Changeset 85966 in webkit

Timestamp:

May 6, 2011 12:09:31 PM (13 years ago)

Author:

jam@chromium.org

Message:

2011-05-06 John Abd-El-Malek <​jam@chromium.org>

Reviewed by James Robinson.

[chromium]: Reland using WebPermissionClient for checking indexed db usage
​https://bugs.webkit.org/show_bug.cgi?id=60386

• public/WebPermissionClient.h: (WebKit::WebPermissionClient::allowIndexedDB):
• src/IDBFactoryBackendProxy.cpp: (WebKit::IDBFactoryBackendProxy::open):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebPermissionClient.h (modified) (2 diffs)
• src/IDBFactoryBackendProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-06  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium]: Reland using WebPermissionClient for checking indexed db usage
+        https://bugs.webkit.org/show_bug.cgi?id=60386
+
+        * public/WebPermissionClient.h:
+        (WebKit::WebPermissionClient::allowIndexedDB):
+        * src/IDBFactoryBackendProxy.cpp:
+        (WebKit::IDBFactoryBackendProxy::open):
+
 2011-05-06  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/public/WebPermissionClient.h

@@ -35 +35 @@
 
 class WebFrame;
+class WebSecurityOrigin;
 class WebString;
 
@@ -44 +45 @@
     // Controls whether images are allowed for this frame.
     virtual bool allowImages(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; }
+
+    // Controls whether access to Indexed DB are allowed for this frame.
+    virtual bool allowIndexedDB(WebFrame*, const WebString& name, const WebSecurityOrigin&) { return true; }
 
     // Controls whether plugins are allowed for this frame.

trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp

@@ -43 +43 @@
 #include "WebKit.h"
 #include "WebKitClient.h"
+#include "WebPermissionClient.h"
 #include "WebVector.h"
+#include "WebViewImpl.h"
 
 using namespace WebCore;
@@ -63 +65 @@
 }
 
-void IDBFactoryBackendProxy::open(const String& name, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin> origin, Frame* frame, const String& dataDir, int64_t maximumSize, BackingStoreType backingStoreType)
+void IDBFactoryBackendProxy::open(const String& name, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin> prpOrigin, Frame* frame, const String& dataDir, int64_t maximumSize, BackingStoreType backingStoreType)
 {
-    WebFrame* webFrame = WebFrameImpl::fromFrame(frame);
+    WebSecurityOrigin origin(prpOrigin);
+    WebFrameImpl* webFrame = WebFrameImpl::fromFrame(frame);
+    WebViewImpl* webView = webFrame->viewImpl();
+    if (webView->permissionClient() && !webView->permissionClient()->allowIndexedDB(webFrame, name, origin)) {
+        callbacks->onError(WebIDBDatabaseError(0, "The user denied permission to access the database."));
+        return;
+    }
+
     m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir, maximumSize, static_cast<WebIDBFactory::BackingStoreType>(backingStoreType));
 }