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

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

Issue 236783002: Pass NewScriptState to idbAnyToScriptValue() and idbKeyToScriptValue() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
« no previous file with comments | « Source/modules/indexeddb/IDBIndex.h ('k') | Source/modules/indexeddb/IDBIndex.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 ASSERT(m_objectStore); 53 ASSERT(m_objectStore);
54 ASSERT(m_transaction); 54 ASSERT(m_transaction);
55 ASSERT(m_metadata.id != IDBIndexMetadata::InvalidId); 55 ASSERT(m_metadata.id != IDBIndexMetadata::InvalidId);
56 ScriptWrappable::init(this); 56 ScriptWrappable::init(this);
57 } 57 }
58 58
59 IDBIndex::~IDBIndex() 59 IDBIndex::~IDBIndex()
60 { 60 {
61 } 61 }
62 62
63 ScriptValue IDBIndex::keyPath(ExecutionContext* context) const 63 ScriptValue IDBIndex::keyPath(NewScriptState* scriptState) const
64 { 64 {
65 DOMRequestState requestState(toIsolate(context)); 65 return idbAnyToScriptValue(scriptState, IDBAny::create(m_metadata.keyPath));
66 return idbAnyToScriptValue(&requestState, IDBAny::create(m_metadata.keyPath) );
67 } 66 }
68 67
69 PassRefPtr<IDBRequest> IDBIndex::openCursor(ExecutionContext* context, const Scr iptValue& range, const String& directionString, ExceptionState& exceptionState) 68 PassRefPtr<IDBRequest> IDBIndex::openCursor(ExecutionContext* context, const Scr iptValue& range, const String& directionString, ExceptionState& exceptionState)
70 { 69 {
71 IDB_TRACE("IDBIndex::openCursor"); 70 IDB_TRACE("IDBIndex::openCursor");
72 if (isDeleted()) { 71 if (isDeleted()) {
73 exceptionState.throwDOMException(InvalidStateError, IDBDatabase::indexDe letedErrorMessage); 72 exceptionState.throwDOMException(InvalidStateError, IDBDatabase::indexDe letedErrorMessage);
74 return nullptr; 73 return nullptr;
75 } 74 }
76 if (m_transaction->isFinished()) { 75 if (m_transaction->isFinished()) {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 { 197 {
199 return m_transaction->backendDB(); 198 return m_transaction->backendDB();
200 } 199 }
201 200
202 bool IDBIndex::isDeleted() const 201 bool IDBIndex::isDeleted() const
203 { 202 {
204 return m_deleted || m_objectStore->isDeleted(); 203 return m_deleted || m_objectStore->isDeleted();
205 } 204 }
206 205
207 } // namespace WebCore 206 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/IDBIndex.h ('k') | Source/modules/indexeddb/IDBIndex.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698