Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / indexeddb / IDBOpenDBRequest.cpp

diff --git a/src/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/src/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
index b8847fb..8fc07fe 100644 (file)
--- a/src/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
+++ b/src/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
@@ -31,7 +31,6 @@
 #include "core/dom/ExecutionContext.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBDatabaseCallbacks.h"
-#include "modules/indexeddb/IDBPendingTransactionMonitor.h"
 #include "modules/indexeddb/IDBTracing.h"
 #include "modules/indexeddb/IDBVersionChangeEvent.h"
 
@@ -41,7 +40,7 @@ namespace blink {
 
 IDBOpenDBRequest* IDBOpenDBRequest::create(ScriptState* scriptState, IDBDatabaseCallbacks* callbacks, int64_t transactionId, int64_t version)
 {
-    IDBOpenDBRequest* request = adoptRefCountedGarbageCollectedWillBeNoop(new IDBOpenDBRequest(scriptState, callbacks, transactionId, version));
+    IDBOpenDBRequest* request = new IDBOpenDBRequest(scriptState, callbacks, transactionId, version);
     request->suspendIfNeeded();
     return request;
 }
@@ -53,7 +52,6 @@ IDBOpenDBRequest::IDBOpenDBRequest(ScriptState* scriptState, IDBDatabaseCallback
     , m_version(version)
 {
     ASSERT(!resultAsAny());
-    ScriptWrappable::init(this);
 }
 
 IDBOpenDBRequest::~IDBOpenDBRequest()
@@ -104,7 +102,7 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBData
     IDBDatabaseMetadata oldMetadata(metadata);
     oldMetadata.intVersion = oldVersion;
 
-    m_transaction = IDBTransaction::create(executionContext(), m_transactionId, idbDatabase, this, oldMetadata);
+    m_transaction = IDBTransaction::create(scriptState(), m_transactionId, idbDatabase, this, oldMetadata);
     setResult(IDBAny::create(idbDatabase));
 
     if (m_version == IDBDatabaseMetadata::NoIntVersion)