diff options
Diffstat (limited to 'mojo/services/html_viewer/weblayertreeview_impl.cc')
| -rw-r--r-- | mojo/services/html_viewer/weblayertreeview_impl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.cc b/mojo/services/html_viewer/weblayertreeview_impl.cc index 1251576..fc53f2d 100644 --- a/mojo/services/html_viewer/weblayertreeview_impl.cc +++ b/mojo/services/html_viewer/weblayertreeview_impl.cc @@ -180,8 +180,12 @@ void WebLayerTreeViewImpl::registerViewportLayers( const blink::WebLayer* innerViewportScrollLayer, const blink::WebLayer* outerViewportScrollLayer) { layer_tree_host_->RegisterViewportLayers( - static_cast<const cc_blink::WebLayerImpl*>(overscrollElasticityLayer) - ->layer(), + // The scroll elasticity layer will only exist when using pinch virtual + // viewports. + overscrollElasticityLayer + ? static_cast<const cc_blink::WebLayerImpl*>( + overscrollElasticityLayer)->layer() + : NULL, static_cast<const cc_blink::WebLayerImpl*>(pageScaleLayer)->layer(), static_cast<const cc_blink::WebLayerImpl*>(innerViewportScrollLayer) ->layer(), |