| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| index f0e32bf0aac4449d93e7cd246539743bd417ee8d..2ba8104216248a8ce57dea7de4b3e321142a4e0f 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| @@ -96,7 +96,6 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
|
| , m_backgroundColor(Color::transparent)
|
| , m_opacity(1)
|
| , m_blendMode(WebBlendModeNormal)
|
| - , m_scrollBlocksOn(WebScrollBlocksOnNone)
|
| , m_hasTransformOrigin(false)
|
| , m_contentsOpaque(false)
|
| , m_shouldFlattenTransform(true)
|
| @@ -131,9 +130,6 @@ GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
|
| m_layer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get()));
|
| m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible);
|
| m_layer->layer()->setLayerClient(this);
|
| -
|
| - // TODO(rbyers): Expose control over this to the web - crbug.com/489802:
|
| - setScrollBlocksOn(WebScrollBlocksOnStartTouch | WebScrollBlocksOnWheelEvent);
|
| }
|
|
|
| GraphicsLayer::~GraphicsLayer()
|
| @@ -1010,14 +1006,6 @@ void GraphicsLayer::setBlendMode(WebBlendMode blendMode)
|
| platformLayer()->setBlendMode(blendMode);
|
| }
|
|
|
| -void GraphicsLayer::setScrollBlocksOn(WebScrollBlocksOn scrollBlocksOn)
|
| -{
|
| - if (m_scrollBlocksOn == scrollBlocksOn)
|
| - return;
|
| - m_scrollBlocksOn = scrollBlocksOn;
|
| - platformLayer()->setScrollBlocksOn(scrollBlocksOn);
|
| -}
|
| -
|
| void GraphicsLayer::setIsRootForIsolatedGroup(bool isolated)
|
| {
|
| if (m_isRootForIsolatedGroup == isolated)
|
|
|