<!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>[162897] 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/162897">162897</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 17:59:20 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow mmap encoded data replacement for WOFF fonts.
<https://webkit.org/b/127737>
We always have to convert WOFF fonts to SFNT format. This happens
in a separate buffer from the CachedFont's internal resource buffer.
Because of this, there's no need to protect the original buffer from
mmap replacement.
With this change, WOFF web fonts are no longer duplicated between
the network and web processes.
Reviewed by Brady Eidson.
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::CachedFont):
(WebCore::CachedFont::ensureCustomFontData):
(WebCore::CachedFont::mayTryReplaceEncodedData):
* loader/cache/CachedFont.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFontcpp">trunk/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFonth">trunk/Source/WebCore/loader/cache/CachedFont.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162896 => 162897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-28 01:56:54 UTC (rev 162896)
+++ trunk/Source/WebCore/ChangeLog 2014-01-28 01:59:20 UTC (rev 162897)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-27 Andreas Kling <akling@apple.com>
+
+ Allow mmap encoded data replacement for WOFF fonts.
+ <https://webkit.org/b/127737>
+
+ We always have to convert WOFF fonts to SFNT format. This happens
+ in a separate buffer from the CachedFont's internal resource buffer.
+ Because of this, there's no need to protect the original buffer from
+ mmap replacement.
+
+ With this change, WOFF web fonts are no longer duplicated between
+ the network and web processes.
+
+ Reviewed by Brady Eidson.
+
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::CachedFont):
+ (WebCore::CachedFont::ensureCustomFontData):
+ (WebCore::CachedFont::mayTryReplaceEncodedData):
+ * loader/cache/CachedFont.h:
+
</ins><span class="cx"> 2014-01-27 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Add support for block progression axis and reverse direction
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (162896 => 162897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2014-01-28 01:56:54 UTC (rev 162896)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2014-01-28 01:59:20 UTC (rev 162897)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> CachedFont::CachedFont(const ResourceRequest& resourceRequest)
</span><span class="cx"> : CachedResource(resourceRequest, FontResource)
</span><span class="cx"> , m_loadInitiated(false)
</span><del>- , m_hasCreatedFontData(false)
</del><ins>+ , m_hasCreatedFontDataWrappingResource(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,9 @@
</span><span class="cx"> ASSERT(buffer);
</span><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> sfntBuffer;
</span><del>- if (isWOFF(buffer)) {
</del><ins>+
+ bool fontIsWOFF = isWOFF(buffer);
+ if (fontIsWOFF) {
</ins><span class="cx"> Vector<char> sfnt;
</span><span class="cx"> if (convertWOFFToSfnt(buffer, sfnt)) {
</span><span class="cx"> sfntBuffer = SharedBuffer::adoptVector(sfnt);
</span><span class="lines">@@ -109,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> m_fontData = buffer ? createFontCustomPlatformData(*buffer) : nullptr;
</span><span class="cx"> if (m_fontData)
</span><del>- m_hasCreatedFontData = true;
</del><ins>+ m_hasCreatedFontDataWrappingResource = !fontIsWOFF;
</ins><span class="cx"> else
</span><span class="cx"> setStatus(DecodeError);
</span><span class="cx"> }
</span><span class="lines">@@ -192,11 +194,11 @@
</span><span class="cx">
</span><span class="cx"> bool CachedFont::mayTryReplaceEncodedData() const
</span><span class="cx"> {
</span><del>- // If the FontCustomPlatformData has ever been constructed then it still might be in use somewhere.
</del><ins>+ // If a FontCustomPlatformData has ever been constructed to wrap the internal resource buffer then it still might be in use somewhere.
</ins><span class="cx"> // That platform font object might directly reference the encoded data buffer behind this CachedFont,
</span><span class="cx"> // so replacing it is unsafe.
</span><span class="cx">
</span><del>- return !m_hasCreatedFontData;
</del><ins>+ return !m_hasCreatedFontDataWrappingResource;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (162896 => 162897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2014-01-28 01:56:54 UTC (rev 162896)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2014-01-28 01:59:20 UTC (rev 162897)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontCustomPlatformData> m_fontData;
</span><span class="cx"> bool m_loadInitiated;
</span><del>- bool m_hasCreatedFontData;
</del><ins>+ bool m_hasCreatedFontDataWrappingResource;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> RefPtr<SVGDocument> m_externalSVGDocument;
</span></span></pre>
</div>
</div>
</body>
</html>