<!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>[161569] 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/161569">161569</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-01-09 12:16:23 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Factor the ReferenceBox type out of BasicShapes
https://bugs.webkit.org/show_bug.cgi?id=126648
Reviewed by Dirk Schulze.
Moving ReferenceBox out of BasicShapes and into RenderStyleConstants
as the LayoutBox enum. Most of the changes are removing the BasicShape
namespace.
Refactoring, no new tests.
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBox):
(WebCore::boxForValue):
(WebCore::valueForBasicShape):
(WebCore::basicShapeForValue):
* css/BasicShapeFunctions.h:
* css/CSSBasicShapes.cpp:
(WebCore::CSSBasicShapeRectangle::cssText):
(WebCore::CSSBasicShapeRectangle::equals):
(WebCore::CSSBasicShapeCircle::cssText):
(WebCore::CSSBasicShapeCircle::equals):
(WebCore::CSSDeprecatedBasicShapeCircle::cssText):
(WebCore::CSSDeprecatedBasicShapeCircle::equals):
(WebCore::CSSBasicShapeEllipse::cssText):
(WebCore::CSSBasicShapeEllipse::equals):
(WebCore::CSSDeprecatedBasicShapeEllipse::cssText):
(WebCore::CSSDeprecatedBasicShapeEllipse::equals):
(WebCore::CSSBasicShapePolygon::cssText):
(WebCore::CSSBasicShapePolygon::equals):
(WebCore::CSSBasicShapeInsetRectangle::cssText):
(WebCore::CSSBasicShapeInsetRectangle::equals):
(WebCore::CSSBasicShapeInset::cssText):
* css/CSSBasicShapes.h:
(WebCore::CSSBasicShape::layoutBox):
(WebCore::CSSBasicShape::setLayoutBox):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseShapeProperty):
* css/DeprecatedStyleBuilder.cpp:
(WebCore::ApplyPropertyClipPath::applyValue):
(WebCore::ApplyPropertyShape::applyValue):
* rendering/ClipPathOperation.h:
(WebCore::ShapeClipPathOperation::setReferenceBox):
(WebCore::ShapeClipPathOperation::referenceBox):
(WebCore::ShapeClipPathOperation::ShapeClipPathOperation):
(WebCore::BoxClipPathOperation::create):
(WebCore::BoxClipPathOperation::referenceBox):
(WebCore::BoxClipPathOperation::BoxClipPathOperation):
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createLayoutBoxShape):
* rendering/shapes/Shape.h:
* rendering/shapes/ShapeInfo.cpp:
(WebCore::ShapeInfo<RenderType>::computedShape):
* rendering/shapes/ShapeInfo.h:
(WebCore::ShapeInfo::setShapeSize):
(WebCore::ShapeInfo::logicalTopOffset):
(WebCore::ShapeInfo::logicalLeftOffset):
* rendering/shapes/ShapeInsideInfo.h:
* rendering/shapes/ShapeOutsideInfo.h:
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):
(WebCore::BasicShape::referenceBoxSize):
* rendering/style/BasicShapes.h:
(WebCore::BasicShape::layoutBox):
(WebCore::BasicShape::setLayoutBox):
(WebCore::BasicShape::BasicShape):
* rendering/style/RenderStyleConstants.h:
* rendering/style/ShapeValue.h:
(WebCore::ShapeValue::createLayoutBoxValue):
(WebCore::ShapeValue::layoutBox):
(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="#trunkSourceWebCorecssBasicShapeFunctionsh">trunk/Source/WebCore/css/BasicShapeFunctions.h</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="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2014-01-09 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Factor the ReferenceBox type out of BasicShapes
+ https://bugs.webkit.org/show_bug.cgi?id=126648
+
+ Reviewed by Dirk Schulze.
+
+ Moving ReferenceBox out of BasicShapes and into RenderStyleConstants
+ as the LayoutBox enum. Most of the changes are removing the BasicShape
+ namespace.
+
+ Refactoring, no new tests.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBox):
+ (WebCore::boxForValue):
+ (WebCore::valueForBasicShape):
+ (WebCore::basicShapeForValue):
+ * css/BasicShapeFunctions.h:
+ * css/CSSBasicShapes.cpp:
+ (WebCore::CSSBasicShapeRectangle::cssText):
+ (WebCore::CSSBasicShapeRectangle::equals):
+ (WebCore::CSSBasicShapeCircle::cssText):
+ (WebCore::CSSBasicShapeCircle::equals):
+ (WebCore::CSSDeprecatedBasicShapeCircle::cssText):
+ (WebCore::CSSDeprecatedBasicShapeCircle::equals):
+ (WebCore::CSSBasicShapeEllipse::cssText):
+ (WebCore::CSSBasicShapeEllipse::equals):
+ (WebCore::CSSDeprecatedBasicShapeEllipse::cssText):
+ (WebCore::CSSDeprecatedBasicShapeEllipse::equals):
+ (WebCore::CSSBasicShapePolygon::cssText):
+ (WebCore::CSSBasicShapePolygon::equals):
+ (WebCore::CSSBasicShapeInsetRectangle::cssText):
+ (WebCore::CSSBasicShapeInsetRectangle::equals):
+ (WebCore::CSSBasicShapeInset::cssText):
+ * css/CSSBasicShapes.h:
+ (WebCore::CSSBasicShape::layoutBox):
+ (WebCore::CSSBasicShape::setLayoutBox):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseShapeProperty):
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::ApplyPropertyClipPath::applyValue):
+ (WebCore::ApplyPropertyShape::applyValue):
+ * rendering/ClipPathOperation.h:
+ (WebCore::ShapeClipPathOperation::setReferenceBox):
+ (WebCore::ShapeClipPathOperation::referenceBox):
+ (WebCore::ShapeClipPathOperation::ShapeClipPathOperation):
+ (WebCore::BoxClipPathOperation::create):
+ (WebCore::BoxClipPathOperation::referenceBox):
+ (WebCore::BoxClipPathOperation::BoxClipPathOperation):
+ * rendering/shapes/Shape.cpp:
+ (WebCore::Shape::createLayoutBoxShape):
+ * rendering/shapes/Shape.h:
+ * rendering/shapes/ShapeInfo.cpp:
+ (WebCore::ShapeInfo<RenderType>::computedShape):
+ * rendering/shapes/ShapeInfo.h:
+ (WebCore::ShapeInfo::setShapeSize):
+ (WebCore::ShapeInfo::logicalTopOffset):
+ (WebCore::ShapeInfo::logicalLeftOffset):
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/shapes/ShapeOutsideInfo.h:
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShape::canBlend):
+ (WebCore::BasicShape::referenceBoxSize):
+ * rendering/style/BasicShapes.h:
+ (WebCore::BasicShape::layoutBox):
+ (WebCore::BasicShape::setLayoutBox):
+ (WebCore::BasicShape::BasicShape):
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/ShapeValue.h:
+ (WebCore::ShapeValue::createLayoutBoxValue):
+ (WebCore::ShapeValue::layoutBox):
+ (WebCore::ShapeValue::ShapeValue):
+
</ins><span class="cx"> 2014-01-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> PDFDocumentImage can be very slow to do the initial paint
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -39,45 +39,45 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<CSSPrimitiveValue> valueForBox(BasicShape::ReferenceBox box)
</del><ins>+PassRefPtr<CSSPrimitiveValue> valueForBox(LayoutBox box)
</ins><span class="cx"> {
</span><span class="cx"> switch (box) {
</span><del>- case BasicShape::ContentBox:
</del><ins>+ case ContentBox:
</ins><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueContentBox);
</span><del>- case BasicShape::PaddingBox:
</del><ins>+ case PaddingBox:
</ins><span class="cx"> return cssValuePool().createIdentifierValue(CSSValuePaddingBox);
</span><del>- case BasicShape::BorderBox:
</del><ins>+ case BorderBox:
</ins><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueBorderBox);
</span><del>- case BasicShape::MarginBox:
</del><ins>+ case MarginBox:
</ins><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueMarginBox);
</span><del>- case BasicShape::BoundingBox:
</del><ins>+ case BoundingBox:
</ins><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueBoundingBox);
</span><del>- case BasicShape::None:
</del><ins>+ case BoxMissing:
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-BasicShape::ReferenceBox boxForValue(const CSSPrimitiveValue* value)
</del><ins>+LayoutBox boxForValue(const CSSPrimitiveValue* value)
</ins><span class="cx"> {
</span><span class="cx"> if (!value)
</span><del>- return BasicShape::None;
</del><ins>+ return BoxMissing;
</ins><span class="cx">
</span><span class="cx"> switch (value->getValueID()) {
</span><span class="cx"> case CSSValueContentBox:
</span><del>- return BasicShape::ContentBox;
</del><ins>+ return ContentBox;
</ins><span class="cx"> case CSSValuePaddingBox:
</span><del>- return BasicShape::PaddingBox;
</del><ins>+ return PaddingBox;
</ins><span class="cx"> case CSSValueBorderBox:
</span><del>- return BasicShape::BorderBox;
</del><ins>+ return BorderBox;
</ins><span class="cx"> case CSSValueMarginBox:
</span><del>- return BasicShape::MarginBox;
</del><ins>+ return MarginBox;
</ins><span class="cx"> case CSSValueBoundingBox:
</span><del>- return BasicShape::BoundingBox;
</del><ins>+ return BoundingBox;
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return BasicShape::None;
</del><ins>+ return BoxMissing;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- basicShapeValue->setBox(valueForBox(basicShape->box()));
</del><ins>+ basicShapeValue->setLayoutBox(valueForBox(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 +460,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- basicShape->setBox(boxForValue(basicShapeValue->box()));
</del><ins>+ basicShape->setLayoutBox(boxForValue(basicShapeValue->layoutBox()));
</ins><span class="cx">
</span><span class="cx"> return basicShape.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> PassRefPtr<CSSValue> valueForBasicShape(const RenderStyle*, const BasicShape*);
</span><span class="cx"> PassRefPtr<BasicShape> basicShapeForValue(const RenderStyle*, const RenderStyle* rootStyle, const CSSBasicShape*);
</span><span class="cx">
</span><del>-PassRefPtr<CSSPrimitiveValue> valueForBox(BasicShape::ReferenceBox);
-BasicShape::ReferenceBox boxForValue(const CSSPrimitiveValue*);
</del><ins>+PassRefPtr<CSSPrimitiveValue> valueForBox(LayoutBox);
+LayoutBox boxForValue(const CSSPrimitiveValue*);
</ins><span class="cx">
</span><span class="cx"> float floatValueForCenterCoordinate(const BasicShapeCenterCoordinate&, float);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> m_height->cssText(),
</span><span class="cx"> m_radiusX.get() ? m_radiusX->cssText() : String(),
</span><span class="cx"> m_radiusY.get() ? m_radiusY->cssText() : String(),
</span><del>- m_box ? m_box->cssText() : String());
</del><ins>+ m_layoutBox ? m_layoutBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeRectangle::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> && compareCSSValuePtr(m_height, other.m_height)
</span><span class="cx"> && compareCSSValuePtr(m_radiusX, other.m_radiusX)
</span><span class="cx"> && compareCSSValuePtr(m_radiusY, other.m_radiusY)
</span><del>- && compareCSSValuePtr(m_box, other.m_box);
</del><ins>+ && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildCircleString(const String& radius, const String& centerX, const String& centerY, const String& box)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> return buildCircleString(m_radius ? m_radius->cssText() : String(),
</span><span class="cx"> m_centerX ? m_centerX->cssText() : String(),
</span><span class="cx"> m_centerY ? m_centerY->cssText() : String(),
</span><del>- m_box ? m_box->cssText() : String());
</del><ins>+ m_layoutBox ? m_layoutBox->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">@@ -140,7 +140,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_box, other.m_box);
</del><ins>+ && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildDeprecatedCircleString(const String& x, const String& y, const String& radius, const String& box)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> String CSSDeprecatedBasicShapeCircle::cssText() const
</span><span class="cx"> {
</span><del>- return buildDeprecatedCircleString(m_centerX->cssText(), m_centerY->cssText(), m_radius->cssText(), m_box ? m_box->cssText() : String());
</del><ins>+ return buildDeprecatedCircleString(m_centerX->cssText(), m_centerY->cssText(), m_radius->cssText(), m_layoutBox ? m_layoutBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSDeprecatedBasicShapeCircle::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -176,7 +176,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_box, other.m_box);
</del><ins>+ && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</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">@@ -221,7 +221,7 @@
</span><span class="cx"> m_radiusY ? m_radiusY->cssText() : String(),
</span><span class="cx"> m_centerX ? m_centerX->cssText() : String(),
</span><span class="cx"> m_centerY ? m_centerY->cssText() : String(),
</span><del>- m_box ? m_box->cssText() : String());
</del><ins>+ m_layoutBox ? m_layoutBox->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">@@ -234,7 +234,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_box, other.m_box);
</del><ins>+ && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildDeprecatedEllipseString(const String& x, const String& y, const String& radiusX, const String& radiusY, const String& box)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> String CSSDeprecatedBasicShapeEllipse::cssText() const
</span><span class="cx"> {
</span><del>- return buildDeprecatedEllipseString(m_centerX->cssText(), m_centerY->cssText(), m_radiusX->cssText(), m_radiusY->cssText(), m_box ? m_box->cssText() : String());
</del><ins>+ return buildDeprecatedEllipseString(m_centerX->cssText(), m_centerY->cssText(), m_radiusX->cssText(), m_radiusY->cssText(), m_layoutBox ? m_layoutBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSDeprecatedBasicShapeEllipse::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -273,7 +273,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_box, other.m_box);
</del><ins>+ && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</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">@@ -331,7 +331,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_box ? m_box->cssText() : String());
</del><ins>+ return buildPolygonString(m_windRule, points, m_layoutBox ? m_layoutBox->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">@@ -340,7 +340,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_box, rhs.m_box)
</del><ins>+ return compareCSSValuePtr(m_layoutBox, rhs.m_layoutBox)
</ins><span class="cx"> && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> m_left->cssText(),
</span><span class="cx"> m_radiusX.get() ? m_radiusX->cssText() : String(),
</span><span class="cx"> m_radiusY.get() ? m_radiusY->cssText() : String(),
</span><del>- m_box ? m_box->cssText() : String());
</del><ins>+ m_layoutBox ? m_layoutBox->cssText() : String());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeInsetRectangle::equals(const CSSBasicShape& shape) const
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> && compareCSSValuePtr(m_left, other.m_left)
</span><span class="cx"> && compareCSSValuePtr(m_radiusX, other.m_radiusX)
</span><span class="cx"> && compareCSSValuePtr(m_radiusY, other.m_radiusY)
</span><del>- && compareCSSValuePtr(m_box, other.m_box);
</del><ins>+ && compareCSSValuePtr(m_layoutBox, other.m_layoutBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String buildInsetString(const String& top, const String& right, const String& bottom, const String& left,
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx"> bottomRightRadiusHeight,
</span><span class="cx"> bottomLeftRadiusWidth,
</span><span class="cx"> bottomLeftRadiusHeight,
</span><del>- m_box ? m_box->cssText() : String());
</del><ins>+ m_layoutBox ? m_layoutBox->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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -55,15 +55,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* box() const { return m_box.get(); }
- void setBox(PassRefPtr<CSSPrimitiveValue> box) { m_box = box; }
</del><ins>+ CSSPrimitiveValue* layoutBox() const { return m_layoutBox.get(); }
+ void setLayoutBox(PassRefPtr<CSSPrimitiveValue> layoutBox) { m_layoutBox = layoutBox; }
</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_box;
</del><ins>+ RefPtr<CSSPrimitiveValue> m_layoutBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class CSSBasicShapeRectangle : public CSSBasicShape {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -2884,7 +2884,7 @@
</span><span class="cx"> if (operation->type() == ClipPathOperation::Shape) {
</span><span class="cx"> ShapeClipPathOperation& shapeOperation = toShapeClipPathOperation(*operation);
</span><span class="cx"> list->append(valueForBasicShape(style.get(), shapeOperation.basicShape()));
</span><del>- if (shapeOperation.referenceBox() != BasicShape::ReferenceBox::None)
</del><ins>+ if (shapeOperation.referenceBox() != BoxMissing)
</ins><span class="cx"> list->append(valueForBox(shapeOperation.referenceBox()));
</span><span class="cx"> }
</span><span class="cx"> if (operation->type() == ClipPathOperation::Box) {
</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()->box());
</del><ins>+ return valueForBox(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()->box());
</del><ins>+ return valueForBox(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="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -5903,7 +5903,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shapeValue && keywordValue)
</span><del>- shapeValue->setBox(keywordValue.release());
</del><ins>+ shapeValue->setLayoutBox(keywordValue.release());
</ins><span class="cx">
</span><span class="cx"> return shapeValue ? cssValuePool().createValue(shapeValue.release()) : keywordValue.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -2063,7 +2063,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (!value->isValueList())
</span><span class="cx"> return;
</span><del>- BasicShape::ReferenceBox referenceBox = BasicShape::ReferenceBox::None;
</del><ins>+ LayoutBox 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">@@ -2075,13 +2075,13 @@
</span><span class="cx"> || primitiveValue.getValueID() == CSSValuePaddingBox
</span><span class="cx"> || primitiveValue.getValueID() == CSSValueMarginBox
</span><span class="cx"> || primitiveValue.getValueID() == CSSValueBoundingBox)
</span><del>- && referenceBox == BasicShape::ReferenceBox::None)
</del><ins>+ && referenceBox == BoxMissing)
</ins><span class="cx"> referenceBox = boxForValue(&primitiveValue);
</span><span class="cx"> else
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!operation) {
</span><del>- if (referenceBox == BasicShape::ReferenceBox::None)
</del><ins>+ if (referenceBox == BoxMissing)
</ins><span class="cx"> return;
</span><span class="cx"> operation = BoxClipPathOperation::create(referenceBox);
</span><span class="cx"> } else
</span><span class="lines">@@ -2110,7 +2110,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::createBoxValue(boxForValue(primitiveValue)));
</del><ins>+ setValue(styleResolver->style(), ShapeValue::createLayoutBoxValue(boxForValue(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>
<a id="trunkSourceWebCorerenderingClipPathOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ClipPathOperation.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/ClipPathOperation.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BasicShapes.h"
</span><span class="cx"> #include "Path.h"
</span><ins>+#include "RenderStyleConstants.h"
</ins><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -113,8 +114,8 @@
</span><span class="cx"> return path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setReferenceBox(BasicShape::ReferenceBox referenceBox) { m_referenceBox = referenceBox; }
- BasicShape::ReferenceBox referenceBox() const { return m_referenceBox; }
</del><ins>+ void setReferenceBox(LayoutBox referenceBox) { m_referenceBox = referenceBox; }
+ LayoutBox 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">@@ -128,17 +129,17 @@
</span><span class="cx"> explicit ShapeClipPathOperation(PassRefPtr<BasicShape> shape)
</span><span class="cx"> : ClipPathOperation(Shape)
</span><span class="cx"> , m_shape(shape)
</span><del>- , m_referenceBox(BasicShape::ReferenceBox::None)
</del><ins>+ , m_referenceBox(BoxMissing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<BasicShape> m_shape;
</span><del>- BasicShape::ReferenceBox m_referenceBox;
</del><ins>+ LayoutBox 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(BasicShape::ReferenceBox referenceBox)
</del><ins>+ static PassRefPtr<BoxClipPathOperation> create(LayoutBox referenceBox)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new BoxClipPathOperation(referenceBox));
</span><span class="cx"> }
</span><span class="lines">@@ -150,7 +151,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=126205
</span><span class="cx"> return path;
</span><span class="cx"> }
</span><del>- BasicShape::ReferenceBox referenceBox() const { return m_referenceBox; }
</del><ins>+ LayoutBox 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">@@ -161,13 +162,13 @@
</span><span class="cx"> return m_referenceBox == other->m_referenceBox;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit BoxClipPathOperation(BasicShape::ReferenceBox referenceBox)
</del><ins>+ explicit BoxClipPathOperation(LayoutBox 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>- BasicShape::ReferenceBox m_referenceBox;
</del><ins>+ LayoutBox 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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> return rasterShape.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<Shape> Shape::createBoxShape(const RoundedRect& roundedRect, WritingMode writingMode, Length margin, Length padding)
</del><ins>+PassOwnPtr<Shape> Shape::createLayoutBoxShape(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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/shapes/Shape.h 2014-01-09 20:16:23 UTC (rev 161569)
</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(const StyleImage*, float threshold, const LayoutSize& logicalBoxSize, WritingMode, Length margin, Length padding);
</span><del>- static PassOwnPtr<Shape> createBoxShape(const RoundedRect&, WritingMode, Length margin, Length padding);
</del><ins>+ static PassOwnPtr<Shape> createLayoutBoxShape(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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case ShapeValue::Box: {
</span><span class="cx"> const RoundedRect& shapeRect = m_renderer.style().getRoundedBorderFor(LayoutRect(LayoutPoint(), m_shapeLogicalSize), &(m_renderer.view()));
</span><del>- m_shape = Shape::createBoxShape(shapeRect, writingMode, margin, padding);
</del><ins>+ m_shape = Shape::createLayoutBoxShape(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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -73,24 +73,24 @@
</span><span class="cx">
</span><span class="cx"> void setShapeSize(LayoutUnit logicalWidth, LayoutUnit logicalHeight)
</span><span class="cx"> {
</span><del>- BasicShape::ReferenceBox box = resolvedBox();
</del><ins>+ LayoutBox box = resolvedLayoutBox();
</ins><span class="cx"> switch (box) {
</span><del>- case BasicShape::MarginBox:
</del><ins>+ case MarginBox:
</ins><span class="cx"> logicalHeight += m_renderer.marginLogicalHeight();
</span><span class="cx"> logicalWidth += m_renderer.marginLogicalWidth();
</span><span class="cx"> break;
</span><del>- case BasicShape::BorderBox:
</del><ins>+ case BorderBox:
</ins><span class="cx"> break;
</span><del>- case BasicShape::PaddingBox:
</del><ins>+ case PaddingBox:
</ins><span class="cx"> logicalHeight -= m_renderer.borderLogicalHeight();
</span><span class="cx"> logicalWidth -= m_renderer.borderLogicalWidth();
</span><span class="cx"> break;
</span><del>- case BasicShape::ContentBox:
</del><ins>+ case ContentBox:
</ins><span class="cx"> logicalHeight -= m_renderer.borderAndPaddingLogicalHeight();
</span><span class="cx"> logicalWidth -= m_renderer.borderAndPaddingLogicalWidth();
</span><span class="cx"> break;
</span><del>- case BasicShape::BoundingBox:
- case BasicShape::None:
</del><ins>+ case BoundingBox:
+ case BoxMissing:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual BasicShape::ReferenceBox resolvedBox() const = 0;
</del><ins>+ virtual LayoutBox resolvedLayoutBox() 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 class="lines">@@ -170,14 +170,14 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalTopOffset() const
</span><span class="cx"> {
</span><del>- BasicShape::ReferenceBox box = resolvedBox();
</del><ins>+ LayoutBox box = resolvedLayoutBox();
</ins><span class="cx"> switch (box) {
</span><del>- case BasicShape::MarginBox: return -m_renderer.marginBefore();
- case BasicShape::BorderBox: return LayoutUnit();
- case BasicShape::PaddingBox: return m_renderer.borderBefore();
- case BasicShape::ContentBox: return m_renderer.borderAndPaddingBefore();
- case BasicShape::BoundingBox: break;
- case BasicShape::None: break;
</del><ins>+ case MarginBox: return -m_renderer.marginBefore();
+ case BorderBox: return LayoutUnit();
+ case PaddingBox: return m_renderer.borderBefore();
+ case ContentBox: return m_renderer.borderAndPaddingBefore();
+ case BoundingBox: break;
+ case BoxMissing: break;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return LayoutUnit();
</span><span class="lines">@@ -187,14 +187,14 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_renderer.isRenderRegion())
</span><span class="cx"> return LayoutUnit();
</span><del>- BasicShape::ReferenceBox box = resolvedBox();
</del><ins>+ LayoutBox box = resolvedLayoutBox();
</ins><span class="cx"> switch (box) {
</span><del>- case BasicShape::MarginBox: return -m_renderer.marginStart();
- case BasicShape::BorderBox: return LayoutUnit();
- case BasicShape::PaddingBox: return m_renderer.borderStart();
- case BasicShape::ContentBox: return m_renderer.borderAndPaddingStart();
- case BasicShape::BoundingBox: break;
- case BasicShape::None: break;
</del><ins>+ case MarginBox: return -m_renderer.marginStart();
+ case BorderBox: return LayoutUnit();
+ case PaddingBox: return m_renderer.borderStart();
+ case ContentBox: return m_renderer.borderAndPaddingStart();
+ case BoundingBox: break;
+ case BoxMissing: break;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return LayoutUnit();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -107,12 +107,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual BasicShape::ReferenceBox resolvedBox() const OVERRIDE
</del><ins>+ virtual LayoutBox resolvedLayoutBox() const OVERRIDE
</ins><span class="cx"> {
</span><del>- if (shapeValue()->box() == BasicShape::None)
- return BasicShape::ContentBox;
</del><ins>+ if (shapeValue()->layoutBox() == BoxMissing)
+ return ContentBox;
</ins><span class="cx">
</span><del>- return shapeValue()->box();
</del><ins>+ return shapeValue()->layoutBox();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -61,14 +61,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual BasicShape::ReferenceBox resolvedBox() const OVERRIDE
</del><ins>+ virtual LayoutBox resolvedLayoutBox() const OVERRIDE
</ins><span class="cx"> {
</span><del>- if (shapeValue()->box() == BasicShape::None) {
</del><ins>+ if (shapeValue()->layoutBox() == BoxMissing) {
</ins><span class="cx"> if (shapeValue()->type() == ShapeValue::Image)
</span><del>- return BasicShape::ContentBox;
- return BasicShape::MarginBox;
</del><ins>+ return ContentBox;
+ return MarginBox;
</ins><span class="cx"> }
</span><del>- return shapeValue()->box();
</del><ins>+ return shapeValue()->layoutBox();
</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 (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -46,7 +46,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 (box() != other->box())
</del><ins>+ if (layoutBox() != other->layoutBox())
</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 class="lines">@@ -75,14 +75,14 @@
</span><span class="cx">
</span><span class="cx"> FloatSize BasicShape::referenceBoxSize(const RenderBox& renderer) const
</span><span class="cx"> {
</span><del>- switch (box()) {
</del><ins>+ switch (layoutBox()) {
</ins><span class="cx"> case ContentBox:
</span><span class="cx"> return renderer.contentBoxRect().size();
</span><span class="cx"> case PaddingBox:
</span><span class="cx"> return renderer.paddingBoxRect().size();
</span><span class="cx"> case BorderBox:
</span><span class="cx"> return renderer.size();
</span><del>- case None: // If <box> is not supplied, then the reference box defaults to margin-box.
</del><ins>+ case BoxMissing: // If <box> is not supplied, then the reference box defaults to margin-box.
</ins><span class="cx"> case MarginBox:
</span><span class="cx"> return FloatSize(renderer.marginLeft() + renderer.width() + renderer.marginRight(),
</span><span class="cx"> renderer.marginTop() + renderer.height() + renderer.marginBottom());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Length.h"
</span><span class="cx"> #include "LengthSize.h"
</span><ins>+#include "RenderStyleConstants.h"
</ins><span class="cx"> #include "WindRule.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -58,15 +59,6 @@
</span><span class="cx"> BasicShapeInsetType
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum ReferenceBox {
- None,
- ContentBox,
- PaddingBox,
- BorderBox,
- MarginBox,
- BoundingBox
- };
-
</del><span class="cx"> bool canBlend(const BasicShape*) const;
</span><span class="cx">
</span><span class="cx"> virtual void path(Path&, const FloatRect&) = 0;
</span><span class="lines">@@ -75,19 +67,19 @@
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span><span class="cx">
</span><del>- ReferenceBox box() const { return m_box; }
- void setBox(ReferenceBox box) { m_box = box; }
</del><ins>+ LayoutBox layoutBox() const { return m_layoutBox; }
+ void setLayoutBox(LayoutBox layoutBox) { m_layoutBox = layoutBox; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> BasicShape()
</span><del>- : m_box(None)
</del><ins>+ : m_layoutBox(BoxMissing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize referenceBoxSize(const RenderBox&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ReferenceBox m_box;
</del><ins>+ LayoutBox m_layoutBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class BasicShapeRectangle : public BasicShape {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -549,6 +549,8 @@
</span><span class="cx"> enum TextIndentType { TextIndentNormal, TextIndentHanging };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox, BoundingBox };
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // RenderStyleConstants_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleShapeValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/ShapeValue.h (161568 => 161569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-01-09 20:14:32 UTC (rev 161568)
+++ trunk/Source/WebCore/rendering/style/ShapeValue.h 2014-01-09 20:16:23 UTC (rev 161569)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> return adoptRef(new ShapeValue(shape));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<ShapeValue> createBoxValue(BasicShape::ReferenceBox box)
</del><ins>+ static PassRefPtr<ShapeValue> createLayoutBoxValue(LayoutBox layoutBox)
</ins><span class="cx"> {
</span><del>- return adoptRef(new ShapeValue(box));
</del><ins>+ return adoptRef(new ShapeValue(layoutBox));
</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>- BasicShape::ReferenceBox box() const { return m_box; }
</del><ins>+ LayoutBox layoutBox() const { return m_layoutBox; }
</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">@@ -87,30 +87,30 @@
</span><span class="cx"> ShapeValue(PassRefPtr<BasicShape> shape)
</span><span class="cx"> : m_type(Shape)
</span><span class="cx"> , m_shape(shape)
</span><del>- , m_box(m_shape->box())
</del><ins>+ , m_layoutBox(m_shape->layoutBox())
</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_box(BasicShape::None)
</del><ins>+ , m_layoutBox(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_box(BasicShape::None)
</del><ins>+ , m_layoutBox(BoxMissing)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>- ShapeValue(BasicShape::ReferenceBox box)
</del><ins>+ ShapeValue(LayoutBox layoutBox)
</ins><span class="cx"> : m_type(Box)
</span><del>- , m_box(box)
</del><ins>+ , m_layoutBox(layoutBox)
</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>- BasicShape::ReferenceBox m_box;
</del><ins>+ LayoutBox m_layoutBox;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>