Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: cc/test/tiled_layer_test_common.h

Issue 11143027: cc: Remove wtf includes from *LayerTextureUpdater headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Out of line CBCLTU dtor Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/skpicture_canvas_layer_texture_updater.h ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/tiled_layer_test_common.h
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 555180167dabae3aaabd2199171f2518e4553aa6..88db7116b20cdc053a3f4e3c2a7bc2c8b9d3b242 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -36,9 +36,8 @@ public:
};
FakeLayerTextureUpdater();
- virtual ~FakeLayerTextureUpdater();
- virtual PassOwnPtr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
+ virtual scoped_ptr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE;
virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE;
@@ -59,6 +58,9 @@ public:
void setOpaquePaintRect(const cc::IntRect& opaquePaintRect) { m_opaquePaintRect = opaquePaintRect; }
+protected:
+ virtual ~FakeLayerTextureUpdater();
+
private:
int m_prepareCount;
int m_updateCount;
@@ -104,7 +106,7 @@ protected:
virtual ~FakeTiledLayerChromium();
private:
- RefPtr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
+ scoped_refptr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
cc::CCPrioritizedTextureManager* m_textureManager;
cc::FloatRect m_lastNeedsDisplayRect;
};
« no previous file with comments | « cc/skpicture_canvas_layer_texture_updater.h ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698