Changeset 185775 in webkit

Timestamp:

Jun 19, 2015, 4:33:36 PM (11 years ago)

Author:

mmaxfield@apple.com

Message:

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/ArgumentCodersMac.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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):
+
 2015-06-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm

@@ -27 +27 @@
 #import "ArgumentCodersMac.h"
 
+#import <CoreText/CoreText.h>
+#if PLATFORM(IOS)
+#import <UIKit/UIKit.h>
+#endif
+
 #import "ArgumentCodersCF.h"
 #import "ArgumentDecoder.h"
@@ -211 +216 @@
 }
 
+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;
+}
+
 void encode(ArgumentEncoder& encoder, NSAttributedString *string)
 {
@@ -230 +270 @@
         ASSERT(NSMaxRange(effectiveRange) <= length);
 
-        ranges.append(std::make_pair(effectiveRange, attributesAtIndex));
+        ranges.append(std::make_pair(effectiveRange, filterUnserializableValues(attributesAtIndex.get())));
 
         position = NSMaxRange(effectiveRange);
@@ -314 +354 @@
         ASSERT([key isKindOfClass:[NSString class]]);
         ASSERT(value);
+        ASSERT(isSerializableValue(value));
 
         // Ignore values we don't recognize.
@@ -410 +451 @@
             continue;
 
+        ASSERT(isSerializableValue(value));
+
         encode(encoder, value);
     }