Changeset 64449 in webkit

Timestamp:

Aug 1, 2010 4:05:55 PM (14 years ago)

Author:

andersca@apple.com

Message:

Implement NPN_SetException
​https://bugs.webkit.org/show_bug.cgi?id=43320

Reviewed by Sam Weinig.

• WebProcess/Plugins/JSNPObject.cpp:

(WebKit::JSNPObject::callConstructor):
(WebKit::JSNPObject::put):
(WebKit::JSNPObject::getOwnPropertyNames):
(WebKit::JSNPObject::propertyGetter):
Call NPRuntimeObjectMap::moveGlobalExceptionToExecState.

• WebProcess/Plugins/NPRuntimeObjectMap.cpp:

(WebKit::globalExceptionString):
Add static global.

(WebKit::NPRuntimeObjectMap::setGlobalException):
Set the global exception string.

(WebKit::NPRuntimeObjectMap::moveGlobalExceptionToExecState):
Create an error from the exception string.

• WebProcess/Plugins/NPRuntimeObjectMap.h:
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:

(WebKit::NPN_SetException):
Call NetscapePlugin::setException.

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::setException):
Call NPRuntimeObjectMap::setGlobalException.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/JSNPObject.cpp (modified) (4 diffs)
• WebProcess/Plugins/NPRuntimeObjectMap.cpp (modified) (2 diffs)
• WebProcess/Plugins/NPRuntimeObjectMap.h (modified) (2 diffs)
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (2 diffs)
• WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-08-01  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement NPN_SetException
+        https://bugs.webkit.org/show_bug.cgi?id=43320
+
+        * WebProcess/Plugins/JSNPObject.cpp:
+        (WebKit::JSNPObject::callConstructor):
+        (WebKit::JSNPObject::put):
+        (WebKit::JSNPObject::getOwnPropertyNames):
+        (WebKit::JSNPObject::propertyGetter):
+        Call NPRuntimeObjectMap::moveGlobalExceptionToExecState.
+
+        * WebProcess/Plugins/NPRuntimeObjectMap.cpp:
+        (WebKit::globalExceptionString):
+        Add static global.
+
+        (WebKit::NPRuntimeObjectMap::setGlobalException):
+        Set the global exception string.
+
+        (WebKit::NPRuntimeObjectMap::moveGlobalExceptionToExecState):
+        Create an error from the exception string.
+
+        * WebProcess/Plugins/NPRuntimeObjectMap.h:
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_SetException):
+        Call NetscapePlugin::setException.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::setException):
+        Call NPRuntimeObjectMap::setGlobalException.
+
 2010-08-01  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/Plugins/JSNPObject.cpp

@@ -152 +152 @@
         JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
         returnValue = m_npObject->_class->construct(m_npObject, arguments.data(), argumentCount, &result);
-
-        // FIXME: Handle construct setting an exception.
+        NPRuntimeObjectMap::moveGlobalExceptionToExecState(exec);
+        
         // FIXME: Find out what happens if calling construct causes the plug-in to go away.
     }
@@ -274 +274 @@
         m_npObject->_class->setProperty(m_npObject, npIdentifier, &variant);
 
-        // FIXME: Handle setProperty setting an exception.
+        NPRuntimeObjectMap::moveGlobalExceptionToExecState(exec);
+
         // FIXME: Find out what happens if calling setProperty causes the plug-in to go away.
         // FIXME: Should we throw an exception if setProperty returns false?
@@ -298 +299 @@
         JSLock::DropAllLocks dropAllLocks(SilenceAssertionsOnly);
 
-        // FIXME: Handle enumerate setting an exception.
         // FIXME: Find out what happens if calling enumerate causes the plug-in to go away.
         // FIXME: Should we throw an exception if enumerate returns false?
         if (!m_npObject->_class->enumerate(m_npObject, &identifiers, &identifierCount))
             return;
+
+        NPRuntimeObjectMap::moveGlobalExceptionToExecState(exec);
     }
 
@@ -343 +345 @@
         returnValue = thisObj->m_npObject->_class->getProperty(thisObj->m_npObject, npIdentifier, &result);
         
-        // FIXME: Handle getProperty setting an exception.
+        NPRuntimeObjectMap::moveGlobalExceptionToExecState(exec);
+
         // FIXME: Find out what happens if calling getProperty causes the plug-in to go away.
     }

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp

@@ -31 +31 @@
 #include "NotImplemented.h"
 #include "PluginView.h"
+#include <JavaScriptCore/Error.h>
 #include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/SourceCode.h>
@@ -235 +236 @@
 }
 
+static String& globalExceptionString()
+{
+    DEFINE_STATIC_LOCAL(String, exceptionString, ());
+    return exceptionString;
+}
+
+void NPRuntimeObjectMap::setGlobalException(const String& exceptionString)
+{
+    globalExceptionString() = exceptionString;
+}
+    
+void NPRuntimeObjectMap::moveGlobalExceptionToExecState(ExecState* exec)
+{
+    if (globalExceptionString().isNull())
+        return;
+
+    {
+        JSLock lock(SilenceAssertionsOnly);
+        throwError(exec, createError(exec, stringToUString(globalExceptionString())));
+    }
+    
+    globalExceptionString() = String();
+}
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h

@@ -66 +66 @@
     JSC::JSValue convertNPVariantToJSValue(JSC::ExecState*, JSC::JSGlobalObject*, const NPVariant&);
 
-    bool evaluate(NPObject*, const WebCore::String&scriptString, NPVariant* result);
+    bool evaluate(NPObject*, const WebCore::String& scriptString, NPVariant* result);
 
     // Called when the plug-in is destroyed. Will invalidate all the NPObjects.
@@ -73 +73 @@
     JSC::JSGlobalObject* globalObject() const;
     JSC::ExecState* globalExec() const;
+
+    static void setGlobalException(const WebCore::String& exceptionString);
+    static void moveGlobalExceptionToExecState(JSC::ExecState*);
 
 private:

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

@@ -620 +620 @@
 }
 
-static void NPN_SetException(NPObject* npobj, const NPUTF8* message)
-{
-    notImplemented();
+static void NPN_SetException(NPObject*, const NPUTF8* message)
+{
+    NetscapePlugin::setException(message);
 }
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -26 +26 @@
 #include "NetscapePlugin.h"
 
+#include "NPRuntimeObjectMap.h"
 #include "NetscapePluginStream.h"
 #include "PluginController.h"
@@ -149 +150 @@
 }
 
+void NetscapePlugin::setException(const String& exceptionString)
+{
+    // FIXME: If the plug-in is running in its own process, this needs to send a CoreIPC message instead of
+    // calling the runtime object map directly.
+    NPRuntimeObjectMap::setGlobalException(exceptionString);
+}
+
 bool NetscapePlugin::evaluate(NPObject* npObject, const String& scriptString, NPVariant* result)
 {

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -61 +61 @@
     NPError destroyStream(NPStream*, NPReason);
     void setStatusbarText(const WebCore::String&);
+    static void setException(const WebCore::String&);
     bool evaluate(NPObject*, const WebCore::String&scriptString, NPVariant* result);