[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:21:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 76a4f783bf36d18e77d110b4680ff0911e70a323
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jun 26 18:53:34 2002 +0000
WebKit:
- added "complete" to progress methods to indicate last progress message
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView setWindow]): added a draw test
* WebView.subproj/IFWebController.h:
* WebView.subproj/IFWebControllerPrivate.mm:
(-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
(-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
WebBrowser:
- added "complete" to progress methods to indicate last progress message
* DownloadMonitor.h:
* DownloadMonitor.m:
(-[DownloadMonitor monitorDownload:withProgress:error:dataSource:complete:]):
* WebController.m:
(-[WebController receivedProgress:forResourceHandle:fromDataSource:complete:]):
(-[WebController receivedError:forResourceHandle:partialProgress:fromDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1440 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1a7138b..22a44d0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-26 Chris Blumenberg <cblu at apple.com>
+
+ - added "complete" to to progress methods to indicate last progress message
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView setWindow]): added a draw test
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+
2002-06-26 Richard Williamson <rjw at apple.com>
Fixed recursion problems. +[NSFont findFontLike:forString:withRange:inLanguage:]
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1a7138b..22a44d0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-06-26 Chris Blumenberg <cblu at apple.com>
+
+ - added "complete" to to progress methods to indicate last progress message
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView setWindow]): added a draw test
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebController _receivedProgress:forResourceHandle:fromDataSource:complete:]):
+ (-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+
2002-06-26 Richard Williamson <rjw at apple.com>
Fixed recursion problems. +[NSFont findFontLike:forString:withRange:inLanguage:]
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index b9e8d50..a1aaade 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -354,6 +354,7 @@ static char *newCString(NSString *string)
{
NPError npErr;
NSRect windowFrame, frameInWindow, visibleRectInWindow;
+ CGrafPtr port = GetWindowPort([[self window] _windowRef]);
windowFrame = [[self window] frame];
frameInWindow = [self convertRect:[self bounds] toView:nil];
@@ -363,7 +364,7 @@ static char *newCString(NSString *string)
frameInWindow.origin.y = windowFrame.size.height - frameInWindow.origin.y - frameInWindow.size.height;
visibleRectInWindow.origin.y = windowFrame.size.height - visibleRectInWindow.origin.y - visibleRectInWindow.size.height;
- nPort.port = GetWindowPort([[self window] _windowRef]);
+ nPort.port = port;
// FIXME: Are these values correct? Without them, Flash freaks.
nPort.portx = -(int32)frameInWindow.origin.x;
@@ -385,6 +386,16 @@ static char *newCString(NSString *string)
npErr = NPP_SetWindow(instance, &window);
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x\n", npErr, (int)nPort.port);
+
+ // Draw test
+#if 0
+ Rect portRect;
+
+ GetPortBounds(port, &portRect);
+ SetPort(port);
+ MoveTo(0,0);
+ LineTo(portRect.right, portRect.bottom);
+#endif
}
-(void)start
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index b9e8d50..a1aaade 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -354,6 +354,7 @@ static char *newCString(NSString *string)
{
NPError npErr;
NSRect windowFrame, frameInWindow, visibleRectInWindow;
+ CGrafPtr port = GetWindowPort([[self window] _windowRef]);
windowFrame = [[self window] frame];
frameInWindow = [self convertRect:[self bounds] toView:nil];
@@ -363,7 +364,7 @@ static char *newCString(NSString *string)
frameInWindow.origin.y = windowFrame.size.height - frameInWindow.origin.y - frameInWindow.size.height;
visibleRectInWindow.origin.y = windowFrame.size.height - visibleRectInWindow.origin.y - visibleRectInWindow.size.height;
- nPort.port = GetWindowPort([[self window] _windowRef]);
+ nPort.port = port;
// FIXME: Are these values correct? Without them, Flash freaks.
nPort.portx = -(int32)frameInWindow.origin.x;
@@ -385,6 +386,16 @@ static char *newCString(NSString *string)
npErr = NPP_SetWindow(instance, &window);
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x\n", npErr, (int)nPort.port);
+
+ // Draw test
+#if 0
+ Rect portRect;
+
+ GetPortBounds(port, &portRect);
+ SetPort(port);
+ MoveTo(0,0);
+ LineTo(portRect.right, portRect.bottom);
+#endif
}
-(void)start
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index bd4f2c7..1c620ed 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -60,7 +60,7 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete;
- (void)receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index ddecf94..94edac1 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -89,7 +89,8 @@
return;
}
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
+ [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ fromDataSource: dataSource complete:isComplete];
// This resouce has completed, so check if the load is complete for all frames.
if (isComplete){
@@ -118,7 +119,8 @@
return;
}
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
+ [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ fromDataSource: dataSource complete:isComplete];
if(isComplete){
if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index bd4f2c7..1c620ed 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -60,7 +60,7 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete;
- (void)receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index ddecf94..94edac1 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -89,7 +89,8 @@
return;
}
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
+ [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ fromDataSource: dataSource complete:isComplete];
// This resouce has completed, so check if the load is complete for all frames.
if (isComplete){
@@ -118,7 +119,8 @@
return;
}
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
+ [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ fromDataSource: dataSource complete:isComplete];
if(isComplete){
if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index bd4f2c7..1c620ed 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -60,7 +60,7 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete;
- (void)receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index ddecf94..94edac1 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -89,7 +89,8 @@
return;
}
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
+ [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ fromDataSource: dataSource complete:isComplete];
// This resouce has completed, so check if the load is complete for all frames.
if (isComplete){
@@ -118,7 +119,8 @@
return;
}
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
+ [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
+ fromDataSource: dataSource complete:isComplete];
if(isComplete){
if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list