cc: Delete channel abstraction between proxies.

cc/trees/proxy_impl.h

 // Copyright 2015 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.
 
 #ifndef CC_TREES_PROXY_IMPL_H_
 #define CC_TREES_PROXY_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "cc/base/completion_event.h"
 #include "cc/base/delayed_unique_notifier.h"
 #include "cc/input/browser_controls_state.h"
 #include "cc/scheduler/scheduler.h"
-#include "cc/trees/channel_impl.h"
 #include "cc/trees/layer_tree_host_impl.h"
 
 namespace cc {
 class LayerTreeHostInProcess;
+class ProxyMain;
 
 // This class aggregates all the interactions that the main side of the
-// compositor needs to have with the impl side. It is created and owned by the
-// ChannelImpl implementation. The class lives entirely on the impl thread.
+// compositor needs to have with the impl side.
+// The class is created and lives on the impl thread.
 class CC_EXPORT ProxyImpl : public NON_EXPORTED_BASE(LayerTreeHostImplClient),
                             public NON_EXPORTED_BASE(SchedulerClient) {
  public:
-  ProxyImpl(ChannelImpl* channel_impl,
+  ProxyImpl(base::WeakPtr<ProxyMain> proxy_main_weak_ptr,
             LayerTreeHostInProcess* layer_tree_host,
             TaskRunnerProvider* task_runner_provider);
   ~ProxyImpl() override;
 
-  // Virtual for testing.
   void UpdateBrowserControlsStateOnImpl(BrowserControlsState constraints,
                                         BrowserControlsState current,
                                         bool animate);
   void InitializeCompositorFrameSinkOnImpl(
       CompositorFrameSink* compositor_frame_sink);
   void InitializeMutatorOnImpl(std::unique_ptr<LayerTreeMutator> mutator);
   void MainThreadHasStoppedFlingingOnImpl();
   void SetInputThrottledUntilCommitOnImpl(bool is_throttled);
   void SetDeferCommitsOnImpl(bool defer_commits) const;
   void SetNeedsRedrawOnImpl(const gfx::Rect& damage_rect);
@@ skipping 58 matching lines @@
   void ScheduledActionActivateSyncTree() override;
   void ScheduledActionBeginCompositorFrameSinkCreation() override;
   void ScheduledActionPrepareTiles() override;
   void ScheduledActionInvalidateCompositorFrameSink() override;
   void SendBeginMainFrameNotExpectedSoon() override;
 
   DrawResult DrawInternal(bool forced_draw);
 
   bool IsImplThread() const;
   bool IsMainThreadBlocked() const;
+  base::SingleThreadTaskRunner* MainThreadTaskRunner();
 
   const int layer_tree_host_id_;
 
   std::unique_ptr<Scheduler> scheduler_;
 
   // Set when the main thread is waiting on a pending tree activation.
   bool commit_completion_waits_for_activation_;
 
   // Set when the main thread is waiting on a commit to complete.
   CompletionEvent* commit_completion_event_;
 
   // Set when the main thread is waiting for activation to complete.
   CompletionEvent* activation_completion_event_;
 
   // Set when the next draw should post DidCommitAndDrawFrame to the main
   // thread.
   bool next_frame_is_newly_committed_frame_;
 
   bool inside_draw_;
   bool input_throttled_until_commit_;
 
   TaskRunnerProvider* task_runner_provider_;
 
   DelayedUniqueNotifier smoothness_priority_expiration_notifier_;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
 
   std::unique_ptr<LayerTreeHostImpl> layer_tree_host_impl_;
 
-  ChannelImpl* channel_impl_;
-
   // Use accessors instead of this variable directly.
   BlockedMainCommitOnly main_thread_blocked_commit_vars_unsafe_;
   BlockedMainCommitOnly& blocked_main_commit();
 
+  // Used to post tasks to ProxyMain on the main thread.
+  base::WeakPtr<ProxyMain> proxy_main_weak_ptr_;
+
   DISALLOW_COPY_AND_ASSIGN(ProxyImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_IMPL_H_