From 856b7bac900b2cfd8f9083ddfca53bf071c725e1 Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Fri, 27 May 2011 17:15:20 +0900 Subject: [PATCH] Bug 658703 widget/src/windows should use new pref utilities r=roc --- widget/src/windows/nsTextStore.cpp | 31 ++----- widget/src/windows/nsWinGesture.cpp | 19 ++-- widget/src/windows/nsWindow.cpp | 132 ++++++++-------------------- 3 files changed, 50 insertions(+), 132 deletions(-) diff --git a/widget/src/windows/nsTextStore.cpp b/widget/src/windows/nsTextStore.cpp index 26ff1fd5ece..457ccfe3e99 100644 --- a/widget/src/windows/nsTextStore.cpp +++ b/widget/src/windows/nsTextStore.cpp @@ -41,10 +41,11 @@ #include "nscore.h" #include "nsTextStore.h" #include "nsWindow.h" -#include "nsIPrefBranch.h" -#include "nsIPrefService.h" #include "prlog.h" #include "nsPrintfCString.h" +#include "mozilla/Preferences.h" + +using namespace mozilla; /******************************************************************/ /* nsTextStore */ @@ -1331,19 +1332,8 @@ GetLayoutChangeIntervalTime() if (sTime > 0) return PRUint32(sTime); - sTime = 100; - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (!prefs) - return PRUint32(sTime); - nsCOMPtr prefBranch; - prefs->GetBranch(nsnull, getter_AddRefs(prefBranch)); - if (!prefBranch) - return PRUint32(sTime); - nsresult rv = - prefBranch->GetIntPref("intl.tsf.on_layout_change_interval", &sTime); - if (NS_FAILED(rv)) - return PRUint32(sTime); - sTime = PR_MAX(10, sTime); + sTime = NS_MAX(10, + Preferences::GetInt("intl.tsf.on_layout_change_interval", 100)); return PRUint32(sTime); } @@ -1625,15 +1615,8 @@ nsTextStore::Initialize(void) sTextStoreLog = PR_NewLogModule("nsTextStoreWidgets"); #endif if (!sTsfThreadMgr) { - PRBool enableTsf = PR_TRUE; - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (prefs) { - nsCOMPtr prefBranch; - prefs->GetBranch(nsnull, getter_AddRefs(prefBranch)); - if (prefBranch && NS_FAILED(prefBranch->GetBoolPref( - "intl.enable_tsf_support", &enableTsf))) - enableTsf = PR_TRUE; - } + PRBool enableTsf = + Preferences::GetBool("intl.enable_tsf_support", PR_FALSE); if (enableTsf) { if (SUCCEEDED(CoCreateInstance(CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, IID_ITfThreadMgr, diff --git a/widget/src/windows/nsWinGesture.cpp b/widget/src/windows/nsWinGesture.cpp index 385b75899ec..b811666e311 100644 --- a/widget/src/windows/nsWinGesture.cpp +++ b/widget/src/windows/nsWinGesture.cpp @@ -43,11 +43,11 @@ #include "nscore.h" #include "nsWinGesture.h" #include "nsUXThemeData.h" -#include "nsIPrefBranch.h" -#include "nsIPrefService.h" -#include "nsIServiceManager.h" #include "nsIDOMSimpleGestureEvent.h" #include "nsGUIEvent.h" +#include "mozilla/Preferences.h" + +using namespace mozilla; #ifndef M_PI #define M_PI 3.14159265358979323846 @@ -140,17 +140,8 @@ PRBool nsWinGesture::InitLibrary() // Check to see if we want single finger gesture input. Only do this once // for the app so we don't have to look it up on every window create. - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (prefs) { - nsCOMPtr prefBranch; - prefs->GetBranch(0, getter_AddRefs(prefBranch)); - if (prefBranch) { - PRBool flag; - if (NS_SUCCEEDED(prefBranch->GetBoolPref("gestures.enable_single_finger_input", &flag)) - && flag) - gEnableSingleFingerPanEvents = PR_TRUE; - } - } + gEnableSingleFingerPanEvents = + Preferences::GetBool("gestures.enable_single_finger_input", PR_FALSE); return PR_TRUE; } diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 1df847a0546..05fd83d1456 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -121,9 +121,6 @@ #include "nsISupportsPrimitives.h" #include "nsIDOMNSUIEvent.h" #include "nsITheme.h" -#include "nsIPrefBranch.h" -#include "nsIPrefBranch2.h" -#include "nsIPrefService.h" #include "nsIObserverService.h" #include "nsIScreenManager.h" #include "imgIContainer.h" @@ -160,6 +157,7 @@ #include "nsWindowGfx.h" #include "gfxWindowsPlatform.h" #include "Layers.h" +#include "mozilla/Preferences.h" #ifdef MOZ_ENABLE_D3D9_LAYER #include "LayerManagerD3D9.h" @@ -212,6 +210,7 @@ using namespace mozilla::widget; using namespace mozilla::layers; +using namespace mozilla; /************************************************************** ************************************************************** @@ -648,33 +647,12 @@ nsWindow::Create(nsIWidget *aParent, that a Mozilla app hogs too much memory while minimized, they will have that entire bug tattooed on their backside. */ - sTrimOnMinimize = 0; - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (prefs) { - nsCOMPtr prefBranch; - prefs->GetBranch(0, getter_AddRefs(prefBranch)); - if (prefBranch) { - - PRBool temp; - if (NS_SUCCEEDED(prefBranch->GetBoolPref("config.trim_on_minimize", - &temp)) - && temp) - sTrimOnMinimize = 1; - - if (NS_SUCCEEDED(prefBranch->GetBoolPref("intl.keyboard.per_window_layout", - &temp))) - sSwitchKeyboardLayout = temp; - - if (NS_SUCCEEDED(prefBranch->GetBoolPref("mozilla.widget.disable-native-theme", - &temp))) - gDisableNativeTheme = temp; - - if (NS_SUCCEEDED(prefBranch->GetBoolPref("mousewheel.enable_pixel_scrolling", - &temp))) { - sEnablePixelScrolling = temp; - } - } - } + sTrimOnMinimize = + Preferences::GetBool("config.trim_on_minimize", PR_FALSE) ? 1 : 0; + sSwitchKeyboardLayout = + Preferences::GetBool("intl.keyboard.per_window_layout", PR_FALSE); + gDisableNativeTheme = + Preferences::GetBool("mozilla.widget.disable-native-theme", PR_FALSE); } return NS_OK; @@ -3173,17 +3151,14 @@ struct LayerManagerPrefs { static void GetLayerManagerPrefs(LayerManagerPrefs* aManagerPrefs) { - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (prefs) { - prefs->GetBoolPref("layers.acceleration.disabled", + Preferences::GetBool("layers.acceleration.disabled", &aManagerPrefs->mDisableAcceleration); - prefs->GetBoolPref("layers.acceleration.force-enabled", + Preferences::GetBool("layers.acceleration.force-enabled", &aManagerPrefs->mForceAcceleration); - prefs->GetBoolPref("layers.prefer-opengl", + Preferences::GetBool("layers.prefer-opengl", &aManagerPrefs->mPreferOpenGL); - prefs->GetBoolPref("layers.prefer-d3d9", + Preferences::GetBool("layers.prefer-d3d9", &aManagerPrefs->mPreferD3D9); - } const char *acceleratedEnv = PR_GetEnv("MOZ_ACCELERATED"); aManagerPrefs->mAccelerateByDefault = @@ -3355,16 +3330,8 @@ nsWindow::OnDefaultButtonLoaded(const nsIntRect &aButtonRect) return NS_OK; } - PRBool isAlwaysSnapCursor = PR_FALSE; - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (prefs) { - nsCOMPtr prefBranch; - prefs->GetBranch(nsnull, getter_AddRefs(prefBranch)); - if (prefBranch) { - prefBranch->GetBoolPref("ui.cursor_snapping.always_enabled", - &isAlwaysSnapCursor); - } - } + PRBool isAlwaysSnapCursor = + Preferences::GetBool("ui.cursor_snapping.always_enabled", PR_FALSE); if (!isAlwaysSnapCursor) { BOOL snapDefaultButton; @@ -4660,16 +4627,10 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam, // Changing nsIPrefBranch entry which triggers callbacks // and flows into calling mDeviceContext->FlushFontCache() // to update the font cache in all the instance of Browsers - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - if (prefs) { - nsCOMPtr fiPrefs; - prefs->GetBranch("font.internaluseonly.", getter_AddRefs(fiPrefs)); - if (fiPrefs) { - PRBool fontInternalChange = PR_FALSE; - fiPrefs->GetBoolPref("changed", &fontInternalChange); - fiPrefs->SetBoolPref("changed", !fontInternalChange); - } - } + const char* kPrefName = "font.internaluseonly.changed"; + PRBool fontInternalChange = + Preferences::GetBool(kPrefName, PR_FALSE); + Preferences::SetBool(kPrefName, !fontInternalChange); } } //if (NS_SUCCEEDED(rv)) } @@ -6335,6 +6296,9 @@ nsWindow::InitMouseWheelScrollData() // See the comments for the case sMouseWheelScrollLines > WHEEL_DELTA. sMouseWheelScrollChars = WHEEL_PAGESCROLL; } + + sEnablePixelScrolling = + Preferences::GetBool("mousewheel.enable_pixel_scrolling", PR_TRUE); } /* static */ @@ -7707,15 +7671,8 @@ PRBool nsWindow::OnScroll(UINT aMsg, WPARAM aWParam, LPARAM aLParam) { static PRInt8 sMouseWheelEmulation = -1; if (sMouseWheelEmulation < 0) { - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - NS_ENSURE_TRUE(prefs, PR_FALSE); - nsCOMPtr prefBranch; - prefs->GetBranch(0, getter_AddRefs(prefBranch)); - NS_ENSURE_TRUE(prefBranch, PR_FALSE); - PRBool emulate; - nsresult rv = - prefBranch->GetBoolPref("mousewheel.emulate_at_wm_scroll", &emulate); - NS_ENSURE_SUCCESS(rv, PR_FALSE); + PRBool emulate = + Preferences::GetBool("mousewheel.emulate_at_wm_scroll", PR_FALSE); sMouseWheelEmulation = PRInt8(emulate); } @@ -8078,10 +8035,8 @@ nsWindow::GetRootAccessible() static int accForceDisable = -1; if (accForceDisable == -1) { - nsCOMPtr prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); - PRBool b = PR_FALSE; - nsresult rv = prefs->GetBoolPref("accessibility.win32.force_disabled", &b); - if (NS_SUCCEEDED(rv) && b) { + const char* kPrefName = "accessibility.win32.force_disabled"; + if (Preferences::GetBool(kPrefName, PR_FALSE)) { accForceDisable = 1; } else { accForceDisable = 0; @@ -8785,17 +8740,11 @@ PRBool nsWindow::CanTakeFocus() void nsWindow::GetMainWindowClass(nsAString& aClass) { - nsresult rv; - nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); - if (NS_SUCCEEDED(rv) && prefs) { - nsXPIDLCString name; - rv = prefs->GetCharPref("ui.window_class_override", getter_Copies(name)); - if (NS_SUCCEEDED(rv) && !name.IsEmpty()) { - aClass.AssignASCII(name.get()); - return; - } + NS_PRECONDITION(aClass.IsEmpty(), "aClass should be empty string"); + nsresult rv = Preferences::GetString("ui.window_class_override", &aClass); + if (NS_FAILED(rv) || aClass.IsEmpty()) { + aClass.AssignASCII(sDefaultMainWindowClass); } - aClass.AssignASCII(sDefaultMainWindowClass); } /** @@ -8815,20 +8764,15 @@ PRBool nsWindow::GetInputWorkaroundPref(const char* aPrefName, return aValueIfAutomatic; } - nsresult rv; - nsCOMPtr prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); - if (NS_SUCCEEDED(rv) && prefs) { - PRInt32 lHackValue; - rv = prefs->GetIntPref(aPrefName, &lHackValue); - if (NS_SUCCEEDED(rv)) { - switch (lHackValue) { - case 0: // disabled - return PR_FALSE; - case 1: // enabled - return PR_TRUE; - default: // -1: autodetect - break; - } + PRInt32 lHackValue = 0; + if (NS_SUCCEEDED(Preferences::GetInt(aPrefName, &lHackValue))) { + switch (lHackValue) { + case 0: // disabled + return PR_FALSE; + case 1: // enabled + return PR_TRUE; + default: // -1: autodetect + break; } } return aValueIfAutomatic;