<!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>[178741] branches/safari-600.1.4.15-branch</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/178741">178741</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 12:45:24 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172504">r172504</a>. rdar://problem/19432702</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsSimpleFontDatacpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/SimpleFontData.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoretestingInternalscpp">branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoretestingInternalsh">branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoretestingInternalsidl">branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsfasttextinternationalsynthesizeditalicverticallatindoubleexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfasttextinternationalsynthesizeditalicverticallatindoublehtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (178740 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-20 20:44:05 UTC (rev 178740)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172504.
+
+ 2014-08-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Fonts forced to use non synthetic italics might be laid out with the incorrect baseline
+ https://bugs.webkit.org/show_bug.cgi?id=135403
+
+ Reviewed by Darin Adler.
+
+ Laying out the same string twice (where there is a cache collision) should be rendered
+ the same as laying out similar strings (where there is no cache collision).
+
+ * fast/text/international/synthesized-italic-vertical-latin-double-expected.html: Added.
+ * fast/text/international/synthesized-italic-vertical-latin-double.html: Added.
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172326.
</span><span class="cx">
</span><span class="cx"> 2014-08-07 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfasttextinternationalsynthesizeditalicverticallatindoubleexpectedhtmlfromrev172504trunkLayoutTestsfasttextinternationalsynthesizeditalicverticallatindoubleexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double-expected.html (from rev 172504, trunk/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double-expected.html) (0 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double-expected.html 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="UTF-8">
+ <style>
+ html {
+ -webkit-writing-mode: vertical-lr;
+ }
+ p {
+ font-size: 30px;
+ font-style: italic;
+ }
+ </style>
+</head>
+<body>
+ <script>
+ if (window.internals)
+ window.internals.invalidateFontCache();
+ </script>
+ <p style="color: white;">ABC丹</p>
+ <p>ABC羽</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfasttextinternationalsynthesizeditalicverticallatindoublehtmlfromrev172504trunkLayoutTestsfasttextinternationalsynthesizeditalicverticallatindoublehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double.html (from rev 172504, trunk/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double.html) (0 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/text/international/synthesized-italic-vertical-latin-double.html 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="UTF-8">
+ <style>
+ html {
+ -webkit-writing-mode: vertical-lr;
+ }
+ p {
+ font-size: 30px;
+ font-style: italic;
+ }
+ </style>
+</head>
+<body>
+ <script>
+ if (window.internals)
+ window.internals.invalidateFontCache();
+ </script>
+ <p style="color: white;">ABC丹羽 亮介</p>
+ <p>ABC羽</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178740 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-20 20:44:05 UTC (rev 178740)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172504.
+
+ 2014-08-12 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Fonts forced to use non synthetic italics might be laid out with the incorrect baseline
+ https://bugs.webkit.org/show_bug.cgi?id=135403
+
+ Reviewed by Darin Adler.
+
+ When italics is specified on a font, and the font isn't coming from the cache, we ask
+ the SimpleFontData to provide a non-synthetic-italic version of itself. Our current
+ implementation doesn't preserve whether or not the SimpleFontData includes vertical
+ glyphs (glyphs that are not rotated when drawn in the vertical writing mode), which
+ determines which baseline we use to lay out the text. By passing "false" to
+ the isTextOrientationFallback argument to SimpleFontData::create(), we preserve this
+ hasVerticalGlyphs flag.
+
+ Test: fast/text/international/synthesized-italic-vertical-latin-double.html
+
+ * platform/graphics/SimpleFontData.cpp:
+ (WebCore::SimpleFontData::nonSyntheticItalicFontData):
+ * testing/Internals.cpp:
+ (WebCore::Internals::invalidateFontCache): Add "invalidateFontCache" to window.internals.
+ * testing/Internals.h: Ditto.
+ * testing/Internals.idl: Ditto.
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172326.
</span><span class="cx">
</span><span class="cx"> 2014-08-07 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsSimpleFontDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/SimpleFontData.cpp (178740 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/SimpleFontData.cpp 2015-01-20 20:44:05 UTC (rev 178740)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/SimpleFontData.cpp 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> nonSyntheticItalicFontPlatformData.m_syntheticOblique = false;
</span><span class="cx"> #endif
</span><del>- m_derivedFontData->nonSyntheticItalic = create(nonSyntheticItalicFontPlatformData, isCustomFont(), false, true);
</del><ins>+ m_derivedFontData->nonSyntheticItalic = create(nonSyntheticItalicFontPlatformData, isCustomFont());
</ins><span class="cx"> }
</span><span class="cx"> return m_derivedFontData->nonSyntheticItalic;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp (178740 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp 2015-01-20 20:44:05 UTC (rev 178740)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.cpp 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "FontCache.h"
</ins><span class="cx"> #include "FormController.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -813,6 +814,11 @@
</span><span class="cx"> document->frame()->editor().setMarkedTextMatchesAreHighlighted(flag);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::invalidateFontCache()
+{
+ fontCache().invalidate();
+}
+
</ins><span class="cx"> void Internals::setScrollViewPosition(long x, long y, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h (178740 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h 2015-01-20 20:44:05 UTC (rev 178740)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.h 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -133,6 +133,8 @@
</span><span class="cx"> void addTextMatchMarker(const Range*, bool isActive);
</span><span class="cx"> void setMarkedTextMatchesAreHighlighted(bool, ExceptionCode&);
</span><span class="cx">
</span><ins>+ void invalidateFontCache();
+
</ins><span class="cx"> void setScrollViewPosition(long x, long y, ExceptionCode&);
</span><span class="cx"> void setPagination(const String& mode, int gap, ExceptionCode& ec) { setPagination(mode, gap, 0, ec); }
</span><span class="cx"> void setPagination(const String& mode, int gap, int pageLength, ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl (178740 => 178741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl 2015-01-20 20:44:05 UTC (rev 178740)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/testing/Internals.idl 2015-01-20 20:45:24 UTC (rev 178741)
</span><span class="lines">@@ -83,6 +83,8 @@
</span><span class="cx"> void addTextMatchMarker(Range range, boolean isActive);
</span><span class="cx"> [RaisesException] void setMarkedTextMatchesAreHighlighted(boolean flag);
</span><span class="cx">
</span><ins>+ void invalidateFontCache();
+
</ins><span class="cx"> [RaisesException] void setScrollViewPosition(long x, long y);
</span><span class="cx">
</span><span class="cx"> [RaisesException] void setPagination(DOMString mode, long gap, optional long pageLength);
</span></span></pre>
</div>
</div>
</body>
</html>