Title: [170596] trunk/Tools
- Revision
- 170596
- Author
- mmaxfi...@apple.com
- Date
- 2014-06-30 13:57:18 -0700 (Mon, 30 Jun 2014)
Log Message
DRT in iOS sim crashes while loading fonts
https://bugs.webkit.org/show_bug.cgi?id=134451
Reviewed by Geoffrey Garen.
The magic linker symbols had the same name, and were therefore being unified
to a single font file. Then, adding the same file twice was failing.
* DumpRenderTree/mac/DumpRenderTree.mm:
(activateFontsIOS):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (170595 => 170596)
--- trunk/Tools/ChangeLog 2014-06-30 19:01:49 UTC (rev 170595)
+++ trunk/Tools/ChangeLog 2014-06-30 20:57:18 UTC (rev 170596)
@@ -1,3 +1,16 @@
+2014-06-30 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ DRT in iOS sim crashes while loading fonts
+ https://bugs.webkit.org/show_bug.cgi?id=134451
+
+ Reviewed by Geoffrey Garen.
+
+ The magic linker symbols had the same name, and were therefore being unified
+ to a single font file. Then, adding the same file twice was failing.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (activateFontsIOS):
+
2014-06-30 Tibor Meszaros <tmeszaros.u-sze...@partner.samsung.com>
Remove Qt cruft from webkitpy
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (170595 => 170596)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-06-30 19:01:49 UTC (rev 170595)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-06-30 20:57:18 UTC (rev 170596)
@@ -541,20 +541,20 @@
// __asm() requires a string literal, so we can't do this as either local variables or template parameters.
#define fontData(sectionName) \
{ \
- extern const uint8_t start __asm("section$start$__DATA$" sectionName); \
- extern const uint8_t end __asm("section$end$__DATA$" sectionName); \
- activateFontIOS(&start, &end - &start, sectionName); \
+ extern const uint8_t start##sectionName __asm("section$start$__DATA$" # sectionName); \
+ extern const uint8_t end##sectionName __asm("section$end$__DATA$" # sectionName); \
+ activateFontIOS(&start##sectionName, &end##sectionName - &start##sectionName, #sectionName); \
}
- fontData("Ahem");
- fontData("WeightWatcher100");
- fontData("WeightWatcher200");
- fontData("WeightWatcher300");
- fontData("WeightWatcher400");
- fontData("WeightWatcher500");
- fontData("WeightWatcher600");
- fontData("WeightWatcher700");
- fontData("WeightWatcher800");
- fontData("WeightWatcher900");
+ fontData(Ahem);
+ fontData(WeightWatcher100);
+ fontData(WeightWatcher200);
+ fontData(WeightWatcher300);
+ fontData(WeightWatcher400);
+ fontData(WeightWatcher500);
+ fontData(WeightWatcher600);
+ fontData(WeightWatcher700);
+ fontData(WeightWatcher800);
+ fontData(WeightWatcher900);
}
#endif // !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
