Extension Error Piping - Blink: WebKit Side

Source/core/page/Chrome.cpp

 /*
  * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2012, Samsung Electronics. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/page/Chrome.h"
 
 #include "public/platform/WebScreenInfo.h"
 #include "HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/inspector/ScriptCallFrame.h"
+#include "core/inspector/ScriptCallStack.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Frame.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/PageGroupLoadDeferrer.h"
 #include "core/page/PopupOpeningObserver.h"
 #include "core/platform/ColorChooser.h"
 #include "core/platform/DateTimeChooser.h"
 #include "core/platform/FileChooser.h"
+#include "core/platform/JSONValues.h"
 #include "core/platform/graphics/FloatRect.h"
 #include "core/platform/network/DNS.h"
 #include "core/rendering/HitTestResult.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 using namespace std;
@@ skipping 384 matching lines @@
     m_popupOpeningObservers.remove(index);
 }
 
 void Chrome::notifyPopupOpeningObservers() const
 {
     const Vector<PopupOpeningObserver*> observers(m_popupOpeningObservers);
     for (size_t i = 0; i < observers.size(); ++i)
         observers[i]->willOpenPopup();
 }
 
+static const char kLineNumberKey[] = "lineNumber";
+static const char kColumnNumberKey[] = "columnNumber";
+static const char kURLKey[] = "url";
+static const char kFunctionNameKey[] = "functionName";
+static const char kStackTraceKey[] = "stackTrace";
+static const char kExecutionContextURLKey[] = "executionContextURL";
+
+static String generateConsoleMessageDetailsImpl(PassRefPtr<JSONArray> stackTrace
+, const String& executionContextURL)
+{
+    RefPtr<JSONObject> details = JSONObject::create();
+    details->setArray(kStackTraceKey, stackTrace);
+    details->setString(kExecutionContextURLKey, executionContextURL);
+    return details->toJSONString();
+}
+
+String Chrome::generateConsoleMessageDetails(size_t lineNumber, size_t columnNumber, const String& sourceURL, const String& functionName, const String& executionContextURL)

[abarth-chromium, 2013/07/19 03:04:07]

This isn't the right file for this code.  Chrome.cpp has nothing to do with
"Chrome" the browser.

+{
+    RefPtr<JSONObject> stackFrame = JSONObject::create();
+    stackFrame->setNumber(kLineNumberKey, lineNumber);

[pfeldman, 2013/08/07 13:30:21]

Why another format? You should either pass stack traces as text (and linkify
them later in your code) or introduce StackTrace structures in WebKit API. I'd
vote for the plain text as a start. I.e. early version of your change with text
instead of JSON.

+    stackFrame->setNumber(kColumnNumberKey, columnNumber);
+    stackFrame->setString(kURLKey, sourceURL);
+    stackFrame->setString(kFunctionNameKey, functionName);
+
+    RefPtr<JSONArray> simpleStackTrace = JSONArray::create();
+    simpleStackTrace->pushObject(stackFrame);
+
+    return generateConsoleMessageDetailsImpl(simpleStackTrace, executionContextURL);
+}
+
+String Chrome::generateConsoleMessageDetails(PassRefPtr<ScriptCallStack> callStack, const String& executionContextURL)
+{
+    RefPtr<JSONArray> stackTrace = JSONArray::create();
+    for (size_t i = 0; i < callStack->size(); ++i) {
+        const ScriptCallFrame& frame = callStack->at(i);
+        RefPtr<JSONObject> stackFrame = JSONObject::create();
+
+        stackFrame->setNumber(kLineNumberKey, frame.lineNumber());
+        stackFrame->setNumber(kColumnNumberKey, frame.columnNumber());
+        stackFrame->setString(kURLKey, frame.sourceURL());
+        stackFrame->setString(kFunctionNameKey, frame.functionName());
+
+        stackTrace->pushObject(stackFrame);
+    }
+
+    return generateConsoleMessageDetailsImpl(stackTrace, executionContextURL);
+}
+
 } // namespace WebCore