third_party/WebKit/Source/core/css/FontFaceSet.cpp - Issue 1913833002: Current work-in-progress crbug.com/567021

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/css/FontFaceSet.cpp

Issue 1913833002: Current work-in-progress crbug.com/567021 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More assert fixes Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/core/css/FontFaceSet.cpp

diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp

index 44228468db9f65f7681215fe8d5ec67c0325f9e0..498ffc0a3b77a319234c4a47dd7ffa96f105c4af 100644

--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp

+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp

@@ -326,7 +326,7 @@ bool FontFaceSet::hasForBinding(ScriptState*, FontFace* fontFace, ExceptionState

const HeapListHashSet<Member<FontFace>>& FontFaceSet::cssConnectedFontFaceList() const

{

Document* d = document();

- d->ensureStyleResolver(); // Flush pending style changes.

+ d->styleEngine().updateActiveStyle();

return d->styleEngine().fontSelector()->fontFaceCache()->cssConnectedFontFaces();

}

@@ -463,6 +463,7 @@ bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font)

style->font().update(style->font().getFontSelector());

+ document()->styleEngine().updateActiveStyle();

document()->ensureStyleResolver().computeFont(style.get(), *parsedStyle);

font = style->font();