Title: [152450] trunk/Source/WebCore
- Revision
- 152450
- Author
- [email protected]
- Date
- 2013-07-08 07:12:40 -0700 (Mon, 08 Jul 2013)
Log Message
[Coordinated Graphics] Rename variables in UpdateAtlas
https://bugs.webkit.org/show_bug.cgi?id=118403
Patch by Jae Hyun Park <[email protected]> on 2013-07-08
Reviewed by Noam Rosenthal.
As of r149292, non-composited contents layer was removed from
CoordinatedGraphics. So, the variables should be renamed for
clarification.
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::releaseInactiveAtlasesTimerFired):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152449 => 152450)
--- trunk/Source/WebCore/ChangeLog 2013-07-08 13:22:31 UTC (rev 152449)
+++ trunk/Source/WebCore/ChangeLog 2013-07-08 14:12:40 UTC (rev 152450)
@@ -1,3 +1,17 @@
+2013-07-08 Jae Hyun Park <[email protected]>
+
+ [Coordinated Graphics] Rename variables in UpdateAtlas
+ https://bugs.webkit.org/show_bug.cgi?id=118403
+
+ Reviewed by Noam Rosenthal.
+
+ As of r149292, non-composited contents layer was removed from
+ CoordinatedGraphics. So, the variables should be renamed for
+ clarification.
+
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::releaseInactiveAtlasesTimerFired):
+
2013-07-08 Ádám Kallai <[email protected]>
[Qt] Incremental build fix after r145712.
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (152449 => 152450)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2013-07-08 13:22:31 UTC (rev 152449)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2013-07-08 14:12:40 UTC (rev 152450)
@@ -406,23 +406,23 @@
void CompositingCoordinator::releaseInactiveAtlasesTimerFired(Timer<CompositingCoordinator>*)
{
- // We always want to keep one atlas for non-composited content.
+ // We always want to keep one atlas for root contents layer.
OwnPtr<UpdateAtlas> atlasToKeepAnyway;
- bool foundActiveAtlasForNonCompositedContent = false;
+ bool foundActiveAtlasForRootContentsLayer = false;
for (int i = m_updateAtlases.size() - 1; i >= 0; --i) {
UpdateAtlas* atlas = m_updateAtlases[i].get();
if (!atlas->isInUse())
atlas->addTimeInactive(ReleaseInactiveAtlasesTimerInterval);
- bool usableForNonCompositedContent = !atlas->supportsAlpha();
+ bool usableForRootContentsLayer = !atlas->supportsAlpha();
if (atlas->isInactive()) {
- if (!foundActiveAtlasForNonCompositedContent && !atlasToKeepAnyway && usableForNonCompositedContent)
+ if (!foundActiveAtlasForRootContentsLayer && !atlasToKeepAnyway && usableForRootContentsLayer)
atlasToKeepAnyway = m_updateAtlases[i].release();
m_updateAtlases.remove(i);
- } else if (usableForNonCompositedContent)
- foundActiveAtlasForNonCompositedContent = true;
+ } else if (usableForRootContentsLayer)
+ foundActiveAtlasForRootContentsLayer = true;
}
- if (!foundActiveAtlasForNonCompositedContent && atlasToKeepAnyway)
+ if (!foundActiveAtlasForRootContentsLayer && atlasToKeepAnyway)
m_updateAtlases.append(atlasToKeepAnyway.release());
if (m_updateAtlases.size() <= 1)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
