[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 7911435046428c42e0f2271d5b8c3716777e06fe
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 23:52:31 2010 +0000

    plugins/npruntime/invoke-failure.html fails in WebKit2 due to slightly different exception being thrown
    https://bugs.webkit.org/show_bug.cgi?id=46715
    <rdar://problem/8485909>
    
    Reviewed by Darin Adler.
    
    WebCore:
    
    Remove exclamation points from exceptions.
    
    * bindings/v8/V8NPObject.cpp:
    (WebCore::npObjectInvokeImpl):
    * bridge/c/c_instance.cpp:
    (JSC::Bindings::CInstance::invokeMethod):
    (JSC::Bindings::CInstance::invokeDefaultMethod):
    (JSC::Bindings::CInstance::invokeConstruct):
    
    LayoutTests:
    
    Remove exclamation point.
    
    * plugins/npruntime/invoke-failure-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 58ab56a..08f40fb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-29  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Darin Adler.
+
+        plugins/npruntime/invoke-failure.html fails in WebKit2 due to slightly different exception being thrown
+        https://bugs.webkit.org/show_bug.cgi?id=46715
+        <rdar://problem/8485909>
+
+        Remove exclamation point.
+
+        * plugins/npruntime/invoke-failure-expected.txt:
+
 2010-09-29  Chris Fleizach  <cfleizach at apple.com>
 
         Unreviewed. Update test results.
diff --git a/LayoutTests/plugins/npruntime/invoke-failure-expected.txt b/LayoutTests/plugins/npruntime/invoke-failure-expected.txt
index d996eeb..baf5262 100644
--- a/LayoutTests/plugins/npruntime/invoke-failure-expected.txt
+++ b/LayoutTests/plugins/npruntime/invoke-failure-expected.txt
@@ -1,2 +1,2 @@
 
-SUCCESS: Exception caught: Error: Error calling method on NPObject!
+SUCCESS: Exception caught: Error: Error calling method on NPObject.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6408d2d..a08ff24 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -20,6 +20,23 @@
 
         Reviewed by Darin Adler.
 
+        plugins/npruntime/invoke-failure.html fails in WebKit2 due to slightly different exception being thrown
+        https://bugs.webkit.org/show_bug.cgi?id=46715
+        <rdar://problem/8485909>
+
+        Remove exclamation points from exceptions.
+
+        * bindings/v8/V8NPObject.cpp:
+        (WebCore::npObjectInvokeImpl):
+        * bridge/c/c_instance.cpp:
+        (JSC::Bindings::CInstance::invokeMethod):
+        (JSC::Bindings::CInstance::invokeDefaultMethod):
+        (JSC::Bindings::CInstance::invokeConstruct):
+
+2010-09-29  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Darin Adler.
+
         Add additional check to Text::wholeText.
         <rdar://problem/8304795>
 
diff --git a/WebCore/bindings/v8/V8NPObject.cpp b/WebCore/bindings/v8/V8NPObject.cpp
index 7f2051e..0b1d25e 100644
--- a/WebCore/bindings/v8/V8NPObject.cpp
+++ b/WebCore/bindings/v8/V8NPObject.cpp
@@ -131,7 +131,7 @@ static v8::Handle<v8::Value> npObjectInvokeImpl(const v8::Arguments& args, Invok
     }
 
     if (!retval)
-        throwError("Error calling method on NPObject!", V8Proxy::GeneralError);
+        throwError("Error calling method on NPObject.", V8Proxy::GeneralError);
 
     for (int i = 0; i < numArgs; i++)
         _NPN_ReleaseVariantValue(&npArgs[i]);
diff --git a/WebCore/bridge/c/c_instance.cpp b/WebCore/bridge/c/c_instance.cpp
index 2db009e..03e72fc 100644
--- a/WebCore/bridge/c/c_instance.cpp
+++ b/WebCore/bridge/c/c_instance.cpp
@@ -165,7 +165,7 @@ JSValue CInstance::invokeMethod(ExecState* exec, RuntimeMethod* runtimeMethod)
     }
     
     if (!retval)
-        throwError(exec, createError(exec, "Error calling method on NPObject!"));
+        throwError(exec, createError(exec, "Error calling method on NPObject."));
 
     for (i = 0; i < count; i++)
         _NPN_ReleaseVariantValue(&cArgs[i]);
@@ -200,7 +200,7 @@ JSValue CInstance::invokeDefaultMethod(ExecState* exec)
     }
     
     if (!retval)
-        throwError(exec, createError(exec, "Error calling method on NPObject!"));
+        throwError(exec, createError(exec, "Error calling method on NPObject."));
 
     for (i = 0; i < count; i++)
         _NPN_ReleaseVariantValue(&cArgs[i]);
@@ -239,7 +239,7 @@ JSValue CInstance::invokeConstruct(ExecState* exec, const ArgList& args)
     }
     
     if (!retval)
-        throwError(exec, createError(exec, "Error calling method on NPObject!"));
+        throwError(exec, createError(exec, "Error calling method on NPObject."));
 
     for (i = 0; i < count; i++)
         _NPN_ReleaseVariantValue(&cArgs[i]);

-- 
WebKit Debian packaging