[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:55:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4ff14a6b668ede18157ede84ae215c47216afb5d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 5 02:45:07 2002 +0000
Top level:
Fix everything for WebFoundation and WebKit WK --> IF rename.
* Tests/CookieManager/wkcookie-test.m:
WebBrowser:
Fix everything for WK --> IF rename.
* BackForwardListEntry.h:
* BrowserDocument.h:
* BrowserDocument.m: (-[BrowserDocument init]), (-[BrowserDocument
setMainWebView:]), (-[BrowserDocument goToURLBypassingBackForwardList:]),
(-[BrowserDocument receivedProgress:forResource:fromDataSource:]),
(-[BrowserDocument receivedError:forResource:partialProgress:fromDataSource:]),
(-[BrowserDocument setStatusText:forDataSource:]), (-[BrowserDocument
statusTextForDataSource:]), (-[BrowserDocument authenticate:]),
(-[BrowserDocument locationChangeStartedForDataSource:]), (-[BrowserDocument
locationChangeInProgressForDataSource:]), (-[BrowserDocument
locationChangeDone:forDataSource:]), (-[BrowserDocument
receivedPageTitle:forDataSource:]), (-[BrowserDocument
serverRedirectTo:forDataSource:]), (-[BrowserDocument
createFrameNamed:for:inParent:]):
* BrowserWindow.h:
* WebController.h:
* WebController.m: (-[WebController
receivedProgress:forResource:fromDataSource:]), (-[WebController
receivedError:forResource:partialProgress:fromDataSource:]), (-[WebController
setStatusText:forDataSource:]), (-[WebController
locationChangeStartedForDataSource:]), (-[WebController
locationChangeInProgressForDataSource:]), (-[WebController
locationChangeDone:forDataSource:]), (-[WebController
receivedPageTitle:forDataSource:]), (-[WebController
serverRedirectTo:forDataSource:]):
WebCore:
Fix everything for WK --> IF rename.
* src/kwq/KWQKHTMLPart.h:
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
(KHTMLPart::requestFrame), (KHTMLPart::checkCompleted):
WebFoundation:
Rename all classes from WK prefix to IF prefix.
* CacheLoader.subproj/IFCachedObject.h:
* CacheLoader.subproj/IFCachedObject.m:
* CacheLoader.subproj/IFContentType.h:
* CacheLoader.subproj/IFContentType.m:
* CacheLoader.subproj/IFHTTPURLHandle.h:
* CacheLoader.subproj/IFHTTPURLHandle.m: (+[IFHTTPURLHandle canInitWithURL:]),
(-[IFHTTPURLHandle initWithURL:cached:]), (-[IFHTTPURLHandle
initWithURL:flags:group:requestMethod:requestData:]):
* CacheLoader.subproj/IFHTTPURLHandleCookies.h:
* CacheLoader.subproj/IFHTTPURLProtocolHandler.h:
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m: (readStreamCallback),
(-[IFHTTPURLProtocolHandler initWithURLLoad:]), (-[IFHTTPURLProtocolHandler
beginLoadInBackground]), (-[IFHTTPURLProtocolHandler endLoadInBackground]),
(-[IFHTTPURLProtocolHandler handleReadStreamEvent:event:]),
(-[IFHTTPURLProtocolHandler performHTTPHeaderRead:]), (-[IFHTTPURLProtocolHandler
performStreamRead:]), (-[IFHTTPURLProtocolHandler determineError]):
* CacheLoader.subproj/IFURLCache.h:
* CacheLoader.subproj/IFURLCache.m: (-[IFURLCache objectForURL:]), (-[IFURLCache
cacheObject:forURL:untilDate:]), (-[IFURLCache expiryForURL:]), (-[IFURLCache
setExpiryForURL:date:]), (-[IFURLCache invalidateURL:]), (-[IFURLCache
clearCache]), (-[IFURLCache truncateToSizeLimit:]):
* CacheLoader.subproj/IFURLDataProvider.h:
* CacheLoader.subproj/IFURLDiskCache.h:
* CacheLoader.subproj/IFURLDiskCache.m:
* CacheLoader.subproj/IFURLHandle.h:
* CacheLoader.subproj/IFURLHandle.m: (-[IFURLHandleSynchronousClient init]),
(-[IFURLHandleSynchronousClient IFURLHandleResourceDidBeginLoading:]),
(-[IFURLHandleSynchronousClient IFURLHandleResourceDidCancelLoading:]),
(-[IFURLHandleSynchronousClient IFURLHandleResourceDidFinishLoading:]),
(-[IFURLHandleSynchronousClient IFURLHandle:resourceDataDidBecomeAvailable:]),
(-[IFURLHandleSynchronousClient IFURLHandle:resourceDidFailLoadingWithResult:]),
(_sendLoadCancelledMessages), (_sendLoadDidBeginMessages),
(_sendDidLoadDataMessages), (_sendLoadCompleteMessages),
(_sendLoadFailedMessages), (_handleRetain), (_handleRelease),
(_handleCopyDescription), (+[IFURLHandle initialize]), (+[IFURLHandle
canInitWithURL:]), (-[IFURLHandle initWithURL:cached:]), (-[IFURLHandle
addClient:]), (-[IFURLHandle removeClient:]), (-[IFURLHandle loadInBackground]),
(-[IFURLHandle cancelLoadInBackground]), (-[IFURLHandle backgroundLoadDidBegin]),
(-[IFURLHandle didLoadData:fromStream:]), (-[IFURLHandle
backgroundLoadComplete]), (-[IFURLHandle backgroundLoadFailedWithResultCode:]),
(-[IFURLHandle loadInForeground:]), (-[IFURLHandle statusCode]), (-[IFURLHandle
resultCode]), (-[IFURLHandle isEqual:]), (-[IFURLHandle hash]), (-[IFURLHandle
cacheable]), (-[IFURLHandle setCacheable:]), (-[IFURLHandle setStatusCode:]),
(-[IFURLHandle setResultCode:]), (-[IFURLHandle
notifyClientsBackgroundLoadCancelled]), (-[IFURLHandle
notifyClientsBackgroundLoadDidBegin]), (-[IFURLHandle notifyClientsDidLoadData]),
(-[IFURLHandle notifyClientsBackgroundLoadComplete]), (-[IFURLHandle
notifyClientsBackgroundLoadFailed]):
* CacheLoader.subproj/IFURLHandleCGlue.h:
* CacheLoader.subproj/IFURLHandleCGlue.m: (-[IFURLHandleCGlueClient
initWithClientContext:]), (-[IFURLHandleCGlueClient
IFURLHandleResourceDidBeginLoading:]), (-[IFURLHandleCGlueClient
IFURLHandleResourceDidCancelLoading:]), (-[IFURLHandleCGlueClient
IFURLHandleResourceDidFinishLoading:]), (-[IFURLHandleCGlueClient
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFURLHandleCGlueClient
IFURLHandle:resourceDidFailLoadingWithResult:]), (IFURLHandleCreate),
(IFURLHandleRelease), (IFURLHandleLoadInBackground):
* CacheLoader.subproj/IFURLLoad.m: (+[IFURLLoad initialize]), (+[IFURLLoad
URLLoadWithURL:flags:]), (-[IFURLLoad initWithURL:flags:]), (-[IFURLLoad
addHandle:]), (-[IFURLLoad removeHandle:]), (-[IFURLLoad schedule]), (-[IFURLLoad
statusCode]), (-[IFURLLoad resultCode]), (-[IFURLLoad succeeded]), (-[IFURLLoad
failedWithResultCode:]), (-[IFURLLoad protocolHandler]), (-[IFURLLoad
beginOriginLoad]), (-[IFURLLoad didBeginLoading]), (-[IFURLLoad cleanup]),
(-[IFURLLoad setStatusCode:]), (-[IFURLLoad setResultCode:]), (+[IFURLLoad
IFURLLoadCacheCheckerRun:]), (+[IFURLLoad IFURLLoadThrottlerRun:]), (+[IFURLLoad
IFURLLoadLoaderRun:]), (+[IFURLLoad IFURLLoadSweeperRun:]), (+[IFURLLoad
IFURLLoadCFStreamHandlerRun:]):
* CacheLoader.subproj/IFURLLoadManager.m: (-[IFURLLoadManager
initWithDefaultStack]), (+[IFURLLoadManager sharedURLLoader]),
(-[IFURLLoadManager concurrentNetworkLoadLimit]), (-[IFURLLoadManager
setConcurrentNetworkLoadLimit:]), (-[IFURLLoadManager canAccessNetwork]),
(-[IFURLLoadManager setCanAccessNetwork:]), (-[IFURLLoadManager
networkLoadTimeout]), (-[IFURLLoadManager setNetworkLoadTimeout:]),
(-[IFURLLoadManager requestWithURLHandle:]), (-[IFURLLoadManager
cancelRequestWithURLHandle:]), (-[IFURLLoadManager cancelAllRequestsWithURL:]),
(-[IFURLLoadManager handleURLLoadDone:]), (-[IFURLLoadManager
handleURLLoadedResourceData:]):
* CacheLoader.subproj/IFURLMemoryCache.m: (+[IFMemoryCacheObject
memoryCacheObjectWithObject:]), (+[IFMemoryCacheObject
memoryCacheObjectWithObject:expiry:]), (-[IFMemoryCacheObject initWithObject:]),
(-[IFMemoryCacheObject touch]), (-[IFMemoryCacheObject isExpired]),
(-[IFURLMemoryCache initWithSizeLimit:]), (-[IFURLMemoryCache
truncateToSizeLimit]), (-[IFURLMemoryCache objectForURL:]), (-[IFURLMemoryCache
cacheObject:forURL:untilDate:]), (-[IFURLMemoryCache invalidateURL:]):
* CacheLoader.subproj/IFURLProtocolHandler.m: (+[IFURLProtocolHandler
initialize]), (+[IFURLProtocolHandler canInitWithURL:]), (-[IFURLProtocolHandler
initWithURLLoad:]), (-[IFURLProtocolHandler beginLoadInBackground]),
(-[IFURLProtocolHandler endLoadInBackground]):
* CacheLoader.subproj/WCURLHandleGlue.m: (-[WCURLHandleClientProxy
IFURLHandleResourceDidBeginLoading:]), (-[WCURLHandleClientProxy
IFURLHandleResourceDidCancelLoading:]), (-[WCURLHandleClientProxy
IFURLHandleResourceDidFinishLoading:]), (-[WCURLHandleClientProxy
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[WCURLHandleClientProxy
IFURLHandle:resourceDidFailLoadingWithResult:]), (WCURLHandleCreate):
* CookieManager.subproj/IFCookie.m: (+[IFCookie cookieWithDictionary:]),
(setVersion), (setName), (setValue), (setDefaultsFromOriginURL), (setDomain),
(setPath), (setSecure), (setExpires), (-[IFCookie initWithDictionary:]),
(-[IFCookie version]), (-[IFCookie name]), (-[IFCookie value]), (-[IFCookie
expires]), (-[IFCookie sessionOnly]), (-[IFCookie domain]), (-[IFCookie path]),
(-[IFCookie secure]), (-[IFCookie comment]), (-[IFCookie commentURL]),
(-[IFCookie portList]), (+[IFCookie cookieWithV0Spec:forURL:]),
(MakeCookieWithV0Spec), (-[IFCookie compare:]), (-[IFCookie description]):
* CookieManager.subproj/IFCookieManager.m: (+[IFCookieManager
sharedCookieManager]), (-[IFCookieManager cookies]), (-[IFCookieManager
setCookie:]), (-[IFCookieManager deleteCookie:]), (-[IFCookieManager
deleteCookieWithName:domain:path:]), (-[IFCookieManager
cookieRequestHeadersForURL:]), (-[IFCookieManager
setCookiesFromResponseHeaders:forURL:]), (-[IFCookieManager addAcceptHandler:]),
(-[IFCookieManager removeAcceptHandler:]), (-[IFCookieManager
addChangeListener:]), (-[IFCookieManager removeChangeListener:]),
(-[IFCookieManager description]):
* Misc.subproj/IFBinaryHeap.m: (_IFBinaryHeapRetain), (_IFBinaryHeapRelease),
(_IFBinaryHeapCopyDescription), (_IFBinaryHeapCompare), (_heap), (+[IFBinaryHeap
binaryHeap]), (+[IFBinaryHeap binaryHeapWithBinaryHeap:]), (-[IFBinaryHeap
init]), (-[IFBinaryHeap initWithBinaryHeap:]):
* Misc.subproj/IFMonitor.m: (-[IFMonitor description]):
* Misc.subproj/IFMutableData.m: (-[IFMutableData getBytes:length:]),
(-[IFMutableData getBytes:range:]), (-[IFMutableData subdataWithRange:]):
* Misc.subproj/IFMutableDataPrivate.m: (IFDataCheckBound), (+[IFByteRange
rangeWithRange:]), (-[IFByteRange isEqual:]), (+[IFByteBlock
byteBlockWithBytes:length:]), (-[IFMutableData createBlockForRange:buffer:]),
(-[IFMutableData dataObjectsGreaterThanMatchedOffset:]), (-[IFMutableData
byteBlocksForRange:]), (-[IFMutableData bytesInRange:]), (-[IFMutableData
appendBytes:length:]), (+[IFData dataWithByteBlock:]), (-[IFData
initWithByteBlock:]), (-[IFData getBytes:range:]), (-[IFData subdataWithRange:]):
* Misc.subproj/IFNSArrayExtensions.m:
* Misc.subproj/IFNSObjectExtensions.m:
* Misc.subproj/IFQueue.m: (+[IFQueue newNode]), (-[IFQueue init]), (-[IFQueue
put:]), (-[IFQueue take]), (-[IFQueue peekAt:]), (-[IFQueue remove:]), (-[IFQueue
clear]), (-[IFQueue indexOf:]):
* Misc.subproj/IFReadWriteLock.m: (-[IFReadWriteLock init]):
WebKit:
Rename all classes from WK prefix to IF prefix.
* Cache.subproj/IFLoadChunk.h:
* Cache.subproj/IFWebCache.h:
* Cache.subproj/IFWebCacheClient.h:
* Cache.subproj/IFWebContentType.h:
* History.subproj/IFAttributedURL.h:
* History.subproj/IFBackForwardList.h:
* History.subproj/IFBackForwardList.m: (-[IFBackForwardList init]),
(-[IFBackForwardList addEntry:]), (-[IFBackForwardList back]),
(-[IFBackForwardList currentEntry]), (-[IFBackForwardList forward]),
(-[IFBackForwardList description]):
* History.subproj/IFURIEntry.h:
* History.subproj/IFURIEntry.m: (WCCreateURIEntry), (-[IFURIEntry isEqual:]),
(-[IFURIEntry description]):
* History.subproj/IFURIList.h:
* History.subproj/IFURIList.m: (newURIListNode), (freeNode), (-[IFURIList
dealloc]), (-[IFURIList addEntry:]), (-[IFURIList removeURL:]), (-[IFURIList
removeEntry:]), (-[IFURIList entryForURL:]), (-[IFURIList entryAtIndex:]),
(-[IFURIList removeEntryAtIndex:]), (-[IFURIList removeEntriesToIndex:]):
* Misc.subproj/IFException.h:
* Misc.subproj/IFException.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/IFBaseWebController.h:
* WebView.subproj/IFBaseWebController.mm: (+[IFObjectHolder holderWithObject:]),
(-[IFBaseWebController init]), (-[IFBaseWebController initWithView:dataSource:]),
(-[IFBaseWebController setDirectsAllLinksToSystemBrowser:]),
(-[IFBaseWebController directsAllLinksToSystemBrowser]), (-[IFBaseWebController
setView:andDataSource:]), (-[IFBaseWebController
createFrameNamed:for:inParent:]), (-[IFBaseWebController viewForDataSource:]),
(-[IFBaseWebController dataSourceForView:]), (-[IFBaseWebController mainView]),
(-[IFBaseWebController mainDataSource]), (-[IFBaseWebController
setStatusText:forDataSource:]), (-[IFBaseWebController
statusTextForDataSource:]), (-[IFBaseWebController authenticate:]),
(-[IFBaseWebController receivedProgress:forResource:fromDataSource:]),
(-[IFBaseWebController
receivedError:forResource:partialProgress:fromDataSource:]),
(-[IFBaseWebController locationWillChangeTo:]), (-[IFBaseWebController
locationChangeStartedForDataSource:]), (-[IFBaseWebController
locationChangeInProgressForDataSource:]), (-[IFBaseWebController
locationChangeDone:forDataSource:]), (-[IFBaseWebController
receivedPageTitle:forDataSource:]), (-[IFBaseWebController
serverRedirectTo:forDataSource:]):
* WebView.subproj/IFBaseWebControllerPrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@589 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 871a790..a874869 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
+ Fix everything for WK --> IF rename.
+
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
+ (KHTMLPart::requestFrame), (KHTMLPart::checkCompleted):
+
2002-02-01 Kenneth Kocienda <kocienda at apple.com>
More cleanups to the no-copy NSData API.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 871a790..a874869 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
+ Fix everything for WK --> IF rename.
+
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
+ (KHTMLPart::requestFrame), (KHTMLPart::checkCompleted):
+
2002-02-01 Kenneth Kocienda <kocienda at apple.com>
More cleanups to the no-copy NSData API.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 871a790..a874869 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
+ Fix everything for WK --> IF rename.
+
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent),
+ (KHTMLPart::requestFrame), (KHTMLPart::checkCompleted):
+
2002-02-01 Kenneth Kocienda <kocienda at apple.com>
More cleanups to the no-copy NSData API.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index fd8d562..cda2dc5 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -56,38 +56,38 @@
#import <KWQView.h>
- at class WKWebDataSource;
- at class WKWebView;
- at class WKWebFrame;
- at class WKError;
-
- at protocol WKWebController
-- (WKWebFrame *)createFrameNamed: (NSString *)name for: (WKWebDataSource *)dataSource inParent: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at class IFWebDataSource;
+ at class IFWebView;
+ at class IFWebFrame;
+ at class IFError;
+
+ at protocol IFWebController
+- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
- at protocol WKLocationChangeHandler
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at protocol IFLocationChangeHandler
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
- at interface WKWebDataSource : NSObject
+ at interface IFWebDataSource : NSObject
- initWithURL: (NSURL *)url;
- (void)_setFrameName: (NSString *)fName;
-- (id <WKWebController>)controller;
+- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
- frameNamed: (NSString *)f;
@end
// This should not be allowed here. data source should not reference view
// API.
- at interface WKWebView: NSObject
+ at interface IFWebView: NSObject
- (QWidget *)_widget;
- (void)_resetView;
- documentView;
@end
- at interface WKWebFrame: NSObject
-- initWithName: (NSString *)n view: v dataSource: (WKWebDataSource *)d;
+ at interface IFWebFrame: NSObject
+- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
- view;
@end
@@ -1284,9 +1284,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
// HACK! FIXME!
if (d->m_strSelectedURL != QString::null) {
- id nsview = ((WKWebView *)((QWidget *)view())->getView());
+ id nsview = ((IFWebView *)((QWidget *)view())->getView());
- if ([nsview isKindOfClass: NSClassFromString(@"WKDynamicScrollBarsView")])
+ if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
nsview = [nsview documentView];
[nsview _resetView];
KURL clickedURL(completeURL( splitUrlTarget(d->m_strSelectedURL)));
@@ -1522,8 +1522,8 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
const QStringList ¶ms, bool isIFrame)
{
NSString *nsframeName = QSTRING_TO_NSSTRING(frameName);
- WKWebFrame *aFrame;
- WKWebDataSource *dataSource;
+ IFWebFrame *aFrame;
+ IFWebDataSource *dataSource;
fprintf (stdout, "0x%08x requestFrame(): part = 0x%08x, name = %s, url = %s\n", (unsigned int)this, (unsigned int)frame, frameName.latin1(), url.latin1());
dataSource = getDataSource();
@@ -1535,14 +1535,14 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
frame->setWidget ([[aFrame view] _widget]);
}
else {
- WKWebDataSource *childDataSource, *dataSource;
+ IFWebDataSource *childDataSource, *dataSource;
NSURL *childURL;
- WKWebFrame *newFrame;
- id <WKWebController> controller;
+ IFWebFrame *newFrame;
+ id <IFWebController> controller;
fprintf (stdout, "0x%08x requestFrame(): part = 0x%08x creating frame\n", (unsigned int)this, (unsigned int)frame);
childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
- childDataSource = [[WKWebDataSource alloc] initWithURL: childURL];
+ childDataSource = [[IFWebDataSource alloc] initWithURL: childURL];
[childDataSource _setFrameName: nsframeName];
dataSource = getDataSource();
@@ -1661,8 +1661,8 @@ void KHTMLPart::checkCompleted()
// tell anyone who's interested that we're done
[[NSNotificationCenter defaultCenter] postNotificationName:@"uri-done" object:urlString];
- WKWebDataSource *dataSource;
- id <WKWebController> controller;
+ IFWebDataSource *dataSource;
+ id <IFWebController> controller;
dataSource = getDataSource();
controller = [dataSource controller];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index fd8d562..cda2dc5 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -56,38 +56,38 @@
#import <KWQView.h>
- at class WKWebDataSource;
- at class WKWebView;
- at class WKWebFrame;
- at class WKError;
-
- at protocol WKWebController
-- (WKWebFrame *)createFrameNamed: (NSString *)name for: (WKWebDataSource *)dataSource inParent: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at class IFWebDataSource;
+ at class IFWebView;
+ at class IFWebFrame;
+ at class IFError;
+
+ at protocol IFWebController
+- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
- at protocol WKLocationChangeHandler
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at protocol IFLocationChangeHandler
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
- at interface WKWebDataSource : NSObject
+ at interface IFWebDataSource : NSObject
- initWithURL: (NSURL *)url;
- (void)_setFrameName: (NSString *)fName;
-- (id <WKWebController>)controller;
+- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
- frameNamed: (NSString *)f;
@end
// This should not be allowed here. data source should not reference view
// API.
- at interface WKWebView: NSObject
+ at interface IFWebView: NSObject
- (QWidget *)_widget;
- (void)_resetView;
- documentView;
@end
- at interface WKWebFrame: NSObject
-- initWithName: (NSString *)n view: v dataSource: (WKWebDataSource *)d;
+ at interface IFWebFrame: NSObject
+- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
- view;
@end
@@ -1284,9 +1284,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
// HACK! FIXME!
if (d->m_strSelectedURL != QString::null) {
- id nsview = ((WKWebView *)((QWidget *)view())->getView());
+ id nsview = ((IFWebView *)((QWidget *)view())->getView());
- if ([nsview isKindOfClass: NSClassFromString(@"WKDynamicScrollBarsView")])
+ if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
nsview = [nsview documentView];
[nsview _resetView];
KURL clickedURL(completeURL( splitUrlTarget(d->m_strSelectedURL)));
@@ -1522,8 +1522,8 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
const QStringList ¶ms, bool isIFrame)
{
NSString *nsframeName = QSTRING_TO_NSSTRING(frameName);
- WKWebFrame *aFrame;
- WKWebDataSource *dataSource;
+ IFWebFrame *aFrame;
+ IFWebDataSource *dataSource;
fprintf (stdout, "0x%08x requestFrame(): part = 0x%08x, name = %s, url = %s\n", (unsigned int)this, (unsigned int)frame, frameName.latin1(), url.latin1());
dataSource = getDataSource();
@@ -1535,14 +1535,14 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
frame->setWidget ([[aFrame view] _widget]);
}
else {
- WKWebDataSource *childDataSource, *dataSource;
+ IFWebDataSource *childDataSource, *dataSource;
NSURL *childURL;
- WKWebFrame *newFrame;
- id <WKWebController> controller;
+ IFWebFrame *newFrame;
+ id <IFWebController> controller;
fprintf (stdout, "0x%08x requestFrame(): part = 0x%08x creating frame\n", (unsigned int)this, (unsigned int)frame);
childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
- childDataSource = [[WKWebDataSource alloc] initWithURL: childURL];
+ childDataSource = [[IFWebDataSource alloc] initWithURL: childURL];
[childDataSource _setFrameName: nsframeName];
dataSource = getDataSource();
@@ -1661,8 +1661,8 @@ void KHTMLPart::checkCompleted()
// tell anyone who's interested that we're done
[[NSNotificationCenter defaultCenter] postNotificationName:@"uri-done" object:urlString];
- WKWebDataSource *dataSource;
- id <WKWebController> controller;
+ IFWebDataSource *dataSource;
+ id <IFWebController> controller;
dataSource = getDataSource();
controller = [dataSource controller];
diff --git a/WebCore/src/kwq/KWQKHTMLPart.h b/WebCore/src/kwq/KWQKHTMLPart.h
index 185fded..fa00553 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.h
+++ b/WebCore/src/kwq/KWQKHTMLPart.h
@@ -47,7 +47,7 @@ class KJSProxy;
class KHTMLPartPrivate;
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
- at class WKWebDataSource;
+ at class IFWebDataSource;
#endif
namespace DOM
@@ -597,8 +597,8 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
// Not retained.
- void setDataSource(WKWebDataSource *d) { dataSource = d; }
- WKWebDataSource *getDataSource() { return dataSource; }
+ void setDataSource(IFWebDataSource *d) { dataSource = d; }
+ IFWebDataSource *getDataSource() { return dataSource; }
#else
void setDataSource(void *d) { dataSource = d; }
void *getDataSource() { return dataSource; }
@@ -613,7 +613,7 @@ private:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
- WKWebDataSource *dataSource;
+ IFWebDataSource *dataSource;
#else
void *dataSource;
#endif
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index fd8d562..cda2dc5 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -56,38 +56,38 @@
#import <KWQView.h>
- at class WKWebDataSource;
- at class WKWebView;
- at class WKWebFrame;
- at class WKError;
-
- at protocol WKWebController
-- (WKWebFrame *)createFrameNamed: (NSString *)name for: (WKWebDataSource *)dataSource inParent: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at class IFWebDataSource;
+ at class IFWebView;
+ at class IFWebFrame;
+ at class IFError;
+
+ at protocol IFWebController
+- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
- at protocol WKLocationChangeHandler
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at protocol IFLocationChangeHandler
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
- at interface WKWebDataSource : NSObject
+ at interface IFWebDataSource : NSObject
- initWithURL: (NSURL *)url;
- (void)_setFrameName: (NSString *)fName;
-- (id <WKWebController>)controller;
+- (id <IFWebController>)controller;
- (void)startLoading: (BOOL)forceRefresh;
- frameNamed: (NSString *)f;
@end
// This should not be allowed here. data source should not reference view
// API.
- at interface WKWebView: NSObject
+ at interface IFWebView: NSObject
- (QWidget *)_widget;
- (void)_resetView;
- documentView;
@end
- at interface WKWebFrame: NSObject
-- initWithName: (NSString *)n view: v dataSource: (WKWebDataSource *)d;
+ at interface IFWebFrame: NSObject
+- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
- view;
@end
@@ -1284,9 +1284,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
// HACK! FIXME!
if (d->m_strSelectedURL != QString::null) {
- id nsview = ((WKWebView *)((QWidget *)view())->getView());
+ id nsview = ((IFWebView *)((QWidget *)view())->getView());
- if ([nsview isKindOfClass: NSClassFromString(@"WKDynamicScrollBarsView")])
+ if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
nsview = [nsview documentView];
[nsview _resetView];
KURL clickedURL(completeURL( splitUrlTarget(d->m_strSelectedURL)));
@@ -1522,8 +1522,8 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
const QStringList ¶ms, bool isIFrame)
{
NSString *nsframeName = QSTRING_TO_NSSTRING(frameName);
- WKWebFrame *aFrame;
- WKWebDataSource *dataSource;
+ IFWebFrame *aFrame;
+ IFWebDataSource *dataSource;
fprintf (stdout, "0x%08x requestFrame(): part = 0x%08x, name = %s, url = %s\n", (unsigned int)this, (unsigned int)frame, frameName.latin1(), url.latin1());
dataSource = getDataSource();
@@ -1535,14 +1535,14 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
frame->setWidget ([[aFrame view] _widget]);
}
else {
- WKWebDataSource *childDataSource, *dataSource;
+ IFWebDataSource *childDataSource, *dataSource;
NSURL *childURL;
- WKWebFrame *newFrame;
- id <WKWebController> controller;
+ IFWebFrame *newFrame;
+ id <IFWebController> controller;
fprintf (stdout, "0x%08x requestFrame(): part = 0x%08x creating frame\n", (unsigned int)this, (unsigned int)frame);
childURL = [NSURL URLWithString: QSTRING_TO_NSSTRING (completeURL( url ).url() )];
- childDataSource = [[WKWebDataSource alloc] initWithURL: childURL];
+ childDataSource = [[IFWebDataSource alloc] initWithURL: childURL];
[childDataSource _setFrameName: nsframeName];
dataSource = getDataSource();
@@ -1661,8 +1661,8 @@ void KHTMLPart::checkCompleted()
// tell anyone who's interested that we're done
[[NSNotificationCenter defaultCenter] postNotificationName:@"uri-done" object:urlString];
- WKWebDataSource *dataSource;
- id <WKWebController> controller;
+ IFWebDataSource *dataSource;
+ id <IFWebController> controller;
dataSource = getDataSource();
controller = [dataSource controller];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 11b8ab4..e17011c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,96 @@
2002-02-04 Maciej Stachowiak <mjs at apple.com>
+ Rename all classes from WK prefix to IF prefix.
+
+ * Cache.subproj/IFLoadChunk.h:
+ * Cache.subproj/IFWebCache.h:
+ * Cache.subproj/IFWebCacheClient.h:
+ * Cache.subproj/IFWebContentType.h:
+ * History.subproj/IFAttributedURL.h:
+ * History.subproj/IFBackForwardList.h:
+ * History.subproj/IFBackForwardList.m: (-[IFBackForwardList init]),
+ (-[IFBackForwardList addEntry:]), (-[IFBackForwardList back]),
+ (-[IFBackForwardList currentEntry]), (-[IFBackForwardList forward]),
+ (-[IFBackForwardList description]):
+ * History.subproj/IFURIEntry.h:
+ * History.subproj/IFURIEntry.m: (WCCreateURIEntry), (-[IFURIEntry isEqual:]),
+ (-[IFURIEntry description]):
+ * History.subproj/IFURIList.h:
+ * History.subproj/IFURIList.m: (newURIListNode), (freeNode), (-[IFURIList
+ dealloc]), (-[IFURIList addEntry:]), (-[IFURIList removeURL:]), (-[IFURIList
+ removeEntry:]), (-[IFURIList entryForURL:]), (-[IFURIList entryAtIndex:]),
+ (-[IFURIList removeEntryAtIndex:]), (-[IFURIList removeEntriesToIndex:]):
+ * Misc.subproj/IFException.h:
+ * Misc.subproj/IFException.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFBaseWebController.h:
+ * WebView.subproj/IFBaseWebController.mm: (+[IFObjectHolder holderWithObject:]),
+ (-[IFBaseWebController init]), (-[IFBaseWebController initWithView:dataSource:]),
+ (-[IFBaseWebController setDirectsAllLinksToSystemBrowser:]),
+ (-[IFBaseWebController directsAllLinksToSystemBrowser]), (-[IFBaseWebController
+ setView:andDataSource:]), (-[IFBaseWebController
+ createFrameNamed:for:inParent:]), (-[IFBaseWebController viewForDataSource:]),
+ (-[IFBaseWebController dataSourceForView:]), (-[IFBaseWebController mainView]),
+ (-[IFBaseWebController mainDataSource]), (-[IFBaseWebController
+ setStatusText:forDataSource:]), (-[IFBaseWebController
+ statusTextForDataSource:]), (-[IFBaseWebController authenticate:]),
+ (-[IFBaseWebController receivedProgress:forResource:fromDataSource:]),
+ (-[IFBaseWebController
+ receivedError:forResource:partialProgress:fromDataSource:]),
+ (-[IFBaseWebController locationWillChangeTo:]), (-[IFBaseWebController
+ locationChangeStartedForDataSource:]), (-[IFBaseWebController
+ locationChangeInProgressForDataSource:]), (-[IFBaseWebController
+ locationChangeDone:forDataSource:]), (-[IFBaseWebController
+ receivedPageTitle:forDataSource:]), (-[IFBaseWebController
+ serverRedirectTo:forDataSource:]):
+ * WebView.subproj/IFBaseWebControllerPrivate.h:
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ * WebView.subproj/IFDynamicScrollBarsView.h:
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ * WebView.subproj/IFGrabBag.h:
+ * WebView.subproj/IFPreferences.h:
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource _commonInitialization]),
+ (-[IFWebDataSource initWithURL:]), (-[IFWebDataSource frameName]),
+ (-[IFWebDataSource isMainDocument]), (-[IFWebDataSource parent]),
+ (-[IFWebDataSource children]), (-[IFWebDataSource addFrame:]), (-[IFWebDataSource
+ frameNamed:]), (-[IFWebDataSource frameNames]), (-[IFWebDataSource
+ findDataSourceForFrameNamed:]), (-[IFWebDataSource frameExists:]),
+ (-[IFWebDataSource openURL:inFrameNamed:]), (-[IFWebDataSource
+ openURL:inIFrame:]), (-[IFWebDataSource controller]), (-[IFWebDataSource
+ inputURL]), (-[IFWebDataSource finalURL]), (-[IFWebDataSource wasRedirected]),
+ (-[IFWebDataSource stopLoading]), (-[IFWebDataSource isLoading]),
+ (-[IFWebDataSource base]), (-[IFWebDataSource baseTarget]), (-[IFWebDataSource
+ encoding]), (-[IFWebDataSource setUserStyleSheetFromURL:]), (-[IFWebDataSource
+ setUserStyleSheetFromString:]), (-[IFWebDataSource icon]), (-[IFWebDataSource
+ isPageSecure]), (-[IFWebDataSource pageTitle]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSourcePrivate dealloc]),
+ (-[IFWebDataSource _setController:]), (-[IFWebDataSource _part]),
+ (-[IFWebDataSource _setFrameName:]):
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.m: (-[IFWebFrame initWithName:view:dataSource:]),
+ (-[IFWebFrame dataSource]):
+ * WebView.subproj/IFWebView.h:
+ * WebView.subproj/IFWebView.mm: (-[IFWebView initWithFrame:]), (-[IFWebView
+ controller]), (-[IFWebView dataSourceChanged]), (-[IFWebView layout]),
+ (-[IFWebView stopAnimations]), (-[IFWebView setFontSizes:]), (-[IFWebView
+ fontSizes]), (-[IFWebView resetFontSizes]), (-[IFWebView setStandardFont:]),
+ (-[IFWebView standardFont]), (-[IFWebView setFixedFont:]), (-[IFWebView
+ fixedFont]), (-[IFWebView setCanDragFrom:]), (-[IFWebView setCanDragTo:]),
+ (-[IFWebView defaultContextMenuItemsForNode:]), (-[IFWebView
+ setContextMenusEnabled:]), (-[IFWebView deselectText]), (-[IFWebView
+ searchFor:direction:caseSensitive:]), (-[IFWebView selectedText]), (-[IFWebView
+ setNeedsLayout:]), (-[IFWebView drawRect:]), (-[IFWebView setIsFlipped:]),
+ (-[IFWebView isFlipped]), (-[IFWebView mouseUp:]), (-[IFWebView mouseDown:]):
+ * WebView.subproj/IFWebViewPrivate.h:
+ * WebView.subproj/IFWebViewPrivate.mm: (-[IFWebViewPrivate dealloc]),
+ (-[IFWebView _setController:]), (-[IFWebView _widget]), (-[IFWebView
+ _setFrameScrollView:]), (-[IFWebView _frameScrollView]):
+
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
Rename all WK files to IF (classes not renamed yet).
* Cache.subproj/IFLoadChunk.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 11b8ab4..e17011c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,96 @@
2002-02-04 Maciej Stachowiak <mjs at apple.com>
+ Rename all classes from WK prefix to IF prefix.
+
+ * Cache.subproj/IFLoadChunk.h:
+ * Cache.subproj/IFWebCache.h:
+ * Cache.subproj/IFWebCacheClient.h:
+ * Cache.subproj/IFWebContentType.h:
+ * History.subproj/IFAttributedURL.h:
+ * History.subproj/IFBackForwardList.h:
+ * History.subproj/IFBackForwardList.m: (-[IFBackForwardList init]),
+ (-[IFBackForwardList addEntry:]), (-[IFBackForwardList back]),
+ (-[IFBackForwardList currentEntry]), (-[IFBackForwardList forward]),
+ (-[IFBackForwardList description]):
+ * History.subproj/IFURIEntry.h:
+ * History.subproj/IFURIEntry.m: (WCCreateURIEntry), (-[IFURIEntry isEqual:]),
+ (-[IFURIEntry description]):
+ * History.subproj/IFURIList.h:
+ * History.subproj/IFURIList.m: (newURIListNode), (freeNode), (-[IFURIList
+ dealloc]), (-[IFURIList addEntry:]), (-[IFURIList removeURL:]), (-[IFURIList
+ removeEntry:]), (-[IFURIList entryForURL:]), (-[IFURIList entryAtIndex:]),
+ (-[IFURIList removeEntryAtIndex:]), (-[IFURIList removeEntriesToIndex:]):
+ * Misc.subproj/IFException.h:
+ * Misc.subproj/IFException.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFBaseWebController.h:
+ * WebView.subproj/IFBaseWebController.mm: (+[IFObjectHolder holderWithObject:]),
+ (-[IFBaseWebController init]), (-[IFBaseWebController initWithView:dataSource:]),
+ (-[IFBaseWebController setDirectsAllLinksToSystemBrowser:]),
+ (-[IFBaseWebController directsAllLinksToSystemBrowser]), (-[IFBaseWebController
+ setView:andDataSource:]), (-[IFBaseWebController
+ createFrameNamed:for:inParent:]), (-[IFBaseWebController viewForDataSource:]),
+ (-[IFBaseWebController dataSourceForView:]), (-[IFBaseWebController mainView]),
+ (-[IFBaseWebController mainDataSource]), (-[IFBaseWebController
+ setStatusText:forDataSource:]), (-[IFBaseWebController
+ statusTextForDataSource:]), (-[IFBaseWebController authenticate:]),
+ (-[IFBaseWebController receivedProgress:forResource:fromDataSource:]),
+ (-[IFBaseWebController
+ receivedError:forResource:partialProgress:fromDataSource:]),
+ (-[IFBaseWebController locationWillChangeTo:]), (-[IFBaseWebController
+ locationChangeStartedForDataSource:]), (-[IFBaseWebController
+ locationChangeInProgressForDataSource:]), (-[IFBaseWebController
+ locationChangeDone:forDataSource:]), (-[IFBaseWebController
+ receivedPageTitle:forDataSource:]), (-[IFBaseWebController
+ serverRedirectTo:forDataSource:]):
+ * WebView.subproj/IFBaseWebControllerPrivate.h:
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ * WebView.subproj/IFDynamicScrollBarsView.h:
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ * WebView.subproj/IFGrabBag.h:
+ * WebView.subproj/IFPreferences.h:
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource _commonInitialization]),
+ (-[IFWebDataSource initWithURL:]), (-[IFWebDataSource frameName]),
+ (-[IFWebDataSource isMainDocument]), (-[IFWebDataSource parent]),
+ (-[IFWebDataSource children]), (-[IFWebDataSource addFrame:]), (-[IFWebDataSource
+ frameNamed:]), (-[IFWebDataSource frameNames]), (-[IFWebDataSource
+ findDataSourceForFrameNamed:]), (-[IFWebDataSource frameExists:]),
+ (-[IFWebDataSource openURL:inFrameNamed:]), (-[IFWebDataSource
+ openURL:inIFrame:]), (-[IFWebDataSource controller]), (-[IFWebDataSource
+ inputURL]), (-[IFWebDataSource finalURL]), (-[IFWebDataSource wasRedirected]),
+ (-[IFWebDataSource stopLoading]), (-[IFWebDataSource isLoading]),
+ (-[IFWebDataSource base]), (-[IFWebDataSource baseTarget]), (-[IFWebDataSource
+ encoding]), (-[IFWebDataSource setUserStyleSheetFromURL:]), (-[IFWebDataSource
+ setUserStyleSheetFromString:]), (-[IFWebDataSource icon]), (-[IFWebDataSource
+ isPageSecure]), (-[IFWebDataSource pageTitle]):
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSourcePrivate dealloc]),
+ (-[IFWebDataSource _setController:]), (-[IFWebDataSource _part]),
+ (-[IFWebDataSource _setFrameName:]):
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.m: (-[IFWebFrame initWithName:view:dataSource:]),
+ (-[IFWebFrame dataSource]):
+ * WebView.subproj/IFWebView.h:
+ * WebView.subproj/IFWebView.mm: (-[IFWebView initWithFrame:]), (-[IFWebView
+ controller]), (-[IFWebView dataSourceChanged]), (-[IFWebView layout]),
+ (-[IFWebView stopAnimations]), (-[IFWebView setFontSizes:]), (-[IFWebView
+ fontSizes]), (-[IFWebView resetFontSizes]), (-[IFWebView setStandardFont:]),
+ (-[IFWebView standardFont]), (-[IFWebView setFixedFont:]), (-[IFWebView
+ fixedFont]), (-[IFWebView setCanDragFrom:]), (-[IFWebView setCanDragTo:]),
+ (-[IFWebView defaultContextMenuItemsForNode:]), (-[IFWebView
+ setContextMenusEnabled:]), (-[IFWebView deselectText]), (-[IFWebView
+ searchFor:direction:caseSensitive:]), (-[IFWebView selectedText]), (-[IFWebView
+ setNeedsLayout:]), (-[IFWebView drawRect:]), (-[IFWebView setIsFlipped:]),
+ (-[IFWebView isFlipped]), (-[IFWebView mouseUp:]), (-[IFWebView mouseDown:]):
+ * WebView.subproj/IFWebViewPrivate.h:
+ * WebView.subproj/IFWebViewPrivate.mm: (-[IFWebViewPrivate dealloc]),
+ (-[IFWebView _setController:]), (-[IFWebView _widget]), (-[IFWebView
+ _setFrameScrollView:]), (-[IFWebView _frameScrollView]):
+
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
Rename all WK files to IF (classes not renamed yet).
* Cache.subproj/IFLoadChunk.h:
diff --git a/WebKit/History.subproj/IFAttributedURL.h b/WebKit/History.subproj/IFAttributedURL.h
index 0ecbb10..2b3aff4 100644
--- a/WebKit/History.subproj/IFAttributedURL.h
+++ b/WebKit/History.subproj/IFAttributedURL.h
@@ -8,12 +8,12 @@
//
// IFAttributedURL.h
//
-// WKAttributedURL is the class that is used to store a "reference" to a URL
+// IFAttributedURL is the class that is used to store a "reference" to a URL
// in the various history and bookmark mechanisms. It provides some attributes
// that clients can use to "decorate" a URL with data that a user might find
// useful in organizing their internet and browsing experience.
//
- at interface WKAttributedURL : NSObject
+ at interface IFAttributedURL : NSObject
{
// The URL that serves as the "anchor" for the accompanying attributes.
NSURL *url;
@@ -43,14 +43,14 @@
}
//
-// Initializes a WKAttributedURL object, setting the URL to the given
+// Initializes a IFAttributedURL object, setting the URL to the given
// object, the creation and modification dates to "now" and all other
// fields to empty values (nil or zero).
//
-(id)initWithURL:(NSURL *)url;
//
-// Initializes a WKAttributedURL object, setting the URL and title to
+// Initializes a IFAttributedURL object, setting the URL and title to
// the given objects, the creation and modification dates to "now" and
// all other fields to empty values (nil or zero).
//
@@ -144,7 +144,7 @@
//
// Returns YES if the receiver is equal to the given object, no otherwise.
-// Two WKAttributedURL objects are equal if and only if they have the
+// Two IFAttributedURL objects are equal if and only if they have the
// equal URLs and creation dates.
//
-(BOOL)isEqual:(id)anObject;
diff --git a/WebKit/History.subproj/IFBackForwardList.h b/WebKit/History.subproj/IFBackForwardList.h
index 1bb625f..cdbdea8 100644
--- a/WebKit/History.subproj/IFBackForwardList.h
+++ b/WebKit/History.subproj/IFBackForwardList.h
@@ -6,8 +6,8 @@
#import <WebKit/IFURIList.h>
#import <WebKit/IFURIEntry.h>
- at interface WKBackForwardList : NSObject {
- WKURIList *uriList;
+ at interface IFBackForwardList : NSObject {
+ IFURIList *uriList;
int index;
NSLock *mutex;
int state;
@@ -15,12 +15,12 @@
-(id)init;
--(void)addEntry:(WKURIEntry *)entry;
+-(void)addEntry:(IFURIEntry *)entry;
--(WKURIEntry *)back;
--(WKURIEntry *)forward;
+-(IFURIEntry *)back;
+-(IFURIEntry *)forward;
--(WKURIEntry *)currentEntry;
+-(IFURIEntry *)currentEntry;
-(NSArray *)backList;
-(NSArray *)forwardList;
@@ -35,22 +35,22 @@
//=============================================================================
//
-// WKBackForwardList.h
+// IFBackForwardList.h
//
// It provides the list that enables the "Back" and "Forward" buttons to
// work correctly. As such, it is merely a user convenience that aids in
// basic navigation in ways that users have come to expect.
//
- at interface WKBackForwardList
+ at interface IFBackForwardList
{
-(id)init;
--(void)addAttributedURL:(WKAttributedURL *)url;
+-(void)addAttributedURL:(IFAttributedURL *)url;
--(WKAttributedURL *)back;
--(WKAttributedURL *)forward;
+-(IFAttributedURL *)back;
+-(IFAttributedURL *)forward;
-(NSArray *)backList;
-(NSArray *)forwardList;
diff --git a/WebKit/History.subproj/IFBackForwardList.m b/WebKit/History.subproj/IFBackForwardList.m
index 18599b7..4cfe2ee 100644
--- a/WebKit/History.subproj/IFBackForwardList.m
+++ b/WebKit/History.subproj/IFBackForwardList.m
@@ -8,7 +8,7 @@
#import "IFBackForwardList.h"
- at implementation WKBackForwardList
+ at implementation IFBackForwardList
-(id)init
{
@@ -17,7 +17,7 @@
return nil;
}
- uriList = [[WKURIList alloc] init];
+ uriList = [[IFURIList alloc] init];
[uriList setAllowsDuplicates:YES];
index = 0;
mutex = [[NSLock alloc] init];
@@ -33,7 +33,7 @@
[super dealloc];
}
--(void)addEntry:(WKURIEntry *)entry
+-(void)addEntry:(IFURIEntry *)entry
{
[mutex lock];
if (index > 0) {
@@ -44,9 +44,9 @@
[mutex unlock];
}
--(WKURIEntry *)back
+-(IFURIEntry *)back
{
- WKURIEntry *result;
+ IFURIEntry *result;
[mutex lock];
index++;
@@ -56,14 +56,14 @@
return result;
}
--(WKURIEntry *)currentEntry
+-(IFURIEntry *)currentEntry
{
return [uriList entryAtIndex:index];
}
--(WKURIEntry *)forward
+-(IFURIEntry *)forward
{
- WKURIEntry *result;
+ IFURIEntry *result;
[mutex lock];
index--;
@@ -119,7 +119,7 @@
result = [NSMutableString stringWithCapacity:512];
[result appendString:@"\n--------------------------------------------\n"];
- [result appendString:@"WKBackForwardList:\n"];
+ [result appendString:@"IFBackForwardList:\n"];
for (i = 0; i < [uriList count]; i++) {
if (i == index) {
diff --git a/WebKit/History.subproj/IFURIEntry.h b/WebKit/History.subproj/IFURIEntry.h
index 2a6f274..2453cf7 100644
--- a/WebKit/History.subproj/IFURIEntry.h
+++ b/WebKit/History.subproj/IFURIEntry.h
@@ -10,8 +10,8 @@
#import <AppKit/AppKit.h>
//#import <WCURIEntry.h>
-//@interface WKURIEntry : NSObject <WCURIEntry>
- at interface WKURIEntry : NSObject
+//@interface IFURIEntry : NSObject <WCURIEntry>
+ at interface IFURIEntry : NSObject
{
NSURL *_url;
NSString *_title;
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index ea7bc9e..a46993a 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -16,11 +16,11 @@
id <WCURIEntry> WCCreateURIEntry(void)
{
- return [[WKURIEntry alloc] init];
+ return [[IFURIEntry alloc] init];
}
#endif
- at implementation WKURIEntry
+ at implementation IFURIEntry
-(id)init
{
@@ -149,8 +149,8 @@ id <WCURIEntry> WCCreateURIEntry(void)
result = NO;
- if ([anObject isMemberOfClass:[WKURIEntry class]]) {
- result = [_url isEqual:[((WKURIEntry *)anObject) url]];
+ if ([anObject isMemberOfClass:[IFURIEntry class]]) {
+ result = [_url isEqual:[((IFURIEntry *)anObject) url]];
}
return result;
@@ -158,7 +158,7 @@ id <WCURIEntry> WCCreateURIEntry(void)
-(NSString *)description
{
- return [NSString stringWithFormat:@"WKURIEntry %@", _url];
+ return [NSString stringWithFormat:@"IFURIEntry %@", _url];
}
@end
diff --git a/WebKit/History.subproj/IFURIList.h b/WebKit/History.subproj/IFURIList.h
index 1930b0b..2d13a27 100644
--- a/WebKit/History.subproj/IFURIList.h
+++ b/WebKit/History.subproj/IFURIList.h
@@ -6,12 +6,12 @@
#import "IFURIEntry.h"
-typedef struct WKURIListNode WKURIListNode;
+typedef struct IFURIListNode IFURIListNode;
- at interface WKURIList : NSObject
+ at interface IFURIList : NSObject
{
- WKURIListNode *_head;
- WKURIListNode *_tail;
+ IFURIListNode *_head;
+ IFURIListNode *_tail;
int _count;
BOOL _allowsDuplicates;
int _maximumSize;
@@ -27,14 +27,14 @@ typedef struct WKURIListNode WKURIListNode;
-(int)maximumSize;
-(void)setMaximumSize:(int)size;
--(WKURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
--(void)addEntry:(WKURIEntry *)entry;
--(WKURIEntry *)removeURL:(NSURL *)url;
--(BOOL)removeEntry:(WKURIEntry *)entry;
+-(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(void)addEntry:(IFURIEntry *)entry;
+-(IFURIEntry *)removeURL:(NSURL *)url;
+-(BOOL)removeEntry:(IFURIEntry *)entry;
--(WKURIEntry *)entryForURL:(NSURL *)url;
--(WKURIEntry *)entryAtIndex:(int)index;
--(WKURIEntry *)removeEntryAtIndex:(int)index;
+-(IFURIEntry *)entryForURL:(NSURL *)url;
+-(IFURIEntry *)entryAtIndex:(int)index;
+-(IFURIEntry *)removeEntryAtIndex:(int)index;
-(void)removeEntriesToIndex:(int)index;
@end
diff --git a/WebKit/History.subproj/IFURIList.m b/WebKit/History.subproj/IFURIList.m
index f8d34d9..57814e6 100644
--- a/WebKit/History.subproj/IFURIList.m
+++ b/WebKit/History.subproj/IFURIList.m
@@ -5,21 +5,21 @@
#import "IFURIList.h"
#import "WebKitReallyPrivate.h"
-struct WKURIListNode
+struct IFURIListNode
{
unsigned hash;
- WKURIEntry *entry;
- WKURIListNode *prev;
- WKURIListNode *next;
+ IFURIEntry *entry;
+ IFURIListNode *prev;
+ IFURIListNode *next;
};
-static WKURIListNode *newURIListNode(WKURIEntry *entry)
+static IFURIListNode *newURIListNode(IFURIEntry *entry)
{
- WKURIListNode *node;
+ IFURIListNode *node;
[entry retain];
- node = malloc(sizeof(WKURIListNode));
+ node = malloc(sizeof(IFURIListNode));
node->hash = [entry hash];
node->entry = entry;
node->prev = nil;
@@ -28,7 +28,7 @@ static WKURIListNode *newURIListNode(WKURIEntry *entry)
return node;
}
-static void freeNode(WKURIListNode *node)
+static void freeNode(IFURIListNode *node)
{
// it is important to autorelase here rather than using
// a straight release since we often return an entry
@@ -39,7 +39,7 @@ static void freeNode(WKURIListNode *node)
}
- at implementation WKURIList
+ at implementation IFURIList
-(id)init
{
@@ -58,8 +58,8 @@ static void freeNode(WKURIListNode *node)
-(void)dealloc
{
- WKURIListNode *curNode;
- WKURIListNode *delNode;
+ IFURIListNode *curNode;
+ IFURIListNode *delNode;
curNode = _head;
@@ -98,19 +98,19 @@ static void freeNode(WKURIListNode *node)
--(WKURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
{
- WKURIEntry *result;
+ IFURIEntry *result;
- result = [[WKURIEntry alloc] initWithURL:url title:title];
+ result = [[IFURIEntry alloc] initWithURL:url title:title];
[self addEntry:result];
return result;
}
--(void)addEntry:(WKURIEntry *)entry
+-(void)addEntry:(IFURIEntry *)entry
{
- WKURIListNode *node;
+ IFURIListNode *node;
unsigned hash;
if (!_allowsDuplicates) {
@@ -162,10 +162,10 @@ static void freeNode(WKURIListNode *node)
}
}
--(WKURIEntry *)removeURL:(NSURL *)url
+-(IFURIEntry *)removeURL:(NSURL *)url
{
- WKURIEntry *removedEntry;
- WKURIListNode *node;
+ IFURIEntry *removedEntry;
+ IFURIListNode *node;
unsigned hash;
removedEntry = nil;
@@ -199,10 +199,10 @@ static void freeNode(WKURIListNode *node)
return removedEntry;
}
--(BOOL)removeEntry:(WKURIEntry *)entry
+-(BOOL)removeEntry:(IFURIEntry *)entry
{
BOOL removed;
- WKURIListNode *node;
+ IFURIListNode *node;
unsigned hash;
removed = NO;
@@ -236,10 +236,10 @@ static void freeNode(WKURIListNode *node)
return removed;
}
--(WKURIEntry *)entryForURL:(NSURL *)url
+-(IFURIEntry *)entryForURL:(NSURL *)url
{
- WKURIEntry *foundEntry;
- WKURIListNode *node;
+ IFURIEntry *foundEntry;
+ IFURIListNode *node;
unsigned hash;
foundEntry = nil;
@@ -255,10 +255,10 @@ static void freeNode(WKURIListNode *node)
return foundEntry;
}
--(WKURIEntry *)entryAtIndex:(int)index
+-(IFURIEntry *)entryAtIndex:(int)index
{
int i;
- WKURIListNode *node;
+ IFURIListNode *node;
WEBKIT_ASSERT(index >= 0 && index < _count);
@@ -271,10 +271,10 @@ static void freeNode(WKURIListNode *node)
return node->entry;
}
--(WKURIEntry *)removeEntryAtIndex:(int)index
+-(IFURIEntry *)removeEntryAtIndex:(int)index
{
- WKURIEntry *removedEntry;
- WKURIListNode *node;
+ IFURIEntry *removedEntry;
+ IFURIListNode *node;
int i;
WEBKIT_ASSERT(index > 0 && index < _count);
@@ -310,8 +310,8 @@ static void freeNode(WKURIListNode *node)
-(void)removeEntriesToIndex:(int)index
{
- WKURIListNode *node;
- WKURIListNode *delNode;
+ IFURIListNode *node;
+ IFURIListNode *delNode;
int i;
WEBKIT_ASSERT(index > 0 && index < _count);
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index 1bb625f..cdbdea8 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -6,8 +6,8 @@
#import <WebKit/IFURIList.h>
#import <WebKit/IFURIEntry.h>
- at interface WKBackForwardList : NSObject {
- WKURIList *uriList;
+ at interface IFBackForwardList : NSObject {
+ IFURIList *uriList;
int index;
NSLock *mutex;
int state;
@@ -15,12 +15,12 @@
-(id)init;
--(void)addEntry:(WKURIEntry *)entry;
+-(void)addEntry:(IFURIEntry *)entry;
--(WKURIEntry *)back;
--(WKURIEntry *)forward;
+-(IFURIEntry *)back;
+-(IFURIEntry *)forward;
--(WKURIEntry *)currentEntry;
+-(IFURIEntry *)currentEntry;
-(NSArray *)backList;
-(NSArray *)forwardList;
@@ -35,22 +35,22 @@
//=============================================================================
//
-// WKBackForwardList.h
+// IFBackForwardList.h
//
// It provides the list that enables the "Back" and "Forward" buttons to
// work correctly. As such, it is merely a user convenience that aids in
// basic navigation in ways that users have come to expect.
//
- at interface WKBackForwardList
+ at interface IFBackForwardList
{
-(id)init;
--(void)addAttributedURL:(WKAttributedURL *)url;
+-(void)addAttributedURL:(IFAttributedURL *)url;
--(WKAttributedURL *)back;
--(WKAttributedURL *)forward;
+-(IFAttributedURL *)back;
+-(IFAttributedURL *)forward;
-(NSArray *)backList;
-(NSArray *)forwardList;
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 18599b7..4cfe2ee 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -8,7 +8,7 @@
#import "IFBackForwardList.h"
- at implementation WKBackForwardList
+ at implementation IFBackForwardList
-(id)init
{
@@ -17,7 +17,7 @@
return nil;
}
- uriList = [[WKURIList alloc] init];
+ uriList = [[IFURIList alloc] init];
[uriList setAllowsDuplicates:YES];
index = 0;
mutex = [[NSLock alloc] init];
@@ -33,7 +33,7 @@
[super dealloc];
}
--(void)addEntry:(WKURIEntry *)entry
+-(void)addEntry:(IFURIEntry *)entry
{
[mutex lock];
if (index > 0) {
@@ -44,9 +44,9 @@
[mutex unlock];
}
--(WKURIEntry *)back
+-(IFURIEntry *)back
{
- WKURIEntry *result;
+ IFURIEntry *result;
[mutex lock];
index++;
@@ -56,14 +56,14 @@
return result;
}
--(WKURIEntry *)currentEntry
+-(IFURIEntry *)currentEntry
{
return [uriList entryAtIndex:index];
}
--(WKURIEntry *)forward
+-(IFURIEntry *)forward
{
- WKURIEntry *result;
+ IFURIEntry *result;
[mutex lock];
index--;
@@ -119,7 +119,7 @@
result = [NSMutableString stringWithCapacity:512];
[result appendString:@"\n--------------------------------------------\n"];
- [result appendString:@"WKBackForwardList:\n"];
+ [result appendString:@"IFBackForwardList:\n"];
for (i = 0; i < [uriList count]; i++) {
if (i == index) {
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 2a6f274..2453cf7 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -10,8 +10,8 @@
#import <AppKit/AppKit.h>
//#import <WCURIEntry.h>
-//@interface WKURIEntry : NSObject <WCURIEntry>
- at interface WKURIEntry : NSObject
+//@interface IFURIEntry : NSObject <WCURIEntry>
+ at interface IFURIEntry : NSObject
{
NSURL *_url;
NSString *_title;
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index ea7bc9e..a46993a 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -16,11 +16,11 @@
id <WCURIEntry> WCCreateURIEntry(void)
{
- return [[WKURIEntry alloc] init];
+ return [[IFURIEntry alloc] init];
}
#endif
- at implementation WKURIEntry
+ at implementation IFURIEntry
-(id)init
{
@@ -149,8 +149,8 @@ id <WCURIEntry> WCCreateURIEntry(void)
result = NO;
- if ([anObject isMemberOfClass:[WKURIEntry class]]) {
- result = [_url isEqual:[((WKURIEntry *)anObject) url]];
+ if ([anObject isMemberOfClass:[IFURIEntry class]]) {
+ result = [_url isEqual:[((IFURIEntry *)anObject) url]];
}
return result;
@@ -158,7 +158,7 @@ id <WCURIEntry> WCCreateURIEntry(void)
-(NSString *)description
{
- return [NSString stringWithFormat:@"WKURIEntry %@", _url];
+ return [NSString stringWithFormat:@"IFURIEntry %@", _url];
}
@end
diff --git a/WebKit/History.subproj/WebHistoryList.h b/WebKit/History.subproj/WebHistoryList.h
index 1930b0b..2d13a27 100644
--- a/WebKit/History.subproj/WebHistoryList.h
+++ b/WebKit/History.subproj/WebHistoryList.h
@@ -6,12 +6,12 @@
#import "IFURIEntry.h"
-typedef struct WKURIListNode WKURIListNode;
+typedef struct IFURIListNode IFURIListNode;
- at interface WKURIList : NSObject
+ at interface IFURIList : NSObject
{
- WKURIListNode *_head;
- WKURIListNode *_tail;
+ IFURIListNode *_head;
+ IFURIListNode *_tail;
int _count;
BOOL _allowsDuplicates;
int _maximumSize;
@@ -27,14 +27,14 @@ typedef struct WKURIListNode WKURIListNode;
-(int)maximumSize;
-(void)setMaximumSize:(int)size;
--(WKURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
--(void)addEntry:(WKURIEntry *)entry;
--(WKURIEntry *)removeURL:(NSURL *)url;
--(BOOL)removeEntry:(WKURIEntry *)entry;
+-(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(void)addEntry:(IFURIEntry *)entry;
+-(IFURIEntry *)removeURL:(NSURL *)url;
+-(BOOL)removeEntry:(IFURIEntry *)entry;
--(WKURIEntry *)entryForURL:(NSURL *)url;
--(WKURIEntry *)entryAtIndex:(int)index;
--(WKURIEntry *)removeEntryAtIndex:(int)index;
+-(IFURIEntry *)entryForURL:(NSURL *)url;
+-(IFURIEntry *)entryAtIndex:(int)index;
+-(IFURIEntry *)removeEntryAtIndex:(int)index;
-(void)removeEntriesToIndex:(int)index;
@end
diff --git a/WebKit/History.subproj/WebHistoryList.m b/WebKit/History.subproj/WebHistoryList.m
index f8d34d9..57814e6 100644
--- a/WebKit/History.subproj/WebHistoryList.m
+++ b/WebKit/History.subproj/WebHistoryList.m
@@ -5,21 +5,21 @@
#import "IFURIList.h"
#import "WebKitReallyPrivate.h"
-struct WKURIListNode
+struct IFURIListNode
{
unsigned hash;
- WKURIEntry *entry;
- WKURIListNode *prev;
- WKURIListNode *next;
+ IFURIEntry *entry;
+ IFURIListNode *prev;
+ IFURIListNode *next;
};
-static WKURIListNode *newURIListNode(WKURIEntry *entry)
+static IFURIListNode *newURIListNode(IFURIEntry *entry)
{
- WKURIListNode *node;
+ IFURIListNode *node;
[entry retain];
- node = malloc(sizeof(WKURIListNode));
+ node = malloc(sizeof(IFURIListNode));
node->hash = [entry hash];
node->entry = entry;
node->prev = nil;
@@ -28,7 +28,7 @@ static WKURIListNode *newURIListNode(WKURIEntry *entry)
return node;
}
-static void freeNode(WKURIListNode *node)
+static void freeNode(IFURIListNode *node)
{
// it is important to autorelase here rather than using
// a straight release since we often return an entry
@@ -39,7 +39,7 @@ static void freeNode(WKURIListNode *node)
}
- at implementation WKURIList
+ at implementation IFURIList
-(id)init
{
@@ -58,8 +58,8 @@ static void freeNode(WKURIListNode *node)
-(void)dealloc
{
- WKURIListNode *curNode;
- WKURIListNode *delNode;
+ IFURIListNode *curNode;
+ IFURIListNode *delNode;
curNode = _head;
@@ -98,19 +98,19 @@ static void freeNode(WKURIListNode *node)
--(WKURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
{
- WKURIEntry *result;
+ IFURIEntry *result;
- result = [[WKURIEntry alloc] initWithURL:url title:title];
+ result = [[IFURIEntry alloc] initWithURL:url title:title];
[self addEntry:result];
return result;
}
--(void)addEntry:(WKURIEntry *)entry
+-(void)addEntry:(IFURIEntry *)entry
{
- WKURIListNode *node;
+ IFURIListNode *node;
unsigned hash;
if (!_allowsDuplicates) {
@@ -162,10 +162,10 @@ static void freeNode(WKURIListNode *node)
}
}
--(WKURIEntry *)removeURL:(NSURL *)url
+-(IFURIEntry *)removeURL:(NSURL *)url
{
- WKURIEntry *removedEntry;
- WKURIListNode *node;
+ IFURIEntry *removedEntry;
+ IFURIListNode *node;
unsigned hash;
removedEntry = nil;
@@ -199,10 +199,10 @@ static void freeNode(WKURIListNode *node)
return removedEntry;
}
--(BOOL)removeEntry:(WKURIEntry *)entry
+-(BOOL)removeEntry:(IFURIEntry *)entry
{
BOOL removed;
- WKURIListNode *node;
+ IFURIListNode *node;
unsigned hash;
removed = NO;
@@ -236,10 +236,10 @@ static void freeNode(WKURIListNode *node)
return removed;
}
--(WKURIEntry *)entryForURL:(NSURL *)url
+-(IFURIEntry *)entryForURL:(NSURL *)url
{
- WKURIEntry *foundEntry;
- WKURIListNode *node;
+ IFURIEntry *foundEntry;
+ IFURIListNode *node;
unsigned hash;
foundEntry = nil;
@@ -255,10 +255,10 @@ static void freeNode(WKURIListNode *node)
return foundEntry;
}
--(WKURIEntry *)entryAtIndex:(int)index
+-(IFURIEntry *)entryAtIndex:(int)index
{
int i;
- WKURIListNode *node;
+ IFURIListNode *node;
WEBKIT_ASSERT(index >= 0 && index < _count);
@@ -271,10 +271,10 @@ static void freeNode(WKURIListNode *node)
return node->entry;
}
--(WKURIEntry *)removeEntryAtIndex:(int)index
+-(IFURIEntry *)removeEntryAtIndex:(int)index
{
- WKURIEntry *removedEntry;
- WKURIListNode *node;
+ IFURIEntry *removedEntry;
+ IFURIListNode *node;
int i;
WEBKIT_ASSERT(index > 0 && index < _count);
@@ -310,8 +310,8 @@ static void freeNode(WKURIListNode *node)
-(void)removeEntriesToIndex:(int)index
{
- WKURIListNode *node;
- WKURIListNode *delNode;
+ IFURIListNode *node;
+ IFURIListNode *delNode;
int i;
WEBKIT_ASSERT(index > 0 && index < _count);
diff --git a/WebKit/Misc.subproj/IFException.h b/WebKit/Misc.subproj/IFException.h
index 60522ae..0a754cb 100644
--- a/WebKit/Misc.subproj/IFException.h
+++ b/WebKit/Misc.subproj/IFException.h
@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _WKEXCEPTION_H
-#define _WKEXCEPTION_H
+#ifndef _IFEXCEPTION_H
+#define _IFEXCEPTION_H
-extern NSString * const WKMethodNotYetImplemented;
-extern NSString * const WKRuntimeError;
+extern NSString * const IFMethodNotYetImplemented;
+extern NSString * const IFRuntimeError;
#endif
diff --git a/WebKit/Misc.subproj/IFException.m b/WebKit/Misc.subproj/IFException.m
index b2b54d4..e1cfd38 100644
--- a/WebKit/Misc.subproj/IFException.m
+++ b/WebKit/Misc.subproj/IFException.m
@@ -24,5 +24,5 @@
*/
#import <Cocoa/Cocoa.h>
-NSString * const WKMethodNotYetImplemented = @"WKMethodNotYetImplemented";
-NSString * const WKRuntimeError = @"WKRuntimeError";
+NSString * const IFMethodNotYetImplemented = @"IFMethodNotYetImplemented";
+NSString * const IFRuntimeError = @"IFRuntimeError";
diff --git a/WebKit/Misc.subproj/WebException.h b/WebKit/Misc.subproj/WebException.h
index 60522ae..0a754cb 100644
--- a/WebKit/Misc.subproj/WebException.h
+++ b/WebKit/Misc.subproj/WebException.h
@@ -22,10 +22,10 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _WKEXCEPTION_H
-#define _WKEXCEPTION_H
+#ifndef _IFEXCEPTION_H
+#define _IFEXCEPTION_H
-extern NSString * const WKMethodNotYetImplemented;
-extern NSString * const WKRuntimeError;
+extern NSString * const IFMethodNotYetImplemented;
+extern NSString * const IFRuntimeError;
#endif
diff --git a/WebKit/Misc.subproj/WebException.m b/WebKit/Misc.subproj/WebException.m
index b2b54d4..e1cfd38 100644
--- a/WebKit/Misc.subproj/WebException.m
+++ b/WebKit/Misc.subproj/WebException.m
@@ -24,5 +24,5 @@
*/
#import <Cocoa/Cocoa.h>
-NSString * const WKMethodNotYetImplemented = @"WKMethodNotYetImplemented";
-NSString * const WKRuntimeError = @"WKRuntimeError";
+NSString * const IFMethodNotYetImplemented = @"IFMethodNotYetImplemented";
+NSString * const IFRuntimeError = @"IFRuntimeError";
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 7862557..b8d0e0a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -80,10 +80,10 @@
};
0867D691FE84028FC02AAC07 = {
children = (
+ 394460AB020F75D90ECA1767,
9C7CABBB0190A37C0ECA16EA,
254DC334016E1D3F0ECA149E,
25A8176801B5474B0ECA149E,
- 2568C71E017490290ECA149E,
089C1665FE841158C02AAC07,
0867D69AFE84028FC02AAC07,
034768DFFF38A50411DB9C8B,
@@ -170,13 +170,7 @@
buildActionMask = 2147483647;
files = (
25C29827016E29620ECA149E,
- 2568C723017490290ECA149E,
- 2568C724017490290ECA149E,
2568C72D0174912D0ECA149E,
- 25BECC9A017E0A0D0ECA149E,
- 25BECC9B017E0A0D0ECA149E,
- 25BECC9D017E0A0D0ECA149E,
- 251E877A01A1EE570ECA149E,
25A5593301A5996D0ECA149E,
39446087020F50ED0ECA1767,
39446088020F50ED0ECA1767,
@@ -194,10 +188,12 @@
39446096020F50ED0ECA1767,
39446097020F50ED0ECA1767,
39446098020F50ED0ECA1767,
- 39446099020F50ED0ECA1767,
- 3944609A020F50ED0ECA1767,
- 3944609B020F50ED0ECA1767,
- 3944609C020F50ED0ECA1767,
+ 394460AE020F75D90ECA1767,
+ 394460B4020F77090ECA1767,
+ 394460B5020F77090ECA1767,
+ 394460BA020F788C0ECA1767,
+ 394460BD020F792B0ECA1767,
+ 394460C0020F793F0ECA1767,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@@ -215,11 +211,6 @@
0867D69FFE84028FC02AAC07 = {
buildActionMask = 2147483647;
files = (
- 2568C725017490290ECA149E,
- 2568C72A017490CF0ECA149E,
- 25BECC9E017E0A0D0ECA149E,
- 25BECC9F017E0A0D0ECA149E,
- 251E877B01A1EE570ECA149E,
25A5593401A5996D0ECA149E,
3944609D020F50ED0ECA1767,
3944609E020F50ED0ECA1767,
@@ -233,6 +224,11 @@
394460A8020F50ED0ECA1767,
394460A9020F50ED0ECA1767,
394460AA020F50ED0ECA1767,
+ 394460AF020F75D90ECA1767,
+ 394460B6020F77090ECA1767,
+ 394460B7020F77090ECA1767,
+ 394460BB020F788C0ECA1767,
+ 394460C1020F793F0ECA1767,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -344,119 +340,21 @@
//252
//253
//254
- 251E877801A1EE570ECA149E = {
- isa = PBXFileReference;
- path = _NSURICacheQueue.h;
- refType = 4;
- };
- 251E877901A1EE570ECA149E = {
- isa = PBXFileReference;
- path = _NSURICacheQueue.m;
- refType = 4;
- };
- 251E877A01A1EE570ECA149E = {
- fileRef = 251E877801A1EE570ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 251E877B01A1EE570ECA149E = {
- fileRef = 251E877901A1EE570ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
254DC334016E1D3F0ECA149E = {
children = (
3944607A020F50ED0ECA1767,
3944607B020F50ED0ECA1767,
2568C72C0174912D0ECA149E,
25C29825016E29620ECA149E,
- 2568C729017490CF0ECA149E,
- 2568C72B017491070ECA149E,
25A5593101A5996D0ECA149E,
25A5593201A5996D0ECA149E,
+ 394460B8020F788C0ECA1767,
+ 394460B9020F788C0ECA1767,
);
isa = PBXGroup;
name = Misc;
refType = 4;
};
- 2568C71E017490290ECA149E = {
- children = (
- 39446083020F50ED0ECA1767,
- 39446084020F50ED0ECA1767,
- 39446085020F50ED0ECA1767,
- 39446086020F50ED0ECA1767,
- 25BECC93017E0A0D0ECA149E,
- 25BECC94017E0A0D0ECA149E,
- 25BECC95017E0A0D0ECA149E,
- 25BECC96017E0A0D0ECA149E,
- 25BECC99017E0A0D0ECA149E,
- 2568C722017490290ECA149E,
- 2568C720017490290ECA149E,
- 2568C71F017490290ECA149E,
- 251E877801A1EE570ECA149E,
- 251E877901A1EE570ECA149E,
- );
- isa = PBXGroup;
- name = Cache;
- path = Cache.subproj;
- refType = 4;
- };
- 2568C71F017490290ECA149E = {
- isa = PBXFileReference;
- path = NSURILoad.h;
- refType = 4;
- };
- 2568C720017490290ECA149E = {
- isa = PBXFileReference;
- path = NSURILoad.m;
- refType = 4;
- };
- 2568C722017490290ECA149E = {
- isa = PBXFileReference;
- path = NSURILoadReallyPrivate.h;
- refType = 4;
- };
- 2568C723017490290ECA149E = {
- fileRef = 2568C71F017490290ECA149E;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Private,
- );
- };
- };
- 2568C724017490290ECA149E = {
- fileRef = 2568C722017490290ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 2568C725017490290ECA149E = {
- fileRef = 2568C720017490290ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 2568C729017490CF0ECA149E = {
- isa = PBXFileReference;
- name = _NSMonitor.m;
- path = Misc.subproj/_NSMonitor.m;
- refType = 4;
- };
- 2568C72A017490CF0ECA149E = {
- fileRef = 2568C729017490CF0ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 2568C72B017491070ECA149E = {
- isa = PBXFileReference;
- name = _NSMonitor.h;
- path = Misc.subproj/_NSMonitor.h;
- refType = 4;
- };
2568C72C0174912D0ECA149E = {
isa = PBXFileReference;
name = WebKit.h;
@@ -514,61 +412,6 @@
path = History.subproj;
refType = 4;
};
- 25BECC93017E0A0D0ECA149E = {
- isa = PBXFileReference;
- path = NSURICache.h;
- refType = 4;
- };
- 25BECC94017E0A0D0ECA149E = {
- isa = PBXFileReference;
- path = NSURICache.m;
- refType = 4;
- };
- 25BECC95017E0A0D0ECA149E = {
- isa = PBXFileReference;
- path = NSURICacheData.h;
- refType = 4;
- };
- 25BECC96017E0A0D0ECA149E = {
- isa = PBXFileReference;
- path = NSURICacheData.m;
- refType = 4;
- };
- 25BECC99017E0A0D0ECA149E = {
- isa = PBXFileReference;
- path = NSURILoadReallyPrivate.h;
- refType = 4;
- };
- 25BECC9A017E0A0D0ECA149E = {
- fileRef = 25BECC93017E0A0D0ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 25BECC9B017E0A0D0ECA149E = {
- fileRef = 25BECC95017E0A0D0ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 25BECC9D017E0A0D0ECA149E = {
- fileRef = 25BECC99017E0A0D0ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 25BECC9E017E0A0D0ECA149E = {
- fileRef = 25BECC94017E0A0D0ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 25BECC9F017E0A0D0ECA149E = {
- fileRef = 25BECC96017E0A0D0ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
25C29825016E29620ECA149E = {
isa = PBXFileReference;
name = WebKitReallyPrivate.h;
@@ -873,26 +716,6 @@
path = IFURIList.m;
refType = 4;
};
- 39446083020F50ED0ECA1767 = {
- isa = PBXFileReference;
- path = IFLoadChunk.h;
- refType = 4;
- };
- 39446084020F50ED0ECA1767 = {
- isa = PBXFileReference;
- path = IFWebCache.h;
- refType = 4;
- };
- 39446085020F50ED0ECA1767 = {
- isa = PBXFileReference;
- path = IFWebCacheClient.h;
- refType = 4;
- };
- 39446086020F50ED0ECA1767 = {
- isa = PBXFileReference;
- path = IFWebContentType.h;
- refType = 4;
- };
39446087020F50ED0ECA1767 = {
fileRef = 39446063020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1019,30 +842,6 @@
);
};
};
- 39446099020F50ED0ECA1767 = {
- fileRef = 39446083020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 3944609A020F50ED0ECA1767 = {
- fileRef = 39446084020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 3944609B020F50ED0ECA1767 = {
- fileRef = 39446085020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 3944609C020F50ED0ECA1767 = {
- fileRef = 39446086020F50ED0ECA1767;
- isa = PBXBuildFile;
- settings = {
- };
- };
3944609D020F50ED0ECA1767 = {
fileRef = 39446064020F50ED0ECA1767;
isa = PBXBuildFile;
@@ -1115,6 +914,155 @@
settings = {
};
};
+ 394460AB020F75D90ECA1767 = {
+ children = (
+ 394460AC020F75D90ECA1767,
+ 394460AD020F75D90ECA1767,
+ 394460B0020F77090ECA1767,
+ 394460B1020F77090ECA1767,
+ 394460B2020F77090ECA1767,
+ 394460B3020F77090ECA1767,
+ 394460BC020F792B0ECA1767,
+ 394460BE020F793F0ECA1767,
+ 394460BF020F793F0ECA1767,
+ );
+ isa = PBXGroup;
+ name = Cache;
+ path = "";
+ refType = 4;
+ };
+ 394460AC020F75D90ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURICache.h;
+ path = Cache.subproj/NSURICache.h;
+ refType = 4;
+ };
+ 394460AD020F75D90ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURICache.m;
+ path = Cache.subproj/NSURICache.m;
+ refType = 4;
+ };
+ 394460AE020F75D90ECA1767 = {
+ fileRef = 394460AC020F75D90ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460AF020F75D90ECA1767 = {
+ fileRef = 394460AD020F75D90ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460B0020F77090ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURICacheData.h;
+ path = Cache.subproj/NSURICacheData.h;
+ refType = 4;
+ };
+ 394460B1020F77090ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURICacheData.m;
+ path = Cache.subproj/NSURICacheData.m;
+ refType = 4;
+ };
+ 394460B2020F77090ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURILoad.h;
+ path = Cache.subproj/NSURILoad.h;
+ refType = 4;
+ };
+ 394460B3020F77090ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURILoad.m;
+ path = Cache.subproj/NSURILoad.m;
+ refType = 4;
+ };
+ 394460B4020F77090ECA1767 = {
+ fileRef = 394460B0020F77090ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460B5020F77090ECA1767 = {
+ fileRef = 394460B2020F77090ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460B6020F77090ECA1767 = {
+ fileRef = 394460B1020F77090ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460B7020F77090ECA1767 = {
+ fileRef = 394460B3020F77090ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460B8020F788C0ECA1767 = {
+ isa = PBXFileReference;
+ name = _NSMonitor.h;
+ path = Misc.subproj/_NSMonitor.h;
+ refType = 4;
+ };
+ 394460B9020F788C0ECA1767 = {
+ isa = PBXFileReference;
+ name = _NSMonitor.m;
+ path = Misc.subproj/_NSMonitor.m;
+ refType = 4;
+ };
+ 394460BA020F788C0ECA1767 = {
+ fileRef = 394460B8020F788C0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460BB020F788C0ECA1767 = {
+ fileRef = 394460B9020F788C0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460BC020F792B0ECA1767 = {
+ isa = PBXFileReference;
+ name = NSURILoadReallyPrivate.h;
+ path = Cache.subproj/NSURILoadReallyPrivate.h;
+ refType = 4;
+ };
+ 394460BD020F792B0ECA1767 = {
+ fileRef = 394460BC020F792B0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460BE020F793F0ECA1767 = {
+ isa = PBXFileReference;
+ name = _NSURICacheQueue.h;
+ path = Cache.subproj/_NSURICacheQueue.h;
+ refType = 4;
+ };
+ 394460BF020F793F0ECA1767 = {
+ isa = PBXFileReference;
+ name = _NSURICacheQueue.m;
+ path = Cache.subproj/_NSURICacheQueue.m;
+ refType = 4;
+ };
+ 394460C0020F793F0ECA1767 = {
+ fileRef = 394460BE020F793F0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 394460C1020F793F0ECA1767 = {
+ fileRef = 394460BF020F793F0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
//390
//391
//392
diff --git a/WebKit/WebView.subproj/IFBaseWebController.h b/WebKit/WebView.subproj/IFBaseWebController.h
index 1120275..011e7f0 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.h
+++ b/WebKit/WebView.subproj/IFBaseWebController.h
@@ -1,5 +1,5 @@
/*
- IFDefaultWebController.mm
+ IFBaseWebController.mm
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
#import <WebKit/IFWebController.h>
@@ -8,7 +8,7 @@
/*
*/
- at interface WKDefaultWebController : NSObject <WKWebController>
+ at interface IFBaseWebController : NSObject <IFWebController>
{
@private
id _controllerPrivate;
@@ -17,24 +17,24 @@
- init;
-- initWithView: (WKWebView *)view dataSource: (WKWebDataSource *)dataSource;
+- initWithView: (IFWebView *)view dataSource: (IFWebDataSource *)dataSource;
- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag;
- (BOOL)directsAllLinksToSystemBrowser;
// Sets the mainView and the mainDataSource.
-- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource;
+- (void)setView: (IFWebView *)view andDataSource: (IFWebDataSource *)dataSource;
// Find the view for the specified data source.
-- (WKWebView *)viewForDataSource: (WKWebDataSource *)dataSource;
+- (IFWebView *)viewForDataSource: (IFWebDataSource *)dataSource;
// Find the data source for the specified view.
-- (WKWebDataSource *)dataSourceForView: (WKWebView *)view;
+- (IFWebDataSource *)dataSourceForView: (IFWebView *)view;
-- (void)setMainView: (WKWebView *)view;
-- (WKWebView *)mainView;
+- (void)setMainView: (IFWebView *)view;
+- (IFWebView *)mainView;
-- (void)setMainDataSource: (WKWebDataSource *)dataSource;
-- (WKWebDataSource *)mainDataSource;
+- (void)setMainDataSource: (IFWebDataSource *)dataSource;
+- (IFWebDataSource *)mainDataSource;
@end
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index d763bda..a4b9585 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -1,5 +1,5 @@
/*
- IFDefaultWebController.mm
+ IFBaseWebController.mm
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
#import <WebKit/IFBaseWebController.h>
@@ -10,9 +10,9 @@
#import <WebKit/IFException.h>
-// WKObjectHolder holds objects as keys in dictionaries without
+// IFObjectHolder holds objects as keys in dictionaries without
// copying.
- at interface WKObjectHolder : NSObject
+ at interface IFObjectHolder : NSObject
{
id object;
}
@@ -24,11 +24,11 @@
@end
- at implementation WKObjectHolder
+ at implementation IFObjectHolder
+ holderWithObject: o
{
- return [[[WKObjectHolder alloc] initWithObject: o] autorelease];
+ return [[[IFObjectHolder alloc] initWithObject: o] autorelease];
}
- initWithObject: o
@@ -66,20 +66,20 @@
@end
- at implementation WKDefaultWebController
+ at implementation IFBaseWebController
- init
{
[super init];
- _controllerPrivate = [[WKDefaultWebControllerPrivate alloc] init];
+ _controllerPrivate = [[IFBaseWebControllerPrivate alloc] init];
return self;
}
-- initWithView: (WKWebView *)view dataSource: (WKWebDataSource *)dataSource
+- initWithView: (IFWebView *)view dataSource: (IFWebDataSource *)dataSource
{
[super init];
- _controllerPrivate = [[WKDefaultWebControllerPrivate alloc] init];
+ _controllerPrivate = [[IFBaseWebControllerPrivate alloc] init];
[self setView: view andDataSource: dataSource];
return self;
}
@@ -92,21 +92,21 @@
- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
}
- (BOOL)directsAllLinksToSystemBrowser
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::directsAllLinksToSystemBrowser is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::directsAllLinksToSystemBrowser is not implemented"];
return NO;
}
-- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource
+- (void)setView: (IFWebView *)view andDataSource: (IFWebDataSource *)dataSource
{
- // FIXME: this needs to be implemented in terms of WKWebFrame.
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ // FIXME: this needs to be implemented in terms of IFWebFrame.
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
[data->viewMap autorelease];
data->viewMap = [[NSMutableDictionary alloc] init];
@@ -123,35 +123,35 @@
[dataSource _setController: self];
if (dataSource != nil && view != nil){
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
+ [data->viewMap setObject: view forKey: [IFObjectHolder holderWithObject:dataSource]];
- [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
+ [data->dataSourceMap setObject: dataSource forKey: [IFObjectHolder holderWithObject:view]];
}
if (dataSource != nil)
[view dataSourceChanged];
}
-- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)childDataSource inParent: (WKWebDataSource *)parentDataSource
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)childDataSource inParent: (IFWebDataSource *)parentDataSource
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- WKWebView *childView;
- WKWebFrame *newFrame;
- //WKDynamicScrollBarsView *scrollView;
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
+ IFWebView *childView;
+ IFWebFrame *newFrame;
+ //IFDynamicScrollBarsView *scrollView;
- childView = [[WKWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
+ childView = [[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
- newFrame = [[[WKWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
+ newFrame = [[[IFWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
[parentDataSource addFrame: newFrame];
- [data->viewMap setObject: childView forKey: [WKObjectHolder holderWithObject:childDataSource]];
+ [data->viewMap setObject: childView forKey: [IFObjectHolder holderWithObject:childDataSource]];
[childView _setController: self];
- [data->dataSourceMap setObject: childDataSource forKey: [WKObjectHolder holderWithObject:childView]];
+ [data->dataSourceMap setObject: childDataSource forKey: [IFObjectHolder holderWithObject:childView]];
[childDataSource _setController: self];
- //scrollView = [[[WKDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
+ //scrollView = [[[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
//[childView _setFrameScrollView: scrollView];
[childView dataSourceChanged];
@@ -160,42 +160,42 @@
}
-- (WKWebView *)viewForDataSource: (WKWebDataSource *)dataSource
+- (IFWebView *)viewForDataSource: (IFWebDataSource *)dataSource
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return [data->viewMap objectForKey: [WKObjectHolder holderWithObject:dataSource]];
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
+ return [data->viewMap objectForKey: [IFObjectHolder holderWithObject:dataSource]];
}
-- (WKWebDataSource *)dataSourceForView: (WKWebView *)view
+- (IFWebDataSource *)dataSourceForView: (IFWebView *)view
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return [data->dataSourceMap objectForKey: [WKObjectHolder holderWithObject:view]];
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
+ return [data->dataSourceMap objectForKey: [IFObjectHolder holderWithObject:view]];
}
-- (void)setMainView: (WKWebView *)m;
+- (void)setMainView: (IFWebView *)m;
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
[self setView: m andDataSource: data->mainDataSource];
}
-- (WKWebView *)mainView
+- (IFWebView *)mainView
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
return data->mainView;
}
-- (void)setMainDataSource: (WKWebDataSource *)dataSource;
+- (void)setMainDataSource: (IFWebDataSource *)dataSource;
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
[self setView: data->mainView andDataSource: dataSource];
}
-- (WKWebDataSource *)mainDataSource
+- (IFWebDataSource *)mainDataSource
{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
+ IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
return data->mainDataSource;
}
@@ -204,86 +204,86 @@
// ---------------------------------------------------------------------
-// WKScriptContextHandler
+// IFScriptContextHandler
// ---------------------------------------------------------------------
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource
+- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::setStatusText:forDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::setStatusText:forDataSource: is not implemented"];
}
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource
+- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::statusTextForDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::statusTextForDataSource: is not implemented"];
return nil;
}
// ---------------------------------------------------------------------
-// WKAuthenticationHandler
+// IFAuthenticationHandler
// ---------------------------------------------------------------------
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::authenticate: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::authenticate: is not implemented"];
return nil;
}
// ---------------------------------------------------------------------
-// WKLoadHandler
+// IFLoadHandler
// ---------------------------------------------------------------------
-- (void)receivedProgress: (WKLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (WKWebDataSource *)dataSource
+- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedProgress:forResource:fromDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::receivedProgress:forResource:fromDataSource: is not implemented"];
}
-- (void)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource
+- (void)receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedError:forResource:partialProgress:fromDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::receivedError:forResource:partialProgress:fromDataSource: is not implemented"];
}
// ---------------------------------------------------------------------
-// WKLocationChangeHandler
+// IFLocationChangeHandler
// ---------------------------------------------------------------------
- (BOOL)locationWillChangeTo: (NSURL *)url
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationWillChangeTo: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::locationWillChangeTo: is not implemented"];
return NO;
}
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource
+- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationWillChangeTo: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::locationWillChangeTo: is not implemented"];
}
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource
+- (void)locationChangeInProgressForDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationChangeInProgressForDataSource:forDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::locationChangeInProgressForDataSource:forDataSource: is not implemented"];
}
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource
{
- WKWebView *view;
+ IFWebView *view;
view = [self viewForDataSource: dataSource];
[view setNeedsLayout: YES];
[view setNeedsDisplay: YES];
}
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource
+- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedPageTitle:forDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::receivedPageTitle:forDataSource: is not implemented"];
}
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::serverRedirectTo:forDataSource: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFBaseWebController::serverRedirectTo:forDataSource: is not implemented"];
}
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h
index f92722d..4074591 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h
@@ -7,10 +7,10 @@
#import <WebKit/IFWebView.h>
- at interface WKDefaultWebControllerPrivate : NSObject
+ at interface IFBaseWebControllerPrivate : NSObject
{
- WKWebView *mainView;
- WKWebDataSource *mainDataSource;
+ IFWebView *mainView;
+ IFWebDataSource *mainDataSource;
NSMutableDictionary *viewMap;
NSMutableDictionary *dataSourceMap;
}
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index c71d7eb..15b0f9a 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -7,7 +7,7 @@
#import <WebKit/IFWebView.h>
- at implementation WKDefaultWebControllerPrivate
+ at implementation IFBaseWebControllerPrivate
- init
{
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
index 8219286..49e2a03 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
- at interface WKDynamicScrollBarsView : NSScrollView {
+ at interface IFDynamicScrollBarsView : NSScrollView {
}
@end
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
index 990cec8..9306f73 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -8,7 +8,7 @@
#import <WebKit/IFDynamicScrollBarsView.h>
- at implementation WKDynamicScrollBarsView
+ at implementation IFDynamicScrollBarsView
// make the horizontal and vertical scroll bars come and go as needed
- (void) reflectScrolledClipView: (NSClipView*)clipView
diff --git a/WebKit/WebView.subproj/IFGrabBag.h b/WebKit/WebView.subproj/IFGrabBag.h
index 816b562..6f13d97 100644
--- a/WebKit/WebView.subproj/IFGrabBag.h
+++ b/WebKit/WebView.subproj/IFGrabBag.h
@@ -13,11 +13,11 @@
/*
=============================================================================
*/
- at protocol WKContextMenuHandler
+ at protocol IFContextMenuHandler
// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WKWebView defaultContextMenuItemsForNode:
+// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
+- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
@end
diff --git a/WebKit/WebView.subproj/IFPreferences.h b/WebKit/WebView.subproj/IFPreferences.h
index 12ef448..bbdac0d 100644
--- a/WebKit/WebView.subproj/IFPreferences.h
+++ b/WebKit/WebView.subproj/IFPreferences.h
@@ -16,7 +16,7 @@
This class provides a cover for URL-based preference items.
*/
- at interface WKPreferences
+ at interface IFPreferences
+ getPreferencesForURL: (NSURL *)url;
// Encoding that will be used in none specified on page? or in header?
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 0c7eacb..f962137 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -10,112 +10,112 @@
/*
=============================================================================
- WKWebController manages the interaction between WKWebView(s) and WKWebDataSource(s).
+ IFWebController manages the interaction between IFWebView(s) and IFWebDataSource(s).
- The WKWebController implements required behavior. WKWebView and WKWebDataSource
+ The IFWebController implements required behavior. IFWebView and IFWebDataSource
cannot function without a controller.
- It it expected that alternate implementations of WKWebController will be written for
- alternate views of the web pages described by WKWebDataSources. For example, a web
- crawler may implement a WKWebController with no corresponding view.
+ It it expected that alternate implementations of IFWebController will be written for
+ alternate views of the web pages described by IFWebDataSources. For example, a web
+ crawler may implement a IFWebController with no corresponding view.
- WKDefaultWebController may be subclassed to modify the behavior of the standard
- WKWebView and WKWebDataSource.
+ IFDefaultWebController may be subclassed to modify the behavior of the standard
+ IFWebView and IFWebDataSource.
=============================================================================
Changes:
2001-12-12
- Changed WKConcreteWebController to WKDefaultWebController.
+ Changed IFConcreteWebController to IFDefaultWebController.
- Changed WKLocationChangedHandler naming, replace "loadingXXX" with
+ Changed IFLocationChangedHandler naming, replace "loadingXXX" with
"locationChangeXXX".
- Changed loadingStopped in WKLocationChangedHandler to locationChangeStopped:(WKError *).
+ Changed loadingStopped in IFLocationChangedHandler to locationChangeStopped:(IFError *).
- Changed loadingCancelled in WKLocationChangedHandler to locationChangeCancelled:(WKError *).
+ Changed loadingCancelled in IFLocationChangedHandler to locationChangeCancelled:(IFError *).
- Changed loadedPageTitle in WKLocationChangedHandler to receivedPageTitle:.
+ Changed loadedPageTitle in IFLocationChangedHandler to receivedPageTitle:.
- Added inputURL:(NSURL *) resolvedTo: (NSURL *) to WKLocationChangedHandler.
+ Added inputURL:(NSURL *) resolvedTo: (NSURL *) to IFLocationChangedHandler.
- Added the following two methods to WKLocationChangedHandler:
+ Added the following two methods to IFLocationChangedHandler:
- (void)inputURL: (NSURL *)inputURL resolvedTo: (NSURL *)resolvedURL;
- (void)serverRedirectTo: (NSURL *)url;
- Put locationWillChangeTo: back on WKLocationChangedHandler.
+ Put locationWillChangeTo: back on IFLocationChangedHandler.
- Changed XXXforLocation in WKLoadHandler to XXXforResource.
+ Changed XXXforLocation in IFLoadHandler to XXXforResource.
- Changed timeoutForLocation: in WKLoadHandler to receivedError:forResource:partialProgress:
+ Changed timeoutForLocation: in IFLoadHandler to receivedError:forResource:partialProgress:
- Added the following two methods to WKDefaultWebController:
+ Added the following two methods to IFDefaultWebController:
- setDirectsAllLinksToSystemBrowser: (BOOL)flag
- (BOOL)directsAllLinksToSystemBrowser;
- Removed WKError. This will be described in WKError.h.
+ Removed IFError. This will be described in IFError.h.
2001-12-13
- Removed WKFrameSetHandler, placed that functionality on WKWebDataSource.
+ Removed IFFrameSetHandler, placed that functionality on IFWebDataSource.
- Changed WKLocationChangeHandler to add a parameter specifying the data source
+ Changed IFLocationChangeHandler to add a parameter specifying the data source
that sent the message.
2001-12-14
Removed inputURL:resolvedTo: methods, per discussion with Don.
- Remove WKContextMenuHandler for want of a better way to describe the
- not-yet-existing WKDOMNode. We can't think of any initial clients that want
- to override the default behavior anyway. Put it in WKGrabBag.h for now.
+ Remove IFContextMenuHandler for want of a better way to describe the
+ not-yet-existing IFDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in IFGrabBag.h for now.
- Simplified WKLocationChangeHandler and updated
- WKAuthenticationHandler to use interfaces instead of structs..
+ Simplified IFLocationChangeHandler and updated
+ IFAuthenticationHandler to use interfaces instead of structs..
*/
- at class WKWebDataSource;
- at class WKError;
- at class WKWebView;
- at class WKWebFrame;
+ at class IFWebDataSource;
+ at class IFError;
+ at class IFWebView;
+ at class IFWebFrame;
#ifdef TENTATIVE_API
/*
=============================================================================
- WKWebViewDelegates implement protocols that modify the behavior of
- WKWebViews. A WKWebView does not require a delegate.
+ IFWebViewDelegates implement protocols that modify the behavior of
+ IFWebViews. A IFWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <?>
+ at protocol IFWebViewDelegate <?>
@end
/*
=============================================================================
- WKWebDataSourceDelegate implement protocols that modify the behavior of
- WKWebDataSources. A WKWebDataSources does not require a delegate.
+ IFWebDataSourceDelegate implement protocols that modify the behavior of
+ IFWebDataSources. A IFWebDataSources does not require a delegate.
*/
- at protocol WKWebDataSourceDelegate <?>
+ at protocol IFWebDataSourceDelegate <?>
@end
/*
=============================================================================
- See the comments in WKWebPageView above for more description about this protocol.
+ See the comments in IFWebPageView above for more description about this protocol.
*/
- at protocol WKLocationChangeHandler
+ at protocol IFLocationChangeHandler
- (BOOL)locationWillChangeTo: (NSURL *)url;
- (void)locationChangeStarted;
- (void)locationChangeInProgress;
-- (void)locationChangeDone: (WKError *)error;
+- (void)locationChangeDone: (IFError *)error;
- (void)receivedPageTitle: (NSString *)title;
@@ -128,11 +128,11 @@
/*
=============================================================================
- A frame-aware version of the the WKLocationChangeHandler
+ A frame-aware version of the the IFLocationChangeHandler
- See the comments in WKWebPageView above for more description about this protocol.
+ See the comments in IFWebPageView above for more description about this protocol.
*/
- at protocol WKLocationChangeHandler
+ at protocol IFLocationChangeHandler
// locationWillChangeTo: is required, but will it be sent by the dataSource? More
// likely the controller will receive a change request from the view. That argues for
@@ -140,13 +140,13 @@
// handshake.
- (BOOL)locationWillChangeTo: (NSURL *)url;
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeInProgressForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
@end
@@ -154,16 +154,16 @@
/*
=============================================================================
- A WKLoadProgress capture the state associated with a load progress
+ A IFLoadProgress capture the state associated with a load progress
indication. Should we use a struct?
*/
- at interface WKLoadProgress
+ at interface IFLoadProgress
{
int bytesSoFar; // 0 if this is the start of load
int totalToLoad; // -1 if this is not known.
// bytesSoFar == totalLoaded when complete
#ifdef TENTATIVE_API
- WK_LOAD_TYPES type; // load types, either image, css, jscript, or html
+ IF_LOAD_TYPES type; // load types, either image, css, jscript, or html
#endif
}
@end
@@ -178,7 +178,7 @@
The methods in this protocol will be called even if the data source
is initialized with something other than a URL.
*/
- at protocol WKLoadHandler
+ at protocol IFLoadHandler
/*
A new chunk of data has been received. This could be a partial load
@@ -186,9 +186,9 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (WKLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
@end
@@ -199,7 +199,7 @@
*/
- at interface WKSimpleAuthenticationResult
+ at interface IFSimpleAuthenticationResult
{
NSString *username;
NSString *password;
@@ -209,7 +209,7 @@
}
@end
- at interface WKSimpleAuthenticationRequest
+ at interface IFSimpleAuthenticationRequest
{
NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
@@ -225,10 +225,10 @@
@end
- at protocol WKAuthenticationHandler
+ at protocol IFAuthenticationHandler
// Can we make this work without blocking the UI, or do we need to make it explicitly async
// somehow?
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request;
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request;
// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
@@ -240,23 +240,23 @@
=============================================================================
*/
- at protocol WKWebDataSourceErrorHandler
-- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at protocol IFWebDataSourceErrorHandler
+- receivedError: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
/*
=============================================================================
- A class that implements WKScriptContextHandler provides all the state information
+ A class that implements IFScriptContextHandler provides all the state information
that may be used by Javascript (AppleScript?).
*/
- at protocol WKScriptContextHandler
+ at protocol IFScriptContextHandler
// setStatusText and statusText are used by Javascript's status bar text methods.
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource;
+- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
+- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
// Need API for things like window size and position, window ids,
// screen goemetry. Essentially all the 'view' items that are
@@ -271,20 +271,20 @@
/*
=============================================================================
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
+ IFWebController implements all the behavior that ties together IFWebView
+ and IFWebDataSource. See each inherited protocol for a more complete
description.
[Don and I both agree that all these little protocols are useful to cleanly
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at protocol IFWebController <IFLoadHandler, IFScriptContextHandler, IFAuthenticationHandler, IFLocationChangeHandler>
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializaing a view of the appropriate class.
-- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent;
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 850b3ea..e90f08a 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -12,15 +12,15 @@
/*
=============================================================================
- A WKWebDataSource represents all the state associated
+ A IFWebDataSource represents all the state associated
with a web page. It is typicallly initialized with a URL, but
may also be initialized with an NSString or NSData that hold
HTML (?also other, i.e. image data?) content.
- Typical usage of a WKWebDataSource.
+ Typical usage of a IFWebDataSource.
- WKWebDataSource *dataSource = [[WKWebDataSource alloc] initWithURL: url];
- id <WKWebController>myController = [[MyControllerClass alloc] init];
+ IFWebDataSource *dataSource = [[IFWebDataSource alloc] initWithURL: url];
+ id <IFWebController>myController = [[MyControllerClass alloc] init];
[myController setDataSource: dataSource];
Changes:
@@ -41,14 +41,14 @@
Changed return type of baseTarget to (NSString *)
Added the following two methods:
- - (WKDataSource *)parent;
+ - (IFDataSource *)parent;
- (NSArry *)children;
- (BOOL)isMainDocument;
Added the following methods:
- (NSArray *)frameNames;
- - (WKWebDataSource) findDataSourceForFrameNamed: (NSString *)name;
+ - (IFWebDataSource) findDataSourceForFrameNamed: (NSString *)name;
- (BOOL)frameExists: (NSString *)name;
- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName;
- (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier;
@@ -58,9 +58,9 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
- Moved search API to WKWebView.
+ Moved search API to IFWebView.
- Moved WKPreferences to a new file, WKPreferences.h. We are still discussing
+ Moved IFPreferences to a new file, IFPreferences.h. We are still discussing
this item and it will not make it into the white paper.
Minor naming changes.
@@ -68,12 +68,12 @@
============================================================================= */
#ifdef TENTATIVE_API
- at class WKLoader;
+ at class IFLoader;
#endif
- at interface WKWebDataSource : NSObject
+ at interface IFWebDataSource : NSObject
{
@private
id _dataSourcePrivate;
@@ -86,7 +86,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
- initWithString: (NSString *)string;
-- initWithLoader: (WKLoader *)loader;
+- initWithLoader: (IFLoader *)loader;
#endif
// Returns YES if this is the main document. The main document is the 'top'
@@ -96,22 +96,22 @@
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
-- (WKWebDataSource *)parent;
+- (IFWebDataSource *)parent;
// Add a child frame. This should only be called by the data source's controller
// as a result of a createFrame:inParent:.
// [Should this be private?]
-- (void)addFrame: (WKWebFrame *)frame;
+- (void)addFrame: (IFWebFrame *)frame;
-// Returns an array of WKWebFrame. The data sources in the array are
+// Returns an array of IFWebFrame. The data sources in the array are
// the data source assoicated with a frame set or iframe. If the main document
// is not a frameset, or has not iframes children will return nil.
- (NSArray *)children;
-- (WKWebFrame *)frameNamed: (NSString *)frameName;
+- (IFWebFrame *)frameNamed: (NSString *)frameName;
// Returns an array of NSStrings or nil. The NSStrings corresponds to
// frame names. If this data source is the main document and has no
@@ -120,7 +120,7 @@
// findDataSourceForFrameNamed: returns the child data source associated with
// the frame named 'name', or nil.
-- (WKWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
+- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
- (BOOL)frameExists: (NSString *)name;
@@ -135,9 +135,9 @@
// Set the controller for this data source. NOTE: The controller is not retained by the
// data source. Perhaps setController: should be private? Perhaps the back pointers
// can be managed externally, i.e. + controllerForDataSource: as a class method on
-// WKDefaultWebController?
-//- (void)setController: (id <WKWebController>)controller;
-- (id <WKWebController>)controller;
+// IFDefaultWebController?
+//- (void)setController: (id <IFWebController>)controller;
+- (id <IFWebController>)controller;
// May return nil if not initialized with a URL.
@@ -146,7 +146,7 @@
// finalURL returns the URL that was actually used. The final URL
// may be different than the inputURL if the server redirects.
-// <WKLocationChangedHandler> includes a message that is sent when
+// <IFLocationChangedHandler> includes a message that is sent when
// a redirect is processed
- (NSURL *)finalURL;
@@ -174,7 +174,7 @@
#ifdef TENTATIVE_API
// Get DOM access to the document.
-- (WKDOMDocument *)document;
+- (IFDOMDocument *)document;
#endif
// Get the source of the document by reconstructing it from the DOM.
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 64d1fe5..40118ac 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -9,7 +9,7 @@
#include <xml/dom_docimpl.h>
- at implementation WKWebDataSource
+ at implementation IFWebDataSource
+ (void)initialize {
@@ -37,7 +37,7 @@
- (void)_commonInitialization
{
- ((WKWebDataSourcePrivate *)_dataSourcePrivate) = [[WKWebDataSourcePrivate alloc] init];
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate) = [[IFWebDataSourcePrivate alloc] init];
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
@@ -45,7 +45,7 @@
{
[super init];
[self _commonInitialization];
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->inputURL = inputURL;
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL = inputURL;
return self;
}
@@ -57,7 +57,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data
- initWithString: (NSString *)string;
-- initWithLoader: (WKLoader *)loader;
+- initWithLoader: (IFLoader *)loader;
#endif
@@ -65,7 +65,7 @@
// if the data source is not in a frame set.
- (NSString *)frameName
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->frameName;
}
@@ -73,7 +73,7 @@
// document, typically either a frameset or a normal HTML document.
- (BOOL)isMainDocument
{
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent == nil)
+ if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent == nil)
return YES;
return NO;
}
@@ -81,23 +81,23 @@
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
-- (WKWebDataSource *)parent
+- (IFWebDataSource *)parent
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent;
}
-// Returns an array of WKWebDataSource. The data sources in the array are
+// Returns an array of IFWebDataSource. The data sources in the array are
// the data source assoicated with a frame set or iframe. If the main document
// is not a frameset, or has not iframes children will return nil.
- (NSArray *)children
{
- return [((WKWebDataSourcePrivate *)_dataSourcePrivate)->frames allValues];
+ return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->frames allValues];
}
-- (void)addFrame: (WKWebFrame *)frame
+- (void)addFrame: (IFWebFrame *)frame
{
- WKWebDataSourcePrivate *data = (WKWebDataSourcePrivate *)_dataSourcePrivate;
+ IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
if (data->frames == nil)
data->frames = [[NSMutableDictionary alloc] init];
@@ -105,11 +105,11 @@
}
-- (WKWebFrame *)frameNamed: (NSString *)frameName
+- (IFWebFrame *)frameNamed: (NSString *)frameName
{
- WKWebDataSourcePrivate *data = (WKWebDataSourcePrivate *)_dataSourcePrivate;
+ IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
- return (WKWebFrame *)[data->frames objectForKey: frameName];
+ return (IFWebFrame *)[data->frames objectForKey: frameName];
}
@@ -119,63 +119,63 @@
// frames then frameNames will return nil.
- (NSArray *)frameNames
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::frameNames is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::frameNames is not implemented"];
return nil;
}
// findDataSourceForFrameNamed: returns the child data source associated with
// the frame named 'name', or nil.
-- (WKWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
+- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::findDataSourceForFrameNamed: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::findDataSourceForFrameNamed: is not implemented"];
return nil;
}
- (BOOL)frameExists: (NSString *)name
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::frameExists: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::frameExists: is not implemented"];
return NO;
}
- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::openURL:inFrameNamed: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::openURL:inFrameNamed: is not implemented"];
}
- (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::openURL:inIFrame: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::openURL:inIFrame: is not implemented"];
}
-- (id <WKWebController>)controller
+- (id <IFWebController>)controller
{
// All data source from a document (frameset) share the same
// controller.
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
- return [((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent controller];
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->controller;
+ if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
+ return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent controller];
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->controller;
}
// May return nil if not initialized with a URL.
- (NSURL *)inputURL
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->inputURL;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL;
}
// finalURL returns the URL that was actually used. The final URL
// may be different than the inputURL if the server redirects.
-// <WKLocationChangedHandler> includes a message that is sent when
+// <IFLocationChangedHandler> includes a message that is sent when
// a redirect is processed
- (NSURL *)finalURL
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::finalURL is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::finalURL is not implemented"];
return nil;
}
@@ -184,7 +184,7 @@
// i.e. inputURL != finalURL.
- (BOOL)wasRedirected
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::wasRedirected is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::wasRedirected is not implemented"];
return NO;
}
@@ -207,21 +207,21 @@
// Returns NO if the data source is not currently loading.
- (void)stopLoading
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::stopLoading is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::stopLoading is not implemented"];
}
// Returns YES if there are any pending loads.
- (BOOL)isLoading
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::isLoading is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isLoading is not implemented"];
return NO;
}
#ifdef TENTATIVE_API
// Get DOM access to the document.
-- (WKDOMDocument *)document;
+- (IFDOMDocument *)document;
#endif
// Get the actual source of the docment.
@@ -259,21 +259,21 @@
// URL reference point, these should probably not be public for 1.0.
- (NSURL *)base
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::base is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::base is not implemented"];
return nil;
}
- (NSString *)baseTarget
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::baseTarget is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::baseTarget is not implemented"];
return nil;
}
- (NSString *)encoding
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::encoding is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::encoding is not implemented"];
return nil;
}
@@ -281,13 +281,13 @@
// Style sheet
- (void)setUserStyleSheetFromURL: (NSURL *)url
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromURL: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromURL: is not implemented"];
}
- (void)setUserStyleSheetFromString: (NSString *)sheet
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromString: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
}
@@ -296,7 +296,7 @@
// that WebCore also has dependencies on the appkit.
- (NSImage *)icon
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromString: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
return nil;
}
@@ -304,7 +304,7 @@
// Is page secure, e.g. https, ftps
- (BOOL)isPageSecure
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::isPageSecure is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isPageSecure is not implemented"];
return NO;
}
@@ -312,7 +312,7 @@
// Returns nil or the page title.
- (NSString *)pageTitle
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::pageTitle is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::pageTitle is not implemented"];
return nil;
}
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index d148a28..1459bdf 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -12,11 +12,11 @@
// includes from kde
#include <khtmlview.h>
- at interface WKWebDataSourcePrivate : NSObject
+ at interface IFWebDataSourcePrivate : NSObject
{
- WKWebDataSource *parent;
+ IFWebDataSource *parent;
NSMutableArray *children;
- id <WKWebController>controller;
+ id <IFWebController>controller;
NSURL *inputURL;
KHTMLPart *part;
NSString *frameName;
@@ -28,8 +28,8 @@
@end
- at interface WKWebDataSource (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
+ at interface IFWebDataSource (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller;
- (KHTMLPart *)_part;
- (void)_setFrameName: (NSString *)fName;
@end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 2a7de86..2159aca 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -11,7 +11,7 @@
- at implementation WKWebDataSourcePrivate
+ at implementation IFWebDataSourcePrivate
- init
{
@@ -27,7 +27,7 @@
- (void)dealloc
{
- // controller is not retained! WKWebControllers maintain
+ // controller is not retained! IFWebControllers maintain
// a reference to their view and main data source.
[parent release];
[frames release];
@@ -37,24 +37,24 @@
@end
- at implementation WKWebDataSource (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller
+ at implementation IFWebDataSource (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller
{
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
- [NSException raise:WKRuntimeError format:@"WKWebDataSource::_setController: called not called on main data source."];
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->controller = controller;
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->part->setDataSource (self);
+ if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
+ [NSException raise:IFRuntimeError format:@"IFWebDataSource::_setController: called not called on main data source."];
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->controller = controller;
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->part->setDataSource (self);
}
- (KHTMLPart *)_part
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->part;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->part;
}
- (void)_setFrameName: (NSString *)fname
{
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
}
@end
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 047bbe0..4a36fd3 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -7,17 +7,17 @@
*/
#import <Cocoa/Cocoa.h>
- at class WKWebDataSource;
+ at class IFWebDataSource;
- at interface WKWebFrame : NSObject
+ at interface IFWebFrame : NSObject
{
NSString *name;
id view;
- WKWebDataSource *dataSource;
+ IFWebDataSource *dataSource;
}
-- initWithName: (NSString *)name view: view dataSource: (WKWebDataSource *)dataSource;
+- initWithName: (NSString *)name view: view dataSource: (IFWebDataSource *)dataSource;
- (NSString *)name;
- (void)setView: view;
- view;
-- (WKWebDataSource *)dataSource;
+- (IFWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/IFWebFrame.m b/WebKit/WebView.subproj/IFWebFrame.m
index 5e37f63..67fe280 100644
--- a/WebKit/WebView.subproj/IFWebFrame.m
+++ b/WebKit/WebView.subproj/IFWebFrame.m
@@ -10,9 +10,9 @@
#import <WebKit/IFWebFrame.h>
#import <WebKit/IFWebDataSource.h>
- at implementation WKWebFrame
+ at implementation IFWebFrame
-- initWithName: (NSString *)n view: v dataSource: (WKWebDataSource *)d
+- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d
{
[super init];
name = [n retain];
@@ -47,7 +47,7 @@
}
-- (WKWebDataSource *)dataSource
+- (IFWebDataSource *)dataSource
{
return dataSource;
}
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
index 7b38252..4c33d59 100644
--- a/WebKit/WebView.subproj/IFWebView.h
+++ b/WebKit/WebView.subproj/IFWebView.h
@@ -12,12 +12,12 @@
/*
=============================================================================
- Typical usage of a WKWebView.
+ Typical usage of a IFWebView.
NSURL *url = [NSURL URLWithString: @"http://www.apple.com"];
- WKWebDataSource *dataSource = [[WKWebDataSource alloc] initWithURL: url];
- WKWebView *view = [[WKWebView alloc] initWithFrame: myFrame];
- WKDefaultWebController *controller = [[WKDefaultWebController alloc] initWithView: view dataSource: dataSource];
+ IFWebDataSource *dataSource = [[IFWebDataSource alloc] initWithURL: url];
+ IFWebView *view = [[IFWebView alloc] initWithFrame: myFrame];
+ IFDefaultWebController *controller = [[IFDefaultWebController alloc] initWithView: view dataSource: dataSource];
[[[view controller] dataSource] startLoading];
@@ -27,7 +27,7 @@
What is the behaviour of the view after it has been initialized and
startLoading: is called?
- 1. No WKLocationChangedHandler messages will be sent until
+ 1. No IFLocationChangedHandler messages will be sent until
startLoading: is called. After startLoading is called a loadingStarted
message will be sent to the controller. The view will remain unchanged
until the controller receives a receivedDataForLocation: message
@@ -48,7 +48,7 @@
is called before the document has fully loaded, the layout will be incomplete, and a
loadingStopped message will be sent to the controller
- 4. When the controller receives a receivedDataForLocation: with a WKLoadProgress that
+ 4. When the controller receives a receivedDataForLocation: with a IFLoadProgress that
contains bytesSoFar==totalToLoad the location specified is completely loaded. Clients
may display the location string to indicate completion of a loaded resource.
When the controller receives a loadingFinished message the main document and all it
@@ -73,7 +73,7 @@
the selected text.
*/
- at interface WKWebView : NSView
+ at interface IFWebView : NSView
{
@private
id _viewPrivate;
@@ -84,14 +84,14 @@
#ifdef TENTATIVE_API
// Set and get the delegate.
-- (void)setDelegate: (id <WKWebViewDelegate>)delegate;
-- (id <WKWebViewDelegate>)delegate;
+- (void)setDelegate: (id <IFWebViewDelegate>)delegate;
+- (id <IFWebViewDelegate>)delegate;
#endif
// Set and get the controller. Note that the controller is not retained.
// Perhaps setController: should be private?
-- (id <WKWebController>)controller;
+- (id <IFWebController>)controller;
// This method is typically called by the view's controller when
@@ -102,7 +102,7 @@
// This method should not be public until we have a more completely
-// understood way to subclass WKWebView.
+// understood way to subclass IFWebView.
- (void)layout;
@@ -128,9 +128,9 @@
// Returns an array of built-in context menu items for this node.
-// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
+// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *);
+- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *);
#endif
- (void)setContextMenusEnabled: (BOOL)flag;
- (BOOL)contextMenusEnabled;
@@ -166,7 +166,7 @@
Selection on data source is reflected in view.
Does the view also need a cover selection API?
- subclassing of WKWebView
+ subclassing of IFWebView
*/
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 726c269..9684709 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -18,16 +18,16 @@
#include <html/html_documentimpl.h>
- at implementation WKWebView
+ at implementation IFWebView
- initWithFrame: (NSRect) frame
{
[super initWithFrame: frame];
- _viewPrivate = [[WKWebViewPrivate alloc] init];
+ _viewPrivate = [[IFWebViewPrivate alloc] init];
- ((WKWebViewPrivate *)_viewPrivate)->isFlipped = YES;
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = YES;
+ ((IFWebViewPrivate *)_viewPrivate)->isFlipped = YES;
+ ((IFWebViewPrivate *)_viewPrivate)->needsLayout = YES;
return self;
}
@@ -41,9 +41,9 @@
// Set and get the controller. Note that the controller is not retained.
// Perhaps setController: should be private?
-- (id <WKWebController>)controller
+- (id <IFWebController>)controller
{
- return ((WKWebViewPrivate *)_viewPrivate)->controller;
+ return ((IFWebViewPrivate *)_viewPrivate)->controller;
}
@@ -52,7 +52,7 @@
// the data source is changed.
- (void)dataSourceChanged
{
- WKWebViewPrivate *data = ((WKWebViewPrivate *)_viewPrivate);
+ IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
NSRect r = [self frame];
if (data->widget)
@@ -80,17 +80,17 @@
// This method should not be public until we have a more completely
-// understood way to subclass WKWebView.
+// understood way to subclass IFWebView.
- (void)layout
{
- KHTMLView *widget = ((WKWebViewPrivate *)_viewPrivate)->widget;
+ KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
- if (((WKWebViewPrivate *)_viewPrivate)->needsLayout){
+ if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
//double start = CFAbsoluteTimeGetCurrent();
widget->layout(TRUE);
//WebKitDebugAtLevel (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = NO;
+ ((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
}
}
}
@@ -99,20 +99,20 @@
// Stop animating animated GIFs, etc.
- (void)stopAnimations
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::stopAnimations is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::stopAnimations is not implemented"];
}
// Font API
- (void)setFontSizes: (NSArray *)sizes
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setFontSizes: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setFontSizes: is not implemented"];
}
- (NSArray *)fontSizes
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::fontSizes is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::fontSizes is not implemented"];
return nil;
}
@@ -120,32 +120,32 @@
- (void)resetFontSizes
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::resetFontSizes is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::resetFontSizes is not implemented"];
}
- (void)setStandardFont: (NSFont *)font
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setStandardFont: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setStandardFont: is not implemented"];
}
- (NSFont *)standardFont
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::standardFont is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::standardFont is not implemented"];
return nil;
}
- (void)setFixedFont: (NSFont *)font
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setFixedFont: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setFixedFont: is not implemented"];
}
- (NSFont *)fixedFont
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::fixedFont is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::fixedFont is not implemented"];
return nil;
}
@@ -153,7 +153,7 @@
// Drag and drop links and images. Others?
- (void)setCanDragFrom: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setCanDragFrom: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setCanDragFrom: is not implemented"];
}
- (BOOL)canDragFrom
@@ -163,7 +163,7 @@
- (void)setCanDragTo: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setCanDragTo: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setCanDragTo: is not implemented"];
}
- (BOOL)canDragTo
@@ -173,18 +173,18 @@
// Returns an array of built-in context menu items for this node.
-// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
+// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *)
+- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *)
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::defaultContextMenuItemsForNode: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::defaultContextMenuItemsForNode: is not implemented"];
return nil;
}
#endif
- (void)setContextMenusEnabled: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setContextMenusEnabled: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setContextMenusEnabled: is not implemented"];
}
@@ -197,7 +197,7 @@
// Remove the selection.
- (void)deselectText
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::deselectText: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::deselectText: is not implemented"];
}
@@ -206,14 +206,14 @@
// is selected.
- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::searchFor:direction:caseSensitive: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::searchFor:direction:caseSensitive: is not implemented"];
}
// Get an attributed string that represents the current selection.
- (NSAttributedString *)selectedText
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::selectedText is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::selectedText is not implemented"];
return nil;
}
@@ -248,13 +248,13 @@
- (void)setNeedsLayout: (bool)flag
{
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = flag;
+ ((IFWebViewPrivate *)_viewPrivate)->needsLayout = flag;
}
// This should eventually be removed.
- (void)drawRect:(NSRect)rect {
- KHTMLView *widget = ((WKWebViewPrivate *)_viewPrivate)->widget;
+ KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
if (widget != 0l){
[self layout];
@@ -294,13 +294,13 @@
- (void)setIsFlipped: (bool)flag
{
- ((WKWebViewPrivate *)_viewPrivate)->isFlipped = flag;
+ ((IFWebViewPrivate *)_viewPrivate)->isFlipped = flag;
}
- (BOOL)isFlipped
{
- return ((WKWebViewPrivate *)_viewPrivate)->isFlipped;
+ return ((IFWebViewPrivate *)_viewPrivate)->isFlipped;
}
@@ -330,13 +330,13 @@
state = Qt::MidButton;
}
else {
- [NSException raise:WKRuntimeError format:@"WKWebView::mouseUp: unknown button type"];
+ [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
button = 0; state = 0; // Shutup the compiler.
}
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- ((WKWebViewPrivate *)_viewPrivate)->widget->viewportMouseReleaseEvent(kEvent);
+ ((IFWebViewPrivate *)_viewPrivate)->widget->viewportMouseReleaseEvent(kEvent);
}
- (void)mouseDown: (NSEvent *)event
@@ -356,13 +356,13 @@
state = Qt::MidButton;
}
else {
- [NSException raise:WKRuntimeError format:@"WKWebView::mouseUp: unknown button type"];
+ [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
button = 0; state = 0; // Shutup the compiler.
}
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- ((WKWebViewPrivate *)_viewPrivate)->widget->viewportMousePressEvent(kEvent);
+ ((IFWebViewPrivate *)_viewPrivate)->widget->viewportMousePressEvent(kEvent);
}
- (void)mouseDragged: (NSEvent *)event
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
index d741d20..00eed0e 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.h
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.h
@@ -15,21 +15,21 @@ class QWidget;
class KHTMLPart;
class KHTMLView;
- at interface WKWebViewPrivate : NSObject
+ at interface IFWebViewPrivate : NSObject
{
- id <WKWebController>controller;
+ id <IFWebController>controller;
KHTMLView *widget;
- WKDynamicScrollBarsView *frameScrollView;
+ IFDynamicScrollBarsView *frameScrollView;
bool isFlipped;
bool needsLayout;
}
@end
- at interface WKWebView (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
+ at interface IFWebView (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller;
- (void)_resetView;
- (KHTMLView *)_widget;
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv;
-- (WKDynamicScrollBarsView *)_frameScrollView;
+- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv;
+- (IFDynamicScrollBarsView *)_frameScrollView;
@end
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 1e72e11..3f0b311 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -10,7 +10,7 @@
// Includes from KDE
#include <khtmlview.h>
- at implementation WKWebViewPrivate
+ at implementation IFWebViewPrivate
- init
{
@@ -25,7 +25,7 @@
- (void)dealloc
{
- // controller is not retained! WKWebControllers maintain
+ // controller is not retained! IFWebControllers maintain
// a reference to their view and main data source.
[frameScrollView release];
@@ -39,7 +39,7 @@
@end
- at implementation WKWebView (WKPrivate)
+ at implementation IFWebView (IFPrivate)
- (void)_resetView
{
@@ -55,27 +55,27 @@
}
-- (void)_setController: (id <WKWebController>)controller
+- (void)_setController: (id <IFWebController>)controller
{
// Not retained.
- ((WKWebViewPrivate *)_viewPrivate)->controller = controller;
+ ((IFWebViewPrivate *)_viewPrivate)->controller = controller;
}
- (KHTMLView *)_widget
{
- return ((WKWebViewPrivate *)_viewPrivate)->widget;
+ return ((IFWebViewPrivate *)_viewPrivate)->widget;
}
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv
+- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv
{
- ((WKWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
+ ((IFWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
[self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[sv setDocumentView: self];
}
-- (WKDynamicScrollBarsView *)_frameScrollView
+- (IFDynamicScrollBarsView *)_frameScrollView
{
- return ((WKWebViewPrivate *)_viewPrivate)->frameScrollView;
+ return ((IFWebViewPrivate *)_viewPrivate)->frameScrollView;
}
@end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 0c7eacb..f962137 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -10,112 +10,112 @@
/*
=============================================================================
- WKWebController manages the interaction between WKWebView(s) and WKWebDataSource(s).
+ IFWebController manages the interaction between IFWebView(s) and IFWebDataSource(s).
- The WKWebController implements required behavior. WKWebView and WKWebDataSource
+ The IFWebController implements required behavior. IFWebView and IFWebDataSource
cannot function without a controller.
- It it expected that alternate implementations of WKWebController will be written for
- alternate views of the web pages described by WKWebDataSources. For example, a web
- crawler may implement a WKWebController with no corresponding view.
+ It it expected that alternate implementations of IFWebController will be written for
+ alternate views of the web pages described by IFWebDataSources. For example, a web
+ crawler may implement a IFWebController with no corresponding view.
- WKDefaultWebController may be subclassed to modify the behavior of the standard
- WKWebView and WKWebDataSource.
+ IFDefaultWebController may be subclassed to modify the behavior of the standard
+ IFWebView and IFWebDataSource.
=============================================================================
Changes:
2001-12-12
- Changed WKConcreteWebController to WKDefaultWebController.
+ Changed IFConcreteWebController to IFDefaultWebController.
- Changed WKLocationChangedHandler naming, replace "loadingXXX" with
+ Changed IFLocationChangedHandler naming, replace "loadingXXX" with
"locationChangeXXX".
- Changed loadingStopped in WKLocationChangedHandler to locationChangeStopped:(WKError *).
+ Changed loadingStopped in IFLocationChangedHandler to locationChangeStopped:(IFError *).
- Changed loadingCancelled in WKLocationChangedHandler to locationChangeCancelled:(WKError *).
+ Changed loadingCancelled in IFLocationChangedHandler to locationChangeCancelled:(IFError *).
- Changed loadedPageTitle in WKLocationChangedHandler to receivedPageTitle:.
+ Changed loadedPageTitle in IFLocationChangedHandler to receivedPageTitle:.
- Added inputURL:(NSURL *) resolvedTo: (NSURL *) to WKLocationChangedHandler.
+ Added inputURL:(NSURL *) resolvedTo: (NSURL *) to IFLocationChangedHandler.
- Added the following two methods to WKLocationChangedHandler:
+ Added the following two methods to IFLocationChangedHandler:
- (void)inputURL: (NSURL *)inputURL resolvedTo: (NSURL *)resolvedURL;
- (void)serverRedirectTo: (NSURL *)url;
- Put locationWillChangeTo: back on WKLocationChangedHandler.
+ Put locationWillChangeTo: back on IFLocationChangedHandler.
- Changed XXXforLocation in WKLoadHandler to XXXforResource.
+ Changed XXXforLocation in IFLoadHandler to XXXforResource.
- Changed timeoutForLocation: in WKLoadHandler to receivedError:forResource:partialProgress:
+ Changed timeoutForLocation: in IFLoadHandler to receivedError:forResource:partialProgress:
- Added the following two methods to WKDefaultWebController:
+ Added the following two methods to IFDefaultWebController:
- setDirectsAllLinksToSystemBrowser: (BOOL)flag
- (BOOL)directsAllLinksToSystemBrowser;
- Removed WKError. This will be described in WKError.h.
+ Removed IFError. This will be described in IFError.h.
2001-12-13
- Removed WKFrameSetHandler, placed that functionality on WKWebDataSource.
+ Removed IFFrameSetHandler, placed that functionality on IFWebDataSource.
- Changed WKLocationChangeHandler to add a parameter specifying the data source
+ Changed IFLocationChangeHandler to add a parameter specifying the data source
that sent the message.
2001-12-14
Removed inputURL:resolvedTo: methods, per discussion with Don.
- Remove WKContextMenuHandler for want of a better way to describe the
- not-yet-existing WKDOMNode. We can't think of any initial clients that want
- to override the default behavior anyway. Put it in WKGrabBag.h for now.
+ Remove IFContextMenuHandler for want of a better way to describe the
+ not-yet-existing IFDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in IFGrabBag.h for now.
- Simplified WKLocationChangeHandler and updated
- WKAuthenticationHandler to use interfaces instead of structs..
+ Simplified IFLocationChangeHandler and updated
+ IFAuthenticationHandler to use interfaces instead of structs..
*/
- at class WKWebDataSource;
- at class WKError;
- at class WKWebView;
- at class WKWebFrame;
+ at class IFWebDataSource;
+ at class IFError;
+ at class IFWebView;
+ at class IFWebFrame;
#ifdef TENTATIVE_API
/*
=============================================================================
- WKWebViewDelegates implement protocols that modify the behavior of
- WKWebViews. A WKWebView does not require a delegate.
+ IFWebViewDelegates implement protocols that modify the behavior of
+ IFWebViews. A IFWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <?>
+ at protocol IFWebViewDelegate <?>
@end
/*
=============================================================================
- WKWebDataSourceDelegate implement protocols that modify the behavior of
- WKWebDataSources. A WKWebDataSources does not require a delegate.
+ IFWebDataSourceDelegate implement protocols that modify the behavior of
+ IFWebDataSources. A IFWebDataSources does not require a delegate.
*/
- at protocol WKWebDataSourceDelegate <?>
+ at protocol IFWebDataSourceDelegate <?>
@end
/*
=============================================================================
- See the comments in WKWebPageView above for more description about this protocol.
+ See the comments in IFWebPageView above for more description about this protocol.
*/
- at protocol WKLocationChangeHandler
+ at protocol IFLocationChangeHandler
- (BOOL)locationWillChangeTo: (NSURL *)url;
- (void)locationChangeStarted;
- (void)locationChangeInProgress;
-- (void)locationChangeDone: (WKError *)error;
+- (void)locationChangeDone: (IFError *)error;
- (void)receivedPageTitle: (NSString *)title;
@@ -128,11 +128,11 @@
/*
=============================================================================
- A frame-aware version of the the WKLocationChangeHandler
+ A frame-aware version of the the IFLocationChangeHandler
- See the comments in WKWebPageView above for more description about this protocol.
+ See the comments in IFWebPageView above for more description about this protocol.
*/
- at protocol WKLocationChangeHandler
+ at protocol IFLocationChangeHandler
// locationWillChangeTo: is required, but will it be sent by the dataSource? More
// likely the controller will receive a change request from the view. That argues for
@@ -140,13 +140,13 @@
// handshake.
- (BOOL)locationWillChangeTo: (NSURL *)url;
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeInProgressForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
@end
@@ -154,16 +154,16 @@
/*
=============================================================================
- A WKLoadProgress capture the state associated with a load progress
+ A IFLoadProgress capture the state associated with a load progress
indication. Should we use a struct?
*/
- at interface WKLoadProgress
+ at interface IFLoadProgress
{
int bytesSoFar; // 0 if this is the start of load
int totalToLoad; // -1 if this is not known.
// bytesSoFar == totalLoaded when complete
#ifdef TENTATIVE_API
- WK_LOAD_TYPES type; // load types, either image, css, jscript, or html
+ IF_LOAD_TYPES type; // load types, either image, css, jscript, or html
#endif
}
@end
@@ -178,7 +178,7 @@
The methods in this protocol will be called even if the data source
is initialized with something other than a URL.
*/
- at protocol WKLoadHandler
+ at protocol IFLoadHandler
/*
A new chunk of data has been received. This could be a partial load
@@ -186,9 +186,9 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (WKLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
@end
@@ -199,7 +199,7 @@
*/
- at interface WKSimpleAuthenticationResult
+ at interface IFSimpleAuthenticationResult
{
NSString *username;
NSString *password;
@@ -209,7 +209,7 @@
}
@end
- at interface WKSimpleAuthenticationRequest
+ at interface IFSimpleAuthenticationRequest
{
NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
@@ -225,10 +225,10 @@
@end
- at protocol WKAuthenticationHandler
+ at protocol IFAuthenticationHandler
// Can we make this work without blocking the UI, or do we need to make it explicitly async
// somehow?
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request;
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request;
// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
@@ -240,23 +240,23 @@
=============================================================================
*/
- at protocol WKWebDataSourceErrorHandler
-- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at protocol IFWebDataSourceErrorHandler
+- receivedError: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
/*
=============================================================================
- A class that implements WKScriptContextHandler provides all the state information
+ A class that implements IFScriptContextHandler provides all the state information
that may be used by Javascript (AppleScript?).
*/
- at protocol WKScriptContextHandler
+ at protocol IFScriptContextHandler
// setStatusText and statusText are used by Javascript's status bar text methods.
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource;
+- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
+- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
// Need API for things like window size and position, window ids,
// screen goemetry. Essentially all the 'view' items that are
@@ -271,20 +271,20 @@
/*
=============================================================================
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
+ IFWebController implements all the behavior that ties together IFWebView
+ and IFWebDataSource. See each inherited protocol for a more complete
description.
[Don and I both agree that all these little protocols are useful to cleanly
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at protocol IFWebController <IFLoadHandler, IFScriptContextHandler, IFAuthenticationHandler, IFLocationChangeHandler>
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializaing a view of the appropriate class.
-- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent;
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 850b3ea..e90f08a 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -12,15 +12,15 @@
/*
=============================================================================
- A WKWebDataSource represents all the state associated
+ A IFWebDataSource represents all the state associated
with a web page. It is typicallly initialized with a URL, but
may also be initialized with an NSString or NSData that hold
HTML (?also other, i.e. image data?) content.
- Typical usage of a WKWebDataSource.
+ Typical usage of a IFWebDataSource.
- WKWebDataSource *dataSource = [[WKWebDataSource alloc] initWithURL: url];
- id <WKWebController>myController = [[MyControllerClass alloc] init];
+ IFWebDataSource *dataSource = [[IFWebDataSource alloc] initWithURL: url];
+ id <IFWebController>myController = [[MyControllerClass alloc] init];
[myController setDataSource: dataSource];
Changes:
@@ -41,14 +41,14 @@
Changed return type of baseTarget to (NSString *)
Added the following two methods:
- - (WKDataSource *)parent;
+ - (IFDataSource *)parent;
- (NSArry *)children;
- (BOOL)isMainDocument;
Added the following methods:
- (NSArray *)frameNames;
- - (WKWebDataSource) findDataSourceForFrameNamed: (NSString *)name;
+ - (IFWebDataSource) findDataSourceForFrameNamed: (NSString *)name;
- (BOOL)frameExists: (NSString *)name;
- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName;
- (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier;
@@ -58,9 +58,9 @@
Removed all mentions of resolved URLs, because browsers don't
actuall treat DNS aliases specially.
- Moved search API to WKWebView.
+ Moved search API to IFWebView.
- Moved WKPreferences to a new file, WKPreferences.h. We are still discussing
+ Moved IFPreferences to a new file, IFPreferences.h. We are still discussing
this item and it will not make it into the white paper.
Minor naming changes.
@@ -68,12 +68,12 @@
============================================================================= */
#ifdef TENTATIVE_API
- at class WKLoader;
+ at class IFLoader;
#endif
- at interface WKWebDataSource : NSObject
+ at interface IFWebDataSource : NSObject
{
@private
id _dataSourcePrivate;
@@ -86,7 +86,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
- initWithString: (NSString *)string;
-- initWithLoader: (WKLoader *)loader;
+- initWithLoader: (IFLoader *)loader;
#endif
// Returns YES if this is the main document. The main document is the 'top'
@@ -96,22 +96,22 @@
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
-- (WKWebDataSource *)parent;
+- (IFWebDataSource *)parent;
// Add a child frame. This should only be called by the data source's controller
// as a result of a createFrame:inParent:.
// [Should this be private?]
-- (void)addFrame: (WKWebFrame *)frame;
+- (void)addFrame: (IFWebFrame *)frame;
-// Returns an array of WKWebFrame. The data sources in the array are
+// Returns an array of IFWebFrame. The data sources in the array are
// the data source assoicated with a frame set or iframe. If the main document
// is not a frameset, or has not iframes children will return nil.
- (NSArray *)children;
-- (WKWebFrame *)frameNamed: (NSString *)frameName;
+- (IFWebFrame *)frameNamed: (NSString *)frameName;
// Returns an array of NSStrings or nil. The NSStrings corresponds to
// frame names. If this data source is the main document and has no
@@ -120,7 +120,7 @@
// findDataSourceForFrameNamed: returns the child data source associated with
// the frame named 'name', or nil.
-- (WKWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
+- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
- (BOOL)frameExists: (NSString *)name;
@@ -135,9 +135,9 @@
// Set the controller for this data source. NOTE: The controller is not retained by the
// data source. Perhaps setController: should be private? Perhaps the back pointers
// can be managed externally, i.e. + controllerForDataSource: as a class method on
-// WKDefaultWebController?
-//- (void)setController: (id <WKWebController>)controller;
-- (id <WKWebController>)controller;
+// IFDefaultWebController?
+//- (void)setController: (id <IFWebController>)controller;
+- (id <IFWebController>)controller;
// May return nil if not initialized with a URL.
@@ -146,7 +146,7 @@
// finalURL returns the URL that was actually used. The final URL
// may be different than the inputURL if the server redirects.
-// <WKLocationChangedHandler> includes a message that is sent when
+// <IFLocationChangedHandler> includes a message that is sent when
// a redirect is processed
- (NSURL *)finalURL;
@@ -174,7 +174,7 @@
#ifdef TENTATIVE_API
// Get DOM access to the document.
-- (WKDOMDocument *)document;
+- (IFDOMDocument *)document;
#endif
// Get the source of the document by reconstructing it from the DOM.
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 64d1fe5..40118ac 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -9,7 +9,7 @@
#include <xml/dom_docimpl.h>
- at implementation WKWebDataSource
+ at implementation IFWebDataSource
+ (void)initialize {
@@ -37,7 +37,7 @@
- (void)_commonInitialization
{
- ((WKWebDataSourcePrivate *)_dataSourcePrivate) = [[WKWebDataSourcePrivate alloc] init];
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate) = [[IFWebDataSourcePrivate alloc] init];
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
@@ -45,7 +45,7 @@
{
[super init];
[self _commonInitialization];
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->inputURL = inputURL;
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL = inputURL;
return self;
}
@@ -57,7 +57,7 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data
- initWithString: (NSString *)string;
-- initWithLoader: (WKLoader *)loader;
+- initWithLoader: (IFLoader *)loader;
#endif
@@ -65,7 +65,7 @@
// if the data source is not in a frame set.
- (NSString *)frameName
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->frameName;
}
@@ -73,7 +73,7 @@
// document, typically either a frameset or a normal HTML document.
- (BOOL)isMainDocument
{
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent == nil)
+ if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent == nil)
return YES;
return NO;
}
@@ -81,23 +81,23 @@
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
-- (WKWebDataSource *)parent
+- (IFWebDataSource *)parent
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent;
}
-// Returns an array of WKWebDataSource. The data sources in the array are
+// Returns an array of IFWebDataSource. The data sources in the array are
// the data source assoicated with a frame set or iframe. If the main document
// is not a frameset, or has not iframes children will return nil.
- (NSArray *)children
{
- return [((WKWebDataSourcePrivate *)_dataSourcePrivate)->frames allValues];
+ return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->frames allValues];
}
-- (void)addFrame: (WKWebFrame *)frame
+- (void)addFrame: (IFWebFrame *)frame
{
- WKWebDataSourcePrivate *data = (WKWebDataSourcePrivate *)_dataSourcePrivate;
+ IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
if (data->frames == nil)
data->frames = [[NSMutableDictionary alloc] init];
@@ -105,11 +105,11 @@
}
-- (WKWebFrame *)frameNamed: (NSString *)frameName
+- (IFWebFrame *)frameNamed: (NSString *)frameName
{
- WKWebDataSourcePrivate *data = (WKWebDataSourcePrivate *)_dataSourcePrivate;
+ IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
- return (WKWebFrame *)[data->frames objectForKey: frameName];
+ return (IFWebFrame *)[data->frames objectForKey: frameName];
}
@@ -119,63 +119,63 @@
// frames then frameNames will return nil.
- (NSArray *)frameNames
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::frameNames is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::frameNames is not implemented"];
return nil;
}
// findDataSourceForFrameNamed: returns the child data source associated with
// the frame named 'name', or nil.
-- (WKWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
+- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::findDataSourceForFrameNamed: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::findDataSourceForFrameNamed: is not implemented"];
return nil;
}
- (BOOL)frameExists: (NSString *)name
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::frameExists: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::frameExists: is not implemented"];
return NO;
}
- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::openURL:inFrameNamed: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::openURL:inFrameNamed: is not implemented"];
}
- (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::openURL:inIFrame: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::openURL:inIFrame: is not implemented"];
}
-- (id <WKWebController>)controller
+- (id <IFWebController>)controller
{
// All data source from a document (frameset) share the same
// controller.
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
- return [((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent controller];
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->controller;
+ if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
+ return [((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent controller];
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->controller;
}
// May return nil if not initialized with a URL.
- (NSURL *)inputURL
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->inputURL;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->inputURL;
}
// finalURL returns the URL that was actually used. The final URL
// may be different than the inputURL if the server redirects.
-// <WKLocationChangedHandler> includes a message that is sent when
+// <IFLocationChangedHandler> includes a message that is sent when
// a redirect is processed
- (NSURL *)finalURL
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::finalURL is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::finalURL is not implemented"];
return nil;
}
@@ -184,7 +184,7 @@
// i.e. inputURL != finalURL.
- (BOOL)wasRedirected
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::wasRedirected is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::wasRedirected is not implemented"];
return NO;
}
@@ -207,21 +207,21 @@
// Returns NO if the data source is not currently loading.
- (void)stopLoading
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::stopLoading is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::stopLoading is not implemented"];
}
// Returns YES if there are any pending loads.
- (BOOL)isLoading
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::isLoading is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isLoading is not implemented"];
return NO;
}
#ifdef TENTATIVE_API
// Get DOM access to the document.
-- (WKDOMDocument *)document;
+- (IFDOMDocument *)document;
#endif
// Get the actual source of the docment.
@@ -259,21 +259,21 @@
// URL reference point, these should probably not be public for 1.0.
- (NSURL *)base
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::base is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::base is not implemented"];
return nil;
}
- (NSString *)baseTarget
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::baseTarget is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::baseTarget is not implemented"];
return nil;
}
- (NSString *)encoding
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::encoding is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::encoding is not implemented"];
return nil;
}
@@ -281,13 +281,13 @@
// Style sheet
- (void)setUserStyleSheetFromURL: (NSURL *)url
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromURL: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromURL: is not implemented"];
}
- (void)setUserStyleSheetFromString: (NSString *)sheet
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromString: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
}
@@ -296,7 +296,7 @@
// that WebCore also has dependencies on the appkit.
- (NSImage *)icon
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromString: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
return nil;
}
@@ -304,7 +304,7 @@
// Is page secure, e.g. https, ftps
- (BOOL)isPageSecure
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::isPageSecure is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isPageSecure is not implemented"];
return NO;
}
@@ -312,7 +312,7 @@
// Returns nil or the page title.
- (NSString *)pageTitle
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::pageTitle is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::pageTitle is not implemented"];
return nil;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index d148a28..1459bdf 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -12,11 +12,11 @@
// includes from kde
#include <khtmlview.h>
- at interface WKWebDataSourcePrivate : NSObject
+ at interface IFWebDataSourcePrivate : NSObject
{
- WKWebDataSource *parent;
+ IFWebDataSource *parent;
NSMutableArray *children;
- id <WKWebController>controller;
+ id <IFWebController>controller;
NSURL *inputURL;
KHTMLPart *part;
NSString *frameName;
@@ -28,8 +28,8 @@
@end
- at interface WKWebDataSource (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
+ at interface IFWebDataSource (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller;
- (KHTMLPart *)_part;
- (void)_setFrameName: (NSString *)fName;
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 2a7de86..2159aca 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -11,7 +11,7 @@
- at implementation WKWebDataSourcePrivate
+ at implementation IFWebDataSourcePrivate
- init
{
@@ -27,7 +27,7 @@
- (void)dealloc
{
- // controller is not retained! WKWebControllers maintain
+ // controller is not retained! IFWebControllers maintain
// a reference to their view and main data source.
[parent release];
[frames release];
@@ -37,24 +37,24 @@
@end
- at implementation WKWebDataSource (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller
+ at implementation IFWebDataSource (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller
{
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
- [NSException raise:WKRuntimeError format:@"WKWebDataSource::_setController: called not called on main data source."];
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->controller = controller;
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->part->setDataSource (self);
+ if (((IFWebDataSourcePrivate *)_dataSourcePrivate)->parent != nil)
+ [NSException raise:IFRuntimeError format:@"IFWebDataSource::_setController: called not called on main data source."];
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->controller = controller;
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->part->setDataSource (self);
}
- (KHTMLPart *)_part
{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->part;
+ return ((IFWebDataSourcePrivate *)_dataSourcePrivate)->part;
}
- (void)_setFrameName: (NSString *)fname
{
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
+ ((IFWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
}
@end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
index 8219286..49e2a03 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
- at interface WKDynamicScrollBarsView : NSScrollView {
+ at interface IFDynamicScrollBarsView : NSScrollView {
}
@end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 990cec8..9306f73 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -8,7 +8,7 @@
#import <WebKit/IFDynamicScrollBarsView.h>
- at implementation WKDynamicScrollBarsView
+ at implementation IFDynamicScrollBarsView
// make the horizontal and vertical scroll bars come and go as needed
- (void) reflectScrolledClipView: (NSClipView*)clipView
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 047bbe0..4a36fd3 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -7,17 +7,17 @@
*/
#import <Cocoa/Cocoa.h>
- at class WKWebDataSource;
+ at class IFWebDataSource;
- at interface WKWebFrame : NSObject
+ at interface IFWebFrame : NSObject
{
NSString *name;
id view;
- WKWebDataSource *dataSource;
+ IFWebDataSource *dataSource;
}
-- initWithName: (NSString *)name view: view dataSource: (WKWebDataSource *)dataSource;
+- initWithName: (NSString *)name view: view dataSource: (IFWebDataSource *)dataSource;
- (NSString *)name;
- (void)setView: view;
- view;
-- (WKWebDataSource *)dataSource;
+- (IFWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 7b38252..4c33d59 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -12,12 +12,12 @@
/*
=============================================================================
- Typical usage of a WKWebView.
+ Typical usage of a IFWebView.
NSURL *url = [NSURL URLWithString: @"http://www.apple.com"];
- WKWebDataSource *dataSource = [[WKWebDataSource alloc] initWithURL: url];
- WKWebView *view = [[WKWebView alloc] initWithFrame: myFrame];
- WKDefaultWebController *controller = [[WKDefaultWebController alloc] initWithView: view dataSource: dataSource];
+ IFWebDataSource *dataSource = [[IFWebDataSource alloc] initWithURL: url];
+ IFWebView *view = [[IFWebView alloc] initWithFrame: myFrame];
+ IFDefaultWebController *controller = [[IFDefaultWebController alloc] initWithView: view dataSource: dataSource];
[[[view controller] dataSource] startLoading];
@@ -27,7 +27,7 @@
What is the behaviour of the view after it has been initialized and
startLoading: is called?
- 1. No WKLocationChangedHandler messages will be sent until
+ 1. No IFLocationChangedHandler messages will be sent until
startLoading: is called. After startLoading is called a loadingStarted
message will be sent to the controller. The view will remain unchanged
until the controller receives a receivedDataForLocation: message
@@ -48,7 +48,7 @@
is called before the document has fully loaded, the layout will be incomplete, and a
loadingStopped message will be sent to the controller
- 4. When the controller receives a receivedDataForLocation: with a WKLoadProgress that
+ 4. When the controller receives a receivedDataForLocation: with a IFLoadProgress that
contains bytesSoFar==totalToLoad the location specified is completely loaded. Clients
may display the location string to indicate completion of a loaded resource.
When the controller receives a loadingFinished message the main document and all it
@@ -73,7 +73,7 @@
the selected text.
*/
- at interface WKWebView : NSView
+ at interface IFWebView : NSView
{
@private
id _viewPrivate;
@@ -84,14 +84,14 @@
#ifdef TENTATIVE_API
// Set and get the delegate.
-- (void)setDelegate: (id <WKWebViewDelegate>)delegate;
-- (id <WKWebViewDelegate>)delegate;
+- (void)setDelegate: (id <IFWebViewDelegate>)delegate;
+- (id <IFWebViewDelegate>)delegate;
#endif
// Set and get the controller. Note that the controller is not retained.
// Perhaps setController: should be private?
-- (id <WKWebController>)controller;
+- (id <IFWebController>)controller;
// This method is typically called by the view's controller when
@@ -102,7 +102,7 @@
// This method should not be public until we have a more completely
-// understood way to subclass WKWebView.
+// understood way to subclass IFWebView.
- (void)layout;
@@ -128,9 +128,9 @@
// Returns an array of built-in context menu items for this node.
-// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
+// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *);
+- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *);
#endif
- (void)setContextMenusEnabled: (BOOL)flag;
- (BOOL)contextMenusEnabled;
@@ -166,7 +166,7 @@
Selection on data source is reflected in view.
Does the view also need a cover selection API?
- subclassing of WKWebView
+ subclassing of IFWebView
*/
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 726c269..9684709 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -18,16 +18,16 @@
#include <html/html_documentimpl.h>
- at implementation WKWebView
+ at implementation IFWebView
- initWithFrame: (NSRect) frame
{
[super initWithFrame: frame];
- _viewPrivate = [[WKWebViewPrivate alloc] init];
+ _viewPrivate = [[IFWebViewPrivate alloc] init];
- ((WKWebViewPrivate *)_viewPrivate)->isFlipped = YES;
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = YES;
+ ((IFWebViewPrivate *)_viewPrivate)->isFlipped = YES;
+ ((IFWebViewPrivate *)_viewPrivate)->needsLayout = YES;
return self;
}
@@ -41,9 +41,9 @@
// Set and get the controller. Note that the controller is not retained.
// Perhaps setController: should be private?
-- (id <WKWebController>)controller
+- (id <IFWebController>)controller
{
- return ((WKWebViewPrivate *)_viewPrivate)->controller;
+ return ((IFWebViewPrivate *)_viewPrivate)->controller;
}
@@ -52,7 +52,7 @@
// the data source is changed.
- (void)dataSourceChanged
{
- WKWebViewPrivate *data = ((WKWebViewPrivate *)_viewPrivate);
+ IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
NSRect r = [self frame];
if (data->widget)
@@ -80,17 +80,17 @@
// This method should not be public until we have a more completely
-// understood way to subclass WKWebView.
+// understood way to subclass IFWebView.
- (void)layout
{
- KHTMLView *widget = ((WKWebViewPrivate *)_viewPrivate)->widget;
+ KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
- if (((WKWebViewPrivate *)_viewPrivate)->needsLayout){
+ if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
//double start = CFAbsoluteTimeGetCurrent();
widget->layout(TRUE);
//WebKitDebugAtLevel (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = NO;
+ ((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
}
}
}
@@ -99,20 +99,20 @@
// Stop animating animated GIFs, etc.
- (void)stopAnimations
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::stopAnimations is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::stopAnimations is not implemented"];
}
// Font API
- (void)setFontSizes: (NSArray *)sizes
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setFontSizes: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setFontSizes: is not implemented"];
}
- (NSArray *)fontSizes
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::fontSizes is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::fontSizes is not implemented"];
return nil;
}
@@ -120,32 +120,32 @@
- (void)resetFontSizes
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::resetFontSizes is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::resetFontSizes is not implemented"];
}
- (void)setStandardFont: (NSFont *)font
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setStandardFont: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setStandardFont: is not implemented"];
}
- (NSFont *)standardFont
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::standardFont is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::standardFont is not implemented"];
return nil;
}
- (void)setFixedFont: (NSFont *)font
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setFixedFont: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setFixedFont: is not implemented"];
}
- (NSFont *)fixedFont
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::fixedFont is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::fixedFont is not implemented"];
return nil;
}
@@ -153,7 +153,7 @@
// Drag and drop links and images. Others?
- (void)setCanDragFrom: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setCanDragFrom: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setCanDragFrom: is not implemented"];
}
- (BOOL)canDragFrom
@@ -163,7 +163,7 @@
- (void)setCanDragTo: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setCanDragTo: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setCanDragTo: is not implemented"];
}
- (BOOL)canDragTo
@@ -173,18 +173,18 @@
// Returns an array of built-in context menu items for this node.
-// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
+// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *)
+- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *)
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::defaultContextMenuItemsForNode: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::defaultContextMenuItemsForNode: is not implemented"];
return nil;
}
#endif
- (void)setContextMenusEnabled: (BOOL)flag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setContextMenusEnabled: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setContextMenusEnabled: is not implemented"];
}
@@ -197,7 +197,7 @@
// Remove the selection.
- (void)deselectText
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::deselectText: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::deselectText: is not implemented"];
}
@@ -206,14 +206,14 @@
// is selected.
- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::searchFor:direction:caseSensitive: is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::searchFor:direction:caseSensitive: is not implemented"];
}
// Get an attributed string that represents the current selection.
- (NSAttributedString *)selectedText
{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::selectedText is not implemented"];
+ [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::selectedText is not implemented"];
return nil;
}
@@ -248,13 +248,13 @@
- (void)setNeedsLayout: (bool)flag
{
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = flag;
+ ((IFWebViewPrivate *)_viewPrivate)->needsLayout = flag;
}
// This should eventually be removed.
- (void)drawRect:(NSRect)rect {
- KHTMLView *widget = ((WKWebViewPrivate *)_viewPrivate)->widget;
+ KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
if (widget != 0l){
[self layout];
@@ -294,13 +294,13 @@
- (void)setIsFlipped: (bool)flag
{
- ((WKWebViewPrivate *)_viewPrivate)->isFlipped = flag;
+ ((IFWebViewPrivate *)_viewPrivate)->isFlipped = flag;
}
- (BOOL)isFlipped
{
- return ((WKWebViewPrivate *)_viewPrivate)->isFlipped;
+ return ((IFWebViewPrivate *)_viewPrivate)->isFlipped;
}
@@ -330,13 +330,13 @@
state = Qt::MidButton;
}
else {
- [NSException raise:WKRuntimeError format:@"WKWebView::mouseUp: unknown button type"];
+ [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
button = 0; state = 0; // Shutup the compiler.
}
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- ((WKWebViewPrivate *)_viewPrivate)->widget->viewportMouseReleaseEvent(kEvent);
+ ((IFWebViewPrivate *)_viewPrivate)->widget->viewportMouseReleaseEvent(kEvent);
}
- (void)mouseDown: (NSEvent *)event
@@ -356,13 +356,13 @@
state = Qt::MidButton;
}
else {
- [NSException raise:WKRuntimeError format:@"WKWebView::mouseUp: unknown button type"];
+ [NSException raise:IFRuntimeError format:@"IFWebView::mouseUp: unknown button type"];
button = 0; state = 0; // Shutup the compiler.
}
NSPoint p = [event locationInWindow];
QMouseEvent *kEvent = new QMouseEvent(QEvent::MouseButtonPress, QPoint(p.x, p.y), button, state);
- ((WKWebViewPrivate *)_viewPrivate)->widget->viewportMousePressEvent(kEvent);
+ ((IFWebViewPrivate *)_viewPrivate)->widget->viewportMousePressEvent(kEvent);
}
- (void)mouseDragged: (NSEvent *)event
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index d741d20..00eed0e 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -15,21 +15,21 @@ class QWidget;
class KHTMLPart;
class KHTMLView;
- at interface WKWebViewPrivate : NSObject
+ at interface IFWebViewPrivate : NSObject
{
- id <WKWebController>controller;
+ id <IFWebController>controller;
KHTMLView *widget;
- WKDynamicScrollBarsView *frameScrollView;
+ IFDynamicScrollBarsView *frameScrollView;
bool isFlipped;
bool needsLayout;
}
@end
- at interface WKWebView (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
+ at interface IFWebView (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller;
- (void)_resetView;
- (KHTMLView *)_widget;
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv;
-- (WKDynamicScrollBarsView *)_frameScrollView;
+- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv;
+- (IFDynamicScrollBarsView *)_frameScrollView;
@end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index d741d20..00eed0e 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -15,21 +15,21 @@ class QWidget;
class KHTMLPart;
class KHTMLView;
- at interface WKWebViewPrivate : NSObject
+ at interface IFWebViewPrivate : NSObject
{
- id <WKWebController>controller;
+ id <IFWebController>controller;
KHTMLView *widget;
- WKDynamicScrollBarsView *frameScrollView;
+ IFDynamicScrollBarsView *frameScrollView;
bool isFlipped;
bool needsLayout;
}
@end
- at interface WKWebView (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
+ at interface IFWebView (IFPrivate)
+- (void)_setController: (id <IFWebController>)controller;
- (void)_resetView;
- (KHTMLView *)_widget;
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv;
-- (WKDynamicScrollBarsView *)_frameScrollView;
+- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv;
+- (IFDynamicScrollBarsView *)_frameScrollView;
@end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 1e72e11..3f0b311 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -10,7 +10,7 @@
// Includes from KDE
#include <khtmlview.h>
- at implementation WKWebViewPrivate
+ at implementation IFWebViewPrivate
- init
{
@@ -25,7 +25,7 @@
- (void)dealloc
{
- // controller is not retained! WKWebControllers maintain
+ // controller is not retained! IFWebControllers maintain
// a reference to their view and main data source.
[frameScrollView release];
@@ -39,7 +39,7 @@
@end
- at implementation WKWebView (WKPrivate)
+ at implementation IFWebView (IFPrivate)
- (void)_resetView
{
@@ -55,27 +55,27 @@
}
-- (void)_setController: (id <WKWebController>)controller
+- (void)_setController: (id <IFWebController>)controller
{
// Not retained.
- ((WKWebViewPrivate *)_viewPrivate)->controller = controller;
+ ((IFWebViewPrivate *)_viewPrivate)->controller = controller;
}
- (KHTMLView *)_widget
{
- return ((WKWebViewPrivate *)_viewPrivate)->widget;
+ return ((IFWebViewPrivate *)_viewPrivate)->widget;
}
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv
+- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv
{
- ((WKWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
+ ((IFWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
[self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[sv setDocumentView: self];
}
-- (WKDynamicScrollBarsView *)_frameScrollView
+- (IFDynamicScrollBarsView *)_frameScrollView
{
- return ((WKWebViewPrivate *)_viewPrivate)->frameScrollView;
+ return ((IFWebViewPrivate *)_viewPrivate)->frameScrollView;
}
@end
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 12ef448..bbdac0d 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -16,7 +16,7 @@
This class provides a cover for URL-based preference items.
*/
- at interface WKPreferences
+ at interface IFPreferences
+ getPreferencesForURL: (NSURL *)url;
// Encoding that will be used in none specified on page? or in header?
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 0c7eacb..f962137 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -10,112 +10,112 @@
/*
=============================================================================
- WKWebController manages the interaction between WKWebView(s) and WKWebDataSource(s).
+ IFWebController manages the interaction between IFWebView(s) and IFWebDataSource(s).
- The WKWebController implements required behavior. WKWebView and WKWebDataSource
+ The IFWebController implements required behavior. IFWebView and IFWebDataSource
cannot function without a controller.
- It it expected that alternate implementations of WKWebController will be written for
- alternate views of the web pages described by WKWebDataSources. For example, a web
- crawler may implement a WKWebController with no corresponding view.
+ It it expected that alternate implementations of IFWebController will be written for
+ alternate views of the web pages described by IFWebDataSources. For example, a web
+ crawler may implement a IFWebController with no corresponding view.
- WKDefaultWebController may be subclassed to modify the behavior of the standard
- WKWebView and WKWebDataSource.
+ IFDefaultWebController may be subclassed to modify the behavior of the standard
+ IFWebView and IFWebDataSource.
=============================================================================
Changes:
2001-12-12
- Changed WKConcreteWebController to WKDefaultWebController.
+ Changed IFConcreteWebController to IFDefaultWebController.
- Changed WKLocationChangedHandler naming, replace "loadingXXX" with
+ Changed IFLocationChangedHandler naming, replace "loadingXXX" with
"locationChangeXXX".
- Changed loadingStopped in WKLocationChangedHandler to locationChangeStopped:(WKError *).
+ Changed loadingStopped in IFLocationChangedHandler to locationChangeStopped:(IFError *).
- Changed loadingCancelled in WKLocationChangedHandler to locationChangeCancelled:(WKError *).
+ Changed loadingCancelled in IFLocationChangedHandler to locationChangeCancelled:(IFError *).
- Changed loadedPageTitle in WKLocationChangedHandler to receivedPageTitle:.
+ Changed loadedPageTitle in IFLocationChangedHandler to receivedPageTitle:.
- Added inputURL:(NSURL *) resolvedTo: (NSURL *) to WKLocationChangedHandler.
+ Added inputURL:(NSURL *) resolvedTo: (NSURL *) to IFLocationChangedHandler.
- Added the following two methods to WKLocationChangedHandler:
+ Added the following two methods to IFLocationChangedHandler:
- (void)inputURL: (NSURL *)inputURL resolvedTo: (NSURL *)resolvedURL;
- (void)serverRedirectTo: (NSURL *)url;
- Put locationWillChangeTo: back on WKLocationChangedHandler.
+ Put locationWillChangeTo: back on IFLocationChangedHandler.
- Changed XXXforLocation in WKLoadHandler to XXXforResource.
+ Changed XXXforLocation in IFLoadHandler to XXXforResource.
- Changed timeoutForLocation: in WKLoadHandler to receivedError:forResource:partialProgress:
+ Changed timeoutForLocation: in IFLoadHandler to receivedError:forResource:partialProgress:
- Added the following two methods to WKDefaultWebController:
+ Added the following two methods to IFDefaultWebController:
- setDirectsAllLinksToSystemBrowser: (BOOL)flag
- (BOOL)directsAllLinksToSystemBrowser;
- Removed WKError. This will be described in WKError.h.
+ Removed IFError. This will be described in IFError.h.
2001-12-13
- Removed WKFrameSetHandler, placed that functionality on WKWebDataSource.
+ Removed IFFrameSetHandler, placed that functionality on IFWebDataSource.
- Changed WKLocationChangeHandler to add a parameter specifying the data source
+ Changed IFLocationChangeHandler to add a parameter specifying the data source
that sent the message.
2001-12-14
Removed inputURL:resolvedTo: methods, per discussion with Don.
- Remove WKContextMenuHandler for want of a better way to describe the
- not-yet-existing WKDOMNode. We can't think of any initial clients that want
- to override the default behavior anyway. Put it in WKGrabBag.h for now.
+ Remove IFContextMenuHandler for want of a better way to describe the
+ not-yet-existing IFDOMNode. We can't think of any initial clients that want
+ to override the default behavior anyway. Put it in IFGrabBag.h for now.
- Simplified WKLocationChangeHandler and updated
- WKAuthenticationHandler to use interfaces instead of structs..
+ Simplified IFLocationChangeHandler and updated
+ IFAuthenticationHandler to use interfaces instead of structs..
*/
- at class WKWebDataSource;
- at class WKError;
- at class WKWebView;
- at class WKWebFrame;
+ at class IFWebDataSource;
+ at class IFError;
+ at class IFWebView;
+ at class IFWebFrame;
#ifdef TENTATIVE_API
/*
=============================================================================
- WKWebViewDelegates implement protocols that modify the behavior of
- WKWebViews. A WKWebView does not require a delegate.
+ IFWebViewDelegates implement protocols that modify the behavior of
+ IFWebViews. A IFWebView does not require a delegate.
*/
- at protocol WKWebViewDelegate <?>
+ at protocol IFWebViewDelegate <?>
@end
/*
=============================================================================
- WKWebDataSourceDelegate implement protocols that modify the behavior of
- WKWebDataSources. A WKWebDataSources does not require a delegate.
+ IFWebDataSourceDelegate implement protocols that modify the behavior of
+ IFWebDataSources. A IFWebDataSources does not require a delegate.
*/
- at protocol WKWebDataSourceDelegate <?>
+ at protocol IFWebDataSourceDelegate <?>
@end
/*
=============================================================================
- See the comments in WKWebPageView above for more description about this protocol.
+ See the comments in IFWebPageView above for more description about this protocol.
*/
- at protocol WKLocationChangeHandler
+ at protocol IFLocationChangeHandler
- (BOOL)locationWillChangeTo: (NSURL *)url;
- (void)locationChangeStarted;
- (void)locationChangeInProgress;
-- (void)locationChangeDone: (WKError *)error;
+- (void)locationChangeDone: (IFError *)error;
- (void)receivedPageTitle: (NSString *)title;
@@ -128,11 +128,11 @@
/*
=============================================================================
- A frame-aware version of the the WKLocationChangeHandler
+ A frame-aware version of the the IFLocationChangeHandler
- See the comments in WKWebPageView above for more description about this protocol.
+ See the comments in IFWebPageView above for more description about this protocol.
*/
- at protocol WKLocationChangeHandler
+ at protocol IFLocationChangeHandler
// locationWillChangeTo: is required, but will it be sent by the dataSource? More
// likely the controller will receive a change request from the view. That argues for
@@ -140,13 +140,13 @@
// handshake.
- (BOOL)locationWillChangeTo: (NSURL *)url;
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeInProgressForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
@end
@@ -154,16 +154,16 @@
/*
=============================================================================
- A WKLoadProgress capture the state associated with a load progress
+ A IFLoadProgress capture the state associated with a load progress
indication. Should we use a struct?
*/
- at interface WKLoadProgress
+ at interface IFLoadProgress
{
int bytesSoFar; // 0 if this is the start of load
int totalToLoad; // -1 if this is not known.
// bytesSoFar == totalLoaded when complete
#ifdef TENTATIVE_API
- WK_LOAD_TYPES type; // load types, either image, css, jscript, or html
+ IF_LOAD_TYPES type; // load types, either image, css, jscript, or html
#endif
}
@end
@@ -178,7 +178,7 @@
The methods in this protocol will be called even if the data source
is initialized with something other than a URL.
*/
- at protocol WKLoadHandler
+ at protocol IFLoadHandler
/*
A new chunk of data has been received. This could be a partial load
@@ -186,9 +186,9 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (WKLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource;
+- (void)receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
@end
@@ -199,7 +199,7 @@
*/
- at interface WKSimpleAuthenticationResult
+ at interface IFSimpleAuthenticationResult
{
NSString *username;
NSString *password;
@@ -209,7 +209,7 @@
}
@end
- at interface WKSimpleAuthenticationRequest
+ at interface IFSimpleAuthenticationRequest
{
NSURL *url; // nil if for something non-URI based
NSString *domain; // http authentication domain or some representation of
@@ -225,10 +225,10 @@
@end
- at protocol WKAuthenticationHandler
+ at protocol IFAuthenticationHandler
// Can we make this work without blocking the UI, or do we need to make it explicitly async
// somehow?
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request;
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request;
// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
@@ -240,23 +240,23 @@
=============================================================================
*/
- at protocol WKWebDataSourceErrorHandler
-- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
+ at protocol IFWebDataSourceErrorHandler
+- receivedError: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
@end
/*
=============================================================================
- A class that implements WKScriptContextHandler provides all the state information
+ A class that implements IFScriptContextHandler provides all the state information
that may be used by Javascript (AppleScript?).
*/
- at protocol WKScriptContextHandler
+ at protocol IFScriptContextHandler
// setStatusText and statusText are used by Javascript's status bar text methods.
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource;
+- (void)setStatusText: (NSString *)text forDataSource: (IFWebDataSource *)dataSource;
+- (NSString *)statusTextForDataSource: (IFWebDataSource *)dataSource;
// Need API for things like window size and position, window ids,
// screen goemetry. Essentially all the 'view' items that are
@@ -271,20 +271,20 @@
/*
=============================================================================
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
+ IFWebController implements all the behavior that ties together IFWebView
+ and IFWebDataSource. See each inherited protocol for a more complete
description.
[Don and I both agree that all these little protocols are useful to cleanly
describe snippets of behavior, but do we explicity reference them anywhere,
or do we just use the umbrella protocol?]
*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at protocol IFWebController <IFLoadHandler, IFScriptContextHandler, IFAuthenticationHandler, IFLocationChangeHandler>
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializaing a view of the appropriate class.
-- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)child inParent: (WKWebDataSource *)parent;
+- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list