Diff
Modified: trunk/LayoutTests/ChangeLog (149622 => 149623)
--- trunk/LayoutTests/ChangeLog 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/ChangeLog 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,3 +1,19 @@
+2013-05-06 Bem Jones-Bey <bjone...@adobe.com>
+
+ [CSS Exclusions] remove unused -webkit-wrap property
+ https://bugs.webkit.org/show_bug.cgi?id=102105
+
+ Reviewed by Darin Adler.
+
+ Delete tests for the -webkit-wrap property.
+
+ * fast/exclusions/css-exclusions-disabled.html: Remove use of -webkit-wrap.
+ * fast/exclusions/script-tests/wrap-parsing.js: Removed.
+ * fast/exclusions/wrap-parsing-expected.txt: Removed.
+ * fast/exclusions/wrap-parsing.html: Removed.
+ * svg/css/style-change-crash-expected.txt: Removed.
+ * svg/css/style-change-crash.html: Removed.
+
2013-05-06 Christophe Dumez <ch.du...@sisa.samsung.com>
Unreviewed EFL gardening.
Modified: trunk/LayoutTests/fast/exclusions/css-exclusions-disabled.html (149622 => 149623)
--- trunk/LayoutTests/fast/exclusions/css-exclusions-disabled.html 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/fast/exclusions/css-exclusions-disabled.html 2013-05-06 19:11:58 UTC (rev 149623)
@@ -36,8 +36,6 @@
testStyle("-webkit-wrap-through", "none", "wrap");
-testInlineStyle("-webkit-wrap", "both 10px 10px");
-
testStyle("-webkit-shape-outside", "circle(10px, 10px, 10px)", "auto");
testStyle("-webkit-shape-inside", "circle(10px, 10px, 10px)", "outside-shape");
Deleted: trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js (149622 => 149623)
--- trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,48 +0,0 @@
-description('Test parsing of the CSS wrap property.');
-
-if (window.internals)
- window.internals.settings.setCSSExclusionsEnabled(true);
-
-function test(declaration) {
- var div = document.createElement("div");
- div.setAttribute("style", declaration);
- return div.style.webkitWrap;
-}
-
-function testComputedStyle(value) {
- var div = document.createElement("div");
- document.body.appendChild(div);
- div.style.setProperty("-webkit-wrap", value);
- var webkitWrapFlowComputedValue = getComputedStyle(div).getPropertyValue("-webkit-wrap-flow");
- var webkitShapeMarginComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-margin");
- var webkitShapePaddingComputedValue = getComputedStyle(div).getPropertyValue("-webkit-shape-padding");
- document.body.removeChild(div);
- return webkitWrapFlowComputedValue + " " + webkitShapeMarginComputedValue + " " + webkitShapePaddingComputedValue;
-}
-
-shouldBeEqualToString('test("-webkit-wrap: auto")', "auto");
-shouldBeEqualToString('test("-webkit-wrap: start 1px")', "start 1px");
-shouldBeEqualToString('test("-webkit-wrap: end 1px 2px")', "end 1px 2px");
-shouldBeEqualToString('test("-webkit-wrap: 5px both 10pt;")', "both 5px 10pt");
-shouldBeEqualToString('test("-webkit-wrap: 2px 3px clear;")', "clear 2px 3px");
-shouldBeEqualToString('test("-webkit-wrap: 5px maximum;")', "maximum 5px");
-shouldBeEqualToString('test("-webkit-wrap: 5px;")', "5px");
-shouldBeEqualToString('test("-webkit-wrap: 5px 10px;")', "5px 10px");
-
-shouldBeEqualToString('test("-webkit-wrap: none 10px 10em;")', "");
-shouldBeEqualToString('test("-webkit-wrap: auto -5px;")', "");
-shouldBeEqualToString('test("-webkit-wrap: auto both;")', "");
-shouldBeEqualToString('test("-webkit-wrap: auto 1px -10px;")', "");
-shouldBeEqualToString('test("-webkit-wrap: -5px start;")', "");
-shouldBeEqualToString('test("-webkit-wrap: 5px end \'string\';")', "");
-
-shouldBeEqualToString('testComputedStyle("auto")', "auto 0px 0px");
-shouldBeEqualToString('testComputedStyle("start 1px")', "start 1px 0px");
-shouldBeEqualToString('testComputedStyle("end 1px 2px")', "end 1px 2px");
-shouldBeEqualToString('testComputedStyle("5px maximum")', "maximum 5px 0px");
-shouldBeEqualToString('testComputedStyle("5px")', "auto 5px 0px");
-shouldBeEqualToString('testComputedStyle("5px 10px")', "auto 5px 10px");
-
-shouldBeEqualToString('testComputedStyle("none 5px 10px")', "auto 0px 0px");
-shouldBeEqualToString('testComputedStyle("auto -5px")', "auto 0px 0px");
-
Deleted: trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt (149622 => 149623)
--- trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,31 +0,0 @@
-Test parsing of the CSS wrap property.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS test("-webkit-wrap: auto") is "auto"
-PASS test("-webkit-wrap: start 1px") is "start 1px"
-PASS test("-webkit-wrap: end 1px 2px") is "end 1px 2px"
-PASS test("-webkit-wrap: 5px both 10pt;") is "both 5px 10pt"
-PASS test("-webkit-wrap: 2px 3px clear;") is "clear 2px 3px"
-PASS test("-webkit-wrap: 5px maximum;") is "maximum 5px"
-PASS test("-webkit-wrap: 5px;") is "5px"
-PASS test("-webkit-wrap: 5px 10px;") is "5px 10px"
-PASS test("-webkit-wrap: none 10px 10em;") is ""
-PASS test("-webkit-wrap: auto -5px;") is ""
-PASS test("-webkit-wrap: auto both;") is ""
-PASS test("-webkit-wrap: auto 1px -10px;") is ""
-PASS test("-webkit-wrap: -5px start;") is ""
-PASS test("-webkit-wrap: 5px end 'string';") is ""
-PASS testComputedStyle("auto") is "auto 0px 0px"
-PASS testComputedStyle("start 1px") is "start 1px 0px"
-PASS testComputedStyle("end 1px 2px") is "end 1px 2px"
-PASS testComputedStyle("5px maximum") is "maximum 5px 0px"
-PASS testComputedStyle("5px") is "auto 5px 0px"
-PASS testComputedStyle("5px 10px") is "auto 5px 10px"
-PASS testComputedStyle("none 5px 10px") is "auto 0px 0px"
-PASS testComputedStyle("auto -5px") is "auto 0px 0px"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/exclusions/wrap-parsing.html (149622 => 149623)
--- trunk/LayoutTests/fast/exclusions/wrap-parsing.html 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/fast/exclusions/wrap-parsing.html 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/svg/css/style-change-crash-expected.txt (149622 => 149623)
--- trunk/LayoutTests/svg/css/style-change-crash-expected.txt 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/svg/css/style-change-crash-expected.txt 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,3 +0,0 @@
-ALERT: PASS. WebKit didn't crash
-
-
Deleted: trunk/LayoutTests/svg/css/style-change-crash.html (149622 => 149623)
--- trunk/LayoutTests/svg/css/style-change-crash.html 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/LayoutTests/svg/css/style-change-crash.html 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,24 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
- <g>
- <rect id="rect"/>
- </g>
- <br/>
-<script>
-
-function write_br() {
- document.write("<br/>");
- GCController.collect();
-}
-
-document.body.offsetHeight;
-window.addEventListener("DOMSubtreeModified", write_br);
-document.getElementById("rect").style.WebkitWrap="both 2147483519";
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- alert("PASS. WebKit didn't crash");
-} else
- alert("This test requires GCController.");
-
-</script>
-</svg>
Modified: trunk/Source/WebCore/ChangeLog (149622 => 149623)
--- trunk/Source/WebCore/ChangeLog 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/ChangeLog 2013-05-06 19:11:58 UTC (rev 149623)
@@ -1,3 +1,32 @@
+2013-05-06 Bem Jones-Bey <bjone...@adobe.com>
+
+ [CSS Exclusions] remove unused -webkit-wrap property
+ https://bugs.webkit.org/show_bug.cgi?id=102105
+
+ Reviewed by Darin Adler.
+
+ Remove -webkit-wrap property and all mentions. This property doesn't
+ exist in the spec anymore, and was never implemented more than just
+ parsing the property.
+
+ * WebCore.order:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::isInheritedProperty):
+ * css/CSSPropertyNames.in:
+ * css/StylePropertySet.cpp:
+ (WebCore::StylePropertySet::getPropertyValue):
+ (WebCore::StylePropertySet::asText):
+ * css/StylePropertyShorthand.cpp:
+ (WebCore::shorthandForProperty):
+ * css/StylePropertyShorthand.h:
+ (WebCore):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
2013-05-06 Anders Carlsson <ander...@apple.com>
Write storage changes to disk
Modified: trunk/Source/WebCore/WebCore.order (149622 => 149623)
--- trunk/Source/WebCore/WebCore.order 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/WebCore.order 2013-05-06 19:11:58 UTC (rev 149623)
@@ -39723,8 +39723,6 @@
__ZGVZN7WebCore22webkitMarqueeShorthandEvE22webkitMarqueeLonghands.b
__ZZN7WebCore25webkitMaskRepeatShorthandEvE25webkitMaskRepeatLonghands
__ZGVZN7WebCore25webkitMaskRepeatShorthandEvE25webkitMaskRepeatLonghands.b
-__ZZN7WebCore19webkitWrapShorthandEvE19webkitWrapLonghands
-__ZGVZN7WebCore19webkitWrapShorthandEvE19webkitWrapLonghands.b
__ZN7WebCoreL22defaultViewSourceStyleE
__ZZN7WebCore13StyleResolver26keyframeStylesForAnimationEPNS_7ElementEPKNS_11RenderStyleERNS_12KeyframeListEE19zeroPercentKeyframe
__ZZN7WebCore13StyleResolver26keyframeStylesForAnimationEPNS_7ElementEPKNS_11RenderStyleERNS_12KeyframeListEE22hundredPercentKeyframe
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (149622 => 149623)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-05-06 19:11:58 UTC (rev 149623)
@@ -2841,9 +2841,6 @@
case CSSPropertyWebkitTransformOriginX:
case CSSPropertyWebkitTransformOriginY:
case CSSPropertyWebkitTransformOriginZ:
-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrap:
-#endif
#if ENABLE(CSS_SHADERS)
case CSSPropertyMix:
case CSSPropertyParameters:
Modified: trunk/Source/WebCore/css/CSSParser.cpp (149622 => 149623)
--- trunk/Source/WebCore/css/CSSParser.cpp 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-05-06 19:11:58 UTC (rev 149623)
@@ -2976,8 +2976,6 @@
case CSSPropertyWebkitShapePadding:
validPrimitive = (RuntimeEnabledFeatures::cssExclusionsEnabled() && !id && validUnit(value, FLength | FNonNeg));
break;
- case CSSPropertyWebkitWrap:
- return RuntimeEnabledFeatures::cssExclusionsEnabled() && parseShorthand(propId, webkitWrapShorthand(), important);
#endif
#if ENABLE(CSS_IMAGE_ORIENTATION)
case CSSPropertyImageOrientation:
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (149622 => 149623)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2013-05-06 19:11:58 UTC (rev 149623)
@@ -670,7 +670,6 @@
case CSSPropertyWebkitRegionBreakInside:
#endif
#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrap:
case CSSPropertyWebkitWrapFlow:
case CSSPropertyWebkitShapeMargin:
case CSSPropertyWebkitShapePadding:
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (149622 => 149623)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2013-05-06 19:11:58 UTC (rev 149623)
@@ -427,7 +427,6 @@
-webkit-shape-padding
-webkit-wrap-flow
-webkit-wrap-through
--webkit-wrap
#endif
#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
max-zoom
Modified: trunk/Source/WebCore/css/StylePropertySet.cpp (149622 => 149623)
--- trunk/Source/WebCore/css/StylePropertySet.cpp 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/StylePropertySet.cpp 2013-05-06 19:11:58 UTC (rev 149623)
@@ -204,10 +204,6 @@
return getLayeredShorthandValue(webkitTransitionShorthand());
case CSSPropertyWebkitAnimation:
return getLayeredShorthandValue(webkitAnimationShorthand());
-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrap:
- return getShorthandValue(webkitWrapShorthand());
-#endif
#if ENABLE(SVG)
case CSSPropertyMarker: {
RefPtr<CSSValue> value = getPropertyCSSValue(CSSPropertyMarkerStart);
@@ -919,13 +915,6 @@
case CSSPropertyWebkitTransitionDelay:
shorthandPropertyID = CSSPropertyWebkitTransition;
break;
-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrapFlow:
- case CSSPropertyWebkitShapeMargin:
- case CSSPropertyWebkitShapePadding:
- shorthandPropertyID = CSSPropertyWebkitWrap;
- break;
-#endif
default:
break;
}
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (149622 => 149623)
--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2013-05-06 19:11:58 UTC (rev 149623)
@@ -470,19 +470,6 @@
return webkitTransformOriginLonghands;
}
-#if ENABLE(CSS_EXCLUSIONS)
-const StylePropertyShorthand& webkitWrapShorthand()
-{
- static const CSSPropertyID webkitWrapProperties[] = {
- CSSPropertyWebkitWrapFlow,
- CSSPropertyWebkitShapeMargin,
- CSSPropertyWebkitShapePadding
- };
- DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitWrapLonghands, (webkitWrapProperties, WTF_ARRAY_LENGTH(webkitWrapProperties)));
- return webkitWrapLonghands;
-}
-#endif
-
// Returns an empty list if the property is not a shorthand
const StylePropertyShorthand& shorthandForProperty(CSSPropertyID propertyID)
{
@@ -571,10 +558,6 @@
return webkitTransitionShorthand();
case CSSPropertyWebkitTransformOrigin:
return webkitTransformOriginShorthand();
-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrap:
- return webkitWrapShorthand();
-#endif
default: {
DEFINE_STATIC_LOCAL(StylePropertyShorthand, emptyShorthand, ());
return emptyShorthand;
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.h (149622 => 149623)
--- trunk/Source/WebCore/css/StylePropertyShorthand.h 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.h 2013-05-06 19:11:58 UTC (rev 149623)
@@ -102,9 +102,6 @@
const StylePropertyShorthand& webkitTextStrokeShorthand();
const StylePropertyShorthand& webkitTransitionShorthand();
const StylePropertyShorthand& webkitTransformOriginShorthand();
-#if ENABLE(CSS_EXCLUSIONS)
-const StylePropertyShorthand& webkitWrapShorthand();
-#endif
// Returns an empty list if the property is not a shorthand
const StylePropertyShorthand& shorthandForProperty(CSSPropertyID);
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (149622 => 149623)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-05-06 18:49:10 UTC (rev 149622)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-05-06 19:11:58 UTC (rev 149623)
@@ -2473,9 +2473,6 @@
case CSSPropertyWebkitTextStroke:
case CSSPropertyWebkitTransition:
case CSSPropertyWebkitTransformOrigin:
-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrap:
-#endif
ASSERT(isExpandedShorthand(id));
ASSERT_NOT_REACHED();
break;
