<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166618] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166618">166618</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-01 15:13:34 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Exclusions] Remove exclusions parsing support
https://bugs.webkit.org/show_bug.cgi?id=131046
Reviewed by David Hyatt.
Source/WebCore:
CSS Exclusions specification [1] needs some evolution before the actual implementation happens.
We have only the parsing code in WebKit for -webkit-wrap-flow and -webkit-wrap-through.
This patch removes the code from the trunk for now, it doesn't make sense to keep it around.
[1] http://www.w3.org/TR/css3-exclusions/
Removed existing parsing tests.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
(WebCore::CSSPrimitiveValue::operator WrapFlow): Deleted.
(WebCore::CSSPrimitiveValue::operator WrapThrough): Deleted.
* css/CSSPropertyNames.in:
* css/CSSValueKeywords.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
Source/WebInspectorUI:
* UserInterface/Models/CSSKeywordCompletions.js:
Tools:
* Scripts/webkitperl/FeatureList.pm:
LayoutTests:
* fast/exclusions/css-exclusions-disabled-expected.txt: Removed.
* fast/exclusions/css-exclusions-disabled.html: Removed.
* fast/exclusions/css-exclusions-enabled-expected.txt: Removed.
* fast/exclusions/css-exclusions-enabled.html: Removed.
* fast/exclusions/parsing/parsing-wrap-flow-expected.txt: Removed.
* fast/exclusions/parsing/parsing-wrap-flow.html: Removed.
* fast/exclusions/parsing/parsing-wrap-through-expected.txt: Removed.
* fast/exclusions/parsing/parsing-wrap-through.html: Removed.
* fast/exclusions/parsing/script-tests/parsing-test-utils.js: Removed.
* fast/exclusions/parsing/script-tests/parsing-wrap-flow.js: Removed.
* fast/exclusions/parsing/script-tests/parsing-wrap-through.js: Removed.
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwincairoTestExpectations">trunk/LayoutTests/platform/wincairo/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/exclusions/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/LayoutTests/ChangeLog 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-01 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Exclusions] Remove exclusions parsing support
+ https://bugs.webkit.org/show_bug.cgi?id=131046
+
+ Reviewed by David Hyatt.
+
+ * fast/exclusions/css-exclusions-disabled-expected.txt: Removed.
+ * fast/exclusions/css-exclusions-disabled.html: Removed.
+ * fast/exclusions/css-exclusions-enabled-expected.txt: Removed.
+ * fast/exclusions/css-exclusions-enabled.html: Removed.
+ * fast/exclusions/parsing/parsing-wrap-flow-expected.txt: Removed.
+ * fast/exclusions/parsing/parsing-wrap-flow.html: Removed.
+ * fast/exclusions/parsing/parsing-wrap-through-expected.txt: Removed.
+ * fast/exclusions/parsing/parsing-wrap-through.html: Removed.
+ * fast/exclusions/parsing/script-tests/parsing-test-utils.js: Removed.
+ * fast/exclusions/parsing/script-tests/parsing-wrap-flow.js: Removed.
+ * fast/exclusions/parsing/script-tests/parsing-wrap-through.js: Removed.
+ * platform/win/TestExpectations:
+ * platform/wincairo/TestExpectations:
+
</ins><span class="cx"> 2014-04-01 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Enable runtime feature if feature flag is enabled
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1409,9 +1409,6 @@
</span><span class="cx"> # JSC does not support setIsolatedWorldSecurityOrigin
</span><span class="cx"> webkit.org/b/61540 http/tests/security/isolatedWorld/cross-origin-xhr.html [ Failure ]
</span><span class="cx">
</span><del>-# CSS Exclusions support not yet enabled.
-webkit.org/b/57311 fast/exclusions
-
</del><span class="cx"> webkit.org/b/62595 fast/workers/worker-crash-with-invalid-location.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> # Need to implement getFormValue().
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwincairoTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wincairo/TestExpectations 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1981,10 +1981,6 @@
</span><span class="cx"> # CSS Regions support not yet enabled. http://webkit.org/b/57312
</span><span class="cx"> fast/regions
</span><span class="cx">
</span><del>-# CSS Exclusions support not yet enabled. http://webkit.org/b/57311
-fast/exclusions
-csswg/submitted/shapes
-
</del><span class="cx"> # Causes a SyntaxError (http://webkit.org/b/62595).
</span><span class="cx"> fast/workers/worker-crash-with-invalid-location.html
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/ChangeLog 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-04-01 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Exclusions] Remove exclusions parsing support
+ https://bugs.webkit.org/show_bug.cgi?id=131046
+
+ Reviewed by David Hyatt.
+
+ CSS Exclusions specification [1] needs some evolution before the actual implementation happens.
+ We have only the parsing code in WebKit for -webkit-wrap-flow and -webkit-wrap-through.
+ This patch removes the code from the trunk for now, it doesn't make sense to keep it around.
+
+ [1] http://www.w3.org/TR/css3-exclusions/
+
+ Removed existing parsing tests.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
+ (WebCore::CSSPrimitiveValue::operator WrapFlow): Deleted.
+ (WebCore::CSSPrimitiveValue::operator WrapThrough): Deleted.
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2014-04-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the rest of the old Canvas inspection support.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -385,10 +385,6 @@
</span><span class="cx"> CSSPropertyWebkitRegionBreakInside,
</span><span class="cx"> CSSPropertyWebkitRegionFragment,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_EXCLUSIONS)
- CSSPropertyWebkitWrapFlow,
- CSSPropertyWebkitWrapThrough,
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> CSSPropertyWebkitShapeMargin,
</span><span class="cx"> CSSPropertyWebkitShapeImageThreshold,
</span><span class="lines">@@ -2806,12 +2802,6 @@
</span><span class="cx"> case CSSPropertyWebkitRegionFragment:
</span><span class="cx"> return cssValuePool().createValue(style->regionFragment());
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrapFlow:
- return cssValuePool().createValue(style->wrapFlow());
- case CSSPropertyWebkitWrapThrough:
- return cssValuePool().createValue(style->wrapThrough());
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> case CSSPropertyWebkitShapeMargin:
</span><span class="cx"> return cssValuePool().createValue(style->shapeMargin());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1017,20 +1017,6 @@
</span><span class="cx"> if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrapFlow:
- if (!RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
- return false;
- if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueMaximum || valueID == CSSValueClear)
- return true;
- break;
- case CSSPropertyWebkitWrapThrough:
- if (!RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
- return false;
- if (valueID == CSSValueWrap || valueID == CSSValueNone)
- return true;
- break;
-#endif
</del><span class="cx"> case CSSPropertyWebkitWritingMode:
</span><span class="cx"> if (valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalBt)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1163,10 +1149,6 @@
</span><span class="cx"> case CSSPropertyWebkitUserDrag:
</span><span class="cx"> case CSSPropertyWebkitUserModify:
</span><span class="cx"> case CSSPropertyWebkitUserSelect:
</span><del>-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrapFlow:
- case CSSPropertyWebkitWrapThrough:
-#endif
</del><span class="cx"> case CSSPropertyWebkitWritingMode:
</span><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWordBreak:
</span><span class="lines">@@ -3038,10 +3020,6 @@
</span><span class="cx"> case CSSPropertyWebkitUserDrag:
</span><span class="cx"> case CSSPropertyWebkitUserModify:
</span><span class="cx"> case CSSPropertyWebkitUserSelect:
</span><del>-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrapFlow:
- case CSSPropertyWebkitWrapThrough:
-#endif
</del><span class="cx"> case CSSPropertyWebkitWritingMode:
</span><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWordBreak:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -4581,88 +4581,6 @@
</span><span class="cx"> return NormalColumnProgression;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (wrapFlow) {
- case WrapFlowAuto:
- m_value.valueID = CSSValueAuto;
- break;
- case WrapFlowBoth:
- m_value.valueID = CSSValueBoth;
- break;
- case WrapFlowStart:
- m_value.valueID = CSSValueStart;
- break;
- case WrapFlowEnd:
- m_value.valueID = CSSValueEnd;
- break;
- case WrapFlowMaximum:
- m_value.valueID = CSSValueMaximum;
- break;
- case WrapFlowClear:
- m_value.valueID = CSSValueClear;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator WrapFlow() const
-{
- ASSERT(isValueID());
-
- switch (m_value.valueID) {
- case CSSValueAuto:
- return WrapFlowAuto;
- case CSSValueBoth:
- return WrapFlowBoth;
- case CSSValueStart:
- return WrapFlowStart;
- case CSSValueEnd:
- return WrapFlowEnd;
- case CSSValueMaximum:
- return WrapFlowMaximum;
- case CSSValueClear:
- return WrapFlowClear;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return WrapFlowAuto;
-}
-
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapThrough wrapThrough)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (wrapThrough) {
- case WrapThroughWrap:
- m_value.valueID = CSSValueWrap;
- break;
- case WrapThroughNone:
- m_value.valueID = CSSValueNone;
- break;
- }
-}
-
-template<> inline CSSPrimitiveValue::operator WrapThrough() const
-{
- ASSERT(isValueID());
-
- switch (m_value.valueID) {
- case CSSValueWrap:
- return WrapThroughWrap;
- case CSSValueNone:
- return WrapThroughNone;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return WrapThroughWrap;
-}
-
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> template<> inline CSSPrimitiveValue::operator GridAutoFlow() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -440,10 +440,6 @@
</span><span class="cx"> -webkit-shape-margin
</span><span class="cx"> -webkit-shape-image-threshold
</span><span class="cx"> #endif
</span><del>-#if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
--webkit-wrap-flow
--webkit-wrap-through
-#endif
</del><span class="cx"> #if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx"> max-zoom
</span><span class="cx"> min-zoom
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -982,17 +982,7 @@
</span><span class="cx"> // auto
</span><span class="cx"> break
</span><span class="cx">
</span><del>-// -webkit-wrap-flow
-// auto
-// both
-// left
-// right
-maximum
-// clear
-
-// -webkit-wrap-through
</del><span class="cx"> wrap
</span><del>-// none
</del><span class="cx">
</span><span class="cx"> // -webkit-line-align
</span><span class="cx"> edges
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -2609,11 +2609,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitUserModify, ApplyPropertyDefault<EUserModify, &RenderStyle::userModify, EUserModify, &RenderStyle::setUserModify, EUserModify, &RenderStyle::initialUserModify>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitUserSelect, ApplyPropertyDefault<EUserSelect, &RenderStyle::userSelect, EUserSelect, &RenderStyle::setUserSelect, EUserSelect, &RenderStyle::initialUserSelect>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
</span><del>-
-#if ENABLE(CSS_EXCLUSIONS)
- setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
- setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
-#endif
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyDefault<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -3002,10 +3002,6 @@
</span><span class="cx"> case CSSPropertyWebkitShapeImageThreshold:
</span><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_EXCLUSIONS)
- case CSSPropertyWebkitWrapFlow:
- case CSSPropertyWebkitWrapThrough:
-#endif
</del><span class="cx"> case CSSPropertyWhiteSpace:
</span><span class="cx"> case CSSPropertyWidows:
</span><span class="cx"> case CSSPropertyWidth:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -415,10 +415,6 @@
</span><span class="cx"> if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedData->m_regionFragment)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_wrapFlow
- || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedData->m_wrapThrough)
- return true;
-
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> if (rareNonInheritedData->m_shapeMargin != other->rareNonInheritedData->m_shapeMargin)
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1031,9 +1031,6 @@
</span><span class="cx"> LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData->m_lineSnap); }
</span><span class="cx"> LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedData->m_lineAlign); }
</span><span class="cx">
</span><del>- WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedData->m_wrapFlow); }
- WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInheritedData->m_wrapThrough); }
-
</del><span class="cx"> // Apple-specific property getter methods
</span><span class="cx"> EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(inherited_flags._pointerEvents); }
</span><span class="cx"> const AnimationList* animations() const { return rareNonInheritedData->m_animations.get(); }
</span><span class="lines">@@ -1547,9 +1544,6 @@
</span><span class="cx"> void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
</span><span class="cx"> void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInheritedData, m_regionFragment, regionFragment); }
</span><span class="cx">
</span><del>- void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
- void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
-
</del><span class="cx"> // Apple-specific property setters
</span><span class="cx"> void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p; }
</span><span class="cx">
</span><span class="lines">@@ -1913,9 +1907,6 @@
</span><span class="cx"> static const AtomicString& initialRegionThread() { return nullAtom; }
</span><span class="cx"> static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
</span><span class="cx">
</span><del>- static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
- static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
-
</del><span class="cx"> // Keep these at the end.
</span><span class="cx"> static LineClampValue initialLineClamp() { return LineClampValue(); }
</span><span class="cx"> static ETextSecurity initialTextSecurity() { return TSNONE; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -535,10 +535,6 @@
</span><span class="cx">
</span><span class="cx"> enum LineAlign { LineAlignNone, LineAlignEdges };
</span><span class="cx">
</span><del>-enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlowMaximum, WrapFlowClear };
-
-enum WrapThrough { WrapThroughWrap, WrapThroughNone };
-
</del><span class="cx"> enum RubyPosition { RubyPositionBefore, RubyPositionAfter };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -84,8 +84,6 @@
</span><span class="cx"> , m_borderFit(RenderStyle::initialBorderFit())
</span><span class="cx"> , m_textCombine(RenderStyle::initialTextCombine())
</span><span class="cx"> , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
</span><del>- , m_wrapFlow(RenderStyle::initialWrapFlow())
- , m_wrapThrough(RenderStyle::initialWrapThrough())
</del><span class="cx"> , m_runningAcceleratedAnimation(false)
</span><span class="cx"> , m_aspectRatioType(RenderStyle::initialAspectRatioType())
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -163,8 +161,6 @@
</span><span class="cx"> , m_borderFit(o.m_borderFit)
</span><span class="cx"> , m_textCombine(o.m_textCombine)
</span><span class="cx"> , m_textDecorationStyle(o.m_textDecorationStyle)
</span><del>- , m_wrapFlow(o.m_wrapFlow)
- , m_wrapThrough(o.m_wrapThrough)
</del><span class="cx"> , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
</span><span class="cx"> , m_aspectRatioType(o.m_aspectRatioType)
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -253,8 +249,6 @@
</span><span class="cx"> && m_borderFit == o.m_borderFit
</span><span class="cx"> && m_textCombine == o.m_textCombine
</span><span class="cx"> && m_textDecorationStyle == o.m_textDecorationStyle
</span><del>- && m_wrapFlow == o.m_wrapFlow
- && m_wrapThrough == o.m_wrapThrough
</del><span class="cx"> && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> && m_effectiveBlendMode == o.m_effectiveBlendMode
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -185,8 +185,6 @@
</span><span class="cx"> unsigned m_textCombine : 1; // CSS3 text-combine properties
</span><span class="cx">
</span><span class="cx"> unsigned m_textDecorationStyle : 3; // TextDecorationStyle
</span><del>- unsigned m_wrapFlow: 3; // WrapFlow
- unsigned m_wrapThrough: 1; // WrapThrough
</del><span class="cx">
</span><span class="cx"> unsigned m_runningAcceleratedAnimation : 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-01 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Exclusions] Remove exclusions parsing support
+ https://bugs.webkit.org/show_bug.cgi?id=131046
+
+ Reviewed by David Hyatt.
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
</ins><span class="cx"> 2014-04-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the rest of the old Canvas inspection support.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -766,12 +766,6 @@
</span><span class="cx"> "-webkit-region-overflow": [
</span><span class="cx"> "auto", "break"
</span><span class="cx"> ],
</span><del>- "-webkit-wrap-flow": [
- "auto", "both", "start", "end", "maximum", "clear"
- ],
- "-webkit-wrap-through": [
- "wrap", "none"
- ],
</del><span class="cx"> "-webkit-backface-visibility": [
</span><span class="cx"> "visible", "hidden"
</span><span class="cx"> ],
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Tools/ChangeLog 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-01 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Exclusions] Remove exclusions parsing support
+ https://bugs.webkit.org/show_bug.cgi?id=131046
+
+ Reviewed by David Hyatt.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
</ins><span class="cx"> 2014-04-01 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove last reference to GTK+ WK1 EWS
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (166617 => 166618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-04-01 22:13:34 UTC (rev 166618)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> $css4ImagesSupport,
</span><span class="cx"> $cssBoxDecorationBreakSupport,
</span><span class="cx"> $cssDeviceAdaptation,
</span><del>- $cssExclusionsSupport,
</del><span class="cx"> $cssFiltersSupport,
</span><span class="cx"> $cssGridLayoutSupport,
</span><span class="cx"> $cssImageOrientationSupport,
</span><span class="lines">@@ -183,9 +182,6 @@
</span><span class="cx"> { option => "css-device-adaptation", desc => "Toggle CSS Device Adaptation support",
</span><span class="cx"> define => "ENABLE_CSS_DEVICE_ADAPTATION", default => isEfl(), value => \$cssDeviceAdaptation },
</span><span class="cx">
</span><del>- { option => "css-exclusions", desc => "Toggle CSS Exclusions support",
- define => "ENABLE_CSS_EXCLUSIONS", default => 1, value => \$cssExclusionsSupport },
-
</del><span class="cx"> { option => "css-shapes", desc => "Toggle CSS Shapes support",
</span><span class="cx"> define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>