зеркало из https://github.com/mozilla/gecko-dev.git
Merge Bug 366774
This commit is contained in:
Коммит
a986a2c9c7
|
@ -3201,6 +3201,27 @@ NS_IMETHODIMP DocumentViewerImpl::GetBidiSupport(PRUint8* aSupport)
|
||||||
return NS_OK;
|
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)
|
NS_IMETHODIMP DocumentViewerImpl::SetBidiOptions(PRUint32 aBidiOptions)
|
||||||
{
|
{
|
||||||
if (mPresContext) {
|
if (mPresContext) {
|
||||||
|
|
|
@ -764,6 +764,11 @@ nsPresContext::GetUserPreferences()
|
||||||
GET_BIDI_OPTION_SUPPORT(bidiOptions));
|
GET_BIDI_OPTION_SUPPORT(bidiOptions));
|
||||||
SET_BIDI_OPTION_SUPPORT(bidiOptions, prefInt);
|
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
|
// We don't need to force reflow: either we are initializing a new
|
||||||
// prescontext or we are being called from UpdateAfterPreferencesChanged()
|
// prescontext or we are being called from UpdateAfterPreferencesChanged()
|
||||||
// which triggers a reflow anyway.
|
// which triggers a reflow anyway.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче