Title: [187801] trunk/Source/WebKit/mac
- Revision
- 187801
- Author
- mmaxfi...@apple.com
- Date
- 2015-08-03 20:06:05 -0700 (Mon, 03 Aug 2015)
Log Message
Fix the Yosemite build after r187797
Unreviewed.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _updateFontPanel]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (187800 => 187801)
--- trunk/Source/WebKit/mac/ChangeLog 2015-08-04 03:00:24 UTC (rev 187800)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-04 03:06:05 UTC (rev 187801)
@@ -1,5 +1,14 @@
2015-08-03 Myles C. Maxfield <mmaxfi...@apple.com>
+ Fix the Yosemite build after r187797
+
+ Unreviewed.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _updateFontPanel]):
+
+2015-08-03 Myles C. Maxfield <mmaxfi...@apple.com>
+
REGRESSION(r184899): Crash when focusing an input element styled with a web font
https://bugs.webkit.org/show_bug.cgi?id=147616
<rdar://problem/21838271>
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (187800 => 187801)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-08-04 03:00:24 UTC (rev 187800)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-08-04 03:06:05 UTC (rev 187801)
@@ -5485,7 +5485,7 @@
NSDictionary *attributes = nil;
if (Frame* coreFrame = core([self _frame])) {
if (const Font* fd = coreFrame->editor().fontForSelection(multipleFonts))
- font = static_cast<NSFont *>(fd->platformData().activatedFont());
+ font = reinterpret_cast<NSFont *>(const_cast<__CTFont*>(fd->platformData().activatedFont()));
attributes = coreFrame->editor().fontAttributesForSelectionStart();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
