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

[aa at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit cfc4fa0476346129a9707174bf4657fefa069d4e
Author: aa at chromium.org <aa at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 03:11:06 2009 +0000

    2009-11-13  Aaron Boodman  <aa at chromium.org>
    
            Unreviewed fix for Chromium build.
    
            * loader/FrameLoader.h: Make dispatchDidClearWindowObjectsInAllWorlds()
            public, as Chromium's V8Proxy calls it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50991 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 51dd2d0..f1c409d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-13  Aaron Boodman  <aa at chromium.org>
 
+        Unreviewed fix for Chromium build.
+
+        * loader/FrameLoader.h: Make dispatchDidClearWindowObjectsInAllWorlds()
+        public, as Chromium's V8Proxy calls it.
+
+2009-11-13  Aaron Boodman  <aa at chromium.org>
+
         Unreviewed fix to Chromium build.
 
         * bindings/v8/ScriptController.cpp:
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index 0059903..216bc53 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -248,6 +248,7 @@ public:
     PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const HashMap<String, String>& args);
 
     void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*);
+    void dispatchDidClearWindowObjectsInAllWorlds();
     void dispatchDocumentElementAvailable();
 
     // Mixed content related functions.
@@ -395,7 +396,6 @@ private:
     bool shouldReloadToHandleUnreachableURL(DocumentLoader*);
 
     void dispatchDidCommitLoad();
-    void dispatchDidClearWindowObjectsInAllWorlds();
 
     void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, PassRefPtr<FormState>); // Calls continueLoadAfterNavigationPolicy
     void load(DocumentLoader*);                                                         // Calls loadWithDocumentLoader   

-- 
WebKit Debian packaging