Changeset 150011 in webkit

Timestamp:

May 13, 2013 7:55:38 AM (11 years ago)

Author:

akling@apple.com

Message:

REGRESSION(r149287): FoldingText only shows me half of my text.
<​http://webkit.org/b/115956>
<rdar://problem/13831099>

Reviewed by Antti Koivisto.

Check if the FrameView geometry changed post-layout, and send a resize event if needed.
This brings us closer to the original resize event behavior, with the exception that
setFrameRect() still fires an event right away if possible. This means we are still
guarded from FOUC's but frames that layout via [WebHTMLView layoutToMinimumPageWidth]
also get resize events like they used to.

No new tests, because I don't know how to test this.

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

(WebCore::FrameView::setFrameRect):
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::sendResizeEventIfNeeded):

Factor out the resize event logic from setFrameRect() so we can call it from both
there and performPostLayoutTasks(). sendResizeEventIfNeeded() only sends an event
if view geometry or zoom factor has changed since last time it was called.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-13  Andreas Kling  <akling@apple.com>
+
+        REGRESSION(r149287): FoldingText only shows me half of my text.
+        <http://webkit.org/b/115956>
+        <rdar://problem/13831099>
+
+        Reviewed by Antti Koivisto.
+
+        Check if the FrameView geometry changed post-layout, and send a resize event if needed.
+        This brings us closer to the original resize event behavior, with the exception that
+        setFrameRect() still fires an event right away if possible. This means we are still
+        guarded from FOUC's but frames that layout via [WebHTMLView layoutToMinimumPageWidth]
+        also get resize events like they used to.
+
+        No new tests, because I don't know how to test this.
+
+        * page/FrameView.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setFrameRect):
+        (WebCore::FrameView::performPostLayoutTasks):
+        (WebCore::FrameView::sendResizeEventIfNeeded):
+
+            Factor out the resize event logic from setFrameRect() so we can call it from both
+            there and performPostLayoutTasks(). sendResizeEventIfNeeded() only sends an event
+            if view geometry or zoom factor has changed since last time it was called.
+
 2013-05-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -486 +486 @@
     }
 
-    if (renderView && !renderView->printing()) {
-        IntSize currentSize;
-        if (useFixedLayout() && !fixedLayoutSize().isEmpty() && delegatesScrolling())
-            currentSize = fixedLayoutSize();
-        else
-            currentSize = visibleContentRect(IncludeScrollbars).size();
-        float currentZoomFactor = renderView->style()->zoom();
-        bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
-        m_lastViewportSize = currentSize;
-        m_lastZoomFactor = currentZoomFactor;
-        if (resized)
-            dispatchResizeEvent();
-    }
-
+    sendResizeEventIfNeeded();
 }
 
@@ -2783 +2770 @@
 
     m_actionScheduler->resume();
-}
-
-void FrameView::dispatchResizeEvent()
+
+    sendResizeEventIfNeeded();
+}
+
+void FrameView::sendResizeEventIfNeeded()
 {
     ASSERT(m_frame);
 
+    RenderView* renderView = this->renderView();
+    if (!renderView || renderView->printing())
+        return;
+
     Page* page = m_frame->page();
+    IntSize currentSize;
+    if (useFixedLayout() && !fixedLayoutSize().isEmpty() && delegatesScrolling())
+        currentSize = fixedLayoutSize();
+    else
+        currentSize = visibleContentRect(IncludeScrollbars).size();
+
+    float currentZoomFactor = renderView->style()->zoom();
+    bool shouldSendResizeEvent = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
+
+    m_lastViewportSize = currentSize;
+    m_lastZoomFactor = currentZoomFactor;
+
+    if (!shouldSendResizeEvent)
+        return;
+
     bool isMainFrame = page && page->mainFrame() == m_frame;
     bool canSendResizeEventSynchronously = isMainFrame && !isInLayout();

trunk/Source/WebCore/page/FrameView.h

@@ -496 +496 @@
     virtual void willRemoveScrollbar(Scrollbar*, ScrollbarOrientation) OVERRIDE;
 
-    void dispatchResizeEvent();
+    void sendResizeEventIfNeeded();
 
     void updateScrollableAreaSet();