[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:06:40 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c54e6a722188dc10b380c6b2e281f860c36e5270
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 17 19:53:57 2002 +0000
Added a debug bit mask for plugins and downloads.
* MIME.subproj/IFDownloadHandlerPrivate.m: (-[IFDownloadHandlerPrivate
_openFile]), (-[IFDownloadHandlerPrivate _saveFile]), (-[IFDownloadHandler
_initWithURLHandle:mimeHandler:]):
* Misc.subproj/WebKitDebug.h:
* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
initWithFrame:plugin:url:mime:arguments:mode:]), (-[IFPluginView setWindow]),
(-[IFPluginView newStream:mimeType:notifyData:]), (-[IFPluginView stop]),
(-[IFPluginView sendUpdateEvent]), (-[IFPluginView becomeFirstResponder]),
(-[IFPluginView resignFirstResponder]), (-[IFPluginView mouseDown:]),
(-[IFPluginView mouseUp:]), (-[IFPluginView mouseEntered:]), (-[IFPluginView
mouseExited:]), (-[IFPluginView keyUp:]), (-[IFPluginView keyDown:]),
(-[IFPluginView IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFPluginView
IFURLHandleResourceDidFinishLoading:data:]), (-[IFPluginView
getURLNotify:target:notifyData:]), (-[IFPluginView getURL:target:]),
(-[IFPluginView postURLNotify:target:len:buf:file:notifyData:]), (-[IFPluginView
postURL:target:len:buf:file:]), (-[IFPluginView newStream:target:stream:]),
(-[IFPluginView write:len:buffer:]), (-[IFPluginView destroyStream:reason:]),
(-[IFPluginView status:]), (-[IFPluginView getValue:value:]), (-[IFPluginView
setValue:value:]), (-[IFPluginView invalidateRect:]), (-[IFPluginView
invalidateRegion:]), (-[IFPluginView forceRedraw]):
* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
IFURLHandle:resourceDataDidBecomeAvailable:]):
* src/kwq/kwqdebug.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1038 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8aa7aa5..99f9c52 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-04-17 Chris Blumenberg <cblu at apple.com>
+
+ Added a debug bit mask for plugins and downloads.
+
+ * src/kwq/kwqdebug.h:
+
2002-04-16 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/khtml_part.cpp: Added. Not used yet, but maybe we'll use
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8aa7aa5..99f9c52 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-04-17 Chris Blumenberg <cblu at apple.com>
+
+ Added a debug bit mask for plugins and downloads.
+
+ * src/kwq/kwqdebug.h:
+
2002-04-16 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/khtml_part.cpp: Added. Not used yet, but maybe we'll use
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8aa7aa5..99f9c52 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-04-17 Chris Blumenberg <cblu at apple.com>
+
+ Added a debug bit mask for plugins and downloads.
+
+ * src/kwq/kwqdebug.h:
+
2002-04-16 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/khtml_part.cpp: Added. Not used yet, but maybe we'll use
diff --git a/WebCore/src/kwq/kwqdebug.h b/WebCore/src/kwq/kwqdebug.h
index cbb8081..02d7a5e 100644
--- a/WebCore/src/kwq/kwqdebug.h
+++ b/WebCore/src/kwq/kwqdebug.h
@@ -64,6 +64,8 @@ long _GetMillisecondsSinceEpoch();
#define KWQ_LOG_FONTCACHE 0x00000100
#define KWQ_LOG_FONTCACHECHARMISS 0x00000200
#define KWQ_LOG_FRAMES 0x00000400
+#define KWQ_LOG_DOWNLOAD 0x00000800
+#define KWQ_LOG_PLUGINS 0x00002000
#define KWQ_LOG_NONE 0
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0f86b1a..bd267db 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,30 @@
+2002-04-17 Chris Blumenberg <cblu at apple.com>
+
+ Added a debug bit mask for plugins and downloads.
+
+ * MIME.subproj/IFDownloadHandlerPrivate.m: (-[IFDownloadHandlerPrivate
+ _openFile]), (-[IFDownloadHandlerPrivate _saveFile]), (-[IFDownloadHandler
+ _initWithURLHandle:mimeHandler:]):
+ * Misc.subproj/WebKitDebug.h:
+ * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+ initWithFrame:plugin:url:mime:arguments:mode:]), (-[IFPluginView setWindow]),
+ (-[IFPluginView newStream:mimeType:notifyData:]), (-[IFPluginView stop]),
+ (-[IFPluginView sendUpdateEvent]), (-[IFPluginView becomeFirstResponder]),
+ (-[IFPluginView resignFirstResponder]), (-[IFPluginView mouseDown:]),
+ (-[IFPluginView mouseUp:]), (-[IFPluginView mouseEntered:]), (-[IFPluginView
+ mouseExited:]), (-[IFPluginView keyUp:]), (-[IFPluginView keyDown:]),
+ (-[IFPluginView IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFPluginView
+ IFURLHandleResourceDidFinishLoading:data:]), (-[IFPluginView
+ getURLNotify:target:notifyData:]), (-[IFPluginView getURL:target:]),
+ (-[IFPluginView postURLNotify:target:len:buf:file:notifyData:]), (-[IFPluginView
+ postURL:target:len:buf:file:]), (-[IFPluginView newStream:target:stream:]),
+ (-[IFPluginView write:len:buffer:]), (-[IFPluginView destroyStream:reason:]),
+ (-[IFPluginView status:]), (-[IFPluginView getValue:value:]), (-[IFPluginView
+ setValue:value:]), (-[IFPluginView invalidateRect:]), (-[IFPluginView
+ invalidateRegion:]), (-[IFPluginView forceRedraw]):
+ * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]):
+
2002-04-17 Darin Adler <darin at apple.com>
* WebView.subproj/IFPreferences.mm: (+[IFPreferences load]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0f86b1a..bd267db 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,30 @@
+2002-04-17 Chris Blumenberg <cblu at apple.com>
+
+ Added a debug bit mask for plugins and downloads.
+
+ * MIME.subproj/IFDownloadHandlerPrivate.m: (-[IFDownloadHandlerPrivate
+ _openFile]), (-[IFDownloadHandlerPrivate _saveFile]), (-[IFDownloadHandler
+ _initWithURLHandle:mimeHandler:]):
+ * Misc.subproj/WebKitDebug.h:
+ * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+ initWithFrame:plugin:url:mime:arguments:mode:]), (-[IFPluginView setWindow]),
+ (-[IFPluginView newStream:mimeType:notifyData:]), (-[IFPluginView stop]),
+ (-[IFPluginView sendUpdateEvent]), (-[IFPluginView becomeFirstResponder]),
+ (-[IFPluginView resignFirstResponder]), (-[IFPluginView mouseDown:]),
+ (-[IFPluginView mouseUp:]), (-[IFPluginView mouseEntered:]), (-[IFPluginView
+ mouseExited:]), (-[IFPluginView keyUp:]), (-[IFPluginView keyDown:]),
+ (-[IFPluginView IFURLHandle:resourceDataDidBecomeAvailable:]), (-[IFPluginView
+ IFURLHandleResourceDidFinishLoading:data:]), (-[IFPluginView
+ getURLNotify:target:notifyData:]), (-[IFPluginView getURL:target:]),
+ (-[IFPluginView postURLNotify:target:len:buf:file:notifyData:]), (-[IFPluginView
+ postURL:target:len:buf:file:]), (-[IFPluginView newStream:target:stream:]),
+ (-[IFPluginView write:len:buffer:]), (-[IFPluginView destroyStream:reason:]),
+ (-[IFPluginView status:]), (-[IFPluginView getValue:value:]), (-[IFPluginView
+ setValue:value:]), (-[IFPluginView invalidateRect:]), (-[IFPluginView
+ invalidateRegion:]), (-[IFPluginView forceRedraw]):
+ * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+ IFURLHandle:resourceDataDidBecomeAvailable:]):
+
2002-04-17 Darin Adler <darin at apple.com>
* WebView.subproj/IFPreferences.mm: (+[IFPreferences load]):
diff --git a/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m b/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m
index 224f4ac..7937b6f 100644
--- a/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m
+++ b/WebKit/MIME.subproj/IFDownloadHandlerPrivate.m
@@ -7,12 +7,14 @@
//
#import <WebKit/IFDownloadHandlerPrivate.h>
-#import <ApplicationServices/ApplicationServices.h>
-#import <Carbon/Carbon.h>
+#import <WebKit/IFMIMEHandler.h>
+#import <WebKit/WebKitDebug.h>
-#import "IFMIMEHandler.h"
#import <WebFoundation/IFURLHandle.h>
+#import <ApplicationServices/ApplicationServices.h>
+#import <Carbon/Carbon.h>
+
@implementation IFDownloadHandlerPrivate
@@ -91,7 +93,7 @@
{
CFURLRef pathURL;
pathURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef)path, kCFURLPOSIXPathStyle, FALSE);
- NSLog(@"Opening: %@", path);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD,"Opening: %s", [path cString]);
LSOpenCFURLRef(pathURL, NULL);
CFRelease(pathURL);
}
@@ -105,10 +107,10 @@
// FIXME: Should report error if there is one
fileManager = [NSFileManager defaultManager];
[fileManager createFileAtPath:path contents:[urlHandle resourceData] attributes:nil];
- NSLog(@"Download complete. Saved to: %@", path);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download complete. Saved to: %s", [path cString]);
// Send Finder notification
- NSLog(@"Notifying Finder");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Notifying Finder");
FNNotifyByPath([[path stringByDeletingLastPathComponent] cString], kFNDirectoryModifiedMessage, kNilOptions);
if(shouldOpen)
@@ -126,7 +128,7 @@
[_private _setURLHandle:uHandle];
[_private _setMIMEHandler:mHandler];
- NSLog(@"Downloading: %@", [uHandle url]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Downloading: %s", [[[uHandle url] absoluteString] cString]);
return self;
}
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index b623bf5..5aab93f 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -27,7 +27,9 @@
#define WEBKIT_LOG_GENERIC_ERROR 0x00000010
#define WEBKIT_LOG_TIMING 0x00000020
#define WEBKIT_LOG_LOADING 0x00000040
+#define WEBKIT_LOG_DOWNLOAD 0x00000800
#define WEBKIT_LOG_DOCUMENTLOAD 0x00001000
+#define WEBKIT_LOG_PLUGINS 0x00002000
#define WEBKIT_LOG_EVENTS 0x00010000
#define WEBKIT_LOG_VIEW 0x00020000
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 3d6a216..a7f50ea 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -112,7 +112,7 @@ extern "C" {
npErr = NPP_New(cMime, instance, NP_FULL, 0, NULL, NULL, &saved);
}
- WEBKITDEBUG("NPP_New: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_New: %d\n", npErr);
free(cMime);
@@ -181,7 +181,7 @@ extern "C" {
window.type = NPWindowTypeWindow;
npErr = NPP_SetWindow(instance, &window);
- WEBKITDEBUG("NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
}
- (void) newStream:(NSURL *)streamURL mimeType:(NSString *)mimeType notifyData:(void *)notifyData
@@ -201,20 +201,20 @@ extern "C" {
[mimeType getCString:cMime];
npErr = NPP_NewStream(instance, cMime, npStream, FALSE, &transferMode);
- WEBKITDEBUG("NPP_NewStream: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_NewStream: %d\n", npErr);
[stream setTransferMode:transferMode];
free(cMime);
if(transferMode == NP_NORMAL){
- WEBKITDEBUG("Stream type: NP_NORMAL\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_NORMAL\n");
}else if(transferMode == NP_ASFILEONLY || transferMode == NP_ASFILE){
if(transferMode == NP_ASFILEONLY)
- WEBKITDEBUG("Stream type: NP_ASFILEONLY\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_ASFILEONLY\n");
if(transferMode == NP_ASFILE)
- WEBKITDEBUG("Stream type: NP_ASFILE\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_ASFILE\n");
[stream setFilename:[[streamURL path] lastPathComponent]];
}else if(transferMode == NP_SEEK){
- WEBKITDEBUG("Stream type: NP_SEEK not yet supported\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_SEEK not yet supported\n");
return;
}
attributes = [NSDictionary dictionaryWithObject:stream forKey:IFURLHandleUserData];
@@ -242,7 +242,7 @@ extern "C" {
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self removeTrackingRect:trackingTag];
npErr = NPP_Destroy(instance, NULL);
- WEBKITDEBUG("NPP_Destroy: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
stopped = TRUE;
}
}
@@ -275,7 +275,7 @@ extern "C" {
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
event.modifiers = isActive;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
}
-(void)sendUpdateEvent
@@ -289,7 +289,7 @@ extern "C" {
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(updateEvt): %d when: %lu\n", acceptedEvent, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(updateEvt): %d when: %lu\n", acceptedEvent, event.when);
}
@@ -346,7 +346,7 @@ extern "C" {
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(getFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(getFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -360,7 +360,7 @@ extern "C" {
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(loseFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(loseFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -379,7 +379,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60); // seconds to ticks
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
-(void)mouseUp:(NSEvent *)theEvent
@@ -396,7 +396,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
- (void)mouseEntered:(NSEvent *)theEvent
@@ -408,7 +408,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 1;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
}
- (void)mouseExited:(NSEvent *)theEvent
@@ -420,7 +420,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
}
- (void)keyUp:(NSEvent *)theEvent
@@ -432,7 +432,7 @@ extern "C" {
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
//Note: QT Plug-in doesn't use keyUp's
}
@@ -445,7 +445,7 @@ extern "C" {
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
}
#pragma mark NOTIFICATIONS
@@ -492,9 +492,9 @@ extern "C" {
if(transferMode != NP_ASFILEONLY){
bytes = NPP_WriteReady(instance, npStream);
- //WEBKITDEBUG("NPP_WriteReady bytes=%u\n", bytes);
+ //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_WriteReady bytes=%u\n", bytes);
bytes = NPP_Write(instance, npStream, [stream offset], [data length], (void *)[data bytes]);
- //WEBKITDEBUG("NPP_Write bytes=%u\n", bytes);
+ //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Write bytes=%u\n", bytes);
[stream incrementOffset:[data length]];
}
if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY){
@@ -539,14 +539,14 @@ extern "C" {
[filenameClassic getCString:cFilename];
NPP_StreamAsFile(instance, npStream, cFilename);
- WEBKITDEBUG("NPP_StreamAsFile: %s\n", cFilename);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_StreamAsFile: %s\n", cFilename);
}
npErr = NPP_DestroyStream(instance, npStream, NPRES_DONE);
- WEBKITDEBUG("NPP_DestroyStream: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_DestroyStream: %d\n", npErr);
if(npStream->notifyData){
NPP_URLNotify(instance, npStream->url, NPRES_DONE, npStream->notifyData);
- WEBKITDEBUG("NPP_URLNotify\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_URLNotify\n");
}
[stream release];
[activeURLHandles removeObject:sender];
@@ -610,7 +610,7 @@ extern "C" {
IFWebDataSource *dataSource;
NSURL *requestedURL;
- WEBKITDEBUG("NPN_GetURLNotify: %s target: %s\n", url, target);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURLNotify: %s target: %s\n", url, target);
if(!strcmp(url, "")){
return NPERR_INVALID_URL;
@@ -637,37 +637,37 @@ extern "C" {
-(NPError)getURL:(const char *)url target:(const char *)target
{
- WEBKITDEBUG("NPN_GetURL: %s target: %s\n", url, target);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "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
{
- WEBKITDEBUG("NPN_PostURLNotify\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "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
{
- WEBKITDEBUG("NPN_PostURL\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURL\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
{
- WEBKITDEBUG("NPN_NewStream\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_NewStream\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)write:(NPStream*)stream len:(SInt32)len buffer:(void *)buffer
{
- WEBKITDEBUG("NPN_Write\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Write\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason
{
- WEBKITDEBUG("NPN_DestroyStream\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_DestroyStream\n");
return NPERR_GENERIC_ERROR;
}
@@ -675,7 +675,7 @@ extern "C" {
{
IFWebDataSource *dataSource;
- WEBKITDEBUG("NPN_Status: %s\n", message);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Status: %s\n", message);
if(webController){
dataSource = [[webController mainFrame] dataSource];
[webController setStatusText:[NSString stringWithCString:message] forDataSource:dataSource];
@@ -684,29 +684,29 @@ extern "C" {
-(NPError)getValue:(NPNVariable)variable value:(void *)value
{
- WEBKITDEBUG("NPN_GetValue\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetValue\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)setValue:(NPPVariable)variable value:(void *)value
{
- WEBKITDEBUG("NPN_SetValue\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_SetValue\n");
return NPERR_GENERIC_ERROR;
}
-(void)invalidateRect:(NPRect *)invalidRect
{
- WEBKITDEBUG("NPN_InvalidateRect\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_InvalidateRect\n");
}
-(void)invalidateRegion:(NPRegion)invalidateRegion
{
- WEBKITDEBUG("NPN_InvalidateRegion\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_InvalidateRegion\n");
}
-(void)forceRedraw
{
- WEBKITDEBUG("forceRedraw\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "forceRedraw\n");
}
#pragma mark PREBINDING
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 3d6a216..a7f50ea 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -112,7 +112,7 @@ extern "C" {
npErr = NPP_New(cMime, instance, NP_FULL, 0, NULL, NULL, &saved);
}
- WEBKITDEBUG("NPP_New: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_New: %d\n", npErr);
free(cMime);
@@ -181,7 +181,7 @@ extern "C" {
window.type = NPWindowTypeWindow;
npErr = NPP_SetWindow(instance, &window);
- WEBKITDEBUG("NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=%d\n", npErr, (int)nPort.port);
}
- (void) newStream:(NSURL *)streamURL mimeType:(NSString *)mimeType notifyData:(void *)notifyData
@@ -201,20 +201,20 @@ extern "C" {
[mimeType getCString:cMime];
npErr = NPP_NewStream(instance, cMime, npStream, FALSE, &transferMode);
- WEBKITDEBUG("NPP_NewStream: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_NewStream: %d\n", npErr);
[stream setTransferMode:transferMode];
free(cMime);
if(transferMode == NP_NORMAL){
- WEBKITDEBUG("Stream type: NP_NORMAL\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_NORMAL\n");
}else if(transferMode == NP_ASFILEONLY || transferMode == NP_ASFILE){
if(transferMode == NP_ASFILEONLY)
- WEBKITDEBUG("Stream type: NP_ASFILEONLY\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_ASFILEONLY\n");
if(transferMode == NP_ASFILE)
- WEBKITDEBUG("Stream type: NP_ASFILE\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_ASFILE\n");
[stream setFilename:[[streamURL path] lastPathComponent]];
}else if(transferMode == NP_SEEK){
- WEBKITDEBUG("Stream type: NP_SEEK not yet supported\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_SEEK not yet supported\n");
return;
}
attributes = [NSDictionary dictionaryWithObject:stream forKey:IFURLHandleUserData];
@@ -242,7 +242,7 @@ extern "C" {
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self removeTrackingRect:trackingTag];
npErr = NPP_Destroy(instance, NULL);
- WEBKITDEBUG("NPP_Destroy: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
stopped = TRUE;
}
}
@@ -275,7 +275,7 @@ extern "C" {
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
event.modifiers = isActive;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
}
-(void)sendUpdateEvent
@@ -289,7 +289,7 @@ extern "C" {
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(updateEvt): %d when: %lu\n", acceptedEvent, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(updateEvt): %d when: %lu\n", acceptedEvent, event.when);
}
@@ -346,7 +346,7 @@ extern "C" {
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(getFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(getFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -360,7 +360,7 @@ extern "C" {
Microseconds(&msecs);
event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(loseFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(loseFocusEvent): %d when: %lu\n", acceptedEvent, event.when);
return YES;
}
@@ -379,7 +379,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60); // seconds to ticks
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
-(void)mouseUp:(NSEvent *)theEvent
@@ -396,7 +396,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%lu\n", acceptedEvent, pt.v, pt.h, event.when);
}
- (void)mouseEntered:(NSEvent *)theEvent
@@ -408,7 +408,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 1;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
}
- (void)mouseExited:(NSEvent *)theEvent
@@ -420,7 +420,7 @@ extern "C" {
event.when = (uint32)([theEvent timestamp] * 60);
event.modifiers = 0;
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
}
- (void)keyUp:(NSEvent *)theEvent
@@ -432,7 +432,7 @@ extern "C" {
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
//Note: QT Plug-in doesn't use keyUp's
}
@@ -445,7 +445,7 @@ extern "C" {
event.message = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
event.when = (uint32)([theEvent timestamp] * 60);
acceptedEvent = NPP_HandleEvent(instance, &event);
- WEBKITDEBUG("NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
}
#pragma mark NOTIFICATIONS
@@ -492,9 +492,9 @@ extern "C" {
if(transferMode != NP_ASFILEONLY){
bytes = NPP_WriteReady(instance, npStream);
- //WEBKITDEBUG("NPP_WriteReady bytes=%u\n", bytes);
+ //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_WriteReady bytes=%u\n", bytes);
bytes = NPP_Write(instance, npStream, [stream offset], [data length], (void *)[data bytes]);
- //WEBKITDEBUG("NPP_Write bytes=%u\n", bytes);
+ //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Write bytes=%u\n", bytes);
[stream incrementOffset:[data length]];
}
if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY){
@@ -539,14 +539,14 @@ extern "C" {
[filenameClassic getCString:cFilename];
NPP_StreamAsFile(instance, npStream, cFilename);
- WEBKITDEBUG("NPP_StreamAsFile: %s\n", cFilename);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_StreamAsFile: %s\n", cFilename);
}
npErr = NPP_DestroyStream(instance, npStream, NPRES_DONE);
- WEBKITDEBUG("NPP_DestroyStream: %d\n", npErr);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_DestroyStream: %d\n", npErr);
if(npStream->notifyData){
NPP_URLNotify(instance, npStream->url, NPRES_DONE, npStream->notifyData);
- WEBKITDEBUG("NPP_URLNotify\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_URLNotify\n");
}
[stream release];
[activeURLHandles removeObject:sender];
@@ -610,7 +610,7 @@ extern "C" {
IFWebDataSource *dataSource;
NSURL *requestedURL;
- WEBKITDEBUG("NPN_GetURLNotify: %s target: %s\n", url, target);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURLNotify: %s target: %s\n", url, target);
if(!strcmp(url, "")){
return NPERR_INVALID_URL;
@@ -637,37 +637,37 @@ extern "C" {
-(NPError)getURL:(const char *)url target:(const char *)target
{
- WEBKITDEBUG("NPN_GetURL: %s target: %s\n", url, target);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "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
{
- WEBKITDEBUG("NPN_PostURLNotify\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "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
{
- WEBKITDEBUG("NPN_PostURL\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURL\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
{
- WEBKITDEBUG("NPN_NewStream\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_NewStream\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)write:(NPStream*)stream len:(SInt32)len buffer:(void *)buffer
{
- WEBKITDEBUG("NPN_Write\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Write\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason
{
- WEBKITDEBUG("NPN_DestroyStream\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_DestroyStream\n");
return NPERR_GENERIC_ERROR;
}
@@ -675,7 +675,7 @@ extern "C" {
{
IFWebDataSource *dataSource;
- WEBKITDEBUG("NPN_Status: %s\n", message);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Status: %s\n", message);
if(webController){
dataSource = [[webController mainFrame] dataSource];
[webController setStatusText:[NSString stringWithCString:message] forDataSource:dataSource];
@@ -684,29 +684,29 @@ extern "C" {
-(NPError)getValue:(NPNVariable)variable value:(void *)value
{
- WEBKITDEBUG("NPN_GetValue\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetValue\n");
return NPERR_GENERIC_ERROR;
}
-(NPError)setValue:(NPPVariable)variable value:(void *)value
{
- WEBKITDEBUG("NPN_SetValue\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_SetValue\n");
return NPERR_GENERIC_ERROR;
}
-(void)invalidateRect:(NPRect *)invalidRect
{
- WEBKITDEBUG("NPN_InvalidateRect\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_InvalidateRect\n");
}
-(void)invalidateRegion:(NPRegion)invalidateRegion
{
- WEBKITDEBUG("NPN_InvalidateRegion\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_InvalidateRegion\n");
}
-(void)forceRedraw
{
- WEBKITDEBUG("forceRedraw\n");
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "forceRedraw\n");
}
#pragma mark PREBINDING
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index e5e94f6..57d71ce 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -107,10 +107,11 @@
IFMIMEDatabase *mimeDatabase;
IFContentHandler *contentHandler;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
// check the mime type
if(!typeChecked){
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Main URL's contentType: %s", [[sender contentType] cString]);
mimeDatabase = [IFMIMEDatabase sharedMIMEDatabase];
mimeHandler = [[mimeDatabase MIMEHandlerForMIMEType:[sender contentType]] retain];
handlerType = [mimeHandler handlerType];
@@ -159,7 +160,7 @@
loadProgress->bytesSoFar = [sender contentLengthReceived];
if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
[[dataSource controller] receivedProgress:loadProgress forDownloadHandler:downloadHandler];
- NSLog(@"%d of %d", loadProgress->bytesSoFar, loadProgress->totalToLoad);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download progress: %d of %d", loadProgress->bytesSoFar, loadProgress->totalToLoad);
}else{
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress
forResource: [[sender url] absoluteString] fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index e5e94f6..57d71ce 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -107,10 +107,11 @@
IFMIMEDatabase *mimeDatabase;
IFContentHandler *contentHandler;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
// check the mime type
if(!typeChecked){
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Main URL's contentType: %s", [[sender contentType] cString]);
mimeDatabase = [IFMIMEDatabase sharedMIMEDatabase];
mimeHandler = [[mimeDatabase MIMEHandlerForMIMEType:[sender contentType]] retain];
handlerType = [mimeHandler handlerType];
@@ -159,7 +160,7 @@
loadProgress->bytesSoFar = [sender contentLengthReceived];
if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
[[dataSource controller] receivedProgress:loadProgress forDownloadHandler:downloadHandler];
- NSLog(@"%d of %d", loadProgress->bytesSoFar, loadProgress->totalToLoad);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download progress: %d of %d", loadProgress->bytesSoFar, loadProgress->totalToLoad);
}else{
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress
forResource: [[sender url] absoluteString] fromDataSource: dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index e5e94f6..57d71ce 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -107,10 +107,11 @@
IFMIMEDatabase *mimeDatabase;
IFContentHandler *contentHandler;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
// check the mime type
if(!typeChecked){
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Main URL's contentType: %s", [[sender contentType] cString]);
mimeDatabase = [IFMIMEDatabase sharedMIMEDatabase];
mimeHandler = [[mimeDatabase MIMEHandlerForMIMEType:[sender contentType]] retain];
handlerType = [mimeHandler handlerType];
@@ -159,7 +160,7 @@
loadProgress->bytesSoFar = [sender contentLengthReceived];
if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
[[dataSource controller] receivedProgress:loadProgress forDownloadHandler:downloadHandler];
- NSLog(@"%d of %d", loadProgress->bytesSoFar, loadProgress->totalToLoad);
+ WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download progress: %d of %d", loadProgress->bytesSoFar, loadProgress->totalToLoad);
}else{
[[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress
forResource: [[sender url] absoluteString] fromDataSource: dataSource];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list