diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-06 17:08:45 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-17 10:50:28 +0200 |
| commit | c9d97c73d7b1295b8c714ccaf1e5b717841bccc2 (patch) | |
| tree | 12d54ccaf91ca9f4e3d53c57ac05cab1f8f640e5 /chromium/cc | |
| parent | 679147eead574d186ebf3069647b4c23e8ccace6 (diff) | |
| download | qtwebengine-chromium-c9d97c73d7b1295b8c714ccaf1e5b717841bccc2.tar.gz | |
Solve conflicts when including both QtOpenGL headers and resource_provider.h
If resource_provider.h is going to be used to integrate delegated frame
to external compositors, it should avoid conflicting with the system's gl.h.
Change-Id: Ie37d6cde263157e6717cc006a9896f0b9ebdaa5d
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/cc')
| -rw-r--r-- | chromium/cc/layers/texture_layer.cc | 1 | ||||
| -rw-r--r-- | chromium/cc/output/delegating_renderer.cc | 1 | ||||
| -rw-r--r-- | chromium/cc/quads/content_draw_quad_base.h | 1 | ||||
| -rw-r--r-- | chromium/cc/resources/resource_provider.h | 5 |
4 files changed, 6 insertions, 2 deletions
diff --git a/chromium/cc/layers/texture_layer.cc b/chromium/cc/layers/texture_layer.cc index 316042b861a..2325a80c793 100644 --- a/chromium/cc/layers/texture_layer.cc +++ b/chromium/cc/layers/texture_layer.cc @@ -10,6 +10,7 @@ #include "cc/layers/texture_layer_client.h" #include "cc/layers/texture_layer_impl.h" #include "cc/trees/layer_tree_host.h" +#include "third_party/khronos/GLES2/gl2.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" namespace cc { diff --git a/chromium/cc/output/delegating_renderer.cc b/chromium/cc/output/delegating_renderer.cc index bd1c5d1174d..0c3051cc6dd 100644 --- a/chromium/cc/output/delegating_renderer.cc +++ b/chromium/cc/output/delegating_renderer.cc @@ -23,6 +23,7 @@ #include "cc/quads/yuv_video_draw_quad.h" #include "cc/resources/resource_provider.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" using WebKit::WebGraphicsContext3D; diff --git a/chromium/cc/quads/content_draw_quad_base.h b/chromium/cc/quads/content_draw_quad_base.h index cbf18ca2b15..6229d615ce1 100644 --- a/chromium/cc/quads/content_draw_quad_base.h +++ b/chromium/cc/quads/content_draw_quad_base.h @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/quads/draw_quad.h" -#include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" diff --git a/chromium/cc/resources/resource_provider.h b/chromium/cc/resources/resource_provider.h index b5dccc8f046..1d51a2748e7 100644 --- a/chromium/cc/resources/resource_provider.h +++ b/chromium/cc/resources/resource_provider.h @@ -20,11 +20,14 @@ #include "cc/output/output_surface.h" #include "cc/resources/texture_mailbox.h" #include "cc/resources/transferable_resource.h" -#include "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/gfx/size.h" +// A correct fix would be not to use GL types in this interal API file. +typedef unsigned int GLenum; +typedef int GLint; + namespace WebKit { class WebGraphicsContext3D; } namespace gfx { |