[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 812d44bc23abe24e93661771d451f642f627f3a1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Apr 8 19:39:39 2002 +0000

            Added logs for Shelley to note start and completion of document load.
            -WebKitLogLevel 0x1000.  Also, as a bonus, note time to load.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d0c2f45..28a4411 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-08  Richard Williamson  <rjw at apple.com>
+
+        Added logs for Shelley to note start and completion of document load.
+        -WebKitLogLevel 0x1000.  Also, as a bonus, note time to load.
+        
+	* Misc.subproj/WebKitDebug.h:
+	* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame startLoading]):
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _setState:]):
+
 2002-04-08  Chris Blumenberg  <cblu at apple.com>
 
 	* Plugins.subproj/IFNullPluginView.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d0c2f45..28a4411 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-04-08  Richard Williamson  <rjw at apple.com>
+
+        Added logs for Shelley to note start and completion of document load.
+        -WebKitLogLevel 0x1000.  Also, as a bonus, note time to load.
+        
+	* Misc.subproj/WebKitDebug.h:
+	* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame startLoading]):
+	* WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _setState:]):
+
 2002-04-08  Chris Blumenberg  <cblu at apple.com>
 
 	* Plugins.subproj/IFNullPluginView.h:
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 70b2741..6b45989 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -27,6 +27,7 @@
 #define WEBKIT_LOG_GENERIC_ERROR		0x00000010
 #define WEBKIT_LOG_TIMING			0x00000020
 #define WEBKIT_LOG_LOADING			0x00000040
+#define WEBKIT_LOG_DOCUMENTLOAD			0x00001000
 
 #define WEBKIT_LOG_EVENTS			0x00010000
 #define WEBKIT_LOG_VIEW				0x00020000
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 9440b52..ad20547 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -198,6 +198,9 @@
 {
     IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
     
+    if (self == [[self controller] mainFrame])
+        WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] inputURL] absoluteString] cString]);
+
     // Force refresh is irrelevant, as this will always be the first load.
     // The controller will transition the provisional data source to the
     // committed data source.
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 94c33e5..ab1841b 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -287,6 +287,9 @@ char *stateNames[6] = {
     if ([self controller])
         WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s:  transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[data->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
     
+    if (newState == IFWEBFRAMESTATE_COMPLETE && self == [[self controller] mainFrame])
+        WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
+
     data->state = newState;
 }
 
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 9440b52..ad20547 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -198,6 +198,9 @@
 {
     IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
     
+    if (self == [[self controller] mainFrame])
+        WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] inputURL] absoluteString] cString]);
+
     // Force refresh is irrelevant, as this will always be the first load.
     // The controller will transition the provisional data source to the
     // committed data source.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 94c33e5..ab1841b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -287,6 +287,9 @@ char *stateNames[6] = {
     if ([self controller])
         WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s:  transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[data->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
     
+    if (newState == IFWEBFRAMESTATE_COMPLETE && self == [[self controller] mainFrame])
+        WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
+
     data->state = newState;
 }
 

-- 
WebKit Debian packaging