[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:12:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ee510cf2f4e80e0574eb2d03c6cffbaed0ed8680
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 10 22:28:21 2002 +0000
WebKit:
Added support for non-html non-file URL data sources.
Added the init methods below. Removed initWithHandle.
* WebView.subproj/IFWebDataSource.h:
* WebView.subproj/IFWebDataSource.mm:
(IFWebDataSourceMake):
(-[IFWebDataSource initWithURL:]):
(-[IFWebDataSource initWithURL:attributes:]):
(-[IFWebDataSource startLoading:]):
WebCore:
Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithUR
L: attributes: flags:]
instead of initWithHandle.
* kwq/KWQKHTMLPart.mm:
(KHTMLPart::requestFrame):
(KHTMLPart::submitForm):
* kwq/WCWebDataSource.h:
* libwebcore.exp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1134 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index aee80c9..8a95ea7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-05-10 Chris Blumenberg <cblu at apple.com>
+
+ Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithURL: attributes: flags:]
+ instead of initWithHandle.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::requestFrame):
+ (KHTMLPart::submitForm):
+ * kwq/WCWebDataSource.h:
+ * libwebcore.exp:
+
2002-05-10 Darin Adler <darin at apple.com>
* kwq/WebCoreTextRenderer.h:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index aee80c9..8a95ea7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-05-10 Chris Blumenberg <cblu at apple.com>
+
+ Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithURL: attributes: flags:]
+ instead of initWithHandle.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::requestFrame):
+ (KHTMLPart::submitForm):
+ * kwq/WCWebDataSource.h:
+ * libwebcore.exp:
+
2002-05-10 Darin Adler <darin at apple.com>
* kwq/WebCoreTextRenderer.h:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aee80c9..8a95ea7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-05-10 Chris Blumenberg <cblu at apple.com>
+
+ Changed WCIFWebDataSourceMake to wrap around [IFWebDataSource initWithURL: attributes: flags:]
+ instead of initWithHandle.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::requestFrame):
+ (KHTMLPart::submitForm):
+ * kwq/WCWebDataSource.h:
+ * libwebcore.exp:
+
2002-05-10 Darin Adler <darin at apple.com>
* kwq/WebCoreTextRenderer.h:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1096234..2824a65 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -873,7 +873,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
}
[newFrame _setRenderFramePart: frame];
- newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: childURL attributes: nil flags: 0] autorelease]);
+ newDataSource = WCIFWebDataSourceMake(childURL, nil, 0);
[newDataSource _setParent: oldDataSource];
[newFrame setProvisionalDataSource: newDataSource];
@@ -1032,7 +1032,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
oldDataSource = getDataSource();
frame = [oldDataSource webFrame];
- newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: u.getNSURL() attributes: attributes flags: 0] autorelease]);
+ newDataSource = WCIFWebDataSourceMake(u.getNSURL(), attributes, 0);
[newDataSource _setParent: [oldDataSource parent]];
[frame setProvisionalDataSource: newDataSource];
@@ -1402,7 +1402,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
oldDataSource = [frame dataSource];
}
- newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: clickedURL.getNSURL() attributes: nil flags: 0] autorelease]);
+ newDataSource = WCIFWebDataSourceMake(clickedURL.getNSURL(), nil, 0);
[newDataSource _setParent: [oldDataSource parent]];
[frame setProvisionalDataSource: newDataSource];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 1096234..2824a65 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -873,7 +873,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
}
[newFrame _setRenderFramePart: frame];
- newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: childURL attributes: nil flags: 0] autorelease]);
+ newDataSource = WCIFWebDataSourceMake(childURL, nil, 0);
[newDataSource _setParent: oldDataSource];
[newFrame setProvisionalDataSource: newDataSource];
@@ -1032,7 +1032,7 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
oldDataSource = getDataSource();
frame = [oldDataSource webFrame];
- newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: u.getNSURL() attributes: attributes flags: 0] autorelease]);
+ newDataSource = WCIFWebDataSourceMake(u.getNSURL(), attributes, 0);
[newDataSource _setParent: [oldDataSource parent]];
[frame setProvisionalDataSource: newDataSource];
@@ -1402,7 +1402,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
oldDataSource = [frame dataSource];
}
- newDataSource = WCIFWebDataSourceMake([[[IFURLHandle alloc] initWithURL: clickedURL.getNSURL() attributes: nil flags: 0] autorelease]);
+ newDataSource = WCIFWebDataSourceMake(clickedURL.getNSURL(), nil, 0);
[newDataSource _setParent: [oldDataSource parent]];
[frame setProvisionalDataSource: newDataSource];
diff --git a/WebCore/kwq/WCWebDataSource.h b/WebCore/kwq/WCWebDataSource.h
index b9e66f7..0f4e91f 100644
--- a/WebCore/kwq/WCWebDataSource.h
+++ b/WebCore/kwq/WCWebDataSource.h
@@ -29,7 +29,7 @@
#import <Foundation/Foundation.h>
-typedef id (*WCIFWebDataSourceMakeFunc)(void *);
+typedef id (*WCIFWebDataSourceMakeFunc)(void *, void*, unsigned);
void WCSetIFWebDataSourceMakeFunc(WCIFWebDataSourceMakeFunc func);
extern WCIFWebDataSourceMakeFunc WCIFWebDataSourceMake;
diff --git a/WebCore/libwebcore.exp b/WebCore/libwebcore.exp
index 25d9acd..70045a5 100644
--- a/WebCore/libwebcore.exp
+++ b/WebCore/libwebcore.exp
@@ -1,7 +1,6 @@
.objc_class_name_WebCoreTextRendererFactory
.objc_class_name_WebCoreViewFactory
__Z27WCSetIFLoadProgressMakeFuncPFP11objc_objectvE
-__Z28WCSetIFWebDataSourceMakeFuncPFP11objc_objectPvE
__ZN11QMouseEventC1EN6QEvent4TypeERK6QPointii
__ZN3DOM12DocumentImpl19updateStyleSelectorEv
__ZN3DOM9DOMStringD1Ev
@@ -32,3 +31,5 @@ __ZNK7QString6latin1Ev
__ZNK7QWidget7getViewEv
__ZNK9KHTMLPart10xmlDocImplEv
__ZNK9KHTMLPart14documentSourceEv
+__Z28WCSetIFWebDataSourceMakeFuncPFP11objc_objectPvS1_jE
+
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7c569fc..32a44cb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-10 Chris Blumenberg <cblu at apple.com>
+
+ Added support for non-html non-file URL data sources.
+ Added the init methods below. Removed initWithHandle.
+
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ (IFWebDataSourceMake):
+ (-[IFWebDataSource initWithURL:]):
+ (-[IFWebDataSource initWithURL:attributes:]):
+ (-[IFWebDataSource startLoading:]):
+
2002-05-10 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFTextRenderer.h: Moved most of the
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7c569fc..32a44cb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-05-10 Chris Blumenberg <cblu at apple.com>
+
+ Added support for non-html non-file URL data sources.
+ Added the init methods below. Removed initWithHandle.
+
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ (IFWebDataSourceMake):
+ (-[IFWebDataSource initWithURL:]):
+ (-[IFWebDataSource initWithURL:attributes:]):
+ (-[IFWebDataSource startLoading:]):
+
2002-05-10 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/IFTextRenderer.h: Moved most of the
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 5fbb642..5ce23c3 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -33,8 +33,9 @@
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputURL;
-- initWithHandle: (IFURLHandle *)theHandle;
+-(id)initWithURL:(NSURL *)inputURL;
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes;
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 5721f22..b0a23c4 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -18,9 +18,9 @@
@implementation IFWebDataSource
-static id IFWebDataSourceMake(void *handle)
+static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
{
- return [[[IFWebDataSource alloc] initWithHandle: (IFURLHandle *)handle] autorelease];
+ return [[[IFWebDataSource alloc] initWithURL:(NSURL *)url attributes:(NSDictionary *)attributes flags:flags] autorelease];
}
+ (void)load
@@ -33,21 +33,22 @@ static id IFWebDataSourceMake(void *handle)
_private = [[IFWebDataSourcePrivate alloc] init];
}
-// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputURL
+-(id)initWithURL:(NSURL *)theURL
{
- [super init];
- [self _commonInitialization];
- _private->inputURL = [inputURL retain];
- return self;
+ return [self initWithURL:theURL attributes:nil flags:0];
}
-- initWithHandle: (IFURLHandle *)handle
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes
+{
+ return [self initWithURL:theURL attributes:theAttributes flags:0];
+}
+
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
{
[super init];
[self _commonInitialization];
- _private->mainHandle = [handle retain];
- _private->inputURL = [[handle url] retain];
+ _private->inputURL = [theURL retain];
+ _private->mainHandle = [[IFURLHandle alloc] initWithURL: _private->inputURL attributes:theAttributes flags:theFlags];
return self;
}
@@ -185,9 +186,6 @@ static id IFWebDataSourceMake(void *handle)
// If forceRefresh is YES the document will load from the net, not the cache.
- (void)startLoading: (BOOL)forceRefresh
{
- if(!_private->mainHandle){
- _private->mainHandle = [[IFURLHandle alloc] initWithURL: _private->inputURL attributes: nil flags: 0];
- }
[self _startLoading: forceRefresh];
}
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 5fbb642..5ce23c3 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -33,8 +33,9 @@
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputURL;
-- initWithHandle: (IFURLHandle *)theHandle;
+-(id)initWithURL:(NSURL *)inputURL;
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes;
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 5721f22..b0a23c4 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -18,9 +18,9 @@
@implementation IFWebDataSource
-static id IFWebDataSourceMake(void *handle)
+static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
{
- return [[[IFWebDataSource alloc] initWithHandle: (IFURLHandle *)handle] autorelease];
+ return [[[IFWebDataSource alloc] initWithURL:(NSURL *)url attributes:(NSDictionary *)attributes flags:flags] autorelease];
}
+ (void)load
@@ -33,21 +33,22 @@ static id IFWebDataSourceMake(void *handle)
_private = [[IFWebDataSourcePrivate alloc] init];
}
-// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputURL
+-(id)initWithURL:(NSURL *)theURL
{
- [super init];
- [self _commonInitialization];
- _private->inputURL = [inputURL retain];
- return self;
+ return [self initWithURL:theURL attributes:nil flags:0];
}
-- initWithHandle: (IFURLHandle *)handle
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes
+{
+ return [self initWithURL:theURL attributes:theAttributes flags:0];
+}
+
+-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
{
[super init];
[self _commonInitialization];
- _private->mainHandle = [handle retain];
- _private->inputURL = [[handle url] retain];
+ _private->inputURL = [theURL retain];
+ _private->mainHandle = [[IFURLHandle alloc] initWithURL: _private->inputURL attributes:theAttributes flags:theFlags];
return self;
}
@@ -185,9 +186,6 @@ static id IFWebDataSourceMake(void *handle)
// If forceRefresh is YES the document will load from the net, not the cache.
- (void)startLoading: (BOOL)forceRefresh
{
- if(!_private->mainHandle){
- _private->mainHandle = [[IFURLHandle alloc] initWithURL: _private->inputURL attributes: nil flags: 0];
- }
[self _startLoading: forceRefresh];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list