Attachment 347071 Details for Bug 188551 – Patch

[patch] Patch

bug-188551-20180814222704.patch (text/plain), 2.54 KB, created by Yusuke Suzuki on 2018-08-14 06:27:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2018-08-14 06:27:05 PDT

Size: 2.54 KB

patch

obsolete

>Subversion Revision: 234846
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cf872ff87eb541e09dbd94a8c225dddf4722ab3f..5611ff76a4107fa945632d87e0558796013027db 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-08-14  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
>+
>+        Unhandled Promise Rejection logging in workers should not emit ErrorEvent to host Worker object
>+        https://bugs.webkit.org/show_bug.cgi?id=188551
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * dom/ScriptExecutionContext.cpp:
>+        (WebCore::ScriptExecutionContext::reportUnhandledPromiseRejection):
>+
> 2018-08-14  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         Worker should support unhandled promise rejections
>diff --git a/Source/WebCore/dom/ScriptExecutionContext.cpp b/Source/WebCore/dom/ScriptExecutionContext.cpp
>index ca795c991ddec0a62725019187c221284c327f49..dbe898f118252f3b23ac720db743c75cf4fbbff5 100644
>--- a/Source/WebCore/dom/ScriptExecutionContext.cpp
>+++ b/Source/WebCore/dom/ScriptExecutionContext.cpp
>@@ -393,22 +393,15 @@ void ScriptExecutionContext::reportUnhandledPromiseRejection(JSC::ExecState& sta
>     JSC::VM& vm = state.vm();
>     auto scope = DECLARE_CATCH_SCOPE(vm);
> 
>-    int lineNumber = 0;
>-    int columnNumber = 0;
>-    String sourceURL;
>-
>     JSC::JSValue result = promise.result(vm);
>     String resultMessage = retrieveErrorMessage(state, vm, result, scope);
>     String errorMessage = makeString("Unhandled Promise Rejection: ", resultMessage);
>-    if (callStack) {
>-        if (const ScriptCallFrame* callFrame = callStack->firstNonNativeCallFrame()) {
>-            lineNumber = callFrame->lineNumber();
>-            columnNumber = callFrame->columnNumber();
>-            sourceURL = callFrame->sourceURL();
>-        }
>-    }
>-
>-    logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, WTFMove(callStack));
>+    std::unique_ptr<Inspector::ConsoleMessage> message;
>+    if (callStack)
>+        message = std::make_unique<Inspector::ConsoleMessage>(MessageSource::JS, MessageType::Log, MessageLevel::Error, errorMessage, callStack.releaseNonNull());
>+    else
>+        message = std::make_unique<Inspector::ConsoleMessage>(MessageSource::JS, MessageType::Log, MessageLevel::Error, errorMessage);
>+    addConsoleMessage(WTFMove(message));
> }
> 
> void ScriptExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)

Actions: View | Formatted Diff | Diff

Attachments on bug 188551: 347071 | 347073 | 347074 | 347075 | 347076