IndexedDB: Re-enable indexeddb in test_shell

davidsgrogan · davidsgrogan · commit a8ccec457cea · 2012-07-13T19:54:37.000Z
https://bugs.webkit.org/show_bug.cgi?id=91161 Reviewed by Tony Chang. IDB used to be allowed to run if webView->permissionClient() was NULL, as is the case in test_shell. This was inadvertently changed in http://wkb.ug/90310. We still don't have an automated test for this (http://crbug.com/113738) Tested manually: * In test_shell: 1) Open an IDB page 2) Verify IDB has permission to open a DB * In chrome: 1) Open an IDB page 2) Verify IDB has permission to open a DB 3) Revoke IDB permissions in chrome://chrome/settings/content 4) Reload the IDB page 5) Verify IDB doesn't have permission to open a DB * src/IDBFactoryBackendProxy.cpp: (WebKit::IDBFactoryBackendProxy::allowIndexedDB): Canonical link: https://commits.webkit.org/109094@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122622 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,31 @@
+2012-07-13  David Grogan  <dgrogan@chromium.org>
+
+        IndexedDB: Re-enable indexeddb in test_shell
+        https://bugs.webkit.org/show_bug.cgi?id=91161
+
+        Reviewed by Tony Chang.
+
+        IDB used to be allowed to run if webView->permissionClient() was NULL,
+        as is the case in test_shell. This was inadvertently changed in
+        http://wkb.ug/90310.
+
+        We still don't have an automated test for this (http://crbug.com/113738)
+        Tested manually:
+
+        * In test_shell:
+        1) Open an IDB page
+        2) Verify IDB has permission to open a DB
+
+        * In chrome:
+        1) Open an IDB page
+        2) Verify IDB has permission to open a DB
+        3) Revoke IDB permissions in chrome://chrome/settings/content
+        4) Reload the IDB page
+        5) Verify IDB doesn't have permission to open a DB
+
+        * src/IDBFactoryBackendProxy.cpp:
+        (WebKit::IDBFactoryBackendProxy::allowIndexedDB):
+
 2012-07-13  Wei James  <james.wei@intel.com>
 
         enable TestWebKitAPI/webkit_unit_tests apk on x86 android platform by adding abi support
diff --git a/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp b/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
@@ -156,7 +156,8 @@ bool IDBFactoryBackendProxy::allowIndexedDB(ScriptExecutionContext* context, con
         Document* document = static_cast<Document*>(context);
         WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
         WebViewImpl* webView = webFrame->viewImpl();
-        allowed = webView->permissionClient() && webView->permissionClient()->allowIndexedDB(webFrame, name, origin);
+        // FIXME: webView->permissionClient() returns 0 in test_shell and content_shell http://crbug.com/137269
+        allowed = !webView->permissionClient() || webView->permissionClient()->allowIndexedDB(webFrame, name, origin);
     } else {
         WorkerContext* workerContext = static_cast<WorkerContext*>(context);
         WebWorkerBase* webWorkerBase = static_cast<WebWorkerBase*>(&workerContext->thread()->workerLoaderProxy());
