Merge 73605 - 2010-12-07 Jeremy Orlow <jorlow@chromium.org>...

WebCore/bindings/js/JSDOMBinding.cpp

Index: WebCore/bindings/js/JSDOMBinding.cpp
===================================================================
--- WebCore/bindings/js/JSDOMBinding.cpp	(revision 73908)
+++ WebCore/bindings/js/JSDOMBinding.cpp	(working copy)
@@ -86,6 +86,11 @@
 #include "JSFileException.h"
 #endif
 
+#if ENABLE(INDEXED_DATABASE)
+#include "IDBDatabaseException.h"
+#include "JSIDBDatabaseException.h"
+#endif
+
 using namespace JSC;
 
 namespace WebCore {
@@ -650,6 +655,11 @@
             errorObject = toJS(exec, globalObject, FileException::create(description));
             break;
 #endif
+#if ENABLE(INDEXED_DATABASE)
+        case IDBDatabaseExceptionType:
+            errorObject = toJS(exec, globalObject, IDBDatabaseException::create(description));
+            break;
+#endif
     }
 
     ASSERT(errorObject);