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

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11550035: Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate device scale factor, default to 0 totalSize when no root scroll layer. Created 7 years, 9 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 507e35233d988931dda147a16fd5a75dc327b567..51ce55105125b7153c20bfb5fb40557d6ed68a1c 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -1198,6 +1198,7 @@ InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewp
if (layerImpl->tryScroll(deviceViewportPoint, type) == ScrollOnMainThread) {
m_numMainThreadScrolls++;
UMA_HISTOGRAM_BOOLEAN("TryScroll.SlowScroll", true);
+ activeTree()->DidBeginScroll();
return ScrollOnMainThread;
}
@@ -1211,6 +1212,7 @@ InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewp
if (status == ScrollOnMainThread) {
m_numMainThreadScrolls++;
UMA_HISTOGRAM_BOOLEAN("TryScroll.SlowScroll", true);
+ activeTree()->DidBeginScroll();
return ScrollOnMainThread;
}
@@ -1233,6 +1235,7 @@ InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewp
m_numImplThreadScrolls++;
m_client->renewTreePriority();
UMA_HISTOGRAM_BOOLEAN("TryScroll.SlowScroll", false);
+ activeTree()->DidBeginScroll();
return ScrollStarted;
}
return ScrollIgnored;
@@ -1356,6 +1359,7 @@ bool LayerTreeHostImpl::scrollBy(const gfx::Point& viewportPoint,
break;
}
+ activeTree()->DidUpdateScroll();
if (didScroll) {
m_client->setNeedsCommitOnImplThread();
m_client->setNeedsRedrawOnImplThread();
@@ -1375,6 +1379,7 @@ void LayerTreeHostImpl::scrollEnd()
if (m_topControlsManager)
m_topControlsManager->ScrollEnd();
clearCurrentlyScrollingLayer();
+ activeTree()->DidEndScroll();
}
void LayerTreeHostImpl::pinchGestureBegin()

Powered by Google App Engine
This is Rietveld 408576698