mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 53.0.2785.46
This commit is contained in:
@@ -1,8 +1,12 @@
|
||||
diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
|
||||
index 552a56b..2a817d8 100644
|
||||
index 358adff..73368d7 100644
|
||||
--- content/browser/renderer_host/browser_compositor_view_mac.h
|
||||
+++ content/browser/renderer_host/browser_compositor_view_mac.h
|
||||
@@ -52,6 +52,7 @@ class BrowserCompositorMac {
|
||||
@@ -61,9 +61,11 @@ class BrowserCompositorMac : public cc::BeginFrameObserver,
|
||||
|
||||
// These will not return nullptr until Destroy is called.
|
||||
DelegatedFrameHost* GetDelegatedFrameHost();
|
||||
+ ui::Layer* GetRootLayer() { return root_layer_.get(); }
|
||||
|
||||
// This may return nullptr, if this has detached itself from its
|
||||
// ui::Compositor.
|
||||
@@ -11,10 +15,10 @@ index 552a56b..2a817d8 100644
|
||||
|
||||
void SwapCompositorFrame(uint32_t output_surface_id,
|
||||
diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
|
||||
index e9faa0a..931a92f 100644
|
||||
index 1a64104..72d69a1 100644
|
||||
--- content/browser/renderer_host/browser_compositor_view_mac.mm
|
||||
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
|
||||
@@ -186,6 +186,12 @@ void BrowserCompositorMac::Destroy() {
|
||||
@@ -183,6 +183,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
|
||||
g_spare_recyclable_compositor.Get().reset();
|
||||
}
|
||||
|
||||
@@ -27,3 +31,19 @@ index e9faa0a..931a92f 100644
|
||||
ui::AcceleratedWidgetMac* BrowserCompositorMac::GetAcceleratedWidgetMac() {
|
||||
if (recyclable_compositor_)
|
||||
return recyclable_compositor_->accelerated_widget_mac();
|
||||
@@ -394,8 +400,13 @@ SkColor BrowserCompositorMac::DelegatedFrameHostGetGutterColor(
|
||||
}
|
||||
|
||||
gfx::Size BrowserCompositorMac::DelegatedFrameHostDesiredSizeInDIP() const {
|
||||
- NSRect bounds = [client_->BrowserCompositorMacGetNSView() bounds];
|
||||
- return gfx::Size(bounds.size.width, bounds.size.height);
|
||||
+ // View will be nil with CEF OSR.
|
||||
+ NSView* view = client_->BrowserCompositorMacGetNSView();
|
||||
+ if (view) {
|
||||
+ NSRect bounds = [view bounds];
|
||||
+ return gfx::Size(bounds.size.width, bounds.size.height);
|
||||
+ }
|
||||
+ return root_layer_->bounds().size();
|
||||
}
|
||||
|
||||
bool BrowserCompositorMac::DelegatedFrameCanCreateResizeLock() const {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
|
||||
index b4557c2..6cb6c5a 100644
|
||||
index a3062e0..2d78d02 100644
|
||||
--- render_widget_host_view_guest.cc
|
||||
+++ render_widget_host_view_guest.cc
|
||||
@@ -243,6 +243,9 @@ void RenderWidgetHostViewGuest::Destroy() {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git web_contents_impl.cc web_contents_impl.cc
|
||||
index db8263e..07f1989 100644
|
||||
index ed42816..4513f67 100644
|
||||
--- web_contents_impl.cc
|
||||
+++ web_contents_impl.cc
|
||||
@@ -1502,6 +1502,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||
@@ -23,7 +23,7 @@ index db8263e..07f1989 100644
|
||||
CHECK(render_view_host_delegate_view_);
|
||||
CHECK(view_.get());
|
||||
|
||||
@@ -1977,11 +1984,14 @@ void WebContentsImpl::CreateNewWindow(
|
||||
@@ -1991,11 +1998,14 @@ void WebContentsImpl::CreateNewWindow(
|
||||
static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace);
|
||||
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
|
||||
|
||||
@@ -39,7 +39,7 @@ index db8263e..07f1989 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
|
||||
@@ -2005,6 +2015,8 @@ void WebContentsImpl::CreateNewWindow(
|
||||
@@ -2019,6 +2029,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;
|
||||
|
@@ -39,10 +39,10 @@ index 9ad5aef..957ef88 100644
|
||||
// built in media player for the given |url|. Defaults to false.
|
||||
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
|
||||
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
|
||||
index e4abcb5..399348c 100644
|
||||
index faa00b7..9140311 100644
|
||||
--- renderer/render_frame_impl.cc
|
||||
+++ renderer/render_frame_impl.cc
|
||||
@@ -4901,7 +4901,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
@@ -4909,7 +4909,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
(pending_navigation_params_ &&
|
||||
!pending_navigation_params_->request_params.redirects.empty());
|
||||
|
||||
@@ -50,7 +50,7 @@ index e4abcb5..399348c 100644
|
||||
// The handlenavigation API is deprecated and will be removed once
|
||||
// crbug.com/325351 is resolved.
|
||||
if (GetContentClient()->renderer()->HandleNavigation(
|
||||
@@ -4910,7 +4909,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
@@ -4918,7 +4917,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
is_redirect)) {
|
||||
return blink::WebNavigationPolicyIgnore;
|
||||
}
|
||||
|
@@ -89,7 +89,6 @@ index 5bfa9a7..5e6e05d 100644
|
||||
+ "studio path")
|
||||
}
|
||||
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
|
||||
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
|
||||
index d58cb85..c7384b9 100644
|
||||
--- build/toolchain/win/setup_toolchain.py
|
||||
+++ build/toolchain/win/setup_toolchain.py
|
||||
|
@@ -1,8 +1,8 @@
|
||||
diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
|
||||
index b7991fa..7e27615 100644
|
||||
index 284f4fd..916352f 100644
|
||||
--- render_widget_host_view_mac.mm
|
||||
+++ render_widget_host_view_mac.mm
|
||||
@@ -573,9 +573,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
|
||||
@@ -504,9 +504,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
|
||||
// Paint this view host with |background_color_| when there is no content
|
||||
// ready to draw.
|
||||
background_layer_.reset([[CALayer alloc] init]);
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
index d9b97ff..9ac9883 100644
|
||||
index 6f5c6c3..2360cf2 100644
|
||||
--- content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
|
||||
@@ -769,6 +769,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
|
||||
|
@@ -1,8 +1,8 @@
|
||||
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
|
||||
index 6b3b603..0530199 100644
|
||||
index 4afc8d8..07eef06 100644
|
||||
--- Source/web/ChromeClientImpl.cpp
|
||||
+++ Source/web/ChromeClientImpl.cpp
|
||||
@@ -883,7 +883,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
|
||||
@@ -886,7 +886,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
|
||||
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
|
||||
{
|
||||
notifyPopupOpeningObservers();
|
||||
|
Reference in New Issue
Block a user