From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebKit/chromium/public/WebCommonWorkerClient.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'WebKit/chromium/public/WebCommonWorkerClient.h')

diff --git a/WebKit/chromium/public/WebCommonWorkerClient.h b/WebKit/chromium/public/WebCommonWorkerClient.h
index 13603cb..cea6471 100644
--- a/WebKit/chromium/public/WebCommonWorkerClient.h
+++ b/WebKit/chromium/public/WebCommonWorkerClient.h
@@ -35,6 +35,7 @@ namespace WebKit {
 
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
+class WebFrame;
 class WebNotificationPresenter;
 class WebString;
 class WebWorker;
@@ -79,6 +80,9 @@ public:
     // Called on the main webkit thread in the worker process during initialization.
     virtual WebApplicationCacheHost* createApplicationCacheHost(WebApplicationCacheHostClient*) = 0;
 
+    // Called on the main webkit thread before opening a web database.
+    virtual bool allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize) = 0;
+
 protected:
     ~WebCommonWorkerClient() { }
 };
-- 
cgit v1.1