Apple/Safari: Enable WebGL multisampling on ATI cards

for OS X 10.7.2 and above.
https://bugs.webkit.org/show_bug.cgi?id=77922

Address review comments by Alexey Proskuryakov and Mark Rowe.

* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::systemAllowsMultisamplingOnATICards):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5a34d5b..087ef2e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -21,6 +21,17 @@
         for OS X 10.7.2 and above.
         https://bugs.webkit.org/show_bug.cgi?id=77922
 
+        Address review comments by Alexey Proskuryakov and Mark Rowe.
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        (WebCore::systemAllowsMultisamplingOnATICards):
+
+2012-02-07  Dean Jackson  <dino@apple.com>
+
+        Apple/Safari: Enable WebGL multisampling on ATI cards
+        for OS X 10.7.2 and above.
+        https://bugs.webkit.org/show_bug.cgi?id=77922
+
         Reviewed by Chris Marrin.
 
         Follow Chrome's lead to allow WebGL antialiasing

diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
index 15fde23..cf9d8f6 100644 (file)
--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
@@ -63,16 +63,21 @@ namespace WebCore {
 static bool systemAllowsMultisamplingOnATICards()
 {
 #if PLATFORM(MAC)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+    return true;
+#else
+    ASSERT(isMainThread());
     static SInt32 version;
     if (!version) {
         if (Gestalt(gestaltSystemVersion, &version) != noErr)
             return false;
     }
     // See https://bugs.webkit.org/show_bug.cgi?id=77922 for more details
-    return version > 0x1072;
+    return version >= 0x1072;
+#endif // SNOW_LEOPARD and LION
 #else
     return false;
-#endif
+#endif // PLATFORM(MAC)
 }
 
 void GraphicsContext3D::validateAttributes()