Changeset 62865 in webkit


Ignore:
Timestamp:
Jul 8, 2010 4:43:25 PM (14 years ago)
Author:
andersca@apple.com
Message:

Add stubbed out NPN functions
​https://bugs.webkit.org/show_bug.cgi?id=41917

Reviewed by Sam Weinig.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: Added.

(WebKit::initializeBrowserFuncs):
(WebKit::netscapeBrowserFuncs):

  • WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h: Added.
  • WebProcess/Plugins/Netscape/mac/NetscapePluginModuleMac.cpp:

(WebKit::NetscapePluginModule::tryLoad):

Location:
trunk/WebKit2
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r62863 r62865  
     12010-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
    1162010-07-08  Anders Carlsson  <andersca@apple.com>
    217

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

    r62854 r62865  
    5656                1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */; };
    5757                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 */; };
    5860                1AA1CC5D100FA1A10078DEBC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
    5961                1AA1CD07100FA1BA0078DEBC /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
    … …  
    319321                1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModule.cpp; sourceTree = "<group>"; };
    320322                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>"; };
    321325                1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    322326                1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    649653                        children = (
    650654                                1A6FBA0111E6812B00DB1371 /* mac */,
     655                                1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */,
     656                                1A6FBA2811E6862700DB1371 /* NetscapeBrowserFuncs.h */,
    651657                                1A6FB90A11E66FBC00DB1371 /* NetscapePluginModule.cpp */,
    652658                                1A6FB90911E66FBC00DB1371 /* NetscapePluginModule.h */,
    … …  
    12111217                                1A6FB7E611E6530500DB1371 /* DummyPlugin.h in Headers */,
    12121218                                1A6FB90B11E66FBC00DB1371 /* NetscapePluginModule.h in Headers */,
     1219                                1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */,
    12131220                        );
    12141221                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    13971404                                1A6FB90C11E66FBC00DB1371 /* NetscapePluginModule.cpp in Sources */,
    13981405                                1A6FBA0311E6813E00DB1371 /* NetscapePluginModuleMac.cpp in Sources */,
     1406                                1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */,
    13991407                        );
    14001408                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    14881496                                DEBUG_DEFINES = "$(DEBUG_DEFINES_debug)";
    14891497                                GCC_OPTIMIZATION_LEVEL = "$(GCC_OPTIMIZATION_LEVEL_debug)";
     1498                                GCC_VERSION = 4.2;
    14901499                        };
    14911500                        name = Debug;
    … …  
    14951504                        baseConfigurationReference = 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */;
    14961505                        buildSettings = {
     1506                                GCC_VERSION = 4.2;
    14971507                        };
    14981508                        name = Release;
    … …  
    15021512                        baseConfigurationReference = 1A4F976A100E7B6600637A18 /* Base.xcconfig */;
    15031513                        buildSettings = {
     1514                                GCC_VERSION = 4.2;
    15041515                        };
    15051516                        name = Production;

  • trunk/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginModuleMac.cpp

    r62854 r62865  
    2525
    2626#include "NetscapePluginModule.h"
     27#include "NetscapeBrowserFuncs.h"
    2728
    2829namespace WebKit {
    … …  
    6970        return false;
    7071
     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
    7180    return true;
    7281}
Note: See TracChangeset for help on using the changeset viewer.