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

Unified Diff: cc/layer_tree_host.cc

Issue 12093015: Move page scale ownership to LayerTreeImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@coordchange3
Patch Set: Rebase to 179503 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
« no previous file with comments | « cc/cc.gyp ('k') | cc/layer_tree_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 9386699d42d4b2aa84fb560332e621d5c45565aa..a6e2a76179913ae4edee0ed72f7d5a19e2aae2b5 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -299,6 +299,23 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl)
syncTree->FindRootScrollLayer();
+ float page_scale_delta, sent_page_scale_delta;
+ if (m_settings.implSidePainting) {
+ // Update the delta from the active tree, which may have
+ // adjusted its delta prior to the pending tree being created.
+ // This code is equivalent to that in LayerTreeImpl::SetPageScaleDelta.
+ DCHECK_EQ(1, syncTree->sent_page_scale_delta());
+ page_scale_delta = hostImpl->activeTree()->page_scale_delta();
+ sent_page_scale_delta = hostImpl->activeTree()->sent_page_scale_delta();
+ } else {
+ page_scale_delta = syncTree->page_scale_delta();
+ sent_page_scale_delta = syncTree->sent_page_scale_delta();
+ syncTree->set_sent_page_scale_delta(1);
+ }
+
+ syncTree->SetPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
+ syncTree->SetPageScaleDelta(page_scale_delta / sent_page_scale_delta);
+
if (!m_settings.implSidePainting) {
// If we're not in impl-side painting, the tree is immediately
// considered active.
@@ -307,7 +324,6 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl)
hostImpl->setViewportSize(layoutViewportSize(), deviceViewportSize());
hostImpl->setDeviceScaleFactor(deviceScaleFactor());
- hostImpl->setPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
hostImpl->setDebugState(m_debugState);
hostImpl->savePaintTime(m_renderingStats.totalPaintTime);
« no previous file with comments | « cc/cc.gyp ('k') | cc/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698