Send compositor frame IPC with metadata.

cc/layer_tree_host_impl.cc

 // Copyright 2011 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.
 
 #include "cc/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #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"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/math_util.h"
 #include "cc/overdraw_metrics.h"
 #include "cc/page_scale_animation.h"
 #include "cc/prioritized_resource_manager.h"
@@ skipping 833 matching lines @@
 
     // TODO(piman): We may need to do some validation on this ack before processing it.
     m_renderer->receiveCompositorFrameAck(ack);
 }
 
 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");
     DCHECK(canDraw());
     DCHECK(!frame.renderPasses.empty());
 
     // FIXME: use the frame begin time from the overall compositor scheduler.
     // This value is currently inaccessible because it is up in Chromium's
     // RenderWidget.
     m_fpsCounter->markBeginningOfFrame(base::TimeTicks::Now());
 
     if (m_debugState.showHudRects())
         m_debugRectHistory->saveDebugRectsForCurrentFrame(rootLayer(), *frame.renderSurfaceLayerList, frame.occludingScreenSpaceRects, frame.nonOccludingScreenSpaceRects, m_debugState);
 
     // Because the contents of the HUD depend on everything else in the frame, the contents
     // of its texture are updated as the last thing before the frame is drawn.
     if (m_activeTree->hud_layer())
         m_activeTree->hud_layer()->updateHudTexture(m_resourceProvider.get());
 
     m_renderer->drawFrame(frame.renderPasses, frame.renderPassesById);
 
     // The render passes should be consumed by the renderer.
     DCHECK(frame.renderPasses.empty());
     DCHECK(frame.renderPassesById.empty());
 
     // The next frame should start by assuming nothing has changed, and changes are noted as they occur.
     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)
 {
     for (size_t i = 0; i < frame.willDrawLayers.size(); ++i)
         frame.willDrawLayers[i]->didDraw(m_resourceProvider.get());
 
     // Once all layers have been drawn, pending texture uploads should no
     // longer block future uploads.
     m_resourceProvider->markPendingUploadsAsNonBlocking();
@@ skipping 813 matching lines @@
     ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimationController();
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
     if (scrollbarController && scrollbarController->animate(monotonicTime))
         m_client->setNeedsRedrawOnImplThread();
 
     for (size_t i = 0; i < layer->children().size(); ++i)
         animateScrollbarsRecursive(layer->children()[i], time);
 }
 
 }  // namespace cc