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

Unified Diff: webkit/appcache/appcache_host.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « webkit/appcache/appcache_group_unittest.cc ('k') | webkit/appcache/appcache_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/appcache_host.cc
diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc
index c88b1d2ec6d79071f5f207a1541f76a0ae793148..d04fd237da3652b545e6b47074484df3d2f448b4 100644
--- a/webkit/appcache/appcache_host.cc
+++ b/webkit/appcache/appcache_host.cc
@@ -58,9 +58,9 @@ AppCacheHost::AppCacheHost(int host_id, AppCacheFrontend* frontend,
AppCacheHost::~AppCacheHost() {
FOR_EACH_OBSERVER(Observer, observers_, OnDestructionImminent(this));
- if (associated_cache_)
+ if (associated_cache_.get())
associated_cache_->UnassociateHost(this);
- if (group_being_updated_)
+ if (group_being_updated_.get())
group_being_updated_->RemoveUpdateObserver(this);
service_->storage()->CancelDelegateCallbacks(this);
if (service()->quota_manager_proxy() && !origin_in_use_.is_empty())
@@ -208,7 +208,7 @@ void AppCacheHost::DoPendingStartUpdate() {
// 6.9.8 Application cache API
bool success = false;
- if (associated_cache_ && associated_cache_->owning_group()) {
+ if (associated_cache_.get() && associated_cache_->owning_group()) {
AppCacheGroup* group = associated_cache_->owning_group();
if (!group->is_obsolete() && !group->is_being_deleted()) {
success = true;
@@ -240,15 +240,15 @@ void AppCacheHost::DoPendingSwapCache() {
// 6.9.8 Application cache API
bool success = false;
- if (associated_cache_ && associated_cache_->owning_group()) {
+ if (associated_cache_.get() && associated_cache_->owning_group()) {
if (associated_cache_->owning_group()->is_obsolete()) {
success = true;
AssociateNoCache(GURL());
- } else if (swappable_cache_) {
+ } else if (swappable_cache_.get()) {
DCHECK(swappable_cache_.get() ==
swappable_cache_->owning_group()->newest_complete_cache());
success = true;
- AssociateCompleteCache(swappable_cache_);
+ AssociateCompleteCache(swappable_cache_.get());
}
}
@@ -321,7 +321,7 @@ Status AppCacheHost::GetStatus() {
return CHECKING;
if (cache->owning_group()->update_status() == AppCacheGroup::DOWNLOADING)
return DOWNLOADING;
- if (swappable_cache_)
+ if (swappable_cache_.get())
return UPDATE_READY;
return IDLE;
}
@@ -418,7 +418,7 @@ void AppCacheHost::FinishCacheSelection(
}
void AppCacheHost::ObserveGroupBeingUpdated(AppCacheGroup* group) {
- DCHECK(!group_being_updated_);
+ DCHECK(!group_being_updated_.get());
group_being_updated_ = group;
newest_cache_of_group_being_updated_ = group->newest_complete_cache();
group->AddUpdateObserver(this);
@@ -449,7 +449,7 @@ void AppCacheHost::SetSwappableCache(AppCacheGroup* group) {
swappable_cache_ = NULL;
} else {
AppCache* new_cache = group->newest_complete_cache();
- if (new_cache != associated_cache_)
+ if (new_cache != associated_cache_.get())
swappable_cache_ = new_cache;
else
swappable_cache_ = NULL;
@@ -459,7 +459,8 @@ void AppCacheHost::SetSwappableCache(AppCacheGroup* group) {
void AppCacheHost::LoadMainResourceCache(int64 cache_id) {
DCHECK(cache_id != kNoCacheId);
if (pending_main_resource_cache_id_ == cache_id ||
- (main_resource_cache_ && main_resource_cache_->cache_id() == cache_id)) {
+ (main_resource_cache_.get() &&
+ main_resource_cache_->cache_id() == cache_id)) {
return;
}
pending_main_resource_cache_id_ = cache_id;
@@ -496,7 +497,7 @@ void AppCacheHost::AssociateCompleteCache(AppCache* cache) {
void AppCacheHost::AssociateCacheHelper(AppCache* cache,
const GURL& manifest_url) {
- if (associated_cache_) {
+ if (associated_cache_.get()) {
associated_cache_->UnassociateHost(this);
}
« no previous file with comments | « webkit/appcache/appcache_group_unittest.cc ('k') | webkit/appcache/appcache_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698