summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-02 20:51:13 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-02 20:51:13 +0000
commit9c360f54d4a28c6444084ca77ecaea157c755adc (patch)
treea7c4722556d1226f08adbf6ce8f3626038ae715f
parent127aa5e2feea726539c7c8d86034f606435c0c48 (diff)
downloadinclude-9c360f54d4a28c6444084ca77ecaea157c755adc.tar.gz
Revert of Remove setLocalMatrix calls from picture shader GM. (https://codereview.chromium.org/260863007/)
Reason for revert: changed GM unexpectedly. will sort out and try again Original issue's description: > Remove setLocalMatrix calls from picture shader GM. > > This makes all --skr tests pass for me. Enabling it by default in DM. > > BUG=skia:2378 > > Committed: http://code.google.com/p/skia/source/detail?r=14549 R=reed@google.com, fmalita@google.com, mtklein@chromium.org TBR=fmalita@google.com, mtklein@chromium.org, reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia:2378 Author: mtklein@google.com Review URL: https://codereview.chromium.org/265013003 git-svn-id: http://skia.googlecode.com/svn/trunk/include@14550 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--core/SkShader.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/SkShader.h b/core/SkShader.h
index bcb229d..32707d7 100644
--- a/core/SkShader.h
+++ b/core/SkShader.h
@@ -402,8 +402,7 @@ public:
* @param tmy The tiling mode to use when sampling the bitmap in the y-direction.
* @return Returns a new shader object. Note: this function never returns null.
*/
- static SkShader* CreatePictureShader(SkPicture* src, TileMode tmx, TileMode tmy,
- const SkMatrix* localMatrix = NULL);
+ static SkShader* CreatePictureShader(SkPicture* src, TileMode tmx, TileMode tmy);
SK_TO_STRING_VIRT()
SK_DEFINE_FLATTENABLE_TYPE(SkShader)