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

Unified Diff: cc/tree_synchronizer.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: Rebase to fix collision with solid colour scrollbars patch. 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
« no previous file with comments | « cc/scrollbar_layer_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tree_synchronizer.cc
diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc
index ecae10d776a58d792f39b737540620c6fdc49fb5..4f511de8e216d69f8e57ce8d21d3698621e1ed15 100644
--- a/cc/tree_synchronizer.cc
+++ b/cc/tree_synchronizer.cc
@@ -148,7 +148,11 @@ void UpdateScrollbarLayerPointersRecursiveInternal(
}
ScrollbarLayerType* scrollbar_layer = layer->ToScrollbarLayer();
- if (!scrollbar_layer)
+ // Pinch-zoom scrollbars will have an invalid scrollLayerId, but they are
+ // managed by LayerTreeImpl and not LayerImpl, so should not be
+ // processed here.
+ if (!scrollbar_layer || (scrollbar_layer->scroll_layer_id() ==
+ Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID))
return;
RawPtrLayerImplMap::const_iterator iter =
« no previous file with comments | « cc/scrollbar_layer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698