Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1348)

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11316128: Send compositor frame IPC with metadata. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix compile errors on mac/win Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_tree_host_impl.h ('k') | cc/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index e7874b66876abe4d2bc36bb9462bd36a68f3e419..740c361935199ca9b78617a1adece1e59db96d12 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -10,6 +10,7 @@
#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"
@@ -881,6 +882,26 @@ void LayerTreeHostImpl::OnCanDrawStateChangedForTree(LayerTreeImpl*)
m_client->onCanDrawStateChanged(canDraw());
}
+CompositorFrameMetadata LayerTreeHostImpl::makeCompositorFrameMetadata() const
+{
+ if (!rootScrollLayer())
+ return CompositorFrameMetadata();
+
+ CompositorFrameMetadata metadata;
+ 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");
@@ -1064,7 +1085,7 @@ bool LayerTreeHostImpl::initializeRenderer(scoped_ptr<OutputSurface> outputSurfa
if (outputSurface->Capabilities().has_parent_compositor)
m_renderer = DelegatingRenderer::Create(this, resourceProvider.get());
else if (outputSurface->Context3D())
- m_renderer = GLRenderer::create(this, resourceProvider.get());
+ m_renderer = GLRenderer::create(this, outputSurface.get(), resourceProvider.get());
else if (outputSurface->SoftwareDevice())
m_renderer = SoftwareRenderer::create(this, resourceProvider.get(), outputSurface->SoftwareDevice());
if (!m_renderer)
« no previous file with comments | « cc/layer_tree_host_impl.h ('k') | cc/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698