diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-21 23:07:24 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-21 23:07:24 +0000 |
| commit | f76cbb884819830ea51ed090c7d7d4427bcbfdf5 (patch) | |
| tree | 67d1a6581f251dd352ed4f8d91d27a667cf80291 | |
| parent | 3d21f21cac33743e7aedace9abf0473c5063199f (diff) | |
Fix r13897.
git-svn-id: http://skia.googlecode.com/svn/trunk@13899 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index b3f43be875..b09c449aab 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() { } |