[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 06:02:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 06912e1dc8b8d102afdd0ff23819957f721ac52a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 4 18:38:12 2002 +0000
Tuned and re-enabled resource layouts.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c753fe8..a9b1101 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-04 Richard Williamson <rjw at apple.com>
+
+ Tuned and re-enabled resource layouts.
+
+ * WebView.subproj/IFPreferences.mm: (+[IFPreferences load]):
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _scheduleLayout:]),
+ (-[IFWebFrame _timedLayout:]):
+
2002-04-04 Darin Adler <darin at apple.com>
* WebKit.pbproj/project.pbxproj: Add an Unoptimized build
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c753fe8..a9b1101 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-04-04 Richard Williamson <rjw at apple.com>
+
+ Tuned and re-enabled resource layouts.
+
+ * WebView.subproj/IFPreferences.mm: (+[IFPreferences load]):
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _scheduleLayout:]),
+ (-[IFWebFrame _timedLayout:]):
+
2002-04-04 Darin Adler <darin at apple.com>
* WebKit.pbproj/project.pbxproj: Add an Unoptimized build
diff --git a/WebKit/WebView.subproj/IFPreferences.mm b/WebKit/WebView.subproj/IFPreferences.mm
index e0408a8..7587951 100644
--- a/WebKit/WebView.subproj/IFPreferences.mm
+++ b/WebKit/WebView.subproj/IFPreferences.mm
@@ -48,7 +48,7 @@ static IFPreferences *_standardPreferences = nil;
NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
NSNumber *jScriptEnabled = [NSNumber numberWithBool:TRUE];
NSNumber *timedLayoutEnabled = [NSNumber numberWithBool:TRUE];
- NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:FALSE];
+ NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:TRUE];
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@"0x0", WebKitLogLevelPreferenceKey,
@@ -61,7 +61,7 @@ static IFPreferences *_standardPreferences = nil;
@"6", WebKitMinimumFontSizePreferenceKey,
@"1.5", WebKitInitialTimedLayoutDelayPreferenceKey,
@"4096", WebKitInitialTimedLayoutSizePreferenceKey,
- @"1.0", WebKitResourceTimedLayoutDelayPreferenceKey,
+ @"1.5", WebKitResourceTimedLayoutDelayPreferenceKey,
timedLayoutEnabled, WebKitInitialTimedLayoutEnabledPreferenceKey,
resourceTimedLayoutEnabled, WebKitResourceTimedLayoutEnabledPreferenceKey,
fontSizeArray, WebKitFontSizesPreferenceKey,
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
index 1cd002c..feb8bd0 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -37,6 +37,7 @@ typedef enum {
IFWebFrameState state;
NSMutableDictionary *errors;
IFError *mainDocumentError;
+ bool scheduledLayoutPending;
}
- (void)setName: (NSString *)n;
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 49bbf7a..94c33e5 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -131,9 +131,34 @@ char *stateNames[6] = {
- (void)_scheduleLayout: (NSTimeInterval)inSeconds
{
- [NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
+ IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+
+ if (data->scheduledLayoutPending == NO){
+ [NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
+ data->scheduledLayoutPending = YES;
+ }
+}
+
+- (void)_timedLayout: userInfo
+{
+ IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
+
+ data->scheduledLayoutPending = NO;
+ if (data->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
+ if ([self controller])
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ [[self view] setNeedsLayout: YES];
+ [[self view] setNeedsDisplay: YES];
+ }
+ else {
+ if ([self controller])
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ }
}
+
- (void)_transitionProvisionalToLayoutAcceptable
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
@@ -247,24 +272,6 @@ char *stateNames[6] = {
}
-- (void)_timedLayout: userInfo
-{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
-
- if (data->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- [[self view] setNeedsLayout: YES];
- [[self view] setNeedsDisplay: YES];
- }
- else {
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- }
-}
-
- (IFWebFrameState)_state
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 1cd002c..feb8bd0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -37,6 +37,7 @@ typedef enum {
IFWebFrameState state;
NSMutableDictionary *errors;
IFError *mainDocumentError;
+ bool scheduledLayoutPending;
}
- (void)setName: (NSString *)n;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 49bbf7a..94c33e5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -131,9 +131,34 @@ char *stateNames[6] = {
- (void)_scheduleLayout: (NSTimeInterval)inSeconds
{
- [NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
+ IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+
+ if (data->scheduledLayoutPending == NO){
+ [NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
+ data->scheduledLayoutPending = YES;
+ }
+}
+
+- (void)_timedLayout: userInfo
+{
+ IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
+
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
+
+ data->scheduledLayoutPending = NO;
+ if (data->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
+ if ([self controller])
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ [[self view] setNeedsLayout: YES];
+ [[self view] setNeedsDisplay: YES];
+ }
+ else {
+ if ([self controller])
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
+ }
}
+
- (void)_transitionProvisionalToLayoutAcceptable
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
@@ -247,24 +272,6 @@ char *stateNames[6] = {
}
-- (void)_timedLayout: userInfo
-{
- IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
-
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[data->state]);
-
- if (data->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- [[self view] setNeedsLayout: YES];
- [[self view] setNeedsDisplay: YES];
- }
- else {
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- }
-}
-
- (IFWebFrameState)_state
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index e0408a8..7587951 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -48,7 +48,7 @@ static IFPreferences *_standardPreferences = nil;
NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
NSNumber *jScriptEnabled = [NSNumber numberWithBool:TRUE];
NSNumber *timedLayoutEnabled = [NSNumber numberWithBool:TRUE];
- NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:FALSE];
+ NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:TRUE];
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@"0x0", WebKitLogLevelPreferenceKey,
@@ -61,7 +61,7 @@ static IFPreferences *_standardPreferences = nil;
@"6", WebKitMinimumFontSizePreferenceKey,
@"1.5", WebKitInitialTimedLayoutDelayPreferenceKey,
@"4096", WebKitInitialTimedLayoutSizePreferenceKey,
- @"1.0", WebKitResourceTimedLayoutDelayPreferenceKey,
+ @"1.5", WebKitResourceTimedLayoutDelayPreferenceKey,
timedLayoutEnabled, WebKitInitialTimedLayoutEnabledPreferenceKey,
resourceTimedLayoutEnabled, WebKitResourceTimedLayoutEnabledPreferenceKey,
fontSizeArray, WebKitFontSizesPreferenceKey,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list