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

[hyatt at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 0cb6f3306639ea357e3b87626042d474f0fa92db
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 18:24:20 2010 +0000

    Build bustage fix. Make sure the newly added scriptWorldForGlobalContext function is [local] in the IDL.
    
    * Interfaces/IWebScriptWorld.idl:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53473 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 96cc7d8..6443ac5 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,11 @@
 2010-01-19  Dave Hyatt  <hyatt at apple.com>
 
+        Build bustage fix. Make sure the newly added scriptWorldForGlobalContext function is [local] in the IDL.
+
+        * Interfaces/IWebScriptWorld.idl:
+
+2010-01-19  Dave Hyatt  <hyatt at apple.com>
+
         Reviewed by Adam Roben.
 
         Add an API to obtain a WebScriptWorld from a JSGlobalContextRef.
diff --git a/WebKit/win/Interfaces/IWebScriptWorld.idl b/WebKit/win/Interfaces/IWebScriptWorld.idl
index 1c79199..bd8012d 100644
--- a/WebKit/win/Interfaces/IWebScriptWorld.idl
+++ b/WebKit/win/Interfaces/IWebScriptWorld.idl
@@ -36,5 +36,5 @@ import "JavaScriptCoreAPITypes.idl";
 ]
 interface IWebScriptWorld : IUnknown {
     HRESULT standardWorld([out, retval] IWebScriptWorld**);
-    HRESULT scriptWorldForGlobalContext([in] JSGlobalContextRef, [out, retval] IWebScriptWorld**);
+    [local] HRESULT scriptWorldForGlobalContext([in] JSGlobalContextRef, [out, retval] IWebScriptWorld**);
 }

-- 
WebKit Debian packaging