[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:42:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 42f0cdb4e50da7897805cbcf92639ef3fc6c4729
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 19 20:10:21 2003 +0000
top level:
Reviewed by Darin
Changes to move from WebFoundation to Foundation
* Makefile.am: Add some targets to check out and build Foundation.
* configure.in: Add some more command line options to support
building Foundation.
* make-Foundation.sh.in: Added. Helper script to build Foundation.
Tests:
Reviewed by Darin
Changed imports to include headers from Foundation
instead of WebFoundation.
Removed WebFoundation.framework as a dependency in
the project files.
Updated some test files to use Foundation-related names
instead of WebFoundation-related names.
No longer build WebFoundation-CacheLoader subdirectory.
This test has not worked in a very long time. No need
to keep up the ruse as long as the test does not work.
* PDFViewer/DocumentController.m:
* PDFViewer/PDFViewer.pbproj/project.pbxproj:
* SimpleViewer/DocumentController.m:
* SimpleViewer/SimpleViewer.pbproj/project.pbxproj:
* SnippetEditor/SnippetController.m:
* SnippetEditor/SnippetEditor.pbproj/project.pbxproj:
* WebFoundation-CacheLoader/NeverExpiresTest.m:
(-[NeverExpiresTest setUp]):
* WebFoundation-Misc/Makefile.am:
WebKit:
Reviewed by Darin
Changed imports to include headers from Foundation
instead of WebFoundation.
Removed WebFoundation.framework as a dependency in
the project file.
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.m:
* History.subproj/WebHistoryPrivate.m:
* History.subproj/WebURLsWithTitles.m:
* Misc.subproj/WebDownload.h:
* Misc.subproj/WebDownload.m:
* Misc.subproj/WebFileDatabase.m:
* Misc.subproj/WebIconDatabase.m:
* Misc.subproj/WebIconLoader.m:
* Misc.subproj/WebKitErrors.m:
* Misc.subproj/WebKitErrorsPrivate.h:
* Misc.subproj/WebNSPasteboardExtras.m:
* Misc.subproj/WebNSViewExtras.m:
* Panels.subproj/WebAuthenticationPanel.h:
* Panels.subproj/WebAuthenticationPanel.m:
* Panels.subproj/WebPanelAuthenticationHandler.h:
* Panels.subproj/WebPanelAuthenticationHandler.m:
* Plugins.subproj/WebBaseNetscapePluginStream.m:
* Plugins.subproj/WebBaseNetscapePluginView.m:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
* Plugins.subproj/WebNetscapePluginRepresentation.m:
* Plugins.subproj/WebNetscapePluginStream.m:
* Plugins.subproj/WebNullPluginView.m:
* Plugins.subproj/WebPluginController.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebCookieAdapter.m:
* WebCoreSupport.subproj/WebImageRendererFactory.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
* WebView.subproj/WebDataProtocol.h:
* WebView.subproj/WebDataProtocol.m:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebDefaultFrameLoadDelegate.m:
* WebView.subproj/WebDefaultPolicyDelegate.m:
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
* WebView.subproj/WebDefaultUIDelegate.m:
* WebView.subproj/WebFrame.m:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebFrameView.m:
* WebView.subproj/WebFrameViewPrivate.m:
* WebView.subproj/WebHTMLRepresentation.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebImageRepresentation.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebPreferences.m:
* WebView.subproj/WebTextRepresentation.m:
* WebView.subproj/WebTextView.m:
* WebView.subproj/WebUIDelegate.h:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.m:
WebBrowser:
Reviewed by Darin
Changed imports to include headers from Foundation
instead of WebFoundation.
Removed WebFoundation.framework as a dependency in
the project file.
* AppController.m:
* BookmarkSource.m:
* BookmarksViewController.m:
* BrowserDocument.h:
* BrowserDocument.m:
* BrowserDocumentController.m:
* BrowserNSBundleExtras.m:
* BrowserNSErrorExtras.h:
* BrowserNSErrorExtras.m:
* BrowserNSNetServiceExtras.m:
* BrowserNSStringExtras.m:
* BrowserNSURLExtras.m:
* BrowserWebBookmarkExtras.m:
* BrowserWebController.m:
* BrowserWindowController.m:
* BugReportController.m:
* ContextMenuHandler.m:
* Debug/CacheController.m:
* Debug/DebugUtilities.m:
* Debug/SnippetController.m:
* DownloadMonitor.m:
* DownloadProgressEntry.m:
* DownloadRow.m:
* FormCompletionController.m:
* FrameProgressEntry.m:
* GlobalHistory.m:
* GoogleSearchChannel.m:
* HTMLSourceDocument.m:
* LoadProgressMonitor.m:
* LocationChangeError.m:
* LocationChangeHandler.m:
* LocationFieldEditor.m:
* NewBookmarksController.m:
* Preferences.subproj/AcceptedCookies.m:
* Preferences.subproj/AdvancedPreferences.m:
* Preferences.subproj/DefaultBrowserController.m:
* Preferences.subproj/PasswordsEditor.m:
* Preferences.subproj/SecurityPreferences.m:
* Preferences.subproj/WBPreferences.m:
* RendezvousController.m:
* ResourceProgressEntry.m:
* SlidingAnimation.m:
* SpinningProgressIndicator.m:
* TabBarView.m:
* Test/PageLoadTestController.m:
* Test/PageLoadTestRunner.m:
* TitleBarButton.m:
* URLCompletionController.m:
* WebBookmarkImporter.m:
* WebBookmarkLeaf.m:
* main.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4393 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 37712d7..65bedf9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,68 @@
+2003-05-19 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Darin
+
+ Changed imports to include headers from Foundation
+ instead of WebFoundation.
+
+ Removed WebFoundation.framework as a dependency in
+ the project file.
+
+ * History.subproj/WebHistory.m:
+ * History.subproj/WebHistoryItem.m:
+ * History.subproj/WebHistoryPrivate.m:
+ * History.subproj/WebURLsWithTitles.m:
+ * Misc.subproj/WebDownload.h:
+ * Misc.subproj/WebDownload.m:
+ * Misc.subproj/WebFileDatabase.m:
+ * Misc.subproj/WebIconDatabase.m:
+ * Misc.subproj/WebIconLoader.m:
+ * Misc.subproj/WebKitErrors.m:
+ * Misc.subproj/WebKitErrorsPrivate.h:
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ * Misc.subproj/WebNSViewExtras.m:
+ * Panels.subproj/WebAuthenticationPanel.h:
+ * Panels.subproj/WebAuthenticationPanel.m:
+ * Panels.subproj/WebPanelAuthenticationHandler.h:
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ * Plugins.subproj/WebBaseNetscapePluginStream.m:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ * Plugins.subproj/WebNetscapePluginStream.m:
+ * Plugins.subproj/WebNullPluginView.m:
+ * Plugins.subproj/WebPluginController.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ * WebCoreSupport.subproj/WebImageRendererFactory.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ * WebView.subproj/WebDataProtocol.h:
+ * WebView.subproj/WebDataProtocol.m:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebDefaultFrameLoadDelegate.m:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ * WebView.subproj/WebDefaultUIDelegate.m:
+ * WebView.subproj/WebFrame.m:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebFrameView.m:
+ * WebView.subproj/WebFrameViewPrivate.m:
+ * WebView.subproj/WebHTMLRepresentation.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebImageRepresentation.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebPreferences.m:
+ * WebView.subproj/WebTextRepresentation.m:
+ * WebView.subproj/WebTextView.m:
+ * WebView.subproj/WebUIDelegate.h:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.m:
+
2003-05-16 Maciej Stachowiak <mjs at apple.com>
Reviewed by John.
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index f154c6b..d3370df 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -10,10 +10,10 @@
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHistoryItemPrivate.h>
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#import <WebCore/WebCoreHistory.h>
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 865cfb8..4702f98 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -11,8 +11,8 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index 7a4f6cc..b9f244c 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -12,12 +12,12 @@
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebKit/WebKitLogging.h>
-#import <WebFoundation/NSError.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
-#import <WebFoundation/NSCalendarDate_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSCalendarDate_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
NSString *FileVersionKey = @"WebHistoryFileVersion";
NSString *DatesArrayKey = @"WebHistoryDates";
diff --git a/WebKit/History.subproj/WebURLsWithTitles.m b/WebKit/History.subproj/WebURLsWithTitles.m
index 2d397b7..83e2691 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.m
+++ b/WebKit/History.subproj/WebURLsWithTitles.m
@@ -8,7 +8,7 @@
#import "WebURLsWithTitles.h"
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
@implementation WebURLsWithTitles
diff --git a/WebKit/Misc.subproj/WebDownload.h b/WebKit/Misc.subproj/WebDownload.h
index 8ac309d..1e1e82b 100644
--- a/WebKit/Misc.subproj/WebDownload.h
+++ b/WebKit/Misc.subproj/WebDownload.h
@@ -5,7 +5,7 @@
Public header file.
*/
-#import <WebFoundation/NSURLDownload.h>
+#import <Foundation/NSURLDownload.h>
@class WebDownloadInternal;
diff --git a/WebKit/Misc.subproj/WebDownload.m b/WebKit/Misc.subproj/WebDownload.m
index 7996302..58103d2 100644
--- a/WebKit/Misc.subproj/WebDownload.m
+++ b/WebKit/Misc.subproj/WebDownload.m
@@ -4,9 +4,9 @@
#import <WebKit/WebDownload.h>
-#import <WebFoundation/NSURLDownload.h>
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
-#import <WebFoundation/NSURLDownloadPrivate.h>
+#import <Foundation/NSURLDownload.h>
+#import <Foundation/NSURLAuthenticationChallenge.h>
+#import <Foundation/NSURLDownloadPrivate.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
@interface WebDownloadInternal : NSObject
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index f0ea47f..c8641e9 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -7,7 +7,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLRUFileList.h>
-#import <WebFoundation/NSFileManager_NSURLExtras.h>
+#import <Foundation/NSFileManager_NSURLExtras.h>
#import <fcntl.h>
#import <fts.h>
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index bf8df54..47b92bb 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -12,8 +12,8 @@
#import <WebKit/WebFileDatabase.h>
#import <WebKit/WebKitLogging.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
NSString * const WebIconDatabaseVersionKey = @"WebIconDatabaseVersion";
NSString * const WebIconsOnDiskKey = @"WebIconsOnDisk";
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 33a82e3..10fa715 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -11,10 +11,10 @@
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconDatabasePrivate.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
#define WebIconLoaderWeeksWorthOfSeconds (60 * 60 * 24 * 7)
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index ee801d9..1916058 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -10,7 +10,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocalizableStrings.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
#import <pthread.h>
diff --git a/WebKit/Misc.subproj/WebKitErrorsPrivate.h b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
index 9c6e31b..c47f0b7 100644
--- a/WebKit/Misc.subproj/WebKitErrorsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
@@ -8,7 +8,7 @@
#import <WebKit/WebKitErrors.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#endif
@interface NSError (WebKitExtras)
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 2df55a3..d85fc62 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -11,8 +11,8 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#import <ApplicationServices/ApplicationServicesPriv.h>
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index 59d934d..dd93601 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -8,8 +8,8 @@
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#define WebDragStartHysteresisX 5.0
#define WebDragStartHysteresisY 5.0
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.h b/WebKit/Panels.subproj/WebAuthenticationPanel.h
index 3c0ed40..e6163f4 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.h
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.h
@@ -5,7 +5,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/NSURLCredentialStorage.h>
+#import <Foundation/NSURLCredentialStorage.h>
@class NSURLAuthenticationChallenge;
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index c8d680e..e605547 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -7,11 +7,11 @@
#import <WebKit/WebAuthenticationPanel.h>
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
-#import <WebFoundation/NSURLProtectionSpace.h>
+#import <Foundation/NSURLAuthenticationChallenge.h>
+#import <Foundation/NSURLProtectionSpace.h>
#import <WebKit/WebAssertions.h>
#import <WebKit/WebLocalizableStrings.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#import <WebKit/WebNSControlExtras.h>
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
index 1e8b99d..2ef3bce 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
@@ -5,7 +5,7 @@
*/
#import <Foundation/Foundation.h>
-#import <WebFoundation/NSURLCredentialStorage.h>
+#import <Foundation/NSURLCredentialStorage.h>
@class NSURLAuthenticationChallenge;
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 5fe9e30..0dfcb24 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -7,9 +7,9 @@
#import <WebKit/WebPanelAuthenticationHandler.h>
#import <WebKit/WebAuthenticationPanel.h>
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
+#import <Foundation/NSURLAuthenticationChallenge.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index 1a6a18a..50ecacf 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -8,9 +8,9 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/NSFileManager_NSURLExtras.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
+#import <Foundation/NSFileManager_NSURLExtras.h>
@implementation WebBaseNetscapePluginStream
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 7939e7f..c2563be 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -21,11 +21,11 @@
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSData_NSURLExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSData_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#import <AppKit/NSEvent_Private.h>
#import <Carbon/Carbon.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index c621933..26bd5ea 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -17,7 +17,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLResponse.h>
@implementation WebNetscapePluginDocumentView
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index 7465592..c2f8bfc 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -12,7 +12,7 @@
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebNetscapePluginPackage.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSURLRequest.h>
@implementation WebNetscapePluginEmbeddedView
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index 35b01f4..0a2b786 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -9,12 +9,12 @@
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNetscapePluginRepresentation.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#endif
@implementation WebNetscapePluginRepresentation
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 9003960..358071c 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -10,8 +10,8 @@
#import <WebKit/WebNetscapePluginEmbeddedView.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLConnection.h>
@implementation WebNetscapePluginStream
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 5e64672..efc6320 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -11,8 +11,8 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSError.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSURL_NSURLExtras.h>
static NSImage *image = nil;
diff --git a/WebKit/Plugins.subproj/WebPluginController.m b/WebKit/Plugins.subproj/WebPluginController.m
index aec7457..cbd0303 100644
--- a/WebKit/Plugins.subproj/WebPluginController.m
+++ b/WebKit/Plugins.subproj/WebPluginController.m
@@ -19,7 +19,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSURLRequest.h>
@implementation WebPluginController
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index ae2fc76..d111115 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -40,14 +40,14 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLFileTypeMappings.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLFileTypeMappings.h>
#import <WebKit/WebLocalizableStrings.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index f9eb126..832a3d3 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -9,8 +9,8 @@
#import "WebCookieAdapter.h"
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSHTTPCookieStorage.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSHTTPCookieStorage.h>
+#import <Foundation/NSURL_NSURLExtras.h>
@implementation WebCookieAdapter
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
index 06f3118..2afb11a 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
@@ -27,7 +27,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURLFileTypeMappings.h>
+#import <Foundation/NSURLFileTypeMappings.h>
@implementation WebImageRendererFactory
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index d023f3f..33f5269 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -10,15 +10,15 @@
#import <WebKit/WebFrame.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#endif
#import <WebCore/WebCoreResourceLoader.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index d023f3f..33f5269 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -10,15 +10,15 @@
#import <WebKit/WebFrame.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#endif
#import <WebCore/WebCoreResourceLoader.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 955ae0a..74ab684 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -106,12 +106,12 @@
};
0867D69AFE84028FC02AAC07 = {
children = (
+ BE1B2F5504755C7700CA289C,
F5C2869302846DCD018635CA,
F5C2869402846DCD018635CA,
F5C2869502846DCD018635CA,
F738C9E903FAD3DF0321FBE0,
F738C9EA03FAD3DF0321FBE0,
- F738C9EB03FAD3DF0321FBE0,
);
isa = PBXGroup;
name = "Frameworks and Libraries";
@@ -427,7 +427,7 @@
F5C287BD02846DCD018635CA,
F738CA5703FAD3DF0321FBE0,
F738CA5803FAD3DF0321FBE0,
- F738CA5903FAD3DF0321FBE0,
+ BE1B2F5604755C7700CA289C,
);
isa = PBXFrameworksBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2461,6 +2461,17 @@
settings = {
};
};
+ BE1B2F5504755C7700CA289C = {
+ isa = PBXFrameworkReference;
+ path = Foundation.framework;
+ refType = 3;
+ };
+ BE1B2F5604755C7700CA289C = {
+ fileRef = BE1B2F5504755C7700CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
BEE18F920472A0CF00CA289C = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -3623,12 +3634,6 @@
path = build/WebCore.framework;
refType = 4;
};
- F738C9EB03FAD3DF0321FBE0 = {
- isa = PBXFrameworkReference;
- name = WebFoundation.framework;
- path = build/WebFoundation.framework;
- refType = 4;
- };
F738CA5703FAD3DF0321FBE0 = {
fileRef = F738C9E903FAD3DF0321FBE0;
isa = PBXBuildFile;
@@ -3641,12 +3646,6 @@
settings = {
};
};
- F738CA5903FAD3DF0321FBE0 = {
- fileRef = F738C9EB03FAD3DF0321FBE0;
- isa = PBXBuildFile;
- settings = {
- };
- };
F79B974804019934036909D2 = {
fileEncoding = 30;
isa = PBXFileReference;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index b66f539..679e0ca 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -5,15 +5,15 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionPrivate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
+#import <Foundation/NSURLAuthenticationChallenge.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLConnectionPrivate.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebDataProtocol.h b/WebKit/WebView.subproj/WebDataProtocol.h
index 9cb82d1..e262868 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.h
+++ b/WebKit/WebView.subproj/WebDataProtocol.h
@@ -7,8 +7,8 @@
#import <Foundation/Foundation.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLProtocol.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLProtocol.h>
@interface WebDataProtocol : NSURLProtocol
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 8649b38..cfd394f 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -4,10 +4,10 @@
*/
#import <WebKit/WebDataProtocol.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
+#import <Foundation/NSError_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
#import <WebKit/WebAssertions.h>
NSString *WebDataProtocolScheme = @"applewebdata";
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index d5c7975..54bc1e9 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -15,11 +15,11 @@
#import <WebKit/WebView.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSURLFileTypeMappings.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
@implementation WebDataSource
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 2c668cc..eef507d 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -29,14 +29,14 @@
#import <WebKit/WebTextRepresentation.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
@implementation WebDataSourcePrivate
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index b481373..50c9814 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -15,9 +15,9 @@
#import <WebKit/WebLocalizableStrings.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
@implementation WebDefaultUIDelegate (WebContextMenu)
diff --git a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
index 0dfae7e..e8662ff 100644
--- a/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultFrameLoadDelegate.m
@@ -7,7 +7,7 @@
#import <WebKit/WebFrame.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#endif
@implementation WebDefaultFrameLoadDelegate
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index e366285..e48fe66 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -9,9 +9,9 @@
#import <WebKit/WebView.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index 421ce6f..edf6598 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -5,11 +5,11 @@
#import <WebKit/WebDefaultResourceLoadDelegate.h>
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSURLAuthenticationChallenge.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSError_NSURLExtras.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index c121edb..fdae7a3 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -4,7 +4,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSURLRequest.h>
#import <WebKit/WebDefaultUIDelegate.h>
#import <WebKit/WebJavaScriptTextInputPanel.h>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index bb49d71..097bc91 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -21,10 +21,10 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
@implementation WebFrame
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 90a26ab..09ad0b6 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -30,13 +30,13 @@
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSError_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
#import <objc/objc-runtime.h>
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 83391ca..a5b3898 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -24,9 +24,9 @@
#import <WebKit/WebViewFactory.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLRequest.h>
enum {
SpaceKey = 0x0020
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index ba5b42c..b26720c 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -12,8 +12,8 @@
#import <WebKit/WebTextView.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
@implementation WebFrameViewPrivate
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 5b8654e..2d35e42 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -11,7 +11,7 @@
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDOMElement.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLResponse.h>
@interface WebHTMLRepresentationPrivate : NSObject
{
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 424e1ea..9e8f50e 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -9,7 +9,7 @@
#import <AppKit/NSResponder_Private.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURL_NSURLExtras.h>
#import <WebCore/WebCoreFirstResponderChanges.h>
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index 1804ea5..11241f8 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -10,10 +10,10 @@
#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebImageRendererFactory.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSURLRequest.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
-#import <WebFoundation/NSError.h>
+#import <Foundation/NSError.h>
#endif
@implementation WebImageRepresentation
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index b66f539..679e0ca 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -5,15 +5,15 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionPrivate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
+#import <Foundation/NSURLAuthenticationChallenge.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLConnectionPrivate.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
+#import <Foundation/NSError_NSURLExtras.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 339579e..95a9d9b 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -5,18 +5,18 @@
#import <WebKit/WebMainResourceClient.h>
-#import <WebFoundation/NSHTTPCookie.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
-
-#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionPrivate.h>
-#import <WebFoundation/NSURLDownloadPrivate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
+#import <Foundation/NSHTTPCookie.h>
+#import <Foundation/NSError_NSURLExtras.h>
+
+#import <Foundation/NSURLFileTypeMappings.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLConnectionPrivate.h>
+#import <Foundation/NSURLDownloadPrivate.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 339579e..95a9d9b 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -5,18 +5,18 @@
#import <WebKit/WebMainResourceClient.h>
-#import <WebFoundation/NSHTTPCookie.h>
-#import <WebFoundation/NSError_NSURLExtras.h>
-
-#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/NSURL_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionPrivate.h>
-#import <WebFoundation/NSURLDownloadPrivate.h>
-#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/NSURLRequestPrivate.h>
-#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/NSURLResponsePrivate.h>
+#import <Foundation/NSHTTPCookie.h>
+#import <Foundation/NSError_NSURLExtras.h>
+
+#import <Foundation/NSURLFileTypeMappings.h>
+#import <Foundation/NSURL_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLConnectionPrivate.h>
+#import <Foundation/NSURLDownloadPrivate.h>
+#import <Foundation/NSURLRequest.h>
+#import <Foundation/NSURLRequestPrivate.h>
+#import <Foundation/NSURLResponse.h>
+#import <Foundation/NSURLResponsePrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultPolicyDelegate.h>
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index bccec76..7ad89eb 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -5,7 +5,7 @@
#import "WebPreferences.h"
-#import <WebFoundation/NSDictionary_NSURLExtras.h>
+#import <Foundation/NSDictionary_NSURLExtras.h>
#import <WebCore/WebCoreSettings.h>
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index 35cb7bf..dd13c70 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -10,7 +10,7 @@
#import <WebKit/WebFrameView.h>
#import <WebKit/WebTextView.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebAssertions.h>
@implementation WebTextRepresentation
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 8774449..b6a8307 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -6,7 +6,7 @@
#import <WebKit/WebTextView.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURLResponse.h>
+#import <Foundation/NSURLResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index f8227a4..b3168e6 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -6,7 +6,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSURLRequest.h>
/*!
@enum WebMenuItemTag
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 606387d..d5875d7 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -30,8 +30,8 @@
#import <WebKit/WebUIDelegate.h>
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSUserDefaults_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
+#import <Foundation/NSUserDefaults_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
static const struct UserAgentSpoofTableEntry *_web_findSpoofTableEntry(const char *, unsigned);
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 1e293f2..38c5d49 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -25,12 +25,12 @@
#import <WebKit/WebAssertions.h>
-#import <WebFoundation/NSURLFileTypeMappings.h>
-#import <WebFoundation/NSData_NSURLExtras.h>
-#import <WebFoundation/NSString_NSURLExtras.h>
-#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLDownloadPrivate.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <Foundation/NSURLFileTypeMappings.h>
+#import <Foundation/NSData_NSURLExtras.h>
+#import <Foundation/NSString_NSURLExtras.h>
+#import <Foundation/NSURLConnection.h>
+#import <Foundation/NSURLDownloadPrivate.h>
+#import <Foundation/NSURLRequest.h>
#import <WebCore/WebCoreEncodings.h>
#import <WebCore/WebCoreSettings.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list