Title: [193590] branches/safari-601.1.46-branch/Tools
- Revision
- 193590
- Author
- [email protected]
- Date
- 2015-12-06 13:53:55 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r191032. rdar://problem/23769702
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Tools/ChangeLog (193589 => 193590)
--- branches/safari-601.1.46-branch/Tools/ChangeLog 2015-12-06 21:53:53 UTC (rev 193589)
+++ branches/safari-601.1.46-branch/Tools/ChangeLog 2015-12-06 21:53:55 UTC (rev 193590)
@@ -1,5 +1,21 @@
2015-12-06 Matthew Hanson <[email protected]>
+ Merge r191032. rdar://problem/23769702
+
+ 2015-10-13 Myles C. Maxfield <[email protected]>
+
+ [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 <[email protected]>
+
Merge r190848. rdar://problem/23769702
"Build fix" (r193582) from Expo branch squash-merged here:
Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (193589 => 193590)
--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-06 21:53:53 UTC (rev 193589)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-06 21:53:55 UTC (rev 193590)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
