Changeset 88819 in webkit


Ignore:
Timestamp:
Jun 14, 2011 10:37:25 AM (13 years ago)
Author:
andersca@apple.com
Message:

2011-06-14 Anders Carlsson <​andersca@apple.com>

Reviewed by Darin Adler.

Add PluginModuleInfo header and prepare for renaming of PluginInfoStore::Plugin to PluginModuleInfo
​https://bugs.webkit.org/show_bug.cgi?id=62647

Make PluginModuleInfo a typedef of PluginInfoStore::Plugin for now; eventually it should be its own class,
and PluginInfoStore::Plugin should go away.

  • GNUmakefile.am:
  • Shared/Plugins/Netscape/NetscapePluginModule.h:
  • Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm: (WebKit::getPluginArchitecture): (WebKit::getMIMETypesFromPluginBundle): (WebKit::getPluginInfoFromPropertyLists): (WebKit::getPluginInfoFromCarbonResources): (WebKit::NetscapePluginModule::getPluginInfo): (WebKit::NetscapePluginModule::determineQuirks):
  • Shared/Plugins/PluginModuleInfo.cpp: Added.
  • Shared/Plugins/PluginModuleInfo.h: Added.
  • WebKit2.pro:
  • WebKit2.xcodeproj/project.pbxproj:
  • win/WebKit2.vcproj:
Location:
trunk/Source/WebKit2
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r88803 r88819  
     12011-06-14  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Add PluginModuleInfo header and prepare for renaming of PluginInfoStore::Plugin to PluginModuleInfo
     6        https://bugs.webkit.org/show_bug.cgi?id=62647
     7
     8        Make PluginModuleInfo a typedef of PluginInfoStore::Plugin for now; eventually it should be its own class,
     9        and PluginInfoStore::Plugin should go away.
     10
     11        * GNUmakefile.am:
     12        * Shared/Plugins/Netscape/NetscapePluginModule.h:
     13        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
     14        (WebKit::getPluginArchitecture):
     15        (WebKit::getMIMETypesFromPluginBundle):
     16        (WebKit::getPluginInfoFromPropertyLists):
     17        (WebKit::getPluginInfoFromCarbonResources):
     18        (WebKit::NetscapePluginModule::getPluginInfo):
     19        (WebKit::NetscapePluginModule::determineQuirks):
     20        * Shared/Plugins/PluginModuleInfo.cpp: Added.
     21        * Shared/Plugins/PluginModuleInfo.h: Added.
     22        * WebKit2.pro:
     23        * WebKit2.xcodeproj/project.pbxproj:
     24        * win/WebKit2.vcproj:
     25
    1262011-06-14  Carlos Garcia Campos  <cgarcia@igalia.com>
    227

  • trunk/Source/WebKit2/GNUmakefile.am

    r88800 r88819  
    231231        Source/WebKit2/Shared/Plugins/NPVariantData.cpp \
    232232        Source/WebKit2/Shared/Plugins/NPVariantData.h \
     233        Source/WebKit2/Shared/Plugins/PluginModuleInfo.cpp \
     234        Source/WebKit2/Shared/Plugins/PluginModuleInfo.h \
    233235        Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp \
    234236        Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h \

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h

    r86097 r88819  
    2828
    2929#include "Module.h"
     30#include "PluginModuleInfo.h"
    3031#include "PluginQuirks.h"
    3132#include <WebCore/npruntime_internal.h>
    3233#include <wtf/RefCounted.h>
    3334#include <wtf/text/WTFString.h>
    34 
    35 // FIXME: We should not include PluginInfoStore.h here. Instead,
    36 // PluginInfoStore::Plugin should be moved out into its own header which we can
    37 // put in Shared/Plugins.
    38 #include "PluginInfoStore.h"
    3935
    4036namespace WebKit {
    … …  
    5046    void decrementLoadCount();
    5147
    52     static bool getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin&);
     48    static bool getPluginInfo(const String& pluginPath, PluginModuleInfo&);
    5349
    5450    const PluginQuirks& pluginQuirks() const { return m_pluginQuirks; }

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

    r88735 r88819  
    3636namespace WebKit {
    3737
    38 static bool getPluginArchitecture(CFBundleRef bundle, PluginInfoStore::Plugin& plugin)
     38static bool getPluginArchitecture(CFBundleRef bundle, PluginModuleInfo& plugin)
    3939{
    4040    RetainPtr<CFArrayRef> pluginArchitecturesArray(AdoptCF, CFBundleCopyExecutableArchitectures(bundle));
    … …  
    109109}
    110110
    111 static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const PluginInfoStore::Plugin& plugin)
     111static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const PluginModuleInfo& plugin)
    112112{
    113113    CFStringRef propertyListFilename = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypesFilename")));
    … …  
    132132}
    133133
    134 static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfoStore::Plugin& plugin)
     134static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginModuleInfo& plugin)
    135135{
    136136    RetainPtr<CFDictionaryRef> mimeTypes = getMIMETypesFromPluginBundle(bundle, plugin);
    … …  
    289289static const ResID MIMEListStringStringNumber = 128;
    290290
    291 static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfoStore::Plugin& plugin)
     291static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginModuleInfo& plugin)
    292292{
    293293    ResourceMap resourceMap(bundle);
    … …  
    343343}
    344344
    345 bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin)
     345bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
    346346{
    347347    RetainPtr<CFStringRef> bundlePath(AdoptCF, pluginPath.createCFString());
    … …  
    450450void NetscapePluginModule::determineQuirks()
    451451{
    452     PluginInfoStore::Plugin plugin;
     452    PluginModuleInfo plugin;
    453453    if (!getPluginInfo(m_pluginPath, plugin))
    454454        return;

  • trunk/Source/WebKit2/WebKit2.pro

    r88799 r88819  
    168168    Shared/Plugins/NPObjectProxy.h \
    169169    Shared/Plugins/NPVariantData.h \
     170    Shared/Plugins/PluginModuleInfo.h \
    170171    Shared/Plugins/PluginProcessCreationParameters.h \
    171172    Shared/Plugins/PluginQuirks.h \
    … …  
    335336    Shared/Plugins/NPObjectProxy.cpp \
    336337    Shared/Plugins/NPVariantData.cpp \
     338    Shared/Plugins/PluginModuleInfo.cpp \
    337339    Shared/Plugins/PluginProcessCreationParameters.cpp \
    338340    Shared/ChildProcess.cpp \

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r88463 r88819  
    101101                1A3979F61332983A00E00300 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
    102102                1A3979F71332983F00E00300 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
     103                1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */; };
     104                1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; };
    103105                1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */; };
    104106                1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3DD201125E5A1F004515E6 /* WebFindClient.h */; };
    … …  
    10071009                1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
    10081010                1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectionMac.cpp; sourceTree = "<group>"; };
     1011                1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginModuleInfo.cpp; sourceTree = "<group>"; };
     1012                1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; };
    10091013                1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFindClient.cpp; sourceTree = "<group>"; };
    10101014                1A3DD201125E5A1F004515E6 /* WebFindClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFindClient.h; sourceTree = "<group>"; };
    … …  
    22452249                        children = (
    22462250                                1A4A9C5212B816CF008FE984 /* Netscape */,
     2251                                1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */,
     2252                                1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */,
    22472253                                1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */,
    22482254                                1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */,
    … …  
    38183824                                512DF70B138C26C700A22FC6 /* KeychainAttribute.h in Headers */,
    38193825                                93C01DAC139AC91700ED51D7 /* CoreIPCClientRunLoop.h in Headers */,
     3826                                1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */,
    38203827                        );
    38213828                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    44864493                                512DF70A138C26C700A22FC6 /* KeychainAttribute.cpp in Sources */,
    44874494                                93C01DAD139AC91700ED51D7 /* CoreIPCClientRunLoop.mm in Sources */,
     4495                                1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */,
    44884496                        );
    44894497                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebKit2/win/WebKit2.vcproj

    r88463 r88819  
    14311431                                >
    14321432                                <File
     1433                                        RelativePath="..\Shared\Plugins\PluginModuleInfo.cpp"
     1434                                        >
     1435                                </File>
     1436                                <File
     1437                                        RelativePath="..\Shared\Plugins\PluginModuleInfo.h"
     1438                                        >
     1439                                </File>
     1440                                <File
    14331441                                        RelativePath="..\Shared\Plugins\PluginQuirks.h"
    14341442                                        >
Note: See TracChangeset for help on using the changeset viewer.