Commit bc1984b0 authored by andersca@apple.com's avatar andersca@apple.com
Browse files

2008-11-04 Anders Carlsson <andersca@apple.com>

        Reviewed by Kevin Decker.

        More cleanup. Make a bunch of instance variables RetainPtrs.
        
        * Plugins/WebBaseNetscapePluginView.h:
        * Plugins/WebBaseNetscapePluginView.mm:
        (-[WebBaseNetscapePluginView visibleRect]):
        (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]):
        (-[WebBaseNetscapePluginView sendActivateEvent:]):
        (-[WebBaseNetscapePluginView sendDrawRectEvent:]):
        (-[WebBaseNetscapePluginView stopTimers]):
        (-[WebBaseNetscapePluginView restartTimers]):
        (-[WebBaseNetscapePluginView setHasFocus:]):
        (-[WebBaseNetscapePluginView mouseDown:]):
        (-[WebBaseNetscapePluginView mouseUp:]):
        (-[WebBaseNetscapePluginView mouseEntered:]):
        (-[WebBaseNetscapePluginView mouseExited:]):
        (-[WebBaseNetscapePluginView handleMouseMoved:]):
        (-[WebBaseNetscapePluginView mouseDragged:]):
        (-[WebBaseNetscapePluginView scrollWheel:]):
        (-[WebBaseNetscapePluginView keyUp:]):
        (-[WebBaseNetscapePluginView keyDown:]):
        (-[WebBaseNetscapePluginView flagsChanged:]):
        (-[WebBaseNetscapePluginView cut:]):
        (-[WebBaseNetscapePluginView copy:]):
        (-[WebBaseNetscapePluginView paste:]):
        (-[WebBaseNetscapePluginView selectAll:]):
        (-[WebBaseNetscapePluginView didStart]):
        (-[WebBaseNetscapePluginView start]):
        (-[WebBaseNetscapePluginView stop]):
        (-[WebBaseNetscapePluginView dataSource]):
        (-[WebBaseNetscapePluginView pluginPackage]):
        (-[WebBaseNetscapePluginView setPluginPackage:]):
        (-[WebBaseNetscapePluginView setAttributeKeys:andValues:]):
        (-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:DOMElement:]):
        (-[WebBaseNetscapePluginView fini]):
        (-[WebBaseNetscapePluginView dealloc]):
        (-[WebBaseNetscapePluginView pluginView:receivedError:]):
        (-[WebBaseNetscapePluginView requestWithURLCString:]):
        (-[WebBaseNetscapePluginView webFrame:didFinishLoadWithReason:]):
        (-[WebBaseNetscapePluginView loadPluginRequest:]):
        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:sendNotification:]):
        (-[WebBaseNetscapePluginView userAgent]):
        (-[WebBaseNetscapePluginView getVariable:value:]):
        (-[WebBaseNetscapePluginView setVariable:value:]):
        (-[WebBaseNetscapePluginView _createPlugin]):
        (-[WebBaseNetscapePluginView _redeliverStream]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38116 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 28f3c1bd
2008-11-04 Anders Carlsson <andersca@apple.com>
Reviewed by Kevin Decker.
More cleanup. Make a bunch of instance variables RetainPtrs.
* Plugins/WebBaseNetscapePluginView.h:
* Plugins/WebBaseNetscapePluginView.mm:
(-[WebBaseNetscapePluginView visibleRect]):
(-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]):
(-[WebBaseNetscapePluginView sendActivateEvent:]):
(-[WebBaseNetscapePluginView sendDrawRectEvent:]):
(-[WebBaseNetscapePluginView stopTimers]):
(-[WebBaseNetscapePluginView restartTimers]):
(-[WebBaseNetscapePluginView setHasFocus:]):
(-[WebBaseNetscapePluginView mouseDown:]):
(-[WebBaseNetscapePluginView mouseUp:]):
(-[WebBaseNetscapePluginView mouseEntered:]):
(-[WebBaseNetscapePluginView mouseExited:]):
(-[WebBaseNetscapePluginView handleMouseMoved:]):
(-[WebBaseNetscapePluginView mouseDragged:]):
(-[WebBaseNetscapePluginView scrollWheel:]):
(-[WebBaseNetscapePluginView keyUp:]):
(-[WebBaseNetscapePluginView keyDown:]):
(-[WebBaseNetscapePluginView flagsChanged:]):
(-[WebBaseNetscapePluginView cut:]):
(-[WebBaseNetscapePluginView copy:]):
(-[WebBaseNetscapePluginView paste:]):
(-[WebBaseNetscapePluginView selectAll:]):
(-[WebBaseNetscapePluginView didStart]):
(-[WebBaseNetscapePluginView start]):
(-[WebBaseNetscapePluginView stop]):
(-[WebBaseNetscapePluginView dataSource]):
(-[WebBaseNetscapePluginView pluginPackage]):
(-[WebBaseNetscapePluginView setPluginPackage:]):
(-[WebBaseNetscapePluginView setAttributeKeys:andValues:]):
(-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:DOMElement:]):
(-[WebBaseNetscapePluginView fini]):
(-[WebBaseNetscapePluginView dealloc]):
(-[WebBaseNetscapePluginView pluginView:receivedError:]):
(-[WebBaseNetscapePluginView requestWithURLCString:]):
(-[WebBaseNetscapePluginView webFrame:didFinishLoadWithReason:]):
(-[WebBaseNetscapePluginView loadPluginRequest:]):
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:sendNotification:]):
(-[WebBaseNetscapePluginView userAgent]):
(-[WebBaseNetscapePluginView getVariable:value:]):
(-[WebBaseNetscapePluginView setVariable:value:]):
(-[WebBaseNetscapePluginView _createPlugin]):
(-[WebBaseNetscapePluginView _redeliverStream]):
2008-11-04 Brady Eidson <beidson@apple.com> 2008-11-04 Brady Eidson <beidson@apple.com>
Reviewed by John Sullivan Reviewed by John Sullivan
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#import <WebKit/WebBasePluginPackage.h> #import <WebKit/WebBasePluginPackage.h>
#import <wtf/HashMap.h> #import <wtf/HashMap.h>
#import <wtf/HashSet.h> #import <wtf/HashSet.h>
#import <wtf/OwnPtr.h>
#import <wtf/RetainPtr.h>
@class DOMElement; @class DOMElement;
@class WebDataSource; @class WebDataSource;
...@@ -61,9 +63,9 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs; ...@@ -61,9 +63,9 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
@interface WebBaseNetscapePluginView : NSView <WebPluginManualLoader, NSTextInput> @interface WebBaseNetscapePluginView : NSView <WebPluginManualLoader, NSTextInput>
{ {
WebNetscapePluginPackage *pluginPackage; RetainPtr<WebNetscapePluginPackage> _pluginPackage;
NSURL *sourceURL; RetainPtr<NSURL> _sourceURL;
WebFrame *_webFrame; WebFrame *_webFrame;
BOOL _loadManually; BOOL _loadManually;
...@@ -72,9 +74,9 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs; ...@@ -72,9 +74,9 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
CALayer *_layer; CALayer *_layer;
#endif #endif
unsigned _dataLengthReceived; unsigned _dataLengthReceived;
NSError *_error; RetainPtr<NSError> _error;
int mode; int _mode;
unsigned argsCount; unsigned argsCount;
char **cAttributes; char **cAttributes;
...@@ -88,13 +90,12 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs; ...@@ -88,13 +90,12 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
NPDrawingModel drawingModel; NPDrawingModel drawingModel;
NPEventModel eventModel; NPEventModel eventModel;
#ifndef NP_NO_QUICKDRAW #ifndef NP_NO_QUICKDRAW
// This is only valid when drawingModel is NPDrawingModelQuickDraw // This is only valid when drawingModel is NPDrawingModelQuickDraw
GWorldPtr offscreenGWorld; GWorldPtr offscreenGWorld;
#endif #endif
WebNetscapePluginEventHandler *eventHandler; OwnPtr<WebNetscapePluginEventHandler> _eventHandler;
BOOL isStarted; BOOL isStarted;
BOOL inSetWindow; BOOL inSetWindow;
...@@ -108,17 +109,17 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs; ...@@ -108,17 +109,17 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
unsigned pluginFunctionCallDepth; unsigned pluginFunctionCallDepth;
DOMElement *element; RetainPtr<DOMElement> _element;
int32 specifiedHeight; int32 specifiedHeight;
int32 specifiedWidth; int32 specifiedWidth;
NSString *MIMEType; RetainPtr<NSString> _MIMEType;
NSURL *baseURL; RetainPtr<NSURL> _baseURL;
NSTrackingRectTag trackingTag; NSTrackingRectTag trackingTag;
HashSet<RefPtr<WebNetscapePluginStream> > streams; HashSet<RefPtr<WebNetscapePluginStream> > streams;
NSMutableDictionary *pendingFrameLoads; RetainPtr<NSMutableDictionary> _pendingFrameLoads;
NPPluginTextInputFuncs *textInputFuncs; NPPluginTextInputFuncs *textInputFuncs;
...@@ -166,10 +167,6 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs; ...@@ -166,10 +167,6 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
- (WebNetscapePluginPackage *)pluginPackage; - (WebNetscapePluginPackage *)pluginPackage;
- (void)setPluginPackage:(WebNetscapePluginPackage *)thePluginPackage; - (void)setPluginPackage:(WebNetscapePluginPackage *)thePluginPackage;
- (void)setMIMEType:(NSString *)theMIMEType;
- (void)setBaseURL:(NSURL *)theBaseURL;
- (void)setAttributeKeys:(NSArray *)keys andValues:(NSArray *)values;
- (void)setMode:(int)theMode;
- (void)viewWillMoveToHostWindow:(NSWindow *)hostWindow; - (void)viewWillMoveToHostWindow:(NSWindow *)hostWindow;
- (void)viewDidMoveToHostWindow; - (void)viewDidMoveToHostWindow;
- (void)disconnectStream:(WebNetscapePluginStream*)stream; - (void)disconnectStream:(WebNetscapePluginStream*)stream;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment