Changeset 199581 in webkit

Timestamp:

Apr 15, 2016 12:22:50 AM (8 years ago)

Author:

beidson@apple.com

Message:

Add the message property to DOMError.
​https://bugs.webkit.org/show_bug.cgi?id=139173

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Updated existing tests).

Adding this property brings us up to date with other browsers, and will help
test the few web features that still use DOMError.

• Modules/indexeddb/IDBOpenDBRequest.cpp:

(WebCore::IDBOpenDBRequest::onError):
(WebCore::IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion):

• Modules/indexeddb/IDBRequest.cpp:

(WebCore::IDBRequest::uncaughtExceptionInEventHandler):
(WebCore::IDBRequest::onError):

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::didCreateIndexOnServer):

• Modules/mediastream/NavigatorUserMediaError.h:

(WebCore::NavigatorUserMediaError::NavigatorUserMediaError):

• dom/DOMError.cpp:

(WebCore::DOMError::DOMError):

• dom/DOMError.h:

(WebCore::DOMError::create):
(WebCore::DOMError::message):

• dom/DOMError.idl:

LayoutTests:

• storage/indexeddb/createIndex-after-failure-expected.txt:
• storage/indexeddb/createIndex-after-failure-private-expected.txt:
• storage/indexeddb/intversion-upgrades-expected.txt:
• storage/indexeddb/intversion-upgrades-private-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/createIndex-after-failure-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/createIndex-after-failure-private-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/intversion-upgrades-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/intversion-upgrades-private-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBRequest.cpp (modified) (2 diffs)
• Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/NavigatorUserMediaError.h (modified) (1 diff)
• Source/WebCore/dom/DOMError.cpp (modified) (2 diffs)
• Source/WebCore/dom/DOMError.h (modified) (2 diffs)
• Source/WebCore/dom/DOMError.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-15  Brady Eidson  <beidson@apple.com>
+
+        Add the message property to DOMError.
+        https://bugs.webkit.org/show_bug.cgi?id=139173
+
+        Reviewed by Alex Christensen.
+
+        * storage/indexeddb/createIndex-after-failure-expected.txt:
+        * storage/indexeddb/createIndex-after-failure-private-expected.txt:
+        * storage/indexeddb/intversion-upgrades-expected.txt:
+        * storage/indexeddb/intversion-upgrades-private-expected.txt:
+
 2016-04-15  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/LayoutTests/storage/indexeddb/createIndex-after-failure-expected.txt

@@ -17 +17 @@
 Now requesting object2
 now we wait.
-Error function called: (AbortError) undefined
-PASS Abort function called: (ConstraintError) undefined
+Error function called: (AbortError) The transaction was aborted, so the request cannot be fulfilled.
+PASS Abort function called: (ConstraintError) A mutation operation in the transaction failed because a constraint was not satisfied.
 PASS successfullyParsed is true
 

trunk/LayoutTests/storage/indexeddb/createIndex-after-failure-private-expected.txt

@@ -17 +17 @@
 Now requesting object2
 now we wait.
-Error function called: (AbortError) undefined
-PASS Abort function called: (ConstraintError) undefined
+Error function called: (AbortError) The transaction was aborted, so the request cannot be fulfilled.
+PASS Abort function called: (ConstraintError) A mutation operation in the transaction failed because a constraint was not satisfied.
 PASS successfullyParsed is true
 

trunk/LayoutTests/storage/indexeddb/intversion-upgrades-expected.txt

@@ -55 +55 @@
 
 errorWhenTryingLowVersion():
-request.error.message = undefined
+request.error.message = An attempt was made to open a database using a lower version than the existing version.
 request = indexedDB.open(dbname, 4)
 request.onupgradeneeded = connection4UpgradeNeeded

trunk/LayoutTests/storage/indexeddb/intversion-upgrades-private-expected.txt

@@ -55 +55 @@
 
 errorWhenTryingLowVersion():
-request.error.message = undefined
+request.error.message = An attempt was made to open a database using a lower version than the existing version.
 request = indexedDB.open(dbname, 4)
 request.onupgradeneeded = connection4UpgradeNeeded

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-15  Brady Eidson  <beidson@apple.com>
+
+        Add the message property to DOMError.
+        https://bugs.webkit.org/show_bug.cgi?id=139173
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Updated existing tests).
+        
+        Adding this property brings us up to date with other browsers, and will help
+        test the few web features that still use DOMError.
+
+        * Modules/indexeddb/IDBOpenDBRequest.cpp:
+        (WebCore::IDBOpenDBRequest::onError):
+        (WebCore::IDBOpenDBRequest::fireErrorAfterVersionChangeCompletion):
+
+        * Modules/indexeddb/IDBRequest.cpp:
+        (WebCore::IDBRequest::uncaughtExceptionInEventHandler):
+        (WebCore::IDBRequest::onError):
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::didCreateIndexOnServer):
+
+        * Modules/mediastream/NavigatorUserMediaError.h:
+        (WebCore::NavigatorUserMediaError::NavigatorUserMediaError):
+
+        * dom/DOMError.cpp:
+        (WebCore::DOMError::DOMError):
+
+        * dom/DOMError.h:
+        (WebCore::DOMError::create):
+        (WebCore::DOMError::message):
+        * dom/DOMError.idl:
+
 2016-04-14  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.cpp

@@ -65 +65 @@
 void IDBOpenDBRequest::onError(const IDBResultData& data)
 {
-    m_domError = DOMError::create(data.error().name());
+    m_domError = DOMError::create(data.error().name(), data.error().message());
     enqueueEvent(IDBRequestCompletionEvent::create(eventNames().errorEvent, true, true, *this));
 }
@@ -98 +98 @@
 
     IDBError idbError(IDBDatabaseException::AbortError);
-    m_domError = DOMError::create(idbError.name());
+    m_domError = DOMError::create(idbError.name(), idbError.message());
     m_result = IDBAny::createUndefined();
 

trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp

@@ -322 +322 @@
 
     if (m_transaction && m_idbError.code() != IDBDatabaseException::AbortError)
-        m_transaction->abortDueToFailedRequest(DOMError::create(IDBDatabaseException::getErrorName(IDBDatabaseException::AbortError)));
+        m_transaction->abortDueToFailedRequest(DOMError::create(IDBDatabaseException::getErrorName(IDBDatabaseException::AbortError), ASCIILiteral("IDBTransaction will abort due to uncaught exception in an event handler")));
 }
 
@@ -422 +422 @@
 
     ASSERT(!m_idbError.isNull());
-    m_domError = DOMError::create(m_idbError.name());
+    m_domError = DOMError::create(m_idbError.name(), m_idbError.message());
     enqueueEvent(Event::create(eventNames().errorEvent, true, true));
 }

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

@@ -597 +597 @@
 
     // Otherwise, failure to create an index forced abortion of the transaction.
-    abortDueToFailedRequest(DOMError::create(IDBDatabaseException::getErrorName(resultData.error().code())));
+    abortDueToFailedRequest(DOMError::create(IDBDatabaseException::getErrorName(resultData.error().code()), resultData.error().message()));
 }
 

trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.h

@@ -51 +51 @@
 private:
     NavigatorUserMediaError(const String& name, const String& constraintName)
-        : DOMError(name)
+        : DOMError(name, { })
         , m_constraintName(constraintName)
     {

trunk/Source/WebCore/dom/DOMError.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +28 @@
 #include "DOMError.h"
 
-
 namespace WebCore {
 
-DOMError::DOMError(const String& name)
+DOMError::DOMError(const String& name, const String& message)
     : m_name(name)
+    , m_message(message)
 {
 }

trunk/Source/WebCore/dom/DOMError.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Google Inc. All Rights Reserved.
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34 +35 @@
 class DOMError : public RefCounted<DOMError> {
 public:
-    static Ref<DOMError> create(const String& name)
+    static Ref<DOMError> create(const String& name, const String& message = { })
     {
-        return adoptRef(*new DOMError(name));
+        return adoptRef(*new DOMError(name, message));
     }
     virtual ~DOMError() { }
 
     const String& name() const { return m_name; }
+    const String& message() const { return m_message; }
 
 protected:
-    explicit DOMError(const String& name);
+    explicit DOMError(const String& name, const String& message);
 
 private:
-    const String m_name;
+    String m_name;
+    String m_message;
 };
 

trunk/Source/WebCore/dom/DOMError.idl

@@ -31 +31 @@
 ] interface  DOMError {
     readonly attribute DOMString name;
+    readonly attribute DOMString message;
 };