Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(374)

Issue 1355863002: Revert of add ImageShader, sharing code with its Bitmap cousin (Closed)

Created:
5 years, 3 months ago by tomhudson
Modified:
5 years, 3 months ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

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: Committed: https://skia.googlesource.com/skia/+/f2608513626264459a00388537175600b515cae2

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+40 lines, -193 lines) Patch
M gyp/core.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M src/image/SkImage.cpp View 2 chunks +1 line, -2 lines 0 comments Download
D src/image/SkImageShader.h View 1 chunk +0 lines, -44 lines 0 comments Download
D src/image/SkImageShader.cpp View 1 chunk +0 lines, -145 lines 0 comments Download
M src/image/SkImage_Base.h View 1 chunk +4 lines, -0 lines 0 comments Download
M src/image/SkImage_Generator.cpp View 2 chunks +16 lines, -0 lines 0 comments Download
M src/image/SkImage_Gpu.h View 1 chunk +3 lines, -0 lines 0 comments Download
M src/image/SkImage_Gpu.cpp View 1 chunk +7 lines, -0 lines 0 comments Download
M src/image/SkImage_Raster.cpp View 2 chunks +9 lines, -0 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
tomhudson
Created Revert of add ImageShader, sharing code with its Bitmap cousin
5 years, 3 months ago (2015-09-18 16:36:02 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1355863002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1355863002/1
5 years, 3 months ago (2015-09-18 16:36:07 UTC) #2
commit-bot: I haz the power
5 years, 3 months ago (2015-09-18 16:36:15 UTC) #3
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/f2608513626264459a00388537175600b515cae2

Powered by Google App Engine
This is Rietveld 408576698