<!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>[159779] 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/159779">159779</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-11-25 21:54:30 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert some Shape code to use references
https://bugs.webkit.org/show_bug.cgi?id=124876
Reviewed by Andreas Kling.
* inspector/InspectorOverlay.cpp:
* rendering/FloatingObjects.cpp:
* rendering/LayoutState.cpp:
* rendering/RenderBlock.cpp:
* rendering/RenderBlock.h:
* rendering/RenderBlockLineLayout.cpp:
* rendering/RenderBox.cpp:
* rendering/RenderBox.h:
* rendering/line/BreakingContextInlineHeaders.h:
* rendering/line/LineWidth.cpp:
* rendering/shapes/ShapeInfo.cpp:
* rendering/shapes/ShapeInfo.h:
* rendering/shapes/ShapeInsideInfo.cpp:
* rendering/shapes/ShapeInsideInfo.h:
* rendering/shapes/ShapeOutsideInfo.cpp:
* rendering/shapes/ShapeOutsideInfo.h:
Replace yet more pointers with references.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFloatingObjectscpp">trunk/Source/WebCore/rendering/FloatingObjects.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStatecpp">trunk/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthcpp">trunk/Source/WebCore/rendering/line/LineWidth.cpp</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="#trunkSourceWebCorerenderingshapesShapeInsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeOutsideInfoh">trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/ChangeLog 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2013-11-25 Sam Weinig <sam@webkit.org>
+
+ Convert some Shape code to use references
+ https://bugs.webkit.org/show_bug.cgi?id=124876
+
+ Reviewed by Andreas Kling.
+
+ * inspector/InspectorOverlay.cpp:
+ * rendering/FloatingObjects.cpp:
+ * rendering/LayoutState.cpp:
+ * rendering/RenderBlock.cpp:
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockLineLayout.cpp:
+ * rendering/RenderBox.cpp:
+ * rendering/RenderBox.h:
+ * rendering/line/BreakingContextInlineHeaders.h:
+ * rendering/line/LineWidth.cpp:
+ * rendering/shapes/ShapeInfo.cpp:
+ * rendering/shapes/ShapeInfo.h:
+ * rendering/shapes/ShapeInsideInfo.cpp:
+ * rendering/shapes/ShapeInsideInfo.h:
+ * rendering/shapes/ShapeOutsideInfo.cpp:
+ * rendering/shapes/ShapeOutsideInfo.h:
+ Replace yet more pointers with references.
+
</ins><span class="cx"> 2013-11-25 Simon Pena <simon.pena@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] X11Helper::createPixmap doesn't initialise out value handleId
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> shapeObject->setArray("bounds", buildArrayForQuad(shapeQuad));
</span><span class="cx">
</span><span class="cx"> Path path;
</span><del>- shapeOutsideInfo->computedShape()->buildPath(path);
</del><ins>+ shapeOutsideInfo->computedShape().buildPath(path);
</ins><span class="cx">
</span><span class="cx"> if (path.length()) {
</span><span class="cx"> RefPtr<InspectorArray> shapePath = InspectorArray::create();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFloatingObjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -360,12 +360,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (floatingObject) {
</span><span class="cx"> if (ShapeOutsideInfo* shapeOutside = floatingObject->renderer().shapeOutsideInfo()) {
</span><del>- shapeOutside->updateDeltasForContainingBlockLine(&containingBlock, floatingObject, lineTop, lineBottom - lineTop);
</del><ins>+ shapeOutside->updateDeltasForContainingBlockLine(containingBlock, *floatingObject, lineTop, lineBottom - lineTop);
</ins><span class="cx"> return shapeOutside;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> , m_lineGrid(0)
</span><span class="cx"> , m_next(std::move(next))
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- , m_shapeInsideInfo(0)
</del><ins>+ , m_shapeInsideInfo(nullptr)
</ins><span class="cx"> #endif
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_renderer(renderer)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> , m_columnInfo(0)
</span><span class="cx"> , m_lineGrid(0)
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- , m_shapeInsideInfo(0)
</del><ins>+ , m_shapeInsideInfo(nullptr)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_pageLogicalHeight(0)
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> LayoutUnit m_pageLogicalOffset;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- OwnPtr<ShapeInsideInfo> m_shapeInsideInfo;
</del><ins>+ std::unique_ptr<ShapeInsideInfo> m_shapeInsideInfo;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1400,8 +1400,8 @@
</span><span class="cx">
</span><span class="cx"> ShapeValue* shapeValue = style().shapeInside();
</span><span class="cx"> if (shapeValue && shapeValue->image() && shapeValue->image()->data() == image) {
</span><del>- ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo->dirtyShapeSize();
</del><ins>+ ShapeInsideInfo& shapeInsideInfo = ensureShapeInsideInfo();
+ shapeInsideInfo.dirtyShapeSize();
</ins><span class="cx"> markShapeInsideDescendantsForLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1417,32 +1417,32 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (shapeInside) {
</span><del>- ShapeInsideInfo* shapeInsideInfo = ensureShapeInsideInfo();
- shapeInsideInfo->dirtyShapeSize();
</del><ins>+ ShapeInsideInfo& shapeInsideInfo = ensureShapeInsideInfo();
+ shapeInsideInfo.dirtyShapeSize();
</ins><span class="cx"> } else
</span><span class="cx"> setShapeInsideInfo(nullptr);
</span><span class="cx"> markShapeInsideDescendantsForLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ShapeInsideInfo* RenderBlock::ensureShapeInsideInfo()
</del><ins>+ShapeInsideInfo& RenderBlock::ensureShapeInsideInfo()
</ins><span class="cx"> {
</span><span class="cx"> RenderBlockRareData& rareData = ensureRareData(this);
</span><span class="cx"> if (!rareData.m_shapeInsideInfo)
</span><del>- setShapeInsideInfo(ShapeInsideInfo::createInfo(this));
- return rareData.m_shapeInsideInfo.get();
</del><ins>+ setShapeInsideInfo(std::make_unique<ShapeInsideInfo>(*this));
+ return *rareData.m_shapeInsideInfo;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ShapeInsideInfo* RenderBlock::shapeInsideInfo() const
</span><span class="cx"> {
</span><span class="cx"> RenderBlockRareData* rareData = getRareData(this);
</span><span class="cx"> if (!rareData || !rareData->m_shapeInsideInfo)
</span><del>- return 0;
- return ShapeInsideInfo::isEnabledFor(this) ? rareData->m_shapeInsideInfo.get() : 0;
</del><ins>+ return nullptr;
+ return ShapeInsideInfo::isEnabledFor(*this) ? rareData->m_shapeInsideInfo.get() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::setShapeInsideInfo(PassOwnPtr<ShapeInsideInfo> value)
</del><ins>+void RenderBlock::setShapeInsideInfo(std::unique_ptr<ShapeInsideInfo> value)
</ins><span class="cx"> {
</span><del>- ensureRareData(this).m_shapeInsideInfo = value;
</del><ins>+ ensureRareData(this).m_shapeInsideInfo = std::move(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::markShapeInsideDescendantsForLayout()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -386,9 +386,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- ShapeInsideInfo* ensureShapeInsideInfo();
</del><ins>+ ShapeInsideInfo& ensureShapeInsideInfo();
</ins><span class="cx"> ShapeInsideInfo* shapeInsideInfo() const;
</span><del>- void setShapeInsideInfo(PassOwnPtr<ShapeInsideInfo> value);
</del><ins>+ void setShapeInsideInfo(std::unique_ptr<ShapeInsideInfo>);
</ins><span class="cx">
</span><span class="cx"> void markShapeInsideDescendantsForLayout();
</span><span class="cx"> ShapeInsideInfo* layoutShapeInsideInfo() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> LayoutUnit shapeLogicalBottom = shapeInsideInfo->shapeLogicalBottom();
</span><span class="cx"> LayoutUnit shapeContainingBlockLogicalHeight = shapeInsideInfo->shapeContainingBlockLogicalHeight();
</span><span class="cx">
</span><del>- bool isOverflowPositionedAlready = (shapeContainingBlockLogicalHeight - shapeInsideInfo->owner()->borderAndPaddingAfter() + lineHeight) <= lineTop;
</del><ins>+ bool isOverflowPositionedAlready = (shapeContainingBlockLogicalHeight - shapeInsideInfo->owner().borderAndPaddingAfter() + lineHeight) <= lineTop;
</ins><span class="cx">
</span><span class="cx"> // If the last line overlaps with the shape, we don't need the segments anymore
</span><span class="cx"> if (lineTop < shapeLogicalBottom && shapeLogicalBottom < logicalLineBottom)
</span><span class="lines">@@ -1143,7 +1143,7 @@
</span><span class="cx"> if (logicalLineBottom <= shapeLogicalBottom || !shapeContainingBlockLogicalHeight || isOverflowPositionedAlready)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockLogicalHeight - (lineTop + shapeInsideInfo->owner()->borderAndPaddingAfter()));
</del><ins>+ LayoutUnit newLogicalHeight = block->logicalHeight() + (shapeContainingBlockLogicalHeight - (lineTop + shapeInsideInfo->owner().borderAndPaddingAfter()));
</ins><span class="cx"> block->setLogicalHeight(newLogicalHeight);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1301,17 +1301,17 @@
</span><span class="cx"> LayoutSize logicalOffsetFromShapeContainer;
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = layoutShapeInsideInfo();
</span><span class="cx"> if (shapeInsideInfo) {
</span><del>- ASSERT(shapeInsideInfo->owner() == this || allowsShapeInsideInfoSharing());
</del><ins>+ ASSERT(&shapeInsideInfo->owner() == this || allowsShapeInsideInfoSharing());
</ins><span class="cx"> if (shapeInsideInfo != this->shapeInsideInfo()) {
</span><span class="cx"> // FIXME Bug 100284: If subsequent LayoutStates are pushed, we will have to add
</span><span class="cx"> // their offsets from the original shape-inside container.
</span><del>- logicalOffsetFromShapeContainer = logicalOffsetFromShapeAncestorContainer(shapeInsideInfo->owner());
</del><ins>+ logicalOffsetFromShapeContainer = logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner());
</ins><span class="cx"> }
</span><span class="cx"> // Begin layout at the logical top of our shape inside.
</span><span class="cx"> if (logicalHeight() + logicalOffsetFromShapeContainer.height() < shapeInsideInfo->shapeLogicalTop()) {
</span><span class="cx"> LayoutUnit logicalHeight = shapeInsideInfo->shapeLogicalTop() - logicalOffsetFromShapeContainer.height();
</span><span class="cx"> if (layoutState.flowThread())
</span><del>- logicalHeight -= shapeInsideInfo->owner()->borderAndPaddingBefore();
</del><ins>+ logicalHeight -= shapeInsideInfo->owner().borderAndPaddingBefore();
</ins><span class="cx"> setLogicalHeight(logicalHeight);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> RenderBlock::removePercentHeightDescendantIfNeeded(*this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>- ShapeOutsideInfo::removeInfo(this);
</del><ins>+ ShapeOutsideInfo::removeInfo(*this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RenderBoxModelObject::willBeDestroyed();
</span><span class="lines">@@ -400,9 +400,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!shapeOutside)
</span><del>- ShapeOutsideInfo::removeInfo(this);
</del><ins>+ ShapeOutsideInfo::removeInfo(*this);
</ins><span class="cx"> else
</span><del>- ShapeOutsideInfo::ensureInfo(this)->dirtyShapeSize();
</del><ins>+ ShapeOutsideInfo::ensureInfo(*this).dirtyShapeSize();
</ins><span class="cx">
</span><span class="cx"> if (shapeOutside || shapeOutside != oldShapeOutside)
</span><span class="cx"> markShapeOutsideDependentsForLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> ShapeOutsideInfo* shapeOutsideInfo() const
</span><span class="cx"> {
</span><del>- return ShapeOutsideInfo::isEnabledFor(this) ? ShapeOutsideInfo::info(this) : 0;
</del><ins>+ return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void markShapeOutsideDependentsForLayout()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool isHorizontalWritingMode = block.isHorizontalWritingMode();
</span><del>- LayoutUnit logicalOffsetFromShapeContainer = block.logicalOffsetFromShapeAncestorContainer(shapeInsideInfo->owner()).height();
</del><ins>+ LayoutUnit logicalOffsetFromShapeContainer = block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
</ins><span class="cx">
</span><span class="cx"> LayoutUnit lineLogicalTop = block.logicalHeight() + logicalOffsetFromShapeContainer;
</span><span class="cx"> LayoutUnit lineLogicalHeight = block.lineHeight(isFirstLine, isHorizontalWritingMode ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> // when we add a subsequent float on the same line, we need to undo the shape delta in order to position
</span><span class="cx"> // based on the margin box. In order to do this, we need to walk back through the floating object list to find
</span><span class="cx"> // the first previous float that is on the same side as our newFloat.
</span><del>- ShapeOutsideInfo* previousShapeOutsideInfo = 0;
</del><ins>+ ShapeOutsideInfo* previousShapeOutsideInfo = nullptr;
</ins><span class="cx"> const FloatingObjectSet& floatingObjectSet = m_block.m_floatingObjects->set();
</span><span class="cx"> auto it = floatingObjectSet.end();
</span><span class="cx"> auto begin = floatingObjectSet.begin();
</span><span class="lines">@@ -111,14 +111,14 @@
</span><span class="cx"> if (previousFloat != newFloat && previousFloat->type() == newFloat->type()) {
</span><span class="cx"> previousShapeOutsideInfo = previousFloat->renderer().shapeOutsideInfo();
</span><span class="cx"> if (previousShapeOutsideInfo)
</span><del>- previousShapeOutsideInfo->updateDeltasForContainingBlockLine(&m_block, previousFloat, m_block.logicalHeight(), lineHeight);
</del><ins>+ previousShapeOutsideInfo->updateDeltasForContainingBlockLine(m_block, *previousFloat, m_block.logicalHeight(), lineHeight);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ShapeOutsideInfo* shapeOutsideInfo = newFloat->renderer().shapeOutsideInfo();
</span><span class="cx"> if (shapeOutsideInfo)
</span><del>- shapeOutsideInfo->updateDeltasForContainingBlockLine(&m_block, newFloat, m_block.logicalHeight(), lineHeight);
</del><ins>+ shapeOutsideInfo->updateDeltasForContainingBlockLine(m_block, *newFloat, m_block.logicalHeight(), lineHeight);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (newFloat->type() == FloatingObject::FloatLeft) {
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> // FIXME: This code should be refactored to incorporate with the code above.
</span><span class="cx"> ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
</span><span class="cx"> if (shapeInsideInfo) {
</span><del>- LayoutUnit logicalOffsetFromShapeContainer = m_block.logicalOffsetFromShapeAncestorContainer(shapeInsideInfo->owner()).height();
</del><ins>+ LayoutUnit logicalOffsetFromShapeContainer = m_block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
</ins><span class="cx"> LayoutUnit lineHeight = m_block.lineHeight(false, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
</span><span class="cx"> shapeInsideInfo->updateSegmentsForLine(lastFloatLogicalBottom + logicalOffsetFromShapeContainer, lineHeight);
</span><span class="cx"> updateCurrentShapeSegment();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -55,15 +55,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class RenderType>
</span><del>-const Shape* ShapeInfo<RenderType>::computedShape() const
</del><ins>+const Shape& ShapeInfo<RenderType>::computedShape() const
</ins><span class="cx"> {
</span><span class="cx"> if (Shape* shape = m_shape.get())
</span><del>- return shape;
</del><ins>+ return *shape;
</ins><span class="cx">
</span><del>- WritingMode writingMode = m_renderer->style().writingMode();
- Length margin = m_renderer->style().shapeMargin();
- Length padding = m_renderer->style().shapePadding();
- float shapeImageThreshold = m_renderer->style().shapeImageThreshold();
</del><ins>+ WritingMode writingMode = m_renderer.style().writingMode();
+ Length margin = m_renderer.style().shapeMargin();
+ Length padding = m_renderer.style().shapePadding();
+ float shapeImageThreshold = m_renderer.style().shapeImageThreshold();
</ins><span class="cx"> const ShapeValue* shapeValue = this->shapeValue();
</span><span class="cx"> ASSERT(shapeValue);
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case ShapeValue::Box: {
</span><span class="cx"> ASSERT(shapeValue->box());
</span><del>- const RoundedRect& shapeRect = m_renderer->style().getRoundedBorderFor(LayoutRect(LayoutPoint(), m_shapeLogicalSize), &(m_renderer->view()));
</del><ins>+ const RoundedRect& shapeRect = m_renderer.style().getRoundedBorderFor(LayoutRect(LayoutPoint(), m_shapeLogicalSize), &(m_renderer.view()));
</ins><span class="cx"> m_shape = Shape::createShape(shapeRect, writingMode, margin, padding);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(m_shape);
</span><del>- return m_shape.get();
</del><ins>+ return *m_shape;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class RenderType>
</span><span class="lines">@@ -109,5 +109,6 @@
</span><span class="cx">
</span><span class="cx"> template class ShapeInfo<RenderBlock>;
</span><span class="cx"> template class ShapeInfo<RenderBox>;
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.h (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.h 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -45,18 +45,19 @@
</span><span class="cx"> template<class KeyType, class InfoType>
</span><span class="cx"> class MappedInfo {
</span><span class="cx"> public:
</span><del>- static InfoType* ensureInfo(const KeyType* key)
</del><ins>+ static InfoType& ensureInfo(const KeyType& key)
</ins><span class="cx"> {
</span><span class="cx"> InfoMap& infoMap = MappedInfo<KeyType, InfoType>::infoMap();
</span><del>- if (InfoType* info = infoMap.get(key))
- return info;
- typename InfoMap::AddResult result = infoMap.add(key, InfoType::createInfo(key));
- return result.iterator->value.get();
</del><ins>+ if (InfoType* info = infoMap.get(&key))
+ return *info;
+ typename InfoMap::AddResult result = infoMap.add(&key, std::make_unique<InfoType>(key));
+ return *result.iterator->value;
</ins><span class="cx"> }
</span><del>- static void removeInfo(const KeyType* key) { infoMap().remove(key); }
- static InfoType* info(const KeyType* key) { return infoMap().get(key); }
</del><ins>+ static void removeInfo(const KeyType& key) { infoMap().remove(&key); }
+ static InfoType* info(const KeyType& key) { return infoMap().get(&key); }
+
</ins><span class="cx"> private:
</span><del>- typedef HashMap<const KeyType*, OwnPtr<InfoType>> InfoMap;
</del><ins>+ typedef HashMap<const KeyType*, std::unique_ptr<InfoType>> InfoMap;
</ins><span class="cx"> static InfoMap& infoMap()
</span><span class="cx"> {
</span><span class="cx"> DEFINE_STATIC_LOCAL(InfoMap, staticInfoMap, ());
</span><span class="lines">@@ -75,23 +76,23 @@
</span><span class="cx"> if (shapeValue()->type() == ShapeValue::Box) {
</span><span class="cx"> switch (shapeValue()->box()) {
</span><span class="cx"> case CSSValueMarginBox:
</span><del>- logicalHeight += m_renderer->marginLogicalHeight();
- logicalWidth += m_renderer->marginLogicalWidth();
</del><ins>+ logicalHeight += m_renderer.marginLogicalHeight();
+ logicalWidth += m_renderer.marginLogicalWidth();
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueBorderBox:
</span><span class="cx"> break;
</span><span class="cx"> case CSSValuePaddingBox:
</span><del>- logicalHeight -= m_renderer->borderLogicalHeight();
- logicalWidth -= m_renderer->borderLogicalWidth();
</del><ins>+ logicalHeight -= m_renderer.borderLogicalHeight();
+ logicalWidth -= m_renderer.borderLogicalWidth();
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- logicalHeight -= m_renderer->borderAndPaddingLogicalHeight();
- logicalWidth -= m_renderer->borderAndPaddingLogicalWidth();
</del><ins>+ logicalHeight -= m_renderer.borderAndPaddingLogicalHeight();
+ logicalWidth -= m_renderer.borderAndPaddingLogicalWidth();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- } else if (m_renderer->style().boxSizing() == CONTENT_BOX) {
- logicalHeight -= m_renderer->borderAndPaddingLogicalHeight();
- logicalWidth -= m_renderer->borderAndPaddingLogicalWidth();
</del><ins>+ } else if (m_renderer.style().boxSizing() == CONTENT_BOX) {
+ logicalHeight -= m_renderer.borderAndPaddingLogicalHeight();
+ logicalWidth -= m_renderer.borderAndPaddingLogicalWidth();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutSize newLogicalSize(logicalWidth, logicalHeight);
</span><span class="lines">@@ -114,13 +115,13 @@
</span><span class="cx"> LayoutUnit logicalLineBottom() const { return m_shapeLineTop + m_lineHeight + logicalTopOffset(); }
</span><span class="cx"> LayoutUnit logicalLineBottom(LayoutUnit lineHeight) const { return m_shapeLineTop + lineHeight + logicalTopOffset(); }
</span><span class="cx">
</span><del>- LayoutUnit shapeContainingBlockLogicalHeight() const { return (m_renderer->style().boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer->borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
</del><ins>+ LayoutUnit shapeContainingBlockLogicalHeight() const { return (m_renderer.style().boxSizing() == CONTENT_BOX) ? (m_shapeLogicalSize.height() + m_renderer.borderAndPaddingLogicalHeight()) : m_shapeLogicalSize.height(); }
</ins><span class="cx">
</span><span class="cx"> virtual bool lineOverlapsShapeBounds() const = 0;
</span><span class="cx">
</span><span class="cx"> void dirtyShapeSize() { m_shape.clear(); }
</span><span class="cx"> bool shapeSizeDirty() { return !m_shape.get(); }
</span><del>- const RenderType* owner() const { return m_renderer; }
</del><ins>+ const RenderType& owner() const { return m_renderer; }
</ins><span class="cx"> LayoutSize shapeSize() const { return m_shapeLogicalSize; }
</span><span class="cx">
</span><span class="cx"> LayoutRect computedShapePhysicalBoundingBox() const
</span><span class="lines">@@ -128,9 +129,9 @@
</span><span class="cx"> LayoutRect physicalBoundingBox = computedShapeLogicalBoundingBox();
</span><span class="cx"> physicalBoundingBox.setX(physicalBoundingBox.x() + logicalLeftOffset());
</span><span class="cx"> physicalBoundingBox.setY(physicalBoundingBox.y() + logicalTopOffset());
</span><del>- if (m_renderer->style().isFlippedBlocksWritingMode())
- physicalBoundingBox.setY(m_renderer->logicalHeight() - physicalBoundingBox.maxY());
- if (!m_renderer->style().isHorizontalWritingMode())
</del><ins>+ if (m_renderer.style().isFlippedBlocksWritingMode())
+ physicalBoundingBox.setY(m_renderer.logicalHeight() - physicalBoundingBox.maxY());
+ if (!m_renderer.style().isHorizontalWritingMode())
</ins><span class="cx"> physicalBoundingBox = physicalBoundingBox.transposedRect();
</span><span class="cx"> return physicalBoundingBox;
</span><span class="cx"> }
</span><span class="lines">@@ -138,24 +139,27 @@
</span><span class="cx"> FloatPoint shapeToRendererPoint(FloatPoint point) const
</span><span class="cx"> {
</span><span class="cx"> FloatPoint result = FloatPoint(point.x() + logicalLeftOffset(), point.y() + logicalTopOffset());
</span><del>- if (m_renderer->style().isFlippedBlocksWritingMode())
- result.setY(m_renderer->logicalHeight() - result.y());
- if (!m_renderer->style().isHorizontalWritingMode())
</del><ins>+ if (m_renderer.style().isFlippedBlocksWritingMode())
+ result.setY(m_renderer.logicalHeight() - result.y());
+ if (!m_renderer.style().isHorizontalWritingMode())
</ins><span class="cx"> result = result.transposedPoint();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize shapeToRendererSize(FloatSize size) const
</span><span class="cx"> {
</span><del>- if (!m_renderer->style().isHorizontalWritingMode())
</del><ins>+ if (!m_renderer.style().isHorizontalWritingMode())
</ins><span class="cx"> return size.transposedSize();
</span><span class="cx"> return size;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const Shape* computedShape() const;
</del><ins>+ const Shape& computedShape() const;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- explicit ShapeInfo(const RenderType* renderer): m_renderer(renderer) { }
</del><ins>+ explicit ShapeInfo(const RenderType& renderer)
+ : m_renderer(renderer)
+ {
+ }
</ins><span class="cx">
</span><span class="cx"> virtual LayoutRect computedShapeLogicalBoundingBox() const = 0;
</span><span class="cx"> virtual ShapeValue* shapeValue() const = 0;
</span><span class="lines">@@ -165,32 +169,32 @@
</span><span class="cx"> {
</span><span class="cx"> if (shapeValue()->type() == ShapeValue::Box) {
</span><span class="cx"> switch (shapeValue()->box()) {
</span><del>- case CSSValueMarginBox: return -m_renderer->marginBefore();
</del><ins>+ case CSSValueMarginBox: return -m_renderer.marginBefore();
</ins><span class="cx"> case CSSValueBorderBox: return LayoutUnit();
</span><del>- case CSSValuePaddingBox: return m_renderer->borderBefore();
- default: return m_renderer->borderAndPaddingBefore();
</del><ins>+ case CSSValuePaddingBox: return m_renderer.borderBefore();
+ default: return m_renderer.borderAndPaddingBefore();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- return m_renderer->style().boxSizing() == CONTENT_BOX ? m_renderer->borderAndPaddingBefore() : LayoutUnit();
</del><ins>+ return m_renderer.style().boxSizing() == CONTENT_BOX ? m_renderer.borderAndPaddingBefore() : LayoutUnit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalLeftOffset() const
</span><span class="cx"> {
</span><span class="cx"> if (shapeValue()->type() == ShapeValue::Box) {
</span><span class="cx"> switch (shapeValue()->box()) {
</span><del>- case CSSValueMarginBox: return -m_renderer->marginStart();
</del><ins>+ case CSSValueMarginBox: return -m_renderer.marginStart();
</ins><span class="cx"> case CSSValueBorderBox: return LayoutUnit();
</span><del>- case CSSValuePaddingBox: return m_renderer->borderStart();
- default: return m_renderer->borderAndPaddingStart();
</del><ins>+ case CSSValuePaddingBox: return m_renderer.borderStart();
+ default: return m_renderer.borderAndPaddingStart();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- return (m_renderer->style().boxSizing() == CONTENT_BOX && !m_renderer->isRenderRegion()) ? m_renderer->borderAndPaddingStart() : LayoutUnit();
</del><ins>+ return (m_renderer.style().boxSizing() == CONTENT_BOX && !m_renderer.isRenderRegion()) ? m_renderer.borderAndPaddingStart() : LayoutUnit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit m_shapeLineTop;
</span><span class="cx"> LayoutUnit m_lineHeight;
</span><span class="cx">
</span><del>- const RenderType* m_renderer;
</del><ins>+ const RenderType& m_renderer;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> mutable OwnPtr<Shape> m_shape;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ShapeInsideInfo::isEnabledFor(const RenderBlock* renderer)
</del><ins>+bool ShapeInsideInfo::isEnabledFor(const RenderBlock& renderer)
</ins><span class="cx"> {
</span><del>- ShapeValue* shapeValue = renderer->style().resolvedShapeInside();
</del><ins>+ ShapeValue* shapeValue = renderer.style().resolvedShapeInside();
</ins><span class="cx"> if (!shapeValue)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> case ShapeValue::Shape:
</span><span class="cx"> return shapeValue->shape() && shapeValue->shape()->type() != BasicShape::BasicShapeInsetRectangleType;
</span><span class="cx"> case ShapeValue::Image:
</span><del>- return shapeValue->isImageValid() && checkShapeImageOrigin(renderer->document(), *(shapeValue->image()->cachedImage()));
</del><ins>+ return shapeValue->isImageValid() && checkShapeImageOrigin(renderer.document(), *(shapeValue->image()->cachedImage()));
</ins><span class="cx"> case ShapeValue::Box:
</span><span class="cx"> return false;
</span><span class="cx"> case ShapeValue::Outside:
</span><span class="lines">@@ -91,12 +91,12 @@
</span><span class="cx">
</span><span class="cx"> bool ShapeInsideInfo::adjustLogicalLineTop(float minSegmentWidth)
</span><span class="cx"> {
</span><del>- const Shape* shape = computedShape();
- if (!shape || m_lineHeight <= 0 || logicalLineTop() > shapeLogicalBottom())
</del><ins>+ const Shape& shape = computedShape();
+ if (m_lineHeight <= 0 || logicalLineTop() > shapeLogicalBottom())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LayoutUnit newLineTop;
</span><del>- if (shape->firstIncludedIntervalLogicalTop(m_shapeLineTop, LayoutSize(minSegmentWidth, m_lineHeight), newLineTop)) {
</del><ins>+ if (shape.firstIncludedIntervalLogicalTop(m_shapeLineTop, LayoutSize(minSegmentWidth, m_lineHeight), newLineTop)) {
</ins><span class="cx"> if (newLineTop > m_shapeLineTop) {
</span><span class="cx"> m_shapeLineTop = newLineTop;
</span><span class="cx"> return true;
</span><span class="lines">@@ -108,16 +108,16 @@
</span><span class="cx">
</span><span class="cx"> ShapeValue* ShapeInsideInfo::shapeValue() const
</span><span class="cx"> {
</span><del>- return m_renderer->style().resolvedShapeInside();
</del><ins>+ return m_renderer.style().resolvedShapeInside();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit ShapeInsideInfo::computeFirstFitPositionForFloat(const LayoutSize floatSize) const
</span><span class="cx"> {
</span><del>- if (!computedShape() || !floatSize.width() || shapeLogicalBottom() < logicalLineTop())
</del><ins>+ if (!floatSize.width() || shapeLogicalBottom() < logicalLineTop())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> LayoutUnit firstFitPosition = 0;
</span><del>- if (computedShape()->firstIncludedIntervalLogicalTop(m_shapeLineTop, floatSize, firstFitPosition) && (m_shapeLineTop <= firstFitPosition))
</del><ins>+ if (computedShape().firstIncludedIntervalLogicalTop(m_shapeLineTop, floatSize, firstFitPosition) && (m_shapeLineTop <= firstFitPosition))
</ins><span class="cx"> return firstFitPosition;
</span><span class="cx">
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInsideInfo.h 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -65,9 +65,13 @@
</span><span class="cx">
</span><span class="cx"> class ShapeInsideInfo FINAL : public ShapeInfo<RenderBlock> {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ShapeInsideInfo> createInfo(const RenderBlock* renderer) { return adoptPtr(new ShapeInsideInfo(renderer)); }
</del><ins>+ ShapeInsideInfo(const RenderBlock& renderer)
+ : ShapeInfo<RenderBlock>(renderer)
+ , m_needsLayout(false)
+ {
+ }
</ins><span class="cx">
</span><del>- static bool isEnabledFor(const RenderBlock* renderer);
</del><ins>+ static bool isEnabledFor(const RenderBlock& renderer);
</ins><span class="cx">
</span><span class="cx"> bool updateSegmentsForLine(LayoutSize lineOffset, LayoutUnit lineHeight);
</span><span class="cx"> bool updateSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight);
</span><span class="lines">@@ -99,23 +103,17 @@
</span><span class="cx">
</span><span class="cx"> virtual bool lineOverlapsShapeBounds() const OVERRIDE
</span><span class="cx"> {
</span><del>- return computedShape()->lineOverlapsShapePaddingBounds(m_shapeLineTop, m_lineHeight);
</del><ins>+ return computedShape().lineOverlapsShapePaddingBounds(m_shapeLineTop, m_lineHeight);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-protected:
- virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape()->shapePaddingLogicalBoundingBox(); }
</del><ins>+private:
+ virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapePaddingLogicalBoundingBox(); }
</ins><span class="cx"> virtual ShapeValue* shapeValue() const OVERRIDE;
</span><span class="cx"> virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, SegmentList& segments) const OVERRIDE
</span><span class="cx"> {
</span><del>- return computedShape()->getIncludedIntervals(lineTop, lineHeight, segments);
</del><ins>+ return computedShape().getIncludedIntervals(lineTop, lineHeight, segments);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-private:
- ShapeInsideInfo(const RenderBlock* renderer)
- : ShapeInfo<RenderBlock> (renderer)
- , m_needsLayout(false)
- { }
-
</del><span class="cx"> SegmentRangeList m_segmentRanges;
</span><span class="cx"> bool m_needsLayout:1;
</span><span class="cx"> SegmentList m_segments;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -38,17 +38,18 @@
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-bool ShapeOutsideInfo::isEnabledFor(const RenderBox* box)
</del><ins>+
+bool ShapeOutsideInfo::isEnabledFor(const RenderBox& box)
</ins><span class="cx"> {
</span><del>- ShapeValue* shapeValue = box->style().shapeOutside();
- if (!box->isFloating() || !shapeValue)
</del><ins>+ ShapeValue* shapeValue = box.style().shapeOutside();
+ if (!box.isFloating() || !shapeValue)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (shapeValue->type()) {
</span><span class="cx"> case ShapeValue::Shape:
</span><span class="cx"> return shapeValue->shape();
</span><span class="cx"> case ShapeValue::Image:
</span><del>- return shapeValue->isImageValid() && checkShapeImageOrigin(box->document(), *(shapeValue->image()->cachedImage()));
</del><ins>+ return shapeValue->isImageValid() && checkShapeImageOrigin(box.document(), *(shapeValue->image()->cachedImage()));
</ins><span class="cx"> case ShapeValue::Box:
</span><span class="cx"> return true;
</span><span class="cx"> case ShapeValue::Outside:
</span><span class="lines">@@ -58,9 +59,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ShapeOutsideInfo::updateDeltasForContainingBlockLine(const RenderBlockFlow* containingBlock, const FloatingObject* floatingObject, LayoutUnit lineTop, LayoutUnit lineHeight)
</del><ins>+void ShapeOutsideInfo::updateDeltasForContainingBlockLine(const RenderBlockFlow& containingBlock, const FloatingObject& floatingObject, LayoutUnit lineTop, LayoutUnit lineHeight)
</ins><span class="cx"> {
</span><del>- LayoutUnit shapeTop = containingBlock->logicalTopForFloat(floatingObject) + std::max(LayoutUnit(), containingBlock->marginBeforeForChild(*m_renderer));
</del><ins>+ LayoutUnit shapeTop = containingBlock.logicalTopForFloat(&floatingObject) + std::max(LayoutUnit(), containingBlock.marginBeforeForChild(m_renderer));
</ins><span class="cx"> LayoutUnit floatRelativeLineTop = lineTop - shapeTop;
</span><span class="cx">
</span><span class="cx"> if (shapeSizeDirty() || m_lineTop != floatRelativeLineTop || m_lineHeight != lineHeight) {
</span><span class="lines">@@ -68,15 +69,15 @@
</span><span class="cx"> m_shapeLineTop = floatRelativeLineTop - logicalTopOffset();
</span><span class="cx"> m_lineHeight = lineHeight;
</span><span class="cx">
</span><del>- LayoutUnit floatMarginBoxWidth = containingBlock->logicalWidthForFloat(floatingObject);
</del><ins>+ LayoutUnit floatMarginBoxWidth = containingBlock.logicalWidthForFloat(&floatingObject);
</ins><span class="cx">
</span><span class="cx"> if (lineOverlapsShapeBounds()) {
</span><span class="cx"> SegmentList segments = computeSegmentsForLine(floatRelativeLineTop, lineHeight);
</span><span class="cx"> if (segments.size()) {
</span><del>- LayoutUnit rawLeftMarginBoxDelta = segments.first().logicalLeft + containingBlock->marginStartForChild(*m_renderer);
</del><ins>+ LayoutUnit rawLeftMarginBoxDelta = segments.first().logicalLeft + containingBlock.marginStartForChild(m_renderer);
</ins><span class="cx"> m_leftMarginBoxDelta = clampTo<LayoutUnit>(rawLeftMarginBoxDelta, LayoutUnit(), floatMarginBoxWidth);
</span><span class="cx">
</span><del>- LayoutUnit rawRightMarginBoxDelta = segments.last().logicalRight - containingBlock->logicalWidthForChild(*m_renderer) - containingBlock->marginEndForChild(*m_renderer);
</del><ins>+ LayoutUnit rawRightMarginBoxDelta = segments.last().logicalRight - containingBlock.logicalWidthForChild(m_renderer) - containingBlock.marginEndForChild(m_renderer);
</ins><span class="cx"> m_rightMarginBoxDelta = clampTo<LayoutUnit>(rawRightMarginBoxDelta, -floatMarginBoxWidth, LayoutUnit());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -96,8 +97,9 @@
</span><span class="cx">
</span><span class="cx"> ShapeValue* ShapeOutsideInfo::shapeValue() const
</span><span class="cx"> {
</span><del>- return m_renderer->style().shapeOutside();
</del><ins>+ return m_renderer.style().shapeOutside();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeOutsideInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h (159778 => 159779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-11-26 05:46:52 UTC (rev 159778)
+++ trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.h 2013-11-26 05:54:30 UTC (rev 159779)
</span><span class="lines">@@ -43,30 +43,31 @@
</span><span class="cx">
</span><span class="cx"> class ShapeOutsideInfo FINAL : public ShapeInfo<RenderBox>, public MappedInfo<RenderBox, ShapeOutsideInfo> {
</span><span class="cx"> public:
</span><ins>+ ShapeOutsideInfo(const RenderBox& renderer)
+ : ShapeInfo<RenderBox>(renderer)
+ {
+ }
+
+ static bool isEnabledFor(const RenderBox&);
+
</ins><span class="cx"> LayoutUnit leftMarginBoxDelta() const { return m_leftMarginBoxDelta; }
</span><span class="cx"> LayoutUnit rightMarginBoxDelta() const { return m_rightMarginBoxDelta; }
</span><span class="cx">
</span><del>- void updateDeltasForContainingBlockLine(const RenderBlockFlow*, const FloatingObject*, LayoutUnit lineTop, LayoutUnit lineHeight);
</del><ins>+ void updateDeltasForContainingBlockLine(const RenderBlockFlow&, const FloatingObject&, LayoutUnit lineTop, LayoutUnit lineHeight);
</ins><span class="cx">
</span><del>- static PassOwnPtr<ShapeOutsideInfo> createInfo(const RenderBox* renderer) { return adoptPtr(new ShapeOutsideInfo(renderer)); }
- static bool isEnabledFor(const RenderBox*);
-
</del><span class="cx"> virtual bool lineOverlapsShapeBounds() const OVERRIDE
</span><span class="cx"> {
</span><del>- return computedShape()->lineOverlapsShapeMarginBounds(m_shapeLineTop, m_lineHeight);
</del><ins>+ return computedShape().lineOverlapsShapeMarginBounds(m_shapeLineTop, m_lineHeight);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-protected:
- virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape()->shapeMarginLogicalBoundingBox(); }
</del><ins>+private:
+ virtual LayoutRect computedShapeLogicalBoundingBox() const OVERRIDE { return computedShape().shapeMarginLogicalBoundingBox(); }
</ins><span class="cx"> virtual ShapeValue* shapeValue() const OVERRIDE;
</span><span class="cx"> virtual void getIntervals(LayoutUnit lineTop, LayoutUnit lineHeight, SegmentList& segments) const OVERRIDE
</span><span class="cx"> {
</span><del>- return computedShape()->getExcludedIntervals(lineTop, lineHeight, segments);
</del><ins>+ return computedShape().getExcludedIntervals(lineTop, lineHeight, segments);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-private:
- ShapeOutsideInfo(const RenderBox* renderer) : ShapeInfo<RenderBox>(renderer) { }
-
</del><span class="cx"> LayoutUnit m_leftMarginBoxDelta;
</span><span class="cx"> LayoutUnit m_rightMarginBoxDelta;
</span><span class="cx"> LayoutUnit m_lineTop;
</span></span></pre>
</div>
</div>
</body>
</html>