From: reed@google.com Date: Wed, 3 Oct 2012 20:40:38 +0000 (+0000) Subject: revert 5794 X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~14663 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ba274d9f343c04eb09afda0a75847d9ad927644;p=platform%2Fupstream%2FlibSkiaSharp.git revert 5794 git-svn-id: http://skia.googlecode.com/svn/trunk@5795 2bbb7eff-a529-9590-31e7-b0007b416f81 --- diff --git a/gm/savelayer.cpp b/gm/savelayer.cpp deleted file mode 100644 index 9284e23..0000000 --- a/gm/savelayer.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "gm.h" -#include "SkCanvas.h" - -// This should be on SkCanvas imho -static void rotateAbout(SkCanvas* canvas, SkScalar degrees, - SkScalar px, SkScalar py) { - canvas->translate(px, py); - canvas->rotate(degrees); - canvas->translate(-px, -py); -} - -class SaveLayerGM : public skiagm::GM { - void drawStuff(SkCanvas* canvas, const SkRect& r) { - SkPaint paint; - paint.setAntiAlias(true); - canvas->drawOval(r, paint); - } - -public: - SaveLayerGM() {} - -protected: - SkString onShortName() { - return SkString("savelayer"); - } - - virtual SkISize onISize() { return SkISize::Make(100, 100); } - - virtual void onDraw(SkCanvas* canvas) { - SkPaint hairpaint; - hairpaint.setAntiAlias(true); - hairpaint.setStyle(SkPaint::kStroke_Style); - hairpaint.setColor(SK_ColorRED); - - canvas->translate(50, 50); - - SkRect r = SkRect::MakeWH(100, 60); - SkRect r2 = r; - r2.inset(5, 5); - - this->drawStuff(canvas, r); - canvas->drawRect(r, hairpaint); - canvas->translate(r.width() * 5/4, 0); - - canvas->saveLayer(&r2, NULL); - this->drawStuff(canvas, r); - canvas->restore(); - canvas->drawRect(r, hairpaint); - canvas->translate(r.width() * 5/4, 0); - - // We need to ensure that we still clip against r2 (after it is rotated) - // even though the layer's bounds will be larger (since they are the - // enclosing rect of rotated-r2). - - rotateAbout(canvas, 30, r.centerX(), r.centerY()); - canvas->saveLayer(&r2, NULL); - this->drawStuff(canvas, r); - canvas->restore(); - canvas->drawRect(r, hairpaint); - } - -private: - typedef GM INHERITED; -}; - -////////////////////////////////////////////////////////////////////////////// - -static skiagm::GM* MyFactory(void*) { return new SaveLayerGM; } -static skiagm::GMRegistry reg(MyFactory); diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 547aa61..003cb05 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -57,7 +57,6 @@ '../gm/poly2poly.cpp', '../gm/quadpaths.cpp', '../gm/samplerstress.cpp', - '../gm/savelayer.cpp', '../gm/shaderbounds.cpp', '../gm/shadertext.cpp', '../gm/shadows.cpp',