Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index c391a17e971bb311710dfb1f5a74bdf3407620dd..b3d19addbcbccaa90b81539cadb7ba738cb9030f 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -1490,12 +1490,10 @@ void RenderWidgetHostViewAndroid::StartObservingRootWindow() { |
if (!using_browser_compositor_) |
SetBeginFrameSource(view_.GetWindowAndroid()->GetBeginFrameSource()); |
- ui::WindowAndroidCompositor* compositor = |
- view_.GetWindowAndroid()->GetCompositor(); |
- if (compositor) { |
- delegated_frame_host_->RegisterFrameSinkHierarchy( |
- compositor->GetFrameSinkId()); |
- } |
+ CompositorImpl* compositor = |
+ static_cast<CompositorImpl*>(view_.GetWindowAndroid()->GetCompositor()); |
+ if (compositor) |
+ delegated_frame_host_->AttachToCompositor(compositor); |
} |
void RenderWidgetHostViewAndroid::StopObservingRootWindow() { |
@@ -1519,7 +1517,7 @@ void RenderWidgetHostViewAndroid::StopObservingRootWindow() { |
// If the DFH has already been destroyed, it will have cleaned itself up. |
// This happens in some WebView cases. |
if (delegated_frame_host_) |
- delegated_frame_host_->UnregisterFrameSinkHierarchy(); |
+ delegated_frame_host_->DetachFromCompositor(); |
DCHECK(!begin_frame_source_); |
} |
@@ -1902,10 +1900,9 @@ void RenderWidgetHostViewAndroid::OnAttachCompositor() { |
DCHECK(content_view_core_); |
CreateOverscrollControllerIfPossible(); |
if (observing_root_window_) { |
- ui::WindowAndroidCompositor* compositor = |
- view_.GetWindowAndroid()->GetCompositor(); |
- delegated_frame_host_->RegisterFrameSinkHierarchy( |
- compositor->GetFrameSinkId()); |
+ CompositorImpl* compositor = |
+ static_cast<CompositorImpl*>(view_.GetWindowAndroid()->GetCompositor()); |
+ delegated_frame_host_->AttachToCompositor(compositor); |
} |
} |
@@ -1914,7 +1911,7 @@ void RenderWidgetHostViewAndroid::OnDetachCompositor() { |
DCHECK(using_browser_compositor_); |
RunAckCallbacks(); |
overscroll_controller_.reset(); |
- delegated_frame_host_->UnregisterFrameSinkHierarchy(); |
+ delegated_frame_host_->DetachFromCompositor(); |
} |
void RenderWidgetHostViewAndroid::OnBeginFrame(const cc::BeginFrameArgs& args) { |