128098 2014-02-02 23:40:02 -0800 Stop using PLATFORM(MAC) in JavaScriptCore except where it means “OS X but not iOS” 2014-02-03 00:21:16 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz andersca darin oldest_to_newest 974938 0 mitz 2014-02-02 23:40:02 -0800 So that we can make PLATFORM(MAC) false when building for iOS, we need to replace all uses of it that don’t take iOS into account. Most such uses are about targeting Darwin. 974941 1 222964 mitz 2014-02-02 23:47:47 -0800 Created attachment 222964 Replace PLATFORM(MAC) with alternatives appropriate for the context 974945 2 222964 darin 2014-02-03 00:06:27 -0800 Comment on attachment 222964 Replace PLATFORM(MAC) with alternatives appropriate for the context View in context: https://bugs.webkit.org/attachment.cgi?id=222964&action=review > Source/JavaScriptCore/runtime/Watchdog.h:29 > +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) I probably would have guarded this just by OS(DARWIN) even though the actual code is turned off for EFL and GTK. 974946 3 mitz 2014-02-03 00:07:58 -0800 (In reply to comment #2) > (From update of attachment 222964 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=222964&action=review > > > Source/JavaScriptCore/runtime/Watchdog.h:29 > > +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) > > I probably would have guarded this just by OS(DARWIN) even though the actual code is turned off for EFL and GTK. Makes sense. I’ll change that to OS(DARWIN) alone. 974947 4 mitz 2014-02-03 00:12:55 -0800 Committed <http://trac.webkit.org/r163291>. 974949 5 222964 darin 2014-02-03 00:15:25 -0800 Comment on attachment 222964 Replace PLATFORM(MAC) with alternatives appropriate for the context View in context: https://bugs.webkit.org/attachment.cgi?id=222964&action=review >>> Source/JavaScriptCore/runtime/Watchdog.h:29 >>> +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) >> >> I probably would have guarded this just by OS(DARWIN) even though the actual code is turned off for EFL and GTK. > > Makes sense. I’ll change that to OS(DARWIN) alone. Glad you took my suggestion for the include here, but ... > Source/JavaScriptCore/runtime/Watchdog.h:96 > +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) Looks like you also made this check just OS(DARWIN), and that was not what I was suggesting. 974950 6 mitz 2014-02-03 00:20:28 -0800 (In reply to comment #5) > (From update of attachment 222964 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=222964&action=review > > >>> Source/JavaScriptCore/runtime/Watchdog.h:29 > >>> +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) > >> > >> I probably would have guarded this just by OS(DARWIN) even though the actual code is turned off for EFL and GTK. > > > > Makes sense. I’ll change that to OS(DARWIN) alone. > > Glad you took my suggestion for the include here, but ... > > > Source/JavaScriptCore/runtime/Watchdog.h:96 > > +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) > > Looks like you also made this check just OS(DARWIN), and that was not what I was suggesting. I misunderstood you. I thought you meant that it would be OK to give EFL and GTK on Darwin those extra member variables in their Watchdog instances, even though they don’t use the WatchDogMac (though they could!). But I’ll undo that bit. 974952 7 222964 darin 2014-02-03 00:21:16 -0800 Comment on attachment 222964 Replace PLATFORM(MAC) with alternatives appropriate for the context View in context: https://bugs.webkit.org/attachment.cgi?id=222964&action=review >>>>> Source/JavaScriptCore/runtime/Watchdog.h:29 >>>>> +#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) >>>> >>>> I probably would have guarded this just by OS(DARWIN) even though the actual code is turned off for EFL and GTK. >>> >>> Makes sense. I’ll change that to OS(DARWIN) alone. >> >> Glad you took my suggestion for the include here, but ... > > I misunderstood you. I thought you meant that it would be OK to give EFL and GTK on Darwin those extra member variables in their Watchdog instances, even though they don’t use the WatchDogMac (though they could!). But I’ll undo that bit. Who knows, that might be a good idea. It just wasn’t my idea. 222964 2014-02-02 23:47:47 -0800 2014-02-03 00:21:16 -0800 Replace PLATFORM(MAC) with alternatives appropriate for the context bug-128098-20140202234810.patch text/plain 6205 mitz SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzMjg4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE0LTAyLTAyICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAg U3RvcCB1c2luZyBQTEFURk9STShNQUMpIGluIEphdmFTY3JpcHRDb3JlIGV4Y2VwdCB3aGVyZSBp dCBtZWFucyDigJxPUyBYIGJ1dCBub3QgaU9T4oCdCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIEFQSS9KU1ZhbHVlUmVmLmNwcDoKKyAgICAgICAgKEpT VmFsdWVVbnByb3RlY3QpOiBBZGRlZCBhbiBleHBsaWNpdCAhUExBVEZPUk0oSU9TKSBpbiBndWFy ZHMgZm9yIHRoZSBFdmVybm90ZSB3b3JrYXJvdW5kLAorICAgICAgICB3aGljaCBpcyBvbmx5IG5l ZWRlZCBvbiBPUyBYLgorCisgICAgICAgICogQVBJL3Rlc3RzL3Rlc3RhcGkuYzoKKyAgICAgICAg KG1haW4pOiBDaGFuZ2VkIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKSBndWFyZHMgdG8g T1MoREFSV0lOKSwgYmVjYXVzZSB0aGV5IHdlcmUKKyAgICAgICAgc3Vycm91bmRpbmcgdGVzdHMg Zm9yIGNvZGUgdGhhdCBpcyBpdHNlbGYgZ3VhcmRlZCBieSBPUyhEQVJXSU4pLgorCisgICAgICAg ICogcnVudGltZS9XYXRjaGRvZy5oOiBDaGFuZ2VkIFBMQVRGT1JNKE1BQykgdG8gdGhlIGVxdWl2 YWxlbnQKKyAgICAgICAgT1MoREFSV0lOKSAmJiAhUExBVEZPUk0oRUZMKSAmJiAhUExBVEZPUk0o R1RLKS4KKworICAgICAgICAqIHRvb2xzL0NvZGVQcm9maWxpbmcuY3BwOgorICAgICAgICAoSlND OjpDb2RlUHJvZmlsaW5nOjpiZWdpbik6IERpdHRvLgorICAgICAgICAoSlNDOjpDb2RlUHJvZmls aW5nOjplbmQpOiBEaXR0by4KKwogMjAxNC0wMi0wMiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVwYXRjaCBjb2RlIGlzIHBhc3NpbmcgdGhlIHdyb25nIGFyZ3Mg dG8gbG9va3VwRXhjZXB0aW9uSGFuZGxlci4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvSlNWYWx1ZVJlZi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU1ZhbHVlUmVmLmNwcAkocmV2aXNpb24gMTYzMjg3KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL0FQSS9KU1ZhbHVlUmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsMTMgKzQ0LDEzIEBA CiAKICNpbmNsdWRlIDxhbGdvcml0aG0+IC8vIGZvciBzdGQ6Om1pbgogCi0jaWYgUExBVEZPUk0o TUFDKQorI2lmIFBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKElPUykKICNpbmNsdWRlIDxtYWNo LW8vZHlsZC5oPgogI2VuZGlmCiAKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CiAKLSNpZiBQTEFURk9S TShNQUMpCisjaWYgUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oSU9TKQogc3RhdGljIGJvb2wg ZXZlcm5vdGVIYWNrTmVlZGVkKCkKIHsKICAgICBzdGF0aWMgY29uc3QgaW50MzJfdCB3ZWJraXRM YXN0VmVyc2lvbldpdGhFdmVybm90ZUhhY2sgPSAzNTEzMzk1OTsKQEAgLTQ0Myw3ICs0NDMsNyBA QCB2b2lkIEpTVmFsdWVQcm90ZWN0KEpTQ29udGV4dFJlZiBjdHgsIEpTCiAKIHZvaWQgSlNWYWx1 ZVVucHJvdGVjdChKU0NvbnRleHRSZWYgY3R4LCBKU1ZhbHVlUmVmIHZhbHVlKQogewotI2lmIFBM QVRGT1JNKE1BQykKKyNpZiBQTEFURk9STShNQUMpICYmICFQTEFURk9STShJT1MpCiAgICAgaWYg KCghdmFsdWUgfHwgIWN0eCkgJiYgZXZlcm5vdGVIYWNrTmVlZGVkKCkpCiAgICAgICAgIHJldHVy bjsKICNlbmRpZgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBp LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBp LmMJKHJldmlzaW9uIDE2MzI4NykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvdGVzdHMv dGVzdGFwaS5jCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw3IEBACiAjZGVmaW5lIEFTU0VS VF9ESVNBQkxFRCAwCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAotI2lmIFBMQVRGT1JN KE1BQykgfHwgUExBVEZPUk0oSU9TKQorI2lmIE9TKERBUldJTikKICNpbmNsdWRlIDxtYWNoL21h Y2guaD4KICNpbmNsdWRlIDxtYWNoL21hY2hfdGltZS5oPgogI2luY2x1ZGUgPHN5cy90aW1lLmg+ CkBAIC0xMTAzLDcgKzExMDMsNyBAQCBzdGF0aWMgdm9pZCBjaGVja0NvbnN0bmVzc0luSlNPYmpl Y3ROYW1lCiAgICAgdmFsLm5hbWUgPSAic29tZXRoaW5nIjsKIH0KIAotI2lmIFBMQVRGT1JNKE1B QykgfHwgUExBVEZPUk0oSU9TKQorI2lmIE9TKERBUldJTikKIHN0YXRpYyBkb3VibGUgY3VycmVu dENQVVRpbWUoKQogewogICAgIG1hY2hfbXNnX3R5cGVfbnVtYmVyX3QgaW5mb0NvdW50ID0gVEhS RUFEX0JBU0lDX0lORk9fQ09VTlQ7CkBAIC0xMTYyLDcgKzExNjIsNyBAQCBzdGF0aWMgYm9vbCBl eHRlbmRUZXJtaW5hdGVDYWxsYmFjayhKU0NvCiAgICAgfQogICAgIHJldHVybiB0cnVlOwogfQot I2VuZGlmIC8qIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKSAqLworI2VuZGlmIC8qIE9T KERBUldJTikgKi8KIAogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQpAQCAtMTg1 Myw3ICsxODUzLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAgICAg ZnJlZShzY3JpcHRVVEY4KTsKICAgICB9CiAKLSNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JN KElPUykKKyNpZiBPUyhEQVJXSU4pCiAgICAgSlNTdHJpbmdSZWYgY3VycmVudENQVVRpbWVTdHIg PSBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiY3VycmVudENQVVRpbWUiKTsKICAgICBK U09iamVjdFJlZiBjdXJyZW50Q1BVVGltZUZ1bmN0aW9uID0gSlNPYmplY3RNYWtlRnVuY3Rpb25X aXRoQ2FsbGJhY2soY29udGV4dCwgY3VycmVudENQVVRpbWVTdHIsIGN1cnJlbnRDUFVUaW1lX2Nh bGxBc0Z1bmN0aW9uKTsKICAgICBKU09iamVjdFNldFByb3BlcnR5KGNvbnRleHQsIGdsb2JhbE9i amVjdCwgY3VycmVudENQVVRpbWVTdHIsIGN1cnJlbnRDUFVUaW1lRnVuY3Rpb24sIGtKU1Byb3Bl cnR5QXR0cmlidXRlTm9uZSwgTlVMTCk7IApAQCAtMjAwNCw3ICsyMDA0LDcgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgICAgIGZhaWxlZCA9IHRydWU7CiAgICAg ICAgIH0KICAgICB9Ci0jZW5kaWYgLyogUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1MpICov CisjZW5kaWYgLyogT1MoREFSV0lOKSAqLwogCiAgICAgLy8gQ2xlYXIgb3V0IGxvY2FsIHZhcmlh YmxlcyBwb2ludGluZyBhdCBKU09iamVjdFJlZnMgdG8gYWxsb3cgdGhlaXIgdmFsdWVzIHRvIGJl IGNvbGxlY3RlZAogICAgIGZ1bmN0aW9uID0gTlVMTDsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1dhdGNoZG9nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvV2F0Y2hkb2cuaAkocmV2aXNpb24gMTYzMjg3KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYs NyBAQAogI2lmbmRlZiBXYXRjaGRvZ19oCiAjZGVmaW5lIFdhdGNoZG9nX2gKIAotI2lmIFBMQVRG T1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKQorI2lmIE9TKERBUldJTikgJiYgIVBMQVRGT1JNKEVG TCkgJiYgIVBMQVRGT1JNKEdUSykKICNpbmNsdWRlIDxkaXNwYXRjaC9kaXNwYXRjaC5oPiAgICAK ICNlbmRpZgogCkBAIC05Myw3ICs5Myw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCogbV9jYWxsYmFj a0RhdGExOwogICAgIHZvaWQqIG1fY2FsbGJhY2tEYXRhMjsKIAotI2lmIFBMQVRGT1JNKE1BQykg fHwgUExBVEZPUk0oSU9TKQorI2lmIE9TKERBUldJTikgJiYgIVBMQVRGT1JNKEVGTCkgJiYgIVBM QVRGT1JNKEdUSykKICAgICBkaXNwYXRjaF9xdWV1ZV90IG1fcXVldWU7CiAgICAgZGlzcGF0Y2hf c291cmNlX3QgbV90aW1lcjsKICNlbmRpZgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3Rv b2xzL0NvZGVQcm9maWxpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS90b29scy9Db2RlUHJvZmlsaW5nLmNwcAkocmV2aXNpb24gMTYzMjg3KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3Rvb2xzL0NvZGVQcm9maWxpbmcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 OCw3ICs0OCw3IEBAIFdURjo6TWV0YUFsbG9jYXRvclRyYWNrZXIqIENvZGVQcm9maWxpbmcKICNw cmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBpZ25vcmVkICItV21pc3Npbmctbm9yZXR1cm4iCiAjZW5k aWYKIAotI2lmIChQTEFURk9STShNQUMpICYmIENQVShYODZfNjQpKSB8fCAoT1MoTElOVVgpICYm IENQVShYODYpKQorI2lmIChPUyhEQVJXSU4pICYmICFQTEFURk9STShFRkwpICYmICFQTEFURk9S TShHVEspICYmIENQVShYODZfNjQpKSB8fCAoT1MoTElOVVgpICYmIENQVShYODYpKQogLy8gSGVs cGVyIGZ1bmN0aW9uIHRvIHN0YXJ0ICYgc3RvcCB0aGUgdGltZXIuCiAvLyBQcmVzZW50bHkgd2Un cmUgdXNpbmcgdGhlIHdhbGwtY2xvY2sgdGltZXIsIHNpbmNlIHRoaXMgc2VlbXMgdG8gZ2l2ZSB0 aGUgYmVzdCByZXN1bHRzLgogc3RhdGljIHZvaWQgc2V0UHJvZmlsZVRpbWVyKHVuc2lnbmVkIHVz ZWMpCkBAIC02Niw3ICs2Niw3IEBAIHN0YXRpYyB2b2lkIHNldFByb2ZpbGVUaW1lcih1bnNpZ25l ZCB1c2UKICNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKICNlbmRpZgogCi0jaWYgUExBVEZP Uk0oTUFDKSAmJiBDUFUoWDg2XzY0KQorI2lmIE9TKERBUldJTikgJiYgIVBMQVRGT1JNKEVGTCkg JiYgIVBMQVRGT1JNKEdUSykgJiYgQ1BVKFg4Nl82NCkKIHN0YXRpYyB2b2lkIHByb2ZpbGluZ1Rp bWVyKGludCwgc2lnaW5mb190Kiwgdm9pZCogdWFwKQogewogICAgIG1jb250ZXh0X3QgY29udGV4 dCA9IHN0YXRpY19jYXN0PHVjb250ZXh0X3QqPih1YXApLT51Y19tY29udGV4dDsKQEAgLTE0Myw3 ICsxNDMsNyBAQCB2b2lkIENvZGVQcm9maWxpbmc6OmJlZ2luKGNvbnN0IFNvdXJjZUNvCiAgICAg aWYgKGFscmVhZHlQcm9maWxpbmcpCiAgICAgICAgIHJldHVybjsKIAotI2lmIChQTEFURk9STShN QUMpICYmIENQVShYODZfNjQpKSB8fCAoT1MoTElOVVgpICYmIENQVShYODYpKQorI2lmIChPUyhE QVJXSU4pICYmICFQTEFURk9STShFRkwpICYmICFQTEFURk9STShHVEspICYmIENQVShYODZfNjQp KSB8fCAoT1MoTElOVVgpICYmIENQVShYODYpKQogICAgIC8vIFJlZ3NpdGVyIGEgc2lnbmFsIGhh bmRsZXIgJiBpdGltZXIuCiAgICAgc3RydWN0IHNpZ2FjdGlvbiBhY3Rpb247CiAgICAgYWN0aW9u LnNhX3NpZ2FjdGlvbiA9IHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCAoKikoaW50LCBzaWdpbmZvX3Qg Kiwgdm9pZCAqKT4ocHJvZmlsaW5nVGltZXIpOwpAQCAtMTY3LDcgKzE2Nyw3IEBAIHZvaWQgQ29k ZVByb2ZpbGluZzo6ZW5kKCkKICAgICBpZiAoc19wcm9maWxlU3RhY2spCiAgICAgICAgIHJldHVy bjsKIAotI2lmIChQTEFURk9STShNQUMpICYmIENQVShYODZfNjQpKSB8fCAoT1MoTElOVVgpICYm IENQVShYODYpKQorI2lmIChPUyhEQVJXSU4pICYmICFQTEFURk9STShFRkwpICYmICFQTEFURk9S TShHVEspICYmIENQVShYODZfNjQpKSB8fCAoT1MoTElOVVgpICYmIENQVShYODYpKQogICAgIC8v IFN0b3AgcHJvZmlsaW5nCiAgICAgc2V0UHJvZmlsZVRpbWVyKDApOwogI2VuZGlmCg==