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

Unified Diff: ppapi/native_client/src/trusted/plugin/service_runtime.cc

Issue 9159037: Use CORS for fetching NaCl resources from extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add webkit bug# Created 8 years, 11 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: ppapi/native_client/src/trusted/plugin/service_runtime.cc
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
index 230b45fb79267f78f0aa20fb619ec0cf72299e78..9f0bb2876aca4ece74d13994301fdd1743280450 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
@@ -253,8 +253,7 @@ void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation(
NaClLog(4, "Entered OpenManifestEntry_MainThreadContinuation\n");
std::string mapped_url;
- bool permit_extension_url = false;
- if (!manifest_->ResolveKey(p->url, &mapped_url, &permit_extension_url,
+ if (!manifest_->ResolveKey(p->url, &mapped_url,
p->error_info, p->is_portable)) {
NaClLog(4, "OpenManifestEntry_MainThreadContinuation: ResolveKey failed\n");
// Failed, and error_info has the details on what happened. Wake
@@ -278,7 +277,6 @@ void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation(
&PluginReverseInterface::StreamAsFile_MainThreadContinuation,
open_cont);
if (!plugin_->StreamAsFile(mapped_url,
- permit_extension_url,
stream_cc.pp_completion_callback())) {
NaClLog(4,
"OpenManifestEntry_MainThreadContinuation: StreamAsFile failed\n");

Powered by Google App Engine
This is Rietveld 408576698