Title: [122622] trunk/Source/WebKit/chromium
- Revision
- 122622
- Author
- [email protected]
- Date
- 2012-07-13 12:54:37 -0700 (Fri, 13 Jul 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (122621 => 122622)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-13 19:48:40 UTC (rev 122621)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-13 19:54:37 UTC (rev 122622)
@@ -1,3 +1,31 @@
+2012-07-13 David Grogan <[email protected]>
+
+ 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 <[email protected]>
enable TestWebKitAPI/webkit_unit_tests apk on x86 android platform by adding abi support
Modified: trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (122621 => 122622)
--- trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2012-07-13 19:48:40 UTC (rev 122621)
+++ trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2012-07-13 19:54:37 UTC (rev 122622)
@@ -156,7 +156,8 @@
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());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
