Chromium Code Reviews| 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 "SampleCode.h" | 8 #include "SampleCode.h" |
| 9 #include "SkView.h" | 9 #include "SkView.h" |
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 if (fSize.fWidth < kLimit) { | 94 if (fSize.fWidth < kLimit) { |
| 95 SkDebugf("--- width=%g, flat=%d buldge=%d total: flat=%d buldge=%d\n ", fSize.fWidth, | 95 SkDebugf("--- width=%g, flat=%d buldge=%d total: flat=%d buldge=%d\n ", fSize.fWidth, |
| 96 flatCount, buldgeCount, gFlatCount, gBuldgeCount); | 96 flatCount, buldgeCount, gFlatCount, gBuldgeCount); |
| 97 fSize.fWidth += SK_Scalar1; | 97 fSize.fWidth += SK_Scalar1; |
| 98 fSize.fHeight += SK_Scalar1; | 98 fSize.fHeight += SK_Scalar1; |
| 99 } else { | 99 } else { |
| 100 // fSize.set(SK_Scalar1, SK_Scalar1); | 100 // fSize.set(SK_Scalar1, SK_Scalar1); |
| 101 } | 101 } |
| 102 } | 102 } |
| 103 | 103 |
| 104 virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) { | 104 virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) { |
|
sugoi
2013/03/06 16:14:59
virtual function's signature did not fit base clas
| |
| 105 this->inval(NULL); | 105 this->inval(NULL); |
| 106 return NULL; | 106 return NULL; |
| 107 } | 107 } |
| 108 | 108 |
| 109 private: | 109 private: |
| 110 typedef SampleView INHERITED; | 110 typedef SampleView INHERITED; |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 /////////////////////////////////////////////////////////////////////////////// | 113 /////////////////////////////////////////////////////////////////////////////// |
| 114 | 114 |
| 115 static SkView* MyFactory() { return new OvalTestView; } | 115 static SkView* MyFactory() { return new OvalTestView; } |
| 116 static SkViewRegister reg(MyFactory); | 116 static SkViewRegister reg(MyFactory); |
| OLD | NEW |