Replace SystemUIResourceManager with ResourceManager

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/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.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/common/content_export.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/public/browser/android/compositor.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/android/resources/resource_manager.h"
+#include "ui/android/resources/ui_resource_provider.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;
 class SurfaceIdAllocator;
 }
 
 namespace content {
 class CompositorClient;
 class OnscreenDisplayClient;
-class UIResourceProvider;
 
 // -----------------------------------------------------------------------------
 // Browser-side compositor that manages a tree of content and UI layers.
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT CompositorImpl
     : public Compositor,
       public cc::LayerTreeHostClient,
       public cc::LayerTreeHostSingleThreadClient,
       public ui::WindowAndroidCompositor {
  public:
   CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window);
   virtual ~CompositorImpl();
 
   static bool IsInitialized();
 
   void PopulateGpuCapabilities(gpu::Capabilities gpu_capabilities);
 
  private:
   // Compositor implementation.
   virtual void SetRootLayer(scoped_refptr<cc::Layer> root) override;
   virtual void SetSurface(jobject surface) override;
   virtual void SetVisible(bool visible) override;
   virtual void setDeviceScaleFactor(float factor) override;
   virtual void SetWindowBounds(const gfx::Size& size) override;
   virtual void SetHasTransparentBackground(bool flag) override;
   virtual void SetNeedsComposite() override;
-  virtual UIResourceProvider& GetUIResourceProvider() override;
+  virtual ui::UIResourceProvider& GetUIResourceProvider() override;
   virtual ui::ResourceManager& GetResourceManager() override;
 
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) override {}
   virtual void DidBeginMainFrame() override {}
   virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
   virtual void Layout() override;
   virtual void ApplyViewportDeltas(
       const gfx::Vector2d& inner_delta,
       const gfx::Vector2d& outer_delta,
@@ skipping 16 matching lines @@
   virtual void DidPostSwapBuffers() override;
   virtual void DidAbortSwapBuffers() 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;

[jdduke (slow), 2014/12/09 16:11:07]

It's a little unclear why GetSystemUIResourceManager hangs off the
WindowAndroidCompositor interface, but GetResourceManager() hangs off the
Compositor interface? When we remove SystemUIResourceManager can we have
GetResourceManager() hang off the WindowAndroidCompositor interface? 

[Jaekyun Seok (inactive), 2014/12/09 23:35:22]

I will remove SystemUIResourceManager and add GetResourceManager() to
WindowAndroidCompositor interface.

 
   void SetWindowSurface(ANativeWindow* window);
 
   enum CompositingTrigger {
     DO_NOT_COMPOSITE,
     COMPOSITE_IMMEDIATELY,
     COMPOSITE_EVENTUALLY,
   };
   void PostComposite(CompositingTrigger trigger);
   void Composite(CompositingTrigger trigger);
@@ skipping 22 matching lines @@
   }
   void CreateLayerTreeHost();
   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_;
+  ui::UIResourceProvider ui_resource_provider_;
   ui::ResourceManager resource_manager_;
 
   scoped_ptr<OnscreenDisplayClient> display_client_;
   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
 
   gfx::Size size_;
   bool has_transparent_background_;
   float device_scale_factor_;
 
   ANativeWindow* window_;
@@ 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_