Title: [184114] trunk/Source/WebCore
- Revision
- 184114
- Author
- [email protected]
- Date
- 2015-05-11 12:01:26 -0700 (Mon, 11 May 2015)
Log Message
Fix checkingLogicalHeight initialization in Document::updateLayoutIfDimensionsOutOfDate()
https://bugs.webkit.org/show_bug.cgi?id=144873
Reviewed by Simon Fraser.
Fix checkingLogicalHeight initialization in Document::updateLayoutIfDimensionsOutOfDate().
checkingLogicalHeight should only be initialized to true when
"dimensionsCheck & WidthDimensionsCheck" if isVertical is true.
* dom/Document.cpp:
(WebCore::Document::updateLayoutIfDimensionsOutOfDate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184113 => 184114)
--- trunk/Source/WebCore/ChangeLog 2015-05-11 18:59:53 UTC (rev 184113)
+++ trunk/Source/WebCore/ChangeLog 2015-05-11 19:01:26 UTC (rev 184114)
@@ -1,3 +1,17 @@
+2015-05-11 Chris Dumez <[email protected]>
+
+ Fix checkingLogicalHeight initialization in Document::updateLayoutIfDimensionsOutOfDate()
+ https://bugs.webkit.org/show_bug.cgi?id=144873
+
+ Reviewed by Simon Fraser.
+
+ Fix checkingLogicalHeight initialization in Document::updateLayoutIfDimensionsOutOfDate().
+ checkingLogicalHeight should only be initialized to true when
+ "dimensionsCheck & WidthDimensionsCheck" if isVertical is true.
+
+ * dom/Document.cpp:
+ (WebCore::Document::updateLayoutIfDimensionsOutOfDate):
+
2015-05-11 Daniel Bates <[email protected]>
[iOS] Close all open databases in expiration handler of process assertion
Modified: trunk/Source/WebCore/dom/Document.cpp (184113 => 184114)
--- trunk/Source/WebCore/dom/Document.cpp 2015-05-11 18:59:53 UTC (rev 184113)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-05-11 19:01:26 UTC (rev 184114)
@@ -1947,7 +1947,7 @@
bool isVertical = renderer && !renderer->isHorizontalWritingMode();
bool checkingLogicalWidth = ((dimensionsCheck & WidthDimensionsCheck) && !isVertical) || ((dimensionsCheck & HeightDimensionsCheck) && isVertical);
- bool checkingLogicalHeight = ((dimensionsCheck & HeightDimensionsCheck) && !isVertical) || ((dimensionsCheck & WidthDimensionsCheck) && !isVertical);
+ bool checkingLogicalHeight = ((dimensionsCheck & HeightDimensionsCheck) && !isVertical) || ((dimensionsCheck & WidthDimensionsCheck) && isVertical);
bool hasSpecifiedLogicalHeight = renderer && renderer->style().logicalMinHeight() == Length(0, Fixed) && renderer->style().logicalHeight().isFixed() && renderer->style().logicalMaxHeight().isAuto();
if (!requireFullLayout) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
