[webkit-changes] [213094] trunk

Mon, 27 Feb 2017 14:41:13 -0800

Title: [213094] trunk
Revision
213094
Author
mmaxfi...@apple.com
Date
2017-02-27 14:41:08 -0800 (Mon, 27 Feb 2017)

Log Message

Unprefix -webkit-line-break
https://bugs.webkit.org/show_bug.cgi?id=168213

Reviewed by Darin Adler.

Source/WebCore:

We support the property as specced.

Test: fast/text/line-break-unprefixed.html

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSProperties.json:
* css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
(WebCore::CSSParserFastPaths::isKeywordPropertyID):
* editing/Editor.cpp:
(WebCore::Editor::applyEditingStyleToElement):
* html/HTMLElement.cpp:
(WebCore::HTMLElement::collectStyleForPresentationAttribute):

LayoutTests:

Updating expected results.

* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/text/line-break-unprefixed.html: Added.
* fast/text/line-break-unprefixed-expected.html: Added.
* svg/css/getComputedStyle-basic-expected.txt:

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (213093 => 213094)


--- trunk/LayoutTests/ChangeLog	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/LayoutTests/ChangeLog	2017-02-27 22:41:08 UTC (rev 213094)
@@ -1,3 +1,18 @@
+2017-02-27  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        Unprefix -webkit-line-break
+        https://bugs.webkit.org/show_bug.cgi?id=168213
+
+        Reviewed by Darin Adler.
+
+        Updating expected results.
+
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * fast/text/line-break-unprefixed.html: Added.
+        * fast/text/line-break-unprefixed-expected.html: Added.
+        * svg/css/getComputedStyle-basic-expected.txt:
+
 2017-02-27  Ryan Haddad  <ryanhad...@apple.com>
 
         Mark imported/w3c/web-platform-tests/IndexedDB/idbdatabase-deleteObjectStore-exception-order.htm as flaky.

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (213093 => 213094)


--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt	2017-02-27 22:41:08 UTC (rev 213094)
@@ -189,7 +189,6 @@
 -webkit-hyphens: manual;
 -webkit-line-align: none;
 -webkit-line-box-contain: block inline replaced;
--webkit-line-break: auto;
 -webkit-line-clamp: none;
 -webkit-line-grid: none;
 -webkit-line-snap: none;

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (213093 => 213094)


--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt	2017-02-27 22:41:08 UTC (rev 213094)
@@ -188,7 +188,6 @@
 -webkit-hyphens: manual
 -webkit-line-align: none
 -webkit-line-box-contain: block inline replaced
--webkit-line-break: auto
 -webkit-line-clamp: none
 -webkit-line-grid: none
 -webkit-line-snap: none

Added: trunk/LayoutTests/fast/text/line-break-unprefixed-expected.html (0 => 213094)


--- trunk/LayoutTests/fast/text/line-break-unprefixed-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/text/line-break-unprefixed-expected.html	2017-02-27 22:41:08 UTC (rev 213094)
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test makes sure that the line-break property works unprefixed.
+<div style="font-size: 30px; width: 3em;" lang="zh-hans">
+<div style="-webkit-line-break: normal;">&#x4EBA;&#x4EBA;&#x4EBA;&#xFF01;</div>
+<div style="-webkit-line-break: loose;">&#x4EBA;&#x4EBA;&#x4EBA;&#xFF01;</div>
+</div>
+</body>
+</html>

Added: trunk/LayoutTests/fast/text/line-break-unprefixed.html (0 => 213094)


--- trunk/LayoutTests/fast/text/line-break-unprefixed.html	                        (rev 0)
+++ trunk/LayoutTests/fast/text/line-break-unprefixed.html	2017-02-27 22:41:08 UTC (rev 213094)
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+This test makes sure that the line-break property works unprefixed.
+<div style="font-size: 30px; width: 3em;" lang="zh-hans">
+<div style="line-break: normal;">&#x4EBA;&#x4EBA;&#x4EBA;&#xFF01;</div>
+<div style="line-break: loose;">&#x4EBA;&#x4EBA;&#x4EBA;&#xFF01;</div>
+</div>
+</body>
+</html>

Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (213093 => 213094)


--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt	2017-02-27 22:41:08 UTC (rev 213094)
@@ -376,8 +376,6 @@
 rect: style.getPropertyCSSValue(-webkit-line-align) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-line-box-contain) : block inline replaced
 rect: style.getPropertyCSSValue(-webkit-line-box-contain) : [object CSSValue]
-rect: style.getPropertyValue(-webkit-line-break) : auto
-rect: style.getPropertyCSSValue(-webkit-line-break) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-line-clamp) : none
 rect: style.getPropertyCSSValue(-webkit-line-clamp) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-line-grid) : none
@@ -930,8 +928,6 @@
 g: style.getPropertyCSSValue(-webkit-line-align) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-line-box-contain) : block inline replaced
 g: style.getPropertyCSSValue(-webkit-line-box-contain) : [object CSSValue]
-g: style.getPropertyValue(-webkit-line-break) : auto
-g: style.getPropertyCSSValue(-webkit-line-break) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-line-clamp) : none
 g: style.getPropertyCSSValue(-webkit-line-clamp) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-line-grid) : none

Modified: trunk/Source/WebCore/ChangeLog (213093 => 213094)


--- trunk/Source/WebCore/ChangeLog	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/Source/WebCore/ChangeLog	2017-02-27 22:41:08 UTC (rev 213094)
@@ -1,5 +1,27 @@
 2017-02-27  Myles C. Maxfield  <mmaxfi...@apple.com>
 
+        Unprefix -webkit-line-break
+        https://bugs.webkit.org/show_bug.cgi?id=168213
+
+        Reviewed by Darin Adler.
+
+        We support the property as specced.
+
+        Test: fast/text/line-break-unprefixed.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSProperties.json:
+        * css/parser/CSSParserFastPaths.cpp:
+        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
+        * editing/Editor.cpp:
+        (WebCore::Editor::applyEditingStyleToElement):
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::collectStyleForPresentationAttribute):
+
+2017-02-27  Myles C. Maxfield  <mmaxfi...@apple.com>
+
         Use RAII for ICU breaking iterators
         https://bugs.webkit.org/show_bug.cgi?id=168203

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (213093 => 213094)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2017-02-27 22:41:08 UTC (rev 213094)
@@ -354,7 +354,7 @@
     CSSPropertyWebkitInitialLetter,
     CSSPropertyWebkitLineAlign,
     CSSPropertyWebkitLineBoxContain,
-    CSSPropertyWebkitLineBreak,
+    CSSPropertyLineBreak,
     CSSPropertyWebkitLineClamp,
     CSSPropertyWebkitLineGrid,
     CSSPropertyWebkitLineSnap,
@@ -3314,7 +3314,7 @@
             return zoomAdjustedPixelValue(style->fontCascade().wordSpacing(), *style);
         case CSSPropertyWordWrap:
             return cssValuePool.createValue(style->overflowWrap());
-        case CSSPropertyWebkitLineBreak:
+        case CSSPropertyLineBreak:
             return cssValuePool.createValue(style->lineBreak());
         case CSSPropertyWebkitNbspMode:
             return cssValuePool.createValue(style->nbspMode());

Modified: trunk/Source/WebCore/css/CSSProperties.json (213093 => 213094)


--- trunk/Source/WebCore/css/CSSProperties.json	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/Source/WebCore/css/CSSProperties.json	2017-02-27 22:41:08 UTC (rev 213094)
@@ -4928,7 +4928,7 @@
                 "comment": "Added in https://trac.webkit.org/changeset/108133"
             }
         },
-        "-webkit-line-break": {
+        "line-break": {
             "inherited": true,
             "values": [
                 "auto",
@@ -4937,15 +4937,18 @@
                 "strict",
                 {
                     "value": "after-white-space",
-                    "status": "non-standard"
+                    "status": "non-standard",
+                    "comment": "Added in https://trac.webkit.org/changeset/7763"
                 }
             ],
-            "status": {
-                "status": "experimental"
-            },
             "specification": {
                 "category": "css-text",
                 "url": "https://www.w3.org/TR/css-text-3/#line-break"
+            },
+            "codegen-properties": {
+                "aliases": [
+                    "-webkit-line-break"
+                ]
             }
         },
         "-webkit-line-clamp": {

Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (213093 => 213094)


--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2017-02-27 22:41:08 UTC (rev 213094)
@@ -721,7 +721,7 @@
         return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
     case CSSPropertyWebkitLineAlign:
         return valueID == CSSValueNone || valueID == CSSValueEdges;
-    case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-white-space
+    case CSSPropertyLineBreak: // auto | loose | normal | strict | after-white-space
         return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpace;
     case CSSPropertyWebkitLineSnap:
         return valueID == CSSValueNone || valueID == CSSValueBaseline || valueID == CSSValueContain;
@@ -881,7 +881,7 @@
     case CSSPropertyWebkitFontSmoothing:
     case CSSPropertyWebkitHyphens:
     case CSSPropertyWebkitLineAlign:
-    case CSSPropertyWebkitLineBreak:
+    case CSSPropertyLineBreak:
     case CSSPropertyWebkitLineSnap:
     case CSSPropertyWebkitMarginAfterCollapse:
     case CSSPropertyWebkitMarginBeforeCollapse:

Modified: trunk/Source/WebCore/editing/Editor.cpp (213093 => 213094)


--- trunk/Source/WebCore/editing/Editor.cpp	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/Source/WebCore/editing/Editor.cpp	2017-02-27 22:41:08 UTC (rev 213094)
@@ -3106,7 +3106,7 @@
     CSSStyleDeclaration* style = downcast<StyledElement>(*element).cssomStyle();
     style->setPropertyInternal(CSSPropertyWordWrap, "break-word", false);
     style->setPropertyInternal(CSSPropertyWebkitNbspMode, "space", false);
-    style->setPropertyInternal(CSSPropertyWebkitLineBreak, "after-white-space", false);
+    style->setPropertyInternal(CSSPropertyLineBreak, "after-white-space", false);
 }
 
 bool Editor::findString(const String& target, FindOptions options)

Modified: trunk/Source/WebCore/html/HTMLElement.cpp (213093 => 213094)


--- trunk/Source/WebCore/html/HTMLElement.cpp	2017-02-27 22:39:31 UTC (rev 213093)
+++ trunk/Source/WebCore/html/HTMLElement.cpp	2017-02-27 22:41:08 UTC (rev 213094)
@@ -183,7 +183,7 @@
         case ContentEditableType::True:
             addPropertyToPresentationAttributeStyle(style, CSSPropertyWordWrap, CSSValueBreakWord);
             addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitNbspMode, CSSValueSpace);
-            addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitLineBreak, CSSValueAfterWhiteSpace);
+            addPropertyToPresentationAttributeStyle(style, CSSPropertyLineBreak, CSSValueAfterWhiteSpace);
 #if PLATFORM(IOS)
             addPropertyToPresentationAttributeStyle(style, CSSPropertyWebkitTextSizeAdjust, CSSValueNone);
 #endif

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to