diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-09 12:05:00 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 12:05:00 -0800 |
| commit | 08d739c03623cf471db45e8278cf48b3c81c28ed (patch) | |
| tree | f796043547d98d236bea3c877ca472fea3c1db38 /src/ports/SkFontMgr_win_dw.cpp | |
| parent | 045afea97902936869d71389e656a9c6917fa32f (diff) | |
Fix Windows clang compiler complaint
https://codereview.chromium.org/1740533003 ( Initialize font fallback when creating DWrite font manager) seems to have broken the clang/win builds with:
..\..\third_party\skia\src\ports\SkFontMgr_win_dw.cpp(272,11) : error: field
'fLocaleName' will be initialized after field 'fFontFallback'
[-Werror,-Wreorder]
, fLocaleName(localeNameLength)
^
1 error generated.
I have also created skbug.com/5078 (Add Windows clang bot)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1784533002
Review URL: https://codereview.chromium.org/1784533002
Diffstat (limited to 'src/ports/SkFontMgr_win_dw.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index 715bed5291..b4e5c1a9f4 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -268,11 +268,11 @@ public: SkFontMgr_DirectWrite(IDWriteFactory* factory, IDWriteFontCollection* fontCollection, WCHAR* localeName, int localeNameLength, IDWriteFontFallback* fallback) : fFactory(SkRefComPtr(factory)) - , fFontCollection(SkRefComPtr(fontCollection)) - , fLocaleName(localeNameLength) #if SK_HAS_DWRITE_2_H , fFontFallback(SkSafeRefComPtr(fallback)) #endif + , fFontCollection(SkRefComPtr(fontCollection)) + , fLocaleName(localeNameLength) { #if SK_HAS_DWRITE_2_H if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) { |