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

Unified Diff: trunk/src/chrome/renderer/chrome_content_renderer_client.cc

Issue 60323002: Revert 232547 "Pepper: Move FileIO host from renderer to browser." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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: trunk/src/chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- trunk/src/chrome/renderer/chrome_content_renderer_client.cc (revision 233010)
+++ trunk/src/chrome/renderer/chrome_content_renderer_client.cc (working copy)
@@ -209,12 +209,24 @@
return false;
}
+#if defined(ENABLE_PLUGINS)
+const char* kPredefinedAllowedFileHandleOrigins[] = {
+ "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
+ "4EB74897CB187C7633357C2FE832E0AD6A44883A" // see crbug.com/234789
+};
+#endif
+
} // namespace
namespace chrome {
ChromeContentRendererClient::ChromeContentRendererClient() {
g_current_client = this;
+
+#if defined(ENABLE_PLUGINS)
+ for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
+ allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
+#endif
}
ChromeContentRendererClient::~ChromeContentRendererClient() {
@@ -1295,6 +1307,23 @@
return module_name == "Native Client";
}
+bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle(
+ WebKit::WebPluginContainer* container) {
+#if defined(ENABLE_PLUGINS)
+ if (!container)
+ return false;
+ GURL url = container->element().document().baseURL();
+ const ExtensionSet* extension_set = extension_dispatcher_->extensions();
+
+ return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
+ allowed_file_handle_origins_) ||
+ IsHostAllowedByCommandLine(url, extension_set,
+ switches::kAllowNaClFileHandleAPI);
+#else
+ return false;
+#endif
+}
+
WebKit::WebSpeechSynthesizer*
ChromeContentRendererClient::OverrideSpeechSynthesizer(
WebKit::WebSpeechSynthesizerClient* client) {
« no previous file with comments | « trunk/src/chrome/renderer/chrome_content_renderer_client.h ('k') | trunk/src/content/browser/fileapi/fileapi_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698