Changeset 147553 in webkit

Timestamp:

Apr 3, 2013, 8:02:37 AM (12 years ago)

Author:

zeno.albisser@digia.com

Message:

[Qt] Fail gracefully if an OpenGL context could not be created.
​https://bugs.webkit.org/show_bug.cgi?id=113784

In case we fail to create or adopt a valid platform OpenGL context
we do not want to provide a GraphicsContext3D instance.
Otherwise we would crash as soon as the instance is being used.

Reviewed by Jocelyn Turcotte.

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
(WebCore::GraphicsContext3D::GraphicsContext3D):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt] Fail gracefully if an OpenGL context could not be created.
+        https://bugs.webkit.org/show_bug.cgi?id=113784
+
+        In case we fail to create or adopt a valid platform OpenGL context
+        we do not want to provide a GraphicsContext3D instance.
+        Otherwise we would crash as soon as the instance is being used.
+
+        Reviewed by Jocelyn Turcotte.
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2013-04-03  ChangSeok Oh  <changseok.oh@collabora.com>
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -112 +112 @@
     if (renderStyle == GraphicsContext3D::RenderToCurrentGLContext) {
         m_platformContext = QOpenGLContext::currentContext();
-        m_surface = m_platformContext->surface();
+        if (m_platformContext)
+            m_surface = m_platformContext->surface();
         return;
     }
@@ -396 +397 @@
     validateAttributes();
 
-    if (!m_private->m_surface) {
-        LOG_ERROR("GraphicsContext3D: QGLWidget initialization failed.");
+    if (!m_private->m_surface || !m_private->m_platformContext) {
+        LOG_ERROR("GraphicsContext3D: GL context creation failed.");
         m_private = nullptr;
         return;