Remove SVG fonts

Source/core/fetch/FontResource.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 18 matching lines @@
 
 #include "core/dom/TagCollection.h"
 #include "core/fetch/ResourceClientWalker.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "platform/SharedBuffer.h"
 #include "platform/fonts/FontCustomPlatformData.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "public/platform/Platform.h"
 #include "wtf/CurrentTime.h"
 
-#if ENABLE(SVG_FONTS)
-#include "core/SVGNames.h"
-#include "core/dom/XMLDocument.h"
-#include "core/html/HTMLCollection.h"
-#include "core/svg/SVGFontElement.h"
-#endif
-
 namespace blink {
 
 static const double fontLoadWaitLimitSec = 3.0;
 
 enum FontPackageFormat {
     PackageFormatUnknown,
     PackageFormatSFNT,
     PackageFormatWOFF,
     PackageFormatWOFF2,
     PackageFormatSVG,
@@ skipping 24 matching lines @@
     , m_exceedsFontLoadWaitLimit(false)
     , m_corsFailed(false)
     , m_fontLoadWaitLimitTimer(this, &FontResource::fontLoadWaitLimitCallback)
 {
 }
 
 FontResource::~FontResource()
 {
 }
 
 void FontResource::trace(Visitor* visitor)

[eae, 2014/10/23 22:02:34]

Remove the entire overloaded function?

[pdr., 2014/10/23 22:15:34]

Done.

 {
-#if ENABLE(SVG_FONTS)
-    visitor->trace(m_externalSVGDocument);
-#endif
     Resource::trace(visitor);
 }
 
 void FontResource::didScheduleLoad()
 {
     if (m_state == Unloaded)
         m_state = LoadScheduled;
 }
 
 void FontResource::didUnscheduleLoad()
@@ skipping 41 matching lines @@
         } else {
             setStatus(DecodeError);
             recordPackageFormatHistogram(PackageFormatUnknown);
         }
     }
     return m_fontData;
 }
 
 FontPlatformData FontResource::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation, FontWidthVariant widthVariant)
 {
-#if ENABLE(SVG_FONTS)
-    if (m_externalSVGDocument)
-        return FontPlatformData(size, bold, italic);
-#endif
     ASSERT(m_fontData);
     return m_fontData->fontPlatformData(size, bold, italic, orientation, widthVariant);
 }
 
-#if ENABLE(SVG_FONTS)
-bool FontResource::ensureSVGFontData()
-{
-    if (!m_externalSVGDocument && !errorOccurred() && !isLoading()) {
-        if (m_data) {
-            m_externalSVGDocument = XMLDocument::createSVG();
-
-            OwnPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("application/xml");
-            String svgSource = decoder->decode(m_data->data(), m_data->size());
-            svgSource = svgSource + decoder->flush();
-
-            m_externalSVGDocument->setContent(svgSource);
-
-            if (decoder->sawError())
-                m_externalSVGDocument = nullptr;
-        }
-        if (m_externalSVGDocument) {
-            recordPackageFormatHistogram(PackageFormatSVG);
-        } else {
-            setStatus(DecodeError);
-            recordPackageFormatHistogram(PackageFormatUnknown);
-        }
-    }
-
-    return m_externalSVGDocument;
-}
-
-SVGFontElement* FontResource::getSVGFontById(const String& fontName) const
-{
-    RefPtrWillBeRawPtr<TagCollection> collection = m_externalSVGDocument->getElementsByTagNameNS(SVGNames::fontTag.namespaceURI(), SVGNames::fontTag.localName());
-    if (!collection)
-        return 0;
-
-    unsigned collectionLength = collection->length();
-    if (!collectionLength)
-        return 0;
-
-#if ENABLE(ASSERT)
-    for (unsigned i = 0; i < collectionLength; ++i) {
-        ASSERT(collection->item(i));
-        ASSERT(isSVGFontElement(collection->item(i)));
-    }
-#endif
-
-    if (fontName.isEmpty())
-        return toSVGFontElement(collection->item(0));
-
-    for (unsigned i = 0; i < collectionLength; ++i) {
-        SVGFontElement* element = toSVGFontElement(collection->item(i));
-        if (element->getIdAttribute() == fontName)
-            return element;
-    }
-
-    return 0;
-}
-#endif
-
 bool FontResource::isSafeToUnlock() const
 {
     return m_data->hasOneRef();
 }
 
 void FontResource::fontLoadWaitLimitCallback(Timer<FontResource>*)
 {
     if (!isLoading())
         return;
     m_exceedsFontLoadWaitLimit = true;
@@ skipping 10 matching lines @@
 
 void FontResource::checkNotify()
 {
     m_fontLoadWaitLimitTimer.stop();
     ResourceClientWalker<FontResourceClient> w(m_clients);
     while (FontResourceClient* c = w.next())
         c->fontLoaded(this);
 }
 
 }