Changeset 62865 in webkit
- Timestamp:
- Jul 8, 2010 4:43:25 PM (14 years ago)
- Location:
- trunk/WebKit2
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r62863 r62865 1 2010-07-08 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Add stubbed out NPN functions 6 https://bugs.webkit.org/show_bug.cgi?id=41917 7 8 * WebKit2.xcodeproj/project.pbxproj: 9 * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: Added. 10 (WebKit::initializeBrowserFuncs): 11 (WebKit::netscapeBrowserFuncs): 12 * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h: Added. 13 * WebProcess/Plugins/Netscape/mac/NetscapePluginModuleMac.cpp: 14 (WebKit::NetscapePluginModule::tryLoad): 15 1 16 2010-07-08 Anders Carlsson <andersca@apple.com> 2 17 -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r62854 r62865 56 56 1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */; }; 57 57 1A6FBA0311E6813E00DB1371 /* NetscapePluginModuleMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA0211E6813E00DB1371 /* NetscapePluginModuleMac.cpp */; }; 58 1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */; }; 59 1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */; }; 58 60 1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; }; 59 61 1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; }; … … 319 321 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModule.cpp; sourceTree = "<group>"; }; 320 322 1A6FBA0211E6813E00DB1371 /* NetscapePluginModuleMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModuleMac.cpp; sourceTree = "<group>"; }; 323 1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetscapeBrowserFuncs.h; sourceTree = "<group>"; }; 324 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapeBrowserFuncs.cpp; sourceTree = "<group>"; }; 321 325 1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 322 326 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; … … 649 653 children = ( 650 654 1A6FBA0111E6812B00DB1371 /* mac */, 655 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */, 656 1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */, 651 657 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */, 652 658 1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */, … … 1211 1217 1A6FB7E611E6530500DB1371 /* DummyPlugin.h in Headers */, 1212 1218 1A6FB90B11E66FBC00DB1371 /* NetscapePluginModule.h in Headers */, 1219 1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */, 1213 1220 ); 1214 1221 runOnlyForDeploymentPostprocessing = 0; … … 1397 1404 1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */, 1398 1405 1A6FBA0311E6813E00DB1371 /* NetscapePluginModuleMac.cpp in Sources */, 1406 1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */, 1399 1407 ); 1400 1408 runOnlyForDeploymentPostprocessing = 0; … … 1488 1496 DEBUG_DEFINES = "$(DEBUG_DEFINES_debug)"; 1489 1497 GCC_OPTIMIZATION_LEVEL = "$(GCC_OPTIMIZATION_LEVEL_debug)"; 1498 GCC_VERSION = 4.2; 1490 1499 }; 1491 1500 name = Debug; … … 1495 1504 baseConfigurationReference = 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */; 1496 1505 buildSettings = { 1506 GCC_VERSION = 4.2; 1497 1507 }; 1498 1508 name = Release; … … 1502 1512 baseConfigurationReference = 1A4F976A100E7B6600637A18 /* Base.xcconfig */; 1503 1513 buildSettings = { 1514 GCC_VERSION = 4.2; 1504 1515 }; 1505 1516 name = Production; -
trunk/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginModuleMac.cpp
r62854 r62865 25 25 26 26 #include "NetscapePluginModule.h" 27 #include "NetscapeBrowserFuncs.h" 27 28 28 29 namespace WebKit { … … 69 70 return false; 70 71 72 if (initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR) 73 return false; 74 75 m_pluginFuncs.size = sizeof(NPPluginFuncs); 76 m_pluginFuncs.version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR; 77 if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR) 78 return false; 79 71 80 return true; 72 81 }
Note: See TracChangeset
for help on using the changeset viewer.