Title: [212834] branches/safari-603-branch/Source/WebCore
- Revision
- 212834
- Author
- [email protected]
- Date
- 2017-02-22 09:51:36 -0800 (Wed, 22 Feb 2017)
Log Message
Merge r212831. rdar://problem/30628889
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212833 => 212834)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-22 17:44:34 UTC (rev 212833)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-22 17:51:36 UTC (rev 212834)
@@ -1,5 +1,20 @@
2017-02-22 Matthew Hanson <[email protected]>
+ Merge r212831. rdar://problem/30628889
+
+ 2017-02-22 Per Arne Vollan <[email protected]>
+
+ [Win] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=168713
+
+ Reviewed by Brent Fulgham.
+
+ The include file <ANGLE/ShaderLang.h> is not found.
+
+ * testing/Internals.cpp:
+
+2017-02-22 Matthew Hanson <[email protected]>
+
Merge r212819. rdar://problem/30640217
2017-02-22 Matthew Hanson <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/testing/Internals.cpp (212833 => 212834)
--- branches/safari-603-branch/Source/WebCore/testing/Internals.cpp 2017-02-22 17:44:34 UTC (rev 212833)
+++ branches/safari-603-branch/Source/WebCore/testing/Internals.cpp 2017-02-22 17:51:36 UTC (rev 212834)
@@ -133,7 +133,9 @@
#include "UserMediaController.h"
#include "ViewportArguments.h"
#include "WebCoreJSClientData.h"
+#if ENABLE(WEBGL)
#include "WebGLRenderingContextBase.h"
+#endif
#include "WorkerThread.h"
#include "WritingDirection.h"
#include "XMLHttpRequest.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
