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

Issue 1508903002: Use GrGLTextureInfo for Skia texture handles. (Closed)

Created:
5 years ago by bsalomon
Modified:
4 years, 9 months ago
CC:
ajuma+watch-canvas_chromium.org, blink-reviews, blink-reviews-platform-graphics_chromium.org, Rik, cc-bugs_chromium.org, chromium-reviews, danakj, dshwang, drott+blinkwatch_chromium.org, krit, feature-media-reviews_chromium.org, f(malita), jbroman, Justin Novosad, pdr+graphicswatchlist_chromium.org, rwlbuis, Stephen Chennney, vmpstr+blinkwatch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@ignore_gl_target
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Use GrGLTextureInfo for Skia texture handles. Currently Chromium's Skia build uses the old interface for moving textures in and out of Ganesh using a #define. This change updates callers to use the new type that communicates the texture target in addition to the ID. This is needed to support Chromium/skia interop for rectangle and external_oes textures. CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Committed: https://crrev.com/6b8d63efcd6214ebd5477b4bb5ad944a68f6de1c Cr-Commit-Position: refs/heads/master@{#378136}

Patch Set 1 #

Patch Set 2 : rebase #

Patch Set 3 : update assertions #

Total comments: 7

Patch Set 4 : Address dcastagna's comments #

Total comments: 5

Patch Set 5 : Fix local variable name #

Patch Set 6 : Fix Canvas2DLayerBridgeTest.FullLifecycleSingleThreaded test #

Total comments: 1

Patch Set 7 : rebase #

Patch Set 8 : Consolidate reinterpret_casts #

Patch Set 9 : fix comment on #endif in new file #

Total comments: 4

Patch Set 10 : Remove missed reinterpret_casts #

Total comments: 1

Patch Set 11 : remove 'static' from 'static inline' #

Patch Set 12 : fix wrong name in canvas2dlayerbidgetest.cpp #

Patch Set 13 : One more getTextureHandle in webmediaplayer_android #

Patch Set 14 : Set target type in from mailbox in skcanvas_video_renderer #

Unified diffs Side-by-side diffs Delta from patch set Stats (+84 lines, -35 lines) Patch
M cc/output/gl_renderer.cc View 1 2 3 4 5 6 7 8 9 5 chunks +13 lines, -3 lines 0 comments Download
M cc/resources/resource_provider.cc View 1 2 3 4 5 6 7 2 chunks +6 lines, -1 line 0 comments Download
M content/renderer/media/android/webmediaplayer_android.cc View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +4 lines, -2 lines 0 comments Download
M media/renderers/skcanvas_video_renderer.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 7 chunks +22 lines, -18 lines 0 comments Download
M skia/config/SkUserConfig.h View 1 2 3 4 5 6 1 chunk +0 lines, -3 lines 0 comments Download
A skia/ext/texture_handle.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +25 lines, -0 lines 0 comments Download
M third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp View 1 2 3 4 5 6 7 2 chunks +5 lines, -4 lines 0 comments Download
M third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +4 lines, -2 lines 0 comments Download
M third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp View 1 2 3 4 5 6 7 2 chunks +3 lines, -1 line 0 comments Download
M third_party/WebKit/Source/platform/graphics/gpu/AcceleratedImageBufferSurface.cpp View 1 2 3 4 5 6 7 2 chunks +2 lines, -1 line 0 comments Download

Messages

Total messages: 49 (16 generated)
bsalomon
5 years ago (2015-12-16 16:47:27 UTC) #4
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1508903002/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1508903002/40001
5 years ago (2015-12-16 16:48:11 UTC) #6
commit-bot: I haz the power
Dry run: No L-G-T-M from a valid reviewer yet. Only full committers are accepted. Even ...
5 years ago (2015-12-16 16:48:12 UTC) #8
Daniele Castagna
https://codereview.chromium.org/1508903002/diff/40001/media/renderers/skcanvas_video_renderer.cc File media/renderers/skcanvas_video_renderer.cc (right): https://codereview.chromium.org/1508903002/diff/40001/media/renderers/skcanvas_video_renderer.cc#newcode127 media/renderers/skcanvas_video_renderer.cc:127: DCHECK_LE(source_textures[0].fID, We can get rid of these DCHECKs since ...
5 years ago (2015-12-16 17:25:51 UTC) #9
bsalomon
https://codereview.chromium.org/1508903002/diff/40001/media/renderers/skcanvas_video_renderer.cc File media/renderers/skcanvas_video_renderer.cc (right): https://codereview.chromium.org/1508903002/diff/40001/media/renderers/skcanvas_video_renderer.cc#newcode127 media/renderers/skcanvas_video_renderer.cc:127: DCHECK_LE(source_textures[0].fID, On 2015/12/16 17:25:51, Daniele Castagna wrote: > We ...
5 years ago (2015-12-16 18:09:02 UTC) #10
Daniele Castagna
https://codereview.chromium.org/1508903002/diff/40001/media/renderers/skcanvas_video_renderer.cc File media/renderers/skcanvas_video_renderer.cc (right): https://codereview.chromium.org/1508903002/diff/40001/media/renderers/skcanvas_video_renderer.cc#newcode151 media/renderers/skcanvas_video_renderer.cc:151: color_space, handles, yuvSizes, On 2015/12/16 at 18:09:02, bsalomon wrote: ...
5 years ago (2015-12-16 19:30:18 UTC) #11
bsalomon
https://codereview.chromium.org/1508903002/diff/60001/media/renderers/skcanvas_video_renderer.cc File media/renderers/skcanvas_video_renderer.cc (right): https://codereview.chromium.org/1508903002/diff/60001/media/renderers/skcanvas_video_renderer.cc#newcode193 media/renderers/skcanvas_video_renderer.cc:193: GrGLTextureInfo sourceTextureInfo; On 2015/12/16 19:30:18, Daniele Castagna wrote: > ...
5 years ago (2015-12-16 20:06:36 UTC) #12
Stephen White
All of those reinterpret_casts seem really unfortunate. Especially the one that takes a pointer to ...
5 years ago (2015-12-16 22:13:31 UTC) #13
bsalomon
On 2015/12/16 22:13:31, Stephen White wrote: > All of those reinterpret_casts seem really unfortunate. Especially ...
5 years ago (2015-12-17 16:52:03 UTC) #14
ericrk
On 2015/12/17 16:52:03, bsalomon wrote: > On 2015/12/16 22:13:31, Stephen White wrote: > > All ...
4 years, 10 months ago (2016-02-19 21:28:36 UTC) #15
Daniele Castagna
On 2016/02/19 at 21:28:36, ericrk wrote: > On 2015/12/17 16:52:03, bsalomon wrote: > > On ...
4 years, 10 months ago (2016-02-19 21:44:05 UTC) #16
bsalomon
Personally I think the risk here is pretty low. Skia doesn't retain the GrGLTextureInfo pointer. ...
4 years, 10 months ago (2016-02-22 16:37:38 UTC) #17
Stephen White
On 2016/02/22 16:37:38, bsalomon wrote: > Personally I think the risk here is pretty low. ...
4 years, 10 months ago (2016-02-22 16:41:10 UTC) #18
ericrk
On 2016/02/22 16:41:10, Stephen White wrote: > On 2016/02/22 16:37:38, bsalomon wrote: > > Personally ...
4 years, 10 months ago (2016-02-22 21:09:57 UTC) #19
bsalomon
On 2016/02/22 21:09:57, ericrk wrote: > On 2016/02/22 16:41:10, Stephen White wrote: > > On ...
4 years, 10 months ago (2016-02-23 02:29:39 UTC) #20
bsalomon
Would it be OK to land this with a TODO to change the Skia API ...
4 years, 9 months ago (2016-02-25 13:26:56 UTC) #21
Stephen White
On 2016/02/25 13:26:56, bsalomon wrote: > Would it be OK to land this with a ...
4 years, 9 months ago (2016-02-25 17:53:52 UTC) #22
bsalomon
Instead of adding conversion functions to SkUserConfig.h I added skia/ext/texture_handle.h so that I could get ...
4 years, 9 months ago (2016-02-26 16:31:27 UTC) #23
Stephen White
Thanks! Much cleaner. https://codereview.chromium.org/1508903002/diff/160001/cc/output/gl_renderer.cc File cc/output/gl_renderer.cc (right): https://codereview.chromium.org/1508903002/diff/160001/cc/output/gl_renderer.cc#newcode964 cc/output/gl_renderer.cc:964: background_image_id = reinterpret_cast<const GrGLTextureInfo*>( Could you ...
4 years, 9 months ago (2016-02-26 16:39:21 UTC) #24
bsalomon
https://codereview.chromium.org/1508903002/diff/160001/cc/output/gl_renderer.cc File cc/output/gl_renderer.cc (right): https://codereview.chromium.org/1508903002/diff/160001/cc/output/gl_renderer.cc#newcode964 cc/output/gl_renderer.cc:964: background_image_id = reinterpret_cast<const GrGLTextureInfo*>( On 2016/02/26 16:39:21, Stephen White ...
4 years, 9 months ago (2016-02-26 16:51:45 UTC) #25
Stephen White
LGTM
4 years, 9 months ago (2016-02-26 18:34:07 UTC) #26
ericrk
cc LGTM
4 years, 9 months ago (2016-02-26 19:34:58 UTC) #27
bsalomon
On 2016/02/26 19:34:58, ericrk wrote: > cc LGTM I think that just leaves media. Dale?
4 years, 9 months ago (2016-02-26 19:41:08 UTC) #28
DaleCurtis
media/ lgtm https://codereview.chromium.org/1508903002/diff/180001/skia/ext/texture_handle.h File skia/ext/texture_handle.h (right): https://codereview.chromium.org/1508903002/diff/180001/skia/ext/texture_handle.h#newcode13 skia/ext/texture_handle.h:13: static inline GrBackendObject GrGLTextureInfoToGrBackendObject( static inline in ...
4 years, 9 months ago (2016-02-26 20:43:16 UTC) #29
bsalomon
On 2016/02/26 20:43:16, DaleCurtis wrote: > media/ lgtm > > https://codereview.chromium.org/1508903002/diff/180001/skia/ext/texture_handle.h > File skia/ext/texture_handle.h (right): ...
4 years, 9 months ago (2016-02-26 21:06:24 UTC) #30
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1508903002/200001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1508903002/200001
4 years, 9 months ago (2016-02-26 21:12:54 UTC) #33
commit-bot: I haz the power
Exceeded global retry quota
4 years, 9 months ago (2016-02-26 21:44:22 UTC) #35
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1508903002/240001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1508903002/240001
4 years, 9 months ago (2016-02-27 14:47:06 UTC) #37
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_chromium_compile_dbg_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_compile_dbg_ng/builds/56769)
4 years, 9 months ago (2016-02-27 15:28:37 UTC) #39
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1508903002/240001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1508903002/240001
4 years, 9 months ago (2016-02-27 18:52:35 UTC) #42
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1508903002/260001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1508903002/260001
4 years, 9 months ago (2016-02-27 19:48:34 UTC) #45
commit-bot: I haz the power
Committed patchset #14 (id:260001)
4 years, 9 months ago (2016-02-27 23:28:37 UTC) #47
commit-bot: I haz the power
4 years, 9 months ago (2016-02-27 23:29:56 UTC) #49
Message was sent while issue was closed.
Patchset 14 (id:??) landed as
https://crrev.com/6b8d63efcd6214ebd5477b4bb5ad944a68f6de1c
Cr-Commit-Position: refs/heads/master@{#378136}

Powered by Google App Engine
This is Rietveld 408576698