Changeset 90369 in webkit

Timestamp:

Jul 4, 2011 11:16:34 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-07-04 Jeff Timanus <​twiz@chromium.org>

Reviewed by Stephen White.

Prevent calls to GrapicsContext3D::deleteTexture with id 0 in DrawingBuffer::clear().
​https://bugs.webkit.org/show_bug.cgi?id=63756

• platform/graphics/gpu/DrawingBuffer.cpp: (WebCore::DrawingBuffer::clear):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gpu/DrawingBuffer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-04  Jeff Timanus  <twiz@chromium.org>
+
+        Reviewed by Stephen White.
+
+        Prevent calls to GrapicsContext3D::deleteTexture with id 0 in DrawingBuffer::clear().
+        https://bugs.webkit.org/show_bug.cgi?id=63756
+
+        * platform/graphics/gpu/DrawingBuffer.cpp:
+        (WebCore::DrawingBuffer::clear):
+
 2011-07-04  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp

@@ -59 +59 @@
     if (!m_context)
         return;
-        
+
     m_context->makeContextCurrent();
-    m_context->deleteTexture(m_colorBuffer);
-    m_colorBuffer = 0;
-    
+
+    if (m_colorBuffer) {
+        m_context->deleteTexture(m_colorBuffer);
+        m_colorBuffer = 0;
+    }
+
     if (m_multisampleColorBuffer) {
         m_context->deleteRenderbuffer(m_multisampleColorBuffer);
         m_multisampleColorBuffer = 0;
     }
-    
+
     if (m_depthStencilBuffer) {
         m_context->deleteRenderbuffer(m_depthStencilBuffer);
         m_depthStencilBuffer = 0;
     }
-    
+
     if (m_depthBuffer) {
         m_context->deleteRenderbuffer(m_depthBuffer);
         m_depthBuffer = 0;
     }
-    
+
     if (m_stencilBuffer) {
         m_context->deleteRenderbuffer(m_stencilBuffer);
         m_stencilBuffer = 0;
     }
-    
+
     if (m_multisampleFBO) {
         m_context->deleteFramebuffer(m_multisampleFBO);
         m_multisampleFBO = 0;
     }
-        
+
     m_context->deleteFramebuffer(m_fbo);
     m_fbo = 0;