Title: [198729] trunk/Source/WebCore
- Revision
- 198729
- Author
- commit-qu...@webkit.org
- Date
- 2016-03-27 23:47:34 -0700 (Sun, 27 Mar 2016)
Log Message
Removed redundant #if conditions in ANGLEWebKitBridge.h
https://bugs.webkit.org/show_bug.cgi?id=155880
Patch by Konstantin Tokarev <annu...@yandex.ru> on 2016-03-27
Reviewed by Csaba Osztrogonác.
GTK, Efl, AppleWin, and WinCairo ports can be built only with cmake,
so condition !defined(BUILDING_WITH_CMAKE) implies
!PLATFORM(GTK) && !PLATFORM(EFL) && !PLATOFRM(WIN).
No new tests needed.
* platform/graphics/ANGLEWebKitBridge.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (198728 => 198729)
--- trunk/Source/WebCore/ChangeLog 2016-03-28 05:59:51 UTC (rev 198728)
+++ trunk/Source/WebCore/ChangeLog 2016-03-28 06:47:34 UTC (rev 198729)
@@ -1,3 +1,18 @@
+2016-03-27 Konstantin Tokarev <annu...@yandex.ru>
+
+ Removed redundant #if conditions in ANGLEWebKitBridge.h
+ https://bugs.webkit.org/show_bug.cgi?id=155880
+
+ Reviewed by Csaba Osztrogonác.
+
+ GTK, Efl, AppleWin, and WinCairo ports can be built only with cmake,
+ so condition !defined(BUILDING_WITH_CMAKE) implies
+ !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATOFRM(WIN).
+
+ No new tests needed.
+
+ * platform/graphics/ANGLEWebKitBridge.h:
+
2016-03-26 Alex Christensen <achristen...@webkit.org>
Mac CMake build fix.
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (198728 => 198729)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2016-03-28 05:59:51 UTC (rev 198728)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2016-03-28 06:47:34 UTC (rev 198729)
@@ -26,6 +26,7 @@
#ifndef ANGLEWebKitBridge_h
#define ANGLEWebKitBridge_h
+#include <ANGLE/ShaderLang.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
@@ -43,14 +44,6 @@
#endif
#endif
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
-#include "ANGLE/ShaderLang.h"
-#elif PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
-#include "GLSLANG/ShaderLang.h"
-#else
-#include <ANGLE/ShaderLang.h>
-#endif
-
namespace WebCore {
enum ANGLEShaderType {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
