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

WebCore/bindings/js/JSDOMBinding.cpp

 /*
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *  Copyright (C) 2007 Samuel Weinig <sam@webkit.org>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
@@ skipping 68 matching lines @@
 #if ENABLE(DATABASE)
 #include "JSSQLException.h"
 #include "SQLException.h"
 #endif
 
 #if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
 #include "FileException.h"
 #include "JSFileException.h"
 #endif
 
+#if ENABLE(INDEXED_DATABASE)
+#include "IDBDatabaseException.h"
+#include "JSIDBDatabaseException.h"
+#endif
+
 using namespace JSC;
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 typedef Document::JSWrapperCache JSWrapperCache;
 typedef Document::JSWrapperCacheMap JSWrapperCacheMap;
 
 class JSGlobalDataWorldIterator {
@@ skipping 544 matching lines @@
 #if ENABLE(DATABASE)
         case SQLExceptionType:
             errorObject = toJS(exec, globalObject, SQLException::create(description));
             break;
 #endif
 #if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
         case FileExceptionType:
             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);
     throwError(exec, errorObject);
 }
 
 bool checkNodeSecurity(ExecState* exec, Node* node)
 {
     return node && allowsAccessFromFrame(exec, node->document()->frame());
 }
@@ skipping 125 matching lines @@
     }
 
     length = lengthValue.toUInt32(exec);
     if (exec->hadException())
         return 0;
 
     return object;
 }
 
 } // namespace WebCore