[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:49:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f1fdc081817405b19ba2a98c3fdf84e33fb229a0
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 14 06:16:15 2002 +0000
- Eliminated the dual-role behavior of WebPluginStream. Renamed WebPluginStream to WebBaseNetscapePluginStream.
WebNetscapePluginRepresentation, a subclass of WebNetscapePluginRepresentation, is the document representation for standalone plug-ins. WebNetscapePluginStream, also a subclass of WebNetscapePluginRepresentation, is the general plug-in stream loader for embedded plug-ins or plug-in requested streams.
23 plug-in source files with more likely to come!
* Plugins.subproj/WebBaseNetscapePluginStream.h: Added.
* Plugins.subproj/WebBaseNetscapePluginStream.m: Added.
(-[WebBaseNetscapePluginStream dealloc]):
(-[WebBaseNetscapePluginStream setPluginPointer:]):
(-[WebBaseNetscapePluginStream setResponse:]):
(-[WebBaseNetscapePluginStream receivedData:]):
(-[WebBaseNetscapePluginStream receivedError:]):
(-[WebBaseNetscapePluginStream finishedLoadingWithData:]):
* Plugins.subproj/WebBaseNetscapePluginView.h:
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView setWindow]):
(-[WebBaseNetscapePluginView pluginPointer]):
(-[WebBaseNetscapePluginView drawRect:]):
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginRepresentation.h: Added.
* Plugins.subproj/WebNetscapePluginRepresentation.m: Added.
(-[WebNetscapePluginRepresentation setDataSource:]):
(-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
(-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
(-[WebNetscapePluginRepresentation finishedLoadingWithDataSource:]):
* Plugins.subproj/WebNetscapePluginStream.h: Added.
* Plugins.subproj/WebNetscapePluginStream.m: Added.
(-[WebNetscapePluginStream setCurrentURL:]):
(-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
(-[WebNetscapePluginStream dealloc]):
(-[WebNetscapePluginStream start]):
(-[WebNetscapePluginStream stop]):
(-[WebNetscapePluginStream loadEnded]):
(-[WebNetscapePluginStream handle:willSendRequest:]):
(-[WebNetscapePluginStream handle:didReceiveResponse:]):
(-[WebNetscapePluginStream handle:didReceiveData:]):
(-[WebNetscapePluginStream handleDidFinishLoading:]):
(-[WebNetscapePluginStream handle:didFailLoadingWithError:]):
* Plugins.subproj/WebPluginDatabase.m:
(-[WebNetscapePluginDatabase init]):
* Plugins.subproj/WebPluginStream.h: Removed.
* Plugins.subproj/WebPluginStream.m: Removed.
* WebKit.pbproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2312 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cd9f0ca..73fae9b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,50 @@
+2002-10-13 Chris Blumenberg <cblu at apple.com>
+
+ - Eliminated the dual-role behavior of WebPluginStream. Renamed WebPluginStream to WebBaseNetscapePluginStream.
+ WebNetscapePluginRepresentation, a subclass of WebNetscapePluginRepresentation, is the document representation for standalone plug-ins. WebNetscapePluginStream, also a subclass of WebNetscapePluginRepresentation, is the general plug-in stream loader for embedded plug-ins or plug-in requested streams.
+
+ 23 plug-in source files with more likely to come!
+
+ * Plugins.subproj/WebBaseNetscapePluginStream.h: Added.
+ * Plugins.subproj/WebBaseNetscapePluginStream.m: Added.
+ (-[WebBaseNetscapePluginStream dealloc]):
+ (-[WebBaseNetscapePluginStream setPluginPointer:]):
+ (-[WebBaseNetscapePluginStream setResponse:]):
+ (-[WebBaseNetscapePluginStream receivedData:]):
+ (-[WebBaseNetscapePluginStream receivedError:]):
+ (-[WebBaseNetscapePluginStream finishedLoadingWithData:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView setWindow]):
+ (-[WebBaseNetscapePluginView pluginPointer]):
+ (-[WebBaseNetscapePluginView drawRect:]):
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginRepresentation.h: Added.
+ * Plugins.subproj/WebNetscapePluginRepresentation.m: Added.
+ (-[WebNetscapePluginRepresentation setDataSource:]):
+ (-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
+ (-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
+ (-[WebNetscapePluginRepresentation finishedLoadingWithDataSource:]):
+ * Plugins.subproj/WebNetscapePluginStream.h: Added.
+ * Plugins.subproj/WebNetscapePluginStream.m: Added.
+ (-[WebNetscapePluginStream setCurrentURL:]):
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+ (-[WebNetscapePluginStream dealloc]):
+ (-[WebNetscapePluginStream start]):
+ (-[WebNetscapePluginStream stop]):
+ (-[WebNetscapePluginStream loadEnded]):
+ (-[WebNetscapePluginStream handle:willSendRequest:]):
+ (-[WebNetscapePluginStream handle:didReceiveResponse:]):
+ (-[WebNetscapePluginStream handle:didReceiveData:]):
+ (-[WebNetscapePluginStream handleDidFinishLoading:]):
+ (-[WebNetscapePluginStream handle:didFailLoadingWithError:]):
+ * Plugins.subproj/WebPluginDatabase.m:
+ (-[WebNetscapePluginDatabase init]):
+ * Plugins.subproj/WebPluginStream.h: Removed.
+ * Plugins.subproj/WebPluginStream.m: Removed.
+ * WebKit.pbproj/project.pbxproj:
+
2002-10-11 Richard Williamson <rjw at apple.com>
More DOM/attributed string work.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index cd9f0ca..73fae9b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,50 @@
+2002-10-13 Chris Blumenberg <cblu at apple.com>
+
+ - Eliminated the dual-role behavior of WebPluginStream. Renamed WebPluginStream to WebBaseNetscapePluginStream.
+ WebNetscapePluginRepresentation, a subclass of WebNetscapePluginRepresentation, is the document representation for standalone plug-ins. WebNetscapePluginStream, also a subclass of WebNetscapePluginRepresentation, is the general plug-in stream loader for embedded plug-ins or plug-in requested streams.
+
+ 23 plug-in source files with more likely to come!
+
+ * Plugins.subproj/WebBaseNetscapePluginStream.h: Added.
+ * Plugins.subproj/WebBaseNetscapePluginStream.m: Added.
+ (-[WebBaseNetscapePluginStream dealloc]):
+ (-[WebBaseNetscapePluginStream setPluginPointer:]):
+ (-[WebBaseNetscapePluginStream setResponse:]):
+ (-[WebBaseNetscapePluginStream receivedData:]):
+ (-[WebBaseNetscapePluginStream receivedError:]):
+ (-[WebBaseNetscapePluginStream finishedLoadingWithData:]):
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView setWindow]):
+ (-[WebBaseNetscapePluginView pluginPointer]):
+ (-[WebBaseNetscapePluginView drawRect:]):
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginRepresentation.h: Added.
+ * Plugins.subproj/WebNetscapePluginRepresentation.m: Added.
+ (-[WebNetscapePluginRepresentation setDataSource:]):
+ (-[WebNetscapePluginRepresentation receivedData:withDataSource:]):
+ (-[WebNetscapePluginRepresentation receivedError:withDataSource:]):
+ (-[WebNetscapePluginRepresentation finishedLoadingWithDataSource:]):
+ * Plugins.subproj/WebNetscapePluginStream.h: Added.
+ * Plugins.subproj/WebNetscapePluginStream.m: Added.
+ (-[WebNetscapePluginStream setCurrentURL:]):
+ (-[WebNetscapePluginStream initWithRequest:pluginPointer:notifyData:]):
+ (-[WebNetscapePluginStream dealloc]):
+ (-[WebNetscapePluginStream start]):
+ (-[WebNetscapePluginStream stop]):
+ (-[WebNetscapePluginStream loadEnded]):
+ (-[WebNetscapePluginStream handle:willSendRequest:]):
+ (-[WebNetscapePluginStream handle:didReceiveResponse:]):
+ (-[WebNetscapePluginStream handle:didReceiveData:]):
+ (-[WebNetscapePluginStream handleDidFinishLoading:]):
+ (-[WebNetscapePluginStream handle:didFailLoadingWithError:]):
+ * Plugins.subproj/WebPluginDatabase.m:
+ (-[WebNetscapePluginDatabase init]):
+ * Plugins.subproj/WebPluginStream.h: Removed.
+ * Plugins.subproj/WebPluginStream.m: Removed.
+ * WebKit.pbproj/project.pbxproj:
+
2002-10-11 Richard Williamson <rjw at apple.com>
More DOM/attributed string work.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
new file mode 100644
index 0000000..6ebcdcc
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
@@ -0,0 +1,36 @@
+/*
+ WebBaseNetscapePluginStream.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+#import <WebKit/npapi.h>
+
+ at class WebResourceResponse;
+
+ at interface WebBaseNetscapePluginStream : NSObject
+{
+ NSURL *URL;
+ NPP instance;
+ uint16 transferMode;
+ int32 offset;
+ NPStream stream;
+ NSString *path;
+ void *notifyData;
+
+ NPP_NewStreamProcPtr NPP_NewStream;
+ NPP_DestroyStreamProcPtr NPP_DestroyStream;
+ NPP_StreamAsFileProcPtr NPP_StreamAsFile;
+ NPP_WriteReadyProcPtr NPP_WriteReady;
+ NPP_WriteProcPtr NPP_Write;
+ NPP_URLNotifyProcPtr NPP_URLNotify;
+}
+
+- (void)setPluginPointer:(NPP)pluginPointer;
+- (void)setResponse:(WebResourceResponse *)theReponse;
+- (void)receivedData:(NSData *)data;
+- (void)receivedError:(NPError)error;
+- (void)finishedLoadingWithData:(NSData *)data;
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
new file mode 100644
index 0000000..b6a0d9f
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -0,0 +1,145 @@
+/*
+ WebBaseNetscapePluginStream.m
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebBaseNetscapePluginStream.h>
+#import <WebKit/WebBaseNetscapePluginView.h>
+#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebPlugin.h>
+
+#import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/WebNSFileManagerExtras.h>
+
+ at implementation WebBaseNetscapePluginStream
+
+- (void)dealloc
+{
+ if(path){
+ [[NSFileManager defaultManager] removeFileAtPath:path handler:nil];
+ [path release];
+ }
+ free((void *)stream.URL);
+ [URL release];
+ [super dealloc];
+}
+
+- (void)setPluginPointer:(NPP)pluginPointer
+{
+ instance = pluginPointer;
+
+ WebNetscapePlugin *plugin = [(WebBaseNetscapePluginView *)instance->ndata plugin];
+
+ NPP_NewStream = [plugin NPP_NewStream];
+ NPP_WriteReady = [plugin NPP_WriteReady];
+ NPP_Write = [plugin NPP_Write];
+ NPP_StreamAsFile = [plugin NPP_StreamAsFile];
+ NPP_DestroyStream = [plugin NPP_DestroyStream];
+ NPP_URLNotify = [plugin NPP_URLNotify];
+}
+
+- (void)setResponse:(WebResourceResponse *)response
+{
+ [URL release];
+ URL = [[response URL] retain];
+
+ NSString *mimeType = [response contentType];
+ NSString *URLString = [URL absoluteString];
+ char *cURL = (char *)malloc([URLString cStringLength]+1);
+ [URLString getCString:cURL];
+
+ NSNumber *timeInterval = nil;
+ uint32 lastModified = 0;
+
+ if ([response isKindOfClass:[WebHTTPResourceResponse class]]) {
+ timeInterval = [[(WebHTTPResourceResponse *)response headers] objectForKey:@"Last-Modified"];
+ if(timeInterval){
+ NSTimeInterval lastModifiedInterval;
+ lastModifiedInterval = [[NSDate dateWithTimeIntervalSinceReferenceDate:[timeInterval doubleValue]] timeIntervalSince1970];
+ if(lastModifiedInterval > 0){
+ lastModified = (uint32)lastModifiedInterval;
+ }
+ }
+ }
+
+ stream.ndata = self;
+ stream.URL = cURL;
+ stream.end = [response contentLength];
+ stream.lastmodified = lastModified;
+ stream.notifyData = notifyData;
+
+
+ // FIXME: Need a way to check if stream is seekable
+
+ NPError npErr;
+ npErr = NPP_NewStream(instance, (char *)[mimeType cString], &stream, NO, &transferMode);
+ LOG(Plugins, "NPP_NewStream: %d %s", npErr, [[URL absoluteString] cString]);
+
+ if(npErr != NPERR_NO_ERROR){
+ // FIXME: Need to properly handle this error.
+ return;
+ }
+
+ if(transferMode == NP_NORMAL)
+ LOG(Plugins, "Stream type: NP_NORMAL");
+ else if(transferMode == NP_ASFILEONLY)
+ LOG(Plugins, "Stream type: NP_ASFILEONLY");
+ else if(transferMode == NP_ASFILE)
+ LOG(Plugins, "Stream type: NP_ASFILE");
+ else if(transferMode == NP_SEEK){
+ LOG(Plugins, "Stream type: NP_SEEK not yet supported");
+ // FIXME: Need to properly handle this error.
+ return;
+ }
+}
+
+- (void)receivedData:(NSData *)data
+{
+ if(transferMode != NP_ASFILEONLY){
+ int32 numBytes = NPP_WriteReady(instance, &stream);
+ LOG(Plugins, "NPP_WriteReady bytes=%lu", numBytes);
+
+ numBytes = NPP_Write(instance, &stream, offset, [data length], (void *)[data bytes]);
+ LOG(Plugins, "NPP_Write bytes=%lu", numBytes);
+
+ offset += [data length];
+ }
+}
+
+- (void)receivedError:(NPError)error
+{
+ NPError npErr;
+ npErr = NPP_DestroyStream(instance, &stream, error);
+ LOG(Plugins, "NPP_DestroyStream: %d", npErr);
+}
+
+- (void)finishedLoadingWithData:(NSData *)data
+{
+ NPError npErr;
+ NSFileManager *fileManager;
+ NSString *filename, *carbonPath;
+
+ filename = [[URL path] lastPathComponent];
+ if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
+ // FIXME: Need to use something like mkstemp?
+ path = [[NSString stringWithFormat:@"/tmp/%@", filename] retain];
+ fileManager = [NSFileManager defaultManager];
+ [fileManager removeFileAtPath:path handler:nil];
+ [fileManager createFileAtPath:path contents:data attributes:nil];
+
+ // FIXME: Will cString use the correct character set?
+ carbonPath = [[NSFileManager defaultManager] _web_carbonPathForPath:path];
+ NPP_StreamAsFile(instance, &stream, [carbonPath cString]);
+ LOG(Plugins, "NPP_StreamAsFile: %s", [carbonPath cString]);
+ }
+ npErr = NPP_DestroyStream(instance, &stream, NPRES_DONE);
+ LOG(Plugins, "NPP_DestroyStream: %d", npErr);
+
+ if(notifyData){
+ NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
+ LOG(Plugins, "NPP_URLNotify");
+ }
+}
+
+ at end
+
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
index fd16b0a..ea01d91 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
@@ -67,7 +67,7 @@
- (BOOL)sendEvent:(EventRecord *)event;
- (BOOL)sendUpdateEvent;
-- (NPP)pluginInstance;
+- (NPP)pluginPointer;
- (void)setUpWindowAndPort;
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 096ddf8..2c22e44 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -16,7 +16,7 @@
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
-#import <WebKit/WebPluginStream.h>
+#import <WebKit/WebNetscapePluginStream.h>
#import <WebKit/WebPluginNullEventSender.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebView.h>
@@ -403,8 +403,8 @@
#if 0
// Draw test
Rect portRect;
- GetPortBounds(port, &portRect);
- SetPort(port);
+ GetPortBounds(nPort.port, &portRect);
+ SetPort(nPort.port);
MoveTo(0,0);
LineTo(portRect.right, portRect.bottom);
#endif
@@ -513,6 +513,11 @@
return [[self webFrame] controller];
}
+- (NPP)pluginPointer
+{
+ return instance;
+}
+
- (WebNetscapePlugin *)plugin
{
return plugin;
@@ -623,7 +628,11 @@
- (void)drawRect:(NSRect)rect
{
- if (isStarted) {
+ if (!isStarted) {
+ return;
+ }
+
+ if([NSGraphicsContext currentContextDrawingToScreen]){
// AppKit tried to help us by doing a BeginUpdate.
// But the invalid region at that level didn't include AppKit's notion of what was not valid.
// We reset the port's visible region to counteract what BeginUpdate did.
@@ -640,6 +649,18 @@
SetPortVisibleRegion(nPort.port, savedVisibleRegion);
DisposeRgn(savedVisibleRegion);
+ }else{
+ // Printing
+
+ PixMapHandle srcMap, dstMap;
+ Rect rect;
+
+ dstMap = NewPixMap();
+ srcMap = GetPortPixMap(nPort.port);
+ SetRect(&rect, window.x, window.y, window.x + window.width, window.y + window.height);
+ CopyBits((BitMap *)srcMap, (BitMap *)dstMap, &rect, &rect, srcCopy, NULL);
+
+ NSLog(@"%d", QDError());
}
}
@@ -725,12 +746,6 @@
//FIXME: Need to send other NPReasons
}
-- (NPP)pluginInstance
-{
- return instance;
-}
-
-
@end
@implementation WebBaseNetscapePluginView (WebNPPCallbacks)
@@ -754,28 +769,25 @@
- (NPError)loadRequest:(WebResourceRequest *)request inTarget:(NSString *)target withNotifyData:(void *)notifyData
{
- WebNetscapePluginStream *stream;
- WebDataSource *dataSource;
- WebFrame *frame;
- NSURL *URL;
-
- URL = [request URL];
+ NSURL *URL = [request URL];
if(!URL){
return NPERR_INVALID_URL;
}
if(!target){
- stream = [[WebNetscapePluginStream alloc] initWithURL:URL pluginPointer:instance notifyData:notifyData];
+ WebNetscapePluginStream *stream = [[WebNetscapePluginStream alloc] initWithRequest:request
+ pluginPointer:instance
+ notifyData:notifyData];
if(stream){
[streams addObject:stream];
- [stream startLoad];
+ [stream start];
[stream release];
}else{
return NPERR_INVALID_URL;
}
}else{
- frame = [[self webFrame] frameNamed:target];
+ WebFrame *frame = [[self webFrame] frameNamed:target];
if(!frame){
// FIXME: Why is it OK to just discard all the attributes in this case?
[[self controller] _openNewWindowWithURL:URL referrer:nil behind:NO];
@@ -797,7 +809,7 @@
// but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
// so we have to allow this as well. Needed for iTools.
}
- dataSource = [[WebDataSource alloc] initWithRequest:request];
+ WebDataSource *dataSource = [[WebDataSource alloc] initWithRequest:request];
if ([frame setProvisionalDataSource:dataSource]) {
[frame startLoading];
}
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index f1c55a9..da4eed0 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -3,12 +3,11 @@
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/WebNetscapePluginDocumentView.h>
-
#import <WebKit/WebController.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebFrame.h>
+#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginDatabase.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h
new file mode 100644
index 0000000..878868c
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.h
@@ -0,0 +1,17 @@
+/*
+ WebNetscapePluginRepresentation.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+#import <WebKit/WebBaseNetscapePluginStream.h>
+
+ at protocol WebDocumentRepresentation;
+
+ at interface WebNetscapePluginRepresentation : WebBaseNetscapePluginStream <WebDocumentRepresentation>
+{
+
+}
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
new file mode 100644
index 0000000..9957c78
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -0,0 +1,43 @@
+/*
+ WebNetscapePluginRepresentation.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebNetscapePluginDocumentView.h>
+#import <WebKit/WebNetscapePluginRepresentation.h>
+#import <WebKit/WebView.h>
+
+#import <WebFoundation/WebFoundation.h>
+
+ at implementation WebNetscapePluginRepresentation
+
+- (void)setDataSource:(WebDataSource *)dataSource
+{
+}
+
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
+{
+ if(!instance){
+ [self setPluginPointer:[(WebNetscapePluginDocumentView *)[[[dataSource webFrame] webView] documentView] pluginPointer]];
+ [self setResponse:[dataSource response]];
+ }
+ [self receivedData:data];
+}
+
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
+{
+ if([error errorCode] == WebErrorCodeCancelled){
+ [self receivedError:NPRES_USER_BREAK];
+ } else {
+ [self receivedError:NPRES_NETWORK_ERR];
+ }
+}
+
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
+{
+ [self finishedLoadingWithData:[dataSource data]];
+}
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
new file mode 100644
index 0000000..127689f
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -0,0 +1,36 @@
+/*
+ WebNetscapePluginStream.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+#import <WebKit/npapi.h>
+#import <WebKit/WebBaseNetscapePluginStream.h>
+
+ at class WebBaseNetscapePluginView;
+ at class WebResourceHandle;
+ at class WebResourceRequest;
+ at protocol WebResourceHandleDelegate;
+
+ at interface WebNetscapePluginStream : WebBaseNetscapePluginStream <WebResourceHandleDelegate>
+{
+ WebBaseNetscapePluginView *view;
+
+ WebResourceRequest *request;
+ WebResourceHandle *resource;
+
+ NSMutableData *resourceData;
+
+ NSURL *currentURL;
+}
+
+- initWithRequest:(WebResourceRequest *)theRequest
+ pluginPointer:(NPP)thePluginPointer
+ notifyData:(void *)theNotifyData;
+
+- (void)start;
+
+- (void)stop;
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
new file mode 100644
index 0000000..8fdf478
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -0,0 +1,165 @@
+/*
+ WebNetscapePluginStream.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
+
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNetscapePluginEmbeddedView.h>
+#import <WebKit/WebNetscapePluginStream.h>
+
+#import <WebFoundation/WebFoundation.h>
+
+ at implementation WebNetscapePluginStream
+
+- (void)setCurrentURL:(NSURL *)theCurrentURL
+{
+ [currentURL release];
+ currentURL = [theCurrentURL retain];
+}
+
+- initWithRequest:(WebResourceRequest *)theRequest
+ pluginPointer:(NPP)thePluginPointer
+ notifyData:(void *)theNotifyData
+{
+ [super init];
+
+ if(!theRequest || !thePluginPointer || ![WebResourceHandle canInitWithRequest:theRequest]){
+ return nil;
+ }
+
+ request = [theRequest retain];
+
+ [self setCurrentURL:[theRequest URL]];
+
+ [self setPluginPointer:thePluginPointer];
+
+ view = [(WebBaseNetscapePluginView *)instance->ndata retain];
+
+ notifyData = theNotifyData;
+ resourceData = [[NSMutableData alloc] init];
+
+ return self;
+}
+
+- (void)dealloc
+{
+ [resourceData release];
+ [request release];
+ [currentURL release];
+ [super dealloc];
+}
+
+- (void)start
+{
+ resource = [[WebResourceHandle alloc] initWithRequest:request];
+ [resource loadWithDelegate:self];
+ [[view controller] _didStartLoading:currentURL];
+}
+
+- (void)stop
+{
+ [view release];
+ view = nil;
+
+ if (!resource) {
+ return;
+ }
+
+ // Stopped while loading.
+
+ [resource cancel];
+
+ WebController *controller = [view controller];
+
+ WebError *cancelError = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
+ inDomain:WebErrorDomainWebFoundation
+ failingURL:nil];
+ [controller _receivedError:cancelError
+ forResourceHandle:resource
+ fromDataSource:[view dataSource]];
+
+ [cancelError release];
+
+ [resource release];
+ resource = nil;
+
+ if(URL){
+ // Send error only if the response has been set (the URL is set with the response).
+ [self receivedError:NPRES_USER_BREAK];
+ }
+
+ [controller _didStopLoading:currentURL];
+}
+
+- (void)loadEnded
+{
+ [resource release];
+ resource = nil;
+
+ [self stop];
+}
+
+- (WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)theRequest
+{
+ WebController *webController = [view controller];
+
+ [webController _didStopLoading:currentURL];
+
+ [self setCurrentURL:[theRequest URL]];
+
+ [webController _didStartLoading:currentURL];
+
+ return theRequest;
+}
+
+- (void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
+{
+ [self setResponse:theResponse];
+}
+
+- (void)handle:(WebResourceHandle *)handle didReceiveData:(NSData *)data
+{
+ ASSERT(resource == handle);
+
+ if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
+ [resourceData appendData:data];
+ }
+
+ [self receivedData:data];
+
+ [[view controller] _receivedProgressForResourceHandle: handle fromDataSource: [view dataSource] complete: NO];
+}
+
+- (void)handleDidFinishLoading:(WebResourceHandle *)handle
+{
+ ASSERT(resource == handle);
+
+ WebController *controller = [view controller];
+
+ [controller _receivedProgressForResourceHandle: handle fromDataSource: [view dataSource] complete: YES];
+
+ [self finishedLoadingWithData:resourceData];
+
+ [controller _didStopLoading:currentURL];
+
+ [self loadEnded];
+}
+
+- (void)handle:(WebResourceHandle *)handle didFailLoadingWithError:(WebError *)result
+{
+ ASSERT(resource == handle);
+
+ WebController *controller = [view controller];
+
+ [controller _receivedError: result forResourceHandle: handle
+ fromDataSource: [view dataSource]];
+
+ [self receivedError:NPRES_NETWORK_ERR];
+
+ [controller _didStopLoading:currentURL];
+
+ [self loadEnded];
+}
+
+ at end
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 0208b58..3e62a3e 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -8,7 +8,7 @@
#import <WebKit/WebNetscapePluginDocumentView.h>
#import <WebKit/WebPlugin.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebPluginStream.h>
+#import <WebKit/WebNetscapePluginRepresentation.h>
#import <WebKit/WebView.h>
#import <WebKit/WebViewPrivate.h>
@@ -148,8 +148,6 @@ static NSArray *pluginLocations(void)
plugins = [pluginArray copy];
// Register plug-in WebDocumentViews and WebDocumentRepresentations
-
-
NSArray *viewTypes = [[WebView _viewTypes] allKeys];
NSArray *mimes = [self MIMETypes];
NSString *mime;
@@ -160,7 +158,7 @@ static NSArray *pluginLocations(void)
// Don't override previously registered types.
if(![viewTypes containsObject:mime]){
[WebView registerViewClass:[WebNetscapePluginDocumentView class] forMIMEType:mime];
- [WebDataSource registerRepresentationClass:[WebNetscapePluginStream class] forMIMEType:mime];
+ [WebDataSource registerRepresentationClass:[WebNetscapePluginRepresentation class] forMIMEType:mime];
}
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
deleted file mode 100644
index 7c28e23..0000000
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- WebPluginStream.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
-#import <WebKit/npapi.h>
-
- at class WebBaseNetscapePluginView;
- at class WebDataSource;
- at class WebResourceHandle;
- at class WebResourceResponse;
- at class WebResourceRequest;
-
- at protocol WebDocumentRepresentation;
-
- at interface WebNetscapePluginStream : NSObject <WebDocumentRepresentation>
-{
- WebBaseNetscapePluginView *view;
- NSURL *URL;
- NPP instance;
- uint16 transferMode;
- int32 offset;
- NPStream npStream;
- NSString *path;
-
- void *notifyData;
-
- BOOL isFirstChunk;
-
- WebResourceRequest *request;
- WebResourceHandle *resource;
- WebResourceResponse *response;
- NSMutableData *resourceData;
-
- NPP_NewStreamProcPtr NPP_NewStream;
- NPP_DestroyStreamProcPtr NPP_DestroyStream;
- NPP_StreamAsFileProcPtr NPP_StreamAsFile;
- NPP_WriteReadyProcPtr NPP_WriteReady;
- NPP_WriteProcPtr NPP_Write;
- NPP_URLNotifyProcPtr NPP_URLNotify;
-}
-
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData;
-
-- (void)startLoad;
-- (void)stop;
-
- at end
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
deleted file mode 100644
index ba14403..0000000
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- WebPluginStream.m
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebBaseNetscapePluginView.h>
-#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebDataSource.h>
-#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebFrame.h>
-#import <WebKit/WebKitLogging.h>
-#import <WebKit/WebPlugin.h>
-#import <WebKit/WebPluginStream.h>
-#import <WebKit/WebView.h>
-
-#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebNSFileManagerExtras.h>
-#import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceRequest.h>
-#import <WebFoundation/WebResourceResponse.h>
-#import <WebFoundation/WebHTTPResourceResponse.h>
-
- at interface WebNetscapePluginStream (ClassInternal)
-- (void)receivedData:(NSData *)data;
-- (void)receivedError:(NPError)error;
-- (void)finishedLoadingWithData:(NSData *)data;
-- (void)setResponse:(WebResourceResponse *)theReponse;
-- (void)cancel;
- at end
-
- at interface WebNetscapePluginStream (WebResourceHandleDelegate) <WebResourceHandleDelegate>
- at end
-
- at implementation WebNetscapePluginStream
-
-- (void) getFunctionPointersFromPluginView:(WebBaseNetscapePluginView *)pluginView
-{
- ASSERT(pluginView);
-
- WebNetscapePlugin *plugin = [pluginView plugin];
-
- NPP_NewStream = [plugin NPP_NewStream];
- NPP_WriteReady = [plugin NPP_WriteReady];
- NPP_Write = [plugin NPP_Write];
- NPP_StreamAsFile = [plugin NPP_StreamAsFile];
- NPP_DestroyStream = [plugin NPP_DestroyStream];
- NPP_URLNotify = [plugin NPP_URLNotify];
-}
-
-- init
-{
- [super init];
-
- isFirstChunk = YES;
-
- return self;
-}
-
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData
-{
- [super init];
-
- if(!theURL || !thePluginPointer){
- return nil;
- }
-
- request = [[WebResourceRequest alloc] initWithURL:theURL];
- if(![WebResourceHandle canInitWithRequest:request]){
- [request release];
- return nil;
- }
-
- view = [(WebBaseNetscapePluginView *)thePluginPointer->ndata retain];
- ASSERT(view);
- URL = [theURL retain];
- instance = thePluginPointer;
- notifyData = theNotifyData;
- resourceData = [[NSMutableData alloc] init];
-
- [self getFunctionPointersFromPluginView:view];
-
- isFirstChunk = YES;
-
- return self;
-}
-
-- (void) dealloc
-{
- [self stop];
-
- if(path){
- [[NSFileManager defaultManager] removeFileAtPath:path handler:nil];
- [path release];
- }
- free((void *)npStream.URL);
- [URL release];
- [resourceData release];
- [request release];
- [super dealloc];
-}
-
-- (void)startLoad
-{
- resource = [[WebResourceHandle alloc] initWithRequest:request];
- [resource loadWithDelegate:self];
- [[view controller] _didStartLoading:[request URL]];
-}
-
-- (void)stop
-{
- [self cancel];
- [resource release];
- resource = nil;
- [view release];
- view = nil;
-}
-
-- (void)receivedData:(NSData *)data
-{
- if(isFirstChunk){
-
- NSString *mimeType = [response contentType];
- NSString *URLString = [[response URL] absoluteString];
- char *cURL = (char *)malloc([URLString cStringLength]+1);
- [URLString getCString:cURL];
-
- NSNumber *timeInterval = nil;
- uint32 lastModified = 0;
-
- if ([response isKindOfClass:[WebHTTPResourceResponse class]]) {
- timeInterval = [[(WebHTTPResourceResponse *)response headers] objectForKey:@"Last-Modified"];
- if(timeInterval){
- NSTimeInterval lastModifiedInterval;
- lastModifiedInterval = [[NSDate dateWithTimeIntervalSinceReferenceDate:[timeInterval doubleValue]] timeIntervalSince1970];
- if(lastModifiedInterval > 0){
- lastModified = (uint32)lastModifiedInterval;
- }
- }
- }
-
- npStream.ndata = self;
- npStream.URL = cURL;
- npStream.end = [response contentLength];
- npStream.lastmodified = lastModified;
- npStream.notifyData = notifyData;
-
- offset = 0;
-
- // FIXME: Need a way to check if stream is seekable
-
- NPError npErr = NPP_NewStream(instance, (char *)[mimeType cString], &npStream, NO, &transferMode);
- LOG(Plugins, "NPP_NewStream: %d %s", npErr, [[URL absoluteString] cString]);
-
- if(npErr != NPERR_NO_ERROR){
- [self stop];
- return;
- }
-
- if(transferMode == NP_NORMAL)
- LOG(Plugins, "Stream type: NP_NORMAL");
- else if(transferMode == NP_ASFILEONLY)
- LOG(Plugins, "Stream type: NP_ASFILEONLY");
- else if(transferMode == NP_ASFILE)
- LOG(Plugins, "Stream type: NP_ASFILE");
- else if(transferMode == NP_SEEK){
- LOG(Plugins, "Stream type: NP_SEEK not yet supported");
- [self stop];
- return;
- }
-
- isFirstChunk = NO;
- }
-
- if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
- // only need to buffer data in this case
- [resourceData appendData:data];
- }
-
- if(transferMode != NP_ASFILEONLY){
- int32 numBytes = NPP_WriteReady(instance, &npStream);
- LOG(Plugins, "NPP_WriteReady bytes=%lu", numBytes);
-
- numBytes = NPP_Write(instance, &npStream, offset, [data length], (void *)[data bytes]);
- LOG(Plugins, "NPP_Write bytes=%lu", numBytes);
-
- offset += [data length];
- }
-}
-
-- (void)receivedError:(NPError)error
-{
- // Don't report error before we've called NPP_NewStream
- if(!isFirstChunk){
-#if !LOG_DISABLED
- NPError npErr =
-#endif
- NPP_DestroyStream(instance, &npStream, error);
- LOG(Plugins, "NPP_DestroyStream: %d", npErr);
- }
-}
-
-- (void)finishedLoadingWithData:(NSData *)data
-{
- NPError npErr;
- NSFileManager *fileManager;
- NSString *filename, *carbonPath;
-
- filename = [[URL path] lastPathComponent];
- if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
- // FIXME: Need to use something like mkstemp?
- path = [[NSString stringWithFormat:@"/tmp/%@", filename] retain];
- fileManager = [NSFileManager defaultManager];
- [fileManager removeFileAtPath:path handler:nil];
- [fileManager createFileAtPath:path contents:data attributes:nil];
-
- // FIXME: Will cString use the correct character set?
- carbonPath = [[NSFileManager defaultManager] _web_carbonPathForPath:path];
- NPP_StreamAsFile(instance, &npStream, [carbonPath cString]);
- LOG(Plugins, "NPP_StreamAsFile: %s", [carbonPath cString]);
- }
- npErr = NPP_DestroyStream(instance, &npStream, NPRES_DONE);
- LOG(Plugins, "NPP_DestroyStream: %d", npErr);
-
- if(notifyData){
- NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
- LOG(Plugins, "NPP_URLNotify");
- }
-
- [self stop];
-}
-
-- (void)setResponse:(WebResourceResponse *)theResponse
-{
- [response release];
- response = [theResponse retain];
-}
-
-#pragma mark WebDocumentRepresentation
-
-- (void)setDataSource:(WebDataSource *)dataSource
-{
- [self setResponse:[dataSource response]];
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
-{
- ASSERT(dataSource);
- ASSERT([dataSource webFrame]);
- ASSERT([[dataSource webFrame] webView]);
- ASSERT([[[dataSource webFrame] webView] documentView]);
- ASSERT([(WebBaseNetscapePluginView *)[[[dataSource webFrame] webView] documentView] pluginInstance]);
-
- if(isFirstChunk){
- WebFrame *frame = [dataSource webFrame];
- WebView *webView = [frame webView];
- view = [[webView documentView] retain];
- instance = [view pluginInstance];
-
- [self getFunctionPointersFromPluginView:view];
- }
-
- [self receivedData:data];
-}
-
-- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
-{
- if([error errorCode] == WebErrorCodeCancelled){
- [self receivedError:NPRES_USER_BREAK];
- } else {
- [self receivedError:NPRES_NETWORK_ERR];
- }
-}
-
-- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
-{
- [self finishedLoadingWithData:[dataSource data]];
-}
-
- at end
-
-#pragma mark WebResourceHandle
-
- at implementation WebNetscapePluginStream (WebResourceHandleDelegate)
-
--(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)theRequest
-{
- WebController *webController = [view controller];
-
- [webController _didStopLoading:URL];
- // FIXME: This next line is not sufficient. We don't do anything to remember the new URL.
- [webController _didStartLoading:[theRequest URL]];
-
- return theRequest;
-}
-
-- (void)handle:(WebResourceHandle *)handle didReceiveResponse:(WebResourceResponse *)theResponse
-{
- [self setResponse:theResponse];
-}
-
-- (void)handle:(WebResourceHandle *)handle didReceiveData:(NSData *)data
-{
- ASSERT(resource == handle);
-
- [self receivedData:data];
-
- [[view controller] _receivedProgressForResourceHandle: handle fromDataSource: [view dataSource] complete: NO];
-}
-
-- (void)handleDidFinishLoading:(WebResourceHandle *)handle
-{
- ASSERT(resource == handle);
-
- [resource release];
- resource = nil;
-
- WebController *controller = [view controller];
-
- [controller _receivedProgressForResourceHandle: handle fromDataSource: [view dataSource] complete: YES];
-
- [self finishedLoadingWithData:resourceData];
-
- [controller _didStopLoading:URL];
-}
-
-- (void)cancel
-{
- if (resource == nil) {
- return;
- }
-
- [resource cancel];
-
- WebController *controller = [view controller];
-
- WebError *cancelError = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
- inDomain:WebErrorDomainWebFoundation
- failingURL:nil];
- [controller _receivedError: cancelError forResourceHandle: resource
- fromDataSource: [view dataSource]];
-
- [cancelError release];
-
- [self receivedError:NPRES_USER_BREAK];
-
- [controller _didStopLoading:URL];
-
- [resource release];
- resource = nil;
-}
-
-- (void)handle:(WebResourceHandle *)handle didFailLoadingWithError:(WebError *)result
-{
- ASSERT(resource == handle);
-
- [resource release];
- resource = nil;
-
- WebController *controller = [view controller];
-
- [controller _receivedError: result forResourceHandle: handle
- fromDataSource: [view dataSource]];
-
- [self receivedError:NPRES_NETWORK_ERR];
-
- [controller _didStopLoading:URL];
-}
-
- at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 46062c1..02d8c2f 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -283,6 +283,8 @@
F57D1955034E734901A80180,
F57D1959034E734901A80180,
EDD9133E03576ADA00C1A526,
+ 83402EF8035A588900BE770A,
+ 83402EFC035A58D100BE770A,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -378,6 +380,8 @@
F57D195A034E734901A80180,
9367C637034E9F00008635C5,
EDD9134003576AFF00C1A526,
+ 83402EF9035A588900BE770A,
+ 83402EFD035A58D100BE770A,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1304,6 +1308,54 @@
//832
//833
//834
+ 83402EF6035A588900BE770A = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebNetscapePluginRepresentation.h;
+ refType = 4;
+ };
+ 83402EF7035A588900BE770A = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebNetscapePluginRepresentation.m;
+ refType = 4;
+ };
+ 83402EF8035A588900BE770A = {
+ fileRef = 83402EF6035A588900BE770A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 83402EF9035A588900BE770A = {
+ fileRef = 83402EF7035A588900BE770A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 83402EFA035A58D100BE770A = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebNetscapePluginStream.h;
+ refType = 4;
+ };
+ 83402EFB035A58D100BE770A = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebNetscapePluginStream.m;
+ refType = 4;
+ };
+ 83402EFC035A58D100BE770A = {
+ fileRef = 83402EFA035A58D100BE770A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 83402EFD035A58D100BE770A = {
+ fileRef = 83402EFB035A58D100BE770A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
8398847A03426FB000BC5F5E = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -2457,13 +2509,13 @@
F5A672B90263866E01000102 = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebPluginStream.h;
+ path = WebBaseNetscapePluginStream.h;
refType = 4;
};
F5A672BA0263866E01000102 = {
fileEncoding = 4;
isa = PBXFileReference;
- path = WebPluginStream.m;
+ path = WebBaseNetscapePluginStream.m;
refType = 4;
};
F5A672BB0263866E01000102 = {
@@ -2784,6 +2836,10 @@
};
F5EBC45202134BB601CA1520 = {
children = (
+ F5F717220288493C018635CA,
+ F5F717230288493C018635CA,
+ F5A672B90263866E01000102,
+ F5A672BA0263866E01000102,
F5EBC45502134BC301CA1520,
931A72D203265920008635CE,
F5EBC45602134BC301CA1520,
@@ -2791,18 +2847,18 @@
84D4BFFC0348EF9D00CA2ACA,
84D4BFF70348EF7600CA2ACA,
84D4BFF80348EF7600CA2ACA,
+ 83402EF6035A588900BE770A,
+ 83402EF7035A588900BE770A,
+ 83402EFA035A58D100BE770A,
+ 83402EFB035A58D100BE770A,
F5883BE0025E5E9D01000102,
F5883BE1025E5E9D01000102,
F5A672B70263866E01000102,
F5A672B80263866E01000102,
- F5A672B90263866E01000102,
- F5A672BA0263866E01000102,
F5F7171E0288493C018635CA,
F5F7171F0288493C018635CA,
F5F717200288493C018635CA,
F5F717210288493C018635CA,
- F5F717220288493C018635CA,
- F5F717230288493C018635CA,
);
isa = PBXGroup;
name = Plugins;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list