Fix Chromium Mac build.

* platform/graphics/Gradient.h: Forward-declare CGContextRef.
This might even make it possible to remove the include of
<CoreGraphics/CoreGraphics.h> for PLATFORM(WIN), but I did not
do that at this time because I don't want to break the Windows
build when fixing the Chromium build.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 31413f45928c3c684f8287e253e05ac27327fb91..3a505793220d5eece41e7fee73474161c801c060 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-05  Darin Adler  <darin@apple.com>
+
+        Fix Chromium Mac build.
+
+        * platform/graphics/Gradient.h: Forward-declare CGContextRef.
+        This might even make it possible to remove the include of
+        <CoreGraphics/CoreGraphics.h> for PLATFORM(WIN), but I did not
+        do that at this time because I don't want to break the Windows
+        build when fixing the Chromium build.
+

 2011-01-05  Xianzhu Wang  <wangxianzhu@google.com>
 
         Reviewed by David Levin.
 2011-01-05  Xianzhu Wang  <wangxianzhu@google.com>
 
         Reviewed by David Levin.

diff --git a/WebCore/platform/graphics/Gradient.h b/WebCore/platform/graphics/Gradient.h
index 4d5cdc6148fa3919e89c49ec7b37ce7da088ff01..9f7ccb2677e340307f55c6c30b7b077b69d5d4d1 100644 (file)
--- a/WebCore/platform/graphics/Gradient.h
+++ b/WebCore/platform/graphics/Gradient.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.

  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Torch Mobile, Inc.
  *
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Torch Mobile, Inc.
  *


@@ -41,6 +41,8 @@
 
 #if PLATFORM(CG)
 
 
 #if PLATFORM(CG)
 

+typedef struct CGContext* CGContextRef;
+

 #define USE_CG_SHADING defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
 
 #if USE_CG_SHADING
 #define USE_CG_SHADING defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
 
 #if USE_CG_SHADING


@@ -115,6 +117,7 @@ namespace WebCore {
 #else
         PlatformGradient platformGradient();
 #endif
 #else
         PlatformGradient platformGradient();
 #endif

+

         struct ColorStop {
             float stop;
             float red;
         struct ColorStop {
             float stop;
             float red;


@@ -143,6 +146,7 @@ namespace WebCore {
         void paint(CGContextRef);
         void paint(GraphicsContext*);
 #endif
         void paint(CGContextRef);
         void paint(GraphicsContext*);
 #endif

+

     private:
         Gradient(const FloatPoint& p0, const FloatPoint& p1);
         Gradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1, float aspectRatio);
     private:
         Gradient(const FloatPoint& p0, const FloatPoint& p1);
         Gradient(const FloatPoint& p0, float r0, const FloatPoint& p1, float r1, float aspectRatio);