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

Unified Diff: content/plugin/webplugin_proxy.cc

Issue 23503043: Load NPAPI plugin resources through the browser process directly instead of going through the render (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 7 years, 3 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
« no previous file with comments | « content/plugin/webplugin_proxy.h ('k') | content/renderer/npapi/webplugin_delegate_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/webplugin_proxy.cc
===================================================================
--- content/plugin/webplugin_proxy.cc (revision 222566)
+++ content/plugin/webplugin_proxy.cc (working copy)
@@ -14,6 +14,7 @@
#include "content/child/npapi/npobject_proxy.h"
#include "content/child/npapi/npobject_util.h"
#include "content/child/npapi/webplugin_delegate_impl.h"
+#include "content/child/npapi/webplugin_resource_client.h"
#include "content/child/plugin_messages.h"
#include "content/plugin/plugin_channel.h"
#include "content/plugin/plugin_thread.h"
@@ -147,6 +148,7 @@
void WebPluginProxy::CancelResource(unsigned long id) {
Send(new PluginHostMsg_CancelResource(route_id_, id));
+
ananta 2013/09/11 18:18:09 Remove
resource_clients_.erase(id);
}
@@ -676,12 +678,14 @@
void WebPluginProxy::ResourceClientDeleted(
WebPluginResourceClient* resource_client) {
+ // resource_client->ResourceId() is 0 at this point, so can't use it as an
+ // index into the map.
ResourceClientMap::iterator index = resource_clients_.begin();
while (index != resource_clients_.end()) {
WebPluginResourceClient* client = (*index).second;
-
if (client == resource_client) {
- resource_clients_.erase(index++);
+ resource_clients_.erase(index);
+ return;
} else {
index++;
}
@@ -692,6 +696,13 @@
Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
}
+bool WebPluginProxy::CheckIfRunInsecureContent(const GURL& url) {
+ bool result = true;
+ Send(new PluginHostMsg_CheckIfRunInsecureContent(
+ host_render_view_routing_id_, url, &result));
+ return result;
+}
+
#if defined(OS_WIN) && !defined(USE_AURA)
void WebPluginProxy::UpdateIMEStatus() {
// Retrieve the IME status from a plug-in and send it to a renderer process
« no previous file with comments | « content/plugin/webplugin_proxy.h ('k') | content/renderer/npapi/webplugin_delegate_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698