<!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>[177289] trunk/Source/WebCore</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/177289">177289</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-12-15 10:57:58 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Fix StyleBuilder code to use CSSValueNone to match spec and other code
https://bugs.webkit.org/show_bug.cgi?id=139601
Reviewed by Chris Dumez.
Change the code to properly use CSSValueNone instead of CSSValueAuto.
Asserts have been added to catch similar errors in the future.
In doing this change, it became apparent that there is nothing
special about the shape-outside property that requires custom code, so
it was changed to use a standard converter function.
No change observable via LayoutTests.
* css/CSSPropertyNames.in: Use a converter instead of custom code.
* css/StyleBuilderConverter.h:
(WebCore::isImageShape): Helper function so that isImageSetValue can
be properly guarded.
(WebCore::StyleBuilderConverter::convertShapeValue): Format as a
converter instead of custom code.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueWebkitShapeOutside): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177288 => 177289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-15 18:57:07 UTC (rev 177288)
+++ trunk/Source/WebCore/ChangeLog 2014-12-15 18:57:58 UTC (rev 177289)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-15 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ [CSS Shapes] Fix StyleBuilder code to use CSSValueNone to match spec and other code
+ https://bugs.webkit.org/show_bug.cgi?id=139601
+
+ Reviewed by Chris Dumez.
+
+ Change the code to properly use CSSValueNone instead of CSSValueAuto.
+ Asserts have been added to catch similar errors in the future.
+ In doing this change, it became apparent that there is nothing
+ special about the shape-outside property that requires custom code, so
+ it was changed to use a standard converter function.
+
+ No change observable via LayoutTests.
+
+ * css/CSSPropertyNames.in: Use a converter instead of custom code.
+ * css/StyleBuilderConverter.h:
+ (WebCore::isImageShape): Helper function so that isImageSetValue can
+ be properly guarded.
+ (WebCore::StyleBuilderConverter::convertShapeValue): Format as a
+ converter instead of custom code.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueWebkitShapeOutside): Deleted.
+
</ins><span class="cx"> 2014-12-15 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure range based iteration of Vector<> still receives bounds checking
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (177288 => 177289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-15 18:57:07 UTC (rev 177288)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-15 18:57:58 UTC (rev 177289)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> -webkit-region-break-inside [TypeName=EPageBreak, Initial=initialPageBreak]
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
</span><del>--webkit-shape-outside [Custom=Value]
</del><ins>+-webkit-shape-outside [Converter=ShapeValue]
</ins><span class="cx"> -webkit-shape-margin [Converter=Length]
</span><span class="cx"> -webkit-shape-image-threshold [Converter=Number<float>]
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (177288 => 177289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-12-15 18:57:07 UTC (rev 177288)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-12-15 18:57:58 UTC (rev 177289)
</span><span class="lines">@@ -29,6 +29,9 @@
</span><span class="cx">
</span><span class="cx"> #include "BasicShapeFunctions.h"
</span><span class="cx"> #include "CSSCalculationValue.h"
</span><ins>+#include "CSSImageGeneratorValue.h"
+#include "CSSImageSetValue.h"
+#include "CSSImageValue.h"
</ins><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSReflectValue.h"
</span><span class="cx"> #include "Length.h"
</span><span class="lines">@@ -74,6 +77,7 @@
</span><span class="cx"> static float convertTextStrokeWidth(StyleResolver&, CSSValue&);
</span><span class="cx"> static LineBoxContain convertLineBoxContain(StyleResolver&, CSSValue&);
</span><span class="cx"> static TextDecorationSkip convertTextDecorationSkip(StyleResolver&, CSSValue&);
</span><ins>+ static PassRefPtr<ShapeValue> convertShapeValue(StyleResolver&, CSSValue&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static Length convertToRadiusLength(CSSToLengthConversionData&, CSSPrimitiveValue&);
</span><span class="lines">@@ -586,7 +590,54 @@
</span><span class="cx"> return skip;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SHAPES)
+static inline bool isImageShape(const CSSValue& value)
+{
+ return is<CSSImageValue>(value)
+#if ENABLE(CSS_IMAGE_SET)
+ || is<CSSImageSetValue>(value)
+#endif
+ || is<CSSImageGeneratorValue>(value);
+}
</ins><span class="cx">
</span><ins>+inline PassRefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(StyleResolver& styleResolver, CSSValue& value)
+{
+ if (is<CSSPrimitiveValue>(value)) {
+ ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone);
+ return nullptr;
+ }
+
+ if (isImageShape(value))
+ return ShapeValue::createImageValue(styleResolver.styleImage(CSSPropertyWebkitShapeOutside, value));
+
+ RefPtr<BasicShape> shape;
+ CSSBoxType referenceBox = BoxMissing;
+ for (auto& currentValue : downcast<CSSValueList>(value)) {
+ CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(currentValue.get());
+ if (primitiveValue.isShape())
+ shape = basicShapeForValue(styleResolver.state().cssToLengthConversionData(), primitiveValue.getShapeValue());
+ else if (primitiveValue.getValueID() == CSSValueContentBox
+ || primitiveValue.getValueID() == CSSValueBorderBox
+ || primitiveValue.getValueID() == CSSValuePaddingBox
+ || primitiveValue.getValueID() == CSSValueMarginBox)
+ referenceBox = primitiveValue;
+ else {
+ ASSERT_NOT_REACHED();
+ return nullptr;
+ }
+ }
+
+ if (shape)
+ return ShapeValue::createShapeValue(shape.release(), referenceBox);
+
+ if (referenceBox != BoxMissing)
+ return ShapeValue::createBoxShapeValue(referenceBox);
+
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+#endif // ENABLE(CSS_SHAPES)
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (177288 => 177289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-15 18:57:07 UTC (rev 177288)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-15 18:57:58 UTC (rev 177289)
</span><span class="lines">@@ -27,11 +27,7 @@
</span><span class="cx"> #ifndef StyleBuilderCustom_h
</span><span class="cx"> #define StyleBuilderCustom_h
</span><span class="cx">
</span><del>-#include "BasicShapeFunctions.h"
</del><span class="cx"> #include "CSSAspectRatioValue.h"
</span><del>-#include "CSSImageGeneratorValue.h"
-#include "CSSImageSetValue.h"
-#include "CSSImageValue.h"
</del><span class="cx"> #include "CSSShadowValue.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "LocaleToScriptMapping.h"
</span><span class="lines">@@ -53,10 +49,6 @@
</span><span class="cx"> static void applyInheritZoom(StyleResolver&);
</span><span class="cx"> static void applyValueZoom(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SHAPES)
- static void applyValueWebkitShapeOutside(StyleResolver&, CSSValue&);
-#endif // ENABLE(CSS_SHAPES)
-
</del><span class="cx"> static void applyValueVerticalAlign(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_IMAGE_RESOLUTION)
</span><span class="lines">@@ -236,42 +228,6 @@
</span><span class="cx"> styleResolver.setZoom(number);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-#if ENABLE(CSS_SHAPES)
-inline void StyleBuilderCustom::applyValueWebkitShapeOutside(StyleResolver& styleResolver, CSSValue& value)
-{
- if (is<CSSPrimitiveValue>(value)) {
- // FIXME: Shouldn't this be CSSValueNone?
- // http://www.w3.org/TR/css-shapes/#shape-outside-property
- if (downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueAuto)
- styleResolver.style()->setShapeOutside(nullptr);
- } if (is<CSSImageValue>(value) || is<CSSImageGeneratorValue>(value) || is<CSSImageSetValue>(value)) {
- RefPtr<ShapeValue> shape = ShapeValue::createImageValue(styleResolver.styleImage(CSSPropertyWebkitShapeOutside, value));
- styleResolver.style()->setShapeOutside(shape.release());
- } else if (is<CSSValueList>(value)) {
- RefPtr<BasicShape> shape;
- CSSBoxType referenceBox = BoxMissing;
- for (auto& currentValue : downcast<CSSValueList>(value)) {
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(currentValue.get());
- if (primitiveValue.isShape())
- shape = basicShapeForValue(styleResolver.state().cssToLengthConversionData(), primitiveValue.getShapeValue());
- else if (primitiveValue.getValueID() == CSSValueContentBox
- || primitiveValue.getValueID() == CSSValueBorderBox
- || primitiveValue.getValueID() == CSSValuePaddingBox
- || primitiveValue.getValueID() == CSSValueMarginBox)
- referenceBox = CSSBoxType(primitiveValue);
- else
- return;
- }
-
- if (shape)
- styleResolver.style()->setShapeOutside(ShapeValue::createShapeValue(shape.release(), referenceBox));
- else if (referenceBox != BoxMissing)
- styleResolver.style()->setShapeOutside(ShapeValue::createBoxShapeValue(referenceBox));
- }
-}
-#endif // ENABLE(CSS_SHAPES)
-
</del><span class="cx"> inline Length StyleBuilderCustom::mmLength(double mm)
</span><span class="cx"> {
</span><span class="cx"> Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM));
</span></span></pre>
</div>
</div>
</body>
</html>