diff options
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
4 files changed, 12 insertions, 1 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> diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index f3105bd..2c591ed 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1371,7 +1371,7 @@ void WebViewImpl::SetPreferences(const WebPreferences& preferences) { settings->setDeveloperExtrasEnabled(preferences.developer_extras_enabled); settings->setShrinksStandaloneImagesToFit( preferences.shrinks_standalone_images_to_fit); - settings->setUsesUniversalDetector(preferences.uses_universal_detector); + settings->setUsesEncodingDetector(preferences.uses_universal_detector); settings->setTextAreasAreResizable(preferences.text_areas_are_resizable); settings->setAllowScriptsToCloseWindows( preferences.allow_scripts_to_close_windows); diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 35c4e92..22d9647 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -2767,6 +2767,8 @@ '../third_party/WebKit/WebCore/platform/text/TextDirection.h', '../third_party/WebKit/WebCore/platform/text/TextEncoding.cpp', '../third_party/WebKit/WebCore/platform/text/TextEncoding.h', + '../third_party/WebKit/WebCore/platform/text/TextEncodingDetector.h', + '../third_party/WebKit/WebCore/platform/text/TextEncodingDetectorICU.cpp', '../third_party/WebKit/WebCore/platform/text/TextEncodingRegistry.cpp', '../third_party/WebKit/WebCore/platform/text/TextEncodingRegistry.h', '../third_party/WebKit/WebCore/platform/text/TextStream.cpp', |