171896 2017-05-09 16:24:24 -0700 Unindent some code in Watchdog::shouldTerminate(). 2017-05-09 17:03:15 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam buildbot commit-queue keith_miller msaboff saam oldest_to_newest 1306662 0 mark.lam 2017-05-09 16:24:24 -0700 I should have done this before I landed r213107, but I forgot. Unindenting it now. 1306665 1 309560 mark.lam 2017-05-09 16:28:38 -0700 Created attachment 309560 patch for landing. rs=Keith Miller 1306676 2 309560 commit-queue 2017-05-09 17:03:14 -0700 Comment on attachment 309560 patch for landing. Clearing flags on attachment: 309560 Committed r216558: <http://trac.webkit.org/changeset/216558> 1306677 3 commit-queue 2017-05-09 17:03:15 -0700 All reviewed patches have been landed. Closing bug. 309560 2017-05-09 16:28:38 -0700 2017-05-09 17:03:14 -0700 patch for landing. bug-171896.patch text/plain 4211 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjE2NTU2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDE3LTA1LTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV bmluZGVudCBzb21lIGNvZGUgaW4gV2F0Y2hkb2c6OnNob3VsZFRlcm1pbmF0ZSgpLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxODk2CisKKyAgICAg ICAgUnViYmVyIHN0YW1wZWQgYnkgS2VpdGggTWlsbGVyLgorCisgICAgICAgIEkgc2hvdWxkIGhh dmUgZG9uZSB0aGlzIGJlZm9yZSBJIGxhbmRlZCByMjEzMTA3LCBidXQgSSBmb3Jnb3QuICBVbmlu ZGVudGluZyBpdCBub3cuCisKKyAgICAgICAgKiBydW50aW1lL1dhdGNoZG9nLmNwcDoKKyAgICAg ICAgKEpTQzo6V2F0Y2hkb2c6OnNob3VsZFRlcm1pbmF0ZSk6CisKIDIwMTctMDUtMDkgIE1pY2hh ZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2FwIHRoZSBudW1iZXIg b2YgRlRMIGNvbXBpbGF0aW9uIHRocmVhZHMgb24gaU9TIHRvIDIKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9XYXRjaGRvZy5jcHAJKHJldmlzaW9uIDIxNjU1NSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dhdGNoZG9nLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNjksMjEgKzY5LDE4IEBAIHZvaWQgV2F0Y2hkb2c6OnNldFRpbWVMaW1pdChzdGQ6OmNocm9u bzoKIGJvb2wgV2F0Y2hkb2c6OnNob3VsZFRlcm1pbmF0ZShFeGVjU3RhdGUqIGV4ZWMpCiB7CiAg ICAgQVNTRVJUKG1fdm0tPmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdBUElMb2NrKCkpOwotICAgIC8v IEZJWE1FOiBXaWxsIHVuaW5kZW50IHRoZSBmb2xsb3dpbmcgYmVmb3JlIGxhbmRpbmcuIExlYXZp bmcgaW5kZW50ZWQgZm9yIG5vdyB0byBtaW5pbWl6ZSB0aGUgY29kZSBkaWZmLgotICAgIHsKLSAg ICAgICAgaWYgKGN1cnJlbnRXYWxsQ2xvY2tUaW1lKCkgPCBtX3dhbGxDbG9ja0RlYWRsaW5lKQot ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBKdXN0IGEgc3RhbGUgdGltZXIgZmlyaW5nLiBO b3RoaW5nIHRvIGRvLgotCi0gICAgICAgIC8vIFNldCBtX3dhbGxDbG9ja0RlYWRsaW5lIHRvIG5v VGltZUxpbWl0IGhlcmUgc28gdGhhdCB3ZSBjYW4gcmVqZWN0IGFsbCBmdXR1cmUKLSAgICAgICAg Ly8gc3B1cmlvdXMgd2FrZXMuCi0gICAgICAgIG1fd2FsbENsb2NrRGVhZGxpbmUgPSBub1RpbWVM aW1pdDsKLQotICAgICAgICBhdXRvIGNwdVRpbWUgPSBjdXJyZW50Q1BVVGltZSgpOwotICAgICAg ICBpZiAoY3B1VGltZSA8IG1fY3B1RGVhZGxpbmUpIHsKLSAgICAgICAgICAgIGF1dG8gcmVtYWlu aW5nQ1BVVGltZSA9IG1fY3B1RGVhZGxpbmUgLSBjcHVUaW1lOwotICAgICAgICAgICAgc3RhcnRU aW1lcihyZW1haW5pbmdDUFVUaW1lKTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAg ICAgfQorICAgIGlmIChjdXJyZW50V2FsbENsb2NrVGltZSgpIDwgbV93YWxsQ2xvY2tEZWFkbGlu ZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBKdXN0IGEgc3RhbGUgdGltZXIgZmlyaW5nLiBO b3RoaW5nIHRvIGRvLgorCisgICAgLy8gU2V0IG1fd2FsbENsb2NrRGVhZGxpbmUgdG8gbm9UaW1l TGltaXQgaGVyZSBzbyB0aGF0IHdlIGNhbiByZWplY3QgYWxsIGZ1dHVyZQorICAgIC8vIHNwdXJp b3VzIHdha2VzLgorICAgIG1fd2FsbENsb2NrRGVhZGxpbmUgPSBub1RpbWVMaW1pdDsKKworICAg IGF1dG8gY3B1VGltZSA9IGN1cnJlbnRDUFVUaW1lKCk7CisgICAgaWYgKGNwdVRpbWUgPCBtX2Nw dURlYWRsaW5lKSB7CisgICAgICAgIGF1dG8gcmVtYWluaW5nQ1BVVGltZSA9IG1fY3B1RGVhZGxp bmUgLSBjcHVUaW1lOworICAgICAgICBzdGFydFRpbWVyKHJlbWFpbmluZ0NQVVRpbWUpOworICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgLy8gTm90ZTogd2Ugc2hvdWxkIG5vdCBi ZSBob2xkaW5nIHRoZSBsb2NrIHdoaWxlIGNhbGxpbmcgdGhlIGNhbGxiYWNrcy4gVGhlIGNhbGxi YWNrcyBtYXkKQEAgLTk2LDIzICs5MywyMSBAQCBib29sIFdhdGNoZG9nOjpzaG91bGRUZXJtaW5h dGUoRXhlY1N0YXRlCiAgICAgaWYgKG5lZWRzVGVybWluYXRpb24pCiAgICAgICAgIHJldHVybiB0 cnVlOwogCi0gICAgLy8gRklYTUU6IFdpbGwgdW5pbmRlbnQgdGhlIGZvbGxvd2luZyBiZWZvcmUg bGFuZGluZy4gTGVhdmluZyBpbmRlbnRlZCBmb3Igbm93IHRvIG1pbmltaXplIHRoZSBjb2RlIGRp ZmYuCi0gICAgewotICAgICAgICAvLyBJZiB3ZSBnZXQgaGVyZSwgdGhlbiB0aGUgY2FsbGJhY2sg YWJvdmUgZGlkIG5vdCB3YW50IHRvIHRlcm1pbmF0ZSBleGVjdXRpb24uIEFzIGEKLSAgICAgICAg Ly8gcmVzdWx0LCB0aGUgY2FsbGJhY2sgbWF5IGhhdmUgZG9uZSBvbmUgb2YgdGhlIGZvbGxvd2lu ZzoKLSAgICAgICAgLy8gICAxLiBjbGVhcmVkIHRoZSB0aW1lIGxpbWl0IChpLmUuIHdhdGNoZG9n IGlzIGRpc2FibGVkKSwKLSAgICAgICAgLy8gICAyLiBzZXQgYSBuZXcgdGltZSBsaW1pdCB2aWEg V2F0Y2hkb2c6OnNldFRpbWVMaW1pdCgpLCBvcgotICAgICAgICAvLyAgIDMuIGRpZCBub3RoaW5n IChpLmUuIGFsbG93IGFub3RoZXIgY3ljbGUgb2YgdGhlIGN1cnJlbnQgdGltZSBsaW1pdCkuCi0g ICAgICAgIC8vCi0gICAgICAgIC8vIEluIHRoZSBjYXNlIG9mIDEsIHdlIGRvbid0IGhhdmUgdG8g ZG8gYW55dGhpbmcuCi0gICAgICAgIC8vIEluIHRoZSBjYXNlIG9mIDIsIFdhdGNoZG9nOjpzZXRU aW1lTGltaXQoKSB3b3VsZCBhbHJlYWR5IGhhdmUgc3RhcnRlZCB0aGUgdGltZXIuCi0gICAgICAg IC8vIEluIHRoZSBjYXNlIG9mIDMsIHdlIG5lZWQgdG8gcmUtc3RhcnQgdGhlIHRpbWVyIGhlcmUu Ci0KLSAgICAgICAgQVNTRVJUKG1faGFzRW50ZXJlZFZNKTsKLSAgICAgICAgYm9vbCBjYWxsYmFj a0FscmVhZHlTdGFydGVkVGltZXIgPSAobV9jcHVEZWFkbGluZSAhPSBub1RpbWVMaW1pdCk7Ci0g ICAgICAgIGlmIChoYXNUaW1lTGltaXQoKSAmJiAhY2FsbGJhY2tBbHJlYWR5U3RhcnRlZFRpbWVy KQotICAgICAgICAgICAgc3RhcnRUaW1lcihtX3RpbWVMaW1pdCk7Ci0gICAgfQorICAgIC8vIElm IHdlIGdldCBoZXJlLCB0aGVuIHRoZSBjYWxsYmFjayBhYm92ZSBkaWQgbm90IHdhbnQgdG8gdGVy bWluYXRlIGV4ZWN1dGlvbi4gQXMgYQorICAgIC8vIHJlc3VsdCwgdGhlIGNhbGxiYWNrIG1heSBo YXZlIGRvbmUgb25lIG9mIHRoZSBmb2xsb3dpbmc6CisgICAgLy8gICAxLiBjbGVhcmVkIHRoZSB0 aW1lIGxpbWl0IChpLmUuIHdhdGNoZG9nIGlzIGRpc2FibGVkKSwKKyAgICAvLyAgIDIuIHNldCBh IG5ldyB0aW1lIGxpbWl0IHZpYSBXYXRjaGRvZzo6c2V0VGltZUxpbWl0KCksIG9yCisgICAgLy8g ICAzLiBkaWQgbm90aGluZyAoaS5lLiBhbGxvdyBhbm90aGVyIGN5Y2xlIG9mIHRoZSBjdXJyZW50 IHRpbWUgbGltaXQpLgorICAgIC8vCisgICAgLy8gSW4gdGhlIGNhc2Ugb2YgMSwgd2UgZG9uJ3Qg aGF2ZSB0byBkbyBhbnl0aGluZy4KKyAgICAvLyBJbiB0aGUgY2FzZSBvZiAyLCBXYXRjaGRvZzo6 c2V0VGltZUxpbWl0KCkgd291bGQgYWxyZWFkeSBoYXZlIHN0YXJ0ZWQgdGhlIHRpbWVyLgorICAg IC8vIEluIHRoZSBjYXNlIG9mIDMsIHdlIG5lZWQgdG8gcmUtc3RhcnQgdGhlIHRpbWVyIGhlcmUu CisKKyAgICBBU1NFUlQobV9oYXNFbnRlcmVkVk0pOworICAgIGJvb2wgY2FsbGJhY2tBbHJlYWR5 U3RhcnRlZFRpbWVyID0gKG1fY3B1RGVhZGxpbmUgIT0gbm9UaW1lTGltaXQpOworICAgIGlmICho YXNUaW1lTGltaXQoKSAmJiAhY2FsbGJhY2tBbHJlYWR5U3RhcnRlZFRpbWVyKQorICAgICAgICBz dGFydFRpbWVyKG1fdGltZUxpbWl0KTsKKwogICAgIHJldHVybiBmYWxzZTsKIH0KIAo=