Changeset 148595 in webkit

Timestamp:

Apr 17, 2013 2:18:27 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] GraphicsContext3D: don't initialize m_extensions in the constructor
​https://bugs.webkit.org/show_bug.cgi?id=114726

Patch by Alberto Garcia <​agarcia@igalia.com> on 2013-04-17
Reviewed by Carlos Garcia Campos.

m_extensions is now initialized on demand by
GraphicsContext3D::getExtensions().

Doing it in the constructor produces a crash, because
Extensions3DOpenGLES() calls glGetString before the WebGL context
is current.

• platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:

(WebCore::GraphicsContext3D::GraphicsContext3D):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-17  Alberto Garcia  <agarcia@igalia.com>
+
+        [BlackBerry] GraphicsContext3D: don't initialize m_extensions in the constructor
+        https://bugs.webkit.org/show_bug.cgi?id=114726
+
+        Reviewed by Carlos Garcia Campos.
+
+        m_extensions is now initialized on demand by
+        GraphicsContext3D::getExtensions().
+
+        Doing it in the constructor produces a crash, because
+        Extensions3DOpenGLES() calls glGetString before the WebGL context
+        is current.
+
+        * platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2013-04-16  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Source/WebCore/platform/graphics/blackberry/GraphicsContext3DBlackBerry.cpp

@@ -57 +57 @@
     , m_context(BlackBerry::Platform::Graphics::createWebGLContext())
     , m_compiler(SH_ESSL_OUTPUT)
-    , m_extensions(adoptPtr(new Extensions3DOpenGLES(this)))
     , m_attrs(attrs)
     , m_texture(0)
@@ -110 +109 @@
     getIntegerv(GraphicsContext3D::MAX_FRAGMENT_UNIFORM_VECTORS, &ANGLEResources.MaxFragmentUniformVectors);
 
+    Extensions3D* extensions = getExtensions();
     ANGLEResources.MaxDrawBuffers = 1; // Always set to 1 for OpenGL ES.
-    ANGLEResources.OES_standard_derivatives = m_extensions->supports("GL_OES_standard_derivatives");
-    ANGLEResources.OES_EGL_image_external = m_extensions->supports("GL_EGL_image_external");
-    ANGLEResources.ARB_texture_rectangle = m_extensions->supports("GL_ARB_texture_rectangle");
+    ANGLEResources.OES_standard_derivatives = extensions->supports("GL_OES_standard_derivatives");
+    ANGLEResources.OES_EGL_image_external = extensions->supports("GL_EGL_image_external");
+    ANGLEResources.ARB_texture_rectangle = extensions->supports("GL_ARB_texture_rectangle");
 
     GC3Dint range[2], precision;