Make ui/gl/... consistently use on Swiftshader includes on Windows official builds.

Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=

Committed: https://crrev.com/adbb93f546038fd7d4c809a70f8dd10d6ad2add0
Cr-Commit-Position: refs/heads/master@{#410493}

[kylechar, 2016-08-08 21:54:03]

https://codereview.chromium.org/2221063003/diff/1/ui/gl/init/BUILD.gn
File ui/gl/init/BUILD.gn (right):

https://codereview.chromium.org/2221063003/diff/1/ui/gl/init/BUILD.gn#newcode20
ui/gl/init/BUILD.gn:20: 
This include_dirs is still needed in //ui/gl/init for Windows I think? I had
crrev.com/2094513002 reverted because it was only in //ui/gl and not
//ui/gl/init. Also, it passes the trybots without the include_dir because it's
only the official windows build that enabled swiftshader.

[Kevin M, 2016-08-08 22:06:55]

https://codereview.chromium.org/2221063003/diff/1/ui/gl/init/BUILD.gn
File ui/gl/init/BUILD.gn (right):

https://codereview.chromium.org/2221063003/diff/1/ui/gl/init/BUILD.gn#newcode20
ui/gl/init/BUILD.gn:20: 
On 2016/08/08 21:54:02, kylechar wrote:
> This include_dirs is still needed in //ui/gl/init for Windows I think? I had
> crrev.com/2094513002 reverted because it was only in //ui/gl and not
> //ui/gl/init. Also, it passes the trybots without the include_dir because it's
> only the official windows build that enabled swiftshader.

Re-added include_dir to gl/init, and made the inclusion only active on official
Win builds.

[Kevin M, 2016-08-08 22:07:06]

Description was changed from

==========
Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=
==========

to

==========
Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=
==========

[Kevin M, 2016-08-08 22:08:58]

The CQ bit was checked by kmarshall@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-08 22:09:16]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[piman, 2016-08-08 22:34:30]

lgtm

[Kevin M, 2016-08-08 22:55:51]

The CQ bit was unchecked by kmarshall@chromium.org

[Kevin M, 2016-08-08 22:55:51]

The CQ bit was checked by kmarshall@chromium.org

[commit-bot: I haz the power, 2016-08-08 22:56:21]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-08 23:22:18]

Description was changed from

==========
Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=
==========

to

==========
Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=
==========

[commit-bot: I haz the power, 2016-08-08 23:22:19]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-08-08 23:24:05]

Description was changed from

==========
Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=
==========

to

==========
Make ui/gl/... consistently use on Swiftshader includes on Windows.

The existing code specifies the Swiftshader include directory for
//ui/gl/init . The Swiftshader include directory has its own
EGL headers, which collide with the Khronos EGL headers (which are
different due to Chromium-specific modifications.)

The net effect is that //ui/gl's typedefs may collide with
typdefs of //ui/gl/init/... In this case, EGLNativeDisplayType
is incompatible with USE_OZONE=1 (intptr_t in Khronos; XDisplay* in
Swiftshader.)

Moving the Swiftshader include dir to all of //ui/gl will keep things
consistent; making it Winows-only ensures that we aren't picking
up the dependency on unsupported platforms.

R=kylechar@chromium.org,piman@chromium.org,sievers@chromium.org
CC=wez@chromium.org,lethalantidote@chromium.org
BUG=

Committed: https://crrev.com/adbb93f546038fd7d4c809a70f8dd10d6ad2add0
Cr-Commit-Position: refs/heads/master@{#410493}
==========

[commit-bot: I haz the power, 2016-08-08 23:24:06]

Patchset 3 (id:??) landed as
https://crrev.com/adbb93f546038fd7d4c809a70f8dd10d6ad2add0
Cr-Commit-Position: refs/heads/master@{#410493}

[Sébastien Marchand, 2016-08-09 00:10:41]

A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.chromium.org/2226153002/ by sebmarchand@chromium.org.

The reason for reverting is: This break the Win official builds, e.g.:

C:\b\build\slave\chromium-win-pgo-builder\build\src\buildtools\win\gn.exe gen
//out/Release --check
  -> returned 1
ERROR at //ui/gl/BUILD.gn:236:7: Replacing nonempty list.
      include_dirs = [ "//third_party/swiftshader/include" ]
      ^-----------
This overwrites a previously-defined nonempty list (length 1).
See //ui/gl/BUILD.gn:132:18: for previous definition
  include_dirs = [ "//third_party/mesa/src/include" ]
                 ^----------------------------------
with another one (length 1). Did you mean "+=" to append instead? If you
really want to do this, do
  foo = []
before reassigning.
See //BUILD.gn:298:7: which caused the file to be included.
      "//ui/gl:gl_unittests",
      ^---------------------.