<!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>[177957] 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/177957">177957</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 06:49:24 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Resolve mirroring and variant in Font instead of FontGlyphs
https://bugs.webkit.org/show_bug.cgi?id=140079
Reviewed by Darin Adler.
Make FontGlyphs more focused. It doesn't need to know about resolving variants and mirroring.
* platform/graphics/Font.cpp:
(WebCore::Font::glyphDataForCharacter):
* platform/graphics/Font.h:
(WebCore::Font::glyphDataForCharacter): Deleted.
* platform/graphics/FontGlyphs.cpp:
(WebCore::FontGlyphs::glyphDataForCharacter):
* platform/graphics/FontGlyphs.h:</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="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphsh">trunk/Source/WebCore/platform/graphics/FontGlyphs.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177956 => 177957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 11:59:47 UTC (rev 177956)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 14:49:24 UTC (rev 177957)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-06 Antti Koivisto <antti@apple.com>
+
+ Resolve mirroring and variant in Font instead of FontGlyphs
+ https://bugs.webkit.org/show_bug.cgi?id=140079
+
+ Reviewed by Darin Adler.
+
+ Make FontGlyphs more focused. It doesn't need to know about resolving variants and mirroring.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::glyphDataForCharacter):
+ * platform/graphics/Font.h:
+ (WebCore::Font::glyphDataForCharacter): Deleted.
+ * platform/graphics/FontGlyphs.cpp:
+ (WebCore::FontGlyphs::glyphDataForCharacter):
+ * platform/graphics/FontGlyphs.h:
+
</ins><span class="cx"> 2015-01-06 Shivakumar JM <shiva.jm@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix Unused parameter warning in Webcore bindings.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (177956 => 177957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-01-06 11:59:47 UTC (rev 177956)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-01-06 14:49:24 UTC (rev 177957)
</span><span class="lines">@@ -417,6 +417,26 @@
</span><span class="cx"> return width(run);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+GlyphData Font::glyphDataForCharacter(UChar32 c, bool mirror, FontDataVariant variant) const
+{
+ if (variant == AutoVariant) {
+ if (m_fontDescription.smallCaps() && !primaryFontData().isSVGFont()) {
+ UChar32 upperC = u_toupper(c);
+ if (upperC != c) {
+ c = upperC;
+ variant = SmallCapsVariant;
+ } else
+ variant = NormalVariant;
+ } else
+ variant = NormalVariant;
+ }
+
+ if (mirror)
+ c = u_charMirror(c);
+
+ return m_glyphs->glyphDataForCharacter(c, m_fontDescription, variant);
+}
+
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (177956 => 177957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h 2015-01-06 11:59:47 UTC (rev 177956)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2015-01-06 14:49:24 UTC (rev 177957)
</span><span class="lines">@@ -185,10 +185,8 @@
</span><span class="cx">
</span><span class="cx"> const SimpleFontData& primaryFontData() const;
</span><span class="cx"> const FontData* fontDataAt(unsigned) const;
</span><del>- GlyphData glyphDataForCharacter(UChar32 c, bool mirror, FontDataVariant variant = AutoVariant) const
- {
- return m_glyphs->glyphDataForCharacter(m_fontDescription, c, mirror, variant);
- }
</del><ins>+ GlyphData glyphDataForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const;
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (177956 => 177957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-01-06 11:59:47 UTC (rev 177956)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-01-06 14:49:24 UTC (rev 177957)
</span><span class="lines">@@ -360,25 +360,11 @@
</span><span class="cx"> return const_cast<GlyphPage*>(simpleFontData->glyphPage(pageNumber));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GlyphData FontGlyphs::glyphDataForCharacter(const FontDescription& description, UChar32 c, bool mirror, FontDataVariant variant)
</del><ins>+GlyphData FontGlyphs::glyphDataForCharacter( UChar32 c, const FontDescription& description, FontDataVariant variant)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><ins>+ ASSERT(variant != AutoVariant);
</ins><span class="cx">
</span><del>- if (variant == AutoVariant) {
- if (description.smallCaps() && !primarySimpleFontData(description).isSVGFont()) {
- UChar32 upperC = u_toupper(c);
- if (upperC != c) {
- c = upperC;
- variant = SmallCapsVariant;
- } else
- variant = NormalVariant;
- } else
- variant = NormalVariant;
- }
-
- if (mirror)
- c = u_charMirror(c);
-
</del><span class="cx"> if (variant != NormalVariant)
</span><span class="cx"> return glyphDataForVariant(c, description, variant, 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.h (177956 => 177957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.h 2015-01-06 11:59:47 UTC (rev 177956)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.h 2015-01-06 14:49:24 UTC (rev 177957)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> bool isForPlatformFont() const { return m_isForPlatformFont; }
</span><span class="cx">
</span><del>- GlyphData glyphDataForCharacter(const FontDescription&, UChar32, bool mirror, FontDataVariant);
</del><ins>+ GlyphData glyphDataForCharacter(UChar32, const FontDescription&, FontDataVariant);
</ins><span class="cx">
</span><span class="cx"> bool isFixedPitch(const FontDescription&);
</span><span class="cx"> void determinePitch(const FontDescription&);
</span></span></pre>
</div>
</div>
</body>
</html>