From d58499a6e4207df8a2727c62e92411b850c9895e Mon Sep 17 00:00:00 2001
From: "enne@chromium.org"
<enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 9 Oct 2012 22:27:47 +0000
Subject: [cc] Remove WTF types from LayerChromium and layer lists
Relanding https://chromiumcodereview.appspot.com/11047029.
No changes from original patch. This was reverted as an innocent bystander of
r160623's breakage.
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11066083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160953 0039d316-1c4b-4281-b951-d872f2087c98
---
cc/CCDebugRectHistory.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'cc/CCDebugRectHistory.cpp')
diff --git a/cc/CCDebugRectHistory.cpp b/cc/CCDebugRectHistory.cpp
index 1043ced..7f3c2ea 100644
--- a/cc/CCDebugRectHistory.cpp
+++ b/cc/CCDebugRectHistory.cpp
@@ -22,7 +22,7 @@ CCDebugRectHistory::~CCDebugRectHistory()
{
}
-void CCDebugRectHistory::saveDebugRectsForCurrentFrame(CCLayerImpl* rootLayer, const Vector<CCLayerImpl*>& renderSurfaceLayerList, const Vector<IntRect>& occludingScreenSpaceRects, const CCLayerTreeSettings& settings)
+void CCDebugRectHistory::saveDebugRectsForCurrentFrame(CCLayerImpl* rootLayer, const std::vector<CCLayerImpl*>& renderSurfaceLayerList, const Vector<IntRect>& occludingScreenSpaceRects, const CCLayerTreeSettings& settings)
{
// For now, clear all rects from previous frames. In the future we may want to store
// all debug rects for a history of many frames.
@@ -61,14 +61,14 @@ void CCDebugRectHistory::savePaintRects(CCLayerImpl* layer)
savePaintRects(layer->children()[i]);
}
-void CCDebugRectHistory::savePropertyChangedRects(const Vector<CCLayerImpl*>& renderSurfaceLayerList)
+void CCDebugRectHistory::savePropertyChangedRects(const std::vector<CCLayerImpl*>& renderSurfaceLayerList)
{
for (int surfaceIndex = renderSurfaceLayerList.size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {
CCLayerImpl* renderSurfaceLayer = renderSurfaceLayerList[surfaceIndex];
CCRenderSurface* renderSurface = renderSurfaceLayer->renderSurface();
ASSERT(renderSurface);
- const Vector<CCLayerImpl*>& layerList = renderSurface->layerList();
+ const std::vector<CCLayerImpl*>& layerList = renderSurface->layerList();
for (unsigned layerIndex = 0; layerIndex < layerList.size(); ++layerIndex) {
CCLayerImpl* layer = layerList[layerIndex];
@@ -84,7 +84,7 @@ void CCDebugRectHistory::savePropertyChangedRects(const Vector<CCLayerImpl*>& re
}
}
-void CCDebugRectHistory::saveSurfaceDamageRects(const Vector<CCLayerImpl* >& renderSurfaceLayerList)
+void CCDebugRectHistory::saveSurfaceDamageRects(const std::vector<CCLayerImpl* >& renderSurfaceLayerList)
{
for (int surfaceIndex = renderSurfaceLayerList.size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {
CCLayerImpl* renderSurfaceLayer = renderSurfaceLayerList[surfaceIndex];
@@ -95,7 +95,7 @@ void CCDebugRectHistory::saveSurfaceDamageRects(const Vector<CCLayerImpl* >& ren
}
}
-void CCDebugRectHistory::saveScreenSpaceRects(const Vector<CCLayerImpl* >& renderSurfaceLayerList)
+void CCDebugRectHistory::saveScreenSpaceRects(const std::vector<CCLayerImpl* >& renderSurfaceLayerList)
{
for (int surfaceIndex = renderSurfaceLayerList.size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {
CCLayerImpl* renderSurfaceLayer = renderSurfaceLayerList[surfaceIndex];
--
cgit v1.1