From 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Thu, 8 Oct 2009 17:19:54 +0100
Subject: Merge webkit.org at R49305 : Automatic merge by git.

Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
---
 WebKit/mac/Plugins/WebBaseNetscapePluginView.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'WebKit/mac/Plugins/WebBaseNetscapePluginView.h')

diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.h b/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
index a9fb188..bd05ebe 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
@@ -31,6 +31,7 @@
 
 #import "WebNetscapePluginPackage.h"
 #import "WebPluginContainerCheck.h"
+#import <wtf/OwnPtr.h>
 #import <wtf/PassRefPtr.h>
 #import <wtf/RefPtr.h>
 #import <wtf/RetainPtr.h>
@@ -45,6 +46,8 @@ namespace WebCore {
     class HTMLPlugInElement;
 }
 
+class WebHaltablePlugin;
+
 @interface WebBaseNetscapePluginView : NSView
 {
     RetainPtr<WebNetscapePluginPackage> _pluginPackage;
@@ -65,6 +68,8 @@ namespace WebCore {
     RetainPtr<NSURL> _baseURL;
     RetainPtr<NSURL> _sourceURL;
     
+    OwnPtr<WebHaltablePlugin> _haltable;
+    
     NSTrackingRectTag _trackingTag;
 }
 
@@ -101,6 +106,7 @@ namespace WebCore {
 - (void)startTimers;
 - (void)restartTimers;
 
+- (void)start;
 - (void)stop;
 
 - (void)addWindowObservers;
-- 
cgit v1.1