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=

Review-Url: https://codereview.chromium.org/2221063003
Cr-Commit-Position: refs/heads/master@{#410493}
2 files changed