Reviewed by Darin.

        <rdar://problem/4635311> REGRESSION: WebKit should call windowScriptObjectAvailable before attaching the script debugger

        * WebCoreSupport/WebFrameBridge.m:
        (-[WebFrameBridge windowObjectCleared]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15494 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 77ce854319c53d9f209f65a30cab61bee8c6bb22..3925925fab26f44192f9ec1e16aa34128cf82274 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-17  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+        
+        <rdar://problem/4635311> REGRESSION: WebKit should call windowScriptObjectAvailable before attaching the script debugger
+
+        * WebCoreSupport/WebFrameBridge.m:
+        (-[WebFrameBridge windowObjectCleared]):
+
 2006-07-17  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebKit/WebCoreSupport/WebFrameBridge.m b/WebKit/WebCoreSupport/WebFrameBridge.m
index 4f326345a80752ad3a594c00906c00b852196413..f4f1b7a6d03753031db0c5ebd0f9fafb9097fa7c 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameBridge.m
+++ b/WebKit/WebCoreSupport/WebFrameBridge.m
@@ -1499,11 +1499,11 @@ static id <WebFormDelegate> formDelegate(WebFrameBridge *self)
 - (void)windowObjectCleared
 {
     WebView *wv = [self webView];
+    [[wv _frameLoadDelegateForwarder] webView:wv windowScriptObjectAvailable:[self windowScriptObject]];
     if ([wv scriptDebugDelegate] || [WebScriptDebugServer listenerCount]) {
         [_frame _detachScriptDebugger]; // FIXME: remove this once <rdar://problem/4608404> is fixed
         [_frame _attachScriptDebugger];
     }
-    [[wv _frameLoadDelegateForwarder] webView:wv windowScriptObjectAvailable:[self windowScriptObject]];
 }
 
 - (int)spellCheckerDocumentTag