bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision fc6ad471 (#342568)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-08-14 10:41:08 -04:00
parent a08686e6a6
commit a63d646e3b
61 changed files with 460 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patch/patches/aura_window_1677.patch
View File

@@ -1,8 +1,8 @@
diff --git window.cc window.cc
index 0c021f8..ec62e3e 100644
index 6cde8c2..bdd5093 100644
--- window.cc
+++ window.cc
@@ -637,6 +637,12 @@ void Window::Focus() {
@@ -522,6 +522,12 @@ void Window::Focus() {
client->FocusWindow(this);
}
@@ -16,7 +16,7 @@ index 0c021f8..ec62e3e 100644
client::FocusClient* client = client::GetFocusClient(this);
return client && client->GetFocusedWindow() == this;
diff --git window.h window.h
index 749a66a..229a867 100644
index 5586044..53bfd2e 100644
--- window.h
+++ window.h
@@ -262,8 +262,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate,

11
patch/patches/browser_plugin_guest_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git browser/browser_plugin/browser_plugin_guest.cc browser/browser_plugin/browser_plugin_guest.cc
index 092a045..baea4bb 100644
index 6991a29..6aed799 100644
--- browser/browser_plugin/browser_plugin_guest.cc
+++ browser/browser_plugin/browser_plugin_guest.cc
@@ -23,7 +23,7 @@
@@ -22,7 +22,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/web_contents/web_contents_impl.h"
@@ -11,14 +11,13 @@ index 092a045..baea4bb 100644
#include "content/common/browser_plugin/browser_plugin_constants.h"
#include "content/common/browser_plugin/browser_plugin_messages.h"
#include "content/common/content_constants_internal.h"
@@ -277,21 +277,20 @@ void BrowserPluginGuest::InitInternal(
@@ -275,20 +275,19 @@ void BrowserPluginGuest::InitInternal(
guest_window_rect_ = params.view_rect;
if (owner_web_contents_ != owner_web_contents) {
- WebContentsViewGuest* new_view = nullptr;
+ WebContentsView* new_view = nullptr;
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSitePerProcess)) {
if (!BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
- new_view =
- static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
+ new_view = GetWebContents()->GetView();
@@ -37,7 +36,7 @@ index 092a045..baea4bb 100644
}
RendererPreferences* renderer_prefs =
@@ -733,12 +732,9 @@ void BrowserPluginGuest::OnWillAttachComplete(
@@ -720,12 +719,9 @@ void BrowserPluginGuest::OnWillAttachComplete(
// This will trigger a callback to RenderViewReady after a round-trip IPC.
static_cast<RenderViewHostImpl*>(
GetWebContents()->GetRenderViewHost())->Init();

29
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,21 +1,16 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 3aedda6..b4aa061 100644
index 7979b64..d63b4fc 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1312,24 +1312,31 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1351,23 +1351,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
params.main_frame_routing_id);
frame_tree_.root()->SetFrameName(params.main_frame_name);
- WebContentsViewDelegate* delegate =
- GetContentClient()->browser()->GetWebContentsViewDelegate(this);
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
+ render_view_host_delegate_view_ = params.delegate_view;
+ }
-
- if (browser_plugin_guest_ &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSitePerProcess)) {
- !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
- scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
- this, delegate, &render_view_host_delegate_view_));
-
@@ -28,13 +23,17 @@ index 3aedda6..b4aa061 100644
- // Regular WebContentsView.
- view_.reset(CreateWebContentsView(
- this, delegate, &render_view_host_delegate_view_));
+ if (params.view && params.delegate_view) {
+ view_.reset(params.view);
+ render_view_host_delegate_view_ = params.delegate_view;
+ }
+
+ if (!view_) {
+ WebContentsViewDelegate* delegate =
+ GetContentClient()->browser()->GetWebContentsViewDelegate(this);
+
+ if (browser_plugin_guest_ &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSitePerProcess)) {
+ !BrowserPluginGuestMode::UseCrossProcessFramesForGuests()) {
+ scoped_ptr<WebContentsView> platform_view(CreateWebContentsView(
+ this, delegate, &render_view_host_delegate_view_));
+
@@ -51,7 +50,7 @@ index 3aedda6..b4aa061 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1665,6 +1672,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1705,6 +1712,9 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -61,7 +60,7 @@ index 3aedda6..b4aa061 100644
if (delegate_ &&
!delegate_->ShouldCreateWebContents(this,
route_id,
@@ -1673,7 +1683,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1713,7 +1723,9 @@ void WebContentsImpl::CreateNewWindow(
params.frame_name,
params.target_url,
partition_id,
@@ -72,8 +71,8 @@ index 3aedda6..b4aa061 100644
if (route_id != MSG_ROUTING_NONE &&
!RenderViewHost::FromID(render_process_id, route_id)) {
// If the embedder didn't create a WebContents for this route, we need to
@@ -1695,6 +1707,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = GetRenderProcessHost()->GetID();
@@ -1735,6 +1747,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.opener_render_process_id = render_process_id;
create_params.opener_render_frame_id = params.opener_render_frame_id;
create_params.opener_suppressed = params.opener_suppressed;
+ create_params.view = view;

2
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index a0ebbf3..10dfe71 100644
index 4a55516..cbef796 100644
--- common.gypi
+++ common.gypi
@@ -9,6 +9,9 @@

8
patch/patches/chrome_browser_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git ui/browser.cc ui/browser.cc
index 242f79b..66326ef 100644
index 90a10ad..c06bcf8 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1666,7 +1666,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1649,7 +1649,9 @@ bool Browser::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index 242f79b..66326ef 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(route_id,
diff --git ui/browser.h ui/browser.h
index 9bb2137..6dbdcbf 100644
index 362d85a..60a12ef 100644
--- ui/browser.h
+++ ui/browser.h
@@ -593,7 +593,9 @@ class Browser : public TabStripModelObserver,
@@ -586,7 +586,9 @@ class Browser : public TabStripModelObserver,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,

2
patch/patches/chrome_pepper_flash_1586.patch
View File

@@ -1,5 +1,5 @@
diff --git pepper_flash.cc pepper_flash.cc
index da1c00d..f96c17d 100644
index 16b4328..63b21c1 100644
--- pepper_flash.cc
+++ pepper_flash.cc
@@ -119,8 +119,15 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,

4
patch/patches/compositor_1368.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 35db2b9..b9adc3f 100644
index fcb0a3e..40caf08 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -139,6 +139,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
@@ -17,7 +17,7 @@ index 35db2b9..b9adc3f 100644
return scoped_ptr<cc::SoftwareOutputDevice>(
new SoftwareOutputDeviceWin(software_backing_.get(), compositor));
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index f703771..307a2ab 100644
index 7c4166f..afeea2f 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -15,6 +15,7 @@

90
patch/patches/content_nav_1129.patch
View File

@@ -1,60 +1,78 @@
diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc
index 7c6957b..c7270f1 100644
index 95af2f7..c7270f1 100644
--- public/renderer/content_renderer_client.cc
+++ public/renderer/content_renderer_client.cc
@@ -101,7 +101,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -101,6 +101,18 @@ bool ContentRendererClient::AllowPopup() {
return false;
}
-#ifdef OS_ANDROID
bool ContentRendererClient::HandleNavigation(
RenderFrame* render_frame,
DocumentState* document_state,
@@ -113,7 +112,6 @@ bool ContentRendererClient::HandleNavigation(
bool is_redirect) {
return false;
}
-#endif
+bool ContentRendererClient::HandleNavigation(
+ RenderFrame* render_frame,
+ DocumentState* document_state,
+ int opener_id,
+ blink::WebFrame* frame,
+ const blink::WebURLRequest& request,
+ blink::WebNavigationType type,
+ blink::WebNavigationPolicy default_policy,
+ bool is_redirect) {
+ return false;
+}
+
bool ContentRendererClient::ShouldFork(blink::WebLocalFrame* frame,
const GURL& url,
const std::string& http_method,
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
index 2a0517a..9a0d4e4 100644
index ebb7f44..3f77142 100644
--- public/renderer/content_renderer_client.h
+++ public/renderer/content_renderer_client.h
@@ -198,7 +198,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -16,6 +16,8 @@
#include "base/strings/string16.h"
#include "content/public/common/content_client.h"
#include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
+#include "third_party/WebKit/public/web/WebNavigationPolicy.h"
+#include "third_party/WebKit/public/web/WebNavigationType.h"
#include "ui/base/page_transition_types.h"
#include "v8/include/v8.h"
@@ -196,6 +198,17 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
-#ifdef OS_ANDROID
// TODO(sgurun) This callback is deprecated and will be removed as soon
// as android webview completes implementation of a resource throttle based
// shouldoverrideurl implementation. See crbug.com/325351
@@ -213,7 +212,6 @@ class CONTENT_EXPORT ContentRendererClient {
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect);
-#endif
+ // Returns true if the navigation was handled by the embedder and should be
+ // ignored by WebKit. This method is used by CEF and android_webview.
+ virtual bool HandleNavigation(RenderFrame* render_frame,
+ DocumentState* document_state,
+ int opener_id,
+ blink::WebFrame* frame,
+ const blink::WebURLRequest& request,
+ blink::WebNavigationType type,
+ blink::WebNavigationPolicy default_policy,
+ bool is_redirect);
+
// Returns true if we should fork a new process for the given navigation.
// If |send_referrer| is set to false (which is the default), no referrer
// header will be send for the navigation. Otherwise, the referrer header is
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index bee5039..a818d6e 100644
index 05e6ad6..4c02fc8 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4186,7 +4186,6 @@ void RenderFrameImpl::OnFailedNavigation(
@@ -4195,6 +4195,19 @@ void RenderFrameImpl::OnFailedNavigation(
WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
RenderFrame* render_frame,
const NavigationPolicyInfo& info) {
-#ifdef OS_ANDROID
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
@@ -4201,7 +4200,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
info.isRedirect)) {
return blink::WebNavigationPolicyIgnore;
}
-#endif
+ if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
+ GetContentClient()->renderer()->HandleNavigation(
+ render_frame,
+ static_cast<DocumentState*>(info.extraData),
+ render_view_->opener_id_,
+ info.frame,
+ info.urlRequest,
+ info.navigationType,
+ info.defaultPolicy,
+ info.isRedirect)) {
+ return blink::WebNavigationPolicyIgnore;
+ }
+
Referrer referrer(RenderViewImpl::GetReferrerFromRequest(info.frame,
info.urlRequest));

2
patch/patches/extensions_1257.patch
View File

@@ -1,5 +1,5 @@
diff --git browser/guest_view/extension_options/extension_options_guest.cc browser/guest_view/extension_options/extension_options_guest.cc
index cb9cdd5..8ad7ee0 100644
index 28014e2..4a08998 100644
--- browser/guest_view/extension_options/extension_options_guest.cc
+++ browser/guest_view/extension_options/extension_options_guest.cc
@@ -195,7 +195,9 @@ bool ExtensionOptionsGuest::ShouldCreateWebContents(

2
patch/patches/gritsettings.patch
View File

@@ -1,5 +1,5 @@
diff --git resource_ids resource_ids
index 49973d1..86cc523 100644
index 7cfda8e..71b0deb 100644
--- resource_ids
+++ resource_ids
@@ -14,6 +14,12 @@

4
patch/patches/hwnd_message_handler_1481.patch
View File

@@ -1,8 +1,8 @@
diff --git hwnd_message_handler.cc hwnd_message_handler.cc
index bd2072b..c3fd2ea 100644
index 5cadce1..26c27ca 100644
--- hwnd_message_handler.cc
+++ hwnd_message_handler.cc
@@ -2649,8 +2649,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -2650,8 +2650,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
"440919 HWNDMessageHandler::HandleMouseEventInternal6"));
// Reroute the mouse wheel to the window under the pointer if applicable.

6
patch/patches/ime_1610.patch
View File

@@ -1,8 +1,8 @@
diff --git input_method_win.cc input_method_win.cc
index 0870fde..23d8038 100644
index 7db88b6..16793d8 100644
--- input_method_win.cc
+++ input_method_win.cc
@@ -567,8 +567,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
@@ -581,8 +581,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
// receiving keyboard input as long as it is an active window. This works well
// even when the |attached_window_handle| becomes active but has not received
// WM_FOCUS yet.
@@ -12,4 +12,4 @@ index 0870fde..23d8038 100644
+ GetActiveWindow() == ::GetAncestor(toplevel_window_handle_, GA_ROOT);
}
bool InputMethodWin::DispatchFabricatedKeyEvent(const ui::KeyEvent& event) {
void InputMethodWin::DispatchFabricatedKeyEvent(ui::KeyEvent* event) {

4
patch/patches/message_loop_443.patch
View File

@@ -1,8 +1,8 @@
diff --git message_loop.cc message_loop.cc
index 4fecbc5..7298151 100644
index 4e5594b..d42a362 100644
--- message_loop.cc
+++ message_loop.cc
@@ -134,12 +134,6 @@ MessageLoop::~MessageLoop() {
@@ -135,12 +135,6 @@ MessageLoop::~MessageLoop() {
// bound to a thread.
DCHECK(current() == this || !current());

16
patch/patches/prefs_content_1161.patch
View File

@@ -1,8 +1,8 @@
diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
index 060fbb9..f028062 100644
index 3c0c982..26d1b55 100644
--- public/common/common_param_traits_macros.h
+++ public/common/common_param_traits_macros.h
@@ -195,6 +195,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -196,6 +196,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@@ -11,10 +11,10 @@ index 060fbb9..f028062 100644
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git public/common/web_preferences.cc public/common/web_preferences.cc
index e140001..42f3b2d 100644
index 39db29a..b7e102c 100644
--- public/common/web_preferences.cc
+++ public/common/web_preferences.cc
@@ -170,6 +170,7 @@ WebPreferences::WebPreferences()
@@ -171,6 +171,7 @@ WebPreferences::WebPreferences()
pinch_overlay_scrollbar_thickness(0),
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true),
@@ -23,10 +23,10 @@ index e140001..42f3b2d 100644
slimming_paint_enabled(false),
cookie_enabled(true),
diff --git public/common/web_preferences.h public/common/web_preferences.h
index e8d7d13..493c743 100644
index 8cc35b7..e1031ad 100644
--- public/common/web_preferences.h
+++ public/common/web_preferences.h
@@ -171,6 +171,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences {
int pinch_overlay_scrollbar_thickness;
bool use_solid_color_scrollbars;
bool navigate_on_drag_drop;
@@ -35,10 +35,10 @@ index e8d7d13..493c743 100644
bool slimming_paint_enabled;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 12f950e..61fc3c1 100644
index 29f4d4f..cb19708 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -1002,6 +1002,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
@@ -1003,6 +1003,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setJavaEnabled(prefs.java_enabled);

2
patch/patches/process_title_1639.patch
View File

@@ -1,5 +1,5 @@
diff --git set_process_title.cc set_process_title.cc
index 229524e..86559f6 100644
index d74af96..5c7ebd2 100644
--- set_process_title.cc
+++ set_process_title.cc
@@ -42,7 +42,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {

2
patch/patches/public_browser_1257.patch
View File

@@ -67,7 +67,7 @@ index 016097b..4fb00ed 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index 34ddd26..7a850af 100644
index 685c1e6..782ab86 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -38,9 +38,11 @@ class DownloadItem;

2
patch/patches/ui_dragdrop_355390.patch
View File

@@ -1,5 +1,5 @@
diff --git os_exchange_data_provider_aurax11.cc os_exchange_data_provider_aurax11.cc
index e7a815c..8188710 100644
index 73ec4bf..9023835 100644
--- os_exchange_data_provider_aurax11.cc
+++ os_exchange_data_provider_aurax11.cc
@@ -159,7 +159,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,

24
patch/patches/views_widget_180_1677.patch
View File

@@ -12,7 +12,7 @@ index a8e088c..838b6a0 100644
return host ? host->GetAcceleratedWidget() : NULL;
}
diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc
index 93b3c5b..a0940ce 100644
index 5bee7fd..53e6c22 100644
--- desktop_aura/desktop_window_tree_host_win.cc
+++ desktop_aura/desktop_window_tree_host_win.cc
@@ -131,7 +131,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
@@ -40,10 +40,10 @@ index 93b3c5b..a0940ce 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(const ui::MouseEvent& event) {
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index a56deb7..a5e8422 100644
index 4a69310..3b00233 100644
--- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -171,7 +171,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -172,7 +172,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
window_parent_(NULL),
custom_window_shape_(false),
urgency_hint_set_(false),
@@ -53,7 +53,7 @@ index a56deb7..a5e8422 100644
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -381,7 +382,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -382,7 +383,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -63,7 +63,7 @@ index a56deb7..a5e8422 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -525,6 +527,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
@@ -526,6 +528,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
}
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
@@ -72,7 +72,7 @@ index a56deb7..a5e8422 100644
return ToDIPRect(bounds_in_pixels_);
}
@@ -962,6 +966,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
@@ -963,6 +967,8 @@ void DesktopWindowTreeHostX11::HideImpl() {
}
gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
@@ -81,7 +81,7 @@ index a56deb7..a5e8422 100644
return bounds_in_pixels_;
}
@@ -1018,6 +1024,8 @@ void DesktopWindowTreeHostX11::SetBounds(
@@ -1019,6 +1025,8 @@ void DesktopWindowTreeHostX11::SetBounds(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@@ -90,7 +90,7 @@ index a56deb7..a5e8422 100644
return bounds_in_pixels_.origin();
}
@@ -1131,9 +1139,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1132,9 +1140,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
}
}
@@ -105,7 +105,7 @@ index a56deb7..a5e8422 100644
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -1782,6 +1794,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
@@ -1787,6 +1799,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@@ -117,7 +117,7 @@ index a56deb7..a5e8422 100644
if (xev->xfocus.mode != NotifyGrab) {
ReleaseCapture();
diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h
index 787372d..d9d57b8 100644
index 73e9e3e..deb2cef 100644
--- desktop_aura/desktop_window_tree_host_x11.h
+++ desktop_aura/desktop_window_tree_host_x11.h
@@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -129,7 +129,7 @@ index 787372d..d9d57b8 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -262,6 +264,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -265,6 +267,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_in_pixels_;
@@ -139,7 +139,7 @@ index 787372d..d9d57b8 100644
// Whenever the bounds are set, we keep the previous set of bounds around so
// we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -348,6 +353,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -351,6 +356,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;

22
patch/patches/webkit_popups.patch
View File

@@ -1,21 +1,21 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 58e8166..23c0cea 100644
index 89f8b5e..4acbf11 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -774,7 +774,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& frame, PopupMenuClient* client)
@@ -781,7 +781,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
- if (WebViewImpl::useExternalPopupMenus())
+ if (m_webView->useExternalPopupMenus())
return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webView));
return adoptRefWillBeNoop(new ExternalPopupMenu(frame, select, *m_webView));
ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 1f8413a..efeff15 100644
index 67c213c..ef14a25 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -397,6 +397,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -426,6 +426,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
@@ -23,7 +23,7 @@ index 1f8413a..efeff15 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -3925,9 +3926,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -3977,9 +3978,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,7 +40,7 @@ index 1f8413a..efeff15 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index a3ece01..60adce4 100644
index a663a10..58900a1 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -389,7 +389,8 @@ public:
@@ -53,7 +53,7 @@ index a3ece01..60adce4 100644
bool contextMenuAllowed() const
{
@@ -675,6 +676,8 @@ private:
@@ -680,6 +681,8 @@ private:
bool m_contextMenuAllowed;
@@ -63,10 +63,10 @@ index a3ece01..60adce4 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index 4046206..fd01e64 100644
index 9f564ec..660e869 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -387,6 +387,7 @@ public:
@@ -398,6 +398,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);