[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit fc75723abbe143c41e54e4d4777f8d54d66676fe
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 13 23:58:45 2009 +0000

    2009-10-13  Simon Fraser  <simon.fraser at apple.com>
    
            Temporary debugging changes to figure out why the webgl tests are crashing on the build bot.
    
            * platform/graphics/mac/GraphicsContext3DMac.cpp:
            (WebCore::GraphicsContext3D::GraphicsContext3D):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49527 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 68ec67f..baf8e0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -86,6 +86,13 @@
 
 2009-10-13  Simon Fraser  <simon.fraser at apple.com>
 
+        Temporary debugging changes to figure out why the webgl tests are crashing on the build bot.
+
+        * platform/graphics/mac/GraphicsContext3DMac.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
+2009-10-13  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Visibility:visible inside a compositing layer doesn't make the element visible
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
index b56a191..ca5bfbe 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
@@ -54,6 +54,10 @@
 namespace WebCore {
 
 GraphicsContext3D::GraphicsContext3D()
+    : m_contextObj(0)
+    , m_texture(0)
+    , m_fbo(0)
+    , m_depthBuffer(0)
 {
     CGLPixelFormatAttribute attribs[] =
     {
@@ -64,12 +68,23 @@ GraphicsContext3D::GraphicsContext3D()
         (CGLPixelFormatAttribute) 0
     };
     
-    CGLPixelFormatObj pixelFormatObj;
-    GLint numPixelFormats;
+    CGLPixelFormatObj pixelFormatObj = 0;
+    GLint numPixelFormats = 0;
     
-    CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats);
+    CGLError err = CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats);
+    if (err != kCGLNoError) {
+        // FIXME: temporary change to get error.
+        fprintf(stderr, "CGLChoosePixelFormat failed, err %d\n", err);
+        return;
+    }
     
-    CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
+    err = CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
+    if (err != kCGLNoError || !m_contextObj) {
+        // FIXME: temporary change to get error.
+        fprintf(stderr, "CGLCreateContext failed, err %d (context %p)\n", err, m_contextObj);
+        m_contextObj = 0;
+        return;
+    }
     
     CGLDestroyPixelFormat(pixelFormatObj);
     

-- 
WebKit Debian packaging