diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 13:35:01 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 13:35:01 +0000 |
commit | ee0cac336c6a3a357ae3cb18be8ef4b3cb5edddb (patch) | |
tree | c71916deffeca1a48b45639e8cb373a188af57ac /samplecode | |
parent | 61744ec1d2b0e287a652a419dac285c6a803e270 (diff) |
remove unused (by clients) SkUnitMapper
BUG=skia:
R=robertphillips@google.com, scroggo@google.com, george@mozilla.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/283273002
git-svn-id: http://skia.googlecode.com/svn/trunk@14761 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleAll.cpp | 9 | ||||
-rw-r--r-- | samplecode/SampleGradients.cpp | 35 | ||||
-rw-r--r-- | samplecode/SampleLayers.cpp | 2 | ||||
-rw-r--r-- | samplecode/SamplePatch.cpp | 2 | ||||
-rw-r--r-- | samplecode/SampleShaderText.cpp | 40 | ||||
-rw-r--r-- | samplecode/SampleSlides.cpp | 29 | ||||
-rw-r--r-- | samplecode/SampleTiling.cpp | 10 | ||||
-rw-r--r-- | samplecode/SampleUnitMapper.cpp | 172 | ||||
-rw-r--r-- | samplecode/SampleVertices.cpp | 2 |
9 files changed, 44 insertions, 257 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index ea1f143288..92fe258dd6 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -36,7 +36,6 @@ #include "SkRandom.h" #include "SkTransparentShader.h" #include "SkTypeface.h" -#include "SkUnitMappers.h" #include "SkUtils.h" #include "SkXfermode.h" @@ -368,10 +367,8 @@ protected: SkScalar* linearPos = NULL; int linearCount = 2; SkShader::TileMode linearMode = SkShader::kMirror_TileMode; - SkUnitMapper* linearMapper = new SkDiscreteMapper(3); - SkAutoUnref unmapLinearMapper(linearMapper); SkShader* linear = SkGradientShader::CreateLinear(linearPoints, - linearColors, linearPos, linearCount, linearMode, linearMapper); + linearColors, linearPos, linearCount, linearMode); SkPoint radialCenter = { SkIntToScalar(25), SkIntToScalar(25) }; SkScalar radialRadius = SkIntToScalar(25); @@ -379,11 +376,9 @@ protected: SkScalar radialPos[] = { 0, SkIntToScalar(3) / 5, SkIntToScalar(1)}; int radialCount = 3; SkShader::TileMode radialMode = SkShader::kRepeat_TileMode; - SkUnitMapper* radialMapper = new SkCosineMapper(); - SkAutoUnref unmapRadialMapper(radialMapper); SkShader* radial = SkGradientShader::CreateRadial(radialCenter, radialRadius, radialColors, radialPos, radialCount, - radialMode, radialMapper); + radialMode); SkTransparentShader* transparentShader = new SkTransparentShader(); SkEmbossMaskFilter::Light light; diff --git a/samplecode/SampleGradients.cpp b/samplecode/SampleGradients.cpp index fead71473f..f328d761a5 100644 --- a/samplecode/SampleGradients.cpp +++ b/samplecode/SampleGradients.cpp @@ -13,8 +13,7 @@ static SkShader* setgrad(const SkRect& r, SkColor c0, SkColor c1) { SkColor colors[] = { c0, c1 }; SkPoint pts[] = { { r.fLeft, r.fTop }, { r.fRight, r.fTop } }; - return SkGradientShader::CreateLinear(pts, colors, NULL, 2, - SkShader::kClamp_TileMode, NULL); + return SkGradientShader::CreateLinear(pts, colors, NULL, 2, SkShader::kClamp_TileMode); } static void test_alphagradients(SkCanvas* canvas) { @@ -64,32 +63,26 @@ static const GradData gGradData[] = { { 5, gColors, gPos2 } }; -static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { - return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, - data.fCount, tm, mapper); +static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { + return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, data.fCount, tm); } -static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); return SkGradientShader::CreateRadial(center, center.fX, data.fColors, - data.fPos, data.fCount, tm, mapper); + data.fPos, data.fCount, tm); } -static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); - return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, - data.fPos, data.fCount, mapper); + return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, data.fPos, data.fCount); } -static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center0, center1; center0.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); @@ -98,22 +91,22 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, return SkGradientShader::CreateTwoPointRadial( center1, (pts[1].fX - pts[0].fX) / 7, center0, (pts[1].fX - pts[0].fX) / 2, - data.fColors, data.fPos, data.fCount, tm, mapper); + data.fColors, data.fPos, data.fCount, tm); } static SkShader* Make2RadialConcentric(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { + SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); return SkGradientShader::CreateTwoPointRadial( center, (pts[1].fX - pts[0].fX) / 7, center, (pts[1].fX - pts[0].fX) / 2, - data.fColors, data.fPos, data.fCount, tm, mapper); + data.fColors, data.fPos, data.fCount, tm); } -typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper); +typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm); + static const GradMaker gGradMakers[] = { MakeLinear, MakeRadial, MakeSweep, Make2Radial, Make2RadialConcentric }; @@ -154,7 +147,7 @@ protected: canvas->save(); for (size_t j = 0; j < SK_ARRAY_COUNT(gGradMakers); j++) { SkShader* shader; - shader = gGradMakers[j](pts, gGradData[i], (SkShader::TileMode)tm, NULL); + shader = gGradMakers[j](pts, gGradData[i], (SkShader::TileMode)tm); paint.setShader(shader)->unref(); canvas->drawRect(r, paint); canvas->translate(0, SkIntToScalar(120)); diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp index 51f02a1ade..43f5d4236a 100644 --- a/samplecode/SampleLayers.cpp +++ b/samplecode/SampleLayers.cpp @@ -31,7 +31,7 @@ static void make_paint(SkPaint* paint, const SkMatrix& localMatrix) { SkColor colors[] = { 0, SK_ColorWHITE }; SkPoint pts[] = { { 0, 0 }, { 0, SK_Scalar1*20 } }; SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL, 2, SkShader::kClamp_TileMode, - NULL, 0, &localMatrix); + 0, &localMatrix); paint->setShader(s)->unref(); paint->setXfermodeMode(SkXfermode::kDstIn_Mode); diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp index 09eb42f6aa..fe94bbfd52 100644 --- a/samplecode/SamplePatch.cpp +++ b/samplecode/SamplePatch.cpp @@ -42,7 +42,7 @@ static SkShader* make_shader1(const SkIPoint& size) { { SkIntToScalar(size.fX), SkIntToScalar(size.fY) } }; SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorRED }; return SkGradientShader::CreateLinear(pts, colors, NULL, - SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode, NULL); + SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode); } /////////////////////////////////////////////////////////////////////////////// diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp index c7048ab401..6f23a0b6b3 100644 --- a/samplecode/SampleShaderText.cpp +++ b/samplecode/SampleShaderText.cpp @@ -1,15 +1,14 @@ - /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SampleCode.h" #include "SkView.h" #include "SkCanvas.h" #include "SkGradientShader.h" -#include "SkUnitMappers.h" static void makebm(SkBitmap* bm, int w, int h) { bm->allocN32Pixels(w, h); @@ -22,15 +21,9 @@ static void makebm(SkBitmap* bm, int w, int h) { SkScalar pos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; SkPaint paint; - SkUnitMapper* um = NULL; - - um = new SkCosineMapper; - - SkAutoUnref au(um); - paint.setDither(true); paint.setShader(SkGradientShader::CreateLinear(pts, colors, pos, - SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode, um))->unref(); + SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode))->unref(); canvas.drawPaint(paint); } @@ -60,32 +53,26 @@ static const GradData gGradData[] = { { 5, gColors, NULL }, }; -static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { - return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, - data.fCount, tm, mapper); +static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { + return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, data.fCount, tm); } -static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); return SkGradientShader::CreateRadial(center, center.fX, data.fColors, - data.fPos, data.fCount, tm, mapper); + data.fPos, data.fCount, tm); } -static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); - return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, - data.fPos, data.fCount, mapper); + return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, data.fPos, data.fCount); } -static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center0, center1; center0.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); @@ -94,11 +81,11 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, return SkGradientShader::CreateTwoPointRadial( center1, (pts[1].fX - pts[0].fX) / 7, center0, (pts[1].fX - pts[0].fX) / 2, - data.fColors, data.fPos, data.fCount, tm, mapper); + data.fColors, data.fPos, data.fCount, tm); } -typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper); +typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm); + static const GradMaker gGradMakers[] = { MakeLinear, MakeRadial, MakeSweep, Make2Radial }; @@ -152,8 +139,7 @@ protected: for (size_t m = 0; m < SK_ARRAY_COUNT(gGradMakers); ++m) { shaders[shdIdx++] = gGradMakers[m](pts, gGradData[d], - SkShader::kClamp_TileMode, - NULL); + SkShader::kClamp_TileMode); } } for (size_t tx = 0; tx < SK_ARRAY_COUNT(tileModes); ++tx) { diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index d828ae601f..6bc9a28fd3 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -178,32 +178,26 @@ static const GradData gGradData[] = { { 5, gColors, gPos2 } }; -static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { - return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, - data.fCount, tm, mapper); +static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { + return SkGradientShader::CreateLinear(pts, data.fColors, data.fPos, data.fCount, tm); } -static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* MakeRadial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); return SkGradientShader::CreateRadial(center, center.fX, data.fColors, - data.fPos, data.fCount, tm, mapper); + data.fPos, data.fCount, tm); } -static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center; center.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); - return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, - data.fPos, data.fCount, mapper); + return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, data.fPos, data.fCount); } -static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper) { +static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { SkPoint center0, center1; center0.set(SkScalarAve(pts[0].fX, pts[1].fX), SkScalarAve(pts[0].fY, pts[1].fY)); @@ -212,11 +206,10 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, return SkGradientShader::CreateTwoPointRadial( center1, (pts[1].fX - pts[0].fX) / 7, center0, (pts[1].fX - pts[0].fX) / 2, - data.fColors, data.fPos, data.fCount, tm, mapper); + data.fColors, data.fPos, data.fCount, tm); } -typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, - SkShader::TileMode tm, SkUnitMapper* mapper); +typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm); static const GradMaker gGradMakers[] = { MakeLinear, MakeRadial, MakeSweep, Make2Radial }; @@ -236,7 +229,7 @@ static void gradient_slide(SkCanvas* canvas) { for (size_t i = 0; i < SK_ARRAY_COUNT(gGradData); i++) { canvas->save(); for (size_t j = 0; j < SK_ARRAY_COUNT(gGradMakers); j++) { - SkShader* shader = gGradMakers[j](pts, gGradData[i], tm, NULL); + SkShader* shader = gGradMakers[j](pts, gGradData[i], tm); paint.setShader(shader); canvas->drawRect(r, paint); shader->unref(); @@ -335,7 +328,7 @@ static SkShader* make_shader1(const SkIPoint& size) { { SkIntToScalar(size.fX), SkIntToScalar(size.fY) } }; SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorRED }; return SkGradientShader::CreateLinear(pts, colors, NULL, - SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode, NULL); + SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode); } class Rec { diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp index cc3b52915d..a59a8021b6 100644 --- a/samplecode/SampleTiling.cpp +++ b/samplecode/SampleTiling.cpp @@ -21,7 +21,6 @@ // effects #include "SkGradientShader.h" -#include "SkUnitMappers.h" #include "SkBlurMask.h" #include "SkBlurDrawLooper.h" @@ -35,16 +34,9 @@ static void makebm(SkBitmap* bm, SkColorType ct, int w, int h) { SkScalar pos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; SkPaint paint; - SkUnitMapper* um = NULL; - - um = new SkCosineMapper; -// um = new SkDiscreteMapper(12); - - SkAutoUnref au(um); - paint.setDither(true); paint.setShader(SkGradientShader::CreateLinear(pts, colors, pos, - SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode, um))->unref(); + SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode))->unref(); canvas.drawPaint(paint); } diff --git a/samplecode/SampleUnitMapper.cpp b/samplecode/SampleUnitMapper.cpp deleted file mode 100644 index db9af09f38..0000000000 --- a/samplecode/SampleUnitMapper.cpp +++ /dev/null @@ -1,172 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "SampleCode.h" -#include "SkView.h" -#include "SkCanvas.h" -#include "SkDevice.h" -#include "SkPaint.h" -#include "SkUnitMappers.h" -#include "SkCubicInterval.h" - -#include "SkWidgetViews.h" - -static SkStaticTextView* make_textview(SkView* parent, - const SkRect& bounds, - const SkPaint& paint) { - SkStaticTextView* view = new SkStaticTextView; - view->setMode(SkStaticTextView::kFixedSize_Mode); - view->setPaint(paint); - view->setVisibleP(true); - view->setSize(bounds.width(), bounds.height()); - view->setLoc(bounds.fLeft, bounds.fTop); - parent->attachChildToFront(view)->unref(); - return view; -} - -static void set_scalar(SkStaticTextView* view, SkScalar value) { - SkString str; - str.appendScalar(value); - view->setText(str); -} - -class UnitMapperView : public SampleView { - SkPoint fPts[4]; - SkMatrix fMatrix; - SkStaticTextView* fViews[4]; - - void setViews() { - set_scalar(fViews[0], fPts[1].fX); - set_scalar(fViews[1], fPts[1].fY); - set_scalar(fViews[2], fPts[2].fX); - set_scalar(fViews[3], fPts[2].fY); - } - -public: - UnitMapperView() { - fPts[0].set(0, 0); - fPts[1].set(SK_Scalar1 / 3, SK_Scalar1 / 3); - fPts[2].set(SK_Scalar1 * 2 / 3, SK_Scalar1 * 2 / 3); - fPts[3].set(SK_Scalar1, SK_Scalar1); - - fMatrix.setScale(SK_Scalar1 * 200, -SK_Scalar1 * 200); - fMatrix.postTranslate(SkIntToScalar(100), SkIntToScalar(300)); - - SkRect r = { - SkIntToScalar(350), SkIntToScalar(100), - SkIntToScalar(500), SkIntToScalar(130) - }; - SkPaint paint; - paint.setAntiAlias(true); - paint.setTextSize(SkIntToScalar(25)); - for (int i = 0; i < 4; i++) { - fViews[i] = make_textview(this, r, paint); - r.offset(0, r.height()); - } - this->setViews(); - } - -protected: - // overrides from SkEventSink - virtual bool onQuery(SkEvent* evt) { - if (SampleCode::TitleQ(*evt)) { - SampleCode::TitleR(evt, "UnitMapper"); - return true; - } - return this->INHERITED::onQuery(evt); - } - - virtual void onDrawContent(SkCanvas* canvas) { - SkPaint paint; - paint.setAntiAlias(true); - paint.setColor(0xFF8888FF); - - SkRect r = { 0, 0, SK_Scalar1, SK_Scalar1 }; - - canvas->concat(fMatrix); - canvas->drawRect(r, paint); - - paint.setColor(SK_ColorBLACK); - paint.setStyle(SkPaint::kStroke_Style); - paint.setStrokeWidth(0); - paint.setStrokeCap(SkPaint::kRound_Cap); - - SkPath path; - path.moveTo(fPts[0]); - path.cubicTo(fPts[1], fPts[2], fPts[3]); - canvas->drawPath(path, paint); - - paint.setColor(SK_ColorRED); - paint.setStrokeWidth(0); - canvas->drawLine(0, 0, SK_Scalar1, SK_Scalar1, paint); - - paint.setColor(SK_ColorBLUE); - paint.setStrokeWidth(SK_Scalar1 / 60); - for (int i = 0; i < 50; i++) { - SkScalar x = i * SK_Scalar1 / 49; - canvas->drawPoint(x, SkEvalCubicInterval(&fPts[1], x), paint); - } - - paint.setStrokeWidth(SK_Scalar1 / 20); - paint.setColor(SK_ColorGREEN); - canvas->drawPoints(SkCanvas::kPoints_PointMode, 2, &fPts[1], paint); - } - - bool invertPt(SkScalar x, SkScalar y, SkPoint* result) { - if (NULL == result) - return true; - - SkMatrix m; - if (!fMatrix.invert(&m)) { - return false; - } - - m.mapXY(x, y, result); - return true; - } - - int hittest(SkScalar x, SkScalar y) { - SkPoint target = { x, y }; - SkPoint pts[2] = { fPts[1], fPts[2] }; - fMatrix.mapPoints(pts, 2); - for (int i = 0; i < 2; i++) { - if (SkPoint::Distance(pts[i], target) < SkIntToScalar(4)) { - return i + 1; - } - } - return -1; - } - - virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned) SK_OVERRIDE { - fDragIndex = hittest(x, y); - return fDragIndex >= 0 ? new Click(this) : NULL; - } - - virtual bool onClick(Click* click) { - if (fDragIndex >= 0) { - if (!invertPt(click->fCurr.fX, click->fCurr.fY, - &fPts[fDragIndex])) { - return false; - } - - this->setViews(); - this->inval(NULL); - return true; - } - return false; - } - -private: - int fDragIndex; - - typedef SampleView INHERITED; -}; - -////////////////////////////////////////////////////////////////////////////// - -static SkView* MyFactory() { return new UnitMapperView; } -static SkViewRegister reg(MyFactory); diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp index 4c3a17eb00..1e568f5568 100644 --- a/samplecode/SampleVertices.cpp +++ b/samplecode/SampleVertices.cpp @@ -47,7 +47,7 @@ static SkShader* make_shader1(const SkIPoint& size) { { SkIntToScalar(size.fX), SkIntToScalar(size.fY) } }; SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorRED }; return SkGradientShader::CreateLinear(pts, colors, NULL, - SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode, NULL); + SK_ARRAY_COUNT(colors), SkShader::kMirror_TileMode); } class VerticesView : public SampleView { |