Tools:
* Scripts/update-kwq-assert: Added. Script to keep the KWQ version
of the assert macros in sync. with the WebFoundation version. Just
update the WebFoundation one and run this script.
* wftool/WFTool.m: Remove obsolete include.
WebCore:
Switch over to new assertion/logging scheme.
* kwq/KWQAssertions.h: Added.
* kwq/KWQAssertions.m: Added.
* kwq/KWQLogging.h: Added.
* kwq/KWQLogging.m: Added.
* kwq/kwqdebug.h: Removed.
* kwq/kwqdebug.mm: Removed.
* WebCore.pbproj/project.pbxproj: Update to reflect above changes.
* kwq/KWQApplication.mm:
* kwq/KWQChar.mm:
* kwq/KWQColor.mm:
* kwq/KWQComboBox.mm:
* kwq/KWQCompletion.mm:
* kwq/KWQCursor.mm:
* kwq/KWQDrawUtil.mm:
* kwq/KWQEvent.mm:
* kwq/KWQFontInfo.mm:
* kwq/KWQFontMetrics.mm:
* kwq/KWQFrame.mm:
* kwq/KWQHBox.mm:
* kwq/KWQInputDialog.mm:
* kwq/KWQInvisibleButton.mm:
* kwq/KWQKConfigBase.mm:
* kwq/KWQKFileDialog.mm:
* kwq/KWQKFileItem.mm:
* kwq/KWQKGlobalSettings.mm:
* kwq/KWQKHTMLPartImpl.mm:
* kwq/KWQKHTMLSettings.mm:
* kwq/KWQKIconLoader.mm:
* kwq/KWQKJob.mm:
* kwq/KWQKLocale.mm:
* kwq/KWQKMimeType.mm:
* kwq/KWQKPartsEvent.mm:
* kwq/KWQKSimpleConfig.mm:
* kwq/KWQKURL.mm:
* kwq/KWQKWin.mm:
* kwq/KWQKWinModule.mm:
* kwq/KWQKjobclasses.mm:
* kwq/KWQKnetaccess.mm:
* kwq/KWQLabel.mm:
* kwq/KWQLineEdit.mm:
* kwq/KWQListBox.mm:
* kwq/KWQListImpl.mm:
* kwq/KWQLoaderImpl.mm:
* kwq/KWQObject.mm:
* kwq/KWQPaintDeviceMetrics.mm:
* kwq/KWQPainter.mm:
* kwq/KWQPixmap.mm:
* kwq/KWQRegion.mm:
* kwq/KWQScrollView.mm:
* kwq/KWQSlot.mm:
* kwq/KWQString.mm:
* kwq/KWQTimer.mm:
* kwq/KWQWidget.mm:
* kwq/KWQbrowserinterface.mm:
* kwq/KWQtextcodec.mm:
* kwq/KWQtextstream.mm:
* kwq/KWQxml.mm:
* kwq/WebCoreBridge.mm:
* kwq/WebCoreCookieAdapter.m:
* kwq/WebCoreHistory.m:
* kwq/WebCoreImageRendererFactory.m:
* kwq/WebCoreTextRendererFactory.m:
* kwq/WebCoreViewFactory.m:
Update to use new assertions and logging macros.
In some cases, just removed unneeded includes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2001 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQAssertions.h b/WebCore/kwq/KWQAssertions.h
new file mode 100644
index 0000000..125ea5b
--- /dev/null
+++ b/WebCore/kwq/KWQAssertions.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2002 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.
+ */
+
+// 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
+
+#ifndef ASSERT_DISABLED
+#define ASSERT_DISABLED 1
+#endif
+
+#ifndef ASSERT_ARG_DISABLED
+#define ASSERT_ARG_DISABLED 1
+#endif
+
+#ifndef FATAL_DISABLED
+#define FATAL_DISABLED 1
+#endif
+
+#ifndef ERROR_DISABLED
+#define ERROR_DISABLED 1
+#endif
+
+#ifndef LOG_DISABLED
+#define LOG_DISABLED 1
+#endif
+
+#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 { KWQLogChannelUninitialized, KWQLogChannelOff, KWQLogChannelOn } state;
+} KWQLogChannel;
+
+void KWQReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
+void KWQReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...);
+void KWQReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion);
+void KWQReportFatalError(const char *file, int line, const char *function, const char *format, ...) ;
+void KWQReportError(const char *file, int line, const char *function, const char *format, ...);
+void KWQLog(const char *file, int line, const char *function, KWQLogChannel *channel, const char *format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+// ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED
+
+#if ASSERT_DISABLED
+
+#define ASSERT(assertion) ((void)0)
+#define ASSERT_WITH_MESSAGE(assertion, format, args...) ((void)0)
+#define ASSERT_NOT_REACHED() ((void)0)
+
+#else
+
+#define ASSERT(assertion) do \
+ if (!(assertion)) { \
+ KWQReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion); \
+ raise(SIGQUIT); \
+ } \
+while (0)
+#define ASSERT_WITH_MESSAGE(assertion, format, args...) do \
+ if (!(assertion)) { \
+ KWQReportAssertionFailureWithMessage(__FILE__, __LINE__, __PRETTY_FUNCTION__, #assertion, format, ## args); \
+ raise(SIGQUIT); \
+ } \
+while (0)
+#define ASSERT_NOT_REACHED() do { \
+ KWQReportAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, 0); \
+ raise(SIGQUIT); \
+} 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)) { \
+ KWQReportArgumentAssertionFailure(__FILE__, __LINE__, __PRETTY_FUNCTION__, #argName, #assertion); \
+ raise(SIGQUIT); \
+ } \
+while (0)
+
+#endif
+
+// FATAL
+
+#if FATAL_DISABLED
+#define FATAL(format, args...) ((void)0)
+#else
+#define FATAL(format, args...) do { \
+ KWQReportFatalError(__FILE__, __LINE__, __PRETTY_FUNCTION__, (format), ## args); \
+ raise(SIGQUIT); \
+} while (0)
+#endif
+
+// ERROR
+
+#if ERROR_DISABLED
+#define ERROR(format, args...) ((void)0)
+#else
+#define ERROR(format, args...) KWQReportError(__FILE__, __LINE__, __PRETTY_FUNCTION__, (format), ## args)
+#endif
+
+// LOG
+
+#if LOG_DISABLED
+#define LOG(channel, format, args...) ((void)0)
+#else
+#define LOG(channel, format, args...) KWQLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), (format), ## args)
+#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
