diff options
| author | Andrei Popescu <andreip@google.com> | 2009-10-27 11:58:04 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-10-27 12:00:12 +0000 |
| commit | 676eb2d5d0c295e70f01861f3fbba3b0e1d5a3ce (patch) | |
| tree | fc66cf33819cc81f9823171c12042dd760e642d5 /WebKit/android | |
| parent | 064849d86c5d90bf7459b0e8bd781de92141499c (diff) | |
| download | external_webkit-676eb2d5d0c295e70f01861f3fbba3b0e1d5a3ce.zip external_webkit-676eb2d5d0c295e70f01861f3fbba3b0e1d5a3ce.tar.gz external_webkit-676eb2d5d0c295e70f01861f3fbba3b0e1d5a3ce.tar.bz2 | |
Avoid calling setDatabaseDirectoryPath() when the path is already set.
http://b/issue?id=2215217
Diffstat (limited to 'WebKit/android')
| -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); |