From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebKit/chromium/public/WebDatabase.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/WebKit/chromium/public/WebDatabase.h b/WebKit/chromium/public/WebDatabase.h
index 108201d..4679f68 100644
--- a/WebKit/chromium/public/WebDatabase.h
+++ b/WebKit/chromium/public/WebDatabase.h
@@ -35,7 +35,7 @@
 #include "WebSecurityOrigin.h"
 
 #if WEBKIT_IMPLEMENTATION
-namespace WebCore { class Database; }
+namespace WebCore { class AbstractDatabase; }
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
@@ -76,9 +76,9 @@ public:
         const WebString& originIdentifier, const WebString& databaseName);
 
 #if WEBKIT_IMPLEMENTATION
-    WebDatabase(const WTF::PassRefPtr<WebCore::Database>&);
-    WebDatabase& operator=(const WTF::PassRefPtr<WebCore::Database>&);
-    operator WTF::PassRefPtr<WebCore::Database>() const;
+    WebDatabase(const WTF::PassRefPtr<WebCore::AbstractDatabase>&);
+    WebDatabase& operator=(const WTF::PassRefPtr<WebCore::AbstractDatabase>&);
+    operator WTF::PassRefPtr<WebCore::AbstractDatabase>() const;
 #endif
 
 private:
-- 
cgit v1.1