Changeset 125314 in webkit

Timestamp:

Aug 10, 2012, 12:38:59 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/11855229> When in paginated mode, the layout timer fires continually
​https://bugs.webkit.org/show_bug.cgi?id=91038

Reviewed by Simon Fraser.

• page/Page.cpp:

(WebCore::Page::pageCount): Changed to only trigger layout if needed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Page.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-10  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/11855229> When in paginated mode, the layout timer fires continually
+        https://bugs.webkit.org/show_bug.cgi?id=91038
+
+        Reviewed by Simon Fraser.
+
+        * page/Page.cpp:
+        (WebCore::Page::pageCount): Changed to only trigger layout if needed.
+
 2012-08-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -710 +710 @@
 
     FrameView* frameView = mainFrame()->view();
-    if (!frameView->didFirstLayout())
-        return 0;
-
-    mainFrame()->view()->forceLayout();
+    if (frameView->needsLayout())
+        frameView->layout();
 
     RenderView* contentRenderer = mainFrame()->contentRenderer();
-    return contentRenderer->columnCount(contentRenderer->columnInfo());
+    return contentRenderer ? contentRenderer->columnCount(contentRenderer->columnInfo()) : 0;
 }