Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / page / scrolling / ScrollingCoordinator.h

diff --git a/src/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h b/src/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h
index 256ef40..58c0e9e 100644 (file)
--- a/src/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h
+++ b/src/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h
@@ -33,22 +33,19 @@
 #include "wtf/text/WTFString.h"
 
 namespace blink {
-class WebLayer;
 class WebScrollbarLayer;
 }
 
-namespace WebCore {
+namespace blink {
 
 typedef unsigned MainThreadScrollingReasons;
 
-class Document;
 class LocalFrame;
 class FrameView;
 class GraphicsLayer;
 class Page;
 class Region;
 class ScrollableArea;
-class ViewportConstraints;
 
 class ScrollingCoordinator {
 public:
@@ -64,10 +61,7 @@ public:
     // Called when any frame has done its layout.
     void notifyLayoutUpdated();
 
-    // Should be called after compositing has been updated.
-    void updateAfterCompositingChange();
-
-    bool needsToUpdateAfterCompositingChange() const { return m_scrollGestureRegionIsDirty || m_touchEventTargetRectsAreDirty || frameViewIsDirty(); }
+    void updateAfterCompositingChangeIfNeeded();
 
     void updateHaveWheelEventHandlers();
     void updateHaveScrollEventHandlers();
@@ -90,6 +84,7 @@ public:
         HasSlowRepaintObjects = 1 << 0,
         HasViewportConstrainedObjectsWithoutSupportingFixedLayers = 1 << 1,
         HasNonLayerViewportConstrainedObjects = 1 << 2,
+        ThreadedScrollingDisabled = 1 << 3
     };
 
     MainThreadScrollingReasons mainThreadScrollingReasons() const;
@@ -123,6 +118,7 @@ protected:
     explicit ScrollingCoordinator(Page*);
 
     bool isForMainFrame(ScrollableArea*) const;
+    bool isForViewport(ScrollableArea*) const;
 
     Page* m_page;
 
@@ -132,11 +128,12 @@ protected:
     bool m_shouldScrollOnMainThreadDirty;
 
 private:
+    bool shouldUpdateAfterCompositingChange() const { return m_scrollGestureRegionIsDirty || m_touchEventTargetRectsAreDirty || frameViewIsDirty(); }
+
     void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScrollingReasons);
 
     bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const;
 
-    bool touchHitTestingEnabled() const;
     void setShouldHandleScrollGestureOnMainThreadRegion(const Region&);
     void setTouchEventTargetRects(LayerHitTestRects&);
     void computeTouchEventTargetRects(LayerHitTestRects&);
@@ -147,7 +144,7 @@ private:
 
     bool frameViewIsDirty() const;
 
-    typedef HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer> > ScrollbarMap;
+    using ScrollbarMap = HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLayer>>;
     ScrollbarMap m_horizontalScrollbars;
     ScrollbarMap m_verticalScrollbars;
     HashSet<const RenderLayer*> m_layersWithTouchRects;
@@ -157,6 +154,6 @@ private:
     MainThreadScrollingReasons m_lastMainThreadScrollingReasons;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // ScrollingCoordinator_h