[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:44:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8b90b78cea32e746d184aa252d3b11a60bb40ca4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 24 23:20:08 2002 +0000
i Fixed 3055078. Ensure file: URLs have // before path.
* kwq/KWQKURL.mm:
(KURL::parse):
Documentation for WebDataSource and WebFrame.
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSource.m:
(-[WebDataSource frameExists:]):
* WebView.subproj/WebDataSourcePrivate.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource addFrame:]):
* WebView.subproj/WebFrame.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2151 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ed121e6..480725f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-24 Richard Williamson <rjw at apple.com>
+
+ Fixed 3055078. Ensure file: URLs have // before path.
+
+ * kwq/KWQKURL.mm:
+ (KURL::parse):
+
2002-09-24 David Hyatt <hyatt at apple.com>
Better fix. Clears the boolean when CLASS has no value.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ed121e6..480725f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-09-24 Richard Williamson <rjw at apple.com>
+
+ Fixed 3055078. Ensure file: URLs have // before path.
+
+ * kwq/KWQKURL.mm:
+ (KURL::parse):
+
2002-09-24 David Hyatt <hyatt at apple.com>
Better fix. Clears the boolean when CLASS has no value.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ed121e6..480725f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-09-24 Richard Williamson <rjw at apple.com>
+
+ Fixed 3055078. Ensure file: URLs have // before path.
+
+ * kwq/KWQKURL.mm:
+ (KURL::parse):
+
2002-09-24 David Hyatt <hyatt at apple.com>
Better fix. Clears the boolean when CLASS has no value.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 8f4007b..bd6d345 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -941,7 +941,7 @@ void KURL::parse(const char *url, const QString *originalString)
char *p = buffer;
const char *strPtr = url;
- bool isHTTPorHTTPS;
+ bool isHTTPorHTTPS, isFILE;
// copy in the scheme
const char *schemeEndPtr = url + schemeEnd;
@@ -953,7 +953,9 @@ void KURL::parse(const char *url, const QString *originalString)
// Check if we're http or https.
isHTTPorHTTPS = strncasecmp ("http", url, schemeEnd) == 0 ||
strncasecmp ("https", url, schemeEnd) == 0;
-
+
+ isFILE = (strncasecmp("file", url, schemeEnd) == 0);
+
// add ";"
*p++ = ':';
@@ -1010,6 +1012,12 @@ void KURL::parse(const char *url, const QString *originalString)
userStartPos = userEndPos = passwordEndPos = hostEndPos = portEndPos = p - buffer;
}
+ // For canonicalization, ensure we have a 'file://' before the path.
+ if (isFILE && (p - buffer) == 5 && (pathEnd - pathStart) >= 2 && strcmp(&url[pathStart], "//") != 0){
+ *p++ = '/';
+ *p++ = '/';
+ }
+
// For canonicalization, ensure we have a '/' for no path.
// Only do this for http and https.
if (isHTTPorHTTPS && pathEnd - pathStart == 0) {
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fcf7f8c..c4f66fe 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-24 Richard Williamson <rjw at apple.com>
+
+ Documentation for WebDataSource and WebFrame.
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource frameExists:]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource addFrame:]):
+ * WebView.subproj/WebFrame.h:
+
2002-09-24 Darin Adler <darin at apple.com>
- fixed 3059266 -- REGRESSION: clicking in web view when location field is
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fcf7f8c..c4f66fe 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-09-24 Richard Williamson <rjw at apple.com>
+
+ Documentation for WebDataSource and WebFrame.
+
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSource.m:
+ (-[WebDataSource frameExists:]):
+ * WebView.subproj/WebDataSourcePrivate.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource addFrame:]):
+ * WebView.subproj/WebFrame.h:
+
2002-09-24 Darin Adler <darin at apple.com>
- fixed 3059266 -- REGRESSION: clicking in web view when location field is
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index ab2bfcb..a87bb70 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -7,12 +7,12 @@
#import <Cocoa/Cocoa.h>
- at class WebError;
- at class WebFrame;
- at class WebResourceHandle;
@class WebContentPolicy;
@class WebController;
@class WebDataSourcePrivate;
+ at class WebError;
+ at class WebFrame;
+ at class WebResourceHandle;
@class WebResourceRequest;
@protocol WebDocumentRepresentation;
@@ -20,6 +20,9 @@
/*!
@class WebDataSource
@discussion A WebDataSource represents the data associated with a web page.
+ A datasource has a WebDocumentRepresentation which holds an appropriate
+ representation of the data. WebDataSources manage a hierarchy of WebFrames.
+ WebDataSources are typically related to a view by there containg WebFrame.
*/
@interface WebDataSource : NSObject
{
@@ -30,125 +33,132 @@
/*!
@method initWithURL:
@discussion Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
- @param URL
+ @param URL The URL to use in creating a datasource.
+ @result Returns an initialized WebDataSource.
*/
--(id)initWithURL:(NSURL *)URL;
+- initWithURL:(NSURL *)URL;
/*!
@method initWithRequest:
- @param request
+ @abstract The designated initializer for WebDataSource.
+ @param request The request to use in creating a datasource.
+ @result Returns an initialized WebDataSource.
*/
--(id)initWithRequest:(WebResourceRequest *)request;
+- initWithRequest:(WebResourceRequest *)request;
/*!
@method data
+ @discussion The data associated with a datasource will not be valid until
+ a datasource has completed loaded.
+ @result Returns the raw data associated with this datasource. Returns nil
+ if the datasource hasn't loaded.
*/
- (NSData *)data;
/*!
@method representation
+ @discussion A representation holds a type specific representation
+ of the datasource's data. The representation class is determined by mapping
+ a MIME type to a class. The representation is created once the MIME type
+ of the datasource content has been determined.
+ @result Returns the representation associated with this datasource.
+ Returns nil if the datasource hasn't created it's representation.
*/
- (id <WebDocumentRepresentation>)representation;
/*!
@method isMainDocument
- @discussion Returns YES if this is the main document. The main document is the 'top'
+ @discussion The main document is the 'top'
document, typically either a frameset or a normal HTML document.
+ @result Returns YES if this is the main document.
*/
- (BOOL)isMainDocument;
/*!
@method parent
- @discussion Returns nil if this data source represents the main document. Otherwise
+ @result Returns nil if this data source represents the main document. Otherwise
returns the parent data source.
*/
- (WebDataSource *)parent;
/*!
@method webFrame
- @discussion Return the frame that represents this data source. Same as above.
+ @result Return the frame that represents this data source.
*/
- (WebFrame *)webFrame;
/*!
- @method addFrame:
- @discussion Add a child frame. This should only be called by the data source's controller
- as a result of a createFrame:inParent:.
- // [Should this be private?]
-*/
-- (void)addFrame: (WebFrame *)frame;
-
-/*!
@method children
- @discussion Returns an array of WebFrame. The frames in the array are
+ @discussion The frames in the array are
associated with a frame set or iframe.
+ @result Returns an array of WebFrame.
*/
- (NSArray *)children;
/*!
@method frameNamed:
- @param frameName
+ @discussion Find the frame named frameName in this datasource's
+ children. Does not recurse.
+ @param frameName The name of the frame to find.
+ @result Returns the frame named frameName, or nil.
*/
- (WebFrame *)frameNamed:(NSString *)frameName;
/*!
@method frameNames
- @discussion Returns an array of NSStrings or nil. The NSStrings corresponds to
+ @discussion The NSStrings corresponds to
frame names. If this data source is the main document and has no
frames then frameNames will return nil.
+ @result Returns an array of NSStrings or nil.
*/
- (NSArray *)frameNames;
/*!
@method findDataSourceForFrameNamed:
- @discussion findDataSourceForFrameNamed: returns the child data source associated with
+ @param name The name of the frame to find. Does not recurse.
+ @result Returns the child data source associated with
the frame named 'name', or nil.
- @param name
*/
- (WebDataSource *)findDataSourceForFrameNamed:(NSString *)name;
/*!
@method frameExists:
- @param name
+ @param name The name of the frame to check for existence. Does not recurse.
+ @result Returns YES if a frame named name exists.
*/
- (BOOL)frameExists: (NSString *)name;
/*!
- @method openURL:isFrameNamed:
- @param URL
- @param frameName
-*/
-- (void)openURL:(NSURL *)URL inFrameNamed:(NSString *)frameName;
-
-/*!
@method controller
+ @result Returns the controller associated with this datasource.
*/
- (WebController *)controller;
/*!
@method request
+ @result Returns the request that was used to create this datasource.
*/
-(WebResourceRequest *)request;
/*!
@method URL
- @discussion May return nil if not initialized with a URL.
- The value of URL will change if a redirect occurs.
+ @discussion The value of URL will change if a redirect occurs.
To monitor change in the URL, override the <WebLocationChangeHandler>
serverRedirectTo:forDataSource: method.
+ @result Returns the current URL associated with the datasource.
*/
- (NSURL *)URL;
/*!
@method originalURL
- @discussion The original passed in at initialization time.
- Starts out same as URL, but doesn't change if a redirect occurs.
+ @discussion Starts out same as URL, but doesn't change if a redirect occurs.
+ @results Returns the original URL passed in at initialization time.
*/
- (NSURL *)originalURL;
/*!
@method startLoading
- @discussion Start actually getting (if initialized with a URL) and parsing data. If the data source
+ @discussion Start actually getting and parsing data. If the data source
is still performing a previous load it will be stopped.
*/
- (void)startLoading;
@@ -169,54 +179,63 @@
/*!
@method isDocumentHTML
+ @result Returns YES if the representation of the datasource is a WebHTMLRepresentation.
*/
- (BOOL)isDocumentHTML;
/*!
@method encoding
+ // FIXME rename to textEncodingName, move to WebHTMLRepresentation
*/
- (NSString *)encoding;
/*!
@method pageTitle
- @discussion Returns nil or the page title.
+ @result Returns nil or the page title.
+ // FIXME move to WebHTMLRepresentation
*/
- (NSString *)pageTitle;
/*!
@method frameName
+ @result frameName The name of frame that contains this datasource.
*/
- (NSString *)frameName;
/*!
@method contentPolicy
+ @result The content policy used by this datasource.
*/
- (WebContentPolicy *)contentPolicy;
/*!
@method contentType
- @discussion returns the MIME type for the data source.
+ @result returns the MIME type for the data source.
*/
- (NSString *)contentType;
/*!
@method fileType
- @discussion extension based on the MIME type
+ @result The extension based on the MIME type
*/
- (NSString *)fileType;
/*!
@method errors
+ @result Returns a dictionary of WebErrors from all the resources loaded for this page.
*/
- (NSDictionary *)errors;
/*!
@method mainDocumentError
+ @result Returns a WebError associated with the load of the main document, or nil if no error occurred.
*/
- (WebError *)mainDocumentError;
/*!
@method registerRepresentationClass:forMIMEType:
+ @discussion A subclass of NSView that implements WebDocumentView may be registered
+ with this method.
@param repClass
@param MIMEType
*/
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 3a039c3..01c77f1 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -114,19 +114,6 @@
return [_private->frames allValues];
}
-- (void)addFrame: (WebFrame *)frame
-{
- if (_private->frames == nil)
- _private->frames = [[NSMutableDictionary alloc] init];
-
- // Check to make sure a duplicate frame name didn't creep in.
- ASSERT([_private->frames objectForKey:[frame name]] == nil);
-
- [[frame dataSource] _setParent: self];
- [_private->frames setObject: frame forKey: [frame name]];
-}
-
-
- (WebFrame *)frameNamed: (NSString *)frameName
{
return (WebFrame *)[_private->frames objectForKey: frameName];
@@ -157,12 +144,6 @@
}
-- (void)openURL: (NSURL *)URL inFrameNamed: (NSString *)frameName
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::openURL:inFrameNamed: is not implemented"];
-}
-
-
- (WebController *)controller
{
// All data sources used in a document share the same controller.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 9385679..bd56adb 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -125,4 +125,13 @@
- (void)_defersCallbacksChanged;
+/*!
+ @method addFrame:
+ @discussion Add a child frame. This should only be called by the data source's controller
+ as a result of a createFrame:inParent:.
+ // [Should this be private?]
+*/
+- (void)addFrame: (WebFrame *)frame;
+
+
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 1f981aa..572d790 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -519,4 +519,19 @@
[[self children] makeObjectsPerformSelector:@selector(_defersCallbacksChanged)];
}
+- (void)addFrame: (WebFrame *)frame
+{
+ if (_private->frames == nil)
+ _private->frames = [[NSMutableDictionary alloc] init];
+
+ // Check to make sure a duplicate frame name didn't creep in.
+ ASSERT([_private->frames objectForKey:[frame name]] == nil);
+
+ [[frame dataSource] _setParent: self];
+ [_private->frames setObject: frame forKey: [frame name]];
+}
+
+
+
+
@end
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 03d348f..b0ed39d 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -16,6 +16,8 @@
/*!
@class WebFrame
+ @discussion Every web page is represented by at least one WebFrame. A WebFrame
+ has a WebView and a WebDataSource.
*/
@interface WebFrame : NSObject
{
@@ -25,15 +27,18 @@
/*!
@method initWithName:webView:provisionalDataSource:controller:
- @param name
- @param view
- @param dataSource
- @param controller
+ @abstract The designated initializer of WebFrame.
+ @param name The name of the frame.
+ @param view The view for the frame.
+ @param dataSource The dataSource for the frame.
+ @param controller The controller that manages the frame.
+ @result Returns an initialized WebFrame.
*/
- initWithName: (NSString *)name webView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controller: (WebController *)controller;
/*!
@method name
+ @result The frame name.
*/
- (NSString *)name;
@@ -45,6 +50,7 @@
/*!
@method controller
+ @result Returns the controller of this frame.
*/
- (WebController *)controller;
@@ -56,6 +62,7 @@
/*!
@method webView
+ @result The WebView for this frame.
*/
- (WebView *)webView;
@@ -65,9 +72,9 @@
considered 'provisional' until it has been loaded, and at least
~some~ data has been received.
- Will return NO and not set the provisional data source if the controller
- disallows by returning a WebURLPolicyIgnore.
@param dataSource
+ @result Returns NO and will not set the provisional data source if the controller
+ disallows by returning a WebURLPolicyIgnore.
*/
- (BOOL)setProvisionalDataSource: (WebDataSource *)dataSource;
@@ -75,6 +82,7 @@
@method dataSource
@discussion Returns the committed data source. Will return nil if the
provisional data source hasn't yet been loaded.
+ @result The datasource for this frame.
*/
- (WebDataSource *)dataSource;
@@ -83,6 +91,7 @@
@discussion Will return the provisional data source. The provisional data source will
return nil if no data source has been set on the frame, or the data source
has successfully transitioned to the committed data source.
+ @result The provisional datasource of this frame.
*/
- (WebDataSource *)provisionalDataSource;
@@ -115,7 +124,8 @@
for _self and _current, the parent frame for _parent and the main frame for _top.
frameNamed returns self for _parent and _top if the receiver it is the mainFrame.
nil is returned if a frame with the given name is not found.
- @param name
+ @param name The name of the frame to find.
+ @result The frame matching the provided name.
*/
- (WebFrame *)frameNamed:(NSString *)name;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list