Changeset 63630 in webkit


Ignore:
Timestamp:
Jul 18, 2010 12:44:06 PM (14 years ago)
Author:
andersca@apple.com
Message:

Implement more NPRuntime related NPN_ functions
​https://bugs.webkit.org/show_bug.cgi?id=42520

Reviewed by Sam Weinig.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/Plugins/NPRuntimeUtilities.cpp: Added.
  • WebProcess/Plugins/NPRuntimeUtilities.h: Added.

Add new file with NPRuntime related utility functions.

  • WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:

(WebKit::NPN_CreateObject):
(WebKit::NPN_RetainObject):
(WebKit::NPN_ReleaseObject):
Call the corresponding NPRuntimeUtilities functions.

Location:
trunk/WebKit2
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r63629 r63630  
     12010-07-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Implement more NPRuntime related NPN_ functions
     6        https://bugs.webkit.org/show_bug.cgi?id=42520
     7
     8        * WebKit2.xcodeproj/project.pbxproj:
     9        * WebProcess/Plugins/NPRuntimeUtilities.cpp: Added.
     10        * WebProcess/Plugins/NPRuntimeUtilities.h: Added.
     11        Add new file with NPRuntime related utility functions.
     12
     13        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
     14        (WebKit::NPN_CreateObject):
     15        (WebKit::NPN_RetainObject):
     16        (WebKit::NPN_ReleaseObject):
     17        Call the corresponding NPRuntimeUtilities functions.
     18
    1192010-07-18  Anders Carlsson  <andersca@apple.com>
    220

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

    r63417 r63630  
    3333                1A10475A110A5AD500A43ECD /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */; };
    3434                1A1C4EC810D06099005E67E7 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
     35                1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */; };
     36                1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */; };
    3537                1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */; };
    3638                1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
    … …  
    298300                0F52667311DD4A490006D33C /* WebProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessProxyMac.mm; sourceTree = "<group>"; };
    299301                1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
     302                1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeUtilities.cpp; sourceTree = "<group>"; };
     303                1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRuntimeUtilities.h; sourceTree = "<group>"; };
    300304                1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
    301305                1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectionMac.cpp; sourceTree = "<group>"; };
    … …  
    649653                                1A6FB7E511E6530500DB1371 /* DummyPlugin.cpp */,
    650654                                1A6FB7E411E6530500DB1371 /* DummyPlugin.h */,
     655                                1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */,
     656                                1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */,
    651657                                1A6FB7D011E651E200DB1371 /* Plugin.cpp */,
    652658                                1A6FB7D111E651E200DB1371 /* Plugin.h */,
    … …  
    12351241                                BC2E6E8C1141971500A63B1E /* WorkItem.h in Headers */,
    12361242                                BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */,
     1243                                1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */,
    12371244                        );
    12381245                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    14251432                                BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */,
    14261433                                BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
     1434                                1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
    14271435                        );
    14281436                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

    r63629 r63630  
    2626#include "NetscapeBrowserFuncs.h"
    2727
     28#include "NPRuntimeUtilities.h"
    2829#include "NetscapePlugin.h"
    2930#include "NotImplemented.h"
    … …  
    278279static NPObject* NPN_CreateObject(NPP npp, NPClass *npClass)
    279280{
    280     ASSERT(npClass);
    281 
    282     NPObject* object;
    283     if (npClass->allocate)
    284         object = npClass->allocate(npp, npClass);
    285     else
    286         object = static_cast<NPObject*>(NPN_MemAlloc(sizeof(NPObject)));
    287 
    288     object->_class = npClass;
    289     object->referenceCount = 1;
    290 
    291     return object;
    292 }
    293 
    294 static NPObject *NPN_RetainObject(NPObject *npobj)
    295 {
    296     notImplemented();
    297     return 0;
    298 }
    299 
    300 static void NPN_ReleaseObject(NPObject *npobj)
    301 {
    302     notImplemented();
     281    return createNPObject(npp, npClass);
     282}
     283
     284static NPObject *NPN_RetainObject(NPObject *npObject)
     285{
     286    retainNPObject(npObject);
     287    return npObject;
     288}
     289
     290static void NPN_ReleaseObject(NPObject *npObject)
     291{
     292    releaseNPObject(npObject);
    303293}
    304294
Note: See TracChangeset for help on using the changeset viewer.