summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/config.gyp
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org>2015-06-05 22:48:02 +0000
committerjshin@chromium.org <jshin@chromium.org>2015-06-05 22:48:02 +0000
commit52692952ee4c963268d9c1020bc637aff6029e0e (patch)
treec51c677f565574eba2e91e42ff30457688471de2 /third_party/WebKit/Source/config.gyp
parentf62c0204c635fb6acee45fad2582dc4cd48d844f (diff)
downloadchromium_src-52692952ee4c963268d9c1020bc637aff6029e0e.zip
chromium_src-52692952ee4c963268d9c1020bc637aff6029e0e.tar.gz
chromium_src-52692952ee4c963268d9c1020bc637aff6029e0e.tar.bz2
Define a variable to distinguish system_icu from bundled_icu
Most of encoding name aliases manually added in TextCodecICU are present in Chrome's copy of ICU. So, they don't have to be added when Chrome's ICU is used. Define 'USING_SYSTEM_ICU" when 'use_system_icu=1' and register the above encoding name aliases only when 'USING_SYSTEM_ICU' is set. In addition, the following was done : * Remove GBK aliases not specified in the encoding spec. * Add tests for GBK and EUC-KR aliases in the spec that have not been tested before. * Add two aliases for ISO-8859-8-I regardless of whether bundled or system ICU is used. * Remove xA3xA0 => U+3000 override in GBK and GB18030 because Chrome's copy of ICU already has that with https://codereview.chromium.org/1162723008/ * Remove gbkFallback for 4 code points when bundled ICU is used for the same reason as above. * Remove one-way mapping from Unicode for U+22EF and U+301C even with system_icu because Chinese IMEs on Mac do not produce them on Mac. (they're added to Webkit to be compatible with an old Mac converter, but they're not specified in the encoding spec.) BUG=493824 TEST=Layout test fast/encoding/* Review URL: https://codereview.chromium.org/1167523003 git-svn-id: svn://svn.chromium.org/blink/trunk@196607 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Source/config.gyp')
-rw-r--r--third_party/WebKit/Source/config.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/WebKit/Source/config.gyp b/third_party/WebKit/Source/config.gyp
index 8a801ad..8bfb8ab 100644
--- a/third_party/WebKit/Source/config.gyp
+++ b/third_party/WebKit/Source/config.gyp
@@ -117,6 +117,11 @@
'MEMORY_TOOL_REPLACES_ALLOCATOR',
],
}],
+ ['use_system_icu==1', {
+ 'defines': [
+ 'USING_SYSTEM_ICU',
+ ],
+ }],
],
},
},