diff options
| author | danakj <danakj@chromium.org> | 2016-01-23 15:24:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-23 23:27:01 +0000 |
| commit | 0536dbbcab956b879d2bee49f7e4629cf753a9fa (patch) | |
| tree | b9aa4a6f53a37a1a4b84e6914278c556653d62aa /cc/blink/web_layer_impl.h | |
| parent | 5a0fcb946fdfed53928aba52fb08d18452e4e78c (diff) | |
| download | chromium_src-0536dbbcab956b879d2bee49f7e4629cf753a9fa.zip chromium_src-0536dbbcab956b879d2bee49f7e4629cf753a9fa.tar.gz chromium_src-0536dbbcab956b879d2bee49f7e4629cf753a9fa.tar.bz2 | |
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}
Diffstat (limited to 'cc/blink/web_layer_impl.h')
| -rw-r--r-- | cc/blink/web_layer_impl.h | 4 |
1 files changed, 1 insertions, 3 deletions
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( |