android: Use UIResource for overscroll glow

content/browser/android/edge_effect.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/edge_effect.h"
 
 #include "cc/layers/layer.h"
+#include "content/browser/android/overscroll_glow.h"
 
 namespace content {
 
 namespace {
 
 enum State {
   STATE_IDLE = 0,
   STATE_PULL,
   STATE_ABSORB,
   STATE_RECEDE,
@@ skipping 118 matching lines @@
   gfx::Size bounds = ComputeBounds(edge, window_size, height);
   layer->SetTransformOrigin(
       gfx::Point3F(bounds.width() * 0.5f, bounds.height() * 0.5f, 0));
   layer->SetTransform(ComputeTransform(edge, window_size, offset, height));
   layer->SetBounds(bounds);
   layer->SetOpacity(Clamp(opacity, 0.f, 1.f));
 }
 
 } // namespace
 
-EdgeEffect::EdgeEffect(scoped_refptr<cc::Layer> edge,
-                       scoped_refptr<cc::Layer> glow)
-  : edge_(edge)
-  , glow_(glow)
-  , edge_alpha_(0)
-  , edge_scale_y_(0)
-  , glow_alpha_(0)
-  , glow_scale_y_(0)
-  , edge_alpha_start_(0)
-  , edge_alpha_finish_(0)
-  , edge_scale_y_start_(0)
-  , edge_scale_y_finish_(0)
-  , glow_alpha_start_(0)
-  , glow_alpha_finish_(0)
-  , glow_scale_y_start_(0)
-  , glow_scale_y_finish_(0)
-  , state_(STATE_IDLE)
-  , pull_distance_(0) {
+EdgeEffect::EdgeEffect(scoped_ptr<OverscrollGlowLayerWrapper> edge,
+                       scoped_ptr<OverscrollGlowLayerWrapper> glow)
+    : edge_(edge.Pass()),
+      glow_(glow.Pass()),
+      edge_alpha_(0),
+      edge_scale_y_(0),
+      glow_alpha_(0),
+      glow_scale_y_(0),
+      edge_alpha_start_(0),
+      edge_alpha_finish_(0),
+      edge_scale_y_start_(0),
+      edge_scale_y_finish_(0),
+      glow_alpha_start_(0),
+      glow_alpha_finish_(0),
+      glow_scale_y_start_(0),
+      glow_scale_y_finish_(0),
+      state_(STATE_IDLE),
+      pull_distance_(0) {
   // Prevent the provided layers from drawing until the effect is activated.
-  DisableLayer(edge_.get());
-  DisableLayer(glow_.get());
+  DisableLayer(edge_->layer());
+  DisableLayer(glow_->layer());
 }
 
 EdgeEffect::~EdgeEffect() { }
 
 bool EdgeEffect::IsFinished() const {
   return state_ == STATE_IDLE;
 }
 
 void EdgeEffect::Finish() {
-  DisableLayer(edge_.get());
-  DisableLayer(glow_.get());
+  DisableLayer(edge_->layer());
+  DisableLayer(glow_->layer());
   pull_distance_ = 0;
   state_ = STATE_IDLE;
 }
 
 void EdgeEffect::Pull(base::TimeTicks current_time, float delta_distance) {
   if (state_ == STATE_PULL_DECAY && current_time - start_time_ < duration_) {
     return;
   }
   if (state_ != STATE_PULL) {
     glow_scale_y_ = kPullGlowBegin;
@@ skipping 164 matching lines @@
                                Edge edge,
                                float edge_height,
                                float glow_height,
                                float offset) {
   if (IsFinished())
     return;
 
   // An empty window size, while meaningless, is also relatively harmless, and
   // will simply prevent any drawing of the layers.
   if (window_size.IsEmpty()) {
-    DisableLayer(edge_.get());
-    DisableLayer(glow_.get());
+    DisableLayer(edge_->layer());
+    DisableLayer(glow_->layer());
     return;
   }
 
   // Glow
   const int scaled_glow_height = static_cast<int>(
       std::min(glow_height * glow_scale_y_ * kGlowHeightToWidthRatio * 0.6f,
                glow_height * kMaxGlowHeight) + 0.5f);
-  UpdateLayer(
-      glow_.get(), edge, window_size, offset, scaled_glow_height, glow_alpha_);
+  UpdateLayer(glow_->layer(),
+              edge,
+              window_size,
+              offset,
+              scaled_glow_height,
+              glow_alpha_);
 
   // Edge
- const int scaled_edge_height = static_cast<int>(edge_height * edge_scale_y_);
-  UpdateLayer(
-      edge_.get(), edge, window_size, offset, scaled_edge_height, edge_alpha_);
+  const int scaled_edge_height = static_cast<int>(edge_height * edge_scale_y_);
+  UpdateLayer(edge_->layer(),
+              edge,
+              window_size,
+              offset,
+              scaled_edge_height,
+              edge_alpha_);
 }
 
 } // namespace content