Changeset 73355 in webkit

Timestamp:

Dec 6, 2010 3:59:32 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2010-12-06 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r73351.
​http://trac.webkit.org/changeset/73351
​https://bugs.webkit.org/show_bug.cgi?id=50560

"The change broke plugin tests in Chromium" (Requested by
yurys on #webkit).

• bindings/js/ScriptCallStackFactory.cpp: (WebCore::ScriptCallStack::stackTrace):
• bindings/js/ScriptCallStackFactory.h:
• bindings/v8/ScriptCallStackFactory.cpp: (WebCore::toScriptCallFrame): (WebCore::toScriptCallFramesVector): (WebCore::createScriptCallStack): (WebCore::ScriptCallStack::stackTrace):
• bindings/v8/ScriptCallStackFactory.h:
• bindings/v8/V8ConsoleMessage.cpp: (WebCore::V8ConsoleMessage::handler):
• inspector/ScriptCallFrame.cpp: (WebCore::ScriptCallFrame::ScriptCallFrame): (WebCore::ScriptCallFrame::isEqual): (WebCore::ScriptCallFrame::buildInspectorObject):
• inspector/ScriptCallFrame.h: (WebCore::ScriptCallFrame::sourceURL):
• inspector/ScriptCallStack.h:
• inspector/TimelineRecordFactory.cpp: (WebCore::TimelineRecordFactory::createGenericRecord):
• inspector/front-end/ConsoleView.js: (WebInspector.ConsoleMessage.prototype._populateStackTraceTreeElement):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptCallStackFactory.cpp (modified) (2 diffs)
• bindings/js/ScriptCallStackFactory.h (modified) (1 diff)
• bindings/v8/ScriptCallStackFactory.cpp (modified) (4 diffs)
• bindings/v8/ScriptCallStackFactory.h (modified) (1 diff)
• bindings/v8/V8ConsoleMessage.cpp (modified) (1 diff)
• inspector/ScriptCallFrame.cpp (modified) (3 diffs)
• inspector/ScriptCallFrame.h (modified) (2 diffs)
• inspector/ScriptCallStack.h (modified) (1 diff)
• inspector/TimelineRecordFactory.cpp (modified) (2 diffs)
• inspector/front-end/ConsoleView.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r73351.
+        http://trac.webkit.org/changeset/73351
+        https://bugs.webkit.org/show_bug.cgi?id=50560
+
+        "The change broke plugin tests in Chromium" (Requested by
+        yurys on #webkit).
+
+        * bindings/js/ScriptCallStackFactory.cpp:
+        (WebCore::ScriptCallStack::stackTrace):
+        * bindings/js/ScriptCallStackFactory.h:
+        * bindings/v8/ScriptCallStackFactory.cpp:
+        (WebCore::toScriptCallFrame):
+        (WebCore::toScriptCallFramesVector):
+        (WebCore::createScriptCallStack):
+        (WebCore::ScriptCallStack::stackTrace):
+        * bindings/v8/ScriptCallStackFactory.h:
+        * bindings/v8/V8ConsoleMessage.cpp:
+        (WebCore::V8ConsoleMessage::handler):
+        * inspector/ScriptCallFrame.cpp:
+        (WebCore::ScriptCallFrame::ScriptCallFrame):
+        (WebCore::ScriptCallFrame::isEqual):
+        (WebCore::ScriptCallFrame::buildInspectorObject):
+        * inspector/ScriptCallFrame.h:
+        (WebCore::ScriptCallFrame::sourceURL):
+        * inspector/ScriptCallStack.h:
+        * inspector/TimelineRecordFactory.cpp:
+        (WebCore::TimelineRecordFactory::createGenericRecord):
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleMessage.prototype._populateStackTraceTreeElement):
+
 2010-12-06  Robert Hogan  <robert@webkit.org>
 

trunk/WebCore/bindings/js/ScriptCallStackFactory.cpp

@@ -49 +49 @@
 namespace WebCore {
 
-PassRefPtr<ScriptCallStack> createScriptCallStack(size_t)
-{
-    return 0;
-}
-
 PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState* exec, size_t maxStackSize)
 {
@@ -93 +88 @@
 }
 
+bool ScriptCallStack::stackTrace(int, const RefPtr<InspectorArray>&)
+{
+    return false;
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/js/ScriptCallStackFactory.h

@@ -43 +43 @@
 class ScriptCallStack;
 
-PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize);
 PassRefPtr<ScriptCallStack> createScriptCallStack(JSC::ExecState*, size_t maxStackSize);
 PassRefPtr<ScriptArguments> createScriptArguments(JSC::ExecState*, unsigned skipArgumentCount);

trunk/WebCore/bindings/v8/ScriptCallStackFactory.cpp

@@ -57 +57 @@
 
     int sourceLineNumber = frame->GetLineNumber();
-    int sourceColumn = frame->GetColumn();
-    return ScriptCallFrame(functionName, sourceName, sourceLineNumber, sourceColumn);
+    return ScriptCallFrame(functionName, sourceName, sourceLineNumber);
 }
 
-static void toScriptCallFramesVector(v8::Handle<v8::StackTrace> stackTrace, Vector<ScriptCallFrame>& scriptCallFrames, size_t maxStackSize)
+static void toScriptCallFramesVector(v8::Local<v8::Context> context, v8::Handle<v8::StackTrace> stackTrace, Vector<ScriptCallFrame>& scriptCallFrames, size_t maxStackSize)
 {
-    ASSERT(v8::Context::InContext());
+    // TODO(yurys): remove this???
+    v8::Context::Scope contextScope(context);
     int frameCount = stackTrace->GetFrameCount();
     if (frameCount > static_cast<int>(maxStackSize))
@@ -71 +71 @@
         scriptCallFrames.append(toScriptCallFrame(stackFrame));
     }
+    
+    if (!frameCount) {
+        // Successfully grabbed stack trace, but there are no frames. It may happen in case of a syntax error for example.
+        // Fallback to setting lineNumber to 0, and source and function name to "undefined".
+        scriptCallFrames.append(ScriptCallFrame("undefined", "undefined", 0));
+    }
 }
 
-PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize)
+PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Local<v8::Context> context, v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize)
 {
-    ASSERT(v8::Context::InContext());
     v8::HandleScope scope;
+    v8::Context::Scope contextScope(context);
+
     Vector<ScriptCallFrame> scriptCallFrames;
-    toScriptCallFramesVector(stackTrace, scriptCallFrames, maxStackSize);
+    toScriptCallFramesVector(context, stackTrace, scriptCallFrames, maxStackSize);
     return ScriptCallStack::create(scriptCallFrames);
 }
@@ -84 +91 @@
 PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize)
 {
-    if (!v8::Context::InContext())
-        return 0;
-    v8::HandleScope handleScope;
+    v8::HandleScope scope;
+    v8::Local<v8::Context> context = v8::Context::GetCurrent();
+    // TODO(yurys): remove?
+    v8::Context::Scope contextScope(context);
     v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(maxStackSize, stackTraceOptions));
-    return createScriptCallStack(stackTrace, maxStackSize);
+    return createScriptCallStack(context, stackTrace, maxStackSize);
 }
 
@@ -104 +112 @@
 }
 
+bool ScriptCallStack::stackTrace(int frameLimit, const RefPtr<InspectorArray>& stackTrace)
+{
+#if ENABLE(INSPECTOR)
+    if (!v8::Context::InContext())
+        return false;
+    v8::Handle<v8::Context> context = v8::Context::GetCurrent();
+    if (context.IsEmpty())
+        return false;
+    v8::HandleScope scope;
+    v8::Context::Scope contextScope(context);
+    v8::Handle<v8::StackTrace> trace(v8::StackTrace::CurrentStackTrace(frameLimit));
+    int frameCount = trace->GetFrameCount();
+    if (trace.IsEmpty() || !frameCount)
+        return false;
+    for (int i = 0; i < frameCount; ++i) {
+        v8::Handle<v8::StackFrame> frame = trace->GetFrame(i);
+        RefPtr<InspectorObject> frameObject = InspectorObject::create();
+        v8::Local<v8::String> scriptName = frame->GetScriptName();
+        frameObject->setString("scriptName", scriptName.IsEmpty() ? "" : toWebCoreString(scriptName));
+        v8::Local<v8::String> functionName = frame->GetFunctionName();
+        frameObject->setString("functionName", functionName.IsEmpty() ? "" : toWebCoreString(functionName));
+        frameObject->setNumber("lineNumber", frame->GetLineNumber());
+        frameObject->setNumber("column", frame->GetColumn());
+        stackTrace->pushObject(frameObject);
+    }
+    return true;
+#else
+    return false;
+#endif
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/v8/ScriptCallStackFactory.h

@@ -47 +47 @@
     | v8::StackTrace::kFunctionName);
 
-PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace>, size_t maxStackSize);
+PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Local<v8::Context>, v8::Handle<v8::StackTrace>, size_t maxStackSize);
 PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize);
 PassRefPtr<ScriptArguments> createScriptArguments(const v8::Arguments& v8arguments, unsigned skipArgumentCount);

trunk/WebCore/bindings/v8/V8ConsoleMessage.cpp

@@ -118 +118 @@
     // Currently stack trace is only collected when inspector is open.
     if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) {
-        callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallStackSizeToCapture);
+        v8::Local<v8::Context> context = v8::Context::GetEntered();
+        callStack = createScriptCallStack(context, stackTrace, ScriptCallStack::maxCallStackSizeToCapture);
     }
 

trunk/WebCore/inspector/ScriptCallFrame.cpp

@@ -37 +37 @@
 namespace WebCore {
 
-ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column)
+ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& urlString, unsigned lineNumber)
     : m_functionName(functionName)
-    , m_scriptName(scriptName)
+    , m_sourceURL(urlString)
     , m_lineNumber(lineNumber)
-    , m_column(column)
 {
 }
@@ -52 +51 @@
 {
     return m_functionName == o.m_functionName
-        && m_scriptName == o.m_scriptName
+        && m_sourceURL == o.m_sourceURL
         && m_lineNumber == o.m_lineNumber;
 }
@@ -61 +60 @@
     RefPtr<InspectorObject> frame = InspectorObject::create();
     frame->setString("functionName", m_functionName);
-    frame->setString("scriptName", m_scriptName);
+    frame->setString("sourceURL", m_sourceURL);
     frame->setNumber("lineNumber", m_lineNumber);
-    frame->setNumber("column", m_column);
     return frame;
 }

trunk/WebCore/inspector/ScriptCallFrame.h

@@ -41 +41 @@
 class ScriptCallFrame  {
 public:
-    ScriptCallFrame(const String& functionName, const String& scriptName, unsigned lineNumber, unsigned column = 0);
+    ScriptCallFrame(const String& functionName, const String& urlString, unsigned lineNumber);
     ~ScriptCallFrame();
 
     const String& functionName() const { return m_functionName; }
-    const String& sourceURL() const { return m_scriptName; }
+    const String& sourceURL() const { return m_sourceURL; }
     unsigned lineNumber() const { return m_lineNumber; }
 
@@ -53 +53 @@
 private:
     String m_functionName;
-    String m_scriptName;
+    String m_sourceURL;
     unsigned m_lineNumber;
-    unsigned m_column;
 };
 

trunk/WebCore/inspector/ScriptCallStack.h

@@ -51 +51 @@
     const ScriptCallFrame &at(size_t) const;
     size_t size() const;
+    static bool stackTrace(int, const RefPtr<InspectorArray>&);
 
     bool isEqual(ScriptCallStack*) const;

trunk/WebCore/inspector/TimelineRecordFactory.cpp

@@ -40 +40 @@
 #include "ResourceResponse.h"
 #include "ScriptCallStack.h"
-#include "ScriptCallStackFactory.h"
 
 namespace WebCore {
@@ -49 +48 @@
     record->setNumber("startTime", startTime);
 
-    RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(5);
-    if (stackTrace && stackTrace->size())
-        record->setArray("stackTrace", stackTrace->buildInspectorObject());
+    RefPtr<InspectorArray> stackTrace = InspectorArray::create();
+    if (ScriptCallStack::stackTrace(5, stackTrace))
+        record->setArray("stackTrace", stackTrace);
     return record.release();
 }

trunk/WebCore/inspector/front-end/ConsoleView.js

@@ -864 +864 @@
             content.appendChild(messageTextElement);
 
-            var urlElement = WebInspector.linkifyResourceAsNode(frame.scriptName, "scripts", frame.lineNumber, "console-message-url");
+            var urlElement = WebInspector.linkifyResourceAsNode(frame.sourceURL, "scripts", frame.lineNumber, "console-message-url"); 
             content.appendChild(urlElement);