162262 2016-09-20 03:09:03 -0700 [Win] Compile fix. 2016-09-29 08:49:26 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pvollan pvollan achristensen bfulgham commit-queue mmaxfield oldest_to_newest 1231586 0 pvollan 2016-09-20 03:09:03 -0700 If the CoreText headers already has defined 'kCTFontTableOptionNoOptions', I get the following compile error: Source\WebCore\platform\spi\win\CoreTextSPIWin.h(44): error C2365: 'kCTFontTableOptionNoOptions': redefinition; previous definition was 'enumerator' (compiling source file Source\WebCore\platform\graphics\ca\PlatformCALayer.cpp) include\CoreText/CTFont.h(1285): note: see declaration of 'kCTFontTableOptionNoOptions' (compiling source file Source\WebCore\platform\graphics\ca\PlatformCALayer.cpp) 1231588 1 289339 pvollan 2016-09-20 03:15:24 -0700 Created attachment 289339 Patch 1231609 2 289339 bfulgham 2016-09-20 07:04:50 -0700 Comment on attachment 289339 Patch This doesn't seem to work. Usually the compiler is happy if we typedef in multiple places as long as they are the same. Maybe expanding the CF_OPTIONS macro manually would work. 1231682 3 289339 bfulgham 2016-09-20 09:14:49 -0700 Comment on attachment 289339 Patch Usually we don't have a problem as long as the typdef's match. It might be that expanding the CF_OPTIONS macro manually would make the compiler happy? At any rate, this code change doesn't seem to work on the build machines. 1233600 4 mmaxfield 2016-09-26 14:58:54 -0700 This error doesn't make any sense. What does "previous definition was 'enumerator' mean? Where is 'enumerator'? I don't see the symbol defined twice inside WebKit sources... 1234751 5 290190 pvollan 2016-09-29 01:57:58 -0700 Created attachment 290190 Patch 1234752 6 pvollan 2016-09-29 02:03:32 -0700 Thanks for reviewing :) The symbol is not defined twice in WebKit, but when compiling with some older SDK versions, the symbol is included when including <CoreText/CoreText.h>. 1234806 7 290190 commit-queue 2016-09-29 08:49:22 -0700 Comment on attachment 290190 Patch Clearing flags on attachment: 290190 Committed r206584: <http://trac.webkit.org/changeset/206584> 1234807 8 commit-queue 2016-09-29 08:49:26 -0700 All reviewed patches have been landed. Closing bug. 289339 2016-09-20 03:15:24 -0700 2016-09-29 01:57:54 -0700 Patch bug-162262-20160920031551.patch text/plain 1672 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjE0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA5LTIwICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDb21waWxlIGZp eC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjI2 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBk ZWZpbmVzIGluc3RlYWQgb2YgYW4gZW51bSB0byBkZWZpbmUgY29uc3RhbnRzLCBpbiBjYXNlIHRo ZSBDb3JlVGV4dCBoZWFkZXJzCisgICAgICAgIGFscmVhZHkgaGF2ZSBkZWZpbmVkIHRoZXNlIGNv bnN0YW50cy4KKworICAgICAgICAqIHBsYXRmb3JtL3NwaS93aW4vQ29yZVRleHRTUElXaW4uaDoK KwogMjAxNi0wOS0yMCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW1dpbl0gVW5yZXZpZXdlZCB3YXJuaW5nIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3NwaS93aW4vQ29yZVRleHRTUElXaW4uaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9zcGkvd2luL0NvcmVUZXh0U1BJV2luLmgJKHJldmlzaW9uIDIwNjA5 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS93aW4vQ29yZVRleHRTUElXaW4uaAko d29ya2luZyBjb3B5KQpAQCAtMzksMTEgKzM5LDkgQEAgdHlwZWRlZiBGb3VyQ2hhckNvZGUgQ1RG b250VGFibGVUYWc7CiBDVF9FWFBPUlQgY29uc3QgQ0ZTdHJpbmdSZWYga0NURm9udEF0dHJpYnV0 ZU5hbWU7CiBDVF9FWFBPUlQgY29uc3QgQ0ZTdHJpbmdSZWYga0NURm9yZWdyb3VuZENvbG9yRnJv bUNvbnRleHRBdHRyaWJ1dGVOYW1lOwogCi10eXBlZGVmIENGX09QVElPTlModWludDMyX3QsIENU Rm9udFRhYmxlT3B0aW9ucykKLXsKLSAgICBrQ1RGb250VGFibGVPcHRpb25Ob09wdGlvbnMgPSAw LAotICAgIGtDVEZvbnRUYWJsZU9wdGlvbkV4Y2x1ZGVTeW50aGV0aWMgPSAoMSA8PCAwKQotfTsK Ky8vIFVzZSBkZWZpbmVzIGluc3RlYWQgb2YgYW4gZW51bSBoZXJlLCBpbiBjYXNlIHRoZSBjb25z dGFudHMgaGF2ZSBhbHJlYWR5IGJlZW4gZGVmaW5lZCBpbiB0aGUgQ29yZVRleHQgaGVhZGVycy4K KyNkZWZpbmUga0NURm9udFRhYmxlT3B0aW9uTm9PcHRpb25zIDAKKyNkZWZpbmUga0NURm9udFRh YmxlT3B0aW9uRXhjbHVkZVN5bnRoZXRpYyAoMSA8PCAwKQogCiBDVEZvbnRSZWYgQ1RGb250Q3Jl YXRlV2l0aE5hbWUoQ0ZTdHJpbmdSZWYsIENHRmxvYXQgc2l6ZSwgY29uc3QgQ0dBZmZpbmVUcmFu c2Zvcm0qKTsKIENURm9udFJlZiBDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KENHRm9udFJl ZiwgQ0dGbG9hdCBzaXplLCBjb25zdCBDR0FmZmluZVRyYW5zZm9ybSosIENURm9udERlc2NyaXB0 b3JSZWYgYXR0cmlidXRlcyk7Cg== 290190 2016-09-29 01:57:58 -0700 2016-09-29 08:49:22 -0700 Patch bug-162262-20160929015456.patch text/plain 1187 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjU3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA5LTI5ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDb21waWxlIGZp eC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjI2 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIENv cmVUZXh0LmggaXMgaW5jbHVkZWQsIHdlIHdpbGwgZ2V0IHJlZGVmaW5pdGlvbiBjb21waWxlIGVy cm9ycyBvbiBzb21lIG9sZGVyIFNESworICAgICAgICB2ZXJzaW9ucy4gCisKKyAgICAgICAgKiBw bGF0Zm9ybS9zcGkvd2luL0NvcmVUZXh0U1BJV2luLmg6CisKIDIwMTYtMDktMjggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wIGZpcnN0ICdzdGF0ZScgcGFy YW1ldGVyIHRvIEpTRE9NV2luZG93Ojp0b1dyYXBwZWQoKSAvIEpTRXZlbnRUYXJnZXQ6OnRvV3Jh cHBlZCgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvd2luL0NvcmVUZXh0U1BJ V2luLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL3dpbi9Db3Jl VGV4dFNQSVdpbi5oCShyZXZpc2lvbiAyMDY1NzYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9zcGkvd2luL0NvcmVUZXh0U1BJV2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDgg QEAKIAogI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9uLmg+CiAjaW5jbHVk ZSA8Q29yZUdyYXBoaWNzL0NvcmVHcmFwaGljcy5oPgotI2luY2x1ZGUgPENvcmVUZXh0L0NvcmVU ZXh0Lmg+CisjaW5jbHVkZSA8Q29yZVRleHQvQ1REZWZpbmVzLmg+CisjaW5jbHVkZSA8Q29yZVRl eHQvQ1RGb250RGVzY3JpcHRvci5oPgogCiBXVEZfRVhURVJOX0NfQkVHSU4KIAo=