[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:04:12 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 8ea709e72dfbed83001bd688f7dc8b5fc96112e4
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 9 23:45:54 2002 +0000

    - Moved plug-in streams to IFPluginStream
    - Put IFPluginNullEventSender to it own file.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Plugins.subproj/IFPluginNullEventSender.h b/WebKit/Plugins.subproj/IFPluginNullEventSender.h
new file mode 100644
index 0000000..e7ef2ac
--- /dev/null
+++ b/WebKit/Plugins.subproj/IFPluginNullEventSender.h
@@ -0,0 +1,21 @@
+//
+//  IFPluginNullEventSender.h
+//  WebKit
+//
+//  Created by Chris Blumenberg on Mon Apr 08 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <npapi.h>
+
+ at interface IFPluginNullEventSender : NSObject{
+    NPP instance;
+    NPP_HandleEventProcPtr NPP_HandleEvent;
+    bool shouldStop;
+}
+
+-(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)HandleEventFunction;
+-(void)sendNullEvents;
+-(void)stop;
+ at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/IFPluginNullEventSender.m b/WebKit/Plugins.subproj/IFPluginNullEventSender.m
new file mode 100644
index 0000000..b71ca1a
--- /dev/null
+++ b/WebKit/Plugins.subproj/IFPluginNullEventSender.m
@@ -0,0 +1,47 @@
+//
+//  IFPluginNullEventSender.m
+//  WebKit
+//
+//  Created by Chris Blumenberg on Mon Apr 08 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import "IFPluginNullEventSender.h"
+#import <Carbon/Carbon.h>
+#import <WebKitDebug.h>
+
+ at implementation IFPluginNullEventSender
+
+-(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)HandleEventFunction;
+{
+    instance = pluginInstance;
+    NPP_HandleEvent = HandleEventFunction;
+    shouldStop = FALSE;
+    return self;
+}
+
+-(void)sendNullEvents
+{
+    EventRecord event;
+    bool acceptedEvent;
+    UnsignedWide msecs;
+    
+    if(!shouldStop){
+        event.what = nullEvent;
+        Microseconds(&msecs);
+        event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
+        acceptedEvent = NPP_HandleEvent(instance, &event);
+        //KWQDebug("NPP_HandleEvent(nullEvent): %d  when: %u %d\n", acceptedEvent, (unsigned)event.when, shouldStop);
+        [self performSelector:@selector(sendNullEvents) withObject:nil afterDelay:.1];
+    }
+}
+
+-(void) stop
+{
+    WEBKITDEBUG("Stopping null events\n");
+    shouldStop = TRUE;
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
+}
+
+ at end
+
diff --git a/WebKit/Plugins.subproj/IFPluginStream.h b/WebKit/Plugins.subproj/IFPluginStream.h
new file mode 100644
index 0000000..7c1f3a8
--- /dev/null
+++ b/WebKit/Plugins.subproj/IFPluginStream.h
@@ -0,0 +1,33 @@
+//
+//  IFPluginStream.h
+//  WebKit
+//
+//  Created by Chris Blumenberg on Tue Apr 09 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <npapi.h>
+
+ at interface IFPluginStream : NSObject {
+    uint16 transferMode;
+    int32 offset;
+    NPStream *npStream;
+    NSString *filename, *mimeType;
+    NSMutableData *data;
+}
+
+- initWithURL:(NSURL *) streamURL mimeType:(NSString *)mime notifyData:(void *)notifyData;
+- (uint16) transferMode;
+- (int32) offset;
+- (NPStream *) npStream;
+- (NSString *) filename;
+- (NSString *) mimeType;
+- (NSMutableData *) data;
+
+- (void) setFilename:(NSString *)file;
+- (void) setData:(NSMutableData *)newData;
+- (void) setTransferMode:(uint16)tMode;
+- (void) incrementOffset:(int32)addition;
+
+ at end
diff --git a/WebKit/Plugins.subproj/IFPluginStream.m b/WebKit/Plugins.subproj/IFPluginStream.m
new file mode 100644
index 0000000..96e30e1
--- /dev/null
+++ b/WebKit/Plugins.subproj/IFPluginStream.m
@@ -0,0 +1,91 @@
+//
+//  IFPluginStream.m
+//  WebKit
+//
+//  Created by Chris Blumenberg on Tue Apr 09 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import "IFPluginStream.h"
+
+
+ at implementation IFPluginStream
+
+- initWithURL:(NSURL *)streamURL mimeType:(NSString *)mime notifyData:(void *)notifyData
+{
+    char * cURL;
+    NSString *streamURLString;
+    
+    mimeType = [mime retain];
+    
+    streamURLString = [streamURL absoluteString];
+    cURL   = malloc([streamURLString length]+1);
+    [streamURLString getCString:cURL];
+    
+    npStream = malloc(sizeof(NPStream));
+    npStream->url = cURL;
+    npStream->end = 0;
+    npStream->lastmodified = 0;
+    npStream->notifyData = notifyData;
+    offset = 0;
+    
+    return self;
+}
+
+
+- (uint16) transferMode
+{
+    return transferMode;
+}
+
+
+- (int32) offset
+{
+    return offset;
+}
+
+
+- (NPStream *) npStream
+{
+    return npStream;
+}
+
+
+- (NSString *) filename
+{
+    return filename;
+}
+
+
+- (NSString *) mimeType
+{
+    return mimeType;
+}
+
+
+- (NSMutableData *) data
+{
+    return data;
+}
+
+
+- (void) setFilename:(NSString *)file
+{
+    filename = [file retain];
+}
+
+- (void) setTransferMode:(uint16)tMode
+{
+    transferMode = tMode;
+}
+
+- (void) setData:(NSMutableData *)newData
+{
+    data = [newData retain];
+}
+
+- (void) incrementOffset:(int32)addition
+{
+    offset += addition;
+}
+ at end
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.h b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
new file mode 100644
index 0000000..e7ef2ac
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
@@ -0,0 +1,21 @@
+//
+//  IFPluginNullEventSender.h
+//  WebKit
+//
+//  Created by Chris Blumenberg on Mon Apr 08 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <npapi.h>
+
+ at interface IFPluginNullEventSender : NSObject{
+    NPP instance;
+    NPP_HandleEventProcPtr NPP_HandleEvent;
+    bool shouldStop;
+}
+
+-(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)HandleEventFunction;
+-(void)sendNullEvents;
+-(void)stop;
+ at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
new file mode 100644
index 0000000..b71ca1a
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
@@ -0,0 +1,47 @@
+//
+//  IFPluginNullEventSender.m
+//  WebKit
+//
+//  Created by Chris Blumenberg on Mon Apr 08 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import "IFPluginNullEventSender.h"
+#import <Carbon/Carbon.h>
+#import <WebKitDebug.h>
+
+ at implementation IFPluginNullEventSender
+
+-(id)initializeWithNPP:(NPP)pluginInstance functionPointer:(NPP_HandleEventProcPtr)HandleEventFunction;
+{
+    instance = pluginInstance;
+    NPP_HandleEvent = HandleEventFunction;
+    shouldStop = FALSE;
+    return self;
+}
+
+-(void)sendNullEvents
+{
+    EventRecord event;
+    bool acceptedEvent;
+    UnsignedWide msecs;
+    
+    if(!shouldStop){
+        event.what = nullEvent;
+        Microseconds(&msecs);
+        event.when = (uint32)((double)UnsignedWideToUInt64(msecs) / 1000000 * 60); // microseconds to ticks
+        acceptedEvent = NPP_HandleEvent(instance, &event);
+        //KWQDebug("NPP_HandleEvent(nullEvent): %d  when: %u %d\n", acceptedEvent, (unsigned)event.when, shouldStop);
+        [self performSelector:@selector(sendNullEvents) withObject:nil afterDelay:.1];
+    }
+}
+
+-(void) stop
+{
+    WEBKITDEBUG("Stopping null events\n");
+    shouldStop = TRUE;
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
+}
+
+ at end
+
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
new file mode 100644
index 0000000..7c1f3a8
--- /dev/null
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -0,0 +1,33 @@
+//
+//  IFPluginStream.h
+//  WebKit
+//
+//  Created by Chris Blumenberg on Tue Apr 09 2002.
+//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <npapi.h>
+
+ at interface IFPluginStream : NSObject {
+    uint16 transferMode;
+    int32 offset;
+    NPStream *npStream;
+    NSString *filename, *mimeType;
+    NSMutableData *data;
+}
+
+- initWithURL:(NSURL *) streamURL mimeType:(NSString *)mime notifyData:(void *)notifyData;
+- (uint16) transferMode;
+- (int32) offset;
+- (NPStream *) npStream;
+- (NSString *) filename;
+- (NSString *) mimeType;
+- (NSMutableData *) data;
+
+- (void) setFilename:(NSString *)file;
+- (void) setData:(NSMutableData *)newData;
+- (void) setTransferMode:(uint16)tMode;
+- (void) incrementOffset:(int32)addition;
+
+ at end

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list