Changeset 21889 in webkit for trunk/JavaScriptCore/kjs/context.h


Ignore:
Timestamp:
May 30, 2007, 5:19:36 AM (18 years ago)
Author:
bdash
Message:

2007-05-30 Luciano Montanaro <[email protected]>

Reviewed by Maciej.

  • cross-port Harri Porten's commits 636099 and 636108 from KJS: "publish a class anyway public already" and "class is being used from outside for quite some time" in preparation for further syncronizations
  • kjs/context.h:
  • kjs/date_object.cpp:
  • kjs/date_object.h:
  • kjs/function.h: (KJS::): (KJS::InternalFunctionImp::classInfo): (KJS::InternalFunctionImp::functionName):
  • kjs/function_object.h:
  • kjs/internal.h:
  • kjs/lookup.h: (KJS::getStaticPropertySlot): (KJS::getStaticFunctionSlot): (KJS::getStaticValueSlot):
  • kjs/object_object.h:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/kjs/context.h

    r16117 r21889  
    2727
    2828#include "function.h"
     29#include "internal.h"
    2930
    3031namespace KJS  {
     
    3233  class ExecState;
    3334 
    34   /** 
     35  /**
    3536   * @short Execution context.
    3637   *
     
    4748   * their first parameter. This can be used to obtain a handle to the current
    4849   * execution context.
    49    */   
     50   */
    5051  class Context {
    5152  public:
    52     Context(JSObject* global, Interpreter*, JSObject* thisV, 
    53             FunctionBodyNode* currentBody, CodeType type = GlobalCode, 
     53    Context(JSObject* global, Interpreter*, JSObject* thisV,
     54            FunctionBodyNode* currentBody, CodeType type = GlobalCode,
    5455            Context* callingContext = 0, FunctionImp* function = 0, const List* args = 0);
    5556    ~Context();
     
    99100     */
    100101    Context* callingContext() { return m_callingContext; }
    101    
     102
    102103    JSObject* activationObject() { return m_activation; }
    103104    CodeType codeType() { return m_codeType; }
     
    113114    void popIteration() { m_iterationDepth--; }
    114115    bool inIteration() const { return (m_iterationDepth > 0); }
    115    
     116
    116117    void pushSwitch() { m_switchDepth++; }
    117118    void popSwitch() { m_switchDepth--; }
    118119    bool inSwitch() const { return (m_switchDepth > 0); }
    119        
     120
    120121    void mark();
    121122
     
    135136    const List* m_arguments;
    136137    JSObject* m_activation;
    137    
     138
    138139    ScopeChain scope;
    139140    JSObject* m_variable;
Note: See TracChangeset for help on using the changeset viewer.