diff options
| author | ccameron <ccameron@chromium.org> | 2014-11-24 17:26:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-25 01:27:38 +0000 |
| commit | 9cd650d5c89b0dbb08e6837b242e167e327b1a3c (patch) | |
| tree | 174ae4f87501bace62102dcca881a7b492bfa819 /mojo | |
| parent | df97624bed36b437b9a3eaa18dd2afa8bfb7cc85 (diff) | |
| download | chromium_src-9cd650d5c89b0dbb08e6837b242e167e327b1a3c.zip chromium_src-9cd650d5c89b0dbb08e6837b242e167e327b1a3c.tar.gz chromium_src-9cd650d5c89b0dbb08e6837b242e167e327b1a3c.tar.bz2 | |
Allow scroll elasticity layer to be NULL
Until the pinch virtual viewport is always used, we will not be able to
require that the scroll elasticity viewport be NULL.
This was missed in r305260, which was
TBR=enne, jam
BUG=133097
Review URL: https://codereview.chromium.org/754053004
Cr-Commit-Position: refs/heads/master@{#305552}
Diffstat (limited to 'mojo')
| -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(), |