Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp b/src/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp
index 36858b9..07bc48a 100644 (file)
--- a/src/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp
+++ b/src/third_party/WebKit/Source/modules/indexeddb/IDBRequest.cpp
@@ -29,11 +29,12 @@
 #include "config.h"
 #include "modules/indexeddb/IDBRequest.h"
 
-#include "bindings/v8/ExceptionState.h"
-#include "bindings/v8/ExceptionStatePlaceholder.h"
-#include "bindings/v8/IDBBindingUtilities.h"
+#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
+#include "bindings/modules/v8/IDBBindingUtilities.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/EventQueue.h"
+#include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/IDBCursorWithValue.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBEventDispatcher.h"
@@ -43,29 +44,29 @@
 
 using blink::WebIDBCursor;
 
-namespace WebCore {
+namespace blink {
 
-PassRefPtrWillBeRawPtr<IDBRequest> IDBRequest::create(ExecutionContext* context, PassRefPtrWillBeRawPtr<IDBAny> source, IDBTransaction* transaction)
+IDBRequest* IDBRequest::create(ScriptState* scriptState, IDBAny* source, IDBTransaction* transaction)
 {
-    RefPtrWillBeRawPtr<IDBRequest> request(adoptRefWillBeRefCountedGarbageCollected(new IDBRequest(context, source, transaction)));
+    IDBRequest* request = adoptRefCountedGarbageCollectedWillBeNoop(new IDBRequest(scriptState, source, transaction));
     request->suspendIfNeeded();
     // Requests associated with IDBFactory (open/deleteDatabase/getDatabaseNames) are not associated with transactions.
     if (transaction)
-        transaction->registerRequest(request.get());
-    return request.release();
+        transaction->registerRequest(request);
+    return request;
 }
 
-IDBRequest::IDBRequest(ExecutionContext* context, PassRefPtrWillBeRawPtr<IDBAny> source, IDBTransaction* transaction)
-    : ActiveDOMObject(context)
+IDBRequest::IDBRequest(ScriptState* scriptState, IDBAny* source, IDBTransaction* transaction)
+    : ActiveDOMObject(scriptState->executionContext())
     , m_contextStopped(false)
     , m_transaction(transaction)
     , m_readyState(PENDING)
     , m_requestAborted(false)
-    , m_scriptState(ScriptState::current(toIsolate(context)))
+    , m_scriptState(scriptState)
     , m_source(source)
     , m_hasPendingActivity(true)
     , m_cursorType(IndexedDB::CursorKeyAndValue)
-    , m_cursorDirection(blink::WebIDBCursor::Next)
+    , m_cursorDirection(WebIDBCursorDirectionNext)
     , m_pendingCursor(nullptr)
     , m_didFireUpgradeNeededEvent(false)
     , m_preventPropagation(false)
@@ -86,10 +87,13 @@ void IDBRequest::trace(Visitor* visitor)
     visitor->trace(m_source);
     visitor->trace(m_result);
     visitor->trace(m_error);
+#if ENABLE(OILPAN)
     visitor->trace(m_enqueuedEvents);
+#endif
     visitor->trace(m_pendingCursor);
     visitor->trace(m_cursorKey);
     visitor->trace(m_cursorPrimaryKey);
+    EventTargetWithInlineData::trace(visitor);
 }
 
 ScriptValue IDBRequest::result(ExceptionState& exceptionState)
@@ -126,13 +130,11 @@ ScriptValue IDBRequest::source() const
 const String& IDBRequest::readyState() const
 {
     ASSERT(m_readyState == PENDING || m_readyState == DONE);
-    DEFINE_STATIC_LOCAL(AtomicString, pending, ("pending", AtomicString::ConstructFromLiteral));
-    DEFINE_STATIC_LOCAL(AtomicString, done, ("done", AtomicString::ConstructFromLiteral));
 
     if (m_readyState == PENDING)
-        return pending;
+        return IndexedDBNames::pending;
 
-    return done;
+    return IndexedDBNames::done;
 }
 
 void IDBRequest::abort()
@@ -144,9 +146,6 @@ void IDBRequest::abort()
     if (m_readyState == DONE)
         return;
 
-    // Enqueued events may be the only reference to this object.
-    RefPtrWillBeRawPtr<IDBRequest> self(this);
-
     EventQueue* eventQueue = executionContext()->eventQueue();
     for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
         bool removed = eventQueue->cancelEvent(m_enqueuedEvents[i].get());
@@ -160,7 +159,7 @@ void IDBRequest::abort()
     m_requestAborted = true;
 }
 
-void IDBRequest::setCursorDetails(IndexedDB::CursorType cursorType, WebIDBCursor::Direction direction)
+void IDBRequest::setCursorDetails(IndexedDB::CursorType cursorType, WebIDBCursorDirection direction)
 {
     ASSERT(m_readyState == PENDING);
     ASSERT(!m_pendingCursor);
@@ -168,7 +167,7 @@ void IDBRequest::setCursorDetails(IndexedDB::CursorType cursorType, WebIDBCursor
     m_cursorDirection = direction;
 }
 
-void IDBRequest::setPendingCursor(PassRefPtrWillBeRawPtr<IDBCursor> cursor)
+void IDBRequest::setPendingCursor(IDBCursor* cursor)
 {
     ASSERT(m_readyState == DONE);
     ASSERT(executionContext());
@@ -178,7 +177,7 @@ void IDBRequest::setPendingCursor(PassRefPtrWillBeRawPtr<IDBCursor> cursor)
 
     m_hasPendingActivity = true;
     m_pendingCursor = cursor;
-    setResult(PassRefPtrWillBeRawPtr<IDBAny>(nullptr));
+    setResult(0);
     m_readyState = PENDING;
     m_error.clear();
     m_transaction->registerRequest(this);
@@ -195,7 +194,7 @@ IDBCursor* IDBRequest::getResultCursor() const
     return 0;
 }
 
-void IDBRequest::setResultCursor(PassRefPtrWillBeRawPtr<IDBCursor> cursor, PassRefPtrWillBeRawPtr<IDBKey> key, PassRefPtrWillBeRawPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
+void IDBRequest::setResultCursor(IDBCursor* cursor, IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
 {
     ASSERT(m_readyState == PENDING);
     m_cursorKey = key;
@@ -207,22 +206,6 @@ void IDBRequest::setResultCursor(PassRefPtrWillBeRawPtr<IDBCursor> cursor, PassR
     onSuccessInternal(IDBAny::create(cursor));
 }
 
-#if !ENABLE(OILPAN)
-void IDBRequest::checkForReferenceCycle()
-{
-    // If this request and its cursor have the only references
-    // to each other, then explicitly break the cycle.
-    IDBCursor* cursor = getResultCursor();
-    if (!cursor || cursor->request() != this)
-        return;
-
-    if (!hasOneRef() || !cursor->hasOneRef())
-        return;
-
-    m_result.clear();
-}
-#endif
-
 void IDBRequest::handleBlobAcks()
 {
     if (m_blobInfo.get() && m_blobInfo->size()) {
@@ -250,6 +233,7 @@ void IDBRequest::onError(PassRefPtrWillBeRawPtr<DOMError> error)
         return;
 
     m_error = error;
+    setResult(IDBAny::createUndefined());
     m_pendingCursor.clear();
     enqueueEvent(Event::createCancelableBubble(EventTypeNames::error));
 }
@@ -266,14 +250,14 @@ void IDBRequest::onSuccess(const Vector<String>& stringList)
     onSuccessInternal(IDBAny::create(domStringList.release()));
 }
 
-void IDBRequest::onSuccess(PassOwnPtr<blink::WebIDBCursor> backend, PassRefPtrWillBeRawPtr<IDBKey> key, PassRefPtrWillBeRawPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
+void IDBRequest::onSuccess(PassOwnPtr<WebIDBCursor> backend, IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
 {
     IDB_TRACE("IDBRequest::onSuccess(IDBCursor)");
     if (!shouldEnqueueEvent())
         return;
 
     ASSERT(!m_pendingCursor);
-    RefPtrWillBeRawPtr<IDBCursor> cursor = nullptr;
+    IDBCursor* cursor = 0;
     switch (m_cursorType) {
     case IndexedDB::CursorKeyOnly:
         cursor = IDBCursor::create(backend, m_cursorDirection, this, m_source.get(), m_transaction.get());
@@ -287,7 +271,7 @@ void IDBRequest::onSuccess(PassOwnPtr<blink::WebIDBCursor> backend, PassRefPtrWi
     setResultCursor(cursor, key, primaryKey, value, blobInfo);
 }
 
-void IDBRequest::onSuccess(PassRefPtrWillBeRawPtr<IDBKey> idbKey)
+void IDBRequest::onSuccess(IDBKey* idbKey)
 {
     IDB_TRACE("IDBRequest::onSuccess(IDBKey)");
     if (!shouldEnqueueEvent())
@@ -299,7 +283,7 @@ void IDBRequest::onSuccess(PassRefPtrWillBeRawPtr<IDBKey> idbKey)
         onSuccessInternal(IDBAny::createUndefined());
 }
 
-void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> valueBuffer, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
+void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> valueBuffer, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
 {
     IDB_TRACE("IDBRequest::onSuccess(SharedBuffer)");
     if (!shouldEnqueueEvent())
@@ -318,8 +302,8 @@ void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> valueBuffer, PassOwnPtr<Vect
     onSuccessInternal(IDBAny::create(valueBuffer, m_blobInfo.get()));
 }
 
-#ifndef NDEBUG
-static PassRefPtrWillBeRawPtr<IDBObjectStore> effectiveObjectStore(PassRefPtrWillBeRawPtr<IDBAny> source)
+#if ENABLE(ASSERT)
+static IDBObjectStore* effectiveObjectStore(IDBAny* source)
 {
     if (source->type() == IDBAny::IDBObjectStoreType)
         return source->idbObjectStore();
@@ -327,26 +311,24 @@ static PassRefPtrWillBeRawPtr<IDBObjectStore> effectiveObjectStore(PassRefPtrWil
         return source->idbIndex()->objectStore();
 
     ASSERT_NOT_REACHED();
-    return nullptr;
+    return 0;
 }
 #endif
 
-void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> prpValueBuffer, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo, PassRefPtrWillBeRawPtr<IDBKey> prpPrimaryKey, const IDBKeyPath& keyPath)
+void IDBRequest::onSuccess(PassRefPtr<SharedBuffer> prpValueBuffer, PassOwnPtr<Vector<WebBlobInfo> > blobInfo, IDBKey* prpPrimaryKey, const IDBKeyPath& keyPath)
 {
     IDB_TRACE("IDBRequest::onSuccess(SharedBuffer, IDBKey, IDBKeyPath)");
     if (!shouldEnqueueEvent())
         return;
 
-#ifndef NDEBUG
     ASSERT(keyPath == effectiveObjectStore(m_source)->metadata().keyPath);
-#endif
 
     RefPtr<SharedBuffer> valueBuffer = prpValueBuffer;
-    RefPtrWillBeRawPtr<IDBKey> primaryKey = prpPrimaryKey;
+    IDBKey* primaryKey = prpPrimaryKey;
     ASSERT(!m_blobInfo.get());
     m_blobInfo = blobInfo;
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     assertPrimaryKeyValidOrInjectable(m_scriptState.get(), valueBuffer, m_blobInfo.get(), primaryKey, keyPath);
 #endif
 
@@ -369,7 +351,7 @@ void IDBRequest::onSuccess()
     onSuccessInternal(IDBAny::createUndefined());
 }
 
-void IDBRequest::onSuccessInternal(PassRefPtrWillBeRawPtr<IDBAny> result)
+void IDBRequest::onSuccessInternal(IDBAny* result)
 {
     ASSERT(!m_contextStopped);
     ASSERT(!m_pendingCursor);
@@ -377,13 +359,13 @@ void IDBRequest::onSuccessInternal(PassRefPtrWillBeRawPtr<IDBAny> result)
     enqueueEvent(Event::create(EventTypeNames::success));
 }
 
-void IDBRequest::setResult(PassRefPtrWillBeRawPtr<IDBAny> result)
+void IDBRequest::setResult(IDBAny* result)
 {
     m_result = result;
     m_resultDirty = true;
 }
 
-void IDBRequest::onSuccess(PassRefPtrWillBeRawPtr<IDBKey> key, PassRefPtrWillBeRawPtr<IDBKey> primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<blink::WebBlobInfo> > blobInfo)
+void IDBRequest::onSuccess(IDBKey* key, IDBKey* primaryKey, PassRefPtr<SharedBuffer> value, PassOwnPtr<Vector<WebBlobInfo> > blobInfo)
 {
     IDB_TRACE("IDBRequest::onSuccess(key, primaryKey, value)");
     if (!shouldEnqueueEvent())
@@ -408,8 +390,6 @@ void IDBRequest::stop()
 
     m_contextStopped = true;
 
-    RefPtrWillBeRawPtr<IDBRequest> protect(this);
-
     if (m_readyState == PENDING) {
         m_readyState = EarlyDeath;
         if (m_transaction) {
@@ -453,7 +433,7 @@ bool IDBRequest::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
         m_readyState = DONE;
     dequeueEvent(event.get());
 
-    Vector<RefPtr<EventTarget> > targets;
+    WillBeHeapVector<RefPtrWillBeMember<EventTarget> > targets;
     targets.append(this);
     if (m_transaction && !m_preventPropagation) {
         targets.append(m_transaction);
@@ -465,7 +445,7 @@ bool IDBRequest::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
     }
 
     // Cursor properties should not be updated until the success event is being dispatched.
-    RefPtrWillBeRawPtr<IDBCursor> cursorToNotify = nullptr;
+    IDBCursor* cursorToNotify = 0;
     if (event->type() == EventTypeNames::success) {
         cursorToNotify = getResultCursor();
         if (cursorToNotify)
@@ -563,4 +543,4 @@ void IDBRequest::dequeueEvent(Event* event)
     }
 }
 
-} // namespace WebCore
+} // namespace blink