binding: Retires ExceptionState::throwIfNeeded().

third_party/WebKit/Source/bindings/core/v8/ExceptionState.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "bindings/core/v8/ExceptionState.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/ExceptionCode.h"
 
 namespace blink {
 
+void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
+{
+    // SecurityError is thrown via ::throwSecurityError, and _careful_ consideration must be given to the data exposed to JavaScript via the 'sanitizedMessage'.
+    DCHECK(ec != SecurityError);
+
+    const String& processedMessage = addExceptionContext(message);
+    setException(ec, processedMessage, V8ThrowException::createDOMException(m_isolate, ec, processedMessage));
+}
+
+void ExceptionState::throwRangeError(const String& message)
+{
+    setException(V8RangeError, message, V8ThrowException::createRangeError(m_isolate, addExceptionContext(message)));
+}
+
+void ExceptionState::throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage)
+{
+    const String& finalSanitized = addExceptionContext(sanitizedMessage);
+    const String& finalUnsanitized = addExceptionContext(unsanitizedMessage);
+    setException(SecurityError, finalSanitized, V8ThrowException::createDOMException(m_isolate, SecurityError, finalSanitized, finalUnsanitized));
+}
+
+void ExceptionState::throwTypeError(const String& message)
+{
+    setException(V8TypeError, message, V8ThrowException::createTypeError(m_isolate, addExceptionContext(message)));
+}
+
 void ExceptionState::clearException()
 {
     m_code = 0;
+    m_message = String();
     m_exception.clear();
 }
 
 ScriptPromise ExceptionState::reject(ScriptState* scriptState)
 {
-    ScriptPromise promise = ScriptPromise::reject(scriptState, m_exception.newLocal(scriptState->isolate()));
+    ScriptPromise promise = ScriptPromise::reject(scriptState, getException());
     clearException();
     return promise;
 }
 
 void ExceptionState::reject(ScriptPromiseResolver* resolver)
 {
-    resolver->reject(m_exception.newLocal(resolver->getScriptState()->isolate()));
+    resolver->reject(getException());
     clearException();
 }
 
-void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
+void ExceptionState::setException(ExceptionCode ec, const String& message, v8::Local<v8::Value> exception)
 {
-    ASSERT(ec);
-    ASSERT(m_isolate);
-
-    // SecurityError is thrown via ::throwSecurityError, and _careful_ consideration must be given to the data exposed to JavaScript via the 'sanitizedMessage'.
-    ASSERT(ec != SecurityError);
+    CHECK(ec);
+    CHECK(!exception.IsEmpty());
 
     m_code = ec;
-    String processedMessage = addExceptionContext(message);
-    m_message = processedMessage;
-    setException(V8ThrowException::createDOMException(m_isolate, ec, processedMessage));
-}
-
-void ExceptionState::throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage)
-{
-    ASSERT(m_isolate);
-    m_code = SecurityError;
-    String finalSanitized = addExceptionContext(sanitizedMessage);
-    m_message = finalSanitized;
-    String finalUnsanitized = addExceptionContext(unsanitizedMessage);
-
-    setException(V8ThrowException::createDOMException(m_isolate, SecurityError, finalSanitized, finalUnsanitized));
-}
-
-void ExceptionState::setException(v8::Local<v8::Value> exception)
-{
-    // FIXME: Assert that exception is not empty?
-    if (exception.IsEmpty()) {
-        clearException();
-        return;
-    }
-
+    m_message = message;
     m_exception.set(m_isolate, exception);
 }
 
-void ExceptionState::throwException()
-{
-    ASSERT(!m_exception.isEmpty());
-    V8ThrowException::throwException(m_isolate, m_exception.newLocal(m_isolate));
-}
-
-void ExceptionState::throwTypeError(const String& message)
-{
-    ASSERT(m_isolate);
-    m_code = V8TypeError;
-    m_message = message;
-    setException(V8ThrowException::createTypeError(m_isolate, addExceptionContext(message)));
-}
-
-void ExceptionState::throwRangeError(const String& message)
-{
-    ASSERT(m_isolate);
-    m_code = V8RangeError;
-    m_message = message;
-    setException(V8ThrowException::createRangeError(m_isolate, addExceptionContext(message)));
-}
-
-void NonThrowableExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
-{
-    ASSERT_NOT_REACHED();
-    m_code = ec;
-    m_message = message;
-}
-
-void NonThrowableExceptionState::throwTypeError(const String& message)
-{
-    ASSERT_NOT_REACHED();
-    m_code = V8TypeError;
-    m_message = message;
-}
-
-void NonThrowableExceptionState::throwSecurityError(const String& sanitizedMessage, const String&)
-{
-    ASSERT_NOT_REACHED();
-    m_code = SecurityError;
-    m_message = sanitizedMessage;
-}
-
-void NonThrowableExceptionState::throwRangeError(const String& message)
-{
-    ASSERT_NOT_REACHED();
-    m_code = V8RangeError;
-    m_message = message;
-}
-
-void TrackExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
-{
-    m_code = ec;
-    m_message = message;
-}
-
-void TrackExceptionState::throwTypeError(const String& message)
-{
-    m_code = V8TypeError;
-    m_message = message;
-}
-
-void TrackExceptionState::throwSecurityError(const String& sanitizedMessage, const String&)
-{
-    m_code = SecurityError;
-    m_message = sanitizedMessage;
-}
-
-void TrackExceptionState::throwRangeError(const String& message)
-{
-    m_code = V8RangeError;
-    m_message = message;
-}
-
 String ExceptionState::addExceptionContext(const String& message) const
 {
     if (message.isEmpty())
         return message;
 
     String processedMessage = message;
     if (propertyName() && interfaceName() && m_context != UnknownContext) {
         if (m_context == DeletionContext)
             processedMessage = ExceptionMessages::failedToDelete(propertyName(), interfaceName(), message);
         else if (m_context == ExecutionContext)
@@ skipping 10 matching lines @@
         else if (m_context == IndexedDeletionContext)
             processedMessage = ExceptionMessages::failedToDeleteIndexed(interfaceName(), message);
         else if (m_context == IndexedGetterContext)
             processedMessage = ExceptionMessages::failedToGetIndexed(interfaceName(), message);
         else if (m_context == IndexedSetterContext)
             processedMessage = ExceptionMessages::failedToSetIndexed(interfaceName(), message);
     }
     return processedMessage;
 }
 
+void NonThrowableExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
+{
+    NOTREACHED();
+}
+
+void NonThrowableExceptionState::throwRangeError(const String& message)
+{
+    NOTREACHED();
+}
+
+void NonThrowableExceptionState::throwSecurityError(const String& sanitizedMessage, const String&)
+{
+    NOTREACHED();
+}
+
+void NonThrowableExceptionState::throwTypeError(const String& message)
+{
+    NOTREACHED();
+}
+
+void TrackExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
+{
+    setException(ec, message, v8::Null(isolate()));
+}
+
+void TrackExceptionState::throwRangeError(const String& message)
+{
+    setException(V8RangeError, message, v8::Null(isolate()));
+}
+
+void TrackExceptionState::throwSecurityError(const String& sanitizedMessage, const String&)
+{
+    setException(SecurityError, sanitizedMessage, v8::Null(isolate()));
+}
+
+void TrackExceptionState::throwTypeError(const String& message)
+{
+    setException(V8TypeError, message, v8::Null(isolate()));
+}
+
 } // namespace blink