OSDN Git Service

Merge webkit.org at r54127 : Fix conflicts due to V8 feature runtime enabler flags
authorSteve Block <steveblock@google.com>
Wed, 3 Feb 2010 19:30:45 +0000 (19:30 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 21:31:25 +0000 (21:31 +0000)
commit8e01d563a1fb60c26584e9a59bda08670cf86e91
tree9e28017dadc3ee561bd04f617edbc6de2a9b256e
parentd6bf7f1ee68ff0a6c4ce9cbfdd9ccade0d75615c
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
WebCore/bindings/v8/RuntimeEnabledFeatures.cpp
WebCore/storage/Database.cpp