Update to Chromium revision adb61db1 (#508578)

This commit is contained in:
Marshall Greenblatt
2017-10-20 13:45:20 -04:00
parent c80264ab11
commit 8b4980b4ca
95 changed files with 647 additions and 776 deletions

View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h
index 4355a8cdacb4..57961ef39f8d 100644
index 8bc4ebd0d771..42949486cf98 100644
--- content/browser/renderer_host/browser_compositor_view_mac.h
+++ content/browser/renderer_host/browser_compositor_view_mac.h
@@ -50,6 +50,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -52,6 +52,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
// These will not return nullptr until Destroy is called.
DelegatedFrameHost* GetDelegatedFrameHost();
@ -10,7 +10,7 @@ index 4355a8cdacb4..57961ef39f8d 100644
// Ensure that the currect compositor frame be cleared (even if it is
// potentially visible).
@@ -57,6 +58,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -59,6 +60,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
// This may return nullptr, if this has detached itself from its
// ui::Compositor.
@ -19,10 +19,10 @@ index 4355a8cdacb4..57961ef39f8d 100644
void DidCreateNewRendererCompositorFrameSink(
diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
index 428bef1ff74e..e841db553ed8 100644
index 04ca86589a13..796a874d0e13 100644
--- content/browser/renderer_host/browser_compositor_view_mac.mm
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -205,6 +205,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
@@ -209,6 +209,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
g_spare_recyclable_compositors.Get().clear();
}
@ -35,7 +35,7 @@ index 428bef1ff74e..e841db553ed8 100644
ui::AcceleratedWidgetMac* BrowserCompositorMac::GetAcceleratedWidgetMac() {
if (recyclable_compositor_)
return recyclable_compositor_->accelerated_widget_mac();
@@ -437,8 +443,13 @@ SkColor BrowserCompositorMac::DelegatedFrameHostGetGutterColor(
@@ -439,8 +445,13 @@ SkColor BrowserCompositorMac::DelegatedFrameHostGetGutterColor(
}
gfx::Size BrowserCompositorMac::DelegatedFrameHostDesiredSizeInDIP() const {