From 563af33bc48281d19dce701398dbb88cb54fd7ec Mon Sep 17 00:00:00 2001
From: Cary Clark <>
Date: Tue, 14 Apr 2009 06:33:00 -0700
Subject: AI 146110: add missing files to webkit   brings it in sync with
 webkit svn cl 42046

Automated import of CL 146110
---
 WebKit/mac/Plugins/WebNetscapePluginView.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.h b/WebKit/mac/Plugins/WebNetscapePluginView.h
index 9d2555b..783b7fb 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.h
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.h
@@ -52,14 +52,12 @@ typedef union PluginPort {
     NP_CGContext cgPort;
 } PluginPort;
 
-typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
-
 // Because the Adobe 7.x Acrobat plug-in has a hard coded check for a view named 
 // "WebNetscapePluginDocumentView", this class must retain the old name in order 
 // for the plug-in to function correctly. (rdar://problem/4699455)
 #define WebNetscapePluginView WebNetscapePluginDocumentView
 
-@interface WebNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader, NSTextInput>
+@interface WebNetscapePluginView : WebBaseNetscapePluginView<WebPluginManualLoader>
 {
     RefPtr<WebNetscapePluginStream> _manualStream;
 #ifndef BUILDING_ON_TIGER
@@ -101,9 +99,8 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
     HashSet<RefPtr<WebNetscapePluginStream> > streams;
     RetainPtr<NSMutableDictionary> _pendingFrameLoads;
     
+    BOOL _isFlash;
     BOOL _isSilverlight;
-    
-    NPPluginTextInputFuncs *textInputFuncs;
 }
 
 + (WebNetscapePluginView *)currentPluginView;
@@ -117,7 +114,7 @@ typedef struct _NPPluginTextInputFuncs NPPluginTextInputFuncs;
       attributeKeys:(NSArray *)keys
     attributeValues:(NSArray *)values
        loadManually:(BOOL)loadManually
-         DOMElement:(DOMElement *)anElement;
+            element:(PassRefPtr<WebCore::HTMLPlugInElement>)element;
 
 
 - (NPP)plugin;
-- 
cgit v1.1