<!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>[162001] 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/162001">162001</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-01-14 13:42:03 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Move CSSPrimitiveValue <-> LayoutBox Conversion to CSSPrimitiveValueMappings
https://bugs.webkit.org/show_bug.cgi?id=126719
Reviewed by Dirk Schulze.
The standard location for conversions to/from CSSPrimitiveValues is CSSPrimitiveValueMappings.
This patch moves the conversion for LayoutBoxes from BasicShapeFunctions to
CSSPrimitiveValueMappings.h.
Refactoring, no new tests.
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBasicShape):
(WebCore::basicShapeForValue):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator LayoutBox):
* css/DeprecatedStyleBuilder.cpp:
(WebCore::ApplyPropertyClipPath::applyValue):
(WebCore::ApplyPropertyShape::applyValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssBasicShapeFunctionscpp">trunk/Source/WebCore/css/BasicShapeFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162000 => 162001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 21:41:04 UTC (rev 162000)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 21:42:03 UTC (rev 162001)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-14 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Move CSSPrimitiveValue <-> LayoutBox Conversion to CSSPrimitiveValueMappings
+ https://bugs.webkit.org/show_bug.cgi?id=126719
+
+ Reviewed by Dirk Schulze.
+
+ The standard location for conversions to/from CSSPrimitiveValues is CSSPrimitiveValueMappings.
+ This patch moves the conversion for LayoutBoxes from BasicShapeFunctions to
+ CSSPrimitiveValueMappings.h.
+
+ Refactoring, no new tests.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBasicShape):
+ (WebCore::basicShapeForValue):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator LayoutBox):
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyClipPath::applyValue):
+ (WebCore::ApplyPropertyShape::applyValue):
+
</ins><span class="cx"> 2014-01-09 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for handling WebGL load policies.
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (162000 => 162001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-01-14 21:41:04 UTC (rev 162000)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-01-14 21:42:03 UTC (rev 162001)
</span><span class="lines">@@ -39,48 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<CSSPrimitiveValue> valueForBox(LayoutBox box)
-{
- switch (box) {
- case ContentBox:
- return cssValuePool().createIdentifierValue(CSSValueContentBox);
- case PaddingBox:
- return cssValuePool().createIdentifierValue(CSSValuePaddingBox);
- case BorderBox:
- return cssValuePool().createIdentifierValue(CSSValueBorderBox);
- case MarginBox:
- return cssValuePool().createIdentifierValue(CSSValueMarginBox);
- case BoundingBox:
- return cssValuePool().createIdentifierValue(CSSValueBoundingBox);
- case BoxMissing:
- return nullptr;
- }
- ASSERT_NOT_REACHED();
- return nullptr;
-}
-
-LayoutBox boxForValue(const CSSPrimitiveValue* value)
-{
- if (!value)
- return BoxMissing;
-
- switch (value->getValueID()) {
- case CSSValueContentBox:
- return ContentBox;
- case CSSValuePaddingBox:
- return PaddingBox;
- case CSSValueBorderBox:
- return BorderBox;
- case CSSValueMarginBox:
- return MarginBox;
- case CSSValueBoundingBox:
- return BoundingBox;
- default:
- ASSERT_NOT_REACHED();
- return BoxMissing;
- }
-}
-
</del><span class="cx"> static PassRefPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSValuePool& pool, const RenderStyle* style, const BasicShapeCenterCoordinate& center)
</span><span class="cx"> {
</span><span class="cx"> CSSValueID keyword = CSSValueInvalid;
</span><span class="lines">@@ -230,7 +188,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- basicShapeValue->setLayoutBox(valueForBox(basicShape->layoutBox()));
</del><ins>+ if (basicShape->layoutBox() != BoxMissing)
+ basicShapeValue->setLayoutBox(pool.createValue(basicShape->layoutBox()));
</ins><span class="cx">
</span><span class="cx"> return pool.createValue(basicShapeValue.release());
</span><span class="cx"> }
</span><span class="lines">@@ -460,7 +419,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- basicShape->setLayoutBox(boxForValue(basicShapeValue->layoutBox()));
</del><ins>+ if (basicShapeValue->layoutBox())
+ basicShape->setLayoutBox(LayoutBox(*basicShapeValue->layoutBox()));
</ins><span class="cx">
</span><span class="cx"> return basicShape.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (162000 => 162001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-14 21:41:04 UTC (rev 162000)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-14 21:42:03 UTC (rev 162001)
</span><span class="lines">@@ -2885,11 +2885,11 @@
</span><span class="cx"> ShapeClipPathOperation& shapeOperation = toShapeClipPathOperation(*operation);
</span><span class="cx"> list->append(valueForBasicShape(style.get(), shapeOperation.basicShape()));
</span><span class="cx"> if (shapeOperation.referenceBox() != BoxMissing)
</span><del>- list->append(valueForBox(shapeOperation.referenceBox()));
</del><ins>+ list->append(cssValuePool().createValue(shapeOperation.referenceBox()));
</ins><span class="cx"> }
</span><span class="cx"> if (operation->type() == ClipPathOperation::Box) {
</span><span class="cx"> BoxClipPathOperation& boxOperation = toBoxClipPathOperation(*operation);
</span><del>- list->append(valueForBox(boxOperation.referenceBox()));
</del><ins>+ list->append(cssValuePool().createValue(boxOperation.referenceBox()));
</ins><span class="cx"> }
</span><span class="cx"> return list.release();
</span><span class="cx"> }
</span><span class="lines">@@ -2922,7 +2922,7 @@
</span><span class="cx"> if (!style->shapeInside())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx"> if (style->shapeInside()->type() == ShapeValue::Box)
</span><del>- return valueForBox(style->shapeInside()->layoutBox());
</del><ins>+ return cssValuePool().createValue(style->shapeInside()->layoutBox());
</ins><span class="cx"> if (style->shapeInside()->type() == ShapeValue::Outside)
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
</span><span class="cx"> if (style->shapeInside()->type() == ShapeValue::Image) {
</span><span class="lines">@@ -2936,7 +2936,7 @@
</span><span class="cx"> if (!style->shapeOutside())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx"> if (style->shapeOutside()->type() == ShapeValue::Box)
</span><del>- return valueForBox(style->shapeOutside()->layoutBox());
</del><ins>+ return cssValuePool().createValue(style->shapeOutside()->layoutBox());
</ins><span class="cx"> if (style->shapeOutside()->type() == ShapeValue::Image) {
</span><span class="cx"> if (style->shapeOutside()->image())
</span><span class="cx"> return style->shapeOutside()->image()->cssValue();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (162000 => 162001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-01-14 21:41:04 UTC (rev 162000)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-01-14 21:42:03 UTC (rev 162001)
</span><span class="lines">@@ -5165,6 +5165,53 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx">
</span><ins>+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LayoutBox layoutBox)
+ : CSSValue(PrimitiveClass)
+{
+ m_primitiveUnitType = CSS_VALUE_ID;
+ switch (layoutBox) {
+ case BoundingBox:
+ m_value.valueID = CSSValueBoundingBox;
+ break;
+ case MarginBox:
+ m_value.valueID = CSSValueMarginBox;
+ break;
+ case BorderBox:
+ m_value.valueID = CSSValueBorderBox;
+ break;
+ case PaddingBox:
+ m_value.valueID = CSSValuePaddingBox;
+ break;
+ case ContentBox:
+ m_value.valueID = CSSValueContentBox;
+ break;
+ case BoxMissing:
+ ASSERT_NOT_REACHED();
+ m_value.valueID = CSSValueNone;
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> inline CSSPrimitiveValue::operator LayoutBox() const
+{
+ switch (getValueID()) {
+ case CSSValueBoundingBox:
+ return BoundingBox;
+ case CSSValueMarginBox:
+ return MarginBox;
+ case CSSValueBorderBox:
+ return BorderBox;
+ case CSSValuePaddingBox:
+ return PaddingBox;
+ case CSSValueContentBox:
+ return ContentBox;
+ default:
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return BoxMissing;
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (162000 => 162001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-14 21:41:04 UTC (rev 162000)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-14 21:42:03 UTC (rev 162001)
</span><span class="lines">@@ -2110,7 +2110,7 @@
</span><span class="cx"> || primitiveValue.getValueID() == CSSValueMarginBox
</span><span class="cx"> || primitiveValue.getValueID() == CSSValueBoundingBox)
</span><span class="cx"> && referenceBox == BoxMissing)
</span><del>- referenceBox = boxForValue(&primitiveValue);
</del><ins>+ referenceBox = LayoutBox(primitiveValue);
</ins><span class="cx"> else
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2144,7 +2144,7 @@
</span><span class="cx"> || primitiveValue->getValueID() == CSSValueBorderBox
</span><span class="cx"> || primitiveValue->getValueID() == CSSValuePaddingBox
</span><span class="cx"> || primitiveValue->getValueID() == CSSValueMarginBox)
</span><del>- setValue(styleResolver->style(), ShapeValue::createLayoutBoxValue(boxForValue(primitiveValue)));
</del><ins>+ setValue(styleResolver->style(), ShapeValue::createLayoutBoxValue(LayoutBox(*primitiveValue)));
</ins><span class="cx"> else if (primitiveValue->getValueID() == CSSValueOutsideShape)
</span><span class="cx"> setValue(styleResolver->style(), ShapeValue::createOutsideValue());
</span><span class="cx"> else if (primitiveValue->isShape()) {
</span></span></pre>
</div>
</div>
</body>
</html>