[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 967380c0974b5c2a783f190e14a65bd572f4fbc4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 31 01:41:14 2002 +0000

    Trivial debugging changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@569 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 8c33567..4fcfdb7 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -277,6 +277,7 @@ void KHTMLView::resizeEvent (QResizeEvent* e)
     KApplication::sendPostedEvents(viewport(), QEvent::Paint);
 }
 
+#ifdef KWQ_RENDER_TREE_DEBUG
 static void printLevel(int level){
     while (level--)
         printf ("    ");
@@ -293,7 +294,7 @@ static void printRenderTree(RenderObject *node, int level)
         child = child->nextSibling();
     }
 }
-
+#endif
 
 
 void KHTMLView::drawContents( QPainter *p, int ex, int ey, int ew, int eh )
@@ -311,7 +312,7 @@ void KHTMLView::drawContents( QPainter *p, int ex, int ey, int ew, int eh )
     if (doc){
         ro = doc->renderer();
         if (ro){
-#ifdef RENDER_TREE_DEBUG
+#ifdef KWQ_RENDER_TREE_DEBUG
                 printRenderTree (ro, 0);
 #endif
             ro->print(p, ex, ey, ew, eh, 0, 0);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3f58f64..959aa85 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -634,7 +634,7 @@ void KHTMLPart::write(const char *str, int len)
 #ifdef _KWQ_TIMING        
     double thisTime = CFAbsoluteTimeGetCurrent() - start;
     totalWriteTime += thisTime;
-    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %e, milliseconds = %e, total = %e\n", len, thisTime, totalWriteTime);
+    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %e, total = %e\n", len, thisTime, totalWriteTime);
 #endif
 }
 
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 3f58f64..959aa85 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -634,7 +634,7 @@ void KHTMLPart::write(const char *str, int len)
 #ifdef _KWQ_TIMING        
     double thisTime = CFAbsoluteTimeGetCurrent() - start;
     totalWriteTime += thisTime;
-    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %e, milliseconds = %e, total = %e\n", len, thisTime, totalWriteTime);
+    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %e, total = %e\n", len, thisTime, totalWriteTime);
 #endif
 }
 
diff --git a/WebCore/src/kdelibs/khtml/khtmlview.cpp b/WebCore/src/kdelibs/khtml/khtmlview.cpp
index 8c33567..4fcfdb7 100644
--- a/WebCore/src/kdelibs/khtml/khtmlview.cpp
+++ b/WebCore/src/kdelibs/khtml/khtmlview.cpp
@@ -277,6 +277,7 @@ void KHTMLView::resizeEvent (QResizeEvent* e)
     KApplication::sendPostedEvents(viewport(), QEvent::Paint);
 }
 
+#ifdef KWQ_RENDER_TREE_DEBUG
 static void printLevel(int level){
     while (level--)
         printf ("    ");
@@ -293,7 +294,7 @@ static void printRenderTree(RenderObject *node, int level)
         child = child->nextSibling();
     }
 }
-
+#endif
 
 
 void KHTMLView::drawContents( QPainter *p, int ex, int ey, int ew, int eh )
@@ -311,7 +312,7 @@ void KHTMLView::drawContents( QPainter *p, int ex, int ey, int ew, int eh )
     if (doc){
         ro = doc->renderer();
         if (ro){
-#ifdef RENDER_TREE_DEBUG
+#ifdef KWQ_RENDER_TREE_DEBUG
                 printRenderTree (ro, 0);
 #endif
             ro->print(p, ex, ey, ew, eh, 0, 0);
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 3f58f64..959aa85 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -634,7 +634,7 @@ void KHTMLPart::write(const char *str, int len)
 #ifdef _KWQ_TIMING        
     double thisTime = CFAbsoluteTimeGetCurrent() - start;
     totalWriteTime += thisTime;
-    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %e, milliseconds = %e, total = %e\n", len, thisTime, totalWriteTime);
+    KWQDEBUGLEVEL3 (0x200, "tokenize/parse length = %d, milliseconds = %e, total = %e\n", len, thisTime, totalWriteTime);
 #endif
 }
 

-- 
WebKit Debian packaging