[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:09:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 72c37f02de6b58d6b87598a060d5d88e3b4fdc1e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 25 01:15:19 2002 +0000
Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
Labyrinth/WebBrowser/ChangeLog
Labyrinth/WebBrowser/FrameProgressEntry.m
Labyrinth/WebBrowser/IFWebFrameAdditions.m
Labyrinth/WebBrowser/LoadProgressMonitor.m
Labyrinth/WebBrowser/LocationChangeHandler.m
Labyrinth/WebBrowser/WebController.m
Labyrinth/WebBrowser/WebBrowser.pbproj/project.pbxproj
Labyrinth/WebCore/ChangeLog
Labyrinth/WebCore/kwq/KWQKHTMLPart.mm
Labyrinth/WebCore/kwq/external.h Labyrinth/WebKit/ChangeLog
Labyrinth/WebKit/WebKit.pbproj/project.pbxproj
Labyrinth/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
Labyrinth/WebKit/WebView.subproj/IFMainURLHandleClient.mm
Labyrinth/WebKit/WebView.subproj/IFWebDataSource.h
Labyrinth/WebKit/WebView.subproj/IFWebDataSource.mm
Labyrinth/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1073 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3c37cbf..174bb0b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-04-24 Chris Blumenberg <cblu at apple.com>
+
+ Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::submitForm):
+ (KHTMLPart::khtmlMouseReleaseEvent):
+ * kwq/external.h:
+
=== Alexander 0.3c2 (v1) ===
2002-04-24 Darin Adler <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3c37cbf..174bb0b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-04-24 Chris Blumenberg <cblu at apple.com>
+
+ Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::submitForm):
+ (KHTMLPart::khtmlMouseReleaseEvent):
+ * kwq/external.h:
+
=== Alexander 0.3c2 (v1) ===
2002-04-24 Darin Adler <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3c37cbf..174bb0b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-04-24 Chris Blumenberg <cblu at apple.com>
+
+ Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::submitForm):
+ (KHTMLPart::khtmlMouseReleaseEvent):
+ * kwq/external.h:
+
=== Alexander 0.3c2 (v1) ===
2002-04-24 Darin Adler <darin at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 76f9579..482bdf7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1025,7 +1025,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
IFWebFrame *frame;
oldDataSource = getDataSource();
- frame = [oldDataSource frame];
+ frame = [oldDataSource webFrame];
newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: u.getNSURL() attributes: attributes flags: 0] autorelease]);
[newDataSource _setParent: [oldDataSource parent]];
@@ -1393,7 +1393,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
if (target.isEmpty()){
oldDataSource = getDataSource();
- frame = [oldDataSource frame];
+ frame = [oldDataSource webFrame];
}
else {
frame = [[getDataSource() controller] frameNamed: QSTRING_TO_NSSTRING(target)];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 76f9579..482bdf7 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -1025,7 +1025,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
IFWebFrame *frame;
oldDataSource = getDataSource();
- frame = [oldDataSource frame];
+ frame = [oldDataSource webFrame];
newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: u.getNSURL() attributes: attributes flags: 0] autorelease]);
[newDataSource _setParent: [oldDataSource parent]];
@@ -1393,7 +1393,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
if (target.isEmpty()){
oldDataSource = getDataSource();
- frame = [oldDataSource frame];
+ frame = [oldDataSource webFrame];
}
else {
frame = [[getDataSource() controller] frameNamed: QSTRING_TO_NSSTRING(target)];
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index 34b1305..03e5b6e 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -55,7 +55,7 @@
@interface IFWebDataSource : NSObject
- initWithURL: (NSURL *)url;
- (void)setFrame: (IFWebFrame *)fName;
-- (IFWebFrame *)frame;
+- (IFWebFrame *)webFrame;
- (id <IFWebController>)controller;
- frameNamed: (NSString *)f;
- (BOOL)frameExists: (NSString *)f;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 84f1668..5680f6a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-04-24 Chris Blumenberg <cblu at apple.com>
+
+ Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _receivedError:forResource:partialProgress:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedError:forResource:partialProgress:fromDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ (-[IFWebDataSource webFrame]):
+ (-[IFWebDataSource frameName]):
+ (-[IFWebDataSource isLoading]):
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _startLoading:]):
+ (-[IFWebDataSource _setTitle:]):
+
2002-04-24 Richard Williamson <rjw at apple.com>
Changed ordering of messages so activity viewer doesn't get -1 bytesSoFar
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 84f1668..5680f6a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-04-24 Chris Blumenberg <cblu at apple.com>
+
+ Renamed [IFWebDataSource frame] to [IFWebDataSource webFrame]
+
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ (-[IFBaseWebController _receivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedProgress:forResource:fromDataSource:]):
+ (-[IFBaseWebController _receivedError:forResource:partialProgress:fromDataSource:]):
+ (-[IFBaseWebController _mainReceivedError:forResource:partialProgress:fromDataSource:]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ (-[IFWebDataSource webFrame]):
+ (-[IFWebDataSource frameName]):
+ (-[IFWebDataSource isLoading]):
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ (-[IFWebDataSource _startLoading:]):
+ (-[IFWebDataSource _setTitle:]):
+
2002-04-24 Richard Williamson <rjw at apple.com>
Changed ordering of messages so activity viewer doesn't get -1 bytesSoFar
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 5220000..61cd04a 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -62,7 +62,7 @@
- (void)_receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource frame];
+ IFWebFrame *frame = [dataSource webFrame];
WEBKIT_ASSERT (dataSource != nil);
@@ -88,7 +88,7 @@
- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource frame];
+ IFWebFrame *frame = [dataSource webFrame];
WEBKIT_ASSERT (dataSource != nil);
@@ -137,7 +137,7 @@
- (void)_receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource frame];
+ IFWebFrame *frame = [dataSource webFrame];
[self receivedError: error forResource: resourceDescription partialProgress: progress fromDataSource: dataSource];
@@ -152,7 +152,7 @@
- (void)_mainReceivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource frame];
+ IFWebFrame *frame = [dataSource webFrame];
[self receivedError: error forResource: resourceDescription partialProgress: progress fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 9bfdac0..e648978 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -157,10 +157,14 @@
else if([dataSource _contentPolicy] == IFContentPolicySave ||
[dataSource _contentPolicy] == IFContentPolicyOpenExternally){
if(!downloadStarted){
+
+ // If this is a download, detach the provisionalDataSource from the frame
+ // and have downloadHandler retain it.
downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
frame = [dataSource webFrame];
- // FIXME: need a cleaner way for the frame to let go of the data source
- frame->_private->provisionalDataSource = nil;
+ [frame->_private setProvisionalDataSource:nil];
+
+ // go right to locationChangeDone as the data source never get committed.
[[dataSource _locationChangeHandler] locationChangeDone:nil];
downloadStarted = YES;
}
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 96f6f22..72a921f 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -50,9 +50,6 @@
// returns the parent data source.
- (IFWebDataSource *)parent;
-// Return the frame that represents this data source.
-- (IFWebFrame *)frame;
-
// Return the frame that represents this data source. Same as above.
- (IFWebFrame *)webFrame;
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index ce0537b..0d54f35 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -63,22 +63,16 @@ static id IFWebDataSourceMake(void *handle)
- initWithLoader: (IFLoader *)loader;
#endif
-- (IFWebFrame *)frame
-{
- return [_private->controller frameForDataSource: self];
-}
-
-// This was adding to avoid collision with NSView
- (IFWebFrame *)webFrame
{
- return [self frame];
+ return [_private->controller frameForDataSource: self];
}
// Returns the name of the frame containing this data source, or nil
// if the data source is not in a frame set.
- (NSString *)frameName
{
- return [[self frame] name];
+ return [[self webFrame] name];
}
// Returns YES if this is the main document. The main document is the 'top'
@@ -210,7 +204,7 @@ static id IFWebDataSourceMake(void *handle)
{
int i, count;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self frame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
if (_private->primaryLoadComplete == NO)
return YES;
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index add5eeb..471b07d 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -130,9 +130,9 @@
[self _setPrimaryLoadComplete: NO];
- WEBKIT_ASSERT ([self frame] != nil);
+ WEBKIT_ASSERT ([self webFrame] != nil);
- [[self frame] _clearErrors];
+ [[self webFrame] _clearErrors];
// FIXME [mjs]: temporary hack to make file: URLs work right
if ([urlString hasPrefix:@"file:/"] && [urlString characterAtIndex:6] != '/') {
@@ -243,7 +243,7 @@
// The title doesn't get communicated to the controller until
// we reach the committed state for this data source's frame.
- if ([[self frame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
+ if ([[self webFrame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
[[self _locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
}
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 96f6f22..72a921f 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -50,9 +50,6 @@
// returns the parent data source.
- (IFWebDataSource *)parent;
-// Return the frame that represents this data source.
-- (IFWebFrame *)frame;
-
// Return the frame that represents this data source. Same as above.
- (IFWebFrame *)webFrame;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index ce0537b..0d54f35 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -63,22 +63,16 @@ static id IFWebDataSourceMake(void *handle)
- initWithLoader: (IFLoader *)loader;
#endif
-- (IFWebFrame *)frame
-{
- return [_private->controller frameForDataSource: self];
-}
-
-// This was adding to avoid collision with NSView
- (IFWebFrame *)webFrame
{
- return [self frame];
+ return [_private->controller frameForDataSource: self];
}
// Returns the name of the frame containing this data source, or nil
// if the data source is not in a frame set.
- (NSString *)frameName
{
- return [[self frame] name];
+ return [[self webFrame] name];
}
// Returns YES if this is the main document. The main document is the 'top'
@@ -210,7 +204,7 @@ static id IFWebDataSourceMake(void *handle)
{
int i, count;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self frame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
if (_private->primaryLoadComplete == NO)
return YES;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index add5eeb..471b07d 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -130,9 +130,9 @@
[self _setPrimaryLoadComplete: NO];
- WEBKIT_ASSERT ([self frame] != nil);
+ WEBKIT_ASSERT ([self webFrame] != nil);
- [[self frame] _clearErrors];
+ [[self webFrame] _clearErrors];
// FIXME [mjs]: temporary hack to make file: URLs work right
if ([urlString hasPrefix:@"file:/"] && [urlString characterAtIndex:6] != '/') {
@@ -243,7 +243,7 @@
// The title doesn't get communicated to the controller until
// we reach the committed state for this data source's frame.
- if ([[self frame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
+ if ([[self webFrame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
[[self _locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 9bfdac0..e648978 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -157,10 +157,14 @@
else if([dataSource _contentPolicy] == IFContentPolicySave ||
[dataSource _contentPolicy] == IFContentPolicyOpenExternally){
if(!downloadStarted){
+
+ // If this is a download, detach the provisionalDataSource from the frame
+ // and have downloadHandler retain it.
downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
frame = [dataSource webFrame];
- // FIXME: need a cleaner way for the frame to let go of the data source
- frame->_private->provisionalDataSource = nil;
+ [frame->_private setProvisionalDataSource:nil];
+
+ // go right to locationChangeDone as the data source never get committed.
[[dataSource _locationChangeHandler] locationChangeDone:nil];
downloadStarted = YES;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 9bfdac0..e648978 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -157,10 +157,14 @@
else if([dataSource _contentPolicy] == IFContentPolicySave ||
[dataSource _contentPolicy] == IFContentPolicyOpenExternally){
if(!downloadStarted){
+
+ // If this is a download, detach the provisionalDataSource from the frame
+ // and have downloadHandler retain it.
downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
frame = [dataSource webFrame];
- // FIXME: need a cleaner way for the frame to let go of the data source
- frame->_private->provisionalDataSource = nil;
+ [frame->_private setProvisionalDataSource:nil];
+
+ // go right to locationChangeDone as the data source never get committed.
[[dataSource _locationChangeHandler] locationChangeDone:nil];
downloadStarted = YES;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list