Changeset 172372 in webkit for trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h

Timestamp:

Aug 8, 2014, 11:50:19 PM (11 years ago)

Author:

[email protected]

Message:

REGRESSION: Inspector crashes when debugger is paused and injected scripts access window.screen().
<​https://webkit.org/b/135656>

Not reviewed.

Rolling out r170680 which was merged to ToT in r172129.

Source/JavaScriptCore:

• debugger/Debugger.h:
• debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::scope):
(JSC::DebuggerCallFrame::evaluate):
(JSC::DebuggerCallFrame::invalidate):

• debugger/DebuggerCallFrame.h:
• debugger/DebuggerScope.cpp:

(JSC::DebuggerScope::DebuggerScope):
(JSC::DebuggerScope::finishCreation):
(JSC::DebuggerScope::visitChildren):
(JSC::DebuggerScope::className):
(JSC::DebuggerScope::getOwnPropertySlot):
(JSC::DebuggerScope::put):
(JSC::DebuggerScope::deleteProperty):
(JSC::DebuggerScope::getOwnPropertyNames):
(JSC::DebuggerScope::defineOwnProperty):
(JSC::DebuggerScope::next): Deleted.
(JSC::DebuggerScope::invalidateChain): Deleted.
(JSC::DebuggerScope::isWithScope): Deleted.
(JSC::DebuggerScope::isGlobalScope): Deleted.
(JSC::DebuggerScope::isFunctionScope): Deleted.

• debugger/DebuggerScope.h:

(JSC::DebuggerScope::create):
(JSC::DebuggerScope::Iterator::Iterator): Deleted.
(JSC::DebuggerScope::Iterator::get): Deleted.
(JSC::DebuggerScope::Iterator::operator++): Deleted.
(JSC::DebuggerScope::Iterator::operator==): Deleted.
(JSC::DebuggerScope::Iterator::operator!=): Deleted.
(JSC::DebuggerScope::isValid): Deleted.
(JSC::DebuggerScope::jsScope): Deleted.
(JSC::DebuggerScope::begin): Deleted.
(JSC::DebuggerScope::end): Deleted.

• inspector/JSJavaScriptCallFrame.cpp:

(Inspector::JSJavaScriptCallFrame::scopeType):
(Inspector::JSJavaScriptCallFrame::scopeChain):

• inspector/JavaScriptCallFrame.h:

(Inspector::JavaScriptCallFrame::scopeChain):

• inspector/ScriptDebugServer.cpp:
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):
(JSC::JSGlobalObject::visitChildren):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::debuggerScopeStructure): Deleted.

• runtime/JSObject.h:

(JSC::JSObject::isWithScope): Deleted.

• runtime/JSScope.h:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

Source/WebCore:

• bindings/js/ScriptController.cpp:

(WebCore::ScriptController::attachDebugger):

File:

• trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h

@@ -30 +30 @@
 #define DebuggerCallFrame_h
 
+#include "CallFrame.h"
 #include "DebuggerPrimitives.h"
-#include "Strong.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -37 +37 @@
 
 namespace JSC {
-
-class DebuggerScope;
-class ExecState;
-typedef ExecState CallFrame;
 
 class DebuggerCallFrame : public RefCounted<DebuggerCallFrame> {
@@ -63 +59 @@
 
     JS_EXPORT_PRIVATE JSGlobalObject* vmEntryGlobalObject() const;
-    JS_EXPORT_PRIVATE DebuggerScope* scope();
+    JS_EXPORT_PRIVATE JSScope* scope() const;
     JS_EXPORT_PRIVATE String functionName() const;
     JS_EXPORT_PRIVATE Type type() const;
@@ -83 +79 @@
     RefPtr<DebuggerCallFrame> m_caller;
     TextPosition m_position;
-    // The DebuggerCallFrameScope is responsible for calling invalidate() which,
-    // in turn, will clear this strong ref.
-    Strong<DebuggerScope> m_scope;
 };