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

WebCore/bindings/v8/V8Proxy.cpp

Index: WebCore/bindings/v8/V8Proxy.cpp
===================================================================
--- WebCore/bindings/v8/V8Proxy.cpp	(revision 73908)
+++ WebCore/bindings/v8/V8Proxy.cpp	(working copy)
@@ -37,6 +37,7 @@
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoaderClient.h"
+#include "IDBDatabaseException.h"
 #include "IDBFactoryBackendInterface.h"
 #include "IDBPendingTransactionMonitor.h"
 #include "InspectorInstrumentation.h"
@@ -64,6 +65,10 @@
 #include "WorkerContext.h"
 #include "WorkerContextExecutionProxy.h"
 
+#if ENABLE(INDEXED_DATABASE)
+#include "V8IDBDatabaseException.h"
+#endif
+
 #if ENABLE(SVG)
 #include "V8SVGException.h"
 #endif
@@ -673,6 +678,11 @@
         exception = toV8(FileException::create(description));
         break;
 #endif
+#if ENABLE(INDEXED_DATABASE)
+    case IDBDatabaseExceptionType:
+        exception = toV8(IDBDatabaseException::create(description));
+        break;
+#endif
     default:
         ASSERT_NOT_REACHED();
     }