Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 18 insertions, 1 deletions

diff --git a/WebCore/page/FrameView.h b/WebCore/page/FrameView.h
index 69cc67a..b047db0 100644
--- a/WebCore/page/FrameView.h
+++ b/WebCore/page/FrameView.h
@@ -46,7 +46,7 @@ class RenderLayer;
 class RenderObject;
 class RenderEmbeddedObject;
 class RenderScrollbarPart;
-class ScheduledEvent;
+struct ScheduledEvent;
 class String;
 
 template <typename T> class Timer;
@@ -222,6 +222,18 @@ public:
     float pageZoomFactor() const { return shouldApplyPageZoom() ? m_zoomFactor : 1.0f; }
     float textZoomFactor() const { return shouldApplyTextZoom() ? m_zoomFactor : 1.0f; }
 
+    // Normal delay
+    static void setRepaintThrottlingDeferredRepaintDelay(double p);
+    // Negative value would mean that first few repaints happen without a delay
+    static void setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(double p);
+    // The delay grows on each repaint to this maximum value
+    static void setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(double p);
+    // On each repaint the delay increses by this amount
+    static void setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double p);
+
+protected:
+    virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
+    
 private:
     FrameView(Frame*);
 
@@ -354,6 +366,11 @@ private:
     RenderScrollbarPart* m_scrollCorner;
 
     float m_zoomFactor;
+
+    static double s_deferredRepaintDelay;
+    static double s_initialDeferredRepaintDelayDuringLoading;
+    static double s_maxDeferredRepaintDelayDuringLoading;
+    static double s_deferredRepaintDelayIncrementDuringLoading;
 };
 
 #if ENABLE(INSPECTOR)