Merge webkit.org at r54127 : Fix conflicts due to V8 feature runtime enabler flags

These have been modified to default to true on Android.
We also set the new flags to default to true.

Note that the enabler flag for database has changed.
See http://trac.webkit.org/changeset/53595

Change-Id: I2832c4bcb316f481a33a8c00e7fe90dffa8dcdcf

diff --git a/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp b/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
index e542f53..b712999 100644 (file)
--- a/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
@@ -33,25 +33,14 @@
 
 namespace WebCore {
 
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-// This should default to true, to match the behavior with JSC
-bool RuntimeEnabledFeatures::isDatabaseEnabled = true;
-#endif
 bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
 bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
+bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
 #if PLATFORM(ANDROID)
 // These should default to true, to match the behavior with JSC
-bool RuntimeEnabledFeatures::isNotificationsEnabled = true;
 bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true;
+bool RuntimeEnabledFeatures::isGeolocationEnabled = true;
 #endif
-=======
-bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
-bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
-bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
-bool RuntimeEnabledFeatures::isApplicationCacheEnabled = false;
-bool RuntimeEnabledFeatures::isGeolocationEnabled = false;
 bool RuntimeEnabledFeatures::isIndexedDatabaseEnabled = false;
->>>>>>> webkit.org at r54127
 
 } // namespace WebCore

diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index 648492f..bbdce87 100644 (file)
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -73,7 +73,10 @@ const String& Database::databaseInfoTableName()
 
 #if ENABLE(DATABASE)
 
-static bool isDatabaseAvailable = false;
+#if PLATFORM(ANDROID)
+// This should default to true, to match the behavior with JSC
+static bool isDatabaseAvailable = true;
+#endif
 
 void Database::setIsAvailable(bool available)
 {