Changeset 61510 in webkit

Timestamp:

Jun 20, 2010 1:53:12 PM (14 years ago)

Author:

andersca@apple.com

Message:

2010-06-20 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Remove -[WebBasePluginPackage bundle]
​https://bugs.webkit.org/show_bug.cgi?id=40892

Add -[WebBasePluginPackage bundleIdentifier] and switch clients over to it.

Move the supportsSnapshotting method over to the plug-in package.

• Plugins/Hosted/NetscapePluginHostManager.mm: (WebKit::NetscapePluginHostManager::hostForPackage):
• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]): (-[WebBaseNetscapePluginView supportsSnapshotting]):
• Plugins/WebBasePluginPackage.h:
• Plugins/WebBasePluginPackage.mm: (-[WebBasePluginPackage isQuickTimePlugIn]): (-[WebBasePluginPackage isJavaPlugIn]): (-[WebBasePluginPackage WebCore::]): Call bundleIdentifier directly instead of asking the bundle
• Plugins/WebNetscapePluginPackage.h:
• Plugins/WebNetscapePluginPackage.mm: (-[WebNetscapePluginPackage supportsSnapshotting]):
• Plugins/WebNetscapePluginView.mm: (-[WebNetscapePluginView setAttributeKeys:andValues:]): (-[WebNetscapePluginView _createPlugin]):
• Plugins/WebPluginDatabase.mm: (checkCandidate):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/Hosted/NetscapePluginHostManager.mm (modified) (1 diff)
• Plugins/WebBaseNetscapePluginView.mm (modified) (2 diffs)
• Plugins/WebBasePluginPackage.h (modified) (1 diff)
• Plugins/WebBasePluginPackage.mm (modified) (3 diffs)
• Plugins/WebNetscapePluginPackage.h (modified) (1 diff)
• Plugins/WebNetscapePluginPackage.mm (modified) (1 diff)
• Plugins/WebNetscapePluginView.mm (modified) (2 diffs)
• Plugins/WebPluginDatabase.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-06-20  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Remove -[WebBasePluginPackage bundle]
+        https://bugs.webkit.org/show_bug.cgi?id=40892
+
+        Add -[WebBasePluginPackage bundleIdentifier] and switch clients over to it.
+        
+        Move the supportsSnapshotting method over to the plug-in package.
+        
+        * Plugins/Hosted/NetscapePluginHostManager.mm:
+        (WebKit::NetscapePluginHostManager::hostForPackage):
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView initWithFrame:pluginPackage:URL:baseURL:MIMEType:attributeKeys:attributeValues:loadManually:element:WebCore::]):
+        (-[WebBaseNetscapePluginView supportsSnapshotting]):
+        * Plugins/WebBasePluginPackage.h:
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage isQuickTimePlugIn]):
+        (-[WebBasePluginPackage isJavaPlugIn]):
+        (-[WebBasePluginPackage WebCore::]):
+        Call bundleIdentifier directly instead of asking the bundle 
+        * Plugins/WebNetscapePluginPackage.h:
+        * Plugins/WebNetscapePluginPackage.mm:
+        (-[WebNetscapePluginPackage supportsSnapshotting]):
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView setAttributeKeys:andValues:]):
+        (-[WebNetscapePluginView _createPlugin]):
+        * Plugins/WebPluginDatabase.mm:
+        (checkCandidate):
+
 2010-06-20  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm

@@ -94 +94 @@
     // Since Flash NPObjects add methods dynamically, we don't want to cache when a property/method doesn't exist
     // on an object because it could be added later.
-    bool shouldCacheMissingPropertiesAndMethods = ![[[package bundle] bundleIdentifier] isEqualToString:@"com.macromedia.Flash Player.plugin"];
+    bool shouldCacheMissingPropertiesAndMethods = [package bundleIdentifier] != "com.macromedia.Flash Player.plugin";
     
     NetscapePluginHostProxy* hostProxy = new NetscapePluginHostProxy(clientPort, pluginHostPort, pluginHostPSN, shouldCacheMissingPropertiesAndMethods);

trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -147 +147 @@
     // Enable "kiosk mode" when instantiating the QT plug-in inside of Dashboard. See <rdar://problem/6878105>
     if ([[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.dashboard.client"] &&
-        [[[_pluginPackage.get() bundle] bundleIdentifier] isEqualToString:@"com.apple.QuickTime Plugin.plugin"]) {
+        [_pluginPackage.get() bundleIdentifier] == "com.apple.QuickTime Plugin.plugin") {
         RetainPtr<NSMutableArray> mutableKeys(AdoptNS, [keys mutableCopy]);
         RetainPtr<NSMutableArray> mutableValues(AdoptNS, [values mutableCopy]);
@@ -579 +579 @@
 - (BOOL)supportsSnapshotting
 {
-    NSBundle *pluginBundle = [_pluginPackage.get() bundle];
-    if (![[pluginBundle bundleIdentifier] isEqualToString:@"com.macromedia.Flash Player.plugin"])
-        return YES;
-    
-    // Flash has a bogus Info.plist entry for CFBundleVersionString, so use CFBundleShortVersionString.
-    NSString *versionString = [pluginBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-    
-    static const NSString *flash10dotOnePrefix = @"10.1";
-    if (![versionString hasPrefix:flash10dotOnePrefix])
-        return YES;
-    
-    // Some prerelease versions of Flash 10.1 crash when sent a drawRect event using the CA drawing model: <rdar://problem/7739922>
-    static const CFStringRef knownGoodFlash10dot1Release = CFSTR("10.1.53.60");
-    return CFStringCompare((CFStringRef)versionString, knownGoodFlash10dot1Release, kCFCompareNumerically) != kCFCompareLessThan;
+    return [_pluginPackage.get() supportsSnapshotting];
 }
 

trunk/WebKit/mac/Plugins/WebBasePluginPackage.h

@@ -83 +83 @@
 - (const WebCore::String&)path;
 - (const WebCore::String&)pluginDescription;
-- (NSBundle *)bundle;
+
+- (WebCore::String)bundleIdentifier;
 
 - (BOOL)supportsExtension:(NSString *)extension;

trunk/WebKit/mac/Plugins/WebBasePluginPackage.mm

@@ -48 +48 @@
 #import <mach-o/loader.h>
 
-#define JavaCocoaPluginIdentifier   @"com.apple.JavaPluginCocoa"
-#define JavaCarbonPluginIdentifier  @"com.apple.JavaAppletPlugin"
+#define JavaCocoaPluginIdentifier   "com.apple.JavaPluginCocoa"
+#define JavaCarbonPluginIdentifier  "com.apple.JavaAppletPlugin"
 #define JavaCFMPluginFilename       @"Java Applet Plugin Enabler"
 
-#define QuickTimeCarbonPluginIdentifier       @"com.apple.QuickTime Plugin.plugin"
-#define QuickTimeCocoaPluginIdentifier        @"com.apple.quicktime.webplugin"
+#define QuickTimeCarbonPluginIdentifier       "com.apple.QuickTime Plugin.plugin"
+#define QuickTimeCocoaPluginIdentifier        "com.apple.quicktime.webplugin"
 
 @interface NSArray (WebPluginExtensions)
@@ -373 +373 @@
 - (BOOL)isQuickTimePlugIn
 {
-    NSString *bundleIdentifier = [[self bundle] bundleIdentifier];
-    return [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:QuickTimeCarbonPluginIdentifier] || 
-        [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:QuickTimeCocoaPluginIdentifier];
+    const String& bundleIdentifier = [self bundleIdentifier];
+    return bundleIdentifier == QuickTimeCocoaPluginIdentifier || bundleIdentifier == QuickTimeCocoaPluginIdentifier;
 }
 
 - (BOOL)isJavaPlugIn
 {
-    NSString *bundleIdentifier = [[self bundle] bundleIdentifier];
-    return [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:JavaCocoaPluginIdentifier] || 
-        [bundleIdentifier _webkit_isCaseInsensitiveEqualToString:JavaCarbonPluginIdentifier] ||
+    const String& bundleIdentifier = [self bundleIdentifier];
+    return bundleIdentifier == JavaCocoaPluginIdentifier || bundleIdentifier == JavaCarbonPluginIdentifier ||
         [(NSString *)[self filename] _webkit_isCaseInsensitiveEqualToString:JavaCFMPluginFilename];
 }
@@ -488 +486 @@
 }
 
+- (WebCore::String)bundleIdentifier
+{
+    return CFBundleGetIdentifier(cfBundle);
+}
+
 @end
 

trunk/WebKit/mac/Plugins/WebNetscapePluginPackage.h

@@ -78 +78 @@
 - (NPPluginFuncs *)pluginFuncs;
 
+- (BOOL)supportsSnapshotting;
+
 #if USE(PLUGIN_HOST_PROCESS)
 - (cpu_type_t)pluginHostArchitecture;

trunk/WebKit/mac/Plugins/WebNetscapePluginPackage.mm

@@ -690 +690 @@
 }
 
+
+- (BOOL)supportsSnapshotting
+{
+    if ([self bundleIdentifier] != "com.macromedia.Flash Player.plugin")
+        return YES;
+    
+    // Flash has a bogus Info.plist entry for CFBundleVersionString, so use CFBundleShortVersionString.
+    NSString *versionString = (NSString *)CFDictionaryGetValue(CFBundleGetInfoDictionary(cfBundle), CFSTR("CFBundleShortVersionString"));
+    
+    if (![versionString hasPrefix:@"10.1"])
+        return YES;
+    
+    // Some prerelease versions of Flash 10.1 crash when sent a drawRect event using the CA drawing model: <rdar://problem/7739922>
+    return CFStringCompare((CFStringRef)versionString, CFSTR("10.1.53.60"), kCFCompareNumerically) != kCFCompareLessThan;
+}
+
 @end
 

trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm

@@ -1235 +1235 @@
     }
 
-    BOOL isWMP = [[[_pluginPackage.get() bundle] bundleIdentifier] isEqualToString:@"com.microsoft.WMP.defaultplugin"];
+    BOOL isWMP = [_pluginPackage.get() bundleIdentifier] == "com.microsoft.WMP.defaultplugin";
     
     unsigned i;
@@ -2371 +2371 @@
 
     PluginMainThreadScheduler::scheduler().registerPlugin(plugin);
-    
-    _isFlash = [[[_pluginPackage.get() bundle] bundleIdentifier] isEqualToString:@"com.macromedia.Flash Player.plugin"];
-    _isSilverlight = [[[_pluginPackage.get() bundle] bundleIdentifier] isEqualToString:@"com.microsoft.SilverlightPlugin"];
+
+    _isFlash = [_pluginPackage.get() bundleIdentifier] == "com.macromedia.Flash Player.plugin";
+    _isSilverlight = [_pluginPackage.get() bundleIdentifier] == "com.microsoft.SilverlightPlugin";
 
     [[self class] setCurrentPluginView:self];

trunk/WebKit/mac/Plugins/WebPluginDatabase.mm

@@ -83 +83 @@
     }
 
-    if ([[[*currentPlugin bundle] bundleIdentifier] isEqualToString:[[*candidatePlugin bundle] bundleIdentifier]] && [*candidatePlugin versionNumber] > [*currentPlugin versionNumber]) 
+    if ([*currentPlugin bundleIdentifier] == [*candidatePlugin bundleIdentifier] && [*candidatePlugin versionNumber] > [*currentPlugin versionNumber]) 
         *currentPlugin = *candidatePlugin;
 }