Index: Source/platform/graphics/GraphicsLayer.cpp |
diff --git a/Source/platform/graphics/GraphicsLayer.cpp b/Source/platform/graphics/GraphicsLayer.cpp |
index 4d9fc9c2c1f3526c56164cb906ab027dc2c2caaf..e02d72a1b943fef02dc2600fd0912c7b9069cd79 100644 |
--- a/Source/platform/graphics/GraphicsLayer.cpp |
+++ b/Source/platform/graphics/GraphicsLayer.cpp |
@@ -119,6 +119,9 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client) |
m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible); |
m_layer->layer()->setWebLayerClient(this); |
m_layer->setAutomaticallyComputeRasterScale(true); |
+ |
+ // TODO(rbyers): Expose control over this to the web - crbug.com/489802: |
+ setScrollBlocksOn(WebScrollBlocksOnStartTouch | WebScrollBlocksOnWheelEvent); |
} |
GraphicsLayer::~GraphicsLayer() |
@@ -597,17 +600,6 @@ PassRefPtr<JSONObject> GraphicsLayer::layerTreeAsJSON(LayerTreeFlags flags, Rend |
if (m_blendMode != WebBlendModeNormal) |
json->setString("blendMode", compositeOperatorName(CompositeSourceOver, m_blendMode)); |
- if ((flags & LayerTreeIncludesScrollBlocksOn) && m_scrollBlocksOn) { |
- RefPtr<JSONArray> scrollBlocksOnJSON = adoptRef(new JSONArray); |
- if (m_scrollBlocksOn & WebScrollBlocksOnStartTouch) |
- scrollBlocksOnJSON->pushString("StartTouch"); |
- if (m_scrollBlocksOn & WebScrollBlocksOnWheelEvent) |
- scrollBlocksOnJSON->pushString("WheelEvent"); |
- if (m_scrollBlocksOn & WebScrollBlocksOnScrollEvent) |
- scrollBlocksOnJSON->pushString("ScrollEvent"); |
- json->setArray("scrollBlocksOn", scrollBlocksOnJSON); |
- } |
- |
if (m_isRootForIsolatedGroup) |
json->setBoolean("isolate", m_isRootForIsolatedGroup); |