| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "gm.h" | 8 #include "gm.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkStream.h" | 10 #include "SkStream.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 private: | 104 private: |
| 105 SkTypeface* fTypeface; | 105 SkTypeface* fTypeface; |
| 106 | 106 |
| 107 typedef GM INHERITED; | 107 typedef GM INHERITED; |
| 108 }; | 108 }; |
| 109 | 109 |
| 110 ////////////////////////////////////////////////////////////////////////////// | 110 ////////////////////////////////////////////////////////////////////////////// |
| 111 | 111 |
| 112 #if !defined(SK_BUILD_FOR_ANDROID) | |
| 113 // fail for now until the appropriate freetype changes are submitted | |
| 114 static GM* MyFactory(void*) { return new ColorEmojiGM; } | 112 static GM* MyFactory(void*) { return new ColorEmojiGM; } |
| 115 static GMRegistry reg(MyFactory); | 113 static GMRegistry reg(MyFactory); |
| 116 #endif | |
| 117 | 114 |
| 118 } | 115 } |
| OLD | NEW |