nephele
/
haikuwebkit
1
0
Fork 0
Code Issues Releases Activity
haikuwebkit/LayoutTests/inspector/debugger/call-frame-this-host-expect...

10 lines
247 B
Plaintext
Raw Permalink Normal View History

Change ScriptDebugServer to use DebuggerCallFrame instead of JavaScriptCallFrame. https://bugs.webkit.org/show_bug.cgi?id=121969. Reviewed by Geoffrey Garen. Source/JavaScriptCore: 1. Make JavaScriptCallFrame a thin shell around the DebuggerCallFrame. DebuggerCallFrame now tracks whether it is valid instead of needing JavaScriptCallFrame do it. 2. ScriptDebugServer now only instantiates an DebuggerCallFrame when needed just before it pauses and calls back to its client, and then invalidates it immediately when the callback returns. Every subsequent callback to the client will use a new instance of the DebuggerCallFrame. 3. Similarly, ScriptDebugServer now only creates a JavaScriptCallFrame when it "pauses". 4. DebuggerCallFrame only creates its caller DebuggerCallFrame when it is needed i.e. when the client calls callerFrame(). Similarly, JavaScriptCallFrame only creates its caller when it's requested. 5. DebuggerCallFrame's line() and column() now returns a base-zero int. 6. WebScriptDebugDelegate now only caches the functionName of the frame instead of the entire DebuggerCallFrame because that is all that is needed. 7. Also removed evaluateInGlobalCallFrame() which is not used anywhere. * debugger/Debugger.cpp: * debugger/Debugger.h: * debugger/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::DebuggerCallFrame): (JSC::DebuggerCallFrame::callerFrame): (JSC::DebuggerCallFrame::dynamicGlobalObject): (JSC::DebuggerCallFrame::sourceId): (JSC::DebuggerCallFrame::functionName): (JSC::DebuggerCallFrame::scope): (JSC::DebuggerCallFrame::type): (JSC::DebuggerCallFrame::thisValue): (JSC::DebuggerCallFrame::evaluate): (JSC::DebuggerCallFrame::evaluateWithCallFrame): (JSC::DebuggerCallFrame::invalidate): (JSC::DebuggerCallFrame::positionForCallFrame): (JSC::DebuggerCallFrame::sourceIdForCallFrame): (JSC::DebuggerCallFrame::thisValueForCallFrame): * debugger/DebuggerCallFrame.h: (JSC::DebuggerCallFrame::create): (JSC::DebuggerCallFrame::exec): (JSC::DebuggerCallFrame::line): (JSC::DebuggerCallFrame::column): (JSC::DebuggerCallFrame::position): (JSC::DebuggerCallFrame::isValid): * interpreter/StackVisitor.cpp: Source/WebCore: Tests: inspector-protocol/debugger/call-frame-function-name.html inspector-protocol/debugger/call-frame-this-host.html inspector-protocol/debugger/call-frame-this-nonstrict.html inspector-protocol/debugger/call-frame-this-strict.html 1. Make JavaScriptCallFrame a thin shell around the DebuggerCallFrame. DebuggerCallFrame now tracks whether it is valid instead of needing JavaScriptCallFrame do it. 2. ScriptDebugServer now only instantiates an DebuggerCallFrame when needed just before it pauses and calls back to its client, and then invalidates it immediately when the callback returns. Every subsequent callback to the client will use a new instance of the DebuggerCallFrame. 3. Similarly, ScriptDebugServer now only creates a JavaScriptCallFrame when it "pauses". 4. DebuggerCallFrame only creates its caller DebuggerCallFrame when it is needed i.e. when the client calls callerFrame(). Similarly, JavaScriptCallFrame only creates its caller when it's requested. 5. DebuggerCallFrame's line() and column() now returns a base-zero int. 6. WebScriptDebugDelegate now only caches the functionName of the frame instead of the entire DebuggerCallFrame because that is all that is needed. 7. Also removed evaluateInGlobalCallFrame() which is not used anywhere. * bindings/js/JSJavaScriptCallFrameCustom.cpp: (WebCore::JSJavaScriptCallFrame::thisObject): * bindings/js/JavaScriptCallFrame.cpp: (WebCore::JavaScriptCallFrame::JavaScriptCallFrame): (WebCore::JavaScriptCallFrame::caller): * bindings/js/JavaScriptCallFrame.h: (WebCore::JavaScriptCallFrame::create): (WebCore::JavaScriptCallFrame::sourceID): (WebCore::JavaScriptCallFrame::position): (WebCore::JavaScriptCallFrame::line): (WebCore::JavaScriptCallFrame::column): (WebCore::JavaScriptCallFrame::functionName): (WebCore::JavaScriptCallFrame::type): (WebCore::JavaScriptCallFrame::scopeChain): (WebCore::JavaScriptCallFrame::dynamicGlobalObject): (WebCore::JavaScriptCallFrame::thisValue): (WebCore::JavaScriptCallFrame::evaluate): * bindings/js/ScriptDebugServer.cpp: (WebCore::DebuggerCallFrameScope::DebuggerCallFrameScope): (WebCore::DebuggerCallFrameScope::~DebuggerCallFrameScope): (WebCore::ScriptDebugServer::ScriptDebugServer): (WebCore::ScriptDebugServer::setBreakpoint): (WebCore::ScriptDebugServer::removeBreakpoint): (WebCore::ScriptDebugServer::hasBreakpoint): (WebCore::ScriptDebugServer::evaluateBreakpointAction): (WebCore::ScriptDebugServer::breakProgram): (WebCore::ScriptDebugServer::stepOverStatement): (WebCore::ScriptDebugServer::stepOutOfFunction): (WebCore::ScriptDebugServer::currentDebuggerCallFrame): (WebCore::ScriptDebugServer::dispatchDidPause): (WebCore::ScriptDebugServer::updateCallFrame): (WebCore::ScriptDebugServer::updateCallFrameAndPauseIfNeeded): (WebCore::ScriptDebugServer::pauseIfNeeded): (WebCore::ScriptDebugServer::callEvent): (WebCore::ScriptDebugServer::returnEvent): (WebCore::ScriptDebugServer::willExecuteProgram): (WebCore::ScriptDebugServer::didExecuteProgram): * bindings/js/ScriptDebugServer.h: * bindings/js/WorkerScriptDebugServer.cpp: (WebCore::WorkerScriptDebugServer::willExecuteProgram): Source/WebKit/mac: 1. Make JavaScriptCallFrame a thin shell around the DebuggerCallFrame. DebuggerCallFrame now tracks whether it is valid instead of needing JavaScriptCallFrame do it. 2. ScriptDebugServer now only instantiates an DebuggerCallFrame when needed just before it pauses and calls back to its client, and then invalidates it immediately when the callback returns. Every subsequent callback to the client will use a new instance of the DebuggerCallFrame. 3. Similarly, ScriptDebugServer now only creates a JavaScriptCallFrame when it "pauses". 4. DebuggerCallFrame only creates its caller DebuggerCallFrame when it is needed i.e. when the client calls callerFrame(). Similarly, JavaScriptCallFrame only creates its caller when it's requested. 5. DebuggerCallFrame's line() and column() now returns a base-zero int. 6. WebScriptDebugDelegate now only caches the functionName of the frame instead of the entire DebuggerCallFrame because that is all that is needed. 7. Also removed evaluateInGlobalCallFrame() which is not used anywhere. * WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFramePrivate dealloc]): (-[WebScriptCallFrame _initWithGlobalObject:functionName:exceptionValue:JSC::]): (-[WebScriptCallFrame functionName]): (-[WebScriptCallFrame exception]): * WebView/WebScriptDebugger.mm: (WebScriptDebugger::exception): LayoutTests: * http/tests/inspector/debugger-test.js: (initialize_DebuggerTest): * inspector-protocol/debugger/call-frame-function-name-expected.txt: Added. * inspector-protocol/debugger/call-frame-function-name.html: Added. * inspector-protocol/debugger/call-frame-this-host-expected.txt: Added. * inspector-protocol/debugger/call-frame-this-host.html: Added. * inspector-protocol/debugger/call-frame-this-nonstrict-expected.txt: Added. * inspector-protocol/debugger/call-frame-this-nonstrict.html: Added. * inspector-protocol/debugger/call-frame-this-strict-expected.txt: Added. * inspector-protocol/debugger/call-frame-this-strict.html: Added. * inspector/debugger/pause-in-internal-script-expected.txt: Canonical link: https://commits.webkit.org/140413@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2013-10-05 00:51:31 +00:00
Debugger.setBreakpoint on line:column in <script>
Found <script>
Running testFunction
Hit Breakpoint!
PASS: frame[0] type "object" className "Window"
PASS: frame[1] type "object" className "Array"
PASS: frame[2] type "object" className "Window"