Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h |
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h |
index fd48d40ca406d2b87d091cea458b4ceb8004c3fb..40c53407386de45a5fb57d1678782194287aae75 100644 |
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h |
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h |
@@ -30,8 +30,8 @@ |
#include "core/layout/LayoutObject.h" |
#include "platform/PlatformWheelEvent.h" |
#include "platform/geometry/IntRect.h" |
+#include "platform/scroll/MainThreadScrollingReason.h" |
#include "platform/scroll/ScrollTypes.h" |
-#include "public/platform/WebMainThreadScrollingReason.h" |
#include "wtf/Noncopyable.h" |
#include "wtf/text/WTFString.h" |
@@ -140,7 +140,7 @@ protected: |
private: |
bool shouldUpdateAfterCompositingChange() const { return m_scrollGestureRegionIsDirty || m_touchEventTargetRectsAreDirty || m_shouldScrollOnMainThreadDirty || frameViewIsDirty(); } |
- void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons); |
+ void setShouldUpdateScrollLayerPositionOnMainThread(uint32_t mainThreadScrollingReasons); |
bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const; |
@@ -162,7 +162,7 @@ private: |
HashSet<const PaintLayer*> m_layersWithTouchRects; |
bool m_wasFrameScrollable; |
- MainThreadScrollingReasons m_lastMainThreadScrollingReasons; |
+ uint32_t m_lastMainThreadScrollingReasons; |
esprehn
2016/01/20 00:09:56
we often do // ActualType
in a comment so you kno
danakj
2016/01/20 00:15:11
Done. "A set of flags from MainThreadScrollingReas
danakj
2016/01/20 22:38:07
Actually I found there is a MainThreadScrollingRea
|
}; |
} // namespace blink |