Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 14:25:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1357307 - Make sure gfxPrefs instance is created before accessing it. r=milan

Browse Source
This commit is contained in:
vincentliu 2017-05-05 14:22:51 +08:00
parent 6abfb0bad6
commit 1af34c7c2f
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
widget/nsXPLookAndFeel.cpp
View File

@ -19,6 +19,7 @@
#include "mozilla/widget/WidgetMessageUtils.h"
#include "gfxPlatform.h"
#include "gfxPrefs.h"
#include "qcms.h"
#ifdef DEBUG
@ -820,21 +821,25 @@ nsXPLookAndFeel::GetColorImpl(ColorID aID, bool aUseStandinsForNativeColors,
}
if (sUseNativeColors && NS_SUCCEEDED(NativeGetColor(aID, aResult))) {
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);
qcms_transform_data(transform, color, color, 1);
aResult = NS_RGB(color[0], color[1], color[2]);
}
}
if (!mozilla::ServoStyleSet::IsInServoTraversal()) {
MOZ_ASSERT(NS_IsMainThread());
// Make sure the preferences are initialized. In the normal run,
// they would already be, because gfxPlatform would have been created,
// but with some addon, that is not the case. See Bug 1357307.
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);
qcms_transform_data(transform, color, color, 1);
aResult = NS_RGB(color[0], color[1], color[2]);
}
}
CACHE_COLOR(aID, aResult);
}
return NS_OK;