Revert r3074 due to Mac build bustage

Review URL: http://codereview.chromium.org/6378

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3088 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 22 deletions

diff --git a/webkit/port/bindings/v8/np_v8object.cpp b/webkit/port/bindings/v8/np_v8object.cpp
index 3cb9de1..4387180 100644
--- a/webkit/port/bindings/v8/np_v8object.cpp
+++ b/webkit/port/bindings/v8/np_v8object.cpp
@@ -41,7 +41,6 @@
 #include "v8_np_utils.h"
 #include "v8_proxy.h"
 #include "DOMWindow.h"
-#include "glue/plugins/plugin_instance.h"
 
 using WebCore::V8ClassIndex;
 using WebCore::V8Proxy;
@@ -243,20 +242,6 @@ bool NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args,
 
 bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *npscript,
                   NPVariant *result) {
-  bool popups_allowed = false;
-
-  if (npp) {
-    NPAPI::PluginInstance* plugin_instance =
-        reinterpret_cast<NPAPI::PluginInstance*>(npp->ndata);
-    if (plugin_instance)
-      popups_allowed = plugin_instance->popups_allowed();
-  }
-
-  return NPN_EvaluateHelper(npp, popups_allowed, npobj, npscript, result);
-}
-
-bool NPN_EvaluateHelper(NPP npp, bool popups_allowed, NPObject *npobj,
-                        NPString *npscript, NPVariant *result) {
   VOID_TO_NPVARIANT(*result);
   if (npobj == NULL)
     return false;
@@ -272,13 +257,7 @@ bool NPN_EvaluateHelper(NPP npp, bool popups_allowed, NPObject *npobj,
 
     v8::Context::Scope scope(context);
 
-    // Passing in a NULL filename is the trick used in V8 to indicate
-    // user gesture. See the inline_code/setInlineCode functions in V8Proxy
-    // for more information.
-    WebCore::String filename;
-    if (!popups_allowed)
-      filename = "npscript";
-
+    WebCore::String filename("npscript");
     // Convert UTF-8 stream to WebCore::String.
     WebCore::String script = WebCore::String::fromUTF8(
         npscript->UTF8Characters, npscript->UTF8Length);