Changeset 139030 in webkit

Timestamp:

Jan 7, 2013 8:58:03 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WebGL] Crash of WebKitTestRunner when running webgl layout tests
​https://bugs.webkit.org/show_bug.cgi?id=105936

Patch by Viatcheslav Ostapenko <​sl.ostapenko@samsung.com> on 2013-01-07
Reviewed by Laszlo Gombos.

If canvas window becomes invalid don't create pixmap from it and don't
use it for painting.

Improves stability of existing webgl layout tests.

• platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:

(WebCore::GraphicsSurfacePrivate::createPixmap):
(WebCore::GraphicsSurfacePrivate::size):
(WebCore::GraphicsSurface::platformGetTextureID):
(WebCore::GraphicsSurface::platformPaintToTextureMapper):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Viatcheslav Ostapenko  <sl.ostapenko@samsung.com>
+
+        [EFL][WebGL] Crash of WebKitTestRunner when running webgl layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=105936
+
+        Reviewed by Laszlo Gombos.
+
+        If canvas window becomes invalid don't create pixmap from it and don't 
+        use it for painting.
+
+        Improves stability of existing webgl layout tests.
+
+        * platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:
+        (WebCore::GraphicsSurfacePrivate::createPixmap):
+        (WebCore::GraphicsSurfacePrivate::size):
+        (WebCore::GraphicsSurface::platformGetTextureID):
+        (WebCore::GraphicsSurface::platformPaintToTextureMapper):
+
 2013-01-07  Hajime Morrita  <morrita@google.com>
 

trunk/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp

@@ -238 +238 @@
     {
         XWindowAttributes attr;
-        XGetWindowAttributes(m_display, winId, &attr);
+        if (!XGetWindowAttributes(m_display, winId, &attr))
+            return;
+        m_size = IntSize(attr.width, attr.height);
 
         XRenderPictFormat* format = XRenderFindVisualFormat(m_display, attr.visual);
@@ -342 +344 @@
         if (m_size.isEmpty()) {
             XWindowAttributes attr;
-            XGetWindowAttributes(m_display, m_surface, &attr);
-            const_cast<GraphicsSurfacePrivate*>(this)->m_size = IntSize(attr.width, attr.height);
+            if (XGetWindowAttributes(m_display, m_surface, &attr))
+                const_cast<GraphicsSurfacePrivate*>(this)->m_size = IntSize(attr.width, attr.height);
         }
         return m_size;
@@ -411 +413 @@
 {
     if (!m_texture) {
+        GLXPixmap pixmap = m_private->glxPixmap();
+        if (!pixmap)
+            return 0;
+
         glGenTextures(1, &m_texture);
         glBindTexture(GL_TEXTURE_2D, m_texture);
@@ -417 +423 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        pGlXBindTexImageEXT(m_private->display(), m_private->glxPixmap(), GLX_FRONT_EXT, 0);
+        pGlXBindTexImageEXT(m_private->display(), pixmap, GLX_FRONT_EXT, 0);
     }
 
@@ -437 +443 @@
 {
     TextureMapperGL* texMapGL = static_cast<TextureMapperGL*>(textureMapper);
+    IntSize size = m_private->size();
+    if (size.isEmpty())
+        return;
+    uint32_t texture = platformGetTextureID();
+    if (!texture)
+        return;
     TransformationMatrix adjustedTransform = transform;
-    adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_private->size()), targetRect));
+    adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), size), targetRect));
     TextureMapperGL::Flags flags = m_private->textureIsYInverted() ? TextureMapperGL::ShouldFlipTexture : 0;
     flags |= TextureMapperGL::ShouldBlend;
-    texMapGL->drawTexture(platformGetTextureID(), flags, m_private->size(), targetRect, adjustedTransform, opacity, mask);
+    texMapGL->drawTexture(texture, flags, size, targetRect, adjustedTransform, opacity, mask);
 }