197936 2019-05-15 17:42:16 -0700 Clean up code related to compositing overlap map maintenance 2019-05-15 22:12:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1536675 0 simon.fraser 2019-05-15 17:42:16 -0700 Clean up code related to compositing overlap map maintenance 1536677 1 370011 simon.fraser 2019-05-15 17:45:16 -0700 Created attachment 370011 Patch 1536712 2 370022 simon.fraser 2019-05-15 19:53:25 -0700 Created attachment 370022 Patch 1536718 3 370022 commit-queue 2019-05-15 21:07:43 -0700 Comment on attachment 370022 Patch Clearing flags on attachment: 370022 Committed r245373: <https://trac.webkit.org/changeset/245373> 1536720 4 webkit-bug-importer 2019-05-15 22:12:19 -0700 <rdar://problem/50840802> 370011 2019-05-15 17:45:16 -0700 2019-05-15 19:09:14 -0700 Patch bug-197936-20190515174515.patch text/plain 14448 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmZmZDIwZDBjZDMzMzg1 NTA2YjE2OGJhZjA0MTY2NWRiNDliODk3YS4uOWM4NzkxYzYyZDgyYjRmZTcyZTJhMWExNDFlNTg3 NTMwOWEwZThiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA1LTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNv ZGUgcmVsYXRlZCB0byBjb21wb3NpdGluZyBvdmVybGFwIG1hcCBtYWludGVuYW5jZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3OTM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xhcmlmeSB0aGUgbG9n aWMgYXJvdW5kIHVwZGF0aW5nIHRoZSBvdmVybGFwIG1hcDoKKworICAgICAgICBXaGVuIGEgbGF5 ZXIgYmVjb21lcyBjb21wb3NpdGVkLCBvciBwYWludHMgaW50byBhIG5vbi1yb290IGNvbXBvc2l0 ZWQgbGF5ZXIsIHdlIGFkZCBpdCB0byB0aGUgb3ZlcmxhcCBtYXAKKyAgICAgICAgYWZ0ZXIgdHJh dmVyc2luZyBkZXNjZW5kYW50cyAoc2luY2UgaXQgb25seSBhZmZldHMgbGF5ZXJzIGxhdGVyIGlu IHRyYXZlcnNhbCkuCisKKyAgICAgICAgSWYgYSBsYXllciBiZWNhbWUgY29tcG9zaXRlZCBhZnRl ciB0cmF2ZXJzaW5nIGRlc2NlbmRhbnRzLCB3ZSBuZWVkIHRvIGdvIGJhY2sgYW5kIGFkZCBhbGwg dGhlIGRlc2NlbmRhbnRzCisgICAgICAgIHRvIHRoZSBvdmVybGFwIG1hcCB3aXRoIGEgcmVjdXJz aXZlIHRyYXZlcnNhbC4KKworICAgICAgICBXZSBjYW4gZG8gYWxsIHRoaXMgbmVhciB0aGUgZW5k IG9mIGNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cy90cmF2ZXJzZVVuY2hhbmdlZFN1YnRy ZWUgYmVjYXVzZQorICAgICAgICB3ZSBvbmx5IGNoZWNrIG92ZXJsYXAgd2hlbiB3ZSBlbnRlciB0 aGlzIGZ1bmN0aW9uIG9uIGxhdGVyIGxheWVycy4KKworICAgICAgICBBZGQgYSBDb21wb3NpdGlu Z092ZXJsYXAgbG9nIGNoYW5uZWwgYW5kIHVzZSBpdCB0byBsb2cgdGhlIHN0YXRlIG9mIHRoZSBv dmVybGFwIG1hcC4KKworICAgICAgICAqIHBsYXRmb3JtL0xvZ2dpbmcuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dHJhdmVyc2VVbmNoYW5nZWRT dWJ0cmVlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRkVG9P dmVybGFwTWFwIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRv cjo6YWRkRGVzY2VuZGFudHNUb092ZXJsYXBNYXBSZWN1cnNpdmUgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVPdmVybGFwTWFwIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRkVG9PdmVybGFwTWFw KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRk VG9PdmVybGFwTWFwUmVjdXJzaXZlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisKIDIwMTktMDUtMTUgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoKSBhbmQgdHJhdmVyc2VVbmNoYW5n ZWRTdWJ0cmVlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCBlMTIwYTI5MmE4MzI1 YmJiODBmNjExNTY2NmM1NzZjNDRmMWIyNGUzLi4yN2JmZWJiNGM3OTM1ODI1N2QzMzRmYTdkNDIz MTA0YzRkMGE4NDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5oCkBAIC00NCw2ICs0NCw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBNKEFyY2hpdmVzKSBcCiAgICAgTShDbGlwUmVj dHMpIFwKICAgICBNKENvbXBvc2l0aW5nKSBcCisgICAgTShDb21wb3NpdGluZ092ZXJsYXApIFwK ICAgICBNKENvbnRlbnRGaWx0ZXJpbmcpIFwKICAgICBNKENvbnRlbnRPYnNlcnZhdGlvbikgXAog ICAgIE0oRGF0YWJhc2VUcmFja2VyKSBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDEzNzU1YzNmNjk4MWY2YWY0MTczZWY2 Y2UzMGZmOTAxZjZmZWM5NzEuLjE2NmM0MTE5ZmZlZWZkMGRkMmZhM2NmM2Q1N2Y0OGQzMTI0ZjY0 OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwCkBAIC04NTQsNiArODU0LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAg ICAvLyBXZSB1cGRhdGVkIGNvbXBvc2l0aW5nIGZvciBkaXJlY3QgcmVhc29ucyBpbiBsYXllclN0 eWxlQ2hhbmdlZCgpLiBIZXJlLCBjaGVjayBmb3IgY29tcG9zaXRpbmcgdGhhdCBjYW4gb25seSBi ZSBldmFsdWF0ZWQgYWZ0ZXIgbGF5b3V0LgogICAgIFJlcXVpcmVzQ29tcG9zaXRpbmdEYXRhIHF1 ZXJ5RGF0YTsKICAgICBib29sIHdpbGxCZUNvbXBvc2l0ZWQgPSBsYXllci5pc0NvbXBvc2l0ZWQo KTsKKyAgICBib29sIGJlY2FtZUNvbXBvc2l0ZWRBZnRlckRlc2NlbmRhbnRUcmF2ZXJzYWwgPSBm YWxzZTsKICAgICBpZiAobGF5ZXIubmVlZHNQb3N0TGF5b3V0Q29tcG9zaXRpbmdVcGRhdGUoKSB8 fCBjb21wb3NpdGluZ1N0YXRlLmZ1bGxQYWludE9yZGVyVHJhdmVyc2FsUmVxdWlyZWQgfHwgY29t cG9zaXRpbmdTdGF0ZS5kZXNjZW5kYW50c1JlcXVpcmVDb21wb3NpdGluZ1VwZGF0ZSkgewogICAg ICAgICBsYXllci5zZXRJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uKFJlbmRlckxheWVyOjpJbmRp cmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lKTsKICAgICAgICAgd2lsbEJlQ29tcG9zaXRlZCA9 IG5lZWRzVG9CZUNvbXBvc2l0ZWQobGF5ZXIsIHF1ZXJ5RGF0YSk7CkBAIC05MTgsNiArOTE5LDcg QEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVt ZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAgICAgICAgLy8gVGhpcyBsYXllciBub3cgYWN0 cyBhcyB0aGUgYW5jZXN0b3IgZm9yIGtpZHMuCiAgICAgICAgIGN1cnJlbnRTdGF0ZS5jb21wb3Np dGluZ0FuY2VzdG9yID0gJmxheWVyOwogICAgICAgICBvdmVybGFwTWFwLnB1c2hDb21wb3NpdGlu Z0NvbnRhaW5lcigpOworICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29tcG9zaXRpbmdPdmVybGFw LCBzdHJlYW0gPDwgImxheWVyICIgPDwgJmxheWVyIDw8ICIgd2lsbCBjb21wb3NpdGUsIHB1c2hl ZCBjb250YWluZXIgIiA8PCBvdmVybGFwTWFwKTsKIAogICAgICAgICB3aWxsQmVDb21wb3NpdGVk ID0gdHJ1ZTsKICAgICAgICAgbGF5ZXJQYWludHNJbnRvUHJvdmlkZWRCYWNraW5nID0gZmFsc2U7 CkBAIC05MjYsNyArOTI4LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVD b21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAgICBhdXRvIGxh eWVyV2lsbENvbXBvc2l0ZVBvc3REZXNjZW5kYW50cyA9IFsmXSgpIHsKICAgICAgICAgbGF5ZXJX aWxsQ29tcG9zaXRlKCk7CiAgICAgICAgIGN1cnJlbnRTdGF0ZS5zdWJ0cmVlSXNDb21wb3NpdGlu ZyA9IHRydWU7Ci0gICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShvdmVybGFwTWFwLCBs YXllcik7CisgICAgICAgIGJlY2FtZUNvbXBvc2l0ZWRBZnRlckRlc2NlbmRhbnRUcmF2ZXJzYWwg PSB0cnVlOwogICAgIH07CiAKICAgICBpZiAod2lsbEJlQ29tcG9zaXRlZCkgewpAQCAtOTM5LDYg Kzk0MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdS ZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgfSBlbHNlIGlmIChsYXllclBh aW50c0ludG9Qcm92aWRlZEJhY2tpbmcpIHsKICAgICAgICAgY3VycmVudFN0YXRlLmJhY2tpbmdT aGFyaW5nQW5jZXN0b3IgPSAmbGF5ZXI7CiAgICAgICAgIG92ZXJsYXBNYXAucHVzaENvbXBvc2l0 aW5nQ29udGFpbmVyKCk7CisgICAgICAgIExPR19XSVRIX1NUUkVBTShDb21wb3NpdGluZ092ZXJs YXAsIHN0cmVhbSA8PCAibGF5ZXIgIiA8PCAmbGF5ZXIgPDwgIiB3aWxsIHNoYXJlLCBwdXNoZWQg Y29udGFpbmVyICIgPDwgb3ZlcmxhcE1hcCk7CiAgICAgfQogCiAgICAgYmFja2luZ1NoYXJpbmdT dGF0ZS51cGRhdGVCZWZvcmVEZXNjZW5kYW50VHJhdmVyc2FsKGxheWVyLCB3aWxsQmVDb21wb3Np dGVkKTsKQEAgLTk3MiwxNCArOTc1LDYgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNv bXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAgICAg ICAgaWYgKHVzZXNDb21wb3NpdGluZygpICYmIG1faGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZykK ICAgICAgICAgICAgIHdpbGxCZUNvbXBvc2l0ZWQgPSB0cnVlOwogICAgIH0KLSAgICAKLSAgICAv LyBBbGwgbGF5ZXJzIChldmVuIG9uZXMgdGhhdCBhcmVuJ3QgYmVpbmcgY29tcG9zaXRlZCkgbmVl ZCB0byBnZXQgYWRkZWQgdG8KLSAgICAvLyB0aGUgb3ZlcmxhcCBtYXAuIExheWVycyB0aGF0IGRv IG5vdCBjb21wb3NpdGUgd2lsbCBkcmF3IGludG8gdGhlaXIKLSAgICAvLyBjb21wb3NpdGluZyBh bmNlc3RvcidzIGJhY2tpbmcsIGFuZCBzbyBhcmUgc3RpbGwgY29uc2lkZXJlZCBmb3Igb3Zlcmxh cC4KLSAgICAvLyBGSVhNRTogV2hlbiBsYXllckV4dGVudCBoYXMgdGFrZW4gYW5pbWF0aW9uIGJv dW5kcyBpbnRvIGFjY291bnQsIHdlIGFsc28ga25vdyB0aGF0IHRoZSBib3VuZHMKLSAgICAvLyBp bmNsdWRlIGRlc2NlbmRhbnRzLCBzbyB3ZSBkb24ndCBuZWVkIHRvIGFkZCB0aGVtIGFsbCB0byB0 aGUgb3ZlcmxhcCBtYXAuCi0gICAgaWYgKGN1cnJlbnRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9y ICYmICFjdXJyZW50U3RhdGUuY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNSZW5kZXJWaWV3TGF5ZXIo KSkKLSAgICAgICAgYWRkVG9PdmVybGFwTWFwKG92ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVu dCk7CiAKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQogICAgIGJvb2wgaXNvbGF0ZWRDb21w b3NpdGVkQmxlbmRpbmcgPSBsYXllci5pc29sYXRlc0NvbXBvc2l0ZWRCbGVuZGluZygpOwpAQCAt MTA1Miw5ICsxMDQ3LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29t cG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgZGVzY2VuZGFu dEhhczNEVHJhbnNmb3JtIHw9IGFueURlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSB8fCBsYXllci5o YXMzRFRyYW5zZm9ybSgpOwogICAgIGNvbXBvc2l0aW5nU3RhdGUudXBkYXRlV2l0aERlc2NlbmRh bnRTdGF0ZUFuZExheWVyKGN1cnJlbnRTdGF0ZSwgbGF5ZXIsIGxheWVyRXh0ZW50KTsKIAorICAg IGJvb2wgbGF5ZXJDb250cmlidXRlc1RvT3ZlcmxhcCA9IGN1cnJlbnRTdGF0ZS5jb21wb3NpdGlu Z0FuY2VzdG9yICYmICFjdXJyZW50U3RhdGUuY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNSZW5kZXJW aWV3TGF5ZXIoKTsKKyAgICB1cGRhdGVPdmVybGFwTWFwKG92ZXJsYXBNYXAsIGxheWVyLCBsYXll ckV4dGVudCwgbGF5ZXJDb250cmlidXRlc1RvT3ZlcmxhcCwgYmVjYW1lQ29tcG9zaXRlZEFmdGVy RGVzY2VuZGFudFRyYXZlcnNhbCk7CisKICAgICAvLyBQb3AgYmFja2luZy9vdmVybGFwIHNoYXJp bmcgc3RhdGUuCi0gICAgaWYgKCh3aWxsQmVDb21wb3NpdGVkICYmICFsYXllci5pc1JlbmRlclZp ZXdMYXllcigpKSB8fCBjdXJyZW50U3RhdGUuYmFja2luZ1NoYXJpbmdBbmNlc3RvciA9PSAmbGF5 ZXIpCisgICAgaWYgKCh3aWxsQmVDb21wb3NpdGVkICYmICFsYXllci5pc1JlbmRlclZpZXdMYXll cigpKSB8fCBjdXJyZW50U3RhdGUuYmFja2luZ1NoYXJpbmdBbmNlc3RvciA9PSAmbGF5ZXIpIHsK ICAgICAgICAgb3ZlcmxhcE1hcC5wb3BDb21wb3NpdGluZ0NvbnRhaW5lcigpOworICAgICAgICBM T0dfV0lUSF9TVFJFQU0oQ29tcG9zaXRpbmdPdmVybGFwLCBzdHJlYW0gPDwgImxheWVyICIgPDwg JmxheWVyIDw8ICIgaXMgY29tcG9zaXRlZCwgcG9wcGVkIGNvbnRhaW5lciAiIDw8IG92ZXJsYXBN YXApOworICAgIH0KIAogICAgIGJhY2tpbmdTaGFyaW5nU3RhdGUudXBkYXRlQWZ0ZXJEZXNjZW5k YW50VHJhdmVyc2FsKGxheWVyLCBjb21wb3NpdGluZ1N0YXRlLnN0YWNraW5nQ29udGV4dEFuY2Vz dG9yKTsKICAgICBvdmVybGFwTWFwLmdlb21ldHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2VzdG9y KGFuY2VzdG9yTGF5ZXIpOwpAQCAtMTEwMiw2ICsxMTAyLDcgQEAgdm9pZCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OnRyYXZlcnNlVW5jaGFuZ2VkU3VidHJlZShSZW5kZXJMYXllciogYW5jZXN0b3JM YXllciwKICAgICAgICAgLy8gVGhpcyBsYXllciBub3cgYWN0cyBhcyB0aGUgYW5jZXN0b3IgZm9y IGtpZHMuCiAgICAgICAgIGN1cnJlbnRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yID0gJmxheWVy OwogICAgICAgICBvdmVybGFwTWFwLnB1c2hDb21wb3NpdGluZ0NvbnRhaW5lcigpOworICAgICAg ICBMT0dfV0lUSF9TVFJFQU0oQ29tcG9zaXRpbmdPdmVybGFwLCBzdHJlYW0gPDwgInVuY2hhbmdl ZFN1YnRyZWU6IGxheWVyICIgPDwgJmxheWVyIDw8ICIgd2lsbCBjb21wb3NpdGUsIHB1c2hlZCBj b250YWluZXIgIiA8PCBvdmVybGFwTWFwKTsKIAogICAgICAgICBjb21wdXRlRXh0ZW50KG92ZXJs YXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7CiAgICAgICAgIGN1cnJlbnRTdGF0ZS5hbmNlc3Rv ckhhc1RyYW5zZm9ybUFuaW1hdGlvbiB8PSBsYXllckV4dGVudC5oYXNUcmFuc2Zvcm1BbmltYXRp b247CkBAIC0xMTI5LDE0ICsxMTMwLDYgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnRy YXZlcnNlVW5jaGFuZ2VkU3VidHJlZShSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwKICAgICBm b3IgKGF1dG8qIGNoaWxkTGF5ZXIgOiBsYXllci5wb3NpdGl2ZVpPcmRlckxheWVycygpKQogICAg ICAgICB0cmF2ZXJzZVVuY2hhbmdlZFN1YnRyZWUoJmxheWVyLCAqY2hpbGRMYXllciwgb3Zlcmxh cE1hcCwgY3VycmVudFN0YXRlLCBiYWNraW5nU2hhcmluZ1N0YXRlLCBhbnlEZXNjZW5kYW50SGFz M0RUcmFuc2Zvcm0pOwogCi0gICAgLy8gQWxsIGxheWVycyAoZXZlbiBvbmVzIHRoYXQgYXJlbid0 IGJlaW5nIGNvbXBvc2l0ZWQpIG5lZWQgdG8gZ2V0IGFkZGVkIHRvCi0gICAgLy8gdGhlIG92ZXJs YXAgbWFwLiBMYXllcnMgdGhhdCBkbyBub3QgY29tcG9zaXRlIHdpbGwgZHJhdyBpbnRvIHRoZWly Ci0gICAgLy8gY29tcG9zaXRpbmcgYW5jZXN0b3IncyBiYWNraW5nLCBhbmQgc28gYXJlIHN0aWxs IGNvbnNpZGVyZWQgZm9yIG92ZXJsYXAuCi0gICAgLy8gRklYTUU6IFdoZW4gbGF5ZXJFeHRlbnQg aGFzIHRha2VuIGFuaW1hdGlvbiBib3VuZHMgaW50byBhY2NvdW50LCB3ZSBhbHNvIGtub3cgdGhh dCB0aGUgYm91bmRzCi0gICAgLy8gaW5jbHVkZSBkZXNjZW5kYW50cywgc28gd2UgZG9uJ3QgbmVl ZCB0byBhZGQgdGhlbSBhbGwgdG8gdGhlIG92ZXJsYXAgbWFwLgotICAgIGlmIChjdXJyZW50U3Rh dGUuY29tcG9zaXRpbmdBbmNlc3RvciAmJiAhY3VycmVudFN0YXRlLmNvbXBvc2l0aW5nQW5jZXN0 b3ItPmlzUmVuZGVyVmlld0xheWVyKCkpCi0gICAgICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFw TWFwLCBsYXllciwgbGF5ZXJFeHRlbnQpOwotCiAgICAgLy8gU2V0IHRoZSBmbGFnIHRvIHNheSB0 aGF0IHRoaXMgbGF5ZXIgaGFzIGNvbXBvc2l0aW5nIGNoaWxkcmVuLgogICAgIEFTU0VSVChsYXll ci5oYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoKSA9PSBjdXJyZW50U3RhdGUuc3VidHJlZUlzQ29t cG9zaXRpbmcpOwogICAgIEFTU0VSVF9JTVBMSUVTKGNhbkJlQ29tcG9zaXRlZChsYXllcikgJiYg Y2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRzKGxheWVyKSwgbGF5ZXJJc0NvbXBvc2l0ZWQpOwpA QCAtMTE0Niw4ICsxMTM5LDEzIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp0cmF2ZXJz ZVVuY2hhbmdlZFN1YnRyZWUoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIsCiAgICAgQVNTRVJU KCFjdXJyZW50U3RhdGUuZnVsbFBhaW50T3JkZXJUcmF2ZXJzYWxSZXF1aXJlZCk7CiAgICAgY29t cG9zaXRpbmdTdGF0ZS51cGRhdGVXaXRoRGVzY2VuZGFudFN0YXRlQW5kTGF5ZXIoY3VycmVudFN0 YXRlLCBsYXllciwgbGF5ZXJFeHRlbnQsIHRydWUpOwogCi0gICAgaWYgKChsYXllcklzQ29tcG9z aXRlZCAmJiAhbGF5ZXIuaXNSZW5kZXJWaWV3TGF5ZXIoKSkgfHwgY3VycmVudFN0YXRlLmJhY2tp bmdTaGFyaW5nQW5jZXN0b3IgPT0gJmxheWVyKQorICAgIGJvb2wgbGF5ZXJDb250cmlidXRlc1Rv T3ZlcmxhcCA9IGN1cnJlbnRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yICYmICFjdXJyZW50U3Rh dGUuY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNSZW5kZXJWaWV3TGF5ZXIoKTsKKyAgICB1cGRhdGVP dmVybGFwTWFwKG92ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVudCwgbGF5ZXJDb250cmlidXRl c1RvT3ZlcmxhcCk7CisKKyAgICBpZiAoKGxheWVySXNDb21wb3NpdGVkICYmICFsYXllci5pc1Jl bmRlclZpZXdMYXllcigpKSB8fCBjdXJyZW50U3RhdGUuYmFja2luZ1NoYXJpbmdBbmNlc3RvciA9 PSAmbGF5ZXIpIHsKICAgICAgICAgb3ZlcmxhcE1hcC5wb3BDb21wb3NpdGluZ0NvbnRhaW5lcigp OworICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29tcG9zaXRpbmdPdmVybGFwLCBzdHJlYW0gPDwg InVuY2hhbmdlZFN1YnRyZWU6IGxheWVyICIgPDwgJmxheWVyIDw8ICIgaXMgY29tcG9zaXRlZCwg cG9wcGVkIGNvbnRhaW5lciAiIDw8IG92ZXJsYXBNYXApOworICAgIH0KIAogICAgIGJhY2tpbmdT aGFyaW5nU3RhdGUudXBkYXRlQWZ0ZXJEZXNjZW5kYW50VHJhdmVyc2FsKGxheWVyLCBjb21wb3Np dGluZ1N0YXRlLnN0YWNraW5nQ29udGV4dEFuY2VzdG9yKTsKICAgICBvdmVybGFwTWFwLmdlb21l dHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2VzdG9yKGFuY2VzdG9yTGF5ZXIpOwpAQCAtMTc3OCw3 ICsxNzc2LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVFeHRlbnQoY29u c3QgTGF5ZXJPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBjb24KICAgICBleHRlbnQuZXh0ZW50Q29t cHV0ZWQgPSB0cnVlOwogfQogCi12b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRkVG9PdmVy bGFwTWFwKExheWVyT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgY29uc3QgUmVuZGVyTGF5ZXImIGxh eWVyLCBPdmVybGFwRXh0ZW50JiBleHRlbnQpCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 YWRkVG9PdmVybGFwTWFwKExheWVyT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgY29uc3QgUmVuZGVy TGF5ZXImIGxheWVyLCBPdmVybGFwRXh0ZW50JiBleHRlbnQpIGNvbnN0CiB7CiAgICAgaWYgKGxh eWVyLmlzUmVuZGVyVmlld0xheWVyKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTE3OTQsMzUgKzE3 OTIsNTcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1hcChMYXll ck92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIGNvbnN0IFIKICAgICBvdmVybGFwTWFwLmFkZChjbGlw UmVjdCk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXBS ZWN1cnNpdmUoTGF5ZXJPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBjb25zdCBSZW5kZXJMYXllciYg bGF5ZXIsIGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyKQordm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmFkZERlc2NlbmRhbnRzVG9PdmVybGFwTWFwUmVjdXJzaXZlKExheWVyT3Zl cmxhcE1hcCYgb3ZlcmxhcE1hcCwgY29uc3QgUmVuZGVyTGF5ZXImIGxheWVyLCBjb25zdCBSZW5k ZXJMYXllciogYW5jZXN0b3JMYXllcikgY29uc3QKIHsKICAgICBpZiAoIWNhbkJlQ29tcG9zaXRl ZChsYXllcikpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEEgbnVsbCBhbmNlc3RvckxheWVy IGlzIGFuIGluZGljYXRpb24gdGhhdCAnbGF5ZXInIGhhcyBhbHJlYWR5IGJlZW4gcHVzaGVkLgot ICAgIGlmIChhbmNlc3RvckxheWVyKQorICAgIGlmIChhbmNlc3RvckxheWVyKSB7CiAgICAgICAg IG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5wdXNoTWFwcGluZ3NUb0FuY2VzdG9yKCZsYXllciwg YW5jZXN0b3JMYXllcik7CiAgICAgCi0gICAgT3ZlcmxhcEV4dGVudCBsYXllckV4dGVudDsKLSAg ICBhZGRUb092ZXJsYXBNYXAob3ZlcmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0ZW50KTsKKyAgICAg ICAgT3ZlcmxhcEV4dGVudCBsYXllckV4dGVudDsKKyAgICAgICAgYWRkVG9PdmVybGFwTWFwKG92 ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7CisgICAgfQogCiAjaWYgIUFTU0VSVF9ESVNB QkxFRAogICAgIExheWVyTGlzdE11dGF0aW9uRGV0ZWN0b3IgbXV0YXRpb25DaGVja2VyKGNvbnN0 X2Nhc3Q8UmVuZGVyTGF5ZXImPihsYXllcikpOwogI2VuZGlmCiAKICAgICBmb3IgKGF1dG8qIHJl bmRlckxheWVyIDogbGF5ZXIubmVnYXRpdmVaT3JkZXJMYXllcnMoKSkKLSAgICAgICAgYWRkVG9P dmVybGFwTWFwUmVjdXJzaXZlKG92ZXJsYXBNYXAsICpyZW5kZXJMYXllciwgJmxheWVyKTsKKyAg ICAgICAgYWRkRGVzY2VuZGFudHNUb092ZXJsYXBNYXBSZWN1cnNpdmUob3ZlcmxhcE1hcCwgKnJl bmRlckxheWVyLCAmbGF5ZXIpOwogCiAgICAgZm9yIChhdXRvKiByZW5kZXJMYXllciA6IGxheWVy Lm5vcm1hbEZsb3dMYXllcnMoKSkKLSAgICAgICAgYWRkVG9PdmVybGFwTWFwUmVjdXJzaXZlKG92 ZXJsYXBNYXAsICpyZW5kZXJMYXllciwgJmxheWVyKTsKKyAgICAgICAgYWRkRGVzY2VuZGFudHNU b092ZXJsYXBNYXBSZWN1cnNpdmUob3ZlcmxhcE1hcCwgKnJlbmRlckxheWVyLCAmbGF5ZXIpOwog CiAgICAgZm9yIChhdXRvKiByZW5kZXJMYXllciA6IGxheWVyLnBvc2l0aXZlWk9yZGVyTGF5ZXJz KCkpCi0gICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShvdmVybGFwTWFwLCAqcmVuZGVy TGF5ZXIsICZsYXllcik7CisgICAgICAgIGFkZERlc2NlbmRhbnRzVG9PdmVybGFwTWFwUmVjdXJz aXZlKG92ZXJsYXBNYXAsICpyZW5kZXJMYXllciwgJmxheWVyKTsKICAgICAKICAgICBpZiAoYW5j ZXN0b3JMYXllcikKICAgICAgICAgb3ZlcmxhcE1hcC5nZW9tZXRyeU1hcCgpLnBvcE1hcHBpbmdz VG9BbmNlc3RvcihhbmNlc3RvckxheWVyKTsKIH0KIAordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZU92ZXJsYXBNYXAoTGF5ZXJPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBjb25zdCBS ZW5kZXJMYXllciYgbGF5ZXIsIE92ZXJsYXBFeHRlbnQmIGxheWVyRXh0ZW50LCBib29sIGxheWVy Q29udHJpYnV0ZXNUb092ZXJsYXAsIGJvb2wgYWRkRGVzY2VuZGFudHNUb092ZXJsYXApIGNvbnN0 Cit7CisgICAgQVNTRVJUX0lNUExJRVMoYWRkRGVzY2VuZGFudHNUb092ZXJsYXAsIGxheWVyQ29u dHJpYnV0ZXNUb092ZXJsYXApOworCisgICAgLy8gQWxsIGxheWVycyAoZXZlbiBvbmVzIHRoYXQg YXJlbid0IGJlaW5nIGNvbXBvc2l0ZWQpIG5lZWQgdG8gZ2V0IGFkZGVkIHRvCisgICAgLy8gdGhl IG92ZXJsYXAgbWFwLiBMYXllcnMgdGhhdCBkbyBub3QgY29tcG9zaXRlIHdpbGwgZHJhdyBpbnRv IHRoZWlyCisgICAgLy8gY29tcG9zaXRpbmcgYW5jZXN0b3IncyBiYWNraW5nLCBhbmQgc28gYXJl IHN0aWxsIGNvbnNpZGVyZWQgZm9yIG92ZXJsYXAuCisgICAgLy8gRklYTUU6IFdoZW4gbGF5ZXJF eHRlbnQgaGFzIHRha2VuIGFuaW1hdGlvbiBib3VuZHMgaW50byBhY2NvdW50LCB3ZSBhbHNvIGtu b3cgdGhhdCB0aGUgYm91bmRzCisgICAgLy8gaW5jbHVkZSBkZXNjZW5kYW50cywgc28gd2UgZG9u J3QgbmVlZCB0byBhZGQgdGhlbSBhbGwgdG8gdGhlIG92ZXJsYXAgbWFwLgorICAgIGlmIChsYXll ckNvbnRyaWJ1dGVzVG9PdmVybGFwKSB7CisgICAgICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFw TWFwLCBsYXllciwgbGF5ZXJFeHRlbnQpOworICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29tcG9z aXRpbmdPdmVybGFwLCBzdHJlYW0gPDwgImxheWVyICIgPDwgJmxheWVyIDw8ICIgY29udHJpYnV0 ZXMgdG8gb3ZlcmxhcCwgYWRkZWQgdG8gbWFwICIgPDwgb3ZlcmxhcE1hcCk7CisgICAgfQorCisg ICAgaWYgKGFkZERlc2NlbmRhbnRzVG9PdmVybGFwKSB7CisgICAgICAgIC8vIElmIHRoaXMgaXMg dGhlIGZpcnN0IG5vbi1yb290IGxheWVyIHRvIGNvbXBvc2l0ZSwgd2UgbmVlZCB0byBhZGQgYWxs IHRoZSBkZXNjZW5kYW50cyB3ZSBhbHJlYWR5IHRyYXZlcnNlZCB0byB0aGUgb3ZlcmxhcCBtYXAu CisgICAgICAgIGFkZERlc2NlbmRhbnRzVG9PdmVybGFwTWFwUmVjdXJzaXZlKG92ZXJsYXBNYXAs IGxheWVyKTsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbXBvc2l0aW5nT3ZlcmxhcCwgc3Ry ZWFtIDw8ICJsYXllciAiIDw8ICZsYXllciA8PCAiIGNvbXBvc2l0ZWQgcG9zdCBkZXNjZW5kYW50 IHRyYXZlcnNhbCwgYWRkZWQgcmVjdXJzaXZlICIgPDwgb3ZlcmxhcE1hcCk7CisgICAgfQorfQor CiAjaWYgRU5BQkxFKFZJREVPKQogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhbkFjY2Vs ZXJhdGVWaWRlb1JlbmRlcmluZyhSZW5kZXJWaWRlbyYgdmlkZW8pIGNvbnN0CiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggZGIy MjQzNjdkYjBlYWU0OTkyZDRiYjhmMDY2NTNiOTQwNGMzMmI4OC4uZjUxNmI4MzBlZDUyZDNmOGRm NTZjN2Y5YTA2YjlhNWQ0MTI0MzI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtNDA2LDggKzQwNiw5IEBAIHByaXZhdGU6CiAg ICAgdm9pZCByZWN1cnNpdmVSZXBhaW50TGF5ZXIoUmVuZGVyTGF5ZXImKTsKIAogICAgIHZvaWQg Y29tcHV0ZUV4dGVudChjb25zdCBMYXllck92ZXJsYXBNYXAmLCBjb25zdCBSZW5kZXJMYXllciYs IE92ZXJsYXBFeHRlbnQmKSBjb25zdDsKLSAgICB2b2lkIGFkZFRvT3ZlcmxhcE1hcChMYXllck92 ZXJsYXBNYXAmLCBjb25zdCBSZW5kZXJMYXllciYsIE92ZXJsYXBFeHRlbnQmKTsKLSAgICB2b2lk IGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShMYXllck92ZXJsYXBNYXAmLCBjb25zdCBSZW5kZXJM YXllciYsIGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyID0gbnVsbHB0cik7CisgICAg dm9pZCBhZGRUb092ZXJsYXBNYXAoTGF5ZXJPdmVybGFwTWFwJiwgY29uc3QgUmVuZGVyTGF5ZXIm LCBPdmVybGFwRXh0ZW50JikgY29uc3Q7CisgICAgdm9pZCBhZGREZXNjZW5kYW50c1RvT3Zlcmxh cE1hcFJlY3Vyc2l2ZShMYXllck92ZXJsYXBNYXAmLCBjb25zdCBSZW5kZXJMYXllciYsIGNvbnN0 IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyID0gbnVsbHB0cikgY29uc3Q7CisgICAgdm9pZCB1 cGRhdGVPdmVybGFwTWFwKExheWVyT3ZlcmxhcE1hcCYsIGNvbnN0IFJlbmRlckxheWVyJiwgT3Zl cmxhcEV4dGVudCYsIGJvb2wgbGF5ZXJDb250cmlidXRlc1RvT3ZlcmxhcCwgYm9vbCBhZGREZXNj ZW5kYW50c1RvT3ZlcmxhcCA9IGZhbHNlKSBjb25zdDsKIAogICAgIHZvaWQgdXBkYXRlQ29tcG9z aXRpbmdMYXllcnNUaW1lckZpcmVkKCk7CiAK 370022 2019-05-15 19:53:25 -0700 2019-05-15 21:07:43 -0700 Patch bug-197936-20190515195325.patch text/plain 14468 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDcwMTBmMmQ0ZWUxN2M2 OGVmOWM1OWJkZDFkNDNkY2ZmNTVhODkyYy4uZmU4NWRlYTRlYmNkMjg0Y2Q5NjgxYjdmZDUyMDg0 YTUxNjAzNWY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA1LTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNv ZGUgcmVsYXRlZCB0byBjb21wb3NpdGluZyBvdmVybGFwIG1hcCBtYWludGVuYW5jZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3OTM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgWmFsYW4gQnVqdGFzLgorCisgICAgICAgIENsYXJpZnkgdGhlIGxvZ2lj IGFyb3VuZCB1cGRhdGluZyB0aGUgb3ZlcmxhcCBtYXA6CisKKyAgICAgICAgV2hlbiBhIGxheWVy IGJlY29tZXMgY29tcG9zaXRlZCwgb3IgcGFpbnRzIGludG8gYSBub24tcm9vdCBjb21wb3NpdGVk IGxheWVyLCB3ZSBhZGQgaXQgdG8gdGhlIG92ZXJsYXAgbWFwCisgICAgICAgIGFmdGVyIHRyYXZl cnNpbmcgZGVzY2VuZGFudHMgKHNpbmNlIGl0IG9ubHkgYWZmZXRzIGxheWVycyBsYXRlciBpbiB0 cmF2ZXJzYWwpLgorCisgICAgICAgIElmIGEgbGF5ZXIgYmVjYW1lIGNvbXBvc2l0ZWQgYWZ0ZXIg dHJhdmVyc2luZyBkZXNjZW5kYW50cywgd2UgbmVlZCB0byBnbyBiYWNrIGFuZCBhZGQgYWxsIHRo ZSBkZXNjZW5kYW50cworICAgICAgICB0byB0aGUgb3ZlcmxhcCBtYXAgd2l0aCBhIHJlY3Vyc2l2 ZSB0cmF2ZXJzYWwuCisKKyAgICAgICAgV2UgY2FuIGRvIGFsbCB0aGlzIG5lYXIgdGhlIGVuZCBv ZiBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMvdHJhdmVyc2VVbmNoYW5nZWRTdWJ0cmVl IGJlY2F1c2UKKyAgICAgICAgd2Ugb25seSBjaGVjayBvdmVybGFwIHdoZW4gd2UgZW50ZXIgdGhp cyBmdW5jdGlvbiBvbiBsYXRlciBsYXllcnMuCisKKyAgICAgICAgQWRkIGEgQ29tcG9zaXRpbmdP dmVybGFwIGxvZyBjaGFubmVsIGFuZCB1c2UgaXQgdG8gbG9nIHRoZSBzdGF0ZSBvZiB0aGUgb3Zl cmxhcCBtYXAuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2dnaW5nLmg6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnRyYXZlcnNlVW5jaGFuZ2VkU3Vi dHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zl cmxhcE1hcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmFkZERlc2NlbmRhbnRzVG9PdmVybGFwTWFwUmVjdXJzaXZlIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmxhcE1hcCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1hcCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRv T3ZlcmxhcE1hcFJlY3Vyc2l2ZSk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5oOgorCiAyMDE5LTA1LTE1ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjQ1MDcyKTogTWlzc2luZyBj b2RlIGluIERvY3VtZW50OjpzdHlsZUNvbG9yT3B0aW9ucyB0byBwcm9wYWdhdGUgU3R5bGVDb2xv cjo6T3B0aW9uczo6VXNlSW5hY3RpdmVBcHBlYXJhbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5n LmgKaW5kZXggZTEyMGEyOTJhODMyNWJiYjgwZjYxMTU2NjZjNTc2YzQ0ZjFiMjRlMy4uMjdiZmVi YjRjNzkzNTgyNTdkMzM0ZmE3ZDQyMzEwNGM0ZDBhODQ5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xv Z2dpbmcuaApAQCAtNDQsNiArNDQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgTShBcmNo aXZlcykgXAogICAgIE0oQ2xpcFJlY3RzKSBcCiAgICAgTShDb21wb3NpdGluZykgXAorICAgIE0o Q29tcG9zaXRpbmdPdmVybGFwKSBcCiAgICAgTShDb250ZW50RmlsdGVyaW5nKSBcCiAgICAgTShD b250ZW50T2JzZXJ2YXRpb24pIFwKICAgICBNKERhdGFiYXNlVHJhY2tlcikgXApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA3 NTkyZWRhOGYxZjYwYjgzYjEyOTkzNDJhYmVmZWZjYzc1ZmVlNzYwLi5iNWI2YzY1NDI4MzI5MTY1 MmFlNmJkZWJiZjFkMWE0ZGE5MGM0NjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtODU0LDYgKzg1NCw3IEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVu ZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgLy8gV2UgdXBkYXRlZCBjb21wb3NpdGluZyBmb3IgZGly ZWN0IHJlYXNvbnMgaW4gbGF5ZXJTdHlsZUNoYW5nZWQoKS4gSGVyZSwgY2hlY2sgZm9yIGNvbXBv c2l0aW5nIHRoYXQgY2FuIG9ubHkgYmUgZXZhbHVhdGVkIGFmdGVyIGxheW91dC4KICAgICBSZXF1 aXJlc0NvbXBvc2l0aW5nRGF0YSBxdWVyeURhdGE7CiAgICAgYm9vbCB3aWxsQmVDb21wb3NpdGVk ID0gbGF5ZXIuaXNDb21wb3NpdGVkKCk7CisgICAgYm9vbCBiZWNhbWVDb21wb3NpdGVkQWZ0ZXJE ZXNjZW5kYW50VHJhdmVyc2FsID0gZmFsc2U7CiAgICAgaWYgKGxheWVyLm5lZWRzUG9zdExheW91 dENvbXBvc2l0aW5nVXBkYXRlKCkgfHwgY29tcG9zaXRpbmdTdGF0ZS5mdWxsUGFpbnRPcmRlclRy YXZlcnNhbFJlcXVpcmVkIHx8IGNvbXBvc2l0aW5nU3RhdGUuZGVzY2VuZGFudHNSZXF1aXJlQ29t cG9zaXRpbmdVcGRhdGUpIHsKICAgICAgICAgbGF5ZXIuc2V0SW5kaXJlY3RDb21wb3NpdGluZ1Jl YXNvbihSZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6Tm9uZSk7CiAgICAg ICAgIHdpbGxCZUNvbXBvc2l0ZWQgPSBuZWVkc1RvQmVDb21wb3NpdGVkKGxheWVyLCBxdWVyeURh dGEpOwpAQCAtOTE4LDYgKzkxOSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21w dXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAgICAgICAg IC8vIFRoaXMgbGF5ZXIgbm93IGFjdHMgYXMgdGhlIGFuY2VzdG9yIGZvciBraWRzLgogICAgICAg ICBjdXJyZW50U3RhdGUuY29tcG9zaXRpbmdBbmNlc3RvciA9ICZsYXllcjsKICAgICAgICAgb3Zl cmxhcE1hcC5wdXNoQ29tcG9zaXRpbmdDb250YWluZXIoKTsKKyAgICAgICAgTE9HX1dJVEhfU1RS RUFNKENvbXBvc2l0aW5nT3ZlcmxhcCwgc3RyZWFtIDw8ICJsYXllciAiIDw8ICZsYXllciA8PCAi IHdpbGwgY29tcG9zaXRlLCBwdXNoZWQgY29udGFpbmVyICIgPDwgb3ZlcmxhcE1hcCk7CiAKICAg ICAgICAgd2lsbEJlQ29tcG9zaXRlZCA9IHRydWU7CiAgICAgICAgIGxheWVyUGFpbnRzSW50b1By b3ZpZGVkQmFja2luZyA9IGZhbHNlOwpAQCAtOTI2LDcgKzkyOCw3IEBAIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIq IGFuY2VzdG9yCiAgICAgYXV0byBsYXllcldpbGxDb21wb3NpdGVQb3N0RGVzY2VuZGFudHMgPSBb Jl0gewogICAgICAgICBsYXllcldpbGxDb21wb3NpdGUoKTsKICAgICAgICAgY3VycmVudFN0YXRl LnN1YnRyZWVJc0NvbXBvc2l0aW5nID0gdHJ1ZTsKLSAgICAgICAgYWRkVG9PdmVybGFwTWFwUmVj dXJzaXZlKG92ZXJsYXBNYXAsIGxheWVyKTsKKyAgICAgICAgYmVjYW1lQ29tcG9zaXRlZEFmdGVy RGVzY2VuZGFudFRyYXZlcnNhbCA9IHRydWU7CiAgICAgfTsKIAogICAgIGlmICh3aWxsQmVDb21w b3NpdGVkKSB7CkBAIC05MzksNiArOTQxLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAg ICB9IGVsc2UgaWYgKGxheWVyUGFpbnRzSW50b1Byb3ZpZGVkQmFja2luZykgewogICAgICAgICBj dXJyZW50U3RhdGUuYmFja2luZ1NoYXJpbmdBbmNlc3RvciA9ICZsYXllcjsKICAgICAgICAgb3Zl cmxhcE1hcC5wdXNoQ29tcG9zaXRpbmdDb250YWluZXIoKTsKKyAgICAgICAgTE9HX1dJVEhfU1RS RUFNKENvbXBvc2l0aW5nT3ZlcmxhcCwgc3RyZWFtIDw8ICJsYXllciAiIDw8ICZsYXllciA8PCAi IHdpbGwgc2hhcmUsIHB1c2hlZCBjb250YWluZXIgIiA8PCBvdmVybGFwTWFwKTsKICAgICB9CiAK ICAgICBiYWNraW5nU2hhcmluZ1N0YXRlLnVwZGF0ZUJlZm9yZURlc2NlbmRhbnRUcmF2ZXJzYWwo bGF5ZXIsIHdpbGxCZUNvbXBvc2l0ZWQpOwpAQCAtOTcyLDE0ICs5NzUsNiBAQCB2b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxh eWVyKiBhbmNlc3RvcgogICAgICAgICBpZiAodXNlc0NvbXBvc2l0aW5nKCkgJiYgbV9oYXNBY2Nl bGVyYXRlZENvbXBvc2l0aW5nKQogICAgICAgICAgICAgd2lsbEJlQ29tcG9zaXRlZCA9IHRydWU7 CiAgICAgfQotICAgIAotICAgIC8vIEFsbCBsYXllcnMgKGV2ZW4gb25lcyB0aGF0IGFyZW4ndCBi ZWluZyBjb21wb3NpdGVkKSBuZWVkIHRvIGdldCBhZGRlZCB0bwotICAgIC8vIHRoZSBvdmVybGFw IG1hcC4gTGF5ZXJzIHRoYXQgZG8gbm90IGNvbXBvc2l0ZSB3aWxsIGRyYXcgaW50byB0aGVpcgot ICAgIC8vIGNvbXBvc2l0aW5nIGFuY2VzdG9yJ3MgYmFja2luZywgYW5kIHNvIGFyZSBzdGlsbCBj b25zaWRlcmVkIGZvciBvdmVybGFwLgotICAgIC8vIEZJWE1FOiBXaGVuIGxheWVyRXh0ZW50IGhh cyB0YWtlbiBhbmltYXRpb24gYm91bmRzIGludG8gYWNjb3VudCwgd2UgYWxzbyBrbm93IHRoYXQg dGhlIGJvdW5kcwotICAgIC8vIGluY2x1ZGUgZGVzY2VuZGFudHMsIHNvIHdlIGRvbid0IG5lZWQg dG8gYWRkIHRoZW0gYWxsIHRvIHRoZSBvdmVybGFwIG1hcC4KLSAgICBpZiAoY3VycmVudFN0YXRl LmNvbXBvc2l0aW5nQW5jZXN0b3IgJiYgIWN1cnJlbnRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9y LT5pc1JlbmRlclZpZXdMYXllcigpKQotICAgICAgICBhZGRUb092ZXJsYXBNYXAob3ZlcmxhcE1h cCwgbGF5ZXIsIGxheWVyRXh0ZW50KTsKIAogI2lmIEVOQUJMRShDU1NfQ09NUE9TSVRJTkcpCiAg ICAgYm9vbCBpc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZyA9IGxheWVyLmlzb2xhdGVzQ29tcG9z aXRlZEJsZW5kaW5nKCk7CkBAIC0xMDUyLDkgKzEwNDcsMTQgQEAgdm9pZCBSZW5kZXJMYXllckNv bXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5j ZXN0b3IKICAgICBkZXNjZW5kYW50SGFzM0RUcmFuc2Zvcm0gfD0gYW55RGVzY2VuZGFudEhhczNE VHJhbnNmb3JtIHx8IGxheWVyLmhhczNEVHJhbnNmb3JtKCk7CiAgICAgY29tcG9zaXRpbmdTdGF0 ZS51cGRhdGVXaXRoRGVzY2VuZGFudFN0YXRlQW5kTGF5ZXIoY3VycmVudFN0YXRlLCBsYXllciwg bGF5ZXJFeHRlbnQpOwogCisgICAgYm9vbCBsYXllckNvbnRyaWJ1dGVzVG9PdmVybGFwID0gY3Vy cmVudFN0YXRlLmNvbXBvc2l0aW5nQW5jZXN0b3IgJiYgIWN1cnJlbnRTdGF0ZS5jb21wb3NpdGlu Z0FuY2VzdG9yLT5pc1JlbmRlclZpZXdMYXllcigpOworICAgIHVwZGF0ZU92ZXJsYXBNYXAob3Zl cmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0ZW50LCBsYXllckNvbnRyaWJ1dGVzVG9PdmVybGFwLCBi ZWNhbWVDb21wb3NpdGVkQWZ0ZXJEZXNjZW5kYW50VHJhdmVyc2FsKTsKKwogICAgIC8vIFBvcCBi YWNraW5nL292ZXJsYXAgc2hhcmluZyBzdGF0ZS4KLSAgICBpZiAoKHdpbGxCZUNvbXBvc2l0ZWQg JiYgIWxheWVyLmlzUmVuZGVyVmlld0xheWVyKCkpIHx8IGN1cnJlbnRTdGF0ZS5iYWNraW5nU2hh cmluZ0FuY2VzdG9yID09ICZsYXllcikKKyAgICBpZiAoKHdpbGxCZUNvbXBvc2l0ZWQgJiYgIWxh eWVyLmlzUmVuZGVyVmlld0xheWVyKCkpIHx8IGN1cnJlbnRTdGF0ZS5iYWNraW5nU2hhcmluZ0Fu Y2VzdG9yID09ICZsYXllcikgewogICAgICAgICBvdmVybGFwTWFwLnBvcENvbXBvc2l0aW5nQ29u dGFpbmVyKCk7CisgICAgICAgIExPR19XSVRIX1NUUkVBTShDb21wb3NpdGluZ092ZXJsYXAsIHN0 cmVhbSA8PCAibGF5ZXIgIiA8PCAmbGF5ZXIgPDwgIiBpcyBjb21wb3NpdGVkLCBwb3BwZWQgY29u dGFpbmVyICIgPDwgb3ZlcmxhcE1hcCk7CisgICAgfQogCiAgICAgYmFja2luZ1NoYXJpbmdTdGF0 ZS51cGRhdGVBZnRlckRlc2NlbmRhbnRUcmF2ZXJzYWwobGF5ZXIsIGNvbXBvc2l0aW5nU3RhdGUu c3RhY2tpbmdDb250ZXh0QW5jZXN0b3IpOwogICAgIG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5w b3BNYXBwaW5nc1RvQW5jZXN0b3IoYW5jZXN0b3JMYXllcik7CkBAIC0xMTAyLDYgKzExMDIsNyBA QCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dHJhdmVyc2VVbmNoYW5nZWRTdWJ0cmVlKFJl bmRlckxheWVyKiBhbmNlc3RvckxheWVyLAogICAgICAgICAvLyBUaGlzIGxheWVyIG5vdyBhY3Rz IGFzIHRoZSBhbmNlc3RvciBmb3Iga2lkcy4KICAgICAgICAgY3VycmVudFN0YXRlLmNvbXBvc2l0 aW5nQW5jZXN0b3IgPSAmbGF5ZXI7CiAgICAgICAgIG92ZXJsYXBNYXAucHVzaENvbXBvc2l0aW5n Q29udGFpbmVyKCk7CisgICAgICAgIExPR19XSVRIX1NUUkVBTShDb21wb3NpdGluZ092ZXJsYXAs IHN0cmVhbSA8PCAidW5jaGFuZ2VkU3VidHJlZTogbGF5ZXIgIiA8PCAmbGF5ZXIgPDwgIiB3aWxs IGNvbXBvc2l0ZSwgcHVzaGVkIGNvbnRhaW5lciAiIDw8IG92ZXJsYXBNYXApOwogCiAgICAgICAg IGNvbXB1dGVFeHRlbnQob3ZlcmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0ZW50KTsKICAgICAgICAg Y3VycmVudFN0YXRlLmFuY2VzdG9ySGFzVHJhbnNmb3JtQW5pbWF0aW9uIHw9IGxheWVyRXh0ZW50 Lmhhc1RyYW5zZm9ybUFuaW1hdGlvbjsKQEAgLTExMjksMTQgKzExMzAsNiBAQCB2b2lkIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dHJhdmVyc2VVbmNoYW5nZWRTdWJ0cmVlKFJlbmRlckxheWVyKiBh bmNlc3RvckxheWVyLAogICAgIGZvciAoYXV0byogY2hpbGRMYXllciA6IGxheWVyLnBvc2l0aXZl Wk9yZGVyTGF5ZXJzKCkpCiAgICAgICAgIHRyYXZlcnNlVW5jaGFuZ2VkU3VidHJlZSgmbGF5ZXIs ICpjaGlsZExheWVyLCBvdmVybGFwTWFwLCBjdXJyZW50U3RhdGUsIGJhY2tpbmdTaGFyaW5nU3Rh dGUsIGFueURlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSk7CiAKLSAgICAvLyBBbGwgbGF5ZXJzIChl dmVuIG9uZXMgdGhhdCBhcmVuJ3QgYmVpbmcgY29tcG9zaXRlZCkgbmVlZCB0byBnZXQgYWRkZWQg dG8KLSAgICAvLyB0aGUgb3ZlcmxhcCBtYXAuIExheWVycyB0aGF0IGRvIG5vdCBjb21wb3NpdGUg d2lsbCBkcmF3IGludG8gdGhlaXIKLSAgICAvLyBjb21wb3NpdGluZyBhbmNlc3RvcidzIGJhY2tp bmcsIGFuZCBzbyBhcmUgc3RpbGwgY29uc2lkZXJlZCBmb3Igb3ZlcmxhcC4KLSAgICAvLyBGSVhN RTogV2hlbiBsYXllckV4dGVudCBoYXMgdGFrZW4gYW5pbWF0aW9uIGJvdW5kcyBpbnRvIGFjY291 bnQsIHdlIGFsc28ga25vdyB0aGF0IHRoZSBib3VuZHMKLSAgICAvLyBpbmNsdWRlIGRlc2NlbmRh bnRzLCBzbyB3ZSBkb24ndCBuZWVkIHRvIGFkZCB0aGVtIGFsbCB0byB0aGUgb3ZlcmxhcCBtYXAu Ci0gICAgaWYgKGN1cnJlbnRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yICYmICFjdXJyZW50U3Rh dGUuY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNSZW5kZXJWaWV3TGF5ZXIoKSkKLSAgICAgICAgYWRk VG9PdmVybGFwTWFwKG92ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7Ci0KICAgICAvLyBT ZXQgdGhlIGZsYWcgdG8gc2F5IHRoYXQgdGhpcyBsYXllciBoYXMgY29tcG9zaXRpbmcgY2hpbGRy ZW4uCiAgICAgQVNTRVJUKGxheWVyLmhhc0NvbXBvc2l0aW5nRGVzY2VuZGFudCgpID09IGN1cnJl bnRTdGF0ZS5zdWJ0cmVlSXNDb21wb3NpdGluZyk7CiAgICAgQVNTRVJUX0lNUExJRVMoY2FuQmVD b21wb3NpdGVkKGxheWVyKSAmJiBjbGlwc0NvbXBvc2l0aW5nRGVzY2VuZGFudHMobGF5ZXIpLCBs YXllcklzQ29tcG9zaXRlZCk7CkBAIC0xMTQ2LDggKzExMzksMTMgQEAgdm9pZCBSZW5kZXJMYXll ckNvbXBvc2l0b3I6OnRyYXZlcnNlVW5jaGFuZ2VkU3VidHJlZShSZW5kZXJMYXllciogYW5jZXN0 b3JMYXllciwKICAgICBBU1NFUlQoIWN1cnJlbnRTdGF0ZS5mdWxsUGFpbnRPcmRlclRyYXZlcnNh bFJlcXVpcmVkKTsKICAgICBjb21wb3NpdGluZ1N0YXRlLnVwZGF0ZVdpdGhEZXNjZW5kYW50U3Rh dGVBbmRMYXllcihjdXJyZW50U3RhdGUsIGxheWVyLCBsYXllckV4dGVudCwgdHJ1ZSk7CiAKLSAg ICBpZiAoKGxheWVySXNDb21wb3NpdGVkICYmICFsYXllci5pc1JlbmRlclZpZXdMYXllcigpKSB8 fCBjdXJyZW50U3RhdGUuYmFja2luZ1NoYXJpbmdBbmNlc3RvciA9PSAmbGF5ZXIpCisgICAgYm9v bCBsYXllckNvbnRyaWJ1dGVzVG9PdmVybGFwID0gY3VycmVudFN0YXRlLmNvbXBvc2l0aW5nQW5j ZXN0b3IgJiYgIWN1cnJlbnRTdGF0ZS5jb21wb3NpdGluZ0FuY2VzdG9yLT5pc1JlbmRlclZpZXdM YXllcigpOworICAgIHVwZGF0ZU92ZXJsYXBNYXAob3ZlcmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0 ZW50LCBsYXllckNvbnRyaWJ1dGVzVG9PdmVybGFwKTsKKworICAgIGlmICgobGF5ZXJJc0NvbXBv c2l0ZWQgJiYgIWxheWVyLmlzUmVuZGVyVmlld0xheWVyKCkpIHx8IGN1cnJlbnRTdGF0ZS5iYWNr aW5nU2hhcmluZ0FuY2VzdG9yID09ICZsYXllcikgewogICAgICAgICBvdmVybGFwTWFwLnBvcENv bXBvc2l0aW5nQ29udGFpbmVyKCk7CisgICAgICAgIExPR19XSVRIX1NUUkVBTShDb21wb3NpdGlu Z092ZXJsYXAsIHN0cmVhbSA8PCAidW5jaGFuZ2VkU3VidHJlZTogbGF5ZXIgIiA8PCAmbGF5ZXIg PDwgIiBpcyBjb21wb3NpdGVkLCBwb3BwZWQgY29udGFpbmVyICIgPDwgb3ZlcmxhcE1hcCk7Cisg ICAgfQogCiAgICAgYmFja2luZ1NoYXJpbmdTdGF0ZS51cGRhdGVBZnRlckRlc2NlbmRhbnRUcmF2 ZXJzYWwobGF5ZXIsIGNvbXBvc2l0aW5nU3RhdGUuc3RhY2tpbmdDb250ZXh0QW5jZXN0b3IpOwog ICAgIG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5wb3BNYXBwaW5nc1RvQW5jZXN0b3IoYW5jZXN0 b3JMYXllcik7CkBAIC0xNzc4LDcgKzE3NzYsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRv cjo6Y29tcHV0ZUV4dGVudChjb25zdCBMYXllck92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIGNvbgog ICAgIGV4dGVudC5leHRlbnRDb21wdXRlZCA9IHRydWU7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoTGF5ZXJPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBj b25zdCBSZW5kZXJMYXllciYgbGF5ZXIsIE92ZXJsYXBFeHRlbnQmIGV4dGVudCkKK3ZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoTGF5ZXJPdmVybGFwTWFwJiBvdmVy bGFwTWFwLCBjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIsIE92ZXJsYXBFeHRlbnQmIGV4dGVudCkg Y29uc3QKIHsKICAgICBpZiAobGF5ZXIuaXNSZW5kZXJWaWV3TGF5ZXIoKSkKICAgICAgICAgcmV0 dXJuOwpAQCAtMTc5NCwzNSArMTc5Miw1NyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 YWRkVG9PdmVybGFwTWFwKExheWVyT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgY29uc3QgUgogICAg IG92ZXJsYXBNYXAuYWRkKGNsaXBSZWN0KTsKIH0KIAotdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShMYXllck92ZXJsYXBNYXAmIG92ZXJsYXBNYXAs IGNvbnN0IFJlbmRlckxheWVyJiBsYXllciwgY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5 ZXIpCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6YWRkRGVzY2VuZGFudHNUb092ZXJsYXBN YXBSZWN1cnNpdmUoTGF5ZXJPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBjb25zdCBSZW5kZXJMYXll ciYgbGF5ZXIsIGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyKSBjb25zdAogewogICAg IGlmICghY2FuQmVDb21wb3NpdGVkKGxheWVyKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8g QSBudWxsIGFuY2VzdG9yTGF5ZXIgaXMgYW4gaW5kaWNhdGlvbiB0aGF0ICdsYXllcicgaGFzIGFs cmVhZHkgYmVlbiBwdXNoZWQuCi0gICAgaWYgKGFuY2VzdG9yTGF5ZXIpCisgICAgaWYgKGFuY2Vz dG9yTGF5ZXIpIHsKICAgICAgICAgb3ZlcmxhcE1hcC5nZW9tZXRyeU1hcCgpLnB1c2hNYXBwaW5n c1RvQW5jZXN0b3IoJmxheWVyLCBhbmNlc3RvckxheWVyKTsKICAgICAKLSAgICBPdmVybGFwRXh0 ZW50IGxheWVyRXh0ZW50OwotICAgIGFkZFRvT3ZlcmxhcE1hcChvdmVybGFwTWFwLCBsYXllciwg bGF5ZXJFeHRlbnQpOworICAgICAgICBPdmVybGFwRXh0ZW50IGxheWVyRXh0ZW50OworICAgICAg ICBhZGRUb092ZXJsYXBNYXAob3ZlcmxhcE1hcCwgbGF5ZXIsIGxheWVyRXh0ZW50KTsKKyAgICB9 CiAKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgTGF5ZXJMaXN0TXV0YXRpb25EZXRlY3RvciBt dXRhdGlvbkNoZWNrZXIoY29uc3RfY2FzdDxSZW5kZXJMYXllciY+KGxheWVyKSk7CiAjZW5kaWYK IAogICAgIGZvciAoYXV0byogcmVuZGVyTGF5ZXIgOiBsYXllci5uZWdhdGl2ZVpPcmRlckxheWVy cygpKQotICAgICAgICBhZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUob3ZlcmxhcE1hcCwgKnJlbmRl ckxheWVyLCAmbGF5ZXIpOworICAgICAgICBhZGREZXNjZW5kYW50c1RvT3ZlcmxhcE1hcFJlY3Vy c2l2ZShvdmVybGFwTWFwLCAqcmVuZGVyTGF5ZXIsICZsYXllcik7CiAKICAgICBmb3IgKGF1dG8q IHJlbmRlckxheWVyIDogbGF5ZXIubm9ybWFsRmxvd0xheWVycygpKQotICAgICAgICBhZGRUb092 ZXJsYXBNYXBSZWN1cnNpdmUob3ZlcmxhcE1hcCwgKnJlbmRlckxheWVyLCAmbGF5ZXIpOworICAg ICAgICBhZGREZXNjZW5kYW50c1RvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShvdmVybGFwTWFwLCAqcmVu ZGVyTGF5ZXIsICZsYXllcik7CiAKICAgICBmb3IgKGF1dG8qIHJlbmRlckxheWVyIDogbGF5ZXIu cG9zaXRpdmVaT3JkZXJMYXllcnMoKSkKLSAgICAgICAgYWRkVG9PdmVybGFwTWFwUmVjdXJzaXZl KG92ZXJsYXBNYXAsICpyZW5kZXJMYXllciwgJmxheWVyKTsKKyAgICAgICAgYWRkRGVzY2VuZGFu dHNUb092ZXJsYXBNYXBSZWN1cnNpdmUob3ZlcmxhcE1hcCwgKnJlbmRlckxheWVyLCAmbGF5ZXIp OwogICAgIAogICAgIGlmIChhbmNlc3RvckxheWVyKQogICAgICAgICBvdmVybGFwTWFwLmdlb21l dHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2VzdG9yKGFuY2VzdG9yTGF5ZXIpOwogfQogCit2b2lk IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlT3ZlcmxhcE1hcChMYXllck92ZXJsYXBNYXAm IG92ZXJsYXBNYXAsIGNvbnN0IFJlbmRlckxheWVyJiBsYXllciwgT3ZlcmxhcEV4dGVudCYgbGF5 ZXJFeHRlbnQsIGJvb2wgbGF5ZXJDb250cmlidXRlc1RvT3ZlcmxhcCwgYm9vbCBhZGREZXNjZW5k YW50c1RvT3ZlcmxhcCkgY29uc3QKK3sKKyAgICBBU1NFUlRfSU1QTElFUyhhZGREZXNjZW5kYW50 c1RvT3ZlcmxhcCwgbGF5ZXJDb250cmlidXRlc1RvT3ZlcmxhcCk7CisKKyAgICAvLyBBbGwgbGF5 ZXJzIChldmVuIG9uZXMgdGhhdCBhcmVuJ3QgYmVpbmcgY29tcG9zaXRlZCkgbmVlZCB0byBnZXQg YWRkZWQgdG8KKyAgICAvLyB0aGUgb3ZlcmxhcCBtYXAuIExheWVycyB0aGF0IGRvIG5vdCBjb21w b3NpdGUgd2lsbCBkcmF3IGludG8gdGhlaXIKKyAgICAvLyBjb21wb3NpdGluZyBhbmNlc3Rvcidz IGJhY2tpbmcsIGFuZCBzbyBhcmUgc3RpbGwgY29uc2lkZXJlZCBmb3Igb3ZlcmxhcC4KKyAgICAv LyBGSVhNRTogV2hlbiBsYXllckV4dGVudCBoYXMgdGFrZW4gYW5pbWF0aW9uIGJvdW5kcyBpbnRv IGFjY291bnQsIHdlIGFsc28ga25vdyB0aGF0IHRoZSBib3VuZHMKKyAgICAvLyBpbmNsdWRlIGRl c2NlbmRhbnRzLCBzbyB3ZSBkb24ndCBuZWVkIHRvIGFkZCB0aGVtIGFsbCB0byB0aGUgb3Zlcmxh cCBtYXAuCisgICAgaWYgKGxheWVyQ29udHJpYnV0ZXNUb092ZXJsYXApIHsKKyAgICAgICAgYWRk VG9PdmVybGFwTWFwKG92ZXJsYXBNYXAsIGxheWVyLCBsYXllckV4dGVudCk7CisgICAgICAgIExP R19XSVRIX1NUUkVBTShDb21wb3NpdGluZ092ZXJsYXAsIHN0cmVhbSA8PCAibGF5ZXIgIiA8PCAm bGF5ZXIgPDwgIiBjb250cmlidXRlcyB0byBvdmVybGFwLCBhZGRlZCB0byBtYXAgIiA8PCBvdmVy bGFwTWFwKTsKKyAgICB9CisKKyAgICBpZiAoYWRkRGVzY2VuZGFudHNUb092ZXJsYXApIHsKKyAg ICAgICAgLy8gSWYgdGhpcyBpcyB0aGUgZmlyc3Qgbm9uLXJvb3QgbGF5ZXIgdG8gY29tcG9zaXRl LCB3ZSBuZWVkIHRvIGFkZCBhbGwgdGhlIGRlc2NlbmRhbnRzIHdlIGFscmVhZHkgdHJhdmVyc2Vk IHRvIHRoZSBvdmVybGFwIG1hcC4KKyAgICAgICAgYWRkRGVzY2VuZGFudHNUb092ZXJsYXBNYXBS ZWN1cnNpdmUob3ZlcmxhcE1hcCwgbGF5ZXIpOworICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29t cG9zaXRpbmdPdmVybGFwLCBzdHJlYW0gPDwgImxheWVyICIgPDwgJmxheWVyIDw8ICIgY29tcG9z aXRlZCBwb3N0IGRlc2NlbmRhbnQgdHJhdmVyc2FsLCBhZGRlZCByZWN1cnNpdmUgIiA8PCBvdmVy bGFwTWFwKTsKKyAgICB9Cit9CisKICNpZiBFTkFCTEUoVklERU8pCiBib29sIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6Y2FuQWNjZWxlcmF0ZVZpZGVvUmVuZGVyaW5nKFJlbmRlclZpZGVvJiB2aWRl bykgY29uc3QKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuaAppbmRleCBkYjIyNDM2N2RiMGVhZTQ5OTJkNGJiOGYwNjY1M2I5NDA0YzMyYjg4 Li5mNTE2YjgzMGVkNTJkM2Y4ZGY1NmM3ZjlhMDZiOWE1ZDQxMjQzMjQ0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC00MDYsOCAr NDA2LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlY3Vyc2l2ZVJlcGFpbnRMYXllcihSZW5kZXJM YXllciYpOwogCiAgICAgdm9pZCBjb21wdXRlRXh0ZW50KGNvbnN0IExheWVyT3ZlcmxhcE1hcCYs IGNvbnN0IFJlbmRlckxheWVyJiwgT3ZlcmxhcEV4dGVudCYpIGNvbnN0OwotICAgIHZvaWQgYWRk VG9PdmVybGFwTWFwKExheWVyT3ZlcmxhcE1hcCYsIGNvbnN0IFJlbmRlckxheWVyJiwgT3Zlcmxh cEV4dGVudCYpOwotICAgIHZvaWQgYWRkVG9PdmVybGFwTWFwUmVjdXJzaXZlKExheWVyT3Zlcmxh cE1hcCYsIGNvbnN0IFJlbmRlckxheWVyJiwgY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5 ZXIgPSBudWxscHRyKTsKKyAgICB2b2lkIGFkZFRvT3ZlcmxhcE1hcChMYXllck92ZXJsYXBNYXAm LCBjb25zdCBSZW5kZXJMYXllciYsIE92ZXJsYXBFeHRlbnQmKSBjb25zdDsKKyAgICB2b2lkIGFk ZERlc2NlbmRhbnRzVG9PdmVybGFwTWFwUmVjdXJzaXZlKExheWVyT3ZlcmxhcE1hcCYsIGNvbnN0 IFJlbmRlckxheWVyJiwgY29uc3QgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yTGF5ZXIgPSBudWxscHRy KSBjb25zdDsKKyAgICB2b2lkIHVwZGF0ZU92ZXJsYXBNYXAoTGF5ZXJPdmVybGFwTWFwJiwgY29u c3QgUmVuZGVyTGF5ZXImLCBPdmVybGFwRXh0ZW50JiwgYm9vbCBsYXllckNvbnRyaWJ1dGVzVG9P dmVybGFwLCBib29sIGFkZERlc2NlbmRhbnRzVG9PdmVybGFwID0gZmFsc2UpIGNvbnN0OwogCiAg ICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVyRmlyZWQoKTsKIAo=