Reviewed by Tim.

        <rdar://problem/5439953> REGRESSION: Cannot load feeds in widgets in Dashcode due to change in WebKit delegate methods

        * WebView/WebFrame.mm:
        (-[WebFrame _attachScriptDebugger]): Don't create the debugger object if the frame has not yet
        created its script interpreter, to avoid premature dispatch of windowScriptObjectAvailable/Cleared
        delegate methods. The script debugger will be created in any case when the window object does appear.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 20190b2fd7de4d0b43bb97f3e11903119fb8b1fc..9ca70e1e621051b32db6b355fdc7facce3b48206 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2007-08-30  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Tim.
+        
+        <rdar://problem/5439953> REGRESSION: Cannot load feeds in widgets in Dashcode due to change in WebKit delegate methods
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _attachScriptDebugger]): Don't create the debugger object if the frame has not yet
+        created its script interpreter, to avoid premature dispatch of windowScriptObjectAvailable/Cleared
+        delegate methods. The script debugger will be created in any case when the window object does appear.
+
 2007-08-29  Darin Adler  <darin@apple.com>
 
         Reviewed by Tim Hatcher.

diff --git a/WebKit/WebView/WebFrame.mm b/WebKit/WebView/WebFrame.mm
index 432b1a3c64648d10984a5a2f743a5609fe8bec9c..6dcef33f985272f8736819b64f80c7c2cd23acfa 100644 (file)
--- a/WebKit/WebView/WebFrame.mm
+++ b/WebKit/WebView/WebFrame.mm
@@ -365,7 +365,7 @@ WebView *getWebView(WebFrame *webFrame)
 
 - (void)_attachScriptDebugger
 {
-    if (!_private->scriptDebugger)
+    if (!_private->scriptDebugger && core(self)->scriptProxy()->haveInterpreter())
         _private->scriptDebugger = [[WebScriptDebugger alloc] initWithWebFrame:self];
 }