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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 1822623002: switch colorfilters to sk_sp (Closed)

Created:
4 years, 9 months ago by reed1
Modified:
4 years, 9 months ago
Reviewers:
f(malita)
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Patch Set 5 : remove extra unref #

Patch Set 6 : #

Patch Set 7 : guard google3 #

Total comments: 1

Patch Set 8 : don't double ref #

Patch Set 9 : manual rebase #

Total comments: 18

Patch Set 10 : address comments from #20 #

Patch Set 11 : rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+419 lines, -455 lines) Patch
M bench/BlurRoundRectBench.cpp View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -3 lines 0 comments Download
M bench/ColorCubeBench.cpp View 1 2 3 chunks +4 lines, -12 lines 0 comments Download
M bench/ColorFilterBench.cpp View 1 2 2 chunks +6 lines, -7 lines 0 comments Download
M bench/ImageFilterCollapse.cpp View 1 2 3 chunks +15 lines, -29 lines 0 comments Download
M gm/blurredclippedcircle.cpp View 1 chunk +2 lines, -2 lines 0 comments Download
M gm/blurroundrect.cpp View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -3 lines 0 comments Download
M gm/color4f.cpp View 1 chunk +11 lines, -11 lines 0 comments Download
M gm/colorcube.cpp View 5 chunks +16 lines, -31 lines 0 comments Download
M gm/coloremoji.cpp View 1 1 chunk +2 lines, -2 lines 0 comments Download
M gm/colorfilterimagefilter.cpp View 1 2 3 4 5 6 7 8 9 5 chunks +17 lines, -20 lines 0 comments Download
M gm/colorfilters.cpp View 1 chunk +1 line, -1 line 0 comments Download
M gm/colormatrix.cpp View 1 1 chunk +2 lines, -2 lines 0 comments Download
M gm/dropshadowimagefilter.cpp View 1 1 chunk +1 line, -2 lines 0 comments Download
M gm/emboss.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M gm/fadefilter.cpp View 1 1 chunk +2 lines, -4 lines 0 comments Download
M gm/imagefilters.cpp View 1 2 chunks +2 lines, -2 lines 0 comments Download
M gm/imagefiltersbase.cpp View 1 2 3 4 2 chunks +3 lines, -5 lines 0 comments Download
M gm/imagefilterscropexpand.cpp View 1 2 3 4 5 6 7 8 9 3 chunks +2 lines, -4 lines 0 comments Download
M gm/imagefilterscropped.cpp View 1 1 chunk +1 line, -2 lines 0 comments Download
M gm/imagefiltersgraph.cpp View 1 4 chunks +10 lines, -13 lines 0 comments Download
M gm/lumafilter.cpp View 1 2 3 4 3 chunks +4 lines, -4 lines 0 comments Download
M gm/megalooper.cpp View 1 2 3 4 5 6 7 8 2 chunks +3 lines, -4 lines 0 comments Download
M gm/modecolorfilters.cpp View 1 1 chunk +1 line, -3 lines 0 comments Download
M gm/multipicturedraw.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M gm/recordopts.cpp View 1 1 chunk +5 lines, -5 lines 0 comments Download
M gm/skbug1719.cpp View 1 1 chunk +1 line, -2 lines 0 comments Download
M gm/tablecolorfilter.cpp View 1 5 chunks +20 lines, -21 lines 0 comments Download
M gm/testimagefilters.cpp View 1 3 chunks +6 lines, -12 lines 0 comments Download
M gm/textbloblooper.cpp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M gm/tileimagefilter.cpp View 1 1 chunk +2 lines, -2 lines 0 comments Download
M gm/vertices.cpp View 1 3 chunks +14 lines, -14 lines 0 comments Download
M gyp/skia_for_android_framework_defines.gypi View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M include/core/SkColorFilter.h View 1 2 3 3 chunks +20 lines, -4 lines 0 comments Download
M include/core/SkPaint.h View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -0 lines 0 comments Download
M include/core/SkShader.h View 1 2 3 4 5 6 7 8 9 1 chunk +1 line, -1 line 0 comments Download
M include/effects/SkBlurDrawLooper.h View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M include/effects/SkColorCubeFilter.h View 2 chunks +5 lines, -1 line 0 comments Download
M include/effects/SkColorFilterImageFilter.h View 1 chunk +1 line, -2 lines 0 comments Download
M include/effects/SkColorMatrixFilter.h View 1 chunk +13 lines, -8 lines 0 comments Download
M include/effects/SkLumaColorFilter.h View 1 2 3 4 1 chunk +5 lines, -1 line 0 comments Download
M include/effects/SkTableColorFilter.h View 2 chunks +15 lines, -3 lines 0 comments Download
M public.bzl View 1 2 3 4 5 6 7 8 2 chunks +3 lines, -1 line 0 comments Download
M samplecode/SampleAll.cpp View 1 2 3 4 5 6 7 8 3 chunks +4 lines, -4 lines 0 comments Download
M samplecode/SampleColorFilter.cpp View 1 chunk +1 line, -2 lines 0 comments Download
M samplecode/SampleFilterFuzz.cpp View 1 2 3 4 5 6 7 8 5 chunks +15 lines, -22 lines 0 comments Download
M src/core/SkBlitter.cpp View 1 2 3 4 5 6 7 8 9 2 chunks +3 lines, -2 lines 0 comments Download
M src/core/SkCanvas.cpp View 1 2 3 4 5 6 7 8 9 3 chunks +7 lines, -7 lines 0 comments Download
M src/core/SkColorFilter.cpp View 1 2 3 4 5 6 7 8 9 4 chunks +18 lines, -16 lines 0 comments Download
M src/core/SkColorFilterShader.h View 1 2 3 4 5 6 7 8 9 2 chunks +3 lines, -3 lines 0 comments Download
M src/core/SkColorFilterShader.cpp View 1 2 3 4 5 6 7 8 9 2 chunks +12 lines, -12 lines 0 comments Download
M src/core/SkColorMatrixFilterRowMajor255.h View 2 chunks +3 lines, -4 lines 0 comments Download
M src/core/SkColorMatrixFilterRowMajor255.cpp View 2 chunks +8 lines, -6 lines 0 comments Download
M src/core/SkDevice.cpp View 1 chunk +1 line, -2 lines 0 comments Download
M src/core/SkModeColorFilter.h View 1 chunk +6 lines, -1 line 0 comments Download
M src/core/SkModeColorFilter.cpp View 3 chunks +5 lines, -5 lines 0 comments Download
M src/core/SkPaint.cpp View 1 2 3 4 5 6 7 8 9 2 chunks +3 lines, -1 line 0 comments Download
M src/core/SkReadBuffer.h View 1 2 3 4 5 6 7 8 1 chunk +3 lines, -1 line 0 comments Download
M src/effects/SkBlurDrawLooper.cpp View 1 2 3 4 5 6 7 8 2 chunks +1 line, -3 lines 0 comments Download
M src/effects/SkColorCubeFilter.cpp View 2 chunks +9 lines, -9 lines 0 comments Download
M src/effects/SkColorFilterImageFilter.cpp View 1 2 3 4 5 6 7 3 chunks +7 lines, -11 lines 0 comments Download
M src/effects/SkColorMatrixFilter.cpp View 2 chunks +2 lines, -2 lines 0 comments Download
M src/effects/SkDropShadowImageFilter.cpp View 1 2 3 4 5 6 7 8 9 1 chunk +1 line, -3 lines 0 comments Download
M src/effects/SkLayerDrawLooper.cpp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M src/effects/SkLumaColorFilter.cpp View 1 chunk +3 lines, -1 line 0 comments Download
M src/effects/SkTableColorFilter.cpp View 1 2 3 4 5 6 7 6 chunks +12 lines, -12 lines 0 comments Download
M src/pdf/SkPDFDevice.cpp View 1 2 3 4 5 6 7 8 9 2 chunks +2 lines, -3 lines 0 comments Download
M src/utils/SkLua.cpp View 1 chunk +1 line, -1 line 0 comments Download
M src/utils/SkRGBAToYUV.cpp View 1 chunk +1 line, -1 line 0 comments Download
M tests/ColorFilterTest.cpp View 1 2 3 4 7 chunks +19 lines, -22 lines 0 comments Download
M tests/ColorMatrixTest.cpp View 1 3 chunks +3 lines, -3 lines 0 comments Download
M tests/GpuColorFilterTest.cpp View 1 1 chunk +1 line, -2 lines 0 comments Download
M tests/ImageFilterTest.cpp View 1 2 3 4 5 6 7 8 9 10 chunks +18 lines, -23 lines 0 comments Download
M tests/PaintTest.cpp View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -2 lines 0 comments Download
M tests/PictureTest.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M tests/RecordOptsTest.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M tests/SerializationTest.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M tests/SkColor4fTest.cpp View 1 2 3 4 5 6 7 8 9 4 chunks +11 lines, -14 lines 0 comments Download
M tools/android/SkAndroidSDKCanvas.cpp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M tools/debugger/SkDrawCommand.cpp View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -3 lines 0 comments Download

Messages

Total messages: 27 (11 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1822623002/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1822623002/40001
4 years, 9 months ago (2016-03-21 04:01:07 UTC) #3
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot on client.skia (JOB_FAILED, http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot/builds/7185)
4 years, 9 months ago (2016-03-21 04:03:17 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1822623002/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1822623002/100001
4 years, 9 months ago (2016-03-21 15:18:35 UTC) #7
reed1
4 years, 9 months ago (2016-03-21 15:20:22 UTC) #9
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1822623002/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1822623002/120001
4 years, 9 months ago (2016-03-21 15:52:04 UTC) #11
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 9 months ago (2016-03-21 16:08:43 UTC) #13
f(malita)
https://codereview.chromium.org/1822623002/diff/120001/gm/colorfilterimagefilter.cpp File gm/colorfilterimagefilter.cpp (right): https://codereview.chromium.org/1822623002/diff/120001/gm/colorfilterimagefilter.cpp#newcode140 gm/colorfilterimagefilter.cpp:140: SkAutoTUnref<SkImageFilter> grayscale(make_grayscale()); ASAN thinks this is leaking, I'm surprised ...
4 years, 9 months ago (2016-03-21 18:19:06 UTC) #14
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1822623002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1822623002/140001
4 years, 9 months ago (2016-03-21 20:45:11 UTC) #16
reed1
ptal
4 years, 9 months ago (2016-03-21 20:45:11 UTC) #17
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot on client.skia (JOB_FAILED, http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot/builds/7236)
4 years, 9 months ago (2016-03-21 20:46:21 UTC) #19
f(malita)
https://codereview.chromium.org/1822623002/diff/160001/gm/colorfilterimagefilter.cpp File gm/colorfilterimagefilter.cpp (right): https://codereview.chromium.org/1822623002/diff/160001/gm/colorfilterimagefilter.cpp#newcode212 gm/colorfilterimagefilter.cpp:212: paint.setShader(shader->makeWithColorFilter(filter.get())); No sk_sp makeWithColorFilter yet? https://codereview.chromium.org/1822623002/diff/160001/gm/imagefilterscropexpand.cpp File gm/imagefilterscropexpand.cpp (right): ...
4 years, 9 months ago (2016-03-21 22:24:19 UTC) #20
reed1
https://codereview.chromium.org/1822623002/diff/160001/gm/colorfilterimagefilter.cpp File gm/colorfilterimagefilter.cpp (right): https://codereview.chromium.org/1822623002/diff/160001/gm/colorfilterimagefilter.cpp#newcode212 gm/colorfilterimagefilter.cpp:212: paint.setShader(shader->makeWithColorFilter(filter.get())); On 2016/03/21 22:24:19, f(malita) wrote: > No sk_sp ...
4 years, 9 months ago (2016-03-22 13:47:11 UTC) #21
f(malita)
lgtm
4 years, 9 months ago (2016-03-22 13:53:16 UTC) #22
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1822623002/200001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1822623002/200001
4 years, 9 months ago (2016-03-22 14:13:56 UTC) #24
commit-bot: I haz the power
Committed patchset #11 (id:200001) as https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
4 years, 9 months ago (2016-03-22 14:23:30 UTC) #26
reed1
4 years, 9 months ago (2016-03-22 14:34:45 UTC) #27
Message was sent while issue was closed. 
A revert of this CL (patchset #11 id:200001) has been created in
https://codereview.chromium.org/1820303002/ by reed@google.com.

The reason for reverting is: need to fix unguarded makeWithFilter.

Powered by Google App Engine
This is Rietveld 408576698