Reland 43183. Block database access on allowDatabase instead of databaseOpenFile. BUG=36435 TEST=Set cookie settings to ASK and open a page with web databases. Review URL: http://codereview.chromium.org/1338001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43185 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 19 insertions, 0 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 81636c7..c40ef64 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -313,6 +313,7 @@ bool RenderThread::Send(IPC::Message* msg) {
         case ViewHostMsg_GetRawCookies::ID:
         case ViewHostMsg_DOMStorageSetItem::ID:
         case ViewHostMsg_SyncLoad::ID:
+        case ViewHostMsg_AllowDatabase::ID:
           may_show_cookie_prompt = true;
           pumping_events = true;
           break;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d8506c3..6c8b8a2 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2936,6 +2936,21 @@ bool RenderView::allowScript(WebFrame* frame, bool enabled_per_settings) {
   return false;  // Other protocols fall through here.
 }
 
+bool RenderView::allowDatabase(
+    WebFrame* frame, const WebString& name, const WebString& display_name,
+    unsigned long estimated_size) {
+  WebSecurityOrigin origin = frame->securityOrigin();
+  if (origin.isEmpty())
+    return false;  // Uninitialized document?
+
+  bool result;
+  if (!Send(new ViewHostMsg_AllowDatabase(routing_id_,
+      origin.toString().utf8(), name, display_name, estimated_size, &result)))
+    return false;
+  if (!result)
+    DidBlockContentType(CONTENT_SETTINGS_TYPE_COOKIES);
+  return result;
+}
 void RenderView::didNotAllowScript(WebKit::WebFrame* frame) {
   DidBlockContentType(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 }
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 370b92d..b057a9a 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -375,6 +375,9 @@ class RenderView : public RenderWidget,
   virtual void didRunInsecureContent(
       WebKit::WebFrame* frame, const WebKit::WebSecurityOrigin& origin);
   virtual bool allowScript(WebKit::WebFrame* frame, bool enabled_per_settings);
+  virtual bool allowDatabase(
+      WebKit::WebFrame* frame, const WebKit::WebString& name,
+      const WebKit::WebString& display_name, unsigned long estimated_size);
   virtual void didNotAllowScript(WebKit::WebFrame* frame);
   virtual void didNotAllowPlugins(WebKit::WebFrame* frame);
   virtual void didExhaustMemoryAvailableForScript(WebKit::WebFrame* frame);