cc: Split ThreadProxy into ProxyMain and ProxyImpl

cc/trees/thread_proxy.cc

Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
deleted file mode 100644
index c50736a09c4c65e48657796ca388892f4d8a04d4..0000000000000000000000000000000000000000
--- a/cc/trees/thread_proxy.cc
+++ /dev/null
@@ -1,1186 +0,0 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "cc/trees/thread_proxy.h"
-
-#include <algorithm>
-#include <string>
-
-#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/trace_event/trace_event.h"
-#include "base/trace_event/trace_event_argument.h"
-#include "base/trace_event/trace_event_synthetic_delay.h"
-#include "cc/debug/benchmark_instrumentation.h"
-#include "cc/debug/devtools_instrumentation.h"
-#include "cc/input/input_handler.h"
-#include "cc/input/top_controls_manager.h"
-#include "cc/output/context_provider.h"
-#include "cc/output/output_surface.h"
-#include "cc/output/swap_promise.h"
-#include "cc/quads/draw_quad.h"
-#include "cc/scheduler/commit_earlyout_reason.h"
-#include "cc/scheduler/compositor_timing_history.h"
-#include "cc/scheduler/scheduler.h"
-#include "cc/trees/blocking_task_runner.h"
-#include "cc/trees/layer_tree_host.h"
-#include "cc/trees/layer_tree_impl.h"
-#include "cc/trees/scoped_abort_remaining_swap_promises.h"
-#include "gpu/command_buffer/client/gles2_interface.h"
-
-namespace cc {
-
-namespace {
-
-// Measured in seconds.
-const double kSmoothnessTakesPriorityExpirationDelay = 0.25;
-
-unsigned int nextBeginFrameId = 0;
-
-}  // namespace
-
-struct ThreadProxy::SchedulerStateRequest {
-  CompletionEvent completion;
-  scoped_ptr<base::Value> state;
-};
-
-scoped_ptr<Proxy> ThreadProxy::Create(
-    LayerTreeHost* layer_tree_host,
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source) {
-  return make_scoped_ptr(new ThreadProxy(layer_tree_host,
-                                         main_task_runner,
-                                         impl_task_runner,
-                                         external_begin_frame_source.Pass()));
-}
-
-ThreadProxy::ThreadProxy(
-    LayerTreeHost* layer_tree_host,
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source)
-    : Proxy(main_task_runner, impl_task_runner),
-      main_thread_only_vars_unsafe_(this, layer_tree_host),
-      compositor_thread_vars_unsafe_(
-          this,
-          layer_tree_host->id(),
-          layer_tree_host->rendering_stats_instrumentation(),
-          external_begin_frame_source.Pass()) {
-  TRACE_EVENT0("cc", "ThreadProxy::ThreadProxy");
-  DCHECK(IsMainThread());
-  DCHECK(this->main().layer_tree_host);
-  // TODO(khushalsagar): Move this to LayerTreeHost#InitializeThreaded once
-  // ThreadProxy is split. LayerTreeHost creates the channel and passes it to
-  // ProxyMain#SetChannel.
-  SetChannel(ThreadedChannel::Create(this, main_task_runner, impl_task_runner));
-}
-
-ThreadProxy::MainThreadOnly::MainThreadOnly(ThreadProxy* proxy,
-                                            LayerTreeHost* layer_tree_host)
-    : layer_tree_host_id(layer_tree_host->id()),
-      layer_tree_host(layer_tree_host),
-      max_requested_pipeline_stage(NO_PIPELINE_STAGE),
-      current_pipeline_stage(NO_PIPELINE_STAGE),
-      final_pipeline_stage(NO_PIPELINE_STAGE),
-      commit_waits_for_activation(false),
-      started(false),
-      prepare_tiles_pending(false),
-      defer_commits(false),
-      weak_factory(proxy) {}
-
-ThreadProxy::MainThreadOnly::~MainThreadOnly() {}
-
-ThreadProxy::BlockedMainCommitOnly::BlockedMainCommitOnly()
-    : layer_tree_host(nullptr) {}
-
-ThreadProxy::BlockedMainCommitOnly::~BlockedMainCommitOnly() {}
-
-ThreadProxy::CompositorThreadOnly::CompositorThreadOnly(
-    ThreadProxy* proxy,
-    int layer_tree_host_id,
-    RenderingStatsInstrumentation* rendering_stats_instrumentation,
-    scoped_ptr<BeginFrameSource> external_begin_frame_source)
-    : layer_tree_host_id(layer_tree_host_id),
-      next_commit_waits_for_activation(false),
-      commit_completion_event(nullptr),
-      next_frame_is_newly_committed_frame(false),
-      inside_draw(false),
-      input_throttled_until_commit(false),
-      smoothness_priority_expiration_notifier(
-          proxy->ImplThreadTaskRunner(),
-          base::Bind(&ThreadProxy::RenewTreePriority, base::Unretained(proxy)),
-          base::TimeDelta::FromMilliseconds(
-              kSmoothnessTakesPriorityExpirationDelay * 1000)),
-      external_begin_frame_source(external_begin_frame_source.Pass()),
-      rendering_stats_instrumentation(rendering_stats_instrumentation),
-      weak_factory(proxy) {}
-
-ThreadProxy::CompositorThreadOnly::~CompositorThreadOnly() {}
-
-ThreadProxy::~ThreadProxy() {
-  TRACE_EVENT0("cc", "ThreadProxy::~ThreadProxy");
-  DCHECK(IsMainThread());
-  DCHECK(!main().started);
-}
-
-void ThreadProxy::SetChannel(scoped_ptr<ThreadedChannel> threaded_channel) {
-  threaded_channel_ = threaded_channel.Pass();
-  main().channel_main = threaded_channel_.get();
-}
-
-void ThreadProxy::FinishAllRendering() {
-  DCHECK(Proxy::IsMainThread());
-  DCHECK(!main().defer_commits);
-
-  // Make sure all GL drawing is finished on the impl thread.
-  DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-  CompletionEvent completion;
-  main().channel_main->FinishAllRenderingOnImpl(&completion);
-  completion.Wait();
-}
-
-bool ThreadProxy::IsStarted() const {
-  DCHECK(Proxy::IsMainThread());
-  return main().started;
-}
-
-bool ThreadProxy::CommitToActiveTree() const {
-  // With ThreadProxy, we use a pending tree and activate it once it's ready to
-  // draw to allow input to modify the active tree and draw during raster.
-  return false;
-}
-
-void ThreadProxy::SetVisible(bool visible) {
-  TRACE_EVENT1("cc", "ThreadProxy::SetVisible", "visible", visible);
-  main().channel_main->SetVisibleOnImpl(visible);
-}
-
-void ThreadProxy::SetVisibleOnImpl(bool visible) {
-  TRACE_EVENT1("cc", "ThreadProxy::SetVisibleOnImplThread", "visible", visible);
-  impl().layer_tree_host_impl->SetVisible(visible);
-  impl().scheduler->SetVisible(visible);
-}
-
-void ThreadProxy::SetThrottleFrameProduction(bool throttle) {
-  TRACE_EVENT1("cc", "ThreadProxy::SetThrottleFrameProduction", "throttle",
-               throttle);
-  main().channel_main->SetThrottleFrameProductionOnImpl(throttle);
-}
-
-void ThreadProxy::SetThrottleFrameProductionOnImpl(bool throttle) {
-  TRACE_EVENT1("cc", "ThreadProxy::SetThrottleFrameProductionOnImplThread",
-               "throttle", throttle);
-  impl().scheduler->SetThrottleFrameProduction(throttle);
-}
-
-void ThreadProxy::DidLoseOutputSurface() {
-  TRACE_EVENT0("cc", "ThreadProxy::DidLoseOutputSurface");
-  DCHECK(IsMainThread());
-  main().layer_tree_host->DidLoseOutputSurface();
-}
-
-void ThreadProxy::RequestNewOutputSurface() {
-  DCHECK(IsMainThread());
-  main().layer_tree_host->RequestNewOutputSurface();
-}
-
-void ThreadProxy::SetOutputSurface(OutputSurface* output_surface) {
-  main().channel_main->InitializeOutputSurfaceOnImpl(output_surface);
-}
-
-void ThreadProxy::ReleaseOutputSurface() {
-  DCHECK(IsMainThread());
-  DCHECK(main().layer_tree_host->output_surface_lost());
-
-  DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-  CompletionEvent completion;
-  main().channel_main->ReleaseOutputSurfaceOnImpl(&completion);
-  completion.Wait();
-}
-
-void ThreadProxy::DidInitializeOutputSurface(
-    bool success,
-    const RendererCapabilities& capabilities) {
-  TRACE_EVENT0("cc", "ThreadProxy::DidInitializeOutputSurface");
-  DCHECK(IsMainThread());
-
-  if (!success) {
-    main().layer_tree_host->DidFailToInitializeOutputSurface();
-    return;
-  }
-  main().renderer_capabilities_main_thread_copy = capabilities;
-  main().layer_tree_host->DidInitializeOutputSurface();
-}
-
-void ThreadProxy::SetRendererCapabilitiesMainCopy(
-    const RendererCapabilities& capabilities) {
-  main().renderer_capabilities_main_thread_copy = capabilities;
-}
-
-bool ThreadProxy::SendCommitRequestToImplThreadIfNeeded(
-    CommitPipelineStage required_stage) {
-  DCHECK(IsMainThread());
-  DCHECK_NE(NO_PIPELINE_STAGE, required_stage);
-  bool already_posted =
-      main().max_requested_pipeline_stage != NO_PIPELINE_STAGE;
-  main().max_requested_pipeline_stage =
-      std::max(main().max_requested_pipeline_stage, required_stage);
-  if (already_posted)
-    return false;
-  main().channel_main->SetNeedsCommitOnImpl();
-  return true;
-}
-
-void ThreadProxy::SetNeedsCommitOnImpl() {
-  SetNeedsCommitOnImplThread();
-}
-
-void ThreadProxy::DidCompletePageScaleAnimation() {
-  DCHECK(IsMainThread());
-  main().layer_tree_host->DidCompletePageScaleAnimation();
-}
-
-const RendererCapabilities& ThreadProxy::GetRendererCapabilities() const {
-  DCHECK(IsMainThread());
-  DCHECK(!main().layer_tree_host->output_surface_lost());
-  return main().renderer_capabilities_main_thread_copy;
-}
-
-void ThreadProxy::SetNeedsAnimate() {
-  DCHECK(IsMainThread());
-  if (SendCommitRequestToImplThreadIfNeeded(ANIMATE_PIPELINE_STAGE)) {
-    TRACE_EVENT_INSTANT0("cc", "ThreadProxy::SetNeedsAnimate",
-                         TRACE_EVENT_SCOPE_THREAD);
-  }
-}
-
-void ThreadProxy::SetNeedsUpdateLayers() {
-  DCHECK(IsMainThread());
-  // If we are currently animating, make sure we also update the layers.
-  if (main().current_pipeline_stage == ANIMATE_PIPELINE_STAGE) {
-    main().final_pipeline_stage =
-        std::max(main().final_pipeline_stage, UPDATE_LAYERS_PIPELINE_STAGE);
-    return;
-  }
-  if (SendCommitRequestToImplThreadIfNeeded(UPDATE_LAYERS_PIPELINE_STAGE)) {
-    TRACE_EVENT_INSTANT0("cc", "ThreadProxy::SetNeedsUpdateLayers",
-                         TRACE_EVENT_SCOPE_THREAD);
-  }
-}
-
-void ThreadProxy::SetNeedsCommit() {
-  DCHECK(IsMainThread());
-  // If we are currently animating, make sure we don't skip the commit. Note
-  // that requesting a commit during the layer update stage means we need to
-  // schedule another full commit.
-  if (main().current_pipeline_stage == ANIMATE_PIPELINE_STAGE) {
-    main().final_pipeline_stage =
-        std::max(main().final_pipeline_stage, COMMIT_PIPELINE_STAGE);
-    return;
-  }
-  if (SendCommitRequestToImplThreadIfNeeded(COMMIT_PIPELINE_STAGE)) {
-    TRACE_EVENT_INSTANT0("cc", "ThreadProxy::SetNeedsCommit",
-                         TRACE_EVENT_SCOPE_THREAD);
-  }
-}
-
-void ThreadProxy::UpdateRendererCapabilitiesOnImplThread() {
-  DCHECK(IsImplThread());
-  impl().channel_impl->SetRendererCapabilitiesMainCopy(
-      impl()
-          .layer_tree_host_impl->GetRendererCapabilities()
-          .MainThreadCapabilities());
-}
-
-void ThreadProxy::DidLoseOutputSurfaceOnImplThread() {
-  TRACE_EVENT0("cc", "ThreadProxy::DidLoseOutputSurfaceOnImplThread");
-  DCHECK(IsImplThread());
-  impl().channel_impl->DidLoseOutputSurface();
-  impl().scheduler->DidLoseOutputSurface();
-}
-
-void ThreadProxy::CommitVSyncParameters(base::TimeTicks timebase,
-                                        base::TimeDelta interval) {
-  impl().scheduler->CommitVSyncParameters(timebase, interval);
-}
-
-void ThreadProxy::SetEstimatedParentDrawTime(base::TimeDelta draw_time) {
-  impl().scheduler->SetEstimatedParentDrawTime(draw_time);
-}
-
-void ThreadProxy::SetMaxSwapsPendingOnImplThread(int max) {
-  impl().scheduler->SetMaxSwapsPending(max);
-}
-
-void ThreadProxy::DidSwapBuffersOnImplThread() {
-  impl().scheduler->DidSwapBuffers();
-}
-
-void ThreadProxy::DidSwapBuffersCompleteOnImplThread() {
-  TRACE_EVENT0("cc,benchmark",
-               "ThreadProxy::DidSwapBuffersCompleteOnImplThread");
-  DCHECK(IsImplThread());
-  impl().scheduler->DidSwapBuffersComplete();
-  impl().channel_impl->DidCompleteSwapBuffers();
-}
-
-void ThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) {
-  impl().layer_tree_host_impl->WillBeginImplFrame(args);
-  if (impl().last_processed_begin_main_frame_args.IsValid()) {
-    // Last processed begin main frame args records the frame args that we sent
-    // to the main thread for the last frame that we've processed. If that is
-    // set, that means the current frame is one past the frame in which we've
-    // finished the processing.
-    impl().layer_tree_host_impl->RecordMainFrameTiming(
-        impl().last_processed_begin_main_frame_args,
-        impl().layer_tree_host_impl->CurrentBeginFrameArgs());
-    impl().last_processed_begin_main_frame_args = BeginFrameArgs();
-  }
-}
-
-void ThreadProxy::OnResourcelessSoftareDrawStateChanged(
-    bool resourceless_draw) {
-  DCHECK(IsImplThread());
-  impl().scheduler->SetResourcelessSoftareDraw(resourceless_draw);
-}
-
-void ThreadProxy::OnCanDrawStateChanged(bool can_draw) {
-  TRACE_EVENT1(
-      "cc", "ThreadProxy::OnCanDrawStateChanged", "can_draw", can_draw);
-  DCHECK(IsImplThread());
-  impl().scheduler->SetCanDraw(can_draw);
-}
-
-void ThreadProxy::NotifyReadyToActivate() {
-  TRACE_EVENT0("cc", "ThreadProxy::NotifyReadyToActivate");
-  impl().scheduler->NotifyReadyToActivate();
-}
-
-void ThreadProxy::NotifyReadyToDraw() {
-  TRACE_EVENT0("cc", "ThreadProxy::NotifyReadyToDraw");
-  impl().scheduler->NotifyReadyToDraw();
-}
-
-void ThreadProxy::SetNeedsCommitOnImplThread() {
-  TRACE_EVENT0("cc", "ThreadProxy::SetNeedsCommitOnImplThread");
-  DCHECK(IsImplThread());
-  impl().scheduler->SetNeedsBeginMainFrame();
-}
-
-void ThreadProxy::SetVideoNeedsBeginFrames(bool needs_begin_frames) {
-  TRACE_EVENT1("cc", "ThreadProxy::SetVideoNeedsBeginFrames",
-               "needs_begin_frames", needs_begin_frames);
-  DCHECK(IsImplThread());
-  // In tests the layer tree is destroyed after the scheduler is.
-  if (impl().scheduler)
-    impl().scheduler->SetVideoNeedsBeginFrames(needs_begin_frames);
-}
-
-void ThreadProxy::PostAnimationEventsToMainThreadOnImplThread(
-    scoped_ptr<AnimationEventsVector> events) {
-  TRACE_EVENT0("cc",
-               "ThreadProxy::PostAnimationEventsToMainThreadOnImplThread");
-  DCHECK(IsImplThread());
-  impl().channel_impl->SetAnimationEvents(events.Pass());
-}
-
-bool ThreadProxy::IsInsideDraw() { return impl().inside_draw; }
-
-void ThreadProxy::SetNeedsRedraw(const gfx::Rect& damage_rect) {
-  TRACE_EVENT0("cc", "ThreadProxy::SetNeedsRedraw");
-  DCHECK(IsMainThread());
-  main().channel_main->SetNeedsRedrawOnImpl(damage_rect);
-}
-
-void ThreadProxy::SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect) {
-  DCHECK(IsImplThread());
-  SetNeedsRedrawRectOnImplThread(damage_rect);
-}
-
-void ThreadProxy::SetNextCommitWaitsForActivation() {
-  DCHECK(IsMainThread());
-  main().commit_waits_for_activation = true;
-}
-
-void ThreadProxy::SetDeferCommits(bool defer_commits) {
-  DCHECK(IsMainThread());
-  if (main().defer_commits == defer_commits)
-    return;
-
-  main().defer_commits = defer_commits;
-  if (main().defer_commits)
-    TRACE_EVENT_ASYNC_BEGIN0("cc", "ThreadProxy::SetDeferCommits", this);
-  else
-    TRACE_EVENT_ASYNC_END0("cc", "ThreadProxy::SetDeferCommits", this);
-
-  main().channel_main->SetDeferCommitsOnImpl(defer_commits);
-}
-
-void ThreadProxy::SetDeferCommitsOnImpl(bool defer_commits) const {
-  DCHECK(IsImplThread());
-  impl().scheduler->SetDeferCommits(defer_commits);
-}
-
-bool ThreadProxy::CommitRequested() const {
-  DCHECK(IsMainThread());
-  // TODO(skyostil): Split this into something like CommitRequested() and
-  // CommitInProgress().
-  return main().current_pipeline_stage != NO_PIPELINE_STAGE ||
-         main().max_requested_pipeline_stage >= COMMIT_PIPELINE_STAGE;
-}
-
-bool ThreadProxy::BeginMainFrameRequested() const {
-  DCHECK(IsMainThread());
-  return main().max_requested_pipeline_stage != NO_PIPELINE_STAGE;
-}
-
-void ThreadProxy::SetNeedsRedrawOnImplThread() {
-  TRACE_EVENT0("cc", "ThreadProxy::SetNeedsRedrawOnImplThread");
-  DCHECK(IsImplThread());
-  impl().scheduler->SetNeedsRedraw();
-}
-
-void ThreadProxy::SetNeedsAnimateOnImplThread() {
-  TRACE_EVENT0("cc", "ThreadProxy::SetNeedsAnimateOnImplThread");
-  DCHECK(IsImplThread());
-  impl().scheduler->SetNeedsAnimate();
-}
-
-void ThreadProxy::SetNeedsPrepareTilesOnImplThread() {
-  DCHECK(IsImplThread());
-  impl().scheduler->SetNeedsPrepareTiles();
-}
-
-void ThreadProxy::SetNeedsRedrawRectOnImplThread(const gfx::Rect& damage_rect) {
-  DCHECK(IsImplThread());
-  impl().layer_tree_host_impl->SetViewportDamage(damage_rect);
-  SetNeedsRedrawOnImplThread();
-}
-
-void ThreadProxy::MainThreadHasStoppedFlinging() {
-  DCHECK(IsMainThread());
-  main().channel_main->MainThreadHasStoppedFlingingOnImpl();
-}
-
-void ThreadProxy::MainThreadHasStoppedFlingingOnImpl() {
-  DCHECK(IsImplThread());
-  impl().layer_tree_host_impl->MainThreadHasStoppedFlinging();
-}
-
-void ThreadProxy::NotifyInputThrottledUntilCommit() {
-  DCHECK(IsMainThread());
-  main().channel_main->SetInputThrottledUntilCommitOnImpl(true);
-}
-
-void ThreadProxy::SetInputThrottledUntilCommitOnImpl(bool is_throttled) {
-  DCHECK(IsImplThread());
-  if (is_throttled == impl().input_throttled_until_commit)
-    return;
-  impl().input_throttled_until_commit = is_throttled;
-  RenewTreePriority();
-}
-
-ThreadProxy::MainThreadOnly& ThreadProxy::main() {
-  DCHECK(IsMainThread());
-  return main_thread_only_vars_unsafe_;
-}
-const ThreadProxy::MainThreadOnly& ThreadProxy::main() const {
-  DCHECK(IsMainThread());
-  return main_thread_only_vars_unsafe_;
-}
-
-ThreadProxy::BlockedMainCommitOnly& ThreadProxy::blocked_main_commit() {
-  DCHECK(IsMainThreadBlocked());
-  DCHECK(impl().commit_completion_event);
-  return main_thread_blocked_commit_vars_unsafe_;
-}
-
-ThreadProxy::CompositorThreadOnly& ThreadProxy::impl() {
-  DCHECK(IsImplThread());
-  return compositor_thread_vars_unsafe_;
-}
-
-const ThreadProxy::CompositorThreadOnly& ThreadProxy::impl() const {
-  DCHECK(IsImplThread());
-  return compositor_thread_vars_unsafe_;
-}
-
-void ThreadProxy::Start() {
-  DCHECK(IsMainThread());
-  DCHECK(Proxy::HasImplThread());
-
-  // Create LayerTreeHostImpl.
-  DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-  CompletionEvent completion;
-  main().channel_main->InitializeImplOnImpl(&completion,
-                                            main().layer_tree_host);
-  completion.Wait();
-
-  main_thread_weak_ptr_ = main().weak_factory.GetWeakPtr();
-
-  main().started = true;
-}
-
-void ThreadProxy::Stop() {
-  TRACE_EVENT0("cc", "ThreadProxy::Stop");
-  DCHECK(IsMainThread());
-  DCHECK(main().started);
-
-  // Synchronously finishes pending GL operations and deletes the impl.
-  // The two steps are done as separate post tasks, so that tasks posted
-  // by the GL implementation due to the Finish can be executed by the
-  // renderer before shutting it down.
-  {
-    DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-    CompletionEvent completion;
-    main().channel_main->FinishGLOnImpl(&completion);
-    completion.Wait();
-  }
-  {
-    DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-
-    CompletionEvent completion;
-    main().channel_main->LayerTreeHostClosedOnImpl(&completion);
-    completion.Wait();
-  }
-
-  main().weak_factory.InvalidateWeakPtrs();
-  main().layer_tree_host = nullptr;
-  main().started = false;
-}
-
-bool ThreadProxy::SupportsImplScrolling() const {
-  return true;
-}
-
-void ThreadProxy::FinishAllRenderingOnImpl(CompletionEvent* completion) {
-  TRACE_EVENT0("cc", "ThreadProxy::FinishAllRenderingOnImplThread");
-  DCHECK(IsImplThread());
-  impl().layer_tree_host_impl->FinishAllRendering();
-  completion->Signal();
-}
-
-void ThreadProxy::ScheduledActionSendBeginMainFrame() {
-  unsigned int begin_frame_id = nextBeginFrameId++;
-  benchmark_instrumentation::ScopedBeginFrameTask begin_frame_task(
-      benchmark_instrumentation::kSendBeginFrame, begin_frame_id);
-  scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state(
-      new BeginMainFrameAndCommitState);
-  begin_main_frame_state->begin_frame_id = begin_frame_id;
-  begin_main_frame_state->begin_frame_args =
-      impl().layer_tree_host_impl->CurrentBeginFrameArgs();
-  begin_main_frame_state->scroll_info =
-      impl().layer_tree_host_impl->ProcessScrollDeltas();
-  begin_main_frame_state->memory_allocation_limit_bytes =
-      impl().layer_tree_host_impl->memory_allocation_limit_bytes();
-  begin_main_frame_state->evicted_ui_resources =
-      impl().layer_tree_host_impl->EvictedUIResourcesExist();
-  // TODO(vmpstr): This needs to be fixed if
-  // main_frame_before_activation_enabled is set, since we might run this code
-  // twice before recording a duration. crbug.com/469824
-  impl().last_begin_main_frame_args = begin_main_frame_state->begin_frame_args;
-  impl().channel_impl->BeginMainFrame(begin_main_frame_state.Pass());
-  devtools_instrumentation::DidRequestMainThreadFrame(
-      impl().layer_tree_host_id);
-}
-
-void ThreadProxy::SendBeginMainFrameNotExpectedSoon() {
-  impl().channel_impl->BeginMainFrameNotExpectedSoon();
-}
-
-void ThreadProxy::BeginMainFrame(
-    scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) {
-  benchmark_instrumentation::ScopedBeginFrameTask begin_frame_task(
-      benchmark_instrumentation::kDoBeginFrame,
-      begin_main_frame_state->begin_frame_id);
-  TRACE_EVENT_SYNTHETIC_DELAY_BEGIN("cc.BeginMainFrame");
-  DCHECK(IsMainThread());
-  DCHECK_EQ(NO_PIPELINE_STAGE, main().current_pipeline_stage);
-
-  if (main().defer_commits) {
-    TRACE_EVENT_INSTANT0("cc", "EarlyOut_DeferCommit",
-                         TRACE_EVENT_SCOPE_THREAD);
-    main().channel_main->BeginMainFrameAbortedOnImpl(
-        CommitEarlyOutReason::ABORTED_DEFERRED_COMMIT);
-    return;
-  }
-
-  // If the commit finishes, LayerTreeHost will transfer its swap promises to
-  // LayerTreeImpl. The destructor of ScopedSwapPromiseChecker aborts the
-  // remaining swap promises.
-  ScopedAbortRemainingSwapPromises swap_promise_checker(main().layer_tree_host);
-
-  main().final_pipeline_stage = main().max_requested_pipeline_stage;
-  main().max_requested_pipeline_stage = NO_PIPELINE_STAGE;
-
-  if (!main().layer_tree_host->visible()) {
-    TRACE_EVENT_INSTANT0("cc", "EarlyOut_NotVisible", TRACE_EVENT_SCOPE_THREAD);
-    main().channel_main->BeginMainFrameAbortedOnImpl(
-        CommitEarlyOutReason::ABORTED_NOT_VISIBLE);
-    return;
-  }
-
-  if (main().layer_tree_host->output_surface_lost()) {
-    TRACE_EVENT_INSTANT0(
-        "cc", "EarlyOut_OutputSurfaceLost", TRACE_EVENT_SCOPE_THREAD);
-    main().channel_main->BeginMainFrameAbortedOnImpl(
-        CommitEarlyOutReason::ABORTED_OUTPUT_SURFACE_LOST);
-    return;
-  }
-
-  main().current_pipeline_stage = ANIMATE_PIPELINE_STAGE;
-
-  main().layer_tree_host->ApplyScrollAndScale(
-      begin_main_frame_state->scroll_info.get());
-
-  main().layer_tree_host->WillBeginMainFrame();
-
-  main().layer_tree_host->BeginMainFrame(
-      begin_main_frame_state->begin_frame_args);
-  main().layer_tree_host->AnimateLayers(
-      begin_main_frame_state->begin_frame_args.frame_time);
-
-  // Recreate all UI resources if there were evicted UI resources when the impl
-  // thread initiated the commit.
-  if (begin_main_frame_state->evicted_ui_resources)
-    main().layer_tree_host->RecreateUIResources();
-
-  main().layer_tree_host->RequestMainFrameUpdate();
-  TRACE_EVENT_SYNTHETIC_DELAY_END("cc.BeginMainFrame");
-
-  bool can_cancel_this_commit =
-      main().final_pipeline_stage < COMMIT_PIPELINE_STAGE &&
-      !begin_main_frame_state->evicted_ui_resources;
-
-  main().current_pipeline_stage = UPDATE_LAYERS_PIPELINE_STAGE;
-  bool should_update_layers =
-      main().final_pipeline_stage >= UPDATE_LAYERS_PIPELINE_STAGE;
-  bool updated = should_update_layers && main().layer_tree_host->UpdateLayers();
-
-  main().layer_tree_host->WillCommit();
-  devtools_instrumentation::ScopedCommitTrace commit_task(
-      main().layer_tree_host->id());
-
-  main().current_pipeline_stage = COMMIT_PIPELINE_STAGE;
-  if (!updated && can_cancel_this_commit) {
-    TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoUpdates", TRACE_EVENT_SCOPE_THREAD);
-    main().channel_main->BeginMainFrameAbortedOnImpl(
-        CommitEarlyOutReason::FINISHED_NO_UPDATES);
-
-    // Although the commit is internally aborted, this is because it has been
-    // detected to be a no-op.  From the perspective of an embedder, this commit
-    // went through, and input should no longer be throttled, etc.
-    main().current_pipeline_stage = NO_PIPELINE_STAGE;
-    main().layer_tree_host->CommitComplete();
-    main().layer_tree_host->DidBeginMainFrame();
-    main().layer_tree_host->BreakSwapPromises(SwapPromise::COMMIT_NO_UPDATE);
-    return;
-  }
-
-  // Notify the impl thread that the main thread is ready to commit. This will
-  // begin the commit process, which is blocking from the main thread's
-  // point of view, but asynchronously performed on the impl thread,
-  // coordinated by the Scheduler.
-  {
-    TRACE_EVENT0("cc", "ThreadProxy::BeginMainFrame::commit");
-
-    DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-
-    // This CapturePostTasks should be destroyed before CommitComplete() is
-    // called since that goes out to the embedder, and we want the embedder
-    // to receive its callbacks before that.
-    BlockingTaskRunner::CapturePostTasks blocked(
-        blocking_main_thread_task_runner());
-
-    CompletionEvent completion;
-    main().channel_main->StartCommitOnImpl(&completion, main().layer_tree_host,
-                                           main().commit_waits_for_activation);
-    completion.Wait();
-    main().commit_waits_for_activation = false;
-  }
-
-  main().current_pipeline_stage = NO_PIPELINE_STAGE;
-  main().layer_tree_host->CommitComplete();
-  main().layer_tree_host->DidBeginMainFrame();
-}
-
-void ThreadProxy::BeginMainFrameNotExpectedSoon() {
-  TRACE_EVENT0("cc", "ThreadProxy::BeginMainFrameNotExpectedSoon");
-  DCHECK(IsMainThread());
-  main().layer_tree_host->BeginMainFrameNotExpectedSoon();
-}
-
-void ThreadProxy::StartCommitOnImpl(CompletionEvent* completion,
-                                    LayerTreeHost* layer_tree_host,
-                                    bool hold_commit_for_activation) {
-  TRACE_EVENT0("cc", "ThreadProxy::StartCommitOnImplThread");
-  DCHECK(!impl().commit_completion_event);
-  DCHECK(IsImplThread() && IsMainThreadBlocked());
-  DCHECK(impl().scheduler);
-  DCHECK(impl().scheduler->CommitPending());
-
-  if (hold_commit_for_activation) {
-    // This commit may be aborted. Store the value for
-    // hold_commit_for_activation so that whenever the next commit is started,
-    // the main thread will be unblocked only after pending tree activation.
-    impl().next_commit_waits_for_activation = hold_commit_for_activation;
-  }
-
-  if (!impl().layer_tree_host_impl) {
-    TRACE_EVENT_INSTANT0(
-        "cc", "EarlyOut_NoLayerTree", TRACE_EVENT_SCOPE_THREAD);
-    completion->Signal();
-    return;
-  }
-
-  // Ideally, we should inform to impl thread when BeginMainFrame is started.
-  // But, we can avoid a PostTask in here.
-  impl().scheduler->NotifyBeginMainFrameStarted();
-  impl().commit_completion_event = completion;
-  DCHECK(!blocked_main_commit().layer_tree_host);
-  blocked_main_commit().layer_tree_host = layer_tree_host;
-  impl().scheduler->NotifyReadyToCommit();
-}
-
-void ThreadProxy::BeginMainFrameAbortedOnImpl(CommitEarlyOutReason reason) {
-  TRACE_EVENT1("cc", "ThreadProxy::BeginMainFrameAbortedOnImplThread", "reason",
-               CommitEarlyOutReasonToString(reason));
-  DCHECK(IsImplThread());
-  DCHECK(impl().scheduler);
-  DCHECK(impl().scheduler->CommitPending());
-  DCHECK(!impl().layer_tree_host_impl->pending_tree());
-
-  if (CommitEarlyOutHandledCommit(reason)) {
-    SetInputThrottledUntilCommitOnImpl(false);
-    impl().last_processed_begin_main_frame_args =
-        impl().last_begin_main_frame_args;
-  }
-  impl().layer_tree_host_impl->BeginMainFrameAborted(reason);
-  impl().scheduler->BeginMainFrameAborted(reason);
-}
-
-void ThreadProxy::ScheduledActionAnimate() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionAnimate");
-  DCHECK(IsImplThread());
-
-  impl().layer_tree_host_impl->Animate();
-}
-
-void ThreadProxy::ScheduledActionCommit() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionCommit");
-  DCHECK(IsImplThread());
-  DCHECK(IsMainThreadBlocked());
-  DCHECK(impl().commit_completion_event);
-  DCHECK(blocked_main_commit().layer_tree_host);
-
-  impl().layer_tree_host_impl->BeginCommit();
-  blocked_main_commit().layer_tree_host->FinishCommitOnImplThread(
-      impl().layer_tree_host_impl.get());
-
-  // Remove the LayerTreeHost reference before the completion event is signaled
-  // and cleared. This is necessary since blocked_main_commit() allows access
-  // only while we have the completion event to ensure the main thread is
-  // blocked for a commit.
-  blocked_main_commit().layer_tree_host = nullptr;
-
-  if (impl().next_commit_waits_for_activation) {
-    // For some layer types in impl-side painting, the commit is held until
-    // the sync tree is activated.  It's also possible that the
-    // sync tree has already activated if there was no work to be done.
-    TRACE_EVENT_INSTANT0("cc", "HoldCommit", TRACE_EVENT_SCOPE_THREAD);
-  } else {
-    impl().commit_completion_event->Signal();
-    impl().commit_completion_event = nullptr;
-  }
-
-  impl().scheduler->DidCommit();
-
-  // Delay this step until afer the main thread has been released as it's
-  // often a good bit of work to update the tree and prepare the new frame.
-  impl().layer_tree_host_impl->CommitComplete();
-
-  SetInputThrottledUntilCommitOnImpl(false);
-
-  impl().next_frame_is_newly_committed_frame = true;
-}
-
-void ThreadProxy::ScheduledActionActivateSyncTree() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionActivateSyncTree");
-  DCHECK(IsImplThread());
-  impl().layer_tree_host_impl->ActivateSyncTree();
-}
-
-void ThreadProxy::ScheduledActionBeginOutputSurfaceCreation() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionBeginOutputSurfaceCreation");
-  DCHECK(IsImplThread());
-  impl().channel_impl->RequestNewOutputSurface();
-}
-
-DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) {
-  TRACE_EVENT_SYNTHETIC_DELAY("cc.DrawAndSwap");
-  DrawResult result;
-
-  DCHECK(IsImplThread());
-  DCHECK(impl().layer_tree_host_impl.get());
-
-  base::AutoReset<bool> mark_inside(&impl().inside_draw, true);
-
-  if (impl().layer_tree_host_impl->pending_tree()) {
-    bool update_lcd_text = false;
-    impl().layer_tree_host_impl->pending_tree()->UpdateDrawProperties(
-        update_lcd_text);
-  }
-
-  // This method is called on a forced draw, regardless of whether we are able
-  // to produce a frame, as the calling site on main thread is blocked until its
-  // request completes, and we signal completion here. If CanDraw() is false, we
-  // will indicate success=false to the caller, but we must still signal
-  // completion to avoid deadlock.
-
-  // We guard PrepareToDraw() with CanDraw() because it always returns a valid
-  // frame, so can only be used when such a frame is possible. Since
-  // DrawLayers() depends on the result of PrepareToDraw(), it is guarded on
-  // CanDraw() as well.
-
-  LayerTreeHostImpl::FrameData frame;
-  bool draw_frame = false;
-
-  if (impl().layer_tree_host_impl->CanDraw()) {
-    result = impl().layer_tree_host_impl->PrepareToDraw(&frame);
-    draw_frame = forced_draw || result == DRAW_SUCCESS;
-  } else {
-    result = DRAW_ABORTED_CANT_DRAW;
-  }
-
-  if (draw_frame) {
-    impl().layer_tree_host_impl->DrawLayers(&frame);
-    result = DRAW_SUCCESS;
-  } else {
-    DCHECK_NE(DRAW_SUCCESS, result);
-  }
-  impl().layer_tree_host_impl->DidDrawAllLayers(frame);
-
-  bool start_ready_animations = draw_frame;
-  impl().layer_tree_host_impl->UpdateAnimationState(start_ready_animations);
-
-  if (draw_frame)
-    impl().layer_tree_host_impl->SwapBuffers(frame);
-
-  // Tell the main thread that the the newly-commited frame was drawn.
-  if (impl().next_frame_is_newly_committed_frame) {
-    impl().next_frame_is_newly_committed_frame = false;
-    impl().channel_impl->DidCommitAndDrawFrame();
-  }
-
-  DCHECK_NE(INVALID_RESULT, result);
-  return result;
-}
-
-void ThreadProxy::ScheduledActionPrepareTiles() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionPrepareTiles");
-  impl().layer_tree_host_impl->PrepareTiles();
-}
-
-DrawResult ThreadProxy::ScheduledActionDrawAndSwapIfPossible() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionDrawAndSwap");
-
-  // SchedulerStateMachine::DidDrawIfPossibleCompleted isn't set up to
-  // handle DRAW_ABORTED_CANT_DRAW.  Moreover, the scheduler should
-  // never generate this call when it can't draw.
-  DCHECK(impl().layer_tree_host_impl->CanDraw());
-
-  bool forced_draw = false;
-  return DrawSwapInternal(forced_draw);
-}
-
-DrawResult ThreadProxy::ScheduledActionDrawAndSwapForced() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionDrawAndSwapForced");
-  bool forced_draw = true;
-  return DrawSwapInternal(forced_draw);
-}
-
-void ThreadProxy::ScheduledActionInvalidateOutputSurface() {
-  TRACE_EVENT0("cc", "ThreadProxy::ScheduledActionInvalidateOutputSurface");
-  DCHECK(impl().layer_tree_host_impl->output_surface());
-  impl().layer_tree_host_impl->output_surface()->Invalidate();
-}
-
-void ThreadProxy::DidFinishImplFrame() {
-  impl().layer_tree_host_impl->DidFinishImplFrame();
-}
-
-void ThreadProxy::SendBeginFramesToChildren(const BeginFrameArgs& args) {
-  NOTREACHED() << "Only used by SingleThreadProxy";
-}
-
-void ThreadProxy::SetAuthoritativeVSyncInterval(
-    const base::TimeDelta& interval) {
-  NOTREACHED() << "Only used by SingleThreadProxy";
-}
-
-void ThreadProxy::DidCommitAndDrawFrame() {
-  DCHECK(IsMainThread());
-  main().layer_tree_host->DidCommitAndDrawFrame();
-}
-
-void ThreadProxy::DidCompleteSwapBuffers() {
-  DCHECK(IsMainThread());
-  main().layer_tree_host->DidCompleteSwapBuffers();
-}
-
-void ThreadProxy::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events) {
-  TRACE_EVENT0("cc", "ThreadProxy::SetAnimationEvents");
-  DCHECK(IsMainThread());
-  main().layer_tree_host->SetAnimationEvents(events.Pass());
-}
-
-void ThreadProxy::InitializeImplOnImpl(CompletionEvent* completion,
-                                       LayerTreeHost* layer_tree_host) {
-  TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread");
-  DCHECK(IsImplThread());
-  DCHECK(IsMainThreadBlocked());
-  DCHECK(layer_tree_host);
-
-  // TODO(khushalsagar): ThreadedChannel will create ProxyImpl here and pass a
-  // reference to itself.
-  impl().channel_impl = threaded_channel_.get();
-
-  impl().layer_tree_host_impl = layer_tree_host->CreateLayerTreeHostImpl(this);
-
-  SchedulerSettings scheduler_settings(
-      layer_tree_host->settings().ToSchedulerSettings());
-
-  scoped_ptr<CompositorTimingHistory> compositor_timing_history(
-      new CompositorTimingHistory(CompositorTimingHistory::RENDERER_UMA,
-                                  impl().rendering_stats_instrumentation));
-
-  impl().scheduler = Scheduler::Create(
-      this, scheduler_settings, impl().layer_tree_host_id,
-      ImplThreadTaskRunner(), impl().external_begin_frame_source.get(),
-      compositor_timing_history.Pass());
-
-  DCHECK_EQ(impl().scheduler->visible(),
-            impl().layer_tree_host_impl->visible());
-  impl_thread_weak_ptr_ = impl().weak_factory.GetWeakPtr();
-  completion->Signal();
-}
-
-void ThreadProxy::InitializeOutputSurfaceOnImpl(OutputSurface* output_surface) {
-  TRACE_EVENT0("cc", "ThreadProxy::InitializeOutputSurfaceOnImplThread");
-  DCHECK(IsImplThread());
-
-  LayerTreeHostImpl* host_impl = impl().layer_tree_host_impl.get();
-  bool success = host_impl->InitializeRenderer(output_surface);
-  RendererCapabilities capabilities;
-  if (success) {
-    capabilities =
-        host_impl->GetRendererCapabilities().MainThreadCapabilities();
-  }
-
-  impl().channel_impl->DidInitializeOutputSurface(success, capabilities);
-
-  if (success)
-    impl().scheduler->DidCreateAndInitializeOutputSurface();
-}
-
-void ThreadProxy::ReleaseOutputSurfaceOnImpl(CompletionEvent* completion) {
-  DCHECK(IsImplThread());
-
-  // Unlike DidLoseOutputSurfaceOnImplThread, we don't need to call
-  // LayerTreeHost::DidLoseOutputSurface since it already knows.
-  impl().scheduler->DidLoseOutputSurface();
-  impl().layer_tree_host_impl->ReleaseOutputSurface();
-  completion->Signal();
-}
-
-void ThreadProxy::FinishGLOnImpl(CompletionEvent* completion) {
-  TRACE_EVENT0("cc", "ThreadProxy::FinishGLOnImplThread");
-  DCHECK(IsImplThread());
-  if (impl().layer_tree_host_impl->output_surface()) {
-    ContextProvider* context_provider =
-        impl().layer_tree_host_impl->output_surface()->context_provider();
-    if (context_provider)
-      context_provider->ContextGL()->Finish();
-  }
-  completion->Signal();
-}
-
-void ThreadProxy::LayerTreeHostClosedOnImpl(CompletionEvent* completion) {
-  TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread");
-  DCHECK(IsImplThread());
-  DCHECK(IsMainThreadBlocked());
-  impl().scheduler = nullptr;
-  impl().external_begin_frame_source = nullptr;
-  impl().layer_tree_host_impl = nullptr;
-  impl().weak_factory.InvalidateWeakPtrs();
-  // We need to explicitly shutdown the notifier to destroy any weakptrs it is
-  // holding while still on the compositor thread. This also ensures any
-  // callbacks holding a ThreadProxy pointer are cancelled.
-  impl().smoothness_priority_expiration_notifier.Shutdown();
-  completion->Signal();
-}
-
-bool ThreadProxy::MainFrameWillHappenForTesting() {
-  DCHECK(IsMainThread());
-  bool main_frame_will_happen = false;
-  {
-    DebugScopedSetMainThreadBlocked main_thread_blocked(this);
-    CompletionEvent completion;
-    main().channel_main->MainFrameWillHappenOnImplForTesting(
-        &completion, &main_frame_will_happen);
-    completion.Wait();
-  }
-  return main_frame_will_happen;
-}
-
-void ThreadProxy::SetChildrenNeedBeginFrames(bool children_need_begin_frames) {
-  NOTREACHED() << "Only used by SingleThreadProxy";
-}
-
-void ThreadProxy::MainFrameWillHappenOnImplForTesting(
-    CompletionEvent* completion,
-    bool* main_frame_will_happen) {
-  DCHECK(IsImplThread());
-  if (impl().layer_tree_host_impl->output_surface()) {
-    *main_frame_will_happen = impl().scheduler->MainFrameForTestingWillHappen();
-  } else {
-    *main_frame_will_happen = false;
-  }
-  completion->Signal();
-}
-
-void ThreadProxy::RenewTreePriority() {
-  DCHECK(IsImplThread());
-  bool smoothness_takes_priority =
-      impl().layer_tree_host_impl->pinch_gesture_active() ||
-      impl().layer_tree_host_impl->page_scale_animation_active() ||
-      impl().layer_tree_host_impl->IsActivelyScrolling();
-
-  // Schedule expiration if smoothness currently takes priority.
-  if (smoothness_takes_priority)
-    impl().smoothness_priority_expiration_notifier.Schedule();
-
-  // We use the same priority for both trees by default.
-  TreePriority priority = SAME_PRIORITY_FOR_BOTH_TREES;
-
-  // Smoothness takes priority if we have an expiration for it scheduled.
-  if (impl().smoothness_priority_expiration_notifier.HasPendingNotification())
-    priority = SMOOTHNESS_TAKES_PRIORITY;
-
-  // New content always takes priority when there is an invalid viewport size or
-  // ui resources have been evicted.
-  if (impl().layer_tree_host_impl->active_tree()->ViewportSizeInvalid() ||
-      impl().layer_tree_host_impl->EvictedUIResourcesExist() ||
-      impl().input_throttled_until_commit) {
-    // Once we enter NEW_CONTENTS_TAKES_PRIORITY mode, visible tiles on active
-    // tree might be freed. We need to set RequiresHighResToDraw to ensure that
-    // high res tiles will be required to activate pending tree.
-    impl().layer_tree_host_impl->SetRequiresHighResToDraw();
-    priority = NEW_CONTENT_TAKES_PRIORITY;
-  }
-
-  impl().layer_tree_host_impl->SetTreePriority(priority);
-
-  // Only put the scheduler in impl latency prioritization mode if we don't
-  // have a scroll listener. This gives the scroll listener a better chance of
-  // handling scroll updates within the same frame. The tree itself is still
-  // kept in prefer smoothness mode to allow checkerboarding.
-  impl().scheduler->SetImplLatencyTakesPriority(
-      priority == SMOOTHNESS_TAKES_PRIORITY &&
-      !impl().layer_tree_host_impl->scroll_affects_scroll_handler());
-
-  // Notify the the client of this compositor via the output surface.
-  // TODO(epenner): Route this to compositor-thread instead of output-surface
-  // after GTFO refactor of compositor-thread (http://crbug/170828).
-  if (impl().layer_tree_host_impl->output_surface()) {
-    impl()
-        .layer_tree_host_impl->output_surface()
-        ->UpdateSmoothnessTakesPriority(priority == SMOOTHNESS_TAKES_PRIORITY);
-  }
-}
-
-void ThreadProxy::PostDelayedAnimationTaskOnImplThread(
-    const base::Closure& task,
-    base::TimeDelta delay) {
-  Proxy::ImplThreadTaskRunner()->PostDelayedTask(FROM_HERE, task, delay);
-}
-
-void ThreadProxy::DidActivateSyncTree() {
-  TRACE_EVENT0("cc", "ThreadProxy::DidActivateSyncTreeOnImplThread");
-  DCHECK(IsImplThread());
-
-  if (impl().next_commit_waits_for_activation) {
-    TRACE_EVENT_INSTANT0(
-        "cc", "ReleaseCommitbyActivation", TRACE_EVENT_SCOPE_THREAD);
-    DCHECK(impl().commit_completion_event);
-    impl().commit_completion_event->Signal();
-    impl().commit_completion_event = nullptr;
-    impl().next_commit_waits_for_activation = false;
-  }
-
-  impl().last_processed_begin_main_frame_args =
-      impl().last_begin_main_frame_args;
-}
-
-void ThreadProxy::WillPrepareTiles() {
-  DCHECK(IsImplThread());
-  impl().scheduler->WillPrepareTiles();
-}
-
-void ThreadProxy::DidPrepareTiles() {
-  DCHECK(IsImplThread());
-  impl().scheduler->DidPrepareTiles();
-}
-
-void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() {
-  DCHECK(IsImplThread());
-  impl().channel_impl->DidCompletePageScaleAnimation();
-}
-
-void ThreadProxy::OnDrawForOutputSurface() {
-  DCHECK(IsImplThread());
-  impl().scheduler->OnDrawForOutputSurface();
-}
-
-void ThreadProxy::UpdateTopControlsState(TopControlsState constraints,
-                                         TopControlsState current,
-                                         bool animate) {
-  main().channel_main->UpdateTopControlsStateOnImpl(constraints, current,
-                                                    animate);
-}
-
-void ThreadProxy::UpdateTopControlsStateOnImpl(TopControlsState constraints,
-                                               TopControlsState current,
-                                               bool animate) {
-  DCHECK(IsImplThread());
-  impl().layer_tree_host_impl->top_controls_manager()->UpdateTopControlsState(
-      constraints, current, animate);
-}
-
-void ThreadProxy::PostFrameTimingEventsOnImplThread(
-    scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
-    scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) {
-  DCHECK(IsImplThread());
-  impl().channel_impl->PostFrameTimingEventsOnMain(composite_events.Pass(),
-                                                   main_frame_events.Pass());
-}
-
-void ThreadProxy::PostFrameTimingEventsOnMain(
-    scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
-    scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) {
-  DCHECK(IsMainThread());
-  main().layer_tree_host->RecordFrameTimingEvents(composite_events.Pass(),
-                                                  main_frame_events.Pass());
-}
-
-base::WeakPtr<ProxyMain> ThreadProxy::GetMainWeakPtr() {
-  return main_thread_weak_ptr_;
-}
-
-base::WeakPtr<ProxyImpl> ThreadProxy::GetImplWeakPtr() {
-  return impl_thread_weak_ptr_;
-}
-
-}  // namespace cc