| Summary: | [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Zan Dobersek <zan> | ||||
| Component: | New Bugs | Assignee: | Zan Dobersek <zan> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | achristensen, bfulgham, cgarcia, commit-queue, darin, jdapena, mrobinson, ossy, peavo, pnormand | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Unspecified | ||||||
| OS: | Unspecified | ||||||
| Bug Depends on: | |||||||
| Bug Blocks: | 138562 | ||||||
| Attachments: |
|
||||||
|
Description
Zan Dobersek
2015-03-10 04:44:53 PDT
Created attachment 248328 [details]
Patch
I don't think this is 100% correct for the Windows port, I'll have to ask around about that. 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 on attachment 248328 [details]
Patch
OK.
Comment on attachment 248328 [details] Patch Clearing flags on attachment: 248328 Committed r181629: <http://trac.webkit.org/changeset/181629> All reviewed patches have been landed. Closing bug. (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 |