[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:29:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e2e7f94d9828189ac1dafb0fc9124cda370d1e9b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 6 22:37:21 2002 +0000
WebKit:
- fixed 3017761 -- dataSource != nil assertion navigating at yahoo.com
* WebView.subproj/WebLocationChangeHandler.h:
* WebView.subproj/WebLocationChangeHandler.m:
Change client redirect calls to pass the frame, not the data source.
At the time a client redirect is requested, it's not even clear yet
which data source will be involved. We may want to make some of the
other calls pass frames, also, aside from the "start", "committed", "done",
calls, which must specify the data source.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge reportClientRedirectTo:delay:fireDate:]): Pass frame, not data source.
(-[WebBridge reportClientRedirectCancelled]): Pass frame, not data source.
WebBrowser:
Update for change to client redirect API.
* LocationChangeHandler.m:
(-[LocationChangeHandler clientRedirectTo:delay:fireDate:forFrame:]):
(-[LocationChangeHandler clientRedirectCancelledForFrame:]):
We get the frame now, not the data source.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1754 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 76cfcdd..20212b2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,20 @@
2002-08-06 Darin Adler <darin at apple.com>
+ - fixed 3017761 -- dataSource != nil assertion navigating at yahoo.com
+
+ * WebView.subproj/WebLocationChangeHandler.h:
+ * WebView.subproj/WebLocationChangeHandler.m:
+ Change client redirect calls to pass the frame, not the data source.
+ At the time a client redirect is requested, it's not even clear yet
+ which data source will be involved. We may want to make some of the
+ other calls pass frames, also, aside from the "start", "committed", "done",
+ calls, which must specify the data source.
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge reportClientRedirectTo:delay:fireDate:]): Pass frame, not data source.
+ (-[WebBridge reportClientRedirectCancelled]): Pass frame, not data source.
+
+2002-08-06 Darin Adler <darin at apple.com>
+
* lots of files: Changed url to URL in many places and renamed URL-related methods.
2002-08-06 Darin Adler <darin at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 76cfcdd..20212b2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,20 @@
2002-08-06 Darin Adler <darin at apple.com>
+ - fixed 3017761 -- dataSource != nil assertion navigating at yahoo.com
+
+ * WebView.subproj/WebLocationChangeHandler.h:
+ * WebView.subproj/WebLocationChangeHandler.m:
+ Change client redirect calls to pass the frame, not the data source.
+ At the time a client redirect is requested, it's not even clear yet
+ which data source will be involved. We may want to make some of the
+ other calls pass frames, also, aside from the "start", "committed", "done",
+ calls, which must specify the data source.
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge reportClientRedirectTo:delay:fireDate:]): Pass frame, not data source.
+ (-[WebBridge reportClientRedirectCancelled]): Pass frame, not data source.
+
+2002-08-06 Darin Adler <darin at apple.com>
+
* lots of files: Changed url to URL in many places and renamed URL-related methods.
2002-08-06 Darin Adler <darin at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index eb7cb42..cab535b 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -192,14 +192,12 @@
- (void)reportClientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date
{
- [[[frame controller] locationChangeHandler]
- clientRedirectTo:URL delay:seconds fireDate:date forDataSource:[self dataSource]];
+ [[[frame controller] locationChangeHandler] clientRedirectTo:URL delay:seconds fireDate:date forFrame:frame];
}
- (void)reportClientRedirectCancelled
{
- [[[frame controller] locationChangeHandler]
- clientRedirectCancelledForDataSource:[self dataSource]];
+ [[[frame controller] locationChangeHandler] clientRedirectCancelledForFrame:frame];
}
- (void)setFrame:(WebFrame *)webFrame
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 2313b50..8589124 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -9,11 +9,12 @@
@class WebError;
@class WebDataSource;
+ at class WebFrame;
/*
=============================================================================
- WebLocationChangeHandlers track changes to a frames location. This includes
+ WebLocationChangeHandlers track changes to a frame's location. This includes
changes that may result in a download, or a resource being opened externally.
rather than a change to the frame document.
@@ -45,8 +46,8 @@
- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource;
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forDataSource:(WebDataSource *)dataSource;
-- (void)clientRedirectCancelledForDataSource:(WebDataSource *)dataSource;
+- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 2313b50..8589124 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -9,11 +9,12 @@
@class WebError;
@class WebDataSource;
+ at class WebFrame;
/*
=============================================================================
- WebLocationChangeHandlers track changes to a frames location. This includes
+ WebLocationChangeHandlers track changes to a frame's location. This includes
changes that may result in a download, or a resource being opened externally.
rather than a change to the frame document.
@@ -45,8 +46,8 @@
- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource;
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forDataSource:(WebDataSource *)dataSource;
-- (void)clientRedirectCancelledForDataSource:(WebDataSource *)dataSource;
+- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.m b/WebKit/WebView.subproj/WebLocationChangeDelegate.m
index 20c597d..763a911 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.m
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.m
@@ -16,7 +16,7 @@
- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource { }
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forDataSource:(WebDataSource *)dataSource { }
-- (void)clientRedirectCancelledForDataSource:(WebDataSource *)dataSource { }
+- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame { }
+- (void)clientRedirectCancelledForFrame:(WebFrame *)frame { }
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
index 2313b50..8589124 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.h
@@ -9,11 +9,12 @@
@class WebError;
@class WebDataSource;
+ at class WebFrame;
/*
=============================================================================
- WebLocationChangeHandlers track changes to a frames location. This includes
+ WebLocationChangeHandlers track changes to a frame's location. This includes
changes that may result in a download, or a resource being opened externally.
rather than a change to the frame document.
@@ -45,8 +46,8 @@
- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource;
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forDataSource:(WebDataSource *)dataSource;
-- (void)clientRedirectCancelledForDataSource:(WebDataSource *)dataSource;
+- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame;
+- (void)clientRedirectCancelledForFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.m b/WebKit/WebView.subproj/WebLocationChangeHandler.m
index 20c597d..763a911 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.m
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.m
@@ -16,7 +16,7 @@
- (void)serverRedirectTo:(NSURL *)URL forDataSource:(WebDataSource *)dataSource { }
-- (void)clientRedirectTo:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forDataSource:(WebDataSource *)dataSource { }
-- (void)clientRedirectCancelledForDataSource:(WebDataSource *)dataSource { }
+- (void)clientRedirectTo:(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