Changeset 149002 in webkit

Timestamp:

Apr 23, 2013 3:36:20 PM (11 years ago)

Author:

akling@apple.com

Message:

Revert "Throttle resize events during live window resize."
<​http://webkit.org/b/114292>
<rdar://problem/13411454>
<rdar://problem/13694839>

Reviewed by Geoffrey Garen.

It appears that this caused more glitches than it helped resize performance.

• page/FrameView.h:
• page/FrameView.cpp:

(WebCore::FrameView::FrameView):
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::sendResizeEvent):

Turn the null-check of m_frame into an assertion since this method is
no longer called asynchronously.

(WebCore::FrameView::willEndLiveResize):

Ninja fix: call up to the closest superclass implementation.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (6 diffs)
• page/FrameView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-23  Andreas Kling  <akling@apple.com>
+
+        Revert "Throttle resize events during live window resize."
+        <http://webkit.org/b/114292>
+        <rdar://problem/13411454>
+        <rdar://problem/13694839>
+
+        Reviewed by Geoffrey Garen.
+
+        It appears that this caused more glitches than it helped resize performance.
+
+        * page/FrameView.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::performPostLayoutTasks):
+        (WebCore::FrameView::sendResizeEvent):
+
+            Turn the null-check of m_frame into an assertion since this method is
+            no longer called asynchronously.
+
+        (WebCore::FrameView::willEndLiveResize):
+
+            Ninja fix: call up to the closest superclass implementation.
+
 2013-04-23  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -127 +127 @@
 #endif
 
-// While the browser window is being resized, resize events will be dispatched at most this often.
-static const double minimumIntervalBetweenResizeEventsDuringLiveResizeInSeconds = 0.2;
-
 // The maximum number of updateWidgets iterations that should be done before returning.
 static const unsigned maxUpdateWidgetsIterations = 2;
@@ -176 +173 @@
     , m_canHaveScrollbars(true)
     , m_slowRepaintObjectCount(0)
-    , m_delayedResizeEventTimer(this, &FrameView::delayedResizeEventTimerFired)
     , m_layoutTimer(this, &FrameView::layoutTimerFired)
     , m_layoutRoot(0)
@@ -2771 +2767 @@
         m_lastViewportSize = currentSize;
         m_lastZoomFactor = currentZoomFactor;
-        if (resized) {
-            if (inLiveResize())
-                scheduleResizeEvent();
-            else
-                sendResizeEvent();
-        }
+        if (resized)
+            sendResizeEvent();
     }
 }
@@ -2782 +2774 @@
 void FrameView::sendResizeEvent()
 {
-    if (!m_frame)
-        return;
+    ASSERT(m_frame);
 
     m_frame->eventHandler()->sendResizeEvent();
@@ -2799 +2790 @@
 }
 
-void FrameView::delayedResizeEventTimerFired(Timer<FrameView>*)
-{
-    sendResizeEvent();
-}
-
 void FrameView::willStartLiveResize()
 {
@@ -2812 +2798 @@
 void FrameView::willEndLiveResize()
 {
-    ScrollableArea::willEndLiveResize();
-    if (m_delayedResizeEventTimer.isActive()) {
-        m_delayedResizeEventTimer.stop();
-        sendResizeEvent();
-    }
+    ScrollView::willEndLiveResize();
     adjustTiledBackingCoverage();
-}
-
-void FrameView::scheduleResizeEvent()
-{
-    if (!m_delayedResizeEventTimer.isActive())
-        m_delayedResizeEventTimer.startOneShot(minimumIntervalBetweenResizeEventsDuringLiveResizeInSeconds);
 }
 

trunk/Source/WebCore/page/FrameView.h

@@ -541 +541 @@
     int m_borderY;
 
-    Timer<FrameView> m_delayedResizeEventTimer;
-
     Timer<FrameView> m_layoutTimer;
     bool m_delayedLayout;