nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1676543 - Remove some invalid assertions. r=heycam

Browse source 
We might clear this flag in PostRebuildAllStyleData before actually
flushing style, so if the timing is wrong you can hit this assertion.

This doesn't impact correctness in any way that I can see.

Differential Revision: https://phabricator.services.mozilla.com/D96685
This commit is contained in:
Emilio Cobos Álvarez 2020-11-13 05:36:37 +00:00
parent e7ec1ff308
commit 643b53b90c
1 changed files with 0 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
layout/style/nsFontFaceUtils.cpp
View file

@ -63,14 +63,12 @@ static FontUsageKind StyleFontUsage(nsIFrame* aFrame, ComputedStyle* aStyle,
if (FontIsUsed(aStyle)) { if (FontIsUsed(aStyle)) {
usage |= FontUsageKind::Frame; usage |= FontUsageKind::Frame;
if (aStyle->DependsOnSelfFontMetrics()) { if (aStyle->DependsOnSelfFontMetrics()) {
MOZ_ASSERT(aPresContext->UsesExChUnits());
usage |= FontUsageKind::FontMetrics; usage |= FontUsageKind::FontMetrics;
} }
} }
if (aStyle->DependsOnInheritedFontMetrics() && if (aStyle->DependsOnInheritedFontMetrics() &&
!(usage & FontUsageKind::FontMetrics)) { !(usage & FontUsageKind::FontMetrics)) {
MOZ_ASSERT(aPresContext->UsesExChUnits());
ComputedStyle* parentStyle = nullptr; ComputedStyle* parentStyle = nullptr;
if (aIsExtraStyle) { if (aIsExtraStyle) {
parentStyle = aFrame->Style(); parentStyle = aFrame->Style();