<!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>[198217] 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/198217">198217</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 11:25:52 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre><attachment> on iOS should use short and emphasized fonts
https://bugs.webkit.org/show_bug.cgi?id=155485
<rdar://problem/24805991>
Reviewed by Simon Fraser.
No new tests; there are existing tests that will be enabled shortly.
* rendering/RenderThemeIOS.mm:
(WebCore::attachmentActionFont):
(WebCore::attachmentTitleFont):
(WebCore::attachmentSubtitleFont):
(WebCore::AttachmentInfo::buildTitleLines):
(WebCore::AttachmentInfo::buildSingleLine):
(WebCore::AttachmentInfo::AttachmentInfo):
No need for UIFonts, we can use CoreText, and that allows us to ask for the
correct Short and Emphasized variants that we need.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198216 => 198217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-15 17:26:50 UTC (rev 198216)
+++ trunk/Source/WebCore/ChangeLog 2016-03-15 18:25:52 UTC (rev 198217)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-15 Tim Horton <timothy_horton@apple.com>
+
+ <attachment> on iOS should use short and emphasized fonts
+ https://bugs.webkit.org/show_bug.cgi?id=155485
+ <rdar://problem/24805991>
+
+ Reviewed by Simon Fraser.
+
+ No new tests; there are existing tests that will be enabled shortly.
+
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::attachmentActionFont):
+ (WebCore::attachmentTitleFont):
+ (WebCore::attachmentSubtitleFont):
+ (WebCore::AttachmentInfo::buildTitleLines):
+ (WebCore::AttachmentInfo::buildSingleLine):
+ (WebCore::AttachmentInfo::AttachmentInfo):
+ No need for UIFonts, we can use CoreText, and that allows us to ask for the
+ correct Short and Emphasized variants that we need.
+
</ins><span class="cx"> 2016-03-15 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (196383): Class change invalidation does not handle :not correctly
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (198216 => 198217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2016-03-15 17:26:50 UTC (rev 198216)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2016-03-15 18:25:52 UTC (rev 198217)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CTFontDescriptorRef CTFontDescriptorCreateWithAttributesAndOptions(CFDictionaryRef attributes, CTFontDescriptorOptions);
</span><ins>+
+extern const CFStringRef kCTFontDescriptorTextStyleAttribute;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (198216 => 198217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-03-15 17:26:50 UTC (rev 198216)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-03-15 18:25:52 UTC (rev 198217)
</span><span class="lines">@@ -81,11 +81,8 @@
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIApplication)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIColor)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIDocumentInteractionController)
</span><del>-SOFT_LINK_CLASS(UIKit, UIFont)
</del><span class="cx"> SOFT_LINK_CLASS(UIKit, UIImage)
</span><span class="cx"> SOFT_LINK_CONSTANT(UIKit, UIContentSizeCategoryDidChangeNotification, CFStringRef)
</span><del>-SOFT_LINK_CONSTANT(UIKit, UIFontTextStyleFootnote, NSString *)
-SOFT_LINK_CONSTANT(UIKit, UIFontTextStyleCaption1, NSString *)
</del><span class="cx"> #define UIContentSizeCategoryDidChangeNotification getUIContentSizeCategoryDidChangeNotification()
</span><span class="cx">
</span><span class="cx"> @interface WebCoreRenderThemeBundle : NSObject
</span><span class="lines">@@ -1351,14 +1348,26 @@
</span><span class="cx"> const CGFloat attachmentTitleMaximumWidth = 140;
</span><span class="cx"> const CFIndex attachmentTitleMaximumLineCount = 2;
</span><span class="cx">
</span><del>-// FIXME: Should be emphasized.
-static UIFont *attachmentActionFont() { return [getUIFontClass() preferredFontForTextStyle:getUIFontTextStyleFootnote()]; }
</del><ins>+static RetainPtr<CTFontRef> attachmentActionFont()
+{
+ RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(kCTUIFontTextStyleShortFootnote, RenderThemeIOS::contentSizeCategory(), 0));
+ RetainPtr<CTFontDescriptorRef> emphasizedFontDescriptor = adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(),
+ (CFDictionaryRef)@{
+ (id)kCTFontDescriptorTextStyleAttribute: (id)kCTFontDescriptorTextStyleEmphasized
+ }));
+ return adoptCF(CTFontCreateWithFontDescriptor(emphasizedFontDescriptor.get(), 0, nullptr));
+}
</ins><span class="cx"> static UIColor *attachmentActionColor() { return [getUIColorClass() systemBlueColor]; }
</span><span class="cx">
</span><del>-static UIFont *attachmentTitleFont() { return [getUIFontClass() preferredFontForTextStyle:getUIFontTextStyleCaption1()]; }
</del><ins>+static RetainPtr<CTFontRef> attachmentTitleFont()
+{
+ RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(kCTUIFontTextStyleShortCaption1, RenderThemeIOS::contentSizeCategory(), 0));
+ return adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), 0, nullptr));
+}
+
</ins><span class="cx"> static UIColor *attachmentTitleColor() { return [getUIColorClass() systemGrayColor]; }
</span><span class="cx">
</span><del>-static UIFont *attachmentSubtitleFont() { return [getUIFontClass() preferredFontForTextStyle:getUIFontTextStyleCaption1()]; }
</del><ins>+static RetainPtr<CTFontRef> attachmentSubtitleFont() { return attachmentTitleFont(); }
</ins><span class="cx"> static UIColor *attachmentSubtitleColor() { return [getUIColorClass() systemGrayColor]; }
</span><span class="cx">
</span><span class="cx"> struct AttachmentInfo {
</span><span class="lines">@@ -1385,7 +1394,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void buildTitleLines(const RenderAttachment&);
</span><del>- void buildSingleLine(const String&, UIFont *, UIColor *);
</del><ins>+ void buildSingleLine(const String&, CTFontRef, UIColor *);
</ins><span class="cx">
</span><span class="cx"> void addLine(CTLineRef);
</span><span class="cx"> };
</span><span class="lines">@@ -1407,14 +1416,14 @@
</span><span class="cx">
</span><span class="cx"> void AttachmentInfo::buildTitleLines(const RenderAttachment& attachment)
</span><span class="cx"> {
</span><del>- RetainPtr<UIFont> font = attachmentTitleFont();
</del><ins>+ RetainPtr<CTFontRef> font = attachmentTitleFont();
</ins><span class="cx">
</span><span class="cx"> String title = attachment.attachmentElement().attachmentTitle();
</span><span class="cx"> if (title.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSDictionary *textAttributes = @{
</span><del>- (id)kCTFontAttributeName: font.get(),
</del><ins>+ (id)kCTFontAttributeName: (id)font.get(),
</ins><span class="cx"> (id)kCTForegroundColorAttributeName: attachmentTitleColor()
</span><span class="cx"> };
</span><span class="cx"> RetainPtr<NSAttributedString> attributedTitle = adoptNS([[NSAttributedString alloc] initWithString:title attributes:textAttributes]);
</span><span class="lines">@@ -1458,13 +1467,13 @@
</span><span class="cx"> addLine(truncatedLine.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AttachmentInfo::buildSingleLine(const String& text, UIFont *font, UIColor *color)
</del><ins>+void AttachmentInfo::buildSingleLine(const String& text, CTFontRef font, UIColor *color)
</ins><span class="cx"> {
</span><span class="cx"> if (text.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSDictionary *textAttributes = @{
</span><del>- (id)kCTFontAttributeName: font,
</del><ins>+ (id)kCTFontAttributeName: (id)font,
</ins><span class="cx"> (id)kCTForegroundColorAttributeName: color
</span><span class="cx"> };
</span><span class="cx"> RetainPtr<NSAttributedString> attributedText = adoptNS([[NSAttributedString alloc] initWithString:text attributes:textAttributes]);
</span><span class="lines">@@ -1551,10 +1560,10 @@
</span><span class="cx"> yOffset += iconRect.height() + attachmentItemMargin;
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- buildSingleLine(action, attachmentActionFont(), attachmentActionColor());
</del><ins>+ buildSingleLine(action, attachmentActionFont().get(), attachmentActionColor());
</ins><span class="cx">
</span><span class="cx"> buildTitleLines(attachment);
</span><del>- buildSingleLine(subtitle, attachmentSubtitleFont(), attachmentSubtitleColor());
</del><ins>+ buildSingleLine(subtitle, attachmentSubtitleFont().get(), attachmentSubtitleColor());
</ins><span class="cx">
</span><span class="cx"> if (!lines.isEmpty()) {
</span><span class="cx"> for (auto& line : lines) {
</span></span></pre>
</div>
</div>
</body>
</html>