summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/public/WebDatabase.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-06-28 16:42:48 +0100
committerKristian Monsen <kristianm@google.com>2010-07-02 10:29:56 +0100
commit06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch)
tree20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKit/chromium/public/WebDatabase.h
parent72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff)
downloadexternal_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip
external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz
external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKit/chromium/public/WebDatabase.h')
-rw-r--r--WebKit/chromium/public/WebDatabase.h8
1 files changed, 4 insertions, 4 deletions
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: