[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:54 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5fb873c33ee65f500614b99e1a983406e8782bb0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Apr 1 20:46:23 2002 +0000
Added more logging to show time of layouts.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@921 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 59e0f5c..4647cd8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-04-01 Richard Williamson <rjw at apple.com>
+
+ Added more logging to show time of layouts.
+
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame
+ _transitionProvisionalToLayoutAcceptable]), (-[IFWebFrame _timedLayout:]),
+ (-[IFWebFrame _isLoadComplete]):
+ * WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]), (-[IFWebView
+ layout]):
+
2002-04-01 Darin Adler <darin at apple.com>
Added operations for JavaScript objects. Not sure if this was the best
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 59e0f5c..4647cd8 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-04-01 Richard Williamson <rjw at apple.com>
+
+ Added more logging to show time of layouts.
+
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame
+ _transitionProvisionalToLayoutAcceptable]), (-[IFWebFrame _timedLayout:]),
+ (-[IFWebFrame _isLoadComplete]):
+ * WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]), (-[IFWebView
+ layout]):
+
2002-04-01 Darin Adler <darin at apple.com>
Added operations for JavaScript objects. Not sure if this was the best
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
index 68f12e6..fc206c6 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -67,5 +67,5 @@ typedef enum {
- (void)_checkLoadCompleteResource: (NSString *)resourceDescription error: (IFError *)error isMainDocument: (BOOL)flag;
- (void)_clearErrors;
- (void)_setMainDocumentError: (IFError *)error;
-- (void)_initialLayout: userInfo;
+- (void)_timedLayout: userInfo;
@end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 592a367..175eac0 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -137,14 +137,14 @@ char *stateNames[6] = {
// ahead and schedule a layout.
timeSinceStart = (CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
if (timeSinceStart > (double)defaultTimedDelay){
- WEBKITDEBUGLEVEL2 (WEBKIT_LOG_LOADING, "performing early layout because commit time, %f, exceeded initial layout interval %f\n", timeSinceStart, defaultTimedDelay);
- [self _initialLayout: nil];
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "performing early layout because commit time, %f, exceeded initial layout interval %f\n", timeSinceStart, defaultTimedDelay);
+ [self _timedLayout: nil];
}
else {
NSTimeInterval timedDelay = defaultTimedDelay - timeSinceStart;
- WEBKITDEBUGLEVEL2 (WEBKIT_LOG_LOADING, "registering delayed layout after %f seconds, time since start %f\n", timedDelay, timeSinceStart);
- [NSTimer scheduledTimerWithTimeInterval:timedDelay target:self selector: @selector(_initialLayout:) userInfo: nil repeats:FALSE];
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "registering delayed layout after %f seconds, time since start %f\n", timedDelay, timeSinceStart);
+ [NSTimer scheduledTimerWithTimeInterval:timedDelay target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
}
}
break;
@@ -225,19 +225,19 @@ char *stateNames[6] = {
}
-- (void)_initialLayout: userInfo
+- (void)_timedLayout: userInfo
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- WEBKITDEBUGLEVEL2 (WEBKIT_LOG_LOADING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
if (data->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
- WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "%s: performing initial layout\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
[[self view] setNeedsLayout: YES];
[[self view] setNeedsDisplay: YES];
}
else {
- WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "%s: timed initial layout not required\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
}
@@ -327,15 +327,16 @@ char *stateNames[6] = {
[thisView setNeedsDisplay: YES];
if ([thisView _frameScrollView])
[[thisView _frameScrollView] setNeedsDisplay: YES];
-
+
+ // Force a relayout and draw NOW if we are complete are the top level.
if ([[self controller] mainFrame] == self){
[mainView layout];
-
- [[self dataSource] _part]->gotoBaseAnchor();
-
[mainView display];
}
-
+
+ // Jump to anchor point, if necessary.
+ [[self dataSource] _part]->gotoBaseAnchor();
+
[[self controller] locationChangeDone: [self mainDocumentError] forFrame: self];
return;
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 5b64745..48d33aa 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -115,22 +115,21 @@
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)->needsToApplyStyles){
+#ifdef _KWQ_TIMING
+ double start = CFAbsoluteTimeGetCurrent();
+#endif
widget->part()->xmlDocImpl()->recalcStyle(DOM::NodeImpl::Force);
((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles = NO;
- }
- }
-
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s apply style seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
+ }
+ }
+
}
@@ -141,25 +140,25 @@
{
KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
+ if (widget->part()->xmlDocImpl() &&
+ widget->part()->xmlDocImpl()->renderer()){
+ if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
- if (widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
- if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
//double start = CFAbsoluteTimeGetCurrent();
widget->layout();
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
- }
- }
-
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
+ }
+ }
+
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 68f12e6..fc206c6 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -67,5 +67,5 @@ typedef enum {
- (void)_checkLoadCompleteResource: (NSString *)resourceDescription error: (IFError *)error isMainDocument: (BOOL)flag;
- (void)_clearErrors;
- (void)_setMainDocumentError: (IFError *)error;
-- (void)_initialLayout: userInfo;
+- (void)_timedLayout: userInfo;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 592a367..175eac0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -137,14 +137,14 @@ char *stateNames[6] = {
// ahead and schedule a layout.
timeSinceStart = (CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
if (timeSinceStart > (double)defaultTimedDelay){
- WEBKITDEBUGLEVEL2 (WEBKIT_LOG_LOADING, "performing early layout because commit time, %f, exceeded initial layout interval %f\n", timeSinceStart, defaultTimedDelay);
- [self _initialLayout: nil];
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "performing early layout because commit time, %f, exceeded initial layout interval %f\n", timeSinceStart, defaultTimedDelay);
+ [self _timedLayout: nil];
}
else {
NSTimeInterval timedDelay = defaultTimedDelay - timeSinceStart;
- WEBKITDEBUGLEVEL2 (WEBKIT_LOG_LOADING, "registering delayed layout after %f seconds, time since start %f\n", timedDelay, timeSinceStart);
- [NSTimer scheduledTimerWithTimeInterval:timedDelay target:self selector: @selector(_initialLayout:) userInfo: nil repeats:FALSE];
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "registering delayed layout after %f seconds, time since start %f\n", timedDelay, timeSinceStart);
+ [NSTimer scheduledTimerWithTimeInterval:timedDelay target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
}
}
break;
@@ -225,19 +225,19 @@ char *stateNames[6] = {
}
-- (void)_initialLayout: userInfo
+- (void)_timedLayout: userInfo
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- WEBKITDEBUGLEVEL2 (WEBKIT_LOG_LOADING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
if (data->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
- WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "%s: performing initial layout\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
[[self view] setNeedsLayout: YES];
[[self view] setNeedsDisplay: YES];
}
else {
- WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "%s: timed initial layout not required\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
}
@@ -327,15 +327,16 @@ char *stateNames[6] = {
[thisView setNeedsDisplay: YES];
if ([thisView _frameScrollView])
[[thisView _frameScrollView] setNeedsDisplay: YES];
-
+
+ // Force a relayout and draw NOW if we are complete are the top level.
if ([[self controller] mainFrame] == self){
[mainView layout];
-
- [[self dataSource] _part]->gotoBaseAnchor();
-
[mainView display];
}
-
+
+ // Jump to anchor point, if necessary.
+ [[self dataSource] _part]->gotoBaseAnchor();
+
[[self controller] locationChangeDone: [self mainDocumentError] forFrame: self];
return;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 5b64745..48d33aa 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -115,22 +115,21 @@
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)->needsToApplyStyles){
+#ifdef _KWQ_TIMING
+ double start = CFAbsoluteTimeGetCurrent();
+#endif
widget->part()->xmlDocImpl()->recalcStyle(DOM::NodeImpl::Force);
((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles = NO;
- }
- }
-
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s apply style seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
+ }
+ }
+
}
@@ -141,25 +140,25 @@
{
KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
+ if (widget->part()->xmlDocImpl() &&
+ widget->part()->xmlDocImpl()->renderer()){
+ if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
#ifdef _KWQ_TIMING
double start = CFAbsoluteTimeGetCurrent();
#endif
- if (widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
- if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
//double start = CFAbsoluteTimeGetCurrent();
widget->layout();
//WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
- }
- }
-
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
+ }
+ }
+
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list