| 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" |
| 11 #include "SkDevice.h" | 11 #include "SkDevice.h" |
| 12 #include "SkPaint.h" | 12 #include "SkPaint.h" |
| 13 #include "SkShader.h" | 13 #include "SkShader.h" |
| 14 | 14 |
| 15 static SkBitmap createBitmap(int n) { | 15 static SkBitmap createBitmap(int n) { |
| 16 SkBitmap bitmap; | 16 SkBitmap bitmap; |
| 17 bitmap.setConfig(SkBitmap::kARGB_8888_Config, n, n); | 17 bitmap.allocN32Pixels(n, n); |
| 18 bitmap.allocPixels(); | |
| 19 bitmap.eraseColor(SK_ColorGREEN); | 18 bitmap.eraseColor(SK_ColorGREEN); |
| 20 | 19 |
| 21 SkCanvas canvas(bitmap); | 20 SkCanvas canvas(bitmap); |
| 22 SkRect r; | 21 SkRect r; |
| 23 r.set(0, 0, SkIntToScalar(n), SkIntToScalar(n)); | 22 r.set(0, 0, SkIntToScalar(n), SkIntToScalar(n)); |
| 24 SkPaint paint; | 23 SkPaint paint; |
| 25 paint.setAntiAlias(true); | 24 paint.setAntiAlias(true); |
| 26 | 25 |
| 27 paint.setColor(SK_ColorRED); | 26 paint.setColor(SK_ColorRED); |
| 28 canvas.drawOval(r, paint); | 27 canvas.drawOval(r, paint); |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 private: | 187 private: |
| 189 int fWidth; | 188 int fWidth; |
| 190 | 189 |
| 191 typedef SampleView INHERITED; | 190 typedef SampleView INHERITED; |
| 192 }; | 191 }; |
| 193 | 192 |
| 194 ////////////////////////////////////////////////////////////////////////////// | 193 ////////////////////////////////////////////////////////////////////////////// |
| 195 | 194 |
| 196 static SkView* MyFactory() { return new AARectView; } | 195 static SkView* MyFactory() { return new AARectView; } |
| 197 static SkViewRegister reg(MyFactory); | 196 static SkViewRegister reg(MyFactory); |
| OLD | NEW |