[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:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2f7b855d3cf842693b33fa5dccc6196cc97e4470
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 26 00:51:12 2002 +0000
API and documentation tweaks.
WebDocumentDragSettings: canDrag -> acceptsDrag
WebDataSource: removed originalURL
WebStandardPanels: use -> uses
* History.subproj/WebBackForwardList.h:
* Misc.subproj/WebDownloadHandler.m:
(-[WebDownloadHandler initWithDataSource:]):
* Panels.subproj/WebStandardPanels.h:
* Panels.subproj/WebStandardPanels.m:
(-[WebStandardPanels setUsesStandardAuthenticationPanel:]):
(-[WebStandardPanels usesStandardAuthenticationPanel]):
* Plugins.subproj/WebPluginView.m:
(-[WebNetscapePluginView frameStateChanged:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient cancel]):
* WebView.subproj/WebController.h:
* WebView.subproj/WebDataSource.h:
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _commitIfReady]):
* WebView.subproj/WebDocument.h:
* WebView.subproj/WebFrame.m:
(-[WebFrame setProvisionalDataSource:]):
(-[WebFrame startLoading]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _transitionToCommitted]):
(-[WebFrame _setState:]):
(-[WebFrame _goToItem:withFrameLoadType:]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView setAcceptsDrags:]):
(-[WebHTMLView acceptsDrags]):
(-[WebHTMLView setAcceptsDrops:]):
(-[WebHTMLView acceptsDrops]):
* WebView.subproj/WebImageView.m:
(-[WebImageView setAcceptsDrags:]):
(-[WebImageView acceptsDrags]):
(-[WebImageView setAcceptsDrops:]):
(-[WebImageView acceptsDrops]):
* WebView.subproj/WebLoadProgress.h:
* WebView.subproj/WebLocationChangeDelegate.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient didCancelWithHandle:]):
* WebView.subproj/WebView.h:
Updated to reflect API tweaks.
* AppController.m:
(-[AppController awakeFromNib]):
* DownloadProgressEntry.m:
(-[DownloadProgressEntry stop]):
* LocationChangeHandler.m:
(-[LocationChangeHandler locationChangeStartedForDataSource:]):
(-[LocationChangeHandler locationChangeCommittedForDataSource:]):
(-[LocationChangeHandler locationChangeDone:forDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2170 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c5e9108..77eb280 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,50 @@
+2002-09-25 Richard Williamson <rjw at apple.com>
+
+ API and documentation tweaks.
+
+ WebDocumentDragSettings: canDrag -> acceptsDrag
+ WebDataSource: removed originalURL
+ WebStandardPanels: use -> uses
+
+ * History.subproj/WebBackForwardList.h:
+ * Misc.subproj/WebDownloadHandler.m:
+ (-[WebDownloadHandler initWithDataSource:]):
+ * Panels.subproj/WebStandardPanels.h:
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels setUsesStandardAuthenticationPanel:]):
+ (-[WebStandardPanels usesStandardAuthenticationPanel]):
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebNetscapePluginView frameStateChanged:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient cancel]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _commitIfReady]):
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame setProvisionalDataSource:]):
+ (-[WebFrame startLoading]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted]):
+ (-[WebFrame _setState:]):
+ (-[WebFrame _goToItem:withFrameLoadType:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView setAcceptsDrags:]):
+ (-[WebHTMLView acceptsDrags]):
+ (-[WebHTMLView setAcceptsDrops:]):
+ (-[WebHTMLView acceptsDrops]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView setAcceptsDrags:]):
+ (-[WebImageView acceptsDrags]):
+ (-[WebImageView setAcceptsDrops:]):
+ (-[WebImageView acceptsDrops]):
+ * WebView.subproj/WebLoadProgress.h:
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient didCancelWithHandle:]):
+ * WebView.subproj/WebView.h:
+
2002-09-25 Ken Kocienda <kocienda at apple.com>
Changes to move the WebResourceHandle API closer to the
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c5e9108..77eb280 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,50 @@
+2002-09-25 Richard Williamson <rjw at apple.com>
+
+ API and documentation tweaks.
+
+ WebDocumentDragSettings: canDrag -> acceptsDrag
+ WebDataSource: removed originalURL
+ WebStandardPanels: use -> uses
+
+ * History.subproj/WebBackForwardList.h:
+ * Misc.subproj/WebDownloadHandler.m:
+ (-[WebDownloadHandler initWithDataSource:]):
+ * Panels.subproj/WebStandardPanels.h:
+ * Panels.subproj/WebStandardPanels.m:
+ (-[WebStandardPanels setUsesStandardAuthenticationPanel:]):
+ (-[WebStandardPanels usesStandardAuthenticationPanel]):
+ * Plugins.subproj/WebPluginView.m:
+ (-[WebNetscapePluginView frameStateChanged:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient cancel]):
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebDataSource.h:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _commitIfReady]):
+ * WebView.subproj/WebDocument.h:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame setProvisionalDataSource:]):
+ (-[WebFrame startLoading]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted]):
+ (-[WebFrame _setState:]):
+ (-[WebFrame _goToItem:withFrameLoadType:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView setAcceptsDrags:]):
+ (-[WebHTMLView acceptsDrags]):
+ (-[WebHTMLView setAcceptsDrops:]):
+ (-[WebHTMLView acceptsDrops]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView setAcceptsDrags:]):
+ (-[WebImageView acceptsDrags]):
+ (-[WebImageView setAcceptsDrops:]):
+ (-[WebImageView acceptsDrops]):
+ * WebView.subproj/WebLoadProgress.h:
+ * WebView.subproj/WebLocationChangeDelegate.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient didCancelWithHandle:]):
+ * WebView.subproj/WebView.h:
+
2002-09-25 Ken Kocienda <kocienda at apple.com>
Changes to move the WebResourceHandle API closer to the
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index ca0ca6f..10ccc4b 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -13,8 +13,6 @@
int state;
}
--(id)init;
-
// add to the list
-(void)addEntry:(WebHistoryItem *)entry;
diff --git a/WebKit/Misc.subproj/WebDownloadHandler.m b/WebKit/Misc.subproj/WebDownloadHandler.m
index 55a9c04..5477022 100644
--- a/WebKit/Misc.subproj/WebDownloadHandler.m
+++ b/WebKit/Misc.subproj/WebDownloadHandler.m
@@ -21,7 +21,7 @@
[super init];
dataSource = [dSource retain];
- LOG(Download, "Download started for: %s", [[[dSource originalURL] absoluteString] cString]);
+ LOG(Download, "Download started for: %s", [[[[dSource request] URL] absoluteString] cString]);
return self;
}
diff --git a/WebKit/Panels.subproj/WebStandardPanels.h b/WebKit/Panels.subproj/WebStandardPanels.h
index ff767ff..0301f47 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.h
+++ b/WebKit/Panels.subproj/WebStandardPanels.h
@@ -29,18 +29,18 @@
+(WebStandardPanels *)sharedStandardPanels;
/*!
- @method setUseStandardAuthenticationPanel:
+ @method setUsesStandardAuthenticationPanel:
@abstract Request that the standard authentication panel be used or not used.
@param use YES if the standard authentication panel should be used, NO otherwise
*/
--(void)setUseStandardAuthenticationPanel:(BOOL)use;
+-(void)setUsesStandardAuthenticationPanel:(BOOL)use;
/*!
- @method useStandardAuthenticationPanel
+ @method usesStandardAuthenticationPanel
@abstract Determine whether the standard authentication panelwill be used or not used.
@result YES if the standard authentication panel should be used, NO otherwise
*/
--(BOOL)useStandardAuthenticationPanel;
+-(BOOL)usesStandardAuthenticationPanel;
/*!
@method didStartLoadingURL:inWindow:
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index c3e641f..3961bc5 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -80,15 +80,15 @@ static void initSharedStandardPanels(void)
return sharedStandardPanels;
}
--(void)setUseStandardAuthenticationPanel:(BOOL)use
+-(void)setUsesStandardAuthenticationPanel:(BOOL)use
{
if (use) {
- if (![self useStandardAuthenticationPanel]) {
+ if (![self usesStandardAuthenticationPanel]) {
_privatePanels->panelAuthenticationHandler = [[WebPanelAuthenticationHandler alloc] init];
[[WebAuthenticationManager sharedAuthenticationManager] addAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
}
} else {
- if ([self useStandardAuthenticationPanel]) {
+ if ([self usesStandardAuthenticationPanel]) {
[[WebAuthenticationManager sharedAuthenticationManager] removeAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
[_privatePanels->panelAuthenticationHandler release];
_privatePanels->panelAuthenticationHandler = nil;
@@ -96,7 +96,7 @@ static void initSharedStandardPanels(void)
}
}
--(BOOL)useStandardAuthenticationPanel
+-(BOOL)usesStandardAuthenticationPanel
{
return _privatePanels->panelAuthenticationHandler != nil;
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 19f3933..3037e0e 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -792,7 +792,7 @@
NSURL *URL;
frame = [notification object];
- URL = [[frame dataSource] originalURL];
+ URL = [[[frame dataSource] request] URL];
notifyDataValue = [notificationData objectForKey:URL];
if(!notifyDataValue)
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index c188c46..86fe3c5 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -202,7 +202,7 @@
[dataSource _removeSubresourceClient:self];
WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
+ inDomain:WebErrorDomainWebFoundation failingURL:[[[dataSource request] URL] absoluteString]];
[self receivedError:error];
[error release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index c188c46..86fe3c5 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -202,7 +202,7 @@
[dataSource _removeSubresourceClient:self];
WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
- inDomain:WebErrorDomainWebFoundation failingURL:[[dataSource originalURL] absoluteString]];
+ inDomain:WebErrorDomainWebFoundation failingURL:[[[dataSource request] URL] absoluteString]];
[self receivedError:error];
[error release];
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 712f6a1..a1f67ec 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -98,13 +98,6 @@ extern NSString *WebElementFrameKey;
*/
+ (BOOL)canShowFile:(NSString *)path;
-/*!
- @method init
- @abstract Calls designated initializer with nil arguments.
- @result returns an initialized WebController.
-*/
-- init;
-
/*!
@method initWithView:provisionalDataSource:controllerSetName:
@abstract The designated initializer for WebController.
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index a87bb70..456fe7b 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -150,13 +150,6 @@
- (NSURL *)URL;
/*!
- @method originalURL
- @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 and parsing data. If the data source
is still performing a previous load it will be stopped.
@@ -234,8 +227,12 @@
/*!
@method registerRepresentationClass:forMIMEType:
- @discussion A subclass of NSView that implements WebDocumentView may be registered
+ @discussion A class that implements WebDocumentRepresentation may be registered
with this method.
+ A document class may register for a primary MIME type by excluding
+ a subtype, i.e. "video/" will match the document class with
+ all video types. More specific matching takes precedence
+ over general matching.
@param repClass
@param MIMEType
*/
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 4b4f6b4..923a3e3 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -408,7 +408,7 @@
-(void)_commitIfReady
{
if ([[self contentPolicy] policyAction] == WebContentPolicyShow && _private->gotFirstByte && !_private->committed) {
- LOG(Loading, "committed resource = %s", [[[self originalURL] absoluteString] cString]);
+ LOG(Loading, "committed resource = %s", [[[[self request] URL] absoluteString] cString]);
_private->committed = TRUE;
[self _makeRepresentation];
[[self webFrame] _transitionToCommitted];
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 2a670f3..f8ec917 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -51,30 +51,30 @@
*/
@protocol WebDocumentDragSettings <NSObject>
/*!
- @method setCanDragFrom:
+ @method setAcceptsDrags:
@abstract Sets whether one can drag from the document view or not.
@param flag YES allows drags from the document view, NO disallows drags from the document view.
*/
-- (void)setCanDragFrom: (BOOL)flag;
+- (void)setAcceptsDrags: (BOOL)flag;
/*!
- @method canDragFrom
+ @method acceptsDrags
@result Whether one can drag from the document view or not.
*/
-- (BOOL)canDragFrom;
+- (BOOL)acceptsDrags;
/*!
- @method setCanDragTo:
+ @method setAcceptsDrags:
@abstract Sets whether one can drag to the document view or not.
@param flag YES allows drags to the document view, NO disallows drags to the document view.
*/
-- (void)setCanDragTo: (BOOL)flag;
+- (void)setAcceptsDrags: (BOOL)flag;
/*!
- @method canDragTo
+ @method acceptsDrops
@result Whether one can drag to the document view or not.
*/
-- (BOOL)canDragTo;
+- (BOOL)acceptsDrops;
@end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 5ea7536..2b51534 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -127,7 +127,7 @@
WebHistoryItem *entry;
entry = (WebHistoryItem *)[[[self controller] backForwardList] currentEntry];
- if ([[[entry URL] _web_URLByRemovingFragment] isEqual: [[[self dataSource] originalURL] _web_URLByRemovingFragment]]) {
+ if ([[[entry URL] _web_URLByRemovingFragment] isEqual: [[[[self dataSource] request] URL] _web_URLByRemovingFragment]]) {
NSPoint point = [[[[self webView] documentView] superview] bounds].origin;
[entry setScrollPoint: point];
}
@@ -175,7 +175,7 @@
- (void)startLoading
{
if (self == [[self controller] mainFrame])
- LOG(DocumentLoad, "loading %s", [[[[self provisionalDataSource] originalURL] absoluteString] cString]);
+ LOG(DocumentLoad, "loading %s", [[[[[self provisionalDataSource] request] URL] absoluteString] cString]);
[_private->provisionalDataSource startLoading];
}
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 08ba0bd..d50aced 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -13,7 +13,7 @@
/*!
@protocol WebLocationChangeDelegate
- @discussion A controller's WebLocationChangeDelegate track changes it's frame's location.
+ @discussion A controller's WebLocationChangeDelegate track changes its frame's location.
*/
@protocol WebLocationChangeDelegate <NSObject>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9fda926..fb8cef2 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -303,7 +303,7 @@ static const char * const stateNames[] = {
case WebFrameLoadTypeStandard:
parentFrame = [[self controller] frameForDataSource: [[self dataSource] parent]];
- backForwardItem = [[WebHistoryItem alloc] initWithURL:[[self dataSource] originalURL]
+ backForwardItem = [[WebHistoryItem alloc] initWithURL:[[[self dataSource] request] URL]
target:[self name]
parent:[parentFrame name]
title:[[self dataSource] pageTitle]];
@@ -355,7 +355,7 @@ static const char * const stateNames[] = {
LOG(Timing, "%s: transition from %s to %s, %f seconds since start of document load", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
if (newState == WebFrameStateComplete && self == [[self controller] mainFrame]){
- LOG(DocumentLoad, "completed %s (%f seconds)", [[[[self dataSource] originalURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
+ LOG(DocumentLoad, "completed %s (%f seconds)", [[[[[self dataSource] request] URL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -655,7 +655,7 @@ static const char * const stateNames[] = {
NSURL *itemURL = [item URL];
WebResourceRequest *request;
WebDataSource *dataSource;
- NSURL *originalURL = [[self dataSource] originalURL];
+ NSURL *originalURL = [[[self dataSource] request] URL];
if ([item anchor] && [[itemURL _web_URLByRemovingFragment] isEqual: [originalURL _web_URLByRemovingFragment]]) {
WebBackForwardList *backForwardList = [[self controller] backForwardList];
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 900915a..f6f38b2 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -46,11 +46,12 @@
/*!
@method isDocumentHTML
+ @result Returns TRUE is the document represented in the view is HTML.
*/
- (BOOL)isDocumentHTML;
/*!
- @method setAllowsScroling:
+ @method setAllowsScrolling:
@param flag
*/
- (void)setAllowsScrolling: (BOOL)flag;
@@ -62,8 +63,12 @@
/*!
@method registerViewClass:forMIMEType:
- @discussion Extends the views that WebKit supports
+ @discussion Extends the views that WebKit supports.
The view must conform to the WebDocumentView protocol
+ A view may register for a primary MIME type by excluding
+ a subtype, i.e. "video/" will match the view with
+ all video types. More specific matching takes precedence
+ over general matching.
@param viewClass
@param MIMEType
*/
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index bf8041b..b17ef73 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -212,22 +212,22 @@
// Drag and drop links and images. Others?
-- (void)setCanDragFrom: (BOOL)flag
+- (void)setAcceptsDrags: (BOOL)flag
{
_private->canDragFrom = flag;
}
-- (BOOL)canDragFrom
+- (BOOL)acceptsDrags
{
return _private->canDragFrom;
}
-- (void)setCanDragTo: (BOOL)flag
+- (void)setAcceptsDrops: (BOOL)flag
{
_private->canDragTo = flag;
}
-- (BOOL)canDragTo
+- (BOOL)acceptsDrops
{
return _private->canDragTo;
}
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index c06bb08..3b032b0 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -63,22 +63,22 @@
}
-- (void)setCanDragFrom: (BOOL)flag
+- (void)setAcceptsDrags: (BOOL)flag
{
canDragFrom = flag;
}
-- (BOOL)canDragFrom
+- (BOOL)acceptsDrags
{
return canDragFrom;
}
-- (void)setCanDragTo: (BOOL)flag
+- (void)setAcceptsDrops: (BOOL)flag
{
canDragTo = flag;
}
-- (BOOL)canDragTo
+- (BOOL)acceptsDrops
{
return canDragTo;
}
diff --git a/WebKit/WebView.subproj/WebLoadProgress.h b/WebKit/WebView.subproj/WebLoadProgress.h
index 8fe5157..5557637 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.h
+++ b/WebKit/WebView.subproj/WebLoadProgress.h
@@ -20,11 +20,6 @@
}
/*!
- @method init
-*/
-- (id)init;
-
-/*!
@method initWithBytesSoFar:totalToLoad:
@param bytes
@param total
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 08ba0bd..d50aced 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -13,7 +13,7 @@
/*!
@protocol WebLocationChangeDelegate
- @discussion A controller's WebLocationChangeDelegate track changes it's frame's location.
+ @discussion A controller's WebLocationChangeDelegate track changes its frame's location.
*/
@protocol WebLocationChangeDelegate <NSObject>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 7fb4b25..c5ff351 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -22,6 +22,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
#import <WebFoundation/WebCookieConstants.h>
@@ -134,7 +135,7 @@
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation
- failingURL:[[dataSource originalURL] absoluteString]];
+ failingURL:[[[dataSource request] URL] absoluteString]];
[self receivedError:error forHandle:handle];
[error release];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 7fb4b25..c5ff351 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -22,6 +22,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
#import <WebFoundation/WebResourceResponse.h>
#import <WebFoundation/WebCookieConstants.h>
@@ -134,7 +135,7 @@
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation
- failingURL:[[dataSource originalURL] absoluteString]];
+ failingURL:[[[dataSource request] URL] absoluteString]];
[self receivedError:error forHandle:handle];
[error release];
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 712f6a1..a1f67ec 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -98,13 +98,6 @@ extern NSString *WebElementFrameKey;
*/
+ (BOOL)canShowFile:(NSString *)path;
-/*!
- @method init
- @abstract Calls designated initializer with nil arguments.
- @result returns an initialized WebController.
-*/
-- init;
-
/*!
@method initWithView:provisionalDataSource:controllerSetName:
@abstract The designated initializer for WebController.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list