<!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>[189466] 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/189466">189466</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-09-07 11:26:46 -0700 (Mon, 07 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove GlyphPage::mayUseMixedFontsWhenFilling
https://bugs.webkit.org/show_bug.cgi?id=148928
Reviewed by Dan Bernstein.
http://trac.webkit.org/188566 removed support for composite fonts. We never need to use mixed
glyph pages for fonts anymore.
* platform/graphics/Font.cpp:
(WebCore::createAndFillGlyphPage):
* platform/graphics/GlyphPage.h:
(WebCore::GlyphPage::GlyphPage):
(WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.
* platform/graphics/mac/GlyphPageMac.cpp:
(WebCore::shouldUseCoreText):
(WebCore::GlyphPage::fill):
(WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphPageh">trunk/Source/WebCore/platform/graphics/GlyphPage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGlyphPageMaccpp">trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189465 => 189466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-07 17:42:50 UTC (rev 189465)
+++ trunk/Source/WebCore/ChangeLog 2015-09-07 18:26:46 UTC (rev 189466)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-09-07 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ Remove GlyphPage::mayUseMixedFontsWhenFilling
+ https://bugs.webkit.org/show_bug.cgi?id=148928
+
+ Reviewed by Dan Bernstein.
+
+ http://trac.webkit.org/188566 removed support for composite fonts. We never need to use mixed
+ glyph pages for fonts anymore.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::createAndFillGlyphPage):
+ * platform/graphics/GlyphPage.h:
+ (WebCore::GlyphPage::GlyphPage):
+ (WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.
+ * platform/graphics/mac/GlyphPageMac.cpp:
+ (WebCore::shouldUseCoreText):
+ (WebCore::GlyphPage::fill):
+ (WebCore::GlyphPage::mayUseMixedFontsWhenFilling): Deleted.
+
+2015-09-07 Antti Koivisto <antti@apple.com>
+
</ins><span class="cx"> Remove unneeded offset and length arguments from glyph page filling functions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148929
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (189465 => 189466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-09-07 17:42:50 UTC (rev 189465)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-09-07 18:26:46 UTC (rev 189466)
</span><span class="lines">@@ -226,11 +226,7 @@
</span><span class="cx"> // routine of our glyph map for actually filling in the page with the glyphs.
</span><span class="cx"> // Success is not guaranteed. For example, Times fails to fill page 260, giving glyph data
</span><span class="cx"> // for only 128 out of 256 characters.
</span><del>- RefPtr<GlyphPage> glyphPage;
- if (GlyphPage::mayUseMixedFontsWhenFilling(buffer, bufferLength, font))
- glyphPage = GlyphPage::createForMixedFonts();
- else
- glyphPage = GlyphPage::createForSingleFont(font);
</del><ins>+ RefPtr<GlyphPage> glyphPage = GlyphPage::createForSingleFont(font);
</ins><span class="cx">
</span><span class="cx"> bool haveGlyphs = fillGlyphPage(*glyphPage, buffer, bufferLength, font);
</span><span class="cx"> if (!haveGlyphs)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphPage.h (189465 => 189466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-09-07 17:42:50 UTC (rev 189465)
+++ trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-09-07 18:26:46 UTC (rev 189466)
</span><span class="lines">@@ -157,11 +157,6 @@
</span><span class="cx">
</span><span class="cx"> // Implemented by the platform.
</span><span class="cx"> bool fill(UChar* characterBuffer, unsigned bufferLength, const Font*);
</span><del>-#if PLATFORM(COCOA)
- static bool mayUseMixedFontsWhenFilling(const UChar* characterBuffer, unsigned bufferLength, const Font*);
-#else
- static bool mayUseMixedFontsWhenFilling(const UChar*, unsigned, const Font*) { return false; }
-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit GlyphPage(const Font* fontForAllGlyphs)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGlyphPageMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (189465 => 189466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-09-07 17:42:50 UTC (rev 189465)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-09-07 18:26:46 UTC (rev 189466)
</span><span class="lines">@@ -58,19 +58,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GlyphPage::mayUseMixedFontsWhenFilling(const UChar* buffer, unsigned bufferLength, const Font* fontData)
-{
-#if USE(APPKIT)
- // FIXME: This is only really needed for composite font references.
- return shouldUseCoreText(buffer, bufferLength, fontData);
-#else
- UNUSED_PARAM(buffer);
- UNUSED_PARAM(bufferLength);
- UNUSED_PARAM(fontData);
- return false;
-#endif
-}
-
</del><span class="cx"> bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</span><span class="cx"> {
</span><span class="cx"> bool haveGlyphs = false;
</span></span></pre>
</div>
</div>
</body>
</html>