Changeset 29418 in webkit

Timestamp:

Jan 11, 2008 1:58:11 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-01-11 Alp Toker <​alp@atoker.com>

Reviewed by Dave Hyatt and Mark Rowe.

​http://bugs.webkit.org/show_bug.cgi?id=16089
[GTK] Support custom fonts, CachedFont::platformDataFromCustomData()

Add support for CSS2 @font-face custom/downloadable fonts to the GTK+
port.

• GNUmakefile.am:
• WebCore.pro:
• loader/CachedFont.cpp: (WebCore::CachedFont::~CachedFont): (WebCore::CachedFont::ensureCustomFontData): (WebCore::CachedFont::platformDataFromCustomData): (WebCore::CachedFont::allReferencesRemoved):
• platform/graphics/gtk/FontCustomPlatformData.cpp: Added. (WebCore::FontCustomPlatformData::~FontCustomPlatformData): (WebCore::FontCustomPlatformData::fontPlatformData): (WebCore::releaseData): (WebCore::createFontCustomPlatformData):
• platform/graphics/gtk/FontCustomPlatformData.h: Added. (WebCore::FontCustomPlatformData::FontCustomPlatformData):
• platform/graphics/gtk/FontPlatformData.h:
• platform/graphics/gtk/FontPlatformDataGtk.cpp: (WebCore::FontPlatformData::FontPlatformData): (WebCore::FontPlatformData::init): (WebCore::FontPlatformData::isFixedPitch):
• platform/graphics/gtk/SimpleFontDataGtk.cpp: (WebCore::SimpleFontData::platformDestroy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• WebCore.pro (modified) (1 diff)
• loader/CachedFont.cpp (modified) (5 diffs)
• platform/graphics/gtk/FontCustomPlatformData.cpp (added)
• platform/graphics/gtk/FontCustomPlatformData.h (added)
• platform/graphics/gtk/FontPlatformData.h (modified) (1 diff)
• platform/graphics/gtk/FontPlatformDataGtk.cpp (modified) (4 diffs)
• platform/graphics/gtk/SimpleFontDataGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-11  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Dave Hyatt and Mark Rowe.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16089
+        [GTK] Support custom fonts, CachedFont::platformDataFromCustomData()
+
+        Add support for CSS2 @font-face custom/downloadable fonts to the GTK+
+        port.
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * loader/CachedFont.cpp:
+        (WebCore::CachedFont::~CachedFont):
+        (WebCore::CachedFont::ensureCustomFontData):
+        (WebCore::CachedFont::platformDataFromCustomData):
+        (WebCore::CachedFont::allReferencesRemoved):
+        * platform/graphics/gtk/FontCustomPlatformData.cpp: Added.
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+        (WebCore::releaseData):
+        (WebCore::createFontCustomPlatformData):
+        * platform/graphics/gtk/FontCustomPlatformData.h: Added.
+        (WebCore::FontCustomPlatformData::FontCustomPlatformData):
+        * platform/graphics/gtk/FontPlatformData.h:
+        * platform/graphics/gtk/FontPlatformDataGtk.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        (WebCore::FontPlatformData::init):
+        (WebCore::FontPlatformData::isFixedPitch):
+        * platform/graphics/gtk/SimpleFontDataGtk.cpp:
+        (WebCore::SimpleFontData::platformDestroy):
+
 2008-01-11  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/GNUmakefile.am

@@ -936 +936 @@
         WebCore/platform/gtk/FileSystemGtk.cpp \
         WebCore/platform/graphics/gtk/FontCacheGtk.cpp \
+        WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp \
         WebCore/platform/graphics/gtk/FontGtk.cpp \
         WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp \

trunk/WebCore/WebCore.pro

@@ -1006 +1006 @@
         platform/gtk/FileSystemGtk.cpp \
         platform/graphics/gtk/FontCacheGtk.cpp \
+        platform/graphics/gtk/FontCustomPlatformData.cpp \
         platform/graphics/gtk/FontGtk.cpp \
         platform/graphics/gtk/FontPlatformDataGtk.cpp \

trunk/WebCore/loader/CachedFont.cpp

@@ -31 +31 @@
 #include "CachedResourceClientWalker.h"
 #include "FontPlatformData.h"
-#if PLATFORM(CG) || PLATFORM(QT)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
 #include "FontCustomPlatformData.h"
 #endif
@@ -50 +50 @@
 CachedFont::~CachedFont()
 {
-#if PLATFORM(CG) || PLATFORM(QT)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
     delete m_fontData;
 #endif
@@ -84 +84 @@
 bool CachedFont::ensureCustomFontData()
 {
-#if PLATFORM(CG) || PLATFORM(QT)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
     if (!m_fontData && !m_errorOccurred && !m_loading) {
         m_fontData = createFontCustomPlatformData(m_data.get());
@@ -96 +96 @@
 FontPlatformData CachedFont::platformDataFromCustomData(int size, bool bold, bool italic)
 {
-#if PLATFORM(CG) || PLATFORM(QT)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
     ASSERT(m_fontData);
     return m_fontData->fontPlatformData(size, bold, italic);
@@ -106 +106 @@
 void CachedFont::allReferencesRemoved()
 {
-#if PLATFORM(CG) || PLATFORM(QT)
+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
     if (m_fontData) {
         delete m_fontData;

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

@@ -50 +50 @@
 
     FontPlatformData(const FontDescription&, const AtomicString& family);
+
+    FontPlatformData(cairo_font_face_t* fontFace, int size, bool bold, bool italic);
+
     ~FontPlatformData();
 

trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp

@@ -1 +1 @@
 /*
- * This file is part of the internal font implementation.  It should not be included by anyone other than
- * FontMac.cpp, FontWin.cpp and Font.cpp.
- *
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
+ * Copyright (C) 2007, 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * All rights reserved.
@@ -23 +20 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
- *
  */
 
@@ -112 +108 @@
 }
 
+FontPlatformData::FontPlatformData(cairo_font_face_t* fontFace, int size, bool bold, bool italic)
+    : m_pattern(0)
+    , m_fontDescription()
+    , m_scaledFont(0)
+{
+    cairo_matrix_t fontMatrix;
+    cairo_matrix_init_scale(&fontMatrix, size, size);
+    cairo_matrix_t ctm;
+    cairo_matrix_init_identity(&ctm);
+    cairo_font_options_t* options = cairo_font_options_create();
+
+    // We force antialiasing and disable hinting to provide consistent
+    // typographic qualities for custom fonts on all platforms.
+    cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
+    cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY);
+
+    m_scaledFont = cairo_scaled_font_create(fontFace, &fontMatrix, &ctm, options);
+    cairo_font_options_destroy(options);
+}
+
 bool FontPlatformData::init()
 {
-    static bool initialized;
+    static bool initialized = false;
     if (initialized)
         return true;
-    initialized = true;
     if (!FcInit()) {
         fprintf(stderr, "Can't init font config library\n");
         return false;
     }
+    initialized = true;
     return true;
 }
@@ -131 +147 @@
 bool FontPlatformData::isFixedPitch()
 {
+    // TODO: Support isFixedPitch() for custom fonts.
+    if (!m_pattern)
+        return false;
+
     int spacing;
     if (FcPatternGetInteger(m_pattern, FC_SPACING, 0, &spacing) == FcResultMatch)

trunk/WebCore/platform/graphics/gtk/SimpleFontDataGtk.cpp

@@ -2 +2 @@
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
- * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
+ * Copyright (C) 2007, 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * All rights reserved.
@@ -63 +63 @@
 void SimpleFontData::platformDestroy()
 {
-    if (m_font.m_pattern && ((FcPattern*)-1 != m_font.m_pattern))
-        FcPatternDestroy(m_font.m_pattern);
+    if (!isCustomFont()) {
+        if (m_font.m_pattern && ((FcPattern*)-1 != m_font.m_pattern)) {
+            FcPatternDestroy(m_font.m_pattern);
+            m_font.m_pattern = 0;
+        }
 
-    if (m_font.m_scaledFont)
-        cairo_scaled_font_destroy(m_font.m_scaledFont);
+        if (m_font.m_scaledFont) {
+            cairo_scaled_font_destroy(m_font.m_scaledFont);
+            m_font.m_scaledFont = 0;
+        }
+    }
+
     delete m_smallCapsFontData;
 }