Changeset 89975 in webkit


Ignore:
Timestamp:
Jun 28, 2011 4:39:05 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-28 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r89968.
http://trac.webkit.org/changeset/89968
https://bugs.webkit.org/show_bug.cgi?id=63581

Broke chromium windows compile (Requested by jamesr on
#webkit).

  • wtf/Platform.h:

2011-06-28 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r89968.
http://trac.webkit.org/changeset/89968
https://bugs.webkit.org/show_bug.cgi?id=63581

Broke chromium windows compile (Requested by jamesr 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-28 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r89968.
http://trac.webkit.org/changeset/89968
https://bugs.webkit.org/show_bug.cgi?id=63581

Broke chromium windows compile (Requested by jamesr on
#webkit).

  • WebKit.gyp:
  • features.gypi:
  • public/WebCommon.h:
Location:
trunk/Source
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r89973 r89975  
     12011-06-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89968.
     4        http://trac.webkit.org/changeset/89968
     5        https://bugs.webkit.org/show_bug.cgi?id=63581
     6
     7        Broke chromium windows compile (Requested by jamesr on
     8        #webkit).
     9
     10        * wtf/Platform.h:
     11
    1122011-06-28  Oliver Hunt  <oliver@apple.com>
    213
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r89968 r89975  
    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

    r89974 r89975  
     12011-06-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89968.
     4        http://trac.webkit.org/changeset/89968
     5        https://bugs.webkit.org/show_bug.cgi?id=63581
     6
     7        Broke chromium windows compile (Requested by jamesr on
     8        #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-28  Levi Weintraub  <leviw@chromium.org>
    239
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r89968 r89975  
    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      }],
     
    13491341          ],
    13501342        }],
    1351         ['OS=="mac" and use_skia==0', {
    1352           'sources/': [
    1353             # The Mac build is PLATFORM_CG too.  platform/graphics/cg is the
    1354             # only place that CG files we want to build are located, and not
    1355             # all of them even have a CG suffix, so just add them by a
    1356             # regexp matching their directory.
    1357             ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
    1358           ],
    1359         }],['OS=="mac"', {
     1343        ['OS=="mac"', {
    13601344          # Necessary for Mac .mm stuff.
    13611345          'include_dirs': [
     
    13871371            ['exclude', 'network/cf/'],
    13881372
     1373            # The Mac build is PLATFORM_CG too.  platform/graphics/cg is the
     1374            # only place that CG files we want to build are located, and not
     1375            # all of them even have a CG suffix, so just add them by a
     1376            # regexp matching their directory.
     1377            ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],
     1378
    13891379            # Use native Mac font code from WebCore.
    13901380            ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
     
    14031393            ['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'],
    14041394            ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],
     1395            ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
    14051396            ['include', 'platform/graphics/mac/IntPointMac\\.mm$'],
    14061397            ['include', 'platform/graphics/mac/IntRectMac\\.mm$'],
     
    14181409            ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'],
    14191410
     1411            # Chromium Mac does not use skia.
     1412            ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
     1413
    14201414            # The Mac uses platform/mac/KillRingMac.mm instead of the dummy
    14211415            # implementation.
     
    14291423            # related to ScrollbarThemeChromium.cpp.
    14301424            ['exclude', 'platform/chromium/ScrollbarThemeChromium\\.cpp$'],
     1425
     1426            # The Mac currently uses ImageChromiumMac.mm from
     1427            # platform/graphics/chromium, included by regex above, instead.
     1428            ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
    14311429
    14321430            # The Mac does not use ImageSourceCG.cpp from platform/graphics/cg
     
    14351433            ['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'],
    14361434
    1437             ['include', '/chrome/junk\\.txt$'],
     1435            # ImageDecoderSkia is not used on mac.  ImageDecoderCG is used instead.
     1436            ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
     1437            ['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
     1438
     1439            # Again, Skia is not used on Mac.
     1440            ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
    14381441          ],
    14391442        },{ # OS!="mac"
     
    14421445            # only used on mac.
    14431446            ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'],
    1444           ],
    1445         }],
    1446         ['OS=="mac" and use_skia==0', {
    1447           'sources/': [
    1448             # Cherry-pick some files that can't be included by broader regexps.
    1449             # Some of these are used instead of Chromium platform files, see
    1450             # the specific exclusions in the "sources!" list below.
    1451             ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
    1452 
    1453             # Chromium Mac does not use skia.
    1454             ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],
    1455 
    1456             # The Mac currently uses ImageChromiumMac.mm from
    1457             # platform/graphics/chromium, included by regex above, instead.
    1458             ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],
    1459 
    1460             # ImageDecoderSkia is not used on mac.  ImageDecoderCG is used instead.
    1461             ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'],
    1462             ['include', 'platform/image-decoders/cg/ImageDecoderCG\\.cpp$'],
    1463 
    1464             # Again, Skia is not used on Mac.
    1465             ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
    1466           ],
    1467         }],
    1468         ['OS=="mac" and use_skia==1', {
    1469           'sources/': [
    1470             ['include', 'platform/graphics/cg/FloatPointCG\\.cpp$'],
    1471             ['include', 'platform/graphics/cg/FloatRectCG\\.cpp$'],
    1472             ['include', 'platform/graphics/cg/FloatSizeCG\\.cpp$'],
    1473             ['include', 'platform/graphics/cg/IntPointCG\\.cpp$'],
    1474             ['include', 'platform/graphics/cg/IntRectCG\\.cpp$'],
    1475             ['include', 'platform/graphics/cg/IntSizeCG\\.cpp$'],
    1476             ['exclude', 'platform/graphics/mac/FontMac\\.mm$'],
    1477             ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
    1478             ['exclude', 'platform/chromium/DragImageChromiumMac\\.cpp$'],
     1447
     1448            # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
     1449            # is excluded by a rule above if WebKit uses CG instead of Skia.
     1450            ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
    14791451          ],
    14801452        }],
     
    14831455            ['exclude', '(Gtk|Linux)\\.cpp$'],
    14841456            ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
    1485           ],
    1486         }],
    1487         ['toolkit_uses_gtk == 0 and use_skia==0', {
    1488           'sources/': [
    14891457            ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
    14901458          ],
    14911459        }],
    14921460        ['OS!="mac"', {
    1493           'sources/': [
    1494             ['exclude', 'Mac\\.(cpp|mm?)$'],
    1495 
    1496             # Linux uses FontLinux; Windows uses FontWin. Additionally, FontSkia
    1497             # is excluded by a rule above if WebKit uses CG instead of Skia.
    1498             ['exclude', 'platform/graphics/skia/FontSkia\\.cpp$'],
    1499           ],
     1461          'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
    15001462        }],
    15011463        ['OS!="win"', {
  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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
     
    131131    }
    132132
    133 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     133#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    134134    FloatPoint(const CGPoint&);
    135135    operator CGPoint() const;
  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r89968 r89975  
    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
     
    175175    void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3);
    176176
    177 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
     177#if USE(CG) || USE(SKIA_ON_MAC_CHROME)
    178178    FloatRect(const CGRect&);
    179179    operator CGRect() const;
  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r89968 r89975  
    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
     
    103103    }
    104104
    105 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM)
     105#if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
    106106    explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy
    107107    operator CGSize() const;
  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    138138    void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
    139139
    140 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
     140#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    141141    float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
    142142#endif
     
    271271    mutable OwnPtr<DerivedFontData> m_derivedFontData;
    272272
    273 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM)
     273#if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
    274274    float m_syntheticBoldOffset;
    275275#endif
  • trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
    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

    r89968 r89975  
     12011-06-28  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r89968.
     4        http://trac.webkit.org/changeset/89968
     5        https://bugs.webkit.org/show_bug.cgi?id=63581
     6
     7        Broke chromium windows compile (Requested by jamesr on
     8        #webkit).
     9
     10        * WebKit.gyp:
     11        * features.gypi:
     12        * public/WebCommon.h:
     13
    1142011-06-28  Cary Clark  <caryclark@google.com>
    215
  • trunk/Source/WebKit/chromium/WebKit.gyp

    r89968 r89975  
    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

    r89968 r89975  
    107107      'enable_touch_events%': 1,
    108108      'use_skia_gpu%': 0,
    109       'use_skia%': 0,
    110109      'enable_touch_icon_loading%' : 0,
    111110      'enable_smooth_scrolling%': 0,
     
    117116    'enable_touch_events%': '<(enable_touch_events)',
    118117    'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
    119     'use_skia%': '<(use_skia)',
    120118    'conditions': [
    121119      ['use_accelerated_compositing==1', {
     
    125123        ],
    126124      }],
    127       ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', {
     125      ['use_accelerated_compositing==1 and OS!="mac"', {
    128126        'feature_defines': [
    129127          'ENABLE_ACCELERATED_2D_CANVAS=1',
     
    143141          'WTF_USE_WEBAUDIO_FFMPEG=1',
    144142        ],
    145         'use_skia%': 1,
    146143      }],
    147144      ['enable_register_protocol_handler==1', {
    148145        'feature_defines': [
    149146          'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
    150         ],
    151       }],
    152       ['OS=="mac"', {
    153         'feature_defines': [
    154           'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)',
    155147        ],
    156148      }],
  • trunk/Source/WebKit/chromium/public/WebCommon.h

    r89968 r89975  
    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.