Revert "Add defense code that sets default text encoding"
authorSeungkeun Lee <sngn.lee@samsung.com>
Wed, 26 Aug 2015 00:17:30 +0000 (09:17 +0900)
committerSeungkeun Lee <sngn.lee@samsung.com>
Wed, 26 Aug 2015 04:36:39 +0000 (21:36 -0700)
This reverts commit 2a9918b0739165fd2fe82a30e60bc11abe8548c4.

Conflicts:
src/runtime/web_view_impl.cc

Change-Id: Ic16114091a30b8780935b98f85771a1294393598

src/runtime/web_view_impl.cc

index df8a5b971783bf9ca8e6e79abef6757bd1f9aff1..16fea016b16fa80917df8e37bc3ca1967267a8d5 100755 (executable)
@@ -818,14 +818,10 @@ void WebViewImpl::SetCSPRule(const std::string& rule, bool report_only) {
 }
 
 void WebViewImpl::SetDefaultEncoding(const std::string& encoding) {
-  Ewk_Settings* settings = ewk_view_settings_get(ewk_view_);
-
-  if (ewk_settings_is_encoding_valid(encoding.c_str()))
+  if (ewk_settings_is_encoding_valid(encoding.c_str())) {
+    Ewk_Settings* settings = ewk_view_settings_get(ewk_view_);
     ewk_settings_default_text_encoding_name_set(settings, encoding.c_str());
-  else
-    ewk_settings_default_text_encoding_name_set(settings, kDefaultEncoding);
-    // TODO(jh5.cho) : It is required to set an encoding value again to apply it
-    // to the document.characterSet for unkown reason. ewk api seems to be fixed
+  }
 }
 
 }  // namespace wrt