Index: content/renderer/gpu/render_widget_compositor.cc |
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc |
index 4048e3b6ffddd6a697ba655bed0f423f2a982f92..8e08d63e35dec9616ab2ba12dd65dd05730a4aec 100644 |
--- a/content/renderer/gpu/render_widget_compositor.cc |
+++ b/content/renderer/gpu/render_widget_compositor.cc |
@@ -23,6 +23,7 @@ |
#include "build/build_config.h" |
#include "cc/animation/animation_host.h" |
#include "cc/animation/animation_timeline.h" |
+#include "cc/animation/layer_tree_mutator.h" |
#include "cc/base/switches.h" |
#include "cc/blink/web_compositor_animation_timeline_impl.h" |
#include "cc/blink/web_layer_impl.h" |
@@ -48,6 +49,8 @@ |
#include "content/renderer/input/input_handler_manager.h" |
#include "gpu/command_buffer/client/gles2_interface.h" |
#include "gpu/command_buffer/service/gpu_switches.h" |
+#include "third_party/WebKit/public/platform/WebCompositorMutations.h" |
+#include "third_party/WebKit/public/platform/WebCompositorMutatorClient.h" |
#include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h" |
#include "third_party/WebKit/public/platform/WebLayoutAndPaintAsyncCallback.h" |
#include "third_party/WebKit/public/platform/WebSize.h" |
@@ -847,6 +850,12 @@ void RenderWidgetCompositor::setShowScrollBottleneckRects(bool show) { |
layer_tree_host_->SetDebugState(debug_state); |
} |
+void RenderWidgetCompositor::setMutatorClient( |
+ blink::WebCompositorMutatorClient* client) { |
+ TRACE_EVENT0("compositor-worker", "RenderWidgetCompositor::setMutatorClient"); |
+ layer_tree_host_->SetLayerTreeMutator(client); |
+} |
+ |
void RenderWidgetCompositor::updateTopControlsState( |
WebTopControlsState constraints, |
WebTopControlsState current, |
@@ -911,6 +920,14 @@ void RenderWidgetCompositor::ApplyViewportDeltas( |
top_controls_delta); |
} |
+void RenderWidgetCompositor::ApplyMutations( |
+ const cc::LayerTreeMutations& mutations) { |
+ TRACE_EVENT0("compositor-worker", |
+ "RenderWidgetCompositor::ApplyMutations"); |
+ widget_->webwidget()->applyMutations( |
+ static_cast<const blink::WebCompositorMutations&>(mutations)); |
+} |
+ |
void RenderWidgetCompositor::RequestNewOutputSurface() { |
// If the host is closing, then no more compositing is possible. This |
// prevents shutdown races between handling the close message and |
@@ -956,6 +973,7 @@ void RenderWidgetCompositor::DidCommit() { |
DCHECK(!temporary_copy_output_request_); |
widget_->DidCommitCompositorFrame(); |
compositor_deps_->GetRendererScheduler()->DidCommitFrameToCompositor(); |
+ widget_->webwidget()->didCommit(); |
} |
void RenderWidgetCompositor::DidCommitAndDrawFrame() { |