Remove digit substitution code from RenderTextWin.

This has a non-trivial performance penalty for canvas_skia_skia.cc
and possibly undesirable behavior.

Also, explicitly memset the POD data - as the default constructors for POD structs don't actually 0-out the values.

BUG=90426, 105550
TEST=existing unit tests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121107 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 14 deletions

diff --git a/ui/gfx/render_text_win.cc b/ui/gfx/render_text_win.cc
index b29c90c..30037a9 100644
--- a/ui/gfx/render_text_win.cc
+++ b/ui/gfx/render_text_win.cc
@@ -109,22 +109,10 @@ TextRun::~TextRun() {
 
 RenderTextWin::RenderTextWin()
     : RenderText(),
-      script_control_(),
-      script_state_(),
       string_width_(0),
       needs_layout_(false) {
-  // Omitting default constructors for script_* would leave POD uninitialized.
-  HRESULT hr = 0;
-
-  // TODO(msw): Call ScriptRecordDigitSubstitution on WM_SETTINGCHANGE message.
-  // TODO(msw): Use Chrome/profile locale/language settings?
-  hr = ScriptRecordDigitSubstitution(LOCALE_USER_DEFAULT, &digit_substitute_);
-  DCHECK(SUCCEEDED(hr));
-
-  hr = ScriptApplyDigitSubstitution(&digit_substitute_,
-                                    &script_control_,
-                                    &script_state_);
-  DCHECK(SUCCEEDED(hr));
+  memset(&script_control_, 0, sizeof(script_control_));
+  memset(&script_state_, 0, sizeof(script_state_));
   script_control_.fMergeNeutralItems = true;
 
   MoveCursorTo(EdgeSelectionModel(CURSOR_LEFT));