Move VISUAL_STATE promise to activation

content/browser/android/in_process/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_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 12 matching lines @@
 class ContextProvider;
 class CompositorFrameMetadata;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace content {
 
-class FrameSwapMessageQueue;
+class FrameUpdateMessageQueue;
 class SynchronousCompositorClient;
 class SynchronousCompositorImpl;
 class SynchronousCompositorOutputSurface;
 class WebGraphicsContext3DCommandBufferImpl;
 
 // Specialization of the output surface that adapts it to implement the
 // content::SynchronousCompositor public API. This class effects an "inversion
 // of control" - enabling drawing to be  orchestrated by the embedding
 // layer, instead of driven by the compositor internals - hence it holds two
 // 'client' pointers (|client_| in the OutputSurface baseclass and
 // |delegate_|) which represent the consumers of the two roles in plays.
 // This class can be created only on the main thread, but then becomes pinned
 // to a fixed thread when BindToClient is called.
 class SynchronousCompositorOutputSurface
     : NON_EXPORTED_BASE(public cc::OutputSurface) {
  public:
   SynchronousCompositorOutputSurface(
       const scoped_refptr<cc::ContextProvider>& context_provider,
       const scoped_refptr<cc::ContextProvider>& worker_context_provider,
       int routing_id,
-      scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue);
+      scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue);
   ~SynchronousCompositorOutputSurface() override;
 
   void SetCompositor(SynchronousCompositorImpl* compositor);
 
   // OutputSurface.
   bool BindToClient(cc::OutputSurfaceClient* surface_client) override;
   void Reshape(const gfx::Size& size, float scale_factor) override;
   void SwapBuffers(cc::CompositorFrame* frame) override;
   void Invalidate() override;
 
   // Partial SynchronousCompositor API implementation.
   scoped_ptr<cc::CompositorFrame> DemandDrawHw(
       gfx::Size surface_size,
       const gfx::Transform& transform,
       gfx::Rect viewport,
       gfx::Rect clip,
       gfx::Rect viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority);
   void ReturnResources(const cc::CompositorFrameAck& frame_ack);
   scoped_ptr<cc::CompositorFrame> DemandDrawSw(SkCanvas* canvas);
   void SetMemoryPolicy(size_t bytes_limit);
   void SetTreeActivationCallback(const base::Closure& callback);
-  void GetMessagesToDeliver(ScopedVector<IPC::Message>* messages);
+  void GetSwapMessagesToDeliver(ScopedVector<IPC::Message>* messages);
 
   size_t GetMemoryPolicy() const {
     return memory_policy_.bytes_limit_when_visible;
   }
 
  private:
   class SoftwareDevice;
   friend class SoftwareDevice;
 
   void InvokeComposite(const gfx::Transform& transform,
@@ skipping 16 matching lines @@
   gfx::Rect cached_hw_viewport_rect_for_tile_priority_;
   gfx::Transform cached_hw_transform_for_tile_priority_;
 
   // Only valid (non-NULL) during a DemandDrawSw() call.
   SkCanvas* current_sw_canvas_;
 
   cc::ManagedMemoryPolicy memory_policy_;
 
   scoped_ptr<cc::CompositorFrame> frame_holder_;
 
-  scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+  scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_