Created attachment 307371 [details]
This first patch won't build. The CMake files are wrong.
Created attachment 307372 [details]
Comment on attachment 307372 [details]
WebCore changes are just changing ShSomething to sh::Something. Straightforward.
The EGL and GLESv2 soft linking was only helping people distributing WinCairo and not wanting to distribute libGLESv2.dll and libEGL.dll, which I think is nobody. If somebody wants to do that, they can bring the soft linking back.
It looks like ANGLE now includes an Xcode build in the file you included as Source/ThirdParty/ANGLE/src/angle.xcodeproj/project.pbxproj and maybe we could adopt that sometime. Let's assume no until we find a benefit of doing so.
The Apple-added comments in ExpressionParser.cpp, glslang_tab.cpp, and glslang_tab.h remain.
Committed r215490: <http://trac.webkit.org/changeset/215490>