Title: [149393] trunk/Source/WebCore
- Revision
- 149393
- Author
- [email protected]
- Date
- 2013-04-30 12:54:20 -0700 (Tue, 30 Apr 2013)
Log Message
Page::pageCount() is inaccurate when we allow the first paint in App Mode
https://bugs.webkit.org/show_bug.cgi?id=115442
-and corresponding-
<rdar://problem/13758445>
Reviewed by Dave Hyatt.
We should set the height here all the time, even if it is the first layout.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::checkForPaginationLogicalHeightChange):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149392 => 149393)
--- trunk/Source/WebCore/ChangeLog 2013-04-30 19:42:45 UTC (rev 149392)
+++ trunk/Source/WebCore/ChangeLog 2013-04-30 19:54:20 UTC (rev 149393)
@@ -1,3 +1,16 @@
+2013-04-30 Beth Dakin <[email protected]>
+
+ Page::pageCount() is inaccurate when we allow the first paint in App Mode
+ https://bugs.webkit.org/show_bug.cgi?id=115442
+ -and corresponding-
+ <rdar://problem/13758445>
+
+ Reviewed by Dave Hyatt.
+
+ We should set the height here all the time, even if it is the first layout.
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::checkForPaginationLogicalHeightChange):
+
2013-04-30 Andreas Kling <[email protected]>
Don't create StyleResolvers just to invalidate them.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (149392 => 149393)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-04-30 19:42:45 UTC (rev 149392)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-04-30 19:54:20 UTC (rev 149393)
@@ -1517,10 +1517,11 @@
}
setLogicalHeight(0);
}
- if (colInfo->columnHeight() != pageLogicalHeight && everHadLayout()) {
- colInfo->setColumnHeight(pageLogicalHeight);
+
+ if (colInfo->columnHeight() != pageLogicalHeight && everHadLayout())
pageLogicalHeightChanged = true;
- }
+
+ colInfo->setColumnHeight(pageLogicalHeight);
if (!hasSpecifiedPageLogicalHeight && !pageLogicalHeight)
colInfo->clearForcedBreaks();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
