Changeset 88819 in webkit
- Timestamp:
- Jun 14, 2011 10:37:25 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r88803 r88819 1 2011-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 1 26 2011-06-14 Carlos Garcia Campos <cgarcia@igalia.com> 2 27 -
trunk/Source/WebKit2/GNUmakefile.am
r88800 r88819 231 231 Source/WebKit2/Shared/Plugins/NPVariantData.cpp \ 232 232 Source/WebKit2/Shared/Plugins/NPVariantData.h \ 233 Source/WebKit2/Shared/Plugins/PluginModuleInfo.cpp \ 234 Source/WebKit2/Shared/Plugins/PluginModuleInfo.h \ 233 235 Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp \ 234 236 Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h \ -
trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h
r86097 r88819 28 28 29 29 #include "Module.h" 30 #include "PluginModuleInfo.h" 30 31 #include "PluginQuirks.h" 31 32 #include <WebCore/npruntime_internal.h> 32 33 #include <wtf/RefCounted.h> 33 34 #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 can37 // put in Shared/Plugins.38 #include "PluginInfoStore.h"39 35 40 36 namespace WebKit { … … 50 46 void decrementLoadCount(); 51 47 52 static bool getPluginInfo(const String& pluginPath, Plugin InfoStore::Plugin&);48 static bool getPluginInfo(const String& pluginPath, PluginModuleInfo&); 53 49 54 50 const PluginQuirks& pluginQuirks() const { return m_pluginQuirks; } -
trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
r88735 r88819 36 36 namespace WebKit { 37 37 38 static bool getPluginArchitecture(CFBundleRef bundle, Plugin InfoStore::Plugin& plugin)38 static bool getPluginArchitecture(CFBundleRef bundle, PluginModuleInfo& plugin) 39 39 { 40 40 RetainPtr<CFArrayRef> pluginArchitecturesArray(AdoptCF, CFBundleCopyExecutableArchitectures(bundle)); … … 109 109 } 110 110 111 static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const Plugin InfoStore::Plugin& plugin)111 static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const PluginModuleInfo& plugin) 112 112 { 113 113 CFStringRef propertyListFilename = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypesFilename"))); … … 132 132 } 133 133 134 static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, Plugin InfoStore::Plugin& plugin)134 static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginModuleInfo& plugin) 135 135 { 136 136 RetainPtr<CFDictionaryRef> mimeTypes = getMIMETypesFromPluginBundle(bundle, plugin); … … 289 289 static const ResID MIMEListStringStringNumber = 128; 290 290 291 static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, Plugin InfoStore::Plugin& plugin)291 static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginModuleInfo& plugin) 292 292 { 293 293 ResourceMap resourceMap(bundle); … … 343 343 } 344 344 345 bool NetscapePluginModule::getPluginInfo(const String& pluginPath, Plugin InfoStore::Plugin& plugin)345 bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin) 346 346 { 347 347 RetainPtr<CFStringRef> bundlePath(AdoptCF, pluginPath.createCFString()); … … 450 450 void NetscapePluginModule::determineQuirks() 451 451 { 452 Plugin InfoStore::Pluginplugin;452 PluginModuleInfo plugin; 453 453 if (!getPluginInfo(m_pluginPath, plugin)) 454 454 return; -
trunk/Source/WebKit2/WebKit2.pro
r88799 r88819 168 168 Shared/Plugins/NPObjectProxy.h \ 169 169 Shared/Plugins/NPVariantData.h \ 170 Shared/Plugins/PluginModuleInfo.h \ 170 171 Shared/Plugins/PluginProcessCreationParameters.h \ 171 172 Shared/Plugins/PluginQuirks.h \ … … 335 336 Shared/Plugins/NPObjectProxy.cpp \ 336 337 Shared/Plugins/NPVariantData.cpp \ 338 Shared/Plugins/PluginModuleInfo.cpp \ 337 339 Shared/Plugins/PluginProcessCreationParameters.cpp \ 338 340 Shared/ChildProcess.cpp \ -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r88463 r88819 101 101 1A3979F61332983A00E00300 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; 102 102 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 */; }; 103 105 1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */; }; 104 106 1A3DD202125E5A1F004515E6 /* WebFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3DD201125E5A1F004515E6 /* WebFindClient.h */; }; … … 1007 1009 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; }; 1008 1010 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>"; }; 1009 1013 1A3DD1FC125E59F3004515E6 /* WebFindClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFindClient.cpp; sourceTree = "<group>"; }; 1010 1014 1A3DD201125E5A1F004515E6 /* WebFindClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFindClient.h; sourceTree = "<group>"; }; … … 2245 2249 children = ( 2246 2250 1A4A9C5212B816CF008FE984 /* Netscape */, 2251 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */, 2252 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */, 2247 2253 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */, 2248 2254 1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */, … … 3818 3824 512DF70B138C26C700A22FC6 /* KeychainAttribute.h in Headers */, 3819 3825 93C01DAC139AC91700ED51D7 /* CoreIPCClientRunLoop.h in Headers */, 3826 1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */, 3820 3827 ); 3821 3828 runOnlyForDeploymentPostprocessing = 0; … … 4486 4493 512DF70A138C26C700A22FC6 /* KeychainAttribute.cpp in Sources */, 4487 4494 93C01DAD139AC91700ED51D7 /* CoreIPCClientRunLoop.mm in Sources */, 4495 1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */, 4488 4496 ); 4489 4497 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebKit2/win/WebKit2.vcproj
r88463 r88819 1431 1431 > 1432 1432 <File 1433 RelativePath="..\Shared\Plugins\PluginModuleInfo.cpp" 1434 > 1435 </File> 1436 <File 1437 RelativePath="..\Shared\Plugins\PluginModuleInfo.h" 1438 > 1439 </File> 1440 <File 1433 1441 RelativePath="..\Shared\Plugins\PluginQuirks.h" 1434 1442 >
Note: See TracChangeset
for help on using the changeset viewer.