Revert 146458 "[EFL][WebGL] Implement a common GraphicsSurface I..."

Source/WebCore/PlatformEfl.cmake

 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/editing/atk"
     "${WEBCORE_DIR}/page/efl"
     "${WEBCORE_DIR}/platform/cairo"
     "${WEBCORE_DIR}/platform/efl"
     "${WEBCORE_DIR}/platform/graphics/cairo"
     "${WEBCORE_DIR}/platform/graphics/efl"
     "${WEBCORE_DIR}/platform/graphics/freetype"
     "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
     "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
@@ skipping 279 matching lines @@
     )
 endif ()
 
 if (WTF_USE_3D_GRAPHICS)
     set(WTF_USE_OPENGL 1)
     add_definitions(-DWTF_USE_OPENGL=1)
 
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/platform/graphics/opengl"
         "${WEBCORE_DIR}/platform/graphics/surfaces"
-        "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
         "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
         "${WEBCORE_DIR}/platform/graphics/texmap"
     )
 
     if (WTF_USE_EGL)
         list(APPEND WebCore_INCLUDE_DIRECTORIES
             ${EGL_INCLUDE_DIR}
             "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
     )
     endif ()
 
     list(APPEND WebCore_SOURCES
         platform/graphics/cairo/DrawingBufferCairo.cpp
         platform/graphics/efl/GraphicsContext3DEfl.cpp
         platform/graphics/efl/GraphicsContext3DPrivate.cpp
         platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
         platform/graphics/opengl/GLPlatformContext.cpp
         platform/graphics/opengl/GLPlatformSurface.cpp
         platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+        platform/graphics/surfaces/GLTransportSurface.cpp
         platform/graphics/surfaces/GraphicsSurface.cpp
-        platform/graphics/surfaces/efl/GLTransportSurface.cpp
-        platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp
         platform/graphics/surfaces/glx/X11Helper.cpp
         platform/graphics/texmap/TextureMapperGL.cpp
         platform/graphics/texmap/TextureMapperShaderProgram.cpp
     )
 
     if (WTF_USE_EGL)
         list(APPEND WebCore_SOURCES
             platform/graphics/surfaces/egl/EGLConfigSelector.cpp
             platform/graphics/surfaces/egl/EGLContext.cpp
             platform/graphics/surfaces/egl/EGLSurface.cpp
         )
     else ()
         list(APPEND WebCore_SOURCES
             platform/graphics/surfaces/glx/GLXContext.cpp
             platform/graphics/surfaces/glx/GLXSurface.cpp
+            platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
         )
     endif ()
 
     if (WTF_USE_OPENGL_ES_2)
         list(APPEND WebCore_SOURCES
             platform/graphics/opengl/Extensions3DOpenGLES.cpp
             platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
         )
     else ()
         list(APPEND WebCore_SOURCES
@@ skipping 45 matching lines @@
 
 if (ENABLE_ACCESSIBILITY)
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/accessibility/atk"
         ${ATK_INCLUDE_DIRS}
     )
     list(APPEND WebCore_LIBRARIES
         ${ATK_LIBRARIES}
     )
 endif ()