webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 4 deletions

diff --git a/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp b/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp
index c99b40a56..28dc3b36d 100644
--- a/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp
+++ b/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.cpp
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -29,13 +29,13 @@
 #include "config.h"
 #include "SQLResultSetRowList.h"
 
-#if ENABLE(SQL_DATABASE)
+#include "ExceptionCode.h"
 
 namespace WebCore {
 
 unsigned SQLResultSetRowList::length() const
 {
-    if (m_result.size() == 0)
+    if (m_result.isEmpty())
         return 0;
 
     ASSERT(m_result.size() % m_columns.size() == 0);
@@ -43,6 +43,19 @@ unsigned SQLResultSetRowList::length() const
     return m_result.size() / m_columns.size();
 }
 
+ExceptionOr<Vector<WTF::KeyValuePair<String, SQLValue>>> SQLResultSetRowList::item(unsigned index) const
+{
+    if (index >= length())
+        return Exception { INDEX_SIZE_ERR };
+
+    Vector<WTF::KeyValuePair<String, SQLValue>> result;
+
+    unsigned numberOfColumns = m_columns.size();
+    unsigned valuesIndex = index * numberOfColumns;
+    for (unsigned i = 0; i < numberOfColumns; i++)
+        result.append({ m_columns[i], m_result[valuesIndex + i] });
+
+    return WTFMove(result);
 }
 
-#endif
+}