diff options
| author | Steve Block <steveblock@google.com> | 2010-04-29 17:06:33 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:14 +0100 |
| commit | 9144b4c4f25c0975b7c850720fb60adff1812d05 (patch) | |
| tree | 500a2f9e1e1cb0fe72dfd9efc6a16b2bc59f02aa /WebKit/android/jni/WebSettings.cpp | |
| parent | 1a0295103dca085437f7f17d26f2037e54c51cb5 (diff) | |
| download | external_webkit-9144b4c4f25c0975b7c850720fb60adff1812d05.zip external_webkit-9144b4c4f25c0975b7c850720fb60adff1812d05.tar.gz external_webkit-9144b4c4f25c0975b7c850720fb60adff1812d05.tar.bz2 | |
Merge webkit.org at r58033 : Settings::setDatabasesEnabled() has been removed
We should use Database::setIsAvailable() instead.
See http://trac.webkit.org/changeset/55666,
http://trac.webkit.org/changeset/55667 and
http://trac.webkit.org/changeset/55809
Change-Id: Iead4dac03f791d2bde8e7ee20e452b2100ed1e4f
Diffstat (limited to 'WebKit/android/jni/WebSettings.cpp')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 702e3f4..775eecf 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -30,6 +30,7 @@ #include "ApplicationCacheStorage.h" #include "DatabaseTracker.h" +#include "Database.h" #include "DocLoader.h" #include "Document.h" #include "Frame.h" @@ -354,7 +355,7 @@ public: s->setShrinksStandaloneImagesToFit(flag); #if ENABLE(DATABASE) flag = env->GetBooleanField(obj, gFieldIds->mDatabaseEnabled); - s->setDatabasesEnabled(flag); + WebCore::Database::setIsAvailable(flag); flag = env->GetBooleanField(obj, gFieldIds->mDatabasePathHasBeenSet); if (flag) { |