Add hooks to content to request permission to connect to the PPAPI broker.

content/renderer/pepper/pepper_broker_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 #include "ppapi/proxy/proxy_channel.h"
@@ skipping 35 matching lines @@
   scoped_ptr<ppapi::proxy::BrokerDispatcher> dispatcher_;
   scoped_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
 };
 
 class PepperBrokerImpl : public webkit::ppapi::PluginDelegate::Broker,
                          public base::RefCountedThreadSafe<PepperBrokerImpl>{
  public:
   PepperBrokerImpl(webkit::ppapi::PluginModule* plugin_module,
                    PepperPluginDelegateImpl* delegate_);
 
-  // PepperBroker implementation.
-  virtual void Connect(webkit::ppapi::PPB_Broker_Impl* client) OVERRIDE;
+  // webkit::ppapi::PluginDelegate::Broker implementation.
   virtual void Disconnect(webkit::ppapi::PPB_Broker_Impl* client) OVERRIDE;
 
+  // Called to balance out Disconnect() calls.
+  void Connect(webkit::ppapi::PPB_Broker_Impl* client);
+
   // Called when the channel to the broker has been established.
   void OnBrokerChannelConnected(const IPC::ChannelHandle& channel_handle);
 
+  // Called when we know whether permission to access the PPAPI broker was
+  // granted.
+  void OnBrokerPermissionResult(webkit::ppapi::PPB_Broker_Impl* client,
+                                bool result);
+
+ private:
+  friend class base::RefCountedThreadSafe<PepperBrokerImpl>;
+
+  struct PendingConnection {
+    PendingConnection();
+    ~PendingConnection();
+
+    bool authorized;

[ddorwin, 2012/08/12 22:51:16]

is_authorized

[Bernhard Bauer, 2012/08/13 09:02:12]

Done.

+    base::WeakPtr<webkit::ppapi::PPB_Broker_Impl> client;
+  };
+
+  virtual ~PepperBrokerImpl();
+
+  // Reports failure to all clients that had pending operations.
+  void ReportFailureToClients();
+
   // Connects the plugin to the broker via a pipe.
   void ConnectPluginToBroker(webkit::ppapi::PPB_Broker_Impl* client);
 
-  // Asynchronously sends a pipe to the broker.
-  int32_t SendHandleToBroker(PP_Instance instance,
-                             base::SyncSocket::Handle handle);
-
- protected:
-  friend class base::RefCountedThreadSafe<PepperBrokerImpl>;
-
-  virtual ~PepperBrokerImpl();
-
   scoped_ptr<PepperBrokerDispatcherWrapper> dispatcher_;
 
   // A map of pointers to objects that have requested a connection to the weak
   // pointer we can use to reference them. The mapping is needed so we can clean
   // up entries for objects that may have been deleted.
-  typedef std::map<webkit::ppapi::PPB_Broker_Impl*,
-                   base::WeakPtr<webkit::ppapi::PPB_Broker_Impl> > ClientMap;
+  typedef std::map<webkit::ppapi::PPB_Broker_Impl*, PendingConnection>
+      ClientMap;
   ClientMap pending_connects_;
 
   // Pointer to the associated plugin module.
   // Always set and cleared at the same time as the module's pointer to this.
   webkit::ppapi::PluginModule* plugin_module_;
 
   base::WeakPtr<PepperPluginDelegateImpl> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperBrokerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_BROKER_IMPL_H_