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

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11777025: cc: Implement DelegatingRender::drawFrame() method. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 years, 11 months 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
Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 3c22180ecf923f86ccf6aed16f3c80d8c8f60075..1ee25c94b388390f96a5ba42d843b1e0dd1de373 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -858,19 +858,20 @@ void LayerTreeHostImpl::OnCanDrawStateChangedForTree(LayerTreeImpl*)
CompositorFrameMetadata LayerTreeHostImpl::makeCompositorFrameMetadata() const
{
- if (!rootScrollLayer())
- return CompositorFrameMetadata();
-
CompositorFrameMetadata metadata;
- metadata.root_scroll_offset = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();
- if (!m_settings.pageScalePinchZoomEnabled)
- metadata.root_scroll_offset.Scale(1 / m_pinchZoomViewport.pageScaleFactor());
metadata.page_scale_factor = m_pinchZoomViewport.totalPageScaleFactor();
metadata.viewport_size = m_pinchZoomViewport.bounds().size();
metadata.root_layer_size = contentSize();
metadata.min_page_scale_factor = m_pinchZoomViewport.minPageScaleFactor();
metadata.max_page_scale_factor = m_pinchZoomViewport.maxPageScaleFactor();
+ if (!rootScrollLayer())
+ return metadata;
+
+ metadata.root_scroll_offset = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();
+ if (!m_settings.pageScalePinchZoomEnabled)
+ metadata.root_scroll_offset.Scale(1 / m_pinchZoomViewport.pageScaleFactor());
+
return metadata;
}
@@ -1075,7 +1076,7 @@ bool LayerTreeHostImpl::initializeRenderer(scoped_ptr<OutputSurface> outputSurfa
m_tileManager.reset(new TileManager(this, resourceProvider.get(), m_settings.numRasterThreads));
if (outputSurface->Capabilities().has_parent_compositor)
- m_renderer = DelegatingRenderer::Create(this, resourceProvider.get());
+ m_renderer = DelegatingRenderer::Create(this, outputSurface.get(), resourceProvider.get());
else if (outputSurface->Context3D())
m_renderer = GLRenderer::create(this, outputSurface.get(), resourceProvider.get());
else if (outputSurface->SoftwareDevice())

Powered by Google App Engine
This is Rietveld 408576698