Bug 366774 - Removed unused preference bidi.characterset.(p2) r=smontagu
authorEdmund Wong <ewong@pw-wspx.org>
Mon, 25 Apr 2011 01:56:09 +0800
changeset 68482 baf7456adc9854ea331f9defc096beb1d2990145
parent 68481 582c92878440d956e227341c66603de34d2e3b8e
child 68483 3f7277e15d8df0907d14d50f194cc0cef17f7da4
child 68487 2928c63ffb5bedba9cecbf3c01e49aca5d4e439b
push id19660
push userphilip.chee@gmail.com
push dateSun, 24 Apr 2011 18:01:28 +0000
treeherdermozilla-central@96bfa1480f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs366774
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 366774 - Removed unused preference bidi.characterset.(p2) r=smontagu
layout/base/nsDocumentViewer.cpp
layout/base/nsPresContext.cpp
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -3196,37 +3196,16 @@ NS_IMETHODIMP DocumentViewerImpl::GetBid
 
   if (aSupport) {
     GetBidiOptions(&bidiOptions);
     *aSupport = GET_BIDI_OPTION_SUPPORT(bidiOptions);
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP DocumentViewerImpl::SetBidiCharacterSet(PRUint8 aCharacterSet)
-{
-  PRUint32 bidiOptions;
-
-  GetBidiOptions(&bidiOptions);
-  SET_BIDI_OPTION_CHARACTERSET(bidiOptions, aCharacterSet);
-  SetBidiOptions(bidiOptions);
-  return NS_OK;
-}
-
-NS_IMETHODIMP DocumentViewerImpl::GetBidiCharacterSet(PRUint8* aCharacterSet)
-{
-  PRUint32 bidiOptions;
-
-  if (aCharacterSet) {
-    GetBidiOptions(&bidiOptions);
-    *aCharacterSet = GET_BIDI_OPTION_CHARACTERSET(bidiOptions);
-  }
-  return NS_OK;
-}
-
 NS_IMETHODIMP DocumentViewerImpl::SetBidiOptions(PRUint32 aBidiOptions)
 {
   if (mPresContext) {
     mPresContext->SetBidi(aBidiOptions, PR_TRUE); // could cause reflow
   }
   // now set bidi on all children of mContainer
   CallChildren(SetChildBidiOptions, NS_INT32_TO_PTR(aBidiOptions));
   return NS_OK;
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -759,21 +759,16 @@ nsPresContext::GetUserPreferences()
                                GET_BIDI_OPTION_NUMERAL(bidiOptions));
   SET_BIDI_OPTION_NUMERAL(bidiOptions, prefInt);
 
   prefInt =
     nsContentUtils::GetIntPref(IBMBIDI_SUPPORTMODE_STR,
                                GET_BIDI_OPTION_SUPPORT(bidiOptions));
   SET_BIDI_OPTION_SUPPORT(bidiOptions, prefInt);
 
-  prefInt =
-    nsContentUtils::GetIntPref(IBMBIDI_CHARSET_STR,
-                               GET_BIDI_OPTION_CHARACTERSET(bidiOptions));
-  SET_BIDI_OPTION_CHARACTERSET(bidiOptions, prefInt);
-
   // We don't need to force reflow: either we are initializing a new
   // prescontext or we are being called from UpdateAfterPreferencesChanged()
   // which triggers a reflow anyway.
   SetBidi(bidiOptions, PR_FALSE);
 }
 
 void
 nsPresContext::AppUnitsPerDevPixelChanged()