Send compositor frame IPC with metadata.

cc/layer_tree_host_impl.cc

Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 89ebddeeb352afe939c941302827e0f38806e56a..70c84a6491ffb37adb5f3094633d0f4cb43b4a99 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -10,11 +10,13 @@
 #include "base/debug/trace_event.h"
 #include "base/json/json_writer.h"
 #include "cc/append_quads_data.h"
+#include "cc/compositor_frame_metadata.h"
 #include "cc/damage_tracker.h"
 #include "cc/debug_rect_history.h"
 #include "cc/delay_based_time_source.h"
 #include "cc/delegating_renderer.h"
 #include "cc/frame_rate_counter.h"
+#include "cc/gl_compositor_frame.h"
 #include "cc/gl_renderer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer_iterator.h"
@@ -868,6 +870,26 @@ void LayerTreeHostImpl::OnCanDrawStateChangedForTree(LayerTreeImpl*)
     m_client->onCanDrawStateChanged(canDraw());
 }
 
+CompositorFrameMetadata LayerTreeHostImpl::makeCompositorFrameMetadata() const
+{
+    if (!rootScrollLayer())
+      return CompositorFrameMetadata();

[piman, 2012/12/14 22:02:22]

nit: (I know it sucks) consistency for indents? +4 here since we're still using
webkit style

[aelias_OOO_until_Jul13, 2012/12/15 00:06:17]

Done.

+
+    CompositorFrameMetadata metadata;

[danakj, 2012/12/14 22:23:34]

How about making a constructor that takes all these parameters so the compiler
can make sure we're setting everything?

+    metadata.root_scroll_offset = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();
+    metadata.page_scale_factor = m_pinchZoomViewport.totalPageScaleFactor();
+    metadata.viewport_size = m_pinchZoomViewport.bounds().size();
+    metadata.root_layer_size = rootScrollLayer()->bounds();
+    metadata.min_page_scale_factor = m_pinchZoomViewport.minPageScaleFactor();
+    metadata.max_page_scale_factor = m_pinchZoomViewport.maxPageScaleFactor();
+    if (!m_settings.pageScalePinchZoomEnabled) {
+        metadata.root_scroll_offset.Scale(1 / m_pinchZoomViewport.pageScaleFactor());
+        metadata.root_layer_size.Scale(1 / m_pinchZoomViewport.pageScaleFactor());
+    }
+
+    return metadata;
+}
+
 void LayerTreeHostImpl::drawLayers(FrameData& frame)
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::drawLayers");
@@ -897,6 +919,12 @@ void LayerTreeHostImpl::drawLayers(FrameData& frame)
     for (unsigned int i = 0; i < frame.renderSurfaceLayerList->size(); i++)
         (*frame.renderSurfaceLayerList)[i]->renderSurface()->damageTracker()->didDrawDamagedArea();
     rootLayer()->resetAllChangeTrackingForSubtree();
+
+    if (settings().compositorFrameMessage && outputSurface()->Context3D()) {

[piman, 2012/12/14 22:02:22]

Shouldn't this happen in GLRenderer::drawFrame instead?

[aelias_OOO_until_Jul13, 2012/12/15 00:06:17]

Done.  I gave the GLRenderer an OutputSurface in the constructor to do this.

+        GLCompositorFrame compositor_frame;
+        compositor_frame.metadata = makeCompositorFrameMetadata();
+        outputSurface()->SendFrameToParentCompositor(compositor_frame);
+    }
 }
 
 void LayerTreeHostImpl::didDrawAllLayers(const FrameData& frame)