diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/bindings/generic | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_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 'WebCore/bindings/generic')
| -rw-r--r-- | WebCore/bindings/generic/RuntimeEnabledFeatures.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp index a3e488e..93ce1ee 100644 --- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp +++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp @@ -31,8 +31,7 @@ #include "config.h" #include "RuntimeEnabledFeatures.h" -#include "Database.h" -#include "DatabaseSync.h" +#include "AbstractDatabase.h" #include "MediaPlayer.h" #include "SharedWorkerRepository.h" #include "WebSocket.h" @@ -95,12 +94,12 @@ bool RuntimeEnabledFeatures::webSocketEnabled() #if ENABLE(DATABASE) bool RuntimeEnabledFeatures::openDatabaseEnabled() { - return Database::isAvailable(); + return AbstractDatabase::isAvailable(); } bool RuntimeEnabledFeatures::openDatabaseSyncEnabled() { - return DatabaseSync::isAvailable(); + return AbstractDatabase::isAvailable(); } #endif |