113014 2013-03-22 00:55:24 -0700 Web Inspector: Flame Chart. move overview window when user scrolls the chart. 2013-03-22 02:02:40 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112814 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 861183 0 loislo 2013-03-22 00:55:24 -0700 When user moves the chart the overview window has to be moved accordingly. 861198 1 194467 loislo 2013-03-22 01:08:03 -0700 Created attachment 194467 Patch 861214 2 194468 loislo 2013-03-22 01:19:07 -0700 Created attachment 194468 Patch 861239 3 loislo 2013-03-22 02:02:40 -0700 Committed r146577: <http://trac.webkit.org/changeset/146577> 194467 2013-03-22 01:08:03 -0700 2013-03-22 01:19:00 -0700 Patch bug-113014-20130322120350.patch text/plain 15097 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExMzc4YTQzMDViYjg2 NWQxYmY0ZmQ3OTgxZmI2NTI4NjYyMDg1Mi4uMDQyYzg2MjAxZTZmNGFmY2U5ODQ4ZDc2YzA1NzYy NzI3OWFiNTg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAzLTIyICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBGbGFtZSBDaGFydC4gbW92ZSBvdmVydmlldyB3aW5kb3cgd2hlbiB1c2VyIHNjcm9sbHMg dGhlIGNoYXJ0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEzMDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSSBmb3VuZCB0aGF0IEkgY291bGQgdXNlIHNjYWxpbmcgbWVjaGFuaWNzIGluIE92ZXJ2aWV3 R3JpZCBmb3Igc2NhbGluZyB0aGUgY2hhcnQuCisgICAgICAgIEJ1dCB0aGUgZHJhZ2dpbmcgcGFy dCB3YXMgbm90IHNvIHNpbXBsZSBkdWUgdG8gdGhlIGRpZmZlcmVudCBhcHByb2FjaGVzIGluCisg ICAgICAgIE92ZXJ2aWV3R3JpZCBhbmQgRmxhbWVDaGFydC4gT3ZlcnZpZXdHcmlkIHVzZWQgX3dp bmRvd0xlZnQgYW5kIF93aW5kb3dSaWdodAorICAgICAgICB3aGVuIEZsYW1lQ2hhcnQgdXNlZCBf eE9mZnNldCBhbmQgX3hTY2FsZUZhY3RvciBhbmQgd2lkdGguCisgICAgICAgIEl0IHdhcyBub3Qg cHJhY3RpY2FsIGFuZCBJIHJld3JvdGUgdGhlIEZsYW1lQ2hhcnQgbWVjaGFuaWNzCisgICAgICAg IGFuZCBub3cgaXQgYWxzbyB1c2VzIF93aW5kb3dMZWZ0IF93aW5kb3dSaWdodC4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5GbGFtZUNoYXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LkNhbGN1 bGF0b3IucHJvdG90eXBlLl91cGRhdGVCb3VuZGFyaWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GbGFtZUNoYXJ0LkNhbGN1bGF0b3IucHJvdG90eXBlLmNvbXB1dGVQb3NpdGlvbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX29uV2luZG93Q2hhbmdlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX3N0YXJ0Q2FudmFz RHJhZ2dpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLl9j YW52YXNEcmFnZ2luZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5 cGUuX29uTW91c2VNb3ZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3Rv dHlwZS5fb25Nb3VzZVdoZWVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnBy b3RvdHlwZS5fY29vcmRpbmF0ZXNUb05vZGVJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RmxhbWVDaGFydC5wcm90b3R5cGUuX2RyYXdPdmVydmlld0NhbnZhcyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuZHJhdyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX3VwZGF0ZUJvdW5kYXJpZXMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9PdmVydmlld0dyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3Zl cnZpZXdHcmlkLnByb3RvdHlwZS5zZXRXaW5kb3dQb3NpdGlvbik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5zZXRXaW5kb3cpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUuYWRkRXZlbnRMaXN0ZW5lcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS56b29tKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5PdmVydmlld0dyaWQuV2luZG93LnByb3RvdHlwZS5fem9vbSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzOgorICAgICAgICAoLm92 ZXJ2aWV3LWdyaWQtd2luZG93LXJ1bGVycyk6CisKIDIwMTMtMDMtMjEgIEhhamltZSBNb3JyaXRh ICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIEN1c3RvbSBFbGVtZW50czogInJlYWR5 Q2FsbGJhY2siIGxpZmVjeWNsZSBjYWxsYmFjayBzaG91bGQgYmUgY2FsbGVkLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzCmluZGV4IDM1MTQ0 NjIxMWRmZDNiYThjMjk0NDU2Y2Q3NjI4YzZhYjE1NThjNDcuLjBhOTRlN2Y1YTdlYWIzMWE0ZGMw MzUxZmY4OTRkYzg4ZjQxYzcwMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRmxhbWVDaGFydC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZsYW1lQ2hhcnQuanMKQEAgLTU3LDcgKzU3LDggQEAgV2ViSW5zcGVjdG9yLkZs YW1lQ2hhcnQgPSBmdW5jdGlvbihjcHVQcm9maWxlVmlldykKIAogICAgIHRoaXMuX2NwdVByb2Zp bGVWaWV3ID0gY3B1UHJvZmlsZVZpZXc7CiAgICAgdGhpcy5feFNjYWxlRmFjdG9yID0gNC4wOwot ICAgIHRoaXMuX3hPZmZzZXQgPSAwOworICAgIHRoaXMuX3dpbmRvd0xlZnQgPSAwLjA7CisgICAg dGhpcy5fd2luZG93UmlnaHQgPSAxLjA7CiAgICAgdGhpcy5fYmFySGVpZ2h0ID0gMTA7CiAgICAg dGhpcy5fbWluV2lkdGggPSAxOwogICAgIHRoaXMuX2NhbnZhcy5hZGRFdmVudExpc3RlbmVyKCJt b3VzZW1vdmUiLCB0aGlzLl9vbk1vdXNlTW92ZS5iaW5kKHRoaXMpKTsKQEAgLTg1LDkgKzg2LDkg QEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQuQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAg ICovCiAgICAgX3VwZGF0ZUJvdW5kYXJpZXM6IGZ1bmN0aW9uKGZsYW1lQ2hhcnQpCiAgICAgewot ICAgICAgICB0aGlzLl94U2NhbGVGYWN0b3IgPSBmbGFtZUNoYXJ0Ll94U2NhbGVGYWN0b3I7Ci0g ICAgICAgIHRoaXMuX21pbmltdW1Cb3VuZGFyaWVzID0gZmxhbWVDaGFydC5feE9mZnNldCAvIHRo aXMuX3hTY2FsZUZhY3RvcjsKLSAgICAgICAgdGhpcy5fbWF4aW11bUJvdW5kYXJpZXMgPSAoZmxh bWVDaGFydC5feE9mZnNldCArIGZsYW1lQ2hhcnQuX2NhbnZhcy53aWR0aCkgLyB0aGlzLl94U2Nh bGVGYWN0b3I7CisgICAgICAgIHRoaXMuX21pbmltdW1Cb3VuZGFyaWVzID0gZmxhbWVDaGFydC5f d2luZG93TGVmdCAqIGZsYW1lQ2hhcnQuX3RpbWVsaW5lRGF0YS50b3RhbFRpbWU7CisgICAgICAg IHRoaXMuX21heGltdW1Cb3VuZGFyaWVzID0gZmxhbWVDaGFydC5fd2luZG93UmlnaHQgKiBmbGFt ZUNoYXJ0Ll90aW1lbGluZURhdGEudG90YWxUaW1lOworICAgICAgICB0aGlzLl90aW1lVG9QaXhl bCA9IGZsYW1lQ2hhcnQuX2NhbnZhcy53aWR0aCAvIHRoaXMuYm91bmRhcnlTcGFuKCk7CiAgICAg fSwKIAogICAgIC8qKgpAQCAtOTUsNyArOTYsNyBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5D YWxjdWxhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBjb21wdXRlUG9zaXRpb246IGZ1 bmN0aW9uKHRpbWUpCiAgICAgewotICAgICAgICByZXR1cm4gKHRpbWUgLSB0aGlzLl9taW5pbXVt Qm91bmRhcmllcykgKiB0aGlzLl94U2NhbGVGYWN0b3I7CisgICAgICAgIHJldHVybiAodGltZSAt IHRoaXMuX21pbmltdW1Cb3VuZGFyaWVzKSAqIHRoaXMuX3RpbWVUb1BpeGVsOwogICAgIH0sCiAK ICAgICBmb3JtYXRUaW1lOiBmdW5jdGlvbih2YWx1ZSkKQEAgLTE3NCw5ICsxNzUsNiBAQCBXZWJJ bnNwZWN0b3IuRmxhbWVDaGFydC5FdmVudHMgPSB7CiBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5w cm90b3R5cGUgPSB7CiAgICAgX29uV2luZG93Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAg ewotICAgICAgICB2YXIgdGltZUludGVydmFsV2lkdGggPSB0aGlzLl90aW1lbGluZURhdGEudG90 YWxUaW1lICogKGV2ZW50LnRhcmdldC53aW5kb3dSaWdodCAtIGV2ZW50LnRhcmdldC53aW5kb3dM ZWZ0KTsKLSAgICAgICAgdGhpcy5feFNjYWxlRmFjdG9yID0gdGhpcy5fY2FudmFzLndpZHRoIC8g dGltZUludGVydmFsV2lkdGg7Ci0gICAgICAgIHRoaXMuX3hPZmZzZXQgPSB0aGlzLl90aW1lbGlu ZURhdGEudG90YWxUaW1lICogZXZlbnQudGFyZ2V0LndpbmRvd0xlZnQgKiB0aGlzLl94U2NhbGVG YWN0b3I7CiAgICAgICAgIHRoaXMuX2hpZGVQb3BvdmVyKCk7CiAgICAgICAgIHRoaXMuX3NjaGVk dWxlVXBkYXRlKCk7CiAgICAgfSwKQEAgLTE4NywzMiArMTg1LDI4IEBAIFdlYkluc3BlY3Rvci5G bGFtZUNoYXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgdGhpcy5faXNEcmFnZ2luZyA9IHRydWU7CiAgICAgICAgIHRoaXMuX2RyYWdTdGFydFBvaW50 ID0gZXZlbnQucGFnZVg7Ci0gICAgICAgIHRoaXMuX2RyYWdTdGFydFhPZmZzZXQgPSB0aGlzLl94 T2Zmc2V0OworICAgICAgICB0aGlzLl9kcmFnU3RhcnRXaW5kb3dMZWZ0ID0gdGhpcy5fd2luZG93 TGVmdDsKKyAgICAgICAgdGhpcy5fZHJhZ1N0YXJ0V2luZG93UmlnaHQgPSB0aGlzLl93aW5kb3dS aWdodDsKICAgICAgICAgdGhpcy5faGlkZVBvcG92ZXIoKTsKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfSwKIAotICAgIF9tYXhYT2Zmc2V0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBp ZiAoIXRoaXMuX3RpbWVsaW5lRGF0YSkKLSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICB2 YXIgbWF4WE9mZnNldCA9IE1hdGguZmxvb3IodGhpcy5fdGltZWxpbmVEYXRhLnRvdGFsVGltZSAq IHRoaXMuX3hTY2FsZUZhY3RvciAtIHRoaXMuX2NhbnZhcy53aWR0aCk7Ci0gICAgICAgIHJldHVy biBtYXhYT2Zmc2V0ID4gMCA/IG1heFhPZmZzZXQgOiAwOwotICAgIH0sCi0KLSAgICBfc2V0WE9m ZnNldDogZnVuY3Rpb24oeE9mZnNldCkKKyAgICBfY2FudmFzRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKLSAgICAgICAgeE9mZnNldCA9IE51bWJlci5jb25zdHJhaW4oeE9mZnNldCwg MCwgdGhpcy5fbWF4WE9mZnNldCgpKTsKKyAgICAgICAgdmFyIHBpeGVsU2hpZnQgPSB0aGlzLl9k cmFnU3RhcnRQb2ludCAtIGV2ZW50LnBhZ2VYOworICAgICAgICB2YXIgd2luZG93U2hpZnQgPSBw aXhlbFNoaWZ0IC8gdGhpcy5fdG90YWxQaXhlbHM7CiAKLSAgICAgICAgaWYgKHhPZmZzZXQgIT09 IHRoaXMuX3hPZmZzZXQpIHsKLSAgICAgICAgICAgIHRoaXMuX3hPZmZzZXQgPSB4T2Zmc2V0Owot ICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVVcGRhdGUoKTsKLSAgICAgICAgfQotICAgIH0sCisg ICAgICAgIHZhciB3aW5kb3dMZWZ0ID0gTWF0aC5tYXgoMCwgdGhpcy5fZHJhZ1N0YXJ0V2luZG93 TGVmdCArIHdpbmRvd1NoaWZ0KTsKKyAgICAgICAgaWYgKHdpbmRvd0xlZnQgPT09IHRoaXMuX3dp bmRvd0xlZnQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHdpbmRvd1NoaWZ0ID0gd2lu ZG93TGVmdCAtIHRoaXMuX2RyYWdTdGFydFdpbmRvd0xlZnQ7CisgICAgICAgIAorICAgICAgICB2 YXIgd2luZG93UmlnaHQgPSBNYXRoLm1pbigxLCB0aGlzLl9kcmFnU3RhcnRXaW5kb3dSaWdodCAr IHdpbmRvd1NoaWZ0KTsKKyAgICAgICAgaWYgKHdpbmRvd1JpZ2h0ID09PSB0aGlzLl93aW5kb3dS aWdodCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgd2luZG93U2hpZnQgPSB3aW5kb3dS aWdodCAtIHRoaXMuX2RyYWdTdGFydFdpbmRvd1JpZ2h0OwogCi0gICAgX2NhbnZhc0RyYWdnaW5n OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3NldFhPZmZzZXQodGhpcy5f ZHJhZ1N0YXJ0WE9mZnNldCArIHRoaXMuX2RyYWdTdGFydFBvaW50IC0gZXZlbnQucGFnZVgpOwor ICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2V0V2luZG93KHRoaXMuX2RyYWdTdGFydFdpbmRv d0xlZnQgKyB3aW5kb3dTaGlmdCwgdGhpcy5fZHJhZ1N0YXJ0V2luZG93UmlnaHQgKyB3aW5kb3dT aGlmdCk7CiAgICAgfSwKIAogICAgIF9lbmRDYW52YXNEcmFnZ2luZzogZnVuY3Rpb24oKQpAQCAt MzY3LDEwICszNjEsMTAgQEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewog CiAgICAgICAgIHZhciB0aW1lbGluZURhdGEgPSB0aGlzLl90aW1lbGluZURhdGE7CiAKLSAgICAg ICAgdmFyIGFuY2hvckxlZnQgPSBNYXRoLmZsb29yKHRpbWVsaW5lRGF0YS5zdGFydFRpbWVzW25v ZGVJbmRleF0gKiB0aGlzLl94U2NhbGVGYWN0b3IgLSB0aGlzLl94T2Zmc2V0KTsKKyAgICAgICAg dmFyIGFuY2hvckxlZnQgPSB0aW1lbGluZURhdGEuc3RhcnRUaW1lc1tub2RlSW5kZXhdICogdGhp cy5fdGltZVRvUGl4ZWwgLSB0aGlzLl9waXhlbFdpbmRvd0xlZnQ7CiAgICAgICAgIGFuY2hvckxl ZnQgPSBOdW1iZXIuY29uc3RyYWluKGFuY2hvckxlZnQsIDAsIHRoaXMuX2NhbnZhcy53aWR0aCk7 CiAKLSAgICAgICAgdmFyIGFuY2hvcldpZHRoID0gTWF0aC5mbG9vcih0aW1lbGluZURhdGEuZHVy YXRpb25zW25vZGVJbmRleF0gKiB0aGlzLl94U2NhbGVGYWN0b3IpOworICAgICAgICB2YXIgYW5j aG9yV2lkdGggPSBNYXRoLmZsb29yKHRpbWVsaW5lRGF0YS5kdXJhdGlvbnNbbm9kZUluZGV4XSAq IHRoaXMuX3RpbWVUb1BpeGVsKTsKICAgICAgICAgYW5jaG9yV2lkdGggPSBOdW1iZXIuY29uc3Ry YWluKGFuY2hvcldpZHRoLCAwLCB0aGlzLl9jYW52YXMud2lkdGggLSBhbmNob3JMZWZ0KTsKIAog ICAgICAgICB2YXIgc3R5bGUgPSB0aGlzLl9hbmNob3JFbGVtZW50LnN0eWxlOwpAQCAtMzgwLDMx ICszNzQsMTAgQEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAg ICBzdHlsZS50b3AgPSBNYXRoLmZsb29yKHRoaXMuX2NhbnZhcy5oZWlnaHQgLSAodGltZWxpbmVE YXRhLmRlcHRoc1tub2RlSW5kZXhdICsgMSkgKiB0aGlzLl9iYXJIZWlnaHQpICsgInB4IjsKICAg ICB9LAogCi0gICAgX2FkanVzdFhPZmZzZXQ6IGZ1bmN0aW9uKGRpcmVjdGlvbikKLSAgICB7Ci0g ICAgICAgIHZhciBzdGVwID0gdGhpcy5feFNjYWxlRmFjdG9yICogNTsKLSAgICAgICAgdGhpcy5f c2V0WE9mZnNldCh0aGlzLl94T2Zmc2V0ICsgKGRpcmVjdGlvbiA+IDAgPyBzdGVwIDogLXN0ZXAp KTsKLSAgICB9LAotCi0gICAgX2FkanVzdFhTY2FsZTogZnVuY3Rpb24oZGlyZWN0aW9uLCB4KQot ICAgIHsKLSAgICAgICAgdmFyIGN1cnNvclRpbWUgPSAoeCArIHRoaXMuX3hPZmZzZXQpIC8gdGhp cy5feFNjYWxlRmFjdG9yOwotCi0gICAgICAgIGlmIChkaXJlY3Rpb24gPCAwKQotICAgICAgICAg ICAgdGhpcy5feFNjYWxlRmFjdG9yIC89IDI7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRo aXMuX3hTY2FsZUZhY3RvciAqPSAyOwotCi0gICAgICAgIHRoaXMuX3NldFhPZmZzZXQoTWF0aC5m bG9vcihjdXJzb3JUaW1lICogdGhpcy5feFNjYWxlRmFjdG9yIC0geCkpOwotICAgIH0sCi0KICAg ICBfb25Nb3VzZVdoZWVsOiBmdW5jdGlvbihlKQogICAgIHsKLSAgICAgICAgaWYgKCFlLnNoaWZ0 S2V5KQotICAgICAgICAgICAgdGhpcy5fYWRqdXN0WFNjYWxlKGUud2hlZWxEZWx0YSwgZS5vZmZz ZXRYKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fYWRqdXN0WE9mZnNldChlLndo ZWVsRGVsdGEpOwotCisgICAgICAgIHZhciB6b29tRmFjdG9yID0gKGUud2hlZWxEZWx0YSA+IDAp ID8gMC45IDogMS4xOworICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuem9vbSh6b29tRmFjdG9y KTsKICAgICAgICAgdGhpcy5faGlkZVBvcG92ZXIoKTsKICAgICAgICAgdGhpcy5fc2NoZWR1bGVV cGRhdGUoKTsKICAgICB9LApAQCAtNDE4LDcgKzM5MSw3IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNo YXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHRpbWVsaW5lRGF0YSA9IHRoaXMuX3RpbWVs aW5lRGF0YTsKICAgICAgICAgaWYgKCF0aW1lbGluZURhdGEpCiAgICAgICAgICAgICByZXR1cm4g LTE7Ci0gICAgICAgIHZhciBjdXJzb3JUaW1lID0gKHggKyB0aGlzLl94T2Zmc2V0KSAvIHRoaXMu X3hTY2FsZUZhY3RvcjsKKyAgICAgICAgdmFyIGN1cnNvclRpbWUgPSBNYXRoLmZsb29yKCh4ICsg dGhpcy5fcGl4ZWxXaW5kb3dMZWZ0KSAqIHRoaXMuX3BpeGVsVG9UaW1lKTsKICAgICAgICAgdmFy IGN1cnNvckxldmVsID0gTWF0aC5mbG9vcigodGhpcy5fY2FudmFzLmhlaWdodCAtIHkpIC8gdGhp cy5fYmFySGVpZ2h0KTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRpbWVsaW5lRGF0 YS5ub2RlQ291bnQ7ICsraSkgewpAQCAtNDUxLDcgKzQyNCw3IEBAIFdlYkluc3BlY3Rvci5GbGFt ZUNoYXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIHN0YXJ0VGltZXMgPSB0aGlzLl90aW1l bGluZURhdGEuc3RhcnRUaW1lczsKICAgICAgICAgdmFyIGR1cmF0aW9ucyA9IHRoaXMuX3RpbWVs aW5lRGF0YS5kdXJhdGlvbnM7CiAgICAgICAgIHZhciBkcmF3RGF0YSA9IG5ldyBVaW50OEFycmF5 KHdpZHRoKTsKLSAgICAgICAgdmFyIHNjYWxlRmFjdG9yID0gd2lkdGggLyB0aGlzLl90aW1lbGlu ZURhdGEudG90YWxUaW1lOworICAgICAgICB2YXIgc2NhbGVGYWN0b3IgPSB3aWR0aCAvIHRoaXMu X3RvdGFsVGltZTsKIAogICAgICAgICBmb3IgKHZhciBub2RlSW5kZXggPSAwOyBub2RlSW5kZXgg PCBub2RlQ291bnQ7ICsrbm9kZUluZGV4KSB7CiAgICAgICAgICAgICB2YXIgc3RhcnQgPSBNYXRo LmZsb29yKHN0YXJ0VGltZXNbbm9kZUluZGV4XSAqIHNjYWxlRmFjdG9yKTsKQEAgLTQ4NiwyMCAr NDU5LDE5IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fY2FudmFzLmhlaWdodCA9IGhlaWdodDsKICAgICAg ICAgdGhpcy5fY2FudmFzLndpZHRoID0gd2lkdGg7Ci0gICAgICAgIHZhciB4U2NhbGVGYWN0b3Ig PSB0aGlzLl94U2NhbGVGYWN0b3I7CiAgICAgICAgIHZhciBiYXJIZWlnaHQgPSB0aGlzLl9iYXJI ZWlnaHQ7Ci0gICAgICAgIHZhciB4T2Zmc2V0ID0gdGhpcy5feE9mZnNldDsKIAogICAgICAgICB2 YXIgY29udGV4dCA9IHRoaXMuX2NhbnZhcy5nZXRDb250ZXh0KCIyZCIpOwogCiAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgdGltZWxpbmVEYXRhLm5vZGVDb3VudDsgKytpKSB7Ci0gICAgICAg ICAgICB2YXIgeCA9IE1hdGguZmxvb3IodGltZWxpbmVEYXRhLnN0YXJ0VGltZXNbaV0gKiB4U2Nh bGVGYWN0b3IpIC0geE9mZnNldDsKLSAgICAgICAgICAgIGlmICh4ID4gd2lkdGgpCisgICAgICAg ICAgICB2YXIgc3RhcnRUaW1lID0gdGltZWxpbmVEYXRhLnN0YXJ0VGltZXNbaV07CisgICAgICAg ICAgICBpZiAoc3RhcnRUaW1lID4gdGhpcy5fdGltZVdpbmRvd1JpZ2h0KQogICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgdmFyIHkgPSBoZWlnaHQgLSAodGltZWxpbmVEYXRhLmRl cHRoc1tpXSArIDEpICogYmFySGVpZ2h0OwotICAgICAgICAgICAgdmFyIGJhcldpZHRoID0gTWF0 aC5mbG9vcih0aW1lbGluZURhdGEuZHVyYXRpb25zW2ldICogeFNjYWxlRmFjdG9yKTsKLSAgICAg ICAgICAgIGlmICh4ICsgYmFyV2lkdGggPCAwKQorICAgICAgICAgICAgaWYgKChzdGFydFRpbWUg KyB0aW1lbGluZURhdGEuZHVyYXRpb25zW2ldKSA8IHRoaXMuX3RpbWVXaW5kb3dMZWZ0KQogICAg ICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgdmFyIHggPSBNYXRoLmZsb29yKHN0 YXJ0VGltZSAqIHRoaXMuX3RpbWVUb1BpeGVsKSAtIHRoaXMuX3BpeGVsV2luZG93TGVmdDsKKyAg ICAgICAgICAgIHZhciB5ID0gaGVpZ2h0IC0gKHRpbWVsaW5lRGF0YS5kZXB0aHNbaV0gKyAxKSAq IGJhckhlaWdodDsKKyAgICAgICAgICAgIHZhciBiYXJXaWR0aCA9IE1hdGguZmxvb3IodGltZWxp bmVEYXRhLmR1cmF0aW9uc1tpXSAqIHRoaXMuX3RpbWVUb1BpeGVsKTsKICAgICAgICAgICAgIGlm IChiYXJXaWR0aCA8IHRoaXMuX21pbldpZHRoKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwog CkBAIC01MjMsMTggKzQ5NSw0MCBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX3VwZGF0ZVRpbWVySWQgPSBz ZXRUaW1lb3V0KHRoaXMudXBkYXRlLmJpbmQodGhpcyksIDEwKTsKICAgICB9LAorICAgIAorICAg IF91cGRhdGVCb3VuZGFyaWVzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl93aW5k b3dMZWZ0ID0gdGhpcy5fb3ZlcnZpZXdHcmlkLndpbmRvd0xlZnQoKTsKKyAgICAgICAgdGhpcy5f d2luZG93UmlnaHQgPSB0aGlzLl9vdmVydmlld0dyaWQud2luZG93UmlnaHQoKTsKKyAgICAgICAg dGhpcy5fd2luZG93V2lkdGggPSB0aGlzLl93aW5kb3dSaWdodCAtIHRoaXMuX3dpbmRvd0xlZnQ7 CisKKyAgICAgICAgdGhpcy5fdG90YWxUaW1lID0gdGhpcy5fdGltZWxpbmVEYXRhLnRvdGFsVGlt ZTsKKyAgICAgICAgdGhpcy5fdGltZVdpbmRvd0xlZnQgPSB0aGlzLl93aW5kb3dMZWZ0ICogdGhp cy5fdG90YWxUaW1lOworICAgICAgICB0aGlzLl90aW1lV2luZG93UmlnaHQgPSB0aGlzLl93aW5k b3dSaWdodCAqIHRoaXMuX3RvdGFsVGltZTsKKworICAgICAgICB0aGlzLl9waXhlbFdpbmRvd1dp ZHRoID0gdGhpcy5fY2hhcnRDb250YWluZXIuY2xpZW50V2lkdGg7CisgICAgICAgIHRoaXMuX3Rv dGFsUGl4ZWxzID0gTWF0aC5mbG9vcih0aGlzLl9waXhlbFdpbmRvd1dpZHRoIC8gdGhpcy5fd2lu ZG93V2lkdGgpOworICAgICAgICB0aGlzLl9waXhlbFdpbmRvd0xlZnQgPSBNYXRoLmZsb29yKHRo aXMuX3RvdGFsUGl4ZWxzICogdGhpcy5fd2luZG93TGVmdCk7CisgICAgICAgIHRoaXMuX3BpeGVs V2luZG93UmlnaHQgPSBNYXRoLmZsb29yKHRoaXMuX3RvdGFsUGl4ZWxzICogdGhpcy5fd2luZG93 UmlnaHQpOworCisgICAgICAgIHRoaXMuX3RpbWVUb1BpeGVsID0gdGhpcy5fdG90YWxQaXhlbHMg LyB0aGlzLl90b3RhbFRpbWU7CisgICAgICAgIHRoaXMuX3BpeGVsVG9UaW1lID0gdGhpcy5fdG90 YWxUaW1lIC8gdGhpcy5fdG90YWxQaXhlbHM7CisgICAgfSwKIAogICAgIHVwZGF0ZTogZnVuY3Rp b24oKQogICAgIHsKICAgICAgICAgdGhpcy5fdXBkYXRlVGltZXJJZCA9IDA7CisgICAgICAgIGlm ICghdGhpcy5fdGltZWxpbmVEYXRhKQorICAgICAgICAgICAgdGhpcy5fY2FsY3VsYXRlVGltZWxp bmVEYXRhKCk7CisgICAgICAgIGlmICghdGhpcy5fdGltZWxpbmVEYXRhKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl91cGRhdGVCb3VuZGFyaWVzKCk7CiAgICAgICAgIHRoaXMu ZHJhdyh0aGlzLl9jaGFydENvbnRhaW5lci5jbGllbnRXaWR0aCwgdGhpcy5fY2hhcnRDb250YWlu ZXIuY2xpZW50SGVpZ2h0KTsKLSAgICAgICAgaWYgKHRoaXMuX3RpbWVsaW5lRGF0YSkgewotICAg ICAgICAgICAgdGhpcy5fY2FsY3VsYXRvci5fdXBkYXRlQm91bmRhcmllcyh0aGlzKTsKLSAgICAg ICAgICAgIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvci5fdXBkYXRlQm91bmRhcmllcyh0aGlzKTsK LSAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC5lbGVtZW50LnN0eWxlLndpZHRoID0gdGhp cy5lbGVtZW50LmNsaWVudFdpZHRoOwotICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVHcmlkLnVw ZGF0ZURpdmlkZXJzKHRoaXMuX2NhbGN1bGF0b3IpOwotICAgICAgICAgICAgdGhpcy5fb3ZlcnZp ZXdHcmlkLnVwZGF0ZURpdmlkZXJzKHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvcik7Ci0gICAgICAg IH0KKyAgICAgICAgdGhpcy5fY2FsY3VsYXRvci5fdXBkYXRlQm91bmRhcmllcyh0aGlzKTsKKyAg ICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLl91cGRhdGVCb3VuZGFyaWVzKHRoaXMpOwor ICAgICAgICB0aGlzLl90aW1lbGluZUdyaWQuZWxlbWVudC5zdHlsZS53aWR0aCA9IHRoaXMuZWxl bWVudC5jbGllbnRXaWR0aDsKKyAgICAgICAgdGhpcy5fdGltZWxpbmVHcmlkLnVwZGF0ZURpdmlk ZXJzKHRoaXMuX2NhbGN1bGF0b3IpOworICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQudXBkYXRl RGl2aWRlcnModGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yKTsKICAgICAgICAgaWYgKHRoaXMuX3Vw ZGF0ZU92ZXJ2aWV3Q2FudmFzKSB7CiAgICAgICAgICAgICB0aGlzLl9kcmF3T3ZlcnZpZXdDYW52 YXModGhpcy5fb3ZlcnZpZXdDb250YWluZXIuY2xpZW50V2lkdGgsIHRoaXMuX292ZXJ2aWV3Q29u dGFpbmVyLmNsaWVudEhlaWdodCk7CiAgICAgICAgICAgICB0aGlzLl91cGRhdGVPdmVydmlld0Nh bnZhcyA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9PdmVydmlld0dyaWQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L092ZXJ2aWV3R3JpZC5qcwppbmRleCAyODA2YjlhOGZkOWQ0OGUzOGIxOTcwYWQ4YTdjMjFmOTEz MTI3NmM3Li5hOGM1YWQzMzUzZWRjMTk3NDA2MmUzMDMzZDUzZTk1YWFlZjk4OWY0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3R3JpZC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3R3JpZC5qcwpA QCAtMTA3LDcgKzEwNyw3IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlID0g ewogICAgICAqLwogICAgIHNldFdpbmRvd1Bvc2l0aW9uOiBmdW5jdGlvbihzdGFydCwgZW5kKQog ICAgIHsKLSAgICAgICAgdGhpcy5fd2luZG93Ll9zZXRXaW5kb3dQb3NpdGlvbihzdGFydCwgZW5k KTsKKyAgICAgICAgdGhpcy5fd2luZG93Ll9zZXRXaW5kb3dQb3NpdGlvbihzdGFydCwgZW5kLCB0 cnVlKTsKICAgICB9LAogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKQEAgLTEzNyw3ICsxMzcsNyBA QCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBz ZXRXaW5kb3c6IGZ1bmN0aW9uKGxlZnQsIHJpZ2h0KQogICAgIHsKLSAgICAgICAgdGhpcy5fd2lu ZG93Ll9zZXRXaW5kb3cobGVmdCwgcmlnaHQpOworICAgICAgICB0aGlzLl93aW5kb3cuX3NldFdp bmRvdyhsZWZ0LCByaWdodCwgdHJ1ZSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTQ4LDYgKzE0 OCwxNCBAQCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZSA9IHsKICAgICBhZGRF dmVudExpc3RlbmVyOiBmdW5jdGlvbihldmVudFR5cGUsIGxpc3RlbmVyLCB0aGlzT2JqZWN0KQog ICAgIHsKICAgICAgICAgdGhpcy5fd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoZXZlbnRUeXBlLCBs aXN0ZW5lciwgdGhpc09iamVjdCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7 IW51bWJlcn0gem9vbUZhY3RvcgorICAgICAqLworICAgIHpvb206IGZ1bmN0aW9uKHpvb21GYWN0 b3IpCisgICAgeworICAgICAgICB0aGlzLl93aW5kb3cuX3pvb20oem9vbUZhY3Rvcik7CiAgICAg fQogfQogCkBAIC00MjgsNyArNDM2LDcgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5XaW5k b3cucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtudW1iZXJ9IGZhY3Rv cgotICAgICAqIEBwYXJhbSB7bnVtYmVyfSByZWZlcmVuY2VQb2ludAorICAgICAqIEBwYXJhbSB7 bnVtYmVyPX0gcmVmZXJlbmNlUG9pbnQKICAgICAgKi8KICAgICBfem9vbTogZnVuY3Rpb24oZmFj dG9yLCByZWZlcmVuY2VQb2ludCkKICAgICB7CkBAIC00MzksNiArNDQ3LDggQEAgV2ViSW5zcGVj dG9yLk92ZXJ2aWV3R3JpZC5XaW5kb3cucHJvdG90eXBlID0gewogICAgICAgICBpZiAoZmFjdG9y IDwgMSAmJiBkZWx0YSA8IFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuTWluU2VsZWN0YWJsZVNp emUpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHZhciBtYXggPSB0aGlzLl9wYXJlbnRF bGVtZW50LmNsaWVudFdpZHRoOworICAgICAgICBpZiAodHlwZW9mIHJlZmVyZW5jZVBvaW50ICE9 PSAibnVtYmVyIikKKyAgICAgICAgICAgIHJlZmVyZW5jZVBvaW50ID0gKHJpZ2h0ICsgbGVmdCkg LyAyOwogICAgICAgICBsZWZ0ID0gTWF0aC5tYXgoMCwgTWF0aC5taW4obWF4IC0gZGVsdGEsIHJl ZmVyZW5jZVBvaW50ICsgKGxlZnQgLSByZWZlcmVuY2VQb2ludCkgKiBmYWN0b3IpKTsKICAgICAg ICAgcmlnaHQgPSBNYXRoLm1pbihtYXgsIGxlZnQgKyBkZWx0YSk7CiAgICAgICAgIHRoaXMuX3Nl dFdpbmRvd1Bvc2l0aW9uKGxlZnQsIHJpZ2h0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yQ29tbW9uLmNzcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yQ29tbW9uLmNzcwppbmRleCAwYjRhMjhkMDRj MmM3OGFjOTBmNDZmNDU3MzgxNGI1ZWVkMmJjNjRkLi5lNzg2MmEwNzcyMDAyZmM3MjliNmY4MDYz OGZlZTVjN2RmNjc2MDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3RvckNvbW1vbi5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzCkBAIC0xNjEsNiArMTYxLDcgQEAgaWZyYW1l LnZpZXcgewogICAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIGJsYWNrOwogICAgIGJvcmRlci1s ZWZ0OiAxcHggc29saWQgYmxhY2s7CiAgICAgei1pbmRleDogMTUwOworICAgIHBvaW50ZXItZXZl bnRzOiBub25lOwogfQogCiAub3ZlcnZpZXctZ3JpZC13aW5kb3ctcmVzaXplciB7Cg== 194468 2013-03-22 01:19:07 -0700 2013-03-22 01:51:58 -0700 Patch bug-113014-20130322121454.patch text/plain 15282 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExMzc4YTQzMDViYjg2 NWQxYmY0ZmQ3OTgxZmI2NTI4NjYyMDg1Mi4uMDQyYzg2MjAxZTZmNGFmY2U5ODQ4ZDc2YzA1NzYy NzI3OWFiNTg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAzLTIyICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBGbGFtZSBDaGFydC4gbW92ZSBvdmVydmlldyB3aW5kb3cgd2hlbiB1c2VyIHNjcm9sbHMg dGhlIGNoYXJ0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEzMDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSSBmb3VuZCB0aGF0IEkgY291bGQgdXNlIHNjYWxpbmcgbWVjaGFuaWNzIGluIE92ZXJ2aWV3 R3JpZCBmb3Igc2NhbGluZyB0aGUgY2hhcnQuCisgICAgICAgIEJ1dCB0aGUgZHJhZ2dpbmcgcGFy dCB3YXMgbm90IHNvIHNpbXBsZSBkdWUgdG8gdGhlIGRpZmZlcmVudCBhcHByb2FjaGVzIGluCisg ICAgICAgIE92ZXJ2aWV3R3JpZCBhbmQgRmxhbWVDaGFydC4gT3ZlcnZpZXdHcmlkIHVzZWQgX3dp bmRvd0xlZnQgYW5kIF93aW5kb3dSaWdodAorICAgICAgICB3aGVuIEZsYW1lQ2hhcnQgdXNlZCBf eE9mZnNldCBhbmQgX3hTY2FsZUZhY3RvciBhbmQgd2lkdGguCisgICAgICAgIEl0IHdhcyBub3Qg cHJhY3RpY2FsIGFuZCBJIHJld3JvdGUgdGhlIEZsYW1lQ2hhcnQgbWVjaGFuaWNzCisgICAgICAg IGFuZCBub3cgaXQgYWxzbyB1c2VzIF93aW5kb3dMZWZ0IF93aW5kb3dSaWdodC4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5GbGFtZUNoYXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LkNhbGN1 bGF0b3IucHJvdG90eXBlLl91cGRhdGVCb3VuZGFyaWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5GbGFtZUNoYXJ0LkNhbGN1bGF0b3IucHJvdG90eXBlLmNvbXB1dGVQb3NpdGlvbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX29uV2luZG93Q2hhbmdlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX3N0YXJ0Q2FudmFz RHJhZ2dpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLl9j YW52YXNEcmFnZ2luZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5 cGUuX29uTW91c2VNb3ZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3Rv dHlwZS5fb25Nb3VzZVdoZWVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnBy b3RvdHlwZS5fY29vcmRpbmF0ZXNUb05vZGVJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RmxhbWVDaGFydC5wcm90b3R5cGUuX2RyYXdPdmVydmlld0NhbnZhcyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuZHJhdyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRmxhbWVDaGFydC5wcm90b3R5cGUuX3VwZGF0ZUJvdW5kYXJpZXMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9PdmVydmlld0dyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3Zl cnZpZXdHcmlkLnByb3RvdHlwZS5zZXRXaW5kb3dQb3NpdGlvbik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5zZXRXaW5kb3cpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUuYWRkRXZlbnRMaXN0ZW5lcik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS56b29tKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5PdmVydmlld0dyaWQuV2luZG93LnByb3RvdHlwZS5fem9vbSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzOgorICAgICAgICAoLm92 ZXJ2aWV3LWdyaWQtd2luZG93LXJ1bGVycyk6CisKIDIwMTMtMDMtMjEgIEhhamltZSBNb3JyaXRh ICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIEN1c3RvbSBFbGVtZW50czogInJlYWR5 Q2FsbGJhY2siIGxpZmVjeWNsZSBjYWxsYmFjayBzaG91bGQgYmUgY2FsbGVkLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzCmluZGV4IDM1MTQ0 NjIxMWRmZDNiYThjMjk0NDU2Y2Q3NjI4YzZhYjE1NThjNDcuLjE3MjBiZjUyYmFkMWZiZDI1ZTI5 MWM2NDI1MjExNWJlY2QwMjY0Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRmxhbWVDaGFydC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZsYW1lQ2hhcnQuanMKQEAgLTU3LDEyICs1NywxMyBAQCBXZWJJbnNwZWN0b3Iu RmxhbWVDaGFydCA9IGZ1bmN0aW9uKGNwdVByb2ZpbGVWaWV3KQogCiAgICAgdGhpcy5fY3B1UHJv ZmlsZVZpZXcgPSBjcHVQcm9maWxlVmlldzsKICAgICB0aGlzLl94U2NhbGVGYWN0b3IgPSA0LjA7 Ci0gICAgdGhpcy5feE9mZnNldCA9IDA7CisgICAgdGhpcy5fd2luZG93TGVmdCA9IDAuMDsKKyAg ICB0aGlzLl93aW5kb3dSaWdodCA9IDEuMDsKICAgICB0aGlzLl9iYXJIZWlnaHQgPSAxMDsKICAg ICB0aGlzLl9taW5XaWR0aCA9IDE7Ci0gICAgdGhpcy5fY2FudmFzLmFkZEV2ZW50TGlzdGVuZXIo Im1vdXNlbW92ZSIsIHRoaXMuX29uTW91c2VNb3ZlLmJpbmQodGhpcykpOwotICAgIHRoaXMuX2Nh bnZhcy5hZGRFdmVudExpc3RlbmVyKCJtb3VzZXdoZWVsIiwgdGhpcy5fb25Nb3VzZVdoZWVsLmJp bmQodGhpcykpOwotICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRo aXMuX29uQ2xpY2suYmluZCh0aGlzKSk7CisgICAgdGhpcy5fY2FudmFzLmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlbW92ZSIsIHRoaXMuX29uTW91c2VNb3ZlLmJpbmQodGhpcyksIGZhbHNlKTsKKyAg ICB0aGlzLl9jYW52YXMuYWRkRXZlbnRMaXN0ZW5lcigibW91c2V3aGVlbCIsIHRoaXMuX29uTW91 c2VXaGVlbC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgdGhpcy5fb25DbGljay5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhp cy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlcih0aGlzLl9j aGFydENvbnRhaW5lciwgdGhpcy5fZ2V0UG9wb3ZlckFuY2hvci5iaW5kKHRoaXMpLCB0aGlzLl9z aG93UG9wb3Zlci5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9wb3BvdmVySGVscGVyLnNldFRpbWVv dXQoMjUwKTsKICAgICB0aGlzLl9hbmNob3JFbGVtZW50ID0gdGhpcy5fY2hhcnRDb250YWluZXIu Y3JlYXRlQ2hpbGQoInNwYW4iKTsKQEAgLTg1LDkgKzg2LDkgQEAgV2ViSW5zcGVjdG9yLkZsYW1l Q2hhcnQuQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX3VwZGF0ZUJvdW5k YXJpZXM6IGZ1bmN0aW9uKGZsYW1lQ2hhcnQpCiAgICAgewotICAgICAgICB0aGlzLl94U2NhbGVG YWN0b3IgPSBmbGFtZUNoYXJ0Ll94U2NhbGVGYWN0b3I7Ci0gICAgICAgIHRoaXMuX21pbmltdW1C b3VuZGFyaWVzID0gZmxhbWVDaGFydC5feE9mZnNldCAvIHRoaXMuX3hTY2FsZUZhY3RvcjsKLSAg ICAgICAgdGhpcy5fbWF4aW11bUJvdW5kYXJpZXMgPSAoZmxhbWVDaGFydC5feE9mZnNldCArIGZs YW1lQ2hhcnQuX2NhbnZhcy53aWR0aCkgLyB0aGlzLl94U2NhbGVGYWN0b3I7CisgICAgICAgIHRo aXMuX21pbmltdW1Cb3VuZGFyaWVzID0gZmxhbWVDaGFydC5fd2luZG93TGVmdCAqIGZsYW1lQ2hh cnQuX3RpbWVsaW5lRGF0YS50b3RhbFRpbWU7CisgICAgICAgIHRoaXMuX21heGltdW1Cb3VuZGFy aWVzID0gZmxhbWVDaGFydC5fd2luZG93UmlnaHQgKiBmbGFtZUNoYXJ0Ll90aW1lbGluZURhdGEu dG90YWxUaW1lOworICAgICAgICB0aGlzLl90aW1lVG9QaXhlbCA9IGZsYW1lQ2hhcnQuX2NhbnZh cy53aWR0aCAvIHRoaXMuYm91bmRhcnlTcGFuKCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtOTUs NyArOTYsNyBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5DYWxjdWxhdG9yLnByb3RvdHlwZSA9 IHsKICAgICAgKi8KICAgICBjb21wdXRlUG9zaXRpb246IGZ1bmN0aW9uKHRpbWUpCiAgICAgewot ICAgICAgICByZXR1cm4gKHRpbWUgLSB0aGlzLl9taW5pbXVtQm91bmRhcmllcykgKiB0aGlzLl94 U2NhbGVGYWN0b3I7CisgICAgICAgIHJldHVybiAodGltZSAtIHRoaXMuX21pbmltdW1Cb3VuZGFy aWVzKSAqIHRoaXMuX3RpbWVUb1BpeGVsOwogICAgIH0sCiAKICAgICBmb3JtYXRUaW1lOiBmdW5j dGlvbih2YWx1ZSkKQEAgLTE3NCw5ICsxNzUsNiBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5F dmVudHMgPSB7CiBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUgPSB7CiAgICAgX29u V2luZG93Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgdGltZUlu dGVydmFsV2lkdGggPSB0aGlzLl90aW1lbGluZURhdGEudG90YWxUaW1lICogKGV2ZW50LnRhcmdl dC53aW5kb3dSaWdodCAtIGV2ZW50LnRhcmdldC53aW5kb3dMZWZ0KTsKLSAgICAgICAgdGhpcy5f eFNjYWxlRmFjdG9yID0gdGhpcy5fY2FudmFzLndpZHRoIC8gdGltZUludGVydmFsV2lkdGg7Ci0g ICAgICAgIHRoaXMuX3hPZmZzZXQgPSB0aGlzLl90aW1lbGluZURhdGEudG90YWxUaW1lICogZXZl bnQudGFyZ2V0LndpbmRvd0xlZnQgKiB0aGlzLl94U2NhbGVGYWN0b3I7CiAgICAgICAgIHRoaXMu X2hpZGVQb3BvdmVyKCk7CiAgICAgICAgIHRoaXMuX3NjaGVkdWxlVXBkYXRlKCk7CiAgICAgfSwK QEAgLTE4NywzMiArMTg1LDI4IEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgdGhpcy5faXNEcmFnZ2luZyA9 IHRydWU7CiAgICAgICAgIHRoaXMuX2RyYWdTdGFydFBvaW50ID0gZXZlbnQucGFnZVg7Ci0gICAg ICAgIHRoaXMuX2RyYWdTdGFydFhPZmZzZXQgPSB0aGlzLl94T2Zmc2V0OworICAgICAgICB0aGlz Ll9kcmFnU3RhcnRXaW5kb3dMZWZ0ID0gdGhpcy5fd2luZG93TGVmdDsKKyAgICAgICAgdGhpcy5f ZHJhZ1N0YXJ0V2luZG93UmlnaHQgPSB0aGlzLl93aW5kb3dSaWdodDsKICAgICAgICAgdGhpcy5f aGlkZVBvcG92ZXIoKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAotICAgIF9tYXhY T2Zmc2V0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX3RpbWVsaW5lRGF0 YSkKLSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAgICB2YXIgbWF4WE9mZnNldCA9IE1hdGgu Zmxvb3IodGhpcy5fdGltZWxpbmVEYXRhLnRvdGFsVGltZSAqIHRoaXMuX3hTY2FsZUZhY3RvciAt IHRoaXMuX2NhbnZhcy53aWR0aCk7Ci0gICAgICAgIHJldHVybiBtYXhYT2Zmc2V0ID4gMCA/IG1h eFhPZmZzZXQgOiAwOwotICAgIH0sCi0KLSAgICBfc2V0WE9mZnNldDogZnVuY3Rpb24oeE9mZnNl dCkKKyAgICBfY2FudmFzRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAg eE9mZnNldCA9IE51bWJlci5jb25zdHJhaW4oeE9mZnNldCwgMCwgdGhpcy5fbWF4WE9mZnNldCgp KTsKKyAgICAgICAgdmFyIHBpeGVsU2hpZnQgPSB0aGlzLl9kcmFnU3RhcnRQb2ludCAtIGV2ZW50 LnBhZ2VYOworICAgICAgICB2YXIgd2luZG93U2hpZnQgPSBwaXhlbFNoaWZ0IC8gdGhpcy5fdG90 YWxQaXhlbHM7CiAKLSAgICAgICAgaWYgKHhPZmZzZXQgIT09IHRoaXMuX3hPZmZzZXQpIHsKLSAg ICAgICAgICAgIHRoaXMuX3hPZmZzZXQgPSB4T2Zmc2V0OwotICAgICAgICAgICAgdGhpcy5fc2No ZWR1bGVVcGRhdGUoKTsKLSAgICAgICAgfQotICAgIH0sCisgICAgICAgIHZhciB3aW5kb3dMZWZ0 ID0gTWF0aC5tYXgoMCwgdGhpcy5fZHJhZ1N0YXJ0V2luZG93TGVmdCArIHdpbmRvd1NoaWZ0KTsK KyAgICAgICAgaWYgKHdpbmRvd0xlZnQgPT09IHRoaXMuX3dpbmRvd0xlZnQpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIHdpbmRvd1NoaWZ0ID0gd2luZG93TGVmdCAtIHRoaXMuX2RyYWdT dGFydFdpbmRvd0xlZnQ7CisgICAgICAgIAorICAgICAgICB2YXIgd2luZG93UmlnaHQgPSBNYXRo Lm1pbigxLCB0aGlzLl9kcmFnU3RhcnRXaW5kb3dSaWdodCArIHdpbmRvd1NoaWZ0KTsKKyAgICAg ICAgaWYgKHdpbmRvd1JpZ2h0ID09PSB0aGlzLl93aW5kb3dSaWdodCkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgd2luZG93U2hpZnQgPSB3aW5kb3dSaWdodCAtIHRoaXMuX2RyYWdTdGFy dFdpbmRvd1JpZ2h0OwogCi0gICAgX2NhbnZhc0RyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKLSAg ICB7Ci0gICAgICAgIHRoaXMuX3NldFhPZmZzZXQodGhpcy5fZHJhZ1N0YXJ0WE9mZnNldCArIHRo aXMuX2RyYWdTdGFydFBvaW50IC0gZXZlbnQucGFnZVgpOworICAgICAgICB0aGlzLl9vdmVydmll d0dyaWQuc2V0V2luZG93KHRoaXMuX2RyYWdTdGFydFdpbmRvd0xlZnQgKyB3aW5kb3dTaGlmdCwg dGhpcy5fZHJhZ1N0YXJ0V2luZG93UmlnaHQgKyB3aW5kb3dTaGlmdCk7CiAgICAgfSwKIAogICAg IF9lbmRDYW52YXNEcmFnZ2luZzogZnVuY3Rpb24oKQpAQCAtMzY3LDEwICszNjEsMTAgQEAgV2Vi SW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciB0aW1lbGlu ZURhdGEgPSB0aGlzLl90aW1lbGluZURhdGE7CiAKLSAgICAgICAgdmFyIGFuY2hvckxlZnQgPSBN YXRoLmZsb29yKHRpbWVsaW5lRGF0YS5zdGFydFRpbWVzW25vZGVJbmRleF0gKiB0aGlzLl94U2Nh bGVGYWN0b3IgLSB0aGlzLl94T2Zmc2V0KTsKKyAgICAgICAgdmFyIGFuY2hvckxlZnQgPSBNYXRo LmZsb29yKHRpbWVsaW5lRGF0YS5zdGFydFRpbWVzW25vZGVJbmRleF0gKiB0aGlzLl90aW1lVG9Q aXhlbCAtIHRoaXMuX3BpeGVsV2luZG93TGVmdCk7CiAgICAgICAgIGFuY2hvckxlZnQgPSBOdW1i ZXIuY29uc3RyYWluKGFuY2hvckxlZnQsIDAsIHRoaXMuX2NhbnZhcy53aWR0aCk7CiAKLSAgICAg ICAgdmFyIGFuY2hvcldpZHRoID0gTWF0aC5mbG9vcih0aW1lbGluZURhdGEuZHVyYXRpb25zW25v ZGVJbmRleF0gKiB0aGlzLl94U2NhbGVGYWN0b3IpOworICAgICAgICB2YXIgYW5jaG9yV2lkdGgg PSBNYXRoLmZsb29yKHRpbWVsaW5lRGF0YS5kdXJhdGlvbnNbbm9kZUluZGV4XSAqIHRoaXMuX3Rp bWVUb1BpeGVsKTsKICAgICAgICAgYW5jaG9yV2lkdGggPSBOdW1iZXIuY29uc3RyYWluKGFuY2hv cldpZHRoLCAwLCB0aGlzLl9jYW52YXMud2lkdGggLSBhbmNob3JMZWZ0KTsKIAogICAgICAgICB2 YXIgc3R5bGUgPSB0aGlzLl9hbmNob3JFbGVtZW50LnN0eWxlOwpAQCAtMzgwLDMzICszNzQsMTEg QEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICBzdHlsZS50 b3AgPSBNYXRoLmZsb29yKHRoaXMuX2NhbnZhcy5oZWlnaHQgLSAodGltZWxpbmVEYXRhLmRlcHRo c1tub2RlSW5kZXhdICsgMSkgKiB0aGlzLl9iYXJIZWlnaHQpICsgInB4IjsKICAgICB9LAogCi0g ICAgX2FkanVzdFhPZmZzZXQ6IGZ1bmN0aW9uKGRpcmVjdGlvbikKLSAgICB7Ci0gICAgICAgIHZh ciBzdGVwID0gdGhpcy5feFNjYWxlRmFjdG9yICogNTsKLSAgICAgICAgdGhpcy5fc2V0WE9mZnNl dCh0aGlzLl94T2Zmc2V0ICsgKGRpcmVjdGlvbiA+IDAgPyBzdGVwIDogLXN0ZXApKTsKLSAgICB9 LAotCi0gICAgX2FkanVzdFhTY2FsZTogZnVuY3Rpb24oZGlyZWN0aW9uLCB4KQotICAgIHsKLSAg ICAgICAgdmFyIGN1cnNvclRpbWUgPSAoeCArIHRoaXMuX3hPZmZzZXQpIC8gdGhpcy5feFNjYWxl RmFjdG9yOwotCi0gICAgICAgIGlmIChkaXJlY3Rpb24gPCAwKQotICAgICAgICAgICAgdGhpcy5f eFNjYWxlRmFjdG9yIC89IDI7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMuX3hTY2Fs ZUZhY3RvciAqPSAyOwotCi0gICAgICAgIHRoaXMuX3NldFhPZmZzZXQoTWF0aC5mbG9vcihjdXJz b3JUaW1lICogdGhpcy5feFNjYWxlRmFjdG9yIC0geCkpOwotICAgIH0sCi0KICAgICBfb25Nb3Vz ZVdoZWVsOiBmdW5jdGlvbihlKQogICAgIHsKLSAgICAgICAgaWYgKCFlLnNoaWZ0S2V5KQotICAg ICAgICAgICAgdGhpcy5fYWRqdXN0WFNjYWxlKGUud2hlZWxEZWx0YSwgZS5vZmZzZXRYKTsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fYWRqdXN0WE9mZnNldChlLndoZWVsRGVsdGEp OwotCisgICAgICAgIHZhciB6b29tRmFjdG9yID0gKGUud2hlZWxEZWx0YSA+IDApID8gMC45IDog MS4xOworICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuem9vbSh6b29tRmFjdG9yKTsKICAgICAg ICAgdGhpcy5faGlkZVBvcG92ZXIoKTsKLSAgICAgICAgdGhpcy5fc2NoZWR1bGVVcGRhdGUoKTsK ICAgICB9LAogCiAgICAgLyoqCkBAIC00MTgsNyArMzkwLDcgQEAgV2ViSW5zcGVjdG9yLkZsYW1l Q2hhcnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdGltZWxpbmVEYXRhID0gdGhpcy5fdGlt ZWxpbmVEYXRhOwogICAgICAgICBpZiAoIXRpbWVsaW5lRGF0YSkKICAgICAgICAgICAgIHJldHVy biAtMTsKLSAgICAgICAgdmFyIGN1cnNvclRpbWUgPSAoeCArIHRoaXMuX3hPZmZzZXQpIC8gdGhp cy5feFNjYWxlRmFjdG9yOworICAgICAgICB2YXIgY3Vyc29yVGltZSA9IE1hdGguZmxvb3IoKHgg KyB0aGlzLl9waXhlbFdpbmRvd0xlZnQpICogdGhpcy5fcGl4ZWxUb1RpbWUpOwogICAgICAgICB2 YXIgY3Vyc29yTGV2ZWwgPSBNYXRoLmZsb29yKCh0aGlzLl9jYW52YXMuaGVpZ2h0IC0geSkgLyB0 aGlzLl9iYXJIZWlnaHQpOwogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGltZWxpbmVE YXRhLm5vZGVDb3VudDsgKytpKSB7CkBAIC00NTEsNyArNDIzLDcgQEAgV2ViSW5zcGVjdG9yLkZs YW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc3RhcnRUaW1lcyA9IHRoaXMuX3Rp bWVsaW5lRGF0YS5zdGFydFRpbWVzOwogICAgICAgICB2YXIgZHVyYXRpb25zID0gdGhpcy5fdGlt ZWxpbmVEYXRhLmR1cmF0aW9uczsKICAgICAgICAgdmFyIGRyYXdEYXRhID0gbmV3IFVpbnQ4QXJy YXkod2lkdGgpOwotICAgICAgICB2YXIgc2NhbGVGYWN0b3IgPSB3aWR0aCAvIHRoaXMuX3RpbWVs aW5lRGF0YS50b3RhbFRpbWU7CisgICAgICAgIHZhciBzY2FsZUZhY3RvciA9IHdpZHRoIC8gdGhp cy5fdG90YWxUaW1lOwogCiAgICAgICAgIGZvciAodmFyIG5vZGVJbmRleCA9IDA7IG5vZGVJbmRl eCA8IG5vZGVDb3VudDsgKytub2RlSW5kZXgpIHsKICAgICAgICAgICAgIHZhciBzdGFydCA9IE1h dGguZmxvb3Ioc3RhcnRUaW1lc1tub2RlSW5kZXhdICogc2NhbGVGYWN0b3IpOwpAQCAtNDg2LDIw ICs0NTgsMTkgQEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9jYW52YXMuaGVpZ2h0ID0gaGVpZ2h0OwogICAg ICAgICB0aGlzLl9jYW52YXMud2lkdGggPSB3aWR0aDsKLSAgICAgICAgdmFyIHhTY2FsZUZhY3Rv ciA9IHRoaXMuX3hTY2FsZUZhY3RvcjsKICAgICAgICAgdmFyIGJhckhlaWdodCA9IHRoaXMuX2Jh ckhlaWdodDsKLSAgICAgICAgdmFyIHhPZmZzZXQgPSB0aGlzLl94T2Zmc2V0OwogCiAgICAgICAg IHZhciBjb250ZXh0ID0gdGhpcy5fY2FudmFzLmdldENvbnRleHQoIjJkIik7CiAKICAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCB0aW1lbGluZURhdGEubm9kZUNvdW50OyArK2kpIHsKLSAgICAg ICAgICAgIHZhciB4ID0gTWF0aC5mbG9vcih0aW1lbGluZURhdGEuc3RhcnRUaW1lc1tpXSAqIHhT Y2FsZUZhY3RvcikgLSB4T2Zmc2V0OwotICAgICAgICAgICAgaWYgKHggPiB3aWR0aCkKKyAgICAg ICAgICAgIHZhciBzdGFydFRpbWUgPSB0aW1lbGluZURhdGEuc3RhcnRUaW1lc1tpXTsKKyAgICAg ICAgICAgIGlmIChzdGFydFRpbWUgPiB0aGlzLl90aW1lV2luZG93UmlnaHQpCiAgICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB2YXIgeSA9IGhlaWdodCAtICh0aW1lbGluZURhdGEu ZGVwdGhzW2ldICsgMSkgKiBiYXJIZWlnaHQ7Ci0gICAgICAgICAgICB2YXIgYmFyV2lkdGggPSBN YXRoLmZsb29yKHRpbWVsaW5lRGF0YS5kdXJhdGlvbnNbaV0gKiB4U2NhbGVGYWN0b3IpOwotICAg ICAgICAgICAgaWYgKHggKyBiYXJXaWR0aCA8IDApCisgICAgICAgICAgICBpZiAoKHN0YXJ0VGlt ZSArIHRpbWVsaW5lRGF0YS5kdXJhdGlvbnNbaV0pIDwgdGhpcy5fdGltZVdpbmRvd0xlZnQpCiAg ICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB2YXIgeCA9IE1hdGguZmxvb3Io c3RhcnRUaW1lICogdGhpcy5fdGltZVRvUGl4ZWwpIC0gdGhpcy5fcGl4ZWxXaW5kb3dMZWZ0Owor ICAgICAgICAgICAgdmFyIHkgPSBoZWlnaHQgLSAodGltZWxpbmVEYXRhLmRlcHRoc1tpXSArIDEp ICogYmFySGVpZ2h0OworICAgICAgICAgICAgdmFyIGJhcldpZHRoID0gTWF0aC5mbG9vcih0aW1l bGluZURhdGEuZHVyYXRpb25zW2ldICogdGhpcy5fdGltZVRvUGl4ZWwpOwogICAgICAgICAgICAg aWYgKGJhcldpZHRoIDwgdGhpcy5fbWluV2lkdGgpCiAgICAgICAgICAgICAgICAgY29udGludWU7 CiAKQEAgLTUyMywxOCArNDk0LDQwIEBAIFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0LnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fdXBkYXRlVGltZXJJZCA9 IHNldFRpbWVvdXQodGhpcy51cGRhdGUuYmluZCh0aGlzKSwgMTApOwogICAgIH0sCisgICAgCisg ICAgX3VwZGF0ZUJvdW5kYXJpZXM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3dp bmRvd0xlZnQgPSB0aGlzLl9vdmVydmlld0dyaWQud2luZG93TGVmdCgpOworICAgICAgICB0aGlz Ll93aW5kb3dSaWdodCA9IHRoaXMuX292ZXJ2aWV3R3JpZC53aW5kb3dSaWdodCgpOworICAgICAg ICB0aGlzLl93aW5kb3dXaWR0aCA9IHRoaXMuX3dpbmRvd1JpZ2h0IC0gdGhpcy5fd2luZG93TGVm dDsKKworICAgICAgICB0aGlzLl90b3RhbFRpbWUgPSB0aGlzLl90aW1lbGluZURhdGEudG90YWxU aW1lOworICAgICAgICB0aGlzLl90aW1lV2luZG93TGVmdCA9IHRoaXMuX3dpbmRvd0xlZnQgKiB0 aGlzLl90b3RhbFRpbWU7CisgICAgICAgIHRoaXMuX3RpbWVXaW5kb3dSaWdodCA9IHRoaXMuX3dp bmRvd1JpZ2h0ICogdGhpcy5fdG90YWxUaW1lOworCisgICAgICAgIHRoaXMuX3BpeGVsV2luZG93 V2lkdGggPSB0aGlzLl9jaGFydENvbnRhaW5lci5jbGllbnRXaWR0aDsKKyAgICAgICAgdGhpcy5f dG90YWxQaXhlbHMgPSBNYXRoLmZsb29yKHRoaXMuX3BpeGVsV2luZG93V2lkdGggLyB0aGlzLl93 aW5kb3dXaWR0aCk7CisgICAgICAgIHRoaXMuX3BpeGVsV2luZG93TGVmdCA9IE1hdGguZmxvb3Io dGhpcy5fdG90YWxQaXhlbHMgKiB0aGlzLl93aW5kb3dMZWZ0KTsKKyAgICAgICAgdGhpcy5fcGl4 ZWxXaW5kb3dSaWdodCA9IE1hdGguZmxvb3IodGhpcy5fdG90YWxQaXhlbHMgKiB0aGlzLl93aW5k b3dSaWdodCk7CisKKyAgICAgICAgdGhpcy5fdGltZVRvUGl4ZWwgPSB0aGlzLl90b3RhbFBpeGVs cyAvIHRoaXMuX3RvdGFsVGltZTsKKyAgICAgICAgdGhpcy5fcGl4ZWxUb1RpbWUgPSB0aGlzLl90 b3RhbFRpbWUgLyB0aGlzLl90b3RhbFBpeGVsczsKKyAgICB9LAogCiAgICAgdXBkYXRlOiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl91cGRhdGVUaW1lcklkID0gMDsKKyAgICAgICAg aWYgKCF0aGlzLl90aW1lbGluZURhdGEpCisgICAgICAgICAgICB0aGlzLl9jYWxjdWxhdGVUaW1l bGluZURhdGEoKTsKKyAgICAgICAgaWYgKCF0aGlzLl90aW1lbGluZURhdGEpCisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIHRoaXMuX3VwZGF0ZUJvdW5kYXJpZXMoKTsKICAgICAgICAgdGhp cy5kcmF3KHRoaXMuX2NoYXJ0Q29udGFpbmVyLmNsaWVudFdpZHRoLCB0aGlzLl9jaGFydENvbnRh aW5lci5jbGllbnRIZWlnaHQpOwotICAgICAgICBpZiAodGhpcy5fdGltZWxpbmVEYXRhKSB7Ci0g ICAgICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLl91cGRhdGVCb3VuZGFyaWVzKHRoaXMpOwotICAg ICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLl91cGRhdGVCb3VuZGFyaWVzKHRoaXMp OwotICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVHcmlkLmVsZW1lbnQuc3R5bGUud2lkdGggPSB0 aGlzLmVsZW1lbnQuY2xpZW50V2lkdGg7Ci0gICAgICAgICAgICB0aGlzLl90aW1lbGluZUdyaWQu dXBkYXRlRGl2aWRlcnModGhpcy5fY2FsY3VsYXRvcik7Ci0gICAgICAgICAgICB0aGlzLl9vdmVy dmlld0dyaWQudXBkYXRlRGl2aWRlcnModGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yKTsKLSAgICAg ICAgfQorICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLl91cGRhdGVCb3VuZGFyaWVzKHRoaXMpOwor ICAgICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IuX3VwZGF0ZUJvdW5kYXJpZXModGhpcyk7 CisgICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC5lbGVtZW50LnN0eWxlLndpZHRoID0gdGhpcy5l bGVtZW50LmNsaWVudFdpZHRoOworICAgICAgICB0aGlzLl90aW1lbGluZUdyaWQudXBkYXRlRGl2 aWRlcnModGhpcy5fY2FsY3VsYXRvcik7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC51cGRh dGVEaXZpZGVycyh0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IpOwogICAgICAgICBpZiAodGhpcy5f dXBkYXRlT3ZlcnZpZXdDYW52YXMpIHsKICAgICAgICAgICAgIHRoaXMuX2RyYXdPdmVydmlld0Nh bnZhcyh0aGlzLl9vdmVydmlld0NvbnRhaW5lci5jbGllbnRXaWR0aCwgdGhpcy5fb3ZlcnZpZXdD b250YWluZXIuY2xpZW50SGVpZ2h0KTsKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZU92ZXJ2aWV3 Q2FudmFzID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL092ZXJ2aWV3R3JpZC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvT3ZlcnZpZXdHcmlkLmpzCmluZGV4IDI4MDZiOWE4ZmQ5ZDQ4ZTM4YjE5NzBhZDhhN2MyMWY5 MTMxMjc2YzcuLjliNjRhYTdjZTNkNjRlZTQyMzc5N2NjNjRhYzc3ZGYyN2E3NTlmMjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnZpZXdHcmlkLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnZpZXdHcmlkLmpz CkBAIC0xNDgsNiArMTQ4LDE0IEBAIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBl ID0gewogICAgIGFkZEV2ZW50TGlzdGVuZXI6IGZ1bmN0aW9uKGV2ZW50VHlwZSwgbGlzdGVuZXIs IHRoaXNPYmplY3QpCiAgICAgewogICAgICAgICB0aGlzLl93aW5kb3cuYWRkRXZlbnRMaXN0ZW5l cihldmVudFR5cGUsIGxpc3RlbmVyLCB0aGlzT2JqZWN0KTsKKyAgICB9LAorCisgICAgLyoqCisg ICAgICogQHBhcmFtIHshbnVtYmVyfSB6b29tRmFjdG9yCisgICAgICovCisgICAgem9vbTogZnVu Y3Rpb24oem9vbUZhY3RvcikKKyAgICB7CisgICAgICAgIHRoaXMuX3dpbmRvdy5fem9vbSh6b29t RmFjdG9yKTsKICAgICB9CiB9CiAKQEAgLTQyOCw3ICs0MzYsNyBAQCBXZWJJbnNwZWN0b3IuT3Zl cnZpZXdHcmlkLldpbmRvdy5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0g e251bWJlcn0gZmFjdG9yCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IHJlZmVyZW5jZVBvaW50Cisg ICAgICogQHBhcmFtIHtudW1iZXI9fSByZWZlcmVuY2VQb2ludAogICAgICAqLwogICAgIF96b29t OiBmdW5jdGlvbihmYWN0b3IsIHJlZmVyZW5jZVBvaW50KQogICAgIHsKQEAgLTQzOSw2ICs0NDcs OCBAQCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLldpbmRvdy5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGlmIChmYWN0b3IgPCAxICYmIGRlbHRhIDwgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5N aW5TZWxlY3RhYmxlU2l6ZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIG1heCA9 IHRoaXMuX3BhcmVudEVsZW1lbnQuY2xpZW50V2lkdGg7CisgICAgICAgIGlmICh0eXBlb2YgcmVm ZXJlbmNlUG9pbnQgIT09ICJudW1iZXIiKQorICAgICAgICAgICAgcmVmZXJlbmNlUG9pbnQgPSAo cmlnaHQgKyBsZWZ0KSAvIDI7CiAgICAgICAgIGxlZnQgPSBNYXRoLm1heCgwLCBNYXRoLm1pbiht YXggLSBkZWx0YSwgcmVmZXJlbmNlUG9pbnQgKyAobGVmdCAtIHJlZmVyZW5jZVBvaW50KSAqIGZh Y3RvcikpOwogICAgICAgICByaWdodCA9IE1hdGgubWluKG1heCwgbGVmdCArIGRlbHRhKTsKICAg ICAgICAgdGhpcy5fc2V0V2luZG93UG9zaXRpb24obGVmdCwgcmlnaHQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JDb21tb24uY3NzCmlu ZGV4IDBiNGEyOGQwNGMyYzc4YWM5MGY0NmY0NTczODE0YjVlZWQyYmM2NGQuLmU3ODYyYTA3NzIw MDJmYzcyOWI2ZjgwNjM4ZmVlNWM3ZGY2NzYwMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yQ29tbW9uLmNzcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3RvckNvbW1vbi5jc3MKQEAgLTE2MSw2ICsx NjEsNyBAQCBpZnJhbWUudmlldyB7CiAgICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgYmxhY2s7 CiAgICAgYm9yZGVyLWxlZnQ6IDFweCBzb2xpZCBibGFjazsKICAgICB6LWluZGV4OiAxNTA7Cisg ICAgcG9pbnRlci1ldmVudHM6IG5vbmU7CiB9CiAKIC5vdmVydmlldy1ncmlkLXdpbmRvdy1yZXNp emVyIHsK