summaryrefslogtreecommitdiffstats
path: root/cc/CCLayerIterator.h
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-08 09:35:07 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-08 09:35:07 +0000
commit1b12924c81e7b5e7828742c2d547d851339c35b4 (patch)
treef1d66ba51046db811923bfdbe444460d26fbd630 /cc/CCLayerIterator.h
parentc71ff0599605265a53269e386c5b22dc1f802501 (diff)
downloadchromium_src-1b12924c81e7b5e7828742c2d547d851339c35b4.zip
chromium_src-1b12924c81e7b5e7828742c2d547d851339c35b4.tar.gz
chromium_src-1b12924c81e7b5e7828742c2d547d851339c35b4.tar.bz2
Revert 160619 - [cc] Remove WTF types from LayerChromium and layer lists
Both layer list types needed to be changed to vector simultaneously because of the amount of templated code that deals with both. BUG=154451 Review URL: https://chromiumcodereview.appspot.com/11047029 TBR=enne@chromium.org Review URL: https://codereview.chromium.org/11070012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCLayerIterator.h')
-rw-r--r--cc/CCLayerIterator.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/CCLayerIterator.h b/cc/CCLayerIterator.h
index 4d36080..7fc3af4 100644
--- a/cc/CCLayerIterator.h
+++ b/cc/CCLayerIterator.h
@@ -7,7 +7,7 @@
#include "CCLayerTreeHostCommon.h"
-#include "base/memory/ref_counted.h"
+#include <wtf/RefPtr.h>
namespace cc {
@@ -15,7 +15,7 @@ namespace cc {
// Example code follows, for a tree of LayerChromium/RenderSurfaceChromium objects. See below for details.
//
-// void doStuffOnLayers(const std::vector<scoped_refptr<LayerChromium> >& renderSurfaceLayerList)
+// void doStuffOnLayers(const Vector<RefPtr<LayerChromium> >& renderSurfaceLayerList)
// {
// typedef CCLayerIterator<LayerChromium, RenderSurfaceChromium, CCLayerIteratorActions::FrontToBack> CCLayerIteratorType;
//
@@ -131,13 +131,13 @@ private:
}
}
- if (start && !renderSurfaceLayerList->empty())
+ if (start && !renderSurfaceLayerList->isEmpty())
m_actions.begin(*this);
else
m_actions.end(*this);
}
- inline static LayerChromium* getRawPtr(const scoped_refptr<LayerChromium>& ptr) { return ptr.get(); }
+ inline static LayerChromium* getRawPtr(const RefPtr<LayerChromium>& ptr) { return ptr.get(); }
inline static CCLayerImpl* getRawPtr(CCLayerImpl* ptr) { return ptr; }
inline LayerType* currentLayer() const { return currentLayerRepresentsTargetRenderSurface() ? targetRenderSurfaceLayer() : getRawPtr(targetRenderSurfaceChildren()[m_currentLayerIndex]); }