[EFL] Remove HAVE_GLX macro
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Oct 2013 04:09:26 +0000 (04:09 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Oct 2013 04:09:26 +0000 (04:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=123191

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/OptionsEfl.cmake: Removed unnecessary HAVE_GLX macro

Source/WebCore:

Since r138313, HAVE(GLX) was replaced to USE(GLX) except in GraphicsSurfaceToken.h.

* platform/graphics/surfaces/GraphicsSurfaceToken.h:
Replace HAVE(GLX) to USE(GLX)

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h
Source/cmake/OptionsEfl.cmake

index 90adee5..44cab4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-22  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Remove HAVE_GLX macro
+        https://bugs.webkit.org/show_bug.cgi?id=123191
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake: Removed unnecessary HAVE_GLX macro
+
 2013-10-21  Gergo Balogh  <geryxyz@inf.u-szeged.hu>
 
         Remove .qmake.conf files
index 2239841..1f50a91 100644 (file)
@@ -1,3 +1,15 @@
+2013-10-22  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Remove HAVE_GLX macro
+        https://bugs.webkit.org/show_bug.cgi?id=123191
+
+        Reviewed by Gyuyoung Kim.
+
+        Since r138313, HAVE(GLX) was replaced to USE(GLX) except in GraphicsSurfaceToken.h.
+
+        * platform/graphics/surfaces/GraphicsSurfaceToken.h:
+        Replace HAVE(GLX) to USE(GLX)
+
 2013-10-22  Mark Lam  <mark.lam@apple.com>
 
         Gardening: fix broken build on Windows.
index c97f368..5472e96 100644 (file)
@@ -41,7 +41,7 @@ struct GraphicsSurfaceToken {
     typedef HANDLE BufferHandle;
 #endif
 
-#if HAVE(GLX)
+#if USE(GLX)
     GraphicsSurfaceToken(uint32_t windowID = 0)
         : frontBufferHandle(windowID)
     { }
index 2800a20..37c2f86 100644 (file)
@@ -196,10 +196,6 @@ if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
     find_package(OpenGL REQUIRED)
     CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
 
-    if (OPENGLX_FOUND)
-        add_definitions(-DHAVE_GLX)
-    endif ()
-
     option(ENABLE_EGL "Enable EGL Support")
 
     if (ENABLE_EGL)