Remove support for NPObjects.

third_party/WebKit/Source/web/WebBindings.cpp

Index: third_party/WebKit/Source/web/WebBindings.cpp
diff --git a/third_party/WebKit/Source/web/WebBindings.cpp b/third_party/WebKit/Source/web/WebBindings.cpp
index 40f904dae09975fa5a333b5661b9a6b7059559a9..35d7268f832865aec4cae753877bc13886ac70fe 100644
--- a/third_party/WebKit/Source/web/WebBindings.cpp
+++ b/third_party/WebKit/Source/web/WebBindings.cpp
@@ -30,136 +30,107 @@
 
 #include "public/web/WebBindings.h"
 
-#include "bindings/core/v8/NPV8Object.h"
-#include "bindings/core/v8/npruntime_impl.h"
-#include "bindings/core/v8/npruntime_priv.h"
-
 namespace blink {
 
 bool WebBindings::construct(NPP npp, NPObject* object, const NPVariant* args, uint32_t argCount, NPVariant* result)

[tkent, 2016/03/29 06:01:04]

Don't you remove WebBindings entirely?

[dcheng, 2016/03/29 07:04:15]

I'm planning on trying that in a follow up since this patch is already quite
large. Right now, function pointers to WebBindings methods are set as the
implementation for various NPN functions:
https://code.google.com/p/chromium/codesearch#chromium/src/content/child/npap....

When I looked through the test plugin, it seems like it's probably safe to
delete WebBindings and just set the function pointers to null, but it's also
hard to tell for sure. So for now, I would prefer to defer it to another patch,
if that's OK.

[tkent, 2016/03/29 07:38:57]

Ok, that's fine.

 {
-    return _NPN_Construct(npp, object, args, argCount, result);
+    return false;
 }
 
 NPObject* WebBindings::createObject(NPP npp, NPClass* npClass)
 {
-    return _NPN_CreateObject(npp, npClass);
+    return nullptr;
 }
 
 bool WebBindings::enumerate(NPP npp, NPObject* object, NPIdentifier** identifier, uint32_t* identifierCount)
 {
-    return _NPN_Enumerate(npp, object, identifier, identifierCount);
+    return false;
 }
 
 bool WebBindings::evaluate(NPP npp, NPObject* object, NPString* script, NPVariant* result)
 {
-    return _NPN_Evaluate(npp, object, script, result);
-}
-
-bool WebBindings::evaluateHelper(NPP npp, bool popupsAllowed, NPObject* object, NPString* script, NPVariant* result)
-{
-    return _NPN_EvaluateHelper(npp, popupsAllowed, object, script, result);
+    return false;
 }
 
 NPIdentifier WebBindings::getIntIdentifier(int32_t number)
 {
-    return _NPN_GetIntIdentifier(number);
+    return nullptr;
 }
 
 bool WebBindings::getProperty(NPP npp, NPObject* object, NPIdentifier property, NPVariant* result)
 {
-    return _NPN_GetProperty(npp, object, property, result);
+    return false;
 }
 
 NPIdentifier WebBindings::getStringIdentifier(const NPUTF8* string)
 {
-    return _NPN_GetStringIdentifier(string);
+    return nullptr;
 }
 
 void WebBindings::getStringIdentifiers(const NPUTF8** names, int32_t nameCount, NPIdentifier* identifiers)
 {
-    _NPN_GetStringIdentifiers(names, nameCount, identifiers);
 }
 
 bool WebBindings::hasMethod(NPP npp, NPObject* object, NPIdentifier method)
 {
-    return _NPN_HasMethod(npp, object, method);
+    return false;
 }
 
 bool WebBindings::hasProperty(NPP npp, NPObject* object, NPIdentifier property)
 {
-    return _NPN_HasProperty(npp, object, property);
+    return false;
 }
 
 bool WebBindings::identifierIsString(NPIdentifier identifier)
 {
-    return _NPN_IdentifierIsString(identifier);
+    return false;
 }
 
 int32_t WebBindings::intFromIdentifier(NPIdentifier identifier)
 {
-    return _NPN_IntFromIdentifier(identifier);
+    return 0;
 }
 
 bool WebBindings::invoke(NPP npp, NPObject* object, NPIdentifier method, const NPVariant* args, uint32_t argCount, NPVariant* result)
 {
-    return _NPN_Invoke(npp, object, method, args, argCount, result);
+    return false;
 }
 
 bool WebBindings::invokeDefault(NPP npp, NPObject* object, const NPVariant* args, uint32_t argCount, NPVariant* result)
 {
-    return _NPN_InvokeDefault(npp, object, args, argCount, result);
+    return false;
 }
 
 void WebBindings::releaseObject(NPObject* object)
 {
-    return _NPN_ReleaseObject(object);
 }
 
 void WebBindings::releaseVariantValue(NPVariant* variant)
 {
-    _NPN_ReleaseVariantValue(variant);
 }
 
 bool WebBindings::removeProperty(NPP npp, NPObject* object, NPIdentifier identifier)
 {
-    return _NPN_RemoveProperty(npp, object, identifier);
+    return false;
 }
 
 NPObject* WebBindings::retainObject(NPObject* object)
 {
-    return _NPN_RetainObject(object);
+    return nullptr;
 }
 
 void WebBindings::setException(NPObject* object, const NPUTF8* message)
 {
-    _NPN_SetException(object, message);
 }
 
 bool WebBindings::setProperty(NPP npp, NPObject* object, NPIdentifier identifier, const NPVariant* value)
 {
-    return _NPN_SetProperty(npp, object, identifier, value);
+    return false;
 }
 
 NPUTF8* WebBindings::utf8FromIdentifier(NPIdentifier identifier)
 {
-    return _NPN_UTF8FromIdentifier(identifier);
-}
-
-void WebBindings::extractIdentifierData(const NPIdentifier& identifier, const NPUTF8*& string, int32_t& number, bool& isString)
-{
-    PrivateIdentifier* data = static_cast<PrivateIdentifier*>(identifier);
-    if (!data) {
-        isString = false;
-        number = 0;
-        return;
-    }
-
-    isString = data->isString;
-    if (isString)
-        string = data->value.string;
-    else
-        number = data->value.number;
+    return nullptr;
 }
 
 } // namespace blink