152656 2016-01-02 16:26:55 -0800 Minor cleanup in ScrollAnimator 2016-01-03 12:07:11 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin commit-queue simon.fraser thorton zalan oldest_to_newest 1152045 0 simon.fraser 2016-01-02 16:26:55 -0800 Minor cleanup in ScrollAnimator 1152046 1 268119 simon.fraser 2016-01-02 16:28:17 -0800 Created attachment 268119 Patch 1152047 2 268120 simon.fraser 2016-01-02 16:32:16 -0800 Created attachment 268120 Patch 1152052 3 268121 simon.fraser 2016-01-02 16:54:17 -0800 Created attachment 268121 Patch 1152140 4 268121 commit-queue 2016-01-03 12:07:07 -0800 Comment on attachment 268121 Patch Clearing flags on attachment: 268121 Committed r194516: <http://trac.webkit.org/changeset/194516> 1152141 5 commit-queue 2016-01-03 12:07:11 -0800 All reviewed patches have been landed. Closing bug. 268119 2016-01-02 16:28:17 -0800 2016-01-02 16:32:13 -0800 Patch bug-152656-20160102162743.patch text/plain 9712 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU3NWM4NmRlMGRlOGI2 NjE4ZDQ3MjNhZjYwYmRlMDZlMjRhOTY2MS4uYmE0M2ZhNjQyZjVlZjBhMzAwMTM3ZmE1ZDJkMDkw OGJjYzYwYTc2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE2LTAxLTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1pbm9yIGNsZWFu dXAgaW4gU2Nyb2xsQW5pbWF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MjY1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENoYW5nZSBTY3JvbGxBbmltYXRvcidzIG1fY3VycmVudFBvc1gvbV9jdXJy ZW50UG9zWSB0byBiZSBhIEZsb2F0UG9pbnQsIGFuZAorICAgICAgICBmaXggY29kZSB0aGF0IHVz ZXMgaXQuCisgICAgICAgIAorICAgICAgICBEbyBvZmZzZXQgLT4gcG9zaXRpb24gY29udmVyc2lv biBpbiBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKCkuCisg ICAgICAgIFRoaXMgaXMgYSBiZWhhdmlvciBjaGFuZ2UsIGJ1dCBJIGNvdWxkIG5ldmVyIGhpdCB0 aGlzIGNvZGUgb24gTWFjLgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnNjcm9sbCk6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzZXRDdXJyZW50UG9zaXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnVwZGF0ZUFjdGl2ZVNjcm9sbFNuYXBJ bmRleEZvck9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6bm90aWZ5 UG9zaXRpb25DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzY3Jv bGxPZmZzZXRPbkF4aXMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OlNjcm9s bEFuaW1hdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpj dXJyZW50UG9zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6U2Nyb2xsQW5pbWF0b3I6 OmN1cnJlbnRQb3NpdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9y TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbCk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6aW1tZWRpYXRlU2Nyb2xsVG9Qb3Np dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6aW1tZWRpYXRlU2Ny b2xsQnkpOgorCisyMDE2LTAxLTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCiAgICAgICAgIFNvbWUgY2xlYW51cCBpbiBTY3JvbGxBbmltYXRvcgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjQ5CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAppbmRleCAwODU0MTFhYzUzNTMyYjdl MjkyNzc5YWJmMDExZWVjYjA2ZjZkNGIzLi41NmU1ZWExOGYwZmMzMzk2ZmU0ZDY1MDU3MTY2MTNi ZWUxYTllMWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmlt YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3Bw CkBAIC01Miw4ICs1Miw2IEBAIFNjcm9sbEFuaW1hdG9yOjpTY3JvbGxBbmltYXRvcihTY3JvbGxh YmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEpCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkgfHwg RU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogICAgICwgbV9zY3JvbGxDb250cm9sbGVyKCp0aGlzKQog I2VuZGlmCi0gICAgLCBtX2N1cnJlbnRQb3NYKDApCi0gICAgLCBtX2N1cnJlbnRQb3NZKDApCiB7 CiB9CiAKQEAgLTYzLDcgKzYxLDcgQEAgU2Nyb2xsQW5pbWF0b3I6On5TY3JvbGxBbmltYXRvcigp CiAKIGJvb2wgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmll bnRhdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IHN0ZXAsIGZsb2F0IG11bHRpcGxpZXIp CiB7Ci0gICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24obV9jdXJyZW50UG9zWCwgbV9jdXJy ZW50UG9zWSk7CisgICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24gPSBtX2N1cnJlbnRTY3Jv bGxQb3NpdGlvbjsKICAgICBGbG9hdFNpemUgZGVsdGE7CiAgICAgaWYgKG9yaWVudGF0aW9uID09 IEhvcml6b250YWxTY3JvbGxiYXIpCiAgICAgICAgIGRlbHRhLnNldFdpZHRoKHN0ZXAgKiBtdWx0 aXBsaWVyKTsKQEAgLTc0LDkgKzcyLDcgQEAgYm9vbCBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsKFNj cm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBTY3JvbGxHcmFudWxhcml0eSwKICAgICBp ZiAoY3VycmVudFBvc2l0aW9uID09IG5ld1Bvc2l0aW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICAvLyBGSVhNRTogbV9jdXJyZW50UG9zWC9ZIHNob3VsZCBqdXN0IGJlIGEgRmxvYXRQ b2ludC4KLSAgICBtX2N1cnJlbnRQb3NYID0gbmV3UG9zaXRpb24ueCgpOwotICAgIG1fY3VycmVu dFBvc1kgPSBuZXdQb3NpdGlvbi55KCk7CisgICAgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBu ZXdQb3NpdGlvbjsKIAogICAgIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZChuZXdQb3NpdGlvbiAtIGN1 cnJlbnRQb3NpdGlvbik7CiAgICAgcmV0dXJuIHRydWU7CkBAIC04NCw5ICs4MCw5IEBAIGJvb2wg U2Nyb2xsQW5pbWF0b3I6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwg U2Nyb2xsR3JhbnVsYXJpdHksCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbFRvT2Zmc2V0 V2l0aG91dEFuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBvZmZzZXQpCiB7Ci0gICAgRmxvYXRT aXplIGRlbHRhID0gRmxvYXRTaXplKG9mZnNldC54KCkgLSBtX2N1cnJlbnRQb3NYLCBvZmZzZXQu eSgpIC0gbV9jdXJyZW50UG9zWSk7Ci0gICAgbV9jdXJyZW50UG9zWCA9IG9mZnNldC54KCk7Ci0g ICAgbV9jdXJyZW50UG9zWSA9IG9mZnNldC55KCk7CisgICAgRmxvYXRQb2ludCBuZXdQb3NpdG9u ID0gU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChvZmZzZXQsIHRvRmxv YXRTaXplKG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsT3JpZ2luKCkpKTsKKyAgICBGbG9hdFNpemUg ZGVsdGEgPSBuZXdQb3NpdG9uIC0gbV9jdXJyZW50U2Nyb2xsUG9zaXRpb247CisgICAgbV9jdXJy ZW50U2Nyb2xsUG9zaXRpb24gPSBuZXdQb3NpdG9uOwogICAgIG5vdGlmeVBvc2l0aW9uQ2hhbmdl ZChkZWx0YSk7CiAgICAgdXBkYXRlQWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yT2Zmc2V0KCk7CiB9 CkBAIC0xNzcsMjAgKzE3MywxNCBAQCBib29sIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVUb3VjaEV2 ZW50KGNvbnN0IFBsYXRmb3JtVG91Y2hFdmVudCYpCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnNl dEN1cnJlbnRQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvbikKIHsKLSAgICBtX2N1 cnJlbnRQb3NYID0gcG9zaXRpb24ueCgpOwotICAgIG1fY3VycmVudFBvc1kgPSBwb3NpdGlvbi55 KCk7CisgICAgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBwb3NpdGlvbjsKICAgICB1cGRhdGVB Y3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JPZmZzZXQoKTsKIH0KIAotRmxvYXRQb2ludCBTY3JvbGxB bmltYXRvcjo6Y3VycmVudFBvc2l0aW9uKCkgY29uc3QKLXsKLSAgICByZXR1cm4gRmxvYXRQb2lu dChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKLX0KLQogdm9pZCBTY3JvbGxBbmltYXRv cjo6dXBkYXRlQWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yT2Zmc2V0KCkKIHsKICNpZiBFTkFCTEUo Q1NTX1NDUk9MTF9TTkFQKQotICAgIG1fc2Nyb2xsQ29udHJvbGxlci5zZXRBY3RpdmVTY3JvbGxT bmFwSW5kaWNlc0Zvck9mZnNldChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKKyAgICBt X3Njcm9sbENvbnRyb2xsZXIuc2V0QWN0aXZlU2Nyb2xsU25hcEluZGljZXNGb3JPZmZzZXQobV9j dXJyZW50U2Nyb2xsUG9zaXRpb24ueCgpLCBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbi55KCkpOwog ICAgIGlmIChtX3Njcm9sbENvbnRyb2xsZXIuYWN0aXZlU2Nyb2xsU25hcEluZGV4RGlkQ2hhbmdl KCkpIHsKICAgICAgICAgbV9zY3JvbGxhYmxlQXJlYS5zZXRDdXJyZW50SG9yaXpvbnRhbFNuYXBQ b2ludEluZGV4KG1fc2Nyb2xsQ29udHJvbGxlci5hY3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JBeGlz KFNjcm9sbEV2ZW50QXhpczo6SG9yaXpvbnRhbCkpOwogICAgICAgICBtX3Njcm9sbGFibGVBcmVh LnNldEN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludEluZGV4KG1fc2Nyb2xsQ29udHJvbGxlci5hY3Rp dmVTY3JvbGxTbmFwSW5kZXhGb3JBeGlzKFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWwpKTsKQEAg LTIwMiw3ICsxOTIsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yOjpub3RpZnlQb3NpdGlvbkNoYW5n ZWQoY29uc3QgRmxvYXRTaXplJiBkZWx0YSkKIHsKICAgICBVTlVTRURfUEFSQU0oZGVsdGEpOwog ICAgIC8vIEZJWE1FOiBuZWVkIHRvIG5vdCBtYXAgYmFjayBhbmQgZm9ydGggYWxsIHRoZSB0aW1l LgotICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2V0U2Nyb2xsT2Zmc2V0RnJvbUFuaW1hdGlvbihtX3Nj cm9sbGFibGVBcmVhLnNjcm9sbE9mZnNldEZyb21Qb3NpdGlvbihJbnRQb2ludChtX2N1cnJlbnRQ b3NYLCBtX2N1cnJlbnRQb3NZKSkpOworICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2V0U2Nyb2xsT2Zm c2V0RnJvbUFuaW1hdGlvbihtX3Njcm9sbGFibGVBcmVhLnNjcm9sbE9mZnNldEZyb21Qb3NpdGlv bihyb3VuZGVkSW50UG9pbnQobV9jdXJyZW50U2Nyb2xsUG9zaXRpb24pKSk7CiB9CiAKICNpZiBF TkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQpAQCAtMjEzLDcgKzIwMyw3IEBAIHZvaWQgU2Nyb2xsQW5p bWF0b3I6OnVwZGF0ZVNjcm9sbFNuYXBTdGF0ZSgpCiAKIExheW91dFVuaXQgU2Nyb2xsQW5pbWF0 b3I6OnNjcm9sbE9mZnNldE9uQXhpcyhTY3JvbGxFdmVudEF4aXMgYXhpcykgY29uc3QKIHsKLSAg ICByZXR1cm4gYXhpcyA9PSBTY3JvbGxFdmVudEF4aXM6Okhvcml6b250YWwgPyBtX2N1cnJlbnRQ b3NYIDogbV9jdXJyZW50UG9zWTsKKyAgICByZXR1cm4gYXhpcyA9PSBTY3JvbGxFdmVudEF4aXM6 Okhvcml6b250YWwgPyBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbi54KCkgOiBtX2N1cnJlbnRTY3Jv bGxQb3NpdGlvbi55KCk7CiB9CiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OmltbWVkaWF0ZVNjcm9s bE9uQXhpcyhTY3JvbGxFdmVudEF4aXMgYXhpcywgZmxvYXQgZGVsdGEpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuaAppbmRleCA4OGMwZjVmNzI0Yjg0ZDQ5OGIzY2Y0YzVl NWEwYzg4OWY2OWIwNDY4Li4yZjhiYzI1ZDAyMjE0NzNkM2YzYWIxZDBmODk0ZjU1ZTU2ZjZkMjdk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmgKQEAgLTg1LDcgKzg1 LDcgQEAgcHVibGljOgogI2VuZGlmCiAKICAgICB2b2lkIHNldEN1cnJlbnRQb3NpdGlvbihjb25z dCBGbG9hdFBvaW50Jik7Ci0gICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24oKSBjb25zdDsK KyAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVu dFNjcm9sbFBvc2l0aW9uOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsQW5pbWF0aW9ucygp IHsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXJ2aWNlU2Nyb2xsQW5pbWF0aW9ucygpIHsgfQpAQCAt MTUwLDggKzE1MCw3IEBAIHByb3RlY3RlZDoKICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKSB8 fCBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAgICAgU2Nyb2xsQ29udHJvbGxlciBtX3Njcm9sbENv bnRyb2xsZXI7CiAjZW5kaWYKLSAgICBmbG9hdCBtX2N1cnJlbnRQb3NYOyAvLyBXZSBhdm9pZCB1 c2luZyBhIEZsb2F0UG9pbnQgaW4gb3JkZXIgdG8gcmVkdWNlCi0gICAgZmxvYXQgbV9jdXJyZW50 UG9zWTsgLy8gc3ViY2xhc3MgY29kZSBjb21wbGV4aXR5LgorICAgIEZsb2F0UG9pbnQgbV9jdXJy ZW50U2Nyb2xsUG9zaXRpb247CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0KaW5kZXggMDM1 NDc3NDVjODFiZTE0MDU2Y2EzZWRkNTU2Yzk1YTU4NzllNzMwMS4uZTc0M2U1ZGQzOTUwY2ExZGNh NjQxZWEzMGY3ZmQ5M2Q1MzM1NGI0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtNzAyLDcgKzcwMiw3IEBAIGJvb2wgU2Nyb2xs QW5pbWF0b3JNYWM6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgU2Ny b2xsR3JhbnVsYXJpCiAgICAgaWYgKGdyYW51bGFyaXR5ID09IFNjcm9sbEJ5UGl4ZWwpCiAgICAg ICAgIHJldHVybiBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsKG9yaWVudGF0aW9uLCBncmFudWxhcml0 eSwgc3RlcCwgbXVsdGlwbGllcik7CiAKLSAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3NpdGlvbiht X2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKKyAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3Np dGlvbiA9IG1fY3VycmVudFNjcm9sbFBvc2l0aW9uOwogICAgIEZsb2F0U2l6ZSBkZWx0YTsKICAg ICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKICAgICAgICAgZGVsdGEu c2V0V2lkdGgoc3RlcCAqIG11bHRpcGxpZXIpOwpAQCAtNzIxLDcgKzcyMSw3IEBAIGJvb2wgU2Ny b2xsQW5pbWF0b3JNYWM6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwg U2Nyb2xsR3JhbnVsYXJpCiAgICAgICAgICAgICBuZXdQb3NpdGlvbi5zZXRYKHRhcmdldE9yaWdp bi54KTsKICAgICB9CiAKLSAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0gPDwg IlNjcm9sbEFuaW1hdG9yTWFjOjpzY3JvbGwgIiA8PCAiIGZyb20gIiA8PCBGbG9hdFBvaW50KG1f Y3VycmVudFBvc1gsIG1fY3VycmVudFBvc1kpIDw8ICIgdG8gIiA8PCBuZXdQb3NpdGlvbik7Cisg ICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJTY3JvbGxBbmltYXRvck1h Yzo6c2Nyb2xsICIgPDwgIiBmcm9tICIgPDwgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPDwgIiB0 byAiIDw8IG5ld1Bvc2l0aW9uKTsKICAgICBbbV9zY3JvbGxBbmltYXRpb25IZWxwZXIgc2Nyb2xs VG9Qb2ludDpuZXdQb3NpdGlvbl07CiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC03NTcsMTQgKzc1 NywxMiBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjppbW1lZGlhdGVTY3JvbGxUb1Bvc2l0aW9u KGNvbnN0IEZsb2F0UG9pbnQmIG5ld1Bvc2l0aW9uKQogewogICAgIEZsb2F0UG9pbnQgYWRqdXN0 ZWRQb3NpdGlvbiA9IGFkanVzdFNjcm9sbFBvc2l0aW9uSWZOZWNlc3NhcnkobmV3UG9zaXRpb24p OwogIAotICAgIGJvb2wgcG9zaXRpb25DaGFuZ2VkID0gYWRqdXN0ZWRQb3NpdGlvbi54KCkgIT0g bV9jdXJyZW50UG9zWCB8fCBhZGp1c3RlZFBvc2l0aW9uLnkoKSAhPSBtX2N1cnJlbnRQb3NZOwor ICAgIGJvb2wgcG9zaXRpb25DaGFuZ2VkID0gYWRqdXN0ZWRQb3NpdGlvbiAhPSBtX2N1cnJlbnRT Y3JvbGxQb3NpdGlvbjsKICAgICBpZiAoIXBvc2l0aW9uQ2hhbmdlZCAmJiAhc2Nyb2xsYWJsZUFy ZWEoKS5zY3JvbGxPcmlnaW5DaGFuZ2VkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZsb2F0 U2l6ZSBkZWx0YSA9IEZsb2F0U2l6ZShhZGp1c3RlZFBvc2l0aW9uLngoKSAtIG1fY3VycmVudFBv c1gsIGFkanVzdGVkUG9zaXRpb24ueSgpIC0gbV9jdXJyZW50UG9zWSk7Ci0KLSAgICBtX2N1cnJl bnRQb3NYID0gYWRqdXN0ZWRQb3NpdGlvbi54KCk7Ci0gICAgbV9jdXJyZW50UG9zWSA9IGFkanVz dGVkUG9zaXRpb24ueSgpOworICAgIEZsb2F0U2l6ZSBkZWx0YSA9IGFkanVzdGVkUG9zaXRpb24g LSBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbjsKKyAgICBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbiA9 IGFkanVzdGVkUG9zaXRpb247CiAgICAgbm90aWZ5UG9zaXRpb25DaGFuZ2VkKGRlbHRhKTsKICAg ICB1cGRhdGVBY3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JPZmZzZXQoKTsKIH0KQEAgLTEyOTksMTQg KzEyOTcsMTIgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6aW1tZWRpYXRlU2Nyb2xsQnlXaXRo b3V0Q29udGVudEVkZ2VDb25zdHJhaW50cyhjb25zdCBGbG8KIAogdm9pZCBTY3JvbGxBbmltYXRv ck1hYzo6aW1tZWRpYXRlU2Nyb2xsQnkoY29uc3QgRmxvYXRTaXplJiBkZWx0YSkKIHsKLSAgICBG bG9hdFBvaW50IG5ld1BvcyA9IGFkanVzdFNjcm9sbFBvc2l0aW9uSWZOZWNlc3NhcnkoRmxvYXRQ b2ludChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKSArIGRlbHRhKTsKLSAgICBpZiAobmV3 UG9zLngoKSA9PSBtX2N1cnJlbnRQb3NYICYmIG5ld1Bvcy55KCkgPT0gbV9jdXJyZW50UG9zWSkK KyAgICBGbG9hdFBvaW50IG5ld1Bvc2l0aW9uID0gYWRqdXN0U2Nyb2xsUG9zaXRpb25JZk5lY2Vz c2FyeShtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbiArIGRlbHRhKTsKKyAgICBpZiAobmV3UG9zaXRp b24gPT0gbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24pCiAgICAgICAgIHJldHVybjsKIAotICAgIEZs b2F0U2l6ZSBhZGp1c3RlZERlbHRhID0gRmxvYXRTaXplKG5ld1Bvcy54KCkgLSBtX2N1cnJlbnRQ b3NYLCBuZXdQb3MueSgpIC0gbV9jdXJyZW50UG9zWSk7Ci0KLSAgICBtX2N1cnJlbnRQb3NYID0g bmV3UG9zLngoKTsKLSAgICBtX2N1cnJlbnRQb3NZID0gbmV3UG9zLnkoKTsKKyAgICBGbG9hdFNp emUgYWRqdXN0ZWREZWx0YSA9IG5ld1Bvc2l0aW9uIC0gbV9jdXJyZW50U2Nyb2xsUG9zaXRpb247 CisgICAgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBuZXdQb3NpdGlvbjsKICAgICBub3RpZnlQ b3NpdGlvbkNoYW5nZWQoYWRqdXN0ZWREZWx0YSk7CiAgICAgdXBkYXRlQWN0aXZlU2Nyb2xsU25h cEluZGV4Rm9yT2Zmc2V0KCk7CiB9Cg== 268120 2016-01-02 16:32:16 -0800 2016-01-02 16:54:14 -0800 Patch bug-152656-20160102163142.patch text/plain 9917 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU3NWM4NmRlMGRlOGI2 NjE4ZDQ3MjNhZjYwYmRlMDZlMjRhOTY2MS4uYmE0M2ZhNjQyZjVlZjBhMzAwMTM3ZmE1ZDJkMDkw OGJjYzYwYTc2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE2LTAxLTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1pbm9yIGNsZWFu dXAgaW4gU2Nyb2xsQW5pbWF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MjY1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENoYW5nZSBTY3JvbGxBbmltYXRvcidzIG1fY3VycmVudFBvc1gvbV9jdXJy ZW50UG9zWSB0byBiZSBhIEZsb2F0UG9pbnQsIGFuZAorICAgICAgICBmaXggY29kZSB0aGF0IHVz ZXMgaXQuCisgICAgICAgIAorICAgICAgICBEbyBvZmZzZXQgLT4gcG9zaXRpb24gY29udmVyc2lv biBpbiBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKCkuCisg ICAgICAgIFRoaXMgaXMgYSBiZWhhdmlvciBjaGFuZ2UsIGJ1dCBJIGNvdWxkIG5ldmVyIGhpdCB0 aGlzIGNvZGUgb24gTWFjLgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnNjcm9sbCk6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzZXRDdXJyZW50UG9zaXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnVwZGF0ZUFjdGl2ZVNjcm9sbFNuYXBJ bmRleEZvck9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6bm90aWZ5 UG9zaXRpb25DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzY3Jv bGxPZmZzZXRPbkF4aXMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OlNjcm9s bEFuaW1hdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpj dXJyZW50UG9zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbEFuaW1h dG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6U2Nyb2xsQW5pbWF0b3I6 OmN1cnJlbnRQb3NpdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9y TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbCk6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6aW1tZWRpYXRlU2Nyb2xsVG9Qb3Np dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvck1hYzo6aW1tZWRpYXRlU2Ny b2xsQnkpOgorCisyMDE2LTAxLTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCiAgICAgICAgIFNvbWUgY2xlYW51cCBpbiBTY3JvbGxBbmltYXRvcgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjQ5CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAppbmRleCAwODU0MTFhYzUzNTMyYjdl MjkyNzc5YWJmMDExZWVjYjA2ZjZkNGIzLi41NmU1ZWExOGYwZmMzMzk2ZmU0ZDY1MDU3MTY2MTNi ZWUxYTllMWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmlt YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuY3Bw CkBAIC01Miw4ICs1Miw2IEBAIFNjcm9sbEFuaW1hdG9yOjpTY3JvbGxBbmltYXRvcihTY3JvbGxh YmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEpCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkgfHwg RU5BQkxFKFJVQkJFUl9CQU5ESU5HKQogICAgICwgbV9zY3JvbGxDb250cm9sbGVyKCp0aGlzKQog I2VuZGlmCi0gICAgLCBtX2N1cnJlbnRQb3NYKDApCi0gICAgLCBtX2N1cnJlbnRQb3NZKDApCiB7 CiB9CiAKQEAgLTYzLDcgKzYxLDcgQEAgU2Nyb2xsQW5pbWF0b3I6On5TY3JvbGxBbmltYXRvcigp CiAKIGJvb2wgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmll bnRhdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IHN0ZXAsIGZsb2F0IG11bHRpcGxpZXIp CiB7Ci0gICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24obV9jdXJyZW50UG9zWCwgbV9jdXJy ZW50UG9zWSk7CisgICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24gPSBtX2N1cnJlbnRTY3Jv bGxQb3NpdGlvbjsKICAgICBGbG9hdFNpemUgZGVsdGE7CiAgICAgaWYgKG9yaWVudGF0aW9uID09 IEhvcml6b250YWxTY3JvbGxiYXIpCiAgICAgICAgIGRlbHRhLnNldFdpZHRoKHN0ZXAgKiBtdWx0 aXBsaWVyKTsKQEAgLTc0LDkgKzcyLDcgQEAgYm9vbCBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsKFNj cm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBTY3JvbGxHcmFudWxhcml0eSwKICAgICBp ZiAoY3VycmVudFBvc2l0aW9uID09IG5ld1Bvc2l0aW9uKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICAvLyBGSVhNRTogbV9jdXJyZW50UG9zWC9ZIHNob3VsZCBqdXN0IGJlIGEgRmxvYXRQ b2ludC4KLSAgICBtX2N1cnJlbnRQb3NYID0gbmV3UG9zaXRpb24ueCgpOwotICAgIG1fY3VycmVu dFBvc1kgPSBuZXdQb3NpdGlvbi55KCk7CisgICAgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBu ZXdQb3NpdGlvbjsKIAogICAgIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZChuZXdQb3NpdGlvbiAtIGN1 cnJlbnRQb3NpdGlvbik7CiAgICAgcmV0dXJuIHRydWU7CkBAIC04NCw5ICs4MCw5IEBAIGJvb2wg U2Nyb2xsQW5pbWF0b3I6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwg U2Nyb2xsR3JhbnVsYXJpdHksCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbFRvT2Zmc2V0 V2l0aG91dEFuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBvZmZzZXQpCiB7Ci0gICAgRmxvYXRT aXplIGRlbHRhID0gRmxvYXRTaXplKG9mZnNldC54KCkgLSBtX2N1cnJlbnRQb3NYLCBvZmZzZXQu eSgpIC0gbV9jdXJyZW50UG9zWSk7Ci0gICAgbV9jdXJyZW50UG9zWCA9IG9mZnNldC54KCk7Ci0g ICAgbV9jdXJyZW50UG9zWSA9IG9mZnNldC55KCk7CisgICAgRmxvYXRQb2ludCBuZXdQb3NpdG9u ID0gU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChvZmZzZXQsIHRvRmxv YXRTaXplKG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsT3JpZ2luKCkpKTsKKyAgICBGbG9hdFNpemUg ZGVsdGEgPSBuZXdQb3NpdG9uIC0gbV9jdXJyZW50U2Nyb2xsUG9zaXRpb247CisgICAgbV9jdXJy ZW50U2Nyb2xsUG9zaXRpb24gPSBuZXdQb3NpdG9uOwogICAgIG5vdGlmeVBvc2l0aW9uQ2hhbmdl ZChkZWx0YSk7CiAgICAgdXBkYXRlQWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yT2Zmc2V0KCk7CiB9 CkBAIC0xNzcsMjAgKzE3MywxNCBAQCBib29sIFNjcm9sbEFuaW1hdG9yOjpoYW5kbGVUb3VjaEV2 ZW50KGNvbnN0IFBsYXRmb3JtVG91Y2hFdmVudCYpCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnNl dEN1cnJlbnRQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvbikKIHsKLSAgICBtX2N1 cnJlbnRQb3NYID0gcG9zaXRpb24ueCgpOwotICAgIG1fY3VycmVudFBvc1kgPSBwb3NpdGlvbi55 KCk7CisgICAgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBwb3NpdGlvbjsKICAgICB1cGRhdGVB Y3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JPZmZzZXQoKTsKIH0KIAotRmxvYXRQb2ludCBTY3JvbGxB bmltYXRvcjo6Y3VycmVudFBvc2l0aW9uKCkgY29uc3QKLXsKLSAgICByZXR1cm4gRmxvYXRQb2lu dChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKLX0KLQogdm9pZCBTY3JvbGxBbmltYXRv cjo6dXBkYXRlQWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yT2Zmc2V0KCkKIHsKICNpZiBFTkFCTEUo Q1NTX1NDUk9MTF9TTkFQKQotICAgIG1fc2Nyb2xsQ29udHJvbGxlci5zZXRBY3RpdmVTY3JvbGxT bmFwSW5kaWNlc0Zvck9mZnNldChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKKyAgICBt X3Njcm9sbENvbnRyb2xsZXIuc2V0QWN0aXZlU2Nyb2xsU25hcEluZGljZXNGb3JPZmZzZXQobV9j dXJyZW50U2Nyb2xsUG9zaXRpb24ueCgpLCBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbi55KCkpOwog ICAgIGlmIChtX3Njcm9sbENvbnRyb2xsZXIuYWN0aXZlU2Nyb2xsU25hcEluZGV4RGlkQ2hhbmdl KCkpIHsKICAgICAgICAgbV9zY3JvbGxhYmxlQXJlYS5zZXRDdXJyZW50SG9yaXpvbnRhbFNuYXBQ b2ludEluZGV4KG1fc2Nyb2xsQ29udHJvbGxlci5hY3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JBeGlz KFNjcm9sbEV2ZW50QXhpczo6SG9yaXpvbnRhbCkpOwogICAgICAgICBtX3Njcm9sbGFibGVBcmVh LnNldEN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludEluZGV4KG1fc2Nyb2xsQ29udHJvbGxlci5hY3Rp dmVTY3JvbGxTbmFwSW5kZXhGb3JBeGlzKFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWwpKTsKQEAg LTIwMiw3ICsxOTIsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yOjpub3RpZnlQb3NpdGlvbkNoYW5n ZWQoY29uc3QgRmxvYXRTaXplJiBkZWx0YSkKIHsKICAgICBVTlVTRURfUEFSQU0oZGVsdGEpOwog ICAgIC8vIEZJWE1FOiBuZWVkIHRvIG5vdCBtYXAgYmFjayBhbmQgZm9ydGggYWxsIHRoZSB0aW1l LgotICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2V0U2Nyb2xsT2Zmc2V0RnJvbUFuaW1hdGlvbihtX3Nj cm9sbGFibGVBcmVhLnNjcm9sbE9mZnNldEZyb21Qb3NpdGlvbihJbnRQb2ludChtX2N1cnJlbnRQ b3NYLCBtX2N1cnJlbnRQb3NZKSkpOworICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2V0U2Nyb2xsT2Zm c2V0RnJvbUFuaW1hdGlvbihtX3Njcm9sbGFibGVBcmVhLnNjcm9sbE9mZnNldEZyb21Qb3NpdGlv bihyb3VuZGVkSW50UG9pbnQobV9jdXJyZW50U2Nyb2xsUG9zaXRpb24pKSk7CiB9CiAKICNpZiBF TkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQpAQCAtMjEzLDcgKzIwMyw3IEBAIHZvaWQgU2Nyb2xsQW5p bWF0b3I6OnVwZGF0ZVNjcm9sbFNuYXBTdGF0ZSgpCiAKIExheW91dFVuaXQgU2Nyb2xsQW5pbWF0 b3I6OnNjcm9sbE9mZnNldE9uQXhpcyhTY3JvbGxFdmVudEF4aXMgYXhpcykgY29uc3QKIHsKLSAg ICByZXR1cm4gYXhpcyA9PSBTY3JvbGxFdmVudEF4aXM6Okhvcml6b250YWwgPyBtX2N1cnJlbnRQ b3NYIDogbV9jdXJyZW50UG9zWTsKKyAgICByZXR1cm4gYXhpcyA9PSBTY3JvbGxFdmVudEF4aXM6 Okhvcml6b250YWwgPyBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbi54KCkgOiBtX2N1cnJlbnRTY3Jv bGxQb3NpdGlvbi55KCk7CiB9CiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OmltbWVkaWF0ZVNjcm9s bE9uQXhpcyhTY3JvbGxFdmVudEF4aXMgYXhpcywgZmxvYXQgZGVsdGEpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuaAppbmRleCA4OGMwZjVmNzI0Yjg0ZDQ5OGIzY2Y0YzVl NWEwYzg4OWY2OWIwNDY4Li4zY2MzMGY2MDdjMzY1MjJmZDQ3YTQzOTMxNGI4MTc2YzdiNDQ1ZjA1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmgKQEAgLTMyLDcgKzMy LDcgQEAKICNpZm5kZWYgU2Nyb2xsQW5pbWF0b3JfaAogI2RlZmluZSBTY3JvbGxBbmltYXRvcl9o CiAKLSNpbmNsdWRlICJGbG9hdFNpemUuaCIKKyNpbmNsdWRlICJGbG9hdFBvaW50LmgiCiAjaW5j bHVkZSAiTGF5b3V0VW5pdC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2lu Y2x1ZGUgIlNjcm9sbFR5cGVzLmgiCkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICNlbmRpZgog CiAgICAgdm9pZCBzZXRDdXJyZW50UG9zaXRpb24oY29uc3QgRmxvYXRQb2ludCYpOwotICAgIEZs b2F0UG9pbnQgY3VycmVudFBvc2l0aW9uKCkgY29uc3Q7CisgICAgRmxvYXRQb2ludCBjdXJyZW50 UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbjsgfQogCiAg ICAgdmlydHVhbCB2b2lkIGNhbmNlbEFuaW1hdGlvbnMoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQg c2VydmljZVNjcm9sbEFuaW1hdGlvbnMoKSB7IH0KQEAgLTE1MCw4ICsxNTAsNyBAQCBwcm90ZWN0 ZWQ6CiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkgfHwgRU5BQkxFKFJVQkJFUl9CQU5ESU5H KQogICAgIFNjcm9sbENvbnRyb2xsZXIgbV9zY3JvbGxDb250cm9sbGVyOwogI2VuZGlmCi0gICAg ZmxvYXQgbV9jdXJyZW50UG9zWDsgLy8gV2UgYXZvaWQgdXNpbmcgYSBGbG9hdFBvaW50IGluIG9y ZGVyIHRvIHJlZHVjZQotICAgIGZsb2F0IG1fY3VycmVudFBvc1k7IC8vIHN1YmNsYXNzIGNvZGUg Y29tcGxleGl0eS4KKyAgICBGbG9hdFBvaW50IG1fY3VycmVudFNjcm9sbFBvc2l0aW9uOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCmluZGV4IDAzNTQ3NzQ1YzgxYmUxNDA1NmNhM2VkZDU1 NmM5NWE1ODc5ZTczMDEuLmU3NDNlNWRkMzk1MGNhMWRjYTY0MWVhMzBmN2ZkOTNkNTMzNTRiNGEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1h Yy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0KQEAgLTcwMiw3ICs3MDIsNyBAQCBib29sIFNjcm9sbEFuaW1hdG9yTWFjOjpzY3JvbGwoU2Ny b2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdyYW51bGFyaQogICAgIGlmIChn cmFudWxhcml0eSA9PSBTY3JvbGxCeVBpeGVsKQogICAgICAgICByZXR1cm4gU2Nyb2xsQW5pbWF0 b3I6OnNjcm9sbChvcmllbnRhdGlvbiwgZ3JhbnVsYXJpdHksIHN0ZXAsIG11bHRpcGxpZXIpOwog Ci0gICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24obV9jdXJyZW50UG9zWCwgbV9jdXJyZW50 UG9zWSk7CisgICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24gPSBtX2N1cnJlbnRTY3JvbGxQ b3NpdGlvbjsKICAgICBGbG9hdFNpemUgZGVsdGE7CiAgICAgaWYgKG9yaWVudGF0aW9uID09IEhv cml6b250YWxTY3JvbGxiYXIpCiAgICAgICAgIGRlbHRhLnNldFdpZHRoKHN0ZXAgKiBtdWx0aXBs aWVyKTsKQEAgLTcyMSw3ICs3MjEsNyBAQCBib29sIFNjcm9sbEFuaW1hdG9yTWFjOjpzY3JvbGwo U2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbEdyYW51bGFyaQogICAgICAg ICAgICAgbmV3UG9zaXRpb24uc2V0WCh0YXJnZXRPcmlnaW4ueCk7CiAgICAgfQogCi0gICAgTE9H X1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJTY3JvbGxBbmltYXRvck1hYzo6c2Ny b2xsICIgPDwgIiBmcm9tICIgPDwgRmxvYXRQb2ludChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQ b3NZKSA8PCAiIHRvICIgPDwgbmV3UG9zaXRpb24pOworICAgIExPR19XSVRIX1NUUkVBTShTY3Jv bGxpbmcsIHN0cmVhbSA8PCAiU2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbCAiIDw8ICIgZnJvbSAi IDw8IG1fY3VycmVudFNjcm9sbFBvc2l0aW9uIDw8ICIgdG8gIiA8PCBuZXdQb3NpdGlvbik7CiAg ICAgW21fc2Nyb2xsQW5pbWF0aW9uSGVscGVyIHNjcm9sbFRvUG9pbnQ6bmV3UG9zaXRpb25dOwog ICAgIHJldHVybiB0cnVlOwogfQpAQCAtNzU3LDE0ICs3NTcsMTIgQEAgdm9pZCBTY3JvbGxBbmlt YXRvck1hYzo6aW1tZWRpYXRlU2Nyb2xsVG9Qb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBuZXdQ b3NpdGlvbikKIHsKICAgICBGbG9hdFBvaW50IGFkanVzdGVkUG9zaXRpb24gPSBhZGp1c3RTY3Jv bGxQb3NpdGlvbklmTmVjZXNzYXJ5KG5ld1Bvc2l0aW9uKTsKICAKLSAgICBib29sIHBvc2l0aW9u Q2hhbmdlZCA9IGFkanVzdGVkUG9zaXRpb24ueCgpICE9IG1fY3VycmVudFBvc1ggfHwgYWRqdXN0 ZWRQb3NpdGlvbi55KCkgIT0gbV9jdXJyZW50UG9zWTsKKyAgICBib29sIHBvc2l0aW9uQ2hhbmdl ZCA9IGFkanVzdGVkUG9zaXRpb24gIT0gbV9jdXJyZW50U2Nyb2xsUG9zaXRpb247CiAgICAgaWYg KCFwb3NpdGlvbkNoYW5nZWQgJiYgIXNjcm9sbGFibGVBcmVhKCkuc2Nyb2xsT3JpZ2luQ2hhbmdl ZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBGbG9hdFNpemUgZGVsdGEgPSBGbG9hdFNpemUo YWRqdXN0ZWRQb3NpdGlvbi54KCkgLSBtX2N1cnJlbnRQb3NYLCBhZGp1c3RlZFBvc2l0aW9uLnko KSAtIG1fY3VycmVudFBvc1kpOwotCi0gICAgbV9jdXJyZW50UG9zWCA9IGFkanVzdGVkUG9zaXRp b24ueCgpOwotICAgIG1fY3VycmVudFBvc1kgPSBhZGp1c3RlZFBvc2l0aW9uLnkoKTsKKyAgICBG bG9hdFNpemUgZGVsdGEgPSBhZGp1c3RlZFBvc2l0aW9uIC0gbV9jdXJyZW50U2Nyb2xsUG9zaXRp b247CisgICAgbV9jdXJyZW50U2Nyb2xsUG9zaXRpb24gPSBhZGp1c3RlZFBvc2l0aW9uOwogICAg IG5vdGlmeVBvc2l0aW9uQ2hhbmdlZChkZWx0YSk7CiAgICAgdXBkYXRlQWN0aXZlU2Nyb2xsU25h cEluZGV4Rm9yT2Zmc2V0KCk7CiB9CkBAIC0xMjk5LDE0ICsxMjk3LDEyIEBAIHZvaWQgU2Nyb2xs QW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWlu dHMoY29uc3QgRmxvCiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5 KGNvbnN0IEZsb2F0U2l6ZSYgZGVsdGEpCiB7Ci0gICAgRmxvYXRQb2ludCBuZXdQb3MgPSBhZGp1 c3RTY3JvbGxQb3NpdGlvbklmTmVjZXNzYXJ5KEZsb2F0UG9pbnQobV9jdXJyZW50UG9zWCwgbV9j dXJyZW50UG9zWSkgKyBkZWx0YSk7Ci0gICAgaWYgKG5ld1Bvcy54KCkgPT0gbV9jdXJyZW50UG9z WCAmJiBuZXdQb3MueSgpID09IG1fY3VycmVudFBvc1kpCisgICAgRmxvYXRQb2ludCBuZXdQb3Np dGlvbiA9IGFkanVzdFNjcm9sbFBvc2l0aW9uSWZOZWNlc3NhcnkobV9jdXJyZW50U2Nyb2xsUG9z aXRpb24gKyBkZWx0YSk7CisgICAgaWYgKG5ld1Bvc2l0aW9uID09IG1fY3VycmVudFNjcm9sbFBv c2l0aW9uKQogICAgICAgICByZXR1cm47CiAKLSAgICBGbG9hdFNpemUgYWRqdXN0ZWREZWx0YSA9 IEZsb2F0U2l6ZShuZXdQb3MueCgpIC0gbV9jdXJyZW50UG9zWCwgbmV3UG9zLnkoKSAtIG1fY3Vy cmVudFBvc1kpOwotCi0gICAgbV9jdXJyZW50UG9zWCA9IG5ld1Bvcy54KCk7Ci0gICAgbV9jdXJy ZW50UG9zWSA9IG5ld1Bvcy55KCk7CisgICAgRmxvYXRTaXplIGFkanVzdGVkRGVsdGEgPSBuZXdQ b3NpdGlvbiAtIG1fY3VycmVudFNjcm9sbFBvc2l0aW9uOworICAgIG1fY3VycmVudFNjcm9sbFBv c2l0aW9uID0gbmV3UG9zaXRpb247CiAgICAgbm90aWZ5UG9zaXRpb25DaGFuZ2VkKGFkanVzdGVk RGVsdGEpOwogICAgIHVwZGF0ZUFjdGl2ZVNjcm9sbFNuYXBJbmRleEZvck9mZnNldCgpOwogfQo= 268121 2016-01-02 16:54:17 -0800 2016-01-03 12:07:07 -0800 Patch bug-152656-20160102165343.patch text/plain 10623 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU3NWM4NmRlMGRlOGI2 NjE4ZDQ3MjNhZjYwYmRlMDZlMjRhOTY2MS4uY2VhYjhkNjNjYWQwNWM5MGE2OWE0ZTI3NWMxOTFi MGIxN2U5NzA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE2LTAxLTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1pbm9yIGNsZWFu dXAgaW4gU2Nyb2xsQW5pbWF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MjY1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEhpZGUgdGhlIGZhY3QgdGhhdCBTY3JvbGxBbmltYXRvcidzIG1fY3VycmVu dFBvc1gvbV9jdXJyZW50UG9zWSBpcyBub3QgYSBGbG9hdFBvaW50CisgICAgICAgIGFzIG11Y2gg YXMgcG9zc2libGUuCisgICAgICAgIAorICAgICAgICBEbyBvZmZzZXQgLT4gcG9zaXRpb24gY29u dmVyc2lvbiBpbiBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9u KCkuCisgICAgICAgIFRoaXMgaXMgYSBiZWhhdmlvciBjaGFuZ2UsIGJ1dCBJIGNvdWxkIG5ldmVy IGhpdCB0aGlzIGNvZGUgb24gTWFjLgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsQW5pbWF0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnNjcm9sbCk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0 aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yOjpzZXRDdXJyZW50UG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3I6OnVwZGF0ZUFjdGl2ZVNjcm9s bFNuYXBJbmRleEZvck9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6 bm90aWZ5UG9zaXRpb25DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9y OjppbW1lZGlhdGVTY3JvbGxPbkF4aXMpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0 b3I6OlNjcm9sbEFuaW1hdG9yKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFu aW1hdG9yOjpjdXJyZW50UG9zaXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL1Nj cm9sbEFuaW1hdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmltYXRvcjo6U2Nyb2xs QW5pbWF0b3I6OmN1cnJlbnRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxBbmlt YXRvcjo6U2Nyb2xsQW5pbWF0b3I6OnNldEN1cnJlbnRQb3NpdGlvbkludGVybmFsKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxBbmltYXRvck1hYzo6c2Nyb2xsKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFu aW1hdG9yTWFjOjppbW1lZGlhdGVTY3JvbGxUb1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbEFuaW1hdG9yTWFjOjppbW1lZGlhdGVTY3JvbGxCeSk6CisKKzIwMTYtMDEtMDIgIFNp bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgU29tZSBjbGVh bnVwIGluIFNjcm9sbEFuaW1hdG9yCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTI2NDkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsQW5pbWF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5p bWF0b3IuY3BwCmluZGV4IDA4NTQxMWFjNTM1MzJiN2UyOTI3NzlhYmYwMTFlZWNiMDZmNmQ0YjMu Ljk3ODhiMjkxMWJhYmMxNzQ3MGM0YzI0NDFlNjBmYTYyZjI3MWIzNGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvci5jcHAKQEAgLTUyLDggKzUyLDYgQEAgU2Nyb2xs QW5pbWF0b3I6OlNjcm9sbEFuaW1hdG9yKFNjcm9sbGFibGVBcmVhJiBzY3JvbGxhYmxlQXJlYSkK ICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKSB8fCBFTkFCTEUoUlVCQkVSX0JBTkRJTkcpCiAg ICAgLCBtX3Njcm9sbENvbnRyb2xsZXIoKnRoaXMpCiAjZW5kaWYKLSAgICAsIG1fY3VycmVudFBv c1goMCkKLSAgICAsIG1fY3VycmVudFBvc1koMCkKIHsKIH0KIApAQCAtNjMsNyArNjEsNyBAQCBT Y3JvbGxBbmltYXRvcjo6flNjcm9sbEFuaW1hdG9yKCkKIAogYm9vbCBTY3JvbGxBbmltYXRvcjo6 c2Nyb2xsKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBTY3JvbGxHcmFudWxhcml0 eSwgZmxvYXQgc3RlcCwgZmxvYXQgbXVsdGlwbGllcikKIHsKLSAgICBGbG9hdFBvaW50IGN1cnJl bnRQb3NpdGlvbihtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKKyAgICBGbG9hdFBvaW50 IGN1cnJlbnRQb3NpdGlvbiA9IHRoaXMtPmN1cnJlbnRQb3NpdGlvbigpOwogICAgIEZsb2F0U2l6 ZSBkZWx0YTsKICAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKICAg ICAgICAgZGVsdGEuc2V0V2lkdGgoc3RlcCAqIG11bHRpcGxpZXIpOwpAQCAtNzQsMTkgKzcyLDE2 IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbChTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmll bnRhdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksCiAgICAgaWYgKGN1cnJlbnRQb3NpdGlvbiA9PSBu ZXdQb3NpdGlvbikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgLy8gRklYTUU6IG1fY3Vy cmVudFBvc1gvWSBzaG91bGQganVzdCBiZSBhIEZsb2F0UG9pbnQuCi0gICAgbV9jdXJyZW50UG9z WCA9IG5ld1Bvc2l0aW9uLngoKTsKLSAgICBtX2N1cnJlbnRQb3NZID0gbmV3UG9zaXRpb24ueSgp OwotCisgICAgc2V0Q3VycmVudFBvc2l0aW9uSW50ZXJuYWwobmV3UG9zaXRpb24pOwogICAgIG5v dGlmeVBvc2l0aW9uQ2hhbmdlZChuZXdQb3NpdGlvbiAtIGN1cnJlbnRQb3NpdGlvbik7CiAgICAg cmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbFRvT2Zmc2V0V2l0 aG91dEFuaW1hdGlvbihjb25zdCBGbG9hdFBvaW50JiBvZmZzZXQpCiB7Ci0gICAgRmxvYXRTaXpl IGRlbHRhID0gRmxvYXRTaXplKG9mZnNldC54KCkgLSBtX2N1cnJlbnRQb3NYLCBvZmZzZXQueSgp IC0gbV9jdXJyZW50UG9zWSk7Ci0gICAgbV9jdXJyZW50UG9zWCA9IG9mZnNldC54KCk7Ci0gICAg bV9jdXJyZW50UG9zWSA9IG9mZnNldC55KCk7CisgICAgRmxvYXRQb2ludCBuZXdQb3NpdG9uID0g U2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChvZmZzZXQsIHRvRmxvYXRT aXplKG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsT3JpZ2luKCkpKTsKKyAgICBGbG9hdFNpemUgZGVs dGEgPSBuZXdQb3NpdG9uIC0gY3VycmVudFBvc2l0aW9uKCk7CisgICAgc2V0Q3VycmVudFBvc2l0 aW9uSW50ZXJuYWwobmV3UG9zaXRvbik7CiAgICAgbm90aWZ5UG9zaXRpb25DaGFuZ2VkKGRlbHRh KTsKICAgICB1cGRhdGVBY3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JPZmZzZXQoKTsKIH0KQEAgLTE3 NywxOSArMTcyLDE0IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3I6OmhhbmRsZVRvdWNoRXZlbnQoY29u c3QgUGxhdGZvcm1Ub3VjaEV2ZW50JikKIAogdm9pZCBTY3JvbGxBbmltYXRvcjo6c2V0Q3VycmVu dFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9uKQogewotICAgIG1fY3VycmVudFBv c1ggPSBwb3NpdGlvbi54KCk7Ci0gICAgbV9jdXJyZW50UG9zWSA9IHBvc2l0aW9uLnkoKTsKKyAg ICBzZXRDdXJyZW50UG9zaXRpb25JbnRlcm5hbChwb3NpdGlvbik7CiAgICAgdXBkYXRlQWN0aXZl U2Nyb2xsU25hcEluZGV4Rm9yT2Zmc2V0KCk7CiB9CiAKLUZsb2F0UG9pbnQgU2Nyb2xsQW5pbWF0 b3I6OmN1cnJlbnRQb3NpdGlvbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIEZsb2F0UG9pbnQobV9j dXJyZW50UG9zWCwgbV9jdXJyZW50UG9zWSk7Ci19Ci0KIHZvaWQgU2Nyb2xsQW5pbWF0b3I6OnVw ZGF0ZUFjdGl2ZVNjcm9sbFNuYXBJbmRleEZvck9mZnNldCgpCiB7CiAjaWYgRU5BQkxFKENTU19T Q1JPTExfU05BUCkKKyAgICAvLyBGSVhNRTogTmVlZHMgb2Zmc2V0L3Bvc2l0aW9uIGRpc2FtYmln dWF0aW9uLgogICAgIG1fc2Nyb2xsQ29udHJvbGxlci5zZXRBY3RpdmVTY3JvbGxTbmFwSW5kaWNl c0Zvck9mZnNldChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsKICAgICBpZiAobV9zY3Jv bGxDb250cm9sbGVyLmFjdGl2ZVNjcm9sbFNuYXBJbmRleERpZENoYW5nZSgpKSB7CiAgICAgICAg IG1fc2Nyb2xsYWJsZUFyZWEuc2V0Q3VycmVudEhvcml6b250YWxTbmFwUG9pbnRJbmRleChtX3Nj cm9sbENvbnRyb2xsZXIuYWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yQXhpcyhTY3JvbGxFdmVudEF4 aXM6Okhvcml6b250YWwpKTsKQEAgLTIwMiw3ICsxOTIsNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9y Ojpub3RpZnlQb3NpdGlvbkNoYW5nZWQoY29uc3QgRmxvYXRTaXplJiBkZWx0YSkKIHsKICAgICBV TlVTRURfUEFSQU0oZGVsdGEpOwogICAgIC8vIEZJWE1FOiBuZWVkIHRvIG5vdCBtYXAgYmFjayBh bmQgZm9ydGggYWxsIHRoZSB0aW1lLgotICAgIG1fc2Nyb2xsYWJsZUFyZWEuc2V0U2Nyb2xsT2Zm c2V0RnJvbUFuaW1hdGlvbihtX3Njcm9sbGFibGVBcmVhLnNjcm9sbE9mZnNldEZyb21Qb3NpdGlv bihJbnRQb2ludChtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKSkpOworICAgIG1fc2Nyb2xs YWJsZUFyZWEuc2V0U2Nyb2xsT2Zmc2V0RnJvbUFuaW1hdGlvbihtX3Njcm9sbGFibGVBcmVhLnNj cm9sbE9mZnNldEZyb21Qb3NpdGlvbihyb3VuZGVkSW50UG9pbnQoY3VycmVudFBvc2l0aW9uKCkp KSk7CiB9CiAKICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQpAQCAtMjE4LDExICsyMDgsMTMg QEAgTGF5b3V0VW5pdCBTY3JvbGxBbmltYXRvcjo6c2Nyb2xsT2Zmc2V0T25BeGlzKFNjcm9sbEV2 ZW50QXhpcyBheGlzKSBjb25zdAogCiB2b2lkIFNjcm9sbEFuaW1hdG9yOjppbW1lZGlhdGVTY3Jv bGxPbkF4aXMoU2Nyb2xsRXZlbnRBeGlzIGF4aXMsIGZsb2F0IGRlbHRhKQogewotICAgIEZsb2F0 UG9pbnQgY3VycmVudFBvc2l0aW9uID0gdGhpcy0+Y3VycmVudFBvc2l0aW9uKCk7CisgICAgRmxv YXRTaXplIGRlbHRhU2l6ZTsKICAgICBpZiAoYXhpcyA9PSBTY3JvbGxFdmVudEF4aXM6Okhvcml6 b250YWwpCi0gICAgICAgIHNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihGbG9hdFBvaW50 KGN1cnJlbnRQb3NpdGlvbi54KCkgKyBkZWx0YSwgY3VycmVudFBvc2l0aW9uLnkoKSkpOworICAg ICAgICBkZWx0YVNpemUuc2V0V2lkdGgoZGVsdGEpOwogICAgIGVsc2UKLSAgICAgICAgc2Nyb2xs VG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKEZsb2F0UG9pbnQoY3VycmVudFBvc2l0aW9uLngoKSwg Y3VycmVudFBvc2l0aW9uLnkoKSArIGRlbHRhKSk7CisgICAgICAgIGRlbHRhU2l6ZS5zZXRIZWln aHQoZGVsdGEpOworCisgICAgc2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKGN1cnJlbnRQ b3NpdGlvbigpICsgZGVsdGFTaXplKTsKIH0KIAogTGF5b3V0U2l6ZSBTY3JvbGxBbmltYXRvcjo6 c2Nyb2xsRXh0ZW50KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbEFuaW1hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRv ci5oCmluZGV4IDg4YzBmNWY3MjRiODRkNDk4YjNjZjRjNWU1YTBjODg5ZjY5YjA0NjguLmM0NGVj NDMyY2FhMDBjMzJkMzk4N2ZmMjlkYjBiZjM2MGMwYmEyYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsQW5pbWF0b3IuaApAQCAtMzIsNyArMzIsNyBAQAogI2lmbmRlZiBTY3JvbGxB bmltYXRvcl9oCiAjZGVmaW5lIFNjcm9sbEFuaW1hdG9yX2gKIAotI2luY2x1ZGUgIkZsb2F0U2l6 ZS5oIgorI2luY2x1ZGUgIkZsb2F0UG9pbnQuaCIKICNpbmNsdWRlICJMYXlvdXRVbml0LmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCiAjaW5jbHVkZSAiU2Nyb2xsVHlwZXMuaCIK QEAgLTg1LDcgKzg1LDcgQEAgcHVibGljOgogI2VuZGlmCiAKICAgICB2b2lkIHNldEN1cnJlbnRQ b3NpdGlvbihjb25zdCBGbG9hdFBvaW50Jik7Ci0gICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRp b24oKSBjb25zdDsKKyAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3NpdGlvbigpIGNvbnN0IHsgcmV0 dXJuIEZsb2F0UG9pbnQobV9jdXJyZW50UG9zWCwgbV9jdXJyZW50UG9zWSk7IH0KIAogICAgIHZp cnR1YWwgdm9pZCBjYW5jZWxBbmltYXRpb25zKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHNlcnZp Y2VTY3JvbGxBbmltYXRpb25zKCkgeyB9CkBAIC0xNDUsMTMgKzE0NSwxOSBAQCBwcm90ZWN0ZWQ6 CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZChjb25zdCBGbG9hdFNpemUm IGRlbHRhKTsKICAgICB2b2lkIHVwZGF0ZUFjdGl2ZVNjcm9sbFNuYXBJbmRleEZvck9mZnNldCgp OwogCisgICAgdm9pZCBzZXRDdXJyZW50UG9zaXRpb25JbnRlcm5hbChjb25zdCBGbG9hdFBvaW50 JiBwKQorICAgIHsKKyAgICAgICAgbV9jdXJyZW50UG9zWCA9IHAueCgpOworICAgICAgICBtX2N1 cnJlbnRQb3NZID0gcC55KCk7CisgICAgfQorCiAgICAgU2Nyb2xsYWJsZUFyZWEmIG1fc2Nyb2xs YWJsZUFyZWE7CiAgICAgUmVmUHRyPFdoZWVsRXZlbnRUZXN0VHJpZ2dlcj4gbV93aGVlbEV2ZW50 VGVzdFRyaWdnZXI7CiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkgfHwgRU5BQkxFKFJVQkJF Ul9CQU5ESU5HKQogICAgIFNjcm9sbENvbnRyb2xsZXIgbV9zY3JvbGxDb250cm9sbGVyOwogI2Vu ZGlmCi0gICAgZmxvYXQgbV9jdXJyZW50UG9zWDsgLy8gV2UgYXZvaWQgdXNpbmcgYSBGbG9hdFBv aW50IGluIG9yZGVyIHRvIHJlZHVjZQotICAgIGZsb2F0IG1fY3VycmVudFBvc1k7IC8vIHN1YmNs YXNzIGNvZGUgY29tcGxleGl0eS4KKyAgICBmbG9hdCBtX2N1cnJlbnRQb3NYIHsgMCB9OyAvLyBT Y3JvbGxBbmltYXRvck5vbmUgdGFrZXMgYWRkcmVzc2VzIG9mIHRoZXNlLCBzbyBjYW4ndCB1c2Ug YSBGbG9hdFBvaW50LgorICAgIGZsb2F0IG1fY3VycmVudFBvc1kgeyAwIH07CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t YWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMubW0KaW5kZXggMDM1NDc3NDVjODFiZTE0MDU2Y2EzZWRkNTU2Yzk1YTU4 NzllNzMwMS4uZDk4ODE3ZjllNWNiNTExZTRlNzhjZmNlMWRiYTVhYzZkNjAxNmI0YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAt NzAyLDcgKzcwMiw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbChTY3JvbGxiYXJP cmllbnRhdGlvbiBvcmllbnRhdGlvbiwgU2Nyb2xsR3JhbnVsYXJpCiAgICAgaWYgKGdyYW51bGFy aXR5ID09IFNjcm9sbEJ5UGl4ZWwpCiAgICAgICAgIHJldHVybiBTY3JvbGxBbmltYXRvcjo6c2Ny b2xsKG9yaWVudGF0aW9uLCBncmFudWxhcml0eSwgc3RlcCwgbXVsdGlwbGllcik7CiAKLSAgICBG bG9hdFBvaW50IGN1cnJlbnRQb3NpdGlvbihtX2N1cnJlbnRQb3NYLCBtX2N1cnJlbnRQb3NZKTsK KyAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3NpdGlvbiA9IHRoaXMtPmN1cnJlbnRQb3NpdGlvbigp OwogICAgIEZsb2F0U2l6ZSBkZWx0YTsKICAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRh bFNjcm9sbGJhcikKICAgICAgICAgZGVsdGEuc2V0V2lkdGgoc3RlcCAqIG11bHRpcGxpZXIpOwpA QCAtNzIxLDcgKzcyMSw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OnNjcm9sbChTY3JvbGxi YXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgU2Nyb2xsR3JhbnVsYXJpCiAgICAgICAgICAgICBu ZXdQb3NpdGlvbi5zZXRYKHRhcmdldE9yaWdpbi54KTsKICAgICB9CiAKLSAgICBMT0dfV0lUSF9T VFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0gPDwgIlNjcm9sbEFuaW1hdG9yTWFjOjpzY3JvbGwgIiA8 PCAiIGZyb20gIiA8PCBGbG9hdFBvaW50KG1fY3VycmVudFBvc1gsIG1fY3VycmVudFBvc1kpIDw8 ICIgdG8gIiA8PCBuZXdQb3NpdGlvbik7CisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbGluZywg c3RyZWFtIDw8ICJTY3JvbGxBbmltYXRvck1hYzo6c2Nyb2xsICIgPDwgIiBmcm9tICIgPDwgY3Vy cmVudFBvc2l0aW9uIDw8ICIgdG8gIiA8PCBuZXdQb3NpdGlvbik7CiAgICAgW21fc2Nyb2xsQW5p bWF0aW9uSGVscGVyIHNjcm9sbFRvUG9pbnQ6bmV3UG9zaXRpb25dOwogICAgIHJldHVybiB0cnVl OwogfQpAQCAtNzU1LDE2ICs3NTUsMTUgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6YWRqdXN0 U2Nyb2xsUG9zaXRpb25Ub0JvdW5kc0lmTmVjZXNzYXJ5KCkKIAogdm9pZCBTY3JvbGxBbmltYXRv ck1hYzo6aW1tZWRpYXRlU2Nyb2xsVG9Qb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBuZXdQb3Np dGlvbikKIHsKKyAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3NpdGlvbiA9IHRoaXMtPmN1cnJlbnRQ b3NpdGlvbigpOwogICAgIEZsb2F0UG9pbnQgYWRqdXN0ZWRQb3NpdGlvbiA9IGFkanVzdFNjcm9s bFBvc2l0aW9uSWZOZWNlc3NhcnkobmV3UG9zaXRpb24pOwogIAotICAgIGJvb2wgcG9zaXRpb25D aGFuZ2VkID0gYWRqdXN0ZWRQb3NpdGlvbi54KCkgIT0gbV9jdXJyZW50UG9zWCB8fCBhZGp1c3Rl ZFBvc2l0aW9uLnkoKSAhPSBtX2N1cnJlbnRQb3NZOworICAgIGJvb2wgcG9zaXRpb25DaGFuZ2Vk ID0gYWRqdXN0ZWRQb3NpdGlvbiAhPSBjdXJyZW50UG9zaXRpb247CiAgICAgaWYgKCFwb3NpdGlv bkNoYW5nZWQgJiYgIXNjcm9sbGFibGVBcmVhKCkuc2Nyb2xsT3JpZ2luQ2hhbmdlZCgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBGbG9hdFNpemUgZGVsdGEgPSBGbG9hdFNpemUoYWRqdXN0ZWRQ b3NpdGlvbi54KCkgLSBtX2N1cnJlbnRQb3NYLCBhZGp1c3RlZFBvc2l0aW9uLnkoKSAtIG1fY3Vy cmVudFBvc1kpOwotCi0gICAgbV9jdXJyZW50UG9zWCA9IGFkanVzdGVkUG9zaXRpb24ueCgpOwot ICAgIG1fY3VycmVudFBvc1kgPSBhZGp1c3RlZFBvc2l0aW9uLnkoKTsKKyAgICBGbG9hdFNpemUg ZGVsdGEgPSBhZGp1c3RlZFBvc2l0aW9uIC0gY3VycmVudFBvc2l0aW9uOworICAgIHNldEN1cnJl bnRQb3NpdGlvbkludGVybmFsKGFkanVzdGVkUG9zaXRpb24pOwogICAgIG5vdGlmeVBvc2l0aW9u Q2hhbmdlZChkZWx0YSk7CiAgICAgdXBkYXRlQWN0aXZlU2Nyb2xsU25hcEluZGV4Rm9yT2Zmc2V0 KCk7CiB9CkBAIC0xMjk5LDE0ICsxMjk4LDEzIEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6Omlt bWVkaWF0ZVNjcm9sbEJ5V2l0aG91dENvbnRlbnRFZGdlQ29uc3RyYWludHMoY29uc3QgRmxvCiAK IHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmltbWVkaWF0ZVNjcm9sbEJ5KGNvbnN0IEZsb2F0U2l6 ZSYgZGVsdGEpCiB7Ci0gICAgRmxvYXRQb2ludCBuZXdQb3MgPSBhZGp1c3RTY3JvbGxQb3NpdGlv bklmTmVjZXNzYXJ5KEZsb2F0UG9pbnQobV9jdXJyZW50UG9zWCwgbV9jdXJyZW50UG9zWSkgKyBk ZWx0YSk7Ci0gICAgaWYgKG5ld1Bvcy54KCkgPT0gbV9jdXJyZW50UG9zWCAmJiBuZXdQb3MueSgp ID09IG1fY3VycmVudFBvc1kpCisgICAgRmxvYXRQb2ludCBjdXJyZW50UG9zaXRpb24gPSB0aGlz LT5jdXJyZW50UG9zaXRpb24oKTsKKyAgICBGbG9hdFBvaW50IG5ld1Bvc2l0aW9uID0gYWRqdXN0 U2Nyb2xsUG9zaXRpb25JZk5lY2Vzc2FyeShjdXJyZW50UG9zaXRpb24gKyBkZWx0YSk7CisgICAg aWYgKG5ld1Bvc2l0aW9uID09IGN1cnJlbnRQb3NpdGlvbikKICAgICAgICAgcmV0dXJuOwogCi0g ICAgRmxvYXRTaXplIGFkanVzdGVkRGVsdGEgPSBGbG9hdFNpemUobmV3UG9zLngoKSAtIG1fY3Vy cmVudFBvc1gsIG5ld1Bvcy55KCkgLSBtX2N1cnJlbnRQb3NZKTsKLQotICAgIG1fY3VycmVudFBv c1ggPSBuZXdQb3MueCgpOwotICAgIG1fY3VycmVudFBvc1kgPSBuZXdQb3MueSgpOworICAgIEZs b2F0U2l6ZSBhZGp1c3RlZERlbHRhID0gbmV3UG9zaXRpb24gLSBjdXJyZW50UG9zaXRpb247Cisg ICAgc2V0Q3VycmVudFBvc2l0aW9uSW50ZXJuYWwobmV3UG9zaXRpb24pOwogICAgIG5vdGlmeVBv c2l0aW9uQ2hhbmdlZChhZGp1c3RlZERlbHRhKTsKICAgICB1cGRhdGVBY3RpdmVTY3JvbGxTbmFw SW5kZXhGb3JPZmZzZXQoKTsKIH0K