IndexedDB: Simplify WebIDBCallbacks exports, strip IDBFactoryBackend

Source/modules/indexeddb/IDBCursor.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 21 matching lines @@
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "modules/indexeddb/IDBAny.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBKey.h"
 #include "modules/indexeddb/IDBObjectStore.h"
 #include "modules/indexeddb/IDBRequest.h"
 #include "modules/indexeddb/IDBTracing.h"
 #include "modules/indexeddb/IDBTransaction.h"
+#include "modules/indexeddb/WebIDBCallbacksImpl.h"
 #include "platform/SharedBuffer.h"
 #include "platform/SharedBuffer.h"
-#include "public/platform/WebIDBCallbacks.h"
 #include "public/platform/WebIDBCursor.h"
 #include "public/platform/WebIDBDatabase.h"
 #include "public/platform/WebIDBKeyRange.h"
 #include <limits>
 
 using blink::WebIDBDatabase;
 
 namespace WebCore {
 
 PassRefPtr<IDBCursor> IDBCursor::create(PassOwnPtr<blink::WebIDBCursor> backend, IndexedDB::CursorDirection direction, IDBRequest* request, IDBAny* source, IDBTransaction* transaction)
@@ skipping 112 matching lines @@
         return;
     }
 
     if (!count) {
         exceptionState.throwUninformativeAndGenericTypeError();
         return;
     }
 
     m_request->setPendingCursor(this);
     m_gotValue = false;
-    m_backend->advance(count, new blink::WebIDBCallbacks(m_request));
+    m_backend->advance(count, WebIDBCallbacksImpl::create(m_request).leakPtr());
 }
 
 void IDBCursor::continueFunction(ExecutionContext* context, const ScriptValue& keyValue, ExceptionState& exceptionState)
 {
     DOMRequestState requestState(context);
     RefPtr<IDBKey> key = keyValue.isUndefined() ? 0 : scriptValueToIDBKey(&requestState, keyValue);
     continueFunction(key.release(), exceptionState);
 }
 
 void IDBCursor::continueFunction(PassRefPtr<IDBKey> key, ExceptionState& exceptionState)
@@ skipping 35 matching lines @@
                 exceptionState.throwDOMException(DataError, ExceptionMessages::failedToExecute("continue", "IDBCursor", "The parameter is greater than or equal to this cursor's position."));
                 return;
             }
         }
     }
 
     // FIXME: We're not using the context from when continue was called, which means the callback
     //        will be on the original context openCursor was called on. Is this right?
     m_request->setPendingCursor(this);
     m_gotValue = false;
-    m_backend->continueFunction(key, new blink::WebIDBCallbacks(m_request));
+    m_backend->continueFunction(key, WebIDBCallbacksImpl::create(m_request).leakPtr());

[alecflett, 2013/11/22 18:19:05]

ah now I see what you mean in the other patch about leakPtr :)

 }
 
 PassRefPtr<IDBRequest> IDBCursor::deleteFunction(ExecutionContext* context, ExceptionState& exceptionState)
 {
     IDB_TRACE("IDBCursor::delete");
     if (m_transaction->isFinished()) {
         exceptionState.throwDOMException(TransactionInactiveError, ExceptionMessages::failedToExecute("delete", "IDBCursor", IDBDatabase::transactionFinishedErrorMessage));
         return 0;
     }
     if (!m_transaction->isActive()) {
@@ skipping 15 matching lines @@
     }
     if (isDeleted()) {
         exceptionState.throwDOMException(InvalidStateError, ExceptionMessages::failedToExecute("delete", "IDBCursor", IDBDatabase::sourceDeletedErrorMessage));
         return 0;
     }
 
     RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(m_primaryKey, exceptionState);
     ASSERT(!exceptionState.hadException());
 
     RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), m_transaction.get());
-    m_transaction->backendDB()->deleteRange(m_transaction->id(), effectiveObjectStore()->id(), keyRange.release(), new blink::WebIDBCallbacks(request));
+    m_transaction->backendDB()->deleteRange(m_transaction->id(), effectiveObjectStore()->id(), keyRange.release(), WebIDBCallbacksImpl::create(request).leakPtr());
     return request.release();
 }
 
 void IDBCursor::postSuccessHandlerCallback()
 {
     if (m_backend)
         m_backend->postSuccessHandlerCallback();
 }
 
 void IDBCursor::close()
@@ skipping 113 matching lines @@
     case IndexedDB::CursorPrevNoDuplicate:
         return IDBCursor::directionPrevUnique();
 
     default:
         ASSERT_NOT_REACHED();
         return IDBCursor::directionNext();
     }
 }
 
 } // namespace WebCore