Title: [125314] trunk/Source/WebCore
- Revision
- 125314
- Author
- [email protected]
- Date
- 2012-08-10 12:38:59 -0700 (Fri, 10 Aug 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125313 => 125314)
--- trunk/Source/WebCore/ChangeLog 2012-08-10 19:22:51 UTC (rev 125313)
+++ trunk/Source/WebCore/ChangeLog 2012-08-10 19:38:59 UTC (rev 125314)
@@ -1,3 +1,13 @@
+2012-08-10 Dan Bernstein <[email protected]>
+
+ <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 <[email protected]>
[CMAKE] Fix wrong idl include path in CMakeList.txt
Modified: trunk/Source/WebCore/page/Page.cpp (125313 => 125314)
--- trunk/Source/WebCore/page/Page.cpp 2012-08-10 19:22:51 UTC (rev 125313)
+++ trunk/Source/WebCore/page/Page.cpp 2012-08-10 19:38:59 UTC (rev 125314)
@@ -709,13 +709,11 @@
return 0;
FrameView* frameView = mainFrame()->view();
- if (!frameView->didFirstLayout())
- return 0;
+ if (frameView->needsLayout())
+ frameView->layout();
- mainFrame()->view()->forceLayout();
-
RenderView* contentRenderer = mainFrame()->contentRenderer();
- return contentRenderer->columnCount(contentRenderer->columnInfo());
+ return contentRenderer ? contentRenderer->columnCount(contentRenderer->columnInfo()) : 0;
}
void Page::didMoveOnscreen()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
