Changeset 90167 in webkit
- Timestamp:
- Jun 30, 2011 3:00:00 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r90159 r90167 1 2011-06-30 Cary Clark <caryclark@google.com> 2 3 Reviewed by James Robinson. 4 5 Use Skia if Skia on Mac Chrome is enabled 6 https://bugs.webkit.org/show_bug.cgi?id=62999 7 8 * wtf/Platform.h: 9 Add switch to use Skia if, externally, 10 Skia has been enabled by a gyp define. 11 1 12 2011-06-30 Juan C. Montemayor <jmont@apple.com> 2 13 -
trunk/Source/JavaScriptCore/wtf/Platform.h
r89975 r90167 544 544 #endif 545 545 546 /* USE(SKIA) for Win/Linux, CG for Mac */546 /* USE(SKIA) for Win/Linux, CG for Mac, unless enabled */ 547 547 #if PLATFORM(CHROMIUM) 548 548 #if OS(DARWIN) 549 #if USE(SKIA_ON_MAC_CHROMIUM) 550 #define WTF_USE_SKIA 1 551 #else 549 552 #define WTF_USE_CG 1 553 #endif 550 554 #define WTF_USE_ATSUI 1 551 555 #define WTF_USE_CORE_TEXT 1 -
trunk/Source/WebCore/ChangeLog
r90166 r90167 1 2011-06-30 Cary Clark <caryclark@google.com> 2 3 Reviewed by James Robinson. 4 5 Use Skia if Skia on Mac Chrome is enabled 6 https://bugs.webkit.org/show_bug.cgi?id=62999 7 8 No new tests. This does not affect existing 9 functionality. 10 11 * WebCore.gyp/WebCore.gyp: 12 Include Skia and related files and exclude CG 13 and related files when building Chromium for Skia 14 on the Mac. 15 16 * loader/cache/CachedFont.cpp: 17 Rename CHROME to CHROMIUM. 18 19 * platform/chromium/DragImageRef.h: 20 * platform/graphics/FloatPoint.h: 21 * platform/graphics/FloatRect.h: 22 * platform/graphics/FloatSize.h: 23 * platform/graphics/FontPlatformData.h: 24 (WebCore::FontPlatformData::hash): 25 * platform/graphics/GlyphBuffer.h: 26 (WebCore::GlyphBuffer::advanceAt): 27 (WebCore::GlyphBuffer::add): 28 (WebCore::GlyphBuffer::expandLastAdvance): 29 * platform/graphics/IntPoint.h: 30 * platform/graphics/IntRect.h: 31 * platform/graphics/IntSize.h: 32 * platform/graphics/SimpleFontData.h: 33 * platform/graphics/cg/FloatPointCG.cpp: 34 * platform/graphics/cg/FloatRectCG.cpp: 35 * platform/graphics/cg/FloatSizeCG.cpp: 36 * platform/graphics/cg/IntPointCG.cpp: 37 * platform/graphics/cg/IntRectCG.cpp: 38 * platform/graphics/cg/IntSizeCG.cpp: 39 * platform/graphics/mac/FontCustomPlatformData.cpp: 40 (WebCore::FontCustomPlatformData::~FontCustomPlatformData): 41 (WebCore::createFontCustomPlatformData): 42 * platform/graphics/mac/FontCustomPlatformData.h: 43 (WebCore::FontCustomPlatformData::FontCustomPlatformData): 44 Ditto. 45 1 46 2011-06-30 Julien Chaffraix <jchaffraix@webkit.org> 2 47 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r90087 r90167 261 261 ], 262 262 }], 263 ['OS=="mac" ', {263 ['OS=="mac" and use_skia==0', { 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"', { 274 276 'webcore_include_dirs': [ 275 277 # FIXME: Eliminate dependency on platform/mac and related … … 283 285 '../platform/mac', 284 286 '../platform/text/mac', 287 ], 288 }], 289 ['OS=="mac" and use_skia==1', { 290 'webcore_include_dirs': [ 291 '../platform/graphics/cocoa', 292 '../platform/graphics/cg', 285 293 ], 286 294 }], … … 1341 1349 ], 1342 1350 }], 1343 ['OS=="mac"', { 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"', { 1344 1360 # Necessary for Mac .mm stuff. 1345 1361 'include_dirs': [ … … 1371 1387 ['exclude', 'network/cf/'], 1372 1388 1373 # The Mac build is PLATFORM_CG too. platform/graphics/cg is the1374 # only place that CG files we want to build are located, and not1375 # all of them even have a CG suffix, so just add them by a1376 # regexp matching their directory.1377 ['include', 'platform/graphics/cg/[^/]*(?<!Win)?\\.(cpp|mm?)$'],1378 1379 1389 # Use native Mac font code from WebCore. 1380 1390 ['include', 'platform/(graphics/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'], … … 1393 1403 ['include', 'platform/graphics/mac/FloatSizeMac\\.mm$'], 1394 1404 ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'], 1395 ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],1396 1405 ['include', 'platform/graphics/mac/IntPointMac\\.mm$'], 1397 1406 ['include', 'platform/graphics/mac/IntRectMac\\.mm$'], … … 1409 1418 ['include', 'WebKit/mac/WebCoreSupport/WebSystemInterface\\.mm$'], 1410 1419 1411 # Chromium Mac does not use skia.1412 ['exclude', 'platform/graphics/skia/[^/]*Skia\\.(cpp|h)$'],1413 1414 1420 # The Mac uses platform/mac/KillRingMac.mm instead of the dummy 1415 1421 # implementation. … … 1423 1429 # related to ScrollbarThemeChromium.cpp. 1424 1430 ['exclude', 'platform/chromium/ScrollbarThemeChromium\\.cpp$'], 1425 1426 # The Mac currently uses ImageChromiumMac.mm from1427 # platform/graphics/chromium, included by regex above, instead.1428 ['exclude', 'platform/graphics/chromium/ImageChromium\\.cpp$'],1429 1431 1430 1432 # The Mac does not use ImageSourceCG.cpp from platform/graphics/cg … … 1433 1435 ['exclude', 'platform/graphics/cg/PDFDocumentImage\\.cpp$'], 1434 1436 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$'], 1437 ['include', '/chrome/junk\\.txt$'], 1441 1438 ], 1442 1439 },{ # OS!="mac" … … 1445 1442 # only used on mac. 1446 1443 ['exclude', 'platform/graphics/FontPlatformData\\.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$'], 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$'], 1451 1479 ], 1452 1480 }], … … 1455 1483 ['exclude', '(Gtk|Linux)\\.cpp$'], 1456 1484 ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], 1485 ], 1486 }], 1487 ['toolkit_uses_gtk == 0 and (OS!="mac" or use_skia==0)', { 1488 'sources/': [ 1457 1489 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], 1458 1490 ], 1459 1491 }], 1460 1492 ['OS!="mac"', { 1461 'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']] 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 ], 1462 1500 }], 1463 1501 ['OS!="win"', { -
trunk/Source/WebCore/loader/cache/CachedFont.cpp
r89975 r90167 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 E))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)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) 32 32 #define STORE_FONT_CUSTOM_PLATFORM_DATA 33 33 #endif -
trunk/Source/WebCore/platform/chromium/DragImageRef.h
r89975 r90167 30 30 #define DragImageRef_h 31 31 32 #if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)32 #if USE(CG) 33 33 typedef struct CGImage* CGImageRef; 34 34 #else … … 38 38 namespace WebCore { 39 39 40 #if OS(DARWIN) && !USE(SKIA_ON_MAC_CHROME)40 #if USE(CG) 41 41 typedef CGImageRef DragImageRef; 42 42 #else -
trunk/Source/WebCore/platform/graphics/FloatPoint.h
r89975 r90167 32 32 #include <wtf/MathExtras.h> 33 33 34 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)34 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 35 35 typedef struct CGPoint CGPoint; 36 36 #endif … … 131 131 } 132 132 133 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)133 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 134 134 FloatPoint(const CGPoint&); 135 135 operator CGPoint() const; -
trunk/Source/WebCore/platform/graphics/FloatRect.h
r89975 r90167 30 30 #include "FloatPoint.h" 31 31 32 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)32 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 33 33 typedef struct CGRect CGRect; 34 34 #endif … … 175 175 void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3); 176 176 177 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)177 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 178 178 FloatRect(const CGRect&); 179 179 operator CGRect() const; -
trunk/Source/WebCore/platform/graphics/FloatSize.h
r89975 r90167 32 32 #include <wtf/MathExtras.h> 33 33 34 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM E)34 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM) 35 35 typedef struct CGSize CGSize; 36 36 #endif … … 103 103 } 104 104 105 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROM E)105 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM) 106 106 explicit FloatSize(const CGSize&); // don't do this implicitly since it's lossy 107 107 operator CGSize() const; -
trunk/Source/WebCore/platform/graphics/FontPlatformData.h
r89975 r90167 83 83 #endif 84 84 85 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)85 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)179 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)215 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)248 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 249 249 ASSERT(m_font || !m_cgFont); 250 250 #endif … … 322 322 #endif 323 323 324 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)324 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 325 325 #if PLATFORM(WIN) 326 326 RetainPtr<CGFontRef> m_cgFont; -
trunk/Source/WebCore/platform/graphics/GlyphBuffer.h
r89975 r90167 36 36 #include <wtf/Vector.h> 37 37 38 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)38 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)65 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)129 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)160 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM) 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 E)199 #if USE(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROMIUM) 200 200 lastAdvance.width += width; 201 201 #elif OS(WINCE) -
trunk/Source/WebCore/platform/graphics/IntPoint.h
r89975 r90167 34 34 #endif 35 35 36 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)36 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 37 37 typedef struct CGPoint CGPoint; 38 38 #endif … … 122 122 } 123 123 124 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)124 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 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
r89975 r90167 30 30 #include <wtf/Vector.h> 31 31 32 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)32 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 33 33 typedef struct CGRect CGRect; 34 34 #endif … … 203 203 #endif 204 204 205 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)205 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 206 206 operator CGRect() const; 207 207 #endif … … 249 249 } 250 250 251 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)251 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 252 252 IntRect enclosingIntRect(const CGRect&); 253 253 #endif -
trunk/Source/WebCore/platform/graphics/IntSize.h
r89975 r90167 27 27 #define IntSize_h 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 30 30 typedef struct CGSize CGSize; 31 31 #endif … … 110 110 } 111 111 112 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)112 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 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
r89975 r90167 138 138 void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; } 139 139 140 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROM E)140 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM) 141 141 float syntheticBoldOffset() const { return m_syntheticBoldOffset; } 142 142 #endif … … 271 271 mutable OwnPtr<DerivedFontData> m_derivedFontData; 272 272 273 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROM E)273 #if USE(CG) || USE(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROMIUM) 274 274 float m_syntheticBoldOffset; 275 275 #endif -
trunk/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp
r89975 r90167 28 28 #include "FloatPoint.h" 29 29 30 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)30 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 31 31 32 32 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/FloatRectCG.cpp
r89975 r90167 28 28 #include "FloatRect.h" 29 29 30 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)30 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 31 31 32 32 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/FloatSizeCG.cpp
r89975 r90167 28 28 #include "FloatSize.h" 29 29 30 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E) || (PLATFORM(QT) && USE(QTKIT))30 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT)) 31 31 32 32 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/IntPointCG.cpp
r89975 r90167 27 27 #include "IntPoint.h" 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 30 30 31 31 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/IntRectCG.cpp
r89975 r90167 27 27 #include "IntRect.h" 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E) || (PLATFORM(QT) && USE(QTKIT))29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) || (PLATFORM(QT) && USE(QTKIT)) 30 30 31 31 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/cg/IntSizeCG.cpp
r89975 r90167 27 27 #include "IntSize.h" 28 28 29 #if USE(CG) || USE(SKIA_ON_MAC_CHROM E)29 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM) 30 30 31 31 #include <ApplicationServices/ApplicationServices.h> -
trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
r89975 r90167 28 28 #include <ApplicationServices/ApplicationServices.h> 29 29 30 #if USE(SKIA_ON_MAC_CHROM E)30 #if USE(SKIA_ON_MAC_CHROMIUM) 31 31 #include "SkStream.h" 32 32 #include "SkTypeface.h" … … 35 35 namespace WebCore { 36 36 37 #if USE(SKIA_ON_MAC_CHROM E)37 #if USE(SKIA_ON_MAC_CHROMIUM) 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 E)85 #if USE(SKIA_ON_MAC_CHROMIUM) 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 E)163 #if USE(SKIA_ON_MAC_CHROMIUM) 164 164 RemoteFontStream* stream = new RemoteFontStream(buffer); 165 165 fontCustomPlatformData->m_typeface = SkTypeface::CreateFromStream(stream); -
trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h
r89975 r90167 34 34 typedef UInt32 ATSFontRef; 35 35 36 #if USE(SKIA_ON_MAC_CHROM E)36 #if USE(SKIA_ON_MAC_CHROMIUM) 37 37 struct SkTypeface; 38 38 #endif … … 49 49 : m_atsContainer(container) 50 50 , m_cgFont(cgFont) 51 #if USE(SKIA_ON_MAC_CHROM E)51 #if USE(SKIA_ON_MAC_CHROMIUM) 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 E)65 #if USE(SKIA_ON_MAC_CHROMIUM) 66 66 SkTypeface* m_typeface; 67 67 #endif -
trunk/Source/WebKit/chromium/ChangeLog
r90164 r90167 1 2011-06-30 Cary Clark <caryclark@google.com> 2 3 Reviewed by James Robinson. 4 5 Use Skia if Skia on Mac Chrome is enabled 6 https://bugs.webkit.org/show_bug.cgi?id=62999 7 8 * WebKit.gyp: 9 If building for Skia, exclude CG files. 10 If not, exclude Skia files. 11 12 * features.gypi: 13 Enable Skia on Chromium Mac if so instructed by the gyp define. 14 Allow Skia to be hardware accelerated on the Mac. 15 16 * public/WebCommon.h: 17 If Skia is defined on the Mac, define it in the WebXXX 18 interfaces as well. 19 1 20 2011-06-30 Sreeram Ramachandran <sreeram@chromium.org> 2 21 -
trunk/Source/WebKit/chromium/WebKit.gyp
r89975 r90167 685 685 'public/mac', 686 686 ], 687 'sources/': [ 688 ['exclude', 'Skia\\.cpp$'], 687 'conditions': [ 688 ['use_skia==0', { 689 'sources/': [ 690 ['exclude', 'Skia\\.cpp$'], 691 ], 692 },{ # use_skia 693 'sources/': [ 694 ['exclude', 'CG\\.cpp$'], 695 ], 696 }], 689 697 ], 690 698 }, { # else: OS!="mac" -
trunk/Source/WebKit/chromium/features.gypi
r89975 r90167 107 107 'enable_touch_events%': 1, 108 108 'use_skia_gpu%': 0, 109 'use_skia%': 0, 109 110 'enable_touch_icon_loading%' : 0, 110 111 'enable_smooth_scrolling%': 0, … … 116 117 'enable_touch_events%': '<(enable_touch_events)', 117 118 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', 119 'use_skia%': '<(use_skia)', 118 120 'conditions': [ 119 121 ['use_accelerated_compositing==1', { … … 123 125 ], 124 126 }], 125 ['use_accelerated_compositing==1 and OS!="mac"', {127 ['use_accelerated_compositing==1 and (OS!="mac" or use_skia==1)', { 126 128 'feature_defines': [ 127 129 'ENABLE_ACCELERATED_2D_CANVAS=1', … … 141 143 'WTF_USE_WEBAUDIO_FFMPEG=1', 142 144 ], 145 'use_skia%': 1, 143 146 }], 144 147 ['enable_register_protocol_handler==1', { 145 148 'feature_defines': [ 146 149 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 150 ], 151 }], 152 ['OS=="mac"', { 153 'feature_defines': [ 154 'WTF_USE_SKIA_ON_MAC_CHROMIUM=<(use_skia)', 147 155 ], 148 156 }], -
trunk/Source/WebKit/chromium/public/WebCommon.h
r89975 r90167 40 40 41 41 #if !defined(WEBKIT_USING_SKIA) 42 #if !defined(__APPLE__) 42 #if !defined(__APPLE__) || defined(USE_SKIA) 43 43 #define WEBKIT_USING_SKIA 1 44 44 #else
Note: See TracChangeset
for help on using the changeset viewer.