<!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>[171925] 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/171925">171925</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-08-01 11:20:04 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>nullptr goodness in RenderLayer
https://bugs.webkit.org/show_bug.cgi?id=135512
Reviewed by Brent Fulgham.
Use nullptr in RenderLayer.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::updateDescendantDependentFlags):
(WebCore::accumulateOffsetTowardsAncestor):
(WebCore::RenderLayer::scrollRectToVisible):
(WebCore::RenderLayer::destroyScrollbar):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):
(WebCore::RenderLayer::hitTestLayer):
(WebCore::RenderLayer::hitTestList):
(WebCore::RenderLayer::calculateClipRects):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171924 => 171925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-01 18:19:07 UTC (rev 171924)
+++ trunk/Source/WebCore/ChangeLog 2014-08-01 18:20:04 UTC (rev 171925)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-08-01 Simon Fraser <simon.fraser@apple.com>
+
+ nullptr goodness in RenderLayer
+ https://bugs.webkit.org/show_bug.cgi?id=135512
+
+ Reviewed by Brent Fulgham.
+
+ Use nullptr in RenderLayer.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::RenderLayer):
+ (WebCore::RenderLayer::updateDescendantDependentFlags):
+ (WebCore::accumulateOffsetTowardsAncestor):
+ (WebCore::RenderLayer::scrollRectToVisible):
+ (WebCore::RenderLayer::destroyScrollbar):
+ (WebCore::RenderLayer::paintLayerContents):
+ (WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):
+ (WebCore::RenderLayer::hitTestLayer):
+ (WebCore::RenderLayer::hitTestList):
+ (WebCore::RenderLayer::calculateClipRects):
+
</ins><span class="cx"> 2014-08-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix for iOS
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (171924 => 171925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-08-01 18:19:07 UTC (rev 171924)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-08-01 18:20:04 UTC (rev 171925)
</span><span class="lines">@@ -191,14 +191,14 @@
</span><span class="cx"> , m_hasNotIsolatedBlendingDescendantsStatusDirty(false)
</span><span class="cx"> #endif
</span><span class="cx"> , m_renderer(rendererLayerModelObject)
</span><del>- , m_parent(0)
- , m_previous(0)
- , m_next(0)
- , m_first(0)
- , m_last(0)
</del><ins>+ , m_parent(nullptr)
+ , m_previous(nullptr)
+ , m_next(nullptr)
+ , m_first(nullptr)
+ , m_last(nullptr)
</ins><span class="cx"> , m_staticInlinePosition(0)
</span><span class="cx"> , m_staticBlockPosition(0)
</span><del>- , m_enclosingPaginationLayer(0)
</del><ins>+ , m_enclosingPaginationLayer(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> m_isNormalFlowOnly = shouldBeNormalFlowOnly();
</span><span class="cx"> m_isSelfPaintingLayer = shouldBeSelfPaintingLayer();
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx"> do {
</span><span class="cx"> r = r->parent();
</span><span class="cx"> if (r == &renderer())
</span><del>- r = 0;
</del><ins>+ r = nullptr;
</ins><span class="cx"> } while (r && !r->nextSibling());
</span><span class="cx"> if (r)
</span><span class="cx"> r = r->nextSibling();
</span><span class="lines">@@ -1894,7 +1894,7 @@
</span><span class="cx"> // FIXME: Special casing RenderFlowThread so much for fixed positioning here is not great.
</span><span class="cx"> RenderFlowThread* fixedFlowThreadContainer = position == FixedPosition ? renderer.flowThreadContainingBlock() : 0;
</span><span class="cx"> if (fixedFlowThreadContainer && !fixedFlowThreadContainer->isOutOfFlowPositioned())
</span><del>- fixedFlowThreadContainer = 0;
</del><ins>+ fixedFlowThreadContainer = nullptr;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Positioning of out-of-flow(fixed, absolute) elements collected in a RenderFlowThread
</span><span class="cx"> // may need to be revisited in a future patch.
</span><span class="lines">@@ -1916,7 +1916,7 @@
</span><span class="cx"> // For a fixed layers, we need to walk up to the root to see if there's a fixed position container
</span><span class="cx"> // (e.g. a transformed layer). It's an error to call offsetFromAncestor() across a layer with a transform,
</span><span class="cx"> // so we should always find the ancestor at or before we find the fixed position container.
</span><del>- RenderLayer* fixedPositionContainerLayer = 0;
</del><ins>+ RenderLayer* fixedPositionContainerLayer = nullptr;
</ins><span class="cx"> bool foundAncestor = false;
</span><span class="cx"> for (RenderLayer* currLayer = layer->parent(); currLayer; currLayer = currLayer->parent()) {
</span><span class="cx"> if (currLayer == ancestorLayer)
</span><span class="lines">@@ -2338,7 +2338,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
</span><span class="cx"> {
</span><del>- RenderLayer* parentLayer = 0;
</del><ins>+ RenderLayer* parentLayer = nullptr;
</ins><span class="cx"> LayoutRect newRect = rect;
</span><span class="cx">
</span><span class="cx"> // We may end up propagating a scroll event. It is important that we suspend events until
</span><span class="lines">@@ -2372,7 +2372,7 @@
</span><span class="cx"> Element* ownerElement = renderer().document().ownerElement();
</span><span class="cx">
</span><span class="cx"> if (ownerElement && ownerElement->renderer()) {
</span><del>- HTMLFrameElementBase* frameElementBase = 0;
</del><ins>+ HTMLFrameElementBase* frameElementBase = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag))
</span><span class="cx"> frameElementBase = toHTMLFrameElementBase(ownerElement);
</span><span class="lines">@@ -2395,7 +2395,7 @@
</span><span class="cx"> newRect.setX(rect.x() - frameView.scrollX() + frameView.x());
</span><span class="cx"> newRect.setY(rect.y() - frameView.scrollY() + frameView.y());
</span><span class="cx"> } else
</span><del>- parentLayer = 0;
</del><ins>+ parentLayer = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -2962,7 +2962,7 @@
</span><span class="cx">
</span><span class="cx"> scrollbar->removeFromParent();
</span><span class="cx"> scrollbar->disconnectFromScrollableArea();
</span><del>- scrollbar = 0;
</del><ins>+ scrollbar = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::scrollsOverflow() const
</span><span class="lines">@@ -4040,7 +4040,7 @@
</span><span class="cx"> // is done by passing a nil subtreePaintRoot down to our renderer (as if no subtreePaintRoot was ever set).
</span><span class="cx"> // Otherwise, our renderer tree may or may not contain the subtreePaintRoot root, so we pass that root along
</span><span class="cx"> // so it will be tested against as we descend through the renderers.
</span><del>- RenderObject* subtreePaintRootForRenderer = 0;
</del><ins>+ RenderObject* subtreePaintRootForRenderer = nullptr;
</ins><span class="cx"> if (localPaintingInfo.subtreePaintRoot && !renderer().isDescendantOf(localPaintingInfo.subtreePaintRoot))
</span><span class="cx"> subtreePaintRootForRenderer = localPaintingInfo.subtreePaintRoot;
</span><span class="cx">
</span><span class="lines">@@ -4708,7 +4708,7 @@
</span><span class="cx"> renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
</span><span class="cx">
</span><span class="cx"> // Hit test the layers
</span><del>- RenderLayer* resultLayer = 0;
</del><ins>+ RenderLayer* resultLayer = nullptr;
</ins><span class="cx"> for (int i = fixedLayers.size() - 1; i >= 0; --i) {
</span><span class="cx"> RenderLayer* fixedLayer = fixedLayers.at(i);
</span><span class="cx">
</span><span class="lines">@@ -4821,8 +4821,8 @@
</span><span class="cx"> // The following are used for keeping track of the z-depth of the hit point of 3d-transformed
</span><span class="cx"> // descendants.
</span><span class="cx"> double localZOffset = -std::numeric_limits<double>::infinity();
</span><del>- double* zOffsetForDescendantsPtr = 0;
- double* zOffsetForContentsPtr = 0;
</del><ins>+ double* zOffsetForDescendantsPtr = nullptr;
+ double* zOffsetForContentsPtr = nullptr;
</ins><span class="cx">
</span><span class="cx"> bool depthSortDescendants = false;
</span><span class="cx"> if (preserves3D()) {
</span><span class="lines">@@ -4831,13 +4831,13 @@
</span><span class="cx"> zOffsetForDescendantsPtr = zOffset ? zOffset : &localZOffset;
</span><span class="cx"> zOffsetForContentsPtr = zOffset ? zOffset : &localZOffset;
</span><span class="cx"> } else if (zOffset) {
</span><del>- zOffsetForDescendantsPtr = 0;
</del><ins>+ zOffsetForDescendantsPtr = nullptr;
</ins><span class="cx"> // Container needs us to give back a z offset for the hit layer.
</span><span class="cx"> zOffsetForContentsPtr = zOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This variable tracks which layer the mouse ends up being inside.
</span><del>- RenderLayer* candidateLayer = 0;
</del><ins>+ RenderLayer* candidateLayer = nullptr;
</ins><span class="cx">
</span><span class="cx"> // Check the fixed positioned layers within flow threads that are positioned by the view.
</span><span class="cx"> RenderLayer* hitLayer = hitTestFixedLayersInNamedFlows(rootLayer, request, result, hitTestRect, hitTestLocation,
</span><span class="lines">@@ -5084,12 +5084,12 @@
</span><span class="cx"> if (!hasSelfPaintingLayerDescendant())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RenderLayer* resultLayer = 0;
</del><ins>+ RenderLayer* resultLayer = nullptr;
</ins><span class="cx"> for (int i = list->size() - 1; i >= 0; --i) {
</span><span class="cx"> RenderLayer* childLayer = list->at(i);
</span><span class="cx"> if (childLayer->isFlowThreadCollectingGraphicsLayersUnderRegions())
</span><span class="cx"> continue;
</span><del>- RenderLayer* hitLayer = 0;
</del><ins>+ RenderLayer* hitLayer = nullptr;
</ins><span class="cx"> HitTestResult tempResult(result.hitTestLocation());
</span><span class="cx"> hitLayer = childLayer->hitTestLayer(rootLayer, this, request, tempResult, hitTestRect, hitTestLocation, false, transformState, zOffsetForDescendants);
</span><span class="cx">
</span><span class="lines">@@ -6767,7 +6767,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect regionContentBox = toRenderBlockFlow(&renderer())->contentBoxRect();
</span><span class="cx">
</span><del>- RenderLayer* resultLayer = 0;
</del><ins>+ RenderLayer* resultLayer = nullptr;
</ins><span class="cx"> for (int i = fragments.size() - 1; i >= 0; --i) {
</span><span class="cx"> const LayerFragment& fragment = fragments.at(i);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>