Changeset 83805 in webkit

Timestamp:

Apr 13, 2011 7:13:31 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-13 Cary Clark <​caryclark@google.com>

Reviewed by Eric Seidel.

Allow CG Font support in Chrome Darwin build using Skia
​https://bugs.webkit.org/show_bug.cgi?id=58321

This allows Chrome to use Skia to do WebKit rendering, while
using CoreGraphics for glyph creation and computing font metrics.
It relies on an undefined platform token, WTF_USE_SKIA_ON_MAC_CHROME.

No new tests needed, no functionality change.

• loader/cache/CachedFont.cpp: Make CGFontRef functions and CG-specific font code available to Chrome builds on Darwin using Skia.
• platform/graphics/FontPlatformData.h: Ditto. (WebCore::FontPlatformData::hash): Ditto.
• platform/graphics/GlyphBuffer.h: Ditto. (WebCore::GlyphBuffer::advanceAt): Ditto. (WebCore::GlyphBuffer::add): Ditto. (WebCore::GlyphBuffer::expandLastAdvance): Ditto.
• platform/graphics/SimpleFontData.h: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedFont.cpp (modified) (1 diff)
• platform/graphics/FontPlatformData.h (modified) (6 diffs)
• platform/graphics/GlyphBuffer.h (modified) (5 diffs)
• platform/graphics/SimpleFontData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Cary Clark  <caryclark@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Allow CG Font support in Chrome Darwin build using Skia
+        https://bugs.webkit.org/show_bug.cgi?id=58321
+        
+        This allows Chrome to use Skia to do WebKit rendering, while
+        using CoreGraphics for glyph creation and computing font metrics.
+        It relies on an undefined platform token, WTF_USE_SKIA_ON_MAC_CHROME.
+
+        No new tests needed, no functionality change.
+
+        * loader/cache/CachedFont.cpp: Make CGFontRef functions and
+        CG-specific font code available to Chrome builds on Darwin using Skia.
+        * platform/graphics/FontPlatformData.h: Ditto.
+        (WebCore::FontPlatformData::hash): Ditto.
+        * platform/graphics/GlyphBuffer.h: Ditto.
+        (WebCore::GlyphBuffer::advanceAt): Ditto.
+        (WebCore::GlyphBuffer::add): Ditto.
+        (WebCore::GlyphBuffer::expandLastAdvance): Ditto.
+        * platform/graphics/SimpleFontData.h: Ditto.
+
 2011-04-13  Alexis Menard  <alexis.menard@openbossa.org>
 

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

@@ -28 +28 @@
 #include "CachedFont.h"
 
-#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
+// FIXME: This should really be a blacklist instead of a whitelist
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD) || USE(SKIA_MAC_ON_CHROME))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
 #define STORE_FONT_CUSTOM_PLATFORM_DATA
 #endif

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

@@ -85 +85 @@
 #endif
 
-#if PLATFORM(CG)
+#if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
 typedef struct CGFont* CGFontRef;
 #if OS(DARWIN)
@@ -180 +180 @@
     FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal,
                      TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth);
+#if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
     FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation,
                      TextOrientation textOrientation, FontWidthVariant widthVariant)
@@ -194 +195 @@
     }
 #endif
+#endif
 #if PLATFORM(WIN)
     FontPlatformData(HFONT, float size, bool syntheticBold, bool syntheticOblique, bool useGDI);
@@ -214 +216 @@
 #endif
 
-#if PLATFORM(CG)
+#if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
 #if OS(DARWIN)
 #ifndef BUILDING_ON_TIGER
@@ -251 +253 @@
         return m_font ? m_font->hash() : 0;
 #elif OS(DARWIN)
+#if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
         ASSERT(m_font || !m_cgFont);
+#endif
         uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, m_textOrientation << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique };
         return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
@@ -325 +329 @@
 #endif
 
-#if PLATFORM(CG)
+#if PLATFORM(CG) || USE(SKIA_ON_MAC_CHROME)
 #if PLATFORM(WIN)
     RetainPtr<CGFontRef> m_cgFont;

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

@@ -35 +35 @@
 #include <wtf/Vector.h>
 
-#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -59 +59 @@
 // CG uses CGSize instead of FloatSize so that the result of advances()
 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
 typedef CGSize GlyphBufferAdvance;
 #elif OS(WINCE)
@@ -123 +123 @@
     float advanceAt(int index) const
     {
-#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
         return m_advances[index].width;
 #elif OS(WINCE)
@@ -154 +154 @@
 #endif
 
-#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
         CGSize advance = { width, 0 };
         m_advances.append(advance);
@@ -193 +193 @@
         ASSERT(!isEmpty());
         GlyphBufferAdvance& lastAdvance = m_advances.last();
-#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(CG) || (PLATFORM(WX) && OS(DARWIN)) || USE(SKIA_ON_MAC_CHROME)
         lastAdvance.width += width;
 #elif OS(WINCE)

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

@@ -116 +116 @@
     float spaceWidth() const { return m_spaceWidth; }
 
-#if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(WX)
+#if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
 #endif
@@ -253 +253 @@
     mutable OwnPtr<DerivedFontData> m_derivedFontData;
 
-#if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(WX)
+#if PLATFORM(CG) || PLATFORM(CAIRO) || PLATFORM(WX) || USE(SKIA_ON_MAC_CHROME)
     float m_syntheticBoldOffset;
 #endif