| Index: third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp
|
| diff --git a/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp b/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp
|
| index a41b2beabec9d379f4be67d2b9e68e580a77ca0e..ca9baafae84a66c5b1f3bd02734756ee8b224b36 100644
|
| --- a/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp
|
| +++ b/third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp
|
| @@ -156,11 +156,10 @@ void WebLayerTreeViewImplForTesting::registerViewportLayers(
|
| m_layerTreeHost->RegisterViewportLayers(
|
| // The scroll elasticity layer will only exist when using pinch virtual
|
| // viewports.
|
| - overscrollElasticityLayer
|
| - ? static_cast<const cc_blink::WebLayerImpl*>(
|
| - overscrollElasticityLayer)
|
| - ->layer()
|
| - : nullptr,
|
| + overscrollElasticityLayer ? static_cast<const cc_blink::WebLayerImpl*>(
|
| + overscrollElasticityLayer)
|
| + ->layer()
|
| + : nullptr,
|
| static_cast<const cc_blink::WebLayerImpl*>(pageScaleLayer)->layer(),
|
| static_cast<const cc_blink::WebLayerImpl*>(innerViewportScrollLayer)
|
| ->layer(),
|
|
|