Changeset 88127 in webkit

Timestamp:

Jun 4, 2011 7:08:54 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-06-04 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

Disable WebProcess side display throttling when in a user scroll
<rdar://problem/9517175>
​https://bugs.webkit.org/show_bug.cgi?id=62095

Add the ability to disable WebProcess side display throttling that
takes place in DrawingAreaImpl::displayTimerFired. Disable the throttling
when in a user or animated scroll.

• WebProcess/WebCoreSupport/WebChromeClient.cpp: (WebKit::WebChromeClient::didStartRubberBandForFrame): (WebKit::WebChromeClient::didCompleteRubberBandForFrame): (WebKit::WebChromeClient::didStartAnimatedScroll): (WebKit::WebChromeClient::didCompleteAnimatedScroll):
• WebProcess/WebPage/DrawingArea.h: (WebKit::DrawingArea::enableDisplayThrottling): (WebKit::DrawingArea::disableDisplayThrottling):
• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::DrawingAreaImpl): (WebKit::DrawingAreaImpl::enableDisplayThrottling): (WebKit::DrawingAreaImpl::disableDisplayThrottling): (WebKit::DrawingAreaImpl::displayTimerFired):
• WebProcess/WebPage/DrawingAreaImpl.h:
• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::wheelEvent):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (3 diffs)
• WebProcess/WebPage/DrawingAreaImpl.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-04  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Disable WebProcess side display throttling when in a user scroll
+        <rdar://problem/9517175>
+        https://bugs.webkit.org/show_bug.cgi?id=62095
+
+        Add the ability to disable WebProcess side display throttling that
+        takes place in DrawingAreaImpl::displayTimerFired. Disable the throttling
+        when in a user or animated scroll.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::didStartRubberBandForFrame):
+        (WebKit::WebChromeClient::didCompleteRubberBandForFrame):
+        (WebKit::WebChromeClient::didStartAnimatedScroll):
+        (WebKit::WebChromeClient::didCompleteAnimatedScroll):
+        * WebProcess/WebPage/DrawingArea.h:
+        (WebKit::DrawingArea::enableDisplayThrottling):
+        (WebKit::DrawingArea::disableDisplayThrottling):
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+        (WebKit::DrawingAreaImpl::enableDisplayThrottling):
+        (WebKit::DrawingAreaImpl::disableDisplayThrottling):
+        (WebKit::DrawingAreaImpl::displayTimerFired):
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::wheelEvent):
+
 2011-06-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -771 +771 @@
 void WebChromeClient::didStartRubberBandForFrame(Frame*, const IntSize&) const
 {
+    m_page->drawingArea()->disableDisplayThrottling();
 }
 
 void WebChromeClient::didCompleteRubberBandForFrame(Frame* frame, const IntSize& initialOverhang) const
 {
+    m_page->drawingArea()->enableDisplayThrottling();
+
     if (frame != frame->page()->mainFrame())
         return;
@@ -782 +785 @@
 void WebChromeClient::didStartAnimatedScroll() const
 {
+    m_page->drawingArea()->disableDisplayThrottling();
 }
 
 void WebChromeClient::didCompleteAnimatedScroll() const
 {
+    m_page->drawingArea()->enableDisplayThrottling();
 }
     

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

@@ -64 +64 @@
 
     // FIXME: These should be pure virtual.
+    virtual void enableDisplayThrottling() { }
+    virtual void disableDisplayThrottling() { }
     virtual void pageBackgroundTransparencyChanged() { }
     virtual void forceRepaint() { }

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -65 +65 @@
     , m_isPaintingSuspended(!parameters.isVisible)
     , m_alwaysUseCompositing(false)
+    , m_shouldThrottleDisplay(true)
     , m_lastDisplayTime(0)
     , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::displayTimerFired)
@@ -191 +192 @@
     m_isWaitingForDidUpdate = false;
     display();
+}
+
+void DrawingAreaImpl::enableDisplayThrottling()
+{
+    m_shouldThrottleDisplay = true;
+}
+
+void DrawingAreaImpl::disableDisplayThrottling()
+{
+    m_shouldThrottleDisplay = false;
 }
 
@@ -515 +526 @@
 #endif
 
-    double timeSinceLastDisplay = currentTime() - m_lastDisplayTime;
-    double timeUntilNextDisplay = minimumFrameInterval - timeSinceLastDisplay;
-
-    if (timeUntilNextDisplay > 0) {
-        m_displayTimer.startOneShot(timeUntilNextDisplay);
-        return;
+    if (m_shouldThrottleDisplay) {
+        double timeSinceLastDisplay = currentTime() - m_lastDisplayTime;
+        double timeUntilNextDisplay = minimumFrameInterval - timeSinceLastDisplay;
+
+        if (timeUntilNextDisplay > 0) {
+            m_displayTimer.startOneShot(timeUntilNextDisplay);
+            return;
+        }
     }
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h

@@ -51 +51 @@
     virtual void setLayerTreeStateIsFrozen(bool);
     virtual void forceRepaint();
+
+    virtual void enableDisplayThrottling();
+    virtual void disableDisplayThrottling();
 
     virtual void didInstallPageOverlay();
@@ -116 +119 @@
     bool m_alwaysUseCompositing;
 
+    // Whether we should throttle displays to a set update rate on the WebProcess side.
+    bool m_shouldThrottleDisplay;
+
     double m_lastDisplayTime;
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1070 +1070 @@
     CurrentEvent currentEvent(wheelEvent);
 
+#if PLATFORM(MAC)
+    if (wheelEvent.momentumPhase() == WebWheelEvent::PhaseBegan || wheelEvent.phase() == WebWheelEvent::PhaseBegan)
+        m_drawingArea->disableDisplayThrottling();
+    else if (wheelEvent.momentumPhase() == WebWheelEvent::PhaseEnded || wheelEvent.phase() == WebWheelEvent::PhaseEnded)
+        m_drawingArea->enableDisplayThrottling();
+#endif
+
     bool handled = handleWheelEvent(wheelEvent, m_page.get());
     send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(wheelEvent.type()), handled));