<!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>[182127] 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/182127">182127</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-29 19:00:20 -0700 (Sun, 29 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>nullptr cleanup in RenderFooBox classes
https://bugs.webkit.org/show_bug.cgi?id=143182
Patch by Joonghun Park <jh718.park@samsung.com> on 2015-03-29
Reviewed by Ryosuke Niwa.
No new tests, no behavior changes
Replace 0 with nullptr in RenderFooBox classes.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::RenderBox):
(WebCore::RenderBox::paintFillLayer):
(WebCore::RenderBox::shrinkLogicalWidthToAvoidFloats):
(WebCore::RenderBox::containingBlockAvailableLineWidthInRegion):
(WebCore::RenderBox::renderBoxRegionInfo):
(WebCore::RenderBox::computePositionedLogicalWidthUsing):
(WebCore::RenderBox::computePositionedLogicalHeightUsing):
(WebCore::RenderBox::computePositionedLogicalWidthReplaced):
(WebCore::RenderBox::positionForPoint):
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBox.h:
(WebCore::RenderBox::setMarginBefore):
(WebCore::RenderBox::setMarginAfter):
(WebCore::RenderBox::setMarginStart):
(WebCore::RenderBox::setMarginEnd):
(WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
(WebCore::RenderBox::setInlineBoxWrapper):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::willBeDestroyed):
(WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
(WebCore::RenderBoxModelObject::paintBorderSides):
(WebCore::RenderBoxModelObject::firstLetterRemainingText):
* rendering/RenderBoxModelObject.h:
(WebCore::RenderBoxModelObject::moveChildTo):
(WebCore::RenderBoxModelObject::moveAllChildrenTo):
(WebCore::RenderBoxModelObject::moveChildrenTo):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::FlexBoxIterator::reset):
(WebCore::FlexBoxIterator::next):
* rendering/RenderDeprecatedFlexibleBox.h:
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::firstLineBaseline):
(WebCore::RenderFlexibleBox::computeMainAxisExtentForChild):
* rendering/RenderLineBoxList.cpp:
(WebCore::RenderLineBoxList::deleteLineBoxTree):
(WebCore::RenderLineBoxList::extractLineBox):
(WebCore::RenderLineBoxList::deleteLineBoxes):
(WebCore::RenderLineBoxList::checkConsistency):
* rendering/RenderLineBoxList.h:
(WebCore::RenderLineBoxList::RenderLineBoxList):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::enclosingScrollableArea):
(WebCore::RenderListBox::setHasVerticalScrollbar):
* rendering/RenderListBox.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxh">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBoxListcpp">trunk/Source/WebCore/rendering/RenderLineBoxList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBoxListh">trunk/Source/WebCore/rendering/RenderLineBoxList.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/ChangeLog 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2015-03-29 Joonghun Park <jh718.park@samsung.com>
+
+ nullptr cleanup in RenderFooBox classes
+ https://bugs.webkit.org/show_bug.cgi?id=143182
+
+ Reviewed by Ryosuke Niwa.
+
+ No new tests, no behavior changes
+
+ Replace 0 with nullptr in RenderFooBox classes.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::RenderBox):
+ (WebCore::RenderBox::paintFillLayer):
+ (WebCore::RenderBox::shrinkLogicalWidthToAvoidFloats):
+ (WebCore::RenderBox::containingBlockAvailableLineWidthInRegion):
+ (WebCore::RenderBox::renderBoxRegionInfo):
+ (WebCore::RenderBox::computePositionedLogicalWidthUsing):
+ (WebCore::RenderBox::computePositionedLogicalHeightUsing):
+ (WebCore::RenderBox::computePositionedLogicalWidthReplaced):
+ (WebCore::RenderBox::positionForPoint):
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::setMarginBefore):
+ (WebCore::RenderBox::setMarginAfter):
+ (WebCore::RenderBox::setMarginStart):
+ (WebCore::RenderBox::setMarginEnd):
+ (WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
+ (WebCore::RenderBox::setInlineBoxWrapper):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::willBeDestroyed):
+ (WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
+ (WebCore::RenderBoxModelObject::paintBorderSides):
+ (WebCore::RenderBoxModelObject::firstLetterRemainingText):
+ * rendering/RenderBoxModelObject.h:
+ (WebCore::RenderBoxModelObject::moveChildTo):
+ (WebCore::RenderBoxModelObject::moveAllChildrenTo):
+ (WebCore::RenderBoxModelObject::moveChildrenTo):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::FlexBoxIterator::reset):
+ (WebCore::FlexBoxIterator::next):
+ * rendering/RenderDeprecatedFlexibleBox.h:
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::firstLineBaseline):
+ (WebCore::RenderFlexibleBox::computeMainAxisExtentForChild):
+ * rendering/RenderLineBoxList.cpp:
+ (WebCore::RenderLineBoxList::deleteLineBoxTree):
+ (WebCore::RenderLineBoxList::extractLineBox):
+ (WebCore::RenderLineBoxList::deleteLineBoxes):
+ (WebCore::RenderLineBoxList::checkConsistency):
+ * rendering/RenderLineBoxList.h:
+ (WebCore::RenderLineBoxList::RenderLineBoxList):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::enclosingScrollableArea):
+ (WebCore::RenderListBox::setHasVerticalScrollbar):
+ * rendering/RenderListBox.h:
+
</ins><span class="cx"> 2015-03-29 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLCollection caches incorrect length if item(0) is called before length on an empty collection
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx">
</span><span class="cx"> // Used by flexible boxes when flexing this element and by table cells.
</span><span class="cx"> typedef WTF::HashMap<const RenderBox*, LayoutUnit> OverrideSizeMap;
</span><del>-static OverrideSizeMap* gOverrideHeightMap = 0;
-static OverrideSizeMap* gOverrideWidthMap = 0;
</del><ins>+static OverrideSizeMap* gOverrideHeightMap = nullptr;
+static OverrideSizeMap* gOverrideWidthMap = nullptr;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> // Used by grid elements to properly size their grid items.
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> : RenderBoxModelObject(element, WTF::move(style), baseTypeFlags)
</span><span class="cx"> , m_minPreferredLogicalWidth(-1)
</span><span class="cx"> , m_maxPreferredLogicalWidth(-1)
</span><del>- , m_inlineBoxWrapper(0)
</del><ins>+ , m_inlineBoxWrapper(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> setIsBox();
</span><span class="cx"> }
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> : RenderBoxModelObject(document, WTF::move(style), baseTypeFlags)
</span><span class="cx"> , m_minPreferredLogicalWidth(-1)
</span><span class="cx"> , m_maxPreferredLogicalWidth(-1)
</span><del>- , m_inlineBoxWrapper(0)
</del><ins>+ , m_inlineBoxWrapper(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> setIsBox();
</span><span class="cx"> }
</span><span class="lines">@@ -1610,7 +1610,7 @@
</span><span class="cx"> void RenderBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer* fillLayer, const LayoutRect& rect,
</span><span class="cx"> BackgroundBleedAvoidance bleedAvoidance, CompositeOperator op, RenderElement* backgroundObject, BaseBackgroundColorUsage baseBgColorUsage)
</span><span class="cx"> {
</span><del>- paintFillLayerExtended(paintInfo, c, fillLayer, rect, bleedAvoidance, 0, LayoutSize(), op, backgroundObject, baseBgColorUsage);
</del><ins>+ paintFillLayerExtended(paintInfo, c, fillLayer, rect, bleedAvoidance, nullptr, LayoutSize(), op, backgroundObject, baseBgColorUsage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool layersUseImage(WrappedImagePtr image, const FillLayer* layers)
</span><span class="lines">@@ -1805,7 +1805,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::shrinkLogicalWidthToAvoidFloats(LayoutUnit childMarginStart, LayoutUnit childMarginEnd, const RenderBlock* cb, RenderRegion* region) const
</span><span class="cx"> {
</span><del>- RenderRegion* containingBlockRegion = 0;
</del><ins>+ RenderRegion* containingBlockRegion = nullptr;
</ins><span class="cx"> LayoutUnit logicalTopPosition = logicalTop();
</span><span class="cx"> if (region) {
</span><span class="cx"> LayoutUnit offsetFromLogicalTopOfRegion = region ? region->logicalTopForFlowThreadContent() - offsetFromLogicalTopOfFirstPage() : LayoutUnit();
</span><span class="lines">@@ -1889,7 +1889,7 @@
</span><span class="cx"> LayoutUnit RenderBox::containingBlockAvailableLineWidthInRegion(RenderRegion* region) const
</span><span class="cx"> {
</span><span class="cx"> RenderBlock* cb = containingBlock();
</span><del>- RenderRegion* containingBlockRegion = 0;
</del><ins>+ RenderRegion* containingBlockRegion = nullptr;
</ins><span class="cx"> LayoutUnit logicalTopPosition = logicalTop();
</span><span class="cx"> if (region) {
</span><span class="cx"> LayoutUnit offsetFromLogicalTopOfRegion = region ? region->logicalTopForFlowThreadContent() - offsetFromLogicalTopOfFirstPage() : LayoutUnit();
</span><span class="lines">@@ -2565,7 +2565,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Make sure nobody is trying to call this with a null region.
</span><span class="cx"> if (!region)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // If we have computed our width in this region already, it will be cached, and we can
</span><span class="cx"> // just return it.
</span><span class="lines">@@ -2578,7 +2578,7 @@
</span><span class="cx"> // support to cover all boxes.
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><span class="cx"> if (isRenderFlowThread() || !flowThread || !canHaveBoxInfoInRegion() || flowThread->style().writingMode() != style().writingMode())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> LogicalExtentComputedValues computedValues;
</span><span class="cx"> computeLogicalWidthInRegion(computedValues, region);
</span><span class="lines">@@ -3406,7 +3406,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit logicalLeftValue = 0;
</span><span class="cx">
</span><del>- const LayoutUnit containerRelativeLogicalWidth = containingBlockLogicalWidthForPositioned(containerBlock, 0, false);
</del><ins>+ const LayoutUnit containerRelativeLogicalWidth = containingBlockLogicalWidthForPositioned(containerBlock, nullptr, false);
</ins><span class="cx">
</span><span class="cx"> bool logicalWidthIsAuto = logicalWidth.isIntrinsicOrAuto();
</span><span class="cx"> bool logicalLeftIsAuto = logicalLeft.isAuto();
</span><span class="lines">@@ -3732,7 +3732,7 @@
</span><span class="cx"> LayoutUnit logicalHeightValue;
</span><span class="cx"> LayoutUnit contentLogicalHeight = logicalHeight - bordersPlusPadding;
</span><span class="cx">
</span><del>- const LayoutUnit containerRelativeLogicalWidth = containingBlockLogicalWidthForPositioned(containerBlock, 0, false);
</del><ins>+ const LayoutUnit containerRelativeLogicalWidth = containingBlockLogicalWidthForPositioned(containerBlock, nullptr, false);
</ins><span class="cx">
</span><span class="cx"> LayoutUnit logicalTopValue = 0;
</span><span class="cx"> LayoutUnit resolvedLogicalHeight = 0;
</span><span class="lines">@@ -3891,7 +3891,7 @@
</span><span class="cx"> * else if 'direction' is 'rtl', set 'right' to the static position.
</span><span class="cx"> \*-----------------------------------------------------------------------*/
</span><span class="cx"> // see FIXME 1
</span><del>- computeInlineStaticDistance(logicalLeft, logicalRight, this, containerBlock, containerLogicalWidth, 0); // FIXME: Pass the region.
</del><ins>+ computeInlineStaticDistance(logicalLeft, logicalRight, this, containerBlock, containerLogicalWidth, nullptr); // FIXME: Pass the region.
</ins><span class="cx">
</span><span class="cx"> /*-----------------------------------------------------------------------*\
</span><span class="cx"> * 3. If 'left' or 'right' are 'auto', replace any 'auto' on 'margin-left'
</span><span class="lines">@@ -4215,7 +4215,7 @@
</span><span class="cx">
</span><span class="cx"> // Pass off to the closest child.
</span><span class="cx"> LayoutUnit minDist = LayoutUnit::max();
</span><del>- RenderBox* closestRenderer = 0;
</del><ins>+ RenderBox* closestRenderer = nullptr;
</ins><span class="cx"> LayoutPoint adjustedPoint = point;
</span><span class="cx"> if (isTableRow())
</span><span class="cx"> adjustedPoint.moveBy(location());
</span><span class="lines">@@ -4810,7 +4810,7 @@
</span><span class="cx"> // See for example RenderTableCell:clippedOverflowRectForRepaint.
</span><span class="cx"> markBoxForRelayoutAfterSplit(*parentBox);
</span><span class="cx"> parentBox->insertChildInternal(postBox, boxToSplit.nextSibling(), NotifyChildren);
</span><del>- boxToSplit.moveChildrenTo(postBox, beforeChild, 0, true);
</del><ins>+ boxToSplit.moveChildrenTo(postBox, beforeChild, nullptr, true);
</ins><span class="cx">
</span><span class="cx"> markBoxForRelayoutAfterSplit(boxToSplit);
</span><span class="cx"> markBoxForRelayoutAfterSplit(*postBox);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> LayoutUnit logicalWidth() const { return style().isHorizontalWritingMode() ? width() : height(); }
</span><span class="cx"> LayoutUnit logicalHeight() const { return style().isHorizontalWritingMode() ? height() : width(); }
</span><span class="cx">
</span><del>- LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock*, RenderRegion* = 0) const;
</del><ins>+ LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock*, RenderRegion* = nullptr) const;
</ins><span class="cx"> LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit) const;
</span><span class="cx"> LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit) const;
</span><span class="cx">
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> // Bounds of the outline box in absolute coords. Respects transforms
</span><span class="cx"> virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const override final;
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</del><ins>+ virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> virtual FloatRect repaintRectInLocalCoordinates() const override { return borderBoxRect(); }
</span><span class="cx"> virtual FloatRect objectBoundingBox() const override { return borderBoxRect(); }
</span><span class="lines">@@ -264,26 +264,26 @@
</span><span class="cx"> LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style().writingMode()); }
</span><span class="cx"> LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style().writingMode()); }
</span><span class="cx">
</span><del>- virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.before((overrideStyle ? overrideStyle : &style())->writingMode()); }
- virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.after((overrideStyle ? overrideStyle : &style())->writingMode()); }
- virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const override final
</del><ins>+ virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = nullptr) const override final { return m_marginBox.before((overrideStyle ? overrideStyle : &style())->writingMode()); }
+ virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = nullptr) const override final { return m_marginBox.after((overrideStyle ? overrideStyle : &style())->writingMode()); }
+ virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = nullptr) const override final
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
</span><span class="cx"> return m_marginBox.start(styleToUse->writingMode(), styleToUse->direction());
</span><span class="cx"> }
</span><del>- virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const override final
</del><ins>+ virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = nullptr) const override final
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
</span><span class="cx"> return m_marginBox.end(styleToUse->writingMode(), styleToUse->direction());
</span><span class="cx"> }
</span><del>- void setMarginBefore(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setBefore((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
- void setMarginAfter(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setAfter((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
- void setMarginStart(LayoutUnit value, const RenderStyle* overrideStyle = 0)
</del><ins>+ void setMarginBefore(LayoutUnit value, const RenderStyle* overrideStyle = nullptr) { m_marginBox.setBefore((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
+ void setMarginAfter(LayoutUnit value, const RenderStyle* overrideStyle = nullptr) { m_marginBox.setAfter((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
+ void setMarginStart(LayoutUnit value, const RenderStyle* overrideStyle = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
</span><span class="cx"> m_marginBox.setStart(styleToUse->writingMode(), styleToUse->direction(), value);
</span><span class="cx"> }
</span><del>- void setMarginEnd(LayoutUnit value, const RenderStyle* overrideStyle = 0)
</del><ins>+ void setMarginEnd(LayoutUnit value, const RenderStyle* overrideStyle = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
</span><span class="cx"> m_marginBox.setEnd(styleToUse->writingMode(), styleToUse->direction(), value);
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> void clearOverrideContainingBlockContentLogicalHeight();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override;
</del><ins>+ virtual LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const override;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
</span><span class="cx"> LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const;
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const;
</span><span class="cx">
</span><span class="cx"> RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const;
</span><del>- void computeLogicalWidthInRegion(LogicalExtentComputedValues&, RenderRegion* = 0) const;
</del><ins>+ void computeLogicalWidthInRegion(LogicalExtentComputedValues&, RenderRegion* = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> bool stretchesToViewport() const
</span><span class="cx"> {
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> int instrinsicScrollbarLogicalWidth() const;
</span><span class="cx"> int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
</span><span class="cx"> virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint());
</span><del>- virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
</del><ins>+ virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr);
</ins><span class="cx"> bool canBeScrolledAndHasScrollableArea() const;
</span><span class="cx"> virtual bool canBeProgramaticallyScrolled() const;
</span><span class="cx"> virtual void autoscroll(const IntPoint&);
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> bool hasUnsplittableScrollingOverflow() const;
</span><span class="cx"> bool isUnsplittableForPagination() const;
</span><span class="cx">
</span><del>- virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override;
</del><ins>+ virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, PaintPhase = PaintPhaseBlockBackground);
</span><span class="cx"> virtual LayoutRect overflowClipRectForChildLayers(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy) { return overflowClipRect(location, region, relevancy); }
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
</span><span class="cx"> virtual void paintMask(PaintInfo&, const LayoutPoint&);
</span><span class="cx"> virtual void paintClippingMask(PaintInfo&, const LayoutPoint&);
</span><del>- virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
</del><ins>+ virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> // Called when a positioned object moves but doesn't necessarily change size. A simplified layout is attempted
</span><span class="cx"> // that just updates the object's position. If the size does change, the object remains dirty.
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject*) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasSameDirectionAs(const RenderBox* object) const { return style().direction() == object->style().direction(); }
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> BackgroundBleedAvoidance determineBackgroundBleedAvoidance(GraphicsContext*) const;
</span><span class="cx"> bool backgroundHasOpaqueTopLayer() const;
</span><span class="cx">
</span><del>- void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = 0) const;
</del><ins>+ void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> LayoutUnit computeIntrinsicLogicalWidthUsing(Length logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
</span><span class="cx">
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx">
</span><span class="cx"> bool skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock, bool isPerpendicularWritingMode) const;
</span><span class="cx">
</span><del>- LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, RenderRegion* = 0, bool checkForPerpendicularWritingMode = true) const;
</del><ins>+ LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, RenderRegion* = nullptr, bool checkForPerpendicularWritingMode = true) const;
</ins><span class="cx"> LayoutUnit containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit viewLogicalHeightForPercentages() const;
</span><span class="lines">@@ -764,7 +764,7 @@
</span><span class="cx"> // Otherwise, there will two line box wrappers keeping the reference to this renderer, and
</span><span class="cx"> // only one will be notified when the renderer is getting destroyed. The second line box wrapper
</span><span class="cx"> // will keep a stale reference.
</span><del>- if (UNLIKELY(m_inlineBoxWrapper != 0))
</del><ins>+ if (UNLIKELY(m_inlineBoxWrapper != nullptr))
</ins><span class="cx"> deleteLineBoxWrapper();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> // This HashMap is similar to the continuation map, but connects first-letter
</span><span class="cx"> // renderers to their remaining text fragments.
</span><span class="cx"> typedef HashMap<const RenderBoxModelObject*, RenderTextFragment*> FirstLetterRemainingTextMap;
</span><del>-static FirstLetterRemainingTextMap* firstLetterRemainingTextMap = 0;
</del><ins>+static FirstLetterRemainingTextMap* firstLetterRemainingTextMap = nullptr;
</ins><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::setSelectionState(SelectionState state)
</span><span class="cx"> {
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> // If this is a first-letter object with a remaining text fragment then the
</span><span class="cx"> // entry needs to be cleared from the map.
</span><span class="cx"> if (firstLetterRemainingText())
</span><del>- setFirstLetterRemainingText(0);
</del><ins>+ setFirstLetterRemainingText(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (!documentBeingDestroyed())
</span><span class="cx"> view().imageQualityController().rendererWillBeDestroyed(*this);
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx">
</span><span class="cx"> // Now add the text to the clip. We do this by painting using a special paint phase that signals to
</span><span class="cx"> // InlineTextBoxes that they should just add their contents to the clip.
</span><del>- PaintInfo info(maskImageContext, maskRect, PaintPhaseTextClip, PaintBehaviorForceBlackText, 0);
</del><ins>+ PaintInfo info(maskImageContext, maskRect, PaintPhaseTextClip, PaintBehaviorForceBlackText);
</ins><span class="cx"> if (box) {
</span><span class="cx"> const RootInlineBox& rootBox = box->root();
</span><span class="cx"> box->paint(info, LayoutPoint(scrolledPaintRect.x() - box->x(), scrolledPaintRect.y() - box->y()), rootBox.lineTop(), rootBox.lineBottom());
</span><span class="lines">@@ -1636,7 +1636,7 @@
</span><span class="cx"> sideRect.setHeight(edges[BSTop].widthForPainting() + innerBorderAdjustment.y());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSTop].style()) || borderWillArcInnerEdge(innerBorder.radii().topLeft(), innerBorder.radii().topRight()));
</span><del>- paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSTop, BSLeft, BSRight, edges, usePath ? &roundedPath : 0, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</del><ins>+ paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSTop, BSLeft, BSRight, edges, usePath ? &roundedPath : nullptr, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (edges[BSBottom].shouldRender() && includesEdge(edgeSet, BSBottom)) {
</span><span class="lines">@@ -1644,7 +1644,7 @@
</span><span class="cx"> sideRect.shiftYEdgeTo(sideRect.maxY() - edges[BSBottom].widthForPainting() - innerBorderAdjustment.y());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSBottom].style()) || borderWillArcInnerEdge(innerBorder.radii().bottomLeft(), innerBorder.radii().bottomRight()));
</span><del>- paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSBottom, BSLeft, BSRight, edges, usePath ? &roundedPath : 0, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</del><ins>+ paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSBottom, BSLeft, BSRight, edges, usePath ? &roundedPath : nullptr, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (edges[BSLeft].shouldRender() && includesEdge(edgeSet, BSLeft)) {
</span><span class="lines">@@ -1652,7 +1652,7 @@
</span><span class="cx"> sideRect.setWidth(edges[BSLeft].widthForPainting() + innerBorderAdjustment.x());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSLeft].style()) || borderWillArcInnerEdge(innerBorder.radii().bottomLeft(), innerBorder.radii().topLeft()));
</span><del>- paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSLeft, BSTop, BSBottom, edges, usePath ? &roundedPath : 0, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</del><ins>+ paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSLeft, BSTop, BSBottom, edges, usePath ? &roundedPath : nullptr, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (edges[BSRight].shouldRender() && includesEdge(edgeSet, BSRight)) {
</span><span class="lines">@@ -1660,7 +1660,7 @@
</span><span class="cx"> sideRect.shiftXEdgeTo(sideRect.maxX() - edges[BSRight].widthForPainting() - innerBorderAdjustment.x());
</span><span class="cx">
</span><span class="cx"> bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSRight].style()) || borderWillArcInnerEdge(innerBorder.radii().bottomRight(), innerBorder.radii().topRight()));
</span><del>- paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSRight, BSTop, BSBottom, edges, usePath ? &roundedPath : 0, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</del><ins>+ paintOneBorderSide(graphicsContext, style, outerBorder, innerBorder, sideRect, BSRight, BSTop, BSBottom, edges, usePath ? &roundedPath : nullptr, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias, overrideColor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2531,7 +2531,7 @@
</span><span class="cx"> RenderTextFragment* RenderBoxModelObject::firstLetterRemainingText() const
</span><span class="cx"> {
</span><span class="cx"> if (!firstLetterRemainingTextMap)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return firstLetterRemainingTextMap->get(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -184,10 +184,10 @@
</span><span class="cx"> virtual LayoutUnit marginBottom() const = 0;
</span><span class="cx"> virtual LayoutUnit marginLeft() const = 0;
</span><span class="cx"> virtual LayoutUnit marginRight() const = 0;
</span><del>- virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const = 0;
- virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const = 0;
- virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const = 0;
- virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const = 0;
</del><ins>+ virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = nullptr) const = 0;
+ virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = nullptr) const = 0;
+ virtual LayoutUnit marginStart(const RenderStyle* otherStyle = nullptr) const = 0;
+ virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = nullptr) const = 0;
</ins><span class="cx"> LayoutUnit verticalMarginExtent() const { return marginTop() + marginBottom(); }
</span><span class="cx"> LayoutUnit horizontalMarginExtent() const { return marginLeft() + marginRight(); }
</span><span class="cx"> LayoutUnit marginLogicalHeight() const { return marginBefore() + marginAfter(); }
</span><span class="lines">@@ -203,9 +203,9 @@
</span><span class="cx"> void paintBorder(const PaintInfo&, const LayoutRect&, const RenderStyle&, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
</span><span class="cx"> bool paintNinePieceImage(GraphicsContext*, const LayoutRect&, const RenderStyle&, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
</span><span class="cx"> void paintBoxShadow(const PaintInfo&, const LayoutRect&, const RenderStyle&, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
</span><del>- void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = 0, const LayoutSize& = LayoutSize(), CompositeOperator = CompositeSourceOver, RenderElement* backgroundObject = 0, BaseBackgroundColorUsage = BaseBackgroundColorUse);
</del><ins>+ void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = nullptr, const LayoutSize& = LayoutSize(), CompositeOperator = CompositeSourceOver, RenderElement* backgroundObject = nullptr, BaseBackgroundColorUsage = BaseBackgroundColorUse);
</ins><span class="cx">
</span><del>- virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox* = 0) const;
</del><ins>+ virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox* = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> // Overridden by subclasses to determine line height and baseline position.
</span><span class="cx"> virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const = 0;
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
</span><span class="cx">
</span><span class="cx"> bool hasBoxDecorationStyle() const;
</span><del>- BackgroundImageGeometry calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, RenderElement* = 0) const;
</del><ins>+ BackgroundImageGeometry calculateBackgroundImageGeometry(const RenderLayerModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, RenderElement* = nullptr) const;
</ins><span class="cx"> bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const;
</span><span class="cx"> bool borderObscuresBackground() const;
</span><span class="cx"> RoundedRect backgroundRoundedRectAdjustedForBleedAvoidance(const GraphicsContext&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox*, const LayoutSize&, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
</span><span class="lines">@@ -269,21 +269,21 @@
</span><span class="cx"> void moveChildTo(RenderBoxModelObject* toBoxModelObject, RenderObject* child, RenderObject* beforeChild, bool fullRemoveInsert = false);
</span><span class="cx"> void moveChildTo(RenderBoxModelObject* toBoxModelObject, RenderObject* child, bool fullRemoveInsert = false)
</span><span class="cx"> {
</span><del>- moveChildTo(toBoxModelObject, child, 0, fullRemoveInsert);
</del><ins>+ moveChildTo(toBoxModelObject, child, nullptr, fullRemoveInsert);
</ins><span class="cx"> }
</span><span class="cx"> void moveAllChildrenTo(RenderBoxModelObject* toBoxModelObject, bool fullRemoveInsert = false)
</span><span class="cx"> {
</span><del>- moveAllChildrenTo(toBoxModelObject, 0, fullRemoveInsert);
</del><ins>+ moveAllChildrenTo(toBoxModelObject, nullptr, fullRemoveInsert);
</ins><span class="cx"> }
</span><span class="cx"> void moveAllChildrenTo(RenderBoxModelObject* toBoxModelObject, RenderObject* beforeChild, bool fullRemoveInsert = false)
</span><span class="cx"> {
</span><del>- moveChildrenTo(toBoxModelObject, firstChild(), 0, beforeChild, fullRemoveInsert);
</del><ins>+ moveChildrenTo(toBoxModelObject, firstChild(), nullptr, beforeChild, fullRemoveInsert);
</ins><span class="cx"> }
</span><span class="cx"> // Move all of the kids from |startChild| up to but excluding |endChild|. 0 can be passed as the |endChild| to denote
</span><span class="cx"> // that all the kids from |startChild| onwards should be moved.
</span><span class="cx"> void moveChildrenTo(RenderBoxModelObject* toBoxModelObject, RenderObject* startChild, RenderObject* endChild, bool fullRemoveInsert = false)
</span><span class="cx"> {
</span><del>- moveChildrenTo(toBoxModelObject, startChild, endChild, 0, fullRemoveInsert);
</del><ins>+ moveChildrenTo(toBoxModelObject, startChild, endChild, nullptr, fullRemoveInsert);
</ins><span class="cx"> }
</span><span class="cx"> void moveChildrenTo(RenderBoxModelObject* toBoxModelObject, RenderObject* startChild, RenderObject* endChild, RenderObject* beforeChild, bool fullRemoveInsert = false);
</span><span class="cx">
</span><span class="lines">@@ -307,12 +307,12 @@
</span><span class="cx"> void clipBorderSideForComplexInnerPath(GraphicsContext*, const RoundedRect&, const RoundedRect&, BoxSide, const BorderEdge[]);
</span><span class="cx"> void paintOneBorderSide(GraphicsContext*, const RenderStyle&, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</span><span class="cx"> const LayoutRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge[],
</span><del>- const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0);
</del><ins>+ const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = nullptr);
</ins><span class="cx"> void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle&, const RoundedRect& outerBorder, const RoundedRect& innerBorder, const IntPoint& innerBorderAdjustment,
</span><span class="cx"> const BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false);
</span><span class="cx"> void paintBorderSides(GraphicsContext*, const RenderStyle&, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
</span><span class="cx"> const IntPoint& innerBorderAdjustment, const BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance,
</span><del>- bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false, const Color* overrideColor = 0);
</del><ins>+ bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false, const Color* overrideColor = nullptr);
</ins><span class="cx"> void drawBoxSideFromPath(GraphicsContext*, const LayoutRect&, const Path&, const BorderEdge[],
</span><span class="cx"> float thickness, float drawThickness, BoxSide, const RenderStyle&,
</span><span class="cx"> Color, EBorderStyle, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> void reset()
</span><span class="cx"> {
</span><del>- m_currentChild = 0;
</del><ins>+ m_currentChild = nullptr;
</ins><span class="cx"> m_ordinalIteration = -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> m_currentOrdinal = m_forward ? 1 : m_largestOrdinal;
</span><span class="cx"> else {
</span><span class="cx"> if (m_ordinalIteration > m_ordinalValues.size())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // Only copy+sort the values once per layout even if the iterator is reset.
</span><span class="cx"> if (static_cast<size_t>(m_ordinalValues.size()) != m_sortedOrdinalValues.size()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.h 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual bool avoidsFloats() const override { return true; }
</span><span class="cx"> virtual bool canCollapseAnonymousBlockChild() const override { return false; }
</span><span class="cx">
</span><del>- void placeChild(RenderBox* child, const LayoutPoint& location, LayoutSize* childLayoutDelta = 0);
</del><ins>+ void placeChild(RenderBox* child, const LayoutPoint& location, LayoutSize* childLayoutDelta = nullptr);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isDeprecatedFlexibleBox() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isWritingModeRoot() || m_numberOfInFlowChildrenOnFirstLine <= 0)
</span><span class="cx"> return Optional<int>();
</span><del>- RenderBox* baselineChild = 0;
</del><ins>+ RenderBox* baselineChild = nullptr;
</ins><span class="cx"> int childNumber = 0;
</span><span class="cx"> for (RenderBox* child = m_orderIterator.first(); child; child = m_orderIterator.next()) {
</span><span class="cx"> if (child->isOutOfFlowPositioned())
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> if (isColumnFlow())
</span><span class="cx"> return child.computeContentLogicalHeight(size);
</span><span class="cx"> // FIXME: Figure out how this should work for regions and pass in the appropriate values.
</span><del>- RenderRegion* region = 0;
</del><ins>+ RenderRegion* region = nullptr;
</ins><span class="cx"> return child.computeLogicalWidthInRegionUsing(sizeType, size, contentLogicalWidth(), this, region) - child.borderAndPaddingLogicalWidth();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBoxListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBoxList.cpp (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderLineBoxList.cpp 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> line->deleteLine();
</span><span class="cx"> line = nextLine;
</span><span class="cx"> }
</span><del>- m_firstLineBox = m_lastLineBox = 0;
</del><ins>+ m_firstLineBox = m_lastLineBox = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLineBoxList::extractLineBox(InlineFlowBox* box)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> if (box == m_firstLineBox)
</span><span class="cx"> m_firstLineBox = 0;
</span><span class="cx"> if (box->prevLineBox())
</span><del>- box->prevLineBox()->setNextLineBox(0);
- box->setPreviousLineBox(0);
</del><ins>+ box->prevLineBox()->setNextLineBox(nullptr);
+ box->setPreviousLineBox(nullptr);
</ins><span class="cx"> for (InlineFlowBox* curr = box; curr; curr = curr->nextLineBox())
</span><span class="cx"> curr->setExtracted();
</span><span class="cx">
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> next = curr->nextLineBox();
</span><span class="cx"> delete curr;
</span><span class="cx"> }
</span><del>- m_firstLineBox = 0;
- m_lastLineBox = 0;
</del><ins>+ m_firstLineBox = nullptr;
+ m_lastLineBox = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -402,8 +402,8 @@
</span><span class="cx"> void RenderLineBoxList::checkConsistency() const
</span><span class="cx"> {
</span><span class="cx"> #ifdef CHECK_CONSISTENCY
</span><del>- const InlineFlowBox* prev = 0;
- for (const InlineFlowBox* child = m_firstLineBox; child != 0; child = child->nextLineBox()) {
</del><ins>+ const InlineFlowBox* prev = nullptr;
+ for (const InlineFlowBox* child = m_firstLineBox; child != nullptr; child = child->nextLineBox()) {
</ins><span class="cx"> ASSERT(child->prevLineBox() == prev);
</span><span class="cx"> prev = child;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBoxListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBoxList.h (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBoxList.h 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderLineBoxList.h 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> class RenderLineBoxList {
</span><span class="cx"> public:
</span><span class="cx"> RenderLineBoxList()
</span><del>- : m_firstLineBox(0)
- , m_lastLineBox(0)
</del><ins>+ : m_firstLineBox(nullptr)
+ , m_lastLineBox(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -779,7 +779,7 @@
</span><span class="cx"> ScrollableArea* RenderListBox::enclosingScrollableArea() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Return a RenderLayer that's scrollable.
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderListBox::isScrollableOrRubberbandable()
</span><span class="lines">@@ -824,7 +824,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderListBox::setHasVerticalScrollbar(bool hasScrollbar)
</span><span class="cx"> {
</span><del>- if (hasScrollbar == (m_vBar != 0))
</del><ins>+ if (hasScrollbar == (m_vBar != nullptr))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (hasScrollbar)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (182126 => 182127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2015-03-30 01:03:07 UTC (rev 182126)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2015-03-30 02:00:20 UTC (rev 182127)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset) override;
</span><span class="cx">
</span><del>- virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) override;
</del><ins>+ virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span><span class="cx"> virtual void computePreferredLogicalWidths() override;
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void layout() override;
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</del><ins>+ virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool canBeProgramaticallyScrolled() const override { return true; }
</span><span class="cx"> virtual void autoscroll(const IntPoint&) override;
</span></span></pre>
</div>
</div>
</body>
</html>