| Index: cc/blink/web_layer_impl.cc
|
| diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
|
| index cd1033845a2eb042d5396fd056c297e45e21b25c..335861ecb9a4459b3ea49576cd1bf6bc352653df 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);
|
| }
|
|
|