From f76cbb884819830ea51ed090c7d7d4427bcbfdf5 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Fri, 21 Mar 2014 23:07:24 +0000 Subject: [PATCH] Fix r13897. git-svn-id: http://skia.googlecode.com/svn/trunk@13899 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/ports/SkFontMgr_indirect.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index b3f43be..b09c449 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -30,8 +30,8 @@ public: : fImpl(SkRef(impl)), fProxy(SkRef(proxy)) { fOnce.done = false; - fOnce.lock.shouldBeZero = 0; - SkDEBUGCODE(fOnce.lock.thisIsPrivate = 0;) + fOnce.lock.thisIsPrivate = 0; + SkDEBUGCODE(fOnce.lock.shouldBeZero = 0;) } protected: @@ -67,7 +67,7 @@ private: struct DataEntry { uint32_t fDataId; // key1 - int fTtcIndex; // key2 + uint32_t fTtcIndex; // key2 SkTypeface* fTypeface; // value: weak ref to typeface DataEntry() { } -- 2.7.4