Changeset 155081 in webkit for trunk/Source/JavaScriptCore/API/JSContextRef.cpp

Timestamp:

Sep 4, 2013, 5:40:15 PM (12 years ago)

Author:

[email protected]

Message:

Renamed StackIterator to StackVisitor.
​https://bugs.webkit.org/show_bug.cgi?id=120706.

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Also did some minor refactoring:

• Renamed StackIterator::iterate() to StackVisitor::visit().
• Make StackVisitor::visit() a static method.
• Move the instantiation of the StackVisitor instance into StackVisitor::visit() from CallFrame::iterate().
• Removed StackIterator::resetIterator() and inline its body into the StackVisitor constructor since this is the only remaining caller of it.

• API/JSContextRef.cpp:

(BacktraceFunctor::operator()):

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• interpreter/CallFrame.h:

(JSC::ExecState::iterate):

• interpreter/Interpreter.cpp:

(JSC::DumpRegisterFunctor::operator()):
(JSC::unwindCallFrame):
(JSC::getStackFrameCodeType):
(JSC::GetStackTraceFunctor::operator()):
(JSC::UnwindFunctor::operator()):

• interpreter/Interpreter.h:
• interpreter/StackIterator.cpp: Removed.
• interpreter/StackIterator.h: Removed.
• interpreter/StackVisitor.cpp: Copied from Source/JavaScriptCore/interpreter/StackIterator.cpp.

(JSC::StackVisitor::StackVisitor):
(JSC::StackVisitor::gotoNextFrame):
(JSC::StackVisitor::readFrame):
(JSC::StackVisitor::readNonInlinedFrame):
(JSC::StackVisitor::readInlinedFrame):
(JSC::StackVisitor::Frame::codeType):
(JSC::StackVisitor::Frame::functionName):
(JSC::StackVisitor::Frame::sourceURL):
(JSC::StackVisitor::Frame::toString):
(JSC::StackVisitor::Frame::arguments):
(JSC::StackVisitor::Frame::computeLineAndColumn):
(JSC::StackVisitor::Frame::retrieveExpressionInfo):
(JSC::StackVisitor::Frame::setToEnd):
(JSC::StackVisitor::Frame::print):
(DebugPrintFrameFunctor::operator()):

• interpreter/StackVisitor.h: Copied from Source/JavaScriptCore/interpreter/StackIterator.h.

(JSC::StackVisitor::visit):

• jsc.cpp:

(FunctionJSCStackFunctor::operator()):

• profiler/ProfileGenerator.cpp:

(JSC::AddParentForConsoleStartFunctor::operator()):

• runtime/JSFunction.cpp:

(JSC::RetrieveArgumentsFunctor::operator()):
(JSC::RetrieveCallerFunctionFunctor::operator()):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::GlobalFuncProtoGetterFunctor::operator()):
(JSC::GlobalFuncProtoSetterFunctor::operator()):

• runtime/ObjectConstructor.cpp:

(JSC::ObjectConstructorGetPrototypeOfFunctor::operator()):

Source/WebCore:

No new tests.

• ForwardingHeaders/interpreter/StackIterator.h: Removed.
• ForwardingHeaders/interpreter/StackVisitor.h: Copied from Source/WebCore/ForwardingHeaders/interpreter/StackIterator.h.
• bindings/js/JSXMLHttpRequestCustom.cpp:

(WebCore::SendFunctor::operator()):

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::CreateScriptCallStackFunctor::operator()):
(WebCore::CreateScriptCallStackForConsoleFunctor::operator()):

File:

• trunk/Source/JavaScriptCore/API/JSContextRef.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -38 +38 @@
 #include "Operations.h"
 #include "SourceProvider.h"
-#include "StackIterator.h"
+#include "StackVisitor.h"
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringHash.h>
@@ -222 +222 @@
     }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         if (m_remainingCapacityForFrameCapture) {
             // If callee is unknown, but we've not added any frame yet, we should
             // still add the frame, because something called us, and gave us arguments.
-            JSObject* callee = iter->callee();
-            if (!callee && iter->index())
-                return StackIterator::Done;
+            JSObject* callee = visitor->callee();
+            if (!callee && visitor->index())
+                return StackVisitor::Done;
 
             StringBuilder& builder = m_builder;
@@ -235 +235 @@
                 builder.append('\n');
             builder.append('#');
-            builder.appendNumber(iter->index());
+            builder.appendNumber(visitor->index());
             builder.append(' ');
-            builder.append(iter->functionName());
+            builder.append(visitor->functionName());
             builder.appendLiteral("() at ");
-            builder.append(iter->sourceURL());
-            if (iter->isJSFrame()) {
+            builder.append(visitor->sourceURL());
+            if (visitor->isJSFrame()) {
                 builder.append(':');
                 unsigned lineNumber;
                 unsigned unusedColumn;
-                iter->computeLineAndColumn(lineNumber, unusedColumn);
+                visitor->computeLineAndColumn(lineNumber, unusedColumn);
                 builder.appendNumber(lineNumber);
             }
 
             if (!callee)
-                return StackIterator::Done;
+                return StackVisitor::Done;
 
             m_remainingCapacityForFrameCapture--;
-            return StackIterator::Continue;
+            return StackVisitor::Continue;
         }
-        return StackIterator::Done;
+        return StackVisitor::Done;
     }