113682 2013-04-01 00:22:13 -0700 Web Inspector: Flame Chart. Extract item to coordinates conversion into a separate function. 2013-04-01 01:11:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 866954 0 loislo 2013-04-01 00:22:13 -0700 There are two places where we calculate coordinates for an item. One is in method draw, the other is in getPopoverAnchor. It is easy to make a mistake if we need to change the logic or introduce an offset. So we need a single function for that. 866967 1 195937 loislo 2013-04-01 00:43:41 -0700 Created attachment 195937 Patch 866979 2 loislo 2013-04-01 01:11:44 -0700 Committed r147308: <http://trac.webkit.org/changeset/147308> 195937 2013-04-01 00:43:41 -0700 2013-04-01 01:03:37 -0700 Patch bug-113682-20130401114334.patch text/plain 9594 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdiZjIzMGRjMDlkOWQ2 Y2ZlODE1N2I3MmY1M2NhZGQzODQ0YmNhNy4uZGFhMTZjMTI3NzVkZjllYzJkNmM5NjA1ZDg2OGE2 NWNiMmZmMDFlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTAxICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBGbGFtZSBDaGFydC4gRXh0cmFjdCBpdGVtIHRvIGNvb3JkaW5hdGVzIGNvbnZlcnNpb24g aW50byBhIHNlcGFyYXRlIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTEzNjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhlIGNhbGN1bGF0aW9uIHdhcyBleHRyYWN0ZWQgaW50byBlbnRy eVRvQW5jaG9yQm94LgorCisgICAgICAgIERyaXZlIGJ5IGZpeGVzOiB1bm5lY2Vzc2FyeSBtZW1i ZXJzIHdlcmUgcmVtb3ZlZC4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVD aGFydC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5GbGFtZUNoYXJ0LkVudHJ5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFt ZUNoYXJ0LnByb3RvdHlwZS5fY2FsY3VsYXRlVGltZWxpbmVEYXRhKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlwZS5fY2FsY3VsYXRlVGltZWxpbmVEYXRhRm9yU2Ft cGxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX2dldFBv cG92ZXJBbmNob3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBl Ll9lbnRyeVRvQW5jaG9yQm94KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnBy b3RvdHlwZS5kcmF3KToKKwogMjAxMy0wMy0zMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEdyYWRpZW50IGJhY2tncm91bmQgZG9lcyBub3QgZ2V0IHJlcGFpbnRl ZCB3aGVuIGNoaWxkIGJveCBpcyBleHBhbmRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qcwppbmRleCA0YzIxNmQyMjJhZmQzMDBlYjkzZDgw YjhlMjE1N2MzOTdiOWUwODQ4Li5jMGMxMmZlNTJiYTdhMWM0OGI0ODVhNDkyZmRhZTUyOGI0MGU4 NDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZsYW1l Q2hhcnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNo YXJ0LmpzCkBAIC02NSw3ICs2NSw2IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0ID0gZnVuY3Rp b24oY3B1UHJvZmlsZVZpZXcpCiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgdGhpcy5fb25DbGljay5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5fcG9wb3Zl ckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlcih0aGlzLl9jaGFydENvbnRh aW5lciwgdGhpcy5fZ2V0UG9wb3ZlckFuY2hvci5iaW5kKHRoaXMpLCB0aGlzLl9zaG93UG9wb3Zl ci5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9wb3BvdmVySGVscGVyLnNldFRpbWVvdXQoMjUwKTsK LSAgICB0aGlzLl9hbmNob3JCb3ggPSBuZXcgQW5jaG9yQm94KDAsIDAsIDAsIDApOwogICAgIHRo aXMuX2xpbmtpZmllciA9IG5ldyBXZWJJbnNwZWN0b3IuTGlua2lmaWVyKCk7CiAgICAgdGhpcy5f aGlnaGxpZ2h0ZWROb2RlSW5kZXggPSAtMTsKIApAQCAtNzQsNyArNzMsOCBAQCBXZWJJbnNwZWN0 b3IuRmxhbWVDaGFydCA9IGZ1bmN0aW9uKGNwdVByb2ZpbGVWaWV3KQogfQogCiAvKioKLSAqIEBj b25zdHJ1Y3RvcgorICogQGNvbnN0cnVjdG9yICAgICAgICAgICAgZW50cmllcy5wdXNoKG5ldyBX ZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5FbnRyeShjb2xvclBhaXIsIGxldmVsLCBub2RlLnRvdGFs VGltZSwgb2Zmc2V0LCBub2RlKSk7CisvCiAgKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlRp bWVsaW5lR3JpZC5DYWxjdWxhdG9yfQogICovCiBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5DYWxj dWxhdG9yID0gZnVuY3Rpb24oKQpAQCAtMjExLDYgKzIxMSwyMiBAQCBXZWJJbnNwZWN0b3IuRmxh bWVDaGFydC5Db2xvckdlbmVyYXRvci5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCisvKioKKyAq IEBjb25zdHJ1Y3RvcgorICogQHBhcmFtIHshT2JqZWN0fSBjb2xvclBhaXIKKyAqIEBwYXJhbSB7 IW51bWJlcn0gZGVwdGgKKyAqIEBwYXJhbSB7IW51bWJlcn0gZHVyYXRpb24KKyAqIEBwYXJhbSB7 IW51bWJlcn0gc3RhcnRUaW1lCisgKiBAcGFyYW0ge09iamVjdH0gbm9kZQorICovCitXZWJJbnNw ZWN0b3IuRmxhbWVDaGFydC5FbnRyeSA9IGZ1bmN0aW9uKGNvbG9yUGFpciwgZGVwdGgsIGR1cmF0 aW9uLCBzdGFydFRpbWUsIG5vZGUpCit7CisgICAgdGhpcy5jb2xvclBhaXIgPSBjb2xvclBhaXI7 CisgICAgdGhpcy5kZXB0aCA9IGRlcHRoOworICAgIHRoaXMuZHVyYXRpb24gPSBkdXJhdGlvbjsK KyAgICB0aGlzLnN0YXJ0VGltZSA9IHN0YXJ0VGltZTsKKyAgICB0aGlzLm5vZGUgPSBub2RlOwor fQogCiBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUgPSB7CiAgICAgX29uV2luZG93 Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCkBAIC0yNjQsOSArMjgwLDYgQEAgV2ViSW5zcGVjdG9y LkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2NwdVByb2ZpbGVW aWV3LnByb2ZpbGVIZWFkKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICAgICAgdmFy IGZ1bmN0aW9uQ29sb3JQYWlycyA9IHsgfTsKLSAgICAgICAgdmFyIGN1cnJlbnRDb2xvckluZGV4 ID0gMDsKLQogICAgICAgICB2YXIgaW5kZXggPSAwOwogICAgICAgICB2YXIgZW50cmllcyA9IFtd OwogCkBAIC0yOTAsMTMgKzMwMyw3IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlw ZSA9IHsKIAogICAgICAgICAgICAgdmFyIGNvbG9yUGFpciA9IGNvbG9yR2VuZXJhdG9yLl9jb2xv clBhaXJGb3JJRChub2RlLmZ1bmN0aW9uTmFtZSArICI6IiArIG5vZGUudXJsICsgIjoiICsgbm9k ZS5saW5lTnVtYmVyKTsKIAotICAgICAgICAgICAgZW50cmllcy5wdXNoKHsKLSAgICAgICAgICAg ICAgICBjb2xvclBhaXI6IGNvbG9yUGFpciwKLSAgICAgICAgICAgICAgICBkZXB0aDogbGV2ZWws Ci0gICAgICAgICAgICAgICAgZHVyYXRpb246IG5vZGUudG90YWxUaW1lLAotICAgICAgICAgICAg ICAgIHN0YXJ0VGltZTogb2Zmc2V0LAotICAgICAgICAgICAgICAgIG5vZGU6IG5vZGUKLSAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgZW50cmllcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuRmxh bWVDaGFydC5FbnRyeShjb2xvclBhaXIsIGxldmVsLCBub2RlLnRvdGFsVGltZSwgb2Zmc2V0LCBu b2RlKSk7CiAKICAgICAgICAgICAgICsraW5kZXg7CiAKQEAgLTMzMiwxMSArMzM5LDkgQEAgV2Vi SW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2FtcGxlcyA9 IHRoaXMuX2NwdVByb2ZpbGVWaWV3LnNhbXBsZXM7CiAgICAgICAgIHZhciBpZFRvTm9kZSA9IHRo aXMuX2NwdVByb2ZpbGVWaWV3Ll9pZFRvTm9kZTsKICAgICAgICAgdmFyIHNhbXBsZXNDb3VudCA9 IHNhbXBsZXMubGVuZ3RoOwotICAgICAgICB2YXIgZnVuY3Rpb25Db2xvclBhaXJzID0geyB9Owot ICAgICAgICB2YXIgY3VycmVudENvbG9ySW5kZXggPSAwOwogCiAgICAgICAgIHZhciBpbmRleCA9 IDA7Ci0gICAgICAgIHZhciBlbnRyaWVzID0gW107CisgICAgICAgIHZhciBlbnRyaWVzID0gLyoq IEB0eXBlIHtBcnJheS48IVdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LkVudHJ5Pn0gKi8gKFtdKTsK IAogICAgICAgICB2YXIgb3BlbkludGVydmFscyA9IFtdOwogICAgICAgICB2YXIgc3RhY2tUcmFj ZSA9IFtdOwpAQCAtMzY2LDE2ICszNzEsOCBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB3aGlsZSAobm9kZSkgewogICAgICAgICAgICAgICAgIHZh ciBjb2xvclBhaXIgPSBjb2xvckdlbmVyYXRvci5fY29sb3JQYWlyRm9ySUQobm9kZS5mdW5jdGlv bk5hbWUgKyAiOiIgKyBub2RlLnVybCArICI6IiArIG5vZGUubGluZU51bWJlcik7CiAKLSAgICAg ICAgICAgICAgICBlbnRyaWVzLnB1c2goewotICAgICAgICAgICAgICAgICAgICBjb2xvclBhaXI6 IGNvbG9yUGFpciwKLSAgICAgICAgICAgICAgICAgICAgZGVwdGg6IGRlcHRoLAotICAgICAgICAg ICAgICAgICAgICBkdXJhdGlvbjogMSwKLSAgICAgICAgICAgICAgICAgICAgc3RhcnRUaW1lOiBz YW1wbGVJbmRleCwKLSAgICAgICAgICAgICAgICAgICAgbm9kZTogbm9kZQotICAgICAgICAgICAg ICAgIH0pOwotCisgICAgICAgICAgICAgICAgZW50cmllcy5wdXNoKG5ldyBXZWJJbnNwZWN0b3Iu RmxhbWVDaGFydC5FbnRyeShjb2xvclBhaXIsIGRlcHRoLCAxLCBzYW1wbGVJbmRleCwgbm9kZSkp OwogICAgICAgICAgICAgICAgIG9wZW5JbnRlcnZhbHMucHVzaCh7bm9kZTogbm9kZSwgaW5kZXg6 IGluZGV4fSk7Ci0KICAgICAgICAgICAgICAgICArK2luZGV4OwogCiAgICAgICAgICAgICAgICAg bm9kZSA9IHN0YWNrVHJhY2UucG9wKCk7CkBAIC00MDQsMjMgKzQwMSwxMiBAQCBXZWJJbnNwZWN0 b3IuRmxhbWVDaGFydC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChub2RlSW5kZXggPT09IC0x KQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICAgICAgdmFyIHRpbWVsaW5lRW50cmll cyA9IHRoaXMuX3RpbWVsaW5lRGF0YS5lbnRyaWVzOwotCi0gICAgICAgIHZhciBhbmNob3JMZWZ0 ID0gTWF0aC5mbG9vcih0aW1lbGluZUVudHJpZXNbbm9kZUluZGV4XS5zdGFydFRpbWUgKiB0aGlz Ll90aW1lVG9QaXhlbCAtIHRoaXMuX3BpeGVsV2luZG93TGVmdCArIHRoaXMuX3BhZGRpbmdMZWZ0 KTsKLSAgICAgICAgdmFyIGFuY2hvclRvcCA9IE1hdGguZmxvb3IodGhpcy5fY2FudmFzLmhlaWdo dCAtICh0aW1lbGluZUVudHJpZXNbbm9kZUluZGV4XS5kZXB0aCArIDEpICogdGhpcy5fYmFySGVp Z2h0KTsKLQotICAgICAgICB2YXIgYW5jaG9yV2lkdGggPSBNYXRoLmZsb29yKHRpbWVsaW5lRW50 cmllc1tub2RlSW5kZXhdLmR1cmF0aW9uICogdGhpcy5fdGltZVRvUGl4ZWwpOwotICAgICAgICBp ZiAoYW5jaG9yTGVmdCA8IDApIHsKLSAgICAgICAgICAgIGFuY2hvcldpZHRoICs9IGFuY2hvckxl ZnQ7Ci0gICAgICAgICAgICBhbmNob3JMZWZ0ID0gMDsKLSAgICAgICAgfQotCi0gICAgICAgIGFu Y2hvckxlZnQgPSBOdW1iZXIuY29uc3RyYWluKGFuY2hvckxlZnQsIDAsIHRoaXMuX2NhbnZhcy53 aWR0aCk7Ci0gICAgICAgIGFuY2hvcldpZHRoID0gTnVtYmVyLmNvbnN0cmFpbihhbmNob3JXaWR0 aCwgMCwgdGhpcy5fY2FudmFzLndpZHRoIC0gYW5jaG9yTGVmdCk7CisgICAgICAgIHZhciBhbmNo b3JCb3ggPSBuZXcgQW5jaG9yQm94KCk7CisgICAgICAgIHRoaXMuX2VudHJ5VG9BbmNob3JCb3go dGhpcy5fdGltZWxpbmVEYXRhLmVudHJpZXNbbm9kZUluZGV4XSwgYW5jaG9yQm94KTsKKyAgICAg ICAgYW5jaG9yQm94LnggKz0gZXZlbnQucGFnZVggLSBldmVudC5vZmZzZXRYOworICAgICAgICBh bmNob3JCb3gueSArPSBldmVudC5wYWdlWSAtIGV2ZW50Lm9mZnNldFk7CiAKLSAgICAgICAgdmFy IGNhbnZhc09mZnNldExlZnQgPSBldmVudC5wYWdlWCAtIGV2ZW50Lm9mZnNldFg7Ci0gICAgICAg IHZhciBjYW52YXNPZmZzZXRUb3AgPSBldmVudC5wYWdlWSAtIGV2ZW50Lm9mZnNldFk7Ci0gICAg ICAgIHJldHVybiBuZXcgQW5jaG9yQm94KGFuY2hvckxlZnQgKyBjYW52YXNPZmZzZXRMZWZ0LCBh bmNob3JUb3AgKyBjYW52YXNPZmZzZXRUb3AsIGFuY2hvcldpZHRoLCB0aGlzLl9iYXJIZWlnaHQp OworICAgICAgICByZXR1cm4gYW5jaG9yQm94OwogICAgIH0sCiAKICAgICBfc2hvd1BvcG92ZXI6 IGZ1bmN0aW9uKGFuY2hvciwgcG9wb3ZlcikKQEAgLTUzMyw2ICs1MTksMjMgQEAgV2ViSW5zcGVj dG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LkVudHJ5fSBlbnRyeQorICAgICAqIEBwYXJh bSB7QW5jaG9yQm94fSBhbmNob3JCb3gKKyAgICAgKi8KKyAgICBfZW50cnlUb0FuY2hvckJveDog ZnVuY3Rpb24oZW50cnksIGFuY2hvckJveCkKKyAgICB7CisgICAgICAgIGFuY2hvckJveC54ID0g TWF0aC5mbG9vcihlbnRyeS5zdGFydFRpbWUgKiB0aGlzLl90aW1lVG9QaXhlbCkgLSB0aGlzLl9w aXhlbFdpbmRvd0xlZnQgKyB0aGlzLl9wYWRkaW5nTGVmdDsKKyAgICAgICAgYW5jaG9yQm94Lnkg PSB0aGlzLl9jYW52YXMuaGVpZ2h0IC0gKGVudHJ5LmRlcHRoICsgMSkgKiB0aGlzLl9iYXJIZWln aHQ7CisgICAgICAgIGFuY2hvckJveC53aWR0aCA9IE1hdGguZmxvb3IoZW50cnkuZHVyYXRpb24g KiB0aGlzLl90aW1lVG9QaXhlbCk7CisgICAgICAgIGFuY2hvckJveC5oZWlnaHQgPSB0aGlzLl9i YXJIZWlnaHQ7CisgICAgICAgIGlmIChhbmNob3JCb3gueCA8IDApIHsKKyAgICAgICAgICAgIGFu Y2hvckJveC53aWR0aCArPSBhbmNob3JCb3gueDsKKyAgICAgICAgICAgIGFuY2hvckJveC54ID0g MDsKKyAgICAgICAgfQorICAgICAgICBhbmNob3JCb3gud2lkdGggPSBOdW1iZXIuY29uc3RyYWlu KGFuY2hvckJveC53aWR0aCwgMCwgdGhpcy5fY2FudmFzLndpZHRoIC0gYW5jaG9yQm94LngpOwor ICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0geyFudW1iZXJ9IGhlaWdodAogICAgICAq IEBwYXJhbSB7IW51bWJlcn0gd2lkdGgKICAgICAgKi8KQEAgLTU1MywxOSArNTU2LDE5IEBAIFdl Ykluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAgY29udGV4dC50ZXh0 QmFzZWxpbmUgPSAidG9wIjsKICAgICAgICAgdGhpcy5fZG90c1dpZHRoID0gY29udGV4dC5tZWFz dXJlVGV4dCgiXHUyMDI2Iikud2lkdGg7CiAKKyAgICAgICAgdmFyIGFuY2hvckJveCA9IG5ldyBB bmNob3JCb3goKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aW1lbGluZUVudHJpZXMu bGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBzdGFydFRpbWUgPSB0aW1lbGluZUVudHJp ZXNbaV0uc3RhcnRUaW1lOworICAgICAgICAgICAgdmFyIGVudHJ5ID0gdGltZWxpbmVFbnRyaWVz W2ldOworICAgICAgICAgICAgdmFyIHN0YXJ0VGltZSA9IGVudHJ5LnN0YXJ0VGltZTsKICAgICAg ICAgICAgIGlmIChzdGFydFRpbWUgPiB0aGlzLl90aW1lV2luZG93UmlnaHQpCiAgICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBpZiAoKHN0YXJ0VGltZSArIHRpbWVsaW5lRW50cmll c1tpXS5kdXJhdGlvbikgPCB0aGlzLl90aW1lV2luZG93TGVmdCkKKyAgICAgICAgICAgIGlmICgo c3RhcnRUaW1lICsgZW50cnkuZHVyYXRpb24pIDwgdGhpcy5fdGltZVdpbmRvd0xlZnQpCiAgICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB2YXIgeCA9IE1hdGguZmxvb3Ioc3Rh cnRUaW1lICogdGhpcy5fdGltZVRvUGl4ZWwpIC0gdGhpcy5fcGl4ZWxXaW5kb3dMZWZ0OwotICAg ICAgICAgICAgdmFyIHkgPSBoZWlnaHQgLSAodGltZWxpbmVFbnRyaWVzW2ldLmRlcHRoICsgMSkg KiBiYXJIZWlnaHQ7Ci0gICAgICAgICAgICB2YXIgYmFyV2lkdGggPSBNYXRoLmZsb29yKHRpbWVs aW5lRW50cmllc1tpXS5kdXJhdGlvbiAqIHRoaXMuX3RpbWVUb1BpeGVsKTsKLSAgICAgICAgICAg IGlmIChiYXJXaWR0aCA8IHRoaXMuX21pbldpZHRoKQorICAgICAgICAgICAgdGhpcy5fZW50cnlU b0FuY2hvckJveChlbnRyeSwgYW5jaG9yQm94KTsKKyAgICAgICAgICAgIGlmIChhbmNob3JCb3gu d2lkdGggPCB0aGlzLl9taW5XaWR0aCkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAg ICAgICAgICAgdmFyIGNvbG9yUGFpciA9IHRpbWVsaW5lRW50cmllc1tpXS5jb2xvclBhaXI7Cisg ICAgICAgICAgICB2YXIgY29sb3JQYWlyID0gZW50cnkuY29sb3JQYWlyOwogICAgICAgICAgICAg dmFyIGNvbG9yOwogICAgICAgICAgICAgaWYgKHRoaXMuX2hpZ2hsaWdodGVkTm9kZUluZGV4ID09 PSBpKQogICAgICAgICAgICAgICAgIGNvbG9yID0gIGNvbG9yUGFpci5oaWdobGlnaHRlZDsKQEAg LTU3MywxNiArNTc2LDE2IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgICAgICBjb2xvciA9IGNvbG9yUGFpci5ub3JtYWw7CiAKICAgICAgICAgICAg IGNvbnRleHQuYmVnaW5QYXRoKCk7Ci0gICAgICAgICAgICBjb250ZXh0LnJlY3QoeCArIHBhZGRp bmdMZWZ0LCB5LCBiYXJXaWR0aCAtIDEsIGJhckhlaWdodCAtIDEpOworICAgICAgICAgICAgY29u dGV4dC5yZWN0KGFuY2hvckJveC54LCBhbmNob3JCb3gueSwgYW5jaG9yQm94LndpZHRoIC0gMSwg YW5jaG9yQm94LmhlaWdodCAtIDEpOwogICAgICAgICAgICAgY29udGV4dC5maWxsU3R5bGUgPSBj b2xvcjsKICAgICAgICAgICAgIGNvbnRleHQuZmlsbCgpOwogCi0gICAgICAgICAgICB2YXIgeFRl eHQgPSBNYXRoLm1heCgwLCB4ICsgcGFkZGluZ0xlZnQpOwotICAgICAgICAgICAgdmFyIHdpZHRo VGV4dCA9IGJhcldpZHRoIC0gdGV4dFBhZGRpbmdMZWZ0ICsgeCAtIHhUZXh0OwotICAgICAgICAg ICAgdmFyIHRpdGxlID0gdGhpcy5fcHJlcGFyZVRpdGxlKGNvbnRleHQsIHRpbWVsaW5lRGF0YS5l bnRyaWVzW2ldLm5vZGUuZnVuY3Rpb25OYW1lLCB3aWR0aFRleHQpOworICAgICAgICAgICAgdmFy IHhUZXh0ID0gTWF0aC5tYXgoMCwgYW5jaG9yQm94LngpOworICAgICAgICAgICAgdmFyIHdpZHRo VGV4dCA9IGFuY2hvckJveC53aWR0aCAtIHRleHRQYWRkaW5nTGVmdCArIGFuY2hvckJveC54IC0g eFRleHQ7CisgICAgICAgICAgICB2YXIgdGl0bGUgPSB0aGlzLl9wcmVwYXJlVGl0bGUoY29udGV4 dCwgZW50cnkubm9kZS5mdW5jdGlvbk5hbWUsIHdpZHRoVGV4dCk7CiAgICAgICAgICAgICBpZiAo dGl0bGUpIHsKICAgICAgICAgICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9ICIjMzMzIjsKLSAg ICAgICAgICAgICAgICBjb250ZXh0LmZpbGxUZXh0KHRpdGxlLCB4VGV4dCArIHRleHRQYWRkaW5n TGVmdCwgeSAtIDEpOworICAgICAgICAgICAgICAgIGNvbnRleHQuZmlsbFRleHQodGl0bGUsIHhU ZXh0ICsgdGV4dFBhZGRpbmdMZWZ0LCBhbmNob3JCb3gueSAtIDEpOwogICAgICAgICAgICAgfQog ICAgICAgICB9CiAgICAgfSwK