Remove support for NPObjects.

content/child/npapi/plugin_host.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/child/npapi/plugin_host.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include "base/command_line.h"
@@ skipping 499 matching lines @@
 NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) {
   // Allows the plugin to query the browser for information
   //
   // Variables:
   //    NPNVxDisplay (unix only)
   //    NPNVxtAppContext (unix only)
   //    NPNVnetscapeWindow (win only) - Gets the native window on which the
   //              plugin drawing occurs, returns HWND
   //    NPNVjavascriptEnabledBool:  tells whether Javascript is enabled
   //    NPNVasdEnabledBool:  tells whether SmartUpdate is enabled
   //    NPNVOfflineBool: tells whether offline-mode is enabled

[Wez, 2016/01/14 21:57:08]

nit: While you're here... this comment seems almost completely out of date - can
we just remove it?

[dcheng, 2016/01/14 22:05:50]

It's probably wrong, but given the size of this patch, I wanted to scope it to
just stuff directly related to NPObject (since Blink stuff is what's blocking
the majority of NPAPI removal).

 
   NPError rv = NPERR_GENERIC_ERROR;
 
   switch (static_cast<int>(variable)) {
-    case NPNVWindowNPObject: {
-      scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin.get()) {
-        NOTREACHED();
-        return NPERR_INVALID_INSTANCE_ERROR;
-      }
-      NPObject *np_object = plugin->webplugin()->GetWindowScriptNPObject();
-      // Return value is expected to be retained, as
-      // described here:
-      // <http://www.mozilla.org/projects/plugins/npruntime.html#browseraccess>
-      if (np_object) {
-        WebBindings::retainObject(np_object);
-        void **v = (void **)value;
-        *v = np_object;
-        rv = NPERR_NO_ERROR;
-      } else {
-        NOTREACHED();
-      }
-      break;
-    }
-    case NPNVPluginElementNPObject: {
-      scoped_refptr<PluginInstance> plugin(FindInstance(id));
-      if (!plugin.get()) {
-        NOTREACHED();
-        return NPERR_INVALID_INSTANCE_ERROR;
-      }
-      NPObject *np_object = plugin->webplugin()->GetPluginElement();
-      // Return value is expected to be retained, as
-      // described here:
-      // <http://www.mozilla.org/projects/plugins/npruntime.html#browseraccess>
-      if (np_object) {
-        WebBindings::retainObject(np_object);
-        void** v = static_cast<void**>(value);
-        *v = np_object;
-        rv = NPERR_NO_ERROR;
-      } else {
-        NOTREACHED();
-      }
-      break;
-    }
+    case NPNVWindowNPObject:
+    case NPNVPluginElementNPObject:
+      return NPERR_INVALID_INSTANCE_ERROR;

[Wez, 2016/01/14 21:57:08]

You're not failing here because the plugin instance is invalid, but because the
browser no longer supports these NPNVariable values - shouldn't you just remove
the cases entirely, so that we'll return NPERR_GENERIC_ERROR?

[dcheng, 2016/01/14 22:05:50]

I'll update this in the next rebasing + update patch.

[Wez, 2016/01/19 17:58:28]

ACK

   #if !defined(OS_MACOSX)  // OS X doesn't have windowed plugins.
     case NPNVnetscapeWindow: {
       scoped_refptr<PluginInstance> plugin = FindInstance(id);
       if (!plugin.get()) {
         NOTREACHED();
         return NPERR_INVALID_INSTANCE_ERROR;
       }
       gfx::PluginWindowHandle handle = plugin->window_handle();
       *((void**)value) = (void*)handle;
       rv = NPERR_NO_ERROR;
@@ skipping 354 matching lines @@
 NPBool NPN_UnfocusInstance(NPP id, NPFocusDirection direction) {
   // TODO: Implement advanced key handling: http://crbug.com/46578
   NOTIMPLEMENTED();
   return false;
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
 }
 
 }  // extern "C"