[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:52:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 569d2791eeadd649918cc4da29973de2fef2092d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 15 03:45:04 2001 +0000
Debugging functions.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index f9b74b9..1bae0a1 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -85,18 +85,14 @@ public:
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
//void _initializeWithData(QFontMetricsPrivate *);
void _initializeWithFont (NSFont *font);
- NSRect _rectOfString(NSString *) const;
#else
- void _initializeWithData(void *);
-// int _rectOfString(void *) const;
+ void _initializeWithFont(void *);
#endif
void _free();
QFontMetricsPrivate *data;
#endif
- void _freeWithData(struct KWQFontMetricsData *);
-
}; // class QFontMetrics =======================================================
#endif
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index da4d60b..a8e22bf 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -24,6 +24,8 @@
*/
#import "KWQView.h"
+#import "kwqdebug.h"
+
#include <khtmlview.h>
#include <qwidget.h>
#include <qpainter.h>
@@ -208,17 +210,18 @@
- (void)mouseUp: (NSEvent *)event
{
- NSLog (@"mouseUp %@", event);
+ KWQDEBUGLEVEL1 (0x100, "mouseUp %s\n", DEBUG_OBJECT(event));
}
- (void)mouseDown: (NSEvent *)event
{
- NSLog (@"mouseDown %@", event);
+ KWQDEBUGLEVEL1 (0x100, "mouseDown %s\n", DEBUG_OBJECT(event));
}
- (void)mouseDragged: (NSEvent *)event
{
- NSLog (@"mouseDragged %@", event);
+ NSPoint p = [event locationInWindow];
+ KWQDEBUG2 ("mouseDragged %f, %f\n", p.x, p.y);
}
diff --git a/WebCore/kwq/kwqdebug.h b/WebCore/kwq/kwqdebug.h
index 301c20b..ce3a00a 100644
--- a/WebCore/kwq/kwqdebug.h
+++ b/WebCore/kwq/kwqdebug.h
@@ -34,32 +34,72 @@
#undef Rect
#undef Boolean
-extern int KWQ_LOG_LEVEL;
-extern int KWQ_LOG_NEVER_IMPLEMENTED;
-extern int KWQ_LOG_PARTIALLY_IMPLEMENTED;
-extern int KWQ_LOG_NOT_YET_IMPLEMENTED;
+#define KWQ_LOG_NEVER_IMPLEMENTED 0x1
+#define KWQ_LOG_PARTIALLY_IMPLEMENTED 0x2
+#define KWQ_LOG_NOT_YET_IMPLEMENTED 0x4
+#define KWQ_LOG_DEBUG 0x8
+#define KWQ_LOG_ERROR 0x10
+
+#define KWQ_LOG_NONE 0
+#define KWQ_LOG_ALL 0xffffffff
+
+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() \
- do { \
- if (KWQ_LOG_LEVEL & KWQ_LOG_NEVER_IMPLEMENTED) { \
- NSLog(@"ERROR %s:%d %s (NOT IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__); \
- } \
- } while (0)
+ KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
#define _logPartiallyImplemented() \
- do { \
- if (KWQ_LOG_LEVEL & KWQ_LOG_PARTIALLY_IMPLEMENTED) { \
- NSLog(@"WARNING %s:%d %s (PARTIALLY IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__); \
- } \
- } while (0)
+ KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
#define _logNotYetImplemented() \
- do { \
- if (KWQ_LOG_LEVEL & KWQ_LOG_NOT_YET_IMPLEMENTED) { \
- NSLog (@"WARNING %s:%d %s (NOT YET IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__); \
- } \
- } while (0)
+ KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
-#endif
-void KWQSetLogLevel(int mask);
+#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 KWQDEBUGLEVEL(level,format) \
+ KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__, format);\
+ 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 DEBUG_OBJECT(object) [[object description] cString]
+
+
+
+#endif KWQDEBUG_H_
+
diff --git a/WebCore/kwq/kwqdebug.mm b/WebCore/kwq/kwqdebug.mm
index 3faa0a9..6c4073a 100644
--- a/WebCore/kwq/kwqdebug.mm
+++ b/WebCore/kwq/kwqdebug.mm
@@ -25,16 +25,65 @@
#include <kwqdebug.h>
-int KWQ_LOG_NONE = 0;
-int KWQ_LOG_ALL = 0x7f;
-
-int KWQ_LOG_NEVER_IMPLEMENTED = 0x1;
-int KWQ_LOG_PARTIALLY_IMPLEMENTED = 0x2;
-int KWQ_LOG_NOT_YET_IMPLEMENTED = 0x4;
-
-int KWQ_LOG_LEVEL = KWQ_LOG_ALL;
+unsigned int KWQ_LOG_LEVEL = KWQ_LOG_ALL;
void KWQSetLogLevel(int mask) {
KWQ_LOG_LEVEL = mask;
-}
\ No newline at end of file
+}
+
+bool checkedDefault = 0;
+
+unsigned int KWQGetLogLevel(){
+ if (!checkedDefault){
+ NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitLogLevel"];
+ if (logLevelString != nil){
+ if (![[NSScanner scannerWithString: logLevelString] scanHexInt: &KWQ_LOG_LEVEL]){
+ NSLog (@"Unable to scan hex value for WebKitLogLevel, default to value of %d", KWQ_LOG_LEVEL);
+ }
+ }
+ checkedDefault = 1;
+ }
+ return KWQ_LOG_LEVEL;
+}
+
+
+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;
+ va_start(args, format);
+ vfprintf(stderr, format, args);
+ va_end(args);
+ }
+}
+
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index f9b74b9..1bae0a1 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -85,18 +85,14 @@ public:
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
//void _initializeWithData(QFontMetricsPrivate *);
void _initializeWithFont (NSFont *font);
- NSRect _rectOfString(NSString *) const;
#else
- void _initializeWithData(void *);
-// int _rectOfString(void *) const;
+ void _initializeWithFont(void *);
#endif
void _free();
QFontMetricsPrivate *data;
#endif
- void _freeWithData(struct KWQFontMetricsData *);
-
}; // class QFontMetrics =======================================================
#endif
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index da4d60b..a8e22bf 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -24,6 +24,8 @@
*/
#import "KWQView.h"
+#import "kwqdebug.h"
+
#include <khtmlview.h>
#include <qwidget.h>
#include <qpainter.h>
@@ -208,17 +210,18 @@
- (void)mouseUp: (NSEvent *)event
{
- NSLog (@"mouseUp %@", event);
+ KWQDEBUGLEVEL1 (0x100, "mouseUp %s\n", DEBUG_OBJECT(event));
}
- (void)mouseDown: (NSEvent *)event
{
- NSLog (@"mouseDown %@", event);
+ KWQDEBUGLEVEL1 (0x100, "mouseDown %s\n", DEBUG_OBJECT(event));
}
- (void)mouseDragged: (NSEvent *)event
{
- NSLog (@"mouseDragged %@", event);
+ NSPoint p = [event locationInWindow];
+ KWQDEBUG2 ("mouseDragged %f, %f\n", p.x, p.y);
}
diff --git a/WebCore/src/kwq/kwqdebug.h b/WebCore/src/kwq/kwqdebug.h
index 301c20b..ce3a00a 100644
--- a/WebCore/src/kwq/kwqdebug.h
+++ b/WebCore/src/kwq/kwqdebug.h
@@ -34,32 +34,72 @@
#undef Rect
#undef Boolean
-extern int KWQ_LOG_LEVEL;
-extern int KWQ_LOG_NEVER_IMPLEMENTED;
-extern int KWQ_LOG_PARTIALLY_IMPLEMENTED;
-extern int KWQ_LOG_NOT_YET_IMPLEMENTED;
+#define KWQ_LOG_NEVER_IMPLEMENTED 0x1
+#define KWQ_LOG_PARTIALLY_IMPLEMENTED 0x2
+#define KWQ_LOG_NOT_YET_IMPLEMENTED 0x4
+#define KWQ_LOG_DEBUG 0x8
+#define KWQ_LOG_ERROR 0x10
+
+#define KWQ_LOG_NONE 0
+#define KWQ_LOG_ALL 0xffffffff
+
+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() \
- do { \
- if (KWQ_LOG_LEVEL & KWQ_LOG_NEVER_IMPLEMENTED) { \
- NSLog(@"ERROR %s:%d %s (NOT IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__); \
- } \
- } while (0)
+ KWQDEBUGLEVEL(KWQ_LOG_NEVER_IMPLEMENTED, "ERROR (NOT IMPLEMENTED)\n")
#define _logPartiallyImplemented() \
- do { \
- if (KWQ_LOG_LEVEL & KWQ_LOG_PARTIALLY_IMPLEMENTED) { \
- NSLog(@"WARNING %s:%d %s (PARTIALLY IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__); \
- } \
- } while (0)
+ KWQDEBUGLEVEL(KWQ_LOG_PARTIALLY_IMPLEMENTED, "WARNING (PARTIALLY IMPLEMENTED)\n")
#define _logNotYetImplemented() \
- do { \
- if (KWQ_LOG_LEVEL & KWQ_LOG_NOT_YET_IMPLEMENTED) { \
- NSLog (@"WARNING %s:%d %s (NOT YET IMPLEMENTED)\n", __FILE__, __LINE__, __FUNCTION__); \
- } \
- } while (0)
+ KWQDEBUGLEVEL (KWQ_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
-#endif
-void KWQSetLogLevel(int mask);
+#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 KWQDEBUGLEVEL(level,format) \
+ KWQDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__, format);\
+ 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 DEBUG_OBJECT(object) [[object description] cString]
+
+
+
+#endif KWQDEBUG_H_
+
diff --git a/WebCore/src/kwq/kwqdebug.mm b/WebCore/src/kwq/kwqdebug.mm
index 3faa0a9..6c4073a 100644
--- a/WebCore/src/kwq/kwqdebug.mm
+++ b/WebCore/src/kwq/kwqdebug.mm
@@ -25,16 +25,65 @@
#include <kwqdebug.h>
-int KWQ_LOG_NONE = 0;
-int KWQ_LOG_ALL = 0x7f;
-
-int KWQ_LOG_NEVER_IMPLEMENTED = 0x1;
-int KWQ_LOG_PARTIALLY_IMPLEMENTED = 0x2;
-int KWQ_LOG_NOT_YET_IMPLEMENTED = 0x4;
-
-int KWQ_LOG_LEVEL = KWQ_LOG_ALL;
+unsigned int KWQ_LOG_LEVEL = KWQ_LOG_ALL;
void KWQSetLogLevel(int mask) {
KWQ_LOG_LEVEL = mask;
-}
\ No newline at end of file
+}
+
+bool checkedDefault = 0;
+
+unsigned int KWQGetLogLevel(){
+ if (!checkedDefault){
+ NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitLogLevel"];
+ if (logLevelString != nil){
+ if (![[NSScanner scannerWithString: logLevelString] scanHexInt: &KWQ_LOG_LEVEL]){
+ NSLog (@"Unable to scan hex value for WebKitLogLevel, default to value of %d", KWQ_LOG_LEVEL);
+ }
+ }
+ checkedDefault = 1;
+ }
+ return KWQ_LOG_LEVEL;
+}
+
+
+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;
+ va_start(args, format);
+ vfprintf(stderr, format, args);
+ va_end(args);
+ }
+}
+
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index f9b74b9..1bae0a1 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -85,18 +85,14 @@ public:
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
//void _initializeWithData(QFontMetricsPrivate *);
void _initializeWithFont (NSFont *font);
- NSRect _rectOfString(NSString *) const;
#else
- void _initializeWithData(void *);
-// int _rectOfString(void *) const;
+ void _initializeWithFont(void *);
#endif
void _free();
QFontMetricsPrivate *data;
#endif
- void _freeWithData(struct KWQFontMetricsData *);
-
}; // class QFontMetrics =======================================================
#endif
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/NSWebPageDataSource.mm
index ee5528a..c616451 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/NSWebPageDataSource.mm
@@ -12,6 +12,7 @@
NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"10", @"12", @"14", @"16", @"18", @"20", nil];
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
+ @"0x8", @"WebKitLogLevel",
@"Arial", @"WebKitStandardFont",
@"Courier", @"WebKitFixedFont",
@"Times-Roman", @"WebKitSerifFont",
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list