diff options
| author |  tomhudson <tomhudson@google.com> | 2015-09-18 09:36:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-18 09:36:12 -0700 |
| commit | f2608513626264459a00388537175600b515cae2 (patch) | |
| tree | 7ad1de293c0760b458904a6c89f34228be460cb3 /gyp | |
| parent | bcfd511eb1aada39622116fd1df8178b58650fba (diff) | |
Revert of add ImageShader, sharing code with its Bitmap cousin (patchset #10 id:180001 of https://codereview.chromium.org/1342113002/ )
Reason for revert:
Failing ImageNewShaderTest on both Android (Tegra3 GPU) and iOS bots.
e.g.
/Users/chrome-bot/buildbot/skiabot-ipad4-000/build/slave/workdir/build/skia/tests/
ImageNewShaderTest.cpp:24 0 == memcmp(bm1.getPixels(), bm2.getPixels(), bm1.getSize())
ImageNewShaderTest.cpp:95 0xFFFF0000 == bmt.getColor(0, y)
ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y)
ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y)
ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y)
ImageNewShaderTest.cpp:98 0xFFDEDEDE == bmt.getColor(x, y)
ImageNewShaderTest.cpp:95 0xFFFF0000 == bmt.getColor(0, y)
...
Original issue's description:
> add ImageShader, sharing code with its Bitmap cousin
>
> This is done by having abstracted the BitmapShaderContext to take a BitmapProvider, instead of just a bitmap. This allows us to share all of that code between SkBitmap and SkImage, since both are valid providers.
>
> It also means that we can simplify SkImage_Base to not need a virtual for onNewShader, since ALL images can uniformly be turned into a shader now.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/0b93e3149d2cb30860c51f9f3204ae811d9a97ca
TBR=fmalita@chromium.org,bsalomon@google.com,robertphillips@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1355863002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index fe14d9656a..710a8e4378 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -254,8 +254,6 @@ '<(skia_src_path)/image/SkImage_Generator.cpp', # '<(skia_src_path)/image/SkImage_Gpu.cpp', '<(skia_src_path)/image/SkImage_Raster.cpp', - '<(skia_src_path)/image/SkImageShader.cpp', - '<(skia_src_path)/image/SkImageShader.h', '<(skia_src_path)/image/SkSurface.cpp', '<(skia_src_path)/image/SkSurface_Base.h', # '<(skia_src_path)/image/SkSurface_Gpu.cpp', |