Title: [193581] branches/safari-601-branch/Tools
- Revision
- 193581
- Author
- matthew_han...@apple.com
- Date
- 2015-12-06 02:37:26 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r191032. rdar://problem/23769770
Modified Paths
Diff
Modified: branches/safari-601-branch/Tools/ChangeLog (193580 => 193581)
--- branches/safari-601-branch/Tools/ChangeLog 2015-12-06 10:37:24 UTC (rev 193580)
+++ branches/safari-601-branch/Tools/ChangeLog 2015-12-06 10:37:26 UTC (rev 193581)
@@ -1,5 +1,21 @@
2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+ Merge r191032. rdar://problem/23769770
+
+ 2015-10-13 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [iOS] Build fix
+
+ Unreviewed.
+
+ Mach-O section names are limited to 16 characters.
+
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (activateFontsIOS):
+
+2015-12-06 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190848. rdar://problem/23769770
2015-10-11 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (193580 => 193581)
--- branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-06 10:37:24 UTC (rev 193580)
+++ branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-06 10:37:26 UTC (rev 193581)
@@ -634,8 +634,8 @@
fontData(WeightWatcher700);
fontData(WeightWatcher800);
fontData(WeightWatcher900);
- fontData(FontWithFeaturesTTF);
- fontData(FontWithFeaturesOTF);
+ fontData(FWFTTF);
+ fontData(FWFOTF);
}
#endif // !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
