[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:12:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 36946a0f4aece395880fe81ba0c42abe68eee9d8
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 13 18:22:00 2002 +0000
* WebView.subproj/IFBaseWebController.mm:
(-[IFBaseWebController URLPolicyForURL:]):
Use [IFURLHandle canInitWithURL] instead of hard-coded URL schemes.
* WebView.subproj/IFBaseWebControllerPrivate.mm:
(-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
* WebView.subproj/IFWebDataSourcePrivate.h:
* WebView.subproj/IFWebDataSourcePrivate.mm:
(-[IFWebDataSourcePrivate init]):
(-[IFWebDataSource _setDownloadPath:]):
Removed _contentPolicy as contentPolicy is public.
Initialize contentPolicy in [IFWebDataSourcePrivate init].
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1137 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9401481..e3981c5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2002-05-13 Chris Blumenberg <cblu at apple.com>
+
+
+ * WebView.subproj/IFBaseWebController.mm:
+ (-[IFBaseWebController URLPolicyForURL:]):
+
+ Use [IFURLHandle canInitWithURL] instead of hard-coded URL schemes.
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSourcePrivate init]):
+ (-[IFWebDataSource _setDownloadPath:]):
+
+ Removed _contentPolicy as contentPolicy is public.
+
+ Initialize contentPolicy in [IFWebDataSourcePrivate init].
+
2002-05-10 Richard J. Williamson <rjw at apple.com>
Logging changes.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9401481..e3981c5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,25 @@
+2002-05-13 Chris Blumenberg <cblu at apple.com>
+
+
+ * WebView.subproj/IFBaseWebController.mm:
+ (-[IFBaseWebController URLPolicyForURL:]):
+
+ Use [IFURLHandle canInitWithURL] instead of hard-coded URL schemes.
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSourcePrivate init]):
+ (-[IFWebDataSource _setDownloadPath:]):
+
+ Removed _contentPolicy as contentPolicy is public.
+
+ Initialize contentPolicy in [IFWebDataSourcePrivate init].
+
2002-05-10 Richard J. Williamson <rjw at apple.com>
Logging changes.
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 8aee991..ba568a9 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -13,7 +13,7 @@
#import <WebKit/IFWebController.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
+#import <WebFoundation/WebFoundation.h>
@implementation IFBaseWebController
@@ -246,8 +246,7 @@
- (IFURLPolicy)URLPolicyForURL: (NSURL *)url
{
- // We need a factory method or something that tells us what schemes we handle
- if([[url scheme] isEqualToString:@"http"] || [[url scheme] isEqualToString:@"https"] || [[url scheme] isEqualToString:@"file"]){
+ if([IFURLHandle canInitWithURL:url]){
return IFURLPolicyUseContentPolicy;
}else{
return IFURLPolicyOpenExternally;
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 1450b2f..7d5341c 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -115,7 +115,7 @@
// Check to see if this is these are the first bits of a provisional data source,
// if so we need to transition the data source from provisional to committed.
// This transition is only done for the IFContentPolicyShow policy.
- if([frame provisionalDataSource] == dataSource && [dataSource _contentPolicy] == IFContentPolicyShow){
+ if([frame provisionalDataSource] == dataSource && [dataSource contentPolicy] == IFContentPolicyShow){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committing resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
[frame _transitionProvisionalToCommitted];
}
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index c7fbaed..2ce8264 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -78,7 +78,7 @@
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
- if([dataSource _contentPolicy] == IFContentPolicyShow){
+ if([dataSource contentPolicy] == IFContentPolicyShow){
if(handlerType == IFMIMEHANDLERTYPE_TEXT) {
contentHandler = [[IFContentHandler alloc] initWithMIMEHandler:mimeHandler URL:[sender url]];
fakeHTMLDocument = [contentHandler textHTMLDocumentBottom];
@@ -88,12 +88,14 @@
}
}
- else if([dataSource _contentPolicy] == IFContentPolicySave ||
- [dataSource _contentPolicy] == IFContentPolicyOpenExternally){
+ else if([dataSource contentPolicy] == IFContentPolicySave ||
+ [dataSource contentPolicy] == IFContentPolicyOpenExternally){
// FIXME [cblu]: We shouldn't wait for the download to end to write to the disk.
// Will fix once we there is an IFURLHandle flag to not memory cache
[downloadHandler downloadCompletedWithData:[sender resourceData]];
[downloadHandler release];
+ }else if([dataSource contentPolicy] == IFContentPolicyNone){
+ // do something
}
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
@@ -122,7 +124,7 @@
typeChecked = YES;
}
- if([dataSource _contentPolicy] == IFContentPolicyShow){
+ if([dataSource contentPolicy] == IFContentPolicyShow){
// if it's html, send the data to the part
// FIXME: [sender contentType] still returns nil if from cache
if(handlerType == IFMIMEHANDLERTYPE_NIL || handlerType == IFMIMEHANDLERTYPE_HTML) {
@@ -154,8 +156,8 @@
}
}
- else if([dataSource _contentPolicy] == IFContentPolicySave ||
- [dataSource _contentPolicy] == IFContentPolicyOpenExternally){
+ else if([dataSource contentPolicy] == IFContentPolicySave ||
+ [dataSource contentPolicy] == IFContentPolicyOpenExternally){
if(!downloadStarted){
// If this is a download, detach the provisionalDataSource from the frame
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 8f39b86..63eea22 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -92,7 +92,6 @@ class KHTMLPart;
- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l;
- (NSString *)_downloadPath;
- (void) _setDownloadPath:(NSString *)path;
-- (IFContentPolicy) _contentPolicy;
- (void) _setContentPolicy:(IFContentPolicy)policy;
- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 05b1cae..f040f64 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -32,6 +32,8 @@
primaryLoadComplete = NO;
+ contentPolicy = IFContentPolicyNone;
+
return self;
}
@@ -288,11 +290,6 @@
_private->downloadPath = [path retain];
}
-- (IFContentPolicy) _contentPolicy
-{
- return _private->contentPolicy;
-}
-
- (void) _setContentPolicy:(IFContentPolicy)policy
{
_private->contentPolicy = policy;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 8f39b86..63eea22 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -92,7 +92,6 @@ class KHTMLPart;
- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l;
- (NSString *)_downloadPath;
- (void) _setDownloadPath:(NSString *)path;
-- (IFContentPolicy) _contentPolicy;
- (void) _setContentPolicy:(IFContentPolicy)policy;
- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 05b1cae..f040f64 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -32,6 +32,8 @@
primaryLoadComplete = NO;
+ contentPolicy = IFContentPolicyNone;
+
return self;
}
@@ -288,11 +290,6 @@
_private->downloadPath = [path retain];
}
-- (IFContentPolicy) _contentPolicy
-{
- return _private->contentPolicy;
-}
-
- (void) _setContentPolicy:(IFContentPolicy)policy
{
_private->contentPolicy = policy;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index c7fbaed..2ce8264 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -78,7 +78,7 @@
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
- if([dataSource _contentPolicy] == IFContentPolicyShow){
+ if([dataSource contentPolicy] == IFContentPolicyShow){
if(handlerType == IFMIMEHANDLERTYPE_TEXT) {
contentHandler = [[IFContentHandler alloc] initWithMIMEHandler:mimeHandler URL:[sender url]];
fakeHTMLDocument = [contentHandler textHTMLDocumentBottom];
@@ -88,12 +88,14 @@
}
}
- else if([dataSource _contentPolicy] == IFContentPolicySave ||
- [dataSource _contentPolicy] == IFContentPolicyOpenExternally){
+ else if([dataSource contentPolicy] == IFContentPolicySave ||
+ [dataSource contentPolicy] == IFContentPolicyOpenExternally){
// FIXME [cblu]: We shouldn't wait for the download to end to write to the disk.
// Will fix once we there is an IFURLHandle flag to not memory cache
[downloadHandler downloadCompletedWithData:[sender resourceData]];
[downloadHandler release];
+ }else if([dataSource contentPolicy] == IFContentPolicyNone){
+ // do something
}
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
@@ -122,7 +124,7 @@
typeChecked = YES;
}
- if([dataSource _contentPolicy] == IFContentPolicyShow){
+ if([dataSource contentPolicy] == IFContentPolicyShow){
// if it's html, send the data to the part
// FIXME: [sender contentType] still returns nil if from cache
if(handlerType == IFMIMEHANDLERTYPE_NIL || handlerType == IFMIMEHANDLERTYPE_HTML) {
@@ -154,8 +156,8 @@
}
}
- else if([dataSource _contentPolicy] == IFContentPolicySave ||
- [dataSource _contentPolicy] == IFContentPolicyOpenExternally){
+ else if([dataSource contentPolicy] == IFContentPolicySave ||
+ [dataSource contentPolicy] == IFContentPolicyOpenExternally){
if(!downloadStarted){
// If this is a download, detach the provisionalDataSource from the frame
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index c7fbaed..2ce8264 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -78,7 +78,7 @@
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
- if([dataSource _contentPolicy] == IFContentPolicyShow){
+ if([dataSource contentPolicy] == IFContentPolicyShow){
if(handlerType == IFMIMEHANDLERTYPE_TEXT) {
contentHandler = [[IFContentHandler alloc] initWithMIMEHandler:mimeHandler URL:[sender url]];
fakeHTMLDocument = [contentHandler textHTMLDocumentBottom];
@@ -88,12 +88,14 @@
}
}
- else if([dataSource _contentPolicy] == IFContentPolicySave ||
- [dataSource _contentPolicy] == IFContentPolicyOpenExternally){
+ else if([dataSource contentPolicy] == IFContentPolicySave ||
+ [dataSource contentPolicy] == IFContentPolicyOpenExternally){
// FIXME [cblu]: We shouldn't wait for the download to end to write to the disk.
// Will fix once we there is an IFURLHandle flag to not memory cache
[downloadHandler downloadCompletedWithData:[sender resourceData]];
[downloadHandler release];
+ }else if([dataSource contentPolicy] == IFContentPolicyNone){
+ // do something
}
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
@@ -122,7 +124,7 @@
typeChecked = YES;
}
- if([dataSource _contentPolicy] == IFContentPolicyShow){
+ if([dataSource contentPolicy] == IFContentPolicyShow){
// if it's html, send the data to the part
// FIXME: [sender contentType] still returns nil if from cache
if(handlerType == IFMIMEHANDLERTYPE_NIL || handlerType == IFMIMEHANDLERTYPE_HTML) {
@@ -154,8 +156,8 @@
}
}
- else if([dataSource _contentPolicy] == IFContentPolicySave ||
- [dataSource _contentPolicy] == IFContentPolicyOpenExternally){
+ else if([dataSource contentPolicy] == IFContentPolicySave ||
+ [dataSource contentPolicy] == IFContentPolicyOpenExternally){
if(!downloadStarted){
// If this is a download, detach the provisionalDataSource from the frame
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list