[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 247fd5b25ed64d381642011c17635cbc09a8d867
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 18 21:21:28 2002 +0000

    Performance measurement.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fe01e67..c9c4826 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-02-18  Richard Williamson  <rjw at apple.com>
+
+        Performance measurement.
+        
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin), (KHTMLPart::write):
+
 2002-02-16  Maciej Stachowiak  <mjs at apple.com>
 
 	Reimplement KURL in terms of CFURL (many workarounds needed to
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fe01e67..c9c4826 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-02-18  Richard Williamson  <rjw at apple.com>
+
+        Performance measurement.
+        
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin), (KHTMLPart::write):
+
 2002-02-16  Maciej Stachowiak  <mjs at apple.com>
 
 	Reimplement KURL in terms of CFURL (many workarounds needed to
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fe01e67..c9c4826 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-02-18  Richard Williamson  <rjw at apple.com>
+
+        Performance measurement.
+        
+	* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin), (KHTMLPart::write):
+
 2002-02-16  Maciej Stachowiak  <mjs at apple.com>
 
 	Reimplement KURL in terms of CFURL (many workarounds needed to
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fee83b6..c5432b9 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -230,6 +230,10 @@ public:
 
     int m_frameNameId;
 
+#ifdef _KWQ_TIMING        
+    double totalWriteTime;
+#endif
+
     KHTMLPartPrivate(KHTMLPart *part)
     {
         if (!cache_init) {
@@ -576,9 +580,6 @@ bool KHTMLPart::onlyLocalReferences() const
     return d->m_onlyLocalReferences;
 }
 
-#ifdef _KWQ_TIMING        
-    static double totalWriteTime = 0;
-#endif
 
 
 
@@ -630,7 +631,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset)
     
     d->m_doc->open();    
 
-    totalWriteTime = 0;
+    d->totalWriteTime = 0;
 }
 
 
@@ -708,8 +709,8 @@ void KHTMLPart::write(const char *str, int len)
 
 #ifdef _KWQ_TIMING        
     double thisTime = CFAbsoluteTimeGetCurrent() - start;
-    totalWriteTime += thisTime;
-    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %f, total = %f\n", len, thisTime, totalWriteTime);
+    d->totalWriteTime += thisTime;
+    KWQDEBUGLEVEL4 (0x200, "%s bytes = %d, seconds = %f, total = %f\n", d->m_url.url().latin1(), len, thisTime, d->totalWriteTime);
 #endif
 
 }
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index fee83b6..c5432b9 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -230,6 +230,10 @@ public:
 
     int m_frameNameId;
 
+#ifdef _KWQ_TIMING        
+    double totalWriteTime;
+#endif
+
     KHTMLPartPrivate(KHTMLPart *part)
     {
         if (!cache_init) {
@@ -576,9 +580,6 @@ bool KHTMLPart::onlyLocalReferences() const
     return d->m_onlyLocalReferences;
 }
 
-#ifdef _KWQ_TIMING        
-    static double totalWriteTime = 0;
-#endif
 
 
 
@@ -630,7 +631,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset)
     
     d->m_doc->open();    
 
-    totalWriteTime = 0;
+    d->totalWriteTime = 0;
 }
 
 
@@ -708,8 +709,8 @@ void KHTMLPart::write(const char *str, int len)
 
 #ifdef _KWQ_TIMING        
     double thisTime = CFAbsoluteTimeGetCurrent() - start;
-    totalWriteTime += thisTime;
-    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %f, total = %f\n", len, thisTime, totalWriteTime);
+    d->totalWriteTime += thisTime;
+    KWQDEBUGLEVEL4 (0x200, "%s bytes = %d, seconds = %f, total = %f\n", d->m_url.url().latin1(), len, thisTime, d->totalWriteTime);
 #endif
 
 }
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index fee83b6..c5432b9 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -230,6 +230,10 @@ public:
 
     int m_frameNameId;
 
+#ifdef _KWQ_TIMING        
+    double totalWriteTime;
+#endif
+
     KHTMLPartPrivate(KHTMLPart *part)
     {
         if (!cache_init) {
@@ -576,9 +580,6 @@ bool KHTMLPart::onlyLocalReferences() const
     return d->m_onlyLocalReferences;
 }
 
-#ifdef _KWQ_TIMING        
-    static double totalWriteTime = 0;
-#endif
 
 
 
@@ -630,7 +631,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset)
     
     d->m_doc->open();    
 
-    totalWriteTime = 0;
+    d->totalWriteTime = 0;
 }
 
 
@@ -708,8 +709,8 @@ void KHTMLPart::write(const char *str, int len)
 
 #ifdef _KWQ_TIMING        
     double thisTime = CFAbsoluteTimeGetCurrent() - start;
-    totalWriteTime += thisTime;
-    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %f, total = %f\n", len, thisTime, totalWriteTime);
+    d->totalWriteTime += thisTime;
+    KWQDEBUGLEVEL4 (0x200, "%s bytes = %d, seconds = %f, total = %f\n", d->m_url.url().latin1(), len, thisTime, d->totalWriteTime);
 #endif
 
 }

-- 
WebKit Debian packaging