[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:57:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f6057ae9c72e3f247ea2e2576559221836f7911c
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 7 19:36:38 2002 +0000
* src/kwq/kwqdebug.h: New debug level constants, kept in
synch with WebKitDebug.h
* src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
IFURLHandle:resourceDidFailLoadingWithResult:]):
* src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
(-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
IFURLHandle:resourceDidFailLoadingWithResult:]), (Loader::load),
(Loader::servePendingRequests):
* src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
Changed numeric debug levels to symbolic ones.
Defined more symbolic debug-level constants; specified ranges for use by
different software levels (core/kit/client==browser) to enable easier
isolation of debug messages.
* Misc.subproj/WebKitDebug.h: #defined new debug levels for existing uses;
renamed a couple.
* Misc.subproj/WebKitDebug.m: (WebKitLog), (WebKitDebug): Updated for
renamed debug levels.
* WebView.subproj/IFBaseWebController.mm:
(-[IFBaseWebController receivedProgress:forResource:fromDataSource:]):
* WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _stopLoading]):
* WebView.subproj/IFWebView.mm: (-[IFWebView layout]),
(-[IFWebView setNeedsDisplay:]), (-[IFWebView setNeedsLayout:]), (-[IFWebView drawRect:]),
(-[IFWebView mouseDragged:]):
* WebView.subproj/IFWebViewPrivate.mm: (-[IFWebView _resetView]):
Changed numeric debug levels to symbolic ones.
* WebKit.pbproj/project.pbxproj: Jaguar/Puma version war.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fd60c55..25bdd29 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-03-07 John Sullivan <sullivan at apple.com>
+
+ * src/kwq/kwqdebug.h: New debug level constants, kept in
+ synch with WebKitDebug.h
+
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
+ (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (Loader::load),
+ (Loader::servePendingRequests):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Changed numeric debug levels to symbolic ones.
+
2002-03-07 Don Melton <gramps at apple.com>
Removed unused file in kdelibs that I missed in previous commit.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fd60c55..25bdd29 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,23 @@
+2002-03-07 John Sullivan <sullivan at apple.com>
+
+ * src/kwq/kwqdebug.h: New debug level constants, kept in
+ synch with WebKitDebug.h
+
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
+ (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (Loader::load),
+ (Loader::servePendingRequests):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Changed numeric debug levels to symbolic ones.
+
2002-03-07 Don Melton <gramps at apple.com>
Removed unused file in kdelibs that I missed in previous commit.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fd60c55..25bdd29 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2002-03-07 John Sullivan <sullivan at apple.com>
+
+ * src/kwq/kwqdebug.h: New debug level constants, kept in
+ synch with WebKitDebug.h
+
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidBeginLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidCancelLoading:]), (-[KHTMLPartLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[KHTMLPartLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]),
+ (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]), (-[URLLoadClient
+ IFURLHandleResourceDidFinishLoading:data:]), (-[URLLoadClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]), (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]), (Loader::load),
+ (Loader::servePendingRequests):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Changed numeric debug levels to symbolic ones.
+
2002-03-07 Don Melton <gramps at apple.com>
Removed unused file in kdelibs that I missed in previous commit.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 496c622..738507d 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -123,18 +123,18 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
[sender autorelease];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
m_part->closeURL();
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -147,7 +147,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
- KWQDEBUGLEVEL3 (0x2000, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
if (!m_data) {
m_data = [data retain];
}
@@ -161,7 +161,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
- KWQDEBUGLEVEL2 (0x2000, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 496c622..738507d 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -123,18 +123,18 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
[sender autorelease];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
m_part->closeURL();
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -147,7 +147,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
- KWQDEBUGLEVEL3 (0x2000, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
if (!m_data) {
m_data = [data retain];
}
@@ -161,7 +161,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
- KWQDEBUGLEVEL2 (0x2000, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 2d2d7a6..0b573da 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -935,7 +935,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -945,7 +945,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
[sender autorelease];
@@ -963,7 +963,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -986,7 +986,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1008,7 +1008,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
@@ -1081,7 +1081,7 @@ void Loader::load(CachedObject *object, const DOMString &baseURL, bool increment
NSNumber *key = [NSNumber numberWithUnsignedInt: (unsigned int)dataSource];
client = [clientForDocument objectForKey: key];
if (client == nil){
- KWQDEBUGLEVEL2 (0x2000, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
client = [[[URLLoadClient alloc] initWithLoader:this dataSource: dataSource] autorelease];
[clientForDocument setObject: client forKey: key];
}
@@ -1106,7 +1106,7 @@ void Loader::servePendingRequests()
#endif
#ifdef _KWQ_
- KWQDEBUGLEVEL2 (0x2000, "Serving request for base %s, url %s\n",
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n",
req->m_baseURL.string().latin1(), req->object->url().string().latin1());
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 2d2d7a6..0b573da 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -935,7 +935,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -945,7 +945,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
[sender autorelease];
@@ -963,7 +963,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -986,7 +986,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1008,7 +1008,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
@@ -1081,7 +1081,7 @@ void Loader::load(CachedObject *object, const DOMString &baseURL, bool increment
NSNumber *key = [NSNumber numberWithUnsignedInt: (unsigned int)dataSource];
client = [clientForDocument objectForKey: key];
if (client == nil){
- KWQDEBUGLEVEL2 (0x2000, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
client = [[[URLLoadClient alloc] initWithLoader:this dataSource: dataSource] autorelease];
[clientForDocument setObject: client forKey: key];
}
@@ -1106,7 +1106,7 @@ void Loader::servePendingRequests()
#endif
#ifdef _KWQ_
- KWQDEBUGLEVEL2 (0x2000, "Serving request for base %s, url %s\n",
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n",
req->m_baseURL.string().latin1(), req->object->url().string().latin1());
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 2d2d7a6..0b573da 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -935,7 +935,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -945,7 +945,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
[sender autorelease];
@@ -963,7 +963,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -986,7 +986,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1008,7 +1008,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
@@ -1081,7 +1081,7 @@ void Loader::load(CachedObject *object, const DOMString &baseURL, bool increment
NSNumber *key = [NSNumber numberWithUnsignedInt: (unsigned int)dataSource];
client = [clientForDocument objectForKey: key];
if (client == nil){
- KWQDEBUGLEVEL2 (0x2000, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
client = [[[URLLoadClient alloc] initWithLoader:this dataSource: dataSource] autorelease];
[clientForDocument setObject: client forKey: key];
}
@@ -1106,7 +1106,7 @@ void Loader::servePendingRequests()
#endif
#ifdef _KWQ_
- KWQDEBUGLEVEL2 (0x2000, "Serving request for base %s, url %s\n",
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n",
req->m_baseURL.string().latin1(), req->object->url().string().latin1());
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index e6759f5..02afcc0 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -175,7 +175,7 @@
if (needsLayout){
double start = CFAbsoluteTimeGetCurrent();
((KHTMLView *)widget)->layout(TRUE);
- KWQDEBUGLEVEL1 (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ KWQDEBUGLEVEL1 (KWQ_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
needsLayout = NO;
}
}
@@ -203,7 +203,7 @@
(int)rect.origin.y,
(int)rect.size.width,
(int)rect.size.height );
- KWQDEBUGLEVEL1 (0x200, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ KWQDEBUGLEVEL1 (KWQ_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
[self unlockFocus];
}
}
diff --git a/WebCore/kwq/kwqdebug.h b/WebCore/kwq/kwqdebug.h
index 21b3f38..39b6b73 100644
--- a/WebCore/kwq/kwqdebug.h
+++ b/WebCore/kwq/kwqdebug.h
@@ -43,14 +43,19 @@ long _GetMillisecondsSinceEpoch();
* Logging macros
*/
-#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_NEVER_IMPLEMENTED 0x00000001
+#define KWQ_LOG_PARTIALLY_IMPLEMENTED 0x00000002
+#define KWQ_LOG_NOT_YET_IMPLEMENTED 0x00000004
+#define KWQ_LOG_DEBUG 0x00000008
+#define KWQ_LOG_ERROR 0x00000010
+#define KWQ_LOG_TIMING 0x00000020
+#define KWQ_LOG_LOADING 0x00000040
#define KWQ_LOG_NONE 0
-#define KWQ_LOG_ALL 0xffffffff
+
+// bits in high byte are reserved for clients
+#define KWQ_LOG_ALL_EXCEPT_CLIENTS 0x0000FFFF
+#define KWQ_LOG_ALL 0xFFFFFFFF
void KWQSetLogLevel(int mask);
unsigned int KWQGetLogLevel();
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 496c622..738507d 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -123,18 +123,18 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
[sender autorelease];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
- KWQDEBUGLEVEL1 (0x2000, "url = %s\n", [[[sender url] absoluteString] cString]);
+ KWQDEBUGLEVEL1 (KWQ_LOG_LOADING, "url = %s\n", [[[sender url] absoluteString] cString]);
m_part->closeURL();
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -147,7 +147,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
- KWQDEBUGLEVEL3 (0x2000, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ KWQDEBUGLEVEL3 (KWQ_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
if (!m_data) {
m_data = [data retain];
}
@@ -161,7 +161,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
{
- KWQDEBUGLEVEL2 (0x2000, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [sender contentLength];
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 2d2d7a6..0b573da 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -935,7 +935,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
@@ -945,7 +945,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
[sender autorelease];
@@ -963,7 +963,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[m_dataSource _removeURLHandle: job->handle()];
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotFinished(job);
@@ -986,7 +986,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
- KWQDEBUGLEVEL4 (0x2000, "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 = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
m_loader->slotData(job, (const char *)[data bytes], [data length]);
@@ -1008,7 +1008,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[[sender attributes] objectForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
@@ -1081,7 +1081,7 @@ void Loader::load(CachedObject *object, const DOMString &baseURL, bool increment
NSNumber *key = [NSNumber numberWithUnsignedInt: (unsigned int)dataSource];
client = [clientForDocument objectForKey: key];
if (client == nil){
- KWQDEBUGLEVEL2 (0x2000, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Creating client for dataSource 0x%08x, url %s\n", dataSource, baseURL.string().latin1());
client = [[[URLLoadClient alloc] initWithLoader:this dataSource: dataSource] autorelease];
[clientForDocument setObject: client forKey: key];
}
@@ -1106,7 +1106,7 @@ void Loader::servePendingRequests()
#endif
#ifdef _KWQ_
- KWQDEBUGLEVEL2 (0x2000, "Serving request for base %s, url %s\n",
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n",
req->m_baseURL.string().latin1(), req->object->url().string().latin1());
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index e6759f5..02afcc0 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -175,7 +175,7 @@
if (needsLayout){
double start = CFAbsoluteTimeGetCurrent();
((KHTMLView *)widget)->layout(TRUE);
- KWQDEBUGLEVEL1 (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ KWQDEBUGLEVEL1 (KWQ_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
needsLayout = NO;
}
}
@@ -203,7 +203,7 @@
(int)rect.origin.y,
(int)rect.size.width,
(int)rect.size.height );
- KWQDEBUGLEVEL1 (0x200, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ KWQDEBUGLEVEL1 (KWQ_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
[self unlockFocus];
}
}
diff --git a/WebCore/src/kwq/kwqdebug.h b/WebCore/src/kwq/kwqdebug.h
index 21b3f38..39b6b73 100644
--- a/WebCore/src/kwq/kwqdebug.h
+++ b/WebCore/src/kwq/kwqdebug.h
@@ -43,14 +43,19 @@ long _GetMillisecondsSinceEpoch();
* Logging macros
*/
-#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_NEVER_IMPLEMENTED 0x00000001
+#define KWQ_LOG_PARTIALLY_IMPLEMENTED 0x00000002
+#define KWQ_LOG_NOT_YET_IMPLEMENTED 0x00000004
+#define KWQ_LOG_DEBUG 0x00000008
+#define KWQ_LOG_ERROR 0x00000010
+#define KWQ_LOG_TIMING 0x00000020
+#define KWQ_LOG_LOADING 0x00000040
#define KWQ_LOG_NONE 0
-#define KWQ_LOG_ALL 0xffffffff
+
+// bits in high byte are reserved for clients
+#define KWQ_LOG_ALL_EXCEPT_CLIENTS 0x0000FFFF
+#define KWQ_LOG_ALL 0xFFFFFFFF
void KWQSetLogLevel(int mask);
unsigned int KWQGetLogLevel();
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 11b04bf..a044b2b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2002-03-07 John Sullivan <sullivan at apple.com>
+
+ Defined more symbolic debug-level constants; specified ranges for use by
+ different software levels (core/kit/client==browser) to enable easier
+ isolation of debug messages.
+
+ * Misc.subproj/WebKitDebug.h: #defined new debug levels for existing uses;
+ renamed a couple.
+
+ * Misc.subproj/WebKitDebug.m: (WebKitLog), (WebKitDebug): Updated for
+ renamed debug levels.
+
+ * WebView.subproj/IFBaseWebController.mm:
+ (-[IFBaseWebController receivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _stopLoading]):
+ * WebView.subproj/IFWebView.mm: (-[IFWebView layout]),
+ (-[IFWebView setNeedsDisplay:]), (-[IFWebView setNeedsLayout:]), (-[IFWebView drawRect:]),
+ (-[IFWebView mouseDragged:]):
+ * WebView.subproj/IFWebViewPrivate.mm: (-[IFWebView _resetView]):
+ Changed numeric debug levels to symbolic ones.
+
+ * WebKit.pbproj/project.pbxproj: Jaguar/Puma version war.
+
2002-03-06 Richard Williamson <rjw at apple.com>
Lots of little changes to improve drawing, and dynamic scroll bar
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 11b04bf..a044b2b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,26 @@
+2002-03-07 John Sullivan <sullivan at apple.com>
+
+ Defined more symbolic debug-level constants; specified ranges for use by
+ different software levels (core/kit/client==browser) to enable easier
+ isolation of debug messages.
+
+ * Misc.subproj/WebKitDebug.h: #defined new debug levels for existing uses;
+ renamed a couple.
+
+ * Misc.subproj/WebKitDebug.m: (WebKitLog), (WebKitDebug): Updated for
+ renamed debug levels.
+
+ * WebView.subproj/IFBaseWebController.mm:
+ (-[IFBaseWebController receivedProgress:forResource:fromDataSource:]):
+ * WebView.subproj/IFWebDataSourcePrivate.mm: (-[IFWebDataSource _stopLoading]):
+ * WebView.subproj/IFWebView.mm: (-[IFWebView layout]),
+ (-[IFWebView setNeedsDisplay:]), (-[IFWebView setNeedsLayout:]), (-[IFWebView drawRect:]),
+ (-[IFWebView mouseDragged:]):
+ * WebView.subproj/IFWebViewPrivate.mm: (-[IFWebView _resetView]):
+ Changed numeric debug levels to symbolic ones.
+
+ * WebKit.pbproj/project.pbxproj: Jaguar/Puma version war.
+
2002-03-06 Richard Williamson <rjw at apple.com>
Lots of little changes to improve drawing, and dynamic scroll bar
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 35bad64..6a784df 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -5,17 +5,31 @@
#import <Foundation/Foundation.h>
/*-----------------------------------------------------------------------------
- * Logging macros
- */
+* Logging macros
+*
+* Keep changes in this file synched with kwqdebug.h in WebCore. (Except kwqdebug.h
+* shouldn't mention non-core components.)
+*/
+
+#define WEBKIT_LOG_NEVER_IMPLEMENTED 0x00000001
+#define WEBKIT_LOG_PARTIALLY_IMPLEMENTED 0x00000002
+#define WEBKIT_LOG_NOT_YET_IMPLEMENTED 0x00000004
+#define WEBKIT_LOG_GENERIC_DEBUG 0x00000008
+#define WEBKIT_LOG_GENERIC_ERROR 0x00000010
+#define WEBKIT_LOG_TIMING 0x00000020
+#define WEBKIT_LOG_LOADING 0x00000040
+
+#define WEBKIT_LOG_EVENTS 0x00010000
+#define WEBKIT_LOG_VIEW 0x00020000
-#define WEBKIT_LOG_NEVER_IMPLEMENTED 0x1
-#define WEBKIT_LOG_PARTIALLY_IMPLEMENTED 0x2
-#define WEBKIT_LOG_NOT_YET_IMPLEMENTED 0x4
-#define WEBKIT_LOG_DEBUG 0x8
-#define WEBKIT_LOG_ERROR 0x10
+// ranges reserved for different uses to enable easy isolation of certain log messages
+#define WEBKIT_LOG_GENERIC_RANGE 0x000000FF
+#define WEBKIT_LOG_CORE_RANGE 0x0000FF00
+#define WEBKIT_LOG_KIT_RANGE 0x00FF0000
+#define WEBKIT_LOG_CLIENT_RANGE 0xFF000000
-#define WEBKIT_LOG_NONE 0
-#define WEBKIT_LOG_ALL 0xffffffff
+#define WEBKIT_LOG_NONE 0
+#define WEBKIT_LOG_ALL 0xFFFFFFFF
#ifdef __cplusplus
extern "C" {
@@ -39,13 +53,13 @@ void WebKitLogAtLevel(unsigned int level, NSString *format, ...);
WEBKITDEBUGLEVEL (WEBKIT_LOG_NOT_YET_IMPLEMENTED, "WARNING (NOT YET IMPLEMENTED)\n")
-#define WEBKITDEBUG(format) WEBKITDEBUGLEVEL(WEBKIT_LOG_DEBUG,format)
-#define WEBKITDEBUG1(format,arg1) WEBKITDEBUGLEVEL1(WEBKIT_LOG_DEBUG,format,arg1)
-#define WEBKITDEBUG2(format,arg1,arg2) WEBKITDEBUGLEVEL2(WEBKIT_LOG_DEBUG,format,arg1,arg2)
-#define WEBKITDEBUG3(format,arg1,arg2,arg3) WEBKITDEBUGLEVEL3(WEBKIT_LOG_DEBUG,format,arg1,arg2,arg3)
-#define WEBKITDEBUG4(format,arg1,arg2,arg3,arg4) WEBKITDEBUGLEVEL4(WEBKIT_LOG_DEBUG,format,arg1,arg2,arg3,arg4)
-#define WEBKITDEBUG5(format,arg1,arg2,arg3,arg4,arg5) WEBKITDEBUGLEVEL5(WEBKIT_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5)
-#define WEBKITDEBUG6(format,arg1,arg2,arg3,arg4,arg5,arg6) WEBKITDEBUGLEVEL6(WEBKIT_LOG_DEBUG,format,arg1,arg2,arg3,arg4,arg5,arg6)
+#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)
#define WEBKITDEBUGLEVEL(level,format) \
WebKitDebugAtLevel (level,"[%s:%d %s] ", __FILE__, __LINE__, __FUNCTION__, format);\
diff --git a/WebKit/Misc.subproj/WebKitDebug.m b/WebKit/Misc.subproj/WebKitDebug.m
index 7fb8d3a..8697238 100644
--- a/WebKit/Misc.subproj/WebKitDebug.m
+++ b/WebKit/Misc.subproj/WebKitDebug.m
@@ -28,7 +28,7 @@ unsigned int WebKitGetLogLevel(){
void WebKitLog(NSString *format, ...) {
- if (WebKitGetLogLevel() & WEBKIT_LOG_ERROR){
+ if (WebKitGetLogLevel() & WEBKIT_LOG_GENERIC_ERROR){
va_list args;
va_start(args, format);
NSLogv(format, args);
@@ -48,7 +48,7 @@ void WebKitLogAtLevel(unsigned int level, NSString *format, ...) {
void WebKitDebug(const char *format, ...) {
- if (WebKitGetLogLevel() & WEBKIT_LOG_DEBUG){
+ if (WebKitGetLogLevel() & WEBKIT_LOG_GENERIC_DEBUG){
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 0388a95..8044dac 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 34;
+ objectVersion = 36;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index 4711034..9fae7a7 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -184,7 +184,7 @@ static id IFLoadProgressMake()
// Check to see if this is the first load for a data source, if so
// we need to transition the data source from provisional to committed.
if (progress->bytesSoFar == progress->totalToLoad && [frame provisionalDataSource] == dataSource){
- WEBKITDEBUGLEVEL1 (0x2000, "resource = %s\n", [resourceDescription cString]);
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "resource = %s\n", [resourceDescription cString]);
[frame _transitionProvisionalToCommitted];
}
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
index 596c97c..730cf27 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -23,12 +23,12 @@
{
id cview = [self documentView];
- WEBKITDEBUGLEVEL (0x100, "\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "\n");
// Do nothing if the web view is in the provisional state.
if ([cview isKindOfClass: NSClassFromString (@"IFWebView")]){
if ([cview _provisionalWidget] != 0){
- WEBKITDEBUGLEVEL (0x100, "not changing scrollview, content in provisional state.\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not changing scrollview, content in provisional state.\n");
return;
}
}
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 285572f..eae3a63 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -102,7 +102,7 @@
count = [data->urlHandles count];
for (i = 0; i < count; i++) {
handle = [data->urlHandles objectAtIndex: i];
- WEBKITDEBUGLEVEL1 (0x2000, "canceling %s\n", [[[handle url] absoluteString] cString] );
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "canceling %s\n", [[[handle url] absoluteString] cString] );
[[data->urlHandles objectAtIndex: i] cancelLoadInBackground];
}
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index d4bb666..249b4b4 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -113,17 +113,17 @@
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
- WEBKITDEBUGLEVEL (0x100, "doing layout\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
//double start = CFAbsoluteTimeGetCurrent();
widget->layout(TRUE);
- //WebKitDebugAtLevel (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
}
}
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL2 (0x200, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
}
@@ -284,14 +284,14 @@
- (void)setNeedsDisplay:(BOOL)flag
{
- WEBKITDEBUGLEVEL1 (0x100, "flag = %d\n", (int)flag);
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
[super setNeedsDisplay: flag];
}
- (void)setNeedsLayout: (bool)flag
{
- WEBKITDEBUGLEVEL1 (0x100, "flag = %d\n", (int)flag);
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
((IFWebViewPrivate *)_viewPrivate)->needsLayout = flag;
}
@@ -302,12 +302,12 @@
IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
if (data->provisionalWidget != 0){
- WEBKITDEBUGLEVEL (0x100, "not drawing, frame in provisional state.\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
return;
}
if (widget != 0l){
- WEBKITDEBUGLEVEL (0x100, "drawing\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
[self layout];
#ifdef _KWQ_TIMING
@@ -322,7 +322,7 @@
(int)rect.origin.y,
(int)rect.size.width,
(int)rect.size.height );
- //WebKitDebugAtLevel (0x200, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
#ifdef DEBUG_LAYOUT
NSRect vframe = [self frame];
@@ -346,7 +346,7 @@
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL2 (0x200, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
}
}
@@ -367,7 +367,7 @@
// Override superclass implementation. We want to relayout when the frame size is changed.
- (void)setFrame:(NSRect)rect
{
- WEBKITDEBUGLEVEL4 (0x100, "(%f,%f) width = %f, height = %f\n", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+ WEBKITDEBUGLEVEL4 (WEBKIT_LOG_VIEW, "(%f,%f) width = %f, height = %f\n", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
[super setFrame:rect];
}
@@ -439,7 +439,7 @@
- (void)mouseDragged: (NSEvent *)event
{
NSPoint p = [event locationInWindow];
- //WebKitDebugAtLevel (0x200, "mouseDragged %f, %f\n", p.x, p.y);
+ //WebKitDebugAtLevel (WEBKIT_LOG_EVENTS, "mouseDragged %f, %f\n", p.x, p.y);
}
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 285572f..eae3a63 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -102,7 +102,7 @@
count = [data->urlHandles count];
for (i = 0; i < count; i++) {
handle = [data->urlHandles objectAtIndex: i];
- WEBKITDEBUGLEVEL1 (0x2000, "canceling %s\n", [[[handle url] absoluteString] cString] );
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_LOADING, "canceling %s\n", [[[handle url] absoluteString] cString] );
[[data->urlHandles objectAtIndex: i] cancelLoadInBackground];
}
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 596c97c..730cf27 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -23,12 +23,12 @@
{
id cview = [self documentView];
- WEBKITDEBUGLEVEL (0x100, "\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "\n");
// Do nothing if the web view is in the provisional state.
if ([cview isKindOfClass: NSClassFromString (@"IFWebView")]){
if ([cview _provisionalWidget] != 0){
- WEBKITDEBUGLEVEL (0x100, "not changing scrollview, content in provisional state.\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not changing scrollview, content in provisional state.\n");
return;
}
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index d4bb666..249b4b4 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -113,17 +113,17 @@
if (widget->part()->xmlDocImpl() &&
widget->part()->xmlDocImpl()->renderer()){
if (((IFWebViewPrivate *)_viewPrivate)->needsLayout){
- WEBKITDEBUGLEVEL (0x100, "doing layout\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
//double start = CFAbsoluteTimeGetCurrent();
widget->layout(TRUE);
- //WebKitDebugAtLevel (0x200, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
((IFWebViewPrivate *)_viewPrivate)->needsLayout = NO;
}
}
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL2 (0x200, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
}
@@ -284,14 +284,14 @@
- (void)setNeedsDisplay:(BOOL)flag
{
- WEBKITDEBUGLEVEL1 (0x100, "flag = %d\n", (int)flag);
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
[super setNeedsDisplay: flag];
}
- (void)setNeedsLayout: (bool)flag
{
- WEBKITDEBUGLEVEL1 (0x100, "flag = %d\n", (int)flag);
+ WEBKITDEBUGLEVEL1 (WEBKIT_LOG_VIEW, "flag = %d\n", (int)flag);
((IFWebViewPrivate *)_viewPrivate)->needsLayout = flag;
}
@@ -302,12 +302,12 @@
IFWebViewPrivate *data = ((IFWebViewPrivate *)_viewPrivate);
if (data->provisionalWidget != 0){
- WEBKITDEBUGLEVEL (0x100, "not drawing, frame in provisional state.\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "not drawing, frame in provisional state.\n");
return;
}
if (widget != 0l){
- WEBKITDEBUGLEVEL (0x100, "drawing\n");
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "drawing\n");
[self layout];
#ifdef _KWQ_TIMING
@@ -322,7 +322,7 @@
(int)rect.origin.y,
(int)rect.size.width,
(int)rect.size.height );
- //WebKitDebugAtLevel (0x200, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
+ //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
#ifdef DEBUG_LAYOUT
NSRect vframe = [self frame];
@@ -346,7 +346,7 @@
#ifdef _KWQ_TIMING
double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL2 (0x200, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
+ WEBKITDEBUGLEVEL2 (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
#endif
}
}
@@ -367,7 +367,7 @@
// Override superclass implementation. We want to relayout when the frame size is changed.
- (void)setFrame:(NSRect)rect
{
- WEBKITDEBUGLEVEL4 (0x100, "(%f,%f) width = %f, height = %f\n", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+ WEBKITDEBUGLEVEL4 (WEBKIT_LOG_VIEW, "(%f,%f) width = %f, height = %f\n", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
[super setFrame:rect];
}
@@ -439,7 +439,7 @@
- (void)mouseDragged: (NSEvent *)event
{
NSPoint p = [event locationInWindow];
- //WebKitDebugAtLevel (0x200, "mouseDragged %f, %f\n", p.x, p.y);
+ //WebKitDebugAtLevel (WEBKIT_LOG_EVENTS, "mouseDragged %f, %f\n", p.x, p.y);
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list