diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-06 17:08:45 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:06:18 +0200 |
| commit | 20b77b6954b72436cf555fedddef2d42a10447d8 (patch) | |
| tree | 76a7f9320ce0bf3f62489704ecd5997a239bd0eb /chromium/content | |
| parent | c63998535d3add533e05ec4efa85f4fc7e34700c (diff) | |
| download | qtwebengine-chromium-20b77b6954b72436cf555fedddef2d42a10447d8.tar.gz | |
<chromium> 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: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content')
| -rw-r--r-- | chromium/content/renderer/gpu/mailbox_output_surface.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/content/renderer/gpu/mailbox_output_surface.cc b/chromium/content/renderer/gpu/mailbox_output_surface.cc index 09e1ec0f7ac..b23575da9ac 100644 --- a/chromium/content/renderer/gpu/mailbox_output_surface.cc +++ b/chromium/content/renderer/gpu/mailbox_output_surface.cc @@ -5,6 +5,7 @@ #include "content/renderer/gpu/mailbox_output_surface.h" #include "base/logging.h" +#include "cc/base/util.h" #include "cc/output/compositor_frame.h" #include "cc/output/compositor_frame_ack.h" #include "cc/output/gl_frame_data.h" |