Index: Source/modules/indexeddb/IDBTransactionTest.cpp |
diff --git a/Source/modules/indexeddb/IDBTransactionTest.cpp b/Source/modules/indexeddb/IDBTransactionTest.cpp |
index 8777ab179d7e2a09c3d353487e1865d0ce66a9c9..ca9981cbca5c3d6d8e752ce2d0c2089c6fa50ef0 100644 |
--- a/Source/modules/indexeddb/IDBTransactionTest.cpp |
+++ b/Source/modules/indexeddb/IDBTransactionTest.cpp |
@@ -50,19 +50,20 @@ namespace { |
class IDBTransactionTest : public testing::Test { |
public: |
IDBTransactionTest() |
- : m_scope(V8ExecutionScope::create(v8::Isolate::GetCurrent())) |
- , m_document(Document::create()) |
+ : m_scope(V8TestingScope::create(v8::Isolate::GetCurrent())) |
{ |
+ m_scope->scriptState()->setExecutionContext(Document::create()); |
} |
+ v8::Isolate* isolate() const { return m_scope->isolate(); } |
+ |
ExecutionContext* executionContext() |
{ |
- return m_document.get(); |
+ return m_scope->scriptState()->executionContext(); |
} |
private: |
- OwnPtr<V8ExecutionScope> m_scope; |
- RefPtr<Document> m_document; |
+ OwnPtr<V8TestingScope> m_scope; |
}; |
class FakeWebIDBDatabase FINAL : public blink::WebIDBDatabase { |
@@ -107,7 +108,7 @@ TEST_F(IDBTransactionTest, EnsureLifetime) |
EXPECT_EQ(3, transaction->refCount()); |
#endif |
- RefPtrWillBePersistent<IDBRequest> request = IDBRequest::create(executionContext(), IDBAny::createUndefined(), transaction.get()); |
+ RefPtrWillBePersistent<IDBRequest> request = IDBRequest::create(ScriptState::current(isolate()), IDBAny::createUndefined(), transaction.get()); |
jsbell
2014/05/27 18:38:47
Just isolate() here rather than ScriptState::curre
haraken
2014/05/28 00:35:49
Done.
|
IDBPendingTransactionMonitor::from(*executionContext()).deactivateNewTransactions(); |
#if ENABLE(OILPAN) |