Switch the android overscroll glow to use UIResources.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 106 matching lines @@
       using_synchronous_compositor_(SynchronousCompositorImpl::FromID(
                                         widget_host->GetProcess()->GetID(),
                                         widget_host->GetRoutingID()) != NULL) {
   if (!UsingDelegatedRenderer()) {
     texture_layer_ = cc::TextureLayer::Create(NULL);
     layer_ = texture_layer_;
   }
 
   overscroll_effect_enabled_ = !CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableOverscrollEdgeEffect);
-  // Don't block the main thread with effect resource loading.
-  // Actual effect creation is deferred until an overscroll event is received.
-  if (overscroll_effect_enabled_) {
-    base::WorkerPool::PostTask(FROM_HERE,
-                               base::Bind(&OverscrollGlow::EnsureResources),
-                               true);
-  }
 
   host_->SetView(this);
   SetContentViewCore(content_view_core);
   ImageTransportFactoryAndroid::AddObserver(this);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   ImageTransportFactoryAndroid::RemoveObserver(this);
   SetContentViewCore(NULL);
   DCHECK(ack_callbacks_.empty());
@@ skipping 714 matching lines @@
   content_view_core_->AttachLayer(layer_);
 }
 
 void RenderWidgetHostViewAndroid::RemoveLayers() {
   if (!content_view_core_)
     return;
   if (!layer_.get())
     return;
 
   if (overscroll_effect_)
-    content_view_core_->RemoveLayer(overscroll_effect_->root_layer());
+    overscroll_effect_->RemoveLayer();
 
   content_view_core_->RemoveLayer(layer_);
 }
 
 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {
   if (!overscroll_effect_)
     return false;
 
   bool overscroll_running = overscroll_effect_->Animate(frame_time);
   if (!overscroll_running)
-    content_view_core_->RemoveLayer(overscroll_effect_->root_layer());
+    overscroll_effect_->RemoveLayer();
 
   return overscroll_running;
 }
 
 void RenderWidgetHostViewAndroid::CreateOverscrollEffectIfNecessary() {
   if (!overscroll_effect_enabled_ || overscroll_effect_)
     return;
 
   overscroll_effect_ = OverscrollGlow::Create(true, content_size_in_layer_);
 
@@ skipping 14 matching lines @@
   overscroll_effect_->set_vertical_overscroll_enabled(
       ceiled_viewport_size.height() < frame_metadata.root_layer_size.height());
   overscroll_effect_->set_size(content_size_in_layer_);
 }
 
 void RenderWidgetHostViewAndroid::ScheduleAnimationIfNecessary() {
   if (!content_view_core_ || !overscroll_effect_)
     return;
 
   if (overscroll_effect_->NeedsAnimate() && are_layers_attached_) {
-    if (!overscroll_effect_->root_layer()->parent())
-      content_view_core_->AttachLayer(overscroll_effect_->root_layer());
+    if (!overscroll_effect_->IsAttached())
+      overscroll_effect_->AttachLayerTo(content_view_core_->GetLayer());
     content_view_core_->SetNeedsAnimate();
   } else {
-    content_view_core_->RemoveLayer(overscroll_effect_->root_layer());
+    overscroll_effect_->RemoveLayer();
   }
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
   NOTREACHED();
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceSuspend() {
@@ skipping 326 matching lines @@
     ack_callbacks_.pop();
   }
 }
 
 void RenderWidgetHostViewAndroid::HasTouchEventHandlers(
     bool need_touch_events) {
   if (content_view_core_)
     content_view_core_->HasTouchEventHandlers(need_touch_events);
 }
 
-void RenderWidgetHostViewAndroid::OnCompositingDidCommit() {
+void RenderWidgetHostViewAndroid::OnCompositingDidCommit(
+    Compositor* compositor) {
   RunAckCallbacks();
+  if (overscroll_effect_) {
+    cc::UIResourceId edge_id = compositor->GetOverscrollEdgeId();
+    cc::UIResourceId glow_id = compositor->GetOverscrollGlowId();
+    if (edge_id && glow_id) {
+      bool updated_resources = overscroll_effect_->SetLayerResources(
+          edge_id,
+          glow_id,
+          compositor->GetUIResourceSize(edge_id),
+          compositor->GetUIResourceSize(glow_id));
+      if (updated_resources)
+        ScheduleAnimationIfNecessary();
+    }
+  }
 }
 
 void RenderWidgetHostViewAndroid::OnDetachCompositor() {
   DCHECK(content_view_core_);
   DCHECK(!using_synchronous_compositor_);
   RunAckCallbacks();
 }
 
 void RenderWidgetHostViewAndroid::OnLostResources() {
   if (texture_layer_.get())
@@ skipping 99 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content