Unreviewed Mavericks build attempt fix after r180609.

* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D):
(WebCore::GraphicsContext3D::checkGPUStatusIfNecessary):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 573fa99c1ac02475d8210e8f3b31185bc22e47e4..67f8a46f1ef9bbbe36260a82b0378addd980cb73 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed Mavericks build attempt fix after r180609.
+
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        (WebCore::GraphicsContext3D::checkGPUStatusIfNecessary):
+
 2015-02-19  Roger Fong  <roger_fong@apple.com>
 
         WebGL: Destroy the GLContext if a GPU restart has been detected.

diff --git a/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm b/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
index ef0a2630fca046e96fa6d3d956c83063603f0649..719927e61fcc4e7314a44ef6a370c34f7cc9083f 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
+++ b/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
@@ -63,10 +63,14 @@
 
 namespace WebCore {
 
+#define USE_GPU_STATUS_CHECK ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
+
 const int maxActiveContexts = 64;
 int GraphicsContext3D::numActiveContexts = 0;
+#if USE_GPU_STATUS_CHECK
 const int GPUStatusCheckThreshold = 5;
 int GraphicsContext3D::GPUCheckCounter = 0;
+#endif
     
 // FIXME: This class is currently empty on Mac, but will get populated as 
 // the restructuring in https://bugs.webkit.org/show_bug.cgi?id=66903 is done
@@ -201,7 +205,7 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWi
         return;
 
     CGLError err = CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
+#if USE_GPU_STATUS_CHECK
     GLint abortOnBlacklist = 0;
 #if PLATFORM(MAC)
     CGLSetParameter(m_contextObj, kCGLCPAbortOnGPURestartStatusBlacklisted, &abortOnBlacklist);
@@ -369,7 +373,7 @@ bool GraphicsContext3D::makeContextCurrent()
 
 void GraphicsContext3D::checkGPUStatusIfNecessary()
 {
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS))
+#if USE_GPU_STATUS_CHECK
     GPUCheckCounter = (GPUCheckCounter + 1) % GPUStatusCheckThreshold;
     if (GPUCheckCounter)
         return;