cc: Fix enum style conformance in InputHandler.

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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 327 matching lines @@
 }
 
 void WebLayerImpl::setHaveScrollEventHandlers(bool have_scroll_event_handlers) {
   layer_->SetHaveScrollEventHandlers(have_scroll_event_handlers);
 }
 
 bool WebLayerImpl::haveScrollEventHandlers() const {
   return layer_->have_scroll_event_handlers();
 }
 
-static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
+static_assert(static_cast<uint32_t>(
                   blink::WebMainThreadScrollingReason::NotScrollingOnMain) ==
-                  cc::InputHandler::NOT_SCROLLING_ON_MAIN,
-              "InputHandler::MainThreadScrollingReason and "
-              "WebMainThreadScrollingReason enums must match");
-static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
-                  blink::WebMainThreadScrollingReason::
-                      HasBackgroundAttachmentFixedObjects) ==
-                  cc::InputHandler::HAS_BACKGROUND_ATTACHMENT_FIXED_OBJECTS,
-              "InputHandler::MainThreadScrollingReason and "
-              "WebMainThreadScrollingReason enums must match");
-static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
-                  blink::WebMainThreadScrollingReason::
-                      HasNonLayerViewportConstrainedObjects) ==
-                  cc::InputHandler::HAS_NON_LAYER_VIEWPORT_CONSTRAINED_OBJECTS,
-              "InputHandler::MainThreadScrollingReason and "
+                  cc::MainThreadScrollingReason::kNotScrollingOnMain,
+              "MainThreadScrollingReason and "
               "WebMainThreadScrollingReason enums must match");
 static_assert(
-    static_cast<cc::InputHandler::MainThreadScrollingReason>(
+    static_cast<uint32_t>(blink::WebMainThreadScrollingReason::
+                              HasBackgroundAttachmentFixedObjects) ==
+        cc::MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects,
+    "MainThreadScrollingReason and "
+    "WebMainThreadScrollingReason enums must match");
+static_assert(
+    static_cast<uint32_t>(blink::WebMainThreadScrollingReason::
+                              HasNonLayerViewportConstrainedObjects) ==
+        cc::MainThreadScrollingReason::kHasNonLayerViewportConstrainedObjects,
+    "MainThreadScrollingReason and "
+    "WebMainThreadScrollingReason enums must match");
+static_assert(
+    static_cast<uint32_t>(
         blink::WebMainThreadScrollingReason::ThreadedScrollingDisabled) ==
-        cc::InputHandler::THREADED_SCROLLING_DISABLED,
-    "InputHandler::MainThreadScrollingReason and "
+        cc::MainThreadScrollingReason::kThreadedScrollingDisabled,
+    "MainThreadScrollingReason and "
     "WebMainThreadScrollingReason enums must match");
-static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
+static_assert(static_cast<uint32_t>(
                   blink::WebMainThreadScrollingReason::ScrollBarScrolling) ==
-                  cc::InputHandler::SCROLL_BAR_SCROLLING,
-              "InputHandler::MainThreadScrollingReason and "
+                  cc::MainThreadScrollingReason::kScrollbarScrolling,
+              "MainThreadScrollingReason and "
               "WebMainThreadScrollingReason enums must match");
-static_assert(static_cast<cc::InputHandler::MainThreadScrollingReason>(
-                  blink::WebMainThreadScrollingReason::PageOverlay) ==
-                  cc::InputHandler::PAGE_OVERLAY,
-              "InputHandler::MainThreadScrollingReason and "
-              "WebMainThreadScrollingReason enums must match");
+static_assert(
+    static_cast<uint32_t>(blink::WebMainThreadScrollingReason::PageOverlay) ==
+        cc::MainThreadScrollingReason::kPageOverlay,
+    "MainThreadScrollingReason and "
+    "WebMainThreadScrollingReason enums must match");
 
 void WebLayerImpl::addMainThreadScrollingReasons(
     blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason
         main_thread_scrolling_reasons) {
   DCHECK(main_thread_scrolling_reasons);
   // WebLayerImpl should only know about non-transient scrolling
   // reasons. Transient scrolling reasons are computed per hit test.
   DCHECK_LE(
       main_thread_scrolling_reasons,
       static_cast<
           blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason>(
-          cc::InputHandler::MaxNonTransientScrollingReason));
-  layer_->AddMainThreadScrollingReasons(
-      static_cast<cc::InputHandler::MainThreadScrollingReason>(
-          main_thread_scrolling_reasons));
+          cc::MainThreadScrollingReason::kMaxNonTransientScrollingReason));
+  layer_->AddMainThreadScrollingReasons(main_thread_scrolling_reasons);
 }
 
 void WebLayerImpl::clearMainThreadScrollingReasons() {
   layer_->ClearMainThreadScrollingReasons();
 }
 
 bool WebLayerImpl::shouldScrollOnMainThread() const {
   return layer_->should_scroll_on_main_thread();
 }
 
@@ skipping 212 matching lines @@
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) {
   contents_opaque_is_fixed_ = fixed;
 }
 
 }  // namespace cc_blink