147939 2015-08-12 10:55:46 -0700 Add a JSC option to enable the watchdog for testing 2015-08-12 11:15:05 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam oldest_to_newest 1116977 0 mark.lam 2015-08-12 10:55:46 -0700 Patch coming 1116979 1 258829 mark.lam 2015-08-12 11:00:02 -0700 Created attachment 258829 the fix. 1116982 2 258829 msaboff 2015-08-12 11:09:09 -0700 Comment on attachment 258829 the fix. r=me 1116984 3 mark.lam 2015-08-12 11:15:05 -0700 Thanks. Landed in r188338: <http://trac.webkit.org/r188338>. 258829 2015-08-12 11:00:02 -0700 2015-08-12 11:09:09 -0700 the fix. bug-147939.patch text/plain 4706 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4MzM2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE1LTA4LTEyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgYSBKU0Mgb3B0aW9uIHRvIGVuYWJsZSB0aGUgd2F0Y2hkb2cgZm9yIHRlc3RpbmcuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5MzkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEFQSS9KU0NvbnRl eHRSZWYuY3BwOgorICAgICAgICAoSlNDb250ZXh0R3JvdXBTZXRFeGVjdXRpb25UaW1lTGltaXQp OgorICAgICAgICAoY3JlYXRlV2F0Y2hkb2dJZk5lZWRlZCk6IERlbGV0ZWQuCisgICAgICAgICog cnVudGltZS9PcHRpb25zLmg6CisgICAgICAgICogcnVudGltZS9WTS5jcHA6CisgICAgICAgIChK U0M6OlZNOjpWTSk6CisgICAgICAgIChKU0M6OlZNOjp+Vk0pOgorICAgICAgICAoSlNDOjpWTTo6 c2hhcmVkSW5zdGFuY2VJbnRlcm5hbCk6CisgICAgICAgIChKU0M6OlZNOjplbnN1cmVXYXRjaGRv Zyk6CisgICAgICAgIChKU0M6OnRodW5rR2VuZXJhdG9yRm9ySW50cmluc2ljKToKKyAgICAgICAg KiBydW50aW1lL1ZNLmg6CisKIDIwMTUtMDgtMTEgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIEltcGxlbWVudGF0aW9uIEphdmFTY3JpcHQgd2F0Y2hkb2cgdXNpbmcg V1RGOjpXb3JrUXVldWUuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4 dFJlZi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRl eHRSZWYuY3BwCShyZXZpc2lvbiAxODgzMzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJ L0pTQ29udGV4dFJlZi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkyLDI0ICs5MiwxMSBAQCBzdGF0 aWMgYm9vbCBpbnRlcm5hbFNjcmlwdFRpbWVvdXRDYWxsYmFjCiAgICAgcmV0dXJuIGNhbGxiYWNr KGNvbnRleHRSZWYsIGNhbGxiYWNrRGF0YSk7CiB9CiAKLXN0YXRpYyB2b2lkIGNyZWF0ZVdhdGNo ZG9nSWZOZWVkZWQoVk0mIHZtKQotewotICAgIGlmICghdm0ud2F0Y2hkb2cpIHsKLSAgICAgICAg dm0ud2F0Y2hkb2cgPSBhZG9wdFJlZihuZXcgV2F0Y2hkb2coKSk7Ci0KLSAgICAgICAgLy8gVGhl IExMSU5UIHBlZWtzIGludG8gdGhlIFdhdGNoZG9nIG9iamVjdCBkaXJlY3RseS4gSW4gb3JkZXIg dG8gZG8gdGhhdCwKLSAgICAgICAgLy8gdGhlIExMSU5UIGFzc3VtZXMgdGhhdCB0aGUgaW50ZXJu YWwgc2hhcGUgb2YgYSBzdGQ6OnVuaXF1ZV9wdHIgaXMgdGhlCi0gICAgICAgIC8vIHNhbWUgYXMg YSBwbGFpbiBDKysgcG9pbnRlciwgYW5kIGxvYWRzIHRoZSBhZGRyZXNzIG9mIFdhdGNoZG9nIGZy b20gaXQuCi0gICAgICAgIFJFTEVBU0VfQVNTRVJUKCpyZWludGVycHJldF9jYXN0PFdhdGNoZG9n Kio+KCZ2bS53YXRjaGRvZykgPT0gdm0ud2F0Y2hkb2cuZ2V0KCkpOwotICAgIH0KLX0KLQogdm9p ZCBKU0NvbnRleHRHcm91cFNldEV4ZWN1dGlvblRpbWVMaW1pdChKU0NvbnRleHRHcm91cFJlZiBn cm91cCwgZG91YmxlIGxpbWl0LCBKU1Nob3VsZFRlcm1pbmF0ZUNhbGxiYWNrIGNhbGxiYWNrLCB2 b2lkKiBjYWxsYmFja0RhdGEpCiB7CiAgICAgVk0mIHZtID0gKnRvSlMoZ3JvdXApOwogICAgIEpT TG9ja0hvbGRlciBsb2NrZXIoJnZtKTsKLSAgICBjcmVhdGVXYXRjaGRvZ0lmTmVlZGVkKHZtKTsK LSAgICBXYXRjaGRvZyYgd2F0Y2hkb2cgPSAqdm0ud2F0Y2hkb2c7CisgICAgV2F0Y2hkb2cmIHdh dGNoZG9nID0gdm0uZW5zdXJlV2F0Y2hkb2coKTsKICAgICBpZiAoY2FsbGJhY2spIHsKICAgICAg ICAgdm9pZCogY2FsbGJhY2tQdHIgPSByZWludGVycHJldF9jYXN0PHZvaWQqPihjYWxsYmFjayk7 CiAgICAgICAgIHdhdGNoZG9nLnNldFRpbWVMaW1pdCh2bSwgc3RkOjpjaHJvbm86OmR1cmF0aW9u X2Nhc3Q8c3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcz4oc3RkOjpjaHJvbm86OmR1cmF0aW9uPGRv dWJsZT4obGltaXQpKSwgaW50ZXJuYWxTY3JpcHRUaW1lb3V0Q2FsbGJhY2ssIGNhbGxiYWNrUHRy LCBjYWxsYmFja0RhdGEpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0 aW9ucy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlv bnMuaAkocmV2aXNpb24gMTg4MzM2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv T3B0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMjAsNiArMzIwLDggQEAgdHlwZWRlZiBjb25z dCBjaGFyKiBvcHRpb25TdHJpbmc7CiAgICAgXAogICAgIHYoYm9vbCwgZW5hYmxlRG9sbGFyVk0s IGZhbHNlLCAiaW5zdGFsbHMgdGhlICR2bSBkZWJ1Z2dpbmcgdG9vbCBpbiBnbG9iYWwgb2JqZWN0 cyIpIFwKICAgICB2KG9wdGlvblN0cmluZywgZnVuY3Rpb25PdmVycmlkZXMsIG51bGxwdHIsICJm aWxlIHdpdGggZGVidWdnaW5nIG92ZXJyaWRlcyBmb3IgZnVuY3Rpb24gYm9kaWVzIikgXAorICAg IFwKKyAgICB2KHVuc2lnbmVkLCB3YXRjaGRvZywgMCwgIndhdGNoZG9nIHRpbWVvdXQgKDAgPSBE aXNhYmxlZCwgTiA9IGEgdGltZW91dCBwZXJpb2Qgb2YgTiBtaWxsaXNlY29uZHMpIikgXAogCiBj bGFzcyBPcHRpb25zIHsKIHB1YmxpYzoKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1ZNLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9W TS5jcHAJKHJldmlzaW9uIDE4ODMzNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1ZNLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg2LDYgKzI4NiwxMiBAQCBWTTo6Vk0oVk1UeXBl IHZtVHlwZSwgSGVhcFR5cGUgaGVhcFR5cGUpCiAgICAgICAgIGVuYWJsZVR5cGVQcm9maWxlcigp OwogICAgIGlmIChPcHRpb25zOjplbmFibGVDb250cm9sRmxvd1Byb2ZpbGVyKCkpCiAgICAgICAg IGVuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXIoKTsKKworICAgIGlmIChPcHRpb25zOjp3YXRjaGRv ZygpKSB7CisgICAgICAgIHN0ZDo6Y2hyb25vOjptaWxsaXNlY29uZHMgdGltZW91dE1pbGxpcyhP cHRpb25zOjp3YXRjaGRvZygpKTsKKyAgICAgICAgV2F0Y2hkb2cmIHdhdGNoZG9nID0gZW5zdXJl V2F0Y2hkb2coKTsKKyAgICAgICAgd2F0Y2hkb2cuc2V0VGltZUxpbWl0KCp0aGlzLCB0aW1lb3V0 TWlsbGlzKTsKKyAgICB9CiB9CiAKIFZNOjp+Vk0oKQpAQCAtMzcxLDYgKzM3NywxOSBAQCBWTSom IFZNOjpzaGFyZWRJbnN0YW5jZUludGVybmFsKCkKICAgICByZXR1cm4gc2hhcmVkSW5zdGFuY2U7 CiB9CiAKK1dhdGNoZG9nJiBWTTo6ZW5zdXJlV2F0Y2hkb2coKQoreworICAgIGlmICghd2F0Y2hk b2cpIHsKKyAgICAgICAgd2F0Y2hkb2cgPSBhZG9wdFJlZihuZXcgV2F0Y2hkb2coKSk7CisgICAg ICAgIAorICAgICAgICAvLyBUaGUgTExJTlQgcGVla3MgaW50byB0aGUgV2F0Y2hkb2cgb2JqZWN0 IGRpcmVjdGx5LiBJbiBvcmRlciB0byBkbyB0aGF0LAorICAgICAgICAvLyB0aGUgTExJTlQgYXNz dW1lcyB0aGF0IHRoZSBpbnRlcm5hbCBzaGFwZSBvZiBhIHN0ZDo6dW5pcXVlX3B0ciBpcyB0aGUK KyAgICAgICAgLy8gc2FtZSBhcyBhIHBsYWluIEMrKyBwb2ludGVyLCBhbmQgbG9hZHMgdGhlIGFk ZHJlc3Mgb2YgV2F0Y2hkb2cgZnJvbSBpdC4KKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoKnJlaW50 ZXJwcmV0X2Nhc3Q8V2F0Y2hkb2cqKj4oJndhdGNoZG9nKSA9PSB3YXRjaGRvZy5nZXQoKSk7Cisg ICAgfQorICAgIHJldHVybiAqd2F0Y2hkb2c7Cit9CisKICNpZiBFTkFCTEUoSklUKQogc3RhdGlj IFRodW5rR2VuZXJhdG9yIHRodW5rR2VuZXJhdG9yRm9ySW50cmluc2ljKEludHJpbnNpYyBpbnRy aW5zaWMpCiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHJldmlzaW9uIDE4 ODMzNikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1ZNLmgJKHdvcmtpbmcgY29w eSkKQEAgLTIzNyw2ICsyMzcsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxWTT4gY3JlYXRl Q29udGV4dEdyb3VwKEhlYXBUeXBlID0gU21hbGxIZWFwKTsKICAgICBKU19FWFBPUlRfUFJJVkFU RSB+Vk0oKTsKIAorICAgIFdhdGNoZG9nJiBlbnN1cmVXYXRjaGRvZygpOworCiBwcml2YXRlOgog ICAgIFJlZlB0cjxKU0xvY2s+IG1fYXBpTG9jazsKIAo=