[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:50:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 063b11e0da3b0854a071cdbd6ba38a2b0ffb2c56
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 16 17:03:47 2002 +0000
WebKit:
- fixed 3017152 -- intra-page anchors not updating page address field
* WebView.subproj/WebLocationChangeDelegate.h: Rearrange methods so they are
in the order they are delivered. Add locationChangedWithinPageForDataSource method.
Renamed the redirect methods to match the verb tenses used in the others.
Removed the URL parameter from the server redirect method.
* WebView.subproj/WebLocationChangeDelegate.m: Update the class to match the
changes to the protocol.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge reportClientRedirectTo:delay:fireDate:]):
Update for change to clientWillRedirectTo method name.
(-[WebBridge loadURL:]): Call locationChangedWithinPageForDataSource:.
* WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]):
Update for change to serverRedirectedForDataSource method name.
* WebView.subproj/WebHTMLView.m: (-[WebHTMLView mouseMovedNotification:]):
Remove overzealous assert that was firing for me.
* WebCoreSupport.subproj/WebSubresourceClient.m: Update comment.
* WebView.subproj/WebDataSource.h: Fix comment.
WebBrowser:
WebBrowser changes to handle location changes within a page (clicks on anchors).
* BrowserWindowController.h: Added mainFrameLocationChangedWithinPage.
* BrowserWindowController.m:
(-[BrowserWindowController mainFrameLocationChangedWithinPage]):
Calls setLocationFieldTextToCurrentURL.
* LocationChangeHandler.m:
(-[LocationChangeHandler serverRedirectedForDataSource:]): Updated name to
track change in WebKit. Also removed unnecessary calls to titleChangedForFrame
and to _currentURLHasChanged, since both are only needed if the data source
is committed, and server redirects always come before it is committed.
(-[LocationChangeHandler locationChangedWithinPageForDataSource:]): Added.
Has much of what used to be in serverRedirectedForDataSource, and also calls
the new mainFrameLocationChangedWithinPage.
(-[LocationChangeHandler clientWillRedirectTo:delay:fireDate:forFrame:]):
Updated name to track change in WebKit.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2339 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2681b73..48f50c4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,28 @@
+2002-10-16 Darin Adler <darin at apple.com>
+
+ - fixed 3017152 -- intra-page anchors not updating page address field
+
+ * WebView.subproj/WebLocationChangeDelegate.h: Rearrange methods so they are
+ in the order they are delivered. Add locationChangedWithinPageForDataSource method.
+ Renamed the redirect methods to match the verb tenses used in the others.
+ Removed the URL parameter from the server redirect method.
+ * WebView.subproj/WebLocationChangeDelegate.m: Update the class to match the
+ changes to the protocol.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge reportClientRedirectTo:delay:fireDate:]):
+ Update for change to clientWillRedirectTo method name.
+ (-[WebBridge loadURL:]): Call locationChangedWithinPageForDataSource:.
+
+ * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]):
+ Update for change to serverRedirectedForDataSource method name.
+
+ * WebView.subproj/WebHTMLView.m: (-[WebHTMLView mouseMovedNotification:]):
+ Remove overzealous assert that was firing for me.
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m: Update comment.
+ * WebView.subproj/WebDataSource.h: Fix comment.
+
2002-10-15 Darin Adler <darin at apple.com>
- fixed 3062393 -- need to send proper referrer for "open in new window" menu items and keyboard shortcuts
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2681b73..48f50c4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,28 @@
+2002-10-16 Darin Adler <darin at apple.com>
+
+ - fixed 3017152 -- intra-page anchors not updating page address field
+
+ * WebView.subproj/WebLocationChangeDelegate.h: Rearrange methods so they are
+ in the order they are delivered. Add locationChangedWithinPageForDataSource method.
+ Renamed the redirect methods to match the verb tenses used in the others.
+ Removed the URL parameter from the server redirect method.
+ * WebView.subproj/WebLocationChangeDelegate.m: Update the class to match the
+ changes to the protocol.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge reportClientRedirectTo:delay:fireDate:]):
+ Update for change to clientWillRedirectTo method name.
+ (-[WebBridge loadURL:]): Call locationChangedWithinPageForDataSource:.
+
+ * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]):
+ Update for change to serverRedirectedForDataSource method name.
+
+ * WebView.subproj/WebHTMLView.m: (-[WebHTMLView mouseMovedNotification:]):
+ Remove overzealous assert that was firing for me.
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m: Update comment.
+ * WebView.subproj/WebDataSource.h: Fix comment.
+
2002-10-15 Darin Adler <darin at apple.com>
- fixed 3062393 -- need to send proper referrer for "open in new window" menu items and keyboard shortcuts
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index d4f5471..87f8fe1 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -197,7 +197,7 @@
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date
{
- [[[frame controller] locationChangeDelegate] clientRedirectTo:URL delay:seconds fireDate:date forFrame:frame];
+ [[[frame controller] locationChangeDelegate] clientWillRedirectTo:URL delay:seconds fireDate:date forFrame:frame];
}
- (void)reportClientRedirectCancelled
@@ -210,7 +210,7 @@
ASSERT(webFrame != nil);
if (frame == nil) {
- // FIXME: non-retained because data source owns representation owns bridge
+ // Non-retained because data source owns representation owns bridge
frame = webFrame;
[self setTextSizeMultiplier:[[frame controller] textSizeMultiplier]];
} else {
@@ -278,11 +278,9 @@
[[[frame controller] backForwardList] addEntry:backForwardItem];
[backForwardItem release];
- //id <WebLocationChangeDelegate> delegate = [[frame controller] locationChangeDelegate];
WebDataSource *dataSource = [frame dataSource];
- [dataSource _setURL:URL];
-
- // FIXME: Call some method here.
+ [dataSource _setURL:URL];
+ [[[frame controller] locationChangeDelegate] locationChangedWithinPageForDataSource:dataSource];
return;
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 151daa8..be03c75 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -114,12 +114,9 @@
{
ASSERT(handle == h);
- // FIXME: We do want to tell the client about redirects.
+ // FIXME: We do want to tell the client about redirects for subresources.
// But the current API doesn't give any way to tell redirects on
- // the main page from redirects on subresources, so for now we are
- // just disabling this. Before, we had code that tried to send the
- // redirect, but sent it to the wrong object.
- //[[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
+ // the main page from redirects on subresources.
// FIXME: Need to make sure client sets cookie policy base URL
// properly on redirect when we have the new redirect
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 151daa8..be03c75 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -114,12 +114,9 @@
{
ASSERT(handle == h);
- // FIXME: We do want to tell the client about redirects.
+ // FIXME: We do want to tell the client about redirects for subresources.
// But the current API doesn't give any way to tell redirects on
- // the main page from redirects on subresources, so for now we are
- // just disabling this. Before, we had code that tried to send the
- // redirect, but sent it to the wrong object.
- //[[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
+ // the main page from redirects on subresources.
// FIXME: Need to make sure client sets cookie policy base URL
// properly on redirect when we have the new redirect
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index af430bc..87fdc49 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -95,7 +95,7 @@
@method URL
@discussion The value of URL will change if a redirect occurs.
To monitor change in the URL, override the <WebLocationChangeHandler>
- serverRedirectTo:forDataSource: method.
+ serverRedirectedForDataSource: method.
@result Returns the current URL associated with the datasource.
*/
- (NSURL *)URL;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index a62bdb9..8229195 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -279,7 +279,7 @@
[_private->request release];
_private->request = request;
- [[_private->controller locationChangeDelegate] serverRedirectTo:[request URL] forDataSource:self];
+ [[_private->controller locationChangeDelegate] serverRedirectedForDataSource:self];
}
- (void)_setResponse:(WebResourceResponse *)response
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index d50aced..e195bb8 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -27,6 +27,14 @@
- (void)locationChangeStartedForDataSource:(WebDataSource *)dataSource;
/*!
+ @method serverRedirectedTo:forDataSource:
+ @abstract Notify that the data source has received a server redirect.
+ @param dataSource The data source for which the redirect occurred
+ @discussion You can find the new URL from the data source object.
+*/
+- (void)serverRedirectedForDataSource:(WebDataSource *)dataSource;
+
+/*!
@method locationChangeCommittedForDataSource:
@abstract Notify that a location change has been committed on a given data source
@param dataSource The data source for which the location change has started
@@ -39,16 +47,6 @@
- (void)locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
/*!
- @method locationChangeDone:forDataSource
- @abstract Notify that a location change is done (possibly with an error) for a data source
- @param error The error, if one occurred, or nil if none
- @param dataSource The data source that finished changing location
- @discussion This callback will only be received when all
- subresources are done loading.
-*/
-- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
-
-/*!
@method receivedPageTitle:forDataSource:
@abstract Notify that the page title has been determined or has changed
@param title The new page title
@@ -69,16 +67,28 @@
- (void)receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
/*!
- @method serverRedirectTo:forDataSource:
- @abstract Notify that the data source has received a server redirect.
- @param URL The URL redirected to
- @param dataSource The data source for which the redirect occurred
+ @method locationChangeDone:forDataSource
+ @abstract Notify that a location change is done (possibly with an error) for a data source
+ @param error The error, if one occurred, or nil if none
+ @param dataSource The data source that finished changing location
+ @discussion This callback will only be received when all
+ subresources are done loading.
+*/
+- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+
+/*!
+ @method locationChangedWithinPageForDataSource:
+ @abstract Notify that a further location change within the page
+ has occurred for an already loaded data source
+ @param dataSource The data source that had a location change
+ @discussion This is normally used for clicks on anchors within a page
+ that is already displayed. You can find the new URL from the data source object.
*/
-- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource;
+- (void)locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
/*!
- @method clientRedirectTo:delay:fireDate:forFrame:
- @abstract Notify that the data source has received a client-side redirect that may trigger soon
+ @method clientWillRedirectTo:delay:fireDate:forFrame:
+ @abstract Notify that the frame has received a client-side redirect that may trigger soon
@param URL The URL to be redirected to
@param seconds Seconds in which the redirect will happen
@param date The fire date
@@ -87,7 +97,7 @@
going while a client redirect is pending. A client redirect might
be cancelled before it fires - see clientRedirectCancelledForFrame.
*/
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
/*!
@method clientRedirectCancelledForFrame:
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index b1368d6..6d8b98a 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -706,7 +706,6 @@
- (void)mouseMovedNotification:(NSNotification *)notification
{
ASSERT(![self _insideAnotherHTMLView]);
- ASSERT([[self window] isMainWindow]);
NSEvent *event = [[notification userInfo] objectForKey:@"NSEvent"];
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index d50aced..e195bb8 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -27,6 +27,14 @@
- (void)locationChangeStartedForDataSource:(WebDataSource *)dataSource;
/*!
+ @method serverRedirectedTo:forDataSource:
+ @abstract Notify that the data source has received a server redirect.
+ @param dataSource The data source for which the redirect occurred
+ @discussion You can find the new URL from the data source object.
+*/
+- (void)serverRedirectedForDataSource:(WebDataSource *)dataSource;
+
+/*!
@method locationChangeCommittedForDataSource:
@abstract Notify that a location change has been committed on a given data source
@param dataSource The data source for which the location change has started
@@ -39,16 +47,6 @@
- (void)locationChangeCommittedForDataSource:(WebDataSource *)dataSource;
/*!
- @method locationChangeDone:forDataSource
- @abstract Notify that a location change is done (possibly with an error) for a data source
- @param error The error, if one occurred, or nil if none
- @param dataSource The data source that finished changing location
- @discussion This callback will only be received when all
- subresources are done loading.
-*/
-- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
-
-/*!
@method receivedPageTitle:forDataSource:
@abstract Notify that the page title has been determined or has changed
@param title The new page title
@@ -69,16 +67,28 @@
- (void)receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource;
/*!
- @method serverRedirectTo:forDataSource:
- @abstract Notify that the data source has received a server redirect.
- @param URL The URL redirected to
- @param dataSource The data source for which the redirect occurred
+ @method locationChangeDone:forDataSource
+ @abstract Notify that a location change is done (possibly with an error) for a data source
+ @param error The error, if one occurred, or nil if none
+ @param dataSource The data source that finished changing location
+ @discussion This callback will only be received when all
+ subresources are done loading.
+*/
+- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource;
+
+/*!
+ @method locationChangedWithinPageForDataSource:
+ @abstract Notify that a further location change within the page
+ has occurred for an already loaded data source
+ @param dataSource The data source that had a location change
+ @discussion This is normally used for clicks on anchors within a page
+ that is already displayed. You can find the new URL from the data source object.
*/
-- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource;
+- (void)locationChangedWithinPageForDataSource:(WebDataSource *)dataSource;
/*!
- @method clientRedirectTo:delay:fireDate:forFrame:
- @abstract Notify that the data source has received a client-side redirect that may trigger soon
+ @method clientWillRedirectTo:delay:fireDate:forFrame:
+ @abstract Notify that the frame has received a client-side redirect that may trigger soon
@param URL The URL to be redirected to
@param seconds Seconds in which the redirect will happen
@param date The fire date
@@ -87,7 +97,7 @@
going while a client redirect is pending. A client redirect might
be cancelled before it fires - see clientRedirectCancelledForFrame.
*/
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
/*!
@method clientRedirectCancelledForFrame:
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.m b/WebKit/WebView.subproj/WebLocationChangeDelegate.m
index 9b027b0..097e4e4 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.m
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.m
@@ -8,15 +8,19 @@
@implementation WebLocationChangeDelegate
- (void)locationChangeStartedForDataSource:(WebDataSource *)dataSource { }
+
+- (void)serverRedirectedForDataSource:(WebDataSource *)dataSource { }
+
- (void)locationChangeCommittedForDataSource:(WebDataSource *)dataSource { }
-- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
- (void)receivedPageTitle:(NSString *)title forDataSource:(WebDataSource *)dataSource { }
- (void)receivedPageIcon:(NSImage *)image forDataSource:(WebDataSource *)dataSource { }
-- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource { }
+- (void)locationChangeDone:(WebError *)error forDataSource:(WebDataSource *)dataSource { }
+
+- (void)locationChangedWithinPageForDataSource:(WebDataSource *)dataSource { }
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+- (void)clientWillRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
- (void)clientRedirectCancelledForFrame:(WebFrame *)frame { }
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list