Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(744)

Unified Diff: Source/platform/graphics/GraphicsLayer.cpp

Issue 1287623002: Delete blink code for scroll-blocks-on (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merge with trunk (no changes from previous patch) Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/graphics/CompositingReasons.cpp ('k') | Source/platform/graphics/GraphicsLayerClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « Source/platform/graphics/CompositingReasons.cpp ('k') | Source/platform/graphics/GraphicsLayerClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698