16085 2007-11-21 12:12:19 -0800 Web Inspector's Network Timeline graph code clean up and misc. fixes 2007-11-21 15:40:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Minor --- 1 timothy timothy oldest_to_newest 61941 0 timothy 2007-11-21 12:12:19 -0800 The Network Timeline graph code has a couple of problems. - It defines a few global functions that should be nested or hanging off another object/prototype. - It recomputes the segment percentages twice, once for the main pill and another time for the reflection. - Sometimes the percentages will round down so the total is below 100%. (We already account for a total greater than 100%.) - The pill shadow is drawn with a stoke on a pixel boundary, to achieve a blurry line. We should use the canvas shadow drawing properties. 61942 1 17434 timothy 2007-11-21 12:18:50 -0800 Created attachment 17434 Patch 61943 2 timothy 2007-11-21 12:20:02 -0800 This patch also removes un-needed save/restore calls. 61951 3 17434 aroben 2007-11-21 15:04:55 -0800 Comment on attachment 17434 Patch r=me 61952 4 timothy 2007-11-21 15:40:45 -0800 Landed in r27943. http://trac.webkit.org/projects/webkit/changeset/27943 17434 2007-11-21 12:18:50 -0800 2007-11-21 15:04:55 -0800 Patch 16085.patch text/plain 15682 timothy SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI3OTQy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDctMTEt MjEgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAxNjA4NTogV2ViIEluc3BlY3Rv cidzIE5ldHdvcmsgVGltZWxpbmUgZ3JhcGggY29kZSBjbGVhbiB1cCBhbmQgbWlzYy4gZml4ZXMK KyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwODUKKyAg ICAgICAgCisgICAgICAgIENoYW5nZXMgaW5jbHVkZToKKyAgICAgICAgLSBSZWZhY3RvciB0aGUg ZHJhd2luZyBjb2RlIGFzIG5lc3RlZCBmdW5jdGlvbnMgaW5zdGVhZCBvZiBnbG9iYWwgZnVuY3Rp b25zLgorICAgICAgICAtIENvbXB1dGUgdGhlIHNlZ21lbnQgcGVyY2VudGFnZXMgb25seSBvbmNl IHBlciBjYWxsIHRvIGRyYXdTdW1tYXJ5R3JhcGguCisgICAgICAgIC0gQWNjb3VudCBmb3IgcGVy Y2VudGFnZXMgdGhhdCByb3VuZGVkIGRvd24gdG8gdG90YWwgbGVzcy10aGFuIDEwMCUuCisgICAg ICAgIC0gRHJhdyB0aGUgcGlsbCBzaGFkb3cgYmV0dGVyIHVzaW5nIHRoZSBjYW52YXMgc2hhZG93 IGRyYXdpbmcgcHJvcGVydGllcy4KKworICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL05ldHdvcmtQ YW5lbC5qczoKKwogMjAwNy0xMS0yMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IHBhZ2UvaW5zcGVj dG9yL05ldHdvcmtQYW5lbC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwYWdlL2luc3BlY3Rvci9OZXR3b3Jr UGFuZWwuanMJKHJldmlzaW9uIDI3OTQwKQorKysgcGFnZS9pbnNwZWN0b3IvTmV0d29ya1BhbmVs LmpzCSh3b3JraW5nIGNvcHkpCkBAIC0zNDAsNTkgKzM0MCwyMzggQEAgV2ViSW5zcGVjdG9yLk5l dHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLnRpbWVsaW5lRW50cmll c1tpXS5yZWZyZXNoKHNraXBCb3VuZHJ5VXBkYXRlLCBza2lwVGltZWxpbmVTb3J0LCBpbW1lZGlh dGUpOwogICAgIH0sCiAKLSAgICBkcmF3U3dhdGNoOiBmdW5jdGlvbihjYW52YXMsIGNvbG9yKSB7 Ci0gICAgICAgIHZhciBjdHggPSBjYW52YXMuZ2V0Q29udGV4dCgnMmQnKTsKLQorICAgIGZhZGVP dXRSZWN0OiBmdW5jdGlvbihjdHgsIHgsIHksIHcsIGgsIGExLCBhMikKKyAgICB7CiAgICAgICAg IGN0eC5zYXZlKCk7CiAKLSAgICAgICAgZHJhd1N3YXRjaFNxdWFyZShjdHgsIGNvbG9yKTsKKyAg ICAgICAgdmFyIGdyYWRpZW50ID0gY3R4LmNyZWF0ZUxpbmVhckdyYWRpZW50KHgsIHksIHgsIHkg KyBoKTsKKyAgICAgICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAuMCwgInJnYmEoMCwgMCwgMCwg IiArICgxLjAgLSBhMSkgKyAiKSIpOworICAgICAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMC44 LCAicmdiYSgwLCAwLCAwLCAiICsgKDEuMCAtIGEyKSArICIpIik7CisgICAgICAgIGdyYWRpZW50 LmFkZENvbG9yU3RvcCgxLjAsICJyZ2JhKDAsIDAsIDAsIDEuMCkiKTsKKworICAgICAgICBjdHgu Z2xvYmFsQ29tcG9zaXRlT3BlcmF0aW9uID0gImRlc3RpbmF0aW9uLW91dCI7CisKKyAgICAgICAg Y3R4LmZpbGxTdHlsZSA9IGdyYWRpZW50OworICAgICAgICBjdHguZmlsbFJlY3QoeCwgeSwgdywg aCk7CisKKyAgICAgICAgY3R4LnJlc3RvcmUoKTsKKyAgICB9LAorCisgICAgZHJhd1N3YXRjaDog ZnVuY3Rpb24oY2FudmFzLCBjb2xvcikKKyAgICB7CisgICAgICAgIHZhciBjdHggPSBjYW52YXMu Z2V0Q29udGV4dCgiMmQiKTsKKworICAgICAgICBmdW5jdGlvbiBkcmF3U3dhdGNoU3F1YXJlKCkg eworICAgICAgICAgICAgY3R4LmZpbGxTdHlsZSA9IGNvbG9yOworICAgICAgICAgICAgY3R4LmZp bGxSZWN0KDAsIDAsIDEzLCAxMyk7CisKKyAgICAgICAgICAgIHZhciBncmFkaWVudCA9IGN0eC5j cmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCAxMywgMTMpOworICAgICAgICAgICAgZ3JhZGllbnQu YWRkQ29sb3JTdG9wKDAuMCwgInJnYmEoMjU1LCAyNTUsIDI1NSwgMC4yKSIpOworICAgICAgICAg ICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDEuMCwgInJnYmEoMjU1LCAyNTUsIDI1NSwgMC4wKSIp OworCisgICAgICAgICAgICBjdHguZmlsbFN0eWxlID0gZ3JhZGllbnQ7CisgICAgICAgICAgICBj dHguZmlsbFJlY3QoMCwgMCwgMTMsIDEzKTsKKworICAgICAgICAgICAgZ3JhZGllbnQgPSBjdHgu Y3JlYXRlTGluZWFyR3JhZGllbnQoMTMsIDEzLCAwLCAwKTsKKyAgICAgICAgICAgIGdyYWRpZW50 LmFkZENvbG9yU3RvcCgwLjAsICJyZ2JhKDAsIDAsIDAsIDAuMikiKTsKKyAgICAgICAgICAgIGdy YWRpZW50LmFkZENvbG9yU3RvcCgxLjAsICJyZ2JhKDAsIDAsIDAsIDAuMCkiKTsKKworICAgICAg ICAgICAgY3R4LmZpbGxTdHlsZSA9IGdyYWRpZW50OworICAgICAgICAgICAgY3R4LmZpbGxSZWN0 KDAsIDAsIDEzLCAxMyk7CisKKyAgICAgICAgICAgIGN0eC5zdHJva2VTdHlsZSA9ICJyZ2JhKDAs IDAsIDAsIDAuNikiOworICAgICAgICAgICAgY3R4LnN0cm9rZVJlY3QoMC41LCAwLjUsIDEyLCAx Mik7CisgICAgICAgIH0KKworICAgICAgICBjdHguY2xlYXJSZWN0KDAsIDAsIDEzLCAyNCk7CisK KyAgICAgICAgZHJhd1N3YXRjaFNxdWFyZSgpOwogCiAgICAgICAgIGN0eC5zYXZlKCk7CiAKLSAg ICAgICAgY3R4LnRyYW5zbGF0ZSgwLCAoMTMgKiAyKSAtIDEpOworICAgICAgICBjdHgudHJhbnNs YXRlKDAsIDI1KTsKICAgICAgICAgY3R4LnNjYWxlKDEsIC0xKTsKIAotICAgICAgICBkcmF3U3dh dGNoU3F1YXJlKGN0eCwgY29sb3IpOworICAgICAgICBkcmF3U3dhdGNoU3F1YXJlKCk7CiAKICAg ICAgICAgY3R4LnJlc3RvcmUoKTsKIAotICAgICAgICBmYWRlT3V0UmVjdChjdHgsIDAsIDAgKyAx MywgMTMsIDEzLCAwLjUsIDAuMCk7Ci0KLSAgICAgICAgY3R4LnJlc3RvcmUoKTsKKyAgICAgICAg dGhpcy5mYWRlT3V0UmVjdChjdHgsIDAsIDEzLCAxMywgMTMsIDAuNSwgMC4wKTsKICAgICB9LAog Ci0gICAgZHJhd1N1bW1hcnlHcmFwaDogZnVuY3Rpb24oc2VnbWVudHMpIHsKKyAgICBkcmF3U3Vt bWFyeUdyYXBoOiBmdW5jdGlvbihzZWdtZW50cykKKyAgICB7CiAgICAgICAgIGlmICghdGhpcy5z dW1tYXJ5R3JhcGhFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBj dHggPSB0aGlzLnN1bW1hcnlHcmFwaEVsZW1lbnQuZ2V0Q29udGV4dCgnMmQnKTsKKyAgICAgICAg aWYgKCFzZWdtZW50cyB8fCAhc2VnbWVudHMubGVuZ3RoKQorICAgICAgICAgICAgc2VnbWVudHMg PSBbe2NvbG9yOiAid2hpdGUiLCB2YWx1ZTogMX1dOworCisgICAgICAgIC8vIENhbGN1bGF0ZSB0 aGUgdG90YWwgb2YgYWxsIHNlZ21lbnRzLgorICAgICAgICB2YXIgdG90YWwgPSAwOworICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHNlZ21lbnRzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAg dG90YWwgKz0gc2VnbWVudHNbaV0udmFsdWU7CisKKyAgICAgICAgLy8gQ2FsY3VsYXRlIHRoZSBw ZXJjZW50YWdlIG9mIGVhY2ggc2VnbWVudCwgcm91bmRlZCB0byB0aGUgbmVhcmVzdCBwZXJjZW50 LgorICAgICAgICB2YXIgcGVyY2VudHMgPSBzZWdtZW50cy5tYXAoZnVuY3Rpb24ocykgeyByZXR1 cm4gTWF0aC5tYXgoTWF0aC5yb3VuZCgxMDAgKiBzLnZhbHVlIC8gdG90YWwpLCAxKSB9KTsKKwor ICAgICAgICAvLyBDYWxjdWxhdGUgdGhlIHRvdGFsIHBlcmNlbnRhZ2UuCisgICAgICAgIHZhciBw ZXJjZW50VG90YWwgPSAwOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBlcmNlbnRzLmxl bmd0aDsgKytpKQorICAgICAgICAgICAgcGVyY2VudFRvdGFsICs9IHBlcmNlbnRzW2ldOworCisg ICAgICAgIC8vIE1ha2Ugc3VyZSBvdXIgcGVyY2VudGFnZSB0b3RhbCBpcyBub3QgZ3JlYXRlci10 aGFuIDEwMCwgaXQgY2FuIGJlIGdyZWF0ZXIKKyAgICAgICAgLy8gaWYgd2Ugcm91bmRlZCB1cCBm b3IgYSBmZXcgc2VnbWVudHMuCisgICAgICAgIHdoaWxlIChwZXJjZW50VG90YWwgPiAxMDApIHsK KyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGVyY2VudHMubGVuZ3RoICYmIHBlcmNl bnRUb3RhbCA+IDEwMDsgKytpKSB7CisgICAgICAgICAgICAgICAgaWYgKHBlcmNlbnRzW2ldID4g MSkgeworICAgICAgICAgICAgICAgICAgICAtLXBlcmNlbnRzW2ldOworICAgICAgICAgICAgICAg ICAgICAtLXBlcmNlbnRUb3RhbDsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKworICAgICAgICAvLyBNYWtlIHN1cmUgb3VyIHBlcmNlbnRhZ2UgdG90YWwgaXMg bm90IGxlc3MtdGhhbiAxMDAsIGl0IGNhbiBiZSBsZXNzCisgICAgICAgIC8vIGlmIHdlIHJvdW5k ZWQgZG93biBmb3IgYSBmZXcgc2VnbWVudHMuCisgICAgICAgIHdoaWxlIChwZXJjZW50VG90YWwg PCAxMDApIHsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGVyY2VudHMubGVuZ3Ro ICYmIHBlcmNlbnRUb3RhbCA8IDEwMDsgKytpKSB7CisgICAgICAgICAgICAgICAgKytwZXJjZW50 c1tpXTsKKyAgICAgICAgICAgICAgICArK3BlcmNlbnRUb3RhbDsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorCisgICAgICAgIHZhciBjdHggPSB0aGlzLnN1bW1hcnlHcmFwaEVsZW1lbnQuZ2V0 Q29udGV4dCgiMmQiKTsKKwogICAgICAgICB2YXIgeCA9IDA7CiAgICAgICAgIHZhciB5ID0gMDsK LSAgICAgICAgdmFyIHdpZHRoID0gNDUwOwotICAgICAgICB2YXIgaGVpZ2h0ID0gMTk7CisgICAg ICAgIHZhciB3ID0gNDUwOworICAgICAgICB2YXIgaCA9IDE5OworICAgICAgICB2YXIgciA9ICho IC8gMik7CiAKLSAgICAgICAgaWYgKCFzZWdtZW50cyB8fCAhc2VnbWVudHMubGVuZ3RoKQotICAg ICAgICAgICAgc2VnbWVudHMgPSBbe2NvbG9yOiAid2hpdGUiLCB2YWx1ZTogMX1dOworICAgICAg ICBmdW5jdGlvbiBkcmF3UGlsbFNoYWRvdygpCisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIFRo aXMgZHJhd3MgYSBsaW5lIHdpdGggYSBzaGFkb3cgdGhhdCBpcyBvZmZzZXQgYXdheSBmcm9tIHRo ZSBsaW5lLiBUaGUgbGluZSBpcyBzdHJva2VkCisgICAgICAgICAgICAvLyB0d2ljZSB3aXRoIGRp ZmZlcmVudCBYIHNoYWRvdyBvZmZzZXRzIHRvIGdpdmUgbW9yZSBmZWF0aGVyZWQgZWRnZXMuIExh dGVyIHdlIGVyYXNlIHRoZQorICAgICAgICAgICAgLy8gbGluZSB3aXRoIGRlc3RpbmF0aW9uLW91 dCAxMDAlIHRyYW5zcGFyZW50IGJsYWNrLCBsZWF2aW5nIG9ubHkgdGhlIHNoYWRvdy4gVGhpcyBv bmx5CisgICAgICAgICAgICAvLyB3b3JrcyBpZiBub3RoaW5nIGhhcyBiZWVuIGRyYXduIGludG8g dGhlIGNhbnZhcyB5ZXQuCiAKLSAgICAgICAgY3R4LnNhdmUoKTsKKyAgICAgICAgICAgIGN0eC5i ZWdpblBhdGgoKTsKKyAgICAgICAgICAgIGN0eC5tb3ZlVG8oeCArIDQsIHkgKyBoIC0gMyAtIDAu NSk7CisgICAgICAgICAgICBjdHgubGluZVRvKHggKyB3IC0gNCwgeSArIGggLSAzIC0gMC41KTsK KyAgICAgICAgICAgIGN0eC5jbG9zZVBhdGgoKTsKKworICAgICAgICAgICAgY3R4LnNhdmUoKTsK KworICAgICAgICAgICAgY3R4LnNoYWRvd0JsdXIgPSAyOworICAgICAgICAgICAgY3R4LnNoYWRv d0NvbG9yID0gInJnYmEoMCwgMCwgMCwgMC41KSI7CisgICAgICAgICAgICBjdHguc2hhZG93T2Zm c2V0WCA9IDM7CisgICAgICAgICAgICBjdHguc2hhZG93T2Zmc2V0WSA9IDU7CisKKyAgICAgICAg ICAgIGN0eC5zdHJva2VTdHlsZSA9ICJ3aGl0ZSI7CisgICAgICAgICAgICBjdHgubGluZVdpZHRo ID0gMTsKIAotICAgICAgICBjdHguY2xlYXJSZWN0KHgsIHksIHdpZHRoLCAoaGVpZ2h0ICogMikp OworICAgICAgICAgICAgY3R4LnN0cm9rZSgpOwogCi0gICAgICAgIGRyYXdTaGFkb3dMaW5lKGN0 eCwgeCwgeSArIGhlaWdodCwgd2lkdGgsIDIpOwotICAgICAgICBkcmF3UGlsbChjdHgsIHgsIHks IHdpZHRoLCBoZWlnaHQsIGhlaWdodCAvIDIsIHNlZ21lbnRzKTsKKyAgICAgICAgICAgIGN0eC5z aGFkb3dPZmZzZXRYID0gLTM7CisKKyAgICAgICAgICAgIGN0eC5zdHJva2UoKTsKKworICAgICAg ICAgICAgY3R4LnJlc3RvcmUoKTsKKworICAgICAgICAgICAgY3R4LnNhdmUoKTsKKworICAgICAg ICAgICAgY3R4Lmdsb2JhbENvbXBvc2l0ZU9wZXJhdGlvbiA9ICJkZXN0aW5hdGlvbi1vdXQiOwor ICAgICAgICAgICAgY3R4LnN0cm9rZVN0eWxlID0gInJnYmEoMCwgMCwgMCwgMSkiOworICAgICAg ICAgICAgY3R4LmxpbmVXaWR0aCA9IDE7CisKKyAgICAgICAgICAgIGN0eC5zdHJva2UoKTsKKwor ICAgICAgICAgICAgY3R4LnJlc3RvcmUoKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9u IGRyYXdQaWxsKCkKKyAgICAgICAgeworICAgICAgICAgICAgLy8gTWFrZSBhIHJvdW5kZWQgcmVj dCBwYXRoLgorICAgICAgICAgICAgY3R4LmJlZ2luUGF0aCgpOworICAgICAgICAgICAgY3R4Lm1v dmVUbyh4LCB5ICsgcik7CisgICAgICAgICAgICBjdHgubGluZVRvKHgsIHkgKyBoIC0gcik7Cisg ICAgICAgICAgICBjdHgucXVhZHJhdGljQ3VydmVUbyh4LCB5ICsgaCwgeCArIHIsIHkgKyBoKTsK KyAgICAgICAgICAgIGN0eC5saW5lVG8oeCArIHcgLSByLCB5ICsgaCk7CisgICAgICAgICAgICBj dHgucXVhZHJhdGljQ3VydmVUbyh4ICsgdywgeSArIGgsIHggKyB3LCB5ICsgaCAtIHIpOworICAg ICAgICAgICAgY3R4LmxpbmVUbyh4ICsgdywgeSArIHIpOworICAgICAgICAgICAgY3R4LnF1YWRy YXRpY0N1cnZlVG8oeCArIHcsIHksIHggKyB3IC0gciwgeSk7CisgICAgICAgICAgICBjdHgubGlu ZVRvKHggKyByLCB5KTsKKyAgICAgICAgICAgIGN0eC5xdWFkcmF0aWNDdXJ2ZVRvKHgsIHksIHgs IHkgKyByKTsKKyAgICAgICAgICAgIGN0eC5jbG9zZVBhdGgoKTsKKworICAgICAgICAgICAgLy8g Q2xpcCB0byB0aGUgcm91bmRlZCByZWN0IHBhdGguCisgICAgICAgICAgICBjdHguc2F2ZSgpOwor ICAgICAgICAgICAgY3R4LmNsaXAoKTsKKworICAgICAgICAgICAgLy8gRmlsbCB0aGUgc2VnbWVu dHMgd2l0aCB0aGUgYXNzb2NpYXRlZCBjb2xvci4KKyAgICAgICAgICAgIHZhciBwcmV2aW91c1Nl Z21lbnRzV2lkdGggPSAwOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzZWdtZW50 cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIHZhciBzZWdtZW50V2lkdGggPSBNYXRo LnJvdW5kKHcgKiBwZXJjZW50c1tpXSAvIDEwMCk7CisgICAgICAgICAgICAgICAgY3R4LmZpbGxT dHlsZSA9IHNlZ21lbnRzW2ldLmNvbG9yOworICAgICAgICAgICAgICAgIGN0eC5maWxsUmVjdCh4 ICsgcHJldmlvdXNTZWdtZW50c1dpZHRoLCB5LCBzZWdtZW50V2lkdGgsIGgpOworICAgICAgICAg ICAgICAgIHByZXZpb3VzU2VnbWVudHNXaWR0aCArPSBzZWdtZW50V2lkdGg7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIC8vIERyYXcgdGhlIHNlZ21lbnQgZGl2aWRlciBsaW5lcy4KKyAg ICAgICAgICAgIGN0eC5saW5lV2lkdGggPSAxOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDE7 IGkgPCAyMDsgKytpKSB7CisgICAgICAgICAgICAgICAgY3R4LmJlZ2luUGF0aCgpOworICAgICAg ICAgICAgICAgIGN0eC5tb3ZlVG8oeCArIChpICogTWF0aC5yb3VuZCh3IC8gMjApKSArIDAuNSwg eSk7CisgICAgICAgICAgICAgICAgY3R4LmxpbmVUbyh4ICsgKGkgKiBNYXRoLnJvdW5kKHcgLyAy MCkpICsgMC41LCB5ICsgaCk7CisgICAgICAgICAgICAgICAgY3R4LmNsb3NlUGF0aCgpOworCisg ICAgICAgICAgICAgICAgY3R4LnN0cm9rZVN0eWxlID0gInJnYmEoMCwgMCwgMCwgMC4yKSI7Cisg ICAgICAgICAgICAgICAgY3R4LnN0cm9rZSgpOworCisgICAgICAgICAgICAgICAgY3R4LmJlZ2lu UGF0aCgpOworICAgICAgICAgICAgICAgIGN0eC5tb3ZlVG8oeCArIChpICogTWF0aC5yb3VuZCh3 IC8gMjApKSArIDEuNSwgeSk7CisgICAgICAgICAgICAgICAgY3R4LmxpbmVUbyh4ICsgKGkgKiBN YXRoLnJvdW5kKHcgLyAyMCkpICsgMS41LCB5ICsgaCk7CisgICAgICAgICAgICAgICAgY3R4LmNs b3NlUGF0aCgpOworCisgICAgICAgICAgICAgICAgY3R4LnN0cm9rZVN0eWxlID0gInJnYmEoMjU1 LCAyNTUsIDI1NSwgMC4yKSI7CisgICAgICAgICAgICAgICAgY3R4LnN0cm9rZSgpOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICAvLyBEcmF3IHRoZSBwaWxsIHNoYWRpbmcuCisgICAgICAg ICAgICB2YXIgbGlnaHRHcmFkaWVudCA9IGN0eC5jcmVhdGVMaW5lYXJHcmFkaWVudCh4LCB5LCB4 LCB5ICsgKGggLyAxLjUpKTsKKyAgICAgICAgICAgIGxpZ2h0R3JhZGllbnQuYWRkQ29sb3JTdG9w KDAuMCwgInJnYmEoMjIwLCAyMjAsIDIyMCwgMC42KSIpOworICAgICAgICAgICAgbGlnaHRHcmFk aWVudC5hZGRDb2xvclN0b3AoMC40LCAicmdiYSgyMjAsIDIyMCwgMjIwLCAwLjIpIik7CisgICAg ICAgICAgICBsaWdodEdyYWRpZW50LmFkZENvbG9yU3RvcCgxLjAsICJyZ2JhKDI1NSwgMjU1LCAy NTUsIDAuMCkiKTsKKworICAgICAgICAgICAgdmFyIGRhcmtHcmFkaWVudCA9IGN0eC5jcmVhdGVM aW5lYXJHcmFkaWVudCh4LCB5ICsgKGggLyAzKSwgeCwgeSArIGgpOworICAgICAgICAgICAgZGFy a0dyYWRpZW50LmFkZENvbG9yU3RvcCgwLjAsICJyZ2JhKDAsIDAsIDAsIDAuMCkiKTsKKyAgICAg ICAgICAgIGRhcmtHcmFkaWVudC5hZGRDb2xvclN0b3AoMC44LCAicmdiYSgwLCAwLCAwLCAwLjIp Iik7CisgICAgICAgICAgICBkYXJrR3JhZGllbnQuYWRkQ29sb3JTdG9wKDEuMCwgInJnYmEoMCwg MCwgMCwgMC41KSIpOworCisgICAgICAgICAgICBjdHguZmlsbFN0eWxlID0gZGFya0dyYWRpZW50 OworICAgICAgICAgICAgY3R4LmZpbGxSZWN0KHgsIHksIHcsIGgpOworCisgICAgICAgICAgICBj dHguZmlsbFN0eWxlID0gbGlnaHRHcmFkaWVudDsKKyAgICAgICAgICAgIGN0eC5maWxsUmVjdCh4 LCB5LCB3LCBoKTsKKworICAgICAgICAgICAgY3R4LnJlc3RvcmUoKTsKKyAgICAgICAgfQorCisg ICAgICAgIGN0eC5jbGVhclJlY3QoeCwgeSwgdywgKGggKiAyKSk7CisKKyAgICAgICAgZHJhd1Bp bGxTaGFkb3coKTsKKyAgICAgICAgZHJhd1BpbGwoKTsKIAogICAgICAgICBjdHguc2F2ZSgpOwog Ci0gICAgICAgIGN0eC50cmFuc2xhdGUoMCwgKGhlaWdodCAqIDIpICsgMSk7CisgICAgICAgIGN0 eC50cmFuc2xhdGUoMCwgKGggKiAyKSArIDEpOwogICAgICAgICBjdHguc2NhbGUoMSwgLTEpOwog Ci0gICAgICAgIGRyYXdQaWxsKGN0eCwgeCwgeSwgd2lkdGgsIGhlaWdodCwgaGVpZ2h0IC8gMiwg c2VnbWVudHMpOworICAgICAgICBkcmF3UGlsbCgpOwogCiAgICAgICAgIGN0eC5yZXN0b3JlKCk7 CiAKLSAgICAgICAgZmFkZU91dFJlY3QoY3R4LCB4LCB5ICsgaGVpZ2h0ICsgMiwgd2lkdGgsIGhl aWdodCwgMC41LCAwLjApOwotCi0gICAgICAgIGN0eC5yZXN0b3JlKCk7CisgICAgICAgIHRoaXMu ZmFkZU91dFJlY3QoY3R4LCB4LCB5ICsgaCArIDEsIHcsIGgsIDAuNSwgMC4wKTsKICAgICB9LAog CiAgICAgdXBkYXRlU3VtbWFyeUdyYXBoU29vbjogZnVuY3Rpb24oKQpAQCAtNTkwLDcgKzc2OSw4 IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVFbnRyeS5wcm90b3QKICAgICAgICAgICAg IHt0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNwb25zZSIpLCBpbmZvOiB0aGlzLnJl c291cmNlLnNvcnRlZFJlc3BvbnNlSGVhZGVyc30KICAgICAgICAgXTsKIAotICAgICAgICBmdW5j dGlvbiBjcmVhdGVTZWN0aW9uVGFibGUoc2VjdGlvbikgeworICAgICAgICBmdW5jdGlvbiBjcmVh dGVTZWN0aW9uVGFibGUoc2VjdGlvbikKKyAgICAgICAgewogICAgICAgICAgICAgaWYgKCFzZWN0 aW9uLmluZm8ubGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNjEyLDYgKzc5 Miw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVFbnRyeS5wcm90b3QKICAgICAgICAg ICAgICAgICByb3cuaW5zZXJ0Q2VsbCgtMSkudGV4dENvbnRlbnQgPSBoZWFkZXIudmFsdWU7CiAg ICAgICAgICAgICB9KTsKICAgICAgICAgfQorCiAgICAgICAgIHNlY3Rpb25zLmZvckVhY2goY3Jl YXRlU2VjdGlvblRhYmxlLCB0aGlzKTsKICAgICB9LAogCkBAIC02OTIsNyArODczLDcgQEAgV2Vi SW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZUVudHJ5LnByb3RvdAogICAgICAgICAgICAgICAgIHRo aXMudGlwQmFsbG9vbkNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CiAgICAgICAgICAgICAgICAgdGhpcy50aXBCYWxsb29uQ29udGVudEVsZW1lbnQuY2xhc3NO YW1lID0gInRpcC1iYWxsb29uLWNvbnRlbnQiOwogICAgICAgICAgICAgICAgIHRoaXMudGlwQmFs bG9vbkVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy50aXBCYWxsb29uQ29udGVudEVsZW1lbnQpOwot ICAgICAgICAgICAgICAgIHZhciB0aXBUZXh0ID0gJyc7CisgICAgICAgICAgICAgICAgdmFyIHRp cFRleHQgPSAiIjsKICAgICAgICAgICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLnJlc291cmNl LnRpcHMpCiAgICAgICAgICAgICAgICAgICAgIHRpcFRleHQgKz0gdGhpcy5yZXNvdXJjZS50aXBz W2lkXS5tZXNzYWdlICsgIlxuIjsKICAgICAgICAgICAgICAgICB0aGlzLnRpcEJhbGxvb25Db250 ZW50RWxlbWVudC50ZXh0Q29udGVudCA9IHRpcFRleHQ7CkBAIC04NDcsMTU2ICsxMDI4LDMgQEAg V2ViSW5zcGVjdG9yLlRyYW5zZmVyU2l6ZUNhbGN1bGF0b3IucHJvdAogfQogCiBXZWJJbnNwZWN0 b3IuVHJhbnNmZXJTaXplQ2FsY3VsYXRvci5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVj dG9yLlRpbWVsaW5lVmFsdWVDYWxjdWxhdG9yLnByb3RvdHlwZTsKLQotZnVuY3Rpb24gbWFrZVJv dW5kZWRSZWN0UGF0aChjdHgsIHgsIHksIHcsIGgsIHIpIHsKLSAgICBjdHguYmVnaW5QYXRoKCk7 Ci0gICAgY3R4Lm1vdmVUbyh4LCB5ICsgcik7Ci0gICAgY3R4LmxpbmVUbyh4LCB5ICsgaCAtIHIp OwotICAgIGN0eC5xdWFkcmF0aWNDdXJ2ZVRvKHgsIHkgKyBoLCB4ICsgciwgeSArIGgpOwotICAg IGN0eC5saW5lVG8oeCArIHcgLSByLCB5ICsgaCk7Ci0gICAgY3R4LnF1YWRyYXRpY0N1cnZlVG8o eCArIHcsIHkgKyBoLCB4ICsgdywgeSArIGggLSByKTsKLSAgICBjdHgubGluZVRvKHggKyB3LCB5 ICsgcik7Ci0gICAgY3R4LnF1YWRyYXRpY0N1cnZlVG8oeCArIHcsIHksIHggKyB3IC0gciwgeSk7 Ci0gICAgY3R4LmxpbmVUbyh4ICsgciwgeSk7Ci0gICAgY3R4LnF1YWRyYXRpY0N1cnZlVG8oeCwg eSwgeCwgeSArIHIpOwotICAgIGN0eC5jbG9zZVBhdGgoKTsKLX0KLQotZnVuY3Rpb24gZHJhd1Bp bGxTaGFkaW5nKGN0eCwgeCwgeSwgdywgaCkgewotICAgIHZhciBsaWdodEdyYWRpZW50ID0gY3R4 LmNyZWF0ZUxpbmVhckdyYWRpZW50KHgsIHksIHgsIHkgKyAoaCAvIDEuNSkpOwotICAgIGxpZ2h0 R3JhZGllbnQuYWRkQ29sb3JTdG9wKDAuMCwgJ3JnYmEoMjIwLCAyMjAsIDIyMCwgMC42KScpOwot ICAgIGxpZ2h0R3JhZGllbnQuYWRkQ29sb3JTdG9wKDAuNCwgJ3JnYmEoMjIwLCAyMjAsIDIyMCwg MC4yKScpOwotICAgIGxpZ2h0R3JhZGllbnQuYWRkQ29sb3JTdG9wKDEuMCwgJ3JnYmEoMjU1LCAy NTUsIDI1NSwgMC4wKScpOwotCi0gICAgdmFyIGRhcmtHcmFkaWVudCA9IGN0eC5jcmVhdGVMaW5l YXJHcmFkaWVudCh4LCB5ICsgKGggLyAzKSwgeCwgeSArIGgpOwotICAgIGRhcmtHcmFkaWVudC5h ZGRDb2xvclN0b3AoMC4wLCAncmdiYSgwLCAwLCAwLCAwLjApJyk7Ci0gICAgZGFya0dyYWRpZW50 LmFkZENvbG9yU3RvcCgwLjgsICdyZ2JhKDAsIDAsIDAsIDAuMiknKTsKLSAgICBkYXJrR3JhZGll bnQuYWRkQ29sb3JTdG9wKDEuMCwgJ3JnYmEoMCwgMCwgMCwgMC41KScpOwotCi0gICAgY3R4LmZp bGxTdHlsZSA9IGRhcmtHcmFkaWVudDsKLSAgICBjdHguZmlsbFJlY3QoeCwgeSwgdywgaCk7Ci0K LSAgICBjdHguZmlsbFN0eWxlID0gbGlnaHRHcmFkaWVudDsKLSAgICBjdHguZmlsbFJlY3QoeCwg eSwgdywgaCk7Ci19Ci0KLWZ1bmN0aW9uIGRyYXdEaXZpZGVyTGluZXMoY3R4LCB4LCB5LCB3LCBo KSB7Ci0gICAgY3R4LnNhdmUoKTsKLQotICAgIGN0eC5saW5lV2lkdGggPSAxOwotCi0gICAgZm9y ICh2YXIgaSA9IDE7IGkgPCAyMDsgKytpKSB7Ci0gICAgICAgIGN0eC5iZWdpblBhdGgoKTsKLSAg ICAgICAgY3R4Lm1vdmVUbyh4ICsgKGkgKiBNYXRoLnJvdW5kKHcgLyAyMCkpICsgMC41LCB5KTsK LSAgICAgICAgY3R4LmxpbmVUbyh4ICsgKGkgKiBNYXRoLnJvdW5kKHcgLyAyMCkpICsgMC41LCB5 ICsgaCk7Ci0gICAgICAgIGN0eC5jbG9zZVBhdGgoKTsKLQotICAgICAgICBjdHguc3Ryb2tlU3R5 bGUgPSAncmdiYSgwLCAwLCAwLCAwLjIpJzsKLSAgICAgICAgY3R4LnN0cm9rZSgpOwotCi0gICAg ICAgIGN0eC5iZWdpblBhdGgoKTsKLSAgICAgICAgY3R4Lm1vdmVUbyh4ICsgKGkgKiBNYXRoLnJv dW5kKHcgLyAyMCkpICsgMS41LCB5KTsKLSAgICAgICAgY3R4LmxpbmVUbyh4ICsgKGkgKiBNYXRo LnJvdW5kKHcgLyAyMCkpICsgMS41LCB5ICsgaCk7Ci0gICAgICAgIGN0eC5jbG9zZVBhdGgoKTsK LQotICAgICAgICBjdHguc3Ryb2tlU3R5bGUgPSAncmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpJzsK LSAgICAgICAgY3R4LnN0cm9rZSgpOwotICAgIH0KLQotICAgIGN0eC5yZXN0b3JlKCk7Ci19Ci0K LWZ1bmN0aW9uIGZhZGVPdXRSZWN0KGN0eCwgeCwgeSwgdywgaCwgYTEsIGEyKSB7Ci0gICAgY3R4 LnNhdmUoKTsKLQotICAgIHZhciBncmFkaWVudCA9IGN0eC5jcmVhdGVMaW5lYXJHcmFkaWVudCh4 LCB5LCB4LCB5ICsgaCk7Ci0gICAgZ3JhZGllbnQuYWRkQ29sb3JTdG9wKDAuMCwgJ3JnYmEoMCwg MCwgMCwgJyArICgxLjAgLSBhMSkgKyAnKScpOwotICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgw LjgsICdyZ2JhKDAsIDAsIDAsICcgKyAoMS4wIC0gYTIpICsgJyknKTsKLSAgICBncmFkaWVudC5h ZGRDb2xvclN0b3AoMS4wLCAncmdiYSgwLCAwLCAwLCAxLjApJyk7Ci0KLSAgICBjdHguZ2xvYmFs Q29tcG9zaXRlT3BlcmF0aW9uID0gJ2Rlc3RpbmF0aW9uLW91dCc7Ci0KLSAgICBjdHguZmlsbFN0 eWxlID0gZ3JhZGllbnQ7Ci0gICAgY3R4LmZpbGxSZWN0KHgsIHksIHcsIGgpOwotCi0gICAgY3R4 LnJlc3RvcmUoKTsKLX0KLQotZnVuY3Rpb24gZHJhd1BpbGxTZWdtZW50cyhjdHgsIHgsIHksIHcs IGgsIHNlZ21lbnRzKSB7Ci0gICAgdmFyIHRvdGFsID0gMDsKLSAgICBmb3IgKHZhciBpID0gMDsg aSA8IHNlZ21lbnRzLmxlbmd0aDsgKytpKQotICAgICAgICB0b3RhbCArPSBzZWdtZW50c1tpXS52 YWx1ZTsKLQotICAgIHZhciBwZXJjZW50cyA9IHNlZ21lbnRzLm1hcChmdW5jdGlvbihzKSB7IHJl dHVybiBNYXRoLm1heChNYXRoLnJvdW5kKDEwMCAqIHMudmFsdWUgLyB0b3RhbCksIDEpIH0pOwot ICAgIHZhciBwZXJjZW50VG90YWwgPSAwOwotICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGVyY2Vu dHMubGVuZ3RoOyArK2kpCi0gICAgICAgIHBlcmNlbnRUb3RhbCArPSBwZXJjZW50c1tpXTsKLQot ICAgIHdoaWxlIChwZXJjZW50VG90YWwgPiAxMDApIHsKLSAgICAgICAgdmFyIGRpZmZlcmVuY2Ug PSBwZXJjZW50VG90YWwgLSAxMDA7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGVyY2Vu dHMubGVuZ3RoICYmIHBlcmNlbnRUb3RhbCA+IDEwMDsgKytpKSB7Ci0gICAgICAgICAgICBpZiAo cGVyY2VudHNbaV0gPiAxKSB7Ci0gICAgICAgICAgICAgICAgLS1wZXJjZW50c1tpXTsKLSAgICAg ICAgICAgICAgICAtLXBlcmNlbnRUb3RhbDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAg IH0KLQotICAgIHZhciBwcmV2aW91c1dpZHRoID0gMDsKLSAgICBmb3IgKHZhciBpID0gMDsgaSA8 IHNlZ21lbnRzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgIHZhciB3aWR0aCA9IE1hdGgucm91bmQo dyAqIHBlcmNlbnRzW2ldIC8gMTAwKTsKLSAgICAgICAgY3R4LmZpbGxTdHlsZSA9IHNlZ21lbnRz W2ldLmNvbG9yOwotICAgICAgICBjdHguZmlsbFJlY3QoeCArIHByZXZpb3VzV2lkdGgsIHksIHdp ZHRoLCBoKTsKLSAgICAgICAgcHJldmlvdXNXaWR0aCArPSB3aWR0aDsKLSAgICB9Ci19Ci0KLWZ1 bmN0aW9uIGRyYXdQaWxsKGN0eCwgeCwgeSwgdywgaCwgciwgc2VnbWVudHMpIHsKLSAgICBjdHgu c2F2ZSgpOwotCi0gICAgbWFrZVJvdW5kZWRSZWN0UGF0aChjdHgsIHgsIHksIHcsIGgsIHIpOwot ICAgIGN0eC5jbGlwKCk7Ci0KLSAgICBkcmF3UGlsbFNlZ21lbnRzKGN0eCwgeCwgeSwgdywgaCwg c2VnbWVudHMpOwotICAgIGRyYXdEaXZpZGVyTGluZXMoY3R4LCB4LCB5LCB3LCBoKTsKLSAgICBk cmF3UGlsbFNoYWRpbmcoY3R4LCB4LCB5LCB3LCBoKTsKLQotICAgIGN0eC5yZXN0b3JlKCk7Ci19 Ci0KLWZ1bmN0aW9uIGRyYXdTaGFkb3dMaW5lKGN0eCwgeCwgeSwgdywgaCkgewotICAgIGN0eC5i ZWdpblBhdGgoKTsKLSAgICBjdHgubW92ZVRvKHggKyAxLjUsIHkgKyAwLjUpOwotICAgIGN0eC5s aW5lVG8oeCArIHcgLSAxLjUsIHkgKyAwLjUpOwotICAgIGN0eC5jbG9zZVBhdGgoKTsKLQotICAg IGN0eC5zdHJva2VTdHlsZSA9ICdyZ2JhKDAsIDAsIDAsIDAuMiknOwotICAgIGN0eC5saW5lV2lk dGggPSBoOwotICAgIGN0eC5zdHJva2UoKTsKLX0KLQotZnVuY3Rpb24gZHJhd1N3YXRjaFNxdWFy ZShjdHgsIGNvbG9yKSB7Ci0gICAgY3R4LnNhdmUoKTsKLQotICAgIGN0eC5maWxsU3R5bGUgPSBj b2xvcjsKLSAgICBjdHguZmlsbFJlY3QoMCwgMCwgMTMsIDEzKTsKLQotICAgIHZhciBncmFkaWVu dCA9IGN0eC5jcmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCAxMywgMTMpOwotICAgIGdyYWRpZW50 LmFkZENvbG9yU3RvcCgwLjAsICdyZ2JhKDI1NSwgMjU1LCAyNTUsIDAuMiknKTsKLSAgICBncmFk aWVudC5hZGRDb2xvclN0b3AoMS4wLCAncmdiYSgyNTUsIDI1NSwgMjU1LCAwLjApJyk7Ci0KLSAg ICBjdHguZmlsbFN0eWxlID0gZ3JhZGllbnQ7Ci0gICAgY3R4LmZpbGxSZWN0KDAsIDAsIDEzLCAx Myk7Ci0KLSAgICBncmFkaWVudCA9IGN0eC5jcmVhdGVMaW5lYXJHcmFkaWVudCgxMywgMTMsIDAs IDApOwotICAgIGdyYWRpZW50LmFkZENvbG9yU3RvcCgwLjAsICdyZ2JhKDAsIDAsIDAsIDAuMikn KTsKLSAgICBncmFkaWVudC5hZGRDb2xvclN0b3AoMS4wLCAncmdiYSgwLCAwLCAwLCAwLjApJyk7 Ci0KLSAgICBjdHguZmlsbFN0eWxlID0gZ3JhZGllbnQ7Ci0gICAgY3R4LmZpbGxSZWN0KDAsIDAs IDEzLCAxMyk7Ci0KLSAgICBjdHguc3Ryb2tlU3R5bGUgPSAicmdiYSgwLCAwLCAwLCAwLjYpIjsK LSAgICBjdHguc3Ryb2tlUmVjdCgwLjUsIDAuNSwgMTIsIDEyKTsKLQotICAgIGN0eC5yZXN0b3Jl KCk7Ci19Cg==