Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(846)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 638123003: Prepare to move BrowserCompositorViewMac to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use __OBJC__ Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 2c64dcd6344da567362785cb5322f06ae11ab366..13d13dc6e16399ab7a760583131446abb5f3041b 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -501,14 +501,6 @@ void RenderWidgetHostViewMac::BrowserCompositorViewFrameSwapped(
}
}
-NSView* RenderWidgetHostViewMac::BrowserCompositorSuperview() {
- return cocoa_view_;
-}
-
-ui::Layer* RenderWidgetHostViewMac::BrowserCompositorRootLayer() {
- return root_layer_.get();
-}
-
///////////////////////////////////////////////////////////////////////////////
// RenderWidgetHostViewBase, public:
@@ -593,7 +585,8 @@ void RenderWidgetHostViewMac::EnsureBrowserCompositorView() {
TRACE_EVENT0("browser",
"RenderWidgetHostViewMac::EnsureBrowserCompositorView");
- browser_compositor_view_.reset(new BrowserCompositorViewMac(this));
+ browser_compositor_view_.reset(
+ new BrowserCompositorViewMac(this, cocoa_view_, root_layer_.get()));
delegated_frame_host_->AddedToWindow();
delegated_frame_host_->WasShown(ui::LatencyInfo());
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698