| OLD | NEW | 
|---|
| 1 | 1 | 
| 2 /* | 2 /* | 
| 3  * Copyright 2011 Google Inc. | 3  * Copyright 2011 Google Inc. | 
| 4  * | 4  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 5  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 6  * found in the LICENSE file. | 
| 7  */ | 7  */ | 
| 8 #include "gm.h" | 8 #include "gm.h" | 
| 9 | 9 | 
| 10 namespace skiagm { | 10 namespace skiagm { | 
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 114 | 114 | 
| 115     virtual uint32_t onGetFlags() const { return kSkipPicture_Flag | 115     virtual uint32_t onGetFlags() const { return kSkipPicture_Flag | 
| 116                                                | kSkipPipe_Flag; } | 116                                                | kSkipPipe_Flag; } | 
| 117 | 117 | 
| 118 private: | 118 private: | 
| 119     typedef GM INHERITED; | 119     typedef GM INHERITED; | 
| 120 }; | 120 }; | 
| 121 | 121 | 
| 122 ////////////////////////////////////////////////////////////////////////////// | 122 ////////////////////////////////////////////////////////////////////////////// | 
| 123 | 123 | 
| 124 #ifndef SK_BUILD_FOR_ANDROID |  | 
| 125 static GM* MyFactory(void*) { return new BitmapCopyGM; } | 124 static GM* MyFactory(void*) { return new BitmapCopyGM; } | 
| 126 static GMRegistry reg(MyFactory); | 125 static GMRegistry reg(MyFactory); | 
| 127 #endif |  | 
| 128 } | 126 } | 
| OLD | NEW | 
|---|