IndexedDB: Simplify WebIDBCallbacks exports, strip IDBFactoryBackend

Source/web/IDBFactoryBackendProxy.cpp

 /*
  * Copyright (C) 2011 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 11 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "IDBFactoryBackendProxy.h"
 
-#include "public/platform/WebIDBCallbacks.h"
-#include "public/platform/WebIDBDatabase.h"
-#include "public/platform/WebIDBDatabaseCallbacks.h"
-#include "public/platform/WebIDBDatabaseError.h"
-#include "public/platform/WebIDBFactory.h"
-#include "public/platform/WebVector.h"
 #include "WebFrameImpl.h"
 #include "WebKit.h"
 #include "WebPermissionClient.h"
 #include "WebSecurityOrigin.h"
 #include "WebViewImpl.h"
 #include "WorkerPermissionClient.h"
 #include "bindings/v8/WorkerScriptController.h"
-#include "core/dom/DOMError.h"
-#include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 
 using namespace WebCore;
 
 namespace blink {
 
 PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendProxy::create()
 {
     return adoptRef(new IDBFactoryBackendProxy());
 }
 
-IDBFactoryBackendProxy::IDBFactoryBackendProxy()
-{
-    m_webIDBFactory = blink::Platform::current()->idbFactory();
-}
-
-IDBFactoryBackendProxy::~IDBFactoryBackendProxy()
-{
-}
-
-bool IDBFactoryBackendProxy::allowIndexedDB(ExecutionContext* context, const String& name, const WebSecurityOrigin& origin, PassRefPtr<IDBRequest> callbacks)
+bool IDBFactoryBackendProxy::allowIndexedDB(ExecutionContext* context, const String& name)
 {
     bool allowed;

[adamk, 2013/11/25 21:56:44]

You could get rid of this bool now that you check it in the caller instead...

[jsbell, 2013/11/26 00:42:53]

Done.

     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerGlobalScope());
+    WebSecurityOrigin origin(context->securityOrigin());
     if (context->isDocument()) {
         Document* document = toDocument(context);
         WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
         WebViewImpl* webView = webFrame->viewImpl();
         // FIXME: webView->permissionClient() returns 0 in test_shell and content_shell http://crbug.com/137269
         allowed = !webView->permissionClient() || webView->permissionClient()->allowIndexedDB(webFrame, name, origin);

[adamk, 2013/11/25 21:56:44]

..and then return this directly...

[jsbell, 2013/11/26 00:42:53]

Done.

     } else {

[adamk, 2013/11/25 21:56:44]

...get rid of the else...

[jsbell, 2013/11/26 00:42:53]

Done.

         WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
         allowed = WorkerPermissionClient::from(workerGlobalScope)->allowIndexedDB(name);

[adamk, 2013/11/25 21:56:44]

and return this too.

[jsbell, 2013/11/26 00:42:53]

Done.

     }
 
-    if (!allowed)
-        callbacks->onError(WebIDBDatabaseError(UnknownError, "The user denied permission to access the database."));
-
     return allowed;
 }
 
-void IDBFactoryBackendProxy::getDatabaseNames(PassRefPtr<IDBRequest> prpCallbacks, const String& databaseIdentifier, ExecutionContext* context)
-{
-    RefPtr<IDBRequest> callbacks(prpCallbacks);
-    WebSecurityOrigin origin(context->securityOrigin());
-    if (!allowIndexedDB(context, "Database Listing", origin, callbacks))
-        return;
-
-    m_webIDBFactory->getDatabaseNames(new WebIDBCallbacks(callbacks), databaseIdentifier);
-}
-
-void IDBFactoryBackendProxy::open(const String& name, int64_t version, int64_t transactionId, PassRefPtr<IDBRequest> prpCallbacks,  PassOwnPtr<WebIDBDatabaseCallbacks> databaseCallbacks, const String& databaseIdentifier, ExecutionContext* context)
-{
-    RefPtr<IDBRequest> callbacks(prpCallbacks);
-    WebSecurityOrigin origin(context->securityOrigin());
-    if (!allowIndexedDB(context, name, origin, callbacks))
-        return;
-
-    m_webIDBFactory->open(name, version, transactionId, new WebIDBCallbacks(callbacks), databaseCallbacks.leakPtr(), databaseIdentifier);
-}
-
-void IDBFactoryBackendProxy::deleteDatabase(const String& name, PassRefPtr<IDBRequest> prpCallbacks, const String& databaseIdentifier, ExecutionContext* context)
-{
-    RefPtr<IDBRequest> callbacks(prpCallbacks);
-    WebSecurityOrigin origin(context->securityOrigin());
-    if (!allowIndexedDB(context, name, origin, callbacks))
-        return;
-
-    m_webIDBFactory->deleteDatabase(name, new WebIDBCallbacks(callbacks), databaseIdentifier);
-}
-
 } // namespace blink