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

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4e5df15fbc8f53e88f14ad8002aec4df0a620341
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 18:41:34 2009 +0000

            The last change fixed the problem, removing diagnostic printfs.
    
            * platform/graphics/mac/GraphicsContext3DMac.cpp:
            (WebCore::GraphicsContext3D::GraphicsContext3D):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9821251..f06e47b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-14  Chris Marrin  <cmarrin at apple.com>
+
+        The last change fixed the problem, removing diagnostic printfs.
+
+        * platform/graphics/mac/GraphicsContext3DMac.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2009-10-14  Kevin Ollivier  <kevino at theolliviers.com>
 
         CURL build fix for versions < 7.18.
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
index 2d82105..bc17595 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
@@ -96,8 +96,7 @@ GraphicsContext3D::GraphicsContext3D()
                 CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats);
         
                 if (numPixelFormats == 0) {
-                    // FIXME: temporary printf for diagnostics
-                    fprintf(stderr, "CGLCreateContext failed, no pixel formats found\n");
+                    // Could not find an acceptable renderer - fail
                     m_contextObj = 0;
                     return;
                 }
@@ -105,25 +104,11 @@ GraphicsContext3D::GraphicsContext3D()
         }
     }
     
-    for (int i = 0; i < numPixelFormats; ++i) {
-        fprintf(stderr, "Pixel format %d:\n", i);
-        GLint value;
-        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFAColorSize, &value);
-        fprintf(stderr, "    kCGLPFAColorSize: %d\n", value);
-        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFADepthSize, &value);
-        fprintf(stderr, "    kCGLPFADepthSize: %d\n", value);
-        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFASupersample, &value);
-        fprintf(stderr, "    kCGLPFASupersample: %d\n", value);
-        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFARendererID, &value);
-        fprintf(stderr, "    kCGLPFARendererID: %d\n", value);
-    }
-    
     CGLError err = CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
     CGLDestroyPixelFormat(pixelFormatObj);
     
     if (err != kCGLNoError || !m_contextObj) {
-        // FIXME: temporary change to get error.
-        fprintf(stderr, "CGLCreateContext failed, err %d (context %p)\n", err, m_contextObj);
+        // Could not create the context - fail
         m_contextObj = 0;
         return;
     }

-- 
WebKit Debian packaging