Bug 142530 - [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
Summary: [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zan Dobersek
URL:
Keywords:
Depends on:
Blocks: 138562
  Show dependency tree / graph
 
Reported: 2015-03-10 04:44 PDT by Zan Dobersek
Modified: 2015-03-17 11:04 PDT (History)
10 users (show)

See Also:

Attachments
Patch (5.83 KB, patch)
2015-03-10 04:55 PDT, Zan Dobersek 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Zan Dobersek 2015-03-10 04:44:53 PDT 
[CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
Comment 1 Zan Dobersek 2015-03-10 04:55:43 PDT 
Created attachment 248328 [details]
Patch
Comment 2 Zan Dobersek 2015-03-10 04:58:43 PDT 
I don't think this is 100% correct for the Windows port, I'll have to ask around about that.
Comment 3 WebKit Commit Bot 2015-03-10 04:58:57 PDT 
Attachment 248328 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:37:  "ANGLE/ShaderLang.h" already included at Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:33  [build/include] [4]
Total errors found: 1 in 8 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 4 Darin Adler 2015-03-10 09:57:16 PDT 
Comment on attachment 248328 [details]
Patch

OK.
Comment 5 Zan Dobersek 2015-03-17 02:46:29 PDT 
Comment on attachment 248328 [details]
Patch

Clearing flags on attachment: 248328

Committed r181629: <http://trac.webkit.org/changeset/181629>
Comment 6 Zan Dobersek 2015-03-17 02:46:38 PDT 
All reviewed patches have been landed.  Closing bug.
Comment 7 Csaba Osztrogonác 2015-03-17 09:43:43 PDT 
(In reply to comment #5)
> Comment on attachment 248328 [details]
> Patch
> 
> Clearing flags on attachment: 248328
> 
> Committed r181629: <http://trac.webkit.org/changeset/181629>

It broke the WinCairo build: 

..\platform\graphics\cairo\GraphicsContext3DCairo.cpp(42): fatal error C1083: Cannot open include file: 'ANGLE/ShaderLang.h': No such file or directory [C:\cygwin\home\webkitbot\win-cairo-release\build\Source\WebCore\WebCore.vcxproj\WebCore.vcxproj]

cc-ing WinCairo maintainers
Comment 8 Alex Christensen 2015-03-17 11:04:17 PDT 
Fixed in http://trac.webkit.org/changeset/181653