Switch HTMLCanvasElement over to new-style ExceptionState.

Source/bindings/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 33 matching lines @@
 }
 
 void ExceptionState::throwDOMException(const ExceptionCode& ec, const String& message)
 {
     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);
 
-    String processedMessage = message;
-    if (propertyName() && interfaceName() && m_context != UnknownContext) {
-        if (m_context == DeletionContext)
-            processedMessage = ExceptionMessages::failedToDelete(propertyName(), interfaceName(), message);
-        else if (m_context == ExecutionContext)
-            processedMessage = ExceptionMessages::failedToExecute(propertyName(), interfaceName(), message);
-        else if (m_context == GetterContext)
-            processedMessage = ExceptionMessages::failedToGet(propertyName(), interfaceName(), message);
-        else if (m_context == SetterContext)
-            processedMessage = ExceptionMessages::failedToSet(propertyName(), interfaceName(), message);
-    } else if (!propertyName() && interfaceName() && m_context == ConstructionContext) {
-        processedMessage = ExceptionMessages::failedToConstruct(interfaceName(), message);
-    }
-
     m_code = ec;
+    String processedMessage = addExceptionContext(message);
     setException(V8ThrowException::createDOMException(ec, processedMessage, m_creationContext, m_isolate));
 }
 
 void ExceptionState::throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage)
 {
     ASSERT(m_isolate);
     m_code = SecurityError;
-    setException(V8ThrowException::createDOMException(SecurityError, sanitizedMessage, unsanitizedMessage, m_creationContext, m_isolate));
+    String finalSanitized = addExceptionContext(sanitizedMessage);
+    String finalUnsanitized = addExceptionContext(unsanitizedMessage);
+    setException(V8ThrowException::createDOMException(SecurityError, finalSanitized, finalUnsanitized, m_creationContext, m_isolate));
 }
 
 void ExceptionState::setException(v8::Handle<v8::Value> exception)
 {
     // FIXME: Assert that exception is not empty?
     if (exception.IsEmpty()) {
         clearException();
         return;
     }
 
@@ skipping 15 matching lines @@
 void TrackExceptionState::throwTypeError(const String&)
 {
     m_code = TypeError;
 }
 
 void TrackExceptionState::throwSecurityError(const String&, const String&)
 {
     m_code = SecurityError;
 }
 
+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)
+            processedMessage = ExceptionMessages::failedToExecute(propertyName(), interfaceName(), message);
+        else if (m_context == GetterContext)
+            processedMessage = ExceptionMessages::failedToGet(propertyName(), interfaceName(), message);
+        else if (m_context == SetterContext)
+            processedMessage = ExceptionMessages::failedToSet(propertyName(), interfaceName(), message);
+    } else if (!propertyName() && interfaceName() && m_context == ConstructionContext) {
+        processedMessage = ExceptionMessages::failedToConstruct(interfaceName(), message);
+    }
+    return processedMessage;
+}
+
 } // namespace WebCore