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

Unified Diff: content/browser/android/overscroll_glow.cc

Issue 628333003: Remove implicit conversions from scoped_refptr to T* in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
Index: content/browser/android/overscroll_glow.cc
diff --git a/content/browser/android/overscroll_glow.cc b/content/browser/android/overscroll_glow.cc
index b3a969ff85f743b498e6a9c747589c02a7f59c08..6df795a2db2ecb5931fb486041b06d7666984c2d 100644
--- a/content/browser/android/overscroll_glow.cc
+++ b/content/browser/android/overscroll_glow.cc
@@ -186,7 +186,7 @@ bool OverscrollGlow::NeedsAnimate() const {
void OverscrollGlow::UpdateLayerAttachment(cc::Layer* parent) {
DCHECK(parent);
- if (!root_layer_)
+ if (!root_layer_.get())
return;
if (!NeedsAnimate()) {
@@ -198,11 +198,11 @@ void OverscrollGlow::UpdateLayerAttachment(cc::Layer* parent) {
parent->AddChild(root_layer_);
for (size_t i = 0; i < EDGE_COUNT; ++i)
- edge_effects_[i]->SetParent(root_layer_);
+ edge_effects_[i]->SetParent(root_layer_.get());
}
void OverscrollGlow::Detach() {
- if (root_layer_)
+ if (root_layer_.get())
root_layer_->RemoveFromParent();
}
@@ -211,7 +211,7 @@ bool OverscrollGlow::InitializeIfNecessary() {
if (initialized_)
return true;
- DCHECK(!root_layer_);
+ DCHECK(!root_layer_.get());
root_layer_ = cc::Layer::Create();
for (size_t i = 0; i < EDGE_COUNT; ++i) {
edge_effects_[i] = edge_effect_provider_.Run();

Powered by Google App Engine
This is Rietveld 408576698