Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 16 insertions, 28 deletions

diff --git a/WebKit/mac/Plugins/WebBasePluginPackage.h b/WebKit/mac/Plugins/WebBasePluginPackage.h
index 1082551..ca2ddcd 100644
--- a/WebKit/mac/Plugins/WebBasePluginPackage.h
+++ b/WebKit/mac/Plugins/WebBasePluginPackage.h
@@ -26,7 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebCore/WebCoreViewFactory.h>
+#import <WebCore/PluginData.h>
+#import <wtf/RetainPtr.h>
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 #import <WebKit/npfunctions.h>
@@ -52,21 +53,15 @@ typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
 #define WebPluginTypeDescriptionKey     @"WebPluginTypeDescription"
 #define WebPluginTypeEnabledKey         @"WebPluginTypeEnabled"
 
-@interface WebBasePluginPackage : NSObject <WebCorePluginInfo>
+@interface WebBasePluginPackage : NSObject
 {
     NSMutableSet *pluginDatabases;
     
-    NSString *name;
-    NSString *path;
-    NSString *pluginDescription;
+    WebCore::String path;
+    WebCore::PluginInfo pluginInfo;
 
-    NSBundle *bundle;
-    CFBundleRef cfBundle;
+    RetainPtr<CFBundleRef> cfBundle;
 
-    NSDictionary *MIMEToDescription;
-    NSDictionary *MIMEToExtensions;
-    NSMutableDictionary *extensionToMIME;
-    
     BP_CreatePluginMIMETypesPreferencesFuncPtr BP_CreatePluginMIMETypesPreferences;
 }
 
@@ -78,23 +73,16 @@ typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
 - (BOOL)load;
 - (void)unload;
 
-- (NSString *)name;
-- (NSString *)path;
-- (NSString *)filename;
-- (NSString *)pluginDescription;
-- (NSBundle *)bundle;
-
-- (NSEnumerator *)extensionEnumerator;
-- (NSEnumerator *)MIMETypeEnumerator;
-- (NSString *)descriptionForMIMEType:(NSString *)MIMEType;
-- (NSString *)MIMETypeForExtension:(NSString *)extension;
-- (NSArray *)extensionsForMIMEType:(NSString *)MIMEType;
-
-- (void)setName:(NSString *)theName;
-- (void)setPath:(NSString *)thePath;
-- (void)setPluginDescription:(NSString *)description;
-- (void)setMIMEToDescriptionDictionary:(NSDictionary *)MIMEToDescriptionDictionary;
-- (void)setMIMEToExtensionsDictionary:(NSDictionary *)MIMEToExtensionsDictionary;
+- (const WebCore::String&)path;
+
+- (const WebCore::PluginInfo&)pluginInfo;
+
+- (WebCore::String)bundleIdentifier;
+
+- (BOOL)supportsExtension:(const WebCore::String&)extension;
+- (BOOL)supportsMIMEType:(const WebCore::String&)MIMEType;
+
+- (NSString *)MIMETypeForExtension:(const WebCore::String&)extension;
 
 - (BOOL)isQuickTimePlugIn;
 - (BOOL)isJavaPlugIn;