2011-06-22 Sheriff Bot <webkit.review.bot@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jun 2011 23:55:53 +0000 (23:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jun 2011 23:55:53 +0000 (23:55 +0000)
        Unreviewed, rolling out r89489.
        http://trac.webkit.org/changeset/89489
        https://bugs.webkit.org/show_bug.cgi?id=63203

        Broke chromium mac build on build.webkit.org (Requested by
        abarth on #webkit).

        * wtf/Platform.h:
2011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r89489.
        http://trac.webkit.org/changeset/89489
        https://bugs.webkit.org/show_bug.cgi?id=63203

        Broke chromium mac build on build.webkit.org (Requested by
        abarth on #webkit).

        * WebCore.gyp/WebCore.gyp:
        * loader/cache/CachedFont.cpp:
        * platform/chromium/DragImageRef.h:
        * platform/graphics/FloatPoint.h:
        * platform/graphics/FloatRect.h:
        * platform/graphics/FloatSize.h:
        * platform/graphics/FontPlatformData.h:
        (WebCore::FontPlatformData::hash):
        * platform/graphics/GlyphBuffer.h:
        (WebCore::GlyphBuffer::advanceAt):
        (WebCore::GlyphBuffer::add):
        (WebCore::GlyphBuffer::expandLastAdvance):
        * platform/graphics/IntPoint.h:
        * platform/graphics/IntRect.h:
        * platform/graphics/IntSize.h:
        * platform/graphics/SimpleFontData.h:
        * platform/graphics/cg/FloatPointCG.cpp:
        * platform/graphics/cg/FloatRectCG.cpp:
        * platform/graphics/cg/FloatSizeCG.cpp:
        * platform/graphics/cg/IntPointCG.cpp:
        * platform/graphics/cg/IntRectCG.cpp:
        * platform/graphics/cg/IntSizeCG.cpp:
        * platform/graphics/mac/FontCustomPlatformData.cpp:
        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
        (WebCore::createFontCustomPlatformData):
        * platform/graphics/mac/FontCustomPlatformData.h:
        (WebCore::FontCustomPlatformData::FontCustomPlatformData):
2011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r89489.
        http://trac.webkit.org/changeset/89489
        https://bugs.webkit.org/show_bug.cgi?id=63203

        Broke chromium mac build on build.webkit.org (Requested by
        abarth on #webkit).

        * WebKit.gyp:
        * features.gypi:
        * public/WebCommon.h:

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

27 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/loader/cache/CachedFont.cpp
Source/WebCore/platform/chromium/DragImageRef.h
Source/WebCore/platform/graphics/FloatPoint.h
Source/WebCore/platform/graphics/FloatRect.h
Source/WebCore/platform/graphics/FloatSize.h
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/GlyphBuffer.h
Source/WebCore/platform/graphics/IntPoint.h
Source/WebCore/platform/graphics/IntRect.h
Source/WebCore/platform/graphics/IntSize.h
Source/WebCore/platform/graphics/SimpleFontData.h
Source/WebCore/platform/graphics/cg/FloatPointCG.cpp
Source/WebCore/platform/graphics/cg/FloatRectCG.cpp
Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp
Source/WebCore/platform/graphics/cg/IntPointCG.cpp
Source/WebCore/platform/graphics/cg/IntRectCG.cpp
Source/WebCore/platform/graphics/cg/IntSizeCG.cpp
Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/public/WebCommon.h

index 2b98ace..b7bf1bc 100644 (file)
@@ -1,3 +1,14 @@
+2011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r89489.
+        http://trac.webkit.org/changeset/89489
+        https://bugs.webkit.org/show_bug.cgi?id=63203
+
+        Broke chromium mac build on build.webkit.org (Requested by
+        abarth on #webkit).
+
+        * wtf/Platform.h:
+
 2011-06-22  Cary Clark  <caryclark@google.com>
 
         Reviewed by Darin Fisher.
index 6010114..9c59929 100644 (file)
 #define WTF_USE_CA 1
 #endif
 
-/* USE(SKIA) for Win/Linux, CG for Mac, unless enabled */
+/* USE(SKIA) for Win/Linux, CG for Mac */
 #if PLATFORM(CHROMIUM)
 #if OS(DARWIN)
-#if USE(SKIA_ON_MAC_CHROMIUM)
-#define WTF_USE_SKIA 1
-#else
 #define WTF_USE_CG 1
-#endif
 #define WTF_USE_ATSUI 1
 #define WTF_USE_CORE_TEXT 1
 #define WTF_USE_ICCJPEG 1
index 43ad512..828311e 100644 (file)
@@ -1,3 +1,40 @@
+2011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r89489.
+        http://trac.webkit.org/changeset/89489
+        https://bugs.webkit.org/show_bug.cgi?id=63203
+
+        Broke chromium mac build on build.webkit.org (Requested by
+        abarth on #webkit).
+
+        * WebCore.gyp/WebCore.gyp:
+        * loader/cache/CachedFont.cpp:
+        * platform/chromium/DragImageRef.h:
+        * platform/graphics/FloatPoint.h:
+        * platform/graphics/FloatRect.h:
+        * platform/graphics/FloatSize.h:
+        * platform/graphics/FontPlatformData.h:
+        (WebCore::FontPlatformData::hash):
+        * platform/graphics/GlyphBuffer.h:
+        (WebCore::GlyphBuffer::advanceAt):
+        (WebCore::GlyphBuffer::add):
+        (WebCore::GlyphBuffer::expandLastAdvance):
+        * platform/graphics/IntPoint.h:
+        * platform/graphics/IntRect.h:
+        * platform/graphics/IntSize.h:
+        * platform/graphics/SimpleFontData.h:
+        * platform/graphics/cg/FloatPointCG.cpp:
+        * platform/graphics/cg/FloatRectCG.cpp:
+        * platform/graphics/cg/FloatSizeCG.cpp:
+        * platform/graphics/cg/IntPointCG.cpp:
+        * platform/graphics/cg/IntRectCG.cpp:
+        * platform/graphics/cg/IntSizeCG.cpp:
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+        (WebCore::createFontCustomPlatformData):
+        * platform/graphics/mac/FontCustomPlatformData.h:
+        (WebCore::FontCustomPlatformData::FontCustomPlatformData):
+
 2011-06-22  Luke Macpherson   <macpherson@chromium.org>
 
         Reviewed by James Robinson.
index a67dd16..45b7a03 100644 (file)
           '<@(webcore_svg_bindings_idl_files)',
         ],
       }],
-      ['OS=="mac" and use_skia==0', {
+      ['OS=="mac"', {
         'webcore_include_dirs+': [
           # platform/graphics/cg and cocoa need to come before
           # platform/graphics/chromium so that the Mac build picks up the
           '../platform/graphics/cocoa',
           '../platform/graphics/cg',
         ],
-      }],
-      ['OS=="mac"', {
         'webcore_include_dirs': [
           # FIXME: Eliminate dependency on platform/mac and related
           # directories.
           '../platform/text/mac',
         ],
       }],
-      ['OS=="mac" and use_skia==1', {
-        'webcore_include_dirs': [
-              '../platform/graphics/cocoa',
-              '../platform/graphics/cg',
-        ],
-      }],
       ['OS=="win"', {
         'webcore_include_dirs': [
           '../page/win',
             '<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
           ],
         }],
-        ['OS=="mac" and use_skia==0', {
-          'sources/': [
-            # The Mac build is PLATFORM_CG too.  platform/graphics/cg is the
-            # only place that CG files we want to build are located, and not
-            # all of them even have a CG suffix, so just add them by a
-            # regexp matching their directory.
-            ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
-          ],
-        }],['OS=="mac"', {
+        ['OS=="mac"', {
           # Necessary for Mac .mm stuff.
           'include_dirs': [
             '../../../WebKitLibraries',
             ['include', 'CF\\.cpp$'],
             ['exclude', 'network/cf/'],
 
+            # The Mac build is PLATFORM_CG too.  platform/graphics/cg is the
+            # only place that CG files we want to build are located, and not
+            # all of them even have a CG suffix, so just add them by a
+            # regexp matching their directory.
+            ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
+
             # Use native Mac font code from WebCore.
             ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
             ['include', 'platform/graphics/mac/ComplexText[^/]*\\.(cpp|h)$'],
             ['include', 'platform/graphics/mac/FloatRectMac\\.mm$'],
             ['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'],
             ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],
+            ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
             ['include', 'platform/graphics/mac/IntPointMac\\.mm$'],
             ['include', 'platform/graphics/mac/IntRectMac\\.mm$'],
             ['include', 'platform/mac/BlockExceptions\\.mm$'],
 
             ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
 
+            # Chromium Mac does not use skia.
+            ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
+
             # The Mac uses platform/mac/KillRingMac.mm instead of the dummy
             # implementation.
             ['exclude', 'platform/KillRingNone\\.cpp$'],
             # related to ScrollbarThemeChromium.cpp.
             ['exclude', 'platform/chromium/ScrollbarThemeChromium\\.cpp$'],
 
+            # The Mac currently uses ImageChromiumMac.mm from
+            # platform/graphics/chromium, included by regex above, instead.
+            ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
+
             # The Mac does not use ImageSourceCG.cpp from platform/graphics/cg
             # even though it is included by regex above.
             ['exclude', 'platform/graphics/cg/ImageSourceCG\\.cpp$'],
             ['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'],
 
-            ['include', '/chrome/junk\\.txt$'],
-          ],
-        },{ # OS!="mac"
-          'sources/': [
-            # FIXME: We will eventually compile this too, but for now it's
-            # only used on mac.
-            ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
-          ],
-        }],
-        ['OS=="mac" and use_skia==0', {
-          'sources/': [
-            # Cherry-pick some files that can't be included by broader regexps.
-            # Some of these are used instead of Chromium platform files, see
-            # the specific exclusions in the "sources!" list below.
-            ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
-
-            # Chromium Mac does not use skia.
-            ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
-
-            # The Mac currently uses ImageChromiumMac.mm from
-            # platform/graphics/chromium, included by regex above, instead.
-            ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
-
             # ImageDecoderSkia is not used on mac.  ImageDecoderCG is used instead.
             ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
             ['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
             # Again, Skia is not used on Mac.
             ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
           ],
-        }],
-        ['OS=="mac" and use_skia==1', {
+        },{ # OS!="mac"
           'sources/': [
-            ['include', 'platform/graphics/cg/FloatPointCG\\.cpp$'],
-            ['include', 'platform/graphics/cg/FloatRectCG\\.cpp$'],
-            ['include', 'platform/graphics/cg/FloatSizeCG\\.cpp$'],
-            ['include', 'platform/graphics/cg/IntPointCG\\.cpp$'],
-            ['include', 'platform/graphics/cg/IntRectCG\\.cpp$'],
-            ['include', 'platform/graphics/cg/IntSizeCG\\.cpp$'],
-            ['exclude', 'platform/graphics/mac/FontMac\\.mm$'],
-            ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
-            ['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
+            # FIXME: We will eventually compile this too, but for now it's
+            # only used on mac.
+            ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
+
+            # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
+            # is excluded by a rule above if WebKit uses CG instead of Skia.
+            ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
           ],
         }],
         ['toolkit_uses_gtk == 0', {
           'sources/': [
             ['exclude', '(Gtk|Linux)\\.cpp$'],
             ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
-          ],
-        }],
-        ['toolkit_uses_gtk == 0 and use_skia==0', {
-          'sources/': [
             ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
           ],
         }],
         ['OS!="mac"', {
-          'sources/': [
-            ['exclude', 'Mac\\.(cpp|mm?)$'],
-
-            # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
-            # is excluded by a rule above if WebKit uses CG instead of Skia.
-            ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
-          ],
+          'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
         }],
         ['OS!="win"', {
           'sources/': [
index a690efa..7d37fdd 100644 (file)
@@ -28,7 +28,7 @@
 #include "CachedFont.h"
 
 // FIXME: This should really be a blacklist instead of a whitelist
-#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
+#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROME))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
 #define STORE_FONT_CUSTOM_PLATFORM_DATA
 #endif
 
index a2398e4..debc904 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef DragImageRef_h
 #define DragImageRef_h
 
-#if USE(CG)
+#if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)
 typedef struct CGImage* CGImageRef;
 #else
 class SkBitmap;
@@ -37,7 +37,7 @@ class SkBitmap;
 
 namespace WebCore {
 
-#if USE(CG)
+#if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)
 typedef CGImageRef DragImageRef;
 #else
 typedef SkBitmap* DragImageRef;
index f8fc593..93334dc 100644 (file)
@@ -31,7 +31,7 @@
 #include "IntPoint.h"
 #include <wtf/MathExtras.h>
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGPoint CGPoint;
 #endif
 
@@ -125,7 +125,7 @@ public:
         return FloatPoint(std::max(m_x, other.m_x), std::max(m_y, other.m_y));
     }   
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     FloatPoint(const CGPoint&);
     operator CGPoint() const;
 #endif
index 629afeb..e4cb3f2 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "FloatPoint.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGRect CGRect;
 #endif
 
@@ -139,7 +139,7 @@ public:
     void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2);
     void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     FloatRect(const CGRect&);
     operator CGRect() const;
 #endif
index 006df9b..ce9efc5 100644 (file)
@@ -31,7 +31,7 @@
 #include "IntPoint.h"
 #include <wtf/MathExtras.h>
 
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGSize CGSize;
 #endif
 
@@ -91,7 +91,7 @@ public:
         return m_width * m_width + m_height * m_height;
     }
 
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
     explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
     operator CGSize() const;
 #endif
index 1fcba31..a1babc4 100644 (file)
@@ -82,7 +82,7 @@ typedef const struct __CTFont* CTFontRef;
 typedef struct HFONT__* HFONT;
 #endif
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGFont* CGFontRef;
 #if OS(DARWIN)
 typedef const struct __CTFont* CTFontRef;
@@ -176,7 +176,7 @@ public:
 #if OS(DARWIN)
     FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal,
                      TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
                      TextOrientation textOrientation, FontWidthVariant widthVariant)
         : m_syntheticBold(syntheticBold)
@@ -212,7 +212,7 @@ public:
     void setFont(NSFont*);
 #endif
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 #if OS(DARWIN)
     CGFontRef cgFont() const { return m_cgFont.get(); }
     CTFontRef ctFont() const;
@@ -245,7 +245,7 @@ public:
 #if PLATFORM(WIN) && !USE(CAIRO)
         return m_font ? m_font->hash() : 0;
 #elif OS(DARWIN)
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
         ASSERT(m_font || !m_cgFont);
 #endif
         uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique };
@@ -321,7 +321,7 @@ private:
     RefPtr<RefCountedGDIHandle<HFONT> > m_font;
 #endif
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 #if PLATFORM(WIN)
     RetainPtr<CGFontRef> m_cgFont;
 #else
index 0158de3..89dac78 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/UnusedParam.h>
 #include <wtf/Vector.h>
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 #include <CoreGraphics/CGGeometry.h>
 #endif
 
@@ -62,7 +62,7 @@ typedef Glyph GlyphBufferGlyph;
 
 // CG uses CGSize instead of FloatSize so that the result of advances()
 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
 typedef CGSize GlyphBufferAdvance;
 #elif OS(WINCE)
 // There is no cross-platform code that uses the height of GlyphBufferAdvance,
@@ -126,7 +126,7 @@ public:
 
     float advanceAt(int index) const
     {
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
         return m_advances[index].width;
 #elif OS(WINCE)
         return m_advances[index];
@@ -157,7 +157,7 @@ public:
         m_glyphs.append(glyph);
 #endif
 
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
         CGSize advance = { width, 0 };
         m_advances.append(advance);
 #elif OS(WINCE)
@@ -196,7 +196,7 @@ public:
     {
         ASSERT(!isEmpty());
         GlyphBufferAdvance& lastAdvance = m_advances.last();
-#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
         lastAdvance.width += width;
 #elif OS(WINCE)
         lastAdvance += width;
index 6a27166..b77e447 100644 (file)
@@ -33,7 +33,7 @@
 #include <QDataStream>
 #endif
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGPoint CGPoint;
 #endif
 
@@ -121,7 +121,7 @@ public:
         return IntPoint(m_y, m_x);
     }
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lossy
     operator CGPoint() const;
 #endif
index 670ea3c..bd3e99b 100644 (file)
@@ -29,7 +29,7 @@
 #include "IntPoint.h"
 #include <wtf/Vector.h>
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGRect CGRect;
 #endif
 
@@ -202,7 +202,7 @@ public:
     operator cairo_rectangle_int_t() const;
 #endif
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     operator CGRect() const;
 #endif
 
@@ -248,7 +248,7 @@ inline bool operator!=(const IntRect& a, const IntRect& b)
     return a.location() != b.location() || a.size() != b.size();
 }
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 IntRect enclosingIntRect(const CGRect&);
 #endif
 
index 1bff20e..db4e54c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef IntSize_h
 #define IntSize_h
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGSize CGSize;
 #endif
 
@@ -109,7 +109,7 @@ public:
         return IntSize(m_height, m_width);
     }
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
     explicit IntSize(const CGSize&); // don't do this implicitly since it's lossy
     operator CGSize() const;
 #endif
index dbd2d9d..6fb191e 100644 (file)
@@ -132,7 +132,7 @@ public:
     float spaceWidth() const { return m_spaceWidth; }
     void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
 
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
 #endif
 
@@ -264,7 +264,7 @@ private:
 
     mutable OwnPtr<DerivedFontData> m_derivedFontData;
 
-#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     float m_syntheticBoldOffset;
 #endif
 
index 006983e..5e7aab3 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "FloatPoint.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 
 #include <ApplicationServices/ApplicationServices.h>
 
index fe6f880..131b7ac 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "FloatRect.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 
 #include <ApplicationServices/ApplicationServices.h>
 
index a3dcbdd..475ebc0 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "FloatSize.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT))
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT))
 
 #include <ApplicationServices/ApplicationServices.h>
 
index a76767f..4a1096b 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "IntPoint.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 
 #include <ApplicationServices/ApplicationServices.h>
 
index f757497..ebd9655 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "IntRect.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT))
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT))
 
 #include <ApplicationServices/ApplicationServices.h>
 
index 7993d42..c844cbc 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "IntSize.h"
 
-#if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
 
 #include <ApplicationServices/ApplicationServices.h>
 
index 47d1f21..87fde13 100644 (file)
 #include "WOFFFileFormat.h"
 #include <ApplicationServices/ApplicationServices.h>
 
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
 #include "SkStream.h"
 #include "SkTypeface.h"
 #endif
 
 namespace WebCore {
 
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
 class RemoteFontStream : public SkStream {
 public:
     explicit RemoteFontStream(PassRefPtr<SharedBuffer> buffer)
@@ -82,7 +82,7 @@ FontCustomPlatformData::~FontCustomPlatformData()
     if (m_atsContainer)
         ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
 #endif
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
     SkSafeUnref(m_typeface);
 #endif
     CGFontRelease(m_cgFont);
@@ -160,7 +160,7 @@ FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 #endif // !defined(BUILDING_ON_LEOPARD)
 
     FontCustomPlatformData* fontCustomPlatformData = new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
     RemoteFontStream* stream = new RemoteFontStream(buffer);
     fontCustomPlatformData->m_typeface = SkTypeface::CreateFromStream(stream);
 #endif
index fe6c701..5afaec7 100644 (file)
@@ -33,7 +33,7 @@ typedef struct CGFont* CGFontRef;
 typedef UInt32 ATSFontContainerRef;
 typedef UInt32 ATSFontRef;
 
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
 struct SkTypeface;
 #endif
 
@@ -48,7 +48,7 @@ public:
     FontCustomPlatformData(ATSFontContainerRef container, CGFontRef cgFont)
         : m_atsContainer(container)
         , m_cgFont(cgFont)
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
         , m_typeface(0)
 #endif
     {
@@ -62,7 +62,7 @@ public:
 
     ATSFontContainerRef m_atsContainer;
     CGFontRef m_cgFont;
-#if USE(SKIA_ON_MAC_CHROMIUM)
+#if USE(SKIA_ON_MAC_CHROME)
     SkTypeface* m_typeface;
 #endif
 };
index 6026612..a3ea814 100644 (file)
@@ -1,3 +1,16 @@
+2011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r89489.
+        http://trac.webkit.org/changeset/89489
+        https://bugs.webkit.org/show_bug.cgi?id=63203
+
+        Broke chromium mac build on build.webkit.org (Requested by
+        abarth on #webkit).
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebCommon.h:
+
 2011-06-22  Cary Clark  <caryclark@google.com>
 
         Reviewed by Darin Fisher.
index 2a346d0..6de04f9 100644 (file)
                     'include_dirs': [
                         'public/mac',
                     ],
-                    'conditions': [
-                        ['use_skia==0', {
-                            'sources/': [
-                                ['exclude', 'Skia\\.cpp$'],
-                            ],
-                        },{ # use_skia
-                            'sources/': [
-                                ['exclude', 'CG\\.cpp$'],
-                            ],
-                        }],
+                    'sources/': [
+                        ['exclude', 'Skia\\.cpp$'],
                     ],
                 }, { # else: OS!="mac"
                     'sources/': [
index e153867..3fc9ad6 100644 (file)
       'enable_svg%': 1,
       'enable_touch_events%': 1,
       'use_skia_gpu%': 0,
-      'use_skia%': 0,
       'enable_touch_icon_loading%' : 0,
       'enable_smooth_scrolling%': 0,
       'enable_css3_flexbox%': 0,
           'ENABLE_3D_RENDERING=1',
         ],
       }],
-      ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', {
+      ['use_accelerated_compositing==1 and OS!="mac"', {
         'feature_defines': [
           'ENABLE_ACCELERATED_2D_CANVAS=1',
         ],
         'feature_defines': [
           'WTF_USE_WEBAUDIO_FFMPEG=1',
         ],
-        'use_skia%': 1,
       }],
       ['enable_register_protocol_handler==1', {
         'feature_defines': [
           'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
         ],
       }],
-      ['OS=="mac"', {
-        'feature_defines': [
-          'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)',
-        ],
-      }],
       ['enable_smooth_scrolling==1', {
         'feature_defines': [
           'ENABLE_SMOOTH_SCROLLING=1',
index 77334d8..27865e1 100644 (file)
@@ -39,7 +39,7 @@
 #endif
 
 #if !defined(WEBKIT_USING_SKIA)
-    #if !defined(__APPLE__) || defined(USE_SKIA)
+    #if !defined(__APPLE__)
         #define WEBKIT_USING_SKIA 1
     #else
         #define WEBKIT_USING_SKIA 0