diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-19 20:10:37 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 20:10:46 +0000 |
| commit | 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc (patch) | |
| tree | 57e5d832d16aa9a0447e5102fe9811e39f8403d9 /tests/PaintTest.cpp | |
| parent | 736db1081b378ac8c167dfbc0322470d28c1cb3e (diff) | |
Reland "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c.
Reason for revert: Breaking ANGLE.
Original change's description:
> Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""
>
> This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.
>
> Bug: skia:
> Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
> Reviewed-on: https://skia-review.googlesource.com/137391
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com
Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/142588
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/PaintTest.cpp')
| -rw-r--r-- | tests/PaintTest.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 647f8e2f23..2794058ceb 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -18,7 +18,6 @@ #include "SkUtils.h" #include "SkWriteBuffer.h" #include "Test.h" -#undef ASSERT static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) { char* u8 = (char*)dst; |