Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Unified Diff: trunk/src/cc/resources/scoped_ui_resource.h

Issue 23740010: Revert 223162 "Update the nine patch layer to use UI resources" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/cc/layers/scrollbar_layer_unittest.cc ('k') | trunk/src/cc/resources/scoped_ui_resource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/cc/resources/scoped_ui_resource.h
===================================================================
--- trunk/src/cc/resources/scoped_ui_resource.h (revision 223178)
+++ trunk/src/cc/resources/scoped_ui_resource.h (working copy)
@@ -15,27 +15,28 @@
class LayerTreeHost;
-// ScopedUIResource creates an UIResource from a bitmap and a LayerTreeHost.
-// This class holds a pointer to the host so that when the instance goes out of
-// scope, the created resource is deleted. On a GetBitmap call from the
-// UIResource manager, ScopeUIResource always returns the reference to the
-// initially given bitmap regardless of whether the request was due to lost
-// resource or not.
class CC_EXPORT ScopedUIResource : public UIResourceClient {
public:
- static scoped_ptr<ScopedUIResource> Create(LayerTreeHost* host,
- const UIResourceBitmap& bitmap);
+ static scoped_ptr<ScopedUIResource> Create(
+ LayerTreeHost* host,
+ scoped_refptr<UIResourceBitmap> bitmap);
virtual ~ScopedUIResource();
+ gfx::Size GetSize() const;
+
// UIResourceClient implementation.
- virtual UIResourceBitmap GetBitmap(UIResourceId uid,
- bool resource_lost) OVERRIDE;
+ virtual scoped_refptr<UIResourceBitmap> GetBitmap(
+ UIResourceId uid,
+ bool resource_lost) OVERRIDE;
UIResourceId id() { return id_; }
protected:
- ScopedUIResource(LayerTreeHost* host, const UIResourceBitmap& bitmap);
+ ScopedUIResource(LayerTreeHost* host, scoped_refptr<UIResourceBitmap> bitmap);
- UIResourceBitmap bitmap_;
+ // An empty default contructor for testing.
+ ScopedUIResource();
+
+ scoped_refptr<UIResourceBitmap> bitmap_;
LayerTreeHost* host_;
UIResourceId id_;
« no previous file with comments | « trunk/src/cc/layers/scrollbar_layer_unittest.cc ('k') | trunk/src/cc/resources/scoped_ui_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698