147790 2015-08-07 12:20:36 -0700 Rename some variables in the JSC watchdog implementation 2015-08-07 12:35:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 147107 1 mark.lam mark.lam oldest_to_newest 1115839 0 mark.lam 2015-08-07 12:20:36 -0700 This is just a refactoring patch to rename some variables so that their intended meaning is clearer, and so that the upcoming patch for bug 147107 will be easier to understand. 1115840 1 258518 mark.lam 2015-08-07 12:25:22 -0700 Created attachment 258518 the fix. 1115841 2 mark.lam 2015-08-07 12:35:18 -0700 Landed in r188147: <http://trac.webkit.org/r188147>. 258518 2015-08-07 12:25:22 -0700 2015-08-07 12:28:15 -0700 the fix. bug-147790.patch text/plain 4288 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4MTQ1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE1LTA4LTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgc29tZSB2YXJpYWJsZXMgaW4gdGhlIEpTQyB3YXRjaGRvZyBpbXBsZW1lbnRhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Nzc5MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMg anVzdCBhIHJlZmFjdG9yaW5nIHBhdGNoIHRvIGdpdmUgdGhlIHZhcmlhYmxlIGJldHRlciBuYW1l cyB0aGF0IGRlc2NyaWJlIHRoZWlyCisgICAgICAgIGludGVuZGVkIHVzZS4gIFRoZXJlIGlzIG5v IGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJ1bnRpbWUvV2F0Y2hkb2cuY3BwOgorICAg ICAgICAoSlNDOjpXYXRjaGRvZzo6V2F0Y2hkb2cpOgorICAgICAgICAoSlNDOjpXYXRjaGRvZzo6 c2V0VGltZUxpbWl0KToKKyAgICAgICAgKEpTQzo6V2F0Y2hkb2c6OmRpZEZpcmUpOgorICAgICAg ICAoSlNDOjpXYXRjaGRvZzo6aXNFbmFibGVkKToKKyAgICAgICAgKEpTQzo6V2F0Y2hkb2c6OmZp cmUpOgorICAgICAgICAoSlNDOjpXYXRjaGRvZzo6c3RhcnRDb3VudGRvd25JZk5lZWRlZCk6Cisg ICAgICAgICogcnVudGltZS9XYXRjaGRvZy5oOgorCiAyMDE1LTA4LTA3ICBTYWFtIGJhcmF0aSAg PHNhYW1iYXJhdGkxQGdtYWlsLmNvbT4KIAogICAgICAgICBJbnRlcnByZXRlcjo6dW53aW5kIHNo b3VsZG4ndCBiZSByZXNwb25zaWJsZSBmb3IgYXNzaWduaW5nIHRoZSBjb3JyZWN0IHNjb3BlLgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcAkocmV2aXNp b24gMTg4MTQ0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvV2F0Y2hkb2cuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw5ICszNyw5IEBAIG5hbWVzcGFjZSBKU0MgewogV2F0Y2hk b2c6OldhdGNoZG9nKCkKICAgICA6IG1fdGltZXJEaWRGaXJlKGZhbHNlKQogICAgICwgbV9kaWRG aXJlKGZhbHNlKQotICAgICwgbV9saW1pdChOT19MSU1JVCkKLSAgICAsIG1fc3RhcnRUaW1lKDAp Ci0gICAgLCBtX2VsYXBzZWRUaW1lKDApCisgICAgLCBtX3RpbWVvdXRQZXJpb2QoTk9fTElNSVQp CisgICAgLCBtX3N0YXJ0Q1BVVGltZSgwKQorICAgICwgbV9lbGFwc2VkQ1BVVGltZSgwKQogICAg ICwgbV9yZWVudHJ5Q291bnQoMCkKICAgICAsIG1faXNTdG9wcGVkKHRydWUpCiAgICAgLCBtX2Nh bGxiYWNrKDApCkBAIC02Niw3ICs2Niw3IEBAIHZvaWQgV2F0Y2hkb2c6OnNldFRpbWVMaW1pdChW TSYgdm0sIHN0ZDoKIAogICAgIG1fZGlkRmlyZSA9IGZhbHNlOyAvLyBSZXNldCB0aGUgd2F0Y2hk b2cuCiAKLSAgICBtX2xpbWl0ID0gbGltaXQ7CisgICAgbV90aW1lb3V0UGVyaW9kID0gbGltaXQ7 CiAgICAgbV9jYWxsYmFjayA9IGNhbGxiYWNrOwogICAgIG1fY2FsbGJhY2tEYXRhMSA9IGRhdGEx OwogICAgIG1fY2FsbGJhY2tEYXRhMiA9IGRhdGEyOwpAQCAtOTgsOSArOTgsOSBAQCBib29sIFdh dGNoZG9nOjpkaWRGaXJlKEV4ZWNTdGF0ZSogZXhlYykKICAgICBzdG9wQ291bnRkb3duKCk7CiAK ICAgICBhdXRvIGN1cnJlbnRUaW1lID0gY3VycmVudENQVVRpbWUoKTsKLSAgICBhdXRvIGRlbHRh VGltZSA9IGN1cnJlbnRUaW1lIC0gbV9zdGFydFRpbWU7Ci0gICAgYXV0byB0b3RhbEVsYXBzZWRU aW1lID0gbV9lbGFwc2VkVGltZSArIGRlbHRhVGltZTsKLSAgICBpZiAodG90YWxFbGFwc2VkVGlt ZSA+IG1fbGltaXQpIHsKKyAgICBhdXRvIGRlbHRhQ1BVVGltZSA9IGN1cnJlbnRUaW1lIC0gbV9z dGFydENQVVRpbWU7CisgICAgYXV0byB0b3RhbEVsYXBzZWRDUFVUaW1lID0gbV9lbGFwc2VkQ1BV VGltZSArIGRlbHRhQ1BVVGltZTsKKyAgICBpZiAodG90YWxFbGFwc2VkQ1BVVGltZSA+IG1fdGlt ZW91dFBlcmlvZCkgewogICAgICAgICAvLyBDYXNlIDE6IHRoZSBhbGxvd2VkIENQVSB0aW1lIGhh cyBlbGFwc2VkLgogCiAgICAgICAgIC8vIElmIG1fY2FsbGJhY2sgaXMgbm90IHNldCwgdGhlbiB3 ZSB0ZXJtaW5hdGUgYnkgZGVmYXVsdC4KQEAgLTEyMSwxMCArMTIxLDEwIEBAIGJvb2wgV2F0Y2hk b2c6OmRpZEZpcmUoRXhlY1N0YXRlKiBleGVjKQogCiAgICAgICAgIC8vIFRlbGwgdGhlIHRpbWVy IHRvIGFsYXJtIHVzIGFnYWluIHdoZW4gaXQgdGhpbmtzIHdlJ3ZlIHJlYWNoZWQgdGhlCiAgICAg ICAgIC8vIGVuZCBvZiB0aGUgYWxsb3dlZCB0aW1lLgotICAgICAgICBhdXRvIHJlbWFpbmluZ1Rp bWUgPSBtX2xpbWl0IC0gdG90YWxFbGFwc2VkVGltZTsKLSAgICAgICAgbV9lbGFwc2VkVGltZSA9 IHRvdGFsRWxhcHNlZFRpbWU7Ci0gICAgICAgIG1fc3RhcnRUaW1lID0gY3VycmVudFRpbWU7Ci0g ICAgICAgIHN0YXJ0Q291bnRkb3duKHJlbWFpbmluZ1RpbWUpOworICAgICAgICBhdXRvIHJlbWFp bmluZ0NQVVRpbWUgPSBtX3RpbWVvdXRQZXJpb2QgLSB0b3RhbEVsYXBzZWRDUFVUaW1lOworICAg ICAgICBtX2VsYXBzZWRDUFVUaW1lID0gdG90YWxFbGFwc2VkQ1BVVGltZTsKKyAgICAgICAgbV9z dGFydENQVVRpbWUgPSBjdXJyZW50VGltZTsKKyAgICAgICAgc3RhcnRDb3VudGRvd24ocmVtYWlu aW5nQ1BVVGltZSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTMyLDcgKzEzMiw3 IEBAIGJvb2wgV2F0Y2hkb2c6OmRpZEZpcmUoRXhlY1N0YXRlKiBleGVjKQogCiBib29sIFdhdGNo ZG9nOjppc0VuYWJsZWQoKQogewotICAgIHJldHVybiAobV9saW1pdCAhPSBOT19MSU1JVCk7Cisg ICAgcmV0dXJuIChtX3RpbWVvdXRQZXJpb2QgIT0gTk9fTElNSVQpOwogfQogCiB2b2lkIFdhdGNo ZG9nOjpmaXJlKCkKQEAgLTE2NCw5ICsxNjQsOSBAQCB2b2lkIFdhdGNoZG9nOjpzdGFydENvdW50 ZG93bklmTmVlZGVkKCkKICAgICAgICAgcmV0dXJuOyAvLyBOb3QgZXhlY3V0aW5nIEpTIHNjcmlw dC4gTm8gbmVlZCB0byBzdGFydC4KIAogICAgIGlmIChpc0VuYWJsZWQoKSkgewotICAgICAgICBt X2VsYXBzZWRUaW1lID0gc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kczo6emVybygpOwotICAgICAg ICBtX3N0YXJ0VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7Ci0gICAgICAgIHN0YXJ0Q291bnRkb3du KG1fbGltaXQpOworICAgICAgICBtX2VsYXBzZWRDUFVUaW1lID0gc3RkOjpjaHJvbm86Om1pY3Jv c2Vjb25kczo6emVybygpOworICAgICAgICBtX3N0YXJ0Q1BVVGltZSA9IGN1cnJlbnRDUFVUaW1l KCk7CisgICAgICAgIHN0YXJ0Q291bnRkb3duKG1fdGltZW91dFBlcmlvZCk7CiAgICAgfQogfQog CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XYXRjaGRvZy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmgJKHJldmlzaW9u IDE4ODE0NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmgJKHdv cmtpbmcgY29weSkKQEAgLTgyLDkgKzgyLDkgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdGltZXJE aWRGaXJlOwogICAgIGJvb2wgbV9kaWRGaXJlOwogCi0gICAgc3RkOjpjaHJvbm86Om1pY3Jvc2Vj b25kcyBtX2xpbWl0OwotICAgIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMgbV9zdGFydFRpbWU7 Ci0gICAgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyBtX2VsYXBzZWRUaW1lOworICAgIHN0ZDo6 Y2hyb25vOjptaWNyb3NlY29uZHMgbV90aW1lb3V0UGVyaW9kOworICAgIHN0ZDo6Y2hyb25vOjpt aWNyb3NlY29uZHMgbV9zdGFydENQVVRpbWU7CisgICAgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25k cyBtX2VsYXBzZWRDUFVUaW1lOwogCiAgICAgaW50IG1fcmVlbnRyeUNvdW50OwogICAgIGJvb2wg bV9pc1N0b3BwZWQ7Cg==