diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-14 15:02:19 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-14 15:02:19 +0000 |
| commit | 5d0b150257f9a630154a39ab6aa5cffc850d4622 (patch) | |
| tree | 11a1aed482e402c6ee44c690a6bac499f7fd23e2 | |
| parent | 54299654e964ab53189f774e30bce2adebbdc857 (diff) | |
resize canvas for GM + typo
This change resized the canvas for some GM cases. It is better to show the visual difference in viewer.html for these cases after the CL applied.
BUG=skia:2375
R=reed@google.com, djsollen@google.com
Author: yunchao.he@intel.com
Review URL: https://codereview.chromium.org/221953002
git-svn-id: http://skia.googlecode.com/svn/trunk@14177 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | expectations/gm/ignored-tests.txt | 7 | ||||
| -rw-r--r-- | gm/aaclip.cpp | 2 | ||||
| -rw-r--r-- | gm/composeshader.cpp | 2 | ||||
| -rw-r--r-- | gm/peekpixels.cpp | 2 | ||||
| -rw-r--r-- | include/core/SkComposeShader.h | 4 |
5 files changed, 12 insertions, 5 deletions
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 07d13d27f1..94531f0e83 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -67,3 +67,10 @@ drrect # reed: https://codereview.chromium.org/233943002 # GM itself may be changed image-surface + +# yunchao: https://codereview.chromium.org/221953002/ +# This change resized the canvas for some GM cases. It is better to show the +# visual difference in viewer.html for these cases. +aaclip +composeshader +peekpixels diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp index 5742902f09..4f61767223 100644 --- a/gm/aaclip.cpp +++ b/gm/aaclip.cpp @@ -76,7 +76,7 @@ protected: } virtual SkISize onISize() SK_OVERRIDE { - return SkISize::Make(640, 480); + return SkISize::Make(240, 120); } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index a6643a688f..4f2c76204f 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -56,7 +56,7 @@ protected: } virtual SkISize onISize() SK_OVERRIDE { - return make_isize(640, 480); + return make_isize(120, 120); } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { diff --git a/gm/peekpixels.cpp b/gm/peekpixels.cpp index bf9c8faffe..484e4e03b4 100644 --- a/gm/peekpixels.cpp +++ b/gm/peekpixels.cpp @@ -29,7 +29,7 @@ protected: } virtual SkISize onISize() SK_OVERRIDE { - return SkISize::Make(640, 480); + return SkISize::Make(360, 120); } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h index e29578cabc..b54e5efa97 100644 --- a/include/core/SkComposeShader.h +++ b/include/core/SkComposeShader.h @@ -17,14 +17,14 @@ class SkXfermode; /////////////////////////////////////////////////////////////////////////////////////////// /** \class SkComposeShader - This subclass of shader returns the coposition of two other shaders, combined by + This subclass of shader returns the composition of two other shaders, combined by a xfermode. */ class SK_API SkComposeShader : public SkShader { public: /** Create a new compose shader, given shaders A, B, and a combining xfermode mode. When the xfermode is called, it will be given the result from shader A as its - "dst", and the result of from shader B as its "src". + "dst", and the result from shader B as its "src". mode->xfer32(sA_result, sB_result, ...) @param shaderA The colors from this shader are seen as the "dst" by the xfermode @param shaderB The colors from this shader are seen as the "src" by the xfermode |