<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195567] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195567">195567</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-01-25 16:35:17 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove broken cache from CSSFontFaceSource
https://bugs.webkit.org/show_bug.cgi?id=153440
Reviewed by Simon Fraser.
This cache has been broken since 2013 (<a href="http://trac.webkit.org/projects/webkit/changeset/158085">r158085</a>). Given we didn't notice a perf
hit when it broke, and the fact it's been broken for years, it clearly isn't
necessary.
https://bugs.webkit.org/show_bug.cgi?id=153414 consists of a fairly invasive
change to CSSFontFaceSource; this patch includes a working version of this
cache, along with an easy way to enable/disable it (to measure possible perf
changes).
This patch is a short-term cleanup patch in the mean time until the above
invasive change gets landed.
No new tests because there is no behavior (or performance!) change.
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::font):
(WebCore::CSSFontFaceSource::~CSSFontFaceSource): Deleted.
(WebCore::CSSFontFaceSource::pruneTable): Deleted.
(WebCore::CSSFontFaceSource::fontLoaded): Deleted.
* css/CSSFontFaceSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourcecpp">trunk/Source/WebCore/css/CSSFontFaceSource.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourceh">trunk/Source/WebCore/css/CSSFontFaceSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195566 => 195567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-26 00:25:42 UTC (rev 195566)
+++ trunk/Source/WebCore/ChangeLog 2016-01-26 00:35:17 UTC (rev 195567)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-01-25 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove broken cache from CSSFontFaceSource
+ https://bugs.webkit.org/show_bug.cgi?id=153440
+
+ Reviewed by Simon Fraser.
+
+ This cache has been broken since 2013 (r158085). Given we didn't notice a perf
+ hit when it broke, and the fact it's been broken for years, it clearly isn't
+ necessary.
+
+ https://bugs.webkit.org/show_bug.cgi?id=153414 consists of a fairly invasive
+ change to CSSFontFaceSource; this patch includes a working version of this
+ cache, along with an easy way to enable/disable it (to measure possible perf
+ changes).
+
+ This patch is a short-term cleanup patch in the mean time until the above
+ invasive change gets landed.
+
+ No new tests because there is no behavior (or performance!) change.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::font):
+ (WebCore::CSSFontFaceSource::~CSSFontFaceSource): Deleted.
+ (WebCore::CSSFontFaceSource::pruneTable): Deleted.
+ (WebCore::CSSFontFaceSource::fontLoaded): Deleted.
+ * css/CSSFontFaceSource.h:
+
</ins><span class="cx"> 2016-01-25 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Try to fix the simulator build.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (195566 => 195567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-01-26 00:25:42 UTC (rev 195566)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-01-26 00:35:17 UTC (rev 195567)
</span><span class="lines">@@ -66,17 +66,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_font)
</span><span class="cx"> m_font->removeClient(this);
</span><del>- pruneTable();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSFontFaceSource::pruneTable()
-{
- if (m_fontTable.isEmpty())
- return;
-
- m_fontTable.clear();
-}
-
</del><span class="cx"> bool CSSFontFaceSource::isValid() const
</span><span class="cx"> {
</span><span class="cx"> if (m_font)
</span><span class="lines">@@ -86,7 +77,6 @@
</span><span class="cx">
</span><span class="cx"> void CSSFontFaceSource::fontLoaded(CachedFont*)
</span><span class="cx"> {
</span><del>- pruneTable();
</del><span class="cx"> if (m_face)
</span><span class="cx"> m_face->fontLoaded(this);
</span><span class="cx"> }
</span><span class="lines">@@ -107,19 +97,12 @@
</span><span class="cx"> return FontCache::singleton().fontForFamily(fontDescription, m_string, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned hashKey = (fontDescription.computedPixelSize() + 1) << 5 | fontDescription.widthVariant() << 3
- | (fontDescription.orientation() == Vertical ? 4 : 0) | (syntheticBold ? 2 : 0) | (syntheticItalic ? 1 : 0);
-
- RefPtr<Font> font = m_fontTable.add(hashKey, nullptr).iterator->value;
- if (font)
- return font.release();
-
</del><span class="cx"> if (!m_font || m_font->isLoaded()) {
</span><span class="cx"> if (m_font) {
</span><span class="cx"> if (!m_font->ensureCustomFontData(m_string))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings);
</del><ins>+ return m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings);
</ins><span class="cx"> } else {
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> // In-Document SVG Fonts
</span><span class="lines">@@ -137,24 +120,21 @@
</span><span class="cx"> auto customPlatformData = createFontCustomPlatformData(*m_generatedOTFBuffer);
</span><span class="cx"> if (!customPlatformData)
</span><span class="cx"> return nullptr;
</span><del>- font = Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
</del><ins>+ return Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
</ins><span class="cx"> #else
</span><del>- font = Font::create(std::make_unique<SVGFontData>(m_svgFontFaceElement.get()), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
</del><ins>+ return Font::create(std::make_unique<SVGFontData>(m_svgFontFaceElement.get()), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Kick off the load. Do it soon rather than now, because we may be in the middle of layout,
</span><span class="cx"> // and the loader may invoke arbitrary delegate or event handler code.
</span><span class="cx"> fontSelector->beginLoadingFontSoon(m_font.get());
</span><span class="cx">
</span><del>- Ref<Font> placeholderFont = FontCache::singleton().lastResortFallbackFont(fontDescription);
- Ref<Font> placeholderFontCopyInLoadingState = Font::create(placeholderFont->platformData(), true, true);
- return WTFMove(placeholderFontCopyInLoadingState);
</del><ins>+ return Font::create(FontCache::singleton().lastResortFallbackFont(fontDescription)->platformData(), true, true);
</ins><span class="cx"> }
</span><del>-
- return font.release();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.h (195566 => 195567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-01-26 00:25:42 UTC (rev 195566)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-01-26 00:35:17 UTC (rev 195567)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "SVGFontFaceElement.h"
</span><span class="cx"> #endif
</span><span class="cx"> #include "Timer.h"
</span><del>-#include <wtf/HashMap.h>
</del><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -81,7 +80,6 @@
</span><span class="cx"> AtomicString m_string; // URI for remote, built-in font name for local.
</span><span class="cx"> CachedResourceHandle<CachedFont> m_font; // For remote fonts, a pointer to our cached resource.
</span><span class="cx"> CSSFontFace* m_face; // Our owning font face.
</span><del>- HashMap<unsigned, RefPtr<Font>> m_fontTable; // The hash key is composed of size synthetic styles.
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_OTF_CONVERTER)
</span><span class="cx"> RefPtr<SharedBuffer> m_generatedOTFBuffer;
</span></span></pre>
</div>
</div>
</body>
</html>