[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[japhet at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit d7349578ecb8cea0be66258e5a734d0e908d43cd
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 17:15:35 2009 +0000

    2009-10-05  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Allow V8 to throw an exception in _NPN_SetException without worrying about context
            if we don't have enough information to find the correct context.
    
            https://bugs.webkit.org/show_bug.cgi?id=30026
    
            Part of the fix for Chromium's failure of LayouTests/plugins/netscape-throw-exception.html.
    
            * bindings/v8/NPV8Object.cpp:
            (_NPN_SetException): Don't suppress the exception if we can't find the relevant context.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49098 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c84d40..cc7bc02 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-05  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Allow V8 to throw an exception in _NPN_SetException without worrying about context
+        if we don't have enough information to find the correct context.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30026
+
+        Part of the fix for Chromium's failure of LayouTests/plugins/netscape-throw-exception.html.
+
+        * bindings/v8/NPV8Object.cpp: 
+        (_NPN_SetException): Don't suppress the exception if we can't find the relevant context.
+
 2009-10-05  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/bindings/v8/NPV8Object.cpp b/WebCore/bindings/v8/NPV8Object.cpp
index af72bac..7cfaab1 100644
--- a/WebCore/bindings/v8/NPV8Object.cpp
+++ b/WebCore/bindings/v8/NPV8Object.cpp
@@ -400,8 +400,12 @@ bool _NPN_HasMethod(NPP npp, NPObject* npObject, NPIdentifier methodName)
 
 void _NPN_SetException(NPObject* npObject, const NPUTF8 *message)
 {
-    if (npObject->_class != npScriptObjectClass)
+    if (npObject->_class != npScriptObjectClass) {
+        // We won't be able to find a proper scope for this exception, so just throw it.
+        // This is consistent with JSC, which throws a global exception all the time.
+        V8Proxy::throwError(V8Proxy::GeneralError, message);
         return;
+    }
     v8::HandleScope handleScope;
     v8::Handle<v8::Context> context = toV8Context(0, npObject);
     if (context.IsEmpty())

-- 
WebKit Debian packaging