summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 20:44:46 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 20:44:46 +0000
commit70ac249f04337f0040ad63a72ced111d87fdc73a (patch)
tree25391a1e3145c44296060b182d752f08cf1d6b11 /webkit/build
parent0362af9571f05634f50d1483e4b972bef6156345 (diff)
downloadchromium_src-70ac249f04337f0040ad63a72ced111d87fdc73a.zip
chromium_src-70ac249f04337f0040ad63a72ced111d87fdc73a.tar.gz
chromium_src-70ac249f04337f0040ad63a72ced111d87fdc73a.tar.bz2
Encoding autodetection patch part 2.
This is the patch to our glue and build files corresponding to my patch for webkit bug 16482 (http://bugs.webkit.org/show_bug.cgi?id=16482). Once my patch is accepted and is merged to our tree, we have to apply this patch. BUG=8587 Review URL: http://codereview.chromium.org/45037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r--webkit/build/WebCore/SConscript1
-rw-r--r--webkit/build/WebCore/WebCore.vcproj8
2 files changed, 9 insertions, 0 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index ee72102..d153b47 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -590,6 +590,7 @@ input_files = [
'$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp',
'$WEBCORE_DIR/platform/text/TextCodecUTF16.cpp',
'$WEBCORE_DIR/platform/text/TextEncoding.cpp',
+ '$WEBCORE_DIR/platform/text/TextEncodingDetectorICU.cpp',
'$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp',
'$WEBCORE_DIR/platform/text/TextStream.cpp',
'$WEBCORE_DIR/platform/text/UnicodeRange.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 9e58f3c..6db752f 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2140,6 +2140,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingDetectorICU.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingDetector.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextEncodingRegistry.cpp"
>
</File>