[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:08 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c7c342ac527466388070454238206257fb0f5942
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed May 14 16:56:15 2003 +0000
Tests:
Reviewed by John
Moved WebAssertions header to WebKit
* PDFViewer/PDFRepresentation.m:
WebFoundation:
Reviewed by John
Copied WebAssertions.[hm] to WebKit
Renamed copy of WebAssertions.[hm] that stayed to NSURLAssertions.[hm]
Renamed WebFoundationLogging.[hm] to NSURLLogging.[hm]
Search and replace through all the code in this framework to
twiddle names used and defined in the logging and assertions
files so that they use an "NSURL" prefix instead of no prefix, i
a "Web" prefix, or a "WebFoundation" prefix.
Removed logging exported symbols to exports file.
* AuthenticationManager.subproj/NSHTTPAuthenticator.m:
(-[NSHTTPAuthenticator init]):
* AuthenticationManager.subproj/NSURLAuthenticationChallenge.m:
(-[NSURLAuthenticationChallenge init]):
* AuthenticationManager.subproj/NSURLCredentialStorage.m:
(-[NSURLCredentialStorage init]):
* AuthenticationManager.subproj/NSURLKeychainCredentialStorage.m:
(-[NSURLKeychainCredentialStorage _protectionSpaceWithKeychainItem:isDefault:]):
(-[NSURLKeychainCredentialStorage _secProtocolForProtectionSpace:]):
(-[NSURLKeychainCredentialStorage _saveCredential:forProtectionSpace:isDefault:]):
(-[NSURLKeychainCredentialStorage _updateDefaultState:forCredential:protectionSpace:]):
(-[NSURLKeychainCredentialStorage _initializeFromKeychain]):
(-[NSURLKeychainCredentialStorage removeCredential:forProtectionSpace:]):
* CacheLoader.subproj/NSNetworkSettings.m:
(-[NSNetworkSettings _listenForProxySettingChanges]):
(-[NSNetworkSettings init]):
* CacheLoader.subproj/NSURLCache.m:
(-[NSURLCache cachedResponseForRequest:]):
(-[NSURLCache storeCachedResponse:forRequest:]):
(-[NSURLCache removeCachedResponseForRequest:]):
(-[NSURLCache removeAllCachedResponses]):
(-[NSURLCache _memoryCacheRemoveNodeFromLRUList:]):
(-[NSURLCache _memoryCacheAppendNodeToLRUList:]):
(-[NSURLCache _memoryCacheTouchNode:]):
(-[NSURLCache _memoryCacheTruncate:]):
(-[NSURLCache _memoryCacheGet:]):
(-[NSURLCache _memoryCachePut:]):
(-[NSURLCache _memoryCacheRemove:]):
(-[NSURLCache _diskCacheSetSyncTimer]):
(-[NSURLCache _diskCacheSync:]):
(-[NSURLCache _diskCacheCreateLRUList:]):
(-[NSURLCache _diskCacheCreateDirectory]):
(-[NSURLCache _diskCacheGet:]):
(-[NSURLCache _diskCacheTruncate:]):
(-[NSURLCache _diskCacheScheduleWrite:]):
(-[NSURLCache _diskCacheExecuteWrite:]):
(-[NSURLCache _diskCacheScheduleRemoval:]):
(-[NSURLCache _diskCacheExecuteRemoval:]):
* CacheLoader.subproj/NSURLConnection.m:
(-[NSURLConnection initWithRequest:delegate:]):
(+[NSURLConnection _forceSingleLoad]):
(-[NSURLConnection _postDidReceiveResponseCallback]):
(-[NSURLConnection _sendWillSendRequestCallback]):
(-[NSURLConnection _sendDidReceiveResponseCallback]):
(-[NSURLConnection _sendDidReceiveDataCallback]):
(-[NSURLConnection _sendDidFailCallback]):
(-[NSURLConnection _sendDidFinishLoadingCallback]):
(-[NSURLConnection _chooseCachedResponse]):
(-[NSURLConnection _beginLoad]):
(-[NSURLConnection _checkIfTimedOut]):
(-[NSURLConnection _cleanup]):
(-[NSURLConnection _wasRedirectedToRequest:redirectResponse:]):
(-[NSURLConnection _didReceiveAuthenticationChallenge:]):
(-[NSURLConnection _didReceiveResponse:cacheStoragePolicy:]):
(-[NSURLConnection _didFinishReturnCachedResponse:]):
(-[NSURLConnection _didFinishLoading]):
(+[NSURLConnection incrementOriginLoadCount]):
(_loadThrottler):
(_loadSweeper):
(-[NSURLConnectionInternal dealloc]):
(-[NSURLConnectionInternal URLProtocol:wasRedirectedToRequest:redirectResponse:]):
(-[NSURLConnectionInternal URLProtocol:cachedResponseIsValid:]):
* CacheLoader.subproj/NSURLConnectionQueue.m:
(-[NSURLConnectionQueue put:URL:]):
* CacheLoader.subproj/NSURLProtocol.m:
(+[NSURLProtocol canonicalRequestForRequest:]):
(+[NSURLProtocol requestIsCacheEquivalent:toRequest:]):
(+[NSURLProtocol propertyForKey:inRequest:]):
(+[NSURLProtocol setProperty:forKey:inRequest:]):
(+[NSURLProtocol _makeRequestCanonicalByMakingRequestURLCanonical:]):
* CacheLoader.subproj/NSURLRequest.m:
(-[NSURLRequest _URLHasScheme:]):
(+[NSURLRequest allowsAnyHTTPSCertificateForHost:]):
(+[NSURLRequest setAllowsAnyHTTPSCertificate:forHost:]):
(-[NSMutableURLRequest setHTTPMethod:]):
* CacheLoader.subproj/NSURLResponse.m:
(-[NSURLResponse suggestedFilename]):
* CookieManager.subproj/NSHTTPCookie.m:
(-[NSHTTPCookie initWithProperties:]):
(-[NSHTTPCookie init]):
(+[NSHTTPCookie cookieWithV0Spec:forURL:locationHeader:]):
* CookieManager.subproj/NSHTTPCookieDOStorage.m:
(-[NSHTTPCookieDOStorage _establishConnection]):
* CookieManager.subproj/NSHTTPCookieStorage.m:
(-[NSHTTPCookieStorage _setCookies:forURL:policyBaseURL:]):
(-[NSHTTPCookieStorage _cookieRequestHeaderFieldsForURL:withExtraCookies:]):
(-[NSHTTPCookieStorage init]):
(-[NSHTTPCookieStorage setCookiesFromResponseHeader:forURL:policyBaseURL:]):
* Database.subproj/NSLRUFileList.m:
(NSLRUFileListRelease):
(NSLRUFileListRebuildFileDataUsingRootDirectory):
(NSLRUFileListRemoveFileWithPath):
(NSLRUFileListTouchFileWithPath):
(NSLRUFileListSetFileData):
(NSLRUFileListGetPathOfOldestFile):
(NSLRUFileListRemoveOldestFileFromList):
(NSLRUFileListContainsItem):
(NSLRUFileListGetFileSize):
(NSLRUFileListCountItems):
(NSLRUFileListGetTotalSize):
(NSLRUFileListRemoveAllFilesFromList):
(compareTimes):
(cStringEqual):
(cStringHash):
(NSLRUFileDataEqual):
(NSLRUFileListGetOldestFileData):
(NSLRUFileDataReleaseApplierFunction):
(NSLRUFileDataRelease):
* Database.subproj/WebFileDatabase.m:
(-[WebFileDatabaseOp initWithCode:key:object:]):
(-[WebFileDatabaseOp perform:]):
(-[WebFileDatabase _createLRUList:]):
(-[WebFileDatabase setObject:forKey:]):
(-[WebFileDatabase removeObjectForKey:]):
(-[WebFileDatabase removeAllObjects]):
(-[WebFileDatabase objectForKey:]):
(-[WebFileDatabase performSetObject:forKey:]):
(-[WebFileDatabase performRemoveObjectForKey:]):
(-[WebFileDatabase lazySync:]):
(-[WebFileDatabase sync]):
* English.lproj/StringsNotToBeLocalized.txt:
* FileTransfer.subproj/NSBinHexDecoder.m:
(-[NSBinHexDecoder decodeIntoBuffer:size:]):
(-[NSBinHexDecoder decodeHeader]):
(-[NSBinHexDecoder decodeForkWithData:count:CRCCheckFlag:]):
(-[NSBinHexDecoder decodeData:dataForkData:resourceForkData:]):
(-[NSBinHexDecoder finishDecoding]):
* FileTransfer.subproj/NSGZipDecoder.m:
(-[NSGZipDecoder init]):
(-[NSGZipDecoder decodeData:dataForkData:resourceForkData:]):
(-[NSGZipDecoder finishDecoding]):
(-[NSGZipDecoder fileAttributes]):
(-[NSGZipDecoder filename]):
* FileTransfer.subproj/NSMacBinaryDecoder.m:
(-[NSMacBinaryDecoder decodeData:dataForkData:resourceForkData:]):
(-[NSMacBinaryDecoder fileAttributes]):
* FileTransfer.subproj/NSURLDownload.m:
(-[NSURLDownloadInternal dealloc]):
(-[NSURLDownload initWithSource:delegate:]):
(-[NSURLDownload setDestination:allowOverwrite:]):
(-[NSURLDownload connection:didReceiveAuthenticationChallenge:]):
(-[NSURLDownload connection:didCancelAuthenticationChallenge:]):
(-[NSURLDownload connection:didReceiveData:]):
(-[NSURLDownload connectionDidFinishLoading:]):
(-[NSURLDownload _createFSRefForPath:]):
(-[NSURLDownload _createFileIfNecessary]):
(-[NSURLDownload _decodeHeaderData:dataForkData:resourceForkData:]):
(-[NSURLDownload _decodeData:dataForkData:resourceForkData:]):
(-[NSURLDownload _decodeData:]):
(-[NSURLDownload _dataIfDoneBufferingData:]):
(-[NSURLDownload _writeForkData:isDataFork:]):
(-[NSURLDownload _closeForkSync:]):
(-[NSURLConnectionDelegateProxy connection:willSendRequest:redirectResponse:]):
(-[NSURLConnectionDelegateProxy connection:didReceiveAuthenticationChallenge:]):
(-[NSURLConnectionDelegateProxy connection:didCancelAuthenticationChallenge:]):
(-[NSURLConnectionDelegateProxy connection:didReceiveResponse:]):
(-[NSURLConnectionDelegateProxy connection:didReceiveData:]):
(-[NSURLConnectionDelegateProxy connectionDidFinishLoading:]):
(-[NSURLConnectionDelegateProxy connection:didFailWithError:]):
(WriteCompletionCallback):
(CloseCompletionCallback):
(DeleteCompletionCallback):
* Misc.subproj/NSURLAssertions.h:
* Misc.subproj/NSURLAssertions.m:
(NSURLReportAssertionFailure):
(NSURLReportAssertionFailureWithMessage):
(NSURLReportArgumentAssertionFailure):
(NSURLReportFatalError):
(NSURLReportError):
(NSURLLog):
* Misc.subproj/NSURLLogging.h:
* Misc.subproj/NSURLLogging.m:
* Misc.subproj/WebAssertions.h: Removed.
* Misc.subproj/WebAssertions.m: Removed.
* Misc.subproj/WebFoundationLogging.h: Removed.
* Misc.subproj/WebFoundationLogging.m: Removed.
* Misc.subproj/WebLocalizableStrings.m:
(WebLocalizedString):
* Misc.subproj/WebNSCalendarDateExtras.m:
(+[NSCalendarDate _web_dateFromHTTPDateString:]):
* Misc.subproj/WebNSDataExtras.m:
(-[NSData _web_parseRFC822HeaderFields]):
* Misc.subproj/WebNSFileManagerExtras.m:
(-[NSFileManager _web_changeFinderAttributes:forFileAtPath:]):
(-[NSFileManager _web_noteFileChangedAtPath:]):
* Misc.subproj/WebNSStringExtras.m:
* Misc.subproj/WebNSURLExtras.m:
(URLStringByAddingPercentEscapes):
(hexDigitValue):
* Misc.subproj/WebQueue.m:
(-[WebQueue put:]):
(-[WebQueue peekAt:]):
(-[WebQueue remove:]):
* Misc.subproj/WebSystemBits.m:
(WebGetRandomBytes):
(WebSetThreadPriority):
(initCapabilities):
* ProtocolHandlers.subproj/NSAboutURLProtocol.m:
(+[NSAboutURLProtocol canInitWithRequest:]):
(+[NSAboutURLProtocol canonicalRequestForRequest:]):
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.m:
(+[NSCFNetworkHTTPURLProtocol canInitWithRequest:]):
(-[NSCFNetworkHTTPURLProtocol dealloc]):
(-[NSCFNetworkHTTPURLProtocol setCertificatePolicyOnStream]):
(-[NSCFNetworkHTTPURLProtocol continueBeginLoadInBackgroundAfterCreatingHTTPRequest]):
(-[NSCFNetworkHTTPURLProtocol addConditionalFieldsToHeader]):
(-[NSCFNetworkHTTPURLProtocol addMessageBodyToRequest]):
(-[NSCFNetworkHTTPURLProtocol retryAfterConnectingToInternet]):
(-[NSCFNetworkHTTPURLProtocol handleReadStreamEvent:event:]):
(-[NSCFNetworkHTTPURLProtocol performHTTPHeaderRead:andCall:]):
(-[NSCFNetworkHTTPURLProtocol setResponseHeaderUsingHTTPResponse:andCall:context:]):
* ProtocolHandlers.subproj/NSFTPURLProtocol.m:
(+[NSFTPURLProtocol canInitWithRequest:]):
(+[NSFTPURLProtocol _canonicalURLForURL:]):
(-[NSFTPURLProtocol startLoading]):
(-[NSFTPURLProtocol determineErrorAndFail]):
(-[NSFTPURLProtocol handleReadStreamEvent:event:]):
* ProtocolHandlers.subproj/NSFileURLProtocol.m:
(+[NSFileURLProtocol canInitWithRequest:]):
(+[NSFileURLProtocol _canonicalURLForURL:]):
* ProtocolHandlers.subproj/NSHTTPURLProtocol.m:
(+[NSHTTPURLProtocol _canonicalURLForURL:]):
(+[NSHTTPURLProtocol requestIsCacheEquivalent:toRequest:]):
(-[NSHTTPURLProtocol startLoading]):
(-[NSHTTPURLProtocol cachedResponseRevalidated]):
(-[NSHTTPURLProtocol _cachedResponsePassesValidityChecks]):
(-[NSHTTPURLProtocol HTTPResponse]):
(-[NSHTTPURLProtocol buildHTTPResponse]):
(-[NSHTTPURLProtocol determineErrorAndFail]):
(-[NSHTTPURLProtocol _cachePolicyForResponse]):
(-[NSHTTPURLProtocol setResponseHeader:]):
(-[NSHTTPURLProtocol _URLStringFromLocationHeader]):
* ProtocolHandlers.subproj/NSSSLProxyWrapperStream.m:
(createConnectBytes):
(wSocketStreamCallBack):
* ProtocolHandlers.subproj/NSSimpleHTTPURLProtocol.m:
(ensureRequestStringCapacity):
(appendBytesToRequestString):
(appendIntegerToRequestString):
(appendNSStringToRequestString):
(_loadRunLoop):
(_socketWriteCallback):
(_socketReadCallback):
(_addCookieHeader):
(+[NSSimpleHTTPURLProtocol canInitWithRequest:]):
(-[NSSimpleHTTPURLProtocol _canUsePersistentConnectionForRequest]):
(-[NSSimpleHTTPURLProtocol _continueLoadingWithFileDescriptor:]):
(-[NSSimpleHTTPURLProtocol _continueLoadingWithAddressInfo]):
(-[NSSimpleHTTPURLProtocol _addRequestMessageBody]):
(-[NSSimpleHTTPURLProtocol buildHTTPRequest]):
(-[NSSimpleHTTPURLProtocol _parseHeaderFromData:]):
(-[NSSimpleHTTPURLProtocol _finishedWithFileDescriptor]):
(-[NSSimpleHTTPURLProtocol _processRawData]):
* WebFoundation-base.exp:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by John
Copied WebAssertions.[hm] from WebFoundation to WebKit
Updated all imports.
Added logging exported symbols to exports file.
* History.subproj/WebBackForwardList.m:
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.m:
* Misc.subproj/WebAssertions.h: Added.
* Misc.subproj/WebAssertions.m: Added.
(vprintf_stderr_objc):
(WebReportAssertionFailure):
(WebReportAssertionFailureWithMessage):
(WebReportArgumentAssertionFailure):
(WebReportFatalError):
(WebReportError):
(WebLog):
* Misc.subproj/WebKitLogging.h:
* Misc.subproj/WebNSPasteboardExtras.m:
* Misc.subproj/WebStringTruncator.m:
* Panels.subproj/WebAuthenticationPanel.m:
* Panels.subproj/WebPanelAuthenticationHandler.m:
* Plugins.subproj/WebBaseNetscapePluginView.m:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginRepresentation.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebCoreSupport.subproj/WebCookieAdapter.m:
* WebCoreSupport.subproj/WebFileButton.m:
* WebCoreSupport.subproj/WebImageRenderer.m:
* WebCoreSupport.subproj/WebImageRendererFactory.m:
* WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m:
* WebCoreSupport.subproj/WebSubresourceClient.m:
* WebCoreSupport.subproj/WebTextRendererFactory.m:
* WebCoreSupport.subproj/WebViewFactory.m:
* WebKit.exp:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
* WebView.subproj/WebClipView.m:
* WebView.subproj/WebDataProtocol.m:
* WebView.subproj/WebDataSource.m:
* WebView.subproj/WebDefaultPolicyDelegate.m:
* WebView.subproj/WebFrameViewPrivate.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebImageView.m:
* WebView.subproj/WebTextRepresentation.m:
* WebView.subproj/WebTextView.m:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.m:
WebBrowser:
Reviewed by John
Copied WebAssertions.[hm] from WebFoundation.[hm] to WebKit.
Updated all imports.
* ABHomePagesController.m:
* ActivityViewer.m:
* AppController.m:
* BookmarkSource.m:
* BookmarksViewController.m:
* BrowserApplication.m:
* BrowserDocument.m:
* BrowserDocumentController.m:
* BrowserNSAppleEventDescriptorExtras.m:
* BrowserNSMenuExtras.m:
* BrowserNSNetServiceExtras.m:
* BrowserNSOutlineViewExtras.m:
* BrowserNSSplitViewExtras.m:
* BrowserNSStringExtras.m:
* BrowserNSTableViewExtras.m:
* BrowserNSWindowExtras.m:
* BrowserNSWorkspaceExtras.m:
* BrowserWebBookmarkExtras.m:
* BrowserWebController.m:
* BrowserWebFrameExtras.m:
* BrowserWebViewExtras.m:
* BrowserWindow.m:
* BrowserWindowController.m:
* BugReportController.m:
* ClippedItemsIndicator.m:
* ColoredRect.m:
* CompletionController.m:
* ContextMenuHandler.m:
* Debug/DebugUtilities.m:
* Debug/Logging.h:
* DownloadMonitor.m:
* DownloadProgressEntry.m:
* DownloadRow.m:
* DownloadViewController.m:
* DownloadWindowController.m:
* FavoriteButton.m:
* FavoritesBar.m:
* FavoritesBarView.m:
* FindPanelController.m:
* FormCompletionController.m:
* FrameProgressEntry.m:
* GoogleSearchChannel.m:
* HTMLSourceDocument.m:
* ImageAndTextCell.m:
* InternetConfigUtilities.m:
* LoadProgressMonitor.m:
* LocationChangeError.m:
* NewBookmarksController.m:
* OutlineViewPlus.m:
* Preferences.subproj/AdvancedPreferences.m:
* Preferences.subproj/BookmarkPreferences.m:
* Preferences.subproj/DefaultBrowserController.m:
* Preferences.subproj/GeneralPreferences.m:
* Preferences.subproj/ISyncController.m:
* Preferences.subproj/PasswordsEditor.m:
* Preferences.subproj/WBPreferences.m:
* RendezvousController.m:
* ResourceProgressEntry.m:
* SearchChannel.m:
* SlidingAnimation.m:
* SpinningProgressIndicator.m:
* TabBarView.m:
* TabButton.m:
* TableViewPlus.m:
* Test/PageLoadTestRunner.m:
* TextEncodingMenu.m:
* TextFieldWithControls.m:
* TitleBarButton.m:
* URLCompletionController.m:
* WebBookmark.m:
* WebBookmarkImporter.m:
* WebBookmarkLeaf.m:
* WebBookmarkList.m:
* WebBookmarkProxy.m:
* WebSearchManager.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4369 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f9a6e6d..6d81312 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,57 @@
+2003-05-14 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by John
+
+ Copied WebAssertions.[hm] from WebFoundation to WebKit
+
+ Updated all imports.
+
+ Added logging exported symbols to exports file.
+
+ * History.subproj/WebBackForwardList.m:
+ * History.subproj/WebHistory.m:
+ * History.subproj/WebHistoryItem.m:
+ * Misc.subproj/WebAssertions.h: Added.
+ * Misc.subproj/WebAssertions.m: Added.
+ (vprintf_stderr_objc):
+ (WebReportAssertionFailure):
+ (WebReportAssertionFailureWithMessage):
+ (WebReportArgumentAssertionFailure):
+ (WebReportFatalError):
+ (WebReportError):
+ (WebLog):
+ * Misc.subproj/WebKitLogging.h:
+ * Misc.subproj/WebNSPasteboardExtras.m:
+ * Misc.subproj/WebStringTruncator.m:
+ * Panels.subproj/WebAuthenticationPanel.m:
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginRepresentation.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebCoreSupport.subproj/WebCookieAdapter.m:
+ * WebCoreSupport.subproj/WebFileButton.m:
+ * WebCoreSupport.subproj/WebImageRenderer.m:
+ * WebCoreSupport.subproj/WebImageRendererFactory.m:
+ * WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebCoreSupport.subproj/WebTextRendererFactory.m:
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ * WebKit.exp:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ * WebView.subproj/WebClipView.m:
+ * WebView.subproj/WebDataProtocol.m:
+ * WebView.subproj/WebDataSource.m:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ * WebView.subproj/WebFrameViewPrivate.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebImageView.m:
+ * WebView.subproj/WebTextRepresentation.m:
+ * WebView.subproj/WebTextView.m:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.m:
+
2003-05-13 Richard Williamson <rjw at apple.com>
Fixed 3014661. We now display (a lame Lemay) image
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 048b125..831618b 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -7,7 +7,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebPreferencesPrivate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebSystemBits.h>
#define COMPUTE_DEFAULT_PAGE_CACHE_SIZE UINT_MAX
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index 25201b2..185cc09 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -11,7 +11,7 @@
#import <WebKit/WebHistoryItemPrivate.h>
#import <WebFoundation/NSError.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 95d9daa..4b6e297 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -10,7 +10,7 @@
#import <WebKit/WebIconLoader.h>
#import <WebKit/WebKitLogging.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/Misc.subproj/WebAssertions.h b/WebKit/Misc.subproj/WebAssertions.h
new file mode 100644
index 0000000..a2c9fca
--- /dev/null
+++ b/WebKit/Misc.subproj/WebAssertions.h
@@ -0,0 +1,138 @@
+/*
+ WebAssertions.h
+ Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+*/
+
+// Note, this file uses many GCC extensions, but it should be compatible with
+// C, Objective C, C++, and Objective C++.
+
+// For non-debug builds, everything is disabled by default.
+// Defining any of the symbols explicitly prevents this from having any effect.
+
+#ifdef NDEBUG
+#define WEB_ASSERTIONS_DISABLED_DEFAULT 1
+#else
+#define WEB_ASSERTIONS_DISABLED_DEFAULT 0
+#endif
+
+#ifndef ASSERT_DISABLED
+#define ASSERT_DISABLED WEB_ASSERTIONS_DISABLED_DEFAULT
+#endif
+
+#ifndef ASSERT_ARG_DISABLED
+#define ASSERT_ARG_DISABLED WEB_ASSERTIONS_DISABLED_DEFAULT
+#endif
+
+#ifndef FATAL_DISABLED
+#define FATAL_DISABLED WEB_ASSERTIONS_DISABLED_DEFAULT
+#endif
+
+#ifndef ERROR_DISABLED
+#define ERROR_DISABLED WEB_ASSERTIONS_DISABLED_DEFAULT
+#endif
+
+#ifndef LOG_DISABLED
+#define LOG_DISABLED WEB_ASSERTIONS_DISABLED_DEFAULT
+#endif
+
+// These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled.
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+ unsigned mask;
+ const char *defaultName;
+ enum { WebLogChannelUninitialized, WebLogChannelOff, WebLogChannelOn } state;
+} WebLogChannel;
+
+void WebReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
+void WebReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...);
+void WebReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion);
+void WebReportFatalError(const char *file, int line, const char *function, const char *format, ...) ;
+void WebReportError(const char *file, int line, const char *function, const char *format, ...);
+void WebLog(const char *file, int line, const char *function, WebLogChannel *channel, const char *format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+// CRASH -- gets us into the debugger or the crash reporter -- signals are ignored by the crash reporter so we must do better
+
+#define CRASH() *(int *)0xbbadbeef = 0
+
+// ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED
+
+#if ASSERT_DISABLED
+
+#define ASSERT(assertion) ((void)0)
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) ((void)0)
+#define ASSERT_NOT_REACHED() ((void)0)
+
+#else
+
+#define ASSERT(assertion) do \
+ if (!(assertion)) { \
+ WebReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion); \
+ CRASH(); \
+ } \
+while (0)
+#define ASSERT_WITH_MESSAGE(assertion, formatAndArgs...) do \
+ if (!(assertion)) { \
+ WebReportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion, formatAndArgs); \
+ CRASH(); \
+ } \
+while (0)
+#define ASSERT_NOT_REACHED() do { \
+ WebReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, 0); \
+ CRASH(); \
+} while (0)
+
+#endif
+
+// ASSERT_ARG
+
+#if ASSERT_ARG_DISABLED
+
+#define ASSERT_ARG(argName, assertion) ((void)0)
+
+#else
+
+#define ASSERT_ARG(argName, assertion) do \
+ if (!(assertion)) { \
+ WebReportArgumentAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #argName, #assertion); \
+ CRASH(); \
+ } \
+while (0)
+
+#endif
+
+// FATAL
+
+#if FATAL_DISABLED
+#define FATAL(formatAndArgs...) ((void)0)
+#else
+#define FATAL(formatAndArgs...) do { \
+ WebReportFatalError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs); \
+ CRASH(); \
+} while (0)
+#endif
+
+// ERROR
+
+#if ERROR_DISABLED
+#define ERROR(formatAndArgs...) ((void)0)
+#else
+#define ERROR(formatAndArgs...) WebReportError(__FILE__, __LINE__, __PRETTY_FUNCTION__, formatAndArgs)
+#endif
+
+// LOG
+
+#if LOG_DISABLED
+#define LOG(channel, formatAndArgs...) ((void)0)
+#else
+#define LOG(channel, formatAndArgs...) WebLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), formatAndArgs)
+#define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
+#define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel
+#endif
diff --git a/WebCore/kwq/KWQAssertions.m b/WebKit/Misc.subproj/WebAssertions.m
similarity index 54%
copy from WebCore/kwq/KWQAssertions.m
copy to WebKit/Misc.subproj/WebAssertions.m
index 4c802b8..7399dd1 100644
--- a/WebCore/kwq/KWQAssertions.m
+++ b/WebKit/Misc.subproj/WebAssertions.m
@@ -1,42 +1,21 @@
-/*
- * Copyright (C) 2003 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.
- */
+/*
+ WebAssertions.m
+ Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+*/
-#import "KWQAssertions.h"
-
-static int (* vfprintf_no_warning)(FILE *, const char *, va_list) = vfprintf;
+#import <WebKit/WebAssertions.h>
static void vprintf_stderr_objc(const char *format, va_list args)
{
if (!strstr(format, "%@")) {
+ int (* vfprintf_no_warning)(FILE *, const char *, va_list) = vfprintf;
vfprintf_no_warning(stderr, format, args);
} else {
fputs([[[[NSString alloc] initWithFormat:[NSString stringWithCString:format] arguments:args] autorelease] UTF8String], stderr);
}
}
-void KWQReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
+void WebReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
{
if (assertion) {
fprintf(stderr, "=================\nASSERTION FAILED: %s (%s:%d %s)\n=================\n", assertion, file, line, function);
@@ -45,7 +24,7 @@ void KWQReportAssertionFailure(const char *file, int line, const char *function,
}
}
-void KWQReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...)
+void WebReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...)
{
fprintf(stderr, "=================\nASSERTION FAILED: ");
va_list args;
@@ -55,12 +34,12 @@ void KWQReportAssertionFailureWithMessage(const char *file, int line, const char
fprintf(stderr, "\n%s (%s:%d %s)\n=================\n", assertion, file, line, function);
}
-void KWQReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion)
+void WebReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion)
{
fprintf(stderr, "=================\nARGUMENT BAD: %s, %s (%s:%d %s)\n=================\n", argName, assertion, file, line, function);
}
-void KWQReportFatalError(const char *file, int line, const char *function, const char *format, ...)
+void WebReportFatalError(const char *file, int line, const char *function, const char *format, ...)
{
fprintf(stderr, "=================\nFATAL ERROR: ");
va_list args;
@@ -70,7 +49,7 @@ void KWQReportFatalError(const char *file, int line, const char *function, const
fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
}
-void KWQReportError(const char *file, int line, const char *function, const char *format, ...)
+void WebReportError(const char *file, int line, const char *function, const char *format, ...)
{
fprintf(stderr, "=================\nERROR: ");
va_list args;
@@ -80,10 +59,10 @@ void KWQReportError(const char *file, int line, const char *function, const char
fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
}
-void KWQLog(const char *file, int line, const char *function, KWQLogChannel *channel, const char *format, ...)
+void WebLog(const char *file, int line, const char *function, WebLogChannel *channel, const char *format, ...)
{
- if (channel->state == KWQLogChannelUninitialized) {
- channel->state = KWQLogChannelOff;
+ if (channel->state == WebLogChannelUninitialized) {
+ channel->state = WebLogChannelOff;
NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithCString:channel->defaultName]];
if (logLevelString) {
unsigned logLevel;
@@ -91,12 +70,12 @@ void KWQLog(const char *file, int line, const char *function, KWQLogChannel *cha
NSLog(@"unable to parse hex value for %s (%@), logging is off", channel->defaultName, logLevelString);
}
if ((logLevel & channel->mask) == channel->mask) {
- channel->state = KWQLogChannelOn;
+ channel->state = WebLogChannelOn;
}
}
}
- if (channel->state != KWQLogChannelOn) {
+ if (channel->state != WebLogChannelOn) {
return;
}
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 3d0d8f7..be93b81 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -13,19 +13,19 @@
#import <sys/types.h>
#import <sys/mman.h>
-#import "WebFoundationLogging.h"
+#import "NSURLLogging.h"
#import "NSLRUFileList.h"
#import "WebNSFileManagerExtras.h"
#import "WebSystemBits.h"
-#if ERROR_DISABLED
+#if NSURL_ERROR_DISABLED
#define BEGIN_EXCEPTION_HANDLER
#define END_EXCEPTION_HANDLER
#else
#define BEGIN_EXCEPTION_HANDLER NS_DURING
#define END_EXCEPTION_HANDLER \
NS_HANDLER \
- ERROR("Uncaught exception: %@ [%@] [%@]", [localException class], [localException reason], [localException userInfo]); \
+ NSURL_ERROR("Uncaught exception: %@ [%@] [%@]", [localException class], [localException reason], [localException userInfo]); \
NS_ENDHANDLER
#endif
@@ -80,7 +80,7 @@ enum
-(id)initWithCode:(WebFileDatabaseOpcode)theOpcode key:(id)theKey object:(id)theObject
{
- ASSERT(theKey);
+ NSURL_ASSERT(theKey);
if ((self = [super init])) {
@@ -111,7 +111,7 @@ enum
-(void)perform:(WebFileDatabase *)target
{
- ASSERT(target);
+ NSURL_ASSERT(target);
switch (opcode) {
case WebFileDatabaseSetObjectOp:
@@ -121,7 +121,7 @@ enum
[target performRemoveObjectForKey:key];
break;
default:
- ASSERT_NOT_REACHED();
+ NSURL_ASSERT_NOT_REACHED();
break;
}
}
@@ -191,7 +191,7 @@ static void UniqueFilePathForKey(id key, char *buffer)
END_EXCEPTION_HANDLER
- LOG(WebFileDatabaseActivity, "lru list created");
+ NSURL_LOG(WebFileDatabaseActivity, "lru list created");
[pool release];
}
@@ -324,12 +324,12 @@ static void databaseInit()
{
WebFileDatabaseOp *op;
- ASSERT(object);
- ASSERT(key);
+ NSURL_ASSERT(object);
+ NSURL_ASSERT(key);
touch = CFAbsoluteTimeGetCurrent();
- LOG(WebFileDatabaseActivity, "%p - %@", object, key);
+ NSURL_LOG(WebFileDatabaseActivity, "%p - %@", object, key);
[mutex lock];
@@ -346,7 +346,7 @@ static void databaseInit()
{
WebFileDatabaseOp *op;
- ASSERT(key);
+ NSURL_ASSERT(key);
touch = CFAbsoluteTimeGetCurrent();
@@ -374,14 +374,14 @@ static void databaseInit()
[self open];
[mutex unlock];
- LOG(WebFileDatabaseActivity, "removeAllObjects");
+ NSURL_LOG(WebFileDatabaseActivity, "removeAllObjects");
}
-(id)objectForKey:(id)key
{
volatile id result;
- ASSERT(key);
+ NSURL_ASSERT(key);
touch = CFAbsoluteTimeGetCurrent();
@@ -420,13 +420,13 @@ static void databaseInit()
// but not critically bad
NSLRUFileListTouchFileWithPath(lru, uniqueKey);
}
- LOG(WebFileDatabaseActivity, "read disk cache file - %@", key);
+ NSURL_LOG(WebFileDatabaseActivity, "read disk cache file - %@", key);
}
}
}
}
NS_HANDLER
- LOG(WebFileDatabaseActivity, "cannot unarchive cache file - %@", key);
+ NSURL_LOG(WebFileDatabaseActivity, "cannot unarchive cache file - %@", key);
result = nil;
NS_ENDHANDLER
@@ -448,12 +448,12 @@ static void databaseInit()
char uniqueKey[UniqueFilePathSize];
BOOL result;
- ASSERT(object);
- ASSERT(key);
+ NSURL_ASSERT(object);
+ NSURL_ASSERT(key);
UniqueFilePathForKey(key, uniqueKey);
- LOG(WebFileDatabaseActivity, "%@ - %s", key, uniqueKey);
+ NSURL_LOG(WebFileDatabaseActivity, "%@ - %s", key, uniqueKey);
data = [NSMutableData data];
archiver = [[NSArchiver alloc] initForWritingWithMutableData:data];
@@ -497,9 +497,9 @@ static void databaseInit()
NSString *filePath;
char uniqueKey[UniqueFilePathSize];
- ASSERT(key);
+ NSURL_ASSERT(key);
- LOG(WebFileDatabaseActivity, "%@", key);
+ NSURL_LOG(WebFileDatabaseActivity, "%@", key);
UniqueFilePathForKey(key, uniqueKey);
filePath = [[NSString alloc] initWithFormat:@"%@/%s", path, uniqueKey];
@@ -566,11 +566,11 @@ static void databaseInit()
CFTimeInterval mark = CFAbsoluteTimeGetCurrent();
#endif
- LOG(WebFileDatabaseActivity, ">>> BEFORE lazySync\n%@", NSLRUFileListDescription(lru));
+ NSURL_LOG(WebFileDatabaseActivity, ">>> BEFORE lazySync\n%@", NSLRUFileListDescription(lru));
WebFileDatabaseOp *op;
- ASSERT(theTimer);
+ NSURL_ASSERT(theTimer);
while (touch + SYNC_IDLE_THRESHOLD < CFAbsoluteTimeGetCurrent() && [ops count] > 0) {
[mutex lock];
@@ -603,10 +603,10 @@ static void databaseInit()
#ifndef NDEBUG
if (lru)
- LOG(WebFileDatabaseActivity, "<<< AFTER lazySync\n%@", NSLRUFileListDescription(lru));
+ NSURL_LOG(WebFileDatabaseActivity, "<<< AFTER lazySync\n%@", NSLRUFileListDescription(lru));
CFTimeInterval now = CFAbsoluteTimeGetCurrent();
- LOG(WebFileDatabaseActivity, "lazySync ran in %.3f secs.", now - mark);
+ NSURL_LOG(WebFileDatabaseActivity, "lazySync ran in %.3f secs.", now - mark);
#endif
}
@@ -621,7 +621,7 @@ static void databaseInit()
touch = CFAbsoluteTimeGetCurrent();
- LOG(WebFileDatabaseActivity, ">>> BEFORE sync\n%@", NSLRUFileListDescription(lru));
+ NSURL_LOG(WebFileDatabaseActivity, ">>> BEFORE sync\n%@", NSLRUFileListDescription(lru));
[mutex lock];
array = [ops copy];
@@ -636,7 +636,7 @@ static void databaseInit()
[array makeObjectsPerformSelector:@selector(perform:) withObject:self];
[array release];
- LOG(WebFileDatabaseActivity, "<<< AFTER sync\n%@", NSLRUFileListDescription(lru));
+ NSURL_LOG(WebFileDatabaseActivity, "<<< AFTER sync\n%@", NSLRUFileListDescription(lru));
}
-(unsigned)count
diff --git a/WebKit/Misc.subproj/WebKitLogging.h b/WebKit/Misc.subproj/WebKitLogging.h
index 5991f21..21441f6 100644
--- a/WebKit/Misc.subproj/WebKitLogging.h
+++ b/WebKit/Misc.subproj/WebKitLogging.h
@@ -6,7 +6,7 @@
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#ifndef LOG_CHANNEL_PREFIX
#define LOG_CHANNEL_PREFIX WebKitLog
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 145db33..36e171d 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -10,7 +10,7 @@
#import <WebKit/WebURLsWithTitles.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/Misc.subproj/WebStringTruncator.m b/WebKit/Misc.subproj/WebStringTruncator.m
index 765809b..5296183 100644
--- a/WebKit/Misc.subproj/WebStringTruncator.m
+++ b/WebKit/Misc.subproj/WebStringTruncator.m
@@ -9,7 +9,7 @@
#import <WebKit/WebStringTruncator.h>
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebTextRenderer.h>
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index ab73ad1..c43c5f0 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -9,7 +9,7 @@
#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/NSURLProtectionSpace.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 575fed1..75d68d2 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -8,7 +8,7 @@
#import <WebKit/WebPanelAuthenticationHandler.h>
#import <WebKit/WebAuthenticationPanel.h>
#import <WebFoundation/NSURLAuthenticationChallenge.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index da0d4b1..6569524 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -20,7 +20,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebNSDataExtras.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index d01bfb8..c621933 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -16,7 +16,7 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSURLResponse.h>
@implementation WebNetscapePluginDocumentView
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index 4a0d718..2897122 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -10,7 +10,7 @@
#import <WebKit/WebNetscapePluginRepresentation.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 94930f2..33989a2 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -38,7 +38,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index ee3f01e..3b7790b 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -8,7 +8,7 @@
#import "WebCookieAdapter.h"
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSHTTPCookieStorage.h>
#import <WebFoundation/WebNSURLExtras.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebFileButton.m b/WebKit/WebCoreSupport.subproj/WebFileButton.m
index e013511..19b38e8 100644
--- a/WebKit/WebCoreSupport.subproj/WebFileButton.m
+++ b/WebKit/WebCoreSupport.subproj/WebFileButton.m
@@ -8,7 +8,7 @@
#import "WebFileButton.h"
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebStringTruncator.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 506f769..bc4103d 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -6,7 +6,7 @@
#import <WebKit/WebImageRenderer.h>
#import <WebCore/WebCoreImageRenderer.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
extern NSString *NSImageLoopCount;
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
index 16c5bb9..32f6f74 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
@@ -26,7 +26,7 @@
#import <WebKit/WebImageRendererFactory.h>
#import <WebKit/WebImageRenderer.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
@implementation WebImageRendererFactory
diff --git a/WebKit/WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m b/WebKit/WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m
index 093b378..566e903 100644
--- a/WebKit/WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m
+++ b/WebKit/WebCoreSupport.subproj/WebJavaScriptTextInputPanel.m
@@ -8,7 +8,7 @@
#import "WebJavaScriptTextInputPanel.h"
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebKit/WebNSControlExtras.h>
#import <WebKit/WebNSWindowExtras.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index c534e3b..4ca1de0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -14,7 +14,7 @@
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index c534e3b..4ca1de0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -14,7 +14,7 @@
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
#if !defined(MAC_OS_X_VERSION_10_3) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index b3e3354..65924f8 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -7,7 +7,7 @@
#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebTextRenderer.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebSystemBits.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index a0c19f6..be66d28 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -8,7 +8,7 @@
#import <WebKit/WebViewFactory.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebKit/WebPluginDatabase.h>
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 1debc0c..a54a7ec 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -56,6 +56,12 @@ _WebIconSmallSize
_WebKitErrorMIMETypeKey
_WebKitErrorPlugInNameKey
_WebKitErrorPlugInPageURLStringKey
+_WebLog
+_WebReportArgumentAssertionFailure
+_WebReportAssertionFailure
+_WebReportAssertionFailureWithMessage
+_WebReportError
+_WebReportFatalError
_WebURLNamePboardType
_WebURLPboardType
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c7933e3..00a01e9 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -292,6 +292,7 @@
515E27CD0458C86500CA2D3A,
515E27D10458CA4B00CA2D3A,
6578F5E0045F817400000128,
+ BEE18F940472A0CF00CA289C,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -404,6 +405,7 @@
70ECD6CF043B727400A80181,
515E27D20458CA4B00CA2D3A,
6578F5E1045F817400000128,
+ BEE18F950472A0CF00CA289C,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2376,6 +2378,43 @@
//9C2
//9C3
//9C4
+//BE0
+//BE1
+//BE2
+//BE3
+//BE4
+ BEE18F920472A0CF00CA289C = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebAssertions.h;
+ refType = 4;
+ };
+ BEE18F930472A0CF00CA289C = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebAssertions.m;
+ refType = 4;
+ };
+ BEE18F940472A0CF00CA289C = {
+ fileRef = BEE18F920472A0CF00CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ BEE18F950472A0CF00CA289C = {
+ fileRef = BEE18F930472A0CF00CA289C;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//BE0
+//BE1
+//BE2
+//BE3
+//BE4
//ED0
//ED1
//ED2
@@ -2565,6 +2604,8 @@
};
F52CA6C002DF9D78018635CA = {
children = (
+ BEE18F920472A0CF00CA289C,
+ BEE18F930472A0CF00CA289C,
F59EAE3E0253C7EE018635CA,
F59EAE410253C8DE018635CA,
F57FB8C4034E180101A80180,
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 1fd6ce1..2571489 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -12,7 +12,7 @@
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
#import <WebKit/WebDataProtocol.h>
diff --git a/WebKit/WebView.subproj/WebClipView.m b/WebKit/WebView.subproj/WebClipView.m
index 0842f45..e714bae 100644
--- a/WebKit/WebView.subproj/WebClipView.m
+++ b/WebKit/WebView.subproj/WebClipView.m
@@ -8,7 +8,7 @@
#import "WebClipView.h"
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
@implementation WebClipView
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 926afd9..3c666d7 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -8,7 +8,7 @@
#import <WebFoundation/NSURLResponsePrivate.h>
#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
NSString *WebDataProtocolScheme = @"applewebdata";
static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index c1d2d6b..902ef2b 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -14,7 +14,7 @@
#import <WebKit/WebMainResourceClient.h>
#import <WebKit/WebView.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 72d0722..e366285 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -12,7 +12,7 @@
#import <WebFoundation/NSURLConnection.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
@implementation WebDefaultPolicyDelegate
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 88fd08d..2eebcf0 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -14,7 +14,7 @@
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
@implementation WebFrameViewPrivate
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 8ad4bef..5acb3b3 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -8,7 +8,7 @@
#import <AppKit/NSGraphicsContextPrivate.h> // for PSbuttondown
#import <AppKit/NSResponder_Private.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebCore/WebCoreFirstResponderChanges.h>
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 8848ef9..8192e85 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -16,7 +16,7 @@
#import <WebCore/WebCoreImageRenderer.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
@implementation WebImageView
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 1fd6ce1..2571489 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -12,7 +12,7 @@
#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/NSURLResponsePrivate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
#import <WebKit/WebDataProtocol.h>
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index df79859..35cb7bf 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -11,7 +11,7 @@
#import <WebKit/WebTextView.h>
#import <WebFoundation/NSURLResponse.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
@implementation WebTextRepresentation
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index ae886e6..8774449 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -5,7 +5,7 @@
#import <WebKit/WebTextView.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 4a08ed6..36d8b97 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -29,7 +29,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebNSUserDefaultsExtras.h>
#import <WebFoundation/NSURLConnection.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 6176b17..c32576a 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -23,7 +23,7 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebUIDelegate.h>
-#import <WebFoundation/WebAssertions.h>
+#import <WebKit/WebAssertions.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSDataExtras.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list