Changeset 89496 in webkit


Ignore:
Timestamp:
Jun 22, 2011 4:55:53 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

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 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:
Location:
trunk/Source
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r89489 r89496  
     12011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89489.
     4        http://trac.webkit.org/changeset/89489
     5        https://bugs.webkit.org/show_bug.cgi?id=63203
     6
     7        Broke chromium mac build on build.webkit.org (Requested by
     8        abarth on #webkit).
     9
     10        * wtf/Platform.h:
     11
    1122011-06-22  Cary Clark  <caryclark@google.com>
    213

  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r89489 r89496  
    544544#endif
    545545
    546 /* USE(SKIA) for Win/Linux, CG for Mac, unless enabled */
     546/* USE(SKIA) for Win/Linux, CG for Mac */
    547547#if PLATFORM(CHROMIUM)
    548548#if OS(DARWIN)
    549 #if USE(SKIA_ON_MAC_CHROMIUM)
    550 #define WTF_USE_SKIA 1
    551 #else
    552549#define WTF_USE_CG 1
    553 #endif
    554550#define WTF_USE_ATSUI 1
    555551#define WTF_USE_CORE_TEXT 1

  • trunk/Source/WebCore/ChangeLog

    r89495 r89496  
     12011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89489.
     4        http://trac.webkit.org/changeset/89489
     5        https://bugs.webkit.org/show_bug.cgi?id=63203
     6
     7        Broke chromium mac build on build.webkit.org (Requested by
     8        abarth on #webkit).
     9
     10        * WebCore.gyp/WebCore.gyp:
     11        * loader/cache/CachedFont.cpp:
     12        * platform/chromium/DragImageRef.h:
     13        * platform/graphics/FloatPoint.h:
     14        * platform/graphics/FloatRect.h:
     15        * platform/graphics/FloatSize.h:
     16        * platform/graphics/FontPlatformData.h:
     17        (WebCore::FontPlatformData::hash):
     18        * platform/graphics/GlyphBuffer.h:
     19        (WebCore::GlyphBuffer::advanceAt):
     20        (WebCore::GlyphBuffer::add):
     21        (WebCore::GlyphBuffer::expandLastAdvance):
     22        * platform/graphics/IntPoint.h:
     23        * platform/graphics/IntRect.h:
     24        * platform/graphics/IntSize.h:
     25        * platform/graphics/SimpleFontData.h:
     26        * platform/graphics/cg/FloatPointCG.cpp:
     27        * platform/graphics/cg/FloatRectCG.cpp:
     28        * platform/graphics/cg/FloatSizeCG.cpp:
     29        * platform/graphics/cg/IntPointCG.cpp:
     30        * platform/graphics/cg/IntRectCG.cpp:
     31        * platform/graphics/cg/IntSizeCG.cpp:
     32        * platform/graphics/mac/FontCustomPlatformData.cpp:
     33        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
     34        (WebCore::createFontCustomPlatformData):
     35        * platform/graphics/mac/FontCustomPlatformData.h:
     36        (WebCore::FontCustomPlatformData::FontCustomPlatformData):
     37
    1382011-06-22  Luke Macpherson   <macpherson@chromium.org>
    239

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r89489 r89496  
    261261        ],
    262262      }],
    263       ['OS=="mac" and use_skia==0', {
     263      ['OS=="mac"', {
    264264        'webcore_include_dirs+': [
    265265          # platform/graphics/cg and cocoa need to come before
    … …  
    272272          '../platform/graphics/cg',
    273273        ],
    274       }],
    275       ['OS=="mac"', {
    276274        'webcore_include_dirs': [
    277275          # FIXME: Eliminate dependency on platform/mac and related
    … …  
    285283          '../platform/mac',
    286284          '../platform/text/mac',
    287         ],
    288       }],
    289       ['OS=="mac" and use_skia==1', {
    290         'webcore_include_dirs': [
    291               '../platform/graphics/cocoa',
    292               '../platform/graphics/cg',
    293285        ],
    294286      }],
    … …  
    13401332          ],
    13411333        }],
    1342         ['OS=="mac" and use_skia==0', {
    1343           'sources/': [
    1344             # The Mac build is PLATFORM_CG too.  platform/graphics/cg is the
    1345             # only place that CG files we want to build are located, and not
    1346             # all of them even have a CG suffix, so just add them by a
    1347             # regexp matching their directory.
    1348             ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
    1349           ],
    1350         }],['OS=="mac"', {
     1334        ['OS=="mac"', {
    13511335          # Necessary for Mac .mm stuff.
    13521336          'include_dirs': [
    … …  
    13781362            ['exclude', 'network/cf/'],
    13791363
     1364            # The Mac build is PLATFORM_CG too.  platform/graphics/cg is the
     1365            # only place that CG files we want to build are located, and not
     1366            # all of them even have a CG suffix, so just add them by a
     1367            # regexp matching their directory.
     1368            ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
     1369
    13801370            # Use native Mac font code from WebCore.
    13811371            ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
    … …  
    13941384            ['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'],
    13951385            ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],
     1386            ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
    13961387            ['include', 'platform/graphics/mac/IntPointMac\\.mm$'],
    13971388            ['include', 'platform/graphics/mac/IntRectMac\\.mm$'],
    … …  
    14091400            ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
    14101401
     1402            # Chromium Mac does not use skia.
     1403            ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
     1404
    14111405            # The Mac uses platform/mac/KillRingMac.mm instead of the dummy
    14121406            # implementation.
    … …  
    14201414            # related to ScrollbarThemeChromium.cpp.
    14211415            ['exclude', 'platform/chromium/ScrollbarThemeChromium\\.cpp$'],
     1416
     1417            # The Mac currently uses ImageChromiumMac.mm from
     1418            # platform/graphics/chromium, included by regex above, instead.
     1419            ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
    14221420
    14231421            # The Mac does not use ImageSourceCG.cpp from platform/graphics/cg
    … …  
    14261424            ['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'],
    14271425
    1428             ['include', '/chrome/junk\\.txt$'],
     1426            # ImageDecoderSkia is not used on mac.  ImageDecoderCG is used instead.
     1427            ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
     1428            ['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
     1429
     1430            # Again, Skia is not used on Mac.
     1431            ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
    14291432          ],
    14301433        },{ # OS!="mac"
    … …  
    14331436            # only used on mac.
    14341437            ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
    1435           ],
    1436         }],
    1437         ['OS=="mac" and use_skia==0', {
    1438           'sources/': [
    1439             # Cherry-pick some files that can't be included by broader regexps.
    1440             # Some of these are used instead of Chromium platform files, see
    1441             # the specific exclusions in the "sources!" list below.
    1442             ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
    1443 
    1444             # Chromium Mac does not use skia.
    1445             ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
    1446 
    1447             # The Mac currently uses ImageChromiumMac.mm from
    1448             # platform/graphics/chromium, included by regex above, instead.
    1449             ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
    1450 
    1451             # ImageDecoderSkia is not used on mac.  ImageDecoderCG is used instead.
    1452             ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
    1453             ['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
    1454 
    1455             # Again, Skia is not used on Mac.
    1456             ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
    1457           ],
    1458         }],
    1459         ['OS=="mac" and use_skia==1', {
    1460           'sources/': [
    1461             ['include', 'platform/graphics/cg/FloatPointCG\\.cpp$'],
    1462             ['include', 'platform/graphics/cg/FloatRectCG\\.cpp$'],
    1463             ['include', 'platform/graphics/cg/FloatSizeCG\\.cpp$'],
    1464             ['include', 'platform/graphics/cg/IntPointCG\\.cpp$'],
    1465             ['include', 'platform/graphics/cg/IntRectCG\\.cpp$'],
    1466             ['include', 'platform/graphics/cg/IntSizeCG\\.cpp$'],
    1467             ['exclude', 'platform/graphics/mac/FontMac\\.mm$'],
    1468             ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
    1469             ['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
     1438
     1439            # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
     1440            # is excluded by a rule above if WebKit uses CG instead of Skia.
     1441            ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
    14701442          ],
    14711443        }],
    … …  
    14741446            ['exclude', '(Gtk|Linux)\\.cpp$'],
    14751447            ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
    1476           ],
    1477         }],
    1478         ['toolkit_uses_gtk == 0 and use_skia==0', {
    1479           'sources/': [
    14801448            ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
    14811449          ],
    14821450        }],
    14831451        ['OS!="mac"', {
    1484           'sources/': [
    1485             ['exclude', 'Mac\\.(cpp|mm?)$'],
    1486 
    1487             # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
    1488             # is excluded by a rule above if WebKit uses CG instead of Skia.
    1489             ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
    1490           ],
     1452          'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
    14911453        }],
    14921454        ['OS!="win"', {

  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r89489 r89496  
    2929
    3030// FIXME: This should really be a blacklist instead of a whitelist
    31 #if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
     31#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROME))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
    3232#define STORE_FONT_CUSTOM_PLATFORM_DATA
    3333#endif

  • trunk/Source/WebCore/platform/chromium/DragImageRef.h

    r89489 r89496  
    3030#define DragImageRef_h
    3131
    32 #if USE(CG)
     32#if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)
    3333typedef struct CGImage* CGImageRef;
    3434#else
    … …  
    3838namespace WebCore {
    3939
    40 #if USE(CG)
     40#if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)
    4141typedef CGImageRef DragImageRef;
    4242#else

  • trunk/Source/WebCore/platform/graphics/FloatPoint.h

    r89489 r89496  
    3232#include <wtf/MathExtras.h>
    3333
    34 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     34#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3535typedef struct CGPoint CGPoint;
    3636#endif
    … …  
    126126    }   
    127127
    128 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     128#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    129129    FloatPoint(const CGPoint&);
    130130    operator CGPoint() const;

  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r89489 r89496  
    3030#include "FloatPoint.h"
    3131
    32 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     32#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3333typedef struct CGRect CGRect;
    3434#endif
    … …  
    140140    void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
    141141
    142 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     142#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    143143    FloatRect(const CGRect&);
    144144    operator CGRect() const;

  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r89489 r89496  
    3232#include <wtf/MathExtras.h>
    3333
    34 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     34#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    3535typedef struct CGSize CGSize;
    3636#endif
    … …  
    9292    }
    9393
    94 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     94#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    9595    explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
    9696    operator CGSize() const;

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r89489 r89496  
    8383#endif
    8484
    85 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     85#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    8686typedef struct CGFont* CGFontRef;
    8787#if OS(DARWIN)
    … …  
    177177    FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal,
    178178                     TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
    179 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     179#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    180180    FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
    181181                     TextOrientation textOrientation, FontWidthVariant widthVariant)
    … …  
    213213#endif
    214214
    215 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     215#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    216216#if OS(DARWIN)
    217217    CGFontRef cgFont() const { return m_cgFont.get(); }
    … …  
    246246        return m_font ? m_font->hash() : 0;
    247247#elif OS(DARWIN)
    248 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     248#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    249249        ASSERT(m_font || !m_cgFont);
    250250#endif
    … …  
    322322#endif
    323323
    324 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     324#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    325325#if PLATFORM(WIN)
    326326    RetainPtr<CGFontRef> m_cgFont;

  • trunk/Source/WebCore/platform/graphics/GlyphBuffer.h

    r89489 r89496  
    3636#include <wtf/Vector.h>
    3737
    38 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     38#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3939#include <CoreGraphics/CGGeometry.h>
    4040#endif
    … …  
    6363// CG uses CGSize instead of FloatSize so that the result of advances()
    6464// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
    65 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     65#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    6666typedef CGSize GlyphBufferAdvance;
    6767#elif OS(WINCE)
    … …  
    127127    float advanceAt(int index) const
    128128    {
    129 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     129#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    130130        return m_advances[index].width;
    131131#elif OS(WINCE)
    … …  
    158158#endif
    159159
    160 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     160#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    161161        CGSize advance = { width, 0 };
    162162        m_advances.append(advance);
    … …  
    197197        ASSERT(!isEmpty());
    198198        GlyphBufferAdvance& lastAdvance = m_advances.last();
    199 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     199#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    200200        lastAdvance.width += width;
    201201#elif OS(WINCE)

  • trunk/Source/WebCore/platform/graphics/IntPoint.h

    r89489 r89496  
    3434#endif
    3535
    36 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     36#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3737typedef struct CGPoint CGPoint;
    3838#endif
    … …  
    122122    }
    123123
    124 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     124#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    125125    explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lossy
    126126    operator CGPoint() const;

  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r89489 r89496  
    3030#include <wtf/Vector.h>
    3131
    32 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     32#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3333typedef struct CGRect CGRect;
    3434#endif
    … …  
    203203#endif
    204204
    205 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     205#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    206206    operator CGRect() const;
    207207#endif
    … …  
    249249}
    250250
    251 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     251#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    252252IntRect enclosingIntRect(const CGRect&);
    253253#endif

  • trunk/Source/WebCore/platform/graphics/IntSize.h

    r89489 r89496  
    2727#define IntSize_h
    2828
    29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030typedef struct CGSize CGSize;
    3131#endif
    … …  
    110110    }
    111111
    112 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     112#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    113113    explicit IntSize(const CGSize&); // don't do this implicitly since it's lossy
    114114    operator CGSize() const;

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.h

    r89489 r89496  
    133133    void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
    134134
    135 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
     135#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    136136    float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
    137137#endif
    … …  
    265265    mutable OwnPtr<DerivedFontData> m_derivedFontData;
    266266
    267 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
     267#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    268268    float m_syntheticBoldOffset;
    269269#endif

  • trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp

    r89489 r89496  
    2828#include "FloatPoint.h"
    2929
    30 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     30#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3131
    3232#include <ApplicationServices/ApplicationServices.h>

  • trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp

    r89489 r89496  
    2828#include "FloatRect.h"
    2929
    30 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     30#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3131
    3232#include <ApplicationServices/ApplicationServices.h>

  • trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp

    r89489 r89496  
    2828#include "FloatSize.h"
    2929
    30 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT))
     30#if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT))
    3131
    3232#include <ApplicationServices/ApplicationServices.h>

  • trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp

    r89489 r89496  
    2727#include "IntPoint.h"
    2828
    29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030
    3131#include <ApplicationServices/ApplicationServices.h>

  • trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp

    r89489 r89496  
    2727#include "IntRect.h"
    2828
    29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT))
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT))
    3030
    3131#include <ApplicationServices/ApplicationServices.h>

  • trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp

    r89489 r89496  
    2727#include "IntSize.h"
    2828
    29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     29#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    3030
    3131#include <ApplicationServices/ApplicationServices.h>

  • trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp

    r89489 r89496  
    2828#include <ApplicationServices/ApplicationServices.h>
    2929
    30 #if USE(SKIA_ON_MAC_CHROMIUM)
     30#if USE(SKIA_ON_MAC_CHROME)
    3131#include "SkStream.h"
    3232#include "SkTypeface.h"
    … …  
    3535namespace WebCore {
    3636
    37 #if USE(SKIA_ON_MAC_CHROMIUM)
     37#if USE(SKIA_ON_MAC_CHROME)
    3838class RemoteFontStream : public SkStream {
    3939public:
    … …  
    8383        ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
    8484#endif
    85 #if USE(SKIA_ON_MAC_CHROMIUM)
     85#if USE(SKIA_ON_MAC_CHROME)
    8686    SkSafeUnref(m_typeface);
    8787#endif
    … …  
    161161
    162162    FontCustomPlatformData* fontCustomPlatformData = new FontCustomPlatformData(containerRef, cgFontRef.releaseRef());
    163 #if USE(SKIA_ON_MAC_CHROMIUM)
     163#if USE(SKIA_ON_MAC_CHROME)
    164164    RemoteFontStream* stream = new RemoteFontStream(buffer);
    165165    fontCustomPlatformData->m_typeface = SkTypeface::CreateFromStream(stream);

  • trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h

    r89489 r89496  
    3434typedef UInt32 ATSFontRef;
    3535
    36 #if USE(SKIA_ON_MAC_CHROMIUM)
     36#if USE(SKIA_ON_MAC_CHROME)
    3737struct SkTypeface;
    3838#endif
    … …  
    4949        : m_atsContainer(container)
    5050        , m_cgFont(cgFont)
    51 #if USE(SKIA_ON_MAC_CHROMIUM)
     51#if USE(SKIA_ON_MAC_CHROME)
    5252        , m_typeface(0)
    5353#endif
    … …  
    6363    ATSFontContainerRef m_atsContainer;
    6464    CGFontRef m_cgFont;
    65 #if USE(SKIA_ON_MAC_CHROMIUM)
     65#if USE(SKIA_ON_MAC_CHROME)
    6666    SkTypeface* m_typeface;
    6767#endif

  • trunk/Source/WebKit/chromium/ChangeLog

    r89489 r89496  
     12011-06-22  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89489.
     4        http://trac.webkit.org/changeset/89489
     5        https://bugs.webkit.org/show_bug.cgi?id=63203
     6
     7        Broke chromium mac build on build.webkit.org (Requested by
     8        abarth on #webkit).
     9
     10        * WebKit.gyp:
     11        * features.gypi:
     12        * public/WebCommon.h:
     13
    1142011-06-22  Cary Clark  <caryclark@google.com>
    215

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r89489 r89496  
    685685                        'public/mac',
    686686                    ],
    687                     'conditions': [
    688                         ['use_skia==0', {
    689                             'sources/': [
    690                                 ['exclude', 'Skia\\.cpp$'],
    691                             ],
    692                         },{ # use_skia
    693                             'sources/': [
    694                                 ['exclude', 'CG\\.cpp$'],
    695                             ],
    696                         }],
     687                    'sources/': [
     688                        ['exclude', 'Skia\\.cpp$'],
    697689                    ],
    698690                }, { # else: OS!="mac"

  • trunk/Source/WebKit/chromium/features.gypi

    r89489 r89496  
    106106      'enable_touch_events%': 1,
    107107      'use_skia_gpu%': 0,
    108       'use_skia%': 0,
    109108      'enable_touch_icon_loading%' : 0,
    110109      'enable_smooth_scrolling%': 0,
    … …  
    123122        ],
    124123      }],
    125       ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', {
     124      ['use_accelerated_compositing==1 and OS!="mac"', {
    126125        'feature_defines': [
    127126          'ENABLE_ACCELERATED_2D_CANVAS=1',
    … …  
    149148          'WTF_USE_WEBAUDIO_FFMPEG=1',
    150149        ],
    151         'use_skia%': 1,
    152150      }],
    153151      ['enable_register_protocol_handler==1', {
    154152        'feature_defines': [
    155153          'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
    156         ],
    157       }],
    158       ['OS=="mac"', {
    159         'feature_defines': [
    160           'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)',
    161154        ],
    162155      }],

  • trunk/Source/WebKit/chromium/public/WebCommon.h

    r89489 r89496  
    4040
    4141#if !defined(WEBKIT_USING_SKIA)
    42     #if !defined(__APPLE__) || defined(USE_SKIA)
     42    #if !defined(__APPLE__)
    4343        #define WEBKIT_USING_SKIA 1
    4444    #else
Note: See TracChangeset for help on using the changeset viewer.