AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix r13897.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@13898 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2014-03-21 23:00:41 +00:00
parent 72cf4fcafa
commit 3d21f21cac
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ports/SkFontMgr_indirect.h
View File

@ -29,7 +29,9 @@ public:
SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy) SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy)
: fImpl(SkRef(impl)), fProxy(SkRef(proxy)) : fImpl(SkRef(impl)), fProxy(SkRef(proxy))
{ {
fOnce = SK_ONCE_INIT; fOnce.done = false;
fOnce.lock.shouldBeZero = 0;
SkDEBUGCODE(fOnce.lock.thisIsPrivate = 0;)
} }
protected: protected:
@ -64,7 +66,7 @@ private:
SkAutoTUnref<SkRemotableFontMgr> fProxy; SkAutoTUnref<SkRemotableFontMgr> fProxy;
struct DataEntry { struct DataEntry {
int fDataId; // key1 uint32_t fDataId; // key1
int fTtcIndex; // key2 int fTtcIndex; // key2
SkTypeface* fTypeface; // value: weak ref to typeface SkTypeface* fTypeface; // value: weak ref to typeface

3
src/ports/SkRemotableFontMgr_win_dw.cpp
View File

@ -451,7 +451,8 @@ public:
identity); identity);
WCHAR str[16]; WCHAR str[16];
UINT32 strLen = SkUTF16_FromUnichar(character, reinterpret_cast<uint16_t*>(str)); UINT32 strLen = static_cast<UINT32>(
SkUTF16_FromUnichar(character, reinterpret_cast<uint16_t*>(str)));
SkTScopedComPtr<IDWriteTextLayout> fallbackLayout; SkTScopedComPtr<IDWriteTextLayout> fallbackLayout;
HR_GENERAL(dwFactory->CreateTextLayout(str, strLen, fallbackFormat.get(), HR_GENERAL(dwFactory->CreateTextLayout(str, strLen, fallbackFormat.get(),
200.0f, 200.0f, 200.0f, 200.0f,