[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:00:58 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d70967761425bf29a7b3cdd5df1e026d79a81ef9
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 3 02:50:23 2002 +0000
WebFoundation:
* WebFoundation.pbproj/project.pbxproj: Update warning flags, add -DAPPLE_CHANGES,
make sure we don't get debugging symbols in non-debug builds.
* Misc.subproj/WebFoundationDebug.h: Get rid of the log variants.
* Misc.subproj/WebFoundationDebug.m: Get rid of the log variants.
* CacheLoader.subproj/IFHTTPURLProtocolHandler.m:
* CacheLoader.subproj/IFURLDiskCache.m:
* CacheLoader.subproj/IFURLHandle.m:
* CacheLoader.subproj/IFURLLoad.m::
* CacheLoader.subproj/IFURLMemoryCache.m:
Wean from the NSLog variants so they get printf type checking.
JavaScriptCore:
* JavaScriptCore.pbproj/project.pbxproj: Update flags as I did for
WebFoundation.
WebCore:
* src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
Remove unused stuff. Add checking for printf parameters.
* src/kwq/kwqdebug.mm: Remove unused variants.
* src/kwq/KWQApplication.mm:
* src/kwq/KWQKGlobal.mm:
* src/kwq/KWQKloader.mm:
* src/kwq/KWQObject.mm:
* src/kwq/KWQString.mm:
* src/kwq/KWQToolTip.mm:
* src/kwq/KWQWidget.mm:
* src/kwq/WCPlugin.mm:
* src/kwq/WCPluginDatabase.mm:
* src/kwq/npapi.mm:
Fix types in log statements caught by the compiler.
WebKit:
* WebKit.pbproj/project.pbxproj: Fix flags as I did in WebFoundation.
* Misc.subproj/WebKitDebug.h: Turn off logging when xNDEBUG is defined.
Remove unused stuff. Add checking for printf parameters.
* Misc.subproj/WebKitDebug.m: Remove unused variants.
* Plugins.subproj/IFPluginView.mm: Change to use WebKit logging, not
WebCore logging.
* WebView.subproj/IFMainURLHandleClient.mm:
* WebView.subproj/IFWebView.mm:
Fix types in log statements caught by the compiler.
WebBrowser:
* WebBrowser.pbproj/project.pbxproj: Update flags as I did for
WebFoundation.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@944 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 07fb888..369b069 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * JavaScriptCore.pbproj/project.pbxproj: Update flags as I did for
+ WebFoundation.
+
2002-04-02 Maciej Stachowiak <mjs at apple.com>
* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 07fb888..369b069 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * JavaScriptCore.pbproj/project.pbxproj: Update flags as I did for
+ WebFoundation.
+
2002-04-02 Maciej Stachowiak <mjs at apple.com>
* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 07fb888..369b069 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * JavaScriptCore.pbproj/project.pbxproj: Update flags as I did for
+ WebFoundation.
+
2002-04-02 Maciej Stachowiak <mjs at apple.com>
* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 6c367d2..8f0faac 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -3,14 +3,17 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 36;
+ objectVersion = 38;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
);
buildSettings = {
COPY_PHASE_STRIP = NO;
+ DEBUGGING_SYMBOLS = YES;
+ DEBUG_CFLAGS = "";
INSTALL_PATH = "@executable_path/../Frameworks";
+ OPTIMIZATION_CFLAGS = "-O";
SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
@@ -20,9 +23,7 @@
buildRules = (
);
buildSettings = {
- COPY_PHASE_STRIP = YES;
INSTALL_PATH = "@executable_path/../Frameworks";
- OTHER_CFLAGS = "-Os";
SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
@@ -65,7 +66,6 @@
buildStyles = (
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
- F692A8D90255645D01FF60F7,
);
isa = PBXProject;
mainGroup = 0867D691FE84028FC02AAC07;
@@ -111,6 +111,9 @@
F692A8D8025563E401FF60F7,
);
buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUGGING_SYMBOLS = NO;
+ DEBUG_CFLAGS = "-DxNDEBUG";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = "";
@@ -118,10 +121,11 @@
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = /System/Library/PrivateFrameworks;
LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "-Wall -Werror -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wno-format-y2k -DAPPLE_CHANGES -DHAVE_CONFIG_H";
+ OPTIMIZATION_CFLAGS = "-Os";
+ OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
PRODUCT_NAME = JavaScriptCore;
SECTORDER_FLAGS = "";
- WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+ WARNING_CFLAGS = "-Werror -Wall -Wcast-align -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wreorder -Wsign-compare";
WRAPPER_EXTENSION = framework;
};
dependencies = (
@@ -1217,17 +1221,6 @@
shellPath = /bin/sh;
shellScript = "if [ -f ../configure.in ]; then make embed; fi";
};
- F692A8D90255645D01FF60F7 = {
- buildRules = (
- );
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- INSTALL_PATH = "";
- OPTIMIZATION_CFLAGS = "-Os";
- };
- isa = PBXBuildStyle;
- name = Standalone;
- };
};
rootObject = 0867D690FE84028FC02AAC07;
}
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 84498c4..6239672 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
+ Remove unused stuff. Add checking for printf parameters.
+ * src/kwq/kwqdebug.mm: Remove unused variants.
+
+ * src/kwq/KWQApplication.mm:
+ * src/kwq/KWQKGlobal.mm:
+ * src/kwq/KWQKloader.mm:
+ * src/kwq/KWQObject.mm:
+ * src/kwq/KWQString.mm:
+ * src/kwq/KWQToolTip.mm:
+ * src/kwq/KWQWidget.mm:
+ * src/kwq/WCPlugin.mm:
+ * src/kwq/WCPluginDatabase.mm:
+ * src/kwq/npapi.mm:
+ Fix types in log statements caught by the compiler.
+
2002-04-02 Richard Williamson <rjw at apple.com>
Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 84498c4..6239672 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
+ Remove unused stuff. Add checking for printf parameters.
+ * src/kwq/kwqdebug.mm: Remove unused variants.
+
+ * src/kwq/KWQApplication.mm:
+ * src/kwq/KWQKGlobal.mm:
+ * src/kwq/KWQKloader.mm:
+ * src/kwq/KWQObject.mm:
+ * src/kwq/KWQString.mm:
+ * src/kwq/KWQToolTip.mm:
+ * src/kwq/KWQWidget.mm:
+ * src/kwq/WCPlugin.mm:
+ * src/kwq/WCPluginDatabase.mm:
+ * src/kwq/npapi.mm:
+ Fix types in log statements caught by the compiler.
+
2002-04-02 Richard Williamson <rjw at apple.com>
Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 84498c4..6239672 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * src/kwq/kwqdebug.h: Turn off logging when xNDEBUG is defined.
+ Remove unused stuff. Add checking for printf parameters.
+ * src/kwq/kwqdebug.mm: Remove unused variants.
+
+ * src/kwq/KWQApplication.mm:
+ * src/kwq/KWQKGlobal.mm:
+ * src/kwq/KWQKloader.mm:
+ * src/kwq/KWQObject.mm:
+ * src/kwq/KWQString.mm:
+ * src/kwq/KWQToolTip.mm:
+ * src/kwq/KWQWidget.mm:
+ * src/kwq/WCPlugin.mm:
+ * src/kwq/WCPluginDatabase.mm:
+ * src/kwq/npapi.mm:
+ Fix types in log statements caught by the compiler.
+
2002-04-02 Richard Williamson <rjw at apple.com>
Fixed a fix, shoulda' been a #ifndef to exclude unnecessary code.
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index 556ba8b..c9458de 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -27,20 +27,12 @@
#include <qapplication.h>
#include <qpalette.h>
-// FIXME:
-static QPalette *DEFAULT_PALETTE = NULL;
-static QSize *DEFAULT_SIZE = NULL;
-
QPalette QApplication::palette(const QWidget *p)
{
- if (DEFAULT_PALETTE == NULL) {
- DEFAULT_PALETTE = new QPalette();
- }
-
- return *DEFAULT_PALETTE;
+ static QPalette pal;
+ return pal;
}
-
static QWidget *mainWidget = 0;
// Do we need to worry about multiple screens?
@@ -64,7 +56,7 @@ int KWQDesktopWidget::height() const
QWidget *QApplication::desktop()
{
- if (mainWidget == 0){
+ if (mainWidget == 0) {
mainWidget = new KWQDesktopWidget();
}
return mainWidget;
@@ -81,12 +73,7 @@ int QApplication::startDragDistance()
QSize QApplication::globalStrut()
{
_logNotYetImplemented();
-
- if (DEFAULT_SIZE == NULL) {
- DEFAULT_SIZE = new QSize(0,0);
- }
-
- return *DEFAULT_SIZE;
+ return QSize(0,0);
}
diff --git a/WebCore/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQKGlobal.mm
index 72a3056..5ca8893 100644
--- a/WebCore/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQKGlobal.mm
@@ -82,7 +82,8 @@ KStandardDirs *KGlobal::dirs()
KConfig *KGlobal::config()
{
_logNotYetImplemented();
- return new KConfig("foo");
+ static KConfig c("foo");
+ return &c;
}
const QString &KGlobal::staticQString(const QString &str)
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index f9995cf..3ed8ee0 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1026,7 +1026,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -1041,7 +1041,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1067,7 +1067,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -1090,7 +1090,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1111,7 +1111,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = 0x%08x, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index f9995cf..3ed8ee0 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1026,7 +1026,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -1041,7 +1041,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1067,7 +1067,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -1090,7 +1090,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1111,7 +1111,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = 0x%08x, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index f9995cf..3ed8ee0 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1026,7 +1026,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -1041,7 +1041,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1067,7 +1067,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -1090,7 +1090,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1111,7 +1111,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = 0x%08x, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 3726b44..f3f3966 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -33,7 +33,7 @@ bool QObject::connect(const QObject *sender, const char *signal, const QObject *
{
if (sender)
((QObject *)sender)->setTarget ((QObject *)dest);
- KWQDEBUG4 ("src = 0x%08x, signal = %s, dest = 0x%08x, slot = %s\n", sender, signal, dest, slot);
+ KWQDEBUG4 ("src = %p, signal = %s, dest = %p, slot = %s\n", sender, signal, dest, slot);
return FALSE;
}
@@ -43,7 +43,7 @@ bool QObject::connect(const QObject *sender, const char *signal, const char *slo
{
if (sender)
((QObject *)sender)->setTarget ((QObject *)sender);
- KWQDEBUG3 ("src = 0x%08x, signal = %s, slot = %s\n", sender, signal, slot);
+ KWQDEBUG3 ("src = %p, signal = %s, slot = %s\n", sender, signal, slot);
return FALSE;
}
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 0306673..2eaf8a6 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -157,7 +157,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
[subView removeFromSuperview];
- KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "Adding 0x%08x %s at (%d,%d) w %d h %d\n", subView, [[[subView class] className] cString], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
+ KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "Adding %p %s at (%d,%d) w %d h %d\n", subView, [[[subView class] className] cString], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
[thisView addSubview: subView];
}
@@ -177,12 +177,12 @@ void QScrollView::removeChild(QWidget* child)
void QScrollView::resizeContents(int w, int h)
{
- KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "0x%08x %s at w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
+ KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "%p %s at w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
//if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
if ([getView() isKindOfClass: NSClassFromString(@"NSScrollView")]){
IFWebView *wview = [(NSScrollView *)getView() documentView];
- KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "0x%08x %s at w %d h %d\n", wview, [[[wview class] className] cString], w, h);
+ KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "%p %s at w %d h %d\n", wview, [[[wview class] className] cString], w, h);
//w -= (int)[NSScroller scrollerWidth];
//w -= 1;
if (w < 0)
@@ -202,7 +202,7 @@ void QScrollView::resizeContents(int w, int h)
void QScrollView::updateContents(int x, int y, int w, int h)
{
- KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
+ KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "%p %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
void QScrollView::updateContents(const QRect &rect)
@@ -213,7 +213,7 @@ void QScrollView::updateContents(const QRect &rect)
void QScrollView::repaintContents(int x, int y, int w, int h, bool erase=TRUE)
{
- KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
+ KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "%p %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
QPoint QScrollView::contentsToViewport(const QPoint &)
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 35cae9d..b59d1cc 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -304,9 +304,7 @@ const QChar *QString::unicode() const
if (cache == NULL || * (int *) cache != CacheUnicode) {
flushCache();
-#if _KWQ_DEBUG_
KWQDEBUG3("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
-#endif
cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len * sizeof (UniChar), 0);
* (int *) cache = CacheUnicode;
CFStringGetCharacters(s, CFRangeMake(0, len), (UniChar *) ((int *) cache + 1));
@@ -327,15 +325,11 @@ const char *QString::latin1() const
if (cache == NULL || * (int *) cache != CacheLatin1) {
flushCache();
-#if _KWQ_DEBUG_
KWQDEBUG3("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
-#endif
cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len + 1, 0);
* (int *) cache = CacheLatin1;
if (!CFStringGetCString(s, (char *) ((int *) cache + 1), len + 1, kCFStringEncodingISOLatin1)) {
-#if _KWQ_DEBUG_
KWQDEBUG3("WARNING %s:%s:%d (CFStringGetCString failed)\n", __FUNCTION__, __FILE__, __LINE__);
-#endif
* (char *) ((int *) cache + 1) = '\0';
}
}
@@ -1109,17 +1103,11 @@ QCString QString::convertToQCString(CFStringEncoding enc) const
char *chs = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
if (chs) {
if (!CFStringGetCString(s, chs, len + 1, enc)) {
-#ifdef _KWQ_DEBUG_
- NSLog(@"WARNING %s:%s:%d (CFStringGetCString failed)\n",
- __FILE__, __FUNCTION__, __LINE__);
-#endif
+ KWQDEBUG("CFStringGetCString failed\n");
*reinterpret_cast<char *>(chs) = '\0';
}
QCString qcs = QCString(chs);
-#ifdef KWQ_STRING_DEBUG
-#else
CFAllocatorDeallocate(kCFAllocatorDefault, chs);
-#endif
return qcs;
}
}
diff --git a/WebCore/kwq/KWQToolTip.mm b/WebCore/kwq/KWQToolTip.mm
index ed8b2c7..f4dc79e 100644
--- a/WebCore/kwq/KWQToolTip.mm
+++ b/WebCore/kwq/KWQToolTip.mm
@@ -26,29 +26,18 @@
#include <kwqdebug.h>
#include <qtooltip.h>
-// FIXME:
-static QPalette *DEFAULT_PALETTE = NULL;
-
QPalette QToolTip::palette()
{
- _logNotYetImplemented();
- if (DEFAULT_PALETTE == NULL) {
- DEFAULT_PALETTE = new QPalette();
- }
-
- return *DEFAULT_PALETTE;
+ static QPalette pal;
+ return pal;
}
-
QToolTip::QToolTip(QWidget *)
{
_logNotYetImplemented();
}
-
void QToolTip::tip(const QRect &, const QString &)
{
_logNotYetImplemented();
}
-
-
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index c27165c..ead6ef5 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -92,7 +92,7 @@ QSize QWidget::sizeHint() const
void QWidget::resize(int w, int h)
{
- KWQDEBUG4 ("0x%08x %s to w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
+ KWQDEBUG4 ("%p %s to w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
internalSetGeometry( pos().x(), pos().y(), w, h );
}
@@ -183,7 +183,7 @@ QPoint QWidget::pos() const
void QWidget::move(int x, int y)
{
- KWQDEBUG4 ("0x%08x %s to x %d y %d\n", getView(), [[[getView() class] className] cString], x, y);
+ KWQDEBUG4 ("%p %s to x %d y %d\n", getView(), [[[getView() class] className] cString], x, y);
internalSetGeometry( x,
y,
width(), height() );
diff --git a/WebCore/kwq/WCPlugin.mm b/WebCore/kwq/WCPlugin.mm
index 58338d9..5db67fe 100644
--- a/WebCore/kwq/WCPlugin.mm
+++ b/WebCore/kwq/WCPlugin.mm
@@ -45,12 +45,12 @@
if([[fileInfo objectForKey:@"NSFileHFSTypeCode"] unsignedLongValue] == 1112690764){ // 1112690764 = 'BRPL'
err = FSPathMakeRef((UInt8 *)[pluginPath cString], &fref, NULL);
if(err != noErr){
- KWQDebug("WCPlugin: FSPathMakeRef failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: FSPathMakeRef failed. Error=%d\n", err);
return FALSE;
}
resRef = FSOpenResFile(&fref, fsRdPerm);
if(resRef <= noErr){
- KWQDebug("WCPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath cString], err);
+ KWQDEBUG2("WCPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
return FALSE;
}
[self getPluginInfoForResourceFile:resRef];
@@ -174,17 +174,17 @@
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
if(err != noErr){
- KWQDebug("WCPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
return;
}
err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
if(err != noErr){
- KWQDebug("WCPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
return;
}
err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
if(err != noErr){
- KWQDebug("WCPlugin: load: GetDiskFragment failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: load: GetDiskFragment failed. Error=%d\n", err);
return;
}
pluginMainFunc = functionPointerForTVector(pluginMainFunc);
@@ -217,7 +217,7 @@
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
- KWQDebug("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
+ KWQDEBUG3("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
NPP_New = functionPointerForTVector(pluginFuncs.newp);
NPP_Destroy = functionPointerForTVector(pluginFuncs.destroy);
@@ -275,7 +275,7 @@
NPP_GetValue = pluginFuncs.getvalue;
NPP_SetValue = pluginFuncs.setvalue;
}
- KWQDebug("Plugin Loaded\n");
+ KWQDEBUG("Plugin Loaded\n");
isLoaded = TRUE;
}
@@ -288,7 +288,7 @@
}else{
CloseConnection(&connID);
}
- KWQDebug("Plugin Unloaded\n");
+ KWQDEBUG("Plugin Unloaded\n");
isLoaded = FALSE;
}
diff --git a/WebCore/kwq/WCPluginDatabase.mm b/WebCore/kwq/WCPluginDatabase.mm
index 58fc5ca..083a0ff 100644
--- a/WebCore/kwq/WCPluginDatabase.mm
+++ b/WebCore/kwq/WCPluginDatabase.mm
@@ -152,8 +152,8 @@ NSArray *findPlugins(void)
if([plugin initializeWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
- KWQDebug("Found plugin: %s\n", [[plugin name] cString]);
- KWQDebug("%s", [[plugin description] cString]);
+ KWQDEBUG1("Found plugin: %s\n", [[plugin name] lossyCString]);
+ KWQDEBUG1("%s", [[plugin description] lossyCString]);
}
}
return [pluginArray retain];
diff --git a/WebCore/kwq/kwqdebug.h b/WebCore/kwq/kwqdebug.h
index 8bb3a13..f9f7dc6 100644
--- a/WebCore/kwq/kwqdebug.h
+++ b/WebCore/kwq/kwqdebug.h
@@ -34,6 +34,23 @@
#undef Rect
#undef Boolean
+#ifdef xNDEBUG
+
+#define KWQDEBUGLEVEL(level,format) ((void)0)
+#define KWQDEBUGLEVEL1(level,format,arg1) ((void)0)
+#define KWQDEBUGLEVEL2(level,format,arg1,arg2) ((void)0)
+#define KWQDEBUGLEVEL3(level,format,arg1,arg2,arg3) ((void)0)
+#define KWQDEBUGLEVEL4(level,format,arg1,arg2,arg3,arg4) ((void)0)
+#define KWQDEBUGLEVEL5(level,format,arg1,arg2,arg3,arg4,arg5) ((void)0)
+#define KWQDEBUGLEVEL6(level,format,arg1,arg2,arg3,arg4,arg5,arg6) ((void)0)
+#define KWQDEBUGLEVEL7(level,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ((void)0)
+
+#define KWQ_ASSERT(expr) ((void)0)
+#define KWQ_ASSERT_VALID_ARG(arg,expr) ((void)0)
+#define KWQ_ASSERT_NOT_NIL(arg) ((void)0)
+
+#else /* xNDEBUG */
+
/*
*/
#define _KWQ_TIMING 1
@@ -63,63 +80,42 @@ long _GetMillisecondsSinceEpoch();
void KWQSetLogLevel(int mask);
unsigned int KWQGetLogLevel();
-void KWQDebug(const char *format, ...);
-void KWQDebugAtLevel(unsigned int level, const char *format, ...);
-void KWQLog(NSString *format, ...);
-void KWQLogAtLevel(unsigned int level, NSString *format, ...);
-
-
-#define _logNeverImplemented() \
- KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
-
-#define _logPartiallyImplemented() \
- KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
-
-#define _logNotYetImplemented() \
- KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
-
-
-#define KWQDEBUG(format) KWQDEBUGLEVEL(KWQ_LOG_DEBUG,format)
-#define KWQDEBUG1(format,arg1) KWQDEBUGLEVEL1(KWQ_LOG_DEBUG,format,arg1)
-#define KWQDEBUG2(format,arg1,arg2) KWQDEBUGLEVEL2(KWQ_LOG_DEBUG,format,arg1,arg2)
-#define KWQDEBUG3(format,arg1,arg2,arg3) KWQDEBUGLEVEL3(KWQ_LOG_DEBUG,format,arg1,arg2,arg3)
-#define KWQDEBUG4(format,arg1,arg2,arg3,arg4) KWQDEBUGLEVEL4(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4)
-#define KWQDEBUG5(format,arg1,arg2,arg3,arg4,arg5) KWQDEBUGLEVEL5(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
-#define KWQDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) KWQDEBUGLEVEL6(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
+void KWQDebugAtLevel(unsigned int level, const char *format, ...)
+ __attribute__((__format__ (__printf__, 2, 3)));
#define KWQDEBUGLEVEL(level,format) \
- KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__, format);\
+ KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format);
-
+
#define KWQDEBUGLEVEL1(level,format,arg1) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1);
-
+
#define KWQDEBUGLEVEL2(level,format,arg1,arg2) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2);
-
+
#define KWQDEBUGLEVEL3(level,format,arg1,arg2,arg3) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3);
-
+
#define KWQDEBUGLEVEL4(level,format,arg1,arg2,arg3,arg4) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4);
-
+
#define KWQDEBUGLEVEL5(level,format,arg1,arg2,arg3,arg4,arg5) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5);
-
+
#define KWQDEBUGLEVEL6(level,format,arg1,arg2,arg3,arg4,arg5,arg6) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5,arg6);
-
+
#define KWQDEBUGLEVEL7(level,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-
-#define DEBUG_OBJECT(object) [[object description] cString]
+
+#define DEBUG_OBJECT(object) [[object description] lossyCString]
/*-----------------------------------------------------------------------------
* Assertion macros
@@ -141,7 +137,7 @@ void KWQLogAtLevel(unsigned int level, NSString *format, ...);
} \
} while (0)
-#define WEBKIT_ASSERT_NOT_NIL(arg) \
+#define KWQ_ASSERT_NOT_NIL(arg) \
do { \
if ((arg) == nil) { \
NSString *reason = [NSString stringWithFormat:@"'%s' is nil", #arg]; \
@@ -149,6 +145,23 @@ void KWQLogAtLevel(unsigned int level, NSString *format, ...);
} \
} while (0)
+#endif
+
+#define KWQDEBUG(format) KWQDEBUGLEVEL(KWQ_LOG_DEBUG,format)
+#define KWQDEBUG1(format,arg1) KWQDEBUGLEVEL1(KWQ_LOG_DEBUG,format,arg1)
+#define KWQDEBUG2(format,arg1,arg2) KWQDEBUGLEVEL2(KWQ_LOG_DEBUG,format,arg1,arg2)
+#define KWQDEBUG3(format,arg1,arg2,arg3) KWQDEBUGLEVEL3(KWQ_LOG_DEBUG,format,arg1,arg2,arg3)
+#define KWQDEBUG4(format,arg1,arg2,arg3,arg4) KWQDEBUGLEVEL4(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4)
+#define KWQDEBUG5(format,arg1,arg2,arg3,arg4,arg5) KWQDEBUGLEVEL5(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
+#define KWQDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) KWQDEBUGLEVEL6(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
+
+#define _logNeverImplemented() \
+ KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
+
+#define _logPartiallyImplemented() \
+ KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
-#endif KWQDEBUG_H_
+#define _logNotYetImplemented() \
+ KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
+#endif /* KWQDEBUG_H_ */
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index fbd7d04..fee5e85 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -47,36 +47,6 @@ unsigned int KWQGetLogLevel(){
}
-void KWQLog(NSString *format, ...) {
- if (KWQGetLogLevel() & KWQ_LOG_ERROR){
- va_list args;
- va_start(args, format);
- NSLogv(format, args);
- va_end(args);
- }
-}
-
-
-void KWQLogAtLevel(unsigned int level, NSString *format, ...) {
- if (KWQGetLogLevel() & level){
- va_list args;
- va_start(args, format);
- NSLogv(format, args);
- va_end(args);
- }
-}
-
-
-void KWQDebug(const char *format, ...) {
- if (KWQGetLogLevel() & KWQ_LOG_DEBUG){
- va_list args;
- va_start(args, format);
- vfprintf(stderr, format, args);
- va_end(args);
- }
-}
-
-
void KWQDebugAtLevel(unsigned int level, const char *format, ...) {
if (KWQGetLogLevel() & level){
va_list args;
diff --git a/WebCore/kwq/npapi.mm b/WebCore/kwq/npapi.mm
index 38055e4..d39669c 100644
--- a/WebCore/kwq/npapi.mm
+++ b/WebCore/kwq/npapi.mm
@@ -46,29 +46,29 @@
// general plug-in to browser functions
const char* NPN_UserAgent(NPP instance){
- KWQDebug("NPN_UserAgent\n");
+ KWQDEBUG("NPN_UserAgent\n");
return "IE";
}
void* NPN_MemAlloc(UInt32 size){
- //KWQDebug("NPN_MemAlloc\n");
+ //KWQDEBUG("NPN_MemAlloc\n");
return malloc(size);
}
void NPN_MemFree(void* ptr){
- //KWQDebug("NPN_MemFree\n");
+ //KWQDEBUG("NPN_MemFree\n");
free(ptr);
}
UInt32 NPN_MemFlush(UInt32 size){
- KWQDebug("NPN_MemFlush\n");
+ KWQDEBUG("NPN_MemFlush\n");
return 0;
}
void NPN_ReloadPlugins(NPBool reloadPages){
- KWQDebug("NPN_ReloadPlugins\n");
+ KWQDEBUG("NPN_ReloadPlugins\n");
}
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index 556ba8b..c9458de 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -27,20 +27,12 @@
#include <qapplication.h>
#include <qpalette.h>
-// FIXME:
-static QPalette *DEFAULT_PALETTE = NULL;
-static QSize *DEFAULT_SIZE = NULL;
-
QPalette QApplication::palette(const QWidget *p)
{
- if (DEFAULT_PALETTE == NULL) {
- DEFAULT_PALETTE = new QPalette();
- }
-
- return *DEFAULT_PALETTE;
+ static QPalette pal;
+ return pal;
}
-
static QWidget *mainWidget = 0;
// Do we need to worry about multiple screens?
@@ -64,7 +56,7 @@ int KWQDesktopWidget::height() const
QWidget *QApplication::desktop()
{
- if (mainWidget == 0){
+ if (mainWidget == 0) {
mainWidget = new KWQDesktopWidget();
}
return mainWidget;
@@ -81,12 +73,7 @@ int QApplication::startDragDistance()
QSize QApplication::globalStrut()
{
_logNotYetImplemented();
-
- if (DEFAULT_SIZE == NULL) {
- DEFAULT_SIZE = new QSize(0,0);
- }
-
- return *DEFAULT_SIZE;
+ return QSize(0,0);
}
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/src/kwq/KWQKGlobal.mm
index 72a3056..5ca8893 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/src/kwq/KWQKGlobal.mm
@@ -82,7 +82,8 @@ KStandardDirs *KGlobal::dirs()
KConfig *KGlobal::config()
{
_logNotYetImplemented();
- return new KConfig("foo");
+ static KConfig c("foo");
+ return &c;
}
const QString &KGlobal::staticQString(const QString &str)
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index f9995cf..3ed8ee0 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1026,7 +1026,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -1041,7 +1041,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1067,7 +1067,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -1090,7 +1090,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+ KWQDEBUGLEVEL4 (KWQ_LOG_LOADING, "dataSource = %p for URL %s data at %p, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1111,7 +1111,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = 0x%08x, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
diff --git a/WebCore/src/kwq/KWQObject.mm b/WebCore/src/kwq/KWQObject.mm
index 3726b44..f3f3966 100644
--- a/WebCore/src/kwq/KWQObject.mm
+++ b/WebCore/src/kwq/KWQObject.mm
@@ -33,7 +33,7 @@ bool QObject::connect(const QObject *sender, const char *signal, const QObject *
{
if (sender)
((QObject *)sender)->setTarget ((QObject *)dest);
- KWQDEBUG4 ("src = 0x%08x, signal = %s, dest = 0x%08x, slot = %s\n", sender, signal, dest, slot);
+ KWQDEBUG4 ("src = %p, signal = %s, dest = %p, slot = %s\n", sender, signal, dest, slot);
return FALSE;
}
@@ -43,7 +43,7 @@ bool QObject::connect(const QObject *sender, const char *signal, const char *slo
{
if (sender)
((QObject *)sender)->setTarget ((QObject *)sender);
- KWQDEBUG3 ("src = 0x%08x, signal = %s, slot = %s\n", sender, signal, slot);
+ KWQDEBUG3 ("src = %p, signal = %s, slot = %s\n", sender, signal, slot);
return FALSE;
}
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index 0306673..2eaf8a6 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -157,7 +157,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
[subView removeFromSuperview];
- KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "Adding 0x%08x %s at (%d,%d) w %d h %d\n", subView, [[[subView class] className] cString], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
+ KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "Adding %p %s at (%d,%d) w %d h %d\n", subView, [[[subView class] className] cString], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
[thisView addSubview: subView];
}
@@ -177,12 +177,12 @@ void QScrollView::removeChild(QWidget* child)
void QScrollView::resizeContents(int w, int h)
{
- KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "0x%08x %s at w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
+ KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "%p %s at w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
//if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
if ([getView() isKindOfClass: NSClassFromString(@"NSScrollView")]){
IFWebView *wview = [(NSScrollView *)getView() documentView];
- KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "0x%08x %s at w %d h %d\n", wview, [[[wview class] className] cString], w, h);
+ KWQDEBUGLEVEL4 (KWQ_LOG_FRAMES, "%p %s at w %d h %d\n", wview, [[[wview class] className] cString], w, h);
//w -= (int)[NSScroller scrollerWidth];
//w -= 1;
if (w < 0)
@@ -202,7 +202,7 @@ void QScrollView::resizeContents(int w, int h)
void QScrollView::updateContents(int x, int y, int w, int h)
{
- KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
+ KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "%p %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
void QScrollView::updateContents(const QRect &rect)
@@ -213,7 +213,7 @@ void QScrollView::updateContents(const QRect &rect)
void QScrollView::repaintContents(int x, int y, int w, int h, bool erase=TRUE)
{
- KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
+ KWQDEBUGLEVEL6 (KWQ_LOG_FRAMES, "%p %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
QPoint QScrollView::contentsToViewport(const QPoint &)
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 35cae9d..b59d1cc 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -304,9 +304,7 @@ const QChar *QString::unicode() const
if (cache == NULL || * (int *) cache != CacheUnicode) {
flushCache();
-#if _KWQ_DEBUG_
KWQDEBUG3("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
-#endif
cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len * sizeof (UniChar), 0);
* (int *) cache = CacheUnicode;
CFStringGetCharacters(s, CFRangeMake(0, len), (UniChar *) ((int *) cache + 1));
@@ -327,15 +325,11 @@ const char *QString::latin1() const
if (cache == NULL || * (int *) cache != CacheLatin1) {
flushCache();
-#if _KWQ_DEBUG_
KWQDEBUG3("WARNING %s:%s:%d (CFStringGetCharactersPtr failed)\n", __FUNCTION__, __FILE__, __LINE__);
-#endif
cache = CFAllocatorAllocate(kCFAllocatorDefault, sizeof(int) + len + 1, 0);
* (int *) cache = CacheLatin1;
if (!CFStringGetCString(s, (char *) ((int *) cache + 1), len + 1, kCFStringEncodingISOLatin1)) {
-#if _KWQ_DEBUG_
KWQDEBUG3("WARNING %s:%s:%d (CFStringGetCString failed)\n", __FUNCTION__, __FILE__, __LINE__);
-#endif
* (char *) ((int *) cache + 1) = '\0';
}
}
@@ -1109,17 +1103,11 @@ QCString QString::convertToQCString(CFStringEncoding enc) const
char *chs = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
if (chs) {
if (!CFStringGetCString(s, chs, len + 1, enc)) {
-#ifdef _KWQ_DEBUG_
- NSLog(@"WARNING %s:%s:%d (CFStringGetCString failed)\n",
- __FILE__, __FUNCTION__, __LINE__);
-#endif
+ KWQDEBUG("CFStringGetCString failed\n");
*reinterpret_cast<char *>(chs) = '\0';
}
QCString qcs = QCString(chs);
-#ifdef KWQ_STRING_DEBUG
-#else
CFAllocatorDeallocate(kCFAllocatorDefault, chs);
-#endif
return qcs;
}
}
diff --git a/WebCore/src/kwq/KWQToolTip.mm b/WebCore/src/kwq/KWQToolTip.mm
index ed8b2c7..f4dc79e 100644
--- a/WebCore/src/kwq/KWQToolTip.mm
+++ b/WebCore/src/kwq/KWQToolTip.mm
@@ -26,29 +26,18 @@
#include <kwqdebug.h>
#include <qtooltip.h>
-// FIXME:
-static QPalette *DEFAULT_PALETTE = NULL;
-
QPalette QToolTip::palette()
{
- _logNotYetImplemented();
- if (DEFAULT_PALETTE == NULL) {
- DEFAULT_PALETTE = new QPalette();
- }
-
- return *DEFAULT_PALETTE;
+ static QPalette pal;
+ return pal;
}
-
QToolTip::QToolTip(QWidget *)
{
_logNotYetImplemented();
}
-
void QToolTip::tip(const QRect &, const QString &)
{
_logNotYetImplemented();
}
-
-
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index c27165c..ead6ef5 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -92,7 +92,7 @@ QSize QWidget::sizeHint() const
void QWidget::resize(int w, int h)
{
- KWQDEBUG4 ("0x%08x %s to w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
+ KWQDEBUG4 ("%p %s to w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
internalSetGeometry( pos().x(), pos().y(), w, h );
}
@@ -183,7 +183,7 @@ QPoint QWidget::pos() const
void QWidget::move(int x, int y)
{
- KWQDEBUG4 ("0x%08x %s to x %d y %d\n", getView(), [[[getView() class] className] cString], x, y);
+ KWQDEBUG4 ("%p %s to x %d y %d\n", getView(), [[[getView() class] className] cString], x, y);
internalSetGeometry( x,
y,
width(), height() );
diff --git a/WebCore/src/kwq/WCPlugin.mm b/WebCore/src/kwq/WCPlugin.mm
index 58338d9..5db67fe 100644
--- a/WebCore/src/kwq/WCPlugin.mm
+++ b/WebCore/src/kwq/WCPlugin.mm
@@ -45,12 +45,12 @@
if([[fileInfo objectForKey:@"NSFileHFSTypeCode"] unsignedLongValue] == 1112690764){ // 1112690764 = 'BRPL'
err = FSPathMakeRef((UInt8 *)[pluginPath cString], &fref, NULL);
if(err != noErr){
- KWQDebug("WCPlugin: FSPathMakeRef failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: FSPathMakeRef failed. Error=%d\n", err);
return FALSE;
}
resRef = FSOpenResFile(&fref, fsRdPerm);
if(resRef <= noErr){
- KWQDebug("WCPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath cString], err);
+ KWQDEBUG2("WCPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
return FALSE;
}
[self getPluginInfoForResourceFile:resRef];
@@ -174,17 +174,17 @@
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
if(err != noErr){
- KWQDebug("WCPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
return;
}
err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
if(err != noErr){
- KWQDebug("WCPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
return;
}
err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
if(err != noErr){
- KWQDebug("WCPlugin: load: GetDiskFragment failed. Error=%d\n", err);
+ KWQDEBUG1("WCPlugin: load: GetDiskFragment failed. Error=%d\n", err);
return;
}
pluginMainFunc = functionPointerForTVector(pluginMainFunc);
@@ -217,7 +217,7 @@
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
- KWQDebug("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
+ KWQDEBUG3("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
NPP_New = functionPointerForTVector(pluginFuncs.newp);
NPP_Destroy = functionPointerForTVector(pluginFuncs.destroy);
@@ -275,7 +275,7 @@
NPP_GetValue = pluginFuncs.getvalue;
NPP_SetValue = pluginFuncs.setvalue;
}
- KWQDebug("Plugin Loaded\n");
+ KWQDEBUG("Plugin Loaded\n");
isLoaded = TRUE;
}
@@ -288,7 +288,7 @@
}else{
CloseConnection(&connID);
}
- KWQDebug("Plugin Unloaded\n");
+ KWQDEBUG("Plugin Unloaded\n");
isLoaded = FALSE;
}
diff --git a/WebCore/src/kwq/WCPluginDatabase.mm b/WebCore/src/kwq/WCPluginDatabase.mm
index 58fc5ca..083a0ff 100644
--- a/WebCore/src/kwq/WCPluginDatabase.mm
+++ b/WebCore/src/kwq/WCPluginDatabase.mm
@@ -152,8 +152,8 @@ NSArray *findPlugins(void)
if([plugin initializeWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
- KWQDebug("Found plugin: %s\n", [[plugin name] cString]);
- KWQDebug("%s", [[plugin description] cString]);
+ KWQDEBUG1("Found plugin: %s\n", [[plugin name] lossyCString]);
+ KWQDEBUG1("%s", [[plugin description] lossyCString]);
}
}
return [pluginArray retain];
diff --git a/WebCore/src/kwq/kwqdebug.h b/WebCore/src/kwq/kwqdebug.h
index 8bb3a13..f9f7dc6 100644
--- a/WebCore/src/kwq/kwqdebug.h
+++ b/WebCore/src/kwq/kwqdebug.h
@@ -34,6 +34,23 @@
#undef Rect
#undef Boolean
+#ifdef xNDEBUG
+
+#define KWQDEBUGLEVEL(level,format) ((void)0)
+#define KWQDEBUGLEVEL1(level,format,arg1) ((void)0)
+#define KWQDEBUGLEVEL2(level,format,arg1,arg2) ((void)0)
+#define KWQDEBUGLEVEL3(level,format,arg1,arg2,arg3) ((void)0)
+#define KWQDEBUGLEVEL4(level,format,arg1,arg2,arg3,arg4) ((void)0)
+#define KWQDEBUGLEVEL5(level,format,arg1,arg2,arg3,arg4,arg5) ((void)0)
+#define KWQDEBUGLEVEL6(level,format,arg1,arg2,arg3,arg4,arg5,arg6) ((void)0)
+#define KWQDEBUGLEVEL7(level,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7) ((void)0)
+
+#define KWQ_ASSERT(expr) ((void)0)
+#define KWQ_ASSERT_VALID_ARG(arg,expr) ((void)0)
+#define KWQ_ASSERT_NOT_NIL(arg) ((void)0)
+
+#else /* xNDEBUG */
+
/*
*/
#define _KWQ_TIMING 1
@@ -63,63 +80,42 @@ long _GetMillisecondsSinceEpoch();
void KWQSetLogLevel(int mask);
unsigned int KWQGetLogLevel();
-void KWQDebug(const char *format, ...);
-void KWQDebugAtLevel(unsigned int level, const char *format, ...);
-void KWQLog(NSString *format, ...);
-void KWQLogAtLevel(unsigned int level, NSString *format, ...);
-
-
-#define _logNeverImplemented() \
- KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
-
-#define _logPartiallyImplemented() \
- KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
-
-#define _logNotYetImplemented() \
- KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
-
-
-#define KWQDEBUG(format) KWQDEBUGLEVEL(KWQ_LOG_DEBUG,format)
-#define KWQDEBUG1(format,arg1) KWQDEBUGLEVEL1(KWQ_LOG_DEBUG,format,arg1)
-#define KWQDEBUG2(format,arg1,arg2) KWQDEBUGLEVEL2(KWQ_LOG_DEBUG,format,arg1,arg2)
-#define KWQDEBUG3(format,arg1,arg2,arg3) KWQDEBUGLEVEL3(KWQ_LOG_DEBUG,format,arg1,arg2,arg3)
-#define KWQDEBUG4(format,arg1,arg2,arg3,arg4) KWQDEBUGLEVEL4(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4)
-#define KWQDEBUG5(format,arg1,arg2,arg3,arg4,arg5) KWQDEBUGLEVEL5(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
-#define KWQDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) KWQDEBUGLEVEL6(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
+void KWQDebugAtLevel(unsigned int level, const char *format, ...)
+ __attribute__((__format__ (__printf__, 2, 3)));
#define KWQDEBUGLEVEL(level,format) \
- KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__, format);\
+ KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format);
-
+
#define KWQDEBUGLEVEL1(level,format,arg1) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1);
-
+
#define KWQDEBUGLEVEL2(level,format,arg1,arg2) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2);
-
+
#define KWQDEBUGLEVEL3(level,format,arg1,arg2,arg3) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3);
-
+
#define KWQDEBUGLEVEL4(level,format,arg1,arg2,arg3,arg4) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4);
-
+
#define KWQDEBUGLEVEL5(level,format,arg1,arg2,arg3,arg4,arg5) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5);
-
+
#define KWQDEBUGLEVEL6(level,format,arg1,arg2,arg3,arg4,arg5,arg6) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5,arg6);
-
+
#define KWQDEBUGLEVEL7(level,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7) \
KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
KWQDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-
-#define DEBUG_OBJECT(object) [[object description] cString]
+
+#define DEBUG_OBJECT(object) [[object description] lossyCString]
/*-----------------------------------------------------------------------------
* Assertion macros
@@ -141,7 +137,7 @@ void KWQLogAtLevel(unsigned int level, NSString *format, ...);
} \
} while (0)
-#define WEBKIT_ASSERT_NOT_NIL(arg) \
+#define KWQ_ASSERT_NOT_NIL(arg) \
do { \
if ((arg) == nil) { \
NSString *reason = [NSString stringWithFormat:@"'%s' is nil", #arg]; \
@@ -149,6 +145,23 @@ void KWQLogAtLevel(unsigned int level, NSString *format, ...);
} \
} while (0)
+#endif
+
+#define KWQDEBUG(format) KWQDEBUGLEVEL(KWQ_LOG_DEBUG,format)
+#define KWQDEBUG1(format,arg1) KWQDEBUGLEVEL1(KWQ_LOG_DEBUG,format,arg1)
+#define KWQDEBUG2(format,arg1,arg2) KWQDEBUGLEVEL2(KWQ_LOG_DEBUG,format,arg1,arg2)
+#define KWQDEBUG3(format,arg1,arg2,arg3) KWQDEBUGLEVEL3(KWQ_LOG_DEBUG,format,arg1,arg2,arg3)
+#define KWQDEBUG4(format,arg1,arg2,arg3,arg4) KWQDEBUGLEVEL4(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4)
+#define KWQDEBUG5(format,arg1,arg2,arg3,arg4,arg5) KWQDEBUGLEVEL5(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
+#define KWQDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) KWQDEBUGLEVEL6(KWQ_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
+
+#define _logNeverImplemented() \
+ KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
+
+#define _logPartiallyImplemented() \
+ KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
-#endif KWQDEBUG_H_
+#define _logNotYetImplemented() \
+ KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
+#endif /* KWQDEBUG_H_ */
diff --git a/WebCore/src/kwq/kwqdebug.mm b/WebCore/src/kwq/kwqdebug.mm
index fbd7d04..fee5e85 100644
--- a/WebCore/src/kwq/kwqdebug.mm
+++ b/WebCore/src/kwq/kwqdebug.mm
@@ -47,36 +47,6 @@ unsigned int KWQGetLogLevel(){
}
-void KWQLog(NSString *format, ...) {
- if (KWQGetLogLevel() & KWQ_LOG_ERROR){
- va_list args;
- va_start(args, format);
- NSLogv(format, args);
- va_end(args);
- }
-}
-
-
-void KWQLogAtLevel(unsigned int level, NSString *format, ...) {
- if (KWQGetLogLevel() & level){
- va_list args;
- va_start(args, format);
- NSLogv(format, args);
- va_end(args);
- }
-}
-
-
-void KWQDebug(const char *format, ...) {
- if (KWQGetLogLevel() & KWQ_LOG_DEBUG){
- va_list args;
- va_start(args, format);
- vfprintf(stderr, format, args);
- va_end(args);
- }
-}
-
-
void KWQDebugAtLevel(unsigned int level, const char *format, ...) {
if (KWQGetLogLevel() & level){
va_list args;
diff --git a/WebCore/src/kwq/npapi.mm b/WebCore/src/kwq/npapi.mm
index 38055e4..d39669c 100644
--- a/WebCore/src/kwq/npapi.mm
+++ b/WebCore/src/kwq/npapi.mm
@@ -46,29 +46,29 @@
// general plug-in to browser functions
const char* NPN_UserAgent(NPP instance){
- KWQDebug("NPN_UserAgent\n");
+ KWQDEBUG("NPN_UserAgent\n");
return "IE";
}
void* NPN_MemAlloc(UInt32 size){
- //KWQDebug("NPN_MemAlloc\n");
+ //KWQDEBUG("NPN_MemAlloc\n");
return malloc(size);
}
void NPN_MemFree(void* ptr){
- //KWQDebug("NPN_MemFree\n");
+ //KWQDEBUG("NPN_MemFree\n");
free(ptr);
}
UInt32 NPN_MemFlush(UInt32 size){
- KWQDebug("NPN_MemFlush\n");
+ KWQDEBUG("NPN_MemFlush\n");
return 0;
}
void NPN_ReloadPlugins(NPBool reloadPages){
- KWQDebug("NPN_ReloadPlugins\n");
+ KWQDEBUG("NPN_ReloadPlugins\n");
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 902abde..311143a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * WebKit.pbproj/project.pbxproj: Fix flags as I did in WebFoundation.
+
+ * Misc.subproj/WebKitDebug.h: Turn off logging when xNDEBUG is defined.
+ Remove unused stuff. Add checking for printf parameters.
+ * Misc.subproj/WebKitDebug.m: Remove unused variants.
+
+ * Plugins.subproj/IFPluginView.mm: Change to use WebKit logging, not
+ WebCore logging.
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ * WebView.subproj/IFWebView.mm:
+ Fix types in log statements caught by the compiler.
+
2002-04-02 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 902abde..311143a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-04-02 Darin Adler <darin at apple.com>
+
+ * WebKit.pbproj/project.pbxproj: Fix flags as I did in WebFoundation.
+
+ * Misc.subproj/WebKitDebug.h: Turn off logging when xNDEBUG is defined.
+ Remove unused stuff. Add checking for printf parameters.
+ * Misc.subproj/WebKitDebug.m: Remove unused variants.
+
+ * Plugins.subproj/IFPluginView.mm: Change to use WebKit logging, not
+ WebCore logging.
+
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ * WebView.subproj/IFWebView.mm:
+ Fix types in log statements caught by the compiler.
+
2002-04-02 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 224bf82..df2037e 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -126,15 +126,15 @@ static void URLFileReaderInit()
if (data) {
if (mappedBytes) {
- WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - mmaped disk cache file - %@", path);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - mmaped disk cache file - %s", [path lossyCString]);
}
else {
- WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %@", path);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - fs read disk cache file - %s", [path lossyCString]);
}
return self;
}
else {
- WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - no disk cache file - %@", path);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - no disk cache file - %s", [path lossyCString]);
[self dealloc];
return nil;
}
@@ -367,7 +367,7 @@ static void URLFileReaderInit()
[self open];
[mutex unlock];
- WEBFOUNDATIONLOGLEVEL(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - removeAllObjects");
+ WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - removeAllObjects");
}
-(id)objectForKey:(id)key
@@ -418,7 +418,7 @@ static void URLFileReaderInit()
}
}
NS_HANDLER
- WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %@", key);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - cannot unarchive cache file - %s", DEBUG_OBJECT(key));
result = nil;
NS_ENDHANDLER
@@ -446,7 +446,8 @@ static void URLFileReaderInit()
NSArchiver *archiver;
NSFileManager *defaultManager;
- WEBFOUNDATIONLOGLEVEL2(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performSetObject - %@ - %@", key, [IFURLFileDatabase uniqueFilePathForKey:key]);
+ WEBFOUNDATIONDEBUGLEVEL2(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - performSetObject - %s - %s",
+ DEBUG_OBJECT(key), DEBUG_OBJECT([IFURLFileDatabase uniqueFilePathForKey:key]));
result = NO;
@@ -486,7 +487,7 @@ static void URLFileReaderInit()
{
NSString *filePath;
- WEBFOUNDATIONLOGLEVEL1(WebFoundationLogDiskCacheActivity, @"- [WEBFOUNDATION_DEBUG] - performRemoveObjectForKey - %@", key);
+ WEBFOUNDATIONDEBUGLEVEL1(WebFoundationLogDiskCacheActivity, "- [WEBFOUNDATION_DEBUG] - performRemoveObjectForKey - %s", DEBUG_OBJECT(key));
filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
[[NSFileManager defaultManager] removeFileAtPath:filePath handler:nil];
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 7e0c147..01a4d04 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -4,6 +4,22 @@
#import <Foundation/Foundation.h>
+#ifdef xNDEBUG
+
+#define WEBKITDEBUGLEVEL(level,format) ((void)0)
+#define WEBKITDEBUGLEVEL1(level,format,arg1) ((void)0)
+#define WEBKITDEBUGLEVEL2(level,format,arg1,arg2) ((void)0)
+#define WEBKITDEBUGLEVEL3(level,format,arg1,arg2,arg3) ((void)0)
+#define WEBKITDEBUGLEVEL4(level,format,arg1,arg2,arg3,arg4) ((void)0)
+#define WEBKITDEBUGLEVEL5(level,format,arg1,arg2,arg3,arg4,arg5) ((void)0)
+#define WEBKITDEBUGLEVEL6(level,format,arg1,arg2,arg3,arg4,arg5,arg6) ((void)0)
+
+#define WEBKIT_ASSERT(expr) ((void)0)
+#define WEBKIT_ASSERT_VALID_ARG(arg,expr) ((void)0)
+#define WEBKIT_ASSERT_NOT_NIL(arg) ((void)0)
+
+#else
+
/*-----------------------------------------------------------------------------
* Logging macros
*
@@ -39,63 +55,42 @@ extern "C" {
void WebKitSetLogLevel(int mask);
unsigned int WebKitGetLogLevel(void);
-void WebKitDebug(const char *format, ...);
-void WebKitDebugAtLevel(unsigned int level, const char *format, ...);
-void WebKitLog(NSString *format, ...);
-void WebKitLogAtLevel(unsigned int level, NSString *format, ...);
-
-
-#define _logNeverImplemented() \
- WEBKITDEBUGLEVEL(WEBKIT_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
-
-#define _logPartiallyImplemented() \
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
-
-#define _logNotYetImplemented() \
- WEBKITDEBUGLEVEL (WEBKIT_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
-
-
-#define WEBKITDEBUG(format) WEBKITDEBUGLEVEL(WEBKIT_LOG_GENERIC_DEBUG,format)
-#define WEBKITDEBUG1(format,arg1) WEBKITDEBUGLEVEL1(WEBKIT_LOG_GENERIC_DEBUG,format,arg1)
-#define WEBKITDEBUG2(format,arg1,arg2) WEBKITDEBUGLEVEL2(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2)
-#define WEBKITDEBUG3(format,arg1,arg2,arg3) WEBKITDEBUGLEVEL3(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3)
-#define WEBKITDEBUG4(format,arg1,arg2,arg3,arg4) WEBKITDEBUGLEVEL4(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3,arg4)
-#define WEBKITDEBUG5(format,arg1,arg2,arg3,arg4,arg5) WEBKITDEBUGLEVEL5(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
-#define WEBKITDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) WEBKITDEBUGLEVEL6(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
+void WebKitDebugAtLevel(unsigned int level, const char *format, ...)
+ __attribute__((__format__ (__printf__, 2, 3)));
+
+#ifdef __cplusplus
+}
+#endif
#define WEBKITDEBUGLEVEL(level,format) \
- WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__, format);\
+ WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format);
-
+
#define WEBKITDEBUGLEVEL1(level,format,arg1) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format,arg1);
-#if NDEBUG
-#define WEBKITDEBUGLEVEL2(level,format,arg1,arg2)
-#else
#define WEBKITDEBUGLEVEL2(level,format,arg1,arg2) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format,arg1,arg2);
-#endif
#define WEBKITDEBUGLEVEL3(level,format,arg1,arg2,arg3) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format,arg1,arg2,arg3);
-
+
#define WEBKITDEBUGLEVEL4(level,format,arg1,arg2,arg3,arg4) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format,arg1,arg2,arg3,arg4);
-
+
#define WEBKITDEBUGLEVEL5(level,format,arg1,arg2,arg3,arg4,arg5) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5);
-
+
#define WEBKITDEBUGLEVEL6(level,format,arg1,arg2,arg3,arg4,arg5,arg6) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__);\
WebKitDebugAtLevel (level,format,arg1,arg2,arg3,arg4,arg5,arg6);
-
-#define DEBUG_OBJECT(object) [[object description] cString]
+
+#define DEBUG_OBJECT(object) [[object description] lossyCString]
/*-----------------------------------------------------------------------------
* Assertion macros
@@ -124,7 +119,22 @@ void WebKitLogAtLevel(unsigned int level, NSString *format, ...);
[[NSException exceptionWithName:NSInvalidArgumentException reason:reason userInfo: nil] raise]; \
} \
} while (0)
-
-#ifdef __cplusplus
-}
+
#endif
+
+#define _logNeverImplemented() \
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
+
+#define _logPartiallyImplemented() \
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
+
+#define _logNotYetImplemented() \
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
+
+#define WEBKITDEBUG(format) WEBKITDEBUGLEVEL(WEBKIT_LOG_GENERIC_DEBUG,format)
+#define WEBKITDEBUG1(format,arg1) WEBKITDEBUGLEVEL1(WEBKIT_LOG_GENERIC_DEBUG,format,arg1)
+#define WEBKITDEBUG2(format,arg1,arg2) WEBKITDEBUGLEVEL2(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2)
+#define WEBKITDEBUG3(format,arg1,arg2,arg3) WEBKITDEBUGLEVEL3(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3)
+#define WEBKITDEBUG4(format,arg1,arg2,arg3,arg4) WEBKITDEBUGLEVEL4(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3,arg4)
+#define WEBKITDEBUG5(format,arg1,arg2,arg3,arg4,arg5) WEBKITDEBUGLEVEL5(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
+#define WEBKITDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) WEBKITDEBUGLEVEL6(WEBKIT_LOG_GENERIC_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
diff --git a/WebKit/Misc.subproj/WebKitDebug.m b/WebKit/Misc.subproj/WebKitDebug.m
index 6f16b27..262dac8 100644
--- a/WebKit/Misc.subproj/WebKitDebug.m
+++ b/WebKit/Misc.subproj/WebKitDebug.m
@@ -4,6 +4,8 @@
#import "WebKitDebug.h"
+#ifndef xNDEBUG
+
unsigned int WEBKIT_LOG_LEVEL = 0;
@@ -27,36 +29,6 @@ unsigned int WebKitGetLogLevel(){
}
-void WebKitLog(NSString *format, ...) {
- if (WebKitGetLogLevel() & WEBKIT_LOG_GENERIC_ERROR){
- va_list args;
- va_start(args, format);
- NSLogv(format, args);
- va_end(args);
- }
-}
-
-
-void WebKitLogAtLevel(unsigned int level, NSString *format, ...) {
- if (WebKitGetLogLevel() & level){
- va_list args;
- va_start(args, format);
- NSLogv(format, args);
- va_end(args);
- }
-}
-
-
-void WebKitDebug(const char *format, ...) {
- if (WebKitGetLogLevel() & WEBKIT_LOG_GENERIC_DEBUG){
- va_list args;
- va_start(args, format);
- vfprintf(stderr, format, args);
- va_end(args);
- }
-}
-
-
void WebKitDebugAtLevel(unsigned int level, const char *format, ...) {
if (WebKitGetLogLevel() & level){
va_list args;
@@ -66,3 +38,4 @@ void WebKitDebugAtLevel(unsigned int level, const char *format, ...) {
}
}
+#endif
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 4f9bd0d..1bdd8cc 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -6,23 +6,17 @@
#import "IFPluginView.h"
#import <AppKit/NSWindow_Private.h>
+#import "WebKitDebug.h"
#include <Carbon/Carbon.h>
-#include "kwqdebug.h"
#include <WebFoundation/IFURLHandle.h>
#import <IFWebDataSource.h>
#include <WCPluginWidget.h>
-#ifdef __cplusplus
extern "C" {
-#endif
-
#include <CoreGraphics/CoreGraphics.h>
#include <CoreGraphics/CoreGraphicsPrivate.h>
-
-#ifdef __cplusplus
}
-#endif
@implementation IFPluginViewNullEventSender
@@ -52,7 +46,7 @@ extern "C" {
-(void) stop
{
- KWQDebug("Stopping null events\n");
+ WEBKITDEBUG("Stopping null events\n");
shouldStop = TRUE;
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
}
@@ -138,7 +132,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
}else{
npErr = NPP_New(cMime, instance, mode, 0, NULL, NULL, &saved);
}
- KWQDebug("NPP_New: %d\n", npErr);
+ WEBKITDEBUG1("NPP_New: %d\n", npErr);
transferred = FALSE;
stopped = FALSE;
@@ -228,10 +222,10 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
window.type = NPWindowTypeWindow;
npErr = NPP_SetWindow(instance, &window);
- KWQDebug("NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
- KWQDebug("frameInWindow.origin.x=%f, frameInWindow.origin.y=%f, frameInWindow.size.height=%d, frameInWindow.size.width=%d\n",
+ WEBKITDEBUG2("NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
+ WEBKITDEBUG4("frameInWindow.origin.x=%f, frameInWindow.origin.y=%f, frameInWindow.size.height=%d, frameInWindow.size.width=%d\n",
frameInWindow.origin.x, frameInWindow.origin.y, (int)frameInWindow.size.height, (int)frameInWindow.size.width);
- KWQDebug("visibleRectInWindow.origin.x=%f, visibleRectInWindow.origin.y=%f, visibleRectInWindow.size.height=%d, visibleRectInWindow.size.width=%d\n",
+ WEBKITDEBUG4("visibleRectInWindow.origin.x=%f, visibleRectInWindow.origin.y=%f, visibleRectInWindow.size.height=%d, visibleRectInWindow.size.width=%d\n",
visibleRectInWindow.origin.x, visibleRectInWindow.origin.y, (int)visibleRectInWindow.size.height, (int)visibleRectInWindow.size.width);
}
@@ -281,19 +275,19 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
streamData->mimeType = cMime;
npErr = NPP_NewStream(instance, cMime, stream, FALSE, &transferMode);
- KWQDebug("NPP_NewStream: %d\n", npErr);
+ WEBKITDEBUG1("NPP_NewStream: %d\n", npErr);
streamData->transferMode = transferMode;
if(transferMode == NP_NORMAL){
- KWQDebug("Stream type: NP_NORMAL\n");
+ WEBKITDEBUG("Stream type: NP_NORMAL\n");
attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:streamData] forKey:IFURLHandleUserData];
urlHandle = [[IFURLHandle alloc] initWithURL:[NSURL URLWithString:streamURL] attributes:attributes flags:0];
[urlHandle addClient:self];
[activeURLHandles addObject:urlHandle];
[urlHandle loadInBackground];
}else if(transferMode == NP_ASFILEONLY || transferMode == NP_ASFILE){
- if(transferMode == NP_ASFILEONLY) KWQDebug("Stream type: NP_ASFILEONLY\n");
- if(transferMode == NP_ASFILE) KWQDebug("Stream type: NP_ASFILE\n");
+ if(transferMode == NP_ASFILEONLY) WEBKITDEBUG("Stream type: NP_ASFILEONLY\n");
+ if(transferMode == NP_ASFILE) WEBKITDEBUG("Stream type: NP_ASFILE\n");
streamData->filename = [NSString stringWithString:[streamURL lastPathComponent]];
[streamData->filename retain];
streamData->data = [NSMutableData dataWithCapacity:0];
@@ -306,7 +300,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
[urlHandle loadInBackground];
}
}else if(transferMode == NP_SEEK){
- KWQDebug("Stream type: NP_SEEK not yet supported\n");
+ WEBKITDEBUG("Stream type: NP_SEEK not yet supported\n");
}
}
@@ -320,9 +314,9 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
streamData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
if(streamData->transferMode != NP_ASFILEONLY){
bytes = NPP_WriteReady(instance, streamData->stream);
- //KWQDebug("NPP_WriteReady bytes=%u\n", bytes);
+ //WEBKITDEBUG1("NPP_WriteReady bytes=%u\n", bytes);
bytes = NPP_Write(instance, streamData->stream, streamData->offset, [data length], (void *)[data bytes]);
- //KWQDebug("NPP_Write bytes=%u\n", bytes);
+ //WEBKITDEBUG1("NPP_Write bytes=%u\n", bytes);
streamData->offset += [data length];
}
if(streamData->transferMode == NP_ASFILE || streamData->transferMode == NP_ASFILEONLY){
@@ -349,21 +343,21 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
[filename appendString:streamData->filename];
[filesToErase addObject:filename];
fileManager = [NSFileManager defaultManager];
- KWQDebug("Writing plugin file out to: %s %s size: %u\n", [filenameClassic cString], [filename cString], [streamData->data length]);
+ WEBKITDEBUG3("Writing plugin file out to: %s %s size: %u\n", [filenameClassic cString], [filename cString], [streamData->data length]);
[fileManager removeFileAtPath:filename handler:nil];
[fileManager createFileAtPath:filename contents:streamData->data attributes:nil];
cFilename = malloc([filenameClassic length]+1);
[filenameClassic getCString:cFilename];
NPP_StreamAsFile(instance, streamData->stream, cFilename);
- KWQDebug("NPP_StreamAsFile: %s\n", cFilename);
+ WEBKITDEBUG1("NPP_StreamAsFile: %s\n", cFilename);
[streamData->data release];
[streamData->filename release];
}
npErr = NPP_DestroyStream(instance, streamData->stream, NPRES_DONE);
- KWQDebug("NPP_DestroyStream: %d\n", npErr);
+ WEBKITDEBUG1("NPP_DestroyStream: %d\n", npErr);
if(streamData->stream->notifyData){
NPP_URLNotify(instance, streamData->stream->url, NPRES_DONE, streamData->stream->notifyData);
- KWQDebug("NPP_URLNotify\n");
+ WEBKITDEBUG("NPP_URLNotify\n");
}
free(streamData);
[activeURLHandles removeObject:sender];
@@ -405,7 +399,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(getFocusEvent): %d when: %u\n", acceptedEvent, event.when);
+ WEBKITDEBUG2("NPP_HandleEvent(getFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -419,7 +413,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(loseFocusEvent): %d when: %u\n", acceptedEvent, event.when);
+ WEBKITDEBUG2("NPP_HandleEvent(loseFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -435,7 +429,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
event.modifiers = isActive;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
+ WEBKITDEBUG2("NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
}
-(void)sendUpdateEvent
@@ -449,7 +443,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(updateEvt): %d when: %u\n", acceptedEvent, event.when);
+ WEBKITDEBUG2("NPP_HandleEvent(updateEvt): %d when: %lu\n", acceptedEvent, event.when);
}
-(void)mouseDown:(NSEvent *)theEvent
@@ -466,7 +460,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60); // seconds to ticks
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%u\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUG4("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
-(void)mouseUp:(NSEvent *)theEvent
@@ -483,7 +477,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%u\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUG4("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
- (void)mouseEntered:(NSEvent *)theEvent
@@ -495,7 +489,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 1;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
+ WEBKITDEBUG1("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
}
- (void)mouseExited:(NSEvent *)theEvent
@@ -507,7 +501,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
+ WEBKITDEBUG1("NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
}
- (void)keyUp:(NSEvent *)theEvent
@@ -519,7 +513,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (event.message & charCodeMask));
+ WEBKITDEBUG2("NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
//Note: QT Plug-in doesn't use keyUp's
}
@@ -532,7 +526,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (event.message & charCodeMask));
+ WEBKITDEBUG2("NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
}
// plug-in to browser calls
@@ -542,7 +536,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
NSURL *newURL;
IFWebDataSource *dataSource;
- KWQDebug("NPN_GetURLNotify: %s target: %s\n", url, target);
+ WEBKITDEBUG2("NPN_GetURLNotify: %s target: %s\n", url, target);
if(!strcmp(url, "")){
return NPERR_INVALID_URL;
@@ -564,37 +558,37 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
-(NPError)getURL:(const char *)url target:(const char *)target
{
- KWQDebug("NPN_GetURL: %s target: %s\n", url, target);
+ WEBKITDEBUG2("NPN_GetURL: %s target: %s\n", url, target);
return [self getURLNotify:url target:target notifyData:NULL];
}
-(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
{
- KWQDebug("NPN_PostURLNotify\n");
+ WEBKITDEBUG("NPN_PostURLNotify\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)postURL:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file
{
- KWQDebug("NPN_PostURL\n");
+ WEBKITDEBUG("NPN_PostURL\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
{
- KWQDebug("NPN_NewStream\n");
+ WEBKITDEBUG("NPN_NewStream\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)write:(NPStream*)stream len:(SInt32)len buffer:(void *)buffer
{
- KWQDebug("NPN_Write\n");
+ WEBKITDEBUG("NPN_Write\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason
{
- KWQDebug("NPN_DestroyStream\n");
+ WEBKITDEBUG("NPN_DestroyStream\n");
return NPERR_GENERIC_ERROR;
}
@@ -602,7 +596,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
{
IFWebDataSource *dataSource;
- KWQDebug("NPN_Status: %s\n", message);
+ WEBKITDEBUG1("NPN_Status: %s\n", message);
if(webController){
dataSource = [[webController mainFrame] dataSource];
[webController setStatusText:[NSString stringWithCString:message] forDataSource:dataSource];
@@ -611,24 +605,24 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
-(NPError)getValue:(NPNVariable)variable value:(void *)value
{
- KWQDebug("NPN_GetValue\n");
+ WEBKITDEBUG("NPN_GetValue\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)setValue:(NPPVariable)variable value:(void *)value
{
- KWQDebug("NPN_SetValue\n");
+ WEBKITDEBUG("NPN_SetValue\n");
return NPERR_GENERIC_ERROR;
}
-(void)invalidateRect:(NPRect *)invalidRect
{
- KWQDebug("NPN_InvalidateRect\n");
+ WEBKITDEBUG("NPN_InvalidateRect\n");
}
-(void)invalidateRegion:(NPRegion)invalidateRegion
{
- KWQDebug("NPN_InvalidateRegion\n");
+ WEBKITDEBUG("NPN_InvalidateRegion\n");
}
-(void)start
@@ -650,14 +644,14 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self removeTrackingRect:trackingTag];
npErr = NPP_Destroy(instance, NULL);
- KWQDebug("NPP_Destroy: %d\n", npErr);
+ WEBKITDEBUG1("NPP_Destroy: %d\n", npErr);
stopped = TRUE;
}
}
-(void)forceRedraw
{
- KWQDebug("forceRedraw\n");
+ WEBKITDEBUG("forceRedraw\n");
}
-(void)dealloc
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 4f9bd0d..1bdd8cc 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -6,23 +6,17 @@
#import "IFPluginView.h"
#import <AppKit/NSWindow_Private.h>
+#import "WebKitDebug.h"
#include <Carbon/Carbon.h>
-#include "kwqdebug.h"
#include <WebFoundation/IFURLHandle.h>
#import <IFWebDataSource.h>
#include <WCPluginWidget.h>
-#ifdef __cplusplus
extern "C" {
-#endif
-
#include <CoreGraphics/CoreGraphics.h>
#include <CoreGraphics/CoreGraphicsPrivate.h>
-
-#ifdef __cplusplus
}
-#endif
@implementation IFPluginViewNullEventSender
@@ -52,7 +46,7 @@ extern "C" {
-(void) stop
{
- KWQDebug("Stopping null events\n");
+ WEBKITDEBUG("Stopping null events\n");
shouldStop = TRUE;
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
}
@@ -138,7 +132,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
}else{
npErr = NPP_New(cMime, instance, mode, 0, NULL, NULL, &saved);
}
- KWQDebug("NPP_New: %d\n", npErr);
+ WEBKITDEBUG1("NPP_New: %d\n", npErr);
transferred = FALSE;
stopped = FALSE;
@@ -228,10 +222,10 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
window.type = NPWindowTypeWindow;
npErr = NPP_SetWindow(instance, &window);
- KWQDebug("NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
- KWQDebug("frameInWindow.origin.x=%f, frameInWindow.origin.y=%f, frameInWindow.size.height=%d, frameInWindow.size.width=%d\n",
+ WEBKITDEBUG2("NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
+ WEBKITDEBUG4("frameInWindow.origin.x=%f, frameInWindow.origin.y=%f, frameInWindow.size.height=%d, frameInWindow.size.width=%d\n",
frameInWindow.origin.x, frameInWindow.origin.y, (int)frameInWindow.size.height, (int)frameInWindow.size.width);
- KWQDebug("visibleRectInWindow.origin.x=%f, visibleRectInWindow.origin.y=%f, visibleRectInWindow.size.height=%d, visibleRectInWindow.size.width=%d\n",
+ WEBKITDEBUG4("visibleRectInWindow.origin.x=%f, visibleRectInWindow.origin.y=%f, visibleRectInWindow.size.height=%d, visibleRectInWindow.size.width=%d\n",
visibleRectInWindow.origin.x, visibleRectInWindow.origin.y, (int)visibleRectInWindow.size.height, (int)visibleRectInWindow.size.width);
}
@@ -281,19 +275,19 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
streamData->mimeType = cMime;
npErr = NPP_NewStream(instance, cMime, stream, FALSE, &transferMode);
- KWQDebug("NPP_NewStream: %d\n", npErr);
+ WEBKITDEBUG1("NPP_NewStream: %d\n", npErr);
streamData->transferMode = transferMode;
if(transferMode == NP_NORMAL){
- KWQDebug("Stream type: NP_NORMAL\n");
+ WEBKITDEBUG("Stream type: NP_NORMAL\n");
attributes = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:streamData] forKey:IFURLHandleUserData];
urlHandle = [[IFURLHandle alloc] initWithURL:[NSURL URLWithString:streamURL] attributes:attributes flags:0];
[urlHandle addClient:self];
[activeURLHandles addObject:urlHandle];
[urlHandle loadInBackground];
}else if(transferMode == NP_ASFILEONLY || transferMode == NP_ASFILE){
- if(transferMode == NP_ASFILEONLY) KWQDebug("Stream type: NP_ASFILEONLY\n");
- if(transferMode == NP_ASFILE) KWQDebug("Stream type: NP_ASFILE\n");
+ if(transferMode == NP_ASFILEONLY) WEBKITDEBUG("Stream type: NP_ASFILEONLY\n");
+ if(transferMode == NP_ASFILE) WEBKITDEBUG("Stream type: NP_ASFILE\n");
streamData->filename = [NSString stringWithString:[streamURL lastPathComponent]];
[streamData->filename retain];
streamData->data = [NSMutableData dataWithCapacity:0];
@@ -306,7 +300,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
[urlHandle loadInBackground];
}
}else if(transferMode == NP_SEEK){
- KWQDebug("Stream type: NP_SEEK not yet supported\n");
+ WEBKITDEBUG("Stream type: NP_SEEK not yet supported\n");
}
}
@@ -320,9 +314,9 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
streamData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
if(streamData->transferMode != NP_ASFILEONLY){
bytes = NPP_WriteReady(instance, streamData->stream);
- //KWQDebug("NPP_WriteReady bytes=%u\n", bytes);
+ //WEBKITDEBUG1("NPP_WriteReady bytes=%u\n", bytes);
bytes = NPP_Write(instance, streamData->stream, streamData->offset, [data length], (void *)[data bytes]);
- //KWQDebug("NPP_Write bytes=%u\n", bytes);
+ //WEBKITDEBUG1("NPP_Write bytes=%u\n", bytes);
streamData->offset += [data length];
}
if(streamData->transferMode == NP_ASFILE || streamData->transferMode == NP_ASFILEONLY){
@@ -349,21 +343,21 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
[filename appendString:streamData->filename];
[filesToErase addObject:filename];
fileManager = [NSFileManager defaultManager];
- KWQDebug("Writing plugin file out to: %s %s size: %u\n", [filenameClassic cString], [filename cString], [streamData->data length]);
+ WEBKITDEBUG3("Writing plugin file out to: %s %s size: %u\n", [filenameClassic cString], [filename cString], [streamData->data length]);
[fileManager removeFileAtPath:filename handler:nil];
[fileManager createFileAtPath:filename contents:streamData->data attributes:nil];
cFilename = malloc([filenameClassic length]+1);
[filenameClassic getCString:cFilename];
NPP_StreamAsFile(instance, streamData->stream, cFilename);
- KWQDebug("NPP_StreamAsFile: %s\n", cFilename);
+ WEBKITDEBUG1("NPP_StreamAsFile: %s\n", cFilename);
[streamData->data release];
[streamData->filename release];
}
npErr = NPP_DestroyStream(instance, streamData->stream, NPRES_DONE);
- KWQDebug("NPP_DestroyStream: %d\n", npErr);
+ WEBKITDEBUG1("NPP_DestroyStream: %d\n", npErr);
if(streamData->stream->notifyData){
NPP_URLNotify(instance, streamData->stream->url, NPRES_DONE, streamData->stream->notifyData);
- KWQDebug("NPP_URLNotify\n");
+ WEBKITDEBUG("NPP_URLNotify\n");
}
free(streamData);
[activeURLHandles removeObject:sender];
@@ -405,7 +399,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(getFocusEvent): %d when: %u\n", acceptedEvent, event.when);
+ WEBKITDEBUG2("NPP_HandleEvent(getFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -419,7 +413,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(loseFocusEvent): %d when: %u\n", acceptedEvent, event.when);
+ WEBKITDEBUG2("NPP_HandleEvent(loseFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -435,7 +429,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
event.modifiers = isActive;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
+ WEBKITDEBUG2("NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
}
-(void)sendUpdateEvent
@@ -449,7 +443,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(updateEvt): %d when: %u\n", acceptedEvent, event.when);
+ WEBKITDEBUG2("NPP_HandleEvent(updateEvt): %d when: %lu\n", acceptedEvent, event.when);
}
-(void)mouseDown:(NSEvent *)theEvent
@@ -466,7 +460,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60); // seconds to ticks
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%u\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUG4("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
-(void)mouseUp:(NSEvent *)theEvent
@@ -483,7 +477,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%u\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUG4("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
- (void)mouseEntered:(NSEvent *)theEvent
@@ -495,7 +489,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 1;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
+ WEBKITDEBUG1("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
}
- (void)mouseExited:(NSEvent *)theEvent
@@ -507,7 +501,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
+ WEBKITDEBUG1("NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
}
- (void)keyUp:(NSEvent *)theEvent
@@ -519,7 +513,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (event.message & charCodeMask));
+ WEBKITDEBUG2("NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
//Note: QT Plug-in doesn't use keyUp's
}
@@ -532,7 +526,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- KWQDebug("NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (event.message & charCodeMask));
+ WEBKITDEBUG2("NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
}
// plug-in to browser calls
@@ -542,7 +536,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
NSURL *newURL;
IFWebDataSource *dataSource;
- KWQDebug("NPN_GetURLNotify: %s target: %s\n", url, target);
+ WEBKITDEBUG2("NPN_GetURLNotify: %s target: %s\n", url, target);
if(!strcmp(url, "")){
return NPERR_INVALID_URL;
@@ -564,37 +558,37 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
-(NPError)getURL:(const char *)url target:(const char *)target
{
- KWQDebug("NPN_GetURL: %s target: %s\n", url, target);
+ WEBKITDEBUG2("NPN_GetURL: %s target: %s\n", url, target);
return [self getURLNotify:url target:target notifyData:NULL];
}
-(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
{
- KWQDebug("NPN_PostURLNotify\n");
+ WEBKITDEBUG("NPN_PostURLNotify\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)postURL:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file
{
- KWQDebug("NPN_PostURL\n");
+ WEBKITDEBUG("NPN_PostURL\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
{
- KWQDebug("NPN_NewStream\n");
+ WEBKITDEBUG("NPN_NewStream\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)write:(NPStream*)stream len:(SInt32)len buffer:(void *)buffer
{
- KWQDebug("NPN_Write\n");
+ WEBKITDEBUG("NPN_Write\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason
{
- KWQDebug("NPN_DestroyStream\n");
+ WEBKITDEBUG("NPN_DestroyStream\n");
return NPERR_GENERIC_ERROR;
}
@@ -602,7 +596,7 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
{
IFWebDataSource *dataSource;
- KWQDebug("NPN_Status: %s\n", message);
+ WEBKITDEBUG1("NPN_Status: %s\n", message);
if(webController){
dataSource = [[webController mainFrame] dataSource];
[webController setStatusText:[NSString stringWithCString:message] forDataSource:dataSource];
@@ -611,24 +605,24 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
-(NPError)getValue:(NPNVariable)variable value:(void *)value
{
- KWQDebug("NPN_GetValue\n");
+ WEBKITDEBUG("NPN_GetValue\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)setValue:(NPPVariable)variable value:(void *)value
{
- KWQDebug("NPN_SetValue\n");
+ WEBKITDEBUG("NPN_SetValue\n");
return NPERR_GENERIC_ERROR;
}
-(void)invalidateRect:(NPRect *)invalidRect
{
- KWQDebug("NPN_InvalidateRect\n");
+ WEBKITDEBUG("NPN_InvalidateRect\n");
}
-(void)invalidateRegion:(NPRegion)invalidateRegion
{
- KWQDebug("NPN_InvalidateRegion\n");
+ WEBKITDEBUG("NPN_InvalidateRegion\n");
}
-(void)start
@@ -650,14 +644,14 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self removeTrackingRect:trackingTag];
npErr = NPP_Destroy(instance, NULL);
- KWQDebug("NPP_Destroy: %d\n", npErr);
+ WEBKITDEBUG1("NPP_Destroy: %d\n", npErr);
stopped = TRUE;
}
}
-(void)forceRedraw
{
- KWQDebug("forceRedraw\n");
+ WEBKITDEBUG("forceRedraw\n");
}
-(void)dealloc
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index bcc28a6..cc5e407 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -10,8 +10,11 @@
);
buildSettings = {
COPY_PHASE_STRIP = NO;
+ DEBUGGING_SYMBOLS = YES;
+ DEBUG_CFLAGS = "";
FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
INSTALL_PATH = "@executable_path/../Frameworks";
+ OPTIMIZATION_CFLAGS = "-O";
SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
@@ -21,9 +24,8 @@
buildRules = (
);
buildSettings = {
- COPY_PHASE_STRIP = YES;
- FRAMEWORK_SEARCH_PATHS = "";
- INSTALL_PATH = "";
+ FRAMEWORK_SEARCH_PATHS = "@executable_path/../Frameworks";
+ INSTALL_PATH = "@executable_path/../Frameworks";
SKIP_INSTALL = YES;
};
isa = PBXBuildStyle;
@@ -124,17 +126,21 @@
255AF6590250FC030ECA149E,
);
buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUGGING_SYMBOLS = NO;
+ DEBUG_CFLAGS = "-DxNDEBUG";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
- HEADER_SEARCH_PATHS = "../WebCore/include ../JavaScriptCore";
+ HEADER_SEARCH_PATHS = "../WebCore/include ../JavaScriptCore .. ../WebCore/src/kdelibs/khtml ../WebCore/src/kwq ../WebCore/src/kwq/kparts ../WebCore/include ../WebCore/include/private";
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "-Werror -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I.. -I../WebCore/src/kdelibs/khtml -I../WebCore/src/kwq -I../WebCore/src/kwq/kparts -I../WebCore/include -I../WebCore/include/private -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/ -F/System/Library/Frameworks/Carbon.framework/Frameworks/";
+ OPTIMIZATION_CFLAGS = "-Os";
+ OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/ -F/System/Library/Frameworks/Carbon.framework/Frameworks/";
OTHER_LDFLAGS = "-lwebcore -framework JavaScriptCore -framework WebFoundation -seg1addr 0x4000000";
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
- WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+ WARNING_CFLAGS = "-Werror -Wall -Wcast-align -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wreorder -Wsign-compare";
WRAPPER_EXTENSION = framework;
};
dependencies = (
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 4c6ccd4..2c8b701 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -61,7 +61,7 @@
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
- WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
//FIXME: This is a temporary hack to make sure we don't load non-html content.
//Since the cache returns nil for contentType when the URL is in the cache (2892912),
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 48d33aa..77936cc 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -114,7 +114,6 @@
{
KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
-#define _KWQ_TIMING
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
if (((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles){
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 48d33aa..77936cc 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -114,7 +114,6 @@
{
KHTMLView *widget = ((IFWebViewPrivate *)_viewPrivate)->widget;
-#define _KWQ_TIMING
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
if (((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles){
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 4c6ccd4..2c8b701 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -61,7 +61,7 @@
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
- WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
//FIXME: This is a temporary hack to make sure we don't load non-html content.
//Since the cache returns nil for contentType when the URL is in the cache (2892912),
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 4c6ccd4..2c8b701 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -61,7 +61,7 @@
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
- WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
//FIXME: This is a temporary hack to make sure we don't load non-html content.
//Since the cache returns nil for contentType when the URL is in the cache (2892912),
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list