| Index: Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
|
| diff --git a/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp b/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
|
| index 218c5e7e3bc1df892f3718921e8f0a7e02def39a..6c88190c576a3348451a9d37ec6b2e83d70bdcea 100644
|
| --- a/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
|
| +++ b/Source/WebCore/platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
|
| @@ -28,12 +28,6 @@
|
| #include <EGL/egl.h>
|
| #include <EGL/eglext.h>
|
|
|
| -#if PLATFORM(QT)
|
| -#include <QGuiApplication>
|
| -#include <QOpenGLContext>
|
| -#include <qpa/qplatformnativeinterface.h>
|
| -#endif
|
| -
|
| namespace WebCore {
|
|
|
| #define STRINGIFY(...) #__VA_ARGS__
|
| @@ -107,12 +101,6 @@ public:
|
|
|
| if (!m_eglDisplay || !m_eglContext || !m_eglConfig) {
|
| m_eglDisplay = eglGetCurrentDisplay();
|
| -
|
| -#if PLATFORM(QT)
|
| - QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
|
| - m_eglConfig = static_cast<EGLConfig>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("eglConfig"), shareContext));
|
| - EGLContext eglShareContext = static_cast<EGLContext>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("eglContext"), shareContext));
|
| -#endif
|
| EGLint contextAttributes[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
|
| m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig, eglShareContext, contextAttributes);
|
| }
|
| @@ -315,15 +303,9 @@ protected:
|
|
|
| EGLSurface createSurfaceFromShareHandle(const IntSize& size, HANDLE shareHandle)
|
| {
|
| - if (!m_eglDisplay || !m_eglConfig) {
|
| + if (!m_eglDisplay || !m_eglConfig)
|
| m_eglDisplay = eglGetCurrentDisplay();
|
|
|
| -#if PLATFORM(QT)
|
| - QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
|
| - m_eglConfig = static_cast<EGLConfig>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("eglConfig"), QOpenGLContext::currentContext()));
|
| -#endif
|
| - }
|
| -
|
| EGLint attributes[] = {
|
| EGL_WIDTH, size.width(),
|
| EGL_HEIGHT, size.height(),
|
|
|