[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:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 69db72a27f58b8f4705c0d12ff85a19e4656f4ef
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 29 19:35:53 2002 +0000
Hooked up redirect. Now we see many more ads. :(
Fixed cancel of main handle for document.
Moved stop before start from frame to data source.
Hooked up redirect.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@897 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fbe9abf..189aa68 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-29 Richard Williamson <rjw at apple.com>
+
+ Hooked up redirect.
+
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandle:didRedirectToURL:]):
+ * src/kwq/external.h:
+
2002-03-29 Kenneth Kocienda <kocienda at apple.com>
Workaround for Radar 2890624 (Double free of image data in QPixmap)
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fbe9abf..189aa68 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-03-29 Richard Williamson <rjw at apple.com>
+
+ Hooked up redirect.
+
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandle:didRedirectToURL:]):
+ * src/kwq/external.h:
+
2002-03-29 Kenneth Kocienda <kocienda at apple.com>
Workaround for Radar 2890624 (Double free of image data in QPixmap)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fbe9abf..189aa68 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-03-29 Richard Williamson <rjw at apple.com>
+
+ Hooked up redirect.
+
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandle:didRedirectToURL:]):
+ * src/kwq/external.h:
+
2002-03-29 Kenneth Kocienda <kocienda at apple.com>
Workaround for Radar 2890624 (Double free of image data in QPixmap)
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 34b5e2f..f18c965 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1125,6 +1125,10 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ [m_dataSource _part]->setBaseURL([[url absoluteString] cString]);
+
+ [[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
}
@end
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 34b5e2f..f18c965 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1125,6 +1125,10 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ [m_dataSource _part]->setBaseURL([[url absoluteString] cString]);
+
+ [[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
}
@end
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 34b5e2f..f18c965 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1125,6 +1125,10 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ [m_dataSource _part]->setBaseURL([[url absoluteString] cString]);
+
+ [[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
}
@end
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index b873542..aeb7486 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -43,7 +43,7 @@
@end
@protocol IFLocationChangeHandler
-- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
@end
@interface IFWebDataSource : NSObject
@@ -57,6 +57,7 @@
- (void)_addURLHandle: (IFURLHandle *)handle;
- (void)_removeURLHandle: (IFURLHandle *)handle;
- controller;
+- (KHTMLPart *)_part;
@end
// This should not be allowed here. data source should not reference view
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 34b5e2f..f18c965 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1125,6 +1125,10 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[url absoluteString] cString]);
+ [m_dataSource _part]->setBaseURL([[url absoluteString] cString]);
+
+ [[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
}
@end
diff --git a/WebCore/src/kwq/external.h b/WebCore/src/kwq/external.h
index b873542..aeb7486 100644
--- a/WebCore/src/kwq/external.h
+++ b/WebCore/src/kwq/external.h
@@ -43,7 +43,7 @@
@end
@protocol IFLocationChangeHandler
-- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
@end
@interface IFWebDataSource : NSObject
@@ -57,6 +57,7 @@
- (void)_addURLHandle: (IFURLHandle *)handle;
- (void)_removeURLHandle: (IFURLHandle *)handle;
- controller;
+- (KHTMLPart *)_part;
@end
// This should not be allowed here. data source should not reference view
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b804c36..7bbaf1a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,24 @@
2002-03-29 Richard Williamson <rjw at apple.com>
+ Hooked up redirect. Now we see many more ads. :(
+ Fixed cancel of main handle for document.
+ Moved stop before start from frame to data source.
+
+ * WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+ locationChangeDone:forFrame:]), (-[IFBaseWebController
+ serverRedirectTo:forDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+ IFURLHandleResourceDidCancelLoading:]), (-[IFMainURLHandleClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[IFMainURLHandleClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (-[IFMainURLHandleClient
+ IFURLHandle:didRedirectToURL:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSourcePrivate dealloc]),
+ (-[IFWebDataSource _startLoading:]), (-[IFWebDataSource _stopLoading]):
+ * WebView.subproj/IFWebFrame.mm: (-[IFWebFrame startLoading]):
+
+2002-03-29 Richard Williamson <rjw at apple.com>
+
Added stopLoading to startLoading to cancel any pending loads before
new loads start. This doesn't work yet because of loader bugs, but will
once those are fixed.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b804c36..7bbaf1a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,24 @@
2002-03-29 Richard Williamson <rjw at apple.com>
+ Hooked up redirect. Now we see many more ads. :(
+ Fixed cancel of main handle for document.
+ Moved stop before start from frame to data source.
+
+ * WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+ locationChangeDone:forFrame:]), (-[IFBaseWebController
+ serverRedirectTo:forDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+ IFURLHandleResourceDidCancelLoading:]), (-[IFMainURLHandleClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[IFMainURLHandleClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (-[IFMainURLHandleClient
+ IFURLHandle:didRedirectToURL:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSourcePrivate dealloc]),
+ (-[IFWebDataSource _startLoading:]), (-[IFWebDataSource _stopLoading]):
+ * WebView.subproj/IFWebFrame.mm: (-[IFWebFrame startLoading]):
+
+2002-03-29 Richard Williamson <rjw at apple.com>
+
Added stopLoading to startLoading to cancel any pending loads before
new loads start. This doesn't work yet because of loader bugs, but will
once those are fixed.
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 48b0c9e..13caacb 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -188,6 +188,7 @@
- (void)locationChangeDone: (IFError *)error forFrame: (IFWebFrame *)frame
{
+ // Do nothing. Subclasses typically override this method.
}
- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource
@@ -198,7 +199,7 @@
- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::serverRedirectTo:forDataSource: is not implemented"];
+ // Do nothing. Subclasses typically override this method.
}
- (IFWebFrame *)_frameForDataSource: (IFWebDataSource *)dataSource fromFrame: (IFWebFrame *)frame
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 8b1cac1..512d94b 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -38,8 +38,6 @@
loadProgress->bytesSoFar = -1;
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
[loadProgress release];
-
- [sender autorelease];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -51,8 +49,6 @@
loadProgress->bytesSoFar = [data length];
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
[loadProgress release];
-
- [sender autorelease];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -78,13 +74,14 @@
IFError *error = [[IFError alloc] initWithErrorCode: result];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
[error release];
-
- [sender autorelease];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_REDIRECT, "url = %s\n", [[url absoluteString] cString]);
+ part->setBaseURL([[url absoluteString] cString]);
+
+ [[dataSource controller] serverRedirectTo: url forDataSource: dataSource];
}
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 4a17f1b..fb4b4be 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -30,6 +30,9 @@
// Child frames of this frame.
NSMutableDictionary *frames;
+
+ // The main handle.
+ IFURLHandle *mainHandle;
// The handle client for the main document associated with the
// datasource.
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index ece553c..4aa626b 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -38,6 +38,7 @@
[frames release];
[inputURL release];
[urlHandles release];
+ [mainHandle release];
[mainURLHandleClient release];
delete part;
@@ -83,8 +84,10 @@
NSString *urlString = [[self inputURL] absoluteString];
NSURL *theURL;
KURL url = [[[self inputURL] absoluteString] cString];
- IFURLHandle *handle;
+ // Stop loading any previous loads that may be currently active.
+ [self stopLoading];
+
[self _setPrimaryLoadComplete: NO];
WEBKIT_ASSERT ([self frame] != nil);
@@ -102,18 +105,16 @@
data->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self part: [self _part]];
- // The handle will be released by the client upon receipt of a
- // terminal callback.
- handle = [[IFURLHandle alloc] initWithURL:theURL];
- [handle addClient: data->mainURLHandleClient];
+ data->mainHandle = [[IFURLHandle alloc] initWithURL:theURL];
+ [data->mainHandle addClient: data->mainURLHandleClient];
// Mark the start loading time.
data->loadingStartedTime = CFAbsoluteTimeGetCurrent();
// Fire this guy up.
- [handle loadInBackground];
+ [data->mainHandle loadInBackground];
- // FIXME: Do any work need in the kde engine. This should be removed.
+ // FIXME [rjw]: Do any work need in the kde engine. This should be removed.
// We should move any code needed out of KWQ.
[self _part]->openURL (url);
@@ -142,7 +143,9 @@
IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
int i, count;
IFURLHandle *handle;
-
+
+ [data->mainHandle cancelLoadInBackground];
+
// Tell all handles to stop loading.
count = [data->urlHandles count];
for (i = 0; i < count; i++) {
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 626cd51..63ae1a2 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -157,9 +157,6 @@
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- // Stop loading any previous loads that may be currently active.
- [self stopLoading];
-
// Force refresh is irrelevant, as this will always be the first load.
// The controller will transition the provisional data source to the
// committed data source.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 4a17f1b..fb4b4be 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -30,6 +30,9 @@
// Child frames of this frame.
NSMutableDictionary *frames;
+
+ // The main handle.
+ IFURLHandle *mainHandle;
// The handle client for the main document associated with the
// datasource.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index ece553c..4aa626b 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -38,6 +38,7 @@
[frames release];
[inputURL release];
[urlHandles release];
+ [mainHandle release];
[mainURLHandleClient release];
delete part;
@@ -83,8 +84,10 @@
NSString *urlString = [[self inputURL] absoluteString];
NSURL *theURL;
KURL url = [[[self inputURL] absoluteString] cString];
- IFURLHandle *handle;
+ // Stop loading any previous loads that may be currently active.
+ [self stopLoading];
+
[self _setPrimaryLoadComplete: NO];
WEBKIT_ASSERT ([self frame] != nil);
@@ -102,18 +105,16 @@
data->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self part: [self _part]];
- // The handle will be released by the client upon receipt of a
- // terminal callback.
- handle = [[IFURLHandle alloc] initWithURL:theURL];
- [handle addClient: data->mainURLHandleClient];
+ data->mainHandle = [[IFURLHandle alloc] initWithURL:theURL];
+ [data->mainHandle addClient: data->mainURLHandleClient];
// Mark the start loading time.
data->loadingStartedTime = CFAbsoluteTimeGetCurrent();
// Fire this guy up.
- [handle loadInBackground];
+ [data->mainHandle loadInBackground];
- // FIXME: Do any work need in the kde engine. This should be removed.
+ // FIXME [rjw]: Do any work need in the kde engine. This should be removed.
// We should move any code needed out of KWQ.
[self _part]->openURL (url);
@@ -142,7 +143,9 @@
IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
int i, count;
IFURLHandle *handle;
-
+
+ [data->mainHandle cancelLoadInBackground];
+
// Tell all handles to stop loading.
count = [data->urlHandles count];
for (i = 0; i < count; i++) {
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 626cd51..63ae1a2 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -157,9 +157,6 @@
{
IFWebFramePrivate *data = (IFWebFramePrivate *)_framePrivate;
- // Stop loading any previous loads that may be currently active.
- [self stopLoading];
-
// Force refresh is irrelevant, as this will always be the first load.
// The controller will transition the provisional data source to the
// committed data source.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 8b1cac1..512d94b 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -38,8 +38,6 @@
loadProgress->bytesSoFar = -1;
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
[loadProgress release];
-
- [sender autorelease];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -51,8 +49,6 @@
loadProgress->bytesSoFar = [data length];
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
[loadProgress release];
-
- [sender autorelease];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -78,13 +74,14 @@
IFError *error = [[IFError alloc] initWithErrorCode: result];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
[error release];
-
- [sender autorelease];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_REDIRECT, "url = %s\n", [[url absoluteString] cString]);
+ part->setBaseURL([[url absoluteString] cString]);
+
+ [[dataSource controller] serverRedirectTo: url forDataSource: dataSource];
}
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 8b1cac1..512d94b 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -38,8 +38,6 @@
loadProgress->bytesSoFar = -1;
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
[loadProgress release];
-
- [sender autorelease];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -51,8 +49,6 @@
loadProgress->bytesSoFar = [data length];
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
[loadProgress release];
-
- [sender autorelease];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
@@ -78,13 +74,14 @@
IFError *error = [[IFError alloc] initWithErrorCode: result];
[[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress: loadProgress fromDataSource: dataSource];
[error release];
-
- [sender autorelease];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
{
WEBKITDEBUGLEVEL1 (WEBKIT_LOG_REDIRECT, "url = %s\n", [[url absoluteString] cString]);
+ part->setBaseURL([[url absoluteString] cString]);
+
+ [[dataSource controller] serverRedirectTo: url forDataSource: dataSource];
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list