Revert of DevTools: [console] Logged promise rejections do not change state once handled

Source/bindings/core/v8/V8Initializer.cpp

 /*
  * Copyright (C) 2009 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 185 matching lines @@
 } // namespace
 
 void V8Initializer::reportRejectedPromisesOnMainThread()
 {
     rejectedPromisesOnMainThread().processQueue();
 }
 
 static void promiseRejectHandlerInMainThread(v8::PromiseRejectMessage data)
 {
     ASSERT(isMainThread());
-    if (data.GetEvent() == v8::kPromiseHandlerAddedAfterReject) {
-        rejectedPromisesOnMainThread().handlerAdded(data);
+    if (data.GetEvent() != v8::kPromiseRejectWithNoHandler)
         return;
-    }
-
-    ASSERT(data.GetEvent() == v8::kPromiseRejectWithNoHandler);
-
     v8::Handle<v8::Promise> promise = data.GetPromise();
 
     v8::Isolate* isolate = promise->GetIsolate();
     // There is no entered window during microtask callbacks from V8,
     // thus we call toDOMWindow() instead of enteredDOMWindow().
     LocalDOMWindow* window = currentDOMWindow(isolate);
     if (!window || !window->isCurrentlyDisplayedInFrame())
         return;
 
     v8::Handle<v8::Value> exception = data.GetValue();
@@ skipping 24 matching lines @@
     } else if (!exception.IsEmpty() && exception->IsInt32()) {
         // For Smi's the message would be empty.
         errorMessage = "Uncaught " + String::number(exception.As<v8::Integer>()->Value());
     }
 
     String messageForConsole = extractMessageForConsole(isolate, data.GetValue());
     if (!messageForConsole.isEmpty())
         errorMessage = "Uncaught " + messageForConsole;
 
     ScriptState* scriptState = ScriptState::current(isolate);
-    rejectedPromisesOnMainThread().rejectedWithNoHandler(scriptState, data, errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack);
+    rejectedPromisesOnMainThread().add(scriptState, data, errorMessage, resourceName, scriptId, lineNumber, columnNumber, callStack);
 }
 
 static void promiseRejectHandlerInWorker(v8::PromiseRejectMessage data)
 {
+    if (data.GetEvent() != v8::kPromiseRejectWithNoHandler)
+        return;
+
     v8::Handle<v8::Promise> promise = data.GetPromise();
 
     // Bail out if called during context initialization.
     v8::Isolate* isolate = promise->GetIsolate();
     ScriptState* scriptState = ScriptState::current(isolate);
     if (!scriptState->contextIsValid())
         return;
 
     ExecutionContext* executionContext = scriptState->executionContext();
     if (!executionContext)
         return;
 
     ASSERT(executionContext->isWorkerGlobalScope());
     WorkerScriptController* scriptController = toWorkerGlobalScope(executionContext)->script();
     ASSERT(scriptController);
 
-    if (data.GetEvent() == v8::kPromiseHandlerAddedAfterReject) {
-        scriptController->rejectedPromises()->handlerAdded(data);
-        return;
-    }
-
-    ASSERT(data.GetEvent() == v8::kPromiseRejectWithNoHandler);
-
     int scriptId = 0;
     int lineNumber = 0;
     int columnNumber = 0;
     String resourceName;
     String errorMessage;
 
     v8::Handle<v8::Message> message = v8::Exception::CreateMessage(data.GetValue());
     if (!message.IsEmpty()) {
         TOSTRING_VOID(V8StringResource<>, resourceName, message->GetScriptOrigin().ResourceName());
         scriptId = message->GetScriptOrigin().ScriptID()->Value();
         if (v8Call(message->GetLineNumber(scriptState->context()), lineNumber)
             && v8Call(message->GetStartColumn(scriptState->context()), columnNumber))
             ++columnNumber;
         // message->Get() can be empty here. https://crbug.com/450330
         errorMessage = toCoreStringWithNullCheck(message->Get());
     }
-    scriptController->rejectedPromises()->rejectedWithNoHandler(scriptState, data, errorMessage, resourceName, scriptId, lineNumber, columnNumber, nullptr);
+    scriptController->rejectedPromises()->add(scriptState, data, errorMessage, resourceName, scriptId, lineNumber, columnNumber, nullptr);
 }
 
 static void failedAccessCheckCallbackInMainThread(v8::Local<v8::Object> host, v8::AccessType type, v8::Local<v8::Value> data)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     Frame* target = findFrame(isolate, host, data);
     if (!target)
         return;
     DOMWindow* targetWindow = target->domWindow();
 
@@ skipping 158 matching lines @@
 
     v8::V8::AddMessageListener(messageHandlerInWorker);
     v8::V8::SetFatalErrorHandler(reportFatalErrorInWorker);
 
     uint32_t here;
     isolate->SetStackLimit(reinterpret_cast<uintptr_t>(&here - kWorkerMaxStackSize / sizeof(uint32_t*)));
     isolate->SetPromiseRejectCallback(promiseRejectHandlerInWorker);
 }
 
 } // namespace blink