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/WebIndexedDatabase.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/WebKit/chromium/public/WebIndexedDatabase.h b/WebKit/chromium/public/WebIndexedDatabase.h
index bb75170..8861456 100644
--- a/WebKit/chromium/public/WebIndexedDatabase.h
+++ b/WebKit/chromium/public/WebIndexedDatabase.h
@@ -47,7 +47,8 @@ public:
 
     virtual ~WebIndexedDatabase() { }
 
-    virtual void open(const WebString& name, const WebString& description, bool modifyDatabase, WebIDBCallbacks<WebIDBDatabase>*, WebFrame*, int& exceptionCode) = 0;
+    // The WebKit implementation of open ignores the WebFrame* parameter.
+    virtual void open(const WebString& name, const WebString& description, bool modifyDatabase, WebIDBCallbacks*, const WebString& origin, WebFrame*, int& exceptionCode) = 0;
 };
 
 } // namespace WebKit
-- 
cgit v1.1