Title: [172124] tags/Safari-600.1.2.7/Source/WebCore
- Revision
- 172124
- Author
- dburk...@apple.com
- Date
- 2014-08-05 21:25:51 -0700 (Tue, 05 Aug 2014)
Log Message
Merge r172114 <rdar://problem/17925495>.
Modified Paths
Diff
Modified: tags/Safari-600.1.2.7/Source/WebCore/ChangeLog (172123 => 172124)
--- tags/Safari-600.1.2.7/Source/WebCore/ChangeLog 2014-08-06 04:21:58 UTC (rev 172123)
+++ tags/Safari-600.1.2.7/Source/WebCore/ChangeLog 2014-08-06 04:25:51 UTC (rev 172124)
@@ -1,3 +1,18 @@
+2014-08-05 Dana Burkart <dburk...@apple.com>
+
+ Merge r172114.
+
+ 2014-08-05 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Build attempts to use ANGLE when not building WebGL.
+ https://bugs.webkit.org/show_bug.cgi?id=135630
+ <rdar://problem/135630>
+
+ Unreviewed build fix.
+
+ * platform/graphics/win/GraphicsContext3DWin.cpp: Move #include of GraphicsContext3D.h
+ inside USE(3D_GRAPHICS) guard.
+
2014-07-23 Matthew Hanson <matthew_han...@apple.com>
Merge r171499. <rdar://problem/17783423>
Modified: tags/Safari-600.1.2.7/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp (172123 => 172124)
--- tags/Safari-600.1.2.7/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2014-08-06 04:21:58 UTC (rev 172123)
+++ tags/Safari-600.1.2.7/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2014-08-06 04:25:51 UTC (rev 172124)
@@ -23,10 +23,10 @@
*/
#include "config.h"
-#include "GraphicsContext3D.h"
#if USE(3D_GRAPHICS)
+#include "GraphicsContext3D.h"
#include "GraphicsContext3DPrivate.h"
#include <WebCore/PlatformCALayerWin.h>
#include <wtf/OwnPtr.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
