mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 237081.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1532 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
Index: message_loop.cc
|
||||
===================================================================
|
||||
--- message_loop.cc (revision 233896)
|
||||
--- message_loop.cc (revision 237081)
|
||||
+++ message_loop.cc (working copy)
|
||||
@@ -208,7 +208,7 @@
|
||||
@@ -166,7 +166,7 @@
|
||||
MessageLoop::~MessageLoop() {
|
||||
DCHECK_EQ(this, current());
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 161696)
|
||||
--- public/web/WebView.h (revision 162607)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -441,6 +441,7 @@
|
||||
|
||||
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
|
||||
// Visited link state --------------------------------------------------
|
||||
Index: Source/web/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 161696)
|
||||
--- Source/web/ChromeClientImpl.cpp (revision 162607)
|
||||
+++ Source/web/ChromeClientImpl.cpp (working copy)
|
||||
@@ -871,7 +871,7 @@
|
||||
@@ -866,7 +866,7 @@
|
||||
|
||||
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
|
||||
{
|
||||
@@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp
|
||||
return adoptRef(new PopupMenuChromium(frame, client));
|
||||
Index: Source/web/WebViewImpl.cpp
|
||||
===================================================================
|
||||
--- Source/web/WebViewImpl.cpp (revision 161696)
|
||||
--- Source/web/WebViewImpl.cpp (revision 162607)
|
||||
+++ Source/web/WebViewImpl.cpp (working copy)
|
||||
@@ -390,6 +390,7 @@
|
||||
@@ -392,6 +392,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)
|
||||
@@ -3693,9 +3694,14 @@
|
||||
@@ -3686,9 +3687,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 161696)
|
||||
--- Source/web/WebViewImpl.h (revision 162607)
|
||||
+++ Source/web/WebViewImpl.h (working copy)
|
||||
@@ -414,7 +414,8 @@
|
||||
@@ -416,7 +416,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
|
||||
{
|
||||
@@ -710,6 +711,8 @@
|
||||
@@ -713,6 +714,8 @@
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
41
patch/patches/webplugin_win.patch
Normal file
41
patch/patches/webplugin_win.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
Index: webplugin_delegate_impl_win.cc
|
||||
===================================================================
|
||||
--- webplugin_delegate_impl_win.cc (revision 237081)
|
||||
+++ webplugin_delegate_impl_win.cc (working copy)
|
||||
@@ -88,8 +88,10 @@
|
||||
base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_proc_address =
|
||||
LAZY_INSTANCE_INITIALIZER;
|
||||
|
||||
+#if defined(USE_AURA)
|
||||
base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_window_from_point =
|
||||
LAZY_INSTANCE_INITIALIZER;
|
||||
+#endif
|
||||
|
||||
// http://crbug.com/16114
|
||||
// Enforces providing a valid device context in NPWindow, so that NPP_SetWindow
|
||||
@@ -420,12 +422,14 @@
|
||||
GetProcAddressPatch);
|
||||
}
|
||||
|
||||
+#if defined(USE_AURA)
|
||||
if (windowless_ && !g_iat_patch_window_from_point.Pointer()->is_patched() &&
|
||||
(quirks_ & PLUGIN_QUIRK_FAKE_WINDOW_FROM_POINT)) {
|
||||
g_iat_patch_window_from_point.Pointer()->Patch(
|
||||
GetPluginPath().value().c_str(), "user32.dll", "WindowFromPoint",
|
||||
WebPluginDelegateImpl::WindowFromPointPatch);
|
||||
}
|
||||
+#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -447,8 +451,10 @@
|
||||
if (g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched())
|
||||
g_iat_patch_reg_enum_key_ex_w.Pointer()->Unpatch();
|
||||
|
||||
+#if defined(USE_AURA)
|
||||
if (g_iat_patch_window_from_point.Pointer()->is_patched())
|
||||
g_iat_patch_window_from_point.Pointer()->Unpatch();
|
||||
+#endif
|
||||
|
||||
if (mouse_hook_) {
|
||||
UnhookWindowsHookEx(mouse_hook_);
|
Reference in New Issue
Block a user