mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 242756.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1553 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Index: public/renderer/content_renderer_client.cc
|
||||
===================================================================
|
||||
--- public/renderer/content_renderer_client.cc (revision 240657)
|
||||
--- public/renderer/content_renderer_client.cc (revision 242756)
|
||||
+++ public/renderer/content_renderer_client.cc (working copy)
|
||||
@@ -91,7 +91,6 @@
|
||||
return false;
|
||||
@@ -20,7 +20,7 @@ Index: public/renderer/content_renderer_client.cc
|
||||
const GURL& url,
|
||||
Index: public/renderer/content_renderer_client.h
|
||||
===================================================================
|
||||
--- public/renderer/content_renderer_client.h (revision 240657)
|
||||
--- public/renderer/content_renderer_client.h (revision 242756)
|
||||
+++ public/renderer/content_renderer_client.h (working copy)
|
||||
@@ -172,7 +172,6 @@
|
||||
// Returns true if a popup window should be allowed.
|
||||
@@ -40,9 +40,9 @@ Index: public/renderer/content_renderer_client.h
|
||||
// If |send_referrer| is set to false (which is the default), no referrer
|
||||
Index: renderer/render_view_impl.cc
|
||||
===================================================================
|
||||
--- renderer/render_view_impl.cc (revision 240657)
|
||||
--- renderer/render_view_impl.cc (revision 242756)
|
||||
+++ renderer/render_view_impl.cc (working copy)
|
||||
@@ -3134,7 +3134,6 @@
|
||||
@@ -3124,7 +3124,6 @@
|
||||
WebFrame* frame, WebDataSource::ExtraData* extraData,
|
||||
const WebURLRequest& request, WebNavigationType type,
|
||||
WebNavigationPolicy default_policy, bool is_redirect) {
|
||||
@@ -50,7 +50,7 @@ Index: renderer/render_view_impl.cc
|
||||
// The handlenavigation API is deprecated and will be removed once
|
||||
// crbug.com/325351 is resolved.
|
||||
if (request.url() != GURL(kSwappedOutURL) &&
|
||||
@@ -3149,7 +3148,6 @@
|
||||
@@ -3139,7 +3138,6 @@
|
||||
is_redirect)) {
|
||||
return blink::WebNavigationPolicyIgnore;
|
||||
}
|
||||
|
@@ -1,6 +1,6 @@
|
||||
Index: desktop_aura/desktop_root_window_host_win.cc
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_root_window_host_win.cc (revision 241258)
|
||||
--- desktop_aura/desktop_root_window_host_win.cc (revision 242756)
|
||||
+++ desktop_aura/desktop_root_window_host_win.cc (working copy)
|
||||
@@ -131,7 +131,9 @@
|
||||
native_widget_delegate_);
|
||||
@@ -13,7 +13,7 @@ Index: desktop_aura/desktop_root_window_host_win.cc
|
||||
parent_hwnd =
|
||||
params.parent->GetDispatcher()->host()->GetAcceleratedWidget();
|
||||
}
|
||||
@@ -751,7 +753,7 @@
|
||||
@@ -752,7 +754,7 @@
|
||||
|
||||
void DesktopRootWindowHostWin::HandleCreate() {
|
||||
// TODO(beng): moar
|
||||
@@ -24,7 +24,7 @@ Index: desktop_aura/desktop_root_window_host_win.cc
|
||||
|
||||
Index: desktop_aura/desktop_screen_win.cc
|
||||
===================================================================
|
||||
--- desktop_aura/desktop_screen_win.cc (revision 241258)
|
||||
--- desktop_aura/desktop_screen_win.cc (revision 242756)
|
||||
+++ desktop_aura/desktop_screen_win.cc (working copy)
|
||||
@@ -54,6 +54,8 @@
|
||||
}
|
||||
@@ -37,9 +37,9 @@ Index: desktop_aura/desktop_screen_win.cc
|
||||
}
|
||||
Index: widget.h
|
||||
===================================================================
|
||||
--- widget.h (revision 241258)
|
||||
--- widget.h (revision 242756)
|
||||
+++ widget.h (working copy)
|
||||
@@ -201,6 +201,7 @@
|
||||
@@ -197,6 +197,7 @@
|
||||
// Should the widget be double buffered? Default is false.
|
||||
bool double_buffer;
|
||||
gfx::NativeView parent;
|
||||
|
@@ -1,33 +1,33 @@
|
||||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 163979)
|
||||
--- public/web/WebView.h (revision 164381)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -441,6 +441,7 @@
|
||||
@@ -417,6 +417,7 @@
|
||||
|
||||
// Sets whether select popup menus should be rendered by the browser.
|
||||
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
|
||||
+ virtual void setUseExternalPopupMenusThisInstance(bool) = 0;
|
||||
|
||||
|
||||
// Visited link state --------------------------------------------------
|
||||
// Hides any popup (suggestions, selects...) that might be showing.
|
||||
virtual void hidePopups() = 0;
|
||||
Index: Source/web/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 163979)
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 164381)
|
||||
+++ Source/web/ChromeClientImpl.cpp (working copy)
|
||||
@@ -867,7 +867,7 @@
|
||||
@@ -851,7 +851,7 @@
|
||||
|
||||
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
|
||||
{
|
||||
- if (WebViewImpl::useExternalPopupMenus())
|
||||
+ if (m_webView->useExternalPopupMenus())
|
||||
return adoptRef(new ExternalPopupMenu(frame, client, m_webView->client()));
|
||||
return adoptRef(new ExternalPopupMenu(frame, client, *m_webView));
|
||||
|
||||
return adoptRef(new PopupMenuChromium(frame, client));
|
||||
Index: Source/web/WebViewImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.cpp (revision 163979)
|
||||
--- Source/web/WebViewImpl.cpp (revision 164381)
|
||||
+++ Source/web/WebViewImpl.cpp (working copy)
|
||||
@@ -393,6 +393,7 @@
|
||||
@@ -348,6 +348,7 @@
|
||||
, m_fakePageScaleAnimationPageScaleFactor(0)
|
||||
, m_fakePageScaleAnimationUseAnchor(false)
|
||||
, m_contextMenuAllowed(false)
|
||||
@@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp
|
||||
, m_doingDragAndDrop(false)
|
||||
, m_ignoreInputEvents(false)
|
||||
, m_compositorDeviceScaleFactorOverride(0)
|
||||
@@ -3708,9 +3709,14 @@
|
||||
@@ -3552,9 +3553,14 @@
|
||||
updateLayerTreeViewport();
|
||||
}
|
||||
|
||||
@@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
|
||||
void WebViewImpl::startDragging(Frame* frame,
|
||||
Index: Source/web/WebViewImpl.h
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.h (revision 163979)
|
||||
--- Source/web/WebViewImpl.h (revision 164381)
|
||||
+++ Source/web/WebViewImpl.h (working copy)
|
||||
@@ -416,7 +416,8 @@
|
||||
@@ -398,7 +398,8 @@
|
||||
|
||||
// Returns true if popup menus should be rendered by the browser, false if
|
||||
// they should be rendered by WebKit (which is the default).
|
||||
@@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h
|
||||
|
||||
bool contextMenuAllowed() const
|
||||
{
|
||||
@@ -714,6 +715,8 @@
|
||||
@@ -680,6 +681,8 @@
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
Reference in New Issue
Block a user