Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: Source/modules/indexeddb/IDBObjectStore.cpp

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed LICENSE and windows build Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/IDBObjectStore.h" 27 #include "modules/indexeddb/IDBObjectStore.h"
28 28
29 #include "bindings/core/v8/Dictionary.h"
30 #include "bindings/core/v8/DictionaryHelper.h"
29 #include "bindings/core/v8/ExceptionState.h" 31 #include "bindings/core/v8/ExceptionState.h"
30 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 32 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
31 #include "bindings/core/v8/ScriptState.h" 33 #include "bindings/core/v8/ScriptState.h"
32 #include "bindings/modules/v8/IDBBindingUtilities.h" 34 #include "bindings/modules/v8/IDBBindingUtilities.h"
33 #include "core/dom/DOMStringList.h" 35 #include "core/dom/DOMStringList.h"
34 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
35 #include "core/dom/ExecutionContext.h" 37 #include "core/dom/ExecutionContext.h"
36 #include "modules/indexeddb/IDBAny.h" 38 #include "modules/indexeddb/IDBAny.h"
37 #include "modules/indexeddb/IDBCursorWithValue.h" 39 #include "modules/indexeddb/IDBCursorWithValue.h"
38 #include "modules/indexeddb/IDBDatabase.h" 40 #include "modules/indexeddb/IDBDatabase.h"
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 Persistent<IDBDatabase> m_database; 381 Persistent<IDBDatabase> m_database;
380 const int64_t m_transactionId; 382 const int64_t m_transactionId;
381 const int64_t m_objectStoreId; 383 const int64_t m_objectStoreId;
382 const IDBIndexMetadata m_indexMetadata; 384 const IDBIndexMetadata m_indexMetadata;
383 }; 385 };
384 } 386 }
385 387
386 IDBIndex* IDBObjectStore::createIndex(ScriptState* scriptState, const String& na me, const IDBKeyPath& keyPath, const Dictionary& options, ExceptionState& except ionState) 388 IDBIndex* IDBObjectStore::createIndex(ScriptState* scriptState, const String& na me, const IDBKeyPath& keyPath, const Dictionary& options, ExceptionState& except ionState)
387 { 389 {
388 bool unique = false; 390 bool unique = false;
389 options.get("unique", unique); 391 DictionaryHelper::get(options, "unique", unique);
390 392
391 bool multiEntry = false; 393 bool multiEntry = false;
392 options.get("multiEntry", multiEntry); 394 DictionaryHelper::get(options, "multiEntry", multiEntry);
393 395
394 return createIndex(scriptState, name, keyPath, unique, multiEntry, exception State); 396 return createIndex(scriptState, name, keyPath, unique, multiEntry, exception State);
395 } 397 }
396 398
397 IDBIndex* IDBObjectStore::createIndex(ScriptState* scriptState, const String& na me, const IDBKeyPath& keyPath, bool unique, bool multiEntry, ExceptionState& exc eptionState) 399 IDBIndex* IDBObjectStore::createIndex(ScriptState* scriptState, const String& na me, const IDBKeyPath& keyPath, bool unique, bool multiEntry, ExceptionState& exc eptionState)
398 { 400 {
399 IDB_TRACE("IDBObjectStore::createIndex"); 401 IDB_TRACE("IDBObjectStore::createIndex");
400 if (!m_transaction->isVersionChange()) { 402 if (!m_transaction->isVersionChange()) {
401 exceptionState.throwDOMException(InvalidStateError, IDBDatabase::notVers ionChangeTransactionErrorMessage); 403 exceptionState.throwDOMException(InvalidStateError, IDBDatabase::notVers ionChangeTransactionErrorMessage);
402 return 0; 404 return 0;
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 } 663 }
662 return IDBIndexMetadata::InvalidId; 664 return IDBIndexMetadata::InvalidId;
663 } 665 }
664 666
665 WebIDBDatabase* IDBObjectStore::backendDB() const 667 WebIDBDatabase* IDBObjectStore::backendDB() const
666 { 668 {
667 return m_transaction->backendDB(); 669 return m_transaction->backendDB();
668 } 670 }
669 671
670 } // namespace WebCore 672 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698