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

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: Revised per latest comments. Created 7 years, 10 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/pinch_zoom_scrollbar.cc ('K') | « cc/pinch_zoom_scrollbar_painter.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 8c3a3700a8cdc31bb350fbfe69d1e1564709c356..16af96f92cdccfb9fd03fe80910601d8bd64ad82 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->childAt(i));
ScrollbarLayerType* scrollbarLayer = layer->toScrollbarLayer();
- if (!scrollbarLayer)
+ // Pinch-zoom scrollbars will have a scrollLayerId of -1, but they are
enne (OOO) 2013/03/06 19:32:58 Can you add a named constant to cc::Layer (since i
wjmaclean 2013/03/06 22:36:53 Done.
+ // managed by LayerTreeImpl and not LayerImpl, so should not be
+ // processed here.
+ if (!scrollbarLayer || (scrollbarLayer->scrollLayerId() == -1))
return;
RawPtrLayerImplMap::const_iterator iter = newLayers.find(scrollbarLayer->id());
« cc/pinch_zoom_scrollbar.cc ('K') | « cc/pinch_zoom_scrollbar_painter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698