| Index: gm/fontmgr.cpp
|
| diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
|
| index 9d0e3509f19814db00ae0284201cbd34bee60fbe..e89e585fdeca3c32b53343b8a7a5862f5c3b2094 100644
|
| --- a/gm/fontmgr.cpp
|
| +++ b/gm/fontmgr.cpp
|
| @@ -115,16 +115,6 @@ protected:
|
| }
|
| }
|
|
|
| - uint32_t onGetFlags() const SK_OVERRIDE {
|
| - // fontdescriptors (and therefore serialization) don't yet understand
|
| - // these new styles, so skip tests that exercise that for now.
|
| -
|
| - // If certain fonts are picked up (e.g. Microsoft Jhenghei 20MB for Regular, 12MB for Bold),
|
| - // the resulting pdf can be ~700MB and crashes Chrome's PDF viewer.
|
| -
|
| - return kSkipPicture_Flag | kSkipPipe_Flag | kSkipPDF_Flag;
|
| - }
|
| -
|
| private:
|
| SkAutoTUnref<SkFontMgr> fFM;
|
| SkString fName;
|
| @@ -214,12 +204,6 @@ protected:
|
| this->iterateFamily(canvas, paint, fset);
|
| }
|
|
|
| - uint32_t onGetFlags() const SK_OVERRIDE {
|
| - // fontdescriptors (and therefore serialization) don't yet understand
|
| - // these new styles, so skip tests that exercise that for now.
|
| - return kSkipPicture_Flag | kSkipPipe_Flag;
|
| - }
|
| -
|
| private:
|
| typedef GM INHERITED;
|
| };
|
| @@ -299,17 +283,7 @@ protected:
|
| }
|
| }
|
| }
|
| -
|
| - uint32_t onGetFlags() const SK_OVERRIDE {
|
| - // fontdescriptors (and therefore serialization) don't yet understand
|
| - // these new styles, so skip tests that exercise that for now.
|
| -
|
| - // If certain fonts are picked up (e.g. Microsoft Jhenghei 20MB for Regular, 12MB for Bold),
|
| - // the resulting pdf can be ~700MB and crashes Chrome's PDF viewer.
|
| -
|
| - return kSkipPicture_Flag | kSkipPipe_Flag | kSkipPDF_Flag;
|
| - }
|
| -
|
| +
|
| private:
|
| SkAutoTUnref<SkFontMgr> fFM;
|
| SkString fName;
|
|
|