Skip to content

Commit f0fd320

Browse files
magreenblattmagreenblatt
committed
Update to CEF version 3.3325.1755.g7c74b17
1 parent 13b930e commit f0fd320

20 files changed

Lines changed: 4 additions & 379 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
120120
#
121121

122122
# Specify the CEF distribution version.
123-
set(CEF_VERSION "3.3282.1741.gcd94615")
123+
set(CEF_VERSION "3.3325.1755.g7c74b17")
124124

125125
# Determine the platform.
126126
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

‎java/org/cef/CefClient.java‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.cef.callback.CefDownloadItemCallback;
3232
import org.cef.callback.CefDragData;
3333
import org.cef.callback.CefFileDialogCallback;
34-
import org.cef.callback.CefGeolocationCallback;
3534
import org.cef.callback.CefJSDialogCallback;
3635
import org.cef.callback.CefMenuModel;
3736
import org.cef.callback.CefRequestCallback;
@@ -42,7 +41,6 @@
4241
import org.cef.handler.CefDownloadHandler;
4342
import org.cef.handler.CefDragHandler;
4443
import org.cef.handler.CefFocusHandler;
45-
import org.cef.handler.CefGeolocationHandler;
4644
import org.cef.handler.CefJSDialogHandler;
4745
import org.cef.handler.CefKeyboardHandler;
4846
import org.cef.handler.CefLifeSpanHandler;
@@ -64,17 +62,16 @@
6462
*/
6563
public class CefClient extends CefClientHandler
6664
implements CefContextMenuHandler, CefDialogHandler, CefDisplayHandler, CefDownloadHandler,
67-
CefDragHandler, CefFocusHandler, CefGeolocationHandler, CefJSDialogHandler,
68-
CefKeyboardHandler, CefLifeSpanHandler, CefLoadHandler, CefRenderHandler,
69-
CefRequestHandler, CefWindowHandler {
65+
CefDragHandler, CefFocusHandler, CefJSDialogHandler, CefKeyboardHandler,
66+
CefLifeSpanHandler, CefLoadHandler, CefRenderHandler, CefRequestHandler,
67+
CefWindowHandler {
7068
private HashMap<Integer, CefBrowser> browser_ = new HashMap<Integer, CefBrowser>();
7169
private CefContextMenuHandler contextMenuHandler_ = null;
7270
private CefDialogHandler dialogHandler_ = null;
7371
private CefDisplayHandler displayHandler_ = null;
7472
private CefDownloadHandler downloadHandler_ = null;
7573
private CefDragHandler dragHandler_ = null;
7674
private CefFocusHandler focusHandler_ = null;
77-
private CefGeolocationHandler geolocationHandler_ = null;
7875
private CefJSDialogHandler jsDialogHandler_ = null;
7976
private CefKeyboardHandler keyboardHandler_ = null;
8077
private CefLifeSpanHandler lifeSpanHandler_ = null;
@@ -188,11 +185,6 @@ protected CefFocusHandler getFocusHandler() {
188185
return this;
189186
}
190187

191-
@Override
192-
protected CefGeolocationHandler getGeolocationHandler() {
193-
return this;
194-
}
195-
196188
@Override
197189
protected CefJSDialogHandler getJSDialogHandler() {
198190
return this;
@@ -445,33 +437,6 @@ public void onGotFocus(CefBrowser browser) {
445437
if (focusHandler_ != null) focusHandler_.onGotFocus(browser);
446438
}
447439

448-
// CefGeolocationHandler
449-
450-
public CefClient addGeolocationHandler(CefGeolocationHandler handler) {
451-
if (geolocationHandler_ == null) geolocationHandler_ = handler;
452-
return this;
453-
}
454-
455-
public void removeGeolocationHandler() {
456-
geolocationHandler_ = null;
457-
}
458-
459-
@Override
460-
public boolean onRequestGeolocationPermission(CefBrowser browser, String requesting_url,
461-
int request_id, CefGeolocationCallback callback) {
462-
if (geolocationHandler_ != null && browser != null) {
463-
return geolocationHandler_.onRequestGeolocationPermission(
464-
browser, requesting_url, request_id, callback);
465-
}
466-
return false;
467-
}
468-
469-
@Override
470-
public void onCancelGeolocationPermission(CefBrowser browser, int request_id) {
471-
if (geolocationHandler_ != null && browser != null)
472-
geolocationHandler_.onCancelGeolocationPermission(browser, request_id);
473-
}
474-
475440
// CefJSDialogHandler
476441

477442
public CefClient addJSDialogHandler(CefJSDialogHandler handler) {
@@ -595,7 +560,6 @@ public void onBeforeClose(CefBrowser browser) {
595560
removeDownloadHandler(this);
596561
removeDragHandler(this);
597562
removeFocusHandler(this);
598-
removeGeolocationHandler(this);
599563
removeJSDialogHandler(this);
600564
removeKeyboardHandler(this);
601565
removeLifeSpanHandler(this);

‎java/org/cef/callback/CefGeolocationCallback.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎java/org/cef/callback/CefGeolocationCallback_N.java‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎java/org/cef/handler/CefClientHandler.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@ protected void dispose() {
109109
*/
110110
abstract protected CefFocusHandler getFocusHandler();
111111

112-
/**
113-
* Return the handler for geolocation requests.
114-
* This method is a callback method and is called by
115-
* the native code.
116-
*/
117-
abstract protected CefGeolocationHandler getGeolocationHandler();
118-
119112
/**
120113
* Return the handler for javascript dialog requests.
121114
* This method is a callback method and is called by
@@ -222,14 +215,6 @@ protected void removeFocusHandler(CefFocusHandler h) {
222215
}
223216
}
224217

225-
protected void removeGeolocationHandler(CefGeolocationHandler h) {
226-
try {
227-
N_removeGeolocationHandler(h);
228-
} catch (UnsatisfiedLinkError err) {
229-
err.printStackTrace();
230-
}
231-
}
232-
233218
protected void removeJSDialogHandler(CefJSDialogHandler h) {
234219
try {
235220
N_removeJSDialogHandler(h);
@@ -303,7 +288,6 @@ protected void removeWindowHandler(CefWindowHandler h) {
303288
private final native void N_removeDownloadHandler(CefDisplayHandler h);
304289
private final native void N_removeDragHandler(CefDragHandler h);
305290
private final native void N_removeFocusHandler(CefFocusHandler h);
306-
private final native void N_removeGeolocationHandler(CefGeolocationHandler h);
307291
private final native void N_removeJSDialogHandler(CefJSDialogHandler h);
308292
private final native void N_removeKeyboardHandler(CefKeyboardHandler h);
309293
private final native void N_removeLifeSpanHandler(CefLifeSpanHandler h);

‎java/org/cef/handler/CefGeolocationHandler.java‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎java/org/cef/handler/CefGeolocationHandlerAdapter.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎java/tests/detailed/MainFrame.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import tests.detailed.handler.AppHandler;
3333
import tests.detailed.handler.ContextMenuHandler;
3434
import tests.detailed.handler.DragHandler;
35-
import tests.detailed.handler.GeolocationHandler;
3635
import tests.detailed.handler.JSDialogHandler;
3736
import tests.detailed.handler.KeyboardHandler;
3837
import tests.detailed.handler.MessageRouterHandler;
@@ -131,7 +130,6 @@ public MainFrame(boolean osrEnabled, boolean transparentPaintingEnabled, String
131130
client_.addContextMenuHandler(new ContextMenuHandler(this));
132131
client_.addDownloadHandler(downloadDialog);
133132
client_.addDragHandler(new DragHandler());
134-
client_.addGeolocationHandler(new GeolocationHandler(this));
135133
client_.addJSDialogHandler(new JSDialogHandler());
136134
client_.addKeyboardHandler(new KeyboardHandler());
137135
client_.addRequestHandler(new RequestHandler(this));
@@ -228,7 +226,6 @@ public CefCookieManager getCookieManager() {
228226
menuBar.addBookmark("Binding Test", "client://tests/binding_test.html");
229227
menuBar.addBookmark("Binding Test 2", "client://tests/binding_test2.html");
230228
menuBar.addBookmark("Download Test", "http://cefbuilds.com");
231-
menuBar.addBookmark("Geolocation Test", "http://slides.html5rocks.com/#geolocation");
232229
menuBar.addBookmark("Login Test (username:pumpkin, password:pie)",
233230
"http://www.colostate.edu/~ric/protect/your.html");
234231
menuBar.addBookmark("Certificate-error Test", "https://www.k2go.de");

‎java/tests/detailed/handler/GeolocationHandler.java‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎native/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ set(JCEF_SRCS
3636
CefFileDialogCallback_N.h
3737
CefFrame_N.cpp
3838
CefFrame_N.h
39-
CefGeolocationCallback_N.h
40-
CefGeolocationCallback_N.cpp
4139
CefJSDialogCallback_N.h
4240
CefJSDialogCallback_N.cpp
4341
CefMenuModel_N.cpp
@@ -97,8 +95,6 @@ set(JCEF_SRCS
9795
drag_handler.h
9896
focus_handler.cpp
9997
focus_handler.h
100-
geolocation_handler.cpp
101-
geolocation_handler.h
10298
jcef_version.h
10399
jni_util.h
104100
jni_util.cpp

0 commit comments

Comments
 (0)