Move ownership of ChildFrameCompositingHelper from frame to proxy.

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 @@
 namespace cc { class OutputSurface; }
 
 namespace gfx {
 class Range;
 }
 
 namespace content {
 class ExternalPopupMenu;
 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
 // a RenderWidgetHost, the latter of which lives in a different process.
 class CONTENT_EXPORT RenderWidget
     : public IPC::Listener,
@@ skipping 21 matching lines @@
   // Temporary for debugging purposes...
   bool closing() const { return closing_; }
   bool is_swapped_out() { return is_swapped_out_; }
   ui::MenuSourceType context_menu_source_type() {
     return context_menu_source_type_; }
   gfx::Point touch_editing_context_menu_location() {
     return touch_editing_context_menu_location_;
   }
 
   // Functions to track out-of-process frames for special notifications.
-  void RegisterSwappedOutChildFrame(RenderFrameImpl* frame);
-  void UnregisterSwappedOutChildFrame(RenderFrameImpl* frame);
+  void RegisterRenderFrameProxy(RenderFrameProxy* proxy);
+  void UnregisterRenderFrameProxy(RenderFrameProxy* proxy);
 
   // Functions to track all RenderFrame objects associated with this
   // RenderWidget.
   void RegisterRenderFrame(RenderFrameImpl* frame);
   void UnregisterRenderFrame(RenderFrameImpl* frame);
 
 #if defined(VIDEO_HOLE)
   void RegisterVideoHoleFrame(RenderFrameImpl* frame);
   void UnregisterVideoHoleFrame(RenderFrameImpl* frame);
 #endif  // defined(VIDEO_HOLE)
@@ skipping 560 matching lines @@
   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::Point popup_view_origin_for_emulation_;
   gfx::Point popup_screen_origin_for_emulation_;
   float popup_origin_scale_for_emulation_;
 
   scoped_ptr<ResizingModeSelector> resizing_mode_selector_;
 
-  // Lists of swapped out RenderFrames that need to be notified
-  // of compositing-related events (e.g. DidCommitCompositorFrame).
-  ObserverList<RenderFrameImpl> swapped_out_frames_;
+  // 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_;
   gfx::Point touch_editing_context_menu_location_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_