Index: cc/tree_synchronizer.cc |
diff --git a/cc/tree_synchronizer.cc b/cc/tree_synchronizer.cc |
index 8c3a3700a8cdc31bb350fbfe69d1e1564709c356..cf0b0378bc74044ef806d56ee021ea56363a4e49 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 an invalid scrollLayerId, but they are |
+ // managed by LayerTreeImpl and not LayerImpl, so should not be |
+ // processed here. |
+ if (!scrollbarLayer || (scrollbarLayer->scrollLayerId() == Layer::s_invalidLayerId)) |
return; |
RawPtrLayerImplMap::const_iterator iter = newLayers.find(scrollbarLayer->id()); |