Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1349815 - Avoid setting the static cache during the servo traversal. r=heycam

Browse Source 
MozReview-Commit-ID: E9XC4kaCVd2
This commit is contained in:
Bobby Holley 2017-03-22 19:52:53 -07:00
parent ec78798123
commit 8c4e31302e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/nsXPLookAndFeel.cpp
View File

@ -13,6 +13,7 @@
#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"
@ -437,6 +438,8 @@ nsXPLookAndFeel::OnPrefChanged(const char* aPref, void* aClosure)
void
nsXPLookAndFeel::Init()
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
// Say we're already initialized, and take the chance that it might fail;
// protects against some other process writing to our static variables.
sInitialized = true;
@ -825,7 +828,10 @@ nsXPLookAndFeel::GetColorImpl(ColorID aID, bool aUseStandinsForNativeColors,
}
}
CACHE_COLOR(aID, aResult);
if (!mozilla::ServoStyleSet::IsInServoTraversal()) {
MOZ_ASSERT(NS_IsMainThread());
CACHE_COLOR(aID, aResult);
}
return NS_OK;
}