<!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>[174661] 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/174661">174661</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-13 15:35:50 -0700 (Mon, 13 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use modern loops in RenderLayerCompositor
https://bugs.webkit.org/show_bug.cgi?id=137670
Reviewed by Simon Fraser.
Use modern range for-loops in RenderLayerCompositor.
No new tests, no behavior change.
* rendering/RenderLayerCompositor.cpp:
(WebCore::OverlapMapContainer::overlapsLayers):
(WebCore::RenderLayerCompositor::OverlapMap::RectList::intersects):
(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayersAfterFlush):
(WebCore::RenderLayerCompositor::updateCustomLayersAfterFlush):
(WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
(WebCore::RenderLayerCompositor::computeCompositingRequirementsForNamedFlowFixed):
(WebCore::RenderLayerCompositor::computeCompositingRequirements):
(WebCore::RenderLayerCompositor::computeRegionCompositingRequirements):
(WebCore::RenderLayerCompositor::rebuildCompositingLayerTreeForNamedFlowFixed):
(WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
(WebCore::RenderLayerCompositor::rebuildRegionCompositingLayerTree):
(WebCore::RenderLayerCompositor::updateLayerTreeGeometry):
(WebCore::RenderLayerCompositor::updateCompositingDescendantGeometry):
(WebCore::RenderLayerCompositor::recursiveRepaintLayer):
(WebCore::resetTrackedRepaintRectsRecursive):
(WebCore::RenderLayerCompositor::layerHas3DContent):
(WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
(WebCore::RenderLayerCompositor::registerAllScrollingLayers):
(WebCore::RenderLayerCompositor::unregisterAllScrollingLayers):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174660 => 174661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-13 22:30:20 UTC (rev 174660)
+++ trunk/Source/WebCore/ChangeLog 2014-10-13 22:35:50 UTC (rev 174661)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-10-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use modern loops in RenderLayerCompositor
+ https://bugs.webkit.org/show_bug.cgi?id=137670
+
+ Reviewed by Simon Fraser.
+
+ Use modern range for-loops in RenderLayerCompositor.
+
+ No new tests, no behavior change.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::OverlapMapContainer::overlapsLayers):
+ (WebCore::RenderLayerCompositor::OverlapMap::RectList::intersects):
+ (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayersAfterFlush):
+ (WebCore::RenderLayerCompositor::updateCustomLayersAfterFlush):
+ (WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
+ (WebCore::RenderLayerCompositor::computeCompositingRequirementsForNamedFlowFixed):
+ (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+ (WebCore::RenderLayerCompositor::computeRegionCompositingRequirements):
+ (WebCore::RenderLayerCompositor::rebuildCompositingLayerTreeForNamedFlowFixed):
+ (WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
+ (WebCore::RenderLayerCompositor::rebuildRegionCompositingLayerTree):
+ (WebCore::RenderLayerCompositor::updateLayerTreeGeometry):
+ (WebCore::RenderLayerCompositor::updateCompositingDescendantGeometry):
+ (WebCore::RenderLayerCompositor::recursiveRepaintLayer):
+ (WebCore::resetTrackedRepaintRectsRecursive):
+ (WebCore::RenderLayerCompositor::layerHas3DContent):
+ (WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
+ (WebCore::RenderLayerCompositor::registerAllScrollingLayers):
+ (WebCore::RenderLayerCompositor::unregisterAllScrollingLayers):
+
+2014-10-13 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Drop unnecessary overlapMap null checks in computeCompositingRequirements()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137668
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (174660 => 174661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-13 22:30:20 UTC (rev 174660)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-10-13 22:35:50 UTC (rev 174661)
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> // never overlap with each other.
</span><span class="cx"> if (!bounds.intersects(m_boundingBox))
</span><span class="cx"> return false;
</span><del>- for (unsigned i = 0; i < m_layerRects.size(); i++) {
- if (m_layerRects[i].intersects(bounds))
</del><ins>+ for (const auto& layerRect : m_layerRects) {
+ if (layerRect.intersects(bounds))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> if (!rects.size() || !boundingRect.intersects(rect))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- for (unsigned i = 0; i < rects.size(); i++) {
- if (rects[i].intersects(rect))
</del><ins>+ for (const auto& currentRect : rects) {
+ if (currentRect.intersects(rect))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -502,8 +502,8 @@
</span><span class="cx"> updateCustomLayersAfterFlush();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- for (auto it = m_scrollCoordinatedLayersNeedingUpdate.begin(), end = m_scrollCoordinatedLayersNeedingUpdate.end(); it != end; ++it)
- updateScrollCoordinatedStatus(**it);
</del><ins>+ for (auto* layer : m_scrollCoordinatedLayersNeedingUpdate)
+ updateScrollCoordinatedStatus(*layer);
</ins><span class="cx">
</span><span class="cx"> m_scrollCoordinatedLayersNeedingUpdate.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -540,8 +540,8 @@
</span><span class="cx"> if (!m_scrollingLayersNeedingUpdate.isEmpty()) {
</span><span class="cx"> ChromeClient* chromeClient = this->chromeClient();
</span><span class="cx">
</span><del>- for (auto it = m_scrollingLayersNeedingUpdate.begin(), end = m_scrollingLayersNeedingUpdate.end(); it != end; ++it)
- updateScrollingLayerWithClient(**it, chromeClient);
</del><ins>+ for (auto* layer : m_scrollingLayersNeedingUpdate)
+ updateScrollingLayerWithClient(*layer, chromeClient);
</ins><span class="cx"> m_scrollingLayersNeedingUpdate.clear();
</span><span class="cx"> }
</span><span class="cx"> m_scrollingLayersNeedingUpdate.clear();
</span><span class="lines">@@ -1124,20 +1124,20 @@
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i)
- addToOverlapMapRecursive(overlapMap, *negZOrderList->at(i), &layer);
</del><ins>+ for (auto* renderLayer : *negZOrderList)
+ addToOverlapMapRecursive(overlapMap, *renderLayer, &layer);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- for (size_t i = 0, size = normalFlowList->size(); i < size; ++i)
- addToOverlapMapRecursive(overlapMap, *normalFlowList->at(i), &layer);
</del><ins>+ for (auto* renderLayer : *normalFlowList)
+ addToOverlapMapRecursive(overlapMap, *renderLayer, &layer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i)
- addToOverlapMapRecursive(overlapMap, *posZOrderList->at(i), &layer);
</del><ins>+ for (auto* renderLayer : *posZOrderList)
+ addToOverlapMapRecursive(overlapMap, *renderLayer, &layer);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1156,10 +1156,8 @@
</span><span class="cx"> Vector<RenderLayer*> fixedLayers;
</span><span class="cx"> layer.renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
</span><span class="cx">
</span><del>- for (size_t i = 0; i < fixedLayers.size(); ++i) {
- RenderLayer* fixedLayer = fixedLayers.at(i);
</del><ins>+ for (auto* fixedLayer : fixedLayers)
</ins><span class="cx"> computeCompositingRequirements(&layer, *fixedLayer, overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Recurse through the layers in z-index and overflow order (which is equivalent to painting order)
</span><span class="lines">@@ -1260,8 +1258,8 @@
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i) {
- computeCompositingRequirements(&layer, *negZOrderList->at(i), overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</del><ins>+ for (auto* renderLayer : *negZOrderList) {
+ computeCompositingRequirements(&layer, *renderLayer, overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</ins><span class="cx">
</span><span class="cx"> // If we have to make a layer for this child, make one now so we can have a contents layer
</span><span class="cx"> // (since we need to ensure that the -ve z-order child renders underneath our contents).
</span><span class="lines">@@ -1289,14 +1287,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- for (size_t i = 0, size = normalFlowList->size(); i < size; ++i)
- computeCompositingRequirements(&layer, *normalFlowList->at(i), overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</del><ins>+ for (auto* renderLayer : *normalFlowList)
+ computeCompositingRequirements(&layer, *renderLayer, overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i)
- computeCompositingRequirements(&layer, *posZOrderList->at(i), overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</del><ins>+ for (auto* renderLayer : *posZOrderList)
+ computeCompositingRequirements(&layer, *renderLayer, overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1411,10 +1409,9 @@
</span><span class="cx"> overlapMap.geometryMap().pushRenderFlowThread(flowThread);
</span><span class="cx">
</span><span class="cx"> if (const RenderLayerList* layerList = flowThread->getLayerListForRegion(region)) {
</span><del>- for (size_t i = 0, listSize = layerList->size(); i < listSize; ++i) {
- RenderLayer& curLayer = *layerList->at(i);
- ASSERT(flowThread->regionForCompositedLayer(curLayer) == region);
- computeCompositingRequirements(flowThread->layer(), curLayer, overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</del><ins>+ for (auto* renderLayer : *layerList) {
+ ASSERT(flowThread->regionForCompositedLayer(*renderLayer) == region);
+ computeCompositingRequirements(flowThread->layer(), *renderLayer, overlapMap, childState, layersChanged, anyDescendantHas3DTransform);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1469,10 +1466,8 @@
</span><span class="cx"> Vector<RenderLayer*> fixedLayers;
</span><span class="cx"> layer.renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
</span><span class="cx">
</span><del>- for (size_t i = 0; i < fixedLayers.size(); ++i) {
- RenderLayer* fixedLayer = fixedLayers.at(i);
</del><ins>+ for (auto* fixedLayer : fixedLayers)
</ins><span class="cx"> rebuildCompositingLayerTree(*fixedLayer, childGraphicsLayersOfEnclosingLayer, depth);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::rebuildCompositingLayerTree(RenderLayer& layer, Vector<GraphicsLayer*>& childLayersOfEnclosingLayer, int depth)
</span><span class="lines">@@ -1524,8 +1519,8 @@
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i)
- rebuildCompositingLayerTree(*negZOrderList->at(i), childList, depth + 1);
</del><ins>+ for (auto* renderLayer : *negZOrderList)
+ rebuildCompositingLayerTree(*renderLayer, childList, depth + 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If a negative z-order child is compositing, we get a foreground layer which needs to get parented.
</span><span class="lines">@@ -1537,14 +1532,14 @@
</span><span class="cx"> rebuildRegionCompositingLayerTree(downcast<RenderBlockFlow>(layer.renderer()).renderNamedFlowFragment(), layerChildren, depth + 1);
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- for (size_t i = 0, size = normalFlowList->size(); i < size; ++i)
- rebuildCompositingLayerTree(*normalFlowList->at(i), childList, depth + 1);
</del><ins>+ for (auto* renderLayer : *normalFlowList)
+ rebuildCompositingLayerTree(*renderLayer, childList, depth + 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i)
- rebuildCompositingLayerTree(*posZOrderList->at(i), childList, depth + 1);
</del><ins>+ for (auto* renderLayer : *posZOrderList)
+ rebuildCompositingLayerTree(*renderLayer, childList, depth + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1593,10 +1588,9 @@
</span><span class="cx"> RenderFlowThread* flowThread = region->flowThread();
</span><span class="cx"> ASSERT(flowThread->collectsGraphicsLayersUnderRegions());
</span><span class="cx"> if (const RenderLayerList* layerList = flowThread->getLayerListForRegion(region)) {
</span><del>- for (size_t i = 0, listSize = layerList->size(); i < listSize; ++i) {
- RenderLayer& curLayer = *layerList->at(i);
- ASSERT(flowThread->regionForCompositedLayer(curLayer) == region);
- rebuildCompositingLayerTree(curLayer, childList, depth + 1);
</del><ins>+ for (auto* renderLayer : *layerList) {
+ ASSERT(flowThread->regionForCompositedLayer(*renderLayer) == region);
+ rebuildCompositingLayerTree(*renderLayer, childList, depth + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1801,20 +1795,20 @@
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i)
- updateLayerTreeGeometry(*negZOrderList->at(i), depth + 1);
</del><ins>+ for (auto* renderLayer : *negZOrderList)
+ updateLayerTreeGeometry(*renderLayer, depth + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- for (size_t i = 0, size = normalFlowList->size(); i < size; ++i)
- updateLayerTreeGeometry(*normalFlowList->at(i), depth + 1);
</del><ins>+ for (auto* renderLayer : *normalFlowList)
+ updateLayerTreeGeometry(*renderLayer, depth + 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i)
- updateLayerTreeGeometry(*posZOrderList->at(i), depth + 1);
</del><ins>+ for (auto* renderLayer : *posZOrderList)
+ updateLayerTreeGeometry(*renderLayer, depth + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1854,23 +1848,20 @@
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- size_t listSize = negZOrderList->size();
- for (size_t i = 0; i < listSize; ++i)
- updateCompositingDescendantGeometry(compositingAncestor, *negZOrderList->at(i), compositedChildrenOnly);
</del><ins>+ for (auto* renderLayer : *negZOrderList)
+ updateCompositingDescendantGeometry(compositingAncestor, *renderLayer, compositedChildrenOnly);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- size_t listSize = normalFlowList->size();
- for (size_t i = 0; i < listSize; ++i)
- updateCompositingDescendantGeometry(compositingAncestor, *normalFlowList->at(i), compositedChildrenOnly);
</del><ins>+ for (auto* renderLayer : *normalFlowList)
+ updateCompositingDescendantGeometry(compositingAncestor, *renderLayer, compositedChildrenOnly);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- size_t listSize = posZOrderList->size();
- for (size_t i = 0; i < listSize; ++i)
- updateCompositingDescendantGeometry(compositingAncestor, *posZOrderList->at(i), compositedChildrenOnly);
</del><ins>+ for (auto* renderLayer : *posZOrderList)
+ updateCompositingDescendantGeometry(compositingAncestor, *renderLayer, compositedChildrenOnly);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1897,18 +1888,18 @@
</span><span class="cx">
</span><span class="cx"> if (layer.hasCompositingDescendant()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i)
- recursiveRepaintLayer(*negZOrderList->at(i));
</del><ins>+ for (auto* renderLayer : *negZOrderList)
+ recursiveRepaintLayer(*renderLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i)
- recursiveRepaintLayer(*posZOrderList->at(i));
</del><ins>+ for (auto* renderLayer : *posZOrderList)
+ recursiveRepaintLayer(*renderLayer);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- for (size_t i = 0, size = normalFlowList->size(); i < size; ++i)
- recursiveRepaintLayer(*normalFlowList->at(i));
</del><ins>+ for (auto* renderLayer : *normalFlowList)
+ recursiveRepaintLayer(*renderLayer);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2826,8 +2817,8 @@
</span><span class="cx"> {
</span><span class="cx"> graphicsLayer.resetTrackedRepaints();
</span><span class="cx">
</span><del>- for (size_t i = 0, size = graphicsLayer.children().size(); i < size; ++i)
- resetTrackedRepaintRectsRecursive(*graphicsLayer.children()[i]);
</del><ins>+ for (auto* childLayer : graphicsLayer.children())
+ resetTrackedRepaintRectsRecursive(*childLayer);
</ins><span class="cx">
</span><span class="cx"> if (GraphicsLayer* replicaLayer = graphicsLayer.replicaLayer())
</span><span class="cx"> resetTrackedRepaintRectsRecursive(*replicaLayer);
</span><span class="lines">@@ -3534,23 +3525,23 @@
</span><span class="cx">
</span><span class="cx"> if (layer.isStackingContainer()) {
</span><span class="cx"> if (Vector<RenderLayer*>* negZOrderList = layer.negZOrderList()) {
</span><del>- for (size_t i = 0, size = negZOrderList->size(); i < size; ++i) {
- if (layerHas3DContent(*negZOrderList->at(i)))
</del><ins>+ for (auto* renderLayer : *negZOrderList) {
+ if (layerHas3DContent(*renderLayer))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* posZOrderList = layer.posZOrderList()) {
</span><del>- for (size_t i = 0, size = posZOrderList->size(); i < size; ++i) {
- if (layerHas3DContent(*posZOrderList->at(i)))
</del><ins>+ for (auto* renderLayer : *posZOrderList) {
+ if (layerHas3DContent(*renderLayer))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Vector<RenderLayer*>* normalFlowList = layer.normalFlowList()) {
</span><del>- for (size_t i = 0, size = normalFlowList->size(); i < size; ++i) {
- if (layerHas3DContent(*normalFlowList->at(i)))
</del><ins>+ for (auto* renderLayer : *normalFlowList) {
+ if (layerHas3DContent(*renderLayer))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3872,24 +3863,23 @@
</span><span class="cx"> LayerMap layerMap;
</span><span class="cx"> StickyContainerMap stickyContainerMap;
</span><span class="cx">
</span><del>- for (auto it = m_scrollCoordinatedLayers.begin(), end = m_scrollCoordinatedLayers.end(); it != end; ++it) {
- RenderLayer& layer = **it;
- ASSERT(layer.isComposited());
</del><ins>+ for (auto* layer : m_scrollCoordinatedLayers) {
+ ASSERT(layer->isComposited());
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<ViewportConstraints> constraints;
</span><del>- if (layer.renderer().isStickyPositioned()) {
- constraints = std::make_unique<StickyPositionViewportConstraints>(computeStickyViewportConstraints(layer));
</del><ins>+ if (layer->renderer().isStickyPositioned()) {
+ constraints = std::make_unique<StickyPositionViewportConstraints>(computeStickyViewportConstraints(*layer));
</ins><span class="cx"> const RenderLayer* enclosingTouchScrollableLayer = nullptr;
</span><del>- if (isAsyncScrollableStickyLayer(layer, &enclosingTouchScrollableLayer) && enclosingTouchScrollableLayer) {
</del><ins>+ if (isAsyncScrollableStickyLayer(*layer, &enclosingTouchScrollableLayer) && enclosingTouchScrollableLayer) {
</ins><span class="cx"> ASSERT(enclosingTouchScrollableLayer->isComposited());
</span><del>- stickyContainerMap.add(layer.backing()->graphicsLayer()->platformLayer(), enclosingTouchScrollableLayer->backing()->scrollingLayer()->platformLayer());
</del><ins>+ stickyContainerMap.add(layer->backing()->graphicsLayer()->platformLayer(), enclosingTouchScrollableLayer->backing()->scrollingLayer()->platformLayer());
</ins><span class="cx"> }
</span><del>- } else if (layer.renderer().style().position() == FixedPosition)
- constraints = std::make_unique<FixedPositionViewportConstraints>(computeFixedViewportConstraints(layer));
</del><ins>+ } else if (layer->renderer().style().position() == FixedPosition)
+ constraints = std::make_unique<FixedPositionViewportConstraints>(computeFixedViewportConstraints(*layer));
</ins><span class="cx"> else
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- layerMap.add(layer.backing()->graphicsLayer()->platformLayer(), WTF::move(constraints));
</del><ins>+ layerMap.add(layer->backing()->graphicsLayer()->platformLayer(), WTF::move(constraints));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ChromeClient* client = this->chromeClient())
</span><span class="lines">@@ -3918,8 +3908,8 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto it = m_scrollingLayers.begin(), end = m_scrollingLayers.end(); it != end; ++it)
- updateScrollingLayerWithClient(**it, client);
</del><ins>+ for (auto* layer : m_scrollingLayers)
+ updateScrollingLayerWithClient(*layer, client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::unregisterAllScrollingLayers()
</span><span class="lines">@@ -3928,11 +3918,10 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto it = m_scrollingLayers.begin(), end = m_scrollingLayers.end(); it != end; ++it) {
- RenderLayer& layer = **it;
- RenderLayerBacking* backing = layer.backing();
</del><ins>+ for (auto* layer : m_scrollingLayers) {
+ RenderLayerBacking* backing = layer->backing();
</ins><span class="cx"> ASSERT(backing);
</span><del>- client->removeScrollingLayer(layer.renderer().element(), backing->scrollingLayer()->platformLayer(), backing->scrollingContentsLayer()->platformLayer());
</del><ins>+ client->removeScrollingLayer(layer->renderer().element(), backing->scrollingLayer()->platformLayer(), backing->scrollingContentsLayer()->platformLayer());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>