| Index: ppapi/native_client/src/trusted/plugin/plugin.h
|
| diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h
|
| index 5d37595fc577c54a5b59047e1978e36759767179..619d7fca8866fd9413963474b2330de64c4c9c82 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/plugin.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/plugin.h
|
| @@ -74,25 +74,13 @@ class Plugin : public pp::InstancePrivate {
|
| // Gets called by the browser right after New().
|
| virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
|
|
|
| - // Handles view changes from the browser.
|
| - virtual void DidChangeView(const pp::View& view);
|
| -
|
| - // Handles gaining or losing focus.
|
| - virtual void DidChangeFocus(bool has_focus);
|
| -
|
| - // Handles input events delivered from the browser to this plugin element.
|
| - virtual bool HandleInputEvent(const pp::InputEvent& event);
|
| -
|
| - // Handles gaining or losing focus.
|
| + // Handles document load, when the plugin is a MIME type handler.
|
| virtual bool HandleDocumentLoad(const pp::URLLoader& url_loader);
|
|
|
| // Returns a scriptable reference to this plugin element.
|
| // Called by JavaScript document.getElementById(plugin_id).
|
| virtual pp::Var GetInstanceObject();
|
|
|
| - // Handles postMessage from browser
|
| - virtual void HandleMessage(const pp::Var& message);
|
| -
|
| // ----- Plugin interface support.
|
|
|
| // Load support.
|
| @@ -103,12 +91,7 @@ class Plugin : public pp::InstancePrivate {
|
| // done. The module will become ready later, asynchronously. Other
|
| // event handlers should block until the module is ready before
|
| // trying to communicate with it, i.e., until nacl_ready_state is
|
| - // DONE. Note, however, we already have another mechanism that
|
| - // prevents event delivery: StartJSObjectProxy plumbs through
|
| - // NaClSubprocess to SrpcClient which upcalls
|
| - // Plugin::StartProxiedExecution, which sets ppapi_proxy_. And NULL
|
| - // == ppapi_proxy_ prevents events from being delivered, even if
|
| - // nacl_ready_state is DONE.
|
| + // DONE.
|
| //
|
| // NB: currently we do not time out, so if the untrusted code
|
| // does not signal that it is ready, then we will deadlock the main
|
| @@ -244,18 +227,6 @@ class Plugin : public pp::InstancePrivate {
|
| // Requests a NaCl manifest download from a |url| relative to the page origin.
|
| void RequestNaClManifest(const nacl::string& url);
|
|
|
| - // Start up proxied execution of the browser API.
|
| - //
|
| - // NB: this is currently invoked from the main thread. If we ever
|
| - // move it off the main thread (eliminate the possibility of a
|
| - // malicious nexe that isn't linked against / doesn't use our
|
| - // ppapi_proxy code that blocks the main thread on the RPCs used
|
| - // here), then we will need to take care to ensure that the error
|
| - // and crash reporting state machine (see NexeDidCrash comment)
|
| - // continues to work.
|
| - bool StartProxiedExecution(NaClSrpcChannel* srpc_channel,
|
| - ErrorInfo* error_info);
|
| -
|
| // Support for property getting.
|
| typedef void (Plugin::* PropertyGetter)(NaClSrpcArg* prop_value);
|
| void AddPropertyGet(const nacl::string& prop_name, PropertyGetter getter);
|
| @@ -271,9 +242,6 @@ class Plugin : public pp::InstancePrivate {
|
| // sizes return 0.
|
| static const uint64_t kUnknownBytes = 0;
|
|
|
| - // Getter for PPAPI proxy interface.
|
| - ppapi_proxy::BrowserPpp* ppapi_proxy() const { return ppapi_proxy_; }
|
| -
|
| // Called back by CallOnMainThread. Dispatches the first enqueued progress
|
| // event.
|
| void DispatchProgressEvent(int32_t result);
|
| @@ -420,9 +388,6 @@ class Plugin : public pp::InstancePrivate {
|
| FileDownloader*& url_downloader,
|
| PP_CompletionCallback pp_callback);
|
|
|
| - // Shuts down the proxy for PPAPI nexes.
|
| - void ShutdownProxy(); // Nexe shutdown + proxy deletion.
|
| -
|
| // Copy the main service runtime's most recent NaClLog output to the
|
| // JavaScript console. Valid to use only after a crash, e.g., via a
|
| // detail level LOG_FATAL NaClLog entry. If the crash was not due
|
| @@ -468,12 +433,6 @@ class Plugin : public pp::InstancePrivate {
|
| // produced by this plugin.
|
| nacl::string last_error_string_;
|
|
|
| - // A pointer to the browser end of a proxy pattern connecting the
|
| - // NaCl plugin to the PPAPI .nexe's PPP interface
|
| - // (InitializeModule, Shutdown, and GetInterface).
|
| - // TODO(sehr): this should be a scoped_ptr for shutdown.
|
| - ppapi_proxy::BrowserPpp* ppapi_proxy_;
|
| -
|
| // PPAPI Dev interfaces are disabled by default.
|
| bool enable_dev_interfaces_;
|
|
|
| @@ -498,14 +457,6 @@ class Plugin : public pp::InstancePrivate {
|
| // Pending progress events.
|
| std::queue<ProgressEvent*> progress_events_;
|
|
|
| - // Adapter class constructors require a reference to 'this', so we can't
|
| - // contain them directly.
|
| - nacl::scoped_ptr<pp::Find_Dev> find_adapter_;
|
| - nacl::scoped_ptr<pp::MouseLock> mouse_lock_adapter_;
|
| - nacl::scoped_ptr<pp::Printing_Dev> printing_adapter_;
|
| - nacl::scoped_ptr<pp::Selection_Dev> selection_adapter_;
|
| - nacl::scoped_ptr<pp::Zoom_Dev> zoom_adapter_;
|
| -
|
| // Used for NexeFileDidOpenContinuation
|
| int64_t load_start_;
|
|
|
|
|