diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 09:35:07 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 09:35:07 +0000 |
commit | 1b12924c81e7b5e7828742c2d547d851339c35b4 (patch) | |
tree | f1d66ba51046db811923bfdbe444460d26fbd630 /cc/ContentLayerChromium.h | |
parent | c71ff0599605265a53269e386c5b22dc1f802501 (diff) | |
download | chromium_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/ContentLayerChromium.h')
-rw-r--r-- | cc/ContentLayerChromium.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/ContentLayerChromium.h b/cc/ContentLayerChromium.h index b8ac462..1112134 100644 --- a/cc/ContentLayerChromium.h +++ b/cc/ContentLayerChromium.h @@ -38,7 +38,9 @@ private: // A layer that renders its contents into an SkCanvas. class ContentLayerChromium : public TiledLayerChromium { public: - static scoped_refptr<ContentLayerChromium> create(ContentLayerChromiumClient*); + static PassRefPtr<ContentLayerChromium> create(ContentLayerChromiumClient*); + + virtual ~ContentLayerChromium(); void clearClient() { m_client = 0; } @@ -51,7 +53,7 @@ public: protected: explicit ContentLayerChromium(ContentLayerChromiumClient*); - virtual ~ContentLayerChromium(); + private: virtual LayerTextureUpdater* textureUpdater() const OVERRIDE; |