[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:21:54 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit eeb3facd5a437b283d19d41ccf383e84a2ae9be1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 27 20:22:26 2002 +0000
- fixed 2973212 -- bad arg string != nil in _IF_URLWithString
* WebView.subproj/IFWebDataSourcePrivate.mm:
(-[IFWebDataSource _startLoading:]): Get rid of essentially-dead code that
computed but did not use a URL. Also order operations so that we first
set the flag to say that we're loading, then tell the location change
handler, and only then ask for the actual I/O to being.
* WebView.subproj/IFBaseLocationChangeHandler.h: Removed.
* WebView.subproj/IFBaseLocationChangeHandler.m: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1460 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bc4c1d3..6b1ed58 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-06-27 Darin Adler <darin at apple.com>
+
+ - fixed 2973212 -- bad arg string != nil in _IF_URLWithString
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _startLoading:]): Get rid of essentially-dead code that
+ computed but did not use a URL. Also order operations so that we first
+ set the flag to say that we're loading, then tell the location change
+ handler, and only then ask for the actual I/O to being.
+
+ * WebView.subproj/IFBaseLocationChangeHandler.h: Removed.
+ * WebView.subproj/IFBaseLocationChangeHandler.m: Removed.
+
=== Alexander-10 ===
2002-06-27 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index bc4c1d3..6b1ed58 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-06-27 Darin Adler <darin at apple.com>
+
+ - fixed 2973212 -- bad arg string != nil in _IF_URLWithString
+
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _startLoading:]): Get rid of essentially-dead code that
+ computed but did not use a URL. Also order operations so that we first
+ set the flag to say that we're loading, then tell the location change
+ handler, and only then ask for the actual I/O to being.
+
+ * WebView.subproj/IFBaseLocationChangeHandler.h: Removed.
+ * WebView.subproj/IFBaseLocationChangeHandler.m: Removed.
+
=== Alexander-10 ===
2002-06-27 Richard Williamson <rjw at apple.com>
diff --git a/WebKit/WebView.subproj/IFBaseLocationChangeHandler.h b/WebKit/WebView.subproj/IFBaseLocationChangeHandler.h
deleted file mode 100644
index b87e4c4..0000000
--- a/WebKit/WebView.subproj/IFBaseLocationChangeHandler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- IFBaseLocationChangeHandler.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
-#import <WebKit/IFLocationChangeHandler.h>
-
- at protocol IFLocationChangeHandler;
-
- at interface IFBaseLocationChangeHandler : NSObject <IFLocationChangeHandler>
-{
- NSURL *url;
- NSString *MIMEType;
- IFContentPolicy contentPolicy;
-}
-
-// Maintain a persistent database of type-to-policy.
-+ (void)setGlobalContentPolicy: (IFContentPolicy)policy forMIMEType: (NSString *)type;
-+ (IFContentPolicy)globaContentPolicyForMIMEType: (NSString *)typen;
-+ (NSDictionary *)globalContentPolicies;
-
-+ (BOOL)canViewMIMEType: (NSString *)MIMEType;
-+ (IFContentPolicy)builtinPolicyForMIMEType: (NSString *)MIMEType;
-
-+ (NSString *)suggestedFileanemForURL: (NSURL *) andMIMEType: (NSString *)type;
-+ (NSString *)suggestedDirectoryForURL: (NSURL *) andMIMEType: (NSString *)type;
-
-// Returns the extension from the URL. May be used in conjunction with
-// the MIME type to determine how a location should be handled.
-+ (NSString *)extensionForURL: (NSURL *)url;
-
-- (NSURL *)URL;
-
-- (NSString *)MIMEType;
-
- at end
diff --git a/WebKit/WebView.subproj/IFBaseLocationChangeHandler.m b/WebKit/WebView.subproj/IFBaseLocationChangeHandler.m
deleted file mode 100644
index 1163a94..0000000
--- a/WebKit/WebView.subproj/IFBaseLocationChangeHandler.m
+++ /dev/null
@@ -1,103 +0,0 @@
-/* IFBaseLocationChangeHandler.m
-
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFBaseLocationChangeHandler.h>
-
-
- at implementation IFBaseLocationChangeHandler
-
-+ (void)setGlobalContentPolicy: (IFContentPolicy)policy forMIMEType: (NSString *)type
-{
-}
-
-+ (IFContentPolicy)globaContentPolicyForContentType: (NSString *)type
-{
- return IFContentPolicyShow;
-}
-
-+ (NSDictionary *)globalContentPolicies
-{
-}
-
-+ (NSString *)suggestedFileanemForURL: (NSURL *) andContentType: (IFURLContentType *)type
-{
-}
-
-+ (NSString *)suggestedDirectoryForURL: (NSURL *) andContentType: (IFURLContentType *)type
-{
-}
-
-+ (NSString *)extensionForURL: (NSURL *)url
-{
-}
-
-
-
-// Returns the extension from the URL. May be used in conjunction with
-// the MIME type to determine how a location should be handled.
-- (NSString *)extension
-{
- return nil;
-}
-
-- (BOOL)locationWillChangeTo: (NSURL *)url
-{
- url = [url retain];
-}
-
-
-- (void)locationChangeStarted
-{
- // Do nothing. Subclasses may override.
-}
-
-
-- (void)locationChangeCommitted
-{
- // Do nothing. Subclasses may override.
-}
-
-
-- (void)locationChangeDone: (IFError *)error
-{
- // Do nothing. Subclasses may override.
-}
-
-- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource
-{
- // Do nothing. Subclasses may override.
-}
-
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource
-{
- // Do nothing. Subclasses may override.
-}
-
-// DEPRECATED:
-// Called when a file download has started
-- (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler
-{
-}
-
-
-// Sent once the IFContentType of the location handler
-// has been determined. Should not block.
-// Implementations typically call setContentPolicy: immediately, although
-// may call it later after showing a user dialog.
-- (void)requestContentPolicyForMIMEType: (NSString *)type
-{
- [self haveContentPolicy: [IFBaseLocationChangeHandler globaContentPolicyForMIMEType: type] forLocationChangeHandler: self];
-}
-
-// We may have different errors that cause the the policy to be un-implementable, i.e.
-// file i/o failure, launch services failure, type mismatches, etc.
-- (void)unableToImplementContentPolicy: (IFError *)error
-{
-}
-
-
- at end
-
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index b222273..abf4bc0 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -143,10 +143,6 @@ static NSMutableDictionary *_repTypes=nil;
- (void)_startLoading: (BOOL)forceRefresh
{
- NSString *urlString = [[self inputURL] absoluteString];
- NSURL *theURL;
- KURL url = [[[self inputURL] absoluteString] cString];
-
WEBKIT_ASSERT ([self _isStopping] == NO);
[self _setPrimaryLoadComplete: NO];
@@ -155,27 +151,18 @@ static NSMutableDictionary *_repTypes=nil;
[self _clearErrors];
- // FIXME [mjs]: temporary hack to make file: URLs work right
- if ([urlString hasPrefix:@"file:/"] && [urlString characterAtIndex:6] != '/') {
- urlString = [@"file:///" stringByAppendingString:[urlString substringFromIndex:6]];
- }
- if ([urlString hasSuffix:@"/"]) {
- urlString = [urlString substringToIndex:([urlString length] - 1)];
- }
- theURL = [NSURL _IF_URLWithString:urlString];
-
_private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self];
[_private->mainHandle addClient: _private->mainURLHandleClient];
// Mark the start loading time.
_private->loadingStartedTime = CFAbsoluteTimeGetCurrent();
- // Fire this guy up.
- [_private->mainHandle loadInBackground];
-
[self _setLoading:YES];
-
+
[[self _locationChangeHandler] locationChangeStartedForDataSource:self];
+
+ // Fire this guy up.
+ [_private->mainHandle loadInBackground];
}
- (void)_addURLHandle: (IFURLHandle *)handle
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index b222273..abf4bc0 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -143,10 +143,6 @@ static NSMutableDictionary *_repTypes=nil;
- (void)_startLoading: (BOOL)forceRefresh
{
- NSString *urlString = [[self inputURL] absoluteString];
- NSURL *theURL;
- KURL url = [[[self inputURL] absoluteString] cString];
-
WEBKIT_ASSERT ([self _isStopping] == NO);
[self _setPrimaryLoadComplete: NO];
@@ -155,27 +151,18 @@ static NSMutableDictionary *_repTypes=nil;
[self _clearErrors];
- // FIXME [mjs]: temporary hack to make file: URLs work right
- if ([urlString hasPrefix:@"file:/"] && [urlString characterAtIndex:6] != '/') {
- urlString = [@"file:///" stringByAppendingString:[urlString substringFromIndex:6]];
- }
- if ([urlString hasSuffix:@"/"]) {
- urlString = [urlString substringToIndex:([urlString length] - 1)];
- }
- theURL = [NSURL _IF_URLWithString:urlString];
-
_private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self];
[_private->mainHandle addClient: _private->mainURLHandleClient];
// Mark the start loading time.
_private->loadingStartedTime = CFAbsoluteTimeGetCurrent();
- // Fire this guy up.
- [_private->mainHandle loadInBackground];
-
[self _setLoading:YES];
-
+
[[self _locationChangeHandler] locationChangeStartedForDataSource:self];
+
+ // Fire this guy up.
+ [_private->mainHandle loadInBackground];
}
- (void)_addURLHandle: (IFURLHandle *)handle
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list