sync compositor: Move DeliverMessages to OutputSurface

content/renderer/android/synchronous_compositor_proxy.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 CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 49 matching lines @@
                             const gfx::ScrollOffset& max_scroll_offset,
                             const gfx::SizeF& scrollable_size,
                             float page_scale_factor,
                             float min_page_scale_factor,
                             float max_page_scale_factor) override;
 
   // SynchronousCompositorExternalBeginFrameSourceClient overrides.
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
 
   // SynchronousCompositorOutputSurfaceClient overrides.
+  void DidActivatePendingTree() override;
   void Invalidate() override;
   void SwapBuffers(uint32_t output_surface_id,
                    cc::CompositorFrame* frame) override;
 
   void SetOutputSurface(SynchronousCompositorOutputSurface* output_surface);
   void OnMessageReceived(const IPC::Message& message);
   bool Send(IPC::Message* message);
   void DidOverscroll(const DidOverscrollParams& did_overscroll_params);
 
  private:
@@ skipping 35 matching lines @@
 
   void SwapBuffersHw(uint32_t output_surface_id, cc::CompositorFrame* frame);
   void SendDemandDrawHwReply(cc::CompositorFrame* frame,
                              uint32_t output_surface_id,
                              IPC::Message* reply_message);
   void DoDemandDrawSw(const SyncCompositorDemandDrawSwParams& params);
   void SwapBuffersSw(cc::CompositorFrame* frame);
   void SendDemandDrawSwReply(bool success,
                              cc::CompositorFrame* frame,
                              IPC::Message* reply_message);
-  void DidActivatePendingTree();
-  void DeliverMessages();
   void SendAsyncRendererStateIfNeeded();
 
   const int routing_id_;
   IPC::Sender* const sender_;
   SynchronousCompositorExternalBeginFrameSource* const begin_frame_source_;
   ui::SynchronousInputHandlerProxy* const input_handler_proxy_;
   InputHandlerManagerClient::Handler* const input_handler_;
   const bool use_in_process_zero_copy_software_draw_;
   SynchronousCompositorOutputSurface* output_surface_;
   bool inside_receive_;
@@ skipping 15 matching lines @@
   uint32_t need_invalidate_count_;
   bool need_begin_frame_;
   uint32_t did_activate_pending_tree_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_