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

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: Make OpacityIsAnimating() virtual. 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
« cc/scrollbar_layer.cc ('K') | « 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 dfea08e082e103289c90e7c2cf39cca18c717e21..e7652b02957c31426f6bb25197dbf8412a9462a8 100644
--- a/cc/tree_synchronizer.cc
+++ b/cc/tree_synchronizer.cc
@@ -115,7 +115,10 @@ void updateScrollbarLayerPointersRecursiveInternal(const RawPtrLayerImplMap& new
updateScrollbarLayerPointersRecursiveInternal<LayerType, ScrollbarLayerType>(newLayers, layer->child_at(i));
ScrollbarLayerType* scrollbarLayer = layer->ToScrollbarLayer();
- if (!scrollbarLayer)
+ // Pinch-zoom scrollbars will have an invalid scrollLayerId, but they are
+ // managed by LayerTreeImpl and not LayerImpl, so should not be
+ // processed here.
+ if (!scrollbarLayer || (scrollbarLayer->scroll_layer_id() == Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID))
return;
RawPtrLayerImplMap::const_iterator iter = newLayers.find(scrollbarLayer->id());
« cc/scrollbar_layer.cc ('K') | « cc/scrollbar_layer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698