[EFL][Qt][WebGL] Share the common code between GraphicsSurfaceGLX and X11WindowResources.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 9 Feb 2013 15:10:08 +0000 (15:10 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 9 Feb 2013 15:10:08 +0000 (15:10 +0000)
commit2af88770c4c453fd4d233b95850ee00eb410765a
tree0b79053dbfcc5668e17f42b69e6227bdd8fe738b
parent24920485812949f4a5a15da12ecf1aa48ebfae22
[EFL][Qt][WebGL] Share the common code between GraphicsSurfaceGLX and X11WindowResources.
https://bugs.webkit.org/show_bug.cgi?id=106666

Patch by Kondapally Kalyan <kalyan.kondapally@intel.com> on 2013-02-09
Reviewed by Kenneth Rohde Christiansen.

Covered by existing WebGL tests.

This patch removes any duplicate code in X11WindowResources and
GraphicsSurfaceGLX. No new functionality is added.

* PlatformEfl.cmake:
* Target.pri:
* platform/graphics/surfaces/egl/EGLConfigSelector.cpp:
(WebCore::EGLConfigSelector::pixmapContextConfig):
* platform/graphics/surfaces/egl/EGLConfigSelector.h:
(EGLConfigSelector):
* platform/graphics/surfaces/egl/EGLSurface.cpp:
(WebCore::EGLWindowTransportSurface::EGLWindowTransportSurface):
(WebCore::EGLWindowTransportSurface::destroy):
(WebCore::EGLWindowTransportSurface::setGeometry):
* platform/graphics/surfaces/egl/EGLSurface.h:
(WebCore):
(EGLWindowTransportSurface):
* platform/graphics/surfaces/glx/GLXConfigSelector.h:
(WebCore::GLXConfigSelector::GLXConfigSelector):
(WebCore::GLXConfigSelector::visualInfo):
(WebCore::GLXConfigSelector::pBufferContextConfig):
(WebCore::GLXConfigSelector::createSurfaceConfig):
(GLXConfigSelector):
* platform/graphics/surfaces/glx/GLXContext.cpp:
(WebCore::initializeARBExtensions):
(WebCore::GLXOffScreenContext::GLXOffScreenContext):
(WebCore::GLXOffScreenContext::initialize):
(WebCore::GLXOffScreenContext::platformReleaseCurrent):
(WebCore::GLXOffScreenContext::freeResources):
* platform/graphics/surfaces/glx/GLXContext.h:
(GLXOffScreenContext):
* platform/graphics/surfaces/glx/GLXSurface.cpp:
(WebCore::GLXTransportSurface::GLXTransportSurface):
(WebCore::GLXTransportSurface::setGeometry):
(WebCore::GLXTransportSurface::destroy):
(WebCore::GLXPBuffer::initialize):
* platform/graphics/surfaces/glx/GLXSurface.h:
(GLXTransportSurface):
(GLXPBuffer):
* platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:
(WebCore):
(WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::initialize):
(GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::createSurface):
(WebCore::GraphicsSurfacePrivate::createPixmap):
(WebCore::GraphicsSurfacePrivate::display):
(WebCore::GraphicsSurfacePrivate::flags):
(WebCore::GraphicsSurfacePrivate::clear):
(WebCore::GraphicsSurface::platformPaintToTextureMapper):
No new functionality added. Made changes to take the common code into use.

* platform/graphics/surfaces/glx/X11WindowResources.h: Removed.
* platform/graphics/surfaces/glx/X11Helper.cpp: Renamed from Source/WebCore/platform/graphics/surfaces/glx/X11WindowResources.cpp.
(WebCore):
(WebCore::DisplayConnection::DisplayConnection):
(DisplayConnection):
(WebCore::DisplayConnection::~DisplayConnection):
(WebCore::DisplayConnection::display):
(OffScreenRootWindow):
(WebCore::OffScreenRootWindow::OffScreenRootWindow):
(WebCore::OffScreenRootWindow::~OffScreenRootWindow):
(WebCore::OffScreenRootWindow::rootWindow):
(WebCore::X11Helper::resizeWindow):
(WebCore::X11Helper::createOffScreenWindow):
(WebCore::X11Helper::destroyWindow):
(WebCore::X11Helper::isXRenderExtensionSupported):
(WebCore::X11Helper::nativeDisplay):
(WebCore::X11Helper::offscreenRootWindow):
* platform/graphics/surfaces/glx/X11Helper.h: Added.
(WebCore):
(WebCore::handleXPixmapCreationError):
(X11Helper):
(ScopedXPixmapCreationErrorHandler):
(WebCore::ScopedXPixmapCreationErrorHandler::ScopedXPixmapCreationErrorHandler):
(WebCore::ScopedXPixmapCreationErrorHandler::~ScopedXPixmapCreationErrorHandler):
(WebCore::ScopedXPixmapCreationErrorHandler::isValidOperation):
Moved common code from GraphicsSurfaceGLX to X11Helper.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
16 files changed:
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/Target.pri
Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp
Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h
Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h
Source/WebCore/platform/graphics/surfaces/glx/GLXContext.cpp
Source/WebCore/platform/graphics/surfaces/glx/GLXContext.h
Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.cpp
Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.h
Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
Source/WebCore/platform/graphics/surfaces/glx/X11Helper.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/surfaces/glx/X11Helper.h [new file with mode: 0644]
Source/WebCore/platform/graphics/surfaces/glx/X11WindowResources.cpp [deleted file]
Source/WebCore/platform/graphics/surfaces/glx/X11WindowResources.h [deleted file]
Tools/qmake/mkspecs/features/features.prf