Split ThreadProxy methods to ProxyMain and ProxyImpl.

cc/trees/threaded_channel.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_THREADED_CHANNEL_H_
 #define CC_TREES_THREADED_CHANNEL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ skipping 59 matching lines @@
       // and set ProxyImpl.
       ThreadProxy* thread_proxy,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
 
   ~ThreadedChannel() override;
 
   // ChannelMain Implementation
   void SetThrottleFrameProductionOnImpl(bool throttle) override;
   void SetLayerTreeHostClientReadyOnImpl() override;
+  void InitializeOutputSurfaceOnImpl(OutputSurface* output_surface) override;
+  void MainThreadHasStoppedFlingingOnImpl() override;
+  void SetInputThrottledUntilCommitOnImpl(bool is_throttled) override;
+  void SetDeferCommitsOnImpl(bool defer_commits) override;
+
+  // Blocking calls to ProxyImpl
+  void FinishAllRenderingOnImpl() override;
+  void SetVisibleOnImpl(bool visible) override;
+  void ReleaseOutputSurfaceOnImpl() override;
+  void FinishGLOnImpl() override;
+  void MainFrameWillHappenOnImplForTesting(
+      bool* main_frame_will_happen) override;
 
   // ChannelImpl Implementation
   void DidCompleteSwapBuffers() override;
+  void SetRendererCapabilitiesMainCopy(
+      const RendererCapabilities& capabilities) override;
+  void BeginMainFrameNotExpectedSoon() override;
+  void DidCommitAndDrawFrame() override;
+  void SetAnimationEvents(scoped_ptr<AnimationEventsVector> queue) override;
+  void DidLoseOutputSurface() override;
+  void RequestNewOutputSurface() override;
+  void DidInitializeOutputSurface(
+      bool success,
+      const RendererCapabilities& capabilities) override;
+  void DidCompletePageScaleAnimation() override;
+  void PostFrameTimingEventsToMain(

[David Trainor- moved to gerrit, 2015/09/30 14:44:56]

ToMain -> OnMain?

[Khushal, 2015/09/30 15:26:34]

Done.

+      scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events,
+      scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events)
+      override;
+
+  // TODO(khushalsagar): Remove this. Temporary method to create the weak
+  // pointer on the impl thread
+  void InitImplThreadWeakPtr();
+  void InvalidateImplThreadWeakPtr();
 
  protected:
   ThreadedChannel(ThreadProxy* thread_proxy,
                   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
                   scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
 
  private:
   base::SingleThreadTaskRunner* MainThreadTaskRunner() const;
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() const;
 
+  void BlockingFinishAllRenderingOnImpl(CompletionEvent* completion);
+  void BlockingSetVisibleOnImpl(CompletionEvent* completion, bool visible);
+  void BlockingReleaseOutputSurfaceOnImpl(CompletionEvent* completion);
+  void BlockingFinishGLOnImpl(CompletionEvent* completion);
+  void BlockingMainFrameWillHappenOnImplForTesting(
+      CompletionEvent* completion,
+      bool* main_frame_will_happen);
+
   ProxyMain* proxy_main_;
 
   ProxyImpl* proxy_impl_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
 
+  // TODO(khushalsagar): Initialize this in ThreadedChannel when ChannelImpl
+  // gets initialization call.
+  base::WeakPtr<ThreadedChannel> impl_thread_weak_ptr_;
+
+  base::WeakPtrFactory<ThreadedChannel> impl_weak_factory_;

[David Trainor- moved to gerrit, 2015/09/30 14:44:57]

Will we still store the weak factory here in the future?

[Khushal, 2015/09/30 15:26:34]

Yes. We can probably have an accessor for this to DCHECK that it is used to
initialize and invalidate the impl_thread_weak_ptr_ on the impl thread.

+
   DISALLOW_COPY_AND_ASSIGN(ThreadedChannel);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_THREADED_CHANNEL_H_