[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:52:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b9c2df6d79a8fbffd191899a2f9564317d6d5f7e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 22 00:28:16 2002 +0000
Real checkin this time!
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2404 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bc30b4f..ef89cc7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-10-21 Richard Williamson <rjw at apple.com>
+
+ More incremental tweaks. Will be factoring common
+ handle delegate behavior into base class.
+
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream handle:didReceiveData:]):
+ (-[WebNetscapePluginStream handleDidFinishLoading:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:response:size:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ (-[WebSubresourceClient handle:didReceiveData:]):
+ (-[WebSubresourceClient handleDidFinishLoading:]):
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _finsishedLoadingResourceFromDataSource:]):
+
2002-10-21 Trey Matteson trey at apple.com
Fixed typos and other doc comment errors found during API review.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bc30b4f..ef89cc7 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-10-21 Richard Williamson <rjw at apple.com>
+
+ More incremental tweaks. Will be factoring common
+ handle delegate behavior into base class.
+
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ (-[WebNetscapePluginStream handle:didReceiveData:]):
+ (-[WebNetscapePluginStream handleDidFinishLoading:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:response:size:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ (-[WebSubresourceClient handle:didReceiveData:]):
+ (-[WebSubresourceClient handleDidFinishLoading:]):
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _finsishedLoadingResourceFromDataSource:]):
+
2002-10-21 Trey Matteson trey at apple.com
Fixed typos and other doc comment errors found during API review.
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index d59e5d2..e213c82 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -127,8 +127,6 @@
}
[self receivedData:data];
-
- [[view controller] _receivedProgressForResourceHandle: handle fromDataSource: [view dataSource] complete: NO];
}
- (void)handleDidFinishLoading:(WebResourceHandle *)handle
@@ -137,7 +135,7 @@
WebController *controller = [view controller];
- [controller _receivedProgressForResourceHandle: handle fromDataSource: [view dataSource] complete: YES];
+ [controller _finsishedLoadingResourceFromDataSource: [view dataSource]];
[self finishedLoadingWithData:resourceData];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index b3f4461..21f1369 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -188,7 +188,7 @@
[delegate resource: identifier didReceiveContentLength: bytes fromDataSource: [self dataSource]];
[delegate resource: identifier didFinishLoadingFromDataSource: [self dataSource]];
- [[frame controller] _receivedProgressForResourceHandle:nil fromDataSource:[self dataSource] complete:YES];
+ [[frame controller] _finsishedLoadingResourceFromDataSource:[self dataSource]];
[request release];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 4aa0c83..af69eb0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -64,10 +64,6 @@
currentURL = nil;
}
-- (void)receivedProgressWithComplete:(BOOL)isComplete
-{
- [[dataSource controller] _receivedProgressForResourceHandle:handle fromDataSource:dataSource complete:isComplete];
-}
+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withURL:(NSURL *)URL referrer:(NSString *)referrer forDataSource:(WebDataSource *)source
@@ -97,7 +93,6 @@
client->handle = h;
[source _addSubresourceClient:client];
[client didStartLoadingWithURL:[newRequest URL]];
- [client receivedProgressWithComplete:NO];
[h loadWithDelegate:client];
[newRequest release];
@@ -171,7 +166,6 @@
[resourceProgressDelegate resource: identifier didReceiveContentLength: [data length]
fromDataSource: dataSource];
- [self receivedProgressWithComplete:NO];
[loader addData:data];
}
@@ -193,7 +187,7 @@
[resourceProgressDelegate resource:identifier didFinishLoadingFromDataSource:dataSource];
- [self receivedProgressWithComplete:YES];
+ [[dataSource controller] _finsishedLoadingResourceFromDataSource:dataSource];
[self didStopLoading];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 4aa0c83..af69eb0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -64,10 +64,6 @@
currentURL = nil;
}
-- (void)receivedProgressWithComplete:(BOOL)isComplete
-{
- [[dataSource controller] _receivedProgressForResourceHandle:handle fromDataSource:dataSource complete:isComplete];
-}
+ (WebSubresourceClient *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
withURL:(NSURL *)URL referrer:(NSString *)referrer forDataSource:(WebDataSource *)source
@@ -97,7 +93,6 @@
client->handle = h;
[source _addSubresourceClient:client];
[client didStartLoadingWithURL:[newRequest URL]];
- [client receivedProgressWithComplete:NO];
[h loadWithDelegate:client];
[newRequest release];
@@ -171,7 +166,6 @@
[resourceProgressDelegate resource: identifier didReceiveContentLength: [data length]
fromDataSource: dataSource];
- [self receivedProgressWithComplete:NO];
[loader addData:data];
}
@@ -193,7 +187,7 @@
[resourceProgressDelegate resource:identifier didFinishLoadingFromDataSource:dataSource];
- [self receivedProgressWithComplete:YES];
+ [[dataSource controller] _finsishedLoadingResourceFromDataSource:dataSource];
[self didStopLoading];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 34035ce..99f7214 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -44,7 +44,7 @@
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
- (id <WebContextMenuDelegate>)_defaultContextMenuDelegate;
-- (void)_receivedProgressForResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_finsishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
- (void)_receivedError:(WebError *)error forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource;
- (void)_mainReceivedProgressForResourceHandle:(WebResourceHandle *)resourceHandle bytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 69cdb0c..e12acc4 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -102,18 +102,16 @@
return _private->defaultContextMenuDelegate;
}
-- (void)_receivedProgressForResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
+- (void)_finsishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
{
WebFrame *frame = [dataSource webFrame];
ASSERT(dataSource != nil);
// This resource has completed, so check if the load is complete for all frames.
- if (isComplete) {
- if (frame != nil) {
- [frame _transitionToLayoutAcceptable];
- [frame _checkLoadComplete];
- }
+ if (frame != nil) {
+ [frame _transitionToLayoutAcceptable];
+ [frame _checkLoadComplete];
}
}
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 34035ce..99f7214 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -44,7 +44,7 @@
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
- (id <WebContextMenuDelegate>)_defaultContextMenuDelegate;
-- (void)_receivedProgressForResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_finsishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
- (void)_receivedError:(WebError *)error forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource;
- (void)_mainReceivedProgressForResourceHandle:(WebResourceHandle *)resourceHandle bytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 69cdb0c..e12acc4 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -102,18 +102,16 @@
return _private->defaultContextMenuDelegate;
}
-- (void)_receivedProgressForResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
+- (void)_finsishedLoadingResourceFromDataSource: (WebDataSource *)dataSource
{
WebFrame *frame = [dataSource webFrame];
ASSERT(dataSource != nil);
// This resource has completed, so check if the load is complete for all frames.
- if (isComplete) {
- if (frame != nil) {
- [frame _transitionToLayoutAcceptable];
- [frame _checkLoadComplete];
- }
+ if (frame != nil) {
+ [frame _transitionToLayoutAcceptable];
+ [frame _checkLoadComplete];
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list