Diff
Modified: trunk/Source/WebCore/ChangeLog (133641 => 133642)
--- trunk/Source/WebCore/ChangeLog 2012-11-06 19:03:31 UTC (rev 133641)
+++ trunk/Source/WebCore/ChangeLog 2012-11-06 19:04:26 UTC (rev 133642)
@@ -1,3 +1,15 @@
+2012-11-06 Peter Beverloo <[email protected]>
+
+ [Chromium] Enable the _javascript_ i18n API for Android
+ https://bugs.webkit.org/show_bug.cgi?id=101357
+
+ Reviewed by Adam Barth.
+
+ Remove the conditional dependency on the v8-i18n API. The library is now
+ always available in a Chromium for Android checkout.
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-11-06 Adam Barth <[email protected]>
ScriptWrappable should work for more than just Node
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (133641 => 133642)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-11-06 19:03:31 UTC (rev 133641)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-11-06 19:04:26 UTC (rev 133642)
@@ -2033,6 +2033,7 @@
'WEBKIT_IMPLEMENTATION=1',
],
'dependencies': [
+ '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
'webcore_prerequisites',
],
# This is needed for mac because of webkit_system_interface. It'd be nice
@@ -2130,11 +2131,6 @@
'-fno-strict-aliasing',
],
}, { # OS!="android"
- 'dependencies': [
- # Android doesn't have this third party repository, so can't
- # include it. It's not used by Android in any case.
- '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
- ],
'sources/': [['exclude', 'Android\\.cpp$']]
}],
['OS!="mac"', {
Modified: trunk/Source/WebKit/chromium/ChangeLog (133641 => 133642)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-06 19:03:31 UTC (rev 133641)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-06 19:04:26 UTC (rev 133642)
@@ -1,3 +1,15 @@
+2012-11-06 Peter Beverloo <[email protected]>
+
+ [Chromium] Enable the _javascript_ i18n API for Android
+ https://bugs.webkit.org/show_bug.cgi?id=101357
+
+ Reviewed by Adam Barth.
+
+ Enable the _javascript_ i18n API for Chromium on Android. This adds a
+ grand total of 18.7 KiB of data to the content shell apk.
+
+ * features.gypi:
+
2012-11-06 Stephen White <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/features.gypi (133641 => 133642)
--- trunk/Source/WebKit/chromium/features.gypi 2012-11-06 19:03:31 UTC (rev 133641)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-11-06 19:04:26 UTC (rev 133642)
@@ -77,6 +77,7 @@
'ENABLE_INPUT_TYPE_MONTH=1',
'ENABLE_INPUT_TYPE_TIME=1',
'ENABLE_JAVASCRIPT_DEBUGGER=1',
+ 'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0',
'ENABLE_LEGACY_VIEWPORT_ADAPTION=1',
'ENABLE_LEGACY_VENDOR_PREFIXES=0',
@@ -158,7 +159,6 @@
'ENABLE_INPUT_SPEECH=0',
'ENABLE_INPUT_TYPE_COLOR=0',
'ENABLE_INPUT_TYPE_WEEK=0',
- 'ENABLE_JAVASCRIPT_I18N_API=0',
'ENABLE_LEGACY_NOTIFICATIONS=0',
'ENABLE_MEDIA_CAPTURE=1',
'ENABLE_MEDIA_STREAM=0',
@@ -183,7 +183,6 @@
'ENABLE_INPUT_TYPE_COLOR=1',
'ENABLE_INPUT_TYPE_WEEK=1',
'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
- 'ENABLE_JAVASCRIPT_I18N_API=1',
'ENABLE_LEGACY_NOTIFICATIONS=1',
'ENABLE_MEDIA_CAPTURE=0',
'ENABLE_MEDIA_STREAM=1',
