Title: [163181] trunk/Source/WebCore
- Revision
- 163181
- Author
- [email protected]
- Date
- 2014-01-31 11:34:11 -0800 (Fri, 31 Jan 2014)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163180 => 163181)
--- trunk/Source/WebCore/ChangeLog 2014-01-31 19:04:21 UTC (rev 163180)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 19:34:11 UTC (rev 163181)
@@ -1,3 +1,17 @@
+2014-01-31 Zan Dobersek <[email protected]>
+
+ 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 <[email protected]>
Sideways 'wobble' when scrolling with trackpad on Mavericks
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (163180 => 163181)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2014-01-31 19:04:21 UTC (rev 163180)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2014-01-31 19:34:11 UTC (rev 163181)
@@ -295,7 +295,7 @@
}
#endif
-#if ENABLE(WEBGL)
+#if USE(3D_GRAPHICS)
PlatformGraphicsContext3D GLContextEGL::platformContext()
{
return m_context;
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h (163180 => 163181)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h 2014-01-31 19:04:21 UTC (rev 163180)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h 2014-01-31 19:34:11 UTC (rev 163181)
@@ -45,7 +45,7 @@
virtual cairo_device_t* cairoDevice();
#endif
-#if ENABLE(WEBGL)
+#if USE(3D_GRAPHICS)
virtual PlatformGraphicsContext3D platformContext();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
