Diff
Modified: releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,17 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * fast/text/trailing-word-detection-expected.txt: Added.
+ * fast/text/trailing-word-detection.html: Added.
+ * platform/gtk/TestExpectations:
+ * platform/win/TestExpectations:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
Added: releases/WebKitGTK/webkit-2.24/LayoutTests/fast/text/trailing-word-detection-expected.txt (0 => 245440)
--- releases/WebKitGTK/webkit-2.24/LayoutTests/fast/text/trailing-word-detection-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/fast/text/trailing-word-detection-expected.txt 2019-05-17 10:14:44 UTC (rev 245440)
@@ -0,0 +1,6 @@
+PASS '-apple-trailing-word' in element.style is true
+PASS window.getComputedStyle(element).getPropertyValue('color') is "rgb(0, 128, 0)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: releases/WebKitGTK/webkit-2.24/LayoutTests/fast/text/trailing-word-detection.html (0 => 245440)
--- releases/WebKitGTK/webkit-2.24/LayoutTests/fast/text/trailing-word-detection.html (rev 0)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/fast/text/trailing-word-detection.html 2019-05-17 10:14:44 UTC (rev 245440)
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<style>
+@supports (-apple-trailing-word: auto) {
+ #test {
+ color: rgb(0, 128, 0);
+ }
+}
+</style>
+</head>
+<body>
+<div id="test"></div>
+<script>
+let element = document.getElementById("test");
+shouldBeTrue("'-apple-trailing-word' in element.style");
+shouldBeEqualToString("window.getComputedStyle(element).getPropertyValue('color')", "rgb(0, 128, 0)");
+</script>
+<script src=""
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.24/LayoutTests/platform/gtk/TestExpectations (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/LayoutTests/platform/gtk/TestExpectations 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/platform/gtk/TestExpectations 2019-05-17 10:14:44 UTC (rev 245440)
@@ -3201,6 +3201,7 @@
webkit.org/b/160248 fast/text/combining-mark-paint.html [ ImageOnlyFailure ]
webkit.org/b/160248 fast/text/synthetic-bold-transformed.html [ ImageOnlyFailure ]
+webkit.org/b/160248 fast/text/trailing-word-detection.html [ Failure ]
webkit.org/b/160249 fast/shrink-wrap/rect-shrink-wrap.html [ ImageOnlyFailure ]
Modified: releases/WebKitGTK/webkit-2.24/LayoutTests/platform/win/TestExpectations (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/LayoutTests/platform/win/TestExpectations 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/platform/win/TestExpectations 2019-05-17 10:14:44 UTC (rev 245440)
@@ -2977,6 +2977,7 @@
fast/ruby/ruby-expansion-cjk-5.html [ ImageOnlyFailure ]
fast/text/combining-mark-paint.html [ ImageOnlyFailure ]
fast/text/synthetic-bold-transformed.html [ ImageOnlyFailure ]
+fast/text/trailing-word-detection.html [ Failure ]
# TestRunner::addChromeInputField() and focusWebView() not implemented
fast/forms/focus-option-control-on-page.html [ Skip ]
Modified: releases/WebKitGTK/webkit-2.24/PerformanceTests/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/PerformanceTests/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/PerformanceTests/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,3 +1,13 @@
+2019-04-03 Myles C. Maxfield <[email protected]>
+
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * MotionMark/resources/debug-runner/motionmark.css:
+ (#intro .start-benchmark p):
+
2019-02-08 Saam barati <[email protected]>
Update JetStream2 CLI to not print "ms" since we now just print the score values
Modified: releases/WebKitGTK/webkit-2.24/PerformanceTests/MotionMark/resources/debug-runner/motionmark.css (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/PerformanceTests/MotionMark/resources/debug-runner/motionmark.css 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/PerformanceTests/MotionMark/resources/debug-runner/motionmark.css 2019-05-17 10:14:44 UTC (rev 245440)
@@ -209,7 +209,6 @@
#intro .start-benchmark p {
color: hsl(11, 72%, 50%);
margin-bottom: 1em;
- -apple-trailing-word: -apple-partially-balanced;
}
#intro .start-benchmark button {
Modified: releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/_javascript_Core/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,14 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,35 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ This is an unreviewed partial revert of r243819. Turns out there are some websites
+ which use this property to do browser detection. So, we need to continue to parse
+ the property, but we don't need the property to do anything.
+
+ Test: fast/text/trailing-word-detection.html
+
+ * Configurations/FeatureDefines.xcconfig:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator TrailingWord const):
+ * css/CSSProperties.json:
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ (WebCore::CSSParserFastPaths::isKeywordPropertyID):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::trailingWord const):
+ (WebCore::RenderStyle::setTrailingWord):
+ (WebCore::RenderStyle::initialTrailingWord):
+ * rendering/style/RenderStyleConstants.h:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/PAL/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/PAL/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/PAL/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,14 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2019-05-17 10:14:44 UTC (rev 245440)
@@ -4029,6 +4029,11 @@
return valueForScrollSnapAlignment(style.scrollSnapAlign());
#endif
+#if ENABLE(CSS_TRAILING_WORD)
+ case CSSPropertyAppleTrailingWord:
+ return cssValuePool.createValue(style.trailingWord());
+#endif
+
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle:
return cssValuePool.createValue(style.applePayButtonStyle());
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSPrimitiveValueMappings.h (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSPrimitiveValueMappings.h 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSPrimitiveValueMappings.h 2019-05-17 10:14:44 UTC (rev 245440)
@@ -5405,6 +5405,40 @@
#endif
+#if ENABLE(CSS_TRAILING_WORD)
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TrailingWord e)
+ : CSSValue(PrimitiveClass)
+{
+ m_primitiveUnitType = CSS_VALUE_ID;
+ switch (e) {
+ case TrailingWord::Auto:
+ m_value.valueID = CSSValueAuto;
+ break;
+ case TrailingWord::PartiallyBalanced:
+ m_value.valueID = CSSValueWebkitPartiallyBalanced;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+}
+
+template<> inline CSSPrimitiveValue::operator TrailingWord() const
+{
+ ASSERT(isValueID());
+ switch (m_value.valueID) {
+ case CSSValueAuto:
+ return TrailingWord::Auto;
+ case CSSValueWebkitPartiallyBalanced:
+ return TrailingWord::PartiallyBalanced;
+ default:
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return TrailingWord::Auto;
+}
+#endif
+
#if ENABLE(APPLE_PAY)
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ApplePayButtonStyle e)
: CSSValue(PrimitiveClass)
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSProperties.json (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSProperties.json 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSProperties.json 2019-05-17 10:14:44 UTC (rev 245440)
@@ -6954,6 +6954,21 @@
},
"status": "non-standard"
},
+ "-apple-trailing-word": {
+ "inherited": true,
+ "values": [
+ "auto",
+ "-webkit-partially-balanced"
+ ],
+ "codegen-properties": {
+ "name-for-methods": "TrailingWord",
+ "enable-if": "ENABLE_CSS_TRAILING_WORD"
+ },
+ "status": {
+ "status": "non-standard",
+ "comment": "Needed for feature-detecting the Safari browser. Implementation has no effect."
+ }
+ },
"-apple-pay-button-style": {
"codegen-properties": {
"enable-if": "ENABLE_APPLE_PAY"
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSValueKeywords.in (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSValueKeywords.in 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/css/CSSValueKeywords.in 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1323,6 +1323,11 @@
from-dimensions
from-intrinsic
+#if defined(ENABLE_CSS_TRAILING_WORD) && ENABLE_CSS_TRAILING_WORD
+// -apple-trailing-word
+-webkit-partially-balanced
+#endif
+
#if defined(ENABLE_APPLE_PAY) && ENABLE_APPLE_PAY
// -apple-pay-button-style
white-outline
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/css/parser/CSSParserFastPaths.cpp (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2019-05-17 10:14:44 UTC (rev 245440)
@@ -762,6 +762,10 @@
return valueID == CSSValueNormal || valueID == CSSValueBreakAll || valueID == CSSValueKeepAll || valueID == CSSValueBreakWord;
case CSSPropertyWebkitBorderFit:
return valueID == CSSValueBorder || valueID == CSSValueLines;
+#if ENABLE(CSS_TRAILING_WORD)
+ case CSSPropertyAppleTrailingWord: // auto | -apple-partially-balanced
+ return valueID == CSSValueAuto || valueID == CSSValueWebkitPartiallyBalanced;
+#endif
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
@@ -930,6 +934,9 @@
// case CSSPropertyTextJustify:
// case CSSPropertyTextOrientation:
// case CSSPropertyUserSelect:
+#if ENABLE(CSS_TRAILING_WORD)
+ case CSSPropertyAppleTrailingWord:
+#endif
#if ENABLE(CSS_COMPOSITING)
case CSSPropertyIsolation:
case CSSPropertyMixBlendMode:
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/style/RenderStyle.h (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/style/RenderStyle.h 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/style/RenderStyle.h 2019-05-17 10:14:44 UTC (rev 245440)
@@ -799,6 +799,10 @@
bool shouldPlaceBlockDirectionScrollbarOnLeft() const;
+#if ENABLE(CSS_TRAILING_WORD)
+ TrailingWord trailingWord() const { return TrailingWord::Auto; }
+#endif
+
#if ENABLE(APPLE_PAY)
ApplePayButtonStyle applePayButtonStyle() const { return static_cast<ApplePayButtonStyle>(m_rareNonInheritedData->applePayButtonStyle); }
ApplePayButtonType applePayButtonType() const { return static_cast<ApplePayButtonType>(m_rareNonInheritedData->applePayButtonType); }
@@ -1255,6 +1259,10 @@
void setTextSecurity(TextSecurity security) { SET_VAR(m_rareInheritedData, textSecurity, static_cast<unsigned>(security)); }
+#if ENABLE(CSS_TRAILING_WORD)
+ void setTrailingWord(TrailingWord) { }
+#endif
+
#if ENABLE(APPLE_PAY)
void setApplePayButtonStyle(ApplePayButtonStyle style) { SET_VAR(m_rareNonInheritedData, applePayButtonStyle, static_cast<unsigned>(style)); }
void setApplePayButtonType(ApplePayButtonType type) { SET_VAR(m_rareNonInheritedData, applePayButtonType, static_cast<unsigned>(type)); }
@@ -1622,6 +1630,10 @@
static Length initialScrollPadding() { return Length(Fixed); }
#endif
+#if ENABLE(CSS_TRAILING_WORD)
+ static TrailingWord initialTrailingWord() { return TrailingWord::Auto; }
+#endif
+
#if ENABLE(APPLE_PAY)
static ApplePayButtonStyle initialApplePayButtonStyle() { return ApplePayButtonStyle::Black; }
static ApplePayButtonType initialApplePayButtonType() { return ApplePayButtonType::Plain; }
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/style/RenderStyleConstants.h (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/style/RenderStyleConstants.h 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/style/RenderStyleConstants.h 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1108,6 +1108,13 @@
};
#endif
+#if ENABLE(CSS_TRAILING_WORD)
+enum class TrailingWord : uint8_t {
+ Auto,
+ PartiallyBalanced
+};
+#endif
+
#if ENABLE(APPLE_PAY)
enum class ApplePayButtonStyle : uint8_t {
White,
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,14 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKitLegacy/mac/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Source/WebKitLegacy/mac/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKitLegacy/mac/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,14 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
Modified: releases/WebKitGTK/webkit-2.24/Tools/ChangeLog (245439 => 245440)
--- releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-05-17 10:14:31 UTC (rev 245439)
+++ releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-05-17 10:14:44 UTC (rev 245440)
@@ -1,5 +1,14 @@
2019-04-03 Myles C. Maxfield <[email protected]>
+ -apple-trailing-word is needed for browser detection
+ https://bugs.webkit.org/show_bug.cgi?id=196575
+
+ Unreviewed.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+2019-04-03 Myles C. Maxfield <[email protected]>
+
Remove support for -apple-trailing-word
https://bugs.webkit.org/show_bug.cgi?id=196525
