Title: [200564] trunk/Source/WebCore
- Revision
- 200564
- Author
- mmaxfi...@apple.com
- Date
- 2016-05-08 16:03:48 -0700 (Sun, 08 May 2016)
Log Message
[iOS] Build fix after r200563
Unreviewed.
* editing/cocoa/HTMLConverter.mm:
(_font):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200563 => 200564)
--- trunk/Source/WebCore/ChangeLog 2016-05-08 22:54:42 UTC (rev 200563)
+++ trunk/Source/WebCore/ChangeLog 2016-05-08 23:03:48 UTC (rev 200564)
@@ -1,5 +1,14 @@
2016-05-08 Myles C. Maxfield <mmaxfi...@apple.com>
+ [iOS] Build fix after r200563
+
+ Unreviewed.
+
+ * editing/cocoa/HTMLConverter.mm:
+ (_font):
+
+2016-05-08 Myles C. Maxfield <mmaxfi...@apple.com>
+
[OS X] Migrate our Font classes entirely off of NSFont
https://bugs.webkit.org/show_bug.cgi?id=157464
Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (200563 => 200564)
--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-05-08 22:54:42 UTC (rev 200563)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-05-08 23:03:48 UTC (rev 200564)
@@ -1039,7 +1039,7 @@
auto* renderer = element.renderer();
if (!renderer)
return nil;
- return toNSFont(renderer->style().fontCascade().primaryFont().getCTFont());
+ return (PlatformFont *)renderer->style().fontCascade().primaryFont().getCTFont();
}
#define UIFloatIsZero(number) (fabs(number - 0) < FLT_EPSILON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
