Show
Ignore:
Timestamp:
08/20/08 13:23:52 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35853

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/kjs/JSGlobalData.h

    r429 r447  
    5555    class JSGlobalData : public RefCounted<JSGlobalData> { 
    5656    public: 
     57        static bool sharedInstanceExists(); 
     58        static JSGlobalData& sharedInstance(); 
     59 
    5760        static PassRefPtr<JSGlobalData> create(); 
    5861        ~JSGlobalData(); 
     
    8386        JSGlobalObject* head; 
    8487 
     88        bool isSharedInstance; 
     89 
    8590    private: 
    86         JSGlobalData(); 
     91        JSGlobalData(bool isShared = false); 
     92 
     93        static JSGlobalData*& sharedInstanceInternal(); 
    8794    }; 
    8895