Changeset 29864 in webkit

Timestamp:

Jan 29, 2008 7:50:08 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17085 <rdar://problem/5714136> REGRESSION (r29839): All remote fonts are treated as SVG fonts

Test: fast/css/font-face-remote.html

Added an isSVGFont method to CachedFont and use it to decide how to
process the font data. Currently whether the data is SVG is determined
based on the format property in the @font-face rule, but in the future
the MIME type or other metadata may be used when the format is
unspecified.

• css/CSSFontFaceSource.cpp: (WebCore::CSSFontFaceSource::getFontData): Changed to parse the data as SVG only if the CachedFont is an SVG font.
• css/CSSFontSelector.cpp: (WebCore::CSSFontSelector::addFontFaceRule): Mark the CachedFont as an SVG font based on format.
• loader/CachedFont.cpp: (WebCore::CachedFont::CachedFont): Initialize m_isSVGFont to false. (WebCore::CachedFont::ensureCustomFontData): (WebCore::CachedFont::ensureSVGFontData): (WebCore::CachedFont::getSVGFontById):
• loader/CachedFont.h: (WebCore::CachedFont::isSVGFont): Added. (WebCore::CachedFont::setSVGFont): Added.

LayoutTests:

Reviewed by Dave Hyatt.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17085 <rdar://problem/5714136> REGRESSION (r29839): All remote fonts are treated as SVG fonts

This is the first @font-face test that actually tests loading font data
from a URL.

• fast/css/font-face-remote.html: Added.
• fast/css/resources/Ahem.ttf: Added.
• platform/mac/fast/css/font-face-remote-expected.checksum: Added.
• platform/mac/fast/css/font-face-remote-expected.png: Added.
• platform/mac/fast/css/font-face-remote-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/font-face-remote.html (added)
• LayoutTests/fast/css/resources/Ahem.ttf (added)
• LayoutTests/platform/mac/fast/css/font-face-remote-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/font-face-remote-expected.png (added)
• LayoutTests/platform/mac/fast/css/font-face-remote-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSFontFaceSource.cpp (modified) (1 diff)
• WebCore/css/CSSFontSelector.cpp (modified) (2 diffs)
• WebCore/loader/CachedFont.cpp (modified) (4 diffs)
• WebCore/loader/CachedFont.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-01-29  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17085
+          <rdar://problem/5714136> REGRESSION (r29839): All remote fonts are treated as SVG fonts
+
+        This is the first @font-face test that actually tests loading font data
+        from a URL.
+
+        * fast/css/font-face-remote.html: Added.
+        * fast/css/resources/Ahem.ttf: Added.
+        * platform/mac/fast/css/font-face-remote-expected.checksum: Added.
+        * platform/mac/fast/css/font-face-remote-expected.png: Added.
+        * platform/mac/fast/css/font-face-remote-expected.txt: Added.
+
 2008-01-29  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-29  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17085
+          <rdar://problem/5714136> REGRESSION (r29839): All remote fonts are treated as SVG fonts
+
+        Test: fast/css/font-face-remote.html
+
+        Added an isSVGFont method to CachedFont and use it to decide how to
+        process the font data. Currently whether the data is SVG is determined
+        based on the format property in the @font-face rule, but in the future
+        the MIME type or other metadata may be used when the format is
+        unspecified.
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData): Changed to parse the data as
+        SVG only if the CachedFont is an SVG font.
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::addFontFaceRule): Mark the CachedFont as an
+        SVG font based on format.
+        * loader/CachedFont.cpp:
+        (WebCore::CachedFont::CachedFont): Initialize m_isSVGFont to false.
+        (WebCore::CachedFont::ensureCustomFontData):
+        (WebCore::CachedFont::ensureSVGFontData):
+        (WebCore::CachedFont::getSVGFontById):
+        * loader/CachedFont.h:
+        (WebCore::CachedFont::isSVGFont): Added.
+        (WebCore::CachedFont::setSVGFont): Added.
+
 2008-01-29  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/css/CSSFontFaceSource.cpp

@@ -119 +119 @@
         if (m_font) {
 #if ENABLE(SVG_FONTS)
-            // For SVG fonts parse the external SVG document, and extract the <font> element.
-            if (!m_font->ensureSVGFontData())
-                return 0;
+            if (m_font->isSVGFont()) {
+                // For SVG fonts parse the external SVG document, and extract the <font> element.
+                if (!m_font->ensureSVGFontData())
+                    return 0;
 
-            if (!m_externalSVGFontElement)
-                m_externalSVGFontElement = m_font->getSVGFontById(SVGURIReference::getTarget(m_string));
+                if (!m_externalSVGFontElement)
+                    m_externalSVGFontElement = m_font->getSVGFontById(SVGURIReference::getTarget(m_string));
 
-            if (m_externalSVGFontElement) {
+                if (!m_externalSVGFontElement)
+                    return 0;
+
                 SVGFontFaceElement* fontFaceElement = 0;
 

trunk/WebCore/css/CSSFontSelector.cpp

@@ -29 +29 @@
 #include "CSSFontSelector.h"
 #include "AtomicString.h"
-#include "CString.h"
+#include "CachedFont.h"
 #include "CSSFontFace.h"
 #include "CSSFontFaceRule.h"
@@ -156 +156 @@
             if (item->isSupportedFormat()) {
                 CachedFont* cachedFont = m_document->docLoader()->requestFont(item->resource());
-                if (cachedFont)
+                if (cachedFont) {
+#if ENABLE(SVG_FONTS)
+                    if (foundSVGFont)
+                        cachedFont->setSVGFont(true);
+#endif
                     source = new CSSFontFaceSource(item->resource(), cachedFont);
+                }
             }
         } else {

trunk/WebCore/loader/CachedFont.cpp

@@ -51 +51 @@
 CachedFont::CachedFont(DocLoader* dl, const String &url)
     : CachedResource(url, FontResource), m_fontData(0)
+    , m_isSVGFont(false)
 {
     // Don't load the file yet.  Wait for an access before triggering the load.
@@ -94 +95 @@
 {
 #if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK)
+#if ENABLE(SVG_FONTS)
+    ASSERT(!m_isSVGFont);
+#endif
     if (!m_fontData && !m_errorOccurred && !m_loading && m_data) {
         m_fontData = createFontCustomPlatformData(m_data.get());
@@ -120 +124 @@
 bool CachedFont::ensureSVGFontData()
 {
+    ASSERT(m_isSVGFont);
     if (!m_externalSVGDocument && !m_errorOccurred && !m_loading && m_data) {
         m_externalSVGDocument = new SVGDocument(DOMImplementation::instance(), 0);
@@ -136 +141 @@
 SVGFontElement* CachedFont::getSVGFontById(const String& fontName) const
 {
+    ASSERT(m_isSVGFont);
     RefPtr<NodeList> list = m_externalSVGDocument->getElementsByTagName(SVGNames::fontTag.localName());
     if (!list)

trunk/WebCore/loader/CachedFont.h

@@ -64 +64 @@
 
 #if ENABLE(SVG_FONTS)
+    bool isSVGFont() const { return m_isSVGFont; }
+    void setSVGFont(bool isSVG) { m_isSVGFont = isSVG; }
     bool ensureSVGFontData();
     SVGFontElement* getSVGFontById(const String&) const;
@@ -73 +75 @@
 
 #if ENABLE(SVG_FONTS)
+    bool m_isSVGFont;
     RefPtr<SVGDocument> m_externalSVGDocument;
 #endif