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

Unified Diff: cc/thread_proxy.cc

Issue 12093015: Move page scale ownership to LayerTreeImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@coordchange3
Patch Set: 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
« cc/layer_tree_impl.cc ('K') | « cc/pinch_zoom_viewport.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/thread_proxy.cc
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index 7d7678684ab2294f2ff9134796ce331d71e120d9..fa7f287a17120b636a5fdfbb58732fff99ecf703 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -564,7 +564,7 @@ void ThreadProxy::scheduledActionBeginFrame()
scoped_ptr<BeginFrameAndCommitState> beginFrameState(new BeginFrameAndCommitState);
beginFrameState->monotonicFrameBeginTime = base::TimeTicks::Now();
beginFrameState->scrollInfo = m_layerTreeHostImpl->processScrollDeltas();
- beginFrameState->implTransform = m_layerTreeHostImpl->implTransform();
+ beginFrameState->implTransform = m_layerTreeHostImpl->activeTree()->ImplTransform();
DCHECK_GT(m_layerTreeHostImpl->memoryAllocationLimitBytes(), 0u);
beginFrameState->memoryAllocationLimitBytes = m_layerTreeHostImpl->memoryAllocationLimitBytes();
Proxy::mainThread()->postTask(base::Bind(&ThreadProxy::beginFrame, m_mainThreadWeakPtr, base::Passed(&beginFrameState)));
« cc/layer_tree_impl.cc ('K') | « cc/pinch_zoom_viewport.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698