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

Unified Diff: content/browser/renderer_host/pepper/pepper_network_proxy_host.h

Issue 17094022: PPAPI: Add permissions checking for PPB_NetworkProxy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge, appease Clang Created 7 years, 6 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 | « no previous file | content/browser/renderer_host/pepper/pepper_network_proxy_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/pepper/pepper_network_proxy_host.h
diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h
index 84293be553ffb5b17cde8d54ce2ce3dd51c30f67..38e36cb13e6757654d90de64a427033bc5ce7eba 100644
--- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h
+++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h
@@ -28,22 +28,31 @@ struct ReplyMessageContext;
namespace content {
-class BrowserPpapiHost;
+class BrowserPpapiHostImpl;
-// The host for PPB_NetworkProxy. This class runs exclusively on the IO thread.
+// The host for PPB_NetworkProxy. This class lives on the IO thread.
class CONTENT_EXPORT PepperNetworkProxyHost : public ppapi::host::ResourceHost {
public:
- PepperNetworkProxyHost(BrowserPpapiHost* host,
+ PepperNetworkProxyHost(BrowserPpapiHostImpl* host,
PP_Instance instance,
PP_Resource resource);
virtual ~PepperNetworkProxyHost();
private:
- // We retrieve the appropriate URLRequestContextGetter on the UI thread
- // and pass it to this function, which uses it to retrieve proxy_service_.
- void DidGetURLRequestContextGetter(
- scoped_refptr<net::URLRequestContextGetter> context_getter);
+ // We retrieve the appropriate URLRequestContextGetter and whether this API
+ // is allowed for the instance on the UI thread and pass those to
+ // DidGetUIThreadData, which sets allowed_ and proxy_service_.
+ struct UIThreadData {
+ UIThreadData();
+ ~UIThreadData();
+ bool is_allowed;
+ scoped_refptr<net::URLRequestContextGetter> context_getter;
+ };
+ static UIThreadData GetUIThreadDataOnUIThread(int render_process_id,
+ int render_view_id,
+ bool is_external_plugin);
+ void DidGetUIThreadData(const UIThreadData&);
// ResourceHost implementation.
virtual int32_t OnResourceMessageReceived(
@@ -62,8 +71,15 @@ class CONTENT_EXPORT PepperNetworkProxyHost : public ppapi::host::ResourceHost {
void SendFailureReply(int32_t error,
ppapi::host::ReplyMessageContext context);
+ // The following two members are invalid until we get some information from
+ // the UI thread. However, these are only ever set or accessed on the IO
+ // thread.
net::ProxyService* proxy_service_;
- bool waiting_for_proxy_service_;
+ bool is_allowed_;
+
+ // True initially, but set to false once the values for proxy_service_ and
+ // is_allowed_ have been set.
+ bool waiting_for_ui_thread_data_;
// We have to get the URLRequestContextGetter from the UI thread before we
// can retrieve proxy_service_. If we receive any calls for GetProxyForURL
« no previous file with comments | « no previous file | content/browser/renderer_host/pepper/pepper_network_proxy_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698