<!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>[177442] 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/177442">177442</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-12-17 03:44:49 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] Sprinkle range-based for-loops where still possible
https://bugs.webkit.org/show_bug.cgi?id=138752
Reviewed by Chris Dumez.
Apply range-based for-loops where possible in the TextureMapper,
TextureMapperGL and TextureMapperTiledBackingStore classes.
Also prettify the loop in SharedGLData destructor and return
nullptr instead of explicitly constructing the empty PassRefPtr
object in TextureMapperTiledBackingStore::texture().
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::BitmapTexturePool::acquireTexture):
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
(WebCore::TextureMapperGLData::~TextureMapperGLData):
* platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
(WebCore::TextureMapperTiledBackingStore::paintToTextureMapper):
(WebCore::TextureMapperTiledBackingStore::drawBorder):
(WebCore::TextureMapperTiledBackingStore::drawRepaintCounter):
(WebCore::TextureMapperTiledBackingStore::createOrDestroyTilesIfNeeded):
(WebCore::TextureMapperTiledBackingStore::updateContents):
(WebCore::TextureMapperTiledBackingStore::texture):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperTiledBackingStorecpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177441 => 177442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-17 10:14:32 UTC (rev 177441)
+++ trunk/Source/WebCore/ChangeLog 2014-12-17 11:44:49 UTC (rev 177442)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-12-17 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Sprinkle range-based for-loops where still possible
+ https://bugs.webkit.org/show_bug.cgi?id=138752
+
+ Reviewed by Chris Dumez.
+
+ Apply range-based for-loops where possible in the TextureMapper,
+ TextureMapperGL and TextureMapperTiledBackingStore classes.
+
+ Also prettify the loop in SharedGLData destructor and return
+ nullptr instead of explicitly constructing the empty PassRefPtr
+ object in TextureMapperTiledBackingStore::texture().
+
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::BitmapTexturePool::acquireTexture):
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
+ (WebCore::TextureMapperGLData::~TextureMapperGLData):
+ * platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
+ (WebCore::TextureMapperTiledBackingStore::paintToTextureMapper):
+ (WebCore::TextureMapperTiledBackingStore::drawBorder):
+ (WebCore::TextureMapperTiledBackingStore::drawRepaintCounter):
+ (WebCore::TextureMapperTiledBackingStore::createOrDestroyTilesIfNeeded):
+ (WebCore::TextureMapperTiledBackingStore::updateContents):
+ (WebCore::TextureMapperTiledBackingStore::texture):
+
</ins><span class="cx"> 2014-12-17 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> The SVGDocument of an SVGImage should not perform any additional actions when the SVGImage is being destroyed
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (177441 => 177442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2014-12-17 10:14:32 UTC (rev 177441)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2014-12-17 11:44:49 UTC (rev 177442)
</span><span class="lines">@@ -98,15 +98,13 @@
</span><span class="cx"> PassRefPtr<BitmapTexture> BitmapTexturePool::acquireTexture(const IntSize& size, TextureMapper* textureMapper)
</span><span class="cx"> {
</span><span class="cx"> BitmapTexturePoolEntry* selectedEntry = 0;
</span><del>- for (size_t i = 0; i < m_textures.size(); ++i) {
- BitmapTexturePoolEntry* entry = &m_textures[i];
-
</del><ins>+ for (auto& entry : m_textures) {
</ins><span class="cx"> // If the surface has only one reference (the one in m_textures), we can safely reuse it.
</span><del>- if (entry->m_texture->refCount() > 1)
</del><ins>+ if (entry.m_texture->refCount() > 1)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (entry->m_texture->canReuseWith(size)) {
- selectedEntry = entry;
</del><ins>+ if (entry.m_texture->canReuseWith(size)) {
+ selectedEntry = &entry;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (177441 => 177442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2014-12-17 10:14:32 UTC (rev 177441)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2014-12-17 11:44:49 UTC (rev 177442)
</span><span class="lines">@@ -94,15 +94,14 @@
</span><span class="cx">
</span><span class="cx"> ~SharedGLData()
</span><span class="cx"> {
</span><del>- GLContextDataMap::const_iterator end = glContextDataMap().end();
- GLContextDataMap::iterator it;
- for (it = glContextDataMap().begin(); it != end; ++it) {
- if (it->value == this)
- break;
</del><ins>+ for (auto it = glContextDataMap().begin(), end = glContextDataMap().end(); it != end; ++it) {
+ if (it->value == this) {
+ glContextDataMap().remove(it);
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(it != end);
- glContextDataMap().remove(it);
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -159,9 +158,8 @@
</span><span class="cx">
</span><span class="cx"> TextureMapperGLData::~TextureMapperGLData()
</span><span class="cx"> {
</span><del>- HashMap<const void*, Platform3DObject>::iterator end = vbos.end();
- for (HashMap<const void*, Platform3DObject>::iterator it = vbos.begin(); it != end; ++it)
- context->deleteBuffer(it->value);
</del><ins>+ for (auto& entry : vbos)
+ context->deleteBuffer(entry.value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperGL::ClipStack::reset(const IntRect& rect, TextureMapperGL::ClipStack::YAxisMode mode)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp (177441 => 177442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp 2014-12-17 10:14:32 UTC (rev 177441)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp 2014-12-17 11:44:49 UTC (rev 177442)
</span><span class="lines">@@ -51,22 +51,22 @@
</span><span class="cx"> {
</span><span class="cx"> updateContentsFromImageIfNeeded(textureMapper);
</span><span class="cx"> TransformationMatrix adjustedTransform = transform * adjustedTransformForRect(targetRect);
</span><del>- for (size_t i = 0; i < m_tiles.size(); ++i)
- m_tiles[i].paint(textureMapper, adjustedTransform, opacity, calculateExposedTileEdges(rect(), m_tiles[i].rect()));
</del><ins>+ for (auto& tile : m_tiles)
+ tile.paint(textureMapper, adjustedTransform, opacity, calculateExposedTileEdges(rect(), tile.rect()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperTiledBackingStore::drawBorder(TextureMapper* textureMapper, const Color& borderColor, float borderWidth, const FloatRect& targetRect, const TransformationMatrix& transform)
</span><span class="cx"> {
</span><span class="cx"> TransformationMatrix adjustedTransform = transform * adjustedTransformForRect(targetRect);
</span><del>- for (size_t i = 0; i < m_tiles.size(); ++i)
- textureMapper->drawBorder(borderColor, borderWidth, m_tiles[i].rect(), adjustedTransform);
</del><ins>+ for (auto& tile : m_tiles)
+ textureMapper->drawBorder(borderColor, borderWidth, tile.rect(), adjustedTransform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperTiledBackingStore::drawRepaintCounter(TextureMapper* textureMapper, int repaintCount, const Color& borderColor, const FloatRect& targetRect, const TransformationMatrix& transform)
</span><span class="cx"> {
</span><span class="cx"> TransformationMatrix adjustedTransform = transform * adjustedTransformForRect(targetRect);
</span><del>- for (size_t i = 0; i < m_tiles.size(); ++i)
- textureMapper->drawNumber(repaintCount, borderColor, m_tiles[i].rect().location(), adjustedTransform);
</del><ins>+ for (auto& tile : m_tiles)
+ textureMapper->drawNumber(repaintCount, borderColor, tile.rect().location(), adjustedTransform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperTiledBackingStore::createOrDestroyTilesIfNeeded(const FloatSize& size, const IntSize& tileSize, bool hasAlpha)
</span><span class="lines">@@ -112,50 +112,52 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Recycle removable tiles to be used for newly requested tiles.
</span><del>- for (size_t i = 0; i < tileRectsToAdd.size(); ++i) {
</del><ins>+ for (auto& rect : tileRectsToAdd) {
</ins><span class="cx"> if (!tileIndicesToRemove.isEmpty()) {
</span><span class="cx"> // We recycle an existing tile for usage with a new tile rect.
</span><span class="cx"> TextureMapperTile& tile = m_tiles[tileIndicesToRemove.last()];
</span><span class="cx"> tileIndicesToRemove.removeLast();
</span><del>- tile.setRect(tileRectsToAdd[i]);
</del><ins>+ tile.setRect(rect);
</ins><span class="cx">
</span><span class="cx"> if (tile.texture())
</span><span class="cx"> tile.texture()->reset(enclosingIntRect(tile.rect()).size(), hasAlpha ? BitmapTexture::SupportsAlpha : 0);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_tiles.append(TextureMapperTile(tileRectsToAdd[i]));
</del><ins>+ m_tiles.append(TextureMapperTile(rect));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Remove unnecessary tiles, if they weren't recycled.
</span><span class="cx"> // We use a threshold to make sure we don't create/destroy tiles too eagerly.
</span><del>- for (size_t i = 0; i < tileIndicesToRemove.size() && m_tiles.size() > TileEraseThreshold; ++i)
- m_tiles.remove(tileIndicesToRemove[i]);
</del><ins>+ for (auto& index : tileIndicesToRemove) {
+ if (m_tiles.size() <= TileEraseThreshold)
+ break;
+ m_tiles.remove(index);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperTiledBackingStore::updateContents(TextureMapper* textureMapper, Image* image, const FloatSize& totalSize, const IntRect& dirtyRect, BitmapTexture::UpdateContentsFlag updateContentsFlag)
</span><span class="cx"> {
</span><span class="cx"> createOrDestroyTilesIfNeeded(totalSize, textureMapper->maxTextureSize(), !image->currentFrameKnownToBeOpaque());
</span><del>- for (size_t i = 0; i < m_tiles.size(); ++i)
- m_tiles[i].updateContents(textureMapper, image, dirtyRect, updateContentsFlag);
</del><ins>+ for (auto& tile : m_tiles)
+ tile.updateContents(textureMapper, image, dirtyRect, updateContentsFlag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperTiledBackingStore::updateContents(TextureMapper* textureMapper, GraphicsLayer* sourceLayer, const FloatSize& totalSize, const IntRect& dirtyRect, BitmapTexture::UpdateContentsFlag updateContentsFlag)
</span><span class="cx"> {
</span><span class="cx"> createOrDestroyTilesIfNeeded(totalSize, textureMapper->maxTextureSize(), true);
</span><del>- for (size_t i = 0; i < m_tiles.size(); ++i)
- m_tiles[i].updateContents(textureMapper, sourceLayer, dirtyRect, updateContentsFlag);
</del><ins>+ for (auto& tile : m_tiles)
+ tile.updateContents(textureMapper, sourceLayer, dirtyRect, updateContentsFlag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<BitmapTexture> TextureMapperTiledBackingStore::texture() const
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < m_tiles.size(); ++i) {
- RefPtr<BitmapTexture> texture = m_tiles[i].texture();
- if (texture)
</del><ins>+ for (const auto& tile : m_tiles) {
+ if (auto texture = tile.texture())
</ins><span class="cx"> return texture;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return PassRefPtr<BitmapTexture>();
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>