[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 62bd5d8a93666c20cab6773a8fc13dcecacbc77e
Author: aa at chromium.org <aa at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 03:34:08 2009 +0000

    2009-11-13  Aaron Boodman  <aa at chromium.org>
    
            Unreviewed fix for Chromium build.
    
            * loader/FrameLoaderClient.h:
            (WebCore::FrameLoaderClient::dispatchDidClearWindowObjectInWorld):
            Provide an empty implementation of this method because I don't know
            what it is supposed to do on Chromium.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f1c409d..cfc6302 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Unreviewed fix for Chromium build.
 
+        * loader/FrameLoaderClient.h:
+        (WebCore::FrameLoaderClient::dispatchDidClearWindowObjectInWorld):
+        Provide an empty implementation of this method because I don't know
+        what it is supposed to do on Chromium.
+
+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.
 
diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h
index a42147b..84276a9 100644
--- a/WebCore/loader/FrameLoaderClient.h
+++ b/WebCore/loader/FrameLoaderClient.h
@@ -223,7 +223,7 @@ namespace WebCore {
         virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) = 0;
         virtual String overrideMediaType() const = 0;
 
-        virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*) = 0;
+        virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*) {}
         virtual void documentElementAvailable() = 0;
         virtual void didPerformFirstNavigation() const = 0; // "Navigation" here means a transition from one page to another that ends up in the back/forward list.
 

-- 
WebKit Debian packaging