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

Unified Diff: ui/base/resource/resource_bundle.h

Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update to address newly added use Created 4 years, 7 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 | « ios/web/webui/web_ui_ios_data_source_impl.mm ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index df812b1f14c0791a8fa40b508da0aae44666cb61..f58b1269fc8c9f2e3e18f786dff23ab19b5e28ac 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -31,7 +31,7 @@ class SkBitmap;
namespace base {
class File;
class Lock;
-class RefCountedStaticMemory;
+class RefCountedMemory;
}
namespace ui {
@@ -96,9 +96,9 @@ class UI_BASE_EXPORT ResourceBundle {
// default resource.
virtual gfx::Image GetNativeImageNamed(int resource_id) = 0;
- // Return a static memory resource or NULL to attempt retrieval of the
+ // Return a ref counted memory resource or NULL to attempt retrieval of the
// default resource.
- virtual base::RefCountedStaticMemory* LoadDataResourceBytes(
+ virtual base::RefCountedMemory* LoadDataResourceBytes(
int resource_id,
ScaleFactor scale_factor) = 0;
@@ -216,14 +216,14 @@ class UI_BASE_EXPORT ResourceBundle {
gfx::Image& GetNativeImageNamed(int resource_id);
// Loads the raw bytes of a scale independent data resource.
- base::RefCountedStaticMemory* LoadDataResourceBytes(int resource_id) const;
+ base::RefCountedMemory* LoadDataResourceBytes(int resource_id) const;
// Loads the raw bytes of a data resource nearest the scale factor
// |scale_factor| into |bytes|, without doing any processing or
// interpretation of the resource. Use ResourceHandle::SCALE_FACTOR_NONE
// for scale independent image resources (such as wallpaper).
// Returns NULL if we fail to read the resource.
- base::RefCountedStaticMemory* LoadDataResourceBytesForScale(
+ base::RefCountedMemory* LoadDataResourceBytesForScale(
int resource_id,
ScaleFactor scale_factor) const;
« no previous file with comments | « ios/web/webui/web_ui_ios_data_source_impl.mm ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698