Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: cc/input/main_thread_scrolling_reason.h

Issue 2469013004: Put all reasons in MainThreadScrollingReason into one enum (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/main_thread_scrolling_reason.h
diff --git a/cc/input/main_thread_scrolling_reason.h b/cc/input/main_thread_scrolling_reason.h
index 06036796d9516d8ba13bd5a4a6d49cb38fca9e52..8cc83d3eb0110d32030bb2172d2e5155ca91093f 100644
--- a/cc/input/main_thread_scrolling_reason.h
+++ b/cc/input/main_thread_scrolling_reason.h
@@ -15,32 +15,35 @@ namespace cc {
// When adding a new MainThreadScrollingReason, make sure the corresponding
// [MainThread/Compositor]CanSetScrollReasons function is also updated.
struct MainThreadScrollingReason {
- // Non-transient scrolling reasons.
- enum : uint32_t { kNotScrollingOnMain = 0 };
- enum : uint32_t { kHasBackgroundAttachmentFixedObjects = 1 << 0 };
- enum : uint32_t { kHasNonLayerViewportConstrainedObjects = 1 << 1 };
- enum : uint32_t { kThreadedScrollingDisabled = 1 << 2 };
- enum : uint32_t { kScrollbarScrolling = 1 << 3 };
- enum : uint32_t { kPageOverlay = 1 << 4 };
- // This bit is set when any of the other main thread scrolling reasons cause
- // an input event to be handled on the main thread, and the main thread
- // blink::ScrollAnimator is in the middle of running a scroll offset
- // animation. Note that a scroll handled by the main thread can result in an
- // animation running on the main thread or on the compositor thread.
- enum : uint32_t { kHandlingScrollFromMainThread = 1 << 13 };
- enum : uint32_t { kCustomScrollbarScrolling = 1 << 15 };
+ enum : uint32_t {
+ // Non-transient scrolling reasons.
+ kNotScrollingOnMain = 0,
+ kHasBackgroundAttachmentFixedObjects = 1 << 0,
+ kHasNonLayerViewportConstrainedObjects = 1 << 1,
+ kThreadedScrollingDisabled = 1 << 2,
+ kScrollbarScrolling = 1 << 3,
+ kPageOverlay = 1 << 4,
- // Transient scrolling reasons. These are computed for each scroll begin.
- enum : uint32_t { kNonFastScrollableRegion = 1 << 5 };
- enum : uint32_t { kFailedHitTest = 1 << 7 };
- enum : uint32_t { kNoScrollingLayer = 1 << 8 };
- enum : uint32_t { kNotScrollable = 1 << 9 };
- enum : uint32_t { kContinuingMainThreadScroll = 1 << 10 };
- enum : uint32_t { kNonInvertibleTransform = 1 << 11 };
- enum : uint32_t { kPageBasedScrolling = 1 << 12 };
+ // This bit is set when any of the other main thread scrolling reasons cause
+ // an input event to be handled on the main thread, and the main thread
+ // blink::ScrollAnimator is in the middle of running a scroll offset
+ // animation. Note that a scroll handled by the main thread can result in an
+ // animation running on the main thread or on the compositor thread.
+ kHandlingScrollFromMainThread = 1 << 13,
+ kCustomScrollbarScrolling = 1 << 15,
- // The number of flags in this struct (excluding itself).
- enum : uint32_t { kMainThreadScrollingReasonCount = 17 };
+ // Transient scrolling reasons. These are computed for each scroll begin.
+ kNonFastScrollableRegion = 1 << 5,
+ kFailedHitTest = 1 << 7,
+ kNoScrollingLayer = 1 << 8,
+ kNotScrollable = 1 << 9,
+ kContinuingMainThreadScroll = 1 << 10,
+ kNonInvertibleTransform = 1 << 11,
+ kPageBasedScrolling = 1 << 12,
+
+ // The number of flags in this struct (excluding itself).
+ kMainThreadScrollingReasonCount = 17,
+ };
// Returns true if the given MainThreadScrollingReason can be set by the main
// thread.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698