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

Issue 249643002: Revert of Extract most of the mutable state of SkShader into a separate Context object. (Closed)

Created:
6 years, 8 months ago by bsalomon
Modified:
6 years, 8 months ago
CC:
skia-review_googlegroups.com
Base URL:
https://skia.googlesource.com/skia.git@master
Visibility:
Public.

Description

Revert of Extract most of the mutable state of SkShader into a separate Context object. (https://codereview.chromium.org/207683004/) Reason for revert: This is blocking the DEPS roll into Chromium. Failures can be seen here: http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/174333 Original issue's description: > Extract most of the mutable state of SkShader into a separate Context object. > > SkShader currently stores some state during draw calls via setContext(...). > Move that mutable state into a separate SkShader::Context class that is > constructed on demand for the duration of the draw. > > Calls to setContext() are replaced with createContext() which returns a context > corresponding to the shader object or NULL if the parameters to createContext > are invalid. > > TEST=out/Debug/dm > BUG=skia:1976 > > Committed: http://code.google.com/p/skia/source/detail?r=14216 > > Committed: http://code.google.com/p/skia/source/detail?r=14323 TBR=scroggo@google.com,skyostil@chromium.org,tomhudson@chromium.org,senorblanco@chromium.org,reed@google.com,bungeman@google.com,dominikg@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia:1976 Committed: http://code.google.com/p/skia/source/detail?r=14326

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1087 lines, -1737 lines) Patch
M include/core/SkColorShader.h View 2 chunks +13 lines, -28 lines 0 comments Download
M include/core/SkComposeShader.h View 2 chunks +5 lines, -32 lines 0 comments Download
M include/core/SkEmptyShader.h View 1 chunk +9 lines, -17 lines 0 comments Download
M include/core/SkShader.h View 5 chunks +90 lines, -105 lines 0 comments Download
M include/effects/SkPerlinNoiseShader.h View 3 chunks +14 lines, -26 lines 0 comments Download
M include/effects/SkTransparentShader.h View 1 chunk +10 lines, -20 lines 0 comments Download
M src/core/SkBitmapProcShader.h View 2 chunks +13 lines, -47 lines 0 comments Download
M src/core/SkBitmapProcShader.cpp View 11 chunks +42 lines, -84 lines 0 comments Download
M src/core/SkBitmapProcState.h View 1 chunk +6 lines, -0 lines 0 comments Download
M src/core/SkBitmapProcState.cpp View 4 chunks +11 lines, -3 lines 0 comments Download
M src/core/SkBlitter.h View 1 chunk +0 lines, -7 lines 0 comments Download
M src/core/SkBlitter.cpp View 9 chunks +115 lines, -198 lines 0 comments Download
M src/core/SkBlitter_A8.cpp View 5 chunks +14 lines, -17 lines 0 comments Download
M src/core/SkBlitter_ARGB32.cpp View 23 chunks +37 lines, -39 lines 0 comments Download
M src/core/SkBlitter_RGB16.cpp View 20 chunks +50 lines, -59 lines 0 comments Download
M src/core/SkCanvas.cpp View 13 chunks +49 lines, -3 lines 0 comments Download
M src/core/SkComposeShader.cpp View 5 chunks +35 lines, -62 lines 0 comments Download
M src/core/SkCoreBlitters.h View 4 chunks +5 lines, -25 lines 0 comments Download
M src/core/SkDraw.cpp View 8 chunks +36 lines, -69 lines 0 comments Download
M src/core/SkFilterShader.h View 1 chunk +6 lines, -23 lines 0 comments Download
M src/core/SkFilterShader.cpp View 2 chunks +27 lines, -53 lines 0 comments Download
M src/core/SkPictureShader.h View 2 chunks +8 lines, -33 lines 0 comments Download
M src/core/SkPictureShader.cpp View 4 chunks +47 lines, -75 lines 0 comments Download
M src/core/SkShader.cpp View 11 chunks +87 lines, -77 lines 0 comments Download
M src/core/SkSmallAllocator.h View 2 chunks +3 lines, -20 lines 0 comments Download
M src/effects/SkPerlinNoiseShader.cpp View 11 chunks +25 lines, -44 lines 0 comments Download
M src/effects/SkTransparentShader.cpp View 4 chunks +13 lines, -29 lines 0 comments Download
M src/effects/gradients/SkGradientShader.cpp View 11 chunks +143 lines, -152 lines 0 comments Download
M src/effects/gradients/SkGradientShaderPriv.h View 5 chunks +21 lines, -64 lines 0 comments Download
M src/effects/gradients/SkLinearGradient.h View 1 chunk +3 lines, -17 lines 0 comments Download
M src/effects/gradients/SkLinearGradient.cpp View 6 chunks +21 lines, -36 lines 0 comments Download
M src/effects/gradients/SkRadialGradient.h View 1 chunk +4 lines, -18 lines 0 comments Download
M src/effects/gradients/SkRadialGradient.cpp View 4 chunks +14 lines, -36 lines 0 comments Download
M src/effects/gradients/SkSweepGradient.h View 2 chunks +3 lines, -19 lines 0 comments Download
M src/effects/gradients/SkSweepGradient.cpp View 3 chunks +6 lines, -24 lines 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient.h View 3 chunks +12 lines, -20 lines 0 comments Download
M src/effects/gradients/SkTwoPointConicalGradient.cpp View 7 chunks +47 lines, -74 lines 0 comments Download
M src/effects/gradients/SkTwoPointRadialGradient.h View 3 chunks +6 lines, -22 lines 0 comments Download
M src/effects/gradients/SkTwoPointRadialGradient.cpp View 3 chunks +37 lines, -60 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
bsalomon
Created Revert of Extract most of the mutable state of SkShader into a separate Context ...
6 years, 8 months ago (2014-04-23 16:16:19 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://skia-tree-status.appspot.com/cq/bsalomon@google.com/249643002/1
6 years, 8 months ago (2014-04-23 16:16:28 UTC) #2
commit-bot: I haz the power
Change committed as 14326
6 years, 8 months ago (2014-04-23 16:17:58 UTC) #3
Dominik Grewe
On 2014/04/23 16:16:28, I haz the power (commit-bot) wrote: > CQ is trying da patch. ...
6 years, 8 months ago (2014-04-23 16:18:55 UTC) #4
Dominik Grewe
On 2014/04/23 16:18:55, Dominik Grewe wrote: > On 2014/04/23 16:16:28, I haz the power (commit-bot) ...
6 years, 8 months ago (2014-04-23 16:20:48 UTC) #5
bsalomon
On 2014/04/23 16:18:55, Dominik Grewe wrote: > On 2014/04/23 16:16:28, I haz the power (commit-bot) ...
6 years, 8 months ago (2014-04-23 19:07:36 UTC) #6
bsalomon
A revert of this CL has been created in https://codereview.chromium.org/246403013/ by bsalomon@google.com. The reason for ...
6 years, 8 months ago (2014-04-23 19:09:15 UTC) #7
Dominik Grewe
6 years, 8 months ago (2014-04-23 20:23:06 UTC) #8
Message was sent while issue was closed.
On 2014/04/23 19:07:36, bsalomon wrote:
> On 2014/04/23 16:18:55, Dominik Grewe wrote:
> > On 2014/04/23 16:16:28, I haz the power (commit-bot) wrote:
> > > CQ is trying da patch. Follow status at
> > > https://skia-tree-status.appspot.com/cq/bsalomon@google.com/249643002/1
> > 
> > We're aware of this and pointed it out on the original CL (I think Leon
added
> > you to that). There's a very simple fix that we hoped we could land together
> > with the DEPS roll. We planned that last week but then had to revert due to
a
> > memory leak.
> 
> Sorry for the quick revert. There were multiple problems with the DEPS roll
> today and I lost almost the whole day to dealing with it and have kept the
Skia
> tree closed. In the future it'd be nice to have a flashier way of informing
the
> sheriff than a CC on a bug with a lot comments. Hopefully, we can automate the
> process of including Chromium changes into auto-generated DEPS rolls but until
> then non-staged changes incur a high cost. In the end I rolled to a CL before
> this revert and included the Chromium side patch. I'm going to revert the
> revert.

Thanks!

Powered by Google App Engine
This is Rietveld 408576698