Reviewed by Maciej.

        - passed calls that require WebScriptDebugServer across the client interface

        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader _finishedLoading]):
        (-[WebFrameLoader documentLoader:mainReceivedCompleteError:]):
        * Loader/WebFrameLoaderClient.h:
        * WebView/WebFrame.m:
        (-[WebFrame _dispatchDidLoadMainResourceForDocumentLoader:]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dccfcf459d2c4fa7d4eef3c5a739e21a4a88cb2c..bda46c9468529c910587216c40da9aacf656936f 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-09  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - passed calls that require WebScriptDebugServer across the client interface
+
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader _finishedLoading]):
+        (-[WebFrameLoader documentLoader:mainReceivedCompleteError:]):
+        * Loader/WebFrameLoaderClient.h:
+        * WebView/WebFrame.m:
+        (-[WebFrame _dispatchDidLoadMainResourceForDocumentLoader:]):
+
 2006-10-08  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index d2a9876419efbc3c90d2acb9d146746bf881872f..ea6e440e80680ef2b65ba12cbc7d2039cbc73d94 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -47,7 +47,6 @@
 #import "WebNSURLExtras.h"
 #import "WebNSURLRequestExtras.h"
 #import "WebResourcePrivate.h"
-#import "WebScriptDebugServerPrivate.h"
 #import "WebViewInternal.h"
 
 static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
@@ -893,8 +892,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     }
 
     [[self activeDocumentLoader] setPrimaryLoadComplete:YES];
-    if ([WebScriptDebugServer listenerCount])
-        [[WebScriptDebugServer sharedScriptDebugServer] webView:[client webView] didLoadMainResourceForDataSource:[self activeDataSource]];
+    [client _dispatchDidLoadMainResourceForDocumentLoader:[self activeDocumentLoader]];
     [self checkLoadComplete];
 
     [bridge release];
@@ -1259,8 +1257,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 - (void)documentLoader:(WebDocumentLoader *)loader mainReceivedCompleteError:(NSError *)error
 {
     [loader setPrimaryLoadComplete:YES];
-    if ([WebScriptDebugServer listenerCount])
-        [[WebScriptDebugServer sharedScriptDebugServer] webView:[client webView] didLoadMainResourceForDataSource:[self activeDataSource]];
+    [client _dispatchDidLoadMainResourceForDocumentLoader:[self activeDocumentLoader]];
     [self checkLoadComplete];
 }
 

diff --git a/WebKit/Loader/WebFrameLoaderClient.h b/WebKit/Loader/WebFrameLoaderClient.h
index 1b884e6d76e0ab3daf18b88033a632a5dee2214a..002af33223e24272be496e59b30d0183dc355b25 100644 (file)
--- a/WebKit/Loader/WebFrameLoaderClient.h
+++ b/WebKit/Loader/WebFrameLoaderClient.h
@@ -103,4 +103,6 @@ typedef struct LoadErrorResetToken LoadErrorResetToken;
 - (void)_dispatchDecidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request decisionListener:(WebPolicyDecisionListener *)decisionListener;
 - (void)_dispatchUnableToImplementPolicyWithError:(NSError *)error;
 
+- (void)_dispatchDidLoadMainResourceForDocumentLoader:(WebDocumentLoader *)loader;
+
 @end

diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m
index f8ea2af6447c3203d56b1690f4d77c41762e463d..16149fe9bc12d080acbb3960813063bf64161fd2 100644 (file)
--- a/WebKit/WebView/WebFrame.m
+++ b/WebKit/WebView/WebFrame.m
@@ -62,6 +62,7 @@
 #import "WebResourceLoadDelegate.h"
 #import "WebResourcePrivate.h"
 #import "WebScriptDebugDelegatePrivate.h"
+#import "WebScriptDebugServerPrivate.h"
 #import "WebUIDelegate.h"
 #import "WebViewInternal.h"
 #import <WebKit/DOM.h>
@@ -1882,4 +1883,11 @@ static inline WebDataSource *dataSource(WebDocumentLoader *loader)
     [[[[self frameView] _scrollView] contentView] setCopiesOnScroll:YES];
 }
 
+- (void)_dispatchDidLoadMainResourceForDocumentLoader:(WebDocumentLoader *)loader
+{
+    if ([WebScriptDebugServer listenerCount])
+        [[WebScriptDebugServer sharedScriptDebugServer] webView:[self webView]
+            didLoadMainResourceForDataSource:dataSource(loader)];
+}
+
 @end