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 47fb4821 (#318735).

Browse Source 
- Remove the in-process PDF plugin implementation. A new implementation is now required (issue #1565).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2043 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2015-03-04 01:00:13 +00:00
parent a9191b26d2
commit ac4f451c94
42 changed files with 361 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch/patches/base_atomicops_455263.patch
View File

@@ -1,5 +1,5 @@
diff --git allocator.gyp allocator.gyp
index c20325d..0e34390 100644
index d426c9c..f593048 100644
--- allocator.gyp
+++ allocator.gyp
@@ -238,6 +238,7 @@

12
patch/patches/browser_web_contents_1257.patch
View File

@@ -1,8 +1,8 @@
diff --git web_contents_impl.cc web_contents_impl.cc
index 507ebbe..1ef87a2 100644
index ede1642..9a7d93b 100644
--- web_contents_impl.cc
+++ web_contents_impl.cc
@@ -1191,22 +1191,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1212,22 +1212,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
params.browser_context, params.site_instance, params.routing_id,
params.main_frame_routing_id);
@@ -48,7 +48,7 @@ index 507ebbe..1ef87a2 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -1571,6 +1578,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1576,6 +1583,9 @@ void WebContentsImpl::CreateNewWindow(
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
@@ -58,7 +58,7 @@ index 507ebbe..1ef87a2 100644
if (delegate_ &&
!delegate_->ShouldCreateWebContents(this,
route_id,
@@ -1579,7 +1589,9 @@ void WebContentsImpl::CreateNewWindow(
@@ -1584,7 +1594,9 @@ void WebContentsImpl::CreateNewWindow(
params.frame_name,
params.target_url,
partition_id,
@@ -69,7 +69,7 @@ index 507ebbe..1ef87a2 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
@@ -1599,6 +1611,8 @@ void WebContentsImpl::CreateNewWindow(
@@ -1604,6 +1616,8 @@ void WebContentsImpl::CreateNewWindow(
create_params.main_frame_routing_id = main_frame_route_id;
create_params.opener = this;
create_params.opener_suppressed = params.opener_suppressed;
@@ -77,4 +77,4 @@ index 507ebbe..1ef87a2 100644
+ create_params.delegate_view = delegate_view;
if (params.disposition == NEW_BACKGROUND_TAB)
create_params.initially_hidden = true;
create_params.renderer_initiated_creation = true;

2
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git common.gypi common.gypi
index 948dcec..243b262 100644
index 4fcd211..9bfa165 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 436a15e..3985b27 100644
index 53dfccd..771bd25 100644
--- ui/browser.cc
+++ ui/browser.cc
@@ -1563,7 +1563,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1578,7 +1578,9 @@ bool Browser::ShouldCreateWebContents(
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -14,10 +14,10 @@ index 436a15e..3985b27 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(route_id,
diff --git ui/browser.h ui/browser.h
index 8478d97..d1a3f4e 100644
index fcb711c..5a59434 100644
--- ui/browser.h
+++ ui/browser.h
@@ -587,7 +587,9 @@ class Browser : public TabStripModelObserver,
@@ -588,7 +588,9 @@ class Browser : public TabStripModelObserver,
const base::string16& frame_name,
const GURL& target_url,
const std::string& partition_id,

12
patch/patches/compositor_1368.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index cc42565..c671a8d 100644
index 3658c25..74acc61 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -106,6 +106,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
@@ -98,6 +98,13 @@ GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
scoped_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
ui::Compositor* compositor) {
@@ -17,7 +17,7 @@ index cc42565..c671a8d 100644
return scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareOutputDeviceWin(
compositor));
diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index ded2992..0b000c6 100644
index 47d4cd0..793bbe3 100644
--- ui/compositor/compositor.h
+++ ui/compositor/compositor.h
@@ -13,6 +13,7 @@
@@ -28,7 +28,7 @@ index ded2992..0b000c6 100644
#include "cc/surfaces/surface_sequence.h"
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
@@ -134,6 +135,17 @@ class COMPOSITOR_EXPORT CompositorLock
@@ -131,6 +132,17 @@ class COMPOSITOR_EXPORT CompositorLock
DISALLOW_COPY_AND_ASSIGN(CompositorLock);
};
@@ -46,7 +46,7 @@ index ded2992..0b000c6 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -155,6 +167,9 @@ class COMPOSITOR_EXPORT Compositor
@@ -152,6 +164,9 @@ class COMPOSITOR_EXPORT Compositor
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@@ -56,7 +56,7 @@ index ded2992..0b000c6 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -298,6 +313,8 @@ class COMPOSITOR_EXPORT Compositor
@@ -297,6 +312,8 @@ class COMPOSITOR_EXPORT Compositor
ui::ContextFactory* context_factory_;

14
patch/patches/content_nav_1129.patch
View File

@@ -1,5 +1,5 @@
diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc
index 79b40ac..4babaa9 100644
index b56613e..b384eac 100644
--- public/renderer/content_renderer_client.cc
+++ public/renderer/content_renderer_client.cc
@@ -99,7 +99,6 @@ bool ContentRendererClient::AllowPopup() {
@@ -19,10 +19,10 @@ index 79b40ac..4babaa9 100644
bool ContentRendererClient::ShouldFork(blink::WebFrame* frame,
const GURL& url,
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
index a7c7271..05fc084 100644
index 7889016..21307b6 100644
--- public/renderer/content_renderer_client.h
+++ public/renderer/content_renderer_client.h
@@ -192,7 +192,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -193,7 +193,6 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if a popup window should be allowed.
virtual bool AllowPopup();
@@ -30,7 +30,7 @@ index a7c7271..05fc084 100644
// 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
@@ -207,7 +206,6 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -208,7 +207,6 @@ class CONTENT_EXPORT ContentRendererClient {
blink::WebNavigationType type,
blink::WebNavigationPolicy default_policy,
bool is_redirect);
@@ -39,10 +39,10 @@ index a7c7271..05fc084 100644
// 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
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index 876e8ae..a5064a1 100644
index 1e3667f..87b2ec4 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -3954,7 +3954,6 @@ void RenderFrameImpl::OnCommitNavigation(
@@ -3906,7 +3906,6 @@ void RenderFrameImpl::OnCommitNavigation(
WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
RenderFrame* render_frame,
const NavigationPolicyInfo& info) {
@@ -50,7 +50,7 @@ index 876e8ae..a5064a1 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
@@ -3969,7 +3968,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -3921,7 +3920,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
info.isRedirect)) {
return blink::WebNavigationPolicyIgnore;
}

4
patch/patches/gyp_331.patch
View File

@@ -1,8 +1,8 @@
diff --git gyp/generator/ninja.py gyp/generator/ninja.py
index 5407795..580aa54 100644
index 587bf32..c9868db 100644
--- gyp/generator/ninja.py
+++ gyp/generator/ninja.py
@@ -747,7 +747,16 @@ class NinjaWriter(object):
@@ -748,7 +748,16 @@ class NinjaWriter(object):
for path in copy['files']:
# Normalize the path so trailing slashes don't confuse us.
path = os.path.normpath(path)

9
patch/patches/message_loop_443.patch
View File

@@ -1,12 +1,17 @@
diff --git message_loop.cc message_loop.cc
index 24db543..d57673d 100644
index daa7782..6fea3c2 100644
--- message_loop.cc
+++ message_loop.cc
@@ -159,7 +159,6 @@ MessageLoop::MessageLoop(scoped_ptr<MessagePump> pump)
@@ -152,12 +152,6 @@ MessageLoop::MessageLoop(scoped_ptr<MessagePump> pump)
MessageLoop::~MessageLoop() {
DCHECK_EQ(this, current());
- // iOS just attaches to the loop, it doesn't Run it.
- // TODO(stuartmorgan): Consider wiring up a Detach().
-#if !defined(OS_IOS)
- DCHECK(!run_loop_);
-#endif
-
#if defined(OS_WIN)
if (in_high_res_mode_)
Time::ActivateHighResolutionTimer(false);

24
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 4f59c26..69a7b34 100644
index df89031..82d9293 100644
--- public/common/common_param_traits_macros.h
+++ public/common/common_param_traits_macros.h
@@ -190,6 +190,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@@ -194,6 +194,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,34 +11,34 @@ index 4f59c26..69a7b34 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 5563c00..4c24e35 100644
index 97b464e..98e7b4e 100644
--- public/common/web_preferences.cc
+++ public/common/web_preferences.cc
@@ -190,6 +190,7 @@ WebPreferences::WebPreferences()
@@ -185,6 +185,7 @@ WebPreferences::WebPreferences()
rubber_banding_on_compositor_thread(false),
use_solid_color_scrollbars(false),
navigate_on_drag_drop(true),
+ base_background_color(0xFFFFFFFF), // Color::white
v8_cache_options(V8_CACHE_OPTIONS_DEFAULT),
v8_script_streaming_enabled(false),
v8_script_streaming_mode(V8_SCRIPT_STREAMING_MODE_ALL),
slimming_paint_enabled(false),
cookie_enabled(true),
diff --git public/common/web_preferences.h public/common/web_preferences.h
index ab43cd9..a5b3022 100644
index 250b546..b679e26 100644
--- public/common/web_preferences.h
+++ public/common/web_preferences.h
@@ -179,6 +179,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -181,6 +181,7 @@ struct CONTENT_EXPORT WebPreferences {
bool rubber_banding_on_compositor_thread;
bool use_solid_color_scrollbars;
bool navigate_on_drag_drop;
+ uint32_t base_background_color;
V8CacheOptions v8_cache_options;
bool v8_script_streaming_enabled;
V8ScriptStreamingMode v8_script_streaming_mode;
bool slimming_paint_enabled;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index 3be3eb3..23f9891 100644
index 6519f37..27b6699 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -956,6 +956,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
@@ -954,6 +954,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
settings->setJavaEnabled(prefs.java_enabled);

38
patch/patches/public_browser_1161_1257.patch
View File

@@ -1,5 +1,5 @@
diff --git content_browser_client.cc content_browser_client.cc
index 8f3d06c..e67e698 100644
index 67d2df7..e29a5d9 100644
--- content_browser_client.cc
+++ content_browser_client.cc
@@ -278,6 +278,10 @@ bool ContentBrowserClient::IsFastShutdownPossible() {
@@ -14,7 +14,7 @@ index 8f3d06c..e67e698 100644
return base::FilePath();
}
diff --git content_browser_client.h content_browser_client.h
index d2ae7a0..a5b36d5 100644
index c4ab6f3..08583cf 100644
--- content_browser_client.h
+++ content_browser_client.h
@@ -28,6 +28,7 @@
@@ -25,7 +25,7 @@ index d2ae7a0..a5b36d5 100644
#include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
#include "ui/base/window_open_disposition.h"
@@ -509,6 +510,9 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -510,6 +511,9 @@ class CONTENT_EXPORT ContentBrowserClient {
// Clears browser cookies.
virtual void ClearCookies(RenderViewHost* rvh) {}
@@ -36,33 +36,33 @@ index d2ae7a0..a5b36d5 100644
// This can be called on any thread.
virtual base::FilePath GetDefaultDownloadDirectory();
diff --git web_contents.cc web_contents.cc
index 6768411..1dd382b 100644
index aece7c6..63da2c9 100644
--- web_contents.cc
+++ web_contents.cc
@@ -17,7 +17,9 @@ WebContents::CreateParams::CreateParams(BrowserContext* context)
main_frame_routing_id(MSG_ROUTING_NONE),
@@ -18,7 +18,9 @@ WebContents::CreateParams::CreateParams(BrowserContext* context)
initially_hidden(false),
guest_delegate(nullptr),
- context(nullptr) {}
+ context(nullptr),
context(nullptr),
- renderer_initiated_creation(false) {}
+ renderer_initiated_creation(false),
+ view(nullptr),
+ delegate_view(nullptr) {}
WebContents::CreateParams::CreateParams(
BrowserContext* context, SiteInstance* site)
@@ -29,7 +31,9 @@ WebContents::CreateParams::CreateParams(
main_frame_routing_id(MSG_ROUTING_NONE),
@@ -31,7 +33,9 @@ WebContents::CreateParams::CreateParams(
initially_hidden(false),
guest_delegate(nullptr),
- context(nullptr) {}
+ context(nullptr),
context(nullptr),
- renderer_initiated_creation(false) {}
+ renderer_initiated_creation(false),
+ view(nullptr),
+ delegate_view(nullptr) {}
WebContents::CreateParams::~CreateParams() {
}
diff --git web_contents.h web_contents.h
index 879e8d8..0287912 100644
index 493abd8..eface7b 100644
--- web_contents.h
+++ web_contents.h
@@ -52,9 +52,11 @@ class PageState;
@@ -77,11 +77,11 @@ index 879e8d8..0287912 100644
struct CustomContextMenuContext;
struct DropData;
struct Manifest;
@@ -122,6 +124,10 @@ class WebContents : public PageNavigator,
// Used to specify the location context which display the new view should
// belong. This can be nullptr if not needed.
gfx::NativeView context;
+
@@ -128,6 +130,10 @@ class WebContents : public PageNavigator,
// RenderFrame, have already been created on the renderer side, and
// WebContents construction should take this into account.
bool renderer_initiated_creation;
+
+ // Optionally specify the view and delegate view.
+ content::WebContentsView* view;
+ content::RenderViewHostDelegateView* delegate_view;
@@ -104,7 +104,7 @@ index 461927c..2217377 100644
}
diff --git web_contents_delegate.h web_contents_delegate.h
index 13d1c1d..ddf88d8 100644
index d88b27c..fefbed2 100644
--- web_contents_delegate.h
+++ web_contents_delegate.h
@@ -36,9 +36,11 @@ class DownloadItem;

6
patch/patches/render_process_host_1429.patch
View File

@@ -1,8 +1,8 @@
diff --git render_process_host_impl.cc render_process_host_impl.cc
index 37d745e..5723bdc 100644
index 6564c438..7d58b7e 100644
--- render_process_host_impl.cc
+++ render_process_host_impl.cc
@@ -2065,6 +2065,8 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
@@ -2057,6 +2057,8 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
#endif
RemoveUserData(kSessionStorageHolderKey);
@@ -11,7 +11,7 @@ index 37d745e..5723bdc 100644
IDMap<IPC::Listener>::iterator iter(&listeners_);
while (!iter.IsAtEnd()) {
iter.GetCurrentValue()->OnMessageReceived(
@@ -2074,8 +2076,6 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
@@ -2066,8 +2068,6 @@ void RenderProcessHostImpl::ProcessDied(bool already_dead,
iter.Advance();
}

2
patch/patches/spi_webcore_364.patch
View File

@@ -1,5 +1,5 @@
diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
index 8719a5c..555d59d 100644
index 06ced1c..a638814 100644
--- core/frame/FrameView.cpp
+++ core/frame/FrameView.cpp
@@ -146,8 +146,10 @@ FrameView::FrameView(LocalFrame* frame)

4
patch/patches/ui_webview_1257.patch
View File

@@ -1,5 +1,5 @@
diff --git web_dialog_view.cc web_dialog_view.cc
index 0bffda9..c584bc9 100644
index 8fe27bf..04bd1a6 100644
--- web_dialog_view.cc
+++ web_dialog_view.cc
@@ -339,7 +339,9 @@ bool WebDialogView::ShouldCreateWebContents(
@@ -14,7 +14,7 @@ index 0bffda9..c584bc9 100644
return delegate_->HandleShouldCreateWebContents();
return true;
diff --git web_dialog_view.h web_dialog_view.h
index ce69cfc..a890771 100644
index 22550dd..8d72f6d 100644
--- web_dialog_view.h
+++ web_dialog_view.h
@@ -119,7 +119,9 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView,

68
patch/patches/views_widget_180.patch
View File

@@ -43,10 +43,10 @@ index b54a643..5a589e5 100644
if (input_method)
input_method->OnBlur();
diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
index 80008cf..46ea712 100644
index c6fc3d7..40b9b10 100644
--- desktop_aura/desktop_window_tree_host_x11.cc
+++ desktop_aura/desktop_window_tree_host_x11.cc
@@ -153,7 +153,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
@@ -154,7 +154,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
window_shape_(NULL),
custom_window_shape_(false),
urgency_hint_set_(false),
@@ -56,7 +56,7 @@ index 80008cf..46ea712 100644
}
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -355,7 +356,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
@@ -356,7 +357,8 @@ void DesktopWindowTreeHostX11::CloseNow() {
// Actually free our native resources.
if (ui::PlatformEventSource::GetInstance())
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -66,43 +66,34 @@ index 80008cf..46ea712 100644
xwindow_ = None;
desktop_native_widget_aura_->OnHostClosed();
@@ -449,6 +451,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
@@ -455,6 +457,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement(
}
gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const {
+ if (!screen_bounds_.IsEmpty())
+ return screen_bounds_;
return bounds_;
return ToDIPRect(bounds_in_pixels_);
}
@@ -461,6 +465,8 @@ gfx::Rect DesktopWindowTreeHostX11::GetClientAreaBoundsInScreen() const {
// Attempts to calculate the rect by asking the NonClientFrameView what it
// thought its GetBoundsForClientView() were broke combobox drop down
// placement.
+ if (!screen_bounds_.IsEmpty())
+ return screen_bounds_;
return bounds_;
}
@@ -884,6 +890,8 @@ void DesktopWindowTreeHostX11::Hide() {
@@ -887,6 +891,8 @@ void DesktopWindowTreeHostX11::Hide() {
}
gfx::Rect DesktopWindowTreeHostX11::GetBounds() const {
+ if (!screen_bounds_.IsEmpty())
+ return screen_bounds_;
return bounds_;
return bounds_in_pixels_;
}
@@ -939,6 +947,8 @@ void DesktopWindowTreeHostX11::SetBounds(const gfx::Rect& requested_bounds) {
@@ -943,6 +949,8 @@ void DesktopWindowTreeHostX11::SetBounds(
}
gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
+ if (!screen_bounds_.IsEmpty())
+ return screen_bounds_.origin();
return bounds_.origin();
return bounds_in_pixels_.origin();
}
@@ -1058,10 +1068,14 @@ void DesktopWindowTreeHostX11::InitX11Window(
@@ -1063,9 +1071,13 @@ void DesktopWindowTreeHostX11::InitX11Window(
}
}
@@ -110,15 +101,14 @@ index 80008cf..46ea712 100644
+ if (parent_widget == gfx::kNullAcceleratedWidget)
+ parent_widget = x_root_window_;
+
bounds_ = gfx::Rect(params.bounds.origin(),
AdjustSize(params.bounds.size()));
xwindow_ = XCreateWindow(
- xdisplay_, x_root_window_,
+ xdisplay_, parent_widget,
bounds_.x(), bounds_.y(),
bounds_.width(), bounds_.height(),
0, // border width
@@ -1699,6 +1713,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
bounds_in_pixels_ = ToPixelRect(params.bounds);
bounds_in_pixels_.set_size(AdjustSize(bounds_in_pixels_.size()));
- xwindow_ = XCreateWindow(xdisplay_, x_root_window_, bounds_in_pixels_.x(),
+ xwindow_ = XCreateWindow(xdisplay_, parent_widget, bounds_in_pixels_.x(),
bounds_in_pixels_.y(), bounds_in_pixels_.width(),
bounds_in_pixels_.height(),
0, // border width
@@ -1718,6 +1730,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
}
break;
}
@@ -130,7 +120,7 @@ index 80008cf..46ea712 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 d6b5cc8..bf20d4c 100644
index 8f00d3c..a465bed 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
@@ -142,17 +132,17 @@ index d6b5cc8..bf20d4c 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -253,6 +255,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -264,6 +266,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// The bounds of |xwindow_|.
gfx::Rect bounds_;
gfx::Rect bounds_in_pixels_;
+ // Override the screen bounds when the host is a child window.
+ gfx::Rect screen_bounds_;
+
// 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_|. Window
// managers tend to send a Configure message with the maximized bounds, and
@@ -337,6 +342,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// we can have a better chance of getting the real
// |restored_bounds_in_pixels_|. Window managers tend to send a Configure
@@ -349,6 +354,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
@@ -163,10 +153,10 @@ index d6b5cc8..bf20d4c 100644
};
diff --git widget.cc widget.cc
index 76dc14a..8c40f67 100644
index 7d237c8..8778686 100644
--- widget.cc
+++ widget.cc
@@ -109,6 +109,7 @@ Widget::InitParams::InitParams()
@@ -110,6 +110,7 @@ Widget::InitParams::InitParams()
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(NULL),
@@ -174,7 +164,7 @@ index 76dc14a..8c40f67 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
layer_type(aura::WINDOW_LAYER_TEXTURED),
@@ -132,6 +133,7 @@ Widget::InitParams::InitParams(Type type)
@@ -133,6 +134,7 @@ Widget::InitParams::InitParams(Type type)
use_system_default_icon(false),
show_state(ui::SHOW_STATE_DEFAULT),
parent(NULL),
@@ -182,7 +172,7 @@ index 76dc14a..8c40f67 100644
native_widget(NULL),
desktop_window_tree_host(NULL),
layer_type(aura::WINDOW_LAYER_TEXTURED),
@@ -306,7 +308,7 @@ void Widget::Init(const InitParams& in_params) {
@@ -307,7 +309,7 @@ void Widget::Init(const InitParams& in_params) {
InitParams params = in_params;
params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -191,7 +181,7 @@ index 76dc14a..8c40f67 100644
if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
params.type != views::Widget::InitParams::TYPE_WINDOW &&
@@ -367,7 +369,12 @@ void Widget::Init(const InitParams& in_params) {
@@ -370,7 +372,12 @@ void Widget::Init(const InitParams& in_params) {
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());

22
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 0f36f75..b6dd8de 100644
index 16f5b8f..6d457f1 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -740,7 +740,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -735,7 +735,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client)
{
@@ -10,12 +10,12 @@ index 0f36f75..b6dd8de 100644
+ if (m_webView->useExternalPopupMenus())
return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webView));
return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
if (RuntimeEnabledFeatures::htmlPopupMenuEnabled() && RuntimeEnabledFeatures::pagePopupEnabled())
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 06e1c3e..95b7405 100644
index 5312dcd..87b87fd 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -380,6 +380,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -408,6 +408,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
@@ -23,7 +23,7 @@ index 06e1c3e..95b7405 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4059,9 +4060,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4127,9 +4128,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_page->inspectorController().pageScaleFactorChanged();
}
@@ -40,10 +40,10 @@ index 06e1c3e..95b7405 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 7474465..580783f 100644
index 6048f2b..3cbdefd 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -383,7 +383,8 @@ public:
@@ -389,7 +389,8 @@ public:
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@@ -53,7 +53,7 @@ index 7474465..580783f 100644
bool contextMenuAllowed() const
{
@@ -676,6 +677,8 @@ private:
@@ -690,6 +691,8 @@ private:
bool m_contextMenuAllowed;
@@ -63,10 +63,10 @@ index 7474465..580783f 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index 1273aaa..b5d388e 100644
index 774d117..9cd6546 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -407,6 +407,7 @@ public:
@@ -409,6 +409,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);