Title: [226069] branches/safari-604-branch
- Revision
- 226069
- Author
- jmarc...@apple.com
- Date
- 2017-12-18 12:23:05 -0800 (Mon, 18 Dec 2017)
Log Message
Revert r225497. rdar://problem/36112729
Modified Paths
Removed Paths
Diff
Modified: branches/safari-604-branch/LayoutTests/ChangeLog (226068 => 226069)
--- branches/safari-604-branch/LayoutTests/ChangeLog 2017-12-18 20:15:41 UTC (rev 226068)
+++ branches/safari-604-branch/LayoutTests/ChangeLog 2017-12-18 20:23:05 UTC (rev 226069)
@@ -1,3 +1,7 @@
+2017-12-18 Jason Marcell <jmarc...@apple.com>
+
+ Revert r225497. rdar://problem/36112729
+
2017-12-06 Jason Marcell <jmarc...@apple.com>
Cherry-pick r225497. rdar://problem/34604139
Deleted: branches/safari-604-branch/LayoutTests/fast/block/float/simple-line-layout-float-shrink-line-expected.html (226068 => 226069)
--- branches/safari-604-branch/LayoutTests/fast/block/float/simple-line-layout-float-shrink-line-expected.html 2017-12-18 20:15:41 UTC (rev 226068)
+++ branches/safari-604-branch/LayoutTests/fast/block/float/simple-line-layout-float-shrink-line-expected.html 2017-12-18 20:23:05 UTC (rev 226069)
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.floating {
- width: 40px;
- height: 10px;
- border: 1px solid blue;
-}
-
-.container {
- width: 150px;
-}
-</style>
-<script>
-if (window.internals)
- internals.settings.setSimpleLineLayoutEnabled(false);
-</script>
-</head>
-<body>
-<div class=container>
- <div class=floating style="float: left"></div>
- <div class=floating style="float: right; clear: left"></div>
- <div>Pass if "this" wraps to the second line.</div>
-</div>
-</body>
-</html>
Deleted: branches/safari-604-branch/LayoutTests/fast/block/float/simple-line-layout-float-shrink-line.html (226068 => 226069)
--- branches/safari-604-branch/LayoutTests/fast/block/float/simple-line-layout-float-shrink-line.html 2017-12-18 20:15:41 UTC (rev 226068)
+++ branches/safari-604-branch/LayoutTests/fast/block/float/simple-line-layout-float-shrink-line.html 2017-12-18 20:23:05 UTC (rev 226069)
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.floating {
- width: 40px;
- height: 10px;
- border: 1px solid blue;
-}
-
-.container {
- width: 150px;
-}
-</style>
-</head>
-<body>
-<div class=container>
- <div class=floating style="float: left"></div>
- <div class=floating style="float: right; clear: left"></div>
- <div>Pass if "this" wraps to the second line.</div>
-</div>
-</body>
-</html>
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (226068 => 226069)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-12-18 20:15:41 UTC (rev 226068)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-12-18 20:23:05 UTC (rev 226069)
@@ -1,3 +1,7 @@
+2017-12-18 Jason Marcell <jmarc...@apple.com>
+
+ Revert r225497. rdar://problem/36112729
+
2017-12-06 Jason Marcell <jmarc...@apple.com>
Cherry-pick r225497. rdar://problem/34604139
Modified: branches/safari-604-branch/Source/WebCore/rendering/SimpleLineLayout.cpp (226068 => 226069)
--- branches/safari-604-branch/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-12-18 20:15:41 UTC (rev 226068)
+++ branches/safari-604-branch/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-12-18 20:23:05 UTC (rev 226069)
@@ -600,9 +600,8 @@
{
bool shouldApplyTextIndent = !flow.isAnonymous() || flow.parent()->firstChild() == &flow;
LayoutUnit height = flow.logicalHeight();
- LayoutUnit logicalHeight = flow.minLineHeightForReplacedRenderer(false, 0);
- line.setLogicalLeftOffset(flow.logicalLeftOffsetForLine(height, DoNotIndentText, logicalHeight) + (shouldApplyTextIndent && isFirstLine ? flow.textIndentOffset() : LayoutUnit(0)));
- float logicalRightOffset = flow.logicalRightOffsetForLine(height, DoNotIndentText, logicalHeight);
+ line.setLogicalLeftOffset(flow.logicalLeftOffsetForLine(height, DoNotIndentText) + (shouldApplyTextIndent && isFirstLine ? flow.textIndentOffset() : LayoutUnit(0)));
+ float logicalRightOffset = flow.logicalRightOffsetForLine(height, DoNotIndentText);
line.setAvailableWidth(std::max<float>(0, logicalRightOffset - line.logicalLeftOffset()));
if (style.textAlign == JUSTIFY)
line.setNeedsAllFragments();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
