<!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>[162602] 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/162602">162602</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-01-23 02:02:11 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Convert regions iterator loops to range-based loops
https://bugs.webkit.org/show_bug.cgi?id=127464
Reviewed by Antti Koivisto.
Replace most of the iterator loops in the region implementation with
range based for loops. The for loops that iterate only over subsets
of collections have not been changed.
Tests: no new tests, this is a refactoring patch.
* dom/WebKitNamedFlow.cpp:
(WebCore::WebKitNamedFlow::firstEmptyRegionIndex):
(WebCore::WebKitNamedFlow::getRegionsByContent):
(WebCore::WebKitNamedFlow::getRegions):
(WebCore::WebKitNamedFlow::getContent):
* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForCSSRegionsHighlight):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::validateRegions):
(WebCore::RenderFlowThread::updateLogicalWidth):
(WebCore::RenderFlowThread::computeLogicalHeight):
(WebCore::RenderFlowThread::repaintRectangleInRegions):
(WebCore::RenderFlowThread::removeRenderBoxRegionInfo):
(WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
(WebCore::RenderFlowThread::clearRenderBoxRegionInfoAndCustomStyle):
(WebCore::RenderFlowThread::isAutoLogicalHeightRegionsCountConsistent):
(WebCore::RenderFlowThread::markAutoLogicalHeightRegionsForLayout):
(WebCore::RenderFlowThread::markRegionsForOverflowLayoutIfNeeded):
(WebCore::RenderFlowThread::updateRegionsFlowThreadPortionRect):
(WebCore::RenderFlowThread::collectLayerFragments):
(WebCore::RenderFlowThread::fragmentsBoundingBox):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::setRegionObjectsRegionStyle):
(WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle):
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::clearContentElements):
(WebCore::RenderNamedFlowThread::nextRendererForNode):
(WebCore::RenderNamedFlowThread::dependsOn):
(WebCore::RenderNamedFlowThread::computeOversetStateForRegions):
(WebCore::RenderNamedFlowThread::checkInvalidRegions):
(WebCore::RenderNamedFlowThread::pushDependencies):
(WebCore::RenderNamedFlowThread::registerNamedFlowContentElement):
(WebCore::isContainedInElements):
(WebCore::RenderNamedFlowThread::getRanges):
(WebCore::RenderNamedFlowThread::checkRegionsWithStyling):
(WebCore::RenderNamedFlowThread::clearRenderObjectCustomStyle):
* rendering/RenderTreeAsText.cpp:
(WebCore::writeRenderRegionList):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomWebKitNamedFlowcpp">trunk/Source/WebCore/dom/WebKitNamedFlow.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/RenderTreeAsText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/ChangeLog 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2014-01-23 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Convert regions iterator loops to range-based loops
+ https://bugs.webkit.org/show_bug.cgi?id=127464
+
+ Reviewed by Antti Koivisto.
+
+ Replace most of the iterator loops in the region implementation with
+ range based for loops. The for loops that iterate only over subsets
+ of collections have not been changed.
+
+ Tests: no new tests, this is a refactoring patch.
+
+ * dom/WebKitNamedFlow.cpp:
+ (WebCore::WebKitNamedFlow::firstEmptyRegionIndex):
+ (WebCore::WebKitNamedFlow::getRegionsByContent):
+ (WebCore::WebKitNamedFlow::getRegions):
+ (WebCore::WebKitNamedFlow::getContent):
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildObjectForCSSRegionsHighlight):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::validateRegions):
+ (WebCore::RenderFlowThread::updateLogicalWidth):
+ (WebCore::RenderFlowThread::computeLogicalHeight):
+ (WebCore::RenderFlowThread::repaintRectangleInRegions):
+ (WebCore::RenderFlowThread::removeRenderBoxRegionInfo):
+ (WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
+ (WebCore::RenderFlowThread::clearRenderBoxRegionInfoAndCustomStyle):
+ (WebCore::RenderFlowThread::isAutoLogicalHeightRegionsCountConsistent):
+ (WebCore::RenderFlowThread::markAutoLogicalHeightRegionsForLayout):
+ (WebCore::RenderFlowThread::markRegionsForOverflowLayoutIfNeeded):
+ (WebCore::RenderFlowThread::updateRegionsFlowThreadPortionRect):
+ (WebCore::RenderFlowThread::collectLayerFragments):
+ (WebCore::RenderFlowThread::fragmentsBoundingBox):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::setRegionObjectsRegionStyle):
+ (WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle):
+ * rendering/RenderNamedFlowThread.cpp:
+ (WebCore::RenderNamedFlowThread::clearContentElements):
+ (WebCore::RenderNamedFlowThread::nextRendererForNode):
+ (WebCore::RenderNamedFlowThread::dependsOn):
+ (WebCore::RenderNamedFlowThread::computeOversetStateForRegions):
+ (WebCore::RenderNamedFlowThread::checkInvalidRegions):
+ (WebCore::RenderNamedFlowThread::pushDependencies):
+ (WebCore::RenderNamedFlowThread::registerNamedFlowContentElement):
+ (WebCore::isContainedInElements):
+ (WebCore::RenderNamedFlowThread::getRanges):
+ (WebCore::RenderNamedFlowThread::checkRegionsWithStyling):
+ (WebCore::RenderNamedFlowThread::clearRenderObjectCustomStyle):
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::writeRenderRegionList):
+
</ins><span class="cx"> 2014-01-23 László Langó <llango.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Range should be constructable.
</span></span></pre></div>
<a id="trunkSourceWebCoredomWebKitNamedFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WebKitNamedFlow.cpp (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WebKitNamedFlow.cpp 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/dom/WebKitNamedFlow.cpp 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -99,16 +99,15 @@
</span><span class="cx"> return -1;
</span><span class="cx">
</span><span class="cx"> int countNonPseudoRegions = -1;
</span><del>- auto iter = regionList.begin();
- for (int index = 0; iter != regionList.end(); ++index, ++iter) {
</del><ins>+ for (const auto& renderRegion : regionList) {
+ const RenderNamedFlowFragment* namedFlowFragment = toRenderNamedFlowFragment(renderRegion);
</ins><span class="cx"> // FIXME: Pseudo-elements are not included in the list.
</span><span class="cx"> // They will be included when we will properly support the Region interface
</span><span class="cx"> // http://dev.w3.org/csswg/css-regions/#the-region-interface
</span><del>- const RenderNamedFlowFragment* renderRegion = toRenderNamedFlowFragment(*iter);
- if (renderRegion->isPseudoElementRegion())
</del><ins>+ if (namedFlowFragment->isPseudoElementRegion())
</ins><span class="cx"> continue;
</span><span class="cx"> countNonPseudoRegions++;
</span><del>- if (renderRegion->regionOversetState() == RegionEmpty)
</del><ins>+ if (namedFlowFragment->regionOversetState() == RegionEmpty)
</ins><span class="cx"> return countNonPseudoRegions;
</span><span class="cx"> }
</span><span class="cx"> return -1;
</span><span class="lines">@@ -131,16 +130,16 @@
</span><span class="cx">
</span><span class="cx"> if (inFlowThread(contentNode->renderer(), m_parentFlowThread)) {
</span><span class="cx"> const RenderRegionList& regionList = m_parentFlowThread->renderRegionList();
</span><del>- for (auto iter = regionList.begin(), end = regionList.end(); iter != end; ++iter) {
</del><ins>+ for (const auto& renderRegion : regionList) {
+ const RenderNamedFlowFragment* namedFlowFragment = toRenderNamedFlowFragment(renderRegion);
</ins><span class="cx"> // FIXME: Pseudo-elements are not included in the list.
</span><span class="cx"> // They will be included when we will properly support the Region interface
</span><span class="cx"> // http://dev.w3.org/csswg/css-regions/#the-region-interface
</span><del>- const RenderNamedFlowFragment* renderRegion = toRenderNamedFlowFragment(*iter);
- if (renderRegion->isPseudoElementRegion())
</del><ins>+ if (namedFlowFragment->isPseudoElementRegion())
</ins><span class="cx"> continue;
</span><del>- if (m_parentFlowThread->objectInFlowRegion(contentNode->renderer(), renderRegion)) {
- ASSERT(renderRegion->generatingElement());
- regionElements.append(*renderRegion->generatingElement());
</del><ins>+ if (m_parentFlowThread->objectInFlowRegion(contentNode->renderer(), namedFlowFragment)) {
+ ASSERT(namedFlowFragment->generatingElement());
+ regionElements.append(*namedFlowFragment->generatingElement());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -161,15 +160,15 @@
</span><span class="cx"> Vector<Ref<Element>> regionElements;
</span><span class="cx">
</span><span class="cx"> const RenderRegionList& regionList = m_parentFlowThread->renderRegionList();
</span><del>- for (auto iter = regionList.begin(), end = regionList.end(); iter != end; ++iter) {
</del><ins>+ for (const auto& renderRegion : regionList) {
+ const RenderNamedFlowFragment* namedFlowFragment = toRenderNamedFlowFragment(renderRegion);
</ins><span class="cx"> // FIXME: Pseudo-elements are not included in the list.
</span><span class="cx"> // They will be included when we will properly support the Region interface
</span><span class="cx"> // http://dev.w3.org/csswg/css-regions/#the-region-interface
</span><del>- const RenderNamedFlowFragment* renderRegion = toRenderNamedFlowFragment(*iter);
- if (renderRegion->isPseudoElementRegion())
</del><ins>+ if (namedFlowFragment->isPseudoElementRegion())
</ins><span class="cx"> continue;
</span><del>- ASSERT(renderRegion->generatingElement());
- regionElements.append(*renderRegion->generatingElement());
</del><ins>+ ASSERT(namedFlowFragment->generatingElement());
+ regionElements.append(*namedFlowFragment->generatingElement());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return StaticElementList::adopt(regionElements);
</span><span class="lines">@@ -188,8 +187,7 @@
</span><span class="cx"> Vector<Ref<Element>> contentElements;
</span><span class="cx">
</span><span class="cx"> const NamedFlowContentElements& contentElementsList = m_parentFlowThread->contentElements();
</span><del>- for (auto it = contentElementsList.begin(), end = contentElementsList.end(); it != end; ++it) {
- Element* element = *it;
</del><ins>+ for (auto& element : contentElementsList) {
</ins><span class="cx"> ASSERT(element->computedStyle()->flowThread() == m_parentFlowThread->flowThreadName());
</span><span class="cx"> contentElements.append(*element);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -434,8 +434,7 @@
</span><span class="cx"> RefPtr<InspectorArray> array = InspectorArray::create();
</span><span class="cx">
</span><span class="cx"> const RenderRegionList& regionList = flowThread->renderRegionList();
</span><del>- for (RenderRegionList::const_iterator iter = regionList.begin(); iter != regionList.end(); ++iter) {
- RenderRegion* iterRegion = *iter;
</del><ins>+ for (auto& iterRegion : regionList) {
</ins><span class="cx"> if (!iterRegion->isValid())
</span><span class="cx"> continue;
</span><span class="cx"> RefPtr<InspectorObject> regionHighlightObject = buildObjectForRegionHighlight(mainFrameView, iterRegion);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -161,8 +161,7 @@
</span><span class="cx"> LayoutUnit previousRegionLogicalHeight = 0;
</span><span class="cx"> bool firstRegionVisited = false;
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> ASSERT(!region->needsLayout() || region->isRenderRegionSet());
</span><span class="cx">
</span><span class="cx"> region->deleteAllRenderBoxRegionInfo();
</span><span class="lines">@@ -365,16 +364,14 @@
</span><span class="cx"> void RenderFlowThread::updateLogicalWidth()
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit logicalWidth = initialLogicalWidth();
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> ASSERT(!region->needsLayout() || region->isRenderRegionSet());
</span><span class="cx"> logicalWidth = std::max(region->pageLogicalWidth(), logicalWidth);
</span><span class="cx"> }
</span><span class="cx"> setLogicalWidth(logicalWidth);
</span><span class="cx">
</span><span class="cx"> // If the regions have non-uniform logical widths, then insert inset information for the RenderFlowThread.
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> LayoutUnit regionLogicalWidth = region->pageLogicalWidth();
</span><span class="cx"> LayoutUnit logicalLeft = style().direction() == LTR ? LayoutUnit() : logicalWidth - regionLogicalWidth;
</span><span class="cx"> region->setRenderBoxRegionInfo(this, logicalLeft, regionLogicalWidth, false);
</span><span class="lines">@@ -387,8 +384,7 @@
</span><span class="cx"> computedValues.m_extent = 0;
</span><span class="cx">
</span><span class="cx"> const LayoutUnit maxFlowSize = RenderFlowThread::maxLogicalHeight();
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> ASSERT(!region->needsLayout() || region->isRenderRegionSet());
</span><span class="cx">
</span><span class="cx"> LayoutUnit distanceToMaxSize = maxFlowSize - computedValues.m_extent;
</span><span class="lines">@@ -434,11 +430,8 @@
</span><span class="cx"> // Let each region figure out the proper enclosing flow thread.
</span><span class="cx"> CurrentRenderFlowThreadDisabler disabler(&view());
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
-
</del><ins>+ for (auto& region : m_regionList)
</ins><span class="cx"> region->repaintFlowThreadContent(repaintRect, immediate);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderRegion* RenderFlowThread::regionAtBlockOffset(const RenderBox* clampBox, LayoutUnit offset, bool extendLastRegion, RegionAutoGenerationPolicy autoGenerationPolicy)
</span><span class="lines">@@ -629,8 +622,7 @@
</span><span class="cx"> RenderRegion* endRegion;
</span><span class="cx"> getRegionRangeForBox(box, startRegion, endRegion);
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.find(startRegion), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> region->removeRenderBoxRegionInfo(box);
</span><span class="cx"> if (region == endRegion)
</span><span class="cx"> break;
</span><span class="lines">@@ -638,10 +630,8 @@
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> // We have to make sure we did not leave any RenderBoxRegionInfo attached.
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList)
</ins><span class="cx"> ASSERT(!region->renderBoxRegionInfo(box));
</span><del>- }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_regionRangeMap.remove(box);
</span><span class="lines">@@ -676,8 +666,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.find(startRegion), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> ASSERT(!region->needsLayout() || region->isRenderRegionSet());
</span><span class="cx">
</span><span class="cx"> // We have no information computed for this region so we need to do it.
</span><span class="lines">@@ -745,9 +734,7 @@
</span><span class="cx">
</span><span class="cx"> bool insideOldRegionRange = false;
</span><span class="cx"> bool insideNewRegionRange = false;
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
-
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> if (oldStartRegion == region)
</span><span class="cx"> insideOldRegionRange = true;
</span><span class="cx"> if (newStartRegion == region)
</span><span class="lines">@@ -896,8 +883,7 @@
</span><span class="cx"> bool RenderFlowThread::isAutoLogicalHeightRegionsCountConsistent() const
</span><span class="cx"> {
</span><span class="cx"> unsigned autoLogicalHeightRegions = 0;
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- const RenderRegion* region = *iter;
</del><ins>+ for (const auto& region : m_regionList) {
</ins><span class="cx"> if (region->hasAutoLogicalHeight())
</span><span class="cx"> autoLogicalHeightRegions++;
</span><span class="cx"> }
</span><span class="lines">@@ -929,8 +915,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasAutoLogicalHeightRegions());
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> if (!region->hasAutoLogicalHeight())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -945,10 +930,8 @@
</span><span class="cx"> if (!hasRegions())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList)
</ins><span class="cx"> region->setNeedsSimplifiedNormalFlowLayout();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFlowThread::updateRegionsFlowThreadPortionRect(const RenderRegion* lastRegionWithContent)
</span><span class="lines">@@ -959,9 +942,7 @@
</span><span class="cx"> // FIXME: Optimize not to clear the interval all the time. This implies manually managing the tree nodes lifecycle.
</span><span class="cx"> m_regionIntervalTree.clear();
</span><span class="cx"> m_regionIntervalTree.initIfNeeded();
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
-
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> // If we find an empty auto-height region, clear the computedAutoHeight value.
</span><span class="cx"> if (emptyRegionsSegment && region->hasAutoLogicalHeight())
</span><span class="cx"> toRenderNamedFlowFragment(region)->clearComputedAutoHeight();
</span><span class="lines">@@ -1081,10 +1062,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_regionsInvalidated);
</span><span class="cx">
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList)
</ins><span class="cx"> region->collectLayerFragments(layerFragments, layerBoundingBox, dirtyRect);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderFlowThread::fragmentsBoundingBox(const LayoutRect& layerBoundingBox)
</span><span class="lines">@@ -1092,12 +1071,10 @@
</span><span class="cx"> ASSERT(!m_regionsInvalidated);
</span><span class="cx">
</span><span class="cx"> LayoutRect result;
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> LayerFragments fragments;
</span><span class="cx"> region->collectLayerFragments(fragments, layerBoundingBox, LayoutRect::infiniteRect());
</span><del>- for (size_t i = 0; i < fragments.size(); ++i) {
- const LayerFragment& fragment = fragments.at(i);
</del><ins>+ for (const auto& fragment : fragments) {
</ins><span class="cx"> LayoutRect fragmentRect(layerBoundingBox);
</span><span class="cx"> fragmentRect.intersect(fragment.paginationClip);
</span><span class="cx"> fragmentRect.moveBy(fragment.paginationOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -308,8 +308,7 @@
</span><span class="cx"> const RenderNamedFlowThread& namedFlow = view().flowThreadController().ensureRenderFlowThreadWithName(style().regionThread());
</span><span class="cx"> const NamedFlowContentElements& contentElements = namedFlow.contentElements();
</span><span class="cx">
</span><del>- for (auto iter = contentElements.begin(), end = contentElements.end(); iter != end; ++iter) {
- const Element* element = *iter;
</del><ins>+ for (const auto& element : contentElements) {
</ins><span class="cx"> // The list of content nodes contains also the nodes with display:none.
</span><span class="cx"> if (!element->renderer())
</span><span class="cx"> continue;
</span><span class="lines">@@ -343,14 +342,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderObjectRegionStyleMap temp;
</span><del>- for (auto iter = m_renderObjectRegionStyle.begin(), end = m_renderObjectRegionStyle.end(); iter != end; ++iter) {
- RenderObject* object = const_cast<RenderObject*>(iter->key);
</del><ins>+ for (auto& objectPair : m_renderObjectRegionStyle) {
+ RenderObject* object = const_cast<RenderObject*>(objectPair.key);
</ins><span class="cx"> RefPtr<RenderStyle> objectRegionStyle = &object->style();
</span><del>- RefPtr<RenderStyle> objectOriginalStyle = iter->value.style;
</del><ins>+ RefPtr<RenderStyle> objectOriginalStyle = objectPair.value.style;
</ins><span class="cx"> if (object->isRenderElement())
</span><span class="cx"> toRenderElement(object)->setStyleInternal(*objectOriginalStyle);
</span><span class="cx">
</span><del>- bool shouldCacheRegionStyle = iter->value.cached;
</del><ins>+ bool shouldCacheRegionStyle = objectPair.value.cached;
</ins><span class="cx"> if (!shouldCacheRegionStyle) {
</span><span class="cx"> // Check whether we should cache the computed style in region.
</span><span class="cx"> unsigned changedContextSensitiveProperties = ContextSensitivePropertyNone;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -73,9 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderNamedFlowThread::clearContentElements()
</span><span class="cx"> {
</span><del>- for (auto it = m_contentElements.begin(), end = m_contentElements.end(); it != end; ++it) {
- Element* contentElement = *it;
-
</del><ins>+ for (auto& contentElement : m_contentElements) {
</ins><span class="cx"> ASSERT(contentElement);
</span><span class="cx"> ASSERT(contentElement->inNamedFlow());
</span><span class="cx"> ASSERT(&contentElement->document() == &document());
</span><span class="lines">@@ -102,8 +100,8 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* RenderNamedFlowThread::nextRendererForNode(Node* node) const
</span><span class="cx"> {
</span><del>- for (auto it = m_flowThreadChildList->begin(), end = m_flowThreadChildList->end(); it != end; ++it) {
- RenderObject* child = *it;
</del><ins>+ const FlowThreadChildList& childList = *(m_flowThreadChildList.get());
+ for (auto& child : childList) {
</ins><span class="cx"> ASSERT(child->node());
</span><span class="cx"> unsigned short position = node->compareDocumentPosition(child->node());
</span><span class="cx"> if (position & Node::DOCUMENT_POSITION_FOLLOWING)
</span><span class="lines">@@ -165,8 +163,8 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // Recursively traverse the m_layoutBeforeThreadsSet.
</span><del>- for (auto iterator = m_layoutBeforeThreadsSet.begin(), end = m_layoutBeforeThreadsSet.end(); iterator != end; ++iterator) {
- const RenderNamedFlowThread* beforeFlowThread = (*iterator).key;
</del><ins>+ for (const auto& beforeFlowThreadPair : m_layoutBeforeThreadsSet) {
+ const auto& beforeFlowThread = beforeFlowThreadPair.key;
</ins><span class="cx"> if (beforeFlowThread->dependsOn(otherRenderFlowThread))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -326,8 +324,7 @@
</span><span class="cx"> height = isHorizontalWritingMode() ? visualOverflowRect().maxY() : visualOverflowRect().maxX();
</span><span class="cx">
</span><span class="cx"> RenderRegion* lastReg = lastRegion();
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_regionList) {
</ins><span class="cx"> LayoutUnit flowMin = height - (isHorizontalWritingMode() ? region->flowThreadPortionRect().y() : region->flowThreadPortionRect().x());
</span><span class="cx"> LayoutUnit flowMax = height - (isHorizontalWritingMode() ? region->flowThreadPortionRect().maxY() : region->flowThreadPortionRect().maxX());
</span><span class="cx"> RegionOversetState previousState = region->regionOversetState();
</span><span class="lines">@@ -363,8 +360,7 @@
</span><span class="cx"> void RenderNamedFlowThread::checkInvalidRegions()
</span><span class="cx"> {
</span><span class="cx"> Vector<RenderRegion*> newValidRegions;
</span><del>- for (auto iter = m_invalidRegionList.begin(), end = m_invalidRegionList.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : m_invalidRegionList) {
</ins><span class="cx"> // The only reason a region would be invalid is because it has a parent flow thread.
</span><span class="cx"> ASSERT(!region->isValid() && region->parentNamedFlowThread());
</span><span class="cx"> if (region->parentNamedFlowThread()->dependsOn(this))
</span><span class="lines">@@ -373,8 +369,7 @@
</span><span class="cx"> newValidRegions.append(region);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (auto iter = newValidRegions.begin(), end = newValidRegions.end(); iter != end; ++iter) {
- RenderRegion* region = *iter;
</del><ins>+ for (auto& region : newValidRegions) {
</ins><span class="cx"> m_invalidRegionList.remove(region);
</span><span class="cx"> region->parentNamedFlowThread()->m_observerThreadsSet.remove(this);
</span><span class="cx"> addRegionToNamedFlowThread(region);
</span><span class="lines">@@ -392,10 +387,8 @@
</span><span class="cx"> Vector<RenderNamedFlowThread*> observers;
</span><span class="cx"> copyToVector(m_observerThreadsSet, observers);
</span><span class="cx">
</span><del>- for (size_t i = 0; i < observers.size(); ++i) {
- RenderNamedFlowThread* flowThread = observers.at(i);
</del><ins>+ for (auto& flowThread : observers)
</ins><span class="cx"> flowThread->checkInvalidRegions();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderNamedFlowThread::addDependencyOnFlowThread(RenderNamedFlowThread* otherFlowThread)
</span><span class="lines">@@ -418,8 +411,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderNamedFlowThread::pushDependencies(RenderNamedFlowThreadList& list)
</span><span class="cx"> {
</span><del>- for (auto iter = m_layoutBeforeThreadsSet.begin(), end = m_layoutBeforeThreadsSet.end(); iter != end; ++iter) {
- RenderNamedFlowThread* flowThread = (*iter).key;
</del><ins>+ for (auto& flowThreadPair : m_layoutBeforeThreadsSet) {
+ auto& flowThread = flowThreadPair.key;
</ins><span class="cx"> if (list.contains(flowThread))
</span><span class="cx"> continue;
</span><span class="cx"> flowThread->pushDependencies(list);
</span><span class="lines">@@ -439,8 +432,7 @@
</span><span class="cx"> resetMarkForDestruction();
</span><span class="cx">
</span><span class="cx"> // Find the first content node following the new content node.
</span><del>- for (auto it = m_contentElements.begin(), end = m_contentElements.end(); it != end; ++it) {
- Element* element = *it;
</del><ins>+ for (auto& element : m_contentElements) {
</ins><span class="cx"> unsigned short position = contentElement.compareDocumentPosition(element);
</span><span class="cx"> if (position & Node::DOCUMENT_POSITION_FOLLOWING) {
</span><span class="cx"> m_contentElements.insertBefore(element, &contentElement);
</span><span class="lines">@@ -550,8 +542,7 @@
</span><span class="cx">
</span><span class="cx"> static bool isContainedInElements(const Vector<Element*>& others, Element* element)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < others.size(); i++) {
- Element* other = others.at(i);
</del><ins>+ for (auto& other : others) {
</ins><span class="cx"> if (other->contains(element))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -599,14 +590,12 @@
</span><span class="cx">
</span><span class="cx"> Vector<Element*> elements;
</span><span class="cx"> // eliminate the contentElements that are descendants of other contentElements
</span><del>- for (auto it = contentElements().begin(), end = contentElements().end(); it != end; ++it) {
- Element* element = *it;
</del><ins>+ for (auto& element : contentElements()) {
</ins><span class="cx"> if (!isContainedInElements(elements, element))
</span><span class="cx"> elements.append(element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (size_t i = 0; i < elements.size(); i++) {
- Element* contentElement = elements.at(i);
</del><ins>+ for (auto& contentElement : elements) {
</ins><span class="cx"> if (!contentElement->renderer())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -744,9 +733,9 @@
</span><span class="cx"> void RenderNamedFlowThread::checkRegionsWithStyling()
</span><span class="cx"> {
</span><span class="cx"> bool hasRegionsWithStyling = false;
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderNamedFlowFragment* region = toRenderNamedFlowFragment(*iter);
- if (region->hasCustomRegionStyle()) {
</del><ins>+ for (const auto& region : m_regionList) {
+ const RenderNamedFlowFragment* namedFlowFragment = toRenderNamedFlowFragment(region);
+ if (namedFlowFragment->hasCustomRegionStyle()) {
</ins><span class="cx"> hasRegionsWithStyling = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -758,9 +747,9 @@
</span><span class="cx"> {
</span><span class="cx"> // Clear the styles for the object in the regions.
</span><span class="cx"> // FIXME: Region styling is not computed only for the region range of the object so this is why we need to walk the whole chain.
</span><del>- for (auto iter = m_regionList.begin(), end = m_regionList.end(); iter != end; ++iter) {
- RenderNamedFlowFragment* region = toRenderNamedFlowFragment(*iter);
- region->clearObjectStyleInRegion(object);
</del><ins>+ for (auto& region : m_regionList) {
+ RenderNamedFlowFragment* namedFlowFragment = toRenderNamedFlowFragment(region);
+ namedFlowFragment->clearObjectStyleInRegion(object);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (162601 => 162602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2014-01-23 08:36:56 UTC (rev 162601)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2014-01-23 10:02:11 UTC (rev 162602)
</span><span class="lines">@@ -657,9 +657,7 @@
</span><span class="cx">
</span><span class="cx"> static void writeRenderRegionList(const RenderRegionList& flowThreadRegionList, TextStream& ts, int indent)
</span><span class="cx"> {
</span><del>- for (RenderRegionList::const_iterator itRR = flowThreadRegionList.begin(); itRR != flowThreadRegionList.end(); ++itRR) {
- RenderRegion* renderRegion = *itRR;
-
</del><ins>+ for (const auto& renderRegion : flowThreadRegionList) {
</ins><span class="cx"> writeIndent(ts, indent);
</span><span class="cx"> ts << static_cast<const RenderObject*>(renderRegion)->renderName();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>