ios/web/webui/crw_web_ui_manager.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: ios/web/webui/crw_web_ui_manager.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: ios/web/webui/crw_web_ui_manager.mm

diff --git a/ios/web/webui/crw_web_ui_manager.mm b/ios/web/webui/crw_web_ui_manager.mm

index b98c388e0130de98fbd84c33f1465913e1b9e93d..286dfb2b7c28ab7314c0011da961d94a97a377ed 100644

--- a/ios/web/webui/crw_web_ui_manager.mm

+++ b/ios/web/webui/crw_web_ui_manager.mm

@@ -252,7 +252,7 @@ const char kScriptCommandPrefix[] = "webui";

{mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS},

{mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS},

};

- scoped_refptr<base::RefCountedStaticMemory> scriptData(

+ scoped_refptr<base::RefCountedMemory> scriptData(

web::GetWebClient()->GetDataResourceBytes(resource_map[moduleName]));

if (scriptData) {

std::string script(reinterpret_cast<const char*>(scriptData->front()),

« no previous file with comments | « ios/web/public/web_client.mm ('k') | ios/web/webui/web_ui_ios_data_source_impl.mm » ('j') | no next file with comments »