Guard GLContextEGL::platformContext() with USE(3D_GRAPHICS)
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jan 2014 19:34:11 +0000 (19:34 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jan 2014 19:34:11 +0000 (19:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120214

Reviewed by Philippe Normand.

Guard the GLContextEGL::platformContext() declaration and definiton with USE(3D_GRAPHICS)
since this guard is used in the GLContext class, from which the GLContextEGL class overrides
this method.

* platform/graphics/egl/GLContextEGL.cpp:
* platform/graphics/egl/GLContextEGL.h:

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
Source/WebCore/platform/graphics/egl/GLContextEGL.h

index fae2d5e..208b4da 100644 (file)
@@ -1,3 +1,17 @@
+2014-01-31  Zan Dobersek  <zdobersek@igalia.com>
+
+        Guard GLContextEGL::platformContext() with USE(3D_GRAPHICS)
+        https://bugs.webkit.org/show_bug.cgi?id=120214
+
+        Reviewed by Philippe Normand.
+
+        Guard the GLContextEGL::platformContext() declaration and definiton with USE(3D_GRAPHICS)
+        since this guard is used in the GLContext class, from which the GLContextEGL class overrides
+        this method.
+
+        * platform/graphics/egl/GLContextEGL.cpp:
+        * platform/graphics/egl/GLContextEGL.h:
+
 2014-01-31  Beth Dakin  <bdakin@apple.com>
 
         Sideways 'wobble' when scrolling with trackpad on Mavericks
index 09a7ed8..687bbe2 100644 (file)
@@ -295,7 +295,7 @@ cairo_device_t* GLContextEGL::cairoDevice()
 }
 #endif
 
-#if ENABLE(WEBGL)
+#if USE(3D_GRAPHICS)
 PlatformGraphicsContext3D GLContextEGL::platformContext()
 {
     return m_context;
index c887e0b..d1b28ea 100644 (file)
@@ -45,7 +45,7 @@ public:
     virtual cairo_device_t* cairoDevice();
 #endif
 
-#if ENABLE(WEBGL)
+#if USE(3D_GRAPHICS)
     virtual PlatformGraphicsContext3D platformContext();
 #endif