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

[sfalken at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 18e1477d558dad3e4014760fc6d836ff053269fa
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 18:50:40 2009 +0000

    WebKit clients that don't implement didClearWindowObjectForFrameInScriptWorld should fall back to didClearWindowObject
    https://bugs.webkit.org/show_bug.cgi?id=31986
    
    Reviewed by Adam Roben.
    
    * WebFrame.cpp:
    (WebFrame::dispatchDidClearWindowObjectInWorld): Fall back if E_NOTIMPL returned.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index d76d4b2..f18a808 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-30  Steve Falkenburg  <sfalken at apple.com>
+
+        Reviewed by Adam Roben.
+
+        WebKit clients that don't implement didClearWindowObjectForFrameInScriptWorld should fall back to didClearWindowObject
+        https://bugs.webkit.org/show_bug.cgi?id=31986
+
+        * WebFrame.cpp:
+        (WebFrame::dispatchDidClearWindowObjectInWorld): Fall back if E_NOTIMPL returned.
+
 2009-11-24  Chris Marrin  <cmarrin at apple.com>
 
         Another Windows build fix
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 3c6db59..eea4bdb 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1731,10 +1731,8 @@ void WebFrame::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
         return;
 
     COMPtr<IWebFrameLoadDelegatePrivate2> delegatePrivate(Query, frameLoadDelegate);
-    if (delegatePrivate) {
-        delegatePrivate->didClearWindowObjectForFrameInScriptWorld(d->webView, this, WebScriptWorld::findOrCreateWorld(world).get());
+    if (delegatePrivate && delegatePrivate->didClearWindowObjectForFrameInScriptWorld(d->webView, this, WebScriptWorld::findOrCreateWorld(world).get()) != E_NOTIMPL)
         return;
-    }
 
     if (world != mainThreadNormalWorld())
         return;

-- 
WebKit Debian packaging