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

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: Addressing iOS trybots 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
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..c16d9ff8d90635a3736fdcf3fe2abc645560e52c 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 {
@@ -98,7 +98,7 @@ class UI_BASE_EXPORT ResourceBundle {
// Return a static memory resource or NULL to attempt retrieval of the
sadrul 2016/05/24 22:36:59 Update the doc.
smaier 2016/05/25 13:29:14 Done.
// 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;

Powered by Google App Engine
This is Rietveld 408576698