Reviewed by Adam.
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Dec 2006 18:44:41 +0000 (18:44 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Dec 2006 18:44:41 +0000 (18:44 +0000)
        <rdar://problem/4841432> 9A312: iWeb crashes on launch; _WebReportError missing from WebKit

        Added back WebReportAssertionFailure and WebReportError for apps that still need these symbols.

        * Misc/OldWebAssertions.c: Added.
        (WebReportAssertionFailure):
        (WebReportError):
        * WebKit.LP64.exp: added the new symbols, and sorted the file
        * WebKit.exp: added the new symbols, and sorted the file
        * WebKit.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17962 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/Misc/OldWebAssertions.c [new file with mode: 0644]
WebKit/WebKit.LP64.exp
WebKit/WebKit.exp
WebKit/WebKit.xcodeproj/project.pbxproj

index 794e80bf8216528e0265aaaae6ff79674ed53b8e..bcb438f75efbebd9bd4c8f6cd306ad13a876cdcd 100644 (file)
@@ -1,3 +1,18 @@
+2006-12-01  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Adam.
+
+        <rdar://problem/4841432> 9A312: iWeb crashes on launch; _WebReportError missing from WebKit
+
+        Added back WebReportAssertionFailure and WebReportError for apps that still need these symbols.
+
+        * Misc/OldWebAssertions.c: Added.
+        (WebReportAssertionFailure):
+        (WebReportError):
+        * WebKit.LP64.exp: added the new symbols, and sorted the file
+        * WebKit.exp: added the new symbols, and sorted the file
+        * WebKit.xcodeproj/project.pbxproj:
+
 2006-11-30  Geoffrey Garen  <ggaren@apple.com>
 
         Rubber Stamped by Anders Carlsson.
diff --git a/WebKit/Misc/OldWebAssertions.c b/WebKit/Misc/OldWebAssertions.c
new file mode 100644 (file)
index 0000000..b84cdbc
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2006 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. 
+ */
+
+/* These functions are not used anymore, but need to stay for binary compatibility <rdar://problem/4841432>. */
+/* You should use <wtf/Assertions.h>. */
+
+void WebReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
+void WebReportError(const char *file, int line, const char *function, const char *format, ...);
+
+void WebReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
+{
+}
+
+void WebReportError(const char *file, int line, const char *function, const char *format, ...)
+{
+}
index cc94721afbfeb515921b54d52d0fd6b545e28630..1905a664e71debb84eb028d3725ca1bd656935f9 100644 (file)
@@ -1,6 +1,6 @@
-.objc_class_name_WebPluginDatabase
 .objc_class_name_WebArchive
 .objc_class_name_WebBackForwardList
+.objc_class_name_WebCache
 .objc_class_name_WebCoreStatistics
 .objc_class_name_WebDataSource
 .objc_class_name_WebDefaultPolicyDelegate
 .objc_class_name_WebHistory
 .objc_class_name_WebHistoryItem
 .objc_class_name_WebIconDatabase
-.objc_class_name_WebIconLoader
 .objc_class_name_WebInspector
 .objc_class_name_WebJavaScriptTextInputPanel
 .objc_class_name_WebKeyGenerator
 .objc_class_name_WebKitStatistics
+.objc_class_name_WebPluginDatabase
 .objc_class_name_WebPreferences
 .objc_class_name_WebRenderNode
 .objc_class_name_WebResource
-.objc_class_name_WebStringTruncator
 .objc_class_name_WebScriptCallFrame
+.objc_class_name_WebStringTruncator
 .objc_class_name_WebURLsWithTitles
 .objc_class_name_WebView
 _WebActionButtonKey
@@ -35,6 +35,7 @@ _WebActionModifierFlagsKey
 _WebActionNavigationTypeKey
 _WebActionNavigationTypeKey
 _WebActionOriginalURLKey
+_WebArchivePboardType
 _WebElementDOMNodeKey
 _WebElementFrameKey
 _WebElementImageAltStringKey
@@ -42,21 +43,19 @@ _WebElementImageKey
 _WebElementImageRectKey
 _WebElementImageURLKey
 _WebElementIsSelectedKey
+_WebElementLinkIsLiveKey
 _WebElementLinkLabelKey
 _WebElementLinkTargetFrameKey
 _WebElementLinkTitleKey
 _WebElementLinkURLKey
-_WebKitErrorDomain
 _WebHistoryAllItemsRemovedNotification
-_WebHistoryItemsDiscardedWhileLoadingNotification
+_WebHistoryItemChangedNotification
 _WebHistoryItemsAddedNotification
+_WebHistoryItemsDiscardedWhileLoadingNotification
 _WebHistoryItemsKey
 _WebHistoryItemsRemovedNotification
 _WebHistoryLoadedNotification
 _WebHistorySavedNotification
-_WebHistoryItemChangedNotification
-_WebPreferencesChangedNotification
-_WebArchivePboardType
 _WebIconDatabaseDidAddIconNotification
 _WebIconDatabaseDidRemoveAllIconsNotification
 _WebIconDatabaseDirectoryDefaultsKey
@@ -64,35 +63,39 @@ _WebIconLargeSize
 _WebIconMediumSize
 _WebIconNotificationUserInfoURLKey
 _WebIconSmallSize
+_WebKitErrorDomain
 _WebKitErrorMIMETypeKey
 _WebKitErrorPlugInNameKey
 _WebKitErrorPlugInPageURLStringKey
 _WebLocalizedString
 _WebMainResourceKey
-_WebURLNamePboardType
-_WebURLPboardType
-_WebViewProgressStartedNotification
-_WebViewProgressEstimateChangedNotification
-_WebViewProgressFinishedNotification
-_WebViewDidBeginEditingNotification
-_WebViewDidChangeNotification
-_WebViewDidEndEditingNotification
-_WebViewDidChangeTypingStyleNotification
-_WebViewDidChangeSelectionNotification
-_WebPlugInBaseURLKey
 _WebPlugInAttributesKey
+_WebPlugInBaseURLKey
 _WebPlugInContainerKey
+_WebPlugInContainingElementKey
 _WebPlugInModeKey
-_WebPluginWillPresentNativeUserInterfaceNotification
 _WebPlugInShouldLoadMainResourceKey
-_WebPlugInContainingElementKey
-_WebScriptDebugServerProcessNameKey
+_WebPluginWillPresentNativeUserInterfaceNotification
+_WebPreferencesChangedNotification
+_WebReportAssertionFailure
+_WebReportError
+_WebScriptDebugServerDidLoadNotification
 _WebScriptDebugServerProcessBundleIdentifierKey
 _WebScriptDebugServerProcessIdentifierKey
+_WebScriptDebugServerProcessNameKey
 _WebScriptDebugServerQueryNotification
 _WebScriptDebugServerQueryReplyNotification
-_WebScriptDebugServerDidLoadNotification
 _WebScriptDebugServerWillUnloadNotification
-_WebScriptErrorDomain
 _WebScriptErrorDescriptionKey
+_WebScriptErrorDomain
 _WebScriptErrorLineNumberKey
+_WebURLNamePboardType
+_WebURLPboardType
+_WebViewDidBeginEditingNotification
+_WebViewDidChangeNotification
+_WebViewDidChangeSelectionNotification
+_WebViewDidChangeTypingStyleNotification
+_WebViewDidEndEditingNotification
+_WebViewProgressEstimateChangedNotification
+_WebViewProgressFinishedNotification
+_WebViewProgressStartedNotification
index 742f3391b289147e8f664b44f4fbbafc83ac5aa3..104e5a304e63ce72e06aad4e9ed03656ab02af0d 100644 (file)
@@ -1,4 +1,3 @@
-.objc_class_name_WebPluginDatabase
 .objc_class_name_WebArchive
 .objc_class_name_WebBackForwardList
 .objc_class_name_WebCache
 .objc_class_name_WebJavaScriptTextInputPanel
 .objc_class_name_WebKeyGenerator
 .objc_class_name_WebKitStatistics
+.objc_class_name_WebPluginDatabase
 .objc_class_name_WebPreferences
 .objc_class_name_WebRenderNode
 .objc_class_name_WebResource
-.objc_class_name_WebStringTruncator
 .objc_class_name_WebScriptCallFrame
+.objc_class_name_WebStringTruncator
 .objc_class_name_WebURLsWithTitles
 .objc_class_name_WebView
+_HIWebViewCreate
+_HIWebViewGetWebView
 _WebActionButtonKey
 _WebActionButtonKey
 _WebActionElementKey
@@ -35,6 +37,8 @@ _WebActionModifierFlagsKey
 _WebActionNavigationTypeKey
 _WebActionNavigationTypeKey
 _WebActionOriginalURLKey
+_WebArchivePboardType
+_WebConvertNSImageToCGImageRef
 _WebElementDOMNodeKey
 _WebElementFrameKey
 _WebElementImageAltStringKey
@@ -47,17 +51,14 @@ _WebElementLinkLabelKey
 _WebElementLinkTargetFrameKey
 _WebElementLinkTitleKey
 _WebElementLinkURLKey
-_WebKitErrorDomain
 _WebHistoryAllItemsRemovedNotification
-_WebHistoryItemsDiscardedWhileLoadingNotification
+_WebHistoryItemChangedNotification
 _WebHistoryItemsAddedNotification
+_WebHistoryItemsDiscardedWhileLoadingNotification
 _WebHistoryItemsKey
 _WebHistoryItemsRemovedNotification
 _WebHistoryLoadedNotification
 _WebHistorySavedNotification
-_WebHistoryItemChangedNotification
-_WebPreferencesChangedNotification
-_WebArchivePboardType
 _WebIconDatabaseDidAddIconNotification
 _WebIconDatabaseDidRemoveAllIconsNotification
 _WebIconDatabaseDirectoryDefaultsKey
@@ -65,44 +66,40 @@ _WebIconLargeSize
 _WebIconMediumSize
 _WebIconNotificationUserInfoURLKey
 _WebIconSmallSize
+_WebInitForCarbon
+_WebKitErrorDomain
 _WebKitErrorMIMETypeKey
 _WebKitErrorPlugInNameKey
 _WebKitErrorPlugInPageURLStringKey
 _WebLocalizedString
 _WebMainResourceKey
-_WebURLNamePboardType
-_WebURLPboardType
-_WebViewProgressStartedNotification
-_WebViewProgressEstimateChangedNotification
-_WebViewProgressFinishedNotification
-_WebViewDidBeginEditingNotification
-_WebViewDidChangeNotification
-_WebViewDidEndEditingNotification
-_WebViewDidChangeTypingStyleNotification
-_WebViewDidChangeSelectionNotification
-_WebPlugInBaseURLKey
 _WebPlugInAttributesKey
+_WebPlugInBaseURLKey
 _WebPlugInContainerKey
+_WebPlugInContainingElementKey
 _WebPlugInModeKey
-_WebPluginWillPresentNativeUserInterfaceNotification
 _WebPlugInShouldLoadMainResourceKey
-_WebPlugInContainingElementKey
-_WebScriptDebugServerProcessNameKey
+_WebPluginWillPresentNativeUserInterfaceNotification
+_WebPreferencesChangedNotification
+_WebReportAssertionFailure
+_WebReportError
+_WebScriptDebugServerDidLoadNotification
 _WebScriptDebugServerProcessBundleIdentifierKey
 _WebScriptDebugServerProcessIdentifierKey
+_WebScriptDebugServerProcessNameKey
 _WebScriptDebugServerQueryNotification
 _WebScriptDebugServerQueryReplyNotification
-_WebScriptDebugServerDidLoadNotification
 _WebScriptDebugServerWillUnloadNotification
-_WebScriptErrorDomain
 _WebScriptErrorDescriptionKey
+_WebScriptErrorDomain
 _WebScriptErrorLineNumberKey
-
-##
-## Carbon Support
-##
-
-_HIWebViewGetWebView
-_HIWebViewCreate
-_WebConvertNSImageToCGImageRef
-_WebInitForCarbon
+_WebURLNamePboardType
+_WebURLPboardType
+_WebViewDidBeginEditingNotification
+_WebViewDidChangeNotification
+_WebViewDidChangeSelectionNotification
+_WebViewDidChangeTypingStyleNotification
+_WebViewDidEndEditingNotification
+_WebViewProgressEstimateChangedNotification
+_WebViewProgressFinishedNotification
+_WebViewProgressStartedNotification
index 82a13986c19fc471ae67b70e6d68c20c3233cf65..70721131a0f35d80c9e6f9cc329eb84f4e9ea4c7 100644 (file)
@@ -31,6 +31,7 @@
                1C8CB07A0AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1CA57D620AED6A470009BDD0 /* WebGraphicsExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA57D600AED6A470009BDD0 /* WebGraphicsExtras.h */; };
                1CA57D630AED6A470009BDD0 /* WebGraphicsExtras.c in Sources */ = {isa = PBXBuildFile; fileRef = 1CA57D610AED6A470009BDD0 /* WebGraphicsExtras.c */; };
+               1CCFFD130B1F81F2002EE926 /* OldWebAssertions.c in Sources */ = {isa = PBXBuildFile; fileRef = 1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */; };
                220398770922D816009C3FFC /* WebBaseNetscapePluginViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2203984A0922D765009C3FFC /* WebBaseNetscapePluginViewInternal.h */; settings = {ATTRIBUTES = (); }; };
                224100F3091818D900D2D266 /* WebPluginsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 224100F2091818D900D2D266 /* WebPluginsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                224100F90918190100D2D266 /* WebPluginsPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 224100F80918190100D2D266 /* WebPluginsPrivate.m */; };
                1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; };
                1CA57D600AED6A470009BDD0 /* WebGraphicsExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGraphicsExtras.h; sourceTree = "<group>"; };
                1CA57D610AED6A470009BDD0 /* WebGraphicsExtras.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = WebGraphicsExtras.c; sourceTree = "<group>"; };
+               1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OldWebAssertions.c; sourceTree = "<group>"; };
                2203984A0922D765009C3FFC /* WebBaseNetscapePluginViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebBaseNetscapePluginViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                224100F2091818D900D2D266 /* WebPluginsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                224100F80918190100D2D266 /* WebPluginsPrivate.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginsPrivate.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                                F59668C802AD2923018635CA /* WebStringTruncator.h */,
                                F59668C902AD2923018635CA /* WebStringTruncator.m */,
                                DD7CDEE60A23BA9E00069928 /* WebTypesInternal.h */,
+                               1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
                        );
                        path = Misc;
                        sourceTree = "<group>";
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
+                       projectRoot = "";
+                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );
                                14D825300AF955090004F057 /* WebChromeClient.mm in Sources */,
                                065AD5A40B0C32C7005A2B1D /* WebContextMenuClient.mm in Sources */,
                                5241ADF60B1BC48A004012BD /* WebCache.mm in Sources */,
+                               1CCFFD130B1F81F2002EE926 /* OldWebAssertions.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };