diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-11-05 18:55:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-30 13:51:50 +0200 |
| commit | 230554862da8bc79701b7ec0b925816b65dc2703 (patch) | |
| tree | 35b66898ef4dc52b29d513e726246ea33bf8dbcf /chromium/cc | |
| parent | e423807fc086afaeb96fc1e8c113b4dec065c553 (diff) | |
| download | qtwebengine-chromium-230554862da8bc79701b7ec0b925816b65dc2703.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: Ie37d6cde263157e6717cc006a0896f0b9ebdaa5d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc')
| -rw-r--r-- | chromium/cc/layers/texture_layer.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/cc/layers/texture_layer.cc b/chromium/cc/layers/texture_layer.cc index 0b2784bf04d..7aa042e2831 100644 --- a/chromium/cc/layers/texture_layer.cc +++ b/chromium/cc/layers/texture_layer.cc @@ -15,6 +15,8 @@ #include "cc/layers/texture_layer_impl.h" #include "cc/trees/layer_tree_host.h" #include "components/viz/common/resources/single_release_callback.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" namespace cc { |