Changeset 40278 in webkit

Timestamp:

Jan 26, 2009 4:45:36 PM (15 years ago)

Author:

weinig@apple.com

Message:

WebCore:

2009-01-26 Sam Weinig <​sam@webkit.org>

Reviewed by Dan Bernstein.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=18141
Acid3 tests 77 and 78 fail on reload due to SVG font race
<rdar://problem/6504899>

Match Opera's behavior of loading SVGFonts as soon as <font-face-uri>
tag is inserted into the document and not at the first use of the font
as is done for CSS web fonts.

This fixes a race condition noticeable by some in the Acid3 test that
happened because the onload event handler for an iframe containing a
<font-face-uri> with an external reference was not delayed by the pending
load of the font.

Test: http/tests/misc/SVGFont-delayed-load.html

• svg/SVGFontFaceUriElement.cpp: (WebCore::SVGFontFaceUriElement::~SVGFontFaceUriElement): (WebCore::SVGFontFaceUriElement::parseMappedAttribute): Call loadFont if the href attribute changes. (WebCore::SVGFontFaceUriElement::insertedIntoDocument): Call loadFont. (WebCore::SVGFontFaceUriElement::loadFont): Force a load of the font specified in href attribute.
• svg/SVGFontFaceUriElement.h:

LayoutTests:

2009-01-26 Sam Weinig <​sam@webkit.org>

Reviewed by Dan Bernstein.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=18141
Acid3 tests 77 and 78 fail on reload due to SVG font race
<rdar://problem/6504899>

• http/tests/misc/SVGFont-delayed-load-expected.txt: Added.
• http/tests/misc/SVGFont-delayed-load.html: Added.
• http/tests/misc/resources/SVGFont-delayed-loader.svg: Added.
• svg/custom/acid3-test-77.html:
• svg/custom/resources/Acid3Font-loader.svg:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/SVGFont-delayed-load-expected.txt (added)
• LayoutTests/http/tests/misc/SVGFont-delayed-load.html (added)
• LayoutTests/http/tests/misc/resources/SVGFont-delayed-loader.svg (added)
• LayoutTests/svg/custom/acid3-test-77.html (modified) (1 diff)
• LayoutTests/svg/custom/resources/Acid3Font-loader.svg (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGFontFaceUriElement.cpp (modified) (5 diffs)
• WebCore/svg/SVGFontFaceUriElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-01-26  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=18141
+        Acid3 tests 77 and 78 fail on reload due to SVG font race
+        <rdar://problem/6504899>
+
+        * http/tests/misc/SVGFont-delayed-load-expected.txt: Added.
+        * http/tests/misc/SVGFont-delayed-load.html: Added.
+        * http/tests/misc/resources/SVGFont-delayed-loader.svg: Added.
+        * svg/custom/acid3-test-77.html:
+        * svg/custom/resources/Acid3Font-loader.svg:
+
 2009-01-26  Pierre-Olivier Latour  <pol@apple.com>
 

trunk/LayoutTests/svg/custom/acid3-test-77.html

@@ -52 +52 @@
     text.setAttribute("y", "1em");
     text.setAttribute("font-size", "4000");
-    window.setTimeout("executeTest()", 150);
+    executeTest();
   }
     

trunk/LayoutTests/svg/custom/resources/Acid3Font-loader.svg

@@ -11 +11 @@
     </defs>
     <text>X</text>
-
-    <!-- Adding this possibly fixes the problem that acid3-test-77.html is timing dependa though it currently crashes us
-    <script>document.documentElement.offsetWidth;</script> -->
 </svg>

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-01-26  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=18141
+        Acid3 tests 77 and 78 fail on reload due to SVG font race
+        <rdar://problem/6504899>
+
+        Match Opera's behavior of loading SVGFonts as soon as <font-face-uri>
+        tag is inserted into the document and not at the first use of the font
+        as is done for CSS web fonts.
+
+        This fixes a race condition noticeable by some in the Acid3 test that
+        happened because the onload event handler for an iframe containing a
+        <font-face-uri> with an external reference was not delayed by the pending
+        load of the font.
+
+        Test: http/tests/misc/SVGFont-delayed-load.html
+
+        * svg/SVGFontFaceUriElement.cpp:
+        (WebCore::SVGFontFaceUriElement::~SVGFontFaceUriElement):
+        (WebCore::SVGFontFaceUriElement::parseMappedAttribute): Call loadFont if
+        the href attribute changes.
+        (WebCore::SVGFontFaceUriElement::insertedIntoDocument): Call loadFont.
+        (WebCore::SVGFontFaceUriElement::loadFont): Force a load of the
+        font specified in href attribute.
+        * svg/SVGFontFaceUriElement.h:
+
 2009-01-26  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/svg/SVGFontFaceUriElement.cpp

@@ -1 +1 @@
 /*
    Copyright (C) 2007 Eric Seidel <eric@webkit.org>
+   Copyright (C) 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
@@ -24 +25 @@
 
 #include "CSSFontFaceSrcValue.h"
+#include "CachedFont.h"
+#include "DocLoader.h"
+#include "Document.h"
 #include "SVGFontFaceElement.h"
 #include "SVGNames.h"
@@ -37 +41 @@
 }
 
+SVGFontFaceUriElement::~SVGFontFaceUriElement()
+{
+    if (m_cachedFont)
+        m_cachedFont->removeClient(this);
+}
+
 PassRefPtr<CSSFontFaceSrcValue> SVGFontFaceUriElement::srcValue() const
 {
@@ -43 +53 @@
     src->setFormat(value.isEmpty() ? "svg" : value); // Default format
     return src.release();
+}
+
+void SVGFontFaceUriElement::parseMappedAttribute(MappedAttribute* attr)
+{
+    const QualifiedName& attrName = attr->name();
+    if (attrName == XLinkNames::hrefAttr)
+        loadFont();
+    else
+        SVGElement::parseMappedAttribute(attr);
 }
 
@@ -57 +76 @@
 }
 
+void SVGFontFaceUriElement::insertedIntoDocument()
+{
+    loadFont();
+    SVGElement::insertedIntoDocument();
+}
+
+void SVGFontFaceUriElement::loadFont()
+{
+    if (m_cachedFont)
+        m_cachedFont->removeClient(this);
+
+    String href = getAttribute(XLinkNames::hrefAttr);
+    if (!href.isNull()) {        
+        DocLoader* docLoader = document()->docLoader();
+        m_cachedFont = docLoader->requestFont(href);
+        m_cachedFont->setSVGFont(true);
+        m_cachedFont->addClient(this);
+        m_cachedFont->beginLoadIfNeeded(docLoader);
+    } else
+        m_cachedFont = 0;
+}
+
 }
 

trunk/WebCore/svg/SVGFontFaceUriElement.h

@@ -22 +22 @@
 
 #if ENABLE(SVG_FONTS)
+#include "CachedResourceClient.h"
+#include "CachedResourceHandle.h"
 #include "SVGElement.h"
 
 namespace WebCore {
+
     class CSSFontFaceSrcValue;
-    class SVGFontFaceUriElement : public SVGElement {
+    class CachedFont;
+
+    class SVGFontFaceUriElement : public SVGElement, public CachedResourceClient {
     public:
         SVGFontFaceUriElement(const QualifiedName&, Document*);
+        ~SVGFontFaceUriElement();
         
         PassRefPtr<CSSFontFaceSrcValue> srcValue() const;
-        
+
+        virtual void parseMappedAttribute(MappedAttribute*);
         virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
+        virtual void insertedIntoDocument();
+
+    private:
+        void loadFont();
+
+        CachedResourceHandle<CachedFont> m_cachedFont;
     };