Compile fix for WebGL on Windows without GRAPHICS_SURFACE.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Dec 2013 21:18:36 +0000 (21:18 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Dec 2013 21:18:36 +0000 (21:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=125867

Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-17
Reviewed by Martin Robinson.

Source/WebCore:

* platform/graphics/opengl/GLPlatformSurface.cpp:
(WebCore::GLPlatformSurface::createOffScreenSurface):
Protect reference to EGLOffScreenSurface with USE(GRAPHICS_SURFACE).

Source/WTF:

* wtf/FeatureDefines.h:
Removed unused ENABLE_GLIB_SUPPORT macro.
* wtf/Platform.h:
Don't use GRAPHICS_SURFACE for WebGL on Windows.

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

Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp

index 860eedc..78ba222 100644 (file)
@@ -1,5 +1,17 @@
 2013-12-17  Alex Christensen  <achristensen@webkit.org>
 
+        Compile fix for WebGL on Windows without GRAPHICS_SURFACE.
+        https://bugs.webkit.org/show_bug.cgi?id=125867
+
+        Reviewed by Martin Robinson.
+
+        * wtf/FeatureDefines.h:
+        Removed unused ENABLE_GLIB_SUPPORT macro.
+        * wtf/Platform.h:
+        Don't use GRAPHICS_SURFACE for WebGL on Windows.
+
+2013-12-17  Alex Christensen  <achristensen@webkit.org>
+
         [Win] Fixed linker error with GStreamer.
         https://bugs.webkit.org/show_bug.cgi?id=124861
 
index 37b2176..421668a 100644 (file)
 #define ENABLE_GEOLOCATION 0
 #endif
 
-#if !defined(ENABLE_GLIB_SUPPORT)
-#define ENABLE_GLIB_SUPPORT 0
-#endif
-
 #if !defined(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 #define ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING 0
 #endif
index 82b6d0d..77c76cf 100644 (file)
 #define WTF_USE_OPENGL 1
 #define WTF_USE_OPENGL_ES_2 1
 #define WTF_USE_EGL 1
-#define WTF_USE_GRAPHICS_SURFACE 1
 #endif
 
 #if USE(TEXTURE_MAPPER) && USE(3D_GRAPHICS) && !defined(WTF_USE_TEXTURE_MAPPER_GL)
index 6792f7f..9ca772d 100644 (file)
@@ -1,3 +1,14 @@
+2013-12-17  Alex Christensen  <achristensen@webkit.org>
+
+        Compile fix for WebGL on Windows without GRAPHICS_SURFACE.
+        https://bugs.webkit.org/show_bug.cgi?id=125867
+
+        Reviewed by Martin Robinson.
+
+        * platform/graphics/opengl/GLPlatformSurface.cpp:
+        (WebCore::GLPlatformSurface::createOffScreenSurface):
+        Protect reference to EGLOffScreenSurface with USE(GRAPHICS_SURFACE).
+
 2013-12-17  Radu Stavila  <stavila@adobe.com>
 
         [CSS Regions] Positioned elements in regions get clipped if they fall outside the region
index 7c354bb..43b6530 100644 (file)
@@ -47,7 +47,7 @@ PassOwnPtr<GLPlatformSurface> GLPlatformSurface::createOffScreenSurface(SurfaceA
     OwnPtr<GLPlatformSurface> surface;
 #if USE(GLX)
     surface = adoptPtr(new GLXOffScreenSurface(attributes));
-#elif USE(EGL)
+#elif USE(EGL) && USE(GRAPHICS_SURFACE)
     surface = EGLOffScreenSurface::createOffScreenSurface(attributes);
 #else
     // FIXME: Need WGL implementation for Windows