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

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9c0497690ddd13123e8f9b46d7e44682eba13d7c
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 25 17:28:10 2009 +0000

    Add contextForWorldID to the IWebFramePrivate interface.
    
    Reviewed by John Sullivan.
    
    * Interfaces/IWebFramePrivate.idl:
    * WebFrame.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50045 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 8594d2a..a5d4b7e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-25  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Add contextForWorldID to the IWebFramePrivate interface.
+
+        * Interfaces/IWebFramePrivate.idl:
+        * WebFrame.h:
+
 2009-10-25  Sam Weinig  <sam at webkit.org>
 
         Another try at fixing windows.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index a140138..c29ed3d 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -95,4 +95,6 @@ interface IWebFramePrivate : IUnknown
     HRESULT allowsFollowingLink([in] BSTR url, [out, retval] BOOL* result);
 
     HRESULT stringByEvaluatingJavaScriptInIsolatedWorld([in] unsigned worldID, [in] OLE_HANDLE jsGlobalObject, [in] BSTR script, [out, retval] BSTR* result);
+
+    [local] JSGlobalContextRef contextForWorldID([in] unsigned worldID);
 }
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index 1ed2fef..fc3785d 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -153,8 +153,6 @@ public:
         /* [retval][out] */ IDOMElement **formElement);
 
     virtual /* [local] */ JSGlobalContextRef STDMETHODCALLTYPE globalContext();
-    virtual /* [local] */ JSGlobalContextRef STDMETHODCALLTYPE contextForWorldID(
-        /* [in] */ unsigned worldID);
 
     // IWebFramePrivate
     virtual HRESULT STDMETHODCALLTYPE renderTreeAsExternalRepresentation(
@@ -252,6 +250,9 @@ public:
         /* [in] */ BSTR script,
         /* [retval][out] */ BSTR* evaluationResult);
 
+    virtual /* [local] */ JSGlobalContextRef STDMETHODCALLTYPE contextForWorldID(
+        /* [in] */ unsigned worldID);
+
     // IWebDocumentText
     virtual HRESULT STDMETHODCALLTYPE supportsTextEncoding( 
         /* [retval][out] */ BOOL* result);

-- 
WebKit Debian packaging