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

Issue 334173006: Clean up GLSurfaceCGL (Closed)

Created:
6 years, 6 months ago by ccameron
Modified:
6 years, 6 months ago
CC:
chromium-reviews, piman+watch_chromium.org, jam, darin-cc_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Clean up GLSurfaceCGL This is in preparation for support for using remote CALayers. The big change is to separate out ImageTransportSurfaceIOSurface into ImageTransportSurfaceFBO and its StorageProvider. The IOSurface- specific bits of ImageTransportSurfaceIOSurface are moved into the StorageProvider. A separate CALayer-specific version will be added later. While in the neighborhood, don't make everything inherit from GLSurfaceCGL (that class doesn't actually do anything). Move the helper functions and classes from its file to more appropriate locations. Make image_transport_surface_mac.cc a .mm file, because it will need to include Objective C code in the near future. Move the ImageTransportSurfaceFBO into its own file. Also make the IOSurface handles in renderer_host use the 32-bit IOSurfaceID handle type instead of uint64, since that is the type actually used by the interface, and those other bits may find use in disambiguating handle types. BUG=312462 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=277970

Patch Set 1 #

Patch Set 2 : Cleanup #

Patch Set 3 : Stick with similarity=50 (wasn't getting anywhere with that) #

Total comments: 3

Patch Set 4 : Add missed file #

Patch Set 5 : Add a missed s/uint32/IOSurfaceID/ instance #

Total comments: 1

Patch Set 6 : Incorporate review feedback #

Unified diffs Side-by-side diffs Delta from patch set Stats (+476 lines, -1080 lines) Patch
M content/browser/compositor/browser_compositor_view_mac.h View 1 2 3 2 chunks +2 lines, -1 line 0 comments Download
M content/browser/compositor/browser_compositor_view_mac.mm View 1 2 3 2 chunks +2 lines, -2 lines 0 comments Download
M content/browser/renderer_host/compositing_iosurface_mac.h View 1 2 3 3 chunks +3 lines, -3 lines 0 comments Download
M content/browser/renderer_host/compositing_iosurface_mac.mm View 1 2 3 3 chunks +3 lines, -3 lines 0 comments Download
M content/browser/renderer_host/render_widget_helper_mac.mm View 1 2 3 4 5 1 chunk +3 lines, -1 line 0 comments Download
M content/browser/renderer_host/render_widget_host_view_mac.h View 1 2 3 2 chunks +2 lines, -1 line 0 comments Download
M content/browser/renderer_host/render_widget_host_view_mac.mm View 1 2 3 3 chunks +7 lines, -3 lines 0 comments Download
A + content/common/gpu/image_transport_surface_fbo_mac.h View 1 2 chunks +72 lines, -72 lines 0 comments Download
A + content/common/gpu/image_transport_surface_fbo_mac.cc View 1 2 3 13 chunks +72 lines, -275 lines 0 comments Download
A content/common/gpu/image_transport_surface_iosurface_mac.h View 1 2 3 4 1 chunk +41 lines, -0 lines 0 comments Download
A content/common/gpu/image_transport_surface_iosurface_mac.cc View 2 1 chunk +109 lines, -0 lines 0 comments Download
D content/common/gpu/image_transport_surface_mac.cc View 1 chunk +0 lines, -548 lines 0 comments Download
A content/common/gpu/image_transport_surface_mac.mm View 1 2 3 1 chunk +74 lines, -0 lines 0 comments Download
M content/content_common.gypi View 1 chunk +5 lines, -1 line 0 comments Download
M ui/gl/BUILD.gn View 1 chunk +0 lines, -2 lines 0 comments Download
M ui/gl/gl.gyp View 1 chunk +0 lines, -2 lines 0 comments Download
M ui/gl/gl_context_cgl.cc View 1 chunk +1 line, -1 line 0 comments Download
D ui/gl/gl_surface_cgl.h View 1 chunk +0 lines, -56 lines 0 comments Download
D ui/gl/gl_surface_cgl.cc View 1 chunk +0 lines, -106 lines 0 comments Download
M ui/gl/gl_surface_mac.cc View 2 chunks +80 lines, -3 lines 0 comments Download

Messages

Total messages: 9 (0 generated)
ccameron
The actual diffs here are very small (promise, I know it doesn't look like it) ...
6 years, 6 months ago (2014-06-17 19:17:20 UTC) #1
ccameron
Adding piman for the content/browser/compositor bits (s/uint64/IOSurfaceID). I'm going to want to have a central ...
6 years, 6 months ago (2014-06-18 00:18:38 UTC) #2
ccameron
Actually adding piman
6 years, 6 months ago (2014-06-18 00:18:55 UTC) #3
piman
lgtm https://codereview.chromium.org/334173006/diff/140001/content/browser/renderer_host/render_widget_helper_mac.mm File content/browser/renderer_host/render_widget_helper_mac.mm (right): https://codereview.chromium.org/334173006/diff/140001/content/browser/renderer_host/render_widget_helper_mac.mm#newcode24 content/browser/renderer_host/render_widget_helper_mac.mm:24: IOSurfaceID io_surface_handle = static_cast<uint32>(params.surface_handle); nit: static_cast<IOSurfaceID> ?
6 years, 6 months ago (2014-06-18 00:39:55 UTC) #4
Ken Russell (switch to Gerrit)
lgtm
6 years, 6 months ago (2014-06-18 01:24:29 UTC) #5
ccameron
Thanks -- done
6 years, 6 months ago (2014-06-18 02:22:34 UTC) #6
ccameron
The CQ bit was checked by ccameron@chromium.org
6 years, 6 months ago (2014-06-18 02:22:39 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/ccameron@chromium.org/334173006/160001
6 years, 6 months ago (2014-06-18 02:24:37 UTC) #8
commit-bot: I haz the power
6 years, 6 months ago (2014-06-18 07:30:41 UTC) #9
Message was sent while issue was closed.
Change committed as 277970

Powered by Google App Engine
This is Rietveld 408576698