source: webkit/trunk/JavaScriptCore/runtime/JSActivation.h@ 40332

Last change on this file since 40332 was 40332, checked in by [email protected], 16 years ago

JavaScriptCore:

2009-01-28 Sam Weinig <[email protected]>

Reviewed by Geoff Garen.

Fix for <rdar://problem/6129678>
REGRESSION (Safari 3-4): Local variable not accessible from Dashcode console or variables view

Iterating the properties of activation objects accessed through the WebKit debugging
APIs was broken by forced conversion of JSActivation to the global object. To fix this,
we use a proxy activation object that acts more like a normal JSObject.

  • debugger/DebuggerActivation.cpp: Added. (JSC::DebuggerActivation::DebuggerActivation): (JSC::DebuggerActivation::mark): (JSC::DebuggerActivation::className): (JSC::DebuggerActivation::getOwnPropertySlot): (JSC::DebuggerActivation::put): (JSC::DebuggerActivation::putWithAttributes): (JSC::DebuggerActivation::deleteProperty): (JSC::DebuggerActivation::getPropertyNames): (JSC::DebuggerActivation::getPropertyAttributes): (JSC::DebuggerActivation::defineGetter): (JSC::DebuggerActivation::defineSetter): (JSC::DebuggerActivation::lookupGetter): (JSC::DebuggerActivation::lookupSetter):
  • debugger/DebuggerActivation.h: Added. Proxy JSActivation object for Debugging.
  • runtime/JSActivation.h: (JSC::JSActivation::isActivationObject): Added.
  • runtime/JSObject.h: (JSC::JSObject::isActivationObject): Added.

WebCore:

2009-01-28 Sam Weinig <[email protected]>

Reviewed by Geoff Garen.

Add forwarding header.

  • ForwardingHeaders/debugger/DebuggerActivation.h: Added.

WebKit/mac:

2009-01-28 Sam Weinig <[email protected]>

Reviewed by Geoff Garen.

Fix for <rdar://problem/6129678>
REGRESSION (Safari 3-4): Local variable not accessible from Dashcode console or variables view

  • WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFrame scopeChain]): Wrap JSActivations in DebuggerActivations.
File size: 3.8 KB
Line 
1/*
2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#ifndef JSActivation_h
30#define JSActivation_h
31
32#include "CodeBlock.h"
33#include "JSVariableObject.h"
34#include "RegisterFile.h"
35#include "SymbolTable.h"
36#include "Nodes.h"
37
38namespace JSC {
39
40 class Arguments;
41 class Register;
42
43 class JSActivation : public JSVariableObject {
44 typedef JSVariableObject Base;
45 public:
46 JSActivation(CallFrame*, PassRefPtr<FunctionBodyNode>);
47 virtual ~JSActivation();
48
49 virtual void mark();
50
51 virtual bool isDynamicScope() const;
52
53 virtual bool isActivationObject() const { return true; }
54
55 virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
56
57 virtual void put(ExecState*, const Identifier&, JSValuePtr, PutPropertySlot&);
58
59 virtual void putWithAttributes(ExecState*, const Identifier&, JSValuePtr, unsigned attributes);
60 virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
61
62 virtual JSObject* toThisObject(ExecState*) const;
63
64 void copyRegisters(Arguments* arguments);
65
66 virtual const ClassInfo* classInfo() const { return &info; }
67 static const ClassInfo info;
68
69 static PassRefPtr<Structure> createStructure(JSValuePtr proto) { return Structure::create(proto, TypeInfo(ObjectType, NeedsThisConversion)); }
70
71 private:
72 struct JSActivationData : public JSVariableObjectData {
73 JSActivationData(PassRefPtr<FunctionBodyNode> functionBody, Register* registers)
74 : JSVariableObjectData(&functionBody->generatedBytecode().symbolTable(), registers)
75 , functionBody(functionBody)
76 {
77 }
78
79 RefPtr<FunctionBodyNode> functionBody;
80 };
81
82 static JSValuePtr argumentsGetter(ExecState*, const Identifier&, const PropertySlot&);
83 NEVER_INLINE PropertySlot::GetValueFunc getArgumentsGetter();
84
85 JSActivationData* d() const { return static_cast<JSActivationData*>(JSVariableObject::d); }
86 };
87
88 JSActivation* asActivation(JSValuePtr);
89
90 inline JSActivation* asActivation(JSValuePtr value)
91 {
92 ASSERT(asObject(value)->inherits(&JSActivation::info));
93 return static_cast<JSActivation*>(asObject(value));
94 }
95
96} // namespace JSC
97
98#endif // JSActivation_h
Note: See TracBrowser for help on using the repository browser.