Title: [244121] branches/safari-607-branch
- Revision
- 244121
- Author
- [email protected]
- Date
- 2019-04-10 10:10:59 -0700 (Wed, 10 Apr 2019)
Log Message
Cherry-pick r243605. rdar://problem/49725707
[SimpleLineLayout] Disable SLL when text-underline-position is not auto.
https://bugs.webkit.org/show_bug.cgi?id=196338
<rdar://problem/47975167>
Reviewed by Daniel Bates.
Source/WebCore:
Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.
Test: fast/text/simple-line-layout-with-text-underline-position.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForStyle):
LayoutTests:
* fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
* fast/text/simple-line-layout-with-text-underline-position.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-607-branch/LayoutTests/ChangeLog (244120 => 244121)
--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-04-10 17:10:56 UTC (rev 244120)
+++ branches/safari-607-branch/LayoutTests/ChangeLog 2019-04-10 17:10:59 UTC (rev 244121)
@@ -1,5 +1,42 @@
2019-04-09 Alan Coon <[email protected]>
+ Cherry-pick r243605. rdar://problem/49725707
+
+ [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+ https://bugs.webkit.org/show_bug.cgi?id=196338
+ <rdar://problem/47975167>
+
+ Reviewed by Daniel Bates.
+
+ Source/WebCore:
+
+ Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.
+
+ Test: fast/text/simple-line-layout-with-text-underline-position.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForStyle):
+
+ LayoutTests:
+
+ * fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
+ * fast/text/simple-line-layout-with-text-underline-position.html: Added.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-03-28 Zalan Bujtas <[email protected]>
+
+ [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+ https://bugs.webkit.org/show_bug.cgi?id=196338
+ <rdar://problem/47975167>
+
+ Reviewed by Daniel Bates.
+
+ * fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
+ * fast/text/simple-line-layout-with-text-underline-position.html: Added.
+
+2019-04-09 Alan Coon <[email protected]>
+
Cherry-pick r241931. rdar://problem/49725665
Fix the test failure following r241918
Added: branches/safari-607-branch/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html (0 => 244121)
--- branches/safari-607-branch/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/text/simple-line-layout-with-text-underline-position-expected.html 2019-04-10 17:10:59 UTC (rev 244121)
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout is disabled for text-underline-position: under</title>
+</head>
+<body></body>
+</html>
Added: branches/safari-607-branch/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html (0 => 244121)
--- branches/safari-607-branch/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/text/simple-line-layout-with-text-underline-position.html 2019-04-10 17:10:59 UTC (rev 244121)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout is disabled for text-underline-position: under</title>
+<style>
+div {
+ color: white;
+}
+
+.first {
+ overflow: hidden;
+}
+.second, .first {
+ text-underline-position: under;
+}
+</style>
+<script>
+if (window.internals) {
+ internals.settings.setSimpleLineLayoutDebugBordersEnabled(true);
+ internals.settings.setSimpleLineLayoutEnabled(true);
+}
+</script>
+</head>
+<body>
+<div class=first>Pass if after selecting these 2 lines</div>
+<div class=second>this line is still visible</div>
+</body>
+</html>
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (244120 => 244121)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-04-10 17:10:56 UTC (rev 244120)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-04-10 17:10:59 UTC (rev 244121)
@@ -1,5 +1,46 @@
2019-04-09 Alan Coon <[email protected]>
+ Cherry-pick r243605. rdar://problem/49725707
+
+ [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+ https://bugs.webkit.org/show_bug.cgi?id=196338
+ <rdar://problem/47975167>
+
+ Reviewed by Daniel Bates.
+
+ Source/WebCore:
+
+ Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.
+
+ Test: fast/text/simple-line-layout-with-text-underline-position.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForStyle):
+
+ LayoutTests:
+
+ * fast/text/simple-line-layout-with-text-underline-position-expected.html: Added.
+ * fast/text/simple-line-layout-with-text-underline-position.html: Added.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-03-28 Zalan Bujtas <[email protected]>
+
+ [SimpleLineLayout] Disable SLL when text-underline-position is not auto.
+ https://bugs.webkit.org/show_bug.cgi?id=196338
+ <rdar://problem/47975167>
+
+ Reviewed by Daniel Bates.
+
+ Disable simple line layout unconditionally on non-auto text-underline-position content. We don't support it yet.
+
+ Test: fast/text/simple-line-layout-with-text-underline-position.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForStyle):
+
+2019-04-09 Alan Coon <[email protected]>
+
Cherry-pick r243104. rdar://problem/49725692
REGRESSION(r236862): early frame decoupling leaves JSC ArrayBuffer objects lingering
Modified: branches/safari-607-branch/Source/WebCore/rendering/SimpleLineLayout.cpp (244120 => 244121)
--- branches/safari-607-branch/Source/WebCore/rendering/SimpleLineLayout.cpp 2019-04-10 17:10:56 UTC (rev 244120)
+++ branches/safari-607-branch/Source/WebCore/rendering/SimpleLineLayout.cpp 2019-04-10 17:10:59 UTC (rev 244121)
@@ -201,7 +201,7 @@
AvoidanceReasonFlags reasons = { };
if (style.textOverflow() == TextOverflow::Ellipsis)
SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextOverflow, reasons, includeReasons);
- if ((style.textDecorationsInEffect() & TextDecoration::Underline) && (style.textUnderlinePosition() != TextUnderlinePosition::Auto || !style.textUnderlineOffset().isAuto() || !style.textDecorationThickness().isAuto()))
+ if (style.textUnderlinePosition() != TextUnderlinePosition::Auto || !style.textUnderlineOffset().isAuto() || !style.textDecorationThickness().isAuto())
SET_REASON_AND_RETURN_IF_NEEDED(FlowHasUnsupportedUnderlineDecoration, reasons, includeReasons);
// Non-visible overflow should be pretty easy to support.
if (style.overflowX() != Overflow::Visible || style.overflowY() != Overflow::Visible)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
