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

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 07d13d27f11153547e67ff40d4e2fce775f3ac6e..94531f0e836d5e0cee77832e8e491791e9678644 100644 (file)
--- 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 5742902f090970346d778df9027d7d8f54fe5e3e..4f61767223cd223c5185849bd46a61c8a7c727b3 100644 (file)
--- 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 a6643a688fc8dbe645a021f338ffdc9a4cd64241..4f2c76204fe8c1fe48d1157eb106c599230e825f 100644 (file)
--- 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 bf9c8faffee45365c3c78a044b9ca1f68072a570..484e4e03b408c1e158cdf8d3d63814356d1bc744 100644 (file)
--- 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 e29578cabc866987aaa1635bb0fbc03c11675bbf..b54e5efa97e0914dab0564ed940e1f9958607b64 100644 (file)
--- 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