| 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 709ce9d671f14c3ea3146ba2bbbd17deb5383857..03f185fa6c69128cc6fd912566a56572a534bcac 100644
|
| --- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
|
| +++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
|
| @@ -394,8 +394,8 @@ ScriptPromise FontFaceSet::load(ScriptState* scriptState,
|
| LoadFontPromiseResolver* resolver =
|
| LoadFontPromiseResolver::create(faces, scriptState);
|
| ScriptPromise promise = resolver->promise();
|
| - resolver->loadFonts(
|
| - getExecutionContext()); // After this, resolver->promise() may return null.
|
| + // After this, resolver->promise() may return null.
|
| + resolver->loadFonts(getExecutionContext());
|
| return promise;
|
| }
|
|
|
| @@ -441,7 +441,8 @@ bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font) {
|
| if (fontString.isEmpty())
|
| return false;
|
|
|
| - // Interpret fontString in the same way as the 'font' attribute of CanvasRenderingContext2D.
|
| + // Interpret fontString in the same way as the 'font' attribute of
|
| + // CanvasRenderingContext2D.
|
| MutableStylePropertySet* parsedStyle =
|
| MutableStylePropertySet::create(HTMLStandardMode);
|
| CSSParser::parseValue(parsedStyle, CSSPropertyFont, fontString, true, 0);
|
|
|