[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:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit adc6457d67c702a719e9ad4902107f8ece78bfa4
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 5 00:02:45 2002 +0000
Top level:
Fix everything for WebFoundation and WebKit WK --> IF rename.
* Tests/CookieManager/wkcookie-test.m:
* Tests/CookieManager/wkcookiemanager-test.m:
* Tests/khtmlview/_KWQOwner.h:
* Tests/khtmlview/_KWQOwner.m:
WebFoundation:
Rename all WK files to IF (classes not renamed yet).
* CacheLoader.subproj/IFCachedObject.h:
* CacheLoader.subproj/IFCachedObject.m:
* CacheLoader.subproj/IFContentType.h:
* CacheLoader.subproj/IFContentType.m:
* CacheLoader.subproj/IFHTTPURLHandle.h:
* CacheLoader.subproj/IFHTTPURLHandle.m:
* CacheLoader.subproj/IFHTTPURLHandleCookies.h:
* CacheLoader.subproj/IFHTTPURLProtocolHandler.h:
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
* CacheLoader.subproj/IFURLCache.h:
* CacheLoader.subproj/IFURLCache.m:
* CacheLoader.subproj/IFURLDataProvider.h:
* CacheLoader.subproj/IFURLDiskCache.h:
* CacheLoader.subproj/IFURLDiskCache.m:
* CacheLoader.subproj/IFURLHandle.h:
* CacheLoader.subproj/IFURLHandle.m:
* CacheLoader.subproj/IFURLHandleCGlue.h:
* CacheLoader.subproj/IFURLHandleCGlue.m:
* CacheLoader.subproj/IFURLHandleClient.h:
* CacheLoader.subproj/IFURLLoad.h:
* CacheLoader.subproj/IFURLLoad.m:
* CacheLoader.subproj/IFURLLoadManager.h:
* CacheLoader.subproj/IFURLLoadManager.m:
* CacheLoader.subproj/IFURLMemoryCache.h:
* CacheLoader.subproj/IFURLMemoryCache.m:
* CacheLoader.subproj/IFURLProtocolHandler.h:
* CacheLoader.subproj/IFURLProtocolHandler.m:
* CacheLoader.subproj/WCURLHandleGlue.m:
* CacheLoader.subproj/WKCachedObject.h:
* CacheLoader.subproj/WKCachedObject.m:
* CacheLoader.subproj/WKContentType.h:
* CacheLoader.subproj/WKContentType.m:
* CacheLoader.subproj/WKHTTPURLHandle.h:
* CacheLoader.subproj/WKHTTPURLHandle.m:
* CacheLoader.subproj/WKHTTPURLHandleCookies.h:
* CacheLoader.subproj/WKHTTPURLProtocolHandler.h:
* CacheLoader.subproj/WKHTTPURLProtocolHandler.m:
* CacheLoader.subproj/WKURLCache.h:
* CacheLoader.subproj/WKURLCache.m:
* CacheLoader.subproj/WKURLDataProvider.h:
* CacheLoader.subproj/WKURLDiskCache.h:
* CacheLoader.subproj/WKURLDiskCache.m:
* CacheLoader.subproj/WKURLHandle.h:
* CacheLoader.subproj/WKURLHandle.m:
* CacheLoader.subproj/WKURLHandleCGlue.h:
* CacheLoader.subproj/WKURLHandleCGlue.m:
* CacheLoader.subproj/WKURLHandleClient.h:
* CacheLoader.subproj/WKURLLoad.h:
* CacheLoader.subproj/WKURLLoad.m:
* CacheLoader.subproj/WKURLLoadManager.h:
* CacheLoader.subproj/WKURLLoadManager.m:
* CacheLoader.subproj/WKURLMemoryCache.h:
* CacheLoader.subproj/WKURLMemoryCache.m:
* CacheLoader.subproj/WKURLProtocolHandler.h:
* CacheLoader.subproj/WKURLProtocolHandler.m:
* CookieManager.subproj/IFCookie.h:
* CookieManager.subproj/IFCookie.m:
* CookieManager.subproj/IFCookieAcceptHandler.h:
* CookieManager.subproj/IFCookieChangeListener.h:
* CookieManager.subproj/IFCookieManager.h:
* CookieManager.subproj/IFCookieManager.m:
* CookieManager.subproj/IFCookieManagerPrivate.h:
* CookieManager.subproj/IFCookiePrivate.h:
* CookieManager.subproj/WKCookie.h:
* CookieManager.subproj/WKCookie.m:
* CookieManager.subproj/WKCookieAcceptHandler.h:
* CookieManager.subproj/WKCookieChangeListener.h:
* CookieManager.subproj/WKCookieManager.h:
* CookieManager.subproj/WKCookieManager.m:
* CookieManager.subproj/WKCookieManagerPrivate.h:
* CookieManager.subproj/WKCookiePrivate.h:
* Misc.subproj/IFBinaryHeap.h:
* Misc.subproj/IFBinaryHeap.m:
* Misc.subproj/IFMonitor.h:
* Misc.subproj/IFMonitor.m:
* Misc.subproj/IFMutableData.h:
* Misc.subproj/IFMutableData.m:
* Misc.subproj/IFMutableDataPrivate.h:
* Misc.subproj/IFMutableDataPrivate.m:
* Misc.subproj/IFOrderable.h:
* Misc.subproj/IFQueue.h:
* Misc.subproj/IFQueue.m:
* Misc.subproj/IFReadWriteLock.h:
* Misc.subproj/IFReadWriteLock.m:
* Misc.subproj/WKBinaryHeap.h:
* Misc.subproj/WKBinaryHeap.m:
* Misc.subproj/WKMonitor.h:
* Misc.subproj/WKMonitor.m:
* Misc.subproj/WKMutableData.h:
* Misc.subproj/WKMutableData.m:
* Misc.subproj/WKMutableDataPrivate.h:
* Misc.subproj/WKMutableDataPrivate.m:
* Misc.subproj/WKOrderable.h:
* Misc.subproj/WKQueue.h:
* Misc.subproj/WKQueue.m:
* Misc.subproj/WKReadWriteLock.h:
* Misc.subproj/WKReadWriteLock.m:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Rename all WK files to IF (classes not renamed yet).
* Cache.subproj/IFLoadChunk.h:
* Cache.subproj/IFWebCache.h:
* Cache.subproj/IFWebCacheClient.h:
* Cache.subproj/IFWebContentType.h:
* Cache.subproj/WKLoadChunk.h:
* Cache.subproj/WKWebCache.h:
* Cache.subproj/WKWebCacheClient.h:
* Cache.subproj/WKWebContentType.h:
* History.subproj/IFAttributedURL.h:
* History.subproj/IFBackForwardList.h:
* History.subproj/IFBackForwardList.m:
* History.subproj/IFURIEntry.h:
* History.subproj/IFURIEntry.m:
* History.subproj/IFURIList.h:
* History.subproj/IFURIList.m:
* History.subproj/WKAttributedURL.h:
* History.subproj/WKBackForwardList.h:
* History.subproj/WKBackForwardList.m:
* History.subproj/WKURIEntry.h:
* History.subproj/WKURIEntry.m:
* History.subproj/WKURIList.h:
* History.subproj/WKURIList.m:
* Misc.subproj/WKException.h:
* Misc.subproj/WKException.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/IFBaseWebController.h:
* WebView.subproj/IFBaseWebController.mm:
* WebView.subproj/IFBaseWebControllerPrivate.h:
* WebView.subproj/IFBaseWebControllerPrivate.mm:
* WebView.subproj/IFDefaultWebController.h:
* WebView.subproj/IFDefaultWebController.mm:
* WebView.subproj/IFDefaultWebControllerPrivate.h:
* WebView.subproj/IFDefaultWebControllerPrivate.mm:
* WebView.subproj/IFDynamicScrollBarsView.m:
* WebView.subproj/IFGrabBag.h:
* WebView.subproj/IFPreferences.h:
* WebView.subproj/IFWebController.h:
* WebView.subproj/IFWebDataSource.h:
* WebView.subproj/IFWebDataSource.mm:
* WebView.subproj/IFWebDataSourcePrivate.h:
* WebView.subproj/IFWebDataSourcePrivate.mm:
* WebView.subproj/IFWebFrame.h:
* WebView.subproj/IFWebFrame.m:
* WebView.subproj/IFWebView.h:
* WebView.subproj/IFWebView.mm:
* WebView.subproj/IFWebViewPrivate.h:
* WebView.subproj/IFWebViewPrivate.mm:
* WebView.subproj/WKDefaultWebController.h:
* WebView.subproj/WKDefaultWebController.mm:
* WebView.subproj/WKDefaultWebControllerPrivate.h:
* WebView.subproj/WKDefaultWebControllerPrivate.mm:
* WebView.subproj/WKDynamicScrollBarsView.h:
* WebView.subproj/WKDynamicScrollBarsView.m:
* WebView.subproj/WKGrabBag.h:
* WebView.subproj/WKPreferences.h:
* WebView.subproj/WKWebController.h:
* WebView.subproj/WKWebDataSource.h:
* WebView.subproj/WKWebDataSource.mm:
* WebView.subproj/WKWebDataSourcePrivate.h:
* WebView.subproj/WKWebDataSourcePrivate.mm:
* WebView.subproj/WKWebFrame.h:
* WebView.subproj/WKWebFrame.m:
* WebView.subproj/WKWebView.h:
* WebView.subproj/WKWebView.mm:
* WebView.subproj/WKWebViewPrivate.h:
* WebView.subproj/WKWebViewPrivate.mm:
WebBrowser:
Fix everything for WebFoundation and WebKit WK --> IF rename.
* BackForwardListEntry.h:
* BrowserDocument.h:
* BrowserDocument.m:
* BrowserWindow.h:
* WebController.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@588 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 00ab910..11b8ab4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,74 @@
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
+ Rename all WK files to IF (classes not renamed yet).
+
+ * Cache.subproj/IFLoadChunk.h:
+ * Cache.subproj/IFWebCache.h:
+ * Cache.subproj/IFWebCacheClient.h:
+ * Cache.subproj/IFWebContentType.h:
+ * Cache.subproj/WKLoadChunk.h:
+ * Cache.subproj/WKWebCache.h:
+ * Cache.subproj/WKWebCacheClient.h:
+ * Cache.subproj/WKWebContentType.h:
+ * History.subproj/IFAttributedURL.h:
+ * History.subproj/IFBackForwardList.h:
+ * History.subproj/IFBackForwardList.m:
+ * History.subproj/IFURIEntry.h:
+ * History.subproj/IFURIEntry.m:
+ * History.subproj/IFURIList.h:
+ * History.subproj/IFURIList.m:
+ * History.subproj/WKAttributedURL.h:
+ * History.subproj/WKBackForwardList.h:
+ * History.subproj/WKBackForwardList.m:
+ * History.subproj/WKURIEntry.h:
+ * History.subproj/WKURIEntry.m:
+ * History.subproj/WKURIList.h:
+ * History.subproj/WKURIList.m:
+ * Misc.subproj/WKException.h:
+ * Misc.subproj/WKException.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFBaseWebController.h:
+ * WebView.subproj/IFBaseWebController.mm:
+ * WebView.subproj/IFBaseWebControllerPrivate.h:
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ * WebView.subproj/IFDefaultWebController.h:
+ * WebView.subproj/IFDefaultWebController.mm:
+ * WebView.subproj/IFDefaultWebControllerPrivate.h:
+ * WebView.subproj/IFDefaultWebControllerPrivate.mm:
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ * WebView.subproj/IFGrabBag.h:
+ * WebView.subproj/IFPreferences.h:
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.m:
+ * WebView.subproj/IFWebView.h:
+ * WebView.subproj/IFWebView.mm:
+ * WebView.subproj/IFWebViewPrivate.h:
+ * WebView.subproj/IFWebViewPrivate.mm:
+ * WebView.subproj/WKDefaultWebController.h:
+ * WebView.subproj/WKDefaultWebController.mm:
+ * WebView.subproj/WKDefaultWebControllerPrivate.h:
+ * WebView.subproj/WKDefaultWebControllerPrivate.mm:
+ * WebView.subproj/WKDynamicScrollBarsView.h:
+ * WebView.subproj/WKDynamicScrollBarsView.m:
+ * WebView.subproj/WKGrabBag.h:
+ * WebView.subproj/WKPreferences.h:
+ * WebView.subproj/WKWebController.h:
+ * WebView.subproj/WKWebDataSource.h:
+ * WebView.subproj/WKWebDataSource.mm:
+ * WebView.subproj/WKWebDataSourcePrivate.h:
+ * WebView.subproj/WKWebDataSourcePrivate.mm:
+ * WebView.subproj/WKWebFrame.h:
+ * WebView.subproj/WKWebFrame.m:
+ * WebView.subproj/WKWebView.h:
+ * WebView.subproj/WKWebView.mm:
+ * WebView.subproj/WKWebViewPrivate.h:
+ * WebView.subproj/WKWebViewPrivate.mm:
+
2002-02-01 Richard Williamson <rjw at apple.com>
Changes for dynamic scrolling frames. Added notification of complete
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 00ab910..11b8ab4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,74 @@
+2002-02-04 Maciej Stachowiak <mjs at apple.com>
+
+ Rename all WK files to IF (classes not renamed yet).
+
+ * Cache.subproj/IFLoadChunk.h:
+ * Cache.subproj/IFWebCache.h:
+ * Cache.subproj/IFWebCacheClient.h:
+ * Cache.subproj/IFWebContentType.h:
+ * Cache.subproj/WKLoadChunk.h:
+ * Cache.subproj/WKWebCache.h:
+ * Cache.subproj/WKWebCacheClient.h:
+ * Cache.subproj/WKWebContentType.h:
+ * History.subproj/IFAttributedURL.h:
+ * History.subproj/IFBackForwardList.h:
+ * History.subproj/IFBackForwardList.m:
+ * History.subproj/IFURIEntry.h:
+ * History.subproj/IFURIEntry.m:
+ * History.subproj/IFURIList.h:
+ * History.subproj/IFURIList.m:
+ * History.subproj/WKAttributedURL.h:
+ * History.subproj/WKBackForwardList.h:
+ * History.subproj/WKBackForwardList.m:
+ * History.subproj/WKURIEntry.h:
+ * History.subproj/WKURIEntry.m:
+ * History.subproj/WKURIList.h:
+ * History.subproj/WKURIList.m:
+ * Misc.subproj/WKException.h:
+ * Misc.subproj/WKException.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFBaseWebController.h:
+ * WebView.subproj/IFBaseWebController.mm:
+ * WebView.subproj/IFBaseWebControllerPrivate.h:
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ * WebView.subproj/IFDefaultWebController.h:
+ * WebView.subproj/IFDefaultWebController.mm:
+ * WebView.subproj/IFDefaultWebControllerPrivate.h:
+ * WebView.subproj/IFDefaultWebControllerPrivate.mm:
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ * WebView.subproj/IFGrabBag.h:
+ * WebView.subproj/IFPreferences.h:
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm:
+ * WebView.subproj/IFWebDataSourcePrivate.h:
+ * WebView.subproj/IFWebDataSourcePrivate.mm:
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.m:
+ * WebView.subproj/IFWebView.h:
+ * WebView.subproj/IFWebView.mm:
+ * WebView.subproj/IFWebViewPrivate.h:
+ * WebView.subproj/IFWebViewPrivate.mm:
+ * WebView.subproj/WKDefaultWebController.h:
+ * WebView.subproj/WKDefaultWebController.mm:
+ * WebView.subproj/WKDefaultWebControllerPrivate.h:
+ * WebView.subproj/WKDefaultWebControllerPrivate.mm:
+ * WebView.subproj/WKDynamicScrollBarsView.h:
+ * WebView.subproj/WKDynamicScrollBarsView.m:
+ * WebView.subproj/WKGrabBag.h:
+ * WebView.subproj/WKPreferences.h:
+ * WebView.subproj/WKWebController.h:
+ * WebView.subproj/WKWebDataSource.h:
+ * WebView.subproj/WKWebDataSource.mm:
+ * WebView.subproj/WKWebDataSourcePrivate.h:
+ * WebView.subproj/WKWebDataSourcePrivate.mm:
+ * WebView.subproj/WKWebFrame.h:
+ * WebView.subproj/WKWebFrame.m:
+ * WebView.subproj/WKWebView.h:
+ * WebView.subproj/WKWebView.mm:
+ * WebView.subproj/WKWebViewPrivate.h:
+ * WebView.subproj/WKWebViewPrivate.mm:
+
2002-02-01 Richard Williamson <rjw at apple.com>
Changes for dynamic scrolling frames. Added notification of complete
diff --git a/WebKit/History.subproj/IFAttributedURL.h b/WebKit/History.subproj/IFAttributedURL.h
index db417e9..0ecbb10 100644
--- a/WebKit/History.subproj/IFAttributedURL.h
+++ b/WebKit/History.subproj/IFAttributedURL.h
@@ -1,4 +1,4 @@
-/* WKAttributedURL.h
+/* IFAttributedURL.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
@@ -6,7 +6,7 @@
//=============================================================================
//
-// WKAttributedURL.h
+// IFAttributedURL.h
//
// WKAttributedURL is the class that is used to store a "reference" to a URL
// in the various history and bookmark mechanisms. It provides some attributes
diff --git a/WebKit/History.subproj/IFBackForwardList.h b/WebKit/History.subproj/IFBackForwardList.h
index c117329..1bb625f 100644
--- a/WebKit/History.subproj/IFBackForwardList.h
+++ b/WebKit/History.subproj/IFBackForwardList.h
@@ -1,10 +1,10 @@
-/* WKBackForwardList.h
+/* IFBackForwardList.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import <WebKit/WKURIList.h>
-#import <WebKit/WKURIEntry.h>
+#import <WebKit/IFURIList.h>
+#import <WebKit/IFURIEntry.h>
@interface WKBackForwardList : NSObject {
WKURIList *uriList;
diff --git a/WebKit/History.subproj/IFBackForwardList.m b/WebKit/History.subproj/IFBackForwardList.m
index 6ebc75a..18599b7 100644
--- a/WebKit/History.subproj/IFBackForwardList.m
+++ b/WebKit/History.subproj/IFBackForwardList.m
@@ -1,12 +1,12 @@
//
-// WKBackForwardList.m
+// IFBackForwardList.m
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
//
-#import "WKBackForwardList.h"
+#import "IFBackForwardList.h"
@implementation WKBackForwardList
diff --git a/WebKit/History.subproj/IFURIEntry.h b/WebKit/History.subproj/IFURIEntry.h
index 548504b..2a6f274 100644
--- a/WebKit/History.subproj/IFURIEntry.h
+++ b/WebKit/History.subproj/IFURIEntry.h
@@ -1,5 +1,5 @@
//
-// WKURIEntry.h
+// IFURIEntry.h
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index fc3ecb5..ea7bc9e 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -1,12 +1,12 @@
//
-// WKURIEntry.m
+// IFURIEntry.m
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
//
-#import "WKURIEntry.h"
+#import "IFURIEntry.h"
#import "WebKitReallyPrivate.h"
#if 0
diff --git a/WebKit/History.subproj/IFURIList.h b/WebKit/History.subproj/IFURIList.h
index 9972875..1930b0b 100644
--- a/WebKit/History.subproj/IFURIList.h
+++ b/WebKit/History.subproj/IFURIList.h
@@ -1,10 +1,10 @@
-/* WKURIList.h
+/* IFURIList.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import "WKURIEntry.h"
+#import "IFURIEntry.h"
typedef struct WKURIListNode WKURIListNode;
diff --git a/WebKit/History.subproj/IFURIList.m b/WebKit/History.subproj/IFURIList.m
index 0c69804..f8d34d9 100644
--- a/WebKit/History.subproj/IFURIList.m
+++ b/WebKit/History.subproj/IFURIList.m
@@ -1,8 +1,8 @@
-/* WKURIList.h
+/* IFURIList.m
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import "WKURIList.h"
+#import "IFURIList.h"
#import "WebKitReallyPrivate.h"
struct WKURIListNode
diff --git a/WebKit/History.subproj/WKAttributedURL.h b/WebKit/History.subproj/WKAttributedURL.h
deleted file mode 100644
index db417e9..0000000
--- a/WebKit/History.subproj/WKAttributedURL.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* WKAttributedURL.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#ifdef NEW_WEBKIT_API
-
-//=============================================================================
-//
-// WKAttributedURL.h
-//
-// WKAttributedURL 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
-{
- // The URL that serves as the "anchor" for the accompanying attributes.
- NSURL *url;
-
- // The human-readable title of the URL. Taken from the <TITLE> tag
- // in the case of an HTML document.
- NSString *title;
-
- // An icon to associate with the URL. Can be determined by mime type,
- // file extensions, or the various and sundry "favicon.ico" strategies.
- NSImage *image;
-
- // A place for users to add their own comments.
- NSString *comment;
-
- // The date of object creation.
- NSDate *creationDate;
-
- // The date that any of the settable fields was last changed.
- NSDate *modificationDate;
-
- // The date that the URL was last visited by the user.
- NSDate *lastVisitedDate;
-
- // The total number of times the URL has been visited.
- int visits;
-}
-
-//
-// Initializes a WKAttributedURL 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
-// the given objects, the creation and modification dates to "now" and
-// all other fields to empty values (nil or zero).
-//
--(id)initWithURL:(NSURL *)url title:(NSString *)title;
-
-//
-// Returns the URL that serves as the "anchor" for the accompanying
-// attributes.
-//
--(NSURL *)url;
-
-//
-// Returns the human-readable title of the URL, or nil if no title
-// has been set
-//
--(NSString *)title;
-
-//
-// Returns the icon associated with the URL, or nil if no icon image
-// has been set. Note that the image can be determined by mime type,
-// file extensions, or the various and sundry "favicon.ico" strategies.
-//
--(NSImage *)image;
-
-//
-// Returns the comment string set by the user, if any, or nil if no
-// comment has been set.
-//
--(NSString *)comment;
-
-//
-// Returns the date of object creation. This value is immutable.
-//
--(NSDate *)creationDate;
-
-//
-// Returns the date that any of the settable fields was last changed.
-//
--(NSDate *)modificationDate;
-
-//
-// Returns the date that the URL was last visited by the user, or nil
-// if the URL has never been visited.
-//
--(NSDate *)lastVisitedDate;
-
-//
-// Returns the total number of times the URL has been visited.
-//
--(int)visits;
-
-//
-// Sets the URL of the receiver to the given object.
-//
--(void)setURL:(NSURL *)aURL;
-
-//
-// Sets the title of the receiver to the given object.
-//
--(void)setTitle:(NSString *)aTitle;
-
-//
-// Sets the image of the receiver to the given object.
-//
--(void)setImage:(NSImage *)anImage;
-
-//
-// Sets the comment of the receiver to the given object.
-//
--(void)setComment:(NSString *)aComment;
-
-//
-// Sets the modification date of the receiver to the given object.
-//
--(void)setModificationDate:(NSDate *)aDate;
-
-//
-// Sets the last-visited date of the receiver to the given object.
-//
--(void)setLastVisitedDate:(NSDate *)aDate;
-
-//
-// Increments the visited field of the receiver by 1 (one).
-//
--(void)incrementVisits;
-
-//
-// Returns a hash code for the receiver.
-//
--(unsigned)hash;
-
-//
-// 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
-// equal URLs and creation dates.
-//
--(BOOL)isEqual:(id)anObject;
-
- at end
-
-//=============================================================================
-
-#endif // NEW_WEBKIT_API
diff --git a/WebKit/History.subproj/WKBackForwardList.h b/WebKit/History.subproj/WKBackForwardList.h
deleted file mode 100644
index c117329..0000000
--- a/WebKit/History.subproj/WKBackForwardList.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* WKBackForwardList.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-#import <WebKit/WKURIList.h>
-#import <WebKit/WKURIEntry.h>
-
- at interface WKBackForwardList : NSObject {
- WKURIList *uriList;
- int index;
- NSLock *mutex;
- int state;
-}
-
--(id)init;
-
--(void)addEntry:(WKURIEntry *)entry;
-
--(WKURIEntry *)back;
--(WKURIEntry *)forward;
-
--(WKURIEntry *)currentEntry;
-
--(NSArray *)backList;
--(NSArray *)forwardList;
-
--(BOOL)canGoBack;
--(BOOL)canGoForward;
-
- at end
-
-
-#ifdef NEW_WEBKIT_API
-
-//=============================================================================
-//
-// WKBackForwardList.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
-{
-
--(id)init;
-
--(void)addAttributedURL:(WKAttributedURL *)url;
-
--(WKAttributedURL *)back;
--(WKAttributedURL *)forward;
-
--(NSArray *)backList;
--(NSArray *)forwardList;
-
--(BOOL)canGoBack;
--(BOOL)canGoForward;
-
-}
-
-//=============================================================================
-
-#endif // NEW_WEBKIT_API
diff --git a/WebKit/History.subproj/WKBackForwardList.m b/WebKit/History.subproj/WKBackForwardList.m
deleted file mode 100644
index 6ebc75a..0000000
--- a/WebKit/History.subproj/WKBackForwardList.m
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// WKBackForwardList.m
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
-//
-
-#import "WKBackForwardList.h"
-
- at implementation WKBackForwardList
-
--(id)init
-{
- if (self != [super init])
- {
- return nil;
- }
-
- uriList = [[WKURIList alloc] init];
- [uriList setAllowsDuplicates:YES];
- index = 0;
- mutex = [[NSLock alloc] init];
-
- return self;
-}
-
--(void)dealloc
-{
- [uriList release];
- [mutex release];
-
- [super dealloc];
-}
-
--(void)addEntry:(WKURIEntry *)entry
-{
- [mutex lock];
- if (index > 0) {
- [uriList removeEntriesToIndex:index];
- index = 0;
- }
- [uriList addEntry:entry];
- [mutex unlock];
-}
-
--(WKURIEntry *)back
-{
- WKURIEntry *result;
-
- [mutex lock];
- index++;
- result = [uriList entryAtIndex:index];
- [mutex unlock];
-
- return result;
-}
-
--(WKURIEntry *)currentEntry
-{
- return [uriList entryAtIndex:index];
-}
-
--(WKURIEntry *)forward
-{
- WKURIEntry *result;
-
- [mutex lock];
- index--;
- result = [uriList entryAtIndex:index];
- [mutex unlock];
-
- return result;
-}
-
--(BOOL)canGoBack
-{
- BOOL result;
- int count;
-
- [mutex lock];
- count = [uriList count];
- result = (count > 1 && index < (count - 1));
- [mutex unlock];
-
- return result;
-}
-
--(BOOL)canGoForward
-{
- BOOL result;
-
- [mutex lock];
- result = (index > 0);
- [mutex unlock];
-
- return result;
-}
-
--(NSArray *)backList
-{
- // FIXME: implement this some day
- return nil;
-}
-
--(NSArray *)forwardList
-{
- // FIXME: implement this some day
- return nil;
-}
-
--(NSString *)description
-{
- NSMutableString *result;
- int i;
-
- [mutex lock];
-
- result = [NSMutableString stringWithCapacity:512];
-
- [result appendString:@"\n--------------------------------------------\n"];
- [result appendString:@"WKBackForwardList:\n"];
-
- for (i = 0; i < [uriList count]; i++) {
- if (i == index) {
- [result appendString:@" >>>"];
- }
- else {
- [result appendString:@" "];
- }
- [result appendFormat:@" %d) ", i];
- [result appendString:[[uriList entryAtIndex:i] description]];
- [result appendString:@"\n"];
- }
-
- [result appendString:@"\n--------------------------------------------\n"];
-
- [mutex unlock];
-
- return result;
-}
-
- at end
diff --git a/WebKit/History.subproj/WKURIEntry.h b/WebKit/History.subproj/WKURIEntry.h
deleted file mode 100644
index 548504b..0000000
--- a/WebKit/History.subproj/WKURIEntry.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// WKURIEntry.h
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <AppKit/AppKit.h>
-//#import <WCURIEntry.h>
-
-//@interface WKURIEntry : NSObject <WCURIEntry>
- at interface WKURIEntry : NSObject
-{
- NSURL *_url;
- NSString *_title;
- NSImage *_image;
- NSString *_comment;
- NSDate *_creationDate;
- NSDate *_modificationDate;
- NSDate *_lastVisitedDate;
-}
-
--(id)init;
--(id)initWithURL:(NSURL *)url title:(NSString *)title;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment;
-
--(NSURL *)url;
--(NSString *)title;
--(NSImage *)image;
--(NSString *)comment;
--(NSDate *)creationDate;
--(NSDate *)modificationDate;
--(NSDate *)lastVisitedDate;
-
--(void)setURL:(NSURL *)url;
--(void)setTitle:(NSString *)title;
--(void)setImage:(NSImage *)image;
--(void)setComment:(NSString *)comment;
--(void)setModificationDate:(NSDate *)date;
--(void)setLastVisitedDate:(NSDate *)date;
-
--(unsigned)hash;
--(BOOL)isEqual:(id)anObject;
-
- at end
-
diff --git a/WebKit/History.subproj/WKURIEntry.m b/WebKit/History.subproj/WKURIEntry.m
deleted file mode 100644
index fc3ecb5..0000000
--- a/WebKit/History.subproj/WKURIEntry.m
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// WKURIEntry.m
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
-//
-
-#import "WKURIEntry.h"
-#import "WebKitReallyPrivate.h"
-
-#if 0
-#import "WCURIEntry.h"
-
-// *** Function to access WCURICache singleton
-
-id <WCURIEntry> WCCreateURIEntry(void)
-{
- return [[WKURIEntry alloc] init];
-}
-#endif
-
- at implementation WKURIEntry
-
--(id)init
-{
- return [self initWithURL:nil title:nil image:nil comment:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title
-{
- return [self initWithURL:url title:title image:nil comment:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image
-{
- return [self initWithURL:url title:title image:image comment:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image comment:(NSString *)comment
-{
- if (self != [super init])
- {
- return nil;
- }
-
- _url = [url retain];
- _title = [title retain];
- _image = [image retain];
- _comment = [comment retain];
- _creationDate = [[NSDate alloc] init];
- _modificationDate = [[NSDate alloc] init];
- _lastVisitedDate = [[NSDate alloc] init];
-
- return self;
-}
-
--(NSURL *)url
-{
- return _url;
-}
-
--(NSString *)title
-{
- return _title;
-}
-
--(NSImage *)image
-{
- return _image;
-}
-
--(NSString *)comment
-{
- return _comment;
-}
-
--(NSDate *)creationDate;
-{
- return _creationDate;
-}
-
--(NSDate *)modificationDate;
-{
- return _modificationDate;
-}
-
--(NSDate *)lastVisitedDate
-{
- return _lastVisitedDate;
-}
-
--(void)setURL:(NSURL *)url
-{
- if (url != _url) {
- [_url release];
- _url = [url retain];
- }
-}
-
--(void)setTitle:(NSString *)title
-{
- if (title != _title) {
- [_title release];
- _title = [title retain];
- }
-}
-
--(void)setImage:(NSImage *)image
-{
- if (image != _image) {
- [_image release];
- _image = [image retain];
- }
-}
-
--(void)setComment:(NSString *)comment
-{
- if (comment != _comment) {
- [_comment release];
- _comment = [comment retain];
- }
-}
-
--(void)setModificationDate:(NSDate *)date
-{
- if (date != _modificationDate) {
- [_modificationDate release];
- _modificationDate = [date retain];
- }
-}
-
--(void)setLastVisitedDate:(NSDate *)date
-{
- if (date != _lastVisitedDate) {
- [_lastVisitedDate release];
- _lastVisitedDate = [date retain];
- }
-}
-
--(unsigned)hash
-{
- return [_url hash];
-}
-
--(BOOL)isEqual:(id)anObject
-{
- BOOL result;
-
- result = NO;
-
- if ([anObject isMemberOfClass:[WKURIEntry class]]) {
- result = [_url isEqual:[((WKURIEntry *)anObject) url]];
- }
-
- return result;
-}
-
--(NSString *)description
-{
- return [NSString stringWithFormat:@"WKURIEntry %@", _url];
-}
-
- at end
-
diff --git a/WebKit/History.subproj/WKURIList.h b/WebKit/History.subproj/WKURIList.h
deleted file mode 100644
index 9972875..0000000
--- a/WebKit/History.subproj/WKURIList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* WKURIList.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
-#import "WKURIEntry.h"
-
-typedef struct WKURIListNode WKURIListNode;
-
- at interface WKURIList : NSObject
-{
- WKURIListNode *_head;
- WKURIListNode *_tail;
- int _count;
- BOOL _allowsDuplicates;
- int _maximumSize;
-}
-
--(id)init;
-
--(BOOL)allowsDuplicates;
--(void)setAllowsDuplicates:(BOOL)allowsDuplicates;
-
--(int)count;
-
--(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;
-
--(WKURIEntry *)entryForURL:(NSURL *)url;
--(WKURIEntry *)entryAtIndex:(int)index;
--(WKURIEntry *)removeEntryAtIndex:(int)index;
--(void)removeEntriesToIndex:(int)index;
-
- at end
diff --git a/WebKit/History.subproj/WKURIList.m b/WebKit/History.subproj/WKURIList.m
deleted file mode 100644
index 0c69804..0000000
--- a/WebKit/History.subproj/WKURIList.m
+++ /dev/null
@@ -1,331 +0,0 @@
-/* WKURIList.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import "WKURIList.h"
-#import "WebKitReallyPrivate.h"
-
-struct WKURIListNode
-{
- unsigned hash;
- WKURIEntry *entry;
- WKURIListNode *prev;
- WKURIListNode *next;
-};
-
-static WKURIListNode *newURIListNode(WKURIEntry *entry)
-{
- WKURIListNode *node;
-
- [entry retain];
-
- node = malloc(sizeof(WKURIListNode));
- node->hash = [entry hash];
- node->entry = entry;
- node->prev = nil;
- node->next = nil;
-
- return node;
-}
-
-static void freeNode(WKURIListNode *node)
-{
- // it is important to autorelase here rather than using
- // a straight release since we often return an entry
- // as a result of an operation that causes a node
- // to be freed
- [node->entry autorelease];
- free(node);
-}
-
-
- at implementation WKURIList
-
--(id)init
-{
- if (self != [super init])
- {
- return nil;
- }
-
- _head = _tail = nil;
- _count = 0;
- _maximumSize = -1;
- _allowsDuplicates = NO;
-
- return self;
-}
-
--(void)dealloc
-{
- WKURIListNode *curNode;
- WKURIListNode *delNode;
-
- curNode = _head;
-
- while (curNode) {
- delNode = curNode;
- curNode = curNode->next;
- freeNode(delNode);
- }
-}
-
--(BOOL)allowsDuplicates
-{
- return _allowsDuplicates;
-}
-
--(void)setAllowsDuplicates:(BOOL)allowsDuplicates
-{
- _allowsDuplicates = allowsDuplicates;
-}
-
--(int)count
-{
- return _count;
-}
-
--(int)maximumSize
-{
- return _maximumSize;
-}
-
--(void)setMaximumSize:(int)size
-{
- WEBKIT_ASSERT(size > 0 || size == -1);
- _maximumSize = size;
-}
-
-
-
--(WKURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
-{
- WKURIEntry *result;
-
- result = [[WKURIEntry alloc] initWithURL:url title:title];
- [self addEntry:result];
-
- return result;
-}
-
--(void)addEntry:(WKURIEntry *)entry
-{
- WKURIListNode *node;
- unsigned hash;
-
- if (!_allowsDuplicates) {
- // search the list first and remove any entry with the same URL
- // having the same title does not count
- // use the hash codes of the urls to speed up the linear search
- hash = [entry hash];
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [entry isEqual:node->entry]) {
- _count--;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
- break;
- }
- }
- }
-
- // make new entry and put it at the head of the list
- node = newURIListNode(entry);
- node->next = _head;
- _head = node;
- _count++;
- if (_count == 1) {
- _tail = _head;
- }
-
- if (_maximumSize != -1 && _count > _maximumSize) {
- // drop off the tail
- node = _tail;
- _tail = _tail->prev;
- _tail->next = nil;
- freeNode(node);
- _count--;
- }
-}
-
--(WKURIEntry *)removeURL:(NSURL *)url
-{
- WKURIEntry *removedEntry;
- WKURIListNode *node;
- unsigned hash;
-
- removedEntry = nil;
- hash = [url hash];
-
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [url isEqual:[node->entry url]]) {
- _count--;
- removedEntry = node->entry;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
- break;
- }
- }
-
- return removedEntry;
-}
-
--(BOOL)removeEntry:(WKURIEntry *)entry
-{
- BOOL removed;
- WKURIListNode *node;
- unsigned hash;
-
- removed = NO;
- hash = [entry hash];
-
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [entry isEqual:node->entry]) {
- _count--;
- removed = YES;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
- break;
- }
- }
-
- return removed;
-}
-
--(WKURIEntry *)entryForURL:(NSURL *)url
-{
- WKURIEntry *foundEntry;
- WKURIListNode *node;
- unsigned hash;
-
- foundEntry = nil;
- hash = [url hash];
-
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [url isEqual:[node->entry url]]) {
- foundEntry = node->entry;
- break;
- }
- }
-
- return foundEntry;
-}
-
--(WKURIEntry *)entryAtIndex:(int)index
-{
- int i;
- WKURIListNode *node;
-
- WEBKIT_ASSERT(index >= 0 && index < _count);
-
- node = _head;
-
- for (i = 0; i < index; i++) {
- node = node->next;
- }
-
- return node->entry;
-}
-
--(WKURIEntry *)removeEntryAtIndex:(int)index
-{
- WKURIEntry *removedEntry;
- WKURIListNode *node;
- int i;
-
- WEBKIT_ASSERT(index > 0 && index < _count);
-
- node = _head;
-
- for (i = 0; i < index; i++) {
- node = node->next;
- }
-
- _count--;
- removedEntry = node->entry;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
-
- return removedEntry;
-}
-
--(void)removeEntriesToIndex:(int)index
-{
- WKURIListNode *node;
- WKURIListNode *delNode;
- int i;
-
- WEBKIT_ASSERT(index > 0 && index < _count);
-
- node = _head;
-
- for (i = 0; i < index; i++) {
- delNode = node;
- node = node->next;
- freeNode(delNode);
- _count--;
- }
-
- _head = node;
-}
-
- at end
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index c117329..1bb625f 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -1,10 +1,10 @@
-/* WKBackForwardList.h
+/* IFBackForwardList.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import <WebKit/WKURIList.h>
-#import <WebKit/WKURIEntry.h>
+#import <WebKit/IFURIList.h>
+#import <WebKit/IFURIEntry.h>
@interface WKBackForwardList : NSObject {
WKURIList *uriList;
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 6ebc75a..18599b7 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -1,12 +1,12 @@
//
-// WKBackForwardList.m
+// IFBackForwardList.m
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
//
-#import "WKBackForwardList.h"
+#import "IFBackForwardList.h"
@implementation WKBackForwardList
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 548504b..2a6f274 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -1,5 +1,5 @@
//
-// WKURIEntry.h
+// IFURIEntry.h
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index fc3ecb5..ea7bc9e 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -1,12 +1,12 @@
//
-// WKURIEntry.m
+// IFURIEntry.m
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
//
-#import "WKURIEntry.h"
+#import "IFURIEntry.h"
#import "WebKitReallyPrivate.h"
#if 0
diff --git a/WebKit/History.subproj/WebHistoryList.h b/WebKit/History.subproj/WebHistoryList.h
index 9972875..1930b0b 100644
--- a/WebKit/History.subproj/WebHistoryList.h
+++ b/WebKit/History.subproj/WebHistoryList.h
@@ -1,10 +1,10 @@
-/* WKURIList.h
+/* IFURIList.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import "WKURIEntry.h"
+#import "IFURIEntry.h"
typedef struct WKURIListNode WKURIListNode;
diff --git a/WebKit/History.subproj/WebHistoryList.m b/WebKit/History.subproj/WebHistoryList.m
index 0c69804..f8d34d9 100644
--- a/WebKit/History.subproj/WebHistoryList.m
+++ b/WebKit/History.subproj/WebHistoryList.m
@@ -1,8 +1,8 @@
-/* WKURIList.h
+/* IFURIList.m
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import "WKURIList.h"
+#import "IFURIList.h"
#import "WebKitReallyPrivate.h"
struct WKURIListNode
diff --git a/WebKit/Misc.subproj/WKException.h b/WebKit/Misc.subproj/WKException.h
deleted file mode 100644
index 60522ae..0000000
--- a/WebKit/Misc.subproj/WKException.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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
-
-extern NSString * const WKMethodNotYetImplemented;
-extern NSString * const WKRuntimeError;
-
-#endif
diff --git a/WebKit/Misc.subproj/WKException.m b/WebKit/Misc.subproj/WKException.m
deleted file mode 100644
index b2b54d4..0000000
--- a/WebKit/Misc.subproj/WKException.m
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#import <Cocoa/Cocoa.h>
-
-NSString * const WKMethodNotYetImplemented = @"WKMethodNotYetImplemented";
-NSString * const WKRuntimeError = @"WKRuntimeError";
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 291546b..7862557 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -178,23 +178,26 @@
25BECC9D017E0A0D0ECA149E,
251E877A01A1EE570ECA149E,
25A5593301A5996D0ECA149E,
- 25A8176F01B5B9180ECA149E,
- 25A8177301B698760ECA149E,
- 25A8177701B6A5240ECA149E,
- 9C04852501CFF9CE0ECA16EA,
- 9C04852601CFF9CE0ECA16EA,
- 9C04852701CFF9CE0ECA16EA,
- 9C04852801CFF9CE0ECA16EA,
- 9C04852901CFF9CE0ECA16EA,
- 9C04853001CFFD060ECA16EA,
- 9C04853101CFFD060ECA16EA,
- 9C04853201CFFD060ECA16EA,
- 9C04853301CFFD060ECA16EA,
- 9C64424901F790750ECA16EA,
- 9C64424F01F7AF2D0ECA16EA,
- 9C64425001F7AF2D0ECA16EA,
- 9C13328B01FFB40A0ECA16EA,
- 9C56CE4B020B42AF0ECA16EA,
+ 39446087020F50ED0ECA1767,
+ 39446088020F50ED0ECA1767,
+ 3944608B020F50ED0ECA1767,
+ 3944608C020F50ED0ECA1767,
+ 3944608D020F50ED0ECA1767,
+ 3944608E020F50ED0ECA1767,
+ 3944608F020F50ED0ECA1767,
+ 39446090020F50ED0ECA1767,
+ 39446091020F50ED0ECA1767,
+ 39446092020F50ED0ECA1767,
+ 39446093020F50ED0ECA1767,
+ 39446094020F50ED0ECA1767,
+ 39446095020F50ED0ECA1767,
+ 39446096020F50ED0ECA1767,
+ 39446097020F50ED0ECA1767,
+ 39446098020F50ED0ECA1767,
+ 39446099020F50ED0ECA1767,
+ 3944609A020F50ED0ECA1767,
+ 3944609B020F50ED0ECA1767,
+ 3944609C020F50ED0ECA1767,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@@ -218,18 +221,18 @@
25BECC9F017E0A0D0ECA149E,
251E877B01A1EE570ECA149E,
25A5593401A5996D0ECA149E,
- 25A8177001B5B9180ECA149E,
- 25A8177401B698760ECA149E,
- 25A8177801B6A5240ECA149E,
- 9C04852A01CFF9CE0ECA16EA,
- 9C64424601F78B4B0ECA16EA,
- 9C64424A01F790750ECA16EA,
- 9C64425101F7AF2D0ECA16EA,
- 9C64425201F7AF2D0ECA16EA,
- 9C64425401F7B1740ECA16EA,
- 9C64425601F7B4E20ECA16EA,
- 9C13328C01FFB40A0ECA16EA,
- 9C56CE4C020B42AF0ECA16EA,
+ 3944609D020F50ED0ECA1767,
+ 3944609E020F50ED0ECA1767,
+ 394460A1020F50ED0ECA1767,
+ 394460A2020F50ED0ECA1767,
+ 394460A3020F50ED0ECA1767,
+ 394460A4020F50ED0ECA1767,
+ 394460A5020F50ED0ECA1767,
+ 394460A6020F50ED0ECA1767,
+ 394460A7020F50ED0ECA1767,
+ 394460A8020F50ED0ECA1767,
+ 394460A9020F50ED0ECA1767,
+ 394460AA020F50ED0ECA1767,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -365,14 +368,14 @@
};
254DC334016E1D3F0ECA149E = {
children = (
+ 3944607A020F50ED0ECA1767,
+ 3944607B020F50ED0ECA1767,
2568C72C0174912D0ECA149E,
25C29825016E29620ECA149E,
2568C729017490CF0ECA149E,
2568C72B017491070ECA149E,
25A5593101A5996D0ECA149E,
25A5593201A5996D0ECA149E,
- 9C64424701F790750ECA16EA,
- 9C64424801F790750ECA16EA,
);
isa = PBXGroup;
name = Misc;
@@ -380,6 +383,10 @@
};
2568C71E017490290ECA149E = {
children = (
+ 39446083020F50ED0ECA1767,
+ 39446084020F50ED0ECA1767,
+ 39446085020F50ED0ECA1767,
+ 39446086020F50ED0ECA1767,
25BECC93017E0A0D0ECA149E,
25BECC94017E0A0D0ECA149E,
25BECC95017E0A0D0ECA149E,
@@ -390,10 +397,6 @@
2568C71F017490290ECA149E,
251E877801A1EE570ECA149E,
251E877901A1EE570ECA149E,
- 9C04852C01CFFD060ECA16EA,
- 9C04852D01CFFD060ECA16EA,
- 9C04852E01CFFD060ECA16EA,
- 9C04852F01CFFD060ECA16EA,
);
isa = PBXGroup;
name = Cache;
@@ -498,93 +501,19 @@
};
25A8176801B5474B0ECA149E = {
children = (
- 25A8176D01B5B9180ECA149E,
- 25A8176E01B5B9180ECA149E,
- 25A8177101B698760ECA149E,
- 25A8177201B698760ECA149E,
- 25A8177501B6A5240ECA149E,
- 25A8177601B6A5240ECA149E,
+ 3944607C020F50ED0ECA1767,
+ 3944607D020F50ED0ECA1767,
+ 3944607E020F50ED0ECA1767,
+ 3944607F020F50ED0ECA1767,
+ 39446080020F50ED0ECA1767,
+ 39446081020F50ED0ECA1767,
+ 39446082020F50ED0ECA1767,
);
isa = PBXGroup;
name = History;
path = History.subproj;
refType = 4;
};
- 25A8176D01B5B9180ECA149E = {
- isa = PBXFileReference;
- path = WKURIList.h;
- refType = 4;
- };
- 25A8176E01B5B9180ECA149E = {
- isa = PBXFileReference;
- path = WKURIList.m;
- refType = 4;
- };
- 25A8176F01B5B9180ECA149E = {
- fileRef = 25A8176D01B5B9180ECA149E;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 25A8177001B5B9180ECA149E = {
- fileRef = 25A8176E01B5B9180ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 25A8177101B698760ECA149E = {
- isa = PBXFileReference;
- path = WKURIEntry.h;
- refType = 4;
- };
- 25A8177201B698760ECA149E = {
- isa = PBXFileReference;
- path = WKURIEntry.m;
- refType = 4;
- };
- 25A8177301B698760ECA149E = {
- fileRef = 25A8177101B698760ECA149E;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 25A8177401B698760ECA149E = {
- fileRef = 25A8177201B698760ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
- 25A8177501B6A5240ECA149E = {
- isa = PBXFileReference;
- path = WKBackForwardList.h;
- refType = 4;
- };
- 25A8177601B6A5240ECA149E = {
- isa = PBXFileReference;
- path = WKBackForwardList.m;
- refType = 4;
- };
- 25A8177701B6A5240ECA149E = {
- fileRef = 25A8177501B6A5240ECA149E;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 25A8177801B6A5240ECA149E = {
- fileRef = 25A8177601B6A5240ECA149E;
- isa = PBXBuildFile;
- settings = {
- };
- };
25BECC93017E0A0D0ECA149E = {
isa = PBXFileReference;
path = NSURICache.h;
@@ -778,49 +707,194 @@
//352
//353
//354
-//9C0
-//9C1
-//9C2
-//9C3
-//9C4
- 9C04851E01CFF9CE0ECA16EA = {
+//390
+//391
+//392
+//393
+//394
+ 39446063020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = WKWebController.h;
- path = WebView.subproj/WKWebController.h;
- refType = 2;
+ name = IFBaseWebController.h;
+ path = WebView.subproj/IFBaseWebController.h;
+ refType = 4;
};
- 9C04851F01CFF9CE0ECA16EA = {
+ 39446064020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = WKWebDataSource.h;
- path = WebView.subproj/WKWebDataSource.h;
- refType = 2;
+ name = IFBaseWebController.mm;
+ path = WebView.subproj/IFBaseWebController.mm;
+ refType = 4;
+ };
+ 39446065020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFBaseWebControllerPrivate.h;
+ path = WebView.subproj/IFBaseWebControllerPrivate.h;
+ refType = 4;
+ };
+ 39446066020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFBaseWebControllerPrivate.mm;
+ path = WebView.subproj/IFBaseWebControllerPrivate.mm;
+ refType = 4;
+ };
+ 3944606B020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFDynamicScrollBarsView.h;
+ path = WebView.subproj/IFDynamicScrollBarsView.h;
+ refType = 4;
+ };
+ 3944606C020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFDynamicScrollBarsView.m;
+ path = WebView.subproj/IFDynamicScrollBarsView.m;
+ refType = 4;
+ };
+ 3944606D020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFGrabBag.h;
+ path = WebView.subproj/IFGrabBag.h;
+ refType = 4;
+ };
+ 3944606E020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFPreferences.h;
+ path = WebView.subproj/IFPreferences.h;
+ refType = 4;
+ };
+ 3944606F020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebController.h;
+ path = WebView.subproj/IFWebController.h;
+ refType = 4;
+ };
+ 39446070020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebDataSource.h;
+ path = WebView.subproj/IFWebDataSource.h;
+ refType = 4;
+ };
+ 39446071020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebDataSource.mm;
+ path = WebView.subproj/IFWebDataSource.mm;
+ refType = 4;
};
- 9C04852001CFF9CE0ECA16EA = {
+ 39446072020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = WKWebDataSource.mm;
- path = WebView.subproj/WKWebDataSource.mm;
- refType = 2;
+ name = IFWebDataSourcePrivate.h;
+ path = WebView.subproj/IFWebDataSourcePrivate.h;
+ refType = 4;
+ };
+ 39446073020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebDataSourcePrivate.mm;
+ path = WebView.subproj/IFWebDataSourcePrivate.mm;
+ refType = 4;
+ };
+ 39446074020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebFrame.h;
+ path = WebView.subproj/IFWebFrame.h;
+ refType = 4;
+ };
+ 39446075020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebFrame.m;
+ path = WebView.subproj/IFWebFrame.m;
+ refType = 4;
+ };
+ 39446076020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebView.h;
+ path = WebView.subproj/IFWebView.h;
+ refType = 4;
+ };
+ 39446077020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebView.mm;
+ path = WebView.subproj/IFWebView.mm;
+ refType = 4;
+ };
+ 39446078020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebViewPrivate.h;
+ path = WebView.subproj/IFWebViewPrivate.h;
+ refType = 4;
+ };
+ 39446079020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ name = IFWebViewPrivate.mm;
+ path = WebView.subproj/IFWebViewPrivate.mm;
+ refType = 4;
};
- 9C04852101CFF9CE0ECA16EA = {
+ 3944607A020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = WKWebDataSourcePrivate.h;
- path = WebView.subproj/WKWebDataSourcePrivate.h;
- refType = 2;
+ name = IFException.h;
+ path = Misc.subproj/IFException.h;
+ refType = 4;
};
- 9C04852201CFF9CE0ECA16EA = {
+ 3944607B020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = WKWebView.h;
- path = WebView.subproj/WKWebView.h;
- refType = 2;
+ name = IFException.m;
+ path = Misc.subproj/IFException.m;
+ refType = 4;
};
- 9C04852401CFF9CE0ECA16EA = {
+ 3944607C020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = WKWebViewPrivate.h;
- path = WebView.subproj/WKWebViewPrivate.h;
- refType = 2;
+ path = IFAttributedURL.h;
+ refType = 4;
+ };
+ 3944607D020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ path = IFBackForwardList.h;
+ refType = 4;
};
- 9C04852501CFF9CE0ECA16EA = {
- fileRef = 9C04851E01CFF9CE0ECA16EA;
+ 3944607E020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ path = IFBackForwardList.m;
+ refType = 4;
+ };
+ 3944607F020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ path = IFURIEntry.h;
+ refType = 4;
+ };
+ 39446080020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ path = IFURIEntry.m;
+ refType = 4;
+ };
+ 39446081020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ path = IFURIList.h;
+ refType = 4;
+ };
+ 39446082020F50ED0ECA1767 = {
+ isa = PBXFileReference;
+ 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;
settings = {
ATTRIBUTES = (
@@ -828,8 +902,14 @@
);
};
};
- 9C04852601CFF9CE0ECA16EA = {
- fileRef = 9C04851F01CFF9CE0ECA16EA;
+ 39446088020F50ED0ECA1767 = {
+ fileRef = 39446065020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 3944608B020F50ED0ECA1767 = {
+ fileRef = 3944606B020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -837,17 +917,20 @@
);
};
};
- 9C04852701CFF9CE0ECA16EA = {
- fileRef = 9C04852101CFF9CE0ECA16EA;
+ 3944608C020F50ED0ECA1767 = {
+ fileRef = 3944606D020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 3944608D020F50ED0ECA1767 = {
+ fileRef = 3944606E020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
- ATTRIBUTES = (
- Private,
- );
};
};
- 9C04852801CFF9CE0ECA16EA = {
- fileRef = 9C04852201CFF9CE0ECA16EA;
+ 3944608E020F50ED0ECA1767 = {
+ fileRef = 3944606F020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -855,47 +938,23 @@
);
};
};
- 9C04852901CFF9CE0ECA16EA = {
- fileRef = 9C04852401CFF9CE0ECA16EA;
+ 3944608F020F50ED0ECA1767 = {
+ fileRef = 39446070020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
- Private,
+ Public,
);
};
};
- 9C04852A01CFF9CE0ECA16EA = {
- fileRef = 9C04852001CFF9CE0ECA16EA;
+ 39446090020F50ED0ECA1767 = {
+ fileRef = 39446072020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C04852C01CFFD060ECA16EA = {
- isa = PBXFileReference;
- name = WKLoadChunk.h;
- path = Cache.subproj/WKLoadChunk.h;
- refType = 2;
- };
- 9C04852D01CFFD060ECA16EA = {
- isa = PBXFileReference;
- name = WKWebCache.h;
- path = Cache.subproj/WKWebCache.h;
- refType = 2;
- };
- 9C04852E01CFFD060ECA16EA = {
- isa = PBXFileReference;
- name = WKWebCacheClient.h;
- path = Cache.subproj/WKWebCacheClient.h;
- refType = 2;
- };
- 9C04852F01CFFD060ECA16EA = {
- isa = PBXFileReference;
- name = WKWebContentType.h;
- path = Cache.subproj/WKWebContentType.h;
- refType = 2;
- };
- 9C04853001CFFD060ECA16EA = {
- fileRef = 9C04852C01CFFD060ECA16EA;
+ 39446091020F50ED0ECA1767 = {
+ fileRef = 39446074020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -903,8 +962,8 @@
);
};
};
- 9C04853101CFFD060ECA16EA = {
- fileRef = 9C04852D01CFFD060ECA16EA;
+ 39446092020F50ED0ECA1767 = {
+ fileRef = 39446076020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -912,17 +971,20 @@
);
};
};
- 9C04853201CFFD060ECA16EA = {
- fileRef = 9C04852E01CFFD060ECA16EA;
+ 39446093020F50ED0ECA1767 = {
+ fileRef = 39446078020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
- ATTRIBUTES = (
- Public,
- );
};
};
- 9C04853301CFFD060ECA16EA = {
- fileRef = 9C04852F01CFFD060ECA16EA;
+ 39446094020F50ED0ECA1767 = {
+ fileRef = 3944607A020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 39446095020F50ED0ECA1767 = {
+ fileRef = 3944607C020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -930,20 +992,8 @@
);
};
};
- 9C13328901FFB40A0ECA16EA = {
- isa = PBXFileReference;
- name = WKWebFrame.h;
- path = WebView.subproj/WKWebFrame.h;
- refType = 2;
- };
- 9C13328A01FFB40A0ECA16EA = {
- isa = PBXFileReference;
- name = WKWebFrame.m;
- path = WebView.subproj/WKWebFrame.m;
- refType = 2;
- };
- 9C13328B01FFB40A0ECA16EA = {
- fileRef = 9C13328901FFB40A0ECA16EA;
+ 39446096020F50ED0ECA1767 = {
+ fileRef = 3944607D020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -951,175 +1001,151 @@
);
};
};
- 9C13328C01FFB40A0ECA16EA = {
- fileRef = 9C13328A01FFB40A0ECA16EA;
+ 39446097020F50ED0ECA1767 = {
+ fileRef = 3944607F020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Public,
+ );
};
};
- 9C56CE49020B42AF0ECA16EA = {
- isa = PBXFileReference;
- name = WKDynamicScrollBarsView.h;
- path = WebView.subproj/WKDynamicScrollBarsView.h;
- refType = 2;
- };
- 9C56CE4A020B42AF0ECA16EA = {
- isa = PBXFileReference;
- name = WKDynamicScrollBarsView.m;
- path = WebView.subproj/WKDynamicScrollBarsView.m;
- refType = 2;
- };
- 9C56CE4B020B42AF0ECA16EA = {
- fileRef = 9C56CE49020B42AF0ECA16EA;
+ 39446098020F50ED0ECA1767 = {
+ fileRef = 39446081020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
- Private,
+ Public,
);
};
};
- 9C56CE4C020B42AF0ECA16EA = {
- fileRef = 9C56CE4A020B42AF0ECA16EA;
+ 39446099020F50ED0ECA1767 = {
+ fileRef = 39446083020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C64424501F78B4B0ECA16EA = {
- isa = PBXFileReference;
- name = WKWebViewPrivate.mm;
- path = WebView.subproj/WKWebViewPrivate.mm;
- refType = 2;
- };
- 9C64424601F78B4B0ECA16EA = {
- fileRef = 9C64424501F78B4B0ECA16EA;
+ 3944609A020F50ED0ECA1767 = {
+ fileRef = 39446084020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C64424701F790750ECA16EA = {
- isa = PBXFileReference;
- name = WKException.h;
- path = Misc.subproj/WKException.h;
- refType = 2;
- };
- 9C64424801F790750ECA16EA = {
- isa = PBXFileReference;
- name = WKException.m;
- path = Misc.subproj/WKException.m;
- refType = 2;
- };
- 9C64424901F790750ECA16EA = {
- fileRef = 9C64424701F790750ECA16EA;
+ 3944609B020F50ED0ECA1767 = {
+ fileRef = 39446085020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
- ATTRIBUTES = (
- Public,
- );
};
};
- 9C64424A01F790750ECA16EA = {
- fileRef = 9C64424801F790750ECA16EA;
+ 3944609C020F50ED0ECA1767 = {
+ fileRef = 39446086020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C64424B01F7AF2D0ECA16EA = {
- isa = PBXFileReference;
- name = WKDefaultWebController.h;
- path = WebView.subproj/WKDefaultWebController.h;
- refType = 2;
+ 3944609D020F50ED0ECA1767 = {
+ fileRef = 39446064020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
};
- 9C64424C01F7AF2D0ECA16EA = {
- isa = PBXFileReference;
- name = WKDefaultWebController.mm;
- path = WebView.subproj/WKDefaultWebController.mm;
- refType = 2;
+ 3944609E020F50ED0ECA1767 = {
+ fileRef = 39446066020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
};
- 9C64424D01F7AF2D0ECA16EA = {
- isa = PBXFileReference;
- name = WKDefaultWebControllerPrivate.h;
- path = WebView.subproj/WKDefaultWebControllerPrivate.h;
- refType = 2;
+ 394460A1020F50ED0ECA1767 = {
+ fileRef = 3944606C020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
};
- 9C64424E01F7AF2D0ECA16EA = {
- isa = PBXFileReference;
- name = WKDefaultWebControllerPrivate.mm;
- path = WebView.subproj/WKDefaultWebControllerPrivate.mm;
- refType = 2;
+ 394460A2020F50ED0ECA1767 = {
+ fileRef = 39446071020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
};
- 9C64424F01F7AF2D0ECA16EA = {
- fileRef = 9C64424B01F7AF2D0ECA16EA;
+ 394460A3020F50ED0ECA1767 = {
+ fileRef = 39446073020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
- ATTRIBUTES = (
- Public,
- );
};
};
- 9C64425001F7AF2D0ECA16EA = {
- fileRef = 9C64424D01F7AF2D0ECA16EA;
+ 394460A4020F50ED0ECA1767 = {
+ fileRef = 39446075020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
- ATTRIBUTES = (
- Private,
- );
};
};
- 9C64425101F7AF2D0ECA16EA = {
- fileRef = 9C64424C01F7AF2D0ECA16EA;
+ 394460A5020F50ED0ECA1767 = {
+ fileRef = 39446077020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C64425201F7AF2D0ECA16EA = {
- fileRef = 9C64424E01F7AF2D0ECA16EA;
+ 394460A6020F50ED0ECA1767 = {
+ fileRef = 39446079020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C64425301F7B1740ECA16EA = {
- isa = PBXFileReference;
- name = WKWebDataSourcePrivate.mm;
- path = WebView.subproj/WKWebDataSourcePrivate.mm;
- refType = 2;
+ 394460A7020F50ED0ECA1767 = {
+ fileRef = 3944607B020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
};
- 9C64425401F7B1740ECA16EA = {
- fileRef = 9C64425301F7B1740ECA16EA;
+ 394460A8020F50ED0ECA1767 = {
+ fileRef = 3944607E020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
- 9C64425501F7B4E20ECA16EA = {
- isa = PBXFileReference;
- name = WKWebView.mm;
- path = WebView.subproj/WKWebView.mm;
- refType = 2;
+ 394460A9020F50ED0ECA1767 = {
+ fileRef = 39446080020F50ED0ECA1767;
+ isa = PBXBuildFile;
+ settings = {
+ };
};
- 9C64425601F7B4E20ECA16EA = {
- fileRef = 9C64425501F7B4E20ECA16EA;
+ 394460AA020F50ED0ECA1767 = {
+ fileRef = 39446082020F50ED0ECA1767;
isa = PBXBuildFile;
settings = {
};
};
+//390
+//391
+//392
+//393
+//394
+//9C0
+//9C1
+//9C2
+//9C3
+//9C4
9C7CABBB0190A37C0ECA16EA = {
children = (
- 9C04851E01CFF9CE0ECA16EA,
- 9C04851F01CFF9CE0ECA16EA,
- 9C04852001CFF9CE0ECA16EA,
- 9C04852101CFF9CE0ECA16EA,
- 9C04852201CFF9CE0ECA16EA,
- 9C04852401CFF9CE0ECA16EA,
- 9C64424501F78B4B0ECA16EA,
- 9C64424B01F7AF2D0ECA16EA,
- 9C64424C01F7AF2D0ECA16EA,
- 9C64424D01F7AF2D0ECA16EA,
- 9C64424E01F7AF2D0ECA16EA,
- 9C64425301F7B1740ECA16EA,
- 9C64425501F7B4E20ECA16EA,
- 9C13328901FFB40A0ECA16EA,
- 9C13328A01FFB40A0ECA16EA,
- 9C56CE49020B42AF0ECA16EA,
- 9C56CE4A020B42AF0ECA16EA,
+ 39446063020F50ED0ECA1767,
+ 39446064020F50ED0ECA1767,
+ 39446065020F50ED0ECA1767,
+ 39446066020F50ED0ECA1767,
+ 3944606B020F50ED0ECA1767,
+ 3944606C020F50ED0ECA1767,
+ 3944606D020F50ED0ECA1767,
+ 3944606E020F50ED0ECA1767,
+ 3944606F020F50ED0ECA1767,
+ 39446070020F50ED0ECA1767,
+ 39446071020F50ED0ECA1767,
+ 39446072020F50ED0ECA1767,
+ 39446073020F50ED0ECA1767,
+ 39446074020F50ED0ECA1767,
+ 39446075020F50ED0ECA1767,
+ 39446076020F50ED0ECA1767,
+ 39446077020F50ED0ECA1767,
+ 39446078020F50ED0ECA1767,
+ 39446079020F50ED0ECA1767,
);
isa = PBXGroup;
name = WebView;
diff --git a/WebKit/WebView.subproj/IFBaseWebController.h b/WebKit/WebView.subproj/IFBaseWebController.h
index ea8d2a6..1120275 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.h
+++ b/WebKit/WebView.subproj/IFBaseWebController.h
@@ -1,9 +1,9 @@
/*
- WKDefaultWebController.mm
+ IFDefaultWebController.mm
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebFrame.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFWebFrame.h>
/*
@@ -37,4 +37,4 @@
- (void)setMainDataSource: (WKWebDataSource *)dataSource;
- (WKWebDataSource *)mainDataSource;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 8f71b4a..d763bda 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -1,13 +1,13 @@
/*
- WKDefaultWebController.mm
+ IFDefaultWebController.mm
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKDefaultWebController.h>
-#import <WebKit/WKDefaultWebControllerPrivate.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKWebFrame.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFBaseWebController.h>
+#import <WebKit/IFBaseWebControllerPrivate.h>
+#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFException.h>
// WKObjectHolder holds objects as keys in dictionaries without
@@ -287,4 +287,4 @@
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h
index 2ecf399..f92722d 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.h
@@ -1,10 +1,10 @@
/*
- WKWebController.mm
+ IFWebController.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebView.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebView.h>
@interface WKDefaultWebControllerPrivate : NSObject
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 52c6d72..c71d7eb 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -1,10 +1,10 @@
/*
- WKWebController.mm
+ IFWebController.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKDefaultWebControllerPrivate.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebView.h>
+#import <WebKit/IFBaseWebControllerPrivate.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebView.h>
@implementation WKDefaultWebControllerPrivate
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.h b/WebKit/WebView.subproj/IFDefaultWebController.h
deleted file mode 100644
index ea8d2a6..0000000
--- a/WebKit/WebView.subproj/IFDefaultWebController.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- WKDefaultWebController.mm
- Copyright 2001, 2002 Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebFrame.h>
-
-
-/*
-*/
- at interface WKDefaultWebController : NSObject <WKWebController>
-{
- at private
- id _controllerPrivate;
-}
-
-
-- init;
-
-- initWithView: (WKWebView *)view dataSource: (WKWebDataSource *)dataSource;
-
-- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag;
-- (BOOL)directsAllLinksToSystemBrowser;
-
-// Sets the mainView and the mainDataSource.
-- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource;
-
-// Find the view for the specified data source.
-- (WKWebView *)viewForDataSource: (WKWebDataSource *)dataSource;
-
-// Find the data source for the specified view.
-- (WKWebDataSource *)dataSourceForView: (WKWebView *)view;
-
-- (void)setMainView: (WKWebView *)view;
-- (WKWebView *)mainView;
-
-- (void)setMainDataSource: (WKWebDataSource *)dataSource;
-- (WKWebDataSource *)mainDataSource;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFDefaultWebController.mm b/WebKit/WebView.subproj/IFDefaultWebController.mm
deleted file mode 100644
index 8f71b4a..0000000
--- a/WebKit/WebView.subproj/IFDefaultWebController.mm
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- WKDefaultWebController.mm
- Copyright 2001, 2002 Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKDefaultWebController.h>
-#import <WebKit/WKDefaultWebControllerPrivate.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKWebFrame.h>
-#import <WebKit/WKException.h>
-
-
-// WKObjectHolder holds objects as keys in dictionaries without
-// copying.
- at interface WKObjectHolder : NSObject
-{
- id object;
-}
-
-+ holderWithObject: o;
-- initWithObject: o;
-- (void)dealloc;
-- object;
-
- at end
-
- at implementation WKObjectHolder
-
-+ holderWithObject: o
-{
- return [[[WKObjectHolder alloc] initWithObject: o] autorelease];
-}
-
-- initWithObject: o
-{
- [super init];
- object = [o retain];
- return self;
-}
-
-- (void)dealloc
-{
- [object release];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [self retain];
-}
-
-- (unsigned)hash
-{
- return [object hash];
-}
-
-- object
-{
- return object;
-}
-
-- (BOOL)isEqual:(id)anObject
-{
- return object == [anObject object];
-}
-
- at end
-
-
- at implementation WKDefaultWebController
-
-- init
-{
- [super init];
- _controllerPrivate = [[WKDefaultWebControllerPrivate alloc] init];
- return self;
-}
-
-
-- initWithView: (WKWebView *)view dataSource: (WKWebDataSource *)dataSource
-{
- [super init];
- _controllerPrivate = [[WKDefaultWebControllerPrivate alloc] init];
- [self setView: view andDataSource: dataSource];
- return self;
-}
-
-
-- (void)dealloc
-{
- [_controllerPrivate release];
-}
-
-- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
-}
-
-
-- (BOOL)directsAllLinksToSystemBrowser
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::directsAllLinksToSystemBrowser is not implemented"];
- return NO;
-}
-
-
-- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource
-{
- // FIXME: this needs to be implemented in terms of WKWebFrame.
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
-
- [data->viewMap autorelease];
- data->viewMap = [[NSMutableDictionary alloc] init];
-
- [data->dataSourceMap autorelease];
- data->dataSourceMap = [[NSMutableDictionary alloc] init];
-
- [data->mainView autorelease];
- data->mainView = [view retain];
- [view _setController: self];
-
- [data->mainDataSource autorelease];
- data->mainDataSource = [dataSource retain];
- [dataSource _setController: self];
-
- if (dataSource != nil && view != nil){
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
-
- [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
- }
-
- if (dataSource != nil)
- [view dataSourceChanged];
-}
-
-- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)childDataSource inParent: (WKWebDataSource *)parentDataSource
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- WKWebView *childView;
- WKWebFrame *newFrame;
- //WKDynamicScrollBarsView *scrollView;
-
- childView = [[WKWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
-
- newFrame = [[[WKWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
-
- [parentDataSource addFrame: newFrame];
-
- [data->viewMap setObject: childView forKey: [WKObjectHolder holderWithObject:childDataSource]];
- [childView _setController: self];
- [data->dataSourceMap setObject: childDataSource forKey: [WKObjectHolder holderWithObject:childView]];
- [childDataSource _setController: self];
-
-
- //scrollView = [[[WKDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
- //[childView _setFrameScrollView: scrollView];
-
- [childView dataSourceChanged];
-
- return newFrame;
-}
-
-
-- (WKWebView *)viewForDataSource: (WKWebDataSource *)dataSource
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return [data->viewMap objectForKey: [WKObjectHolder holderWithObject:dataSource]];
-}
-
-
-- (WKWebDataSource *)dataSourceForView: (WKWebView *)view
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return [data->dataSourceMap objectForKey: [WKObjectHolder holderWithObject:view]];
-}
-
-- (void)setMainView: (WKWebView *)m;
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [self setView: m andDataSource: data->mainDataSource];
-}
-
-
-- (WKWebView *)mainView
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return data->mainView;
-}
-
-
-- (void)setMainDataSource: (WKWebDataSource *)dataSource;
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [self setView: data->mainView andDataSource: dataSource];
-}
-
-- (WKWebDataSource *)mainDataSource
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return data->mainDataSource;
-}
-
-
-
-
-
-// ---------------------------------------------------------------------
-// WKScriptContextHandler
-// ---------------------------------------------------------------------
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::setStatusText:forDataSource: is not implemented"];
-}
-
-
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::statusTextForDataSource: is not implemented"];
- return nil;
-}
-
-
-// ---------------------------------------------------------------------
-// WKAuthenticationHandler
-// ---------------------------------------------------------------------
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::authenticate: is not implemented"];
- return nil;
-}
-
-
-// ---------------------------------------------------------------------
-// WKLoadHandler
-// ---------------------------------------------------------------------
-- (void)receivedProgress: (WKLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedProgress:forResource:fromDataSource: is not implemented"];
-}
-
-
-- (void)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedError:forResource:partialProgress:fromDataSource: is not implemented"];
-}
-
-
-// ---------------------------------------------------------------------
-// WKLocationChangeHandler
-// ---------------------------------------------------------------------
-- (BOOL)locationWillChangeTo: (NSURL *)url
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationWillChangeTo: is not implemented"];
- return NO;
-}
-
-
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationWillChangeTo: is not implemented"];
-}
-
-
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationChangeInProgressForDataSource:forDataSource: is not implemented"];
-}
-
-
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource
-{
- WKWebView *view;
-
- view = [self viewForDataSource: dataSource];
- [view setNeedsLayout: YES];
- [view setNeedsDisplay: YES];
-}
-
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedPageTitle:forDataSource: is not implemented"];
-}
-
-
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::serverRedirectTo:forDataSource: is not implemented"];
-}
-
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFDefaultWebControllerPrivate.h b/WebKit/WebView.subproj/IFDefaultWebControllerPrivate.h
deleted file mode 100644
index 2ecf399..0000000
--- a/WebKit/WebView.subproj/IFDefaultWebControllerPrivate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- WKWebController.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebView.h>
-
-
- at interface WKDefaultWebControllerPrivate : NSObject
-{
- WKWebView *mainView;
- WKWebDataSource *mainDataSource;
- NSMutableDictionary *viewMap;
- NSMutableDictionary *dataSourceMap;
-}
- at end
diff --git a/WebKit/WebView.subproj/IFDefaultWebControllerPrivate.mm b/WebKit/WebView.subproj/IFDefaultWebControllerPrivate.mm
deleted file mode 100644
index 52c6d72..0000000
--- a/WebKit/WebView.subproj/IFDefaultWebControllerPrivate.mm
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- WKWebController.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKDefaultWebControllerPrivate.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebView.h>
-
-
- at implementation WKDefaultWebControllerPrivate
-
-- init
-{
- mainView = nil;
- mainDataSource = nil;
- viewMap = nil;
- dataSourceMap = nil;
- return self;
-}
-
-- (void)dealloc
-{
- [mainView release];
- [mainDataSource release];
-
- [viewMap release];
- [dataSourceMap release];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
index ca80df1..990cec8 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -6,7 +6,7 @@
// Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/WKDynamicScrollBarsView.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
@implementation WKDynamicScrollBarsView
diff --git a/WebKit/WebView.subproj/IFGrabBag.h b/WebKit/WebView.subproj/IFGrabBag.h
index de4d4fd..816b562 100644
--- a/WebKit/WebView.subproj/IFGrabBag.h
+++ b/WebKit/WebView.subproj/IFGrabBag.h
@@ -1,5 +1,5 @@
/*
- WKWebController.h
+ IFWebController.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
diff --git a/WebKit/WebView.subproj/IFPreferences.h b/WebKit/WebView.subproj/IFPreferences.h
index d829800..12ef448 100644
--- a/WebKit/WebView.subproj/IFPreferences.h
+++ b/WebKit/WebView.subproj/IFPreferences.h
@@ -1,5 +1,5 @@
/*
- WKWebController.h
+ IFWebController.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 88c098b..0c7eacb 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -1,5 +1,5 @@
/*
- WKWebController.h
+ IFWebController.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index f0e3f8d..850b3ea 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -1,13 +1,13 @@
/*
- WKWebDataSource.h
+ IFWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebFrame.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFWebFrame.h>
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 1cce802..64d1fe5 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -1,10 +1,10 @@
/*
- WKWebDataSource.h
+ IFWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFException.h>
#import <WebKit/WebKitDebug.h>
#include <xml/dom_docimpl.h>
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index c1557e6..d148a28 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -1,4 +1,4 @@
-/* WKWebDataSourcePrivate.h
+/* IFWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -7,7 +7,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebDataSource.h>
+#import <WebKit/IFWebDataSource.h>
// includes from kde
#include <khtmlview.h>
@@ -32,4 +32,4 @@
- (void)_setController: (id <WKWebController>)controller;
- (KHTMLPart *)_part;
- (void)_setFrameName: (NSString *)fName;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 6b28728..2a7de86 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -1,12 +1,12 @@
-/* WKWebDataSourcePrivate.h
+/* IFWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
in WebCore. Instances of this class are referenced by _dataSourcePrivate in
NSWebPageDataSource.
*/
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFException.h>
@@ -57,4 +57,4 @@
((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 3c55879..047bbe0 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -1,5 +1,5 @@
/*
- WKWebFrame.h
+ IFWebFrame.h
Copyright 2001, Apple, Inc. All rights reserved.
@@ -20,4 +20,4 @@
- (void)setView: view;
- view;
- (WKWebDataSource *)dataSource;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFWebFrame.m b/WebKit/WebView.subproj/IFWebFrame.m
index b6fa0c5..5e37f63 100644
--- a/WebKit/WebView.subproj/IFWebFrame.m
+++ b/WebKit/WebView.subproj/IFWebFrame.m
@@ -1,5 +1,5 @@
/*
- WKWebFrame.h
+ IFWebFrame.h
Copyright 2001, Apple, Inc. All rights reserved.
@@ -7,8 +7,8 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebFrame.h>
-#import <WebKit/WKWebDataSource.h>
+#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebDataSource.h>
@implementation WKWebFrame
@@ -53,4 +53,4 @@
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
index 0a5334a..7b38252 100644
--- a/WebKit/WebView.subproj/IFWebView.h
+++ b/WebKit/WebView.subproj/IFWebView.h
@@ -1,13 +1,13 @@
/*
- WKWebView.h
+ IFWebView.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebController.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebController.h>
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 2c7eeb4..726c269 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -1,13 +1,13 @@
-/* WKWebView.mm
+/* IFWebView.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKWebView.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKDefaultWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFWebView.h>
+#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFBaseWebController.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
+#import <WebKit/IFException.h>
#import <WebKit/WebKitDebug.h>
// KDE related includes
@@ -371,4 +371,4 @@
//WebKitDebugAtLevel (0x200, "mouseDragged %f, %f\n", p.x, p.y);
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
index 79b55cd..d741d20 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.h
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.h
@@ -1,4 +1,4 @@
-/* WKWebViewPrivate.h
+/* IFWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -7,9 +7,9 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKWebView.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
+#import <WebKit/IFWebView.h>
class QWidget;
class KHTMLPart;
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 147c3c4..1e72e11 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -1,11 +1,11 @@
-/* WKWebViewPrivate.mm
+/* IFWebViewPrivate.mm
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
in WebCore. Instances of this class are referenced by _viewPrivate in
NSWebPageView.
*/
-#import <WKWebViewPrivate.h>
+#import <IFWebViewPrivate.h>
// Includes from KDE
#include <khtmlview.h>
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.h b/WebKit/WebView.subproj/WKDefaultWebController.h
deleted file mode 100644
index ea8d2a6..0000000
--- a/WebKit/WebView.subproj/WKDefaultWebController.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- WKDefaultWebController.mm
- Copyright 2001, 2002 Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebFrame.h>
-
-
-/*
-*/
- at interface WKDefaultWebController : NSObject <WKWebController>
-{
- at private
- id _controllerPrivate;
-}
-
-
-- init;
-
-- initWithView: (WKWebView *)view dataSource: (WKWebDataSource *)dataSource;
-
-- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag;
-- (BOOL)directsAllLinksToSystemBrowser;
-
-// Sets the mainView and the mainDataSource.
-- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource;
-
-// Find the view for the specified data source.
-- (WKWebView *)viewForDataSource: (WKWebDataSource *)dataSource;
-
-// Find the data source for the specified view.
-- (WKWebDataSource *)dataSourceForView: (WKWebView *)view;
-
-- (void)setMainView: (WKWebView *)view;
-- (WKWebView *)mainView;
-
-- (void)setMainDataSource: (WKWebDataSource *)dataSource;
-- (WKWebDataSource *)mainDataSource;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKDefaultWebController.mm b/WebKit/WebView.subproj/WKDefaultWebController.mm
deleted file mode 100644
index 8f71b4a..0000000
--- a/WebKit/WebView.subproj/WKDefaultWebController.mm
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- WKDefaultWebController.mm
- Copyright 2001, 2002 Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKDefaultWebController.h>
-#import <WebKit/WKDefaultWebControllerPrivate.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKWebFrame.h>
-#import <WebKit/WKException.h>
-
-
-// WKObjectHolder holds objects as keys in dictionaries without
-// copying.
- at interface WKObjectHolder : NSObject
-{
- id object;
-}
-
-+ holderWithObject: o;
-- initWithObject: o;
-- (void)dealloc;
-- object;
-
- at end
-
- at implementation WKObjectHolder
-
-+ holderWithObject: o
-{
- return [[[WKObjectHolder alloc] initWithObject: o] autorelease];
-}
-
-- initWithObject: o
-{
- [super init];
- object = [o retain];
- return self;
-}
-
-- (void)dealloc
-{
- [object release];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [self retain];
-}
-
-- (unsigned)hash
-{
- return [object hash];
-}
-
-- object
-{
- return object;
-}
-
-- (BOOL)isEqual:(id)anObject
-{
- return object == [anObject object];
-}
-
- at end
-
-
- at implementation WKDefaultWebController
-
-- init
-{
- [super init];
- _controllerPrivate = [[WKDefaultWebControllerPrivate alloc] init];
- return self;
-}
-
-
-- initWithView: (WKWebView *)view dataSource: (WKWebDataSource *)dataSource
-{
- [super init];
- _controllerPrivate = [[WKDefaultWebControllerPrivate alloc] init];
- [self setView: view andDataSource: dataSource];
- return self;
-}
-
-
-- (void)dealloc
-{
- [_controllerPrivate release];
-}
-
-- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
-}
-
-
-- (BOOL)directsAllLinksToSystemBrowser
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::directsAllLinksToSystemBrowser is not implemented"];
- return NO;
-}
-
-
-- (void)setView: (WKWebView *)view andDataSource: (WKWebDataSource *)dataSource
-{
- // FIXME: this needs to be implemented in terms of WKWebFrame.
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
-
- [data->viewMap autorelease];
- data->viewMap = [[NSMutableDictionary alloc] init];
-
- [data->dataSourceMap autorelease];
- data->dataSourceMap = [[NSMutableDictionary alloc] init];
-
- [data->mainView autorelease];
- data->mainView = [view retain];
- [view _setController: self];
-
- [data->mainDataSource autorelease];
- data->mainDataSource = [dataSource retain];
- [dataSource _setController: self];
-
- if (dataSource != nil && view != nil){
- [data->viewMap setObject: view forKey: [WKObjectHolder holderWithObject:dataSource]];
-
- [data->dataSourceMap setObject: dataSource forKey: [WKObjectHolder holderWithObject:view]];
- }
-
- if (dataSource != nil)
- [view dataSourceChanged];
-}
-
-- (WKWebFrame *)createFrameNamed: (NSString *)fname for: (WKWebDataSource *)childDataSource inParent: (WKWebDataSource *)parentDataSource
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- WKWebView *childView;
- WKWebFrame *newFrame;
- //WKDynamicScrollBarsView *scrollView;
-
- childView = [[WKWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
-
- newFrame = [[[WKWebFrame alloc] initWithName: fname view: childView dataSource: childDataSource] autorelease];
-
- [parentDataSource addFrame: newFrame];
-
- [data->viewMap setObject: childView forKey: [WKObjectHolder holderWithObject:childDataSource]];
- [childView _setController: self];
- [data->dataSourceMap setObject: childDataSource forKey: [WKObjectHolder holderWithObject:childView]];
- [childDataSource _setController: self];
-
-
- //scrollView = [[[WKDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
- //[childView _setFrameScrollView: scrollView];
-
- [childView dataSourceChanged];
-
- return newFrame;
-}
-
-
-- (WKWebView *)viewForDataSource: (WKWebDataSource *)dataSource
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return [data->viewMap objectForKey: [WKObjectHolder holderWithObject:dataSource]];
-}
-
-
-- (WKWebDataSource *)dataSourceForView: (WKWebView *)view
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return [data->dataSourceMap objectForKey: [WKObjectHolder holderWithObject:view]];
-}
-
-- (void)setMainView: (WKWebView *)m;
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [self setView: m andDataSource: data->mainDataSource];
-}
-
-
-- (WKWebView *)mainView
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return data->mainView;
-}
-
-
-- (void)setMainDataSource: (WKWebDataSource *)dataSource;
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- [self setView: data->mainView andDataSource: dataSource];
-}
-
-- (WKWebDataSource *)mainDataSource
-{
- WKDefaultWebControllerPrivate *data = ((WKDefaultWebControllerPrivate *)_controllerPrivate);
- return data->mainDataSource;
-}
-
-
-
-
-
-// ---------------------------------------------------------------------
-// WKScriptContextHandler
-// ---------------------------------------------------------------------
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::setStatusText:forDataSource: is not implemented"];
-}
-
-
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::statusTextForDataSource: is not implemented"];
- return nil;
-}
-
-
-// ---------------------------------------------------------------------
-// WKAuthenticationHandler
-// ---------------------------------------------------------------------
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::authenticate: is not implemented"];
- return nil;
-}
-
-
-// ---------------------------------------------------------------------
-// WKLoadHandler
-// ---------------------------------------------------------------------
-- (void)receivedProgress: (WKLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedProgress:forResource:fromDataSource: is not implemented"];
-}
-
-
-- (void)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedError:forResource:partialProgress:fromDataSource: is not implemented"];
-}
-
-
-// ---------------------------------------------------------------------
-// WKLocationChangeHandler
-// ---------------------------------------------------------------------
-- (BOOL)locationWillChangeTo: (NSURL *)url
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationWillChangeTo: is not implemented"];
- return NO;
-}
-
-
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationWillChangeTo: is not implemented"];
-}
-
-
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::locationChangeInProgressForDataSource:forDataSource: is not implemented"];
-}
-
-
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource
-{
- WKWebView *view;
-
- view = [self viewForDataSource: dataSource];
- [view setNeedsLayout: YES];
- [view setNeedsDisplay: YES];
-}
-
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::receivedPageTitle:forDataSource: is not implemented"];
-}
-
-
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKDefaultWebController::serverRedirectTo:forDataSource: is not implemented"];
-}
-
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKDefaultWebControllerPrivate.h b/WebKit/WebView.subproj/WKDefaultWebControllerPrivate.h
deleted file mode 100644
index 2ecf399..0000000
--- a/WebKit/WebView.subproj/WKDefaultWebControllerPrivate.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- WKWebController.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebView.h>
-
-
- at interface WKDefaultWebControllerPrivate : NSObject
-{
- WKWebView *mainView;
- WKWebDataSource *mainDataSource;
- NSMutableDictionary *viewMap;
- NSMutableDictionary *dataSourceMap;
-}
- at end
diff --git a/WebKit/WebView.subproj/WKDefaultWebControllerPrivate.mm b/WebKit/WebView.subproj/WKDefaultWebControllerPrivate.mm
deleted file mode 100644
index 52c6d72..0000000
--- a/WebKit/WebView.subproj/WKDefaultWebControllerPrivate.mm
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- WKWebController.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKDefaultWebControllerPrivate.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebView.h>
-
-
- at implementation WKDefaultWebControllerPrivate
-
-- init
-{
- mainView = nil;
- mainDataSource = nil;
- viewMap = nil;
- dataSourceMap = nil;
- return self;
-}
-
-- (void)dealloc
-{
- [mainView release];
- [mainDataSource release];
-
- [viewMap release];
- [dataSourceMap release];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WKDynamicScrollBarsView.h b/WebKit/WebView.subproj/WKDynamicScrollBarsView.h
deleted file mode 100644
index 8219286..0000000
--- a/WebKit/WebView.subproj/WKDynamicScrollBarsView.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// DynamicScrollBarsView.h
-// WebBrowser
-//
-// Created by John Sullivan on Tue Jan 22 2002.
-// Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
- at interface WKDynamicScrollBarsView : NSScrollView {
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WKDynamicScrollBarsView.m b/WebKit/WebView.subproj/WKDynamicScrollBarsView.m
deleted file mode 100644
index ca80df1..0000000
--- a/WebKit/WebView.subproj/WKDynamicScrollBarsView.m
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// DynamicScrollBarsView.m
-// WebBrowser
-//
-// Created by John Sullivan on Tue Jan 22 2002.
-// Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/WKDynamicScrollBarsView.h>
-
- at implementation WKDynamicScrollBarsView
-
-// make the horizontal and vertical scroll bars come and go as needed
-- (void) reflectScrolledClipView: (NSClipView*)clipView
-{
- if( clipView == [self contentView] ) {
- BOOL scrollsVertically = [[self documentView] bounds].size.height > [self contentSize].height;
- BOOL scrollsHorizontally = [[self documentView] bounds].size.width > [self contentSize].width;
-
- [self setHasVerticalScroller: scrollsVertically];
- [self setHasHorizontalScroller: scrollsHorizontally];
- }
- [super reflectScrolledClipView: clipView];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WKGrabBag.h b/WebKit/WebView.subproj/WKGrabBag.h
deleted file mode 100644
index de4d4fd..0000000
--- a/WebKit/WebView.subproj/WKGrabBag.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- WKWebController.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#ifdef READY_FOR_PRIMETIME
-
-
-
-/*
- =============================================================================
-*/
- at protocol WKContextMenuHandler
-// 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:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WKDOMNode *);
- at end
-
-
-
-#endif
-
diff --git a/WebKit/WebView.subproj/WKPreferences.h b/WebKit/WebView.subproj/WKPreferences.h
deleted file mode 100644
index d829800..0000000
--- a/WebKit/WebView.subproj/WKPreferences.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- WKWebController.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#ifdef READY_FOR_PRIMETIME
-
-
-
-
-/*
- =============================================================================
-
- This class provides a cover for URL-based preference items.
-*/
- at interface WKPreferences
-+ getPreferencesForURL: (NSURL *)url;
-
-// Encoding that will be used in none specified on page? or in header?
-+ setEncoding: (NSString *)encoding;
-+ (NSString *)encoding;
-
-// Javascript preferences
-- (void)setJScriptEnabled: (BOOL)flag;
-- (BOOL)jScriptEnabled;
-
-// Java preferences
-- (void)setJavaEnabled: (BOOL)flag
-- (BOOL)javaEnabled;
-
-// Document refreshes allowed
-- setRefreshEnabled: (BOOL)flag;
-- (BOOL)refreshEnabled;
-
-// Plugins
-- (void)setPluginsEnabled: (BOOL)flag;
-- (BOOL)pluginEnabled;
-
-// Should images be loaded.
-- (void)setAutoloadImages: (BOOL)flag;
-- (BOOL)autoloadImages;
-
-/*
- Specify whether only local references ( stylesheets, images, scripts, subdocuments )
- should be loaded. ( default false - everything is loaded, if the more specific
- options allow )
- This is carried over from KDE.
-*/
-- (void)setOnlyLocalReferences: (BOOL)flag;
-- (BOOL)onlyLocalReferences;
-
- at end
-
-
-#endif
-
diff --git a/WebKit/WebView.subproj/WKWebController.h b/WebKit/WebView.subproj/WKWebController.h
deleted file mode 100644
index 88c098b..0000000
--- a/WebKit/WebView.subproj/WKWebController.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- WKWebController.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-
-/*
- =============================================================================
-
- WKWebController manages the interaction between WKWebView(s) and WKWebDataSource(s).
-
- The WKWebController implements required behavior. WKWebView and WKWebDataSource
- 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.
-
- WKDefaultWebController may be subclassed to modify the behavior of the standard
- WKWebView and WKWebDataSource.
-
- =============================================================================
-
- Changes:
-
- 2001-12-12
- Changed WKConcreteWebController to WKDefaultWebController.
-
- Changed WKLocationChangedHandler naming, replace "loadingXXX" with
- "locationChangeXXX".
-
- Changed loadingStopped in WKLocationChangedHandler to locationChangeStopped:(WKError *).
-
- Changed loadingCancelled in WKLocationChangedHandler to locationChangeCancelled:(WKError *).
-
- Changed loadedPageTitle in WKLocationChangedHandler to receivedPageTitle:.
-
- Added inputURL:(NSURL *) resolvedTo: (NSURL *) to WKLocationChangedHandler.
-
- Added the following two methods to WKLocationChangedHandler:
-
- - (void)inputURL: (NSURL *)inputURL resolvedTo: (NSURL *)resolvedURL;
- - (void)serverRedirectTo: (NSURL *)url;
-
- Put locationWillChangeTo: back on WKLocationChangedHandler.
-
- Changed XXXforLocation in WKLoadHandler to XXXforResource.
-
- Changed timeoutForLocation: in WKLoadHandler to receivedError:forResource:partialProgress:
-
- Added the following two methods to WKDefaultWebController:
-
- - setDirectsAllLinksToSystemBrowser: (BOOL)flag
- - (BOOL)directsAllLinksToSystemBrowser;
-
- Removed WKError. This will be described in WKError.h.
-
- 2001-12-13
-
- Removed WKFrameSetHandler, placed that functionality on WKWebDataSource.
-
- Changed WKLocationChangeHandler 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.
-
- Simplified WKLocationChangeHandler and updated
- WKAuthenticationHandler to use interfaces instead of structs..
-*/
-
-
- at class WKWebDataSource;
- at class WKError;
- at class WKWebView;
- at class WKWebFrame;
-
-#ifdef TENTATIVE_API
-/*
- =============================================================================
-
- WKWebViewDelegates implement protocols that modify the behavior of
- WKWebViews. A WKWebView does not require a delegate.
-*/
- at protocol WKWebViewDelegate <?>
- at end
-
-
-/*
- =============================================================================
-
- WKWebDataSourceDelegate implement protocols that modify the behavior of
- WKWebDataSources. A WKWebDataSources does not require a delegate.
-*/
- at protocol WKWebDataSourceDelegate <?>
- at end
-
-
-/*
- =============================================================================
-
- See the comments in WKWebPageView above for more description about this protocol.
-*/
- at protocol WKLocationChangeHandler
-
-- (BOOL)locationWillChangeTo: (NSURL *)url;
-
-- (void)locationChangeStarted;
-- (void)locationChangeInProgress;
-- (void)locationChangeDone: (WKError *)error;
-
-- (void)receivedPageTitle: (NSString *)title;
-
-- (void)serverRedirectTo: (NSURL *)url;
-
- at end
-#endif
-
-
-/*
- =============================================================================
-
- A frame-aware version of the the WKLocationChangeHandler
-
- See the comments in WKWebPageView above for more description about this protocol.
-*/
- at protocol WKLocationChangeHandler
-
-// 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
-// placing locationWillChangeTo: in a different protocol, and making it more or a complete
-// handshake.
-- (BOOL)locationWillChangeTo: (NSURL *)url;
-
-- (void)locationChangeStartedForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeInProgressForDataSource: (WKWebDataSource *)dataSource;
-- (void)locationChangeDone: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
-
-- (void)receivedPageTitle: (NSString *)title forDataSource: (WKWebDataSource *)dataSource;
-
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (WKWebDataSource *)dataSource;
-
- at end
-
-
-/*
- =============================================================================
-
- A WKLoadProgress capture the state associated with a load progress
- indication. Should we use a struct?
-*/
- at interface WKLoadProgress
-{
- 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
-#endif
-}
- at end
-
-
-/*
- =============================================================================
-
- Implementors of this protocol will receive messages indicating
- data has been received.
-
- The methods in this protocol will be called even if the data source
- is initialized with something other than a URL.
-*/
- at protocol WKLoadHandler
-
-/*
- A new chunk of data has been received. This could be a partial load
- of a url. It may be useful to do incremental layout, although
- 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)receivedError: (WKError *)error forResource: (NSString *)resourceDescription partialProgress: (WKLoadProgress *)progress fromDataSource: (WKWebDataSource *)dataSource;
-
- at end
-
-
-
-/*
- =============================================================================
-
-*/
-
- at interface WKSimpleAuthenticationResult
-{
- NSString *username;
- NSString *password;
- // May need an extra rememberThisPassword flag if the loader mechanism is
- // going to provide a persistent credentials cache (for starters we can have
- // just a session cache)
-}
- at end
-
- at interface WKSimpleAuthenticationRequest
-{
- NSURL *url; // nil if for something non-URI based
- NSString *domain; // http authentication domain or some representation of
- // auth domain for non-URI-based locations; otherwise nil.
- NSString *username; // username, if already provided, otherwise nil
- BOOL plaintextPassword; // password will be sent in the clear
- // TRUE for http basic auth or ftp
- // FALSE for http digest auth
- unsigned previousFailures; // number of times in a row authenticating to this
- // location has failed; useful to be able to show a
- // different dialog based on count
-}
- at end
-
-
- at protocol WKAuthenticationHandler
-// Can we make this work without blocking the UI, or do we need to make it explicitly async
-// somehow?
-- (WKSimpleAuthenticationResult *) authenticate: (WKSimpleAuthenticationRequest *)request;
-
-// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
-
-// Do we provide a default dialog?
- at end
-
-
-/*
- =============================================================================
-
-*/
- at protocol WKWebDataSourceErrorHandler
-- receivedError: (WKError *)error forDataSource: (WKWebDataSource *)dataSource;
- at end
-
-
-/*
- =============================================================================
-
- A class that implements WKScriptContextHandler provides all the state information
- that may be used by Javascript (AppleScript?).
-
-*/
- at protocol WKScriptContextHandler
-
-// setStatusText and statusText are used by Javascript's status bar text methods.
-- (void)setStatusText: (NSString *)text forDataSource: (WKWebDataSource *)dataSource;
-- (NSString *)statusTextForDataSource: (WKWebDataSource *)dataSource;
-
-// Need API for things like window size and position, window ids,
-// screen goemetry. Essentially all the 'view' items that are
-// accessible from Javascript.
-
- at end
-
-
-
-
-
-/*
- =============================================================================
-
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. 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>
-
-
-// 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;
-
- at end
-
-
-
diff --git a/WebKit/WebView.subproj/WKWebDataSource.h b/WebKit/WebView.subproj/WKWebDataSource.h
deleted file mode 100644
index f0e3f8d..0000000
--- a/WebKit/WebView.subproj/WKWebDataSource.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- WKWebDataSource.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebFrame.h>
-
-/*
- =============================================================================
-
- A WKWebDataSource 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.
-
- WKWebDataSource *dataSource = [[WKWebDataSource alloc] initWithURL: url];
- id <WKWebController>myController = [[MyControllerClass alloc] init];
- [myController setDataSource: dataSource];
-
- Changes:
-
- 2001-12-12
-
- After group discussion we decided to classify API as :
- Tier 1: Needed by our browser (or Sherlock).
- Tier 2: Nedded by Apple internal clients (Mail, Help, PB, other TBD).
- Tier 3: Third party software vendors.
-
- Added finalURL and isRedirected.
-
- 2001-12-13
-
- Remove setBase: and setBaseTarget:
-
- Changed return type of baseTarget to (NSString *)
-
- Added the following two methods:
- - (WKDataSource *)parent;
- - (NSArry *)children;
- - (BOOL)isMainDocument;
-
- Added the following methods:
-
- - (NSArray *)frameNames;
- - (WKWebDataSource) findDataSourceForFrameNamed: (NSString *)name;
- - (BOOL)frameExists: (NSString *)name;
- - (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName;
- - (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier;
-
- 2001-12-14
-
- Removed all mentions of resolved URLs, because browsers don't
- actuall treat DNS aliases specially.
-
- Moved search API to WKWebView.
-
- Moved WKPreferences to a new file, WKPreferences.h. We are still discussing
- this item and it will not make it into the white paper.
-
- Minor naming changes.
-
- ============================================================================= */
-
-#ifdef TENTATIVE_API
- at class WKLoader;
-#endif
-
-
-
- at interface WKWebDataSource : NSObject
-{
- at private
- id _dataSourcePrivate;
-}
-
-
-// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputURL;
-
-#ifdef TENTATIVE_API
-- initWithData: (NSData *)data;
-- initWithString: (NSString *)string;
-- initWithLoader: (WKLoader *)loader;
-#endif
-
-// Returns YES if this is the main document. The main document is the 'top'
-// document, typically either a frameset or a normal HTML document.
-- (BOOL)isMainDocument;
-
-
-// Returns nil if this data source represents the main document. Otherwise
-// returns the parent data source.
-- (WKWebDataSource *)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;
-
-
-// Returns an array of WKWebFrame. 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;
-
-// Returns an array of NSStrings or nil. The NSStrings corresponds to
-// frame names. If this data source is the main document and has no
-// frames then frameNames will return nil.
-- (NSArray *)frameNames;
-
-// findDataSourceForFrameNamed: returns the child data source associated with
-// the frame named 'name', or nil.
-- (WKWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
-
-
-- (BOOL)frameExists: (NSString *)name;
-
-
-- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName;
-
-
-- (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier;
-
-
-// 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;
-
-
-// May return nil if not initialized with a URL.
-- (NSURL *)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
-// a redirect is processed
-- (NSURL *)finalURL;
-
-
-// Returns true if the inputURL has been redirected by the server,
-// i.e. inputURL != finalURL.
-- (BOOL)wasRedirected;
-
-// Start actually getting (if initialized with a URL) and parsing data. If the data source
-// is still performing a previous load it will be stopped.
-// If forceRefresh is YES the document will load from the net, not the cache.
-- (void)startLoading: (BOOL)forceRefresh;
-
-
-// Cancels any pending loads. A data source is conceptually only ever loading
-// one document at a time, although one document may have many related
-// resources. stopLoading will stop all loads related to the data source.
-// Returns NO if the data source is not currently loading.
-- (void)stopLoading;
-
-
-// Returns YES if there are any pending loads.
-- (BOOL)isLoading;
-
-
-#ifdef TENTATIVE_API
-// Get DOM access to the document.
-- (WKDOMDocument *)document;
-#endif
-
-// Get the source of the document by reconstructing it from the DOM.
-- (NSString *)documentTextFromDOM;
-
-
-// Get the actual source of the document.
-- (NSString *)documentText;
-
-
-// URL reference point, these should probably not be public for 1.0.
-- (NSURL *)base;
-- (NSString *)baseTarget;
-
-
-- (NSString *)encoding;
-
-
-// Style sheet
-- (void)setUserStyleSheetFromURL: (NSURL *)url;
-- (void)setUserStyleSheetFromString: (NSString *)sheet;
-
-
-// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
-// This method may be moved to a category to prevent unnecessary linkage to the AppKit. Note, however
-// that WebCore also has dependencies on the appkit.
-- (NSImage *)icon;
-
-
-// Is page secure, e.g. https, ftps
-- (BOOL)isPageSecure;
-
-
-// Returns nil or the page title.
-- (NSString *)pageTitle;
-
-- (NSString *)frameName;
-
- at end
-
-
diff --git a/WebKit/WebView.subproj/WKWebDataSource.mm b/WebKit/WebView.subproj/WKWebDataSource.mm
deleted file mode 100644
index 1cce802..0000000
--- a/WebKit/WebView.subproj/WKWebDataSource.mm
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- WKWebDataSource.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKException.h>
-#import <WebKit/WebKitDebug.h>
-
-#include <xml/dom_docimpl.h>
-
- at implementation WKWebDataSource
-
-+ (void)initialize {
-
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSArray *fontSizeArray = [NSArray arrayWithObjects:@"7", @"8", @"9", @"10", @"12", @"13", @"14", @"16", nil];
- NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
-
- NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-// @"0xffffffff", @"WebKitLogLevel",
- @"0x0", @"WebKitLogLevel",
- @"Arial", @"WebKitStandardFont",
- @"Courier", @"WebKitFixedFont",
- @"Times-Roman", @"WebKitSerifFont",
- @"Arial", @"WebKitSansSerifFont",
- @"Times-Roman", @"WebKitCursiveFont",
- @"Times-Roman", @"WebKitFantasyFont",
- @"6", @"WebKitMinimumFontSize",
- fontSizeArray, @"WebKitFontSizes",
- pluginsEnabled, @"WebKitPluginsEnabled",
- nil];
-
- [defaults registerDefaults:dict];
-}
-
-
-- (void)_commonInitialization
-{
- ((WKWebDataSourcePrivate *)_dataSourcePrivate) = [[WKWebDataSourcePrivate alloc] init];
-}
-
-// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
-- initWithURL: (NSURL *)inputURL
-{
- [super init];
- [self _commonInitialization];
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->inputURL = inputURL;
- return self;
-}
-
-- (void)dealloc
-{
- [_dataSourcePrivate release];
-}
-
-#ifdef TENTATIVE_API
-- initWithData: (NSData *)data
-- initWithString: (NSString *)string;
-- initWithLoader: (WKLoader *)loader;
-#endif
-
-
-// Returns the name of the frame containing this data source, or nil
-// if the data source is not in a frame set.
-- (NSString *)frameName
-{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName;
-}
-
-
-// Returns YES if this is the main document. The main document is the 'top'
-// document, typically either a frameset or a normal HTML document.
-- (BOOL)isMainDocument
-{
- if (((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent == nil)
- return YES;
- return NO;
-}
-
-
-// Returns nil if this data source represents the main document. Otherwise
-// returns the parent data source.
-- (WKWebDataSource *)parent
-{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->parent;
-}
-
-
-// Returns an array of WKWebDataSource. 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];
-}
-
-- (void)addFrame: (WKWebFrame *)frame
-{
- WKWebDataSourcePrivate *data = (WKWebDataSourcePrivate *)_dataSourcePrivate;
-
- if (data->frames == nil)
- data->frames = [[NSMutableDictionary alloc] init];
- [data->frames setObject: frame forKey: [frame name]];
-}
-
-
-- (WKWebFrame *)frameNamed: (NSString *)frameName
-{
- WKWebDataSourcePrivate *data = (WKWebDataSourcePrivate *)_dataSourcePrivate;
-
- return (WKWebFrame *)[data->frames objectForKey: 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
-// frames then frameNames will return nil.
-- (NSArray *)frameNames
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::frameNames is not implemented"];
- return nil;
-}
-
-
-// findDataSourceForFrameNamed: returns the child data source associated with
-// the frame named 'name', or nil.
-- (WKWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::findDataSourceForFrameNamed: is not implemented"];
- return nil;
-}
-
-
-- (BOOL)frameExists: (NSString *)name
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::frameExists: is not implemented"];
- return NO;
-}
-
-
-- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::openURL:inFrameNamed: is not implemented"];
-}
-
-
-- (void)openURL: (NSURL *)url inIFrame: (id)iFrameIdentifier
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::openURL:inIFrame: is not implemented"];
-}
-
-
-- (id <WKWebController>)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;
-}
-
-
-// May return nil if not initialized with a URL.
-- (NSURL *)inputURL
-{
- return ((WKWebDataSourcePrivate *)_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
-// a redirect is processed
-- (NSURL *)finalURL
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::finalURL is not implemented"];
- return nil;
-}
-
-
-// Returns true if the inputURL has been redirected by the server,
-// i.e. inputURL != finalURL.
-- (BOOL)wasRedirected
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::wasRedirected is not implemented"];
- return NO;
-}
-
-
-// Start actually getting (if initialized with a URL) and parsing data. If the data source
-// is still performing a previous load it will be stopped.
-// If forceRefresh is YES the document will load from the net, not the cache.
-- (void)startLoading: (BOOL)forceRefresh
-{
- KURL url = [[[self inputURL] absoluteString] cString];
-
- WEBKITDEBUG1 ("url = %s\n", [[[self inputURL] absoluteString] cString]);
- [self _part]->openURL (url);
-}
-
-
-// Cancels any pending loads. A data source is conceptually only ever loading
-// one document at a time, although one document may have many related
-// resources. stopLoading will stop all loads related to the data source.
-// Returns NO if the data source is not currently loading.
-- (void)stopLoading
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::stopLoading is not implemented"];
-}
-
-
-// Returns YES if there are any pending loads.
-- (BOOL)isLoading
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::isLoading is not implemented"];
- return NO;
-}
-
-
-#ifdef TENTATIVE_API
-// Get DOM access to the document.
-- (WKDOMDocument *)document;
-#endif
-
-// Get the actual source of the docment.
-- (NSString *)documentText
-{
- KHTMLPart *part = [self _part];
-
- return QSTRING_TO_NSSTRING(part->documentSource());
-}
-
-
-- (NSString *)documentTextFromDOM
-{
- DOM::DocumentImpl *doc;
- NSString *string = nil;
- KHTMLPart *part = [self _part];
-
- if (part != 0){
- doc = (DOM::DocumentImpl *)[self _part]->xmlDocImpl();
- if (doc != 0){
- QString str = doc->recursive_toHTML(1);
- string = QSTRING_TO_NSSTRING(str);
-
- // Ensure life of NSString to end of call frame.
- [[string retain] autorelease];
- }
- }
- if (string == nil) {
- string = @"";
- }
- return string;
-}
-
-
-// URL reference point, these should probably not be public for 1.0.
-- (NSURL *)base
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::base is not implemented"];
- return nil;
-}
-
-
-- (NSString *)baseTarget
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::baseTarget is not implemented"];
- return nil;
-}
-
-
-- (NSString *)encoding
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::encoding is not implemented"];
- return nil;
-}
-
-
-// Style sheet
-- (void)setUserStyleSheetFromURL: (NSURL *)url
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromURL: is not implemented"];
-}
-
-
-- (void)setUserStyleSheetFromString: (NSString *)sheet
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromString: is not implemented"];
-}
-
-
-// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
-// This method may be moved to a category to prevent unnecessary linkage to the AppKit. Note, however
-// that WebCore also has dependencies on the appkit.
-- (NSImage *)icon
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::setUserStyleSheetFromString: is not implemented"];
- return nil;
-}
-
-
-// Is page secure, e.g. https, ftps
-- (BOOL)isPageSecure
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::isPageSecure is not implemented"];
- return NO;
-}
-
-
-// Returns nil or the page title.
-- (NSString *)pageTitle
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebDataSource::pageTitle is not implemented"];
- return nil;
-}
-
-
- at end
diff --git a/WebKit/WebView.subproj/WKWebDataSourcePrivate.h b/WebKit/WebView.subproj/WKWebDataSourcePrivate.h
deleted file mode 100644
index c1557e6..0000000
--- a/WebKit/WebView.subproj/WKWebDataSourcePrivate.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* WKWebDataSourcePrivate.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _dataSourcePrivate in
- NSWebPageDataSource.
-*/
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WKWebDataSource.h>
-
-// includes from kde
-#include <khtmlview.h>
-
- at interface WKWebDataSourcePrivate : NSObject
-{
- WKWebDataSource *parent;
- NSMutableArray *children;
- id <WKWebController>controller;
- NSURL *inputURL;
- KHTMLPart *part;
- NSString *frameName;
- NSMutableDictionary *frames;
-}
-
-- init;
-- (void)dealloc;
-
- at end
-
- at interface WKWebDataSource (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
-- (KHTMLPart *)_part;
-- (void)_setFrameName: (NSString *)fName;
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebDataSourcePrivate.mm b/WebKit/WebView.subproj/WKWebDataSourcePrivate.mm
deleted file mode 100644
index 6b28728..0000000
--- a/WebKit/WebView.subproj/WKWebDataSourcePrivate.mm
+++ /dev/null
@@ -1,60 +0,0 @@
-/* WKWebDataSourcePrivate.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _dataSourcePrivate in
- NSWebPageDataSource.
-*/
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKException.h>
-
-
-
-
- at implementation WKWebDataSourcePrivate
-
-- init
-{
- parent = nil;
- frames = nil;
- controller = nil;
- inputURL = nil;
-
- part = new KHTMLPart();
-
- return self;
-}
-
-- (void)dealloc
-{
- // controller is not retained! WKWebControllers maintain
- // a reference to their view and main data source.
- [parent release];
- [frames release];
-
- delete part;
-}
-
- at end
-
- at implementation WKWebDataSource (WKPrivate)
-- (void)_setController: (id <WKWebController>)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);
-}
-
-
-- (KHTMLPart *)_part
-{
- return ((WKWebDataSourcePrivate *)_dataSourcePrivate)->part;
-}
-
-- (void)_setFrameName: (NSString *)fname
-{
- ((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
-}
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebFrame.h b/WebKit/WebView.subproj/WKWebFrame.h
deleted file mode 100644
index 3c55879..0000000
--- a/WebKit/WebView.subproj/WKWebFrame.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- WKWebFrame.h
-
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
- at class WKWebDataSource;
-
- at interface WKWebFrame : NSObject
-{
- NSString *name;
- id view;
- WKWebDataSource *dataSource;
-}
-- initWithName: (NSString *)name view: view dataSource: (WKWebDataSource *)dataSource;
-- (NSString *)name;
-- (void)setView: view;
-- view;
-- (WKWebDataSource *)dataSource;
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebFrame.m b/WebKit/WebView.subproj/WKWebFrame.m
deleted file mode 100644
index b6fa0c5..0000000
--- a/WebKit/WebView.subproj/WKWebFrame.m
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- WKWebFrame.h
-
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WKWebFrame.h>
-#import <WebKit/WKWebDataSource.h>
-
- at implementation WKWebFrame
-
-- initWithName: (NSString *)n view: v dataSource: (WKWebDataSource *)d
-{
- [super init];
- name = [n retain];
- view = [v retain];
- dataSource = [d retain];
- return self;
-}
-
-- (void)dealloc
-{
- [name release];
- [view release];
- [dataSource release];
-}
-
-- (NSString *)name
-{
- return name;
-}
-
-
-- (void)setView: v
-{
- if (view)
- [view autorelease];
- view = [v retain];
-}
-
-- view
-{
- return view;
-}
-
-
-- (WKWebDataSource *)dataSource
-{
- return dataSource;
-}
-
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebView.h b/WebKit/WebView.subproj/WKWebView.h
deleted file mode 100644
index 0a5334a..0000000
--- a/WebKit/WebView.subproj/WKWebView.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- WKWebView.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebController.h>
-
-/*
- =============================================================================
-
- Typical usage of a WKWebView.
-
- 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];
-
- [[[view controller] dataSource] startLoading];
-
- ...
-
-
- What is the behaviour of the view after it has been initialized and
- startLoading: is called?
-
- 1. No WKLocationChangedHandler 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
- from the data source.
-
- If stopLoading is called before receipt of a receivedDataForLocation:, loading will
- abort, the view will be unchanged, and the controller will receive a loadingCancelled
- message.
-
- Controllers should initiate progress indicators upon receipt of loadingStarted,
- and terminate when either a loadingCancelled or loadingStopped is received.
-
- 2. After the controller receives it's first receivedDataForLocation: the contents of
- the view will be cleared and layout may begin.
-
- 3. Upon subsequent receipt of receivedDataForLocation: messages the controller
- may trigger a document layout. Note that layouts may be coalesced. If stopLoading
- 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
- 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
- resources have been loaded. Controllers should terminate progress indicators at
- this point.
-
- =============================================================================
-
- Changes:
-
- 2001-12-14
-
- Added the following methods:
- - (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)case
- - deselectText;
- - (NSAttributedString *)selectedText;
-
-
- Remove explicit API to get/set the selection range. This will be postponed until we
- have a DOM API that allows us to express selection ranges correctly. Instead we have API
- that should support searching and getting a NSAttributedString that corresponds to
- the selected text.
-
-*/
- at interface WKWebView : NSView
-{
- at private
- id _viewPrivate;
-}
-
-- initWithFrame: (NSRect)frame;
-
-
-#ifdef TENTATIVE_API
-// Set and get the delegate.
-- (void)setDelegate: (id <WKWebViewDelegate>)delegate;
-- (id <WKWebViewDelegate>)delegate;
-#endif
-
-
-// Set and get the controller. Note that the controller is not retained.
-// Perhaps setController: should be private?
-- (id <WKWebController>)controller;
-
-
-// This method is typically called by the view's controller when
-// the data source is changed.
-- (void)dataSourceChanged;
-
-- (void)setNeedsLayout: (bool)flag;
-
-
-// This method should not be public until we have a more completely
-// understood way to subclass WKWebView.
-- (void)layout;
-
-
-// Stop animating animated GIFs, etc.
-- (void)stopAnimations;
-
-
-// Font API
-- (void)setFontSizes: (NSArray *)sizes;
-- (NSArray *)fontSizes;
-- (void)resetFontSizes;
-- (void)setStandardFont: (NSFont *)font;
-- (NSFont *)standardFont;
-- (void)setFixedFont: (NSFont *)font;
-- (NSFont *)fixedFont;
-
-
-// Drag and drop links and images. Others?
-- (void)setCanDragFrom: (BOOL)flag;
-- (BOOL)canDragFrom;
-- (void)setCanDragTo: (BOOL)flag;
-- (BOOL)canDragTo;
-
-
-// Returns an array of built-in context menu items for this node.
-// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
-#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *);
-#endif
-- (void)setContextMenusEnabled: (BOOL)flag;
-- (BOOL)contextMenusEnabled;
-
-
-// Remove the selection.
-- (void)deselectText;
-
-
-// Search from the end of the currently selected location, or from the beginning of the document if nothing
-// is selected.
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
-
-
-// Get an attributed string that represents the current selection.
-- (NSAttributedString *)selectedText;
-
- at end
-
-
-
-/*
- Areas still to consider:
-
- ALT image text and link URLs
- Should this be built-in? or able to be overriden?
-
- node events
-
- client access to form elements for auto-completion, passwords
-
- selection
- Selection on data source is reflected in view.
- Does the view also need a cover selection API?
-
- subclassing of WKWebView
-*/
-
-
diff --git a/WebKit/WebView.subproj/WKWebView.mm b/WebKit/WebView.subproj/WKWebView.mm
deleted file mode 100644
index 2c7eeb4..0000000
--- a/WebKit/WebView.subproj/WKWebView.mm
+++ /dev/null
@@ -1,374 +0,0 @@
-/* WKWebView.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/WKWebView.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKDefaultWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKException.h>
-#import <WebKit/WebKitDebug.h>
-
-// KDE related includes
-#include <khtmlview.h>
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <html/html_documentimpl.h>
-
-
- at implementation WKWebView
-
-- initWithFrame: (NSRect) frame
-{
- [super initWithFrame: frame];
-
- _viewPrivate = [[WKWebViewPrivate alloc] init];
-
- ((WKWebViewPrivate *)_viewPrivate)->isFlipped = YES;
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = YES;
-
- return self;
-}
-
-
-- (void)dealloc
-{
- [_viewPrivate release];
-}
-
-
-// Set and get the controller. Note that the controller is not retained.
-// Perhaps setController: should be private?
-- (id <WKWebController>)controller
-{
- return ((WKWebViewPrivate *)_viewPrivate)->controller;
-}
-
-
-
-// This method is typically called by the view's controller when
-// the data source is changed.
-- (void)dataSourceChanged
-{
- WKWebViewPrivate *data = ((WKWebViewPrivate *)_viewPrivate);
- NSRect r = [self frame];
-
- if (data->widget)
- delete data->widget;
-
- // Nasty! Setup the cross references between the KHTMLView and
- // the KHTMLPart.
- KHTMLPart *part = [[[self controller] dataSourceForView: self] _part];
-
- data->widget = new KHTMLView (part, 0);
- part->setView (data->widget);
-
- // Check to see if we're a frame.
- //if ([self _frameScrollView])
- // data->widget->setView ([self _frameScrollView]);
- //else
- data->widget->setView (self);
-
- data->widget->resize (r.size.width,r.size.height);
-
- [self _resetView];
- [self layout];
-}
-
-
-
-// This method should not be public until we have a more completely
-// understood way to subclass WKWebView.
-- (void)layout
-{
- KHTMLView *widget = ((WKWebViewPrivate *)_viewPrivate)->widget;
- if (widget->part()->xmlDocImpl() &&
- widget->part()->xmlDocImpl()->renderer()){
- if (((WKWebViewPrivate *)_viewPrivate)->needsLayout){
- //double start = CFAbsoluteTimeGetCurrent();
- widget->layout(TRUE);
- //WebKitDebugAtLevel (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = NO;
- }
- }
-}
-
-
-// Stop animating animated GIFs, etc.
-- (void)stopAnimations
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::stopAnimations is not implemented"];
-}
-
-
-// Font API
-- (void)setFontSizes: (NSArray *)sizes
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setFontSizes: is not implemented"];
-}
-
-
-- (NSArray *)fontSizes
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::fontSizes is not implemented"];
- return nil;
-}
-
-
-
-- (void)resetFontSizes
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::resetFontSizes is not implemented"];
-}
-
-
-- (void)setStandardFont: (NSFont *)font
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setStandardFont: is not implemented"];
-}
-
-
-- (NSFont *)standardFont
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::standardFont is not implemented"];
- return nil;
-}
-
-
-- (void)setFixedFont: (NSFont *)font
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setFixedFont: is not implemented"];
-}
-
-
-- (NSFont *)fixedFont
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::fixedFont is not implemented"];
- return nil;
-}
-
-
-// Drag and drop links and images. Others?
-- (void)setCanDragFrom: (BOOL)flag
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setCanDragFrom: is not implemented"];
-}
-
-- (BOOL)canDragFrom
-{
- return NO;
-}
-
-- (void)setCanDragTo: (BOOL)flag
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setCanDragTo: is not implemented"];
-}
-
-- (BOOL)canDragTo
-{
- return NO;
-}
-
-
-// Returns an array of built-in context menu items for this node.
-// Generally called by WKContextMenuHandlers from contextMenuItemsForNode:
-#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WKDOMNode *)
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::defaultContextMenuItemsForNode: is not implemented"];
- return nil;
-}
-#endif
-
-- (void)setContextMenusEnabled: (BOOL)flag
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::setContextMenusEnabled: is not implemented"];
-}
-
-
-- (BOOL)contextMenusEnabled;
-{
- return NO;
-}
-
-
-// Remove the selection.
-- (void)deselectText
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::deselectText: is not implemented"];
-}
-
-
-
-// Search from the end of the currently selected location, or from the beginning of the document if nothing
-// is selected.
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
-{
- [NSException raise:WKMethodNotYetImplemented format:@"WKWebView::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"];
- return nil;
-}
-
-
-
-#ifdef DELAY_LAYOUT
-- delayLayout: sender
-{
- [NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(delayLayout:) object: self];
- KWQDEBUG("KWQHTMLView: delayLayout called\n");
- [self setNeedsLayout: YES];
- [self setNeedsDisplay: YES];
-}
-
--(void)notificationReceived:(NSNotification *)notification
-{
- if ([[notification name] rangeOfString: @"uri-fin-"].location == 0){
- KWQDEBUG1("KWQHTMLView: Received notification, %s\n", DEBUG_OBJECT([notification name]));
- [self performSelector:@selector(delayLayout:) withObject:self afterDelay:(NSTimeInterval)0.5];
- }
-}
-#else
--(void)notificationReceived:(NSNotification *)notification
-{
- if ([[notification name] rangeOfString: @"uri-fin-"].location == 0){
- [self setNeedsLayout: YES];
- [self setNeedsDisplay: YES];
- }
-}
-#endif
-
-
-- (void)setNeedsLayout: (bool)flag
-{
- ((WKWebViewPrivate *)_viewPrivate)->needsLayout = flag;
-}
-
-
-// This should eventually be removed.
-- (void)drawRect:(NSRect)rect {
- KHTMLView *widget = ((WKWebViewPrivate *)_viewPrivate)->widget;
-
- if (widget != 0l){
- [self layout];
-
- QPainter p(widget);
-
- [self lockFocus];
-
- //double start = CFAbsoluteTimeGetCurrent();
- ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
- (int)rect.origin.y,
- (int)rect.size.width,
- (int)rect.size.height );
- //WebKitDebugAtLevel (0x200, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
-
-#ifdef DEBUG_LAYOUT
- NSRect vframe = [self frame];
- [[NSColor blackColor] set];
- NSBezierPath *path;
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, 0)];
- [path lineToPoint:NSMakePoint(vframe.size.width, vframe.size.height)];
- [path closePath];
- [path stroke];
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, vframe.size.height)];
- [path lineToPoint:NSMakePoint(vframe.size.width, 0)];
- [path closePath];
- [path stroke];
-#endif
-
- [self unlockFocus];
- }
-}
-
-- (void)setIsFlipped: (bool)flag
-{
- ((WKWebViewPrivate *)_viewPrivate)->isFlipped = flag;
-}
-
-
-- (BOOL)isFlipped
-{
- return ((WKWebViewPrivate *)_viewPrivate)->isFlipped;
-}
-
-
-
-// Override superclass implementation. We want to relayout when the frame size is changed.
-- (void)setFrame:(NSRect)frameRect
-{
- [super setFrame:frameRect];
- [self setNeedsLayout: YES];
-}
-
-
-- (void)mouseUp: (NSEvent *)event
-{
- int button, state;
-
- if ([event type] == NSLeftMouseUp){
- button = Qt::LeftButton;
- state = Qt::LeftButton;
- }
- else if ([event type] == NSRightMouseUp){
- button = Qt::RightButton;
- state = Qt::RightButton;
- }
- else if ([event type] == NSOtherMouseUp){
- button = Qt::MidButton;
- state = Qt::MidButton;
- }
- else {
- [NSException raise:WKRuntimeError format:@"WKWebView::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);
-}
-
-- (void)mouseDown: (NSEvent *)event
-{
- int button, state;
-
- if ([event type] == NSLeftMouseDown){
- button = Qt::LeftButton;
- state = Qt::LeftButton;
- }
- else if ([event type] == NSRightMouseDown){
- button = Qt::RightButton;
- state = Qt::RightButton;
- }
- else if ([event type] == NSOtherMouseDown){
- button = Qt::MidButton;
- state = Qt::MidButton;
- }
- else {
- [NSException raise:WKRuntimeError format:@"WKWebView::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);
-}
-
-- (void)mouseDragged: (NSEvent *)event
-{
- NSPoint p = [event locationInWindow];
- //WebKitDebugAtLevel (0x200, "mouseDragged %f, %f\n", p.x, p.y);
-}
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebViewPrivate.h b/WebKit/WebView.subproj/WKWebViewPrivate.h
deleted file mode 100644
index 79b55cd..0000000
--- a/WebKit/WebView.subproj/WKWebViewPrivate.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* WKWebViewPrivate.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
- NSWebPageView.
-*/
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKWebView.h>
-
-class QWidget;
-class KHTMLPart;
-class KHTMLView;
-
- at interface WKWebViewPrivate : NSObject
-{
- id <WKWebController>controller;
- KHTMLView *widget;
- WKDynamicScrollBarsView *frameScrollView;
- bool isFlipped;
- bool needsLayout;
-}
-
- at end
-
- at interface WKWebView (WKPrivate)
-- (void)_setController: (id <WKWebController>)controller;
-- (void)_resetView;
-- (KHTMLView *)_widget;
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv;
-- (WKDynamicScrollBarsView *)_frameScrollView;
- at end
diff --git a/WebKit/WebView.subproj/WKWebViewPrivate.mm b/WebKit/WebView.subproj/WKWebViewPrivate.mm
deleted file mode 100644
index 147c3c4..0000000
--- a/WebKit/WebView.subproj/WKWebViewPrivate.mm
+++ /dev/null
@@ -1,81 +0,0 @@
-/* WKWebViewPrivate.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _viewPrivate in
- NSWebPageView.
-*/
-#import <WKWebViewPrivate.h>
-
-// Includes from KDE
-#include <khtmlview.h>
-
- at implementation WKWebViewPrivate
-
-- init
-{
- [super init];
-
- controller = nil;
- widget = 0;
-
- return self;
-}
-
-
-- (void)dealloc
-{
- // controller is not retained! WKWebControllers maintain
- // a reference to their view and main data source.
-
- [frameScrollView release];
-
- if (widget)
- delete widget;
-}
-
-
-
- at end
-
-
- at implementation WKWebView (WKPrivate)
-
-- (void)_resetView
-{
- NSArray *views = [self subviews];
- int count;
-
- count = [views count];
- while (count--){
- //WebKitDebugAtLevel(0x200, "Removing %p %s\n", [views objectAtIndex: 0], DEBUG_OBJECT([[[views objectAtIndex: 0] class] className]));
- [[views objectAtIndex: count] removeFromSuperviewWithoutNeedingDisplay];
- }
- [self setFrameSize: NSMakeSize (0,0)];
-}
-
-
-- (void)_setController: (id <WKWebController>)controller
-{
- // Not retained.
- ((WKWebViewPrivate *)_viewPrivate)->controller = controller;
-}
-
-- (KHTMLView *)_widget
-{
- return ((WKWebViewPrivate *)_viewPrivate)->widget;
-}
-
-- (void)_setFrameScrollView: (WKDynamicScrollBarsView *)sv
-{
- ((WKWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
- [self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
- [sv setDocumentView: self];
-}
-
-- (WKDynamicScrollBarsView *)_frameScrollView
-{
- return ((WKWebViewPrivate *)_viewPrivate)->frameScrollView;
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 88c098b..0c7eacb 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -1,5 +1,5 @@
/*
- WKWebController.h
+ IFWebController.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index f0e3f8d..850b3ea 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -1,13 +1,13 @@
/*
- WKWebDataSource.h
+ IFWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKWebFrame.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFWebFrame.h>
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 1cce802..64d1fe5 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -1,10 +1,10 @@
/*
- WKWebDataSource.h
+ IFWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFException.h>
#import <WebKit/WebKitDebug.h>
#include <xml/dom_docimpl.h>
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index c1557e6..d148a28 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -1,4 +1,4 @@
-/* WKWebDataSourcePrivate.h
+/* IFWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -7,7 +7,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebDataSource.h>
+#import <WebKit/IFWebDataSource.h>
// includes from kde
#include <khtmlview.h>
@@ -32,4 +32,4 @@
- (void)_setController: (id <WKWebController>)controller;
- (KHTMLPart *)_part;
- (void)_setFrameName: (NSString *)fName;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 6b28728..2a7de86 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -1,12 +1,12 @@
-/* WKWebDataSourcePrivate.h
+/* IFWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
in WebCore. Instances of this class are referenced by _dataSourcePrivate in
NSWebPageDataSource.
*/
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFException.h>
@@ -57,4 +57,4 @@
((WKWebDataSourcePrivate *)_dataSourcePrivate)->frameName = [fname retain];
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index ca80df1..990cec8 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -6,7 +6,7 @@
// Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/WKDynamicScrollBarsView.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
@implementation WKDynamicScrollBarsView
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 3c55879..047bbe0 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -1,5 +1,5 @@
/*
- WKWebFrame.h
+ IFWebFrame.h
Copyright 2001, Apple, Inc. All rights reserved.
@@ -20,4 +20,4 @@
- (void)setView: view;
- view;
- (WKWebDataSource *)dataSource;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 0a5334a..7b38252 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -1,13 +1,13 @@
/*
- WKWebView.h
+ IFWebView.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebController.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebController.h>
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 2c7eeb4..726c269 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -1,13 +1,13 @@
-/* WKWebView.mm
+/* IFWebView.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WKWebView.h>
-#import <WebKit/WKWebViewPrivate.h>
-#import <WebKit/WKWebDataSource.h>
-#import <WebKit/WKWebDataSourcePrivate.h>
-#import <WebKit/WKDefaultWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKException.h>
+#import <WebKit/IFWebView.h>
+#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/IFWebDataSource.h>
+#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/IFBaseWebController.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
+#import <WebKit/IFException.h>
#import <WebKit/WebKitDebug.h>
// KDE related includes
@@ -371,4 +371,4 @@
//WebKitDebugAtLevel (0x200, "mouseDragged %f, %f\n", p.x, p.y);
}
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 79b55cd..d741d20 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -1,4 +1,4 @@
-/* WKWebViewPrivate.h
+/* IFWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -7,9 +7,9 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKWebView.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
+#import <WebKit/IFWebView.h>
class QWidget;
class KHTMLPart;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 79b55cd..d741d20 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -1,4 +1,4 @@
-/* WKWebViewPrivate.h
+/* IFWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -7,9 +7,9 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/WKWebController.h>
-#import <WebKit/WKDynamicScrollBarsView.h>
-#import <WebKit/WKWebView.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFDynamicScrollBarsView.h>
+#import <WebKit/IFWebView.h>
class QWidget;
class KHTMLPart;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 147c3c4..1e72e11 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -1,11 +1,11 @@
-/* WKWebViewPrivate.mm
+/* IFWebViewPrivate.mm
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
in WebCore. Instances of this class are referenced by _viewPrivate in
NSWebPageView.
*/
-#import <WKWebViewPrivate.h>
+#import <IFWebViewPrivate.h>
// Includes from KDE
#include <khtmlview.h>
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index d829800..12ef448 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -1,5 +1,5 @@
/*
- WKWebController.h
+ IFWebController.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 88c098b..0c7eacb 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -1,5 +1,5 @@
/*
- WKWebController.h
+ IFWebController.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list