<!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>[177847] 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/177847">177847</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-01 12:49:32 -0800 (Thu, 01 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove FontData::containsCharacters
https://bugs.webkit.org/show_bug.cgi?id=140026
Reviewed by Dan Bernstein.
This virtual function has no clients.
* platform/graphics/FontData.h:
* platform/graphics/SegmentedFontData.cpp:
(WebCore::SegmentedFontData::containsCharacter): Deleted.
(WebCore::SegmentedFontData::containsCharacters): Deleted.
* platform/graphics/SegmentedFontData.h:
* platform/graphics/SimpleFontData.h:
* platform/graphics/freetype/SimpleFontDataFreeType.cpp:
(WebCore::SimpleFontData::containsCharacters): Deleted.
* platform/graphics/ios/SimpleFontDataIOS.mm:
(WebCore::SimpleFontData::containsCharacters): Deleted.
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::containsCharacters): Deleted.
* platform/graphics/win/SimpleFontDataWin.cpp:
(WebCore::SimpleFontData::containsCharacters): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDatah">trunk/Source/WebCore/platform/graphics/FontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSegmentedFontDatacpp">trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSegmentedFontDatah">trunk/Source/WebCore/platform/graphics/SegmentedFontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatah">trunk/Source/WebCore/platform/graphics/SimpleFontData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeSimpleFontDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosSimpleFontDataIOSmm">trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp">trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/ChangeLog 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-01 Antti Koivisto <antti@apple.com>
+
+ Remove FontData::containsCharacters
+ https://bugs.webkit.org/show_bug.cgi?id=140026
+
+ Reviewed by Dan Bernstein.
+
+ This virtual function has no clients.
+
+ * platform/graphics/FontData.h:
+ * platform/graphics/SegmentedFontData.cpp:
+ (WebCore::SegmentedFontData::containsCharacter): Deleted.
+ (WebCore::SegmentedFontData::containsCharacters): Deleted.
+ * platform/graphics/SegmentedFontData.h:
+ * platform/graphics/SimpleFontData.h:
+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+ (WebCore::SimpleFontData::containsCharacters): Deleted.
+ * platform/graphics/ios/SimpleFontDataIOS.mm:
+ (WebCore::SimpleFontData::containsCharacters): Deleted.
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::SimpleFontData::containsCharacters): Deleted.
+ * platform/graphics/win/SimpleFontDataWin.cpp:
+ (WebCore::SimpleFontData::containsCharacters): Deleted.
+
</ins><span class="cx"> 2015-01-01 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> We often misspell identifier as "identifer"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontData.h (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontData.h 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/FontData.h 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> virtual ~FontData();
</span><span class="cx">
</span><span class="cx"> virtual const SimpleFontData* fontDataForCharacter(UChar32) const = 0;
</span><del>- virtual bool containsCharacters(const UChar*, int length) const = 0;
</del><span class="cx"> virtual bool isCustomFont() const = 0;
</span><span class="cx"> virtual bool isLoading() const = 0;
</span><span class="cx"> virtual bool isSegmented() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSegmentedFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/SegmentedFontData.cpp 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -48,27 +48,6 @@
</span><span class="cx"> return m_ranges[0].fontData().get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SegmentedFontData::containsCharacter(UChar32 c) const
-{
- Vector<FontDataRange>::const_iterator end = m_ranges.end();
- for (Vector<FontDataRange>::const_iterator it = m_ranges.begin(); it != end; ++it) {
- if (c >= it->from() && c <= it->to())
- return true;
- }
- return false;
-}
-
-bool SegmentedFontData::containsCharacters(const UChar* characters, int length) const
-{
- UChar32 c;
- for (int i = 0; i < length; ) {
- U16_NEXT(characters, i, length, c)
- if (!containsCharacter(c))
- return false;
- }
- return true;
-}
-
</del><span class="cx"> bool SegmentedFontData::isCustomFont() const
</span><span class="cx"> {
</span><span class="cx"> // All segmented fonts are custom fonts.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSegmentedFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SegmentedFontData.h (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SegmentedFontData.h 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/SegmentedFontData.h 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -70,14 +70,11 @@
</span><span class="cx"> SegmentedFontData() { }
</span><span class="cx">
</span><span class="cx"> virtual const SimpleFontData* fontDataForCharacter(UChar32) const;
</span><del>- virtual bool containsCharacters(const UChar*, int length) const;
</del><span class="cx">
</span><span class="cx"> virtual bool isCustomFont() const;
</span><span class="cx"> virtual bool isLoading() const;
</span><span class="cx"> virtual bool isSegmented() const;
</span><span class="cx">
</span><del>- bool containsCharacter(UChar32) const;
-
</del><span class="cx"> Vector<FontDataRange, 1> m_ranges;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -166,7 +166,6 @@
</span><span class="cx"> void setZeroGlyph(Glyph zeroGlyph) { m_zeroGlyph = zeroGlyph; }
</span><span class="cx">
</span><span class="cx"> virtual const SimpleFontData* fontDataForCharacter(UChar32) const override;
</span><del>- virtual bool containsCharacters(const UChar*, int length) const override;
</del><span class="cx">
</span><span class="cx"> Glyph glyphForCharacter(UChar32) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeSimpleFontDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -116,27 +116,6 @@
</span><span class="cx"> isCustomFont(), false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SimpleFontData::containsCharacters(const UChar* characters, int bufferLength) const
-{
- ASSERT(m_platformData.scaledFont());
- FT_Face face = cairo_ft_scaled_font_lock_face(m_platformData.scaledFont());
- if (!face)
- return false;
-
- UTF16UChar32Iterator iterator(characters, bufferLength);
- UChar32 character = iterator.next();
- while (character != iterator.end()) {
- if (!FcFreeTypeCharIndex(face, character)) {
- cairo_ft_scaled_font_unlock_face(m_platformData.scaledFont());
- return false;
- }
- character = iterator.next();
- }
-
- cairo_ft_scaled_font_unlock_face(m_platformData.scaledFont());
- return true;
-}
-
</del><span class="cx"> void SimpleFontData::determinePitch()
</span><span class="cx"> {
</span><span class="cx"> m_treatAsFixedPitch = m_platformData.isFixedPitch();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosSimpleFontDataIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -167,11 +167,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SimpleFontData::containsCharacters(const UChar*, int) const
-{
- return false;
-}
-
</del><span class="cx"> void SimpleFontData::determinePitch()
</span><span class="cx"> {
</span><span class="cx"> CTFontRef ctFont = m_platformData.font();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -321,18 +321,7 @@
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-bool SimpleFontData::containsCharacters(const UChar* characters, int length) const
-{
- NSString *string = [[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(characters) length:length freeWhenDone:NO];
- NSCharacterSet *set = [[m_platformData.nsFont() coveredCharacterSet] invertedSet];
- bool result = set && [string rangeOfCharacterFromSet:set].location == NSNotFound;
- [string release];
- return result;
-}
-
</del><span class="cx"> void SimpleFontData::determinePitch()
</span><span class="cx"> {
</span><span class="cx"> NSFont* f = m_platformData.nsFont();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp (177846 => 177847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2015-01-01 19:56:15 UTC (rev 177846)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2015-01-01 20:49:32 UTC (rev 177847)
</span><span class="lines">@@ -139,47 +139,6 @@
</span><span class="cx"> return SimpleFontData::create(FontPlatformData(WTF::move(hfont), scaledSize, m_platformData.syntheticBold(), m_platformData.syntheticOblique(), m_platformData.useGDI()), isCustomFont(), false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SimpleFontData::containsCharacters(const UChar* characters, int length) const
-{
- // FIXME: Support custom fonts.
- if (isCustomFont())
- return false;
-
- // FIXME: Microsoft documentation seems to imply that characters can be output using a given font and DC
- // merely by testing code page intersection. This seems suspect though. Can't a font only partially
- // cover a given code page?
- IMLangFontLinkType* langFontLink = fontCache().getFontLinkInterface();
- if (!langFontLink)
- return false;
-
- HWndDC dc(0);
-
- DWORD acpCodePages;
- if (FAILED(langFontLink->CodePageToCodePages(CP_ACP, &acpCodePages))) {
- WTFLogAlways("SimpleFontData::containsCharacters: Unable to convert to CP_ACP code page.");
- return false;
- }
-
- DWORD fontCodePages;
- if (FAILED(langFontLink->GetFontCodePages(dc, m_platformData.hfont(), &fontCodePages))) {
- WTFLogAlways("SimpleFontData::containsCharacters: Unable to find matching code page for specified font.");
- return false;
- }
-
- DWORD actualCodePages = 0;
- long numCharactersProcessed = 0;
- long offset = 0;
- while (offset < length) {
- if (FAILED(langFontLink->GetStrCodePages(characters, length, acpCodePages, &actualCodePages, &numCharactersProcessed)))
- return false;
- if ((actualCodePages & fontCodePages) == 0)
- return false;
- offset += numCharactersProcessed;
- }
-
- return true;
-}
-
</del><span class="cx"> void SimpleFontData::determinePitch()
</span><span class="cx"> {
</span><span class="cx"> if (isCustomFont()) {
</span></span></pre>
</div>
</div>
</body>
</html>