Add a path to use CALayers to display content

content/browser/renderer_host/render_widget_host_view_mac.h

Index: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 3b98f255b8f32c333d3a18090d584378e570218d..e42be0f4fe22d2725901eba6f0c10e44ebb80fc6 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -31,6 +31,7 @@ class RenderWidgetHostViewMac;
 class RenderWidgetHostViewMacEditCommandHelper;
 }
 
+@class CompositingIOSurfaceLayer;
 @class FullscreenWindowManager;
 @protocol RenderWidgetHostViewMacDelegate;
 @class ToolTip;
@@ -147,6 +148,8 @@ class RenderWidgetHostViewMacEditCommandHelper;
   // flash fullscreen code to avoid sending a key up event without a matching
   // key down event.
   BOOL suppressNextEscapeKeyUp_;
+
+  scoped_nsobject<CALayer> softwareLayer_;
 }
 
 @property(nonatomic, readonly) NSRange selectedRange;
@@ -391,11 +394,15 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
   ui::TextInputType text_input_type_;
   bool can_compose_inline_;
 
+  scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_;
   scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_;
 
   // Whether to allow overlapping views.
   bool allow_overlapping_views_;
 
+  // Used to test the CoreAnimation path.

[Avi (use Gerrit), 2013/05/31 23:59:58]

// Whether to use the CoreAnimation path.

[ccameron, 2013/06/01 00:29:45]

Done.

+  bool use_core_animation_;
+
   NSWindow* pepper_fullscreen_window() const {
     return pepper_fullscreen_window_;
   }
@@ -412,6 +419,10 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
 
   int window_number() const;
 
+  float scale_factor() const;
+
+  bool is_hidden() const { return is_hidden_; }
+
  private:
   friend class RenderWidgetHostView;
   friend class RenderWidgetHostViewMacTest;