[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hyatt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 859e2e006289e053c3c6a96bdf59f4006de3bd31
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 04:41:26 2010 +0000

    Make sure there is a lock on serialize in SerializedScriptValueData, since type errors can be created when
    exceptions are thrown.
    
    Reviewed by Oliver Hunt.
    
    * bindings/js/SerializedScriptValue.cpp:
    (WebCore::SerializedScriptValueData::serialize):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 77f0076..07c549a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-26  Dave Hyatt  <hyatt at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Make sure there is a lock on serialize in SerializedScriptValueData, since type errors can be created when
+        exceptions are thrown.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValueData::serialize):
+
 2010-01-26  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index 23a3772..3573e35 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -598,6 +598,7 @@ private:
 
 SerializedScriptValueData SerializedScriptValueData::serialize(ExecState* exec, JSValue inValue)
 {
+    JSLock lock(SilenceAssertionsOnly);
     SerializingTreeWalker context(exec);
     return walk<SerializingTreeWalker>(context, inValue);
 }

-- 
WebKit Debian packaging