| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "modules/indexeddb/IDBDatabase.h" | 27 #include "modules/indexeddb/IDBDatabase.h" |
| 28 | 28 |
| 29 #include "bindings/core/v8/DictionaryHelper.h" |
| 29 #include "bindings/core/v8/ExceptionState.h" | 30 #include "bindings/core/v8/ExceptionState.h" |
| 30 #include "bindings/core/v8/ExceptionStatePlaceholder.h" | 31 #include "bindings/core/v8/ExceptionStatePlaceholder.h" |
| 31 #include "bindings/core/v8/Nullable.h" | 32 #include "bindings/core/v8/Nullable.h" |
| 32 #include "bindings/core/v8/SerializedScriptValue.h" | 33 #include "bindings/core/v8/SerializedScriptValue.h" |
| 33 #include "bindings/modules/v8/IDBBindingUtilities.h" | 34 #include "bindings/modules/v8/IDBBindingUtilities.h" |
| 34 #include "core/dom/ExecutionContext.h" | 35 #include "core/dom/ExecutionContext.h" |
| 35 #include "core/events/EventQueue.h" | 36 #include "core/events/EventQueue.h" |
| 36 #include "core/inspector/ScriptCallStack.h" | 37 #include "core/inspector/ScriptCallStack.h" |
| 37 #include "modules/indexeddb/IDBAny.h" | 38 #include "modules/indexeddb/IDBAny.h" |
| 38 #include "modules/indexeddb/IDBEventDispatcher.h" | 39 #include "modules/indexeddb/IDBEventDispatcher.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 return idbAnyToScriptValue(scriptState, IDBAny::create(intVersion)); | 197 return idbAnyToScriptValue(scriptState, IDBAny::create(intVersion)); |
| 197 } | 198 } |
| 198 | 199 |
| 199 IDBObjectStore* IDBDatabase::createObjectStore(const String& name, const Diction
ary& options, ExceptionState& exceptionState) | 200 IDBObjectStore* IDBDatabase::createObjectStore(const String& name, const Diction
ary& options, ExceptionState& exceptionState) |
| 200 { | 201 { |
| 201 IDBKeyPath keyPath; | 202 IDBKeyPath keyPath; |
| 202 bool autoIncrement = false; | 203 bool autoIncrement = false; |
| 203 if (!options.isUndefinedOrNull()) { | 204 if (!options.isUndefinedOrNull()) { |
| 204 String keyPathString; | 205 String keyPathString; |
| 205 Vector<String> keyPathArray; | 206 Vector<String> keyPathArray; |
| 206 if (options.get("keyPath", keyPathArray)) | 207 if (DictionaryHelper::get(options, "keyPath", keyPathArray)) |
| 207 keyPath = IDBKeyPath(keyPathArray); | 208 keyPath = IDBKeyPath(keyPathArray); |
| 208 else if (options.getWithUndefinedOrNullCheck("keyPath", keyPathString)) | 209 else if (options.getWithUndefinedOrNullCheck("keyPath", keyPathString)) |
| 209 keyPath = IDBKeyPath(keyPathString); | 210 keyPath = IDBKeyPath(keyPathString); |
| 210 | 211 |
| 211 options.get("autoIncrement", autoIncrement); | 212 DictionaryHelper::get(options, "autoIncrement", autoIncrement); |
| 212 } | 213 } |
| 213 | 214 |
| 214 return createObjectStore(name, keyPath, autoIncrement, exceptionState); | 215 return createObjectStore(name, keyPath, autoIncrement, exceptionState); |
| 215 } | 216 } |
| 216 | 217 |
| 217 IDBObjectStore* IDBDatabase::createObjectStore(const String& name, const IDBKeyP
ath& keyPath, bool autoIncrement, ExceptionState& exceptionState) | 218 IDBObjectStore* IDBDatabase::createObjectStore(const String& name, const IDBKeyP
ath& keyPath, bool autoIncrement, ExceptionState& exceptionState) |
| 218 { | 219 { |
| 219 IDB_TRACE("IDBDatabase::createObjectStore"); | 220 IDB_TRACE("IDBDatabase::createObjectStore"); |
| 220 blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEnd
APICalls", IDBCreateObjectStoreCall, IDBMethodsMax); | 221 blink::Platform::current()->histogramEnumeration("WebCore.IndexedDB.FrontEnd
APICalls", IDBCreateObjectStoreCall, IDBMethodsMax); |
| 221 if (!m_versionChangeTransaction) { | 222 if (!m_versionChangeTransaction) { |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 { | 472 { |
| 472 return EventTargetNames::IDBDatabase; | 473 return EventTargetNames::IDBDatabase; |
| 473 } | 474 } |
| 474 | 475 |
| 475 ExecutionContext* IDBDatabase::executionContext() const | 476 ExecutionContext* IDBDatabase::executionContext() const |
| 476 { | 477 { |
| 477 return ActiveDOMObject::executionContext(); | 478 return ActiveDOMObject::executionContext(); |
| 478 } | 479 } |
| 479 | 480 |
| 480 } // namespace WebCore | 481 } // namespace WebCore |
| OLD | NEW |