Changeset 64145 in webkit


Ignore:
Timestamp:
Jul 27, 2010 12:04:50 PM (14 years ago)
Author:
andersca@apple.com
Message:

Rename NPJSObjectMap to NPRuntimeObjectMap
https://bugs.webkit.org/show_bug.cgi?id=43066

Reviewed by Adam Roben.

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/Plugins/NPJSObjectMap.cpp: Removed.
  • WebProcess/Plugins/NPJSObjectMap.h: Removed.
  • WebProcess/Plugins/NPRuntimeObjectMap.cpp: Added.

(WebKit::NPJSObject::NPJSObject):
(WebKit::NPJSObject::~NPJSObject):
(WebKit::NPJSObject::toNPJSObject):
(WebKit::NPJSObject::create):
(WebKit::NPJSObject::isNPJSObject):
(WebKit::NPJSObject::initialize):
(WebKit::identifierFromIdentifierRep):
(WebKit::NPJSObject::hasProperty):
(WebKit::NPJSObject::getProperty):
(WebKit::NPJSObject::npClass):
(WebKit::NPJSObject::NP_Allocate):
(WebKit::NPJSObject::NP_Deallocate):
(WebKit::NPJSObject::NP_HasProperty):
(WebKit::NPJSObject::NP_GetProperty):
(WebKit::NPRuntimeObjectMap::NPRuntimeObjectMap):
(WebKit::NPRuntimeObjectMap::getOrCreateNPObject):
(WebKit::NPRuntimeObjectMap::invalidate):

  • WebProcess/Plugins/NPRuntimeObjectMap.h: Added.
  • WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::PluginView):
(WebKit::PluginView::~PluginView):
(WebKit::PluginView::windowScriptNPObject):
(WebKit::PluginView::pluginElementNPObject):

  • WebProcess/Plugins/PluginView.h:
  • win/WebKit2.vcproj:
Location:
trunk/WebKit2
Files:
5 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebKit2/ChangeLog

    r64140 r64145  
     12010-07-27  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        Rename NPJSObjectMap to NPRuntimeObjectMap
     6        https://bugs.webkit.org/show_bug.cgi?id=43066
     7
     8        * WebKit2.xcodeproj/project.pbxproj:
     9        * WebProcess/Plugins/NPJSObjectMap.cpp: Removed.
     10        * WebProcess/Plugins/NPJSObjectMap.h: Removed.
     11        * WebProcess/Plugins/NPRuntimeObjectMap.cpp: Added.
     12        (WebKit::NPJSObject::NPJSObject):
     13        (WebKit::NPJSObject::~NPJSObject):
     14        (WebKit::NPJSObject::toNPJSObject):
     15        (WebKit::NPJSObject::create):
     16        (WebKit::NPJSObject::isNPJSObject):
     17        (WebKit::NPJSObject::initialize):
     18        (WebKit::identifierFromIdentifierRep):
     19        (WebKit::NPJSObject::hasProperty):
     20        (WebKit::NPJSObject::getProperty):
     21        (WebKit::NPJSObject::npClass):
     22        (WebKit::NPJSObject::NP_Allocate):
     23        (WebKit::NPJSObject::NP_Deallocate):
     24        (WebKit::NPJSObject::NP_HasProperty):
     25        (WebKit::NPJSObject::NP_GetProperty):
     26        (WebKit::NPRuntimeObjectMap::NPRuntimeObjectMap):
     27        (WebKit::NPRuntimeObjectMap::getOrCreateNPObject):
     28        (WebKit::NPRuntimeObjectMap::invalidate):
     29        * WebProcess/Plugins/NPRuntimeObjectMap.h: Added.
     30        * WebProcess/Plugins/PluginView.cpp:
     31        (WebKit::PluginView::PluginView):
     32        (WebKit::PluginView::~PluginView):
     33        (WebKit::PluginView::windowScriptNPObject):
     34        (WebKit::PluginView::pluginElementNPObject):
     35        * WebProcess/Plugins/PluginView.h:
     36        * win/WebKit2.vcproj:
     37
    1382010-07-27  Adam Roben  <aroben@apple.com>
    239
  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r64068 r64145  
    3434                1A1C4EC810D06099005E67E7 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
    3535                1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C648611F415B700553C19 /* WebContextMac.mm */; };
    36                 1A2161B011F37664008AD0F5 /* NPJSObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2161AE11F37664008AD0F5 /* NPJSObjectMap.h */; };
    37                 1A2161B111F37664008AD0F5 /* NPJSObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2161AF11F37664008AD0F5 /* NPJSObjectMap.cpp */; };
     36                1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */; };
     37                1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */; };
    3838                1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */; };
    3939                1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */; };
     
    313313                1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
    314314                1A1C648611F415B700553C19 /* WebContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContextMac.mm; sourceTree = "<group>"; };
    315                 1A2161AE11F37664008AD0F5 /* NPJSObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPJSObjectMap.h; sourceTree = "<group>"; };
    316                 1A2161AF11F37664008AD0F5 /* NPJSObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPJSObjectMap.cpp; sourceTree = "<group>"; };
     315                1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRuntimeObjectMap.h; sourceTree = "<group>"; };
     316                1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeObjectMap.cpp; sourceTree = "<group>"; };
    317317                1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeUtilities.cpp; sourceTree = "<group>"; };
    318318                1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRuntimeUtilities.h; sourceTree = "<group>"; };
     
    674674                        children = (
    675675                                1A6FB90811E66FB100DB1371 /* Netscape */,
    676                                 1A2161AF11F37664008AD0F5 /* NPJSObjectMap.cpp */,
    677                                 1A2161AE11F37664008AD0F5 /* NPJSObjectMap.h */,
     676                                1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */,
     677                                1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */,
    678678                                1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */,
    679679                                1A2162AF11F38971008AD0F5 /* NPRuntimeUtilities.h */,
     
    12741274                                BC2E6E8C1141971500A63B1E /* WorkItem.h in Headers */,
    12751275                                BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */,
    1276                                 1A2161B011F37664008AD0F5 /* NPJSObjectMap.h in Headers */,
     1276                                1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */,
    12771277                                1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */,
    12781278                                1A24B5F311F531E800C38269 /* MachUtilities.h in Headers */,
     
    14721472                                BC2E6E8D1141971500A63B1E /* WorkQueue.cpp in Sources */,
    14731473                                BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
    1474                                 1A2161B111F37664008AD0F5 /* NPJSObjectMap.cpp in Sources */,
     1474                                1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */,
    14751475                                1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
    14761476                                1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */,
  • trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp

    r64144 r64145  
    2424 */
    2525
    26 #include "NPJSObjectMap.h"
     26#include "NPRuntimeObjectMap.h"
    2727
    2828#include "NPRuntimeUtilities.h"
     
    4242class NPJSObject : public NPObject, Noncopyable {
    4343public:
    44     static NPJSObject* create(NPJSObjectMap* objectMap, JSObject* jsObject);
     44    static NPJSObject* create(NPRuntimeObjectMap* objectMap, JSObject* jsObject);
    4545
    4646private:
     
    6565    }
    6666
    67     void initialize(NPJSObjectMap*, JSObject* jsObject);
     67    void initialize(NPRuntimeObjectMap*, JSObject* jsObject);
    6868
    6969    bool hasProperty(NPIdentifier);
     
    7676    static bool NP_GetProperty(NPObject* npobj, NPIdentifier name, NPVariant* result);
    7777   
    78     NPJSObjectMap* m_objectMap;
     78    NPRuntimeObjectMap* m_objectMap;
    7979    ProtectedPtr<JSObject> m_jsObject;
    8080};
    8181
    82 NPJSObject* NPJSObject::create(NPJSObjectMap* objectMap, JSObject* jsObject)
     82NPJSObject* NPJSObject::create(NPRuntimeObjectMap* objectMap, JSObject* jsObject)
    8383{
    8484    NPJSObject* npJSObject = toNPJSObject(createNPObject(0, npClass()));
     
    9393}
    9494
    95 void NPJSObject::initialize(NPJSObjectMap* objectMap, JSObject* jsObject)
     95void NPJSObject::initialize(NPRuntimeObjectMap* objectMap, JSObject* jsObject)
    9696{
    9797    ASSERT(!m_objectMap);
     
    182182}
    183183
    184 NPJSObjectMap::NPJSObjectMap(PluginView* pluginView)
     184NPRuntimeObjectMap::NPRuntimeObjectMap(PluginView* pluginView)
    185185    : m_pluginView(pluginView)
    186186{
    187187}
    188188
    189 NPObject* NPJSObjectMap::getOrCreateObject(JSObject* jsObject)
     189NPObject* NPRuntimeObjectMap::getOrCreateNPObject(JSObject* jsObject)
    190190{
    191191    // First, check if we already know about this object.
     
    201201}
    202202
    203 void NPJSObjectMap::invalidate()
     203void NPRuntimeObjectMap::invalidate()
    204204{
    205205    Vector<NPJSObject*> npJSObjects;
  • trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h

    r64144 r64145  
    4242// A per plug-in map of NPObjects that wrap JavaScript objects.
    4343
    44 class NPJSObjectMap {
     44class NPRuntimeObjectMap {
    4545public:
    46     explicit NPJSObjectMap(PluginView*);
     46    explicit NPRuntimeObjectMap(PluginView*);
    4747
    4848    // Returns an NPObject that wraps the given JavaScript object. If there is already an NPObject that wraps this JSObject, it will
    4949    // retain it and return it.
    50     NPObject* getOrCreateObject(JSC::JSObject*);
     50    NPObject* getOrCreateNPObject(JSC::JSObject*);
    5151
    5252    void invalidate();
  • trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

    r64073 r64145  
    216216    , m_isWaitingUntilMediaCanStart(false)
    217217    , m_pendingURLRequestsTimer(RunLoop::main(), this, &PluginView::pendingURLRequestsTimerFired)
    218     , m_npJSObjectMap(this)
     218    , m_npRuntimeObjectMap(this)
    219219{
    220220}
     
    233233        m_plugin->destroy();
    234234
    235     // Invalidate the NPObject map.
    236     m_npJSObjectMap.invalidate();
     235    // Invalidate the object map.
     236    m_npRuntimeObjectMap.invalidate();
    237237
    238238    // Cancel all streams.
     
    607607    ASSERT(frame()->script()->canExecuteScripts(NotAboutToExecuteScript));
    608608
    609     return m_npJSObjectMap.getOrCreateObject(frame()->script()->windowShell(pluginWorld())->window());
     609    return m_npRuntimeObjectMap.getOrCreateNPObject(frame()->script()->windowShell(pluginWorld())->window());
    610610}
    611611
     
    619619    ASSERT(object);
    620620
    621     return m_npJSObjectMap.getOrCreateObject(object);
     621    return m_npRuntimeObjectMap.getOrCreateNPObject(object);
    622622}
    623623
  • trunk/WebKit2/WebProcess/Plugins/PluginView.h

    r64073 r64145  
    2727#define PluginView_h
    2828
    29 #include "NPJSObjectMap.h"
     29#include "NPRuntimeObjectMap.h"
    3030#include "Plugin.h"
    3131#include "PluginController.h"
     
    124124    HashMap<uint64_t, RefPtr<Stream> > m_streams;
    125125
    126     // NPObjects wrapping JavaScript objects.
    127     NPJSObjectMap m_npJSObjectMap;
     126    // A map of all related NPObjects for this plug-in view.
     127    NPRuntimeObjectMap m_npRuntimeObjectMap;
    128128};
    129129
  • trunk/WebKit2/win/WebKit2.vcproj

    r64068 r64145  
    753753                                >
    754754                                <File
    755                                         RelativePath="..\WebProcess\Plugins\NPJSObjectMap.cpp"
    756                                         >
    757                                 </File>
    758                                 <File
    759                                         RelativePath="..\WebProcess\Plugins\NPJSObjectMap.h"
     755                                        RelativePath="..\WebProcess\Plugins\NPRuntimeObjectMap.cpp"
     756                                        >
     757                                </File>
     758                                <File
     759                                        RelativePath="..\WebProcess\Plugins\NPRuntimeObjectMap.h"
    760760                                        >
    761761                                </File>
Note: See TracChangeset for help on using the changeset viewer.