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 "cc/layers/ui_resource_layer.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_refptr<cc::UIResourceLayer> edge,
+                       scoped_refptr<cc::UIResourceLayer> 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) {

[powei, 2014/07/08 19:12:43]

result of clang-format.  Let me know if the other way's preferrable.

[jdduke (slow), 2014/07/08 20:10:11]

It's not, this is great.

   // Prevent the provided layers from drawing until the effect is activated.
   DisableLayer(edge_.get());
   DisableLayer(glow_.get());
 }
 
 EdgeEffect::~EdgeEffect() { }
 
 bool EdgeEffect::IsFinished() const {
   return state_ == STATE_IDLE;
 }
@@ skipping 196 matching lines @@
                glow_height * kMaxGlowHeight) + 0.5f);
   UpdateLayer(
       glow_.get(), 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_);
 }
 
-} // namespace content
+void EdgeEffect::SetUIResources(cc::UIResourceId edge_resource,
+                                cc::UIResourceId glow_resource) {
+  edge_->SetUIResourceId(edge_resource);
+  glow_->SetUIResourceId(glow_resource);
+}
+
+}  // namespace content