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

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 59a025e..d64713f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-18  Richard Williamson  <rjw at apple.com>
+
+        Performance measurement.
+        
+	* WebView.subproj/IFWebView.mm: (-[IFWebView layout]), (-[IFWebView drawRect:]):
+
 2002-02-16  Richard Williamson  <rjw at apple.com>
 
 	* WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource controller]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 59a025e..d64713f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-02-18  Richard Williamson  <rjw at apple.com>
+
+        Performance measurement.
+        
+	* WebView.subproj/IFWebView.mm: (-[IFWebView layout]), (-[IFWebView drawRect:]):
+
 2002-02-16  Richard Williamson  <rjw at apple.com>
 
 	* WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource controller]):
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index a059c6c..1382946 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -88,6 +88,12 @@
 - (void)layout
 {
     KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
+
+#define _KWQ_TIMING        
+#ifdef _KWQ_TIMING        
+    double start = CFAbsoluteTimeGetCurrent();
+#endif
+
     if (widget->part()->xmlDocImpl() && 
         widget->part()->xmlDocImpl()->renderer()){
         if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
@@ -97,6 +103,11 @@
             ((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
         }
     }
+
+#ifdef _KWQ_TIMING        
+    double thisTime = CFAbsoluteTimeGetCurrent() - start;
+    WEBKITDEBUGLEVEL2 (0x200, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+#endif
 }
 
 
@@ -263,6 +274,9 @@
     if (widget != 0l){        
         [self layout];
 
+#ifdef _KWQ_TIMING        
+    double start = CFAbsoluteTimeGetCurrent();
+#endif
         QPainter p(widget);    
         
         [self lockFocus];
@@ -293,6 +307,11 @@
 #endif
         
         [self unlockFocus];
+
+#ifdef _KWQ_TIMING        
+    double thisTime = CFAbsoluteTimeGetCurrent() - start;
+    WEBKITDEBUGLEVEL2 (0x200, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+#endif
     }
 }
 
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index a059c6c..1382946 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -88,6 +88,12 @@
 - (void)layout
 {
     KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
+
+#define _KWQ_TIMING        
+#ifdef _KWQ_TIMING        
+    double start = CFAbsoluteTimeGetCurrent();
+#endif
+
     if (widget->part()->xmlDocImpl() && 
         widget->part()->xmlDocImpl()->renderer()){
         if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
@@ -97,6 +103,11 @@
             ((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
         }
     }
+
+#ifdef _KWQ_TIMING        
+    double thisTime = CFAbsoluteTimeGetCurrent() - start;
+    WEBKITDEBUGLEVEL2 (0x200, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+#endif
 }
 
 
@@ -263,6 +274,9 @@
     if (widget != 0l){        
         [self layout];
 
+#ifdef _KWQ_TIMING        
+    double start = CFAbsoluteTimeGetCurrent();
+#endif
         QPainter p(widget);    
         
         [self lockFocus];
@@ -293,6 +307,11 @@
 #endif
         
         [self unlockFocus];
+
+#ifdef _KWQ_TIMING        
+    double thisTime = CFAbsoluteTimeGetCurrent() - start;
+    WEBKITDEBUGLEVEL2 (0x200, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+#endif
     }
 }
 

-- 
WebKit Debian packaging