content/browser/renderer_host/compositor_impl_android.h - Issue 731133002: Upstream ResourceManager

Unified Diff: content/browser/renderer_host/compositor_impl_android.h

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Apply David's comments Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/renderer_host/compositor_impl_android.h

diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h

index 54c6469eb4709024be81459abd8224edd987e703..02e4fbcf2683724858cc34c50c067b01b63d623b 100644

--- a/content/browser/renderer_host/compositor_impl_android.h

+++ b/content/browser/renderer_host/compositor_impl_android.h

@@ -12,6 +12,7 @@

#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/resource_manager_impl.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"

@@ -34,6 +35,7 @@ class SurfaceIdAllocator;

namespace content {

class CompositorClient;

class OnscreenDisplayClient;

+class ResourceManager;

class UIResourceProvider;

// -----------------------------------------------------------------------------

@@ -63,6 +65,7 @@ class CONTENT_EXPORT CompositorImpl

virtual void SetHasTransparentBackground(bool flag) override;

virtual void SetNeedsComposite() override;

virtual UIResourceProvider& GetUIResourceProvider() override;

+ virtual ResourceManager* GetResourceManager() override;

jdduke (slow) 2014/11/19 00:09:15 Would be great if we could return a reference.

Jaekyun Seok (inactive) 2014/11/19 02:41:38 Done.

// LayerTreeHostClient implementation.

virtual void WillBeginMainFrame(int frame_id) override {}

@@ -143,6 +146,7 @@ class CONTENT_EXPORT CompositorImpl

scoped_ptr<cc::LayerTreeHost> host_;

content::UIResourceProviderImpl ui_resource_provider_;

+ scoped_ptr<content::ResourceManagerImpl> resource_manager_;

jdduke (slow) 2014/11/19 00:09:15 Does this need to be a scoped_ptr? Could it be a v

Jaekyun Seok (inactive) 2014/11/19 02:41:38 I will declare this as a value member variable.

scoped_ptr<OnscreenDisplayClient> display_client_;

scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;