[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:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 56f118d187c035cf8f48b4599ae8623089d6f994
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 4 02:05:23 2002 +0000
Changed name of finalURL to redirectedURL.
Disabled layout after resource load. It appears to really slow us down.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@960 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4595a9d..879251f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
2002-04-03 Richard Williamson <rjw at apple.com>
+ Changed name of finalURL to redirectedURL.
+ Disabled layout after resource load. It appears to really slow us down.
+
+ * WebView.subproj/IFPreferences.mm: (+[IFPreferences load]):
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource redirectedURL]),
+ (-[IFWebDataSource wasRedirected]):
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _isLoadComplete]):
+
+2002-04-03 Richard Williamson <rjw at apple.com>
+
Added support for finalURL and wasRedirected to datasource.
Added additional layouts on resource loads.
Added more implementations of frame related methods in data source.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4595a9d..879251f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
2002-04-03 Richard Williamson <rjw at apple.com>
+ Changed name of finalURL to redirectedURL.
+ Disabled layout after resource load. It appears to really slow us down.
+
+ * WebView.subproj/IFPreferences.mm: (+[IFPreferences load]):
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource redirectedURL]),
+ (-[IFWebDataSource wasRedirected]):
+ * WebView.subproj/IFWebFramePrivate.mm: (-[IFWebFrame _isLoadComplete]):
+
+2002-04-03 Richard Williamson <rjw at apple.com>
+
Added support for finalURL and wasRedirected to datasource.
Added additional layouts on resource loads.
Added more implementations of frame related methods in data source.
diff --git a/WebKit/WebView.subproj/IFPreferences.mm b/WebKit/WebView.subproj/IFPreferences.mm
index 5b54fea..e0408a8 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:TRUE];
+ NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:FALSE];
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@"0x0", WebKitLogLevelPreferenceKey,
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 8d5b408..7dec647 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -145,15 +145,6 @@
/*
=============================================================================
-*/
- at protocol IFWebDataSourceErrorHandler
-- receivedError: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
- at end
-
-
-/*
- =============================================================================
-
A class that implements IFScriptContextHandler provides all the state information
that may be used by Javascript (AppleScript?).
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index bfb907f..393329a 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -98,11 +98,12 @@
- (NSURL *)inputURL;
-// finalURL returns the URL that was actually used. The final URL
-// may be different than the inputURL if the server redirects.
-// <IFLocationChangedHandler> includes a message that is sent when
-// a redirect is processed
-- (NSURL *)finalURL;
+// redirectedURL returns the URL that was actually used if there was a redirect.
+// The value of redirectedURL will change if more than one redirect occurs. If no
+// redirect occurs the value of redirectedURL will be nil. To monitor change in
+// the value of the redirected URL override the <IFLocationChangeHandler>
+// serverRedirectTo:forDataSource: method.
+- (NSURL *)redirectedURL;
// Returns true if the inputURL has been redirected by the server,
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 312ac6f..9468536 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -165,17 +165,17 @@ static id IFWebDataSourceMake(void *url)
// may be different than the inputURL if the server redirects.
// <IFLocationChangedHandler> includes a message that is sent when
// a redirect is processed
-- (NSURL *)finalURL
+- (NSURL *)redirectedURL
{
return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->finalURL;
}
// Returns true if the inputURL has been redirected by the server,
-// i.e. inputURL != finalURL.
+// i.e. inputURL != redirectedURL.
- (BOOL)wasRedirected
{
- return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL isEqual: [self finalURL]];
+ return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL isEqual: [self redirectedURL]];
}
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index f212f54..49bbf7a 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -367,7 +367,7 @@ char *stateNames[6] = {
return;
}
- // A resource was loaded, but not the entire frame isn't complete. Schedule a
+ // A resource was loaded, but the entire frame isn't complete. Schedule a
// layout.
else {
if ([self _state] == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 8d5b408..7dec647 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -145,15 +145,6 @@
/*
=============================================================================
-*/
- at protocol IFWebDataSourceErrorHandler
-- receivedError: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
- at end
-
-
-/*
- =============================================================================
-
A class that implements IFScriptContextHandler provides all the state information
that may be used by Javascript (AppleScript?).
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index bfb907f..393329a 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -98,11 +98,12 @@
- (NSURL *)inputURL;
-// finalURL returns the URL that was actually used. The final URL
-// may be different than the inputURL if the server redirects.
-// <IFLocationChangedHandler> includes a message that is sent when
-// a redirect is processed
-- (NSURL *)finalURL;
+// redirectedURL returns the URL that was actually used if there was a redirect.
+// The value of redirectedURL will change if more than one redirect occurs. If no
+// redirect occurs the value of redirectedURL will be nil. To monitor change in
+// the value of the redirected URL override the <IFLocationChangeHandler>
+// serverRedirectTo:forDataSource: method.
+- (NSURL *)redirectedURL;
// Returns true if the inputURL has been redirected by the server,
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 312ac6f..9468536 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -165,17 +165,17 @@ static id IFWebDataSourceMake(void *url)
// may be different than the inputURL if the server redirects.
// <IFLocationChangedHandler> includes a message that is sent when
// a redirect is processed
-- (NSURL *)finalURL
+- (NSURL *)redirectedURL
{
return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->finalURL;
}
// Returns true if the inputURL has been redirected by the server,
-// i.e. inputURL != finalURL.
+// i.e. inputURL != redirectedURL.
- (BOOL)wasRedirected
{
- return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL isEqual: [self finalURL]];
+ return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL isEqual: [self redirectedURL]];
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f212f54..49bbf7a 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -367,7 +367,7 @@ char *stateNames[6] = {
return;
}
- // A resource was loaded, but not the entire frame isn't complete. Schedule a
+ // A resource was loaded, but the entire frame isn't complete. Schedule a
// layout.
else {
if ([self _state] == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE){
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 5b54fea..e0408a8 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:TRUE];
+ NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:FALSE];
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
@"0x0", WebKitLogLevelPreferenceKey,
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 8d5b408..7dec647 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -145,15 +145,6 @@
/*
=============================================================================
-*/
- at protocol IFWebDataSourceErrorHandler
-- receivedError: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
- at end
-
-
-/*
- =============================================================================
-
A class that implements IFScriptContextHandler provides all the state information
that may be used by Javascript (AppleScript?).
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list