From 0536dbbcab956b879d2bee49f7e4629cf753a9fa Mon Sep 17 00:00:00 2001 From: danakj Date: Sat, 23 Jan 2016 15:24:50 -0800 Subject: blink: Make WebMainThreadScrollingReason wrap the cc enum. This moves the WebMainThreadScrollingReason from public/platform/ to platform/scroll/, as it is no longer used in the WebLayer API explicitly, and renames it to just MainThreadScrollingReason. We change the type to be an alias for the cc type instead of maintaining static asserts that they match. Depends on: https://codereview.chromium.org/1604053002/ CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1602773006 Cr-Commit-Position: refs/heads/master@{#371151} --- cc/blink/web_layer_impl.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cc/blink/web_layer_impl.h') diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index 482c633..f63ba55 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -22,7 +22,6 @@ #include "third_party/WebKit/public/platform/WebDoublePoint.h" #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebLayer.h" -#include "third_party/WebKit/public/platform/WebMainThreadScrollingReason.h" #include "third_party/WebKit/public/platform/WebPoint.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebSize.h" @@ -130,8 +129,7 @@ class WebLayerImpl : public blink::WebLayer { void setHaveScrollEventHandlers(bool have_scroll_event_handlers) override; bool haveScrollEventHandlers() const override; void addMainThreadScrollingReasons( - blink::WebMainThreadScrollingReason::WebMainThreadScrollingReason - main_thread_scrolling_reasons) override; + uint32_t main_thread_scrolling_reasons) override; void clearMainThreadScrollingReasons() override; bool shouldScrollOnMainThread() const override; void setNonFastScrollableRegion( -- cgit v1.1