Backed out changeset 9f2fe5e3f78c (bug 1357307) for assertion failure at nsXPLookAndFeel.cpp
authorIris Hsiao <ihsiao@mozilla.com>
Mon, 24 Apr 2017 15:28:01 +0800
changeset 405078 6efe7915f97b389c51b85bb2e1e45004f33ca680
parent 405077 288f9c879d41b61c90f16af0e002d6331df921bd
child 405079 265931fd5e5a0b3b7a4625fc517bfa18e86c2291
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1357307
milestone55.0a1
backs out9f2fe5e3f78c8174fab116ebc9091d0e357fb121
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
Backed out changeset 9f2fe5e3f78c (bug 1357307) for assertion failure at nsXPLookAndFeel.cpp
widget/nsXPLookAndFeel.cpp
--- a/widget/nsXPLookAndFeel.cpp
+++ b/widget/nsXPLookAndFeel.cpp
@@ -14,17 +14,16 @@
 #include "nsFont.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ServoStyleSet.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/widget/WidgetMessageUtils.h"
 
 #include "gfxPlatform.h"
-#include "gfxPrefs.h"
 #include "qcms.h"
 
 #ifdef DEBUG
 #include "nsSize.h"
 #endif
 
 using namespace mozilla;
 
@@ -816,18 +815,16 @@ nsXPLookAndFeel::GetColorImpl(ColorID aI
   }
 
   if (sUseNativeColors && aUseStandinsForNativeColors) {
     aResult = GetStandinForNativeColor(aID);
     return NS_OK;
   }
 
   if (sUseNativeColors && NS_SUCCEEDED(NativeGetColor(aID, aResult))) {
-    MOZ_ASSERT(NS_IsMainThread());
-    gfxPrefs::GetSingleton();
     if ((gfxPlatform::GetCMSMode() == eCMSMode_All) &&
          !IsSpecialColor(aID, aResult)) {
       qcms_transform *transform = gfxPlatform::GetCMSInverseRGBTransform();
       if (transform) {
         uint8_t color[3];
         color[0] = NS_GET_R(aResult);
         color[1] = NS_GET_G(aResult);
         color[2] = NS_GET_B(aResult);