Fix r13897.

git-svn-id: http://skia.googlecode.com/svn/trunk@13899 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-21 23:07:24 +00:00 · 2014-03-21 23:07:24 +00:00 · f76cbb8848
commit f76cbb8848
parent 3d21f21cac
1 changed files with 3 additions and 3 deletions
--- 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() { }