Remove SVG fonts

Source/core/css/FontFace.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
 #include "core/css/parser/CSSParser.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
-#include "core/svg/SVGFontFaceElement.h"
-#include "core/svg/SVGFontFaceSource.h"
-#include "core/svg/SVGRemoteFontFaceSource.h"
 #include "platform/FontFamilyNames.h"
 #include "platform/SharedBuffer.h"
 #include "wtf/ArrayBufferView.h"
 
 namespace blink {
 
 static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& s, CSSPropertyID propertyID)
 {
     CSSParserContext context(*document, UseCounter::getFrom(document));
     return CSSParser::parseSingleValue(propertyID, s, context);
@@ skipping 433 matching lines @@
     m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get());
     if (m_error)
         return;
 
     // Each item in the src property's list is a single CSSFontFaceSource. Put them all into a CSSFontFace.
     ASSERT(src);
     ASSERT(src->isValueList());
     CSSValueList* srcList = toCSSValueList(src.get());
     int srcLength = srcList->length();
 
-    bool foundSVGFont = false;
-
     for (int i = 0; i < srcLength; i++) {
         // An item in the list either specifies a string (local font name) or a URL (remote font to download).
         CSSFontFaceSrcValue* item = toCSSFontFaceSrcValue(srcList->item(i));
         OwnPtrWillBeRawPtr<CSSFontFaceSource> source = nullptr;
 
-#if ENABLE(SVG_FONTS)
-        foundSVGFont = item->isSVGFontFaceSrc() || item->svgFontFaceElement();
-#endif
         if (!item->isLocal()) {
             Settings* settings = document ? document->frame() ? document->frame()->settings() : 0 : 0;
-            bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled());
+            bool allowDownloading = settings && settings->downloadableBinaryFontsEnabled();
             if (allowDownloading && item->isSupportedFormat() && document) {
                 FontResource* fetched = item->fetch(document);
                 if (fetched) {
                     FontLoader* fontLoader = document->styleEngine()->fontSelector()->fontLoader();
-
-#if ENABLE(SVG_FONTS)
-                    if (foundSVGFont) {
-                        source = adoptPtrWillBeNoop(new SVGRemoteFontFaceSource(item->resource(), fetched, fontLoader));
-                    } else
-#endif
-                    {
-                        source = adoptPtrWillBeNoop(new RemoteFontFaceSource(fetched, fontLoader));
-                    }
+                    source = adoptPtrWillBeNoop(new RemoteFontFaceSource(fetched, fontLoader));
                 }
             }
         } else {
-#if ENABLE(SVG_FONTS)
-            if (item->svgFontFaceElement()) {
-                RefPtrWillBeRawPtr<SVGFontFaceElement> fontfaceElement = item->svgFontFaceElement();
-                // SVGFontFaceSource assumes that it is the case where <font-face> element resides in the same document.
-                // We put a RELEASE_ASSERT here as it will cause UAF if the assumption is false.
-                RELEASE_ASSERT(fontfaceElement->inDocument());
-                RELEASE_ASSERT(fontfaceElement->document() == document);
-                source = adoptPtrWillBeNoop(new SVGFontFaceSource(fontfaceElement.get()));
-            } else
-#endif
-            {
-                source = adoptPtrWillBeNoop(new LocalFontFaceSource(item->resource()));
-            }
+            source = adoptPtrWillBeNoop(new LocalFontFaceSource(item->resource()));
         }
 
         if (source)
             m_cssFontFace->addSource(source.release());
     }
 }
 
 void FontFace::initCSSFontFace(const unsigned char* data, unsigned size)
 {
     m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get());
@@ skipping 28 matching lines @@
 {
     return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const
 {
     return m_status == Loading && executionContext() && !executionContext()->activeDOMObjectsAreStopped();
 }
 
 } // namespace blink