Unfork TextCodecICU.cpp. The upstream accepted my patch with some changes 
(r39021, http://bugs.webkit.org/show_bug.cgi?id=22116 )
We can now unfork this file.

fast/encoding/char-decoding.html was revised as well. It should be enabled 
once we merge with r39021 or later. A new test (fast/encoding/char-decoding-mac.html) 
should be added to tests_ignored.txt when doing a merge.


Review URL: http://codereview.chromium.org/13197

git-svn-id: svn://svn.chromium.org/chrome/trunk@6540 0039d316-1c4b-4281-b951-d872f2087c98
1 file changed
tree: 509d643457004555755db03dd9f1a03aa4b0ea98
  1. depot_tools/
  2. deps/
  3. src/
  4. tools/