Changeset 61581 in webkit


Ignore:
Timestamp:
Jun 21, 2010 2:40:34 PM (14 years ago)
Author:
andersca@apple.com
Message:

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

Reviewed by Sam Weinig.

More WebBasePluginPackage cleanup
https://bugs.webkit.org/show_bug.cgi?id=40944

  • Plugins/Hosted/HostedNetscapePluginStream.mm: (WebKit::HostedNetscapePluginStream::pluginCancelledConnectionError):
  • Plugins/Hosted/NetscapePluginHostManager.mm: (WebKit::NetscapePluginHostManager::spawnPluginHost):
  • Plugins/WebBaseNetscapePluginStream.mm: (WebNetscapePluginStream::pluginCancelledConnectionError):
  • Plugins/WebBaseNetscapePluginView.mm: (WebHaltablePlugin::pluginName):
  • Plugins/WebBasePluginPackage.h:
  • Plugins/WebBasePluginPackage.mm: (-[WebBasePluginPackage initWithPath:]): (-[WebBasePluginPackage _objectForInfoDictionaryKey:]): (-[WebBasePluginPackage getPluginInfoFromPLists]): (-[WebBasePluginPackage load]): (-[WebBasePluginPackage dealloc]): (-[WebBasePluginPackage finalize]): (-[WebBasePluginPackage pluginInfo]): (-[WebBasePluginPackage supportsExtension:]): (-[WebBasePluginPackage supportsMIMEType:WebCore::]): (-[WebBasePluginPackage MIMETypeForExtension:]): (-[WebBasePluginPackage isJavaPlugIn]): (-[WebBasePluginPackage versionNumber]): (-[WebBasePluginPackage WebCore::]):
  • Plugins/WebNetscapePluginPackage.mm: (-[WebNetscapePluginPackage openResourceFile]): (-[WebNetscapePluginPackage closeResourceFile:]): (-[WebNetscapePluginPackage getPluginInfoFromResources]): (-[WebNetscapePluginPackage _initWithPath:]): (-[WebNetscapePluginPackage _applyDjVuWorkaround]): (-[WebNetscapePluginPackage _tryLoad]): (-[WebNetscapePluginPackage supportsSnapshotting]): (-[WebNetscapePluginPackage _unloadWithShutdown:]):
  • Plugins/WebPluginDatabase.mm: (-[WebPluginDatabase refresh]): (-[WebPluginDatabase _removePlugin:]):
  • Plugins/WebPluginPackage.mm: (-[WebPluginPackage initWithPath:]): (-[WebPluginPackage load]):
  • WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::createPlugin):
  • WebCoreSupport/WebPlatformStrategies.mm: (WebPlatformStrategies::getPluginInfo):
Location:
trunk/WebKit/mac
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/mac/ChangeLog

    r61574 r61581  
     12010-06-21  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        More WebBasePluginPackage cleanup
     6        https://bugs.webkit.org/show_bug.cgi?id=40944
     7
     8        * Plugins/Hosted/HostedNetscapePluginStream.mm:
     9        (WebKit::HostedNetscapePluginStream::pluginCancelledConnectionError):
     10        * Plugins/Hosted/NetscapePluginHostManager.mm:
     11        (WebKit::NetscapePluginHostManager::spawnPluginHost):
     12        * Plugins/WebBaseNetscapePluginStream.mm:
     13        (WebNetscapePluginStream::pluginCancelledConnectionError):
     14        * Plugins/WebBaseNetscapePluginView.mm:
     15        (WebHaltablePlugin::pluginName):
     16        * Plugins/WebBasePluginPackage.h:
     17        * Plugins/WebBasePluginPackage.mm:
     18        (-[WebBasePluginPackage initWithPath:]):
     19        (-[WebBasePluginPackage _objectForInfoDictionaryKey:]):
     20        (-[WebBasePluginPackage getPluginInfoFromPLists]):
     21        (-[WebBasePluginPackage load]):
     22        (-[WebBasePluginPackage dealloc]):
     23        (-[WebBasePluginPackage finalize]):
     24        (-[WebBasePluginPackage pluginInfo]):
     25        (-[WebBasePluginPackage supportsExtension:]):
     26        (-[WebBasePluginPackage supportsMIMEType:WebCore::]):
     27        (-[WebBasePluginPackage MIMETypeForExtension:]):
     28        (-[WebBasePluginPackage isJavaPlugIn]):
     29        (-[WebBasePluginPackage versionNumber]):
     30        (-[WebBasePluginPackage WebCore::]):
     31        * Plugins/WebNetscapePluginPackage.mm:
     32        (-[WebNetscapePluginPackage openResourceFile]):
     33        (-[WebNetscapePluginPackage closeResourceFile:]):
     34        (-[WebNetscapePluginPackage getPluginInfoFromResources]):
     35        (-[WebNetscapePluginPackage _initWithPath:]):
     36        (-[WebNetscapePluginPackage _applyDjVuWorkaround]):
     37        (-[WebNetscapePluginPackage _tryLoad]):
     38        (-[WebNetscapePluginPackage supportsSnapshotting]):
     39        (-[WebNetscapePluginPackage _unloadWithShutdown:]):
     40        * Plugins/WebPluginDatabase.mm:
     41        (-[WebPluginDatabase refresh]):
     42        (-[WebPluginDatabase _removePlugin:]):
     43        * Plugins/WebPluginPackage.mm:
     44        (-[WebPluginPackage initWithPath:]):
     45        (-[WebPluginPackage load]):
     46        * WebCoreSupport/WebFrameLoaderClient.mm:
     47        (WebFrameLoaderClient::createPlugin):
     48        * WebCoreSupport/WebPlatformStrategies.mm:
     49        (WebPlatformStrategies::getPluginInfo):
     50
    1512010-06-21  Anders Carlsson  <andersca@apple.com>
    252
  • trunk/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm

    r52619 r61581  
    257257                                           contentURL:m_responseURL ? m_responseURL.get() : m_requestURL.get()
    258258                                        pluginPageURL:nil
    259                                            pluginName:[[m_instance->pluginView() pluginPackage] name]
     259                                           pluginName:[[m_instance->pluginView() pluginPackage] pluginInfo].name
    260260                                             MIMEType:m_mimeType.get()] autorelease];
    261261}
  • trunk/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm

    r61562 r61581  
    153153                                                                 "visible name of the plug-in host process. The first argument is the plug-in name "
    154154                                                                 "and the second argument is the application name."),
    155                              [[package filename] stringByDeletingPathExtension], [[NSProcessInfo processInfo] processName]];
     155                             [(NSString *)[package pluginInfo].file stringByDeletingPathExtension], [[NSProcessInfo processInfo] processName]];
    156156   
    157157    NSDictionary *hostProperties = [[NSDictionary alloc] initWithObjectsAndKeys:
  • trunk/WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm

    r58610 r61581  
    105105                                           contentURL:m_responseURL ? m_responseURL.get() : m_requestURL.get()
    106106                                        pluginPageURL:nil
    107                                            pluginName:[[m_pluginView.get() pluginPackage] name]
     107                                           pluginName:[[m_pluginView.get() pluginPackage] pluginInfo].name
    108108                                             MIMEType:m_mimeType.get()] autorelease];
    109109}
  • trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

    r61562 r61581  
    109109String WebHaltablePlugin::pluginName() const
    110110{
    111     return [[m_view pluginPackage] name];
     111    return [[m_view pluginPackage] pluginInfo].name;
    112112}
    113113
  • trunk/WebKit/mac/Plugins/WebBasePluginPackage.h

    r61558 r61581  
    2828
    2929#import <WebCore/PluginData.h>
     30#import <wtf/RetainPtr.h>
    3031
    3132#if ENABLE(NETSCAPE_PLUGIN_API)
     
    5758    NSMutableSet *pluginDatabases;
    5859   
    59     WebCore::String name;
    6060    WebCore::String path;
    61     WebCore::String pluginDescription;
     61    WebCore::PluginInfo pluginInfo;
    6262
    63     Vector<WebCore::MimeClassInfo> mimeTypes;
    64 
    65     CFBundleRef cfBundle;
     63    RetainPtr<CFBundleRef> cfBundle;
    6664
    6765    BP_CreatePluginMIMETypesPreferencesFuncPtr BP_CreatePluginMIMETypesPreferences;
     
    7674- (void)unload;
    7775
    78 - (WebCore::String)filename;
    79 - (const WebCore::String&)name;
    8076- (const WebCore::String&)path;
    81 - (const WebCore::String&)pluginDescription;
    8277
    83 - (const Vector<WebCore::MimeClassInfo>&)mimeTypes;
     78- (const WebCore::PluginInfo&)pluginInfo;
    8479
    8580- (WebCore::String)bundleIdentifier;
  • trunk/WebKit/mac/Plugins/WebBasePluginPackage.mm

    r61558 r61581  
    5151#define JavaCocoaPluginIdentifier   "com.apple.JavaPluginCocoa"
    5252#define JavaCarbonPluginIdentifier  "com.apple.JavaAppletPlugin"
    53 #define JavaCFMPluginFilename       @"Java Applet Plugin Enabler"
     53#define JavaCFMPluginFilename       "Java Applet Plugin Enabler"
    5454
    5555#define QuickTimeCarbonPluginIdentifier       "com.apple.QuickTime Plugin.plugin"
     
    127127       
    128128    path = pathByResolvingSymlinksAndAliases(pluginPath);
    129     cfBundle = CFBundleCreate(kCFAllocatorDefault, (CFURLRef)[NSURL fileURLWithPath:path]);
     129    cfBundle.adoptCF(CFBundleCreate(kCFAllocatorDefault, (CFURLRef)[NSURL fileURLWithPath:path]));
    130130
    131131#ifndef __ppc__
     
    171171- (id)_objectForInfoDictionaryKey:(NSString *)key
    172172{
    173     CFDictionaryRef bundleInfoDictionary = CFBundleGetInfoDictionary(cfBundle);
     173    CFDictionaryRef bundleInfoDictionary = CFBundleGetInfoDictionary(cfBundle.get());
    174174    if (!bundleInfoDictionary)
    175175        return nil;
     
    234234        mimeClassInfo.desc = description;
    235235
    236         mimeTypes.append(mimeClassInfo);
     236        pluginInfo.mimes.append(mimeClassInfo);
    237237        if (!description)
    238238            description = @"";
    239239    }
    240240
    241     NSString *filename = [self filename];
     241    NSString *filename = [(NSString *)path lastPathComponent];
     242    pluginInfo.file = filename;
    242243
    243244    NSString *theName = [self _objectForInfoDictionaryKey:WebPluginNameKey];
    244245    if (!theName)
    245246        theName = filename;
    246     name = theName;
     247    pluginInfo.name = theName;
    247248
    248249    description = [self _objectForInfoDictionaryKey:WebPluginDescriptionKey];
    249250    if (!description)
    250251        description = filename;
    251     pluginDescription = description;
     252    pluginInfo.desc = description;
    252253
    253254    return YES;
     
    257258{
    258259    if (cfBundle && !BP_CreatePluginMIMETypesPreferences)
    259         BP_CreatePluginMIMETypesPreferences = (BP_CreatePluginMIMETypesPreferencesFuncPtr)CFBundleGetFunctionPointerForName(cfBundle, CFSTR("BP_CreatePluginMIMETypesPreferences"));
     260        BP_CreatePluginMIMETypesPreferences = (BP_CreatePluginMIMETypesPreferencesFuncPtr)CFBundleGetFunctionPointerForName(cfBundle.get(), CFSTR("BP_CreatePluginMIMETypesPreferences"));
    260261   
    261262    return YES;
     
    266267    ASSERT(!pluginDatabases || [pluginDatabases count] == 0);
    267268    [pluginDatabases release];
    268    
    269     if (cfBundle)
    270         CFRelease(cfBundle);
    271269   
    272270    [super dealloc];
     
    279277    [pluginDatabases release];
    280278
    281     if (cfBundle)
    282         CFRelease(cfBundle);
    283 
    284279    [super finalize];
    285280}
    286281
    287 - (const String&)name
    288 {
    289     return name;
    290 }
    291 
    292282- (const String&)path
    293283{
     
    295285}
    296286
    297 - (String)filename
    298 {
    299     return [(NSString *)path lastPathComponent];
    300 }
    301 
    302 - (const String&)pluginDescription
    303 {
    304     return pluginDescription;
    305 }
    306 
    307 - (const Vector<WebCore::MimeClassInfo>&)mimeTypes
    308 {
    309     return mimeTypes;
     287- (const PluginInfo&)pluginInfo
     288{
     289    return pluginInfo;
    310290}
    311291
     
    314294    ASSERT(extension.lower() == extension);
    315295   
    316     for (size_t i = 0; i < mimeTypes.size(); ++i) {
    317         const Vector<String>& extensions = mimeTypes[i].extensions;
     296    for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) {
     297        const Vector<String>& extensions = pluginInfo.mimes[i].extensions;
    318298
    319299        if (find(extensions.begin(), extensions.end(), extension) != extensions.end())
     
    328308    ASSERT(mimeType.lower() == mimeType);
    329309   
    330     for (size_t i = 0; i < mimeTypes.size(); ++i) {
    331         if (mimeTypes[i].type == mimeType)
     310    for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) {
     311        if (pluginInfo.mimes[i].type == mimeType)
    332312            return YES;
    333313    }
     
    340320    ASSERT(extension.lower() == extension);
    341321   
    342     for (size_t i = 0; i < mimeTypes.size(); ++i) {
    343         const MimeClassInfo& mimeClassInfo = mimeTypes[i];
     322    for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) {
     323        const MimeClassInfo& mimeClassInfo = pluginInfo.mimes[i];
    344324        const Vector<String>& extensions = mimeClassInfo.extensions;
    345325
     
    361341    const String& bundleIdentifier = [self bundleIdentifier];
    362342    return bundleIdentifier == JavaCocoaPluginIdentifier || bundleIdentifier == JavaCarbonPluginIdentifier ||
    363         [(NSString *)[self filename] _webkit_isCaseInsensitiveEqualToString:JavaCFMPluginFilename];
     343        equalIgnoringCase(pluginInfo.file, JavaCFMPluginFilename);
    364344}
    365345
     
    446426{
    447427    // CFBundleGetVersionNumber doesn't work with all possible versioning schemes, but we think for now it's good enough for us.
    448     return CFBundleGetVersionNumber(cfBundle);
     428    return CFBundleGetVersionNumber(cfBundle.get());
    449429}
    450430
     
    468448- (WebCore::String)bundleIdentifier
    469449{
    470     return CFBundleGetIdentifier(cfBundle);
     450    return CFBundleGetIdentifier(cfBundle.get());
    471451}
    472452
  • trunk/WebKit/mac/Plugins/WebNetscapePluginPackage.mm

    r61574 r61581  
    108108#endif
    109109
    110     return CFBundleOpenBundleResourceMap(cfBundle);
     110    return CFBundleOpenBundleResourceMap(cfBundle.get());
    111111}
    112112
     
    120120#endif
    121121
    122     CFBundleCloseBundleResourceMap(cfBundle, resRef);
     122    CFBundleCloseBundleResourceMap(cfBundle.get(), resRef);
    123123}
    124124
     
    178178       
    179179        description = [self stringForStringListID:MIMEDescriptionStringNumber
    180                                          andIndex:mimeTypes.size()];
     180                                         andIndex:pluginInfo.mimes.size()];
    181181        mimeClassInfo.desc = description;
    182182
    183         mimeTypes.append(mimeClassInfo);
    184     }
    185 
    186     NSString *filename = [self filename];
     183        pluginInfo.mimes.append(mimeClassInfo);
     184    }
     185
     186    NSString *filename = [(NSString *)path lastPathComponent];
     187    pluginInfo.file = filename;
    187188   
    188189    description = [self stringForStringListID:PluginNameOrDescriptionStringNumber andIndex:1];
    189190    if (!description)
    190191        description = filename;
    191     pluginDescription = description;
     192    pluginInfo.desc = description;
    192193   
    193194   
     
    195196    if (!theName)
    196197        theName = filename;
    197     name = theName;
     198    pluginInfo.name = theName;
    198199   
    199200    [self closeResourceFile:resRef];
     
    210211    if (cfBundle) {
    211212        // Bundle
    212         CFBundleGetPackageInfo(cfBundle, &type, NULL);
     213        CFBundleGetPackageInfo(cfBundle.get(), &type, NULL);
    213214#ifdef SUPPORT_CFM
    214215        isBundle = YES;
     
    231232    // Check if the executable is Mach-O or CFM.
    232233    if (cfBundle) {
    233         RetainPtr<CFURLRef> executableURL(AdoptCF, CFBundleCopyExecutableURL(cfBundle));
     234        RetainPtr<CFURLRef> executableURL(AdoptCF, CFBundleCopyExecutableURL(cfBundle.get()));
    234235        if (!executableURL)
    235236            return NO;
     
    249250
    250251#if USE(PLUGIN_HOST_PROCESS)
    251         RetainPtr<CFArrayRef> archs(AdoptCF, CFBundleCopyExecutableArchitectures(cfBundle));
     252        RetainPtr<CFArrayRef> archs(AdoptCF, CFBundleCopyExecutableArchitectures(cfBundle.get()));
    252253       
    253254        if ([(NSArray *)archs.get() containsObject:[NSNumber numberWithInteger:NSBundleExecutableArchitectureX86_64]])
     
    326327        return;
    327328   
    328     if ([(NSString *)CFBundleGetIdentifier(cfBundle) isEqualToString:@"com.lizardtech.NPDjVu"]) {
     329    if ([self bundleIdentifier] == "com.lizardtech.NPDjVu") {
    329330        // The DjVu plug-in will crash copying the vtable if it's too big so we cap it to
    330331        // what the plug-in expects here.
     
    355356    CFAbsoluteTime duration;
    356357#endif
    357     LOG(Plugins, "%f Load timing started for: %@", start, (NSString *)[self name]);
     358    LOG(Plugins, "%f Load timing started for: %@", start, (NSString *)[self pluginInfo].name);
    358359
    359360    if (isLoaded)
     
    363364    if (isBundle) {
    364365#endif
    365         if (!CFBundleLoadExecutable(cfBundle))
     366        if (!CFBundleLoadExecutable(cfBundle.get()))
    366367            return NO;
    367368#if !LOG_DISABLED
     
    379380        } else {
    380381#endif
    381             NP_Initialize = (NP_InitializeFuncPtr)CFBundleGetFunctionPointerForName(cfBundle, CFSTR("NP_Initialize"));
    382             NP_GetEntryPoints = (NP_GetEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(cfBundle, CFSTR("NP_GetEntryPoints"));
    383             NP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(cfBundle, CFSTR("NP_Shutdown"));
     382            NP_Initialize = (NP_InitializeFuncPtr)CFBundleGetFunctionPointerForName(cfBundle.get(), CFSTR("NP_Initialize"));
     383            NP_GetEntryPoints = (NP_GetEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(cfBundle.get(), CFSTR("NP_GetEntryPoints"));
     384            NP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(cfBundle.get(), CFSTR("NP_Shutdown"));
    384385            if (!NP_Initialize || !NP_GetEntryPoints || !NP_Shutdown)
    385386                return NO;
     
    628629       
    629630        if (pluginFuncs.javaClass)
    630             LOG(LiveConnect, "%@:  mach-o entry point for NPP_GetJavaClass = %p", (NSString *)[self name], pluginFuncs.javaClass);
     631            LOG(LiveConnect, "%@:  mach-o entry point for NPP_GetJavaClass = %p", (NSString *)[self pluginInfo].name, pluginFuncs.javaClass);
    631632        else
    632             LOG(LiveConnect, "%@:  no entry point for NPP_GetJavaClass", (NSString *)[self name]);
     633            LOG(LiveConnect, "%@:  no entry point for NPP_GetJavaClass", (NSString *)[self pluginInfo].name);
    633634
    634635#ifdef SUPPORT_CFM
     
    699700   
    700701    // Flash has a bogus Info.plist entry for CFBundleVersionString, so use CFBundleShortVersionString.
    701     NSString *versionString = (NSString *)CFDictionaryGetValue(CFBundleGetInfoDictionary(cfBundle), CFSTR("CFBundleShortVersionString"));
     702    NSString *versionString = (NSString *)CFDictionaryGetValue(CFBundleGetInfoDictionary(cfBundle.get()), CFSTR("CFBundleShortVersionString"));
    702703   
    703704    if (![versionString hasPrefix:@"10.1"])
     
    755756        return;
    756757   
    757     LOG(Plugins, "Unloading %@...", (NSString *)name);
     758    LOG(Plugins, "Unloading %@...", (NSString *)pluginInfo.name);
    758759
    759760    // Cannot unload a plug-in package while an instance is still using it
  • trunk/WebKit/mac/Plugins/WebPluginDatabase.mm

    r61525 r61581  
    308308    pluginEnumerator = [plugins objectEnumerator];
    309309    while ((plugin = [pluginEnumerator nextObject])) {
    310         const Vector<MimeClassInfo>& mimeTypes = [plugin mimeTypes];
    311         for (size_t i = 0; i < mimeTypes.size(); ++i)
    312             [MIMETypes addObject:mimeTypes[i].type];
     310        const PluginInfo& pluginInfo = [plugin pluginInfo];
     311        for (size_t i = 0; i < pluginInfo.mimes.size(); ++i)
     312            [MIMETypes addObject:pluginInfo.mimes[i].type];
    313313    }
    314314   
     
    445445
    446446    // Unregister plug-in's MIME type registrations
    447     const Vector<MimeClassInfo>& mimeTypes = [plugin mimeTypes];
    448     for (size_t i = 0; i < mimeTypes.size(); ++i) {
    449         NSString *MIMEType = mimeTypes[i].type;
     447    const PluginInfo& pluginInfo = [plugin pluginInfo];
     448    for (size_t i = 0; i < pluginInfo.mimes.size(); ++i) {
     449        NSString *MIMEType = pluginInfo.mimes[i].type;
    450450
    451451        if ([registeredMIMETypes containsObject:MIMEType]) {
  • trunk/WebKit/mac/Plugins/WebPluginPackage.mm

    r61519 r61581  
    5555    if (![[pluginPath pathExtension] _webkit_isCaseInsensitiveEqualToString:@"webplugin"]) {
    5656        UInt32 type = 0;
    57         CFBundleGetPackageInfo(cfBundle, &type, NULL);
     57        CFBundleGetPackageInfo(cfBundle.get(), &type, NULL);
    5858        if (type != FOUR_CHAR_CODE('WBPL')) {
    5959            [self release];
     
    104104#if !LOG_DISABLED
    105105    CFAbsoluteTime duration = CFAbsoluteTimeGetCurrent() - start;
    106     LOG(Plugins, "principalClass took %f seconds for: %@", duration, (NSString *)[self name]);
     106    LOG(Plugins, "principalClass took %f seconds for: %@", duration, (NSString *)[self pluginInfo].name);
    107107#endif
    108108    return [super load];
  • trunk/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r61568 r61581  
    16331633            if (!pluginPageURL.protocolInHTTPFamily())
    16341634                pluginPageURL = KURL();
    1635             NSString *pluginName = pluginPackage ? (NSString *)[pluginPackage name] : nil;
     1635            NSString *pluginName = pluginPackage ? (NSString *)[pluginPackage pluginInfo].name : nil;
    16361636
    16371637            NSError *error = [[NSError alloc] _initWithPluginErrorCode:errorCode
     
    17251725        WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(getWebView(m_webFrame.get()));
    17261726        if (implementations->plugInFailedWithErrorFunc) {
    1727             NSString *pluginName = pluginPackage ? (NSString *)[pluginPackage name] : nil;
     1727            NSString *pluginName = pluginPackage ? (NSString *)[pluginPackage pluginInfo].name : nil;
    17281728            NSError *error = [[NSError alloc] _initWithPluginErrorCode:WebKitErrorJavaUnavailable contentURL:nil pluginPageURL:nil pluginName:pluginName MIMEType:MIMEType];
    17291729            CallResourceLoadDelegate(implementations->plugInFailedWithErrorFunc, [m_webFrame.get() webView],
  • trunk/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm

    r61522 r61581  
    6565    NSArray* pluginsArray = [[WebPluginDatabase sharedDatabase] plugins];
    6666    for (unsigned int i = 0; i < [pluginsArray count]; ++i) {
    67         PluginInfo pluginInfo;
     67        WebPluginPackage *plugin = [pluginsArray objectAtIndex:i];
    6868
    69         WebPluginPackage *plugin = [pluginsArray objectAtIndex:i];
    70    
    71         pluginInfo.name = [plugin name];
    72         pluginInfo.file = [plugin filename];
    73         pluginInfo.desc = [plugin pluginDescription];
    74         pluginInfo.mimes = [plugin mimeTypes];
    75 
    76         plugins.append(pluginInfo);
     69        plugins.append([plugin pluginInfo]);
    7770    }
    7871   
Note: See TracChangeset for help on using the changeset viewer.