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

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

Issue 295163005: Remove ScriptState::current() from IDBRequest (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/IDBRequest.h ('k') | Source/modules/indexeddb/IDBRequestTest.cpp » ('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 27 matching lines...) Expand all
38 #include "modules/indexeddb/IDBDatabase.h" 38 #include "modules/indexeddb/IDBDatabase.h"
39 #include "modules/indexeddb/IDBEventDispatcher.h" 39 #include "modules/indexeddb/IDBEventDispatcher.h"
40 #include "modules/indexeddb/IDBTracing.h" 40 #include "modules/indexeddb/IDBTracing.h"
41 #include "platform/SharedBuffer.h" 41 #include "platform/SharedBuffer.h"
42 #include "public/platform/WebBlobInfo.h" 42 #include "public/platform/WebBlobInfo.h"
43 43
44 using blink::WebIDBCursor; 44 using blink::WebIDBCursor;
45 45
46 namespace WebCore { 46 namespace WebCore {
47 47
48 IDBRequest* IDBRequest::create(ExecutionContext* context, IDBAny* source, IDBTra nsaction* transaction) 48 IDBRequest* IDBRequest::create(ScriptState* scriptState, IDBAny* source, IDBTran saction* transaction)
49 { 49 {
50 IDBRequest* request(adoptRefCountedGarbageCollected(new IDBRequest(context, source, transaction))); 50 IDBRequest* request(adoptRefCountedGarbageCollected(new IDBRequest(scriptSta te, source, transaction)));
51 request->suspendIfNeeded(); 51 request->suspendIfNeeded();
52 // Requests associated with IDBFactory (open/deleteDatabase/getDatabaseNames ) are not associated with transactions. 52 // Requests associated with IDBFactory (open/deleteDatabase/getDatabaseNames ) are not associated with transactions.
53 if (transaction) 53 if (transaction)
54 transaction->registerRequest(request); 54 transaction->registerRequest(request);
55 return request; 55 return request;
56 } 56 }
57 57
58 IDBRequest::IDBRequest(ExecutionContext* context, IDBAny* source, IDBTransaction * transaction) 58 IDBRequest::IDBRequest(ScriptState* scriptState, IDBAny* source, IDBTransaction* transaction)
59 : ActiveDOMObject(context) 59 : ActiveDOMObject(scriptState->executionContext())
60 , m_contextStopped(false) 60 , m_contextStopped(false)
61 , m_transaction(transaction) 61 , m_transaction(transaction)
62 , m_readyState(PENDING) 62 , m_readyState(PENDING)
63 , m_requestAborted(false) 63 , m_requestAborted(false)
64 , m_scriptState(ScriptState::current(toIsolate(context))) 64 , m_scriptState(scriptState)
65 , m_source(source) 65 , m_source(source)
66 , m_hasPendingActivity(true) 66 , m_hasPendingActivity(true)
67 , m_cursorType(IndexedDB::CursorKeyAndValue) 67 , m_cursorType(IndexedDB::CursorKeyAndValue)
68 , m_cursorDirection(blink::WebIDBCursor::Next) 68 , m_cursorDirection(blink::WebIDBCursor::Next)
69 , m_pendingCursor(nullptr) 69 , m_pendingCursor(nullptr)
70 , m_didFireUpgradeNeededEvent(false) 70 , m_didFireUpgradeNeededEvent(false)
71 , m_preventPropagation(false) 71 , m_preventPropagation(false)
72 , m_resultDirty(true) 72 , m_resultDirty(true)
73 { 73 {
74 ScriptWrappable::init(this); 74 ScriptWrappable::init(this);
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 538
539 void IDBRequest::dequeueEvent(Event* event) 539 void IDBRequest::dequeueEvent(Event* event)
540 { 540 {
541 for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) { 541 for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
542 if (m_enqueuedEvents[i].get() == event) 542 if (m_enqueuedEvents[i].get() == event)
543 m_enqueuedEvents.remove(i); 543 m_enqueuedEvents.remove(i);
544 } 544 }
545 } 545 }
546 546
547 } // namespace WebCore 547 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/IDBRequest.h ('k') | Source/modules/indexeddb/IDBRequestTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698