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

Unified Diff: cc/tiled_layer.cc

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/test/tiled_layer_test_common.cc ('k') | cc/tiled_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiled_layer.cc
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 6e2689278faee9cce423fa528e23905109febf8f..03d8a765236719893bea78925515a85d5ac2242d 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -21,9 +21,9 @@ namespace cc {
class UpdatableTile : public CCLayerTilingData::Tile {
public:
- static scoped_ptr<UpdatableTile> create(PassOwnPtr<LayerTextureUpdater::Texture> texture)
+ static scoped_ptr<UpdatableTile> create(scoped_ptr<LayerTextureUpdater::Texture> texture)
{
- return make_scoped_ptr(new UpdatableTile(texture));
+ return make_scoped_ptr(new UpdatableTile(texture.Pass()));
}
LayerTextureUpdater::Texture* texture() { return m_texture.get(); }
@@ -59,17 +59,18 @@ public:
bool validForFrame;
bool occluded;
bool isInUseOnImpl;
+
private:
- explicit UpdatableTile(PassOwnPtr<LayerTextureUpdater::Texture> texture)
+ explicit UpdatableTile(scoped_ptr<LayerTextureUpdater::Texture> texture)
: partialUpdate(false)
, validForFrame(false)
, occluded(false)
, isInUseOnImpl(false)
- , m_texture(texture)
+ , m_texture(texture.Pass())
{
}
- OwnPtr<LayerTextureUpdater::Texture> m_texture;
+ scoped_ptr<LayerTextureUpdater::Texture> m_texture;
DISALLOW_COPY_AND_ASSIGN(UpdatableTile);
};
@@ -458,7 +459,7 @@ void TiledLayerChromium::updateTileTextures(const IntRect& paintRect, int left,
// effect of disabling compositing, which causes our reference to the texture updater to be deleted.
// However, we can't free the memory backing the SkCanvas until the paint finishes,
// so we grab a local reference here to hold the updater alive until the paint completes.
- RefPtr<LayerTextureUpdater> protector(textureUpdater());
+ scoped_refptr<LayerTextureUpdater> protector(textureUpdater());
IntRect paintedOpaqueRect;
textureUpdater()->prepareToUpdate(paintRect, m_tiler->tileSize(), 1 / widthScale, 1 / heightScale, paintedOpaqueRect, stats);
« no previous file with comments | « cc/test/tiled_layer_test_common.cc ('k') | cc/tiled_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698