134122 2014-06-20 14:11:42 -0700 [iOS] getsectdata() is deprecated and we use it in DRT 2014-06-24 09:06:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield ap dbates ddkilzer dino jonlee simon.fraser thorton oldest_to_newest 1017036 0 mmaxfield 2014-06-20 14:11:42 -0700 [iOS] getsectdata() is deprecated and we use it in DRT 1017038 1 233453 mmaxfield 2014-06-20 14:12:37 -0700 Created attachment 233453 Patch 1017185 2 233453 ap 2014-06-20 20:48:24 -0700 Comment on attachment 233453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233453&action=review > Tools/DumpRenderTree/mac/DumpRenderTree.mm:536 > - char* fontData = getsectdata("__DATA", fontSectionNames[i], &fontDataLength); > + const uint8_t* const fontData = getsectiondata(_NSGetMachExecuteHeader(), "__DATA", fontSectionNames[i], &fontDataLength); The recommended replacement for getsectdata is magic linker symbols, see <rdar://problem/14122320>. As previously mentioned in bug 127730, it's unfortunate that we use different mechanisms for built-in fonts on Mac and on iOS. 1017305 3 233453 mmaxfield 2014-06-21 11:17:56 -0700 Comment on attachment 233453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233453&action=review >> Tools/DumpRenderTree/mac/DumpRenderTree.mm:536 >> + const uint8_t* const fontData = getsectiondata(_NSGetMachExecuteHeader(), "__DATA", fontSectionNames[i], &fontDataLength); > > The recommended replacement for getsectdata is magic linker symbols, see <rdar://problem/14122320>. > > As previously mentioned in bug 127730, it's unfortunate that we use different mechanisms for built-in fonts on Mac and on iOS. It looks like the magic linker symbols rely on strings of the form "section$start$__DATA$__my" which means it will be tricky to iterate over an array of sections. I'll see what I can do. 1017311 4 233453 mmaxfield 2014-06-21 11:35:47 -0700 Comment on attachment 233453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233453&action=review >>> Tools/DumpRenderTree/mac/DumpRenderTree.mm:536 >>> + const uint8_t* const fontData = getsectiondata(_NSGetMachExecuteHeader(), "__DATA", fontSectionNames[i], &fontDataLength); >> >> The recommended replacement for getsectdata is magic linker symbols, see <rdar://problem/14122320>. >> >> As previously mentioned in bug 127730, it's unfortunate that we use different mechanisms for built-in fonts on Mac and on iOS. > > It looks like the magic linker symbols rely on strings of the form "section$start$__DATA$__my" which means it will be tricky to iterate over an array of sections. I'll see what I can do. Yeah, __asm() requires a string literal, which means I can't even do this iteration using template parameters. We may be stuck with getsectiondata :( 1017313 5 233453 mmaxfield 2014-06-21 11:36:36 -0700 Comment on attachment 233453 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233453&action=review >>>> Tools/DumpRenderTree/mac/DumpRenderTree.mm:536 >>>> + const uint8_t* const fontData = getsectiondata(_NSGetMachExecuteHeader(), "__DATA", fontSectionNames[i], &fontDataLength); >>> >>> The recommended replacement for getsectdata is magic linker symbols, see <rdar://problem/14122320>. >>> >>> As previously mentioned in bug 127730, it's unfortunate that we use different mechanisms for built-in fonts on Mac and on iOS. >> >> It looks like the magic linker symbols rely on strings of the form "section$start$__DATA$__my" which means it will be tricky to iterate over an array of sections. I'll see what I can do. > > Yeah, __asm() requires a string literal, which means I can't even do this iteration using template parameters. We may be stuck with getsectiondata :( Actually, I could likely do it with a preprocessor macro 1017371 6 ap 2014-06-21 21:36:45 -0700 I don't have a strong opinion, just pointing out what I was previously told. If using magic symbols is hard, then we shouldn't do that. 1017397 7 233567 mmaxfield 2014-06-22 10:09:44 -0700 Created attachment 233567 Patch 1017418 8 233567 mmaxfield 2014-06-22 11:30:32 -0700 Comment on attachment 233567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233567&action=review > Tools/DumpRenderTree/mac/DumpRenderTree.mm:532 > + if (!GSFontAddCGFont(cgFont)) { We can probably use CTFontManagerEnableFontDescriptors() instead, relieving the dependency on GraphicsServices 1017420 9 mmaxfield 2014-06-22 11:34:19 -0700 (In reply to comment #8) > (From update of attachment 233567 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=233567&action=review > > > Tools/DumpRenderTree/mac/DumpRenderTree.mm:532 > > + if (!GSFontAddCGFont(cgFont)) { > > We can probably use CTFontManagerEnableFontDescriptors() instead, relieving the dependency on GraphicsServices https://bugs.webkit.org/show_bug.cgi?id=134133 1017888 10 233567 ap 2014-06-24 00:41:27 -0700 Comment on attachment 233567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233567&action=review Nice! > Tools/DumpRenderTree/mac/DumpRenderTree.mm:517 > +static void activateFontIOS(const uint8_t* ptr, unsigned long length, std::string sectionName) I suggest using a more descriptive name for "ptr" (maybe fontData?) > Tools/DumpRenderTree/mac/DumpRenderTree.mm:519 > + CGDataProviderRef data = CGDataProviderCreateWithData(NULL, ptr, length, NULL); s/NULL/nullptr/g > Tools/DumpRenderTree/mac/DumpRenderTree.mm:538 > +} > +static void activateFontsIOS() Missing empty line. 1017964 11 mmaxfield 2014-06-24 09:06:13 -0700 http://trac.webkit.org/changeset/170362 233453 2014-06-20 14:12:37 -0700 2014-06-22 10:09:38 -0700 Patch bug-134122-20140620141215.patch text/plain 1752 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjMzMDcwNWYyYjg4MTYzNjI3OWQwYzdkZDU1N2RmZGQ1 M2Y2NDFmZC4uZWYxMjQ1ZGIwOWUwYzE2YjA4YTgxNjE0YjI5MmY1ZTQ1ZjY5MmU5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE0LTA2LTIwICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgW2lPU10gZ2V0c2VjdGRhdGEoKSBpcyBkZXByZWNhdGVkIGFuZCB3ZSB1c2Ug aXQgaW4gRFJUCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzQxMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNaWdyYXRlIHRvIGdldHNlY3Rpb25kYXRhKCkuCisKKyAgICAgICAgTm8gdGVzdHMgYmVjYXVz ZSB0aGVyZSBzaG91bGQgYmUgbm8gYmVoYXZpb3IgY2hhbmdlCisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChhY3RpdmF0ZUZvbnRzSU9T KToKKwogMjAxNC0wNi0yMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K IAogICAgICAgICBNYWtlIFdlYktpdDIgbW9yZSBhY2Nlc3NpYmxlIGluIE1pbmlCcm93c2VyCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0gYi9U b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KaW5kZXggMjRiODllNzAw NzdmMTc4Mjk0OTZkZDgyMWQxZTU4ZjA5NjdlOTE2OS4uMDc0ZGYzZDQ5NGRiMzFmNGUxMDQ3OTc4 NmI3NTIyZWRjNGUyZGQ4NSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1 bXBSZW5kZXJUcmVlLm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVy VHJlZS5tbQpAQCAtMTA5LDYgKzEwOSw3IEBACiAjaW1wb3J0IDxXZWJLaXQvV2ViQ29yZVRocmVh ZC5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkNvcmVUaHJlYWRSdW4uaD4KICNpbXBvcnQgPFdlYktp dC9XZWJET01PcGVyYXRpb25zLmg+CisjaW1wb3J0IDxjcnRfZXh0ZXJucy5oPgogI2ltcG9ydCA8 ZmNudGwuaD4KICNpbXBvcnQgIkR1bXBSZW5kZXJUcmVlQnJvd3NlclZpZXcuaCIKICNlbmRpZgpA QCAtNTMyLDcgKzUzMyw3IEBAIHN0YXRpYyB2b2lkIGFjdGl2YXRlRm9udHNJT1MoKQogCiAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgZm9udFNlY3Rpb25OYW1lc1tpXTsgKytpKSB7CiAgICAgICAg IHVuc2lnbmVkIGxvbmcgZm9udERhdGFMZW5ndGg7Ci0gICAgICAgIGNoYXIqIGZvbnREYXRhID0g Z2V0c2VjdGRhdGEoIl9fREFUQSIsIGZvbnRTZWN0aW9uTmFtZXNbaV0sICZmb250RGF0YUxlbmd0 aCk7CisgICAgICAgIGNvbnN0IHVpbnQ4X3QqIGNvbnN0IGZvbnREYXRhID0gZ2V0c2VjdGlvbmRh dGEoX05TR2V0TWFjaEV4ZWN1dGVIZWFkZXIoKSwgIl9fREFUQSIsIGZvbnRTZWN0aW9uTmFtZXNb aV0sICZmb250RGF0YUxlbmd0aCk7CiAgICAgICAgIGlmICghZm9udERhdGEpIHsKICAgICAgICAg ICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGxvY2F0ZSB0aGUgJXMgZm9udC5cbiIsIGZv bnRTZWN0aW9uTmFtZXNbaV0pOwogICAgICAgICAgICAgZXhpdCgxKTsK 233567 2014-06-22 10:09:44 -0700 2014-06-24 00:41:27 -0700 Patch bug-134122-20140622100922.patch text/plain 4166 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMjQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2FmYTdkOGM1NjI1YzZlMjMxNmEyOGRkNjY3Nzk3ZjJm OGQzMTA4NS4uYzE5Zjk1MTA5MzYzZTlkNGZkYTJiNjdiZGIyM2RkM2FkYjIyMTI1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE0LTA2LTIwICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgW2lPU10gZ2V0c2VjdGRhdGEoKSBpcyBkZXByZWNhdGVkIGFuZCB3ZSB1c2Ug aXQgaW4gRFJUCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzQxMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNaWdyYXRlIHRvIHVzaW5nIG1hZ2ljIGxpbmtlciBzeW1ib2xzLgorCisgICAgICAgIE5vIHRl c3RzIGJlY2F1c2UgdGhlcmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9yIGNoYW5nZQorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAoYWN0aXZh dGVGb250c0lPUyk6CisKIDIwMTQtMDYtMjEgIFRpYm9yIE1lc3phcm9zICA8dG1lc3phcm9zLnUt c3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0luc3BlY3Rvcl1bRUZMXSBD YW4ndCByZXN1bWUgYSBzcGVjaWFsIGJyZWFrIHBvaW50IG9uIEVGTCBpbnNwZWN0b3IKZGlmZiAt LWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbSBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQppbmRleCAyNGI4OWU3MDA3N2Yx NzgyOTQ5NmRkODIxZDFlNThmMDk2N2U5MTY5Li43NzBmNzg2N2ZkMzI1Y2RiYmY5ZmQ5MmNkMjMw NTc3ZTQyNjM2ODQ4IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJl bmRlclRyZWUubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVl Lm1tCkBAIC01MTQsNDkgKzUxNCw0NiBAQCBzdGF0aWMgdm9pZCBhZGp1c3RGb250cygpCiAgICAg YWN0aXZhdGVUZXN0aW5nRm9udHMoKTsKIH0KICNlbHNlCi1zdGF0aWMgdm9pZCBhY3RpdmF0ZUZv bnRzSU9TKCkKK3N0YXRpYyB2b2lkIGFjdGl2YXRlRm9udElPUyhjb25zdCB1aW50OF90KiBwdHIs IHVuc2lnbmVkIGxvbmcgbGVuZ3RoLCBzdGQ6OnN0cmluZyBzZWN0aW9uTmFtZSkKIHsKLSAgICBz dGF0aWMgY29uc3QgY2hhciogZm9udFNlY3Rpb25OYW1lc1tdID0gewotICAgICAgICAiQWhlbSIs Ci0gICAgICAgICJXZWlnaHRXYXRjaGVyMTAwIiwKLSAgICAgICAgIldlaWdodFdhdGNoZXIyMDAi LAotICAgICAgICAiV2VpZ2h0V2F0Y2hlcjMwMCIsCi0gICAgICAgICJXZWlnaHRXYXRjaGVyNDAw IiwKLSAgICAgICAgIldlaWdodFdhdGNoZXI1MDAiLAotICAgICAgICAiV2VpZ2h0V2F0Y2hlcjYw MCIsCi0gICAgICAgICJXZWlnaHRXYXRjaGVyNzAwIiwKLSAgICAgICAgIldlaWdodFdhdGNoZXI4 MDAiLAotICAgICAgICAiV2VpZ2h0V2F0Y2hlcjkwMCIsCi0gICAgICAgIDAKLSAgICB9OwotCi0g ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgZm9udFNlY3Rpb25OYW1lc1tpXTsgKytpKSB7Ci0gICAg ICAgIHVuc2lnbmVkIGxvbmcgZm9udERhdGFMZW5ndGg7Ci0gICAgICAgIGNoYXIqIGZvbnREYXRh ID0gZ2V0c2VjdGRhdGEoIl9fREFUQSIsIGZvbnRTZWN0aW9uTmFtZXNbaV0sICZmb250RGF0YUxl bmd0aCk7Ci0gICAgICAgIGlmICghZm9udERhdGEpIHsKLSAgICAgICAgICAgIGZwcmludGYoc3Rk ZXJyLCAiRmFpbGVkIHRvIGxvY2F0ZSB0aGUgJXMgZm9udC5cbiIsIGZvbnRTZWN0aW9uTmFtZXNb aV0pOwotICAgICAgICAgICAgZXhpdCgxKTsKLSAgICAgICAgfQotCi0gICAgICAgIENHRGF0YVBy b3ZpZGVyUmVmIGRhdGEgPSBDR0RhdGFQcm92aWRlckNyZWF0ZVdpdGhEYXRhKE5VTEwsIGZvbnRE YXRhLCBmb250RGF0YUxlbmd0aCwgTlVMTCk7Ci0gICAgICAgIGlmICghZGF0YSkgewotICAgICAg ICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gY3JlYXRlIENHRGF0YVByb3ZpZGVyUmVm IGZvciB0aGUgJXMgZm9udC5cbiIsIGZvbnRTZWN0aW9uTmFtZXNbaV0pOwotICAgICAgICAgICAg ZXhpdCgxKTsKLSAgICAgICAgfQorICAgIENHRGF0YVByb3ZpZGVyUmVmIGRhdGEgPSBDR0RhdGFQ cm92aWRlckNyZWF0ZVdpdGhEYXRhKE5VTEwsIHB0ciwgbGVuZ3RoLCBOVUxMKTsKKyAgICBpZiAo IWRhdGEpIHsKKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gY3JlYXRlIENHRGF0 YVByb3ZpZGVyUmVmIGZvciB0aGUgJXMgZm9udC5cbiIsIHNlY3Rpb25OYW1lLmNfc3RyKCkpOwor ICAgICAgICBleGl0KDEpOworICAgIH0KIAotICAgICAgICBDR0ZvbnRSZWYgY2dGb250ID0gQ0dG b250Q3JlYXRlV2l0aERhdGFQcm92aWRlcihkYXRhKTsKLSAgICAgICAgQ0dEYXRhUHJvdmlkZXJS ZWxlYXNlKGRhdGEpOwotICAgICAgICBpZiAoIWNnRm9udCkgewotICAgICAgICAgICAgZnByaW50 ZihzdGRlcnIsICJGYWlsZWQgdG8gY3JlYXRlIENHRm9udFJlZiBmb3IgdGhlICVzIGZvbnQuXG4i LCBmb250U2VjdGlvbk5hbWVzW2ldKTsKLSAgICAgICAgICAgIGV4aXQoMSk7Ci0gICAgICAgIH0K KyAgICBDR0ZvbnRSZWYgY2dGb250ID0gQ0dGb250Q3JlYXRlV2l0aERhdGFQcm92aWRlcihkYXRh KTsKKyAgICBDR0RhdGFQcm92aWRlclJlbGVhc2UoZGF0YSk7CisgICAgaWYgKCFjZ0ZvbnQpIHsK KyAgICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gY3JlYXRlIENHRm9udFJlZiBmb3Ig dGhlICVzIGZvbnQuXG4iLCBzZWN0aW9uTmFtZS5jX3N0cigpKTsKKyAgICAgICAgZXhpdCgxKTsK KyAgICB9CiAKLSAgICAgICAgaWYgKCFHU0ZvbnRBZGRDR0ZvbnQoY2dGb250KSkgewotICAgICAg ICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gYWRkIENHRm9udCB0byBHcmFwaGljc1Nl cnZpY2VzIGZvciB0aGUgJXMgZm9udC5cbiIsIGZvbnRTZWN0aW9uTmFtZXNbaV0pOwotICAgICAg ICAgICAgZXhpdCgxKTsKLSAgICAgICAgfQotICAgICAgICBDR0ZvbnRSZWxlYXNlKGNnRm9udCk7 CisgICAgaWYgKCFHU0ZvbnRBZGRDR0ZvbnQoY2dGb250KSkgeworICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIkZhaWxlZCB0byBhZGQgQ0dGb250IHRvIEdyYXBoaWNzU2VydmljZXMgZm9yIHRoZSAl cyBmb250LlxuIiwgc2VjdGlvbk5hbWUuY19zdHIoKSk7CisgICAgICAgIGV4aXQoMSk7CiAgICAg fQorICAgIENHRm9udFJlbGVhc2UoY2dGb250KTsKK30KK3N0YXRpYyB2b2lkIGFjdGl2YXRlRm9u dHNJT1MoKQoreworICAgIC8vIF9fYXNtKCkgcmVxdWlyZXMgYSBzdHJpbmcgbGl0ZXJhbCwgc28g d2UgY2FuJ3QgZG8gdGhpcyBhcyBlaXRoZXIgbG9jYWwgdmFyaWFibGVzIG9yIHRlbXBsYXRlIHBh cmFtZXRlcnMuCisjZGVmaW5lIGZvbnREYXRhKHNlY3Rpb25OYW1lKSBcCit7IFwKKyAgICBleHRl cm4gY29uc3QgdWludDhfdCBzdGFydCBfX2FzbSgic2VjdGlvbiRzdGFydCRfX0RBVEEkIiBzZWN0 aW9uTmFtZSk7IFwKKyAgICBleHRlcm4gY29uc3QgdWludDhfdCBlbmQgX19hc20oInNlY3Rpb24k ZW5kJF9fREFUQSQiIHNlY3Rpb25OYW1lKTsgXAorICAgIGFjdGl2YXRlRm9udElPUygmc3RhcnQs ICZlbmQgLSAmc3RhcnQsIHNlY3Rpb25OYW1lKTsgXAorfQorICAgIGZvbnREYXRhKCJBaGVtIik7 CisgICAgZm9udERhdGEoIldlaWdodFdhdGNoZXIxMDAiKTsKKyAgICBmb250RGF0YSgiV2VpZ2h0 V2F0Y2hlcjIwMCIpOworICAgIGZvbnREYXRhKCJXZWlnaHRXYXRjaGVyMzAwIik7CisgICAgZm9u dERhdGEoIldlaWdodFdhdGNoZXI0MDAiKTsKKyAgICBmb250RGF0YSgiV2VpZ2h0V2F0Y2hlcjUw MCIpOworICAgIGZvbnREYXRhKCJXZWlnaHRXYXRjaGVyNjAwIik7CisgICAgZm9udERhdGEoIldl aWdodFdhdGNoZXI3MDAiKTsKKyAgICBmb250RGF0YSgiV2VpZ2h0V2F0Y2hlcjgwMCIpOworICAg IGZvbnREYXRhKCJXZWlnaHRXYXRjaGVyOTAwIik7CiB9CiAjZW5kaWYgLy8gIVBMQVRGT1JNKElP UykKIAo=