Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: sky/engine/core/css/CSSFontFaceSrcValue.cpp

Issue 1223843003: Remove support for loading remote font faces (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/CSSFontFaceSrcValue.h ('k') | sky/engine/core/css/CSSFontSelector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSFontFaceSrcValue.cpp
diff --git a/sky/engine/core/css/CSSFontFaceSrcValue.cpp b/sky/engine/core/css/CSSFontFaceSrcValue.cpp
deleted file mode 100644
index d9b14535073f0a07371427574b35279f4edff515..0000000000000000000000000000000000000000
--- a/sky/engine/core/css/CSSFontFaceSrcValue.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2007, 2010 Apple 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:
- * 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
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sky/engine/core/css/CSSFontFaceSrcValue.h"
-
-#include "gen/sky/core/FetchInitiatorTypeNames.h"
-#include "sky/engine/core/css/StyleSheetContents.h"
-#include "sky/engine/core/dom/Document.h"
-#include "sky/engine/core/dom/Node.h"
-#include "sky/engine/core/fetch/FetchRequest.h"
-#include "sky/engine/core/fetch/FontResource.h"
-#include "sky/engine/core/fetch/ResourceFetcher.h"
-#include "sky/engine/platform/fonts/FontCache.h"
-#include "sky/engine/platform/fonts/FontCustomPlatformData.h"
-#include "sky/engine/wtf/text/StringBuilder.h"
-
-namespace blink {
-
-bool CSSFontFaceSrcValue::isSupportedFormat() const
-{
- // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face,
- // we will also check to see if the URL ends with .eot. If so, we'll go ahead and assume that we shouldn't load it.
- if (m_format.isEmpty()) {
- // Check for .eot.
- if (!m_resource.startsWith("data:", false) && m_resource.endsWith(".eot", false))
- return false;
- return true;
- }
-
- if (FontCustomPlatformData::supportsFormat(m_format))
- return true;
-
- // We have removed SVG font support on non-gdi platforms. For details, see:
- // https://groups.google.com/a/chromium.org/d/msg/blink-dev/pYbbUcYvlYY/LQvFvM8KZZEJ
- return false;
-}
-
-String CSSFontFaceSrcValue::customCSSText() const
-{
- StringBuilder result;
- if (isLocal())
- result.appendLiteral("local(");
- else
- result.appendLiteral("url(");
- result.append(m_resource);
- result.append(')');
- if (!m_format.isEmpty()) {
- result.appendLiteral(" format(");
- result.append(m_format);
- result.append(')');
- }
- return result.toString();
-}
-
-FontResource* CSSFontFaceSrcValue::fetch(Document* document)
-{
- if (!m_fetched) {
- FetchRequest request(ResourceRequest(document->completeURL(m_resource)), FetchInitiatorTypeNames::css);
- request.mutableResourceRequest().setHTTPReferrer(m_referrer);
- m_fetched = document->fetcher()->fetchFont(request);
- } else {
- // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule
- // is processed by StyleResolver / StyleEngine.
- restoreCachedResourceIfNeeded(document);
- }
- return m_fetched.get();
-}
-
-void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document)
-{
- ASSERT(m_fetched);
- ASSERT(document && document->fetcher());
-
- const String resourceURL = document->completeURL(m_resource);
- if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))
- return;
-
- FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::css);
- document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFetcher::ResourceLoadingFromCache);
-}
-
-bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
-{
- return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resource == other.m_resource;
-}
-
-}
« no previous file with comments | « sky/engine/core/css/CSSFontFaceSrcValue.h ('k') | sky/engine/core/css/CSSFontSelector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698