Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: gm/matrixconvolution.cpp

Issue 281383013: skiagm::make_isize -> SkISize::Make (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gm/linepaths.cpp ('k') | gm/matriximagefilter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 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 "SkColor.h" 9 #include "SkColor.h"
10 #include "SkMatrixConvolutionImageFilter.h" 10 #include "SkMatrixConvolutionImageFilter.h"
(...skipping 28 matching lines...) Expand all
39 SkPoint::Make(0, SkIntToScalar(80)) }; 39 SkPoint::Make(0, SkIntToScalar(80)) };
40 SkColor colors[2] = { 0xFFFFFFFF, 0x40404040 }; 40 SkColor colors[2] = { 0xFFFFFFFF, 0x40404040 };
41 SkScalar pos[2] = { 0, SkIntToScalar(80) }; 41 SkScalar pos[2] = { 0, SkIntToScalar(80) };
42 paint.setShader(SkGradientShader::CreateLinear( 42 paint.setShader(SkGradientShader::CreateLinear(
43 pts, colors, pos, 2, SkShader::kClamp_TileMode))->unref(); 43 pts, colors, pos, 2, SkShader::kClamp_TileMode))->unref();
44 const char* str = "e"; 44 const char* str = "e";
45 canvas.drawText(str, strlen(str), SkIntToScalar(-10), SkIntToScalar(80), paint); 45 canvas.drawText(str, strlen(str), SkIntToScalar(-10), SkIntToScalar(80), paint);
46 } 46 }
47 47
48 virtual SkISize onISize() { 48 virtual SkISize onISize() {
49 return make_isize(500, 300); 49 return SkISize::Make(500, 300);
50 } 50 }
51 51
52 void draw(SkCanvas* canvas, int x, int y, const SkIPoint& kernelOffset, 52 void draw(SkCanvas* canvas, int x, int y, const SkIPoint& kernelOffset,
53 SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAl pha, 53 SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAl pha,
54 const SkImageFilter::CropRect* cropRect = NULL) { 54 const SkImageFilter::CropRect* cropRect = NULL) {
55 SkScalar kernel[9] = { 55 SkScalar kernel[9] = {
56 SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), 56 SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
57 SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1), 57 SkIntToScalar( 1), SkIntToScalar(-7), SkIntToScalar( 1),
58 SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1), 58 SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
59 }; 59 };
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 SkBitmap fBitmap; 110 SkBitmap fBitmap;
111 bool fInitialized; 111 bool fInitialized;
112 }; 112 };
113 113
114 ////////////////////////////////////////////////////////////////////////////// 114 //////////////////////////////////////////////////////////////////////////////
115 115
116 static GM* MyFactory(void*) { return new MatrixConvolutionGM; } 116 static GM* MyFactory(void*) { return new MatrixConvolutionGM; }
117 static GMRegistry reg(MyFactory); 117 static GMRegistry reg(MyFactory);
118 118
119 } 119 }
OLDNEW
« no previous file with comments | « gm/linepaths.cpp ('k') | gm/matriximagefilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698