Changeset 212834 in webkit

Timestamp:

Feb 22, 2017, 9:51:36 AM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r212831. rdar://problem/30628889

Location:

branches/safari-603-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• testing/Internals.cpp (modified) (1 diff)

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-22  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r212831. rdar://problem/30628889
+
+    2017-02-22  Per Arne Vollan  <pvollan@apple.com>
+
+            [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  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/testing/Internals.cpp

@@ -134 +134 @@
 #include "ViewportArguments.h"
 #include "WebCoreJSClientData.h"
+#if ENABLE(WEBGL)
 #include "WebGLRenderingContextBase.h"
+#endif
 #include "WorkerThread.h"
 #include "WritingDirection.h"