diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:42:42 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:42:42 +0000 |
| commit | 13914c9dae337943e348df3f63bed3bb1375bb3c (patch) | |
| tree | 30107ef8b54c575b70ba288cb93e0eb96973cdab /content/browser/android/edge_effect.cc | |
| parent | 7b8a31630192ab3f7c28a0790a681c543a94d409 (diff) | |
| download | chromium_src-13914c9dae337943e348df3f63bed3bb1375bb3c.zip chromium_src-13914c9dae337943e348df3f63bed3bb1375bb3c.tar.gz chromium_src-13914c9dae337943e348df3f63bed3bb1375bb3c.tar.bz2 | |
Update Android to use scoped_refptr<T>::get() rather than implicit "operator T*"
Android fixes and post-Linux cleanup
BUG=110610
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/16907002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/edge_effect.cc')
| -rw-r--r-- | content/browser/android/edge_effect.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/android/edge_effect.cc b/content/browser/android/edge_effect.cc index a9d493c..c7cd7d0 100644 --- a/content/browser/android/edge_effect.cc +++ b/content/browser/android/edge_effect.cc @@ -139,8 +139,8 @@ EdgeEffect::EdgeEffect(scoped_refptr<cc::Layer> edge, , pull_distance_(0) , dpi_scale_(1) { // Prevent the provided layers from drawing until the effect is activated. - DisableLayer(edge_); - DisableLayer(glow_); + DisableLayer(edge_.get()); + DisableLayer(glow_.get()); dpi_scale_ = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().device_scale_factor(); @@ -153,8 +153,8 @@ bool EdgeEffect::IsFinished() const { } void EdgeEffect::Finish() { - DisableLayer(edge_); - DisableLayer(glow_); + DisableLayer(edge_.get()); + DisableLayer(glow_.get()); pull_distance_ = 0; state_ = STATE_IDLE; } @@ -338,8 +338,8 @@ void EdgeEffect::ApplyToLayers(gfx::SizeF size, Edge edge) { // An empty effect size, while meaningless, is also relatively harmless, and // will simply prevent any drawing of the layers. if (size.IsEmpty()) { - DisableLayer(edge_); - DisableLayer(glow_); + DisableLayer(edge_.get()); + DisableLayer(glow_.get()); return; } @@ -354,7 +354,7 @@ void EdgeEffect::ApplyToLayers(gfx::SizeF size, Edge edge) { const int glow_bottom = static_cast<int>(std::min( glow_height * glow_scale_y_ * kGlowImageAspectRatioInverse * 0.6f, glow_height * kMaxGlowHeight) * dpi_scale_ + 0.5f); - UpdateLayer(glow_, edge, size, glow_bottom, glow_alpha_); + UpdateLayer(glow_.get(), edge, size, glow_bottom, glow_alpha_); // Edge gfx::Size edge_image_bounds; @@ -364,7 +364,7 @@ void EdgeEffect::ApplyToLayers(gfx::SizeF size, Edge edge) { const int edge_height = edge_image_bounds.height(); const int edge_bottom = static_cast<int>( edge_height * edge_scale_y_ * dpi_scale_); - UpdateLayer(edge_, edge, size, edge_bottom, edge_alpha_); + UpdateLayer(edge_.get(), edge, size, edge_bottom, edge_alpha_); } } // namespace content |