Title: [172121] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172121
- Author
- dburk...@apple.com
- Date
- 2014-08-05 20:27:10 -0700 (Tue, 05 Aug 2014)
Log Message
Merge r172114
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172120 => 172121)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-06 02:30:22 UTC (rev 172120)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-06 03:27:10 UTC (rev 172121)
@@ -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-08-05 Lucas Forschler <lforsch...@apple.com>
Merge r172083
Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp (172120 => 172121)
--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2014-08-06 02:30:22 UTC (rev 172120)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp 2014-08-06 03:27:10 UTC (rev 172121)
@@ -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
