117360 2013-06-07 13:14:38 -0700 Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits 2013-06-07 13:33:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes ddkilzer oldest_to_newest 898269 0 aestes 2013-06-07 13:14:38 -0700 Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits 898273 1 204063 aestes 2013-06-07 13:24:04 -0700 Created attachment 204063 Patch 898276 2 204063 ddkilzer 2013-06-07 13:29:16 -0700 Comment on attachment 204063 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204063&action=review r=me > Source/WebCore/testing/WebCoreTestShimLibrary.cpp:28 > +#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE We can't use #include <wtf/Platform.h> and #if !PLATFORM(IOS) here? 898279 3 aestes 2013-06-07 13:31:42 -0700 (In reply to comment #2) > (From update of attachment 204063 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204063&action=review > > r=me > > > Source/WebCore/testing/WebCoreTestShimLibrary.cpp:28 > > +#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE > > We can't use #include <wtf/Platform.h> and #if !PLATFORM(IOS) here? We could, but we'd have to add WTF/JavaScriptCore to the target's header search path. It seemed easier to just use TargetConditionals.h. 898280 4 aestes 2013-06-07 13:33:32 -0700 Committed r151334: <http://trac.webkit.org/changeset/151334> 204063 2013-06-07 13:24:04 -0700 2013-06-07 13:29:16 -0700 Patch bug-117360-20130607132230.patch text/plain 2802 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxMzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg3ZDU5ZmFhY2U3MzFm NzMyZmFlYzRiMmZjMjJlYWY2OTRjODAyNS4uYjg4OWQ3MzZkNzllY2VmY2EyZmQ3ZGFlNDM5YzVh NGRmYzEyNjBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA2LTA3ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDb21waWxlIFdlYkNvcmVUZXN0 U2hpbUxpYnJhcnkuY3BwIG9uIGlPUywgYnV0IGV4Y2x1ZGUgdGhlIENhcmJvbiBiaXRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTczNjAKKworICAg ICAgICBJbiByMTUwMTE0IHdlIHRyaWVkIHRvIG1ha2UgdGhlIFdlYkNvcmVUZXN0U2hpbSB0YXJn ZXQgYnVpbGQgb24gaU9TIGJ5CisgICAgICAgIGV4Y2x1ZGluZyBpdHMgb25seSBzb3VyY2UgZmls ZSBmcm9tIHRoZSBidWlsZC4gV2hpbGUgdGhpcyBhbGxvd2VkIHRoZQorICAgICAgICB0YXJnZXQg dG8gYnVpbGQsIGl0IHByZXZlbnRlZCB0aGUgdGFyZ2V0J3MgcHJvZHVjdCAoV2ViQ29yZVRlc3RT aGltLmR5bGliKQorICAgICAgICBmcm9tIGJlaW5nIGNyZWF0ZWQuIFRoaXMgY2F1c2VzIHhjb2Rl YnVpbGQgdG8gZmFpbCBpZiB5b3UgYXNrIGl0IHRvCisgICAgICAgIGluc3RhbGwgdGhlIHRhcmdl dC4KKworICAgICAgICBGaXggdGhpcyBieSBidWlsZGluZyB0aGUgdGFyZ2V0J3MgcHJvZHVjdCBv biBpT1MuIEp1c3QgdXNlIHRoZQorICAgICAgICBwcmVwcm9jZXNzb3IgdG8gZXhjbHVkZSB0aGUg Yml0cyB0aGF0IHdvbid0IGJ1aWxkIG9uIGlPUy4KKworICAgICAgICAqIENvbmZpZ3VyYXRpb25z L1dlYkNvcmVUZXN0U2hpbS54Y2NvbmZpZzoKKyAgICAgICAgKiB0ZXN0aW5nL1dlYkNvcmVUZXN0 U2hpbUxpYnJhcnkuY3BwOgorCiAyMDEzLTA2LTA3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT046IExpbmVzIGp1bXAgdXAgYW5kIGRvd24gd2hp bGUgdHlwaW5nIENoaW5lc2Ugb3IgSmFwYW5lc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NvbmZpZ3VyYXRpb25zL1dlYkNvcmVUZXN0U2hpbS54Y2NvbmZpZyBiL1NvdXJjZS9XZWJDb3Jl L0NvbmZpZ3VyYXRpb25zL1dlYkNvcmVUZXN0U2hpbS54Y2NvbmZpZwppbmRleCAyOWExMmYxZjI4 Y2QyMGEzZmM1YWQzZmFhZDdkOTJiOGNiOGMwZGExLi4wNzI1MGQ1YmIxNmRiYmQ1YTNhMWFmNzJi NjkzNDg0NjBhN2Y3YmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Db25maWd1cmF0aW9u cy9XZWJDb3JlVGVzdFNoaW0ueGNjb25maWcKKysrIGIvU291cmNlL1dlYkNvcmUvQ29uZmlndXJh dGlvbnMvV2ViQ29yZVRlc3RTaGltLnhjY29uZmlnCkBAIC0zOSw3ICszOSwzIEBAIEVYRUNVVEFC TEVfUFJFRklYID0gbGliOwogRVhQT1JURURfU1lNQk9MU19GSUxFID0gOwogT1RIRVJfTERGTEFH UyA9IDsKIFNFQ1RPUkRFUl9GTEFHUyA9IDsKLQotRVhDTFVERURfU09VUkNFX0ZJTEVfTkFNRVMg PSAkKEVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTXyQoUExBVEZPUk1fTkFNRSkpICQoRVhDTFVE RURfU09VUkNFX0ZJTEVfTkFNRVNfJChDT05GSUdVUkFUSU9OKV8kKFBMQVRGT1JNX05BTUUpKTsK LUVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTX2lwaG9uZW9zID0gV2ViQ29yZVRlc3RTaGltTGli cmFyeS5jcHA7Ci1FWENMVURFRF9TT1VSQ0VfRklMRV9OQU1FU19pcGhvbmVzaW11bGF0b3IgPSAk KEVYQ0xVREVEX1NPVVJDRV9GSUxFX05BTUVTX2lwaG9uZW9zKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvV2ViQ29yZVRlc3RTaGltTGlicmFyeS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL1dlYkNvcmVUZXN0U2hpbUxpYnJhcnkuY3BwCmluZGV4IDExMTc2YzFhZDZl N2E5NDczNWMyY2EyODlkMTliODNhN2Y5MDZiOTQuLmVkZjNkMzg4Y2MzYmQyOTQ5MjZhOTMxZDZm MzRjZDUyZWFmOTdjNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvV2ViQ29y ZVRlc3RTaGltTGlicmFyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9XZWJDb3Jl VGVzdFNoaW1MaWJyYXJ5LmNwcApAQCAtMjMsNiArMjMsMTAgQEAKICAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KICAqLwogCisjaW5jbHVkZSA8VGFyZ2V0Q29uZGl0aW9uYWxzLmg+ CisKKyNpZiAhZGVmaW5lZChUQVJHRVRfT1NfSVBIT05FKSB8fCAhVEFSR0VUX09TX0lQSE9ORQor CiAjaW5jbHVkZSAiRHluYW1pY0xpbmtlckludGVycG9zaW5nLmgiCiAjaW5jbHVkZSA8Q2FyYm9u L0NhcmJvbi5oPgogCkBAIC01MCwzICs1NCw1IEBAIHN0YXRpYyBCb29sZWFuIHNoaW1Jc1NlY3Vy ZUV2ZW50SW5wdXRFbmFibGVkKCkKIERZTERfSU5URVJQT1NFKHNoaW1FbmFibGVTZWN1cmVFdmVu dElucHV0LCBFbmFibGVTZWN1cmVFdmVudElucHV0KQogRFlMRF9JTlRFUlBPU0Uoc2hpbURpc2Fi bGVTZWN1cmVFdmVudElucHV0LCBEaXNhYmxlU2VjdXJlRXZlbnRJbnB1dCkKIERZTERfSU5URVJQ T1NFKHNoaW1Jc1NlY3VyZUV2ZW50SW5wdXRFbmFibGVkLCBJc1NlY3VyZUV2ZW50SW5wdXRFbmFi bGVkKQorCisjZW5kaWYgLy8gIWRlZmluZWQoVEFSR0VUX09TX0lQSE9ORSkgfHwgIVRBUkdFVF9P U19JUEhPTkUK