Title: [142356] trunk/Source/WebCore
Revision
142356
Author
[email protected]
Date
2013-02-09 07:14:20 -0800 (Sat, 09 Feb 2013)

Log Message

Drop ExceptionCode from IDB's directionToString and modeToString.
https://bugs.webkit.org/show_bug.cgi?id=109143

Reviewed by Jochen Eisinger.

No caller of either IDBCursor::directionToString or
IDBTransaction::modeToString makes use of the ExceptionCode these
methods require. This patch removes the 'ExceptionCode&' parameter from
both methods and their callsites.

* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::direction):
(WebCore::IDBCursor::directionToString):
    Drop the 'ExceptionCode&' parameter, and replace the 'TypeError'
    exception previously generated with ASSERT_NOT_REACHED.
* Modules/indexeddb/IDBCursor.h:
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::mode):
(WebCore::IDBTransaction::modeToString):
    Drop the 'ExceptionCode&' parameter, and replace the 'TypeError'
    exception previously generated with ASSERT_NOT_REACHED.
* Modules/indexeddb/IDBTransaction.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (142355 => 142356)


--- trunk/Source/WebCore/ChangeLog	2013-02-09 15:10:08 UTC (rev 142355)
+++ trunk/Source/WebCore/ChangeLog	2013-02-09 15:14:20 UTC (rev 142356)
@@ -1,3 +1,28 @@
+2013-02-09  Mike West  <[email protected]>
+
+        Drop ExceptionCode from IDB's directionToString and modeToString.
+        https://bugs.webkit.org/show_bug.cgi?id=109143
+
+        Reviewed by Jochen Eisinger.
+
+        No caller of either IDBCursor::directionToString or
+        IDBTransaction::modeToString makes use of the ExceptionCode these
+        methods require. This patch removes the 'ExceptionCode&' parameter from
+        both methods and their callsites.
+
+        * Modules/indexeddb/IDBCursor.cpp:
+        (WebCore::IDBCursor::direction):
+        (WebCore::IDBCursor::directionToString):
+            Drop the 'ExceptionCode&' parameter, and replace the 'TypeError'
+            exception previously generated with ASSERT_NOT_REACHED.
+        * Modules/indexeddb/IDBCursor.h:
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::mode):
+        (WebCore::IDBTransaction::modeToString):
+            Drop the 'ExceptionCode&' parameter, and replace the 'TypeError'
+            exception previously generated with ASSERT_NOT_REACHED.
+        * Modules/indexeddb/IDBTransaction.h:
+
 2013-02-09  Kondapally Kalyan  <[email protected]>
 
         [EFL][Qt][WebGL] Share the common code between GraphicsSurfaceGLX and X11WindowResources.

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (142355 => 142356)


--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp	2013-02-09 15:10:08 UTC (rev 142355)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp	2013-02-09 15:14:20 UTC (rev 142356)
@@ -95,7 +95,7 @@
 const String& IDBCursor::direction() const
 {
     IDB_TRACE("IDBCursor::direction");
-    return directionToString(m_direction, ASSERT_NO_EXCEPTION);
+    return directionToString(m_direction);
 }
 
 const ScriptValue& IDBCursor::key() const
@@ -313,7 +313,7 @@
     return IDBCursor::NEXT;
 }
 
-const AtomicString& IDBCursor::directionToString(unsigned short direction, ExceptionCode& ec)
+const AtomicString& IDBCursor::directionToString(unsigned short direction)
 {
     switch (direction) {
     case IDBCursor::NEXT:
@@ -329,7 +329,7 @@
         return IDBCursor::directionPrevUnique();
 
     default:
-        ec = TypeError;
+        ASSERT_NOT_REACHED();
         return IDBCursor::directionNext();
     }
 }

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h (142355 => 142356)


--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h	2013-02-09 15:10:08 UTC (rev 142355)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h	2013-02-09 15:14:20 UTC (rev 142356)
@@ -62,7 +62,7 @@
     static const AtomicString& directionPrevUnique();
 
     static IDBCursor::Direction stringToDirection(const String& modeString, ScriptExecutionContext*, ExceptionCode&);
-    static const AtomicString& directionToString(unsigned short mode, ExceptionCode&);
+    static const AtomicString& directionToString(unsigned short mode);
 
     static PassRefPtr<IDBCursor> create(PassRefPtr<IDBCursorBackendInterface>, Direction, IDBRequest*, IDBAny* source, IDBTransaction*);
     virtual ~IDBCursor();

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (142355 => 142356)


--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp	2013-02-09 15:10:08 UTC (rev 142355)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp	2013-02-09 15:14:20 UTC (rev 142356)
@@ -122,7 +122,7 @@
 
 const String& IDBTransaction::mode() const
 {
-    return modeToString(m_mode, ASSERT_NO_EXCEPTION);
+    return modeToString(m_mode);
 }
 
 void IDBTransaction::setError(PassRefPtr<DOMError> error, const String& errorMessage)
@@ -347,7 +347,7 @@
     return IDBTransaction::READ_ONLY;
 }
 
-const AtomicString& IDBTransaction::modeToString(IDBTransaction::Mode mode, ExceptionCode& ec)
+const AtomicString& IDBTransaction::modeToString(IDBTransaction::Mode mode)
 {
     switch (mode) {
     case IDBTransaction::READ_ONLY:
@@ -363,7 +363,7 @@
         break;
 
     default:
-        ec = TypeError;
+        ASSERT_NOT_REACHED();
         return IDBTransaction::modeReadOnly();
     }
 }

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (142355 => 142356)


--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h	2013-02-09 15:10:08 UTC (rev 142355)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h	2013-02-09 15:14:20 UTC (rev 142356)
@@ -68,7 +68,7 @@
     static const AtomicString& modeReadWriteLegacy();
 
     static Mode stringToMode(const String&, ScriptExecutionContext*, ExceptionCode&);
-    static const AtomicString& modeToString(Mode, ExceptionCode&);
+    static const AtomicString& modeToString(Mode);
 
     IDBDatabaseBackendInterface* backendDB() const;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to