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

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit f2b0dc8149c8351625118aa58b42a4640f3e6caa
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 14 04:54:15 2009 +0000

    WebCore:
    
    2009-11-13  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Unreviewed, build fix.
    
            [Chromium] Fix build to catch up with http://trac.webkit.org/changeset/50973.
            This is just enough changes to unbreak the port.
    
            * bindings/v8/ScriptController.cpp:
            (WebCore::mainThreadNormalWorld):
            * bindings/v8/V8Proxy.cpp:
            (WebCore::V8Proxy::initContextIfNeeded):
            * loader/FrameLoaderClient.h:
    
    WebKit/chromium:
    
    2009-11-13  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Unreviewed, build fix.
    
            [Chromium] Rename windowObjectCleared to dispatchDidClearWindowObjectInWorld
            to catch up http://trac.webkit.org/changeset/50973.
    
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld):
            * src/FrameLoaderClientImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cfc6302..773d68b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-13  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Unreviewed, build fix.
+
+        [Chromium] Fix build to catch up with http://trac.webkit.org/changeset/50973.
+        This is just enough changes to unbreak the port.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::mainThreadNormalWorld):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::initContextIfNeeded):
+        * loader/FrameLoaderClient.h:
+
 2009-11-13  Aaron Boodman  <aa at chromium.org>
 
         Unreviewed fix for Chromium build.
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index d1c6ff2..59f46d1 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -435,7 +435,8 @@ void ScriptController::updateDocument()
 // FIXME: Stub method so we compile.  Currently called from FrameLoader.cpp.
 DOMWrapperWorld* mainThreadNormalWorld()
 {
-    return 0;
+    DEFINE_STATIC_LOCAL(DOMWrapperWorld, oneWorld, ());
+    return &oneWorld;
 }
 
 } // namespace WebCore
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index bb94465..6969185 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -1109,7 +1109,7 @@ void V8Proxy::initContextIfNeeded()
 
     // FIXME: This is wrong. We should actually do this for the proper world once
     // we do isolated worlds the WebCore way.
-     m_frame->loader()->dispatchDidClearWindowObjectsInAllWorlds();
+    m_frame->loader()->dispatchDidClearWindowObjectInWorld(0);
 }
 
 void V8Proxy::setDOMException(int exceptionCode)
diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h
index 84276a9..a42147b 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*) {}
+        virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*) = 0;
         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.
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9c861c0..0be1886 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-13  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Unreviewed, build fix.
+
+        [Chromium] Rename windowObjectCleared to dispatchDidClearWindowObjectInWorld
+        to catch up http://trac.webkit.org/changeset/50973.
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld):
+        * src/FrameLoaderClientImpl.h:
+
 2009-11-13  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index f0abfb2..4ab6ed8 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -108,7 +108,7 @@ void FrameLoaderClientImpl::frameLoaderDestroyed()
     m_webFrame->deref();
 }
 
-void FrameLoaderClientImpl::windowObjectCleared()
+void FrameLoaderClientImpl::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*)
 {
     if (m_webFrame->client())
         m_webFrame->client()->didClearWindowObject(m_webFrame);
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.h b/WebKit/chromium/src/FrameLoaderClientImpl.h
index d5592f9..2312f72 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.h
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.h
@@ -59,7 +59,7 @@ public:
     // Notifies the WebView delegate that the JS window object has been cleared,
     // giving it a chance to bind native objects to the window before script
     // parsing begins.
-    virtual void windowObjectCleared();
+    virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*);
     virtual void documentElementAvailable();
 
     // A frame's V8 context was created or destroyed.

-- 
WebKit Debian packaging