Title: [152268] trunk/Source/WebCore
Revision
152268
Author
achristen...@apple.com
Date
2013-07-01 15:44:47 -0700 (Mon, 01 Jul 2013)

Log Message

Fixed unreachable return when GLX or EGL are used with WebGL.
https://bugs.webkit.org/show_bug.cgi?id=118263

Reviewed by Noam Rosenthal.

* platform/graphics/opengl/GLPlatformContext.cpp:
(WebCore::createOffScreenContext): Fixed unreachable return.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (152267 => 152268)


--- trunk/Source/WebCore/ChangeLog	2013-07-01 22:23:11 UTC (rev 152267)
+++ trunk/Source/WebCore/ChangeLog	2013-07-01 22:44:47 UTC (rev 152268)
@@ -1,3 +1,13 @@
+2013-07-01  Alex Christensen  <achristen...@apple.com>
+
+        Fixed unreachable return when GLX or EGL are used with WebGL.
+        https://bugs.webkit.org/show_bug.cgi?id=118263
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/graphics/opengl/GLPlatformContext.cpp:
+        (WebCore::createOffScreenContext): Fixed unreachable return.
+
 2013-07-01  Tim Horton  <timothy_hor...@apple.com>
 
         Maximum scroll position can be negative in some cases

Modified: trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp (152267 => 152268)


--- trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp	2013-07-01 22:23:11 UTC (rev 152267)
+++ trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp	2013-07-01 22:44:47 UTC (rev 152268)
@@ -69,9 +69,9 @@
     return adoptPtr(new GLXOffScreenContext());
 #elif USE(EGL)
     return adoptPtr(new EGLOffScreenContext());
+#else
+    return nullptr;
 #endif
-
-    return nullptr;
 }
 
 static HashSet<String> parseExtensions(const String& extensionsString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to