[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:56:24 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 65e7f686750edfc185e47d56935e5e9bded5ea1f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 27 19:47:19 2002 +0000
2002-02-27 Kenneth Kocienda <kocienda at apple.com>
I have changed the way that WebCore is glued to WebFoundation and WebKit.
If you used or relied upon any code in the following files, you should
now use the IF* equivalents straight up.
- Labyrinth/WebCore/include/WCBackForwardList.h
- Labyrinth/WebCore/include/WCURICache.h
- Labyrinth/WebCore/include/WCURICacheData.h
- Labyrinth/WebCore/include/WCURIEntry.h
- Labyrinth/WebCore/include/WCURIEntry.h
All changes in this commit are related to making dependant code work with the new convention.
WebKit:
* History.subproj/IFURIEntry.h:
* History.subproj/IFURIEntry.m:
* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
newStream:mimeType:notifyData:]), (-[IFPluginView
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFPluginView
IFURLHandleResourceDidFinishLoading:data:]), (-[IFPluginView
IFURLHandleResourceDidBeginLoading:]), (-[IFPluginView
IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
IFURLHandle:resourceDidFailLoadingWithResult:]):
* WebKit.pbproj/kocienda.pbxuser:
* WebKit.pbproj/project.pbxproj:
WebFoundation:
* CacheLoader.subproj/IFURLCacheLoaderConstants.h:
* CacheLoader.subproj/IFURLCacheLoaderConstants.m:
* CacheLoader.subproj/IFURLCacheObject.m: (-[IFURLCacheObject initWithCoder:]),
(-[IFURLCacheObject encodeWithCoder:]):
* WebFoundation.pbproj/project.pbxproj:
WebCore:
* include/WCBackForwardList.h:
* include/WCURICache.h:
* include/WCURICacheData.h:
* include/WCURIEntry.h:
* include/WCURLHandle.h:
* src/kwq/KWQKHTMLPart.h:
* src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
IFURLHandle:resourceDidFailLoadingWithResult:]), (KHTMLPart::slotData),
(KHTMLPart::openURL):
* src/kwq/KWQKjobclasses.mm:
* src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
(-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
IFURLHandle:resourceDidFailLoadingWithResult:]):
* src/kwq/Makefile.am:
* src/kwq/kio/jobclasses.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@675 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 154ffd3..1e987f6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,39 @@
+2002-02-27 Kenneth Kocienda <kocienda at apple.com>
+
+ I have changed the way that WebCore is glued to WebFoundation and WebKit.
+ If you used or relied upon any code in the following files, you should
+ now use the IF* equivalents straight up.
+
+ - Labyrinth/WebCore/include/WCBackForwardList.h
+ - Labyrinth/WebCore/include/WCURICache.h
+ - Labyrinth/WebCore/include/WCURICacheData.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+
+ All changes in this commit are related to making dependant code work with the new convention.
+
+ * include/WCBackForwardList.h:
+ * include/WCURICache.h:
+ * include/WCURICacheData.h:
+ * include/WCURIEntry.h:
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (KHTMLPart::slotData),
+ (KHTMLPart::openURL):
+ * src/kwq/KWQKjobclasses.mm:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
+ (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * src/kwq/Makefile.am:
+ * src/kwq/kio/jobclasses.h:
+
2002-02-27 Maciej Stachowiak <mjs at apple.com>
Replace QDir and QFile with clean-room implementations. Add glob
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 154ffd3..1e987f6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,39 @@
+2002-02-27 Kenneth Kocienda <kocienda at apple.com>
+
+ I have changed the way that WebCore is glued to WebFoundation and WebKit.
+ If you used or relied upon any code in the following files, you should
+ now use the IF* equivalents straight up.
+
+ - Labyrinth/WebCore/include/WCBackForwardList.h
+ - Labyrinth/WebCore/include/WCURICache.h
+ - Labyrinth/WebCore/include/WCURICacheData.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+
+ All changes in this commit are related to making dependant code work with the new convention.
+
+ * include/WCBackForwardList.h:
+ * include/WCURICache.h:
+ * include/WCURICacheData.h:
+ * include/WCURIEntry.h:
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (KHTMLPart::slotData),
+ (KHTMLPart::openURL):
+ * src/kwq/KWQKjobclasses.mm:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
+ (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * src/kwq/Makefile.am:
+ * src/kwq/kio/jobclasses.h:
+
2002-02-27 Maciej Stachowiak <mjs at apple.com>
Replace QDir and QFile with clean-room implementations. Add glob
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 154ffd3..1e987f6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,39 @@
+2002-02-27 Kenneth Kocienda <kocienda at apple.com>
+
+ I have changed the way that WebCore is glued to WebFoundation and WebKit.
+ If you used or relied upon any code in the following files, you should
+ now use the IF* equivalents straight up.
+
+ - Labyrinth/WebCore/include/WCBackForwardList.h
+ - Labyrinth/WebCore/include/WCURICache.h
+ - Labyrinth/WebCore/include/WCURICacheData.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+
+ All changes in this commit are related to making dependant code work with the new convention.
+
+ * include/WCBackForwardList.h:
+ * include/WCURICache.h:
+ * include/WCURICacheData.h:
+ * include/WCURIEntry.h:
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (KHTMLPart::slotData),
+ (KHTMLPart::openURL):
+ * src/kwq/KWQKjobclasses.mm:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
+ (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * src/kwq/Makefile.am:
+ * src/kwq/kio/jobclasses.h:
+
2002-02-27 Maciej Stachowiak <mjs at apple.com>
Replace QDir and QFile with clean-room implementations. Add glob
diff --git a/WebCore/include/WCBackForwardList.h b/WebCore/include/WCBackForwardList.h
deleted file mode 100644
index 15a3df7..0000000
--- a/WebCore/include/WCBackForwardList.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* WKBackForwardList.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-#import "WCURIEntry.h"
-
- at protocol WCBackForwardList
-
--(void)addEntry:(id <WCURIEntry>)entry;
--(id <WCURIEntry>)back;
--(id <WCURIEntry>)forward;
-
--(NSArray *)backList;
--(NSArray *)forwardList;
-
--(BOOL)canGoBack;
--(BOOL)canGoForward;
-
- at end
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-// *** Factory method for WCBackForwardList objects
-
-id <WCBackForwardList> WCCreateBackForwardList(void);
-
-#if defined(__cplusplus)
-} // extern "C"
-#endif
diff --git a/WebCore/include/WCURICache.h b/WebCore/include/WCURICache.h
deleted file mode 100644
index e53902e..0000000
--- a/WebCore/include/WCURICache.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* WCURICache.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at protocol WCURICache
-
--(void)requestWithURL:(NSURL *)url requestor:(id)requestor userData:(void *)userData;
--(void)requestWithString:(NSString *)uriString requestor:(id)requestor userData:(void *)userData;
-
--(void)cancelRequestWithURL:(NSURL *)url requestor:(id)requestor;
--(void)cancelRequestWithString:(NSString *)uriString requestor:(id)requestor;
--(void)cancelAllRequestsWithURL:(NSURL *)url;
--(void)cancelAllRequestsWithString:(NSString *)uriString;
-
- at end
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-// *** Function to access WCURICache singleton
-
-id <WCURICache> WCGetDefaultURICache(void);
-
-#if defined(__cplusplus)
-} // extern "C"
-#endif
diff --git a/WebCore/include/WCURICacheData.h b/WebCore/include/WCURICacheData.h
deleted file mode 100644
index c4c025a..0000000
--- a/WebCore/include/WCURICacheData.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* WCURICacheData.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at protocol WCURICacheData
-
--(NSURL *)url;
--(id)status;
--(id)error;
--(NSDictionary *)headers;
--(UInt8 *)cacheData;
--(int)cacheDataSize;
--(void *)userData;
-
- at end
diff --git a/WebCore/include/WCURIEntry.h b/WebCore/include/WCURIEntry.h
deleted file mode 100644
index c5af231..0000000
--- a/WebCore/include/WCURIEntry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* WCURIEntry.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-#import <AppKit/AppKit.h>
-
-
- at protocol WCURIEntry
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment;
-
--(NSURL *)url;
--(NSString *)title;
--(NSImage *)image;
--(NSString *)comment;
--(NSDate *)creationDate;
--(NSDate *)modificationDate;
--(NSDate *)lastVisitedDate;
-
--(void)setURL:(NSURL *)url;
--(void)setTitle:(NSString *)title;
--(void)setImage:(NSImage *)image;
--(void)setComment:(NSString *)comment;
--(void)setModificationDate:(NSDate *)date;
--(void)setLastVisitedDate:(NSDate *)date;
-
--(unsigned)hash;
--(BOOL)isEqual:(id)anObject;
-
- at end
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-// *** Factory method for WCURIEntry objects
-
-id <WCURIEntry> WCCreateURIEntry(void);
-
-#if defined(__cplusplus)
-} // extern "C"
-#endif
diff --git a/WebCore/include/WCURLHandle.h b/WebCore/include/WCURLHandle.h
deleted file mode 100644
index 721bc6d..0000000
--- a/WebCore/include/WCURLHandle.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* WCURLHandle.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#ifndef WCURLHANDLE_H
-#define WCURLHANDLE_H
-
-#import <Foundation/Foundation.h>
-
- at protocol WCURLHandleClient
-
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData;
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData;
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData;
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData;
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData;
-
- at end
-
- at protocol WCHTTPURLHandle
--(NSString *)responseHeaderForKey:(NSString *)key;
- at end
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-// *** Function to create WCURLHandle instance
-
-id WCURLHandleCreate(NSURL *url, id handleClient, void *userData);
-
-#if defined(__cplusplus)
-} // extern "C"
-#endif
-
-#endif
\ No newline at end of file
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 779f09c..ab999a1 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -29,6 +29,7 @@
#include <qtextcodec.h>
#import <Foundation/Foundation.h>
+#import <WebFoundation/WebFoundation.h>
#include <job.h>
#include <jobclasses.h>
@@ -50,8 +51,6 @@
#include <KWQKHTMLPart.h>
-#import <WCURLHandle.h>
-
#import <WCPluginWidget.h>
#include <rendering/render_frames.h>
@@ -101,7 +100,6 @@
- (void *)_renderFramePart;
@end
-
static bool cache_init = false;
static void recursive(const DOM::Node &pNode, const DOM::Node &node)
@@ -119,7 +117,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
// Class KHTMLPartLoadClient ==============================================================
- at interface KHTMLPartLoadClient : NSObject <WCURLHandleClient>
+ at interface KHTMLPartLoadClient : NSObject <IFURLHandleClient>
{
@public
KHTMLPart *m_part;
@@ -140,26 +138,42 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
m_part->closeURL();
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL3 (0x2000, "userData = 0x%08x, data = 0x%08x, length %d\n", userData, data, [data length]);
if (!m_data) {
m_data = [data retain];
@@ -167,8 +181,12 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
m_part->slotData(sender, (const char *)[data bytes], [data length]);
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL2 (0x2000, "result = %d, userData = 0x%08x\n", result, userData);
[sender autorelease];
}
@@ -355,8 +373,8 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaderForKey:)]) {
- encoding = encodingFromContentType([handle responseHeaderForKey:@"Content-Type"]);
+ if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaders:)]) {
+ encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
if (encoding != NULL) {
enc = QString::fromCFString((CFStringRef) encoding);
setEncoding (enc, true);
@@ -413,7 +431,8 @@ bool KHTMLPart::openURL( const KURL &url )
}
theURL = [NSURL URLWithString:urlString];
- d->m_handle = WCURLHandleCreate(theURL, d->m_recv, NULL);
+ d->m_handle = [[IFURLHandle alloc] initWithURL:theURL];
+ [d->m_handle addClient:d->m_recv];
[d->m_handle loadInBackground];
[[NSNotificationCenter defaultCenter] addObserver:d->m_recv
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 779f09c..ab999a1 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -29,6 +29,7 @@
#include <qtextcodec.h>
#import <Foundation/Foundation.h>
+#import <WebFoundation/WebFoundation.h>
#include <job.h>
#include <jobclasses.h>
@@ -50,8 +51,6 @@
#include <KWQKHTMLPart.h>
-#import <WCURLHandle.h>
-
#import <WCPluginWidget.h>
#include <rendering/render_frames.h>
@@ -101,7 +100,6 @@
- (void *)_renderFramePart;
@end
-
static bool cache_init = false;
static void recursive(const DOM::Node &pNode, const DOM::Node &node)
@@ -119,7 +117,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
// Class KHTMLPartLoadClient ==============================================================
- at interface KHTMLPartLoadClient : NSObject <WCURLHandleClient>
+ at interface KHTMLPartLoadClient : NSObject <IFURLHandleClient>
{
@public
KHTMLPart *m_part;
@@ -140,26 +138,42 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
m_part->closeURL();
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL3 (0x2000, "userData = 0x%08x, data = 0x%08x, length %d\n", userData, data, [data length]);
if (!m_data) {
m_data = [data retain];
@@ -167,8 +181,12 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
m_part->slotData(sender, (const char *)[data bytes], [data length]);
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL2 (0x2000, "result = %d, userData = 0x%08x\n", result, userData);
[sender autorelease];
}
@@ -355,8 +373,8 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaderForKey:)]) {
- encoding = encodingFromContentType([handle responseHeaderForKey:@"Content-Type"]);
+ if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaders:)]) {
+ encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
if (encoding != NULL) {
enc = QString::fromCFString((CFStringRef) encoding);
setEncoding (enc, true);
@@ -413,7 +431,8 @@ bool KHTMLPart::openURL( const KURL &url )
}
theURL = [NSURL URLWithString:urlString];
- d->m_handle = WCURLHandleCreate(theURL, d->m_recv, NULL);
+ d->m_handle = [[IFURLHandle alloc] initWithURL:theURL];
+ [d->m_handle addClient:d->m_recv];
[d->m_handle loadInBackground];
[[NSNotificationCenter defaultCenter] addObserver:d->m_recv
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 9c5d9b0..7fd0e1c 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -36,7 +36,7 @@
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#include <WCURLHandle.h>
+#import <WebFoundation/WebFoundation.h>
#endif
#endif
@@ -168,7 +168,7 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
- void begin(id <WCURLHandleClient> client, void *userData);
+ void begin(id <IFURLHandleClient> client, void *userData);
id handle();
#else
void begin(void *requestor, void *userData);
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index cb5df55..09ba4ad 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -29,8 +29,8 @@
#include <jobclasses.h>
#include <Foundation/Foundation.h>
-#include <WCURICache.h>
-#include <WCURLHandle.h>
+
+#include <WebFoundation/IFURLHandleClient.h>
static const QString *DEFAULT_ERROR_TEXT = NULL;
@@ -116,7 +116,7 @@ private:
NSMutableDictionary *metaData;
NSURL *url;
id handle;
- id <WCURLHandleClient> client;
+ id <IFURLHandleClient> client;
};
// class TransferJob ===========================================================
@@ -174,10 +174,14 @@ void TransferJob::kill(bool quietly=TRUE)
[d->handle cancelLoadInBackground];
}
-void TransferJob::begin(id <WCURLHandleClient> client, void *userData)
+void TransferJob::begin(id <IFURLHandleClient> client, void *userData)
{
+ NSDictionary *attributes;
+
d->client = client;
- d->handle = WCURLHandleCreate(d->url, client, userData);
+ attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:userData] forKey:IFURLHandleUserData];
+ d->handle = [[IFURLHandle alloc] initWithURL:d->url attributes:attributes flags:0];
+ [d->handle addClient:client];
[d->handle loadInBackground];
}
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 4084ace..ec20319 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -29,7 +29,6 @@
#include <kwqdebug.h>
#include <loader.h>
-#include <WCURLHandle.h>
#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
@@ -913,7 +912,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
// Class URLLoadClient ======================================================================
- at interface URLLoadClient : NSObject <WCURLHandleClient>
+ at interface URLLoadClient : NSObject <IFURLHandleClient>
{
@public
Loader *m_loader;
@@ -970,14 +969,22 @@ typedef enum {
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -985,8 +992,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1007,8 +1018,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1025,8 +1040,12 @@ typedef enum {
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -1627,3 +1646,4 @@ void Cache::removeCacheEntry( CachedObject *object )
if ( object->canDelete() )
delete object;
}
+
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 4084ace..ec20319 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -29,7 +29,6 @@
#include <kwqdebug.h>
#include <loader.h>
-#include <WCURLHandle.h>
#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
@@ -913,7 +912,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
// Class URLLoadClient ======================================================================
- at interface URLLoadClient : NSObject <WCURLHandleClient>
+ at interface URLLoadClient : NSObject <IFURLHandleClient>
{
@public
Loader *m_loader;
@@ -970,14 +969,22 @@ typedef enum {
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -985,8 +992,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1007,8 +1018,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1025,8 +1040,12 @@ typedef enum {
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -1627,3 +1646,4 @@ void Cache::removeCacheEntry( CachedObject *object )
if ( object->canDelete() )
delete object;
}
+
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 4084ace..ec20319 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -29,7 +29,6 @@
#include <kwqdebug.h>
#include <loader.h>
-#include <WCURLHandle.h>
#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
@@ -913,7 +912,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
// Class URLLoadClient ======================================================================
- at interface URLLoadClient : NSObject <WCURLHandleClient>
+ at interface URLLoadClient : NSObject <IFURLHandleClient>
{
@public
Loader *m_loader;
@@ -970,14 +969,22 @@ typedef enum {
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -985,8 +992,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1007,8 +1018,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1025,8 +1040,12 @@ typedef enum {
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -1627,3 +1646,4 @@ void Cache::removeCacheEntry( CachedObject *object )
if ( object->canDelete() )
delete object;
}
+
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index 856e10d..b26d5ee 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -149,6 +149,7 @@ INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(WEBCORE_INCLUDES) \
+ -F$(SYMROOTS) \
$(NULL)
noinst_PROGRAMS = \
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 9c5d9b0..7fd0e1c 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -36,7 +36,7 @@
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#include <WCURLHandle.h>
+#import <WebFoundation/WebFoundation.h>
#endif
#endif
@@ -168,7 +168,7 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
- void begin(id <WCURLHandleClient> client, void *userData);
+ void begin(id <IFURLHandleClient> client, void *userData);
id handle();
#else
void begin(void *requestor, void *userData);
diff --git a/WebCore/src/kwq/KWQKHTMLPart.h b/WebCore/src/kwq/KWQKHTMLPart.h
index 46c9105..fc911f4 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.h
+++ b/WebCore/src/kwq/KWQKHTMLPart.h
@@ -37,10 +37,6 @@
#include <kjs_proxy.h>
-#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#import <WCURICacheData.h>
-#endif
-
class KHTMLSettings;
class KJavaAppletContext;
class KJSProxy;
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 779f09c..ab999a1 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -29,6 +29,7 @@
#include <qtextcodec.h>
#import <Foundation/Foundation.h>
+#import <WebFoundation/WebFoundation.h>
#include <job.h>
#include <jobclasses.h>
@@ -50,8 +51,6 @@
#include <KWQKHTMLPart.h>
-#import <WCURLHandle.h>
-
#import <WCPluginWidget.h>
#include <rendering/render_frames.h>
@@ -101,7 +100,6 @@
- (void *)_renderFramePart;
@end
-
static bool cache_init = false;
static void recursive(const DOM::Node &pNode, const DOM::Node &node)
@@ -119,7 +117,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
// Class KHTMLPartLoadClient ==============================================================
- at interface KHTMLPartLoadClient : NSObject <WCURLHandleClient>
+ at interface KHTMLPartLoadClient : NSObject <IFURLHandleClient>
{
@public
KHTMLPart *m_part;
@@ -140,26 +138,42 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
m_part->closeURL();
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL3 (0x2000, "userData = 0x%08x, data = 0x%08x, length %d\n", userData, data, [data length]);
if (!m_data) {
m_data = [data retain];
@@ -167,8 +181,12 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
m_part->slotData(sender, (const char *)[data bytes], [data length]);
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KWQDEBUGLEVEL2 (0x2000, "result = %d, userData = 0x%08x\n", result, userData);
[sender autorelease];
}
@@ -355,8 +373,8 @@ void KHTMLPart::slotData(id handle, const char *bytes, int length)
d->m_workingURL = KURL();
}
- if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaderForKey:)]) {
- encoding = encodingFromContentType([handle responseHeaderForKey:@"Content-Type"]);
+ if (!d->m_encoding && [handle respondsToSelector:@selector(responseHeaders:)]) {
+ encoding = encodingFromContentType([[handle responseHeaders] objectForKey:@"Content-Type"]);
if (encoding != NULL) {
enc = QString::fromCFString((CFStringRef) encoding);
setEncoding (enc, true);
@@ -413,7 +431,8 @@ bool KHTMLPart::openURL( const KURL &url )
}
theURL = [NSURL URLWithString:urlString];
- d->m_handle = WCURLHandleCreate(theURL, d->m_recv, NULL);
+ d->m_handle = [[IFURLHandle alloc] initWithURL:theURL];
+ [d->m_handle addClient:d->m_recv];
[d->m_handle loadInBackground];
[[NSNotificationCenter defaultCenter] addObserver:d->m_recv
diff --git a/WebCore/src/kwq/KWQKjobclasses.mm b/WebCore/src/kwq/KWQKjobclasses.mm
index cb5df55..09ba4ad 100644
--- a/WebCore/src/kwq/KWQKjobclasses.mm
+++ b/WebCore/src/kwq/KWQKjobclasses.mm
@@ -29,8 +29,8 @@
#include <jobclasses.h>
#include <Foundation/Foundation.h>
-#include <WCURICache.h>
-#include <WCURLHandle.h>
+
+#include <WebFoundation/IFURLHandleClient.h>
static const QString *DEFAULT_ERROR_TEXT = NULL;
@@ -116,7 +116,7 @@ private:
NSMutableDictionary *metaData;
NSURL *url;
id handle;
- id <WCURLHandleClient> client;
+ id <IFURLHandleClient> client;
};
// class TransferJob ===========================================================
@@ -174,10 +174,14 @@ void TransferJob::kill(bool quietly=TRUE)
[d->handle cancelLoadInBackground];
}
-void TransferJob::begin(id <WCURLHandleClient> client, void *userData)
+void TransferJob::begin(id <IFURLHandleClient> client, void *userData)
{
+ NSDictionary *attributes;
+
d->client = client;
- d->handle = WCURLHandleCreate(d->url, client, userData);
+ attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:userData] forKey:IFURLHandleUserData];
+ d->handle = [[IFURLHandle alloc] initWithURL:d->url attributes:attributes flags:0];
+ [d->handle addClient:client];
[d->handle loadInBackground];
}
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 4084ace..ec20319 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -29,7 +29,6 @@
#include <kwqdebug.h>
#include <loader.h>
-#include <WCURLHandle.h>
#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
@@ -913,7 +912,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
// Class URLLoadClient ======================================================================
- at interface URLLoadClient : NSObject <WCURLHandleClient>
+ at interface URLLoadClient : NSObject <IFURLHandleClient>
{
@public
Loader *m_loader;
@@ -970,14 +969,22 @@ typedef enum {
return nil;
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -985,8 +992,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1007,8 +1018,12 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
@@ -1025,8 +1040,12 @@ typedef enum {
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
+ void *userData;
+
+ userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
+
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
@@ -1627,3 +1646,4 @@ void Cache::removeCacheEntry( CachedObject *object )
if ( object->canDelete() )
delete object;
}
+
diff --git a/WebCore/src/kwq/Makefile.am b/WebCore/src/kwq/Makefile.am
index 856e10d..b26d5ee 100644
--- a/WebCore/src/kwq/Makefile.am
+++ b/WebCore/src/kwq/Makefile.am
@@ -149,6 +149,7 @@ INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(WEBCORE_INCLUDES) \
+ -F$(SYMROOTS) \
$(NULL)
noinst_PROGRAMS = \
diff --git a/WebCore/src/kwq/kio/jobclasses.h b/WebCore/src/kwq/kio/jobclasses.h
index 9c5d9b0..7fd0e1c 100644
--- a/WebCore/src/kwq/kio/jobclasses.h
+++ b/WebCore/src/kwq/kio/jobclasses.h
@@ -36,7 +36,7 @@
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
-#include <WCURLHandle.h>
+#import <WebFoundation/WebFoundation.h>
#endif
#endif
@@ -168,7 +168,7 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
- void begin(id <WCURLHandleClient> client, void *userData);
+ void begin(id <IFURLHandleClient> client, void *userData);
id handle();
#else
void begin(void *requestor, void *userData);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 553f3b3..b08fa19 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,29 @@
+2002-02-27 Kenneth Kocienda <kocienda at apple.com>
+
+ I have changed the way that WebCore is glued to WebFoundation and WebKit.
+ If you used or relied upon any code in the following files, you should
+ now use the IF* equivalents straight up.
+
+ - Labyrinth/WebCore/include/WCBackForwardList.h
+ - Labyrinth/WebCore/include/WCURICache.h
+ - Labyrinth/WebCore/include/WCURICacheData.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+
+ All changes in this commit are related to making dependant code work with the new convention.
+
+ * History.subproj/IFURIEntry.h:
+ * History.subproj/IFURIEntry.m:
+ * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+ newStream:mimeType:notifyData:]), (-[IFPluginView
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFPluginView
+ IFURLHandleResourceDidFinishLoading:data:]), (-[IFPluginView
+ IFURLHandleResourceDidBeginLoading:]), (-[IFPluginView
+ IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebKit.pbproj/kocienda.pbxuser:
+ * WebKit.pbproj/project.pbxproj:
+
2002-02-26 John Sullivan <sullivan at apple.com>
* History.subproj/IFURIEntry.m: (-[IFURIEntry dealloc]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 553f3b3..b08fa19 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,29 @@
+2002-02-27 Kenneth Kocienda <kocienda at apple.com>
+
+ I have changed the way that WebCore is glued to WebFoundation and WebKit.
+ If you used or relied upon any code in the following files, you should
+ now use the IF* equivalents straight up.
+
+ - Labyrinth/WebCore/include/WCBackForwardList.h
+ - Labyrinth/WebCore/include/WCURICache.h
+ - Labyrinth/WebCore/include/WCURICacheData.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+ - Labyrinth/WebCore/include/WCURIEntry.h
+
+ All changes in this commit are related to making dependant code work with the new convention.
+
+ * History.subproj/IFURIEntry.h:
+ * History.subproj/IFURIEntry.m:
+ * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+ newStream:mimeType:notifyData:]), (-[IFPluginView
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFPluginView
+ IFURLHandleResourceDidFinishLoading:data:]), (-[IFPluginView
+ IFURLHandleResourceDidBeginLoading:]), (-[IFPluginView
+ IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebKit.pbproj/kocienda.pbxuser:
+ * WebKit.pbproj/project.pbxproj:
+
2002-02-26 John Sullivan <sullivan at apple.com>
* History.subproj/IFURIEntry.m: (-[IFURIEntry dealloc]):
diff --git a/WebKit/History.subproj/IFURIEntry.h b/WebKit/History.subproj/IFURIEntry.h
index 8a8ccb1..199ee62 100644
--- a/WebKit/History.subproj/IFURIEntry.h
+++ b/WebKit/History.subproj/IFURIEntry.h
@@ -8,9 +8,7 @@
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
-//#import <WCURIEntry.h>
-//@interface IFURIEntry : NSObject <WCURIEntry>
@interface IFURIEntry : NSObject
{
NSURL *_url;
@@ -46,4 +44,3 @@
-(BOOL)isEqual:(id)anObject;
@end
-
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index eb57704..fe86bab 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -9,17 +9,6 @@
#import "IFURIEntry.h"
#import "WebKitReallyPrivate.h"
-#if 0
-#import "WCURIEntry.h"
-
-// *** Function to access WCURICache singleton
-
-id <WCURIEntry> WCCreateURIEntry(void)
-{
- return [[IFURIEntry alloc] init];
-}
-#endif
-
@implementation IFURIEntry
-(id)init
@@ -175,4 +164,3 @@ id <WCURIEntry> WCCreateURIEntry(void)
}
@end
-
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 8a8ccb1..199ee62 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -8,9 +8,7 @@
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
-//#import <WCURIEntry.h>
-//@interface IFURIEntry : NSObject <WCURIEntry>
@interface IFURIEntry : NSObject
{
NSURL *_url;
@@ -46,4 +44,3 @@
-(BOOL)isEqual:(id)anObject;
@end
-
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index eb57704..fe86bab 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -9,17 +9,6 @@
#import "IFURIEntry.h"
#import "WebKitReallyPrivate.h"
-#if 0
-#import "WCURIEntry.h"
-
-// *** Function to access WCURICache singleton
-
-id <WCURIEntry> WCCreateURIEntry(void)
-{
- return [[IFURIEntry alloc] init];
-}
-#endif
-
@implementation IFURIEntry
-(id)init
@@ -175,4 +164,3 @@ id <WCURIEntry> WCCreateURIEntry(void)
}
@end
-
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index ab520c4..4954b9f 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -9,7 +9,7 @@
#include <Carbon/Carbon.h>
#include "kwqdebug.h"
-#include <WCURLHandle.h>
+#include <WebFoundation/IFURLHandle.h>
#import <IFWebDataSource.h>
#import <IFBaseWebController.h>
#include <WCPluginWidget.h>
@@ -232,6 +232,7 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
NPError npErr;
uint16 transferMode;
IFURLHandle *urlHandle;
+ NSDictionary *attributes;
stream = malloc(sizeof(NPStream));
cURL = malloc([streamURL length]+1);
@@ -254,7 +255,9 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
if(transferMode == NP_NORMAL){
KWQDebug("Stream type: NP_NORMAL\n");
- urlHandle = (IFURLHandle *)WCURLHandleCreate([NSURL URLWithString:streamURL], self, streamData);
+ attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:streamData] forKey:IFURLHandleUserData];
+ urlHandle = [[IFURLHandle alloc] initWithURL:[NSURL URLWithString:streamURL] attributes:attributes flags:0];
+ [urlHandle addClient:self];
[activeURLHandles addObject:urlHandle];
[urlHandle loadInBackground];
}else if(transferMode == NP_ASFILEONLY || transferMode == NP_ASFILE){
@@ -264,7 +267,9 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
[streamData->filename retain];
streamData->data = [NSMutableData dataWithCapacity:0];
[streamData->data retain];
- urlHandle = (IFURLHandle *)WCURLHandleCreate([NSURL URLWithString:streamURL], self, streamData);
+ attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:streamData] forKey:IFURLHandleUserData];
+ urlHandle = [[IFURLHandle alloc] initWithURL:[NSURL URLWithString:streamURL] attributes:attributes flags:0];
+ [urlHandle addClient:self];
if(urlHandle!=nil){
[activeURLHandles addObject:urlHandle];
[urlHandle loadInBackground];
@@ -276,12 +281,12 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
// cache methods
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
int32 bytes;
StreamData *streamData;
- streamData = userData;
+ streamData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
if(streamData->transferMode != NP_ASFILEONLY){
bytes = NPP_WriteReady(instance, streamData->stream);
//KWQDebug("NPP_WriteReady bytes=%u\n", bytes);
@@ -294,15 +299,15 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
}
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
NPError npErr;
char *cFilename;
NSMutableString *filenameClassic, *filename;
StreamData *streamData;
NSFileManager *fileManager;
-
- streamData = userData;
+
+ streamData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
if(streamData->transferMode == NP_ASFILE || streamData->transferMode == NP_ASFILEONLY){
filenameClassic = [NSMutableString stringWithCapacity:200];
filename = [NSMutableString stringWithCapacity:200];
@@ -333,15 +338,15 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
[activeURLHandles removeObject:sender];
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
}
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index ab520c4..4954b9f 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -9,7 +9,7 @@
#include <Carbon/Carbon.h>
#include "kwqdebug.h"
-#include <WCURLHandle.h>
+#include <WebFoundation/IFURLHandle.h>
#import <IFWebDataSource.h>
#import <IFBaseWebController.h>
#include <WCPluginWidget.h>
@@ -232,6 +232,7 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
NPError npErr;
uint16 transferMode;
IFURLHandle *urlHandle;
+ NSDictionary *attributes;
stream = malloc(sizeof(NPStream));
cURL = malloc([streamURL length]+1);
@@ -254,7 +255,9 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
if(transferMode == NP_NORMAL){
KWQDebug("Stream type: NP_NORMAL\n");
- urlHandle = (IFURLHandle *)WCURLHandleCreate([NSURL URLWithString:streamURL], self, streamData);
+ attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:streamData] forKey:IFURLHandleUserData];
+ urlHandle = [[IFURLHandle alloc] initWithURL:[NSURL URLWithString:streamURL] attributes:attributes flags:0];
+ [urlHandle addClient:self];
[activeURLHandles addObject:urlHandle];
[urlHandle loadInBackground];
}else if(transferMode == NP_ASFILEONLY || transferMode == NP_ASFILE){
@@ -264,7 +267,9 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
[streamData->filename retain];
streamData->data = [NSMutableData dataWithCapacity:0];
[streamData->data retain];
- urlHandle = (IFURLHandle *)WCURLHandleCreate([NSURL URLWithString:streamURL], self, streamData);
+ attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:streamData] forKey:IFURLHandleUserData];
+ urlHandle = [[IFURLHandle alloc] initWithURL:[NSURL URLWithString:streamURL] attributes:attributes flags:0];
+ [urlHandle addClient:self];
if(urlHandle!=nil){
[activeURLHandles addObject:urlHandle];
[urlHandle loadInBackground];
@@ -276,12 +281,12 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
// cache methods
-- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
int32 bytes;
StreamData *streamData;
- streamData = userData;
+ streamData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
if(streamData->transferMode != NP_ASFILEONLY){
bytes = NPP_WriteReady(instance, streamData->stream);
//KWQDebug("NPP_WriteReady bytes=%u\n", bytes);
@@ -294,15 +299,15 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
}
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
+- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
NPError npErr;
char *cFilename;
NSMutableString *filenameClassic, *filename;
StreamData *streamData;
NSFileManager *fileManager;
-
- streamData = userData;
+
+ streamData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
if(streamData->transferMode == NP_ASFILE || streamData->transferMode == NP_ASFILEONLY){
filenameClassic = [NSMutableString stringWithCapacity:200];
filename = [NSMutableString stringWithCapacity:200];
@@ -333,15 +338,15 @@ static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString
[activeURLHandles removeObject:sender];
}
-- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
}
-- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData
+- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
}
-- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
}
diff --git a/WebKit/WebKit.pbproj/kocienda.pbxuser b/WebKit/WebKit.pbproj/kocienda.pbxuser
index 7d84335..ecac31a 100644
--- a/WebKit/WebKit.pbproj/kocienda.pbxuser
+++ b/WebKit/WebKit.pbproj/kocienda.pbxuser
@@ -1,7 +1,7 @@
// !$*UTF8*$!
{
0867D690FE84028FC02AAC07 = {
- activeBuildStyle = 257486E20221853F0ECA149E;
+ activeBuildStyle = 014CEA440018CDF011CA2923;
activeTarget = 0867D69CFE84028FC02AAC07;
addToTargets = (
0867D69CFE84028FC02AAC07,
@@ -15,11 +15,26 @@
Split0 = {
Split0 = {
NavContent0 = {
- bookmark = 25680D460221D4410ECA149E;
+ bookmark = 25C50A3C022D54260ECA149E;
+ history = (
+ 25F29B12022C4F6E0ECA149E,
+ 25F29B13022C4F6E0ECA149E,
+ 25F29B18022C50AE0ECA149E,
+ 25C50A27022D4CB10ECA149E,
+ 25C50A2B022D4CB10ECA149E,
+ );
+ prevStack = (
+ 25F29B15022C4F6E0ECA149E,
+ 25F29B16022C4F6E0ECA149E,
+ 25F29B1A022C50AE0ECA149E,
+ 25F29B1B022C50AE0ECA149E,
+ 25C50A29022D4CB10ECA149E,
+ 25C50A2A022D4CB10ECA149E,
+ );
};
NavCount = 1;
NavGeometry0 = {
- Frame = "{{0, 0}, {572, 525}}";
+ Frame = "{{0, 0}, {979, 1002}}";
NavBarVisible = YES;
};
};
@@ -54,16 +69,16 @@
);
PBXWorkspaceGeometries = (
{
- ContentSize = "{856, 572}";
+ ContentSize = "{1263, 1049}";
LeftSlideOut = {
ActiveTab = 0;
Collapsed = NO;
- Frame = "{{0, 23}, {856, 549}}";
+ Frame = "{{0, 23}, {1263, 1026}}";
Split0 = {
Collapsed = NO;
- Frame = "{{284, 0}, {572, 549}}";
+ Frame = "{{284, 0}, {979, 1026}}";
Split0 = {
- Frame = "{{0, 24}, {572, 525}}";
+ Frame = "{{0, 24}, {979, 1002}}";
};
SplitCount = 1;
Tab0 = {
@@ -107,9 +122,9 @@
};
};
Tab2 = {
- BuildMessageFrame = "{{0, 0}, {574, 120}}";
- BuildTranscriptFrame = "{{0, 129}, {574, 0}}";
- Frame = "{{0, 0}, {572, 127}}";
+ BuildMessageFrame = "{{0, 0}, {981, 208}}";
+ BuildTranscriptFrame = "{{0, 217}, {981, 224}}";
+ Frame = "{{0, 0}, {979, 439}}";
};
Tab3 = {
Frame = "{{0, 0}, {572, 265}}";
@@ -119,7 +134,7 @@
};
SplitCount = 1;
Tab0 = {
- Frame = "{{0, 0}, {260, 549}}";
+ Frame = "{{0, 0}, {260, 1026}}";
GroupTreeTableConfiguration = (
TargetStatusColumn,
18,
@@ -148,9 +163,9 @@
Frame = "{{0, 0}, {226, 549}}";
};
Tab3 = {
- Frame = "{{0, 0}, {191, 549}}";
+ Frame = "{{0, 0}, {191, 1026}}";
Split0 = {
- Frame = "{{0, 0}, {191, 265}}";
+ Frame = "{{0, 0}, {191, 499}}";
TargetTreeTableConfiguration = (
ActiveTarget,
16,
@@ -165,7 +180,7 @@
Name,
160,
);
- Frame = "{{0, 274}, {191, 275}}";
+ Frame = "{{0, 508}, {191, 518}}";
};
SplitCount = 2;
};
@@ -193,12 +208,23 @@
StatusViewVisible = YES;
Template = F5F68CF101725D4C0D7A8F4C;
ToolbarVisible = YES;
- WindowLocation = "{30, 683}";
+ WindowLocation = "{365, 192}";
},
);
};
perUserProjectItems = {
- 25680D460221D4410ECA149E = 25680D460221D4410ECA149E;
+ 25C50A27022D4CB10ECA149E = 25C50A27022D4CB10ECA149E;
+ 25C50A29022D4CB10ECA149E = 25C50A29022D4CB10ECA149E;
+ 25C50A2A022D4CB10ECA149E = 25C50A2A022D4CB10ECA149E;
+ 25C50A2B022D4CB10ECA149E = 25C50A2B022D4CB10ECA149E;
+ 25C50A3C022D54260ECA149E = 25C50A3C022D54260ECA149E;
+ 25F29B12022C4F6E0ECA149E = 25F29B12022C4F6E0ECA149E;
+ 25F29B13022C4F6E0ECA149E = 25F29B13022C4F6E0ECA149E;
+ 25F29B15022C4F6E0ECA149E = 25F29B15022C4F6E0ECA149E;
+ 25F29B16022C4F6E0ECA149E = 25F29B16022C4F6E0ECA149E;
+ 25F29B18022C50AE0ECA149E = 25F29B18022C50AE0ECA149E;
+ 25F29B1A022C50AE0ECA149E = 25F29B1A022C50AE0ECA149E;
+ 25F29B1B022C50AE0ECA149E = 25F29B1B022C50AE0ECA149E;
};
wantsIndex = 1;
wantsSCM = -1;
@@ -206,22 +232,6 @@
0867D69CFE84028FC02AAC07 = {
activeExec = 0;
};
- 25680D460221D4410ECA149E = {
- fRef = 25680D470221D4410ECA149E;
- isa = PBXTextBookmark;
- name = "ReleaseNotes.rtf: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1239;
- vrLoc = 0;
- };
- 25680D470221D4410ECA149E = {
- isa = PBXFileReference;
- name = ReleaseNotes.rtf;
- path = "/Developer/Applications/Project Builder.app/Contents/Resources/English.lproj/ReleaseNotes.rtf";
- refType = 0;
- };
25A5593101A5996D0ECA149E = {
uiCtxt = {
sepNavWindowFrame = "{{728, 20}, {750, 502}}";
@@ -237,4 +247,124 @@
sepNavWindowFrame = "{{38, 650}, {750, 502}}";
};
};
+ 25C50A27022D4CB10ECA149E = {
+ fRef = F5EBC45502134BC301CA1520;
+ isa = PBXTextBookmark;
+ name = "IFPluginView.h: _StreamData";
+ rLen = 0;
+ rLoc = 680;
+ rType = 0;
+ vrLen = 1920;
+ vrLoc = 0;
+ };
+ 25C50A29022D4CB10ECA149E = {
+ fRef = F5EBC45602134BC301CA1520;
+ isa = PBXTextBookmark;
+ name = "IFPluginView.mm: newStream:mimeType:notifyData:";
+ rLen = 0;
+ rLoc = 7971;
+ rType = 0;
+ vrLen = 2732;
+ vrLoc = 4075;
+ };
+ 25C50A2A022D4CB10ECA149E = {
+ fRef = F5EBC45502134BC301CA1520;
+ isa = PBXTextBookmark;
+ name = "IFPluginView.h: _StreamData";
+ rLen = 0;
+ rLoc = 680;
+ rType = 0;
+ vrLen = 1920;
+ vrLoc = 0;
+ };
+ 25C50A2B022D4CB10ECA149E = {
+ fRef = F5EBC45602134BC301CA1520;
+ isa = PBXTextBookmark;
+ name = "IFPluginView.mm: 652";
+ rLen = 0;
+ rLoc = 21975;
+ rType = 0;
+ vrLen = 2573;
+ vrLoc = 10968;
+ };
+ 25C50A3C022D54260ECA149E = {
+ fRef = F5EBC45602134BC301CA1520;
+ isa = PBXTextBookmark;
+ name = "IFPluginView.mm: drawRect:";
+ rLen = 9;
+ rLoc = 4899;
+ rType = 0;
+ vrLen = 2607;
+ vrLoc = 7571;
+ };
+ 25F29B12022C4F6E0ECA149E = {
+ fRef = F520FB1A0221DEFD01C1A525;
+ isa = PBXTextBookmark;
+ name = "IFWebHistory.m: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 1373;
+ vrLoc = 0;
+ };
+ 25F29B13022C4F6E0ECA149E = {
+ fRef = 3944607F020F50ED0ECA1767;
+ isa = PBXTextBookmark;
+ name = "IFURIEntry.h: 47";
+ rLen = 0;
+ rLoc = 1172;
+ rType = 0;
+ vrLen = 1172;
+ vrLoc = 0;
+ };
+ 25F29B15022C4F6E0ECA149E = {
+ fRef = F520FB1A0221DEFD01C1A525;
+ isa = PBXTextBookmark;
+ name = "IFWebHistory.m: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 1373;
+ vrLoc = 0;
+ };
+ 25F29B16022C4F6E0ECA149E = {
+ fRef = 3944607F020F50ED0ECA1767;
+ isa = PBXTextBookmark;
+ name = "IFURIEntry.h: 47";
+ rLen = 0;
+ rLoc = 1172;
+ rType = 0;
+ vrLen = 1172;
+ vrLoc = 0;
+ };
+ 25F29B18022C50AE0ECA149E = {
+ fRef = 39446080020F50ED0ECA1767;
+ isa = PBXTextBookmark;
+ name = "IFURIEntry.m: 154";
+ rLen = 0;
+ rLoc = 2691;
+ rType = 0;
+ vrLen = 673;
+ vrLoc = 1524;
+ };
+ 25F29B1A022C50AE0ECA149E = {
+ fRef = 39446080020F50ED0ECA1767;
+ isa = PBXTextBookmark;
+ name = "IFURIEntry.m: 154";
+ rLen = 0;
+ rLoc = 2691;
+ rType = 0;
+ vrLen = 673;
+ vrLoc = 1524;
+ };
+ 25F29B1B022C50AE0ECA149E = {
+ fRef = F5EBC45502134BC301CA1520;
+ isa = PBXTextBookmark;
+ name = "IFPluginView.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 834;
+ vrLoc = 0;
+ };
}
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 3565adf..afb96f1 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 34;
+ objectVersion = 35;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list