| 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 | 8 |
| 9 #include "SampleCode.h" | 9 #include "SampleCode.h" |
| 10 #include "SkView.h" | 10 #include "SkView.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 path.lineTo(SkIntToScalar(30), SkIntToScalar(70)); | 132 path.lineTo(SkIntToScalar(30), SkIntToScalar(70)); |
| 133 path.lineTo(SkIntToScalar(70), SkIntToScalar(70)); | 133 path.lineTo(SkIntToScalar(70), SkIntToScalar(70)); |
| 134 path.lineTo(SkIntToScalar(70), SkIntToScalar(30)); | 134 path.lineTo(SkIntToScalar(70), SkIntToScalar(30)); |
| 135 canvas->drawPath(path, paint); | 135 canvas->drawPath(path, paint); |
| 136 canvas->restore(); | 136 canvas->restore(); |
| 137 } | 137 } |
| 138 } | 138 } |
| 139 | 139 |
| 140 virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, | 140 virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, |
| 141 unsigned modi) { | 141 unsigned modi) { |
| 142 this->inval(NULL); | 142 this->inval(nullptr); |
| 143 return this->INHERITED::onFindClickHandler(x, y, modi); | 143 return this->INHERITED::onFindClickHandler(x, y, modi); |
| 144 } | 144 } |
| 145 | 145 |
| 146 private: | 146 private: |
| 147 typedef SampleView INHERITED; | 147 typedef SampleView INHERITED; |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 ////////////////////////////////////////////////////////////////////////////// | 150 ////////////////////////////////////////////////////////////////////////////// |
| 151 | 151 |
| 152 static SkView* MyFactory() { return new ConcavePathView; } | 152 static SkView* MyFactory() { return new ConcavePathView; } |
| 153 static SkViewRegister reg(MyFactory); | 153 static SkViewRegister reg(MyFactory); |
| OLD | NEW |