diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 18:16:17 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 18:16:17 +0000 |
| commit | cd98a8c34395c06c36cacf7dfe2ab9f7a168054f (patch) | |
| tree | b8fb24fc326adbe20c90dcbe9ff8fa4b2d811a67 /cc/resource_update_controller_unittest.cc | |
| parent | f7f6d2836ab69971133d9ae7176f09602698be4c (diff) | |
| download | chromium_src-cd98a8c34395c06c36cacf7dfe2ab9f7a168054f.zip chromium_src-cd98a8c34395c06c36cacf7dfe2ab9f7a168054f.tar.gz chromium_src-cd98a8c34395c06c36cacf7dfe2ab9f7a168054f.tar.bz2 | |
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
Review URL: https://chromiumcodereview.appspot.com/11794019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_update_controller_unittest.cc')
| -rw-r--r-- | cc/resource_update_controller_unittest.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc index 64ae4f1..2da1460a 100644 --- a/cc/resource_update_controller_unittest.cc +++ b/cc/resource_update_controller_unittest.cc @@ -4,6 +4,7 @@ #include "cc/resource_update_controller.h" +#include "cc/prioritized_resource_manager.h" #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/test/fake_output_surface.h" #include "cc/test/fake_proxy.h" |