<!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>[174168] 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/174168">174168</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-10-01 13:52:59 -0700 (Wed, 01 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] Sprinkle range-based for-loops in GraphicsLayerTextureMapper, TextureMapperLayer
https://bugs.webkit.org/show_bug.cgi?id=137271
Reviewed by Sergio Villar Senin.
Switch to using C++11 range-based for-loops in the
GraphicsLayerTextureMapper and TextureMapperLayer classes.
The for loops that remained unchanged either do further computation
with the loop index or must iterate over the container in reverse.
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::toTextureMapperLayerVector):
(WebCore::GraphicsLayerTextureMapper::flushCompositingState):
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::computeTransformsRecursive):
(WebCore::TextureMapperLayer::paintSelfAndChildren):
(WebCore::TextureMapperLayer::computeOverlapRegions):
(WebCore::TextureMapperLayer::paintUsingOverlapRegions):
(WebCore::TextureMapperLayer::~TextureMapperLayer):
(WebCore::TextureMapperLayer::setChildren):
(WebCore::TextureMapperLayer::descendantsOrSelfHaveRunningAnimations):
(WebCore::TextureMapperLayer::applyAnimationsRecursively):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174167 => 174168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-01 20:47:51 UTC (rev 174167)
+++ trunk/Source/WebCore/ChangeLog 2014-10-01 20:52:59 UTC (rev 174168)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-10-01 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Sprinkle range-based for-loops in GraphicsLayerTextureMapper, TextureMapperLayer
+ https://bugs.webkit.org/show_bug.cgi?id=137271
+
+ Reviewed by Sergio Villar Senin.
+
+ Switch to using C++11 range-based for-loops in the
+ GraphicsLayerTextureMapper and TextureMapperLayer classes.
+
+ The for loops that remained unchanged either do further computation
+ with the loop index or must iterate over the container in reverse.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::toTextureMapperLayerVector):
+ (WebCore::GraphicsLayerTextureMapper::flushCompositingState):
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::computeTransformsRecursive):
+ (WebCore::TextureMapperLayer::paintSelfAndChildren):
+ (WebCore::TextureMapperLayer::computeOverlapRegions):
+ (WebCore::TextureMapperLayer::paintUsingOverlapRegions):
+ (WebCore::TextureMapperLayer::~TextureMapperLayer):
+ (WebCore::TextureMapperLayer::setChildren):
+ (WebCore::TextureMapperLayer::descendantsOrSelfHaveRunningAnimations):
+ (WebCore::TextureMapperLayer::applyAnimationsRecursively):
+
</ins><span class="cx"> 2014-10-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Windows build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (174167 => 174168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-10-01 20:47:51 UTC (rev 174167)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-10-01 20:52:59 UTC (rev 174168)
</span><span class="lines">@@ -477,8 +477,8 @@
</span><span class="cx"> static void toTextureMapperLayerVector(const Vector<GraphicsLayer*>& layers, Vector<TextureMapperLayer*>& texmapLayers)
</span><span class="cx"> {
</span><span class="cx"> texmapLayers.reserveCapacity(layers.size());
</span><del>- for (size_t i = 0; i < layers.size(); ++i)
- texmapLayers.append(toTextureMapperLayer(layers[i]));
</del><ins>+ for (auto* layer : layers)
+ texmapLayers.append(toTextureMapperLayer(layer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerTextureMapper::commitLayerChanges()
</span><span class="lines">@@ -586,8 +586,8 @@
</span><span class="cx"> maskLayer()->flushCompositingState(rect);
</span><span class="cx"> if (replicaLayer())
</span><span class="cx"> replicaLayer()->flushCompositingState(rect);
</span><del>- for (size_t i = 0; i < children().size(); ++i)
- children()[i]->flushCompositingState(rect);
</del><ins>+ for (auto* child : children())
+ child->flushCompositingState(rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerTextureMapper::updateBackingStoreIfNeeded()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (174167 => 174168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2014-10-01 20:47:51 UTC (rev 174167)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2014-10-01 20:52:59 UTC (rev 174168)
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx"> m_state.maskLayer->computeTransformsRecursive();
</span><span class="cx"> if (m_state.replicaLayer)
</span><span class="cx"> m_state.replicaLayer->computeTransformsRecursive();
</span><del>- for (size_t i = 0; i < m_children.size(); ++i) {
- RELEASE_ASSERT(m_children[i]->m_parent == this);
- m_children[i]->computeTransformsRecursive();
</del><ins>+ for (auto* child : m_children) {
+ RELEASE_ASSERT(child->m_parent == this);
+ child->computeTransformsRecursive();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Reorder children if needed on the way back up.
</span><span class="lines">@@ -178,8 +178,8 @@
</span><span class="cx"> options.textureMapper->beginClip(clipTransform, layerRect());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (size_t i = 0; i < m_children.size(); ++i)
- m_children[i]->paintRecursive(options);
</del><ins>+ for (auto* child : m_children)
+ child->paintRecursive(options);
</ins><span class="cx">
</span><span class="cx"> if (shouldClip)
</span><span class="cx"> options.textureMapper->endClip();
</span><span class="lines">@@ -291,10 +291,8 @@
</span><span class="cx"> Region newNonOverlapRegion(enclosingIntRect(boundingRect));
</span><span class="cx">
</span><span class="cx"> if (!m_state.masksToBounds) {
</span><del>- for (size_t i = 0; i < m_children.size(); ++i) {
- TextureMapperLayer* child = m_children[i];
</del><ins>+ for (auto* child : m_children)
</ins><span class="cx"> child->computeOverlapRegions(newOverlapRegion, newNonOverlapRegion, ResolveSelfOverlapIfNeeded);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_state.replicaLayer) {
</span><span class="lines">@@ -332,12 +330,11 @@
</span><span class="cx"> nonOverlapRegion.translate(options.offset);
</span><span class="cx"> Vector<IntRect> rects = nonOverlapRegion.rects();
</span><span class="cx">
</span><del>- for (size_t i = 0; i < rects.size(); ++i) {
- IntRect rect = rects[i];
</del><ins>+ for (auto& rect : rects) {
</ins><span class="cx"> if (!rect.intersects(options.textureMapper->clipBounds()))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- options.textureMapper->beginClip(TransformationMatrix(), rects[i]);
</del><ins>+ options.textureMapper->beginClip(TransformationMatrix(), rect);
</ins><span class="cx"> paintSelfAndChildrenWithReplica(options);
</span><span class="cx"> options.textureMapper->endClip();
</span><span class="cx"> }
</span><span class="lines">@@ -352,8 +349,7 @@
</span><span class="cx"> IntSize maxTextureSize = options.textureMapper->maxTextureSize();
</span><span class="cx"> IntRect adjustedClipBounds(options.textureMapper->clipBounds());
</span><span class="cx"> adjustedClipBounds.move(-options.offset);
</span><del>- for (size_t i = 0; i < rects.size(); ++i) {
- IntRect rect = rects[i];
</del><ins>+ for (auto& rect : rects) {
</ins><span class="cx"> for (int x = rect.x(); x < rect.maxX(); x += maxTextureSize.width()) {
</span><span class="cx"> for (int y = rect.y(); y < rect.maxY(); y += maxTextureSize.height()) {
</span><span class="cx"> IntRect tileRect(IntPoint(x, y), maxTextureSize);
</span><span class="lines">@@ -446,8 +442,8 @@
</span><span class="cx">
</span><span class="cx"> TextureMapperLayer::~TextureMapperLayer()
</span><span class="cx"> {
</span><del>- for (int i = m_children.size() - 1; i >= 0; --i)
- m_children[i]->m_parent = nullptr;
</del><ins>+ for (auto* child : m_children)
+ child->m_parent = nullptr;
</ins><span class="cx">
</span><span class="cx"> removeFromParent();
</span><span class="cx"> }
</span><span class="lines">@@ -455,8 +451,8 @@
</span><span class="cx"> void TextureMapperLayer::setChildren(const Vector<TextureMapperLayer*>& newChildren)
</span><span class="cx"> {
</span><span class="cx"> removeAllChildren();
</span><del>- for (size_t i = 0; i < newChildren.size(); ++i)
- addChild(newChildren[i]);
</del><ins>+ for (auto* child : newChildren)
+ addChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::addChild(TextureMapperLayer* childLayer)
</span><span class="lines">@@ -642,19 +638,17 @@
</span><span class="cx"> if (m_animations.hasRunningAnimations())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- for (size_t i = 0; i < m_children.size(); ++i) {
- if (m_children[i]->descendantsOrSelfHaveRunningAnimations())
- return true;
- }
-
- return false;
</del><ins>+ return std::any_of(m_children.begin(), m_children.end(),
+ [](TextureMapperLayer* child) {
+ return child->descendantsOrSelfHaveRunningAnimations();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::applyAnimationsRecursively()
</span><span class="cx"> {
</span><span class="cx"> syncAnimations();
</span><del>- for (size_t i = 0; i < m_children.size(); ++i)
- m_children[i]->applyAnimationsRecursively();
</del><ins>+ for (auto* child : m_children)
+ child->applyAnimationsRecursively();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::syncAnimations()
</span></span></pre>
</div>
</div>
</body>
</html>