[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[enne at google.com]

The following commit has been merged in the debian/experimental branch:
commit e745b89c3bad8cef17d4063489c6cd593efe7c6e
Author: enne at google.com <enne at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 23 00:27:00 2010 +0000

    2010-12-22  Adrienne Walker  <enne at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f2ba332..1475d85 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-22  Adrienne Walker  <enne at 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 at ericsson.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index a53d799..ca26ba3 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -140,6 +140,7 @@ WebGLRenderingContext::WebGLRenderingContext(HTMLCanvasElement* passedCanvas, Pa
 
 void WebGLRenderingContext::initializeNewContext()
 {
+    ASSERT(!m_contextLost);
     m_needsUpdate = true;
     m_markedCanvasDirty = false;
     m_activeTextureUnit = 0;
@@ -3325,8 +3326,8 @@ void WebGLRenderingContext::restoreContext()
         return;
 
     m_context = context;
-    initializeNewContext();
     m_contextLost = false;
+    initializeNewContext();
     canvas()->dispatchEvent(WebGLContextEvent::create(eventNames().webglcontextrestoredEvent, false, true, ""));
 }
 

-- 
WebKit Debian packaging