<!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>[185775] trunk/Source/WebKit2</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/185775">185775</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-06-19 16:33:36 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/185475">r185475</a>): [Mac] ASSERT() when clicking on text using web fonts with force touch trackpad
https://bugs.webkit.org/show_bug.cgi?id=145890
<rdar://problem/21390877>
Reviewed by Darin Adler and Tim Horton.
The best place to stop the serialization of unserializable fonts is inside WebKit2's IPC code. We want
this logic to occur when encoding an NSAttributedString, rather than when encoding an NSDictionary,
because changing the shape of an NSAttributedString is less likely to result in problems rather than
changing the shape of an NSDictionary.
* Shared/mac/ArgumentCodersMac.mm:
(IPC::fontIsSerializable):
(IPC::filterUnserializableValues):
(IPC::encode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185774 => 185775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-19 23:25:51 UTC (rev 185774)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-19 23:33:36 UTC (rev 185775)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-18 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION(r185475): [Mac] ASSERT() when clicking on text using web fonts with force touch trackpad
+ https://bugs.webkit.org/show_bug.cgi?id=145890
+ <rdar://problem/21390877>
+
+ Reviewed by Darin Adler and Tim Horton.
+
+ The best place to stop the serialization of unserializable fonts is inside WebKit2's IPC code. We want
+ this logic to occur when encoding an NSAttributedString, rather than when encoding an NSDictionary,
+ because changing the shape of an NSAttributedString is less likely to result in problems rather than
+ changing the shape of an NSDictionary.
+
+ * Shared/mac/ArgumentCodersMac.mm:
+ (IPC::fontIsSerializable):
+ (IPC::filterUnserializableValues):
+ (IPC::encode):
+
</ins><span class="cx"> 2015-06-19 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Fix return-type-c-linkage warning after r185553
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm (185774 => 185775)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2015-06-19 23:25:51 UTC (rev 185774)
+++ trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2015-06-19 23:33:36 UTC (rev 185775)
</span><span class="lines">@@ -26,6 +26,11 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "ArgumentCodersMac.h"
</span><span class="cx">
</span><ins>+#import <CoreText/CoreText.h>
+#if PLATFORM(IOS)
+#import <UIKit/UIKit.h>
+#endif
+
</ins><span class="cx"> #import "ArgumentCodersCF.h"
</span><span class="cx"> #import "ArgumentDecoder.h"
</span><span class="cx"> #import "ArgumentEncoder.h"
</span><span class="lines">@@ -210,6 +215,41 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool isSerializableFont(CTFontRef font)
+{
+ return adoptCF(CTFontCopyAttribute(font, kCTFontURLAttribute));
+}
+
+static inline bool isSerializableValue(id value)
+{
+#if USE(APPKIT)
+ auto fontClass = [NSFont class];
+#else
+ auto fontClass = [UIFont class];
+#endif
+ return ![value isKindOfClass:fontClass] || isSerializableFont(reinterpret_cast<CTFontRef>(value));
+}
+
+static inline RetainPtr<NSDictionary> filterUnserializableValues(NSDictionary *dictionary)
+{
+ __block bool modificationNecessary = false;
+ [dictionary enumerateKeysAndObjectsUsingBlock:^(id key, id object, BOOL *stop) {
+ if (!isSerializableValue(object)) {
+ modificationNecessary = true;
+ *stop = YES;
+ }
+ }];
+ if (!modificationNecessary)
+ return dictionary;
+
+ auto result = adoptNS([[NSMutableDictionary alloc] init]);
+ [dictionary enumerateKeysAndObjectsUsingBlock:^(id key, id object, BOOL *stop) {
+ if (isSerializableValue(object))
+ [result setObject:object forKey:key];
+ }];
+ return result;
+}
+
</ins><span class="cx"> void encode(ArgumentEncoder& encoder, NSAttributedString *string)
</span><span class="cx"> {
</span><span class="cx"> // Even though NSAttributedString is toll free bridged with CFAttributedStringRef, attributes' values may be not, so we should stay within this file's code.
</span><span class="lines">@@ -229,7 +269,7 @@
</span><span class="cx"> ASSERT(effectiveRange.length);
</span><span class="cx"> ASSERT(NSMaxRange(effectiveRange) <= length);
</span><span class="cx">
</span><del>- ranges.append(std::make_pair(effectiveRange, attributesAtIndex));
</del><ins>+ ranges.append(std::make_pair(effectiveRange, filterUnserializableValues(attributesAtIndex.get())));
</ins><span class="cx">
</span><span class="cx"> position = NSMaxRange(effectiveRange);
</span><span class="cx"> }
</span><span class="lines">@@ -313,6 +353,7 @@
</span><span class="cx"> ASSERT(key);
</span><span class="cx"> ASSERT([key isKindOfClass:[NSString class]]);
</span><span class="cx"> ASSERT(value);
</span><ins>+ ASSERT(isSerializableValue(value));
</ins><span class="cx">
</span><span class="cx"> // Ignore values we don't recognize.
</span><span class="cx"> if (typeFromObject(value) == Unknown)
</span><span class="lines">@@ -409,6 +450,8 @@
</span><span class="cx"> if (typeFromObject(value) == Unknown)
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ ASSERT(isSerializableValue(value));
+
</ins><span class="cx"> encode(encoder, value);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>