sync compositor: Move DeliverMessages to OutputSurface

content/renderer/android/synchronous_compositor_output_surface.h

 // Copyright 2013 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 CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <stddef.h>
 
 #include <memory>
-#include <vector>
 
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface.h"
@@ skipping 11 matching lines @@
 }
 
 namespace content {
 
 class FrameSwapMessageQueue;
 class SynchronousCompositorRegistry;
 class WebGraphicsContext3DCommandBufferImpl;
 
 class SynchronousCompositorOutputSurfaceClient {
  public:
+  virtual void DidActivatePendingTree() = 0;
   virtual void Invalidate() = 0;
   virtual void SwapBuffers(uint32_t output_surface_id,
                            cc::CompositorFrame* frame) = 0;
 
  protected:
   virtual ~SynchronousCompositorOutputSurfaceClient() {}
 };
 
 // Specialization of the output surface that adapts it to implement the
 // content::SynchronousCompositor public API. This class effects an "inversion
@@ skipping 28 matching lines @@
   void Invalidate() override;
 
   // Partial SynchronousCompositor API implementation.
   void DemandDrawHw(const gfx::Size& surface_size,
                     const gfx::Transform& transform,
                     const gfx::Rect& viewport,
                     const gfx::Rect& clip,
                     const gfx::Rect& viewport_rect_for_tile_priority,
                     const gfx::Transform& transform_for_tile_priority);
   void DemandDrawSw(SkCanvas* canvas);
-  void SetTreeActivationCallback(const base::Closure& callback);
-  void GetMessagesToDeliver(
-      std::vector<std::unique_ptr<IPC::Message>>* messages);
 
  private:
   class SoftwareDevice;
   friend class SoftwareDevice;
 
   void InvokeComposite(const gfx::Transform& transform,
                        const gfx::Rect& viewport,
                        const gfx::Rect& clip,
                        bool hardware_draw);
   bool Send(IPC::Message* message);
+  void DidActivatePendingTree();
+  void DeliverMessages();
   bool CalledOnValidThread() const;
 
   void CancelFallbackTick();
   void FallbackTickFired();
 
   // IPC handlers.
   void SetMemoryPolicy(size_t bytes_limit);
   void OnReclaimResources(uint32_t output_surface_id,
                           const cc::CompositorFrameAck& ack);
 
@@ skipping 18 matching lines @@
   bool fallback_tick_running_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_