Bug 794905 - nsLayoutUtils::FontSizeInflationEnabled can return nsresult instead of bool; r=jwir3
authorAryeh Gregor <ayg@aryeh.name>
Thu, 27 Sep 2012 18:24:17 +0200
changeset 108302 cc666da08e23ac1cedeb1fdc2759946cc2fc636d
parent 108301 550c5ac80046e7d378b201f53cd043546846ca00
child 108303 41416282254b45d039dcd9ac327a3689c4f26204
push id15469
push userayg@aryeh.name
push dateThu, 27 Sep 2012 16:24:26 +0000
treeherdermozilla-inbound@cc666da08e23 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwir3
bugs794905
milestone18.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 794905 - nsLayoutUtils::FontSizeInflationEnabled can return nsresult instead of bool; r=jwir3
layout/base/nsLayoutUtils.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -4956,17 +4956,17 @@ nsLayoutUtils::FontSizeInflationEnabled(
   // object.
 
   // TODO:
   // Once bug 716575 has been resolved, this code should be changed so that it
   // does the right thing on all platforms.
   nsresult rv;
   nsCOMPtr<nsIScreenManager> screenMgr =
     do_GetService("@mozilla.org/gfx/screenmanager;1", &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_SUCCESS(rv, false);
 
   nsCOMPtr<nsIScreen> screen;
   screenMgr->GetPrimaryScreen(getter_AddRefs(screen));
   if (screen) {
     int32_t screenLeft, screenTop, screenWidth, screenHeight;
     screen->GetRect(&screenLeft, &screenTop, &screenWidth, &screenHeight);
 
     ViewportInfo vInf =