Move VISUAL_STATE promise to activation

content/renderer/render_widget.h

 // Copyright (c) 2012 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_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 51 matching lines @@
 class WebMouseEvent;
 class WebNode;
 struct WebPoint;
 class WebTouchEvent;
 class WebView;
 }
 
 namespace cc {
 struct InputHandlerScrollResult;
 class OutputSurface;
-class SwapPromise;
+class Promise;
 }
 
 namespace gfx {
 class Range;
 }
 
 namespace content {
 class CompositorDependencies;
 class ExternalPopupMenu;
-class FrameSwapMessageQueue;
+class FrameUpdateMessageQueue;
 class PepperPluginInstanceImpl;
 class RenderFrameImpl;
 class RenderFrameProxy;
 class RenderWidgetCompositor;
 class RenderWidgetTest;
 class ResizingModeSelector;
 struct ContextMenuParams;
 struct WebPluginGeometry;
 
 // RenderWidget provides a communication bridge between a WebWidget and
@@ skipping 396 matching lines @@
 
   void WillToggleFullscreen();
   void DidToggleFullscreen();
 
   bool next_paint_is_resize_ack() const;
   void set_next_paint_is_resize_ack();
   void set_next_paint_is_repaint_ack();
 
   // QueueMessage implementation extracted into a static method for easy
   // testing.
-  static scoped_ptr<cc::SwapPromise> QueueMessageImpl(
+  static scoped_ptr<cc::Promise> QueueMessageImpl(
       IPC::Message* msg,
       MessageDeliveryPolicy policy,
-      FrameSwapMessageQueue* frame_swap_message_queue,
+      FrameUpdateMessageQueue* frame_update_message_queue,
       scoped_refptr<IPC::SyncMessageFilter> sync_message_filter,
       int source_frame_number);
 
   // Override point to obtain that the current input method state and caret
   // position.
   virtual ui::TextInputType GetTextInputType();
   virtual ui::TextInputType WebKitToUiTextInputType(
       blink::WebTextInputType type);
 
   // Override point to obtain that the current composition character bounds.
@@ skipping 273 matching lines @@
 #endif
 
   scoped_ptr<ScreenMetricsEmulator> screen_metrics_emulator_;
 
   // Popups may be displaced when screen metrics emulation is enabled.
   // These values are used to properly adjust popup position.
   gfx::PointF popup_view_origin_for_emulation_;
   gfx::PointF popup_screen_origin_for_emulation_;
   float popup_origin_scale_for_emulation_;
 
-  scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+  scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue_;
   scoped_ptr<ResizingModeSelector> resizing_mode_selector_;
 
   // Lists of RenderFrameProxy objects that need to be notified of
   // compositing-related events (e.g. DidCommitCompositorFrame).
   ObserverList<RenderFrameProxy> render_frame_proxies_;
 #if defined(VIDEO_HOLE)
   ObserverList<RenderFrameImpl> video_hole_frames_;
 #endif  // defined(VIDEO_HOLE)
 
   // A list of RenderFrames associated with this RenderWidget. Notifications
   // are sent to each frame in the list for events such as changing
   // visibility state for example.
   ObserverList<RenderFrameImpl> render_frames_;
 
   ui::MenuSourceType context_menu_source_type_;
   bool has_host_context_menu_location_;
   gfx::Point host_context_menu_location_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_