[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:20:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8c6ab9870b2f6e2e84b3b868b59865bf79b532e8
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jun 19 05:50:22 2002 +0000
WebKit:
Fix for 2961733 - Progress of plug-in files not shown in activity window
Plugin classed must call _IF_superviewWithName: not _IF_parentWebView
* Plugins.subproj/IFNullPluginView.mm:
(-[IFNullPluginView drawRect:]):
* Plugins.subproj/IFPluginStream.mm: minor cleanup
(-[IFPluginStream IFURLHandle:resourceDataDidBecomeAvailable:]):
(-[IFPluginStream IFURLHandleResourceDidFinishLoading:data:]):
(-[IFPluginStream IFURLHandleResourceDidCancelLoading:]):
(-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]):
(-[IFPluginStream IFURLHandle:didRedirectToURL:]):
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView start]):
(-[IFPluginView layout]):
WebBrowser:
Renamed content policy API's to include the data source.
* WebController.m:
(-[WebController haveContentPolicy:andPath:forDataSource:]):
(-[WebController receivedProgress:forResourceHandle:fromDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9b08107..40943bd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,22 @@
2002-06-18 Chris Blumenberg <cblu at apple.com>
+ Fix for 2961733 - Progress of plug-in files not shown in activity window
+ Plugin classed must call _IF_superviewWithName: not _IF_parentWebView
+
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView drawRect:]):
+ * Plugins.subproj/IFPluginStream.mm: minor cleanup
+ (-[IFPluginStream IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[IFPluginStream IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFPluginStream IFURLHandleResourceDidCancelLoading:]):
+ (-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]):
+ (-[IFPluginStream IFURLHandle:didRedirectToURL:]):
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView start]):
+ (-[IFPluginView layout]):
+
+2002-06-18 Chris Blumenberg <cblu at apple.com>
+
Enabled the viewing of plug-in content inline
(aka direct links to plugin media). Made IFPluginView a
IFDocumentView and IFPluginStream a IFDocumentRespresentation.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9b08107..40943bd 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
2002-06-18 Chris Blumenberg <cblu at apple.com>
+ Fix for 2961733 - Progress of plug-in files not shown in activity window
+ Plugin classed must call _IF_superviewWithName: not _IF_parentWebView
+
+ * Plugins.subproj/IFNullPluginView.mm:
+ (-[IFNullPluginView drawRect:]):
+ * Plugins.subproj/IFPluginStream.mm: minor cleanup
+ (-[IFPluginStream IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[IFPluginStream IFURLHandleResourceDidFinishLoading:data:]):
+ (-[IFPluginStream IFURLHandleResourceDidCancelLoading:]):
+ (-[IFPluginStream IFURLHandle:resourceDidFailLoadingWithResult:]):
+ (-[IFPluginStream IFURLHandle:didRedirectToURL:]):
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView start]):
+ (-[IFPluginView layout]):
+
+2002-06-18 Chris Blumenberg <cblu at apple.com>
+
Enabled the viewing of plug-in content inline
(aka direct links to plugin media). Made IFPluginView a
IFDocumentView and IFPluginStream a IFDocumentRespresentation.
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
index f7dfc7a..0768420 100644
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ b/WebKit/Plugins.subproj/IFNullPluginView.mm
@@ -60,7 +60,7 @@ static NSImage *image = nil;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = [self _IF_parentWebView];
+ webView = [self _IF_superviewWithName:@"IFWebView"];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/IFPluginStream.mm b/WebKit/Plugins.subproj/IFPluginStream.mm
index 27fafd3..bc4a16e 100644
--- a/WebKit/Plugins.subproj/IFPluginStream.mm
+++ b/WebKit/Plugins.subproj/IFPluginStream.mm
@@ -230,6 +230,8 @@ static NSString *getCarbonPath(NSString *posixPath);
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ IFWebController *webController = [view webController];
+
if(isFirstChunk){
NSString *URLString = [[sender url] absoluteString];
char *cURL = (char *)malloc([URLString cStringLength]+1);
@@ -245,50 +247,58 @@ static NSString *getCarbonPath(NSString *posixPath);
}
[self receivedData:data];
- [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource] complete: NO];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
- [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ IFWebController *webController = [view webController];
+
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
[self finishedLoadingWithData:data];
- [[view webController] _didStopLoading:URL];
+ [webController _didStopLoading:URL];
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- [[view webController] _receivedProgress:[IFLoadProgress progress]
+ IFWebController *webController = [view webController];
+
+ [webController _receivedProgress:[IFLoadProgress progress]
forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
[self receivedError];
- [[view webController] _didStopLoading:URL];
+ [webController _didStopLoading:URL];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
+ IFWebController *webController = [view webController];
+
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- [[view webController] _receivedError: result forResourceHandle: sender
+ [webController _receivedError: result forResourceHandle: sender
partialProgress: loadProgress fromDataSource: [view webDataSource]];
[loadProgress release];
[self receivedError];
- [[view webController] _didStopLoading:URL];
+ [webController _didStopLoading:URL];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)toURL
{
- [[view webController] _didStopLoading:URL];
+ IFWebController *webController = [view webController];
+
+ [webController _didStopLoading:URL];
// FIXME: This next line is not sufficient. We don't do anything to remember the new URL.
- [[view webController] _didStartLoading:toURL];
+ [webController _didStartLoading:toURL];
}
@end
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index b2abe64..3276813 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -420,7 +420,12 @@ static char *newCString(NSString *string)
if ([theWindow isKeyWindow])
[self sendActivateEvent:YES];
-
+
+ id webView = [self _IF_superviewWithName:@"IFWebView"];
+ webController = [[webView controller] retain];
+ webFrame = [[webController frameForView:webView] retain];
+ webDataSource = [[webFrame dataSource] retain];
+
if(srcURL){
stream = [[IFPluginStream alloc] initWithURL:srcURL pluginPointer:instance];
if(stream){
@@ -433,11 +438,6 @@ static char *newCString(NSString *string)
eventSender = [[IFPluginNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent window:theWindow];
[eventSender sendNullEvents];
trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
-
- id webView = [self _IF_parentWebView];
- webController = [[webView controller] retain];
- webFrame = [[webController frameForView:webView] retain];
- webDataSource = [[webFrame dataSource] retain];
}
- (void)stop
@@ -544,7 +544,7 @@ static char *newCString(NSString *string)
- (void)layout
{
- NSRect superFrame = [[self _IF_parentWebView] frame];
+ NSRect superFrame = [[self _IF_superviewWithName:@"IFWebView"] frame];
[self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index f7dfc7a..0768420 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -60,7 +60,7 @@ static NSImage *image = nil;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = [self _IF_parentWebView];
+ webView = [self _IF_superviewWithName:@"IFWebView"];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 27fafd3..bc4a16e 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -230,6 +230,8 @@ static NSString *getCarbonPath(NSString *posixPath);
- (void)IFURLHandle:(IFURLHandle *)sender resourceDataDidBecomeAvailable:(NSData *)data
{
+ IFWebController *webController = [view webController];
+
if(isFirstChunk){
NSString *URLString = [[sender url] absoluteString];
char *cURL = (char *)malloc([URLString cStringLength]+1);
@@ -245,50 +247,58 @@ static NSString *getCarbonPath(NSString *posixPath);
}
[self receivedData:data];
- [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource] complete: NO];
}
- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
{
- [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
+ IFWebController *webController = [view webController];
+
+ [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
[self finishedLoadingWithData:data];
- [[view webController] _didStopLoading:URL];
+ [webController _didStopLoading:URL];
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
{
- [[view webController] _receivedProgress:[IFLoadProgress progress]
+ IFWebController *webController = [view webController];
+
+ [webController _receivedProgress:[IFLoadProgress progress]
forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
[self receivedError];
- [[view webController] _didStopLoading:URL];
+ [webController _didStopLoading:URL];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
+ IFWebController *webController = [view webController];
+
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- [[view webController] _receivedError: result forResourceHandle: sender
+ [webController _receivedError: result forResourceHandle: sender
partialProgress: loadProgress fromDataSource: [view webDataSource]];
[loadProgress release];
[self receivedError];
- [[view webController] _didStopLoading:URL];
+ [webController _didStopLoading:URL];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)toURL
{
- [[view webController] _didStopLoading:URL];
+ IFWebController *webController = [view webController];
+
+ [webController _didStopLoading:URL];
// FIXME: This next line is not sufficient. We don't do anything to remember the new URL.
- [[view webController] _didStartLoading:toURL];
+ [webController _didStartLoading:toURL];
}
@end
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index b2abe64..3276813 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -420,7 +420,12 @@ static char *newCString(NSString *string)
if ([theWindow isKeyWindow])
[self sendActivateEvent:YES];
-
+
+ id webView = [self _IF_superviewWithName:@"IFWebView"];
+ webController = [[webView controller] retain];
+ webFrame = [[webController frameForView:webView] retain];
+ webDataSource = [[webFrame dataSource] retain];
+
if(srcURL){
stream = [[IFPluginStream alloc] initWithURL:srcURL pluginPointer:instance];
if(stream){
@@ -433,11 +438,6 @@ static char *newCString(NSString *string)
eventSender = [[IFPluginNullEventSender alloc] initializeWithNPP:instance functionPointer:NPP_HandleEvent window:theWindow];
[eventSender sendNullEvents];
trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
-
- id webView = [self _IF_parentWebView];
- webController = [[webView controller] retain];
- webFrame = [[webController frameForView:webView] retain];
- webDataSource = [[webFrame dataSource] retain];
}
- (void)stop
@@ -544,7 +544,7 @@ static char *newCString(NSString *string)
- (void)layout
{
- NSRect superFrame = [[self _IF_parentWebView] frame];
+ NSRect superFrame = [[self _IF_superviewWithName:@"IFWebView"] frame];
[self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list