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

Unified Diff: cc/resources/picture_layer_tiling.cc

Issue 18346006: Update OS X to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | « no previous file | chrome/app/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/picture_layer_tiling.cc
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index 29d78187dced0a9ecb8da9c74637dd332d80544a..ef4768fad0d277620784b0f1e139af7f303ac239 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -50,7 +50,7 @@ PictureLayerTiling::PictureLayerTiling(float contents_scale,
PictureLayerTiling::~PictureLayerTiling() {
for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
- client_->DestroyTile(it->second);
+ client_->DestroyTile(it->second.get());
}
void PictureLayerTiling::SetClient(PictureLayerTilingClient* client) {
@@ -338,7 +338,7 @@ gfx::Size PictureLayerTiling::CoverageIterator::texture_size() const {
void PictureLayerTiling::Reset() {
live_tiles_rect_ = gfx::Rect();
for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
- client_->DestroyTile(it->second);
+ client_->DestroyTile(it->second.get());
tiles_.clear();
}
@@ -510,7 +510,7 @@ void PictureLayerTiling::SetLiveTilesRect(
// though it was in the live rect.
if (found == tiles_.end())
continue;
- client_->DestroyTile(found->second);
+ client_->DestroyTile(found->second.get());
tiles_.erase(found);
}
« no previous file with comments | « no previous file | chrome/app/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698