Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars.

cc/tree_synchronizer.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/tree_synchronizer.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/layer.h"
 #include "cc/layer_impl.h"
@@ skipping 97 matching lines @@
 template <typename LayerType, typename ScrollbarLayerType>
 void updateScrollbarLayerPointersRecursiveInternal(const RawPtrLayerImplMap& newLayers, LayerType* layer)
 {
     if (!layer)
         return;
 
     for (size_t i = 0; i < layer->children().size(); ++i)
         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 it manages layer ids) instead
of just using -1?

[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());
     ScrollbarLayerImpl* scrollbarLayerImpl = iter != newLayers.end() ? static_cast<ScrollbarLayerImpl*>(iter->second) : NULL;
     iter = newLayers.find(scrollbarLayer->scrollLayerId());
     LayerImpl* scrollLayerImpl = iter != newLayers.end() ? iter->second : NULL;
 
     DCHECK(scrollbarLayerImpl);
     DCHECK(scrollLayerImpl);
 
@@ skipping 40 matching lines @@
     pushPropertiesInternal(layer, layerImpl);
 }
 
 void TreeSynchronizer::pushProperties(LayerImpl* layer, LayerImpl* layerImpl)
 {
     pushPropertiesInternal(layer, layerImpl);
 }
 
 
 }  // namespace cc