[DevTools] Show stack trace for exceptions in dedicated workers

Source/core/workers/WorkerGlobalScope.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 42 matching lines @@
 #include "core/workers/WorkerLocation.h"
 #include "core/workers/WorkerNavigator.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerThread.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebURLRequest.h"
 
+namespace {
+    unsigned long createWorkerExceptionUniqueIdentifier()
+    {
+        static unsigned long s_workerExceptionUniqueIdentifier = 0;
+        return ++s_workerExceptionUniqueIdentifier;
+    }
+}
+
 namespace blink {
 
 class CloseWorkerGlobalScopeTask : public ExecutionContextTask {
 public:
     static PassOwnPtr<CloseWorkerGlobalScopeTask> create()
     {
         return adoptPtr(new CloseWorkerGlobalScopeTask);
     }
 
     virtual void performTask(ExecutionContext *context)
@@ skipping 187 matching lines @@
             return;
         }
     }
 }
 
 EventTarget* WorkerGlobalScope::errorEventTarget()
 {
     return this;
 }
 
-void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>)
+void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
 {
-    thread()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL);
+    unsigned long exceptionId = createWorkerExceptionUniqueIdentifier();
+    RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber);
+    consoleMessage->setCallStack(callStack);
+    m_pendingMessages.set(exceptionId, consoleMessage);
+
+    thread()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL, exceptionId);
 }
 
 void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& directiveText)
 {
     InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
 }
 
 void WorkerGlobalScope::addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleMessage)
 {
     RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
@@ skipping 39 matching lines @@
 void WorkerGlobalScope::countDeprecation(UseCounter::Feature) const
 {
     // FIXME: How should we count features for shared/service workers?
 }
 
 ConsoleMessageStorage* WorkerGlobalScope::messageStorage()
 {
     return m_messageStorage.get();
 }
 
+void WorkerGlobalScope::exceptionHandled(int exceptionId, bool isHandled)
+{
+    RefPtr<ConsoleMessage> consoleMessage = m_pendingMessages.take(exceptionId);
+    if (!isHandled) {
+        thread()->workerReportingProxy().reportConsoleMessage(consoleMessage);
+        addMessageToWorkerConsole(consoleMessage.release());

[vsevik, 2014/12/01 15:06:03]

Let's call addConsoleMessage instead.

[kozy, 2014/12/01 16:17:05]

Done.

+    }
+}
+
 void WorkerGlobalScope::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_console);
     visitor->trace(m_location);
     visitor->trace(m_navigator);
     visitor->trace(m_workerInspectorController);
     visitor->trace(m_eventQueue);
     visitor->trace(m_workerClients);
     visitor->trace(m_messageStorage);
     HeapSupplementable<WorkerGlobalScope>::trace(visitor);
 #endif
     ExecutionContext::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink