Changeset 89496 in webkit
- Timestamp:
- Jun 22, 2011 4:55:53 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r89489 r89496 1 2011-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 1 12 2011-06-22 Cary Clark <caryclark@google.com> 2 13 -
trunk/Source/JavaScriptCore/wtf/Platform.h
r89489 r89496 544 544 #endif 545 545 546 /* USE(SKIA) for Win/Linux, CG for Mac , unless enabled*/546 /* USE(SKIA) for Win/Linux, CG for Mac */ 547 547 #if PLATFORM(CHROMIUM) 548 548 #if OS(DARWIN) 549 #if USE(SKIA_ON_MAC_CHROMIUM)550 #define WTF_USE_SKIA 1551 #else552 549 #define WTF_USE_CG 1 553 #endif554 550 #define WTF_USE_ATSUI 1 555 551 #define WTF_USE_CORE_TEXT 1 -
trunk/Source/WebCore/ChangeLog
r89495 r89496 1 2011-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 1 38 2011-06-22 Luke Macpherson <macpherson@chromium.org> 2 39 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r89489 r89496 261 261 ], 262 262 }], 263 ['OS=="mac" and use_skia==0', {263 ['OS=="mac"', { 264 264 'webcore_include_dirs+': [ 265 265 # platform/graphics/cg and cocoa need to come before … … 272 272 '../platform/graphics/cg', 273 273 ], 274 }],275 ['OS=="mac"', {276 274 'webcore_include_dirs': [ 277 275 # FIXME: Eliminate dependency on platform/mac and related … … 285 283 '../platform/mac', 286 284 '../platform/text/mac', 287 ],288 }],289 ['OS=="mac" and use_skia==1', {290 'webcore_include_dirs': [291 '../platform/graphics/cocoa',292 '../platform/graphics/cg',293 285 ], 294 286 }], … … 1340 1332 ], 1341 1333 }], 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"', { 1351 1335 # Necessary for Mac .mm stuff. 1352 1336 'include_dirs': [ … … 1378 1362 ['exclude', 'network/cf/'], 1379 1363 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 1380 1370 # Use native Mac font code from WebCore. 1381 1371 ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'], … … 1394 1384 ['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'], 1395 1385 ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'], 1386 ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'], 1396 1387 ['include', 'platform/graphics/mac/IntPointMac\\.mm$'], 1397 1388 ['include', 'platform/graphics/mac/IntRectMac\\.mm$'], … … 1409 1400 ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'], 1410 1401 1402 # Chromium Mac does not use skia. 1403 ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'], 1404 1411 1405 # The Mac uses platform/mac/KillRingMac.mm instead of the dummy 1412 1406 # implementation. … … 1420 1414 # related to ScrollbarThemeChromium.cpp. 1421 1415 ['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$'], 1422 1420 1423 1421 # The Mac does not use ImageSourceCG.cpp from platform/graphics/cg … … 1426 1424 ['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'], 1427 1425 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$'], 1429 1432 ], 1430 1433 },{ # OS!="mac" … … 1433 1436 # only used on mac. 1434 1437 ['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$'], 1470 1442 ], 1471 1443 }], … … 1474 1446 ['exclude', '(Gtk|Linux)\\.cpp$'], 1475 1447 ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], 1476 ],1477 }],1478 ['toolkit_uses_gtk == 0 and use_skia==0', {1479 'sources/': [1480 1448 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], 1481 1449 ], 1482 1450 }], 1483 1451 ['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?)$']] 1491 1453 }], 1492 1454 ['OS!="win"', { -
trunk/Source/WebCore/loader/cache/CachedFont.cpp
r89489 r89496 29 29 30 30 // 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_CHROM IUM))) || 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) 32 32 #define STORE_FONT_CUSTOM_PLATFORM_DATA 33 33 #endif -
trunk/Source/WebCore/platform/chromium/DragImageRef.h
r89489 r89496 30 30 #define DragImageRef_h 31 31 32 #if USE(CG)32 #if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME) 33 33 typedef struct CGImage* CGImageRef; 34 34 #else … … 38 38 namespace WebCore { 39 39 40 #if USE(CG)40 #if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME) 41 41 typedef CGImageRef DragImageRef; 42 42 #else -
trunk/Source/WebCore/platform/graphics/FloatPoint.h
r89489 r89496 32 32 #include <wtf/MathExtras.h> 33 33 34 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)34 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 35 35 typedef struct CGPoint CGPoint; 36 36 #endif … … 126 126 } 127 127 128 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)128 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 129 129 FloatPoint(const CGPoint&); 130 130 operator CGPoint() const; -
trunk/Source/WebCore/platform/graphics/FloatRect.h
r89489 r89496 30 30 #include "FloatPoint.h" 31 31 32 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)32 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 33 33 typedef struct CGRect CGRect; 34 34 #endif … … 140 140 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3); 141 141 142 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)142 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 143 143 FloatRect(const CGRect&); 144 144 operator CGRect() const; -
trunk/Source/WebCore/platform/graphics/FloatSize.h
r89489 r89496 32 32 #include <wtf/MathExtras.h> 33 33 34 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM IUM)34 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) 35 35 typedef struct CGSize CGSize; 36 36 #endif … … 92 92 } 93 93 94 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM IUM)94 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) 95 95 explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy 96 96 operator CGSize() const; -
trunk/Source/WebCore/platform/graphics/FontPlatformData.h
r89489 r89496 83 83 #endif 84 84 85 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)85 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 86 86 typedef struct CGFont* CGFontRef; 87 87 #if OS(DARWIN) … … 177 177 FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal, 178 178 TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth); 179 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)179 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 180 180 FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, 181 181 TextOrientation textOrientation, FontWidthVariant widthVariant) … … 213 213 #endif 214 214 215 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)215 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 216 216 #if OS(DARWIN) 217 217 CGFontRef cgFont() const { return m_cgFont.get(); } … … 246 246 return m_font ? m_font->hash() : 0; 247 247 #elif OS(DARWIN) 248 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)248 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 249 249 ASSERT(m_font || !m_cgFont); 250 250 #endif … … 322 322 #endif 323 323 324 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)324 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 325 325 #if PLATFORM(WIN) 326 326 RetainPtr<CGFontRef> m_cgFont; -
trunk/Source/WebCore/platform/graphics/GlyphBuffer.h
r89489 r89496 36 36 #include <wtf/Vector.h> 37 37 38 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)38 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 39 39 #include <CoreGraphics/CGGeometry.h> 40 40 #endif … … 63 63 // CG uses CGSize instead of FloatSize so that the result of advances() 64 64 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm 65 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM IUM)65 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) 66 66 typedef CGSize GlyphBufferAdvance; 67 67 #elif OS(WINCE) … … 127 127 float advanceAt(int index) const 128 128 { 129 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM IUM)129 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) 130 130 return m_advances[index].width; 131 131 #elif OS(WINCE) … … 158 158 #endif 159 159 160 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM IUM)160 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) 161 161 CGSize advance = { width, 0 }; 162 162 m_advances.append(advance); … … 197 197 ASSERT(!isEmpty()); 198 198 GlyphBufferAdvance& lastAdvance = m_advances.last(); 199 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM IUM)199 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME) 200 200 lastAdvance.width += width; 201 201 #elif OS(WINCE) -
trunk/Source/WebCore/platform/graphics/IntPoint.h
r89489 r89496 34 34 #endif 35 35 36 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)36 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 37 37 typedef struct CGPoint CGPoint; 38 38 #endif … … 122 122 } 123 123 124 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)124 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 125 125 explicit IntPoint(const CGPoint&); // don't do this implicitly since it's lossy 126 126 operator CGPoint() const; -
trunk/Source/WebCore/platform/graphics/IntRect.h
r89489 r89496 30 30 #include <wtf/Vector.h> 31 31 32 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)32 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 33 33 typedef struct CGRect CGRect; 34 34 #endif … … 203 203 #endif 204 204 205 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)205 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 206 206 operator CGRect() const; 207 207 #endif … … 249 249 } 250 250 251 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)251 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 252 252 IntRect enclosingIntRect(const CGRect&); 253 253 #endif -
trunk/Source/WebCore/platform/graphics/IntSize.h
r89489 r89496 27 27 #define IntSize_h 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)29 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 30 30 typedef struct CGSize CGSize; 31 31 #endif … … 110 110 } 111 111 112 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)112 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 113 113 explicit IntSize(const CGSize&); // don't do this implicitly since it's lossy 114 114 operator CGSize() const; -
trunk/Source/WebCore/platform/graphics/SimpleFontData.h
r89489 r89496 133 133 void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; } 134 134 135 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROM IUM)135 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME) 136 136 float syntheticBoldOffset() const { return m_syntheticBoldOffset; } 137 137 #endif … … 265 265 mutable OwnPtr<DerivedFontData> m_derivedFontData; 266 266 267 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROM IUM)267 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME) 268 268 float m_syntheticBoldOffset; 269 269 #endif -
trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp
r89489 r89496 28 28 #include "FloatPoint.h" 29 29 30 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)30 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 31 31 32 32 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp
r89489 r89496 28 28 #include "FloatRect.h" 29 29 30 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)30 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 31 31 32 32 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp
r89489 r89496 28 28 #include "FloatSize.h" 29 29 30 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM) || (PLATFORM(QT) && USE(QTKIT))30 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT)) 31 31 32 32 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp
r89489 r89496 27 27 #include "IntPoint.h" 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)29 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 30 30 31 31 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp
r89489 r89496 27 27 #include "IntRect.h" 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM) || (PLATFORM(QT) && USE(QTKIT))29 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) || (PLATFORM(QT) && USE(QTKIT)) 30 30 31 31 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp
r89489 r89496 27 27 #include "IntSize.h" 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM IUM)29 #if USE(CG) || USE(SKIA_ON_MAC_CHROME) 30 30 31 31 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
r89489 r89496 28 28 #include <ApplicationServices/ApplicationServices.h> 29 29 30 #if USE(SKIA_ON_MAC_CHROM IUM)30 #if USE(SKIA_ON_MAC_CHROME) 31 31 #include "SkStream.h" 32 32 #include "SkTypeface.h" … … 35 35 namespace WebCore { 36 36 37 #if USE(SKIA_ON_MAC_CHROM IUM)37 #if USE(SKIA_ON_MAC_CHROME) 38 38 class RemoteFontStream : public SkStream { 39 39 public: … … 83 83 ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault); 84 84 #endif 85 #if USE(SKIA_ON_MAC_CHROM IUM)85 #if USE(SKIA_ON_MAC_CHROME) 86 86 SkSafeUnref(m_typeface); 87 87 #endif … … 161 161 162 162 FontCustomPlatformData* fontCustomPlatformData = new FontCustomPlatformData(containerRef, cgFontRef.releaseRef()); 163 #if USE(SKIA_ON_MAC_CHROM IUM)163 #if USE(SKIA_ON_MAC_CHROME) 164 164 RemoteFontStream* stream = new RemoteFontStream(buffer); 165 165 fontCustomPlatformData->m_typeface = SkTypeface::CreateFromStream(stream); -
trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h
r89489 r89496 34 34 typedef UInt32 ATSFontRef; 35 35 36 #if USE(SKIA_ON_MAC_CHROM IUM)36 #if USE(SKIA_ON_MAC_CHROME) 37 37 struct SkTypeface; 38 38 #endif … … 49 49 : m_atsContainer(container) 50 50 , m_cgFont(cgFont) 51 #if USE(SKIA_ON_MAC_CHROM IUM)51 #if USE(SKIA_ON_MAC_CHROME) 52 52 , m_typeface(0) 53 53 #endif … … 63 63 ATSFontContainerRef m_atsContainer; 64 64 CGFontRef m_cgFont; 65 #if USE(SKIA_ON_MAC_CHROM IUM)65 #if USE(SKIA_ON_MAC_CHROME) 66 66 SkTypeface* m_typeface; 67 67 #endif -
trunk/Source/WebKit/chromium/ChangeLog
r89489 r89496 1 2011-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 1 14 2011-06-22 Cary Clark <caryclark@google.com> 2 15 -
trunk/Source/WebKit/chromium/WebKit.gyp
r89489 r89496 685 685 'public/mac', 686 686 ], 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$'], 697 689 ], 698 690 }, { # else: OS!="mac" -
trunk/Source/WebKit/chromium/features.gypi
r89489 r89496 106 106 'enable_touch_events%': 1, 107 107 'use_skia_gpu%': 0, 108 'use_skia%': 0,109 108 'enable_touch_icon_loading%' : 0, 110 109 'enable_smooth_scrolling%': 0, … … 123 122 ], 124 123 }], 125 ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', {124 ['use_accelerated_compositing==1 and OS!="mac"', { 126 125 'feature_defines': [ 127 126 'ENABLE_ACCELERATED_2D_CANVAS=1', … … 149 148 'WTF_USE_WEBAUDIO_FFMPEG=1', 150 149 ], 151 'use_skia%': 1,152 150 }], 153 151 ['enable_register_protocol_handler==1', { 154 152 'feature_defines': [ 155 153 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 156 ],157 }],158 ['OS=="mac"', {159 'feature_defines': [160 'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)',161 154 ], 162 155 }], -
trunk/Source/WebKit/chromium/public/WebCommon.h
r89489 r89496 40 40 41 41 #if !defined(WEBKIT_USING_SKIA) 42 #if !defined(__APPLE__) || defined(USE_SKIA)42 #if !defined(__APPLE__) 43 43 #define WEBKIT_USING_SKIA 1 44 44 #else
Note: See TracChangeset
for help on using the changeset viewer.