diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-27 08:04:50 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-27 08:04:50 -0400 |
| commit | d7a32d06b4a2872680edc40f01ecce12e3b61b4a (patch) | |
| tree | 532144e69e6a7ab88675f14cf35b9f22f29bab61 | |
| parent | 1e13e466217c7ffb96f5cde0ad0ab8606c0c2481 (diff) | |
| parent | 676eb2d5d0c295e70f01861f3fbba3b0e1d5a3ce (diff) | |
| download | external_webkit-d7a32d06b4a2872680edc40f01ecce12e3b61b4a.zip external_webkit-d7a32d06b4a2872680edc40f01ecce12e3b61b4a.tar.gz external_webkit-d7a32d06b4a2872680edc40f01ecce12e3b61b4a.tar.bz2 | |
Merge change I676eb2d5 into eclair-mr2
* changes:
Avoid calling setDatabaseDirectoryPath() when the path is already set.
| -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 4240dd5..e5532c3 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -342,7 +342,8 @@ public: flag = env->GetBooleanField(obj, gFieldIds->mDatabaseEnabled); s->setDatabasesEnabled(flag); str = (jstring)env->GetObjectField(obj, gFieldIds->mDatabasePath); - WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(to_string(env, str)); + if (str && WebCore::DatabaseTracker::tracker().databaseDirectoryPath().isNull()) + WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(to_string(env, str)); #endif #if ENABLE(DOM_STORAGE) flag = env->GetBooleanField(obj, gFieldIds->mDomStorageEnabled); |