Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/blink/web_layer_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/blink/web_layer_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 379 matching lines @@
   for (cc::Region::Iterator region_rects(layer_->touch_event_handler_region());
        region_rects.has_rect();
        region_rects.next()) {
     result[i] = region_rects.rect();
     ++i;
   }
   return result;
 }
 
 static_assert(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnNone) ==
-                  SCROLL_BLOCKS_ON_NONE,
+                  ScrollBlocksOnNone,
               "ScrollBlocksOn and WebScrollBlocksOn enums must match");
 static_assert(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnStartTouch) ==
-                  SCROLL_BLOCKS_ON_START_TOUCH,
+                  ScrollBlocksOnStartTouch,
               "ScrollBlocksOn and WebScrollBlocksOn enums must match");
 static_assert(static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnWheelEvent) ==
-                  SCROLL_BLOCKS_ON_WHEEL_EVENT,
+                  ScrollBlocksOnWheelEvent,
               "ScrollBlocksOn and WebScrollBlocksOn enums must match");
 static_assert(
     static_cast<ScrollBlocksOn>(blink::WebScrollBlocksOnScrollEvent) ==
-        SCROLL_BLOCKS_ON_SCROLL_EVENT,
+        ScrollBlocksOnScrollEvent,
     "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());
 }
 
@@ skipping 93 matching lines @@
   if (parent)
     clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetClipParent(clip_parent);
 }
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 }  // namespace cc_blink