<!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>[166786] 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/166786">166786</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-04 09:56:46 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Remove outside-shape CSS value
https://bugs.webkit.org/show_bug.cgi?id=131201
Reviewed by Bem Jones-Bey.
Source/WebCore:
Outside-shape is not a valid CSS value anymore. This patch removes it.
No new tests, existing tests are removed.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::shapePropertyValue):
* css/CSSValueKeywords.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::ApplyPropertyShape::applyValue):
* rendering/shapes/ShapeOutsideInfo.cpp:
(WebCore::ShapeOutsideInfo::computedShape):
(WebCore::ShapeOutsideInfo::isEnabledFor):
* rendering/style/ShapeValue.h:
(WebCore::ShapeValue::createOutsideValue): Deleted.
LayoutTests:
* fast/shapes/parsing/parsing-shape-outside-expected.txt:
* fast/shapes/parsing/parsing-shape-outside.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshapesparsingparsingshapeoutsidehtml">trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html</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="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleShapeValueh">trunk/Source/WebCore/rendering/style/ShapeValue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/LayoutTests/ChangeLog 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-04 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove outside-shape CSS value
+ https://bugs.webkit.org/show_bug.cgi?id=131201
+
+ Reviewed by Bem Jones-Bey.
+
+ * fast/shapes/parsing/parsing-shape-outside-expected.txt:
+ * fast/shapes/parsing/parsing-shape-outside.html:
+
</ins><span class="cx"> 2014-04-04 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Gradient offsets are off if compositing operator != source-over
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsideexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside-expected.txt 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -261,8 +261,6 @@
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "url('shape.svg') content-box") is "none"
</span><span class="cx"> PASS getCSSText("-webkit-shape-outside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is ""
</span><span class="cx"> PASS getComputedStyleValue("-webkit-shape-outside", "url('shape.svg') polygon(nonzero, 0 0, 10px 10px, 10px 0)") is "none"
</span><del>-PASS getCSSText("-webkit-shape-outside", "outside-shape") is ""
-PASS getComputedStyleValue("-webkit-shape-outside", "outside-shape") is "none"
</del><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "none", "circle(30px at 10px 20px)") is "parent: none, child: circle(30px at 10px 20px)"
</span><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "circle(30px at 10px 20px)", "initial") is "parent: circle(30px at 10px 20px), child: none"
</span><span class="cx"> PASS getParentAndChildComputedStylesString("-webkit-shape-outside", "circle(30px at 10px 20px)", "") is "parent: circle(30px at 10px 20px), child: none"
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesparsingparsingshapeoutsidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/LayoutTests/fast/shapes/parsing/parsing-shape-outside.html 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> testShapePropertyParsingFailure("-webkit-shape-outside", value, "none")
</span><span class="cx"> });
</span><span class="cx">
</span><del>-testShapePropertyParsingFailure("-webkit-shape-outside", "outside-shape", "none");
-
</del><span class="cx"> applyToEachArglist(
</span><span class="cx"> testNotInheritedShapeProperty,
</span><span class="cx"> [// [property, parentValue, childValue, expectedValue]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-04 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove outside-shape CSS value
+ https://bugs.webkit.org/show_bug.cgi?id=131201
+
+ Reviewed by Bem Jones-Bey.
+
+ Outside-shape is not a valid CSS value anymore. This patch removes it.
+
+ No new tests, existing tests are removed.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::shapePropertyValue):
+ * css/CSSValueKeywords.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyShape::applyValue):
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ (WebCore::ShapeOutsideInfo::computedShape):
+ (WebCore::ShapeOutsideInfo::isEnabledFor):
+ * rendering/style/ShapeValue.h:
+ (WebCore::ShapeValue::createOutsideValue): Deleted.
+
</ins><span class="cx"> 2014-04-04 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Gradient offsets are off if compositing operator != source-over
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -1623,9 +1623,6 @@
</span><span class="cx"> if (!shapeValue)
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx">
</span><del>- if (shapeValue->type() == ShapeValue::Outside)
- return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
-
</del><span class="cx"> if (shapeValue->type() == ShapeValue::Box)
</span><span class="cx"> return cssValuePool().createValue(shapeValue->cssBox());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -969,11 +969,9 @@
</span><span class="cx"> -webkit-crisp-edges
</span><span class="cx"> -webkit-optimize-contrast
</span><span class="cx">
</span><del>-// -webkit-shape-inside
</del><span class="cx"> // -webkit-shape-outside
</span><span class="cx"> nonzero
</span><span class="cx"> evenodd
</span><del>-outside-shape
</del><span class="cx"> at
</span><span class="cx"> // closest-side
</span><span class="cx"> // farthest-side
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -2189,8 +2189,6 @@
</span><span class="cx"> CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
</span><span class="cx"> if (primitiveValue->getValueID() == CSSValueAuto)
</span><span class="cx"> setValue(styleResolver->style(), 0);
</span><del>- else if (primitiveValue->getValueID() == CSSValueOutsideShape)
- setValue(styleResolver->style(), ShapeValue::createOutsideValue());
</del><span class="cx"> } else if (value->isImageValue() || value->isImageSetValue()) {
</span><span class="cx"> RefPtr<ShapeValue> shape = ShapeValue::createImageValue(styleResolver->styleImage(property, value));
</span><span class="cx"> setValue(styleResolver->style(), shape.release());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -185,9 +185,6 @@
</span><span class="cx"> m_shape = Shape::createBoxShape(shapeRect, writingMode, margin);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case ShapeValue::Outside:
- // Outside should have already resolved to a different shape value
- ASSERT_NOT_REACHED();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(m_shape);
</span><span class="lines">@@ -292,15 +289,11 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (shapeValue->type()) {
</span><del>- case ShapeValue::Shape:
- return shapeValue->shape();
- case ShapeValue::Image:
- return shapeValue->isImageValid() && checkShapeImageOrigin(box.document(), *(shapeValue->image()->cachedImage()));
- case ShapeValue::Box:
- return true;
- case ShapeValue::Outside:
- break;
</del><ins>+ case ShapeValue::Shape: return shapeValue->shape();
+ case ShapeValue::Image: return shapeValue->isImageValid() && checkShapeImageOrigin(box.document(), *(shapeValue->image()->cachedImage()));
+ case ShapeValue::Box: return true;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (166785 => 166786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-04-04 16:41:09 UTC (rev 166785)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-04-04 16:56:46 UTC (rev 166786)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> // The None value is defined by a null ShapeValue*
</span><span class="cx"> Shape,
</span><span class="cx"> Box,
</span><del>- Outside,
</del><span class="cx"> Image
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -58,11 +57,6 @@
</span><span class="cx"> return adoptRef(new ShapeValue(boxShape));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<ShapeValue> createOutsideValue()
- {
- return adoptRef(new ShapeValue(Outside));
- }
-
</del><span class="cx"> static PassRefPtr<ShapeValue> createImageValue(PassRefPtr<StyleImage> image)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new ShapeValue(image));
</span></span></pre>
</div>
</div>
</body>
</html>