Plumb PinchVirtualViewport layers into CC.

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index ec047de79e75121b1b95846b05ac1568eb7a7a72..82b96ee734158765b23681b5feef1a7f8e1997c0 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -489,6 +489,26 @@ void RenderWidgetCompositor::registerForAnimations(WebKit::WebLayer* layer) {
       layer_tree_host_->animation_registrar());
 }
 
+void RenderWidgetCompositor::registerViewportLayers(
+    const WebKit::WebLayer* pageScaleLayer,
+    const WebKit::WebLayer* innerViewportScrollLayer,
+    const WebKit::WebLayer* outerViewportScrollLayer) {
+  layer_tree_host_->RegisterViewportLayers(
+      static_cast<const webkit::WebLayerImpl*>(pageScaleLayer)->layer(),
+      static_cast<const webkit::WebLayerImpl*>(
+          innerViewportScrollLayer)->layer(),
+      // The outer viewport layer will only exist when using pinch.

[enne (OOO), 2013/09/12 18:57:02]

pinch => pinch virtual viewports

[wjmaclean, 2013/09/12 19:06:17]

Done.

+      outerViewportScrollLayer ? static_cast<const webkit::WebLayerImpl*>(
+                                     outerViewportScrollLayer)->layer()
+                               : 0);

[enne (OOO), 2013/09/12 18:57:02]

0 => NULL

[wjmaclean, 2013/09/12 19:06:17]

Done.

+}
+
+void RenderWidgetCompositor::clearViewportLayers() {
+  layer_tree_host_->RegisterViewportLayers(scoped_refptr<cc::Layer>(),
+                                           scoped_refptr<cc::Layer>(),
+                                           scoped_refptr<cc::Layer>());
+}
+
 bool RenderWidgetCompositor::compositeAndReadback(
     void *pixels, const WebRect& rect_in_device_viewport) {
   return layer_tree_host_->CompositeAndReadback(pixels,