Title: [152323] trunk/Source/WebCore
- Revision
- 152323
- Author
- [email protected]
- Date
- 2013-07-02 14:58:50 -0700 (Tue, 02 Jul 2013)
Log Message
Fixed compile error in non-X11 platforms using EGL.
https://bugs.webkit.org/show_bug.cgi?id=118323
Reviewed by Brent Fulgham.
* platform/graphics/egl/GLContextEGL.cpp:
(WebCore::GLContextEGL::createPixmapContext): Put all X11-specific code into #if PLATFORM(X11).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152322 => 152323)
--- trunk/Source/WebCore/ChangeLog 2013-07-02 21:45:25 UTC (rev 152322)
+++ trunk/Source/WebCore/ChangeLog 2013-07-02 21:58:50 UTC (rev 152323)
@@ -1,3 +1,13 @@
+2013-07-02 Alex Christensen <[email protected]>
+
+ Fixed compile error in non-X11 platforms using EGL.
+ https://bugs.webkit.org/show_bug.cgi?id=118323
+
+ Reviewed by Brent Fulgham.
+
+ * platform/graphics/egl/GLContextEGL.cpp:
+ (WebCore::GLContextEGL::createPixmapContext): Put all X11-specific code into #if PLATFORM(X11).
+
2013-07-02 Radu Stavila <[email protected]>
[CSS Regions] Improve implementation of elements in region being flowed to another flow thread
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (152322 => 152323)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2013-07-02 21:45:25 UTC (rev 152322)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2013-07-02 21:58:50 UTC (rev 152323)
@@ -173,13 +173,14 @@
return nullptr;
EGLSurface surface = eglCreatePixmapSurface(display, config, pixmap, 0);
-#else
- EGLSurface surface = EGL_NO_SURFACE;
-#endif
+
if (surface == EGL_NO_SURFACE)
return nullptr;
return adoptPtr(new GLContextEGL(context, surface, PixmapSurface));
+#else
+ return nullptr;
+#endif
}
PassOwnPtr<GLContextEGL> GLContextEGL::createContext(EGLNativeWindowType window, GLContext* sharingContext)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
