Remove support for NPObjects.

content/plugin/webplugin_proxy.cc

 // 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.
 
 #include "content/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
-#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/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_client.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/web/WebBindings.h"
 #include "ui/gfx/canvas.h"
 #include "url/url_constants.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "content/common/plugin_process_messages.h"
 #include "content/public/common/sandbox_init.h"
 #endif
 
-using blink::WebBindings;
-
 namespace content {
 
 WebPluginProxy::SharedTransportDIB::SharedTransportDIB(TransportDIB* dib)
     : dib_(dib) {
 }
 
 WebPluginProxy::SharedTransportDIB::~SharedTransportDIB() {
 }
 
 WebPluginProxy::WebPluginProxy(
     PluginChannel* channel,
     int route_id,
     const GURL& page_url,
     int host_render_view_routing_id)
     : channel_(channel),
       route_id_(route_id),
-      window_npobject_(NULL),
-      plugin_element_(NULL),
       delegate_(NULL),
       waiting_for_paint_(false),
       page_url_(page_url),
       windowless_buffer_index_(0),
       host_render_view_routing_id_(host_render_view_routing_id),
       weak_factory_(this) {
 }
 
 WebPluginProxy::~WebPluginProxy() {
 #if defined(OS_MACOSX)
   // Destroy the surface early, since it may send messages during cleanup.
   if (accelerated_surface_)
     accelerated_surface_.reset();
 #endif
-
-  if (plugin_element_)
-    WebBindings::releaseObject(plugin_element_);
-  if (window_npobject_)
-    WebBindings::releaseObject(window_npobject_);
 }
 
 bool WebPluginProxy::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
 #if defined(OS_WIN)
 void WebPluginProxy::SetWindowlessData(
     HANDLE pump_messages_event, gfx::NativeViewId dummy_activation_window) {
   HANDLE pump_messages_event_for_renderer = NULL;
@@ skipping 53 matching lines @@
     // need to be painted asynchronously as per the NPAPI spec.
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&WebPluginProxy::OnPaint,
                    weak_factory_.GetWeakPtr(),
                    damaged_rect_));
     damaged_rect_ = gfx::Rect();
   }
 }
 
-NPObject* WebPluginProxy::GetWindowScriptNPObject() {
-  if (window_npobject_)
-    return window_npobject_;
-
-  int npobject_route_id = channel_->GenerateRouteID();
-  bool success = false;
-  Send(new PluginHostMsg_GetWindowScriptNPObject(
-      route_id_, npobject_route_id, &success));
-  if (!success)
-    return NULL;
-
-  // PluginChannel creates a dummy owner identifier for unknown owners, so
-  // use that.
-  NPP owner = channel_->GetExistingNPObjectOwner(MSG_ROUTING_NONE);
-
-  window_npobject_ = NPObjectProxy::Create(channel_.get(),
-                                           npobject_route_id,
-                                           host_render_view_routing_id_,
-                                           page_url_,
-                                           owner);
-
-  return window_npobject_;
-}
-
-NPObject* WebPluginProxy::GetPluginElement() {
-  if (plugin_element_)
-    return plugin_element_;
-
-  int npobject_route_id = channel_->GenerateRouteID();
-  bool success = false;
-  Send(new PluginHostMsg_GetPluginElement(route_id_, npobject_route_id,
-                                          &success));
-  if (!success)
-    return NULL;
-
-  // PluginChannel creates a dummy owner identifier for unknown owners, so
-  // use that.
-  NPP owner = channel_->GetExistingNPObjectOwner(MSG_ROUTING_NONE);
-
-  plugin_element_ = NPObjectProxy::Create(channel_.get(),
-                                          npobject_route_id,
-                                          host_render_view_routing_id_,
-                                          page_url_,
-                                          owner);
-
-  return plugin_element_;
-}
-
 bool WebPluginProxy::FindProxyForUrl(const GURL& url, std::string* proxy_list) {
   bool result = false;
   Send(new PluginHostMsg_ResolveProxy(route_id_, url, &result, proxy_list));
   return result;
 }
 
 void WebPluginProxy::SetCookie(const GURL& url,
                                const GURL& first_party_for_cookies,
                                const std::string& cookie) {
   Send(new PluginHostMsg_SetCookie(route_id_, url,
@@ skipping 278 matching lines @@
   int input_type;
   gfx::Rect caret_rect;
   if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
     return;
 
   Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
 }
 #endif
 
 }  // namespace content