Changeset 153451 in webkit

Timestamp:

Jul 29, 2013 6:06:27 PM (11 years ago)

Author:

Simon Fraser

Message:

Page count can be incorrect if there is a pending style recalc
​https://bugs.webkit.org/show_bug.cgi?id=119232

Reviewed by Beth Dakin.

If style is changed in a way that schedules a style recalc on the Document,
and then Page::pageCount() is called, we may give the wrong answer because
the existing code only checked FrameView::needsLayout(), not whether a style
recale was pending.

Fix by having Page::pageCount() call updateLayoutIgnorePendingStylesheets()
as we do for other properties that require layer, and are exposed to JS
or via API.

• page/Page.cpp:

(WebCore::Page::pageCount):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Page count can be incorrect if there is a pending style recalc
+        https://bugs.webkit.org/show_bug.cgi?id=119232
+
+        Reviewed by Beth Dakin.
+
+        If style is changed in a way that schedules a style recalc on the Document,
+        and then Page::pageCount() is called, we may give the wrong answer because
+        the existing code only checked FrameView::needsLayout(), not whether a style
+        recale was pending.
+        
+        Fix by having Page::pageCount() call updateLayoutIgnorePendingStylesheets()
+        as we do for other properties that require layer, and are exposed to JS
+        or via API.
+
+        * page/Page.cpp:
+        (WebCore::Page::pageCount):
+
 2013-07-29  Alex Christensen  <achristensen@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -905 +905 @@
         return 0;
 
-    FrameView* frameView = mainFrame()->view();
-    if (frameView->needsLayout())
-        frameView->layout();
+    if (Document* document = mainFrame()->document())
+        document->updateLayoutIgnorePendingStylesheets();
 
     RenderView* contentRenderer = mainFrame()->contentRenderer();