<!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>[195523] 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/195523">195523</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-01-24 21:23:49 -0800 (Sun, 24 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Font Loading] General cleanup
https://bugs.webkit.org/show_bug.cgi?id=153403
Reviewed by Darin Adler.
It turns out that CSSFontFaceSource::m_hasExternalSVGFont exactly equals
whether or not CSSFontFaceSource::m_font is a CachedSVGFont. Therefore,
the variable is redundant.
In addition, it was being passed to functions on CSSFontFaceSource::m_font,
which means it was always true inside the CachedSVGFont subclass and
always false for the CachedFont. Therefore, there is no reason pass this
variable to these functions because its value can be determined at
authorship time.
No new tests because there is no behavior change.
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::font):
(WebCore::CSSFontFaceSource::CSSFontFaceSource): Deleted.
* css/CSSFontFaceSource.h:
* css/CSSFontSelector.cpp:
(WebCore::createFontFace):
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::ensureCustomFontData):
(WebCore::CachedFont::createFont):
* loader/cache/CachedFont.h:
* loader/cache/CachedSVGFont.cpp:
(WebCore::CachedSVGFont::createFont):
(WebCore::CachedSVGFont::ensureCustomFontData):
* loader/cache/CachedSVGFont.h:
* platform/network/HTTPParsers.cpp:
(WebCore::isValidHTTPToken):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::uppercaseKnownHTTPMethod):</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>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</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>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGFontcpp">trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGFonth">trunk/Source/WebCore/loader/cache/CachedSVGFont.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPParserscpp">trunk/Source/WebCore/platform/network/HTTPParsers.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/ChangeLog 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-01-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] General cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=153403
+
+ Reviewed by Darin Adler.
+
+ It turns out that CSSFontFaceSource::m_hasExternalSVGFont exactly equals
+ whether or not CSSFontFaceSource::m_font is a CachedSVGFont. Therefore,
+ the variable is redundant.
+
+ In addition, it was being passed to functions on CSSFontFaceSource::m_font,
+ which means it was always true inside the CachedSVGFont subclass and
+ always false for the CachedFont. Therefore, there is no reason pass this
+ variable to these functions because its value can be determined at
+ authorship time.
+
+ No new tests because there is no behavior change.
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::font):
+ (WebCore::CSSFontFaceSource::CSSFontFaceSource): Deleted.
+ * css/CSSFontFaceSource.h:
+ * css/CSSFontSelector.cpp:
+ (WebCore::createFontFace):
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::ensureCustomFontData):
+ (WebCore::CachedFont::createFont):
+ * loader/cache/CachedFont.h:
+ * loader/cache/CachedSVGFont.cpp:
+ (WebCore::CachedSVGFont::createFont):
+ (WebCore::CachedSVGFont::ensureCustomFontData):
+ * loader/cache/CachedSVGFont.h:
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::isValidHTTPToken):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::uppercaseKnownHTTPMethod):
+
</ins><span class="cx"> 2016-01-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> An XMLDocument interface should be exposed on the global Window object
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -57,9 +57,6 @@
</span><span class="cx"> : m_string(str)
</span><span class="cx"> , m_font(font)
</span><span class="cx"> , m_face(0)
</span><del>-#if ENABLE(SVG_FONTS)
- , m_hasExternalSVGFont(false)
-#endif
</del><span class="cx"> {
</span><span class="cx"> if (m_font)
</span><span class="cx"> m_font->addClient(this);
</span><span class="lines">@@ -119,14 +116,10 @@
</span><span class="cx">
</span><span class="cx"> if (!m_font || m_font->isLoaded()) {
</span><span class="cx"> if (m_font) {
</span><del>- bool hasExternalSVGFont = false;
-#if ENABLE(SVG_FONTS)
- hasExternalSVGFont = m_hasExternalSVGFont;
-#endif
- if (!m_font->ensureCustomFontData(hasExternalSVGFont, m_string))
</del><ins>+ if (!m_font->ensureCustomFontData(m_string))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont, fontFaceFeatures, fontFaceVariantSettings);
</del><ins>+ font = 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">@@ -164,6 +157,13 @@
</span><span class="cx"> return font.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SVG_FONTS)
+bool CSSFontFaceSource::isSVGFontFaceSource() const
+{
+ return m_svgFontFaceElement || is<CachedSVGFont>(m_font.get());
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> bool CSSFontFaceSource::isDecodeError() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.h (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CachedFont;
</del><span class="cx"> class CSSFontFace;
</span><span class="cx"> class CSSFontSelector;
</span><span class="cx"> class Font;
</span><span class="lines">@@ -68,8 +67,7 @@
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement.get(); }
</span><span class="cx"> void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement> element) { m_svgFontFaceElement = element; }
</span><del>- bool isSVGFontFaceSource() const { return m_svgFontFaceElement || m_hasExternalSVGFont; }
- void setHasExternalSVGFont() { m_hasExternalSVGFont = true; }
</del><ins>+ bool isSVGFontFaceSource() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="lines">@@ -91,7 +89,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS) || ENABLE(SVG_OTF_CONVERTER)
</span><span class="cx"> RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
</span><del>- bool m_hasExternalSVGFont;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -180,18 +180,11 @@
</span><span class="cx"> Settings* settings = document ? document->settings() : nullptr;
</span><span class="cx"> bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled());
</span><span class="cx"> if (allowDownloading && item.isSupportedFormat() && document) {
</span><del>- CachedFont* cachedFont = item.cachedFont(document, foundSVGFont, isInitiatingElementInUserAgentShadowTree);
- if (cachedFont) {
</del><ins>+ if (CachedFont* cachedFont = item.cachedFont(document, foundSVGFont, isInitiatingElementInUserAgentShadowTree))
</ins><span class="cx"> source = std::make_unique<CSSFontFaceSource>(item.resource(), cachedFont);
</span><del>-#if ENABLE(SVG_FONTS)
- if (foundSVGFont)
- source->setHasExternalSVGFont();
-#endif
- }
</del><span class="cx"> }
</span><del>- } else {
</del><ins>+ } else
</ins><span class="cx"> source = std::make_unique<CSSFontFaceSource>(item.resource());
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (source) {
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedFont::ensureCustomFontData(bool, const AtomicString&)
</del><ins>+bool CachedFont::ensureCustomFontData(const AtomicString&)
</ins><span class="cx"> {
</span><span class="cx"> return ensureCustomFontData(m_data.get());
</span><span class="cx"> }
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> return m_fontCustomPlatformData.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomicString&, bool syntheticBold, bool syntheticItalic, bool, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</del><ins>+RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomicString&, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> return Font::create(platformDataFromCustomData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> void beginLoadIfNeeded(CachedResourceLoader&);
</span><span class="cx"> virtual bool stillNeedsLoad() const override { return !m_loadInitiated; }
</span><span class="cx">
</span><del>- virtual bool ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI);
</del><ins>+ virtual bool ensureCustomFontData(const AtomicString& remoteURI);
</ins><span class="cx">
</span><del>- virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG, const FontFeatureSettings&, const FontVariantSettings&);
</del><ins>+ virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings&, const FontVariantSettings&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -51,15 +51,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</del><ins>+RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SVG_OTF_CONVERTER)
</span><del>- if (!externalSVG || firstFontFace(remoteURI))
- return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, externalSVG, fontFaceFeatures, fontFaceVariantSettings);
</del><ins>+ if (firstFontFace(remoteURI))
+ return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings);
</ins><span class="cx"> #else
</span><del>- if (!externalSVG)
- return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, externalSVG, fontFaceFeatures, fontFaceVariantSettings);
-
</del><ins>+ UNUSED_PARAM(fontFaceFeatures);
+ UNUSED_PARAM(fontFaceVariantSettings);
</ins><span class="cx"> if (SVGFontFaceElement* firstFontFace = this->firstFontFace(remoteURI))
</span><span class="cx"> return Font::create(std::make_unique<SVGFontData>(firstFontFace), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
</span><span class="cx"> #endif
</span><span class="lines">@@ -73,22 +72,16 @@
</span><span class="cx"> return CachedFont::platformDataFromCustomData(fontDescription, bold, italic, fontFaceFeatures, fontFaceVariantSettings);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedSVGFont::ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI)
</del><ins>+bool CachedSVGFont::ensureCustomFontData(const AtomicString& remoteURI)
</ins><span class="cx"> {
</span><del>- if (!externalSVG)
- return CachedFont::ensureCustomFontData(externalSVG, remoteURI);
-
</del><span class="cx"> if (!m_externalSVGDocument && !errorOccurred() && !isLoading() && m_data) {
</span><span class="cx"> m_externalSVGDocument = SVGDocument::create(nullptr, URL());
</span><span class="cx"> RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("application/xml");
</span><span class="cx"> m_externalSVGDocument->setContent(decoder->decodeAndFlush(m_data->data(), m_data->size()));
</span><del>-#if !ENABLE(SVG_OTF_CONVERTER)
</del><span class="cx"> if (decoder->sawError())
</span><span class="cx"> m_externalSVGDocument = nullptr;
</span><del>-#else
- if (decoder->sawError())
- m_externalSVGDocument = nullptr;
- else
</del><ins>+#if ENABLE(SVG_OTF_CONVERTER)
+ if (m_externalSVGDocument)
</ins><span class="cx"> maybeInitializeExternalSVGFontElement(remoteURI);
</span><span class="cx"> if (!m_externalSVGFontElement)
</span><span class="cx"> return false;
</span><span class="lines">@@ -98,6 +91,8 @@
</span><span class="cx"> m_externalSVGDocument = nullptr;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+#else
+ UNUSED_PARAM(remoteURI);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.h (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGFont.h 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.h 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx"> public:
</span><span class="cx"> CachedSVGFont(const ResourceRequest&, SessionID);
</span><span class="cx">
</span><del>- virtual bool ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI) override;
</del><ins>+ virtual bool ensureCustomFontData(const AtomicString& remoteURI) override;
</ins><span class="cx">
</span><del>- virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG, const FontFeatureSettings&, const FontVariantSettings&) override;
</del><ins>+ virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, const FontFeatureSettings&, const FontVariantSettings&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPParserscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (195522 => 195523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-01-25 04:00:36 UTC (rev 195522)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2016-01-25 05:23:49 UTC (rev 195523)
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (value.isEmpty())
</span><span class="cx"> return false;
</span><del>- for (unsigned i = 0; i < value.length(); ++i) {
- UChar c = value[i];
</del><ins>+ auto valueStringView = StringView(value);
+ for (UChar c : valueStringView.codeUnits()) {
</ins><span class="cx"> if (c <= 0x20 || c >= 0x7F
</span><span class="cx"> || c == '(' || c == ')' || c == '<' || c == '>' || c == '@'
</span><span class="cx"> || c == ',' || c == ';' || c == ':' || c == '\\' || c == '"'
</span></span></pre>
</div>
</div>
</body>
</html>