Changeset 74516 in webkit

Timestamp:

Dec 22, 2010 4:27:00 PM (13 years ago)

Author:

enne@google.com

Message:

2010-12-22 Adrienne Walker <​enne@google.com>

Reviewed by Kenneth Russell.

Fix null pointer deref when restoring a lost WebGL context.
​https://bugs.webkit.org/show_bug.cgi?id=51494

No new tests, as context restored events are not currently testable.

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::initializeNewContext): (WebCore::WebGLRenderingContext::restoreContext):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-22  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Fix null pointer deref when restoring a lost WebGL context.
+        https://bugs.webkit.org/show_bug.cgi?id=51494
+
+        No new tests, as context restored events are not currently testable.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::initializeNewContext):
+        (WebCore::WebGLRenderingContext::restoreContext):
+
 2010-12-22  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -141 +141 @@
 void WebGLRenderingContext::initializeNewContext()
 {
+    ASSERT(!m_contextLost);
     m_needsUpdate = true;
     m_markedCanvasDirty = false;
@@ -3326 +3327 @@
 
     m_context = context;
+    m_contextLost = false;
     initializeNewContext();
-    m_contextLost = false;
     canvas()->dispatchEvent(WebGLContextEvent::create(eventNames().webglcontextrestoredEvent, false, true, ""));
 }