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

Issue 11794019: Avoid exposing gl bindings through cc public API headers (Closed)

Created:
7 years, 11 months ago by jamesr
Modified:
7 years, 11 months ago
Reviewers:
danakj, enne (OOO)
CC:
chromium-reviews, cc-bugs_chromium.org
Visibility:
Public.

Description

Avoid exposing gl bindings through cc public API headers The cc library uses chromium's gles2 bindings in third_party/khronos/... to bind to GL for rendering. However, users of cc may not be able to pull these headers in when including cc API - for instance, on mac any code that includes content/common/view_messages.h pulls in the Apple CGL api through npapi.h. On the 10.6 SDK these headers collide with chromium's gl headers. This avoids exposing gl2.h includes via layer_tree_host.h, mostly by not including prioritized_resource_manager.h directly in l_t_h.h. BUG=156175 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175554

Patch Set 1 #

Patch Set 2 : also make cc::*Layer headers safe #

Patch Set 3 : rebased #

Total comments: 2

Patch Set 4 : nits #

Patch Set 5 : rebased #

Unified diffs Side-by-side diffs Delta from patch set Stats (+66 lines, -25 lines) Patch
M cc/bitmap_content_layer_updater.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/bitmap_skpicture_content_layer_updater.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/caching_bitmap_content_layer_updater.h View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/caching_bitmap_content_layer_updater.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/content_layer.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M cc/content_layer_updater.h View 1 2 3 1 chunk +1 line, -0 lines 0 comments Download
M cc/image_layer.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/image_layer_updater.h View 1 2 chunks +3 lines, -5 lines 0 comments Download
M cc/image_layer_updater.cc View 1 1 chunk +11 lines, -0 lines 0 comments Download
M cc/layer_tree_host.h View 1 2 3 4 3 chunks +3 lines, -2 lines 0 comments Download
M cc/layer_tree_host.cc View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M cc/layer_tree_host_unittest.cc View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M cc/layer_updater.h View 1 2 3 3 chunks +8 lines, -4 lines 0 comments Download
M cc/layer_updater.cc View 1 2 3 1 chunk +9 lines, -4 lines 0 comments Download
M cc/nine_patch_layer.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/nine_patch_layer_unittest.cc View 1 chunk +4 lines, -3 lines 0 comments Download
M cc/resource_update_controller_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M cc/scrollbar_layer.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
M cc/scrollbar_layer.cc View 1 1 chunk +2 lines, -0 lines 0 comments Download
M cc/single_thread_proxy.cc View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M cc/skpicture_content_layer_updater.cc View 1 1 chunk +1 line, -0 lines 0 comments Download
M cc/thread_proxy.cc View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M cc/tiled_layer.h View 1 3 chunks +5 lines, -3 lines 0 comments Download
M cc/tiled_layer.cc View 1 1 chunk +3 lines, -0 lines 0 comments Download
M cc/tiled_layer_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 16 (0 generated)
jamesr
Example failure from patch https://chromiumcodereview.appspot.com/11575049/, which adds an include to cc/layer_tree_host.h from content/renderer/render_widget.cc: FAILED: clang++ ...
7 years, 11 months ago (2013-01-06 23:00:29 UTC) #1
jamesr
This also makes cc/*layer.h safe to include without picking up third_party/khronos/GLES2/gl2.h. It's mostly out-of-lining, replacing ...
7 years, 11 months ago (2013-01-06 23:42:15 UTC) #2
danakj
I don't mind the idea of replacing all GLenum with unsigned (or maybe our own ...
7 years, 11 months ago (2013-01-07 14:48:03 UTC) #3
jamesr
On 2013/01/07 14:48:03, danakj wrote: > I don't mind the idea of replacing all GLenum ...
7 years, 11 months ago (2013-01-07 17:43:45 UTC) #4
danakj
Ok, cool. LGTM
7 years, 11 months ago (2013-01-07 17:46:06 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11794019/11004
7 years, 11 months ago (2013-01-07 18:51:51 UTC) #6
jamesr
On 2013/01/07 14:48:03, danakj wrote: > How can we prevent this from happening again? How ...
7 years, 11 months ago (2013-01-07 21:10:40 UTC) #7
commit-bot: I haz the power
Retried try job too often on win_aura for step(s) content_browsertests
7 years, 11 months ago (2013-01-07 21:16:35 UTC) #8
jamesr
On 2013/01/07 21:16:35, I haz the power (commit-bot) wrote: > Retried try job too often ...
7 years, 11 months ago (2013-01-07 21:17:30 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11794019/11004
7 years, 11 months ago (2013-01-07 21:19:09 UTC) #10
commit-bot: I haz the power
Retried try job too often on win_aura for step(s) interactive_ui_tests
7 years, 11 months ago (2013-01-08 00:00:03 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11794019/11004
7 years, 11 months ago (2013-01-08 01:14:37 UTC) #12
commit-bot: I haz the power
Failed to apply patch for cc/layer_tree_host_unittest.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...
7 years, 11 months ago (2013-01-08 01:14:43 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11794019/7007
7 years, 11 months ago (2013-01-08 01:20:34 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/11794019/7007
7 years, 11 months ago (2013-01-08 17:13:51 UTC) #15
commit-bot: I haz the power
7 years, 11 months ago (2013-01-08 18:16:18 UTC) #16
Message was sent while issue was closed.
Change committed as 175554

Powered by Google App Engine
This is Rietveld 408576698