[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jhoneycutt at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 6dc57094c42333a83bca049179bdaec720b3732b
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 21 21:32:09 2009 +0000

    2009-11-21  Jon Honeycutt  <jhoneycutt at apple.com>
    
            Windows build fix. Unreviewed.
    
            * Interfaces/IWebSerializedJSValue.idl:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index a234a2e..2eb60a8 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-21  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Windows build fix. Unreviewed.
+
+        * Interfaces/IWebSerializedJSValue.idl:
+
 2009-11-20  Jon Honeycutt  <jhoneycutt at apple.com>
 
         DOMElement::tagName() is unimplemented
diff --git a/WebKit/win/Interfaces/IWebSerializedJSValue.idl b/WebKit/win/Interfaces/IWebSerializedJSValue.idl
index c59a0c5..eddef62 100644
--- a/WebKit/win/Interfaces/IWebSerializedJSValue.idl
+++ b/WebKit/win/Interfaces/IWebSerializedJSValue.idl
@@ -35,6 +35,6 @@ import "JavaScriptCoreAPITypes.idl";
     pointer_default(unique)
 ]
 interface IWebSerializedJSValue : IUnknown {
-    [local] HRESULT serialize([in] JSContextRef context, [in] JSValueRef value, [out, retval] JSException* exception);
+    [local] HRESULT serialize([in] JSContextRef context, [in] JSValueRef value, [out, retval] JSValueRef* exception);
     [local] HRESULT deserialize([in] JSContextRef context, [out, retval] JSValueRef* value);
 }

-- 
WebKit Debian packaging