<!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>[165843] 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/165843">165843</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-18 13:58:38 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutBox is a terrible name
https://bugs.webkit.org/show_bug.cgi?id=130351
Reviewed by Simon Fraser.
Rename LayoutBox to CSSBoxType. Also rename the functions and methods
that mention "LayoutBox" to something that makes sense for each
specific situation.
No new tests, no behavior change.
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBasicShape):
(WebCore::basicShapeForValue):
* css/CSSBasicShapes.cpp:
(WebCore::CSSBasicShapeCircle::cssText):
(WebCore::CSSBasicShapeCircle::equals):
(WebCore::CSSBasicShapeEllipse::cssText):
(WebCore::CSSBasicShapeEllipse::equals):
(WebCore::CSSBasicShapePolygon::cssText):
(WebCore::CSSBasicShapePolygon::equals):
(WebCore::CSSBasicShapeInset::cssText):
* css/CSSBasicShapes.h:
(WebCore::CSSBasicShape::referenceBox):
(WebCore::CSSBasicShape::setReferenceBox):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::shapePropertyValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator CSSBoxType):
* css/DeprecatedStyleBuilder.cpp:
(WebCore::ApplyPropertyClipPath::applyValue):
(WebCore::ApplyPropertyShape::applyValue):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc):
* rendering/ClipPathOperation.h:
(WebCore::ShapeClipPathOperation::setReferenceBox):
(WebCore::ShapeClipPathOperation::referenceBox):
(WebCore::BoxClipPathOperation::create):
(WebCore::BoxClipPathOperation::referenceBox):
(WebCore::BoxClipPathOperation::BoxClipPathOperation):
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createBoxShape):
* rendering/shapes/Shape.h:
* rendering/shapes/ShapeInfo.cpp:
(WebCore::ShapeInfo<RenderType>::computedShape):
* rendering/shapes/ShapeInfo.h:
* rendering/shapes/ShapeInsideInfo.h:
* rendering/shapes/ShapeOutsideInfo.h:
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):
* rendering/style/BasicShapes.h:
(WebCore::BasicShape::referenceBox):
(WebCore::BasicShape::setReferenceBox):
(WebCore::BasicShape::BasicShape):
* rendering/style/RenderStyleConstants.h:
* rendering/style/ShapeValue.h:
(WebCore::ShapeValue::createShapeValue):
(WebCore::ShapeValue::createBoxShapeValue):
(WebCore::ShapeValue::cssBox):
(WebCore::ShapeValue::ShapeValue):</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="#trunkSourceWebCorecssCSSBasicShapescpp">trunk/Source/WebCore/css/CSSBasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapesh">trunk/Source/WebCore/css/CSSBasicShapes.h</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>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingClipPathOperationh">trunk/Source/WebCore/rendering/ClipPathOperation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeh">trunk/Source/WebCore/rendering/shapes/Shape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapescpp">trunk/Source/WebCore/rendering/style/BasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapesh">trunk/Source/WebCore/rendering/style/BasicShapes.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/ChangeLog 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2014-03-18 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ LayoutBox is a terrible name
+ https://bugs.webkit.org/show_bug.cgi?id=130351
+
+ Reviewed by Simon Fraser.
+
+ Rename LayoutBox to CSSBoxType. Also rename the functions and methods
+ that mention "LayoutBox" to something that makes sense for each
+ specific situation.
+
+ No new tests, no behavior change.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBasicShape):
+ (WebCore::basicShapeForValue):
+ * css/CSSBasicShapes.cpp:
+ (WebCore::CSSBasicShapeCircle::cssText):
+ (WebCore::CSSBasicShapeCircle::equals):
+ (WebCore::CSSBasicShapeEllipse::cssText):
+ (WebCore::CSSBasicShapeEllipse::equals):
+ (WebCore::CSSBasicShapePolygon::cssText):
+ (WebCore::CSSBasicShapePolygon::equals):
+ (WebCore::CSSBasicShapeInset::cssText):
+ * css/CSSBasicShapes.h:
+ (WebCore::CSSBasicShape::referenceBox):
+ (WebCore::CSSBasicShape::setReferenceBox):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::shapePropertyValue):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator CSSBoxType):
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyClipPath::applyValue):
+ (WebCore::ApplyPropertyShape::applyValue):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc):
+ * rendering/ClipPathOperation.h:
+ (WebCore::ShapeClipPathOperation::setReferenceBox):
+ (WebCore::ShapeClipPathOperation::referenceBox):
+ (WebCore::BoxClipPathOperation::create):
+ (WebCore::BoxClipPathOperation::referenceBox):
+ (WebCore::BoxClipPathOperation::BoxClipPathOperation):
+ * rendering/shapes/Shape.cpp:
+ (WebCore::Shape::createBoxShape):
+ * rendering/shapes/Shape.h:
+ * rendering/shapes/ShapeInfo.cpp:
+ (WebCore::ShapeInfo<RenderType>::computedShape):
+ * rendering/shapes/ShapeInfo.h:
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/shapes/ShapeOutsideInfo.h:
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShape::canBlend):
+ * rendering/style/BasicShapes.h:
+ (WebCore::BasicShape::referenceBox):
+ (WebCore::BasicShape::setReferenceBox):
+ (WebCore::BasicShape::BasicShape):
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/ShapeValue.h:
+ (WebCore::ShapeValue::createShapeValue):
+ (WebCore::ShapeValue::createBoxShapeValue):
+ (WebCore::ShapeValue::cssBox):
+ (WebCore::ShapeValue::ShapeValue):
+
</ins><span class="cx"> 2014-03-18 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r162334): RenderTableCol::styleDidChange uses out-of-date table information
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -124,8 +124,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (basicShape->layoutBox() != BoxMissing)
- basicShapeValue->setLayoutBox(pool.createValue(basicShape->layoutBox()));
</del><ins>+ if (basicShape->referenceBox() != BoxMissing)
+ basicShapeValue->setReferenceBox(pool.createValue(basicShape->referenceBox()));
</ins><span class="cx">
</span><span class="cx"> return pool.createValue(basicShapeValue.release());
</span><span class="cx"> }
</span><span class="lines">@@ -264,8 +264,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (basicShapeValue->layoutBox())
- basicShape->setLayoutBox(LayoutBox(*basicShapeValue->layoutBox()));
</del><ins>+ if (basicShapeValue->referenceBox())
+ basicShape->setReferenceBox(CSSBoxType(*basicShapeValue->referenceBox()));
</ins><span class="cx">
</span><span class="cx"> return basicShape.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> return buildCircleString(m_radius ? m_radius->cssText() : String(),
</span><span class="cx"> serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
</span><span class="cx"> serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
</span><del>- m_layoutBox ? m_layoutBox->cssText() : String());
</del><ins>+ m_referenceBox ? m_referenceBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeCircle::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> return compareCSSValuePtr(m_centerX, other.m_centerX)
</span><span class="cx"> && compareCSSValuePtr(m_centerY, other.m_centerY)
</span><span class="cx"> && compareCSSValuePtr(m_radius, other.m_radius)
</span><del>- && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</del><ins>+ && compareCSSValuePtr(m_referenceBox, other.m_referenceBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildEllipseString(const String& radiusX, const String& radiusY, const String& centerX, const String& centerY, const String& box)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> m_radiusY ? m_radiusY->cssText() : String(),
</span><span class="cx"> serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
</span><span class="cx"> serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
</span><del>- m_layoutBox ? m_layoutBox->cssText() : String());
</del><ins>+ m_referenceBox ? m_referenceBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeEllipse::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> && compareCSSValuePtr(m_centerY, other.m_centerY)
</span><span class="cx"> && compareCSSValuePtr(m_radiusX, other.m_radiusX)
</span><span class="cx"> && compareCSSValuePtr(m_radiusY, other.m_radiusY)
</span><del>- && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</del><ins>+ && compareCSSValuePtr(m_referenceBox, other.m_referenceBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildPolygonString(const WindRule& windRule, const Vector<String>& points, const String& box)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> for (size_t i = 0; i < m_values.size(); ++i)
</span><span class="cx"> points.append(m_values.at(i)->cssText());
</span><span class="cx">
</span><del>- return buildPolygonString(m_windRule, points, m_layoutBox ? m_layoutBox->cssText() : String());
</del><ins>+ return buildPolygonString(m_windRule, points, m_referenceBox ? m_referenceBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapePolygon::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> const CSSBasicShapePolygon& rhs = static_cast<const CSSBasicShapePolygon&>(shape);
</span><del>- return compareCSSValuePtr(m_layoutBox, rhs.m_layoutBox)
</del><ins>+ return compareCSSValuePtr(m_referenceBox, rhs.m_referenceBox)
</ins><span class="cx"> && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> bottomRightRadiusHeight,
</span><span class="cx"> bottomLeftRadiusWidth,
</span><span class="cx"> bottomLeftRadiusHeight,
</span><del>- m_layoutBox ? m_layoutBox->cssText() : String());
</del><ins>+ m_referenceBox ? m_referenceBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeInset::equals(const CSSBasicShape& shape) const
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -51,15 +51,15 @@
</span><span class="cx"> virtual String cssText() const = 0;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const = 0;
</span><span class="cx">
</span><del>- CSSPrimitiveValue* layoutBox() const { return m_layoutBox.get(); }
- void setLayoutBox(PassRefPtr<CSSPrimitiveValue> layoutBox) { m_layoutBox = layoutBox; }
</del><ins>+ CSSPrimitiveValue* referenceBox() const { return m_referenceBox.get(); }
+ void setReferenceBox(PassRefPtr<CSSPrimitiveValue> referenceBox) { m_referenceBox = referenceBox; }
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> virtual ~CSSBasicShape() { }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> CSSBasicShape() { }
</span><del>- RefPtr<CSSPrimitiveValue> m_layoutBox;
</del><ins>+ RefPtr<CSSPrimitiveValue> m_referenceBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class CSSBasicShapeInset : public CSSBasicShape {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -1630,7 +1630,7 @@
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
</span><span class="cx">
</span><span class="cx"> if (shapeValue->type() == ShapeValue::Box)
</span><del>- return cssValuePool().createValue(shapeValue->layoutBox());
</del><ins>+ return cssValuePool().createValue(shapeValue->cssBox());
</ins><span class="cx">
</span><span class="cx"> if (shapeValue->type() == ShapeValue::Image)
</span><span class="cx"> return shapeValue->image() ? shapeValue->image()->cssValue() : cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="lines">@@ -1639,8 +1639,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> list->append(valueForBasicShape(style, shapeValue->shape()));
</span><del>- if (shapeValue->layoutBox() != BoxMissing)
- list->append(cssValuePool().createValue(shapeValue->layoutBox()));
</del><ins>+ if (shapeValue->cssBox() != BoxMissing)
+ list->append(cssValuePool().createValue(shapeValue->cssBox()));
</ins><span class="cx"> return list.release();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -5162,11 +5162,11 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx">
</span><del>-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LayoutBox layoutBox)
</del><ins>+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox)
</ins><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><del>- switch (layoutBox) {
</del><ins>+ switch (cssBox) {
</ins><span class="cx"> case MarginBox:
</span><span class="cx"> m_value.valueID = CSSValueMarginBox;
</span><span class="cx"> break;
</span><span class="lines">@@ -5195,7 +5195,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> inline CSSPrimitiveValue::operator LayoutBox() const
</del><ins>+template<> inline CSSPrimitiveValue::operator CSSBoxType() const
</ins><span class="cx"> {
</span><span class="cx"> switch (getValueID()) {
</span><span class="cx"> case CSSValueMarginBox:
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -2144,7 +2144,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!value->isValueList())
</span><span class="cx"> return;
</span><del>- LayoutBox referenceBox = BoxMissing;
</del><ins>+ CSSBoxType referenceBox = BoxMissing;
</ins><span class="cx"> RefPtr<ClipPathOperation> operation;
</span><span class="cx"> auto& valueList = toCSSValueList(*value);
</span><span class="cx"> for (unsigned i = 0; i < valueList.length(); ++i) {
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx"> || primitiveValue.getValueID() == CSSValueStroke
</span><span class="cx"> || primitiveValue.getValueID() == CSSValueViewBox)
</span><span class="cx"> && referenceBox == BoxMissing)
</span><del>- referenceBox = LayoutBox(primitiveValue);
</del><ins>+ referenceBox = CSSBoxType(primitiveValue);
</ins><span class="cx"> else
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2196,7 +2196,7 @@
</span><span class="cx"> setValue(styleResolver->style(), shape.release());
</span><span class="cx"> } else if (value->isValueList()) {
</span><span class="cx"> RefPtr<BasicShape> shape;
</span><del>- LayoutBox layoutBox = BoxMissing;
</del><ins>+ CSSBoxType referenceBox = BoxMissing;
</ins><span class="cx"> CSSValueList* valueList = toCSSValueList(value);
</span><span class="cx"> for (unsigned i = 0; i < valueList->length(); ++i) {
</span><span class="cx"> CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(valueList->itemWithoutBoundsCheck(i));
</span><span class="lines">@@ -2206,15 +2206,15 @@
</span><span class="cx"> || primitiveValue->getValueID() == CSSValueBorderBox
</span><span class="cx"> || primitiveValue->getValueID() == CSSValuePaddingBox
</span><span class="cx"> || primitiveValue->getValueID() == CSSValueMarginBox)
</span><del>- layoutBox = LayoutBox(*primitiveValue);
</del><ins>+ referenceBox = CSSBoxType(*primitiveValue);
</ins><span class="cx"> else
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shape)
</span><del>- setValue(styleResolver->style(), ShapeValue::createShapeValue(shape.release(), layoutBox));
- else if (layoutBox != BoxMissing)
- setValue(styleResolver->style(), ShapeValue::createLayoutBoxValue(layoutBox));
</del><ins>+ setValue(styleResolver->style(), ShapeValue::createShapeValue(shape.release(), referenceBox));
+ else if (referenceBox != BoxMissing)
+ setValue(styleResolver->style(), ShapeValue::createBoxShapeValue(referenceBox));
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> if (from->type() != ShapeValue::Shape || to->type() != ShapeValue::Shape)
</span><span class="cx"> return to;
</span><span class="cx">
</span><del>- if (from->layoutBox() != to->layoutBox())
</del><ins>+ if (from->cssBox() != to->cssBox())
</ins><span class="cx"> return to;
</span><span class="cx">
</span><span class="cx"> const BasicShape* fromShape = from->shape();
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> if (!fromShape->canBlend(toShape))
</span><span class="cx"> return to;
</span><span class="cx">
</span><del>- return ShapeValue::createShapeValue(toShape->blend(fromShape, progress), to->layoutBox());
</del><ins>+ return ShapeValue::createShapeValue(toShape->blend(fromShape, progress), to->cssBox());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingClipPathOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ClipPathOperation.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -112,8 +112,8 @@
</span><span class="cx"> return path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setReferenceBox(LayoutBox referenceBox) { m_referenceBox = referenceBox; }
- LayoutBox referenceBox() const { return m_referenceBox; }
</del><ins>+ void setReferenceBox(CSSBoxType referenceBox) { m_referenceBox = referenceBox; }
+ CSSBoxType referenceBox() const { return m_referenceBox; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool operator==(const ClipPathOperation& o) const override
</span><span class="lines">@@ -132,12 +132,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<BasicShape> m_shape;
</span><del>- LayoutBox m_referenceBox;
</del><ins>+ CSSBoxType m_referenceBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class BoxClipPathOperation : public ClipPathOperation {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<BoxClipPathOperation> create(LayoutBox referenceBox)
</del><ins>+ static PassRefPtr<BoxClipPathOperation> create(CSSBoxType referenceBox)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new BoxClipPathOperation(referenceBox));
</span><span class="cx"> }
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> path.addRoundedRect(boundingRect);
</span><span class="cx"> return path;
</span><span class="cx"> }
</span><del>- LayoutBox referenceBox() const { return m_referenceBox; }
</del><ins>+ CSSBoxType referenceBox() const { return m_referenceBox; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool operator==(const ClipPathOperation& o) const override
</span><span class="lines">@@ -159,13 +159,13 @@
</span><span class="cx"> return m_referenceBox == other->m_referenceBox;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit BoxClipPathOperation(LayoutBox referenceBox)
</del><ins>+ explicit BoxClipPathOperation(CSSBoxType referenceBox)
</ins><span class="cx"> : ClipPathOperation(Box)
</span><span class="cx"> , m_referenceBox(referenceBox)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutBox m_referenceBox;
</del><ins>+ CSSBoxType m_referenceBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define CLIP_PATH_OPERATION_CASTS(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> return rasterShape.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Shape> Shape::createLayoutBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, Length margin, Length padding)
</del><ins>+PassOwnPtr<Shape> Shape::createBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, Length margin, Length padding)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(roundedRect.rect().width() >= 0 && roundedRect.rect().height() >= 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/shapes/Shape.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> static PassOwnPtr<Shape> createShape(const BasicShape*, const LayoutSize& logicalBoxSize, WritingMode, Length margin, Length padding);
</span><span class="cx"> static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& drawRect, const LayoutRect& clipRect, WritingMode, Length margin, Length padding);
</span><del>- static PassOwnPtr<Shape> createLayoutBoxShape(const RoundedRect&, WritingMode, Length margin, Length padding);
</del><ins>+ static PassOwnPtr<Shape> createBoxShape(const RoundedRect&, WritingMode, Length margin, Length padding);
</ins><span class="cx">
</span><span class="cx"> virtual ~Shape() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> // FIXME This does not properly compute the rounded corners as specified in all conditions.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=127982
</span><span class="cx"> const RoundedRect& shapeRect = m_renderer.style().getRoundedBorderFor(LayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), &(m_renderer.view()));
</span><del>- m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin, padding);
</del><ins>+ m_shape = Shape::createBoxShape(shapeRect, writingMode, margin, padding);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ShapeValue::Outside:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual LayoutBox referenceBox() const = 0;
</del><ins>+ virtual CSSBoxType referenceBox() const = 0;
</ins><span class="cx"> virtual LayoutRect computedShapeLogicalBoundingBox() const = 0;
</span><span class="cx"> virtual ShapeValue* shapeValue() const = 0;
</span><span class="cx"> virtual void getIntervals(LayoutUnit, LayoutUnit, SegmentList&) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -107,12 +107,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual LayoutBox referenceBox() const override
</del><ins>+ virtual CSSBoxType referenceBox() const override
</ins><span class="cx"> {
</span><del>- if (shapeValue()->layoutBox() == BoxMissing)
</del><ins>+ if (shapeValue()->cssBox() == BoxMissing)
</ins><span class="cx"> return ContentBox;
</span><span class="cx">
</span><del>- return shapeValue()->layoutBox();
</del><ins>+ return shapeValue()->cssBox();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual const RenderStyle& styleForWritingMode() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -63,14 +63,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual LayoutBox referenceBox() const override
</del><ins>+ virtual CSSBoxType referenceBox() const override
</ins><span class="cx"> {
</span><del>- if (shapeValue()->layoutBox() == BoxMissing) {
</del><ins>+ if (shapeValue()->cssBox() == BoxMissing) {
</ins><span class="cx"> if (shapeValue()->type() == ShapeValue::Image)
</span><span class="cx"> return ContentBox;
</span><span class="cx"> return MarginBox;
</span><span class="cx"> }
</span><del>- return shapeValue()->layoutBox();
</del><ins>+ return shapeValue()->cssBox();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Both shapes must use the same reference box.
</span><del>- if (layoutBox() != other->layoutBox())
</del><ins>+ if (referenceBox() != other->referenceBox())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Just polygons with same number of vertices can be animated.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -63,17 +63,17 @@
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span><span class="cx">
</span><del>- LayoutBox layoutBox() const { return m_layoutBox; }
- void setLayoutBox(LayoutBox layoutBox) { m_layoutBox = layoutBox; }
</del><ins>+ CSSBoxType referenceBox() const { return m_referenceBox; }
+ void setReferenceBox(CSSBoxType referenceBox) { m_referenceBox = referenceBox; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> BasicShape()
</span><del>- : m_layoutBox(BoxMissing)
</del><ins>+ : m_referenceBox(BoxMissing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LayoutBox m_layoutBox;
</del><ins>+ CSSBoxType m_referenceBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class BasicShapeCenterCoordinate {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> enum Isolation { IsolationAuto, IsolationIsolate };
</span><span class="cx">
</span><span class="cx"> // Fill, Stroke, ViewBox are just used for SVG.
</span><del>-enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox, Fill, Stroke, ViewBox };
</del><ins>+enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox, Fill, Stroke, ViewBox };
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (165842 => 165843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-03-18 20:53:07 UTC (rev 165842)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-03-18 20:58:38 UTC (rev 165843)
</span><span class="lines">@@ -48,14 +48,14 @@
</span><span class="cx"> Image
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static PassRefPtr<ShapeValue> createShapeValue(PassRefPtr<BasicShape> shape, LayoutBox layoutBox)
</del><ins>+ static PassRefPtr<ShapeValue> createShapeValue(PassRefPtr<BasicShape> shape, CSSBoxType cssBox)
</ins><span class="cx"> {
</span><del>- return adoptRef(new ShapeValue(shape, layoutBox));
</del><ins>+ return adoptRef(new ShapeValue(shape, cssBox));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<ShapeValue> createLayoutBoxValue(LayoutBox layoutBox)
</del><ins>+ static PassRefPtr<ShapeValue> createBoxShapeValue(CSSBoxType boxShape)
</ins><span class="cx"> {
</span><del>- return adoptRef(new ShapeValue(layoutBox));
</del><ins>+ return adoptRef(new ShapeValue(boxShape));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<ShapeValue> createOutsideValue()
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> ShapeValueType type() const { return m_type; }
</span><span class="cx"> BasicShape* shape() const { return m_shape.get(); }
</span><del>- LayoutBox layoutBox() const { return m_layoutBox; }
</del><ins>+ CSSBoxType cssBox() const { return m_cssBox; }
</ins><span class="cx">
</span><span class="cx"> StyleImage* image() const { return m_image.get(); }
</span><span class="cx"> bool isImageValid() const { return image() && image()->cachedImage() && image()->cachedImage()->hasImage(); }
</span><span class="lines">@@ -84,33 +84,33 @@
</span><span class="cx"> bool operator==(const ShapeValue& other) const { return type() == other.type(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ShapeValue(PassRefPtr<BasicShape> shape, LayoutBox layoutBox)
</del><ins>+ ShapeValue(PassRefPtr<BasicShape> shape, CSSBoxType cssBox)
</ins><span class="cx"> : m_type(Shape)
</span><span class="cx"> , m_shape(shape)
</span><del>- , m_layoutBox(layoutBox)
</del><ins>+ , m_cssBox(cssBox)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> ShapeValue(ShapeValueType type)
</span><span class="cx"> : m_type(type)
</span><del>- , m_layoutBox(BoxMissing)
</del><ins>+ , m_cssBox(BoxMissing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> ShapeValue(PassRefPtr<StyleImage> image)
</span><span class="cx"> : m_type(Image)
</span><span class="cx"> , m_image(image)
</span><del>- , m_layoutBox(BoxMissing)
</del><ins>+ , m_cssBox(BoxMissing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>- ShapeValue(LayoutBox layoutBox)
</del><ins>+ ShapeValue(CSSBoxType cssBox)
</ins><span class="cx"> : m_type(Box)
</span><del>- , m_layoutBox(layoutBox)
</del><ins>+ , m_cssBox(cssBox)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ShapeValueType m_type;
</span><span class="cx"> RefPtr<BasicShape> m_shape;
</span><span class="cx"> RefPtr<StyleImage> m_image;
</span><del>- LayoutBox m_layoutBox;
</del><ins>+ CSSBoxType m_cssBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>