ui/base/resource/resource_bundle_ios.mm - Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/resource/resource_bundle_ios.mm

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

Index: ui/base/resource/resource_bundle_ios.mm

diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm

index 17f1c79ac07f436b798761c53560d13fd47514ac..43a5325f1695e2763c0ea388efb9fdad9d9c087d 100644

--- a/ui/base/resource/resource_bundle_ios.mm

+++ b/ui/base/resource/resource_bundle_ios.mm

@@ -109,7 +109,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {

// supported at runtime, based on the device resolution.

ui::ScaleFactor scale_factor = GetMaxScaleFactor();

- scoped_refptr<base::RefCountedStaticMemory> data(

+ scoped_refptr<base::RefCountedMemory> data(

LoadDataResourceBytesForScale(resource_id, scale_factor));

if (!data.get()) {

« no previous file with comments | « ui/base/resource/resource_bundle.cc ('k') | ui/base/resource/resource_bundle_unittest.cc » ('j') | no next file with comments »