<!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>[180574] 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/180574">180574</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 10:47:54 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use nullptr in more places in FrameView, RenderView, RenderObject
https://bugs.webkit.org/show_bug.cgi?id=141974
Reviewed by Zalan Bujtas.
0 -> nullptr in FrameView.h/cpp, RenderView.h/cpp, RenderObject.h/cpp.
Rename FrameView::m_deferSetNeedsLayouts to FrameView::m_deferSetNeedsLayoutCount
to make it more clear that it's a count.
* page/FrameView.cpp:
(WebCore::FrameView::FrameView):
(WebCore::FrameView::reset):
(WebCore::FrameView::setContentsSize):
(WebCore::FrameView::calculateScrollbarModesForLayout):
(WebCore::FrameView::layerForScrolling):
(WebCore::FrameView::layerForHorizontalScrollbar):
(WebCore::FrameView::layerForVerticalScrollbar):
(WebCore::FrameView::layerForScrollCorner):
(WebCore::FrameView::tiledBacking):
(WebCore::FrameView::scrollLayerID):
(WebCore::FrameView::layerForOverhangAreas):
(WebCore::FrameView::setWantsLayerForTopOverHangArea):
(WebCore::FrameView::setWantsLayerForBottomOverHangArea):
(WebCore::FrameView::hasCompositedContentIncludingDescendants):
(WebCore::FrameView::layoutRoot):
(WebCore::FrameView::forceLayoutParentViewIfNeeded):
(WebCore::FrameView::layout):
(WebCore::FrameView::hostWindow):
(WebCore::FrameView::scheduleRelayout):
(WebCore::FrameView::scheduleRelayoutOfSubtree):
(WebCore::FrameView::needsLayout):
(WebCore::FrameView::setNeedsLayout):
(WebCore::FrameView::enclosingScrollableArea):
(WebCore::FrameView::parentFrameView):
(WebCore::FrameView::paintControlTints):
(WebCore::FrameView::adjustPageHeightDeprecated):
(WebCore::FrameView::axObjectCache):
* page/FrameView.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::RenderObject):
(WebCore::RenderObject::nextInPreOrderAfterChildren):
(WebCore::RenderObject::previousInPreOrder):
(WebCore::RenderObject::firstLeafChild):
(WebCore::RenderObject::lastLeafChild):
(WebCore::RenderObject::traverseNext):
(WebCore::RenderObject::firstLineBlock):
(WebCore::RenderObject::containerForRepaint):
(WebCore::RenderObject::showRenderSubTreeAndMark):
(WebCore::RenderObject::localToAbsolute):
(WebCore::RenderObject::container):
* rendering/RenderObject.h:
(WebCore::RenderObject::virtualContinuation):
(WebCore::RenderObject::node):
(WebCore::RenderObject::nonPseudoNode):
(WebCore::RenderObject::localToAbsoluteQuad):
(WebCore::RenderObject::absoluteQuads):
(WebCore::RenderObject::absoluteClippedOverflowRect):
(WebCore::RenderObject::outlineBoundsForRepaint):
(WebCore::RenderObject::computeAbsoluteRepaintRect):
(WebCore::RenderObject::selectionRect):
(WebCore::RenderObject::imageChanged):
(WebCore::RenderObject::addFocusRingRects):
(WebCore::RenderObject::absoluteOutlineBounds):
* rendering/RenderView.cpp:
(WebCore::SelectionIterator::next):
(WebCore::RenderView::RenderView):
(WebCore::RenderView::mapLocalToContainer):
(WebCore::RenderView::pushMappingToContainer):
(WebCore::RenderView::computeRectForRepaint):
(WebCore::rendererAfterPosition):
(WebCore::RenderView::splitSelectionBetweenSubtrees):
(WebCore::RenderView::rootBackgroundIsEntirelyFixed):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/ChangeLog 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2015-02-24 Simon Fraser <simon.fraser@apple.com>
+
+ Use nullptr in more places in FrameView, RenderView, RenderObject
+ https://bugs.webkit.org/show_bug.cgi?id=141974
+
+ Reviewed by Zalan Bujtas.
+
+ 0 -> nullptr in FrameView.h/cpp, RenderView.h/cpp, RenderObject.h/cpp.
+
+ Rename FrameView::m_deferSetNeedsLayouts to FrameView::m_deferSetNeedsLayoutCount
+ to make it more clear that it's a count.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView):
+ (WebCore::FrameView::reset):
+ (WebCore::FrameView::setContentsSize):
+ (WebCore::FrameView::calculateScrollbarModesForLayout):
+ (WebCore::FrameView::layerForScrolling):
+ (WebCore::FrameView::layerForHorizontalScrollbar):
+ (WebCore::FrameView::layerForVerticalScrollbar):
+ (WebCore::FrameView::layerForScrollCorner):
+ (WebCore::FrameView::tiledBacking):
+ (WebCore::FrameView::scrollLayerID):
+ (WebCore::FrameView::layerForOverhangAreas):
+ (WebCore::FrameView::setWantsLayerForTopOverHangArea):
+ (WebCore::FrameView::setWantsLayerForBottomOverHangArea):
+ (WebCore::FrameView::hasCompositedContentIncludingDescendants):
+ (WebCore::FrameView::layoutRoot):
+ (WebCore::FrameView::forceLayoutParentViewIfNeeded):
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::hostWindow):
+ (WebCore::FrameView::scheduleRelayout):
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+ (WebCore::FrameView::needsLayout):
+ (WebCore::FrameView::setNeedsLayout):
+ (WebCore::FrameView::enclosingScrollableArea):
+ (WebCore::FrameView::parentFrameView):
+ (WebCore::FrameView::paintControlTints):
+ (WebCore::FrameView::adjustPageHeightDeprecated):
+ (WebCore::FrameView::axObjectCache):
+ * page/FrameView.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::RenderObject):
+ (WebCore::RenderObject::nextInPreOrderAfterChildren):
+ (WebCore::RenderObject::previousInPreOrder):
+ (WebCore::RenderObject::firstLeafChild):
+ (WebCore::RenderObject::lastLeafChild):
+ (WebCore::RenderObject::traverseNext):
+ (WebCore::RenderObject::firstLineBlock):
+ (WebCore::RenderObject::containerForRepaint):
+ (WebCore::RenderObject::showRenderSubTreeAndMark):
+ (WebCore::RenderObject::localToAbsolute):
+ (WebCore::RenderObject::container):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::virtualContinuation):
+ (WebCore::RenderObject::node):
+ (WebCore::RenderObject::nonPseudoNode):
+ (WebCore::RenderObject::localToAbsoluteQuad):
+ (WebCore::RenderObject::absoluteQuads):
+ (WebCore::RenderObject::absoluteClippedOverflowRect):
+ (WebCore::RenderObject::outlineBoundsForRepaint):
+ (WebCore::RenderObject::computeAbsoluteRepaintRect):
+ (WebCore::RenderObject::selectionRect):
+ (WebCore::RenderObject::imageChanged):
+ (WebCore::RenderObject::addFocusRingRects):
+ (WebCore::RenderObject::absoluteOutlineBounds):
+ * rendering/RenderView.cpp:
+ (WebCore::SelectionIterator::next):
+ (WebCore::RenderView::RenderView):
+ (WebCore::RenderView::mapLocalToContainer):
+ (WebCore::RenderView::pushMappingToContainer):
+ (WebCore::RenderView::computeRectForRepaint):
+ (WebCore::rendererAfterPosition):
+ (WebCore::RenderView::splitSelectionBetweenSubtrees):
+ (WebCore::RenderView::rootBackgroundIsEntirelyFixed):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2015-02-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r179429): Can't type comments in Facebook
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> : m_frame(&frame)
</span><span class="cx"> , m_canHaveScrollbars(true)
</span><span class="cx"> , m_layoutTimer(*this, &FrameView::layoutTimerFired)
</span><del>- , m_layoutRoot(0)
</del><ins>+ , m_layoutRoot(nullptr)
</ins><span class="cx"> , m_layoutPhase(OutsideLayout)
</span><span class="cx"> , m_inSynchronousPostLayout(false)
</span><span class="cx"> , m_postLayoutTasksTimer(*this, &FrameView::postLayoutTimerFired)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> , m_baseBackgroundColor(Color::white)
</span><span class="cx"> , m_mediaType("screen")
</span><span class="cx"> , m_overflowStatusDirty(true)
</span><del>- , m_viewportRenderer(0)
</del><ins>+ , m_viewportRenderer(nullptr)
</ins><span class="cx"> , m_wasScrolledByUser(false)
</span><span class="cx"> , m_inProgrammaticScroll(false)
</span><span class="cx"> , m_safeToPropagateScrollToParent(true)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> , m_isTrackingRepaints(false)
</span><span class="cx"> , m_shouldUpdateWhileOffscreen(true)
</span><span class="cx"> , m_exposedRect(FloatRect::infiniteRect())
</span><del>- , m_deferSetNeedsLayouts(0)
</del><ins>+ , m_deferSetNeedsLayoutCount(0)
</ins><span class="cx"> , m_setNeedsLayoutWasDeferred(false)
</span><span class="cx"> , m_speculativeTilingEnabled(false)
</span><span class="cx"> , m_speculativeTilingEnableTimer(*this, &FrameView::speculativeTilingEnableTimerFired)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> m_isOverlapped = false;
</span><span class="cx"> m_contentIsOpaque = false;
</span><span class="cx"> m_layoutTimer.stop();
</span><del>- m_layoutRoot = 0;
</del><ins>+ m_layoutRoot = nullptr;
</ins><span class="cx"> m_delayedLayout = false;
</span><span class="cx"> m_needsFullRepaint = true;
</span><span class="cx"> m_layoutSchedulingEnabled = true;
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> if (size == contentsSize())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_deferSetNeedsLayouts++;
</del><ins>+ m_deferSetNeedsLayoutCount++;
</ins><span class="cx">
</span><span class="cx"> ScrollView::setContentsSize(size);
</span><span class="cx"> ScrollView::contentsResized();
</span><span class="lines">@@ -579,10 +579,10 @@
</span><span class="cx"> if (frame().isMainFrame())
</span><span class="cx"> frame().mainFrame().pageOverlayController().didChangeDocumentSize();
</span><span class="cx">
</span><del>- ASSERT(m_deferSetNeedsLayouts);
- m_deferSetNeedsLayouts--;
</del><ins>+ ASSERT(m_deferSetNeedsLayoutCount);
+ m_deferSetNeedsLayoutCount--;
</ins><span class="cx">
</span><del>- if (!m_deferSetNeedsLayouts)
</del><ins>+ if (!m_deferSetNeedsLayoutCount)
</ins><span class="cx"> m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, ScrollbarMode& vMode, ScrollbarModesCalculationStrategy strategy)
</span><span class="cx"> {
</span><del>- m_viewportRenderer = 0;
</del><ins>+ m_viewportRenderer = nullptr;
</ins><span class="cx">
</span><span class="cx"> const HTMLFrameOwnerElement* owner = frame().ownerElement();
</span><span class="cx"> if (owner && (owner->scrollingMode() == ScrollbarAlwaysOff)) {
</span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return renderView->compositor().scrollLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return renderView->compositor().layerForHorizontalScrollbar();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return renderView->compositor().layerForVerticalScrollbar();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -808,7 +808,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return renderView->compositor().layerForScrollCorner();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -816,11 +816,11 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RenderLayerBacking* backing = renderView->layer()->backing();
</span><span class="cx"> if (!backing)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return backing->graphicsLayer()->tiledBacking();
</span><span class="cx"> }
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return renderView->compositor().layerForOverhangAreas();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -860,7 +860,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return renderView->compositor().updateLayerForTopOverhangArea(wantsLayer);
</span><span class="cx"> }
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return renderView->compositor().updateLayerForBottomOverhangArea(wantsLayer);
</span><span class="cx"> }
</span><span class="lines">@@ -1016,7 +1016,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
</span><span class="cx"> RenderView* renderView = frame->contentRenderer();
</span><del>- if (RenderLayerCompositor* compositor = renderView ? &renderView->compositor() : 0) {
</del><ins>+ if (RenderLayerCompositor* compositor = renderView ? &renderView->compositor() : nullptr) {
</ins><span class="cx"> if (compositor->inCompositingMode())
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -1084,7 +1084,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const
</span><span class="cx"> {
</span><del>- return onlyDuringLayout && layoutPending() ? 0 : m_layoutRoot;
</del><ins>+ return onlyDuringLayout && layoutPending() ? nullptr : m_layoutRoot;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void FrameView::forceLayoutParentViewIfNeeded()
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx">
</span><span class="cx"> // If the embedded SVG document appears the first time, the ownerRenderer has already finished
</span><span class="cx"> // layout without knowing about the existence of the embedded SVG document, because RenderReplaced
</span><del>- // embeddedContentBox() returns 0, as long as the embedded document isn't loaded yet. Before
</del><ins>+ // embeddedContentBox() returns nullptr, as long as the embedded document isn't loaded yet. Before
</ins><span class="cx"> // bothering to lay out the SVG document, mark the ownerRenderer needing layout and ask its
</span><span class="cx"> // FrameView for a layout. After that the RenderEmbeddedObject (ownerRenderer) carries the
</span><span class="cx"> // correct size, which RenderSVGRoot::computeReplacedLogicalWidth/Height rely on, when laying
</span><span class="lines">@@ -1304,7 +1304,7 @@
</span><span class="cx"> disableLayoutState = root->view().shouldDisableLayoutStateForSubtree(root);
</span><span class="cx"> root->view().pushLayoutState(*root);
</span><span class="cx"> }
</span><del>- LayoutStateDisabler layoutStateDisabler(disableLayoutState ? &root->view() : 0);
</del><ins>+ LayoutStateDisabler layoutStateDisabler(disableLayoutState ? &root->view() : nullptr);
</ins><span class="cx"> RenderView::RepaintRegionAccumulator repaintRegionAccumulator(&root->view());
</span><span class="cx">
</span><span class="cx"> ASSERT(m_layoutPhase == InPreLayout);
</span><span class="lines">@@ -2247,7 +2247,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (Page* page = frame().page())
</span><span class="cx"> return &page->chrome();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::addTrackedRepaintRect(const FloatRect& r)
</span><span class="lines">@@ -2460,7 +2460,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_layoutRoot) {
</span><span class="cx"> m_layoutRoot->markContainingBlocksForLayout(false);
</span><del>- m_layoutRoot = 0;
</del><ins>+ m_layoutRoot = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> if (!m_layoutSchedulingEnabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -2551,7 +2551,7 @@
</span><span class="cx">
</span><span class="cx"> // Just do a full relayout.
</span><span class="cx"> m_layoutRoot->markContainingBlocksForLayout(false);
</span><del>- m_layoutRoot = 0;
</del><ins>+ m_layoutRoot = nullptr;
</ins><span class="cx"> newRelayoutRoot.markContainingBlocksForLayout(false);
</span><span class="cx"> InspectorInstrumentation::didInvalidateLayout(frame());
</span><span class="cx"> }
</span><span class="lines">@@ -2597,12 +2597,12 @@
</span><span class="cx"> return layoutPending()
</span><span class="cx"> || (renderView && renderView->needsLayout())
</span><span class="cx"> || m_layoutRoot
</span><del>- || (m_deferSetNeedsLayouts && m_setNeedsLayoutWasDeferred);
</del><ins>+ || (m_deferSetNeedsLayoutCount && m_setNeedsLayoutWasDeferred);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::setNeedsLayout()
</span><span class="cx"> {
</span><del>- if (m_deferSetNeedsLayouts) {
</del><ins>+ if (m_deferSetNeedsLayoutCount) {
</ins><span class="cx"> m_setNeedsLayoutWasDeferred = true;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -3399,7 +3399,7 @@
</span><span class="cx"> ScrollableArea* FrameView::enclosingScrollableArea() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Walk up the frame tree and look for a scrollable parent frame or RenderLayer.
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect FrameView::scrollableAreaBoundingBox() const
</span><span class="lines">@@ -3671,12 +3671,12 @@
</span><span class="cx"> FrameView* FrameView::parentFrameView() const
</span><span class="cx"> {
</span><span class="cx"> if (!parent())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (Frame* parentFrame = frame().tree().parent())
</span><span class="cx"> return parentFrame->view();
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameView::isInChildFrameWithFrameFlattening() const
</span><span class="lines">@@ -3747,8 +3747,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (needsLayout())
</span><span class="cx"> layout();
</span><del>- PlatformGraphicsContext* const noContext = 0;
- GraphicsContext context(noContext);
</del><ins>+
+ GraphicsContext context((PlatformGraphicsContext*)nullptr);
</ins><span class="cx"> context.setUpdatingControlTints(true);
</span><span class="cx"> if (platformWidget()) {
</span><span class="cx"> // FIXME: consult paintsEntireContents().
</span><span class="lines">@@ -4141,7 +4141,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> // Use a context with painting disabled.
</span><del>- GraphicsContext context((PlatformGraphicsContext*)0);
</del><ins>+ GraphicsContext context((PlatformGraphicsContext*)nullptr);
</ins><span class="cx"> renderView->setTruncatedAt(static_cast<int>(floorf(oldBottom)));
</span><span class="cx"> IntRect dirtyRect(0, static_cast<int>(floorf(oldTop)), renderView->layoutOverflowRect().maxX(), static_cast<int>(ceilf(oldBottom - oldTop)));
</span><span class="cx"> renderView->setPrintRect(dirtyRect);
</span><span class="lines">@@ -4456,7 +4456,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (frame().document())
</span><span class="cx"> return frame().document()->existingAXObjectCache();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/page/FrameView.h 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx">
</span><span class="cx"> FloatRect m_exposedRect;
</span><span class="cx">
</span><del>- unsigned m_deferSetNeedsLayouts;
</del><ins>+ unsigned m_deferSetNeedsLayoutCount;
</ins><span class="cx"> bool m_setNeedsLayoutWasDeferred;
</span><span class="cx">
</span><span class="cx"> RefPtr<Node> m_nodeToDraw;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -107,9 +107,9 @@
</span><span class="cx"> RenderObject::RenderObject(Node& node)
</span><span class="cx"> : CachedImageClient()
</span><span class="cx"> , m_node(node)
</span><del>- , m_parent(0)
- , m_previous(0)
- , m_next(0)
</del><ins>+ , m_parent(nullptr)
+ , m_previous(nullptr)
+ , m_next(nullptr)
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_hasAXObject(false)
</span><span class="cx"> , m_setNeedsLayoutForbidden(false)
</span><span class="lines">@@ -221,14 +221,14 @@
</span><span class="cx"> RenderObject* RenderObject::nextInPreOrderAfterChildren(const RenderObject* stayWithin) const
</span><span class="cx"> {
</span><span class="cx"> if (this == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> const RenderObject* current = this;
</span><span class="cx"> RenderObject* next;
</span><span class="cx"> while (!(next = current->nextSibling())) {
</span><span class="cx"> current = current->parent();
</span><span class="cx"> if (!current || current == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> return next;
</span><span class="cx"> }
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> RenderObject* RenderObject::previousInPreOrder(const RenderObject* stayWithin) const
</span><span class="cx"> {
</span><span class="cx"> if (this == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return previousInPreOrder();
</span><span class="cx"> }
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderObject* r = firstChildSlow();
</span><span class="cx"> while (r) {
</span><del>- RenderObject* n = 0;
</del><ins>+ RenderObject* n = nullptr;
</ins><span class="cx"> n = r->firstChildSlow();
</span><span class="cx"> if (!n)
</span><span class="cx"> break;
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderObject* r = lastChildSlow();
</span><span class="cx"> while (r) {
</span><del>- RenderObject* n = 0;
</del><ins>+ RenderObject* n = nullptr;
</ins><span class="cx"> n = r->lastChildSlow();
</span><span class="cx"> if (!n)
</span><span class="cx"> break;
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> return child;
</span><span class="cx"> }
</span><span class="cx"> if (this == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> if (nextSibling()) {
</span><span class="cx"> ASSERT(!stayWithin || nextSibling()->isDescendantOf(stayWithin));
</span><span class="cx"> return nextSibling();
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> ASSERT(!stayWithin || !n->nextSibling() || n->nextSibling()->isDescendantOf(stayWithin));
</span><span class="cx"> return n->nextSibling();
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Non-recursive version of the DFS search.
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> // Now we traverse other nodes if they exist, otherwise
</span><span class="cx"> // we go to the parent node and try doing the same.
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> currentDepth--;
</span><span class="cx"> }
</span><span class="cx"> if (!n)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> for (RenderObject* sibling = n->nextSibling(); sibling; sibling = sibling->nextSibling()) {
</span><span class="cx"> overflowType = inclusionFunction(sibling);
</span><span class="cx"> if (overflowType != FixedHeight) {
</span><span class="lines">@@ -354,9 +354,9 @@
</span><span class="cx"> n = n->parent();
</span><span class="cx"> currentDepth--;
</span><span class="cx"> } else
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* RenderObject::traverseNext(const RenderObject* stayWithin, TraverseNextInclusionFunction inclusionFunction) const
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this == stayWithin)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> for (RenderObject* sibling = nextSibling(); sibling; sibling = sibling->nextSibling()) {
</span><span class="cx"> if (inclusionFunction(sibling)) {
</span><span class="lines">@@ -392,10 +392,10 @@
</span><span class="cx"> if ((!stayWithin || n->parent() != stayWithin))
</span><span class="cx"> n = n->parent();
</span><span class="cx"> else
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject* renderer)
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx">
</span><span class="cx"> RenderBlock* RenderObject::firstLineBlock() const
</span><span class="cx"> {
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool objectIsRelayoutBoundary(const RenderElement* object)
</span><span class="lines">@@ -1200,7 +1200,7 @@
</span><span class="cx"> return repaintContainer;
</span><span class="cx"> // If we have already found a repaint container then we will repaint into that container only if it is part of the same
</span><span class="cx"> // flow thread. Otherwise we will need to catch the repaint call and send it to the flow thread.
</span><del>- RenderFlowThread* repaintContainerFlowThread = repaintContainer ? repaintContainer->flowThreadContainingBlock() : 0;
</del><ins>+ RenderFlowThread* repaintContainerFlowThread = repaintContainer ? repaintContainer->flowThreadContainingBlock() : nullptr;
</ins><span class="cx"> if (!repaintContainerFlowThread || repaintContainerFlowThread != parentRenderFlowThread)
</span><span class="cx"> repaintContainer = parentRenderFlowThread;
</span><span class="cx"> }
</span><span class="lines">@@ -1548,7 +1548,7 @@
</span><span class="cx"> #pragma clang diagnostic ignored "-Wunknown-pragmas"
</span><span class="cx"> #pragma clang diagnostic ignored "-Wundefined-bool-conversion"
</span><span class="cx"> #endif
</span><del>- // As this function is intended to be used when debugging, the |this| pointer may be 0.
</del><ins>+ // As this function is intended to be used when debugging, the |this| pointer may be nullptr.
</ins><span class="cx"> if (!this)
</span><span class="cx"> return;
</span><span class="cx"> #if COMPILER(CLANG)
</span><span class="lines">@@ -1582,7 +1582,7 @@
</span><span class="cx"> FloatPoint RenderObject::localToAbsolute(const FloatPoint& localPoint, MapCoordinatesFlags mode) const
</span><span class="cx"> {
</span><span class="cx"> TransformState transformState(TransformState::ApplyTransformDirection, localPoint);
</span><del>- mapLocalToContainer(0, transformState, mode | ApplyContainerFlip);
</del><ins>+ mapLocalToContainer(nullptr, transformState, mode | ApplyContainerFlip);
</ins><span class="cx"> transformState.flatten();
</span><span class="cx">
</span><span class="cx"> return transformState.lastPlanarPoint();
</span><span class="lines">@@ -1816,7 +1816,7 @@
</span><span class="cx"> // can't get back to the canvas. Instead we just walk as high up
</span><span class="cx"> // as we can. If we're in the tree, we'll get the root. If we
</span><span class="cx"> // aren't we'll get the root of our little subtree (most likely
</span><del>- // we'll just return 0).
</del><ins>+ // we'll just return nullptr).
</ins><span class="cx"> // FIXME: The definition of view() has changed to not crawl up the render tree. It might
</span><span class="cx"> // be safe now to use it.
</span><span class="cx"> // FIXME: share code with containingBlockForFixedPosition().
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> bool isElementContinuation() const { return node() && node()->renderer() != this; }
</span><span class="cx"> bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); }
</span><span class="cx"> bool isBlockElementContinuation() const { return isElementContinuation() && !isInline(); }
</span><del>- virtual RenderBoxModelObject* virtualContinuation() const { return 0; }
</del><ins>+ virtual RenderBoxModelObject* virtualContinuation() const { return nullptr; }
</ins><span class="cx">
</span><span class="cx"> bool isFloating() const { return m_bitfields.floating(); }
</span><span class="cx">
</span><span class="lines">@@ -564,10 +564,10 @@
</span><span class="cx"> RenderView& view() const { return *document().renderView(); };
</span><span class="cx">
</span><span class="cx"> // Returns true if this renderer is rooted, and optionally returns the hosting view (the root of the hierarchy).
</span><del>- bool isRooted(RenderView** = 0) const;
</del><ins>+ bool isRooted(RenderView** = nullptr) const;
</ins><span class="cx">
</span><del>- Node* node() const { return isAnonymous() ? 0 : &m_node; }
- Node* nonPseudoNode() const { return isPseudoElement() ? 0 : node(); }
</del><ins>+ Node* node() const { return isAnonymous() ? nullptr : &m_node; }
+ Node* nonPseudoNode() const { return isPseudoElement() ? nullptr : node(); }
</ins><span class="cx">
</span><span class="cx"> // Returns the styled node that caused the generation of this renderer.
</span><span class="cx"> // This is the same as node() except for renderers of :before and :after
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> Node* generatingNode() const { return isPseudoElement() ? generatingPseudoHostElement() : node(); }
</span><span class="cx">
</span><span class="cx"> Document& document() const { return m_node.document(); }
</span><del>- Frame& frame() const; // Defined in RenderView.h
</del><ins>+ Frame& frame() const;
</ins><span class="cx">
</span><span class="cx"> bool hasOutlineAnnotation() const;
</span><span class="cx"> bool hasOutline() const { return style().hasOutline() || hasOutlineAnnotation(); }
</span><span class="lines">@@ -583,11 +583,11 @@
</span><span class="cx"> // Returns the object containing this one. Can be different from parent for positioned elements.
</span><span class="cx"> // If repaintContainer and repaintContainerSkipped are not null, on return *repaintContainerSkipped
</span><span class="cx"> // is true if the renderer returned is an ancestor of repaintContainer.
</span><del>- RenderElement* container(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const;
</del><ins>+ RenderElement* container(const RenderLayerModelObject* repaintContainer = nullptr, bool* repaintContainerSkipped = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> RenderBoxModelObject* offsetParent() const;
</span><span class="cx">
</span><del>- void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderElement* newRoot = 0);
</del><ins>+ void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderElement* newRoot = nullptr);
</ins><span class="cx"> void setNeedsLayout(MarkingBehavior = MarkContainingBlockChain);
</span><span class="cx"> void clearNeedsLayout();
</span><span class="cx"> void setPreferredLogicalWidthsDirty(bool, MarkingBehavior = MarkContainingBlockChain);
</span><span class="lines">@@ -656,20 +656,20 @@
</span><span class="cx"> FloatPoint absoluteToLocal(const FloatPoint&, MapCoordinatesFlags = 0) const;
</span><span class="cx">
</span><span class="cx"> // Convert a local quad to absolute coordinates, taking transforms into account.
</span><del>- FloatQuad localToAbsoluteQuad(const FloatQuad& quad, MapCoordinatesFlags mode = 0, bool* wasFixed = 0) const
</del><ins>+ FloatQuad localToAbsoluteQuad(const FloatQuad& quad, MapCoordinatesFlags mode = 0, bool* wasFixed = nullptr) const
</ins><span class="cx"> {
</span><del>- return localToContainerQuad(quad, 0, mode, wasFixed);
</del><ins>+ return localToContainerQuad(quad, nullptr, mode, wasFixed);
</ins><span class="cx"> }
</span><span class="cx"> // Convert an absolute quad to local coordinates.
</span><span class="cx"> FloatQuad absoluteToLocalQuad(const FloatQuad&, MapCoordinatesFlags mode = 0) const;
</span><span class="cx">
</span><span class="cx"> // Convert a local quad into the coordinate system of container, taking transforms into account.
</span><del>- WEBCORE_EXPORT FloatQuad localToContainerQuad(const FloatQuad&, const RenderLayerModelObject* repaintContainer, MapCoordinatesFlags = 0, bool* wasFixed = 0) const;
- WEBCORE_EXPORT FloatPoint localToContainerPoint(const FloatPoint&, const RenderLayerModelObject* repaintContainer, MapCoordinatesFlags = 0, bool* wasFixed = 0) const;
</del><ins>+ WEBCORE_EXPORT FloatQuad localToContainerQuad(const FloatQuad&, const RenderLayerModelObject* repaintContainer, MapCoordinatesFlags = 0, bool* wasFixed = nullptr) const;
+ WEBCORE_EXPORT FloatPoint localToContainerPoint(const FloatPoint&, const RenderLayerModelObject* repaintContainer, MapCoordinatesFlags = 0, bool* wasFixed = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> // Return the offset from the container() renderer (excluding transforms). In multi-column layout,
</span><span class="cx"> // different offsets apply at different points, so return the offset that applies to the given point.
</span><del>- virtual LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const;
</del><ins>+ virtual LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const;
</ins><span class="cx"> // Return the offset from an object up the container() chain. Asserts that none of the intermediate objects have transforms.
</span><span class="cx"> LayoutSize offsetFromAncestorContainer(RenderElement&) const;
</span><span class="cx">
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> IntRect absoluteBoundingBoxRectIgnoringTransforms() const { return absoluteBoundingBoxRect(false); }
</span><span class="cx">
</span><span class="cx"> // Build an array of quads in absolute coords for line boxes
</span><del>- virtual void absoluteQuads(Vector<FloatQuad>&, bool* /*wasFixed*/ = 0) const { }
</del><ins>+ virtual void absoluteQuads(Vector<FloatQuad>&, bool* /*wasFixed*/ = nullptr) const { }
</ins><span class="cx">
</span><span class="cx"> virtual void absoluteFocusRingQuads(Vector<FloatQuad>&);
</span><span class="cx">
</span><span class="lines">@@ -709,12 +709,12 @@
</span><span class="cx"> void getTextDecorationColorsAndStyles(int decorations, Color& underlineColor, Color& overlineColor, Color& linethroughColor,
</span><span class="cx"> TextDecorationStyle& underlineStyle, TextDecorationStyle& overlineStyle, TextDecorationStyle& linethroughStyle, bool firstlineStyle = false);
</span><span class="cx">
</span><del>- // Return the RenderLayerModelObject in the container chain which is responsible for painting this object, or 0
</del><ins>+ // Return the RenderLayerModelObject in the container chain which is responsible for painting this object, or nullptr
</ins><span class="cx"> // if painting is root-relative. This is the container that should be passed to the 'forRepaint'
</span><span class="cx"> // methods.
</span><span class="cx"> RenderLayerModelObject* containerForRepaint() const;
</span><span class="cx"> // Actually do the repaint of rect r for this object which has been computed in the coordinate space
</span><del>- // of repaintContainer. If repaintContainer is 0, repaint via the view.
</del><ins>+ // of repaintContainer. If repaintContainer is nullptr, repaint via the view.
</ins><span class="cx"> void repaintUsingContainer(const RenderLayerModelObject* repaintContainer, const LayoutRect&, bool shouldClipToLayer = true) const;
</span><span class="cx">
</span><span class="cx"> // Repaint the entire object. Called when, e.g., the color of a border changes, or when a border
</span><span class="lines">@@ -733,18 +733,18 @@
</span><span class="cx"> // coordinate space. This method deals with outlines and overflow.
</span><span class="cx"> LayoutRect absoluteClippedOverflowRect() const
</span><span class="cx"> {
</span><del>- return clippedOverflowRectForRepaint(0);
</del><ins>+ return clippedOverflowRectForRepaint(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> WEBCORE_EXPORT IntRect pixelSnappedAbsoluteClippedOverflowRect() const;
</span><span class="cx"> virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const;
</span><span class="cx"> virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const;
</span><del>- virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap* = 0) const { return LayoutRect(); }
</del><ins>+ virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap* = nullptr) const { return LayoutRect(); }
</ins><span class="cx">
</span><span class="cx"> // Given a rect in the object's coordinate space, compute a rect suitable for repainting
</span><span class="cx"> // that rect in view coordinates.
</span><span class="cx"> void computeAbsoluteRepaintRect(LayoutRect& r, bool fixed = false) const
</span><span class="cx"> {
</span><del>- computeRectForRepaint(0, r, fixed);
</del><ins>+ computeRectForRepaint(nullptr, r, fixed);
</ins><span class="cx"> }
</span><span class="cx"> // Given a rect in the object's coordinate space, compute a rect suitable for repainting
</span><span class="cx"> // that rect in the coordinate space of repaintContainer.
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx">
</span><span class="cx"> // A single rectangle that encompasses all of the selected objects within this object. Used to determine the tightest
</span><span class="cx"> // possible bounding box for the selection.
</span><del>- LayoutRect selectionRect(bool clipToVisibleContent = true) { return selectionRectForRepaint(0, clipToVisibleContent); }
</del><ins>+ LayoutRect selectionRect(bool clipToVisibleContent = true) { return selectionRectForRepaint(nullptr, clipToVisibleContent); }
</ins><span class="cx"> virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* /*repaintContainer*/, bool /*clipToVisibleContent*/ = true) { return LayoutRect(); }
</span><span class="cx">
</span><span class="cx"> virtual bool canBeSelectionLeaf() const { return false; }
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx"> * @param extraWidthToEndOfLine optional out arg to give extra width to end of line -
</span><span class="cx"> * useful for character range rect computations
</span><span class="cx"> */
</span><del>- virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0);
</del><ins>+ virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr);
</ins><span class="cx">
</span><span class="cx"> // When performing a global document tear-down, the renderer of the document is cleared. We use this
</span><span class="cx"> // as a hook to detect the case of document destruction and don't waste time doing unnecessary work.
</span><span class="lines">@@ -821,8 +821,8 @@
</span><span class="cx"> virtual int previousOffsetForBackwardDeletion(int current) const;
</span><span class="cx"> virtual int nextOffset(int current) const;
</span><span class="cx">
</span><del>- virtual void imageChanged(CachedImage*, const IntRect* = 0) override;
- virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) { }
</del><ins>+ virtual void imageChanged(CachedImage*, const IntRect* = nullptr) override;
+ virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) { }
</ins><span class="cx">
</span><span class="cx"> SelectionSubtreeRoot& selectionRoot() const;
</span><span class="cx"> void selectionStartEnd(int& spos, int& epos) const;
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx">
</span><span class="cx"> // Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use
</span><span class="cx"> // localToAbsolute/absoluteToLocal methods instead.
</span><del>- virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const;
</del><ins>+ virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr) const;
</ins><span class="cx"> virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const;
</span><span class="cx">
</span><span class="cx"> // Pushes state onto RenderGeometryMap about how to map coordinates from this renderer to its container, or ancestorToStopAt (whichever is encountered first).
</span><span class="lines">@@ -843,11 +843,11 @@
</span><span class="cx"> bool shouldUseTransformFromContainer(const RenderObject* container) const;
</span><span class="cx"> void getTransformFromContainer(const RenderObject* container, const LayoutSize& offsetInContainer, TransformationMatrix&) const;
</span><span class="cx">
</span><del>- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& /* additionalOffset */, const RenderLayerModelObject* /* paintContainer */ = 0) { };
</del><ins>+ virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& /* additionalOffset */, const RenderLayerModelObject* /* paintContainer */ = nullptr) { };
</ins><span class="cx">
</span><span class="cx"> LayoutRect absoluteOutlineBounds() const
</span><span class="cx"> {
</span><del>- return outlineBoundsForRepaint(0);
</del><ins>+ return outlineBoundsForRepaint(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RespectImageOrientationEnum shouldRespectImageOrientation() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* next()
</span><span class="cx"> {
</span><del>- RenderObject* currentSpan = m_spannerStack.isEmpty() ? 0 : m_spannerStack.last()->spanner();
</del><ins>+ RenderObject* currentSpan = m_spannerStack.isEmpty() ? nullptr : m_spannerStack.last()->spanner();
</ins><span class="cx"> m_current = m_current->nextInPreOrder(currentSpan);
</span><span class="cx"> checkForSpanner();
</span><span class="cx"> if (!m_current && currentSpan) {
</span><span class="lines">@@ -96,8 +96,8 @@
</span><span class="cx"> RenderView::RenderView(Document& document, Ref<RenderStyle>&& style)
</span><span class="cx"> : RenderBlockFlow(document, WTF::move(style))
</span><span class="cx"> , m_frameView(*document.view())
</span><del>- , m_selectionUnsplitStart(0)
- , m_selectionUnsplitEnd(0)
</del><ins>+ , m_selectionUnsplitStart(nullptr)
+ , m_selectionUnsplitEnd(nullptr)
</ins><span class="cx"> , m_selectionUnsplitStartPos(-1)
</span><span class="cx"> , m_selectionUnsplitEndPos(-1)
</span><span class="cx"> , m_rendererCount(0)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> , m_pageLogicalHeightChanged(false)
</span><span class="cx"> , m_layoutState(nullptr)
</span><span class="cx"> , m_layoutStateDisableCount(0)
</span><del>- , m_renderQuoteHead(0)
</del><ins>+ , m_renderQuoteHead(nullptr)
</ins><span class="cx"> , m_renderCounterCount(0)
</span><span class="cx"> , m_selectionWasCaret(false)
</span><span class="cx"> , m_hasSoftwareFilters(false)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderView::mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) const
</span><span class="cx"> {
</span><del>- // If a container was specified, and was not 0 or the RenderView,
</del><ins>+ // If a container was specified, and was not nullptr or the RenderView,
</ins><span class="cx"> // then we should have found it by now.
</span><span class="cx"> ASSERT_ARG(repaintContainer, !repaintContainer || repaintContainer == this);
</span><span class="cx"> ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == (mode & IsFixed));
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx">
</span><span class="cx"> const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
</span><span class="cx"> {
</span><del>- // If a container was specified, and was not 0 or the RenderView,
</del><ins>+ // If a container was specified, and was not nullptr or the RenderView,
</ins><span class="cx"> // then we should have found it by now.
</span><span class="cx"> ASSERT_ARG(ancestorToStopAt, !ancestorToStopAt || ancestorToStopAt == this);
</span><span class="cx">
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> } else
</span><span class="cx"> geometryMap.pushView(this, scrollOffset);
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderView::computeRectForRepaint(const RenderLayerModelObject* repaintContainer, LayoutRect& rect, bool fixed) const
</span><span class="cx"> {
</span><del>- // If a container was specified, and was not 0 or the RenderView,
</del><ins>+ // If a container was specified, and was not nullptr or the RenderView,
</ins><span class="cx"> // then we should have found it by now.
</span><span class="cx"> ASSERT_ARG(repaintContainer, !repaintContainer || repaintContainer == this);
</span><span class="cx">
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> static RenderObject* rendererAfterPosition(RenderObject* object, unsigned offset)
</span><span class="cx"> {
</span><span class="cx"> if (!object)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RenderObject* child = object->childAt(offset);
</span><span class="cx"> return child ? child : object->nextInPreOrderAfterChildren();
</span><span class="lines">@@ -1126,7 +1126,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderView::rootBackgroundIsEntirelyFixed() const
</span><span class="cx"> {
</span><del>- RenderElement* rootObject = document().documentElement() ? document().documentElement()->renderer() : 0;
</del><ins>+ RenderElement* rootObject = document().documentElement() ? document().documentElement()->renderer() : nullptr;
</ins><span class="cx"> if (!rootObject)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (180573 => 180574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2015-02-24 18:31:58 UTC (rev 180573)
+++ trunk/Source/WebCore/rendering/RenderView.h 2015-02-24 18:47:54 UTC (rev 180574)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> void unscheduleLazyRepaint(RenderBox&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const override;
</del><ins>+ virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr) const override;
</ins><span class="cx"> virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
</span><span class="cx"> virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
</span><span class="cx"> virtual bool requiresColumns(int desiredColumnCount) const override;
</span></span></pre>
</div>
</div>
</body>
</html>