diff options
| author | dtapuska <dtapuska@chromium.org> | 2016-01-28 11:18:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 19:19:32 +0000 |
| commit | cd423123b7c269a40334624e10ec4b10c2d0682d (patch) | |
| tree | 6c05a346a2349dcdef59e6dd3de3ee2897225dd1 /cc/blink | |
| parent | f3aa3bae8b0541ccc151b6e24d6ae4fcab4fa2ea (diff) | |
| download | chromium_src-cd423123b7c269a40334624e10ec4b10c2d0682d.zip chromium_src-cd423123b7c269a40334624e10ec4b10c2d0682d.tar.gz chromium_src-cd423123b7c269a40334624e10ec4b10c2d0682d.tar.bz2 | |
Purge the ScrollBlocksOn code.
The ScrollBlocksOn code needs to be removed since passive event listeners
is the approach going forward.
BUG=489802
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1642093002
Cr-Commit-Position: refs/heads/master@{#372129}
Diffstat (limited to 'cc/blink')
| -rw-r--r-- | cc/blink/web_layer_impl.cc | 22 | ||||
| -rw-r--r-- | cc/blink/web_layer_impl.h | 2 |
2 files changed, 0 insertions, 24 deletions
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index cd10338..335861e 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -431,28 +431,6 @@ WebVector<WebRect> WebLayerImpl::touchEventHandlerRegion() const { return result; } -static_assert(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnNone) == - SCROLL_BLOCKS_ON_NONE, - "ScrollBlocksOn and WebScrollBlocksOn enums must match"); -static_assert(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnStartTouch) == - SCROLL_BLOCKS_ON_START_TOUCH, - "ScrollBlocksOn and WebScrollBlocksOn enums must match"); -static_assert(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnWheelEvent) == - SCROLL_BLOCKS_ON_WHEEL_EVENT, - "ScrollBlocksOn and WebScrollBlocksOn enums must match"); -static_assert( - static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnScrollEvent) == - SCROLL_BLOCKS_ON_SCROLL_EVENT, - "ScrollBlocksOn and WebScrollBlocksOn enums must match"); - -void WebLayerImpl::setScrollBlocksOn(blink::WebScrollBlocksOn blocks) { - layer_->SetScrollBlocksOn(static_cast<ScrollBlocksOn>(blocks)); -} - -blink::WebScrollBlocksOn WebLayerImpl::scrollBlocksOn() const { - return static_cast<blink::WebScrollBlocksOn>(layer_->scroll_blocks_on()); -} - void WebLayerImpl::setIsContainerForFixedPositionLayers(bool enable) { layer_->SetIsContainerForFixedPositionLayers(enable); } diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index d0afa5f..4ec3290 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -135,8 +135,6 @@ class WebLayerImpl : public blink::WebLayer { void setTouchEventHandlerRegion( const blink::WebVector<blink::WebRect>& region) override; blink::WebVector<blink::WebRect> touchEventHandlerRegion() const override; - void setScrollBlocksOn(blink::WebScrollBlocksOn) override; - blink::WebScrollBlocksOn scrollBlocksOn() const override; void setFrameTimingRequests( const blink::WebVector<std::pair<int64_t, blink::WebRect>>& requests) override; |