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

Unified Diff: ppapi/proxy/ppp_instance_proxy.cc

Issue 7362012: Remove untrusted scripting support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 5 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 | « ppapi/proxy/ppp_instance_proxy.h ('k') | ppapi/proxy/ppp_instance_proxy_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppp_instance_proxy.cc
diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc
index b09055dcb2272eda8f299f2ded9d88ebf6860697..99dcaab7c6be63500675e224e8d7a761298c69a3 100644
--- a/ppapi/proxy/ppp_instance_proxy.cc
+++ b/ppapi/proxy/ppp_instance_proxy.cc
@@ -112,24 +112,6 @@ PP_Bool HandleDocumentLoad(PP_Instance instance,
return result;
}
-PP_Var GetInstanceObject(PP_Instance instance) {
- Dispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
- ReceiveSerializedVarReturnValue result;
- dispatcher->Send(new PpapiMsg_PPPInstance_GetInstanceObject(
- INTERFACE_ID_PPP_INSTANCE, instance, &result));
- return result.Return(dispatcher);
-}
-
-static const PPP_Instance_0_4 instance_interface_0_4 = {
- &DidCreate,
- &DidDestroy,
- &DidChangeView,
- &DidChangeFocus,
- &HandleInputEvent,
- &HandleDocumentLoad,
- &GetInstanceObject
-};
-
static const PPP_Instance_0_5 instance_interface_0_5 = {
&DidCreate,
&DidDestroy,
@@ -153,18 +135,6 @@ PPP_Instance_Proxy::~PPP_Instance_Proxy() {
}
// static
-const InterfaceProxy::Info* PPP_Instance_Proxy::GetInfo0_4() {
- static const Info info = {
- &instance_interface_0_4,
- PPP_INSTANCE_INTERFACE_0_4,
- INTERFACE_ID_PPP_INSTANCE,
- false,
- &CreateInstanceProxy<PPP_Instance_0_4>
- };
- return &info;
-}
-
-// static
const InterfaceProxy::Info* PPP_Instance_Proxy::GetInfo0_5() {
static const Info info = {
&instance_interface_0_5,
@@ -191,8 +161,6 @@ bool PPP_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
OnMsgHandleInputEvent)
IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_HandleDocumentLoad,
OnMsgHandleDocumentLoad)
- IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_GetInstanceObject,
- OnMsgGetInstanceObject)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -278,16 +246,5 @@ void PPP_Instance_Proxy::OnMsgHandleDocumentLoad(PP_Instance instance,
PluginResourceTracker::GetInstance()->ReleaseResource(plugin_loader);
}
-void PPP_Instance_Proxy::OnMsgGetInstanceObject(
- PP_Instance instance,
- SerializedVarReturnValue result) {
- // GetInstanceObject_0_4 can be null if we're talking to version 0.5 or later,
- // however the host side of the proxy should never call this function on an
- // 0.5 or later version.
- DCHECK(combined_interface_->GetInstanceObject_0_4);
- result.Return(dispatcher(),
- combined_interface_->GetInstanceObject_0_4(instance));
-}
-
} // namespace proxy
} // namespace pp
« no previous file with comments | « ppapi/proxy/ppp_instance_proxy.h ('k') | ppapi/proxy/ppp_instance_proxy_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698