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

Side by Side Diff: samplecode/SampleAll.cpp

Issue 1832223002: switch xfermodes over to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
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 "SkBlurMask.h" 9 #include "SkBlurMask.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 376
377 SkEmbossMaskFilter::Light light; 377 SkEmbossMaskFilter::Light light;
378 light.fDirection[0] = SK_Scalar1/2; 378 light.fDirection[0] = SK_Scalar1/2;
379 light.fDirection[1] = SK_Scalar1/2; 379 light.fDirection[1] = SK_Scalar1/2;
380 light.fDirection[2] = SK_Scalar1/3; 380 light.fDirection[2] = SK_Scalar1/3;
381 light.fAmbient = 0x48; 381 light.fAmbient = 0x48;
382 light.fSpecular = 0x80; 382 light.fSpecular = 0x80;
383 SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5); 383 SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5);
384 SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); 384 SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light);
385 385
386 SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode);
387 auto lightingFilter = SkColorMatrixFilter::MakeLightingFilter( 386 auto lightingFilter = SkColorMatrixFilter::MakeLightingFilter(
388 0xff89bc45, 0xff112233); 387 0xff89bc45, 0xff112233);
389 388
390 canvas->save(); 389 canvas->save();
391 canvas->translate(SkIntToScalar(0), SkIntToScalar(5)); 390 canvas->translate(SkIntToScalar(0), SkIntToScalar(5));
392 paint.setAntiAlias(true); 391 paint.setAntiAlias(true);
393 paint.setFilterQuality(kLow_SkFilterQuality); 392 paint.setFilterQuality(kLow_SkFilterQuality);
394 // !!! draw through a clip 393 // !!! draw through a clip
395 paint.setColor(SK_ColorLTGRAY); 394 paint.setColor(SK_ColorLTGRAY);
396 paint.setStyle(SkPaint::kFill_Style); 395 paint.setStyle(SkPaint::kFill_Style);
397 SkRect clip = {0, 0, SkIntToScalar(320), SkIntToScalar(120)}; 396 SkRect clip = {0, 0, SkIntToScalar(320), SkIntToScalar(120)};
398 canvas->clipRect(clip); 397 canvas->clipRect(clip);
399 paint.setShader(SkShader::MakeBitmapShader(fTx, 398 paint.setShader(SkShader::MakeBitmapShader(fTx,
400 SkShader::kMirror_TileMode, SkShader::kRepeat_TileMode)); 399 SkShader::kMirror_TileMode, SkShader::kRepeat_TileMode));
401 canvas->drawPaint(paint); 400 canvas->drawPaint(paint);
402 canvas->save(); 401 canvas->save();
403 402
404 // line (exercises xfermode, colorShader, colorFilter, filterShader) 403 // line (exercises xfermode, colorShader, colorFilter, filterShader)
405 paint.setColor(SK_ColorGREEN); 404 paint.setColor(SK_ColorGREEN);
406 paint.setStrokeWidth(SkIntToScalar(10)); 405 paint.setStrokeWidth(SkIntToScalar(10));
407 paint.setStyle(SkPaint::kStroke_Style); 406 paint.setStyle(SkPaint::kStroke_Style);
408 paint.setXfermode(xfermode)->unref(); 407 paint.setXfermode(SkXfermode::Make(SkXfermode::kXor_Mode));
409 paint.setColorFilter(lightingFilter); 408 paint.setColorFilter(lightingFilter);
410 canvas->drawLine(start.fX, start.fY, stop.fX, stop.fY, paint); // should not be green 409 canvas->drawLine(start.fX, start.fY, stop.fX, stop.fY, paint); // should not be green
411 paint.setXfermode(nullptr); 410 paint.setXfermode(nullptr);
412 paint.setColorFilter(nullptr); 411 paint.setColorFilter(nullptr);
413 412
414 // rectangle 413 // rectangle
415 paint.setStyle(SkPaint::kFill_Style); 414 paint.setStyle(SkPaint::kFill_Style);
416 canvas->translate(SkIntToScalar(50), 0); 415 canvas->translate(SkIntToScalar(50), 0);
417 paint.setColor(SK_ColorYELLOW); 416 paint.setColor(SK_ColorYELLOW);
418 paint.setShader(linear); 417 paint.setShader(linear);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 498
500 sk_sp<SkShader> shaderTest() { 499 sk_sp<SkShader> shaderTest() {
501 SkPoint pts[] = { { 0, 0, }, { SkIntToScalar(100), 0 } }; 500 SkPoint pts[] = { { 0, 0, }, { SkIntToScalar(100), 0 } };
502 SkColor colors[] = { SK_ColorRED, SK_ColorBLUE }; 501 SkColor colors[] = { SK_ColorRED, SK_ColorBLUE };
503 auto shaderA = SkGradientShader::MakeLinear(pts, colors, nullptr, 502 auto shaderA = SkGradientShader::MakeLinear(pts, colors, nullptr,
504 2, SkShader::kClamp_TileMode); 503 2, SkShader::kClamp_TileMode);
505 pts[1].set(0, SkIntToScalar(100)); 504 pts[1].set(0, SkIntToScalar(100));
506 SkColor colors2[] = {SK_ColorBLACK, SkColorSetARGB(0x80, 0, 0, 0)}; 505 SkColor colors2[] = {SK_ColorBLACK, SkColorSetARGB(0x80, 0, 0, 0)};
507 auto shaderB = SkGradientShader::MakeLinear(pts, colors2, nullptr, 506 auto shaderB = SkGradientShader::MakeLinear(pts, colors2, nullptr,
508 2, SkShader::kClamp_TileMode); 507 2, SkShader::kClamp_TileMode);
509 SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(SkXfermode::kDstIn_Mode )); 508 return SkShader::MakeComposeShader(std::move(shaderA), std::move(shaderB ),
510 return SkShader::MakeComposeShader(shaderA, shaderB, mode); 509 SkXfermode::Make(SkXfermode::kDstIn_M ode));
511 } 510 }
512 511
513 virtual void startTest() { 512 virtual void startTest() {
514 decode_file("/Users/caryclark/Desktop/bugcirc.gif", &fBug); 513 decode_file("/Users/caryclark/Desktop/bugcirc.gif", &fBug);
515 decode_file("/Users/caryclark/Desktop/tbcirc.gif", &fTb); 514 decode_file("/Users/caryclark/Desktop/tbcirc.gif", &fTb);
516 decode_file("/Users/caryclark/Desktop/05psp04.gif", &fTx); 515 decode_file("/Users/caryclark/Desktop/05psp04.gif", &fTx);
517 } 516 }
518 517
519 void drawRaster(SkCanvas* canvas) { 518 void drawRaster(SkCanvas* canvas) {
520 for (size_t index = 0; index < SK_ARRAY_COUNT(gRastProcs); index++) 519 for (size_t index = 0; index < SK_ARRAY_COUNT(gRastProcs); index++)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 private: 562 private:
564 SkPoint fClickPt; 563 SkPoint fClickPt;
565 SkBitmap fBug, fTb, fTx; 564 SkBitmap fBug, fTb, fTx;
566 typedef SampleView INHERITED; 565 typedef SampleView INHERITED;
567 }; 566 };
568 567
569 ////////////////////////////////////////////////////////////////////////////// 568 //////////////////////////////////////////////////////////////////////////////
570 569
571 static SkView* MyFactory() { return new DemoView; } 570 static SkView* MyFactory() { return new DemoView; }
572 static SkViewRegister reg(MyFactory); 571 static SkViewRegister reg(MyFactory);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698