Only scroll on main if the targeted frames need to scroll on main

third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h

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 b5775ab80f437659a1792d800a4e512b198bac16..20d7cf213ddf216dbce4d5e6d6a8fa78717a7e42 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h
@@ -41,6 +41,7 @@ namespace blink {
 using MainThreadScrollingReasons = uint32_t;
 
 class LocalFrame;
+class Frame;
 class FrameView;
 class GraphicsLayer;
 class Page;
@@ -94,9 +95,15 @@ class CORE_EXPORT ScrollingCoordinator final
   // Should be called whenever the root layer for the given frame view changes.
   void frameViewRootLayerDidChange(FrameView*);
 
-  MainThreadScrollingReasons mainThreadScrollingReasons() const;
-  bool shouldUpdateScrollLayerPositionOnMainThread() const {
-    return mainThreadScrollingReasons() != 0;
+#if OS(MACOSX)
+  // Dispatched by the scrolling tree during handleWheelEvent. This is required
+  // as long as scrollbars are painted on the main thread.
+  void handleWheelEventPhase(PlatformWheelEventPhase);
+#endif

[flackr, 2016/12/02 19:24:02]

Is this from a bad merge?

[yigu, 2016/12/02 20:32:49]

Yes.

+
+  MainThreadScrollingReasons mainThreadScrollingReasons(LocalFrame*) const;
+  bool shouldUpdateScrollLayerPositionOnMainThread(LocalFrame* frame) const {
+    return mainThreadScrollingReasons(frame) != 0;
   }
 
   std::unique_ptr<WebScrollbarLayer> createSolidColorScrollbarLayer(
@@ -120,7 +127,7 @@ class CORE_EXPORT ScrollingCoordinator final
   void updateClipParentForGraphicsLayer(GraphicsLayer* child,
                                         const PaintLayer* parent);
 
-  String mainThreadScrollingReasonsAsText() const;
+  String mainThreadScrollingReasonsAsText(Frame*) const;
   Region computeShouldHandleScrollGestureOnMainThreadRegion(
       const LocalFrame*,
       const IntPoint& frameLocation) const;