Revert of [Android] Use UIResource for overscroll glow

content/browser/renderer_host/compositor_impl_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
+#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 #include "content/browser/android/ui_resource_provider_impl.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/android/compositor.h"
 #include "third_party/khronos/GLES2/gl2.h"
-#include "ui/base/android/system_ui_resource_manager.h"
 #include "ui/base/android/window_android_compositor.h"
 
 class SkBitmap;
 struct ANativeWindow;
 
 namespace cc {
 class Layer;
 class LayerTreeHost;
 }
 
@@ skipping 59 matching lines @@
   // ImageTransportFactoryAndroidObserver implementation.
   virtual void OnLostResources() OVERRIDE;
 
   // WindowAndroidCompositor implementation.
   virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) OVERRIDE;
   virtual void RequestCopyOfOutputOnRootLayer(
       scoped_ptr<cc::CopyOutputRequest> request) OVERRIDE;
   virtual void OnVSync(base::TimeTicks frame_time,
                        base::TimeDelta vsync_period) OVERRIDE;
   virtual void SetNeedsAnimate() OVERRIDE;
-  virtual ui::SystemUIResourceManager& GetSystemUIResourceManager() OVERRIDE;
 
   enum CompositingTrigger {
     DO_NOT_COMPOSITE,
     COMPOSITE_IMMEDIATELY,
     COMPOSITE_EVENTUALLY,
   };
   void PostComposite(CompositingTrigger trigger);
   void Composite(CompositingTrigger trigger);
 
   bool WillCompositeThisFrame() const {
     return current_composite_task_ &&
            !current_composite_task_->callback().is_null();
   }
   bool DidCompositeThisFrame() const {
     return current_composite_task_ &&
            current_composite_task_->callback().is_null();
   }
   bool WillComposite() const {
     return WillCompositeThisFrame() ||
            composite_on_vsync_trigger_ != DO_NOT_COMPOSITE;
   }
   void CancelComposite() {
     DCHECK(WillComposite());
     if (WillCompositeThisFrame())
       current_composite_task_->Cancel();
     current_composite_task_.reset();
     composite_on_vsync_trigger_ = DO_NOT_COMPOSITE;
     will_composite_immediately_ = false;
   }
+  cc::UIResourceId GenerateUIResourceFromUIResourceBitmap(
+      const cc::UIResourceBitmap& bitmap,
+      bool is_transient);
   void OnGpuChannelEstablished();
 
   // root_layer_ is the persistent internal root layer, while subroot_layer_
   // is the one attached by the compositor client.
   scoped_refptr<cc::Layer> root_layer_;
   scoped_refptr<cc::Layer> subroot_layer_;
 
   scoped_ptr<cc::LayerTreeHost> host_;
   content::UIResourceProviderImpl ui_resource_provider_;
 
@@ skipping 39 matching lines @@
   base::TimeTicks last_vsync_;
 
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_