Title: [185475] trunk/Source/WebKit2
- Revision
- 185475
- Author
- mmaxfi...@apple.com
- Date
- 2015-06-11 14:29:56 -0700 (Thu, 11 Jun 2015)
Log Message
[OS X] Decoding fonts may return nil when using force click
https://bugs.webkit.org/show_bug.cgi?id=145890
Reviewed by Beth Dakin.
[NSFontDescriptor fontDescriptorWithFontAttributes] might return nil, which
causes the encoding of an NSFont to erroneously return true.
* Shared/mac/ArgumentCodersMac.mm:
(IPC::decode):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185474 => 185475)
--- trunk/Source/WebKit2/ChangeLog 2015-06-11 21:11:45 UTC (rev 185474)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-11 21:29:56 UTC (rev 185475)
@@ -1,3 +1,16 @@
+2015-06-11 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [OS X] Decoding fonts may return nil when using force click
+ https://bugs.webkit.org/show_bug.cgi?id=145890
+
+ Reviewed by Beth Dakin.
+
+ [NSFontDescriptor fontDescriptorWithFontAttributes] might return nil, which
+ causes the encoding of an NSFont to erroneously return true.
+
+ * Shared/mac/ArgumentCodersMac.mm:
+ (IPC::decode):
+
2015-06-11 Anders Carlsson <ander...@apple.com>
Reimplement WKOriginDataManager in terms of API::WebsiteDataStore
Modified: trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm (185474 => 185475)
--- trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2015-06-11 21:11:45 UTC (rev 185474)
+++ trunk/Source/WebKit2/Shared/mac/ArgumentCodersMac.mm 2015-06-11 21:29:56 UTC (rev 185475)
@@ -363,7 +363,7 @@
NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:fontAttributes.get()];
result = [NSFont fontWithDescriptor:fontDescriptor size:0];
- return true;
+ return result;
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
