<!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>[170813] 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/170813">170813</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-04 15:26:09 -0700 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CoordinatedGraphics] Use the C++11 syntax to clean-up for loops
https://bugs.webkit.org/show_bug.cgi?id=134594
Patch by Hunseop Jeong <hs85.jeong@samsung.com> on 2014-07-04
Reviewed by Darin Adler.
Convert a couple of loops to range-based for
No change in functionality, no new tests.
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::updateTileBuffers):
(WebCore::TiledBackingStore::resizeEdgeTiles):
(WebCore::TiledBackingStore::setKeepRect):
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::~CompositingCoordinator):
(WebCore::CompositingCoordinator::flushPendingImageBackingChanges):
(WebCore::CompositingCoordinator::setVisibleContentsRect):
(WebCore::CompositingCoordinator::purgeBackingStores):
* platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:
(WebCore::CoordinatedBackingStore::removeAllTiles):
(WebCore::CoordinatedBackingStore::paintToTextureMapper):
(WebCore::CoordinatedBackingStore::drawBorder):
(WebCore::CoordinatedBackingStore::drawRepaintCounter):
(WebCore::CoordinatedBackingStore::commitTileOperations):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
(WebCore::CoordinatedGraphicsScene::adjustPositionForFixedLayers):
(WebCore::CoordinatedGraphicsScene::commitPendingBackingStoreOperations):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp">trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedBackingStorecpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsScenecpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170812 => 170813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-04 21:54:48 UTC (rev 170812)
+++ trunk/Source/WebCore/ChangeLog 2014-07-04 22:26:09 UTC (rev 170813)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-07-04 Hunseop Jeong <hs85.jeong@samsung.com>
+
+ [CoordinatedGraphics] Use the C++11 syntax to clean-up for loops
+ https://bugs.webkit.org/show_bug.cgi?id=134594
+
+ Reviewed by Darin Adler.
+
+ Convert a couple of loops to range-based for
+
+ No change in functionality, no new tests.
+
+ * platform/graphics/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::updateTileBuffers):
+ (WebCore::TiledBackingStore::resizeEdgeTiles):
+ (WebCore::TiledBackingStore::setKeepRect):
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::~CompositingCoordinator):
+ (WebCore::CompositingCoordinator::flushPendingImageBackingChanges):
+ (WebCore::CompositingCoordinator::setVisibleContentsRect):
+ (WebCore::CompositingCoordinator::purgeBackingStores):
+ * platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp:
+ (WebCore::CoordinatedBackingStore::removeAllTiles):
+ (WebCore::CoordinatedBackingStore::paintToTextureMapper):
+ (WebCore::CoordinatedBackingStore::drawBorder):
+ (WebCore::CoordinatedBackingStore::drawRepaintCounter):
+ (WebCore::CoordinatedBackingStore::commitTileOperations):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
+ (WebCore::CoordinatedGraphicsScene::adjustPositionForFixedLayers):
+ (WebCore::CoordinatedGraphicsScene::commitPendingBackingStoreOperations):
+
</ins><span class="cx"> 2014-07-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CTTE: ScriptElement always has a HTTPScriptElement or SVGScriptElement.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (170812 => 170813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2014-07-04 21:54:48 UTC (rev 170812)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2014-07-04 22:26:09 UTC (rev 170813)
</span><span class="lines">@@ -112,11 +112,10 @@
</span><span class="cx">
</span><span class="cx"> Vector<IntRect> paintedArea;
</span><span class="cx"> Vector<RefPtr<Tile> > dirtyTiles;
</span><del>- TileMap::iterator end = m_tiles.end();
- for (TileMap::iterator it = m_tiles.begin(); it != end; ++it) {
- if (!it->value->isDirty())
</del><ins>+ for (auto& tile : m_tiles.values()) {
+ if (!tile->isDirty())
</ins><span class="cx"> continue;
</span><del>- dirtyTiles.append(it->value);
</del><ins>+ dirtyTiles.append(tile);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dirtyTiles.isEmpty()) {
</span><span class="lines">@@ -441,15 +440,14 @@
</span><span class="cx"> {
</span><span class="cx"> bool wasResized = false;
</span><span class="cx"> Vector<Tile::Coordinate> tilesToRemove;
</span><del>- TileMap::iterator end = m_tiles.end();
- for (TileMap::iterator it = m_tiles.begin(); it != end; ++it) {
- Tile::Coordinate tileCoordinate = it->value->coordinate();
- IntRect tileRect = it->value->rect();
</del><ins>+ for (auto& tile : m_tiles.values()) {
+ Tile::Coordinate tileCoordinate = tile->coordinate();
+ IntRect tileRect = tile->rect();
</ins><span class="cx"> IntRect expectedTileRect = tileRectForCoordinate(tileCoordinate);
</span><span class="cx"> if (expectedTileRect.isEmpty())
</span><span class="cx"> tilesToRemove.append(tileCoordinate);
</span><span class="cx"> else if (expectedTileRect != tileRect) {
</span><del>- it->value->resize(expectedTileRect.size());
</del><ins>+ tile->resize(expectedTileRect.size());
</ins><span class="cx"> wasResized = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -466,10 +464,9 @@
</span><span class="cx"> FloatRect keepRectF = keepRect;
</span><span class="cx">
</span><span class="cx"> Vector<Tile::Coordinate> toRemove;
</span><del>- TileMap::iterator end = m_tiles.end();
- for (TileMap::iterator it = m_tiles.begin(); it != end; ++it) {
- Tile::Coordinate coordinate = it->value->coordinate();
- FloatRect tileRect = it->value->rect();
</del><ins>+ for (auto& tile : m_tiles.values()) {
+ Tile::Coordinate coordinate = tile->coordinate();
+ FloatRect tileRect = tile->rect();
</ins><span class="cx"> if (!tileRect.intersects(keepRectF))
</span><span class="cx"> toRemove.append(coordinate);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (170812 => 170813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2014-07-04 21:54:48 UTC (rev 170812)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2014-07-04 22:26:09 UTC (rev 170813)
</span><span class="lines">@@ -47,9 +47,8 @@
</span><span class="cx"> {
</span><span class="cx"> purgeBackingStores();
</span><span class="cx">
</span><del>- LayerMap::iterator end = m_registeredLayers.end();
- for (LayerMap::iterator it = m_registeredLayers.begin(); it != end; ++it)
- it->value->setCoordinator(0);
</del><ins>+ for (auto& registeredLayer : m_registeredLayers.values())
+ registeredLayer->setCoordinator(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CompositingCoordinator::CompositingCoordinator(Page* page, CompositingCoordinator::Client* client)
</span><span class="lines">@@ -236,9 +235,8 @@
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::flushPendingImageBackingChanges()
</span><span class="cx"> {
</span><del>- ImageBackingMap::iterator end = m_imageBackings.end();
- for (ImageBackingMap::iterator iter = m_imageBackings.begin(); iter != end; ++iter)
- iter->value->update();
</del><ins>+ for (auto& imageBacking : m_imageBackings.values())
+ imageBacking->update();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::notifyAnimationStarted(const GraphicsLayer*, double /* time */)
</span><span class="lines">@@ -313,9 +311,8 @@
</span><span class="cx"> if (contentsRectDidChange) {
</span><span class="cx"> m_visibleContentsRect = rect;
</span><span class="cx">
</span><del>- LayerMap::iterator end = m_registeredLayers.end();
- for (LayerMap::iterator it = m_registeredLayers.begin(); it != end; ++it)
- it->value->setNeedsVisibleRectAdjustment();
</del><ins>+ for (auto& registeredLayer : m_registeredLayers.values())
+ registeredLayer->setNeedsVisibleRectAdjustment();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameView* view = m_page->mainFrame().view();
</span><span class="lines">@@ -367,9 +364,8 @@
</span><span class="cx"> {
</span><span class="cx"> TemporaryChange<bool> purgingToggle(m_isPurging, true);
</span><span class="cx">
</span><del>- LayerMap::iterator end = m_registeredLayers.end();
- for (LayerMap::iterator it = m_registeredLayers.begin(); it != end; ++it)
- it->value->purgeBackingStores();
</del><ins>+ for (auto& registeredLayer : m_registeredLayers.values())
+ registeredLayer->purgeBackingStores();
</ins><span class="cx">
</span><span class="cx"> m_imageBackings.clear();
</span><span class="cx"> m_updateAtlases.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp (170812 => 170813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp 2014-07-04 21:54:48 UTC (rev 170812)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedBackingStore.cpp 2014-07-04 22:26:09 UTC (rev 170813)
</span><span class="lines">@@ -78,9 +78,8 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedBackingStore::removeAllTiles()
</span><span class="cx"> {
</span><del>- CoordinatedBackingStoreTileMap::iterator end = m_tiles.end();
- for (CoordinatedBackingStoreTileMap::iterator it = m_tiles.begin(); it != end; ++it)
- m_tilesToRemove.add(it->key);
</del><ins>+ for (auto& key : m_tiles.keys())
+ m_tilesToRemove.add(key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedBackingStore::updateTile(uint32_t id, const IntRect& sourceRect, const IntRect& tileRect, PassRefPtr<CoordinatedSurface> backBuffer, const IntPoint& offset)
</span><span class="lines">@@ -128,10 +127,8 @@
</span><span class="cx"> Vector<TextureMapperTile*> previousTilesToPaint;
</span><span class="cx">
</span><span class="cx"> // We have to do this every time we paint, in case the opacity has changed.
</span><del>- CoordinatedBackingStoreTileMap::iterator end = m_tiles.end();
</del><span class="cx"> FloatRect coveredRect;
</span><del>- for (CoordinatedBackingStoreTileMap::iterator it = m_tiles.begin(); it != end; ++it) {
- CoordinatedBackingStoreTile& tile = it->value;
</del><ins>+ for (auto& tile : m_tiles.values()) {
</ins><span class="cx"> if (!tile.texture())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -160,17 +157,15 @@
</span><span class="cx"> void CoordinatedBackingStore::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>- CoordinatedBackingStoreTileMap::iterator end = m_tiles.end();
- for (CoordinatedBackingStoreTileMap::iterator it = m_tiles.begin(); it != end; ++it)
- textureMapper->drawBorder(borderColor, borderWidth, it->value.rect(), adjustedTransform);
</del><ins>+ for (auto& tile : m_tiles.values())
+ textureMapper->drawBorder(borderColor, borderWidth, tile.rect(), adjustedTransform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedBackingStore::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>- CoordinatedBackingStoreTileMap::iterator end = m_tiles.end();
- for (CoordinatedBackingStoreTileMap::iterator it = m_tiles.begin(); it != end; ++it)
- textureMapper->drawNumber(repaintCount, borderColor, it->value.rect().location(), adjustedTransform);
</del><ins>+ for (auto& tile : m_tiles.values())
+ textureMapper->drawNumber(repaintCount, borderColor, tile.rect().location(), adjustedTransform);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedBackingStore::commitTileOperations(TextureMapper* textureMapper)
</span><span class="lines">@@ -180,14 +175,12 @@
</span><span class="cx"> m_pendingSize = FloatSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HashSet<uint32_t>::iterator tilesToRemoveEnd = m_tilesToRemove.end();
- for (HashSet<uint32_t>::iterator it = m_tilesToRemove.begin(); it != tilesToRemoveEnd; ++it)
- m_tiles.remove(*it);
</del><ins>+ for (auto& tileToRemove : m_tilesToRemove)
+ m_tiles.remove(tileToRemove);
</ins><span class="cx"> m_tilesToRemove.clear();
</span><span class="cx">
</span><del>- CoordinatedBackingStoreTileMap::iterator tilesEnd = m_tiles.end();
- for (CoordinatedBackingStoreTileMap::iterator it = m_tiles.begin(); it != tilesEnd; ++it)
- it->value.swapBuffers(textureMapper);
</del><ins>+ for (auto& tile : m_tiles.values())
+ tile.swapBuffers(textureMapper);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp (170812 => 170813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2014-07-04 21:54:48 UTC (rev 170812)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2014-07-04 22:26:09 UTC (rev 170813)
</span><span class="lines">@@ -160,9 +160,8 @@
</span><span class="cx"> // them by the delta between the current position and the position of the viewport used for the last layout.
</span><span class="cx"> FloatSize delta = m_scrollPosition - m_renderedContentsScrollPosition;
</span><span class="cx">
</span><del>- LayerRawPtrMap::iterator end = m_fixedLayers.end();
- for (LayerRawPtrMap::iterator it = m_fixedLayers.begin(); it != end; ++it)
- it->value->setScrollPositionDeltaIfNeeded(delta);
</del><ins>+ for (auto& fixedLayer : m_fixedLayers.values())
+ fixedLayer->setScrollPositionDeltaIfNeeded(delta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="lines">@@ -560,9 +559,8 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::commitPendingBackingStoreOperations()
</span><span class="cx"> {
</span><del>- HashSet<RefPtr<CoordinatedBackingStore> >::iterator end = m_backingStoresWithPendingBuffers.end();
- for (HashSet<RefPtr<CoordinatedBackingStore> >::iterator it = m_backingStoresWithPendingBuffers.begin(); it != end; ++it)
- (*it)->commitTileOperations(m_textureMapper.get());
</del><ins>+ for (auto& backingStore : m_backingStoresWithPendingBuffers)
+ backingStore->commitTileOperations(m_textureMapper.get());
</ins><span class="cx">
</span><span class="cx"> m_backingStoresWithPendingBuffers.clear();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>