144428 2015-04-29 19:02:16 -0700 Fixed elements end up in the middle of the view with pageScale < 1 2015-04-30 16:46:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser cmarcelo commit-queue jamesr luiz tonikitoo oldest_to_newest 1090288 0 simon.fraser 2015-04-29 19:02:16 -0700 Fixed elements end up in the middle of the view with pageScale < 1 1090289 1 252023 simon.fraser 2015-04-29 19:04:46 -0700 Created attachment 252023 Patch 1090290 2 252023 simon.fraser 2015-04-29 19:06:17 -0700 Comment on attachment 252023 Patch Missed another spot. 1090567 3 252086 simon.fraser 2015-04-30 14:10:49 -0700 Created attachment 252086 Patch 1090651 4 252086 commit-queue 2015-04-30 16:46:06 -0700 Comment on attachment 252086 Patch Clearing flags on attachment: 252086 Committed r183655: <http://trac.webkit.org/changeset/183655> 1090652 5 commit-queue 2015-04-30 16:46:11 -0700 All reviewed patches have been landed. Closing bug. 252023 2015-04-29 19:04:46 -0700 2015-04-30 14:10:43 -0700 Patch bug-144428-20150429190336.patch text/plain 15006 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg5NGNlMDM0NjY0NTJk N2FiYWRjMTU2ZTU3Y2U3ZmM0MDJmMmMwMi4uYWE2ZWU4ZDEwOWMwNjgzYWRkMzI3MjVmMjRhMjZm YzY3ZjYxODNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDE1LTA0LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZpeGVkIGVsZW1l bnRzIGVuZCB1cCBpbiB0aGUgbWlkZGxlIG9mIHRoZSB2aWV3IHdpdGggcGFnZVNjYWxlIDwgMQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDI4Cisg ICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIwNDA0OTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBXaGVuIHBhZ2VTY2FsZSBpcyA8IDEsIHdl IHVzZWQgZml4ZWQgbGF5b3V0IG1vZGUsIGFuZCBGcmFtZVZpZXc6OmZpeGVkRWxlbWVudHNMYXlv dXRSZWxhdGl2ZVRvRnJhbWUoKQorICAgICAgICByZXR1cm5zIHRydWUuIEhvd2V2ZXIsIHRoZSBz Y3JvbGxpbmcgdGhyZWFkIHdhcyBjYWxsaW5nIHRoZSBzdGF0aWMgc2Nyb2xsT2Zmc2V0Rm9yRml4 ZWRQb3NpdGlvbigpCisgICAgICAgIGhhcmRjb2RpbmcgJ2ZhbHNlJyBmb3IgdGhpcyBwYXJhbWV0 ZXIuCisgICAgICAgIAorICAgICAgICBGaXggYnkgc2VuZGluZyB0aGUgdmFsdWUgb2YgZml4ZWRF bGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSBvdmVyIHRvIHRoZSBzY3JvbGxpbmcgdGhyZWFk LAorICAgICAgICBzbyB3ZSBjYW4gdXNlIGl0IHdoZW4gZG9pbmcgc2Nyb2xsaW5nLXRocmVhZCBm aXhlZCBwb3NpdGlvbiBzdHVmZi4KKworICAgICAgICBOb3QgdGVzdGFibGUuCisKKyAgICAgICAg KiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld0xheW91dFVwZGF0 ZWQpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlOjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0Rml4ZWRFbGVtZW50c0xh eW91dFJlbGF0aXZlVG9GcmFtZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 dXBkYXRlQmVmb3JlQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWVGcmFtZVNjcm9sbGluZ05vZGU6OmZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUp OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2hv dWxkVXBkYXRlU2Nyb2xsTGF5ZXJQb3NpdGlvblN5bmNocm9ub3VzbHkpOiBEZWxldGVkLgorICAg ICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9k ZU1hYzo6c2V0U2Nyb2xsTGF5ZXJQb3NpdGlvbik6CisKKzIwMTUtMDQtMjkgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgQ3Jhc2ggYXQgV2ViQ29yZTo6 RG9jdW1lbnQ6OmFic29sdXRlUmVnaW9uRm9yRXZlbnRUYXJnZXRzIAogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDI2CiAgICAgICAgIHJkYXI6Ly9w cm9ibGVtLzIwNTAyMTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTI1MmRhZWZhZmY1MjFlNTFjM2ZhYjlkNWFk NTY4ZGU0NjlkODdkNy4uNzBkNjYyZjM2NWY0YzNhNzViZTg2ZDE1MGU1NjYzYmVkMzU5ZGIzZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA0LTI5ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeGVkIGVsZW1lbnRzIGVuZCB1cCBp biB0aGUgbWlkZGxlIG9mIHRoZSB2aWV3IHdpdGggcGFnZVNjYWxlIDwgMQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDI4CisgICAgICAgIHJkYXI6 Ly9wcm9ibGVtLzIwNDA0OTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBFbmNvZGUvZGVjb2RlIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxh dGl2ZVRvRnJhbWUuCisKKyAgICAgICAgKiBTaGFyZWQvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGlu Z0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb24uY3BwOgorICAgICAgICAoQXJndW1lbnRDb2RlcjxTY3Jv bGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT46OmVuY29kZSk6CisgICAgICAgIChBcmd1bWVu dENvZGVyPFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPjo6ZGVjb2RlKToKKwogMjAx NS0wNC0yOSAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBF eHBhbmQgdGVzdCBpbmZyYXN0cnVjdHVyZSB0byBzdXBwb3J0IHNjcm9sbGluZyB0ZXN0cwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmNwcAppbmRleCBiZWQzYzNkODk0MjZjMGM0ZDg4MTUyMDUxNzlkNTVkOTNi NTM1MGIxLi41OTQxMWU3YmU2ZDFiOGIwNWFkMTkyNTRhOTRjZDAzMWNmY2M0ZTNlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmNwcApAQCAtMTM2LDYgKzEzNiw3IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvcjo6ZnJhbWVWaWV3TGF5b3V0VXBkYXRlZChGcmFtZVZpZXcmIGZyYW1lVmlldykK ICAgICBub2RlLT5zZXRTY3JvbGxhYmxlQXJlYVNpemUoZnJhbWVWaWV3LnZpc2libGVDb250ZW50 UmVjdCgpLnNpemUoKSk7CiAgICAgbm9kZS0+c2V0VG90YWxDb250ZW50c1NpemUoZnJhbWVWaWV3 LnRvdGFsQ29udGVudHNTaXplKCkpOwogICAgIG5vZGUtPnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6 ZShmcmFtZVZpZXcudG90YWxDb250ZW50c1NpemUoKSk7CisgICAgbm9kZS0+c2V0Rml4ZWRFbGVt ZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZShmcmFtZVZpZXcuZml4ZWRFbGVtZW50c0xheW91dFJl bGF0aXZlVG9GcmFtZSgpKTsKIAogI2lmIEVOQUJMRShDU1NfU0NST0xMX1NOQVApCiAgICAgZnJh bWVWaWV3LnVwZGF0ZVNuYXBPZmZzZXRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9k ZS5jcHAKaW5kZXggMzUwYzc5NmQ2ZDhjM2JjY2Y4ZjZhMDRiMjA2YzIzMDY0YzU4NmExMy4uMzI2 ZDllOGY0YjY1ZjQ2ZTk3MzExNzJjOTQxNzRmODg0MGZhOTlkMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJh bWVTY3JvbGxpbmdOb2RlLmNwcApAQCAtNDAsMTcgKzQwLDYgQEAgUGFzc1JlZlB0cjxTY3JvbGxp bmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT4gU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU6OmMKIAogU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRl RnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ1N0YXRlVHJlZSYgc3RhdGVUcmVlLCBTY3JvbGxp bmdOb2RlSUQgbm9kZUlEKQogICAgIDogU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlKHN0YXRl VHJlZSwgRnJhbWVTY3JvbGxpbmdOb2RlLCBub2RlSUQpCi0jaWYgUExBVEZPUk0oTUFDKQotICAg ICwgbV92ZXJ0aWNhbFNjcm9sbGJhclBhaW50ZXIoMCkKLSAgICAsIG1faG9yaXpvbnRhbFNjcm9s bGJhclBhaW50ZXIoMCkKLSNlbmRpZgotICAgICwgbV9mcmFtZVNjYWxlRmFjdG9yKDEpCi0gICAg LCBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucygwKQotICAgICwgbV9iZWhhdmlvckZvckZp eGVkKFN0aWNrVG9Eb2N1bWVudEJvdW5kcykKLSAgICAsIG1faGVhZGVySGVpZ2h0KDApCi0gICAg LCBtX2Zvb3RlckhlaWdodCgwKQotICAgICwgbV9yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvblJlcHJl c2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoZmFsc2UpCi0gICAgLCBtX3RvcENvbnRlbnRJbnNldCgw KQogewogfQogCkBAIC02MSwxNCArNTAsMTUgQEAgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGlu Z05vZGU6OlNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlKGNvbnN0IFNjcm9sbGkKICAg ICAsIG1faG9yaXpvbnRhbFNjcm9sbGJhclBhaW50ZXIoc3RhdGVOb2RlLmhvcml6b250YWxTY3Jv bGxiYXJQYWludGVyKCkpCiAjZW5kaWYKICAgICAsIG1fbm9uRmFzdFNjcm9sbGFibGVSZWdpb24o c3RhdGVOb2RlLm5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKCkpCisgICAgLCBtX3JlcXVlc3RlZFNj cm9sbFBvc2l0aW9uKHN0YXRlTm9kZS5yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbigpKQogICAgICwg bV9mcmFtZVNjYWxlRmFjdG9yKHN0YXRlTm9kZS5mcmFtZVNjYWxlRmFjdG9yKCkpCi0gICAgLCBt X3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyhzdGF0ZU5vZGUuc3luY2hyb25vdXNTY3JvbGxp bmdSZWFzb25zKCkpCi0gICAgLCBtX2JlaGF2aW9yRm9yRml4ZWQoc3RhdGVOb2RlLnNjcm9sbEJl aGF2aW9yRm9yRml4ZWRFbGVtZW50cygpKQorICAgICwgbV90b3BDb250ZW50SW5zZXQoc3RhdGVO b2RlLnRvcENvbnRlbnRJbnNldCgpKQogICAgICwgbV9oZWFkZXJIZWlnaHQoc3RhdGVOb2RlLmhl YWRlckhlaWdodCgpKQogICAgICwgbV9mb290ZXJIZWlnaHQoc3RhdGVOb2RlLmZvb3RlckhlaWdo dCgpKQotICAgICwgbV9yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbihzdGF0ZU5vZGUucmVxdWVzdGVk U2Nyb2xsUG9zaXRpb24oKSkKKyAgICAsIG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKHN0 YXRlTm9kZS5zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoKSkKKyAgICAsIG1fYmVoYXZpb3JG b3JGaXhlZChzdGF0ZU5vZGUuc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCkpCiAgICAg LCBtX3JlcXVlc3RlZFNjcm9sbFBvc2l0aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbChz dGF0ZU5vZGUucmVxdWVzdGVkU2Nyb2xsUG9zaXRpb25SZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Ny b2xsKCkpCi0gICAgLCBtX3RvcENvbnRlbnRJbnNldChzdGF0ZU5vZGUudG9wQ29udGVudEluc2V0 KCkpCisgICAgLCBtX2ZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUoc3RhdGVOb2Rl LmZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUoKSkKIHsKICAgICBpZiAoaGFzQ2hh bmdlZFByb3BlcnR5KFNjcm9sbGVkQ29udGVudHNMYXllcikpCiAgICAgICAgIHNldFNjcm9sbGVk Q29udGVudHNMYXllcihzdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkudG9SZXByZXNl bnRhdGlvbihhZG9wdGl2ZVRyZWUucHJlZmVycmVkTGF5ZXJSZXByZXNlbnRhdGlvbigpKSk7CkBA IC0yMTYsNiArMjA2LDE1IEBAIHZvaWQgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6 OnNldEZvb3RlckxheWVyKGNvbnN0IExheWVyUmVwcmVzZW50YXRpb24mCiAgICAgc2V0UHJvcGVy dHlDaGFuZ2VkKEZvb3RlckxheWVyKTsKIH0KIAordm9pZCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Ny b2xsaW5nTm9kZTo6c2V0Rml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZShib29sIGZp eGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpCit7CisgICAgaWYgKGZpeGVkRWxlbWVu dHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUgPT0gbV9maXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVU b0ZyYW1lKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgbV9maXhlZEVsZW1lbnRzTGF5b3V0 UmVsYXRpdmVUb0ZyYW1lID0gZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZTsKKyAg ICBzZXRQcm9wZXJ0eUNoYW5nZWQoRml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSk7 Cit9CisKICNpZiAhUExBVEZPUk0oTUFDKQogdm9pZCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZTo6c2V0U2Nyb2xsYmFyUGFpbnRlcnNGcm9tU2Nyb2xsYmFycyhTY3JvbGxiYXIqLCBT Y3JvbGxiYXIqKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgKaW5kZXggYjEzYjQz ODZmOWE4ZjFlZTM2N2ZkNmIyMmZhZWIwZTRjZWIxNzYwNy4uMmFhYThiMGY0Y2U1NjhhOTI0OTNm MDQ5NzRhN2IyODRkNGQ1MWU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCkBA IC02MCw3ICs2MCw4IEBAIHB1YmxpYzoKICAgICAgICAgRm9vdGVyTGF5ZXIsCiAgICAgICAgIFBh aW50ZXJGb3JTY3JvbGxiYXIsCiAgICAgICAgIEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cywKLSAg ICAgICAgVG9wQ29udGVudEluc2V0CisgICAgICAgIFRvcENvbnRlbnRJbnNldCwKKyAgICAgICAg Rml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSwKICAgICB9OwogCiAgICAgZmxvYXQg ZnJhbWVTY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fZnJhbWVTY2FsZUZhY3RvcjsgfQpA QCAtMTA5LDYgKzExMCw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBMYXllclJlcHJlc2VudGF0aW9u JiBmb290ZXJMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fZm9vdGVyTGF5ZXI7IH0KICAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHNldEZvb3RlckxheWVyKGNvbnN0IExheWVyUmVwcmVzZW50YXRpb24m KTsKIAorICAgIGJvb2wgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpIGNvbnN0 IHsgcmV0dXJuIG1fZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZTsgfQorICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0Rml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZShi b29sKTsKKwogI2lmIFBMQVRGT1JNKE1BQykKICAgICBTY3JvbGxiYXJQYWludGVyIHZlcnRpY2Fs U2Nyb2xsYmFyUGFpbnRlcigpIGNvbnN0IHsgcmV0dXJuIG1fdmVydGljYWxTY3JvbGxiYXJQYWlu dGVyLmdldCgpOyB9CiAgICAgU2Nyb2xsYmFyUGFpbnRlciBob3Jpem9udGFsU2Nyb2xsYmFyUGFp bnRlcigpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbFNjcm9sbGJhclBhaW50ZXIuZ2V0KCk7 IH0KQEAgLTEzNCwxNCArMTM4LDE1IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIFJlZ2lvbiBt X25vbkZhc3RTY3JvbGxhYmxlUmVnaW9uOwotICAgIGZsb2F0IG1fZnJhbWVTY2FsZUZhY3RvcjsK LSAgICBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnM7Ci0gICAgU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzIG1fYmVoYXZpb3JGb3JG aXhlZDsKLSAgICBpbnQgbV9oZWFkZXJIZWlnaHQ7Ci0gICAgaW50IG1fZm9vdGVySGVpZ2h0Owog ICAgIEZsb2F0UG9pbnQgbV9yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbjsKLSAgICBib29sIG1fcmVx dWVzdGVkU2Nyb2xsUG9zaXRpb25SZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsOwotICAgIGZs b2F0IG1fdG9wQ29udGVudEluc2V0OworICAgIGZsb2F0IG1fZnJhbWVTY2FsZUZhY3RvciB7IDEg fTsKKyAgICBmbG9hdCBtX3RvcENvbnRlbnRJbnNldCB7IDAgfTsKKyAgICBpbnQgbV9oZWFkZXJI ZWlnaHQgeyAwIH07CisgICAgaW50IG1fZm9vdGVySGVpZ2h0IHsgMCB9OworICAgIFN5bmNocm9u b3VzU2Nyb2xsaW5nUmVhc29ucyBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucyB7IDAgfTsK KyAgICBTY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMgbV9iZWhhdmlvckZvckZpeGVkIHsg U3RpY2tUb0RvY3VtZW50Qm91bmRzIH07CisgICAgYm9vbCBtX3JlcXVlc3RlZFNjcm9sbFBvc2l0 aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2Zp eGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUgeyBmYWxzZSB9OwogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCBh NWM5ZWE1ZDczYjZkNmU3NGU3ZmJiZTE4NTQ0YzBmNzhlZTQ4ZjFjLi5mNDRiOTJjYmE1NzkxMzIy YmJjMGYwODk5Mzg4YzNmNzg5NWRiYzk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl LmNwcApAQCAtMzUsMTIgKzM1LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBTY3JvbGxpbmdU cmVlRnJhbWVTY3JvbGxpbmdOb2RlOjpTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlKFNj cm9sbGluZ1RyZWUmIHNjcm9sbGluZ1RyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiAgICAg OiBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZShzY3JvbGxpbmdUcmVlLCBGcmFtZVNjcm9sbGlu Z05vZGUsIG5vZGVJRCkKLSAgICAsIG1fZnJhbWVTY2FsZUZhY3RvcigxKQotICAgICwgbV9oZWFk ZXJIZWlnaHQoMCkKLSAgICAsIG1fZm9vdGVySGVpZ2h0KDApCi0gICAgLCBtX3RvcENvbnRlbnRJ bnNldCgwKQotICAgICwgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoMCkKLSAgICAsIG1f YmVoYXZpb3JGb3JGaXhlZChTdGlja1RvRG9jdW1lbnRCb3VuZHMpCiB7CiB9CiAKQEAgLTcxLDYg KzY1LDkgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlOjp1cGRhdGVCZWZv cmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU4KIAogICAgIGlmIChzdGF0ZS5oYXNDaGFu Z2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlRvcENvbnRlbnRJ bnNldCkpCiAgICAgICAgIG1fdG9wQ29udGVudEluc2V0ID0gc3RhdGUudG9wQ29udGVudEluc2V0 KCk7CisKKyAgICBpZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJh bWVTY3JvbGxpbmdOb2RlOjpGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKSkKKyAg ICAgICAgbV9maXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lID0gc3RhdGUuZml4ZWRF bGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpOwogfQogCiB2b2lkIFNjcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGU6OnNjcm9sbEJ5KGNvbnN0IEZsb2F0U2l6ZSYgb2Zmc2V0KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCmluZGV4IDgxNTc4NDJlMWNkYjVkYjdhNzgyZjk5ZTI0 ZGViN2VlZjNlMGEzZDMuLmFjNDQ5MDVkNjA0MDUxN2E5OTAxYzk3ZGYzZDI5YjI2NzA0MTYyMjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmgKQEAgLTU0LDYgKzU0LDcgQEAgcHVibGlj OgogCiAgICAgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIHN5bmNocm9ub3VzU2Nyb2xsaW5n UmVhc29ucygpIGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zOyB9 CiAgICAgYm9vbCBzaG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uU3luY2hyb25vdXNseSgp IGNvbnN0IHsgcmV0dXJuIG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zOyB9CisgICAgYm9v bCBmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9m aXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lOyB9CiAKICAgICBGbG9hdFNpemUgdmll d1RvQ29udGVudHNPZmZzZXQoY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsT2Zmc2V0KSBjb25zdDsK IApAQCAtNzEsMTQgKzcyLDE2IEBAIHByb3RlY3RlZDoKICAgICBTY3JvbGxCZWhhdmlvckZvckZp eGVkRWxlbWVudHMgc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCkgY29uc3QgeyByZXR1 cm4gbV9iZWhhdmlvckZvckZpeGVkOyB9CiAgICAgCiBwcml2YXRlOgotICAgIGZsb2F0IG1fZnJh bWVTY2FsZUZhY3RvcjsKKyAgICBmbG9hdCBtX2ZyYW1lU2NhbGVGYWN0b3IgeyAxIH07CisgICAg ZmxvYXQgbV90b3BDb250ZW50SW5zZXQgeyAwIH07CiAKLSAgICBpbnQgbV9oZWFkZXJIZWlnaHQ7 Ci0gICAgaW50IG1fZm9vdGVySGVpZ2h0OwotICAgIGZsb2F0IG1fdG9wQ29udGVudEluc2V0Owor ICAgIGludCBtX2hlYWRlckhlaWdodCB7IDAgfTsKKyAgICBpbnQgbV9mb290ZXJIZWlnaHQgeyAw IH07CiAgICAgCi0gICAgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIG1fc3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zOwotICAgIFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyBtX2Jl aGF2aW9yRm9yRml4ZWQ7CisgICAgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIG1fc3luY2hy b25vdXNTY3JvbGxpbmdSZWFzb25zIHsgMCB9OworICAgIFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRF bGVtZW50cyBtX2JlaGF2aW9yRm9yRml4ZWQgeyBTdGlja1RvRG9jdW1lbnRCb3VuZHMgfTsKKyAg ICAKKyAgICBib29sIG1fZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSB7IGZhbHNl IH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1h Yy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJh bWVTY3JvbGxpbmdOb2RlTWFjLm1tCmluZGV4IDk0ZDE1N2NjMWMxM2QwYTM0YWIwNWRlNmQ5Nzhm OTg0NmM2MGVkMmEuLjBlZTFkNzc3OTUwMWMyZmM1ZGYzMmU5ZWU4NDk3ZmU0NWM5NDYzODYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCkBAIC0zODEsNyAr MzgxLDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjOjpzZXRTY3Jv bGxMYXllclBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQKICAgICBGbG9hdFJlY3Qgdmlld3BvcnRS ZWN0KEZsb2F0UG9pbnQoKSwgc2Nyb2xsYWJsZUFyZWFTaXplKCkpOwogICAgIAogICAgIEZsb2F0 U2l6ZSBzY3JvbGxPZmZzZXRGb3JGaXhlZENoaWxkcmVuID0gRnJhbWVWaWV3OjpzY3JvbGxPZmZz ZXRGb3JGaXhlZFBvc2l0aW9uKGVuY2xvc2luZ0xheW91dFJlY3Qodmlld3BvcnRSZWN0KSwgTGF5 b3V0U2l6ZSh0b3RhbENvbnRlbnRzU2l6ZSgpKSwgc2Nyb2xsT2Zmc2V0LCBzY3JvbGxPcmlnaW4o KSwgZnJhbWVTY2FsZUZhY3RvcigpLAotICAgICAgICBmYWxzZSwgYmVoYXZpb3JGb3JGaXhlZCwg aGVhZGVySGVpZ2h0KCksIGZvb3RlckhlaWdodCgpKTsKKyAgICAgICAgZml4ZWRFbGVtZW50c0xh eW91dFJlbGF0aXZlVG9GcmFtZSgpLCBiZWhhdmlvckZvckZpeGVkLCBoZWFkZXJIZWlnaHQoKSwg Zm9vdGVySGVpZ2h0KCkpOwogICAgIAogICAgIGlmIChtX2NvdW50ZXJTY3JvbGxpbmdMYXllcikK ICAgICAgICAgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXIuZ2V0KCkucG9zaXRpb24gPSBGbG9hdFBv aW50KHNjcm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvU2hhcmVkL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHAKaW5kZXggZjAwY2M2NmIzZDMxZTM3ZGQyZTRhMmU2 NzFmYjU5NmYwODFkZTQ5Yi4uODA0ZmNjOGMyYmZlZWExMjlkNjQyODIwMzMxYjZhOWMyMzU0OWQz YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Njcm9sbGluZy9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb24uY3BwCkBA IC0xNDgsNiArMTQ4LDcgQEAgdm9pZCBBcmd1bWVudENvZGVyPFNjcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW4KICAgICBTQ1JPTExJTkdf Tk9ERV9FTkNPREUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkhlYWRlckhlaWdo dCwgaGVhZGVySGVpZ2h0KQogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rm9vdGVySGVpZ2h0LCBmb290ZXJIZWlnaHQpCiAgICAgU0NS T0xMSU5HX05PREVfRU5DT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpUb3BD b250ZW50SW5zZXQsIHRvcENvbnRlbnRJbnNldCkKKyAgICBTQ1JPTExJTkdfTk9ERV9FTkNPREUo U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkZpeGVkRWxlbWVudHNMYXlvdXRSZWxh dGl2ZVRvRnJhbWUsIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpCiAKICAgICBp ZiAobm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU6OlNjcm9sbGVkQ29udGVudHNMYXllcikpCiAgICAgICAgIGVuY29kZXIgPDwgc3RhdGljX2Nh c3Q8R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEPihub2RlLnNjcm9sbGVkQ29udGVudHNM YXllcigpKTsKQEAgLTIzMCw2ICsyMzEsNyBAQCBib29sIEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGU+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZQogICAg IFNDUk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 SGVhZGVySGVpZ2h0LCBpbnQsIHNldEhlYWRlckhlaWdodCk7CiAgICAgU0NST0xMSU5HX05PREVf REVDT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpGb290ZXJIZWlnaHQsIGlu dCwgc2V0Rm9vdGVySGVpZ2h0KTsKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoU2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlRvcENvbnRlbnRJbnNldCwgZmxvYXQsIHNldFRvcENv bnRlbnRJbnNldCk7CisgICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNjcm9sbGluZ1N0YXRlRnJh bWVTY3JvbGxpbmdOb2RlOjpGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lLCBib29s LCBzZXRGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKTsKIAogICAgIGlmIChub2Rl Lmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6U2Ny b2xsZWRDb250ZW50c0xheWVyKSkgewogICAgICAgICBHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxh eWVySUQgbGF5ZXJJRDsK 252086 2015-04-30 14:10:49 -0700 2015-04-30 16:46:06 -0700 Patch bug-144428-20150430140938.patch text/plain 18976 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg5NGNlMDM0NjY0NTJk N2FiYWRjMTU2ZTU3Y2U3ZmM0MDJmMmMwMi4uODkwMjBjZTA3ZDJlYjg3M2M1ODExMDc3MWJkOWVk ZmYwMzU3N2YzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDE1LTA0LTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZpeGVkIGVsZW1l bnRzIGVuZCB1cCBpbiB0aGUgbWlkZGxlIG9mIHRoZSB2aWV3IHdpdGggcGFnZVNjYWxlIDwgMQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDI4Cisg ICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIwNDA0OTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBwYWdlU2NhbGUgaXMgPCAxLCB3ZSB1c2VkIGZp eGVkIGxheW91dCBtb2RlLCBhbmQgRnJhbWVWaWV3OjpmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRp dmVUb0ZyYW1lKCkKKyAgICAgICAgcmV0dXJucyB0cnVlLiBIb3dldmVyLCB0aGUgc2Nyb2xsaW5n IHRocmVhZCB3YXMgY2FsbGluZyB0aGUgc3RhdGljIHNjcm9sbE9mZnNldEZvckZpeGVkUG9zaXRp b24oKQorICAgICAgICBoYXJkY29kaW5nICdmYWxzZScgZm9yIHRoaXMgcGFyYW1ldGVyLgorICAg ICAgICAKKyAgICAgICAgRml4IGJ5IHNlbmRpbmcgdGhlIHZhbHVlIG9mIGZpeGVkRWxlbWVudHNM YXlvdXRSZWxhdGl2ZVRvRnJhbWUgb3ZlciB0byB0aGUgc2Nyb2xsaW5nIHRocmVhZCwKKyAgICAg ICAgc28gd2UgY2FuIHVzZSBpdCB3aGVuIGRvaW5nIHNjcm9sbGluZy10aHJlYWQgZml4ZWQgcG9z aXRpb24gc3R1ZmYuCisKKyAgICAgICAgTm90IHRlc3RhYmxlLgorCisgICAgICAgICogcGFnZS9z Y3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpmcmFtZVZpZXdMYXlvdXRVcGRhdGVkKToKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OnNldEZpeGVkRWxlbWVudHNMYXlvdXRSZWxh dGl2ZVRvRnJhbWUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJh bWVTY3JvbGxpbmdOb2RlLmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlOjpTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUJl Zm9yZUNoaWxkcmVuKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJh bWVTY3JvbGxpbmdOb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlRnJhbWVT Y3JvbGxpbmdOb2RlOjpmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OnNob3VsZFVwZGF0 ZVNjcm9sbExheWVyUG9zaXRpb25TeW5jaHJvbm91c2x5KTogRGVsZXRlZC4KKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OnNl dFNjcm9sbExheWVyUG9zaXRpb24pOgorCisyMDE1LTA0LTI5ICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIENyYXNoIGF0IFdlYkNvcmU6OkRvY3VtZW50 OjphYnNvbHV0ZVJlZ2lvbkZvckV2ZW50VGFyZ2V0cyAKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDQyNgogICAgICAgICByZGFyOi8vcHJvYmxlbS8y MDUwMjE2NgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IDkyNTJkYWVmYWZmNTIxZTUxYzNmYWI5ZDVhZDU2OGRlNDY5 ZDg3ZDcuLjk0YmI3Mjg1NjgyOGRjZjIzOTZhNjIyMmUyMjBjMGYzZjRiOTc5NGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNS0wNC0yOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXhlZCBlbGVtZW50cyBlbmQgdXAgaW4gdGhlIG1p ZGRsZSBvZiB0aGUgdmlldyB3aXRoIHBhZ2VTY2FsZSA8IDEKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDQyOAorICAgICAgICByZGFyOi8vcHJvYmxl bS8yMDQwNDk4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEVuY29kZS9kZWNvZGUgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZS4KKwor ICAgICAgICAqIFNoYXJlZC9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFu c2FjdGlvbi5jcHA6CisgICAgICAgIChBcmd1bWVudENvZGVyPFNjcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlPjo6ZW5jb2RlKToKKyAgICAgICAgKEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGU+OjpkZWNvZGUpOgorCiAyMDE1LTA0LTI5ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEV4cGFuZCB0ZXN0IGluZnJh c3RydWN0dXJlIHRvIHN1cHBvcnQgc2Nyb2xsaW5nIHRlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3Bw CmluZGV4IGJlZDNjM2Q4OTQyNmMwYzRkODgxNTIwNTE3OWQ1NWQ5M2I1MzUwYjEuLjU5NDExZTdi ZTZkMWI4YjA1YWQxOTI1NGE5NGNkMDMxY2ZjYzRlM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3Bw CkBAIC0xMzYsNiArMTM2LDcgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpmcmFt ZVZpZXdMYXlvdXRVcGRhdGVkKEZyYW1lVmlldyYgZnJhbWVWaWV3KQogICAgIG5vZGUtPnNldFNj cm9sbGFibGVBcmVhU2l6ZShmcmFtZVZpZXcudmlzaWJsZUNvbnRlbnRSZWN0KCkuc2l6ZSgpKTsK ICAgICBub2RlLT5zZXRUb3RhbENvbnRlbnRzU2l6ZShmcmFtZVZpZXcudG90YWxDb250ZW50c1Np emUoKSk7CiAgICAgbm9kZS0+c2V0UmVhY2hhYmxlQ29udGVudHNTaXplKGZyYW1lVmlldy50b3Rh bENvbnRlbnRzU2l6ZSgpKTsKKyAgICBub2RlLT5zZXRGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRp dmVUb0ZyYW1lKGZyYW1lVmlldy5maXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCkp OwogCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKICAgICBmcmFtZVZpZXcudXBkYXRlU25h cE9mZnNldHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCAzNTBj Nzk2ZDZkOGMzYmNjZjhmNmEwNGIyMDZjMjMwNjRjNTg2YTEzLi4zMjZkOWU4ZjRiNjVmNDZlOTcz MTE3MmM5NDE3NGY4ODQwZmE5OWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUu Y3BwCkBAIC00MCwxNyArNDAsNiBAQCBQYXNzUmVmUHRyPFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlPiBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6YwogCiBTY3JvbGxp bmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGUoU2Nyb2xsaW5nU3RhdGVUcmVlJiBzdGF0ZVRyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQp CiAgICAgOiBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoc3RhdGVUcmVlLCBGcmFtZVNjcm9s bGluZ05vZGUsIG5vZGVJRCkKLSNpZiBQTEFURk9STShNQUMpCi0gICAgLCBtX3ZlcnRpY2FsU2Ny b2xsYmFyUGFpbnRlcigwKQotICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsYmFyUGFpbnRlcigwKQot I2VuZGlmCi0gICAgLCBtX2ZyYW1lU2NhbGVGYWN0b3IoMSkKLSAgICAsIG1fc3luY2hyb25vdXNT Y3JvbGxpbmdSZWFzb25zKDApCi0gICAgLCBtX2JlaGF2aW9yRm9yRml4ZWQoU3RpY2tUb0RvY3Vt ZW50Qm91bmRzKQotICAgICwgbV9oZWFkZXJIZWlnaHQoMCkKLSAgICAsIG1fZm9vdGVySGVpZ2h0 KDApCi0gICAgLCBtX3JlcXVlc3RlZFNjcm9sbFBvc2l0aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRp Y1Njcm9sbChmYWxzZSkKLSAgICAsIG1fdG9wQ29udGVudEluc2V0KDApCiB7CiB9CiAKQEAgLTYx LDE0ICs1MCwxNSBAQCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGUoY29uc3QgU2Nyb2xsaQogICAgICwgbV9ob3Jpem9udGFs U2Nyb2xsYmFyUGFpbnRlcihzdGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJhclBhaW50ZXIoKSkK ICNlbmRpZgogICAgICwgbV9ub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbihzdGF0ZU5vZGUubm9uRmFz dFNjcm9sbGFibGVSZWdpb24oKSkKKyAgICAsIG1fcmVxdWVzdGVkU2Nyb2xsUG9zaXRpb24oc3Rh dGVOb2RlLnJlcXVlc3RlZFNjcm9sbFBvc2l0aW9uKCkpCiAgICAgLCBtX2ZyYW1lU2NhbGVGYWN0 b3Ioc3RhdGVOb2RlLmZyYW1lU2NhbGVGYWN0b3IoKSkKLSAgICAsIG1fc3luY2hyb25vdXNTY3Jv bGxpbmdSZWFzb25zKHN0YXRlTm9kZS5zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoKSkKLSAg ICAsIG1fYmVoYXZpb3JGb3JGaXhlZChzdGF0ZU5vZGUuc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVs ZW1lbnRzKCkpCisgICAgLCBtX3RvcENvbnRlbnRJbnNldChzdGF0ZU5vZGUudG9wQ29udGVudElu c2V0KCkpCiAgICAgLCBtX2hlYWRlckhlaWdodChzdGF0ZU5vZGUuaGVhZGVySGVpZ2h0KCkpCiAg ICAgLCBtX2Zvb3RlckhlaWdodChzdGF0ZU5vZGUuZm9vdGVySGVpZ2h0KCkpCi0gICAgLCBtX3Jl cXVlc3RlZFNjcm9sbFBvc2l0aW9uKHN0YXRlTm9kZS5yZXF1ZXN0ZWRTY3JvbGxQb3NpdGlvbigp KQorICAgICwgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMoc3RhdGVOb2RlLnN5bmNocm9u b3VzU2Nyb2xsaW5nUmVhc29ucygpKQorICAgICwgbV9iZWhhdmlvckZvckZpeGVkKHN0YXRlTm9k ZS5zY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMoKSkKICAgICAsIG1fcmVxdWVzdGVkU2Ny b2xsUG9zaXRpb25SZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKHN0YXRlTm9kZS5yZXF1ZXN0 ZWRTY3JvbGxQb3NpdGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoKSkKLSAgICAsIG1f dG9wQ29udGVudEluc2V0KHN0YXRlTm9kZS50b3BDb250ZW50SW5zZXQoKSkKKyAgICAsIG1fZml4 ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZShzdGF0ZU5vZGUuZml4ZWRFbGVtZW50c0xh eW91dFJlbGF0aXZlVG9GcmFtZSgpKQogewogICAgIGlmIChoYXNDaGFuZ2VkUHJvcGVydHkoU2Ny b2xsZWRDb250ZW50c0xheWVyKSkKICAgICAgICAgc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKHN0 YXRlTm9kZS5zY3JvbGxlZENvbnRlbnRzTGF5ZXIoKS50b1JlcHJlc2VudGF0aW9uKGFkb3B0aXZl VHJlZS5wcmVmZXJyZWRMYXllclJlcHJlc2VudGF0aW9uKCkpKTsKQEAgLTIxNiw2ICsyMDYsMTUg QEAgdm9pZCBTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6c2V0Rm9vdGVyTGF5ZXIo Y29uc3QgTGF5ZXJSZXByZXNlbnRhdGlvbiYKICAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoRm9vdGVy TGF5ZXIpOwogfQogCit2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpzZXRG aXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKGJvb2wgZml4ZWRFbGVtZW50c0xheW91 dFJlbGF0aXZlVG9GcmFtZSkKK3sKKyAgICBpZiAoZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZl VG9GcmFtZSA9PSBtX2ZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpCisgICAgICAg IHJldHVybjsKKyAgICAKKyAgICBtX2ZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUg PSBmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lOworICAgIHNldFByb3BlcnR5Q2hh bmdlZChGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKTsKK30KKwogI2lmICFQTEFU Rk9STShNQUMpCiB2b2lkIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpzZXRTY3Jv bGxiYXJQYWludGVyc0Zyb21TY3JvbGxiYXJzKFNjcm9sbGJhciosIFNjcm9sbGJhciopCiB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZUZy YW1lU2Nyb2xsaW5nTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUuaAppbmRleCBiMTNiNDM4NmY5YThmMWVlMzY3ZmQ2 YjIyZmFlYjBlNGNlYjE3NjA3Li4yYWFhOGIwZjRjZTU2OGE5MjQ5M2YwNDk3NGE3YjI4NGQ0ZDUx ZTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlLmgKQEAgLTYwLDcgKzYwLDggQEAg cHVibGljOgogICAgICAgICBGb290ZXJMYXllciwKICAgICAgICAgUGFpbnRlckZvclNjcm9sbGJh ciwKICAgICAgICAgQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzLAotICAgICAgICBUb3BDb250ZW50 SW5zZXQKKyAgICAgICAgVG9wQ29udGVudEluc2V0LAorICAgICAgICBGaXhlZEVsZW1lbnRzTGF5 b3V0UmVsYXRpdmVUb0ZyYW1lLAogICAgIH07CiAKICAgICBmbG9hdCBmcmFtZVNjYWxlRmFjdG9y KCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZVNjYWxlRmFjdG9yOyB9CkBAIC0xMDksNiArMTEwLDkg QEAgcHVibGljOgogICAgIGNvbnN0IExheWVyUmVwcmVzZW50YXRpb24mIGZvb3RlckxheWVyKCkg Y29uc3QgeyByZXR1cm4gbV9mb290ZXJMYXllcjsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg c2V0Rm9vdGVyTGF5ZXIoY29uc3QgTGF5ZXJSZXByZXNlbnRhdGlvbiYpOwogCisgICAgYm9vbCBm aXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKCkgY29uc3QgeyByZXR1cm4gbV9maXhl ZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lOyB9CisgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzZXRGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKGJvb2wpOworCiAjaWYgUExB VEZPUk0oTUFDKQogICAgIFNjcm9sbGJhclBhaW50ZXIgdmVydGljYWxTY3JvbGxiYXJQYWludGVy KCkgY29uc3QgeyByZXR1cm4gbV92ZXJ0aWNhbFNjcm9sbGJhclBhaW50ZXIuZ2V0KCk7IH0KICAg ICBTY3JvbGxiYXJQYWludGVyIGhvcml6b250YWxTY3JvbGxiYXJQYWludGVyKCkgY29uc3QgeyBy ZXR1cm4gbV9ob3Jpem9udGFsU2Nyb2xsYmFyUGFpbnRlci5nZXQoKTsgfQpAQCAtMTM0LDE0ICsx MzgsMTUgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgUmVnaW9uIG1fbm9uRmFzdFNjcm9sbGFi bGVSZWdpb247Ci0gICAgZmxvYXQgbV9mcmFtZVNjYWxlRmFjdG9yOwotICAgIFN5bmNocm9ub3Vz U2Nyb2xsaW5nUmVhc29ucyBtX3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29uczsKLSAgICBTY3Jv bGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMgbV9iZWhhdmlvckZvckZpeGVkOwotICAgIGludCBt X2hlYWRlckhlaWdodDsKLSAgICBpbnQgbV9mb290ZXJIZWlnaHQ7CiAgICAgRmxvYXRQb2ludCBt X3JlcXVlc3RlZFNjcm9sbFBvc2l0aW9uOwotICAgIGJvb2wgbV9yZXF1ZXN0ZWRTY3JvbGxQb3Np dGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGw7Ci0gICAgZmxvYXQgbV90b3BDb250ZW50 SW5zZXQ7CisgICAgZmxvYXQgbV9mcmFtZVNjYWxlRmFjdG9yIHsgMSB9OworICAgIGZsb2F0IG1f dG9wQ29udGVudEluc2V0IHsgMCB9OworICAgIGludCBtX2hlYWRlckhlaWdodCB7IDAgfTsKKyAg ICBpbnQgbV9mb290ZXJIZWlnaHQgeyAwIH07CisgICAgU3luY2hyb25vdXNTY3JvbGxpbmdSZWFz b25zIG1fc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zIHsgMCB9OworICAgIFNjcm9sbEJlaGF2 aW9yRm9yRml4ZWRFbGVtZW50cyBtX2JlaGF2aW9yRm9yRml4ZWQgeyBTdGlja1RvRG9jdW1lbnRC b3VuZHMgfTsKKyAgICBib29sIG1fcmVxdWVzdGVkU2Nyb2xsUG9zaXRpb25SZXByZXNlbnRzUHJv Z3JhbW1hdGljU2Nyb2xsIHsgZmFsc2UgfTsKKyAgICBib29sIG1fZml4ZWRFbGVtZW50c0xheW91 dFJlbGF0aXZlVG9GcmFtZSB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IGE1YzllYTVkNzNiNmQ2ZTc0 ZTdmYmJlMTg1NDRjMGY3OGVlNDhmMWMuLmY0NGI5MmNiYTU3OTEzMjJiYmMwZjA4OTkzODhjM2Y3 ODk1ZGJjOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0zNSwxMiAr MzUsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGU6OlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nVHJlZSYgc2Ny b2xsaW5nVHJlZSwgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKICAgICA6IFNjcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlKHNjcm9sbGluZ1RyZWUsIEZyYW1lU2Nyb2xsaW5nTm9kZSwgbm9kZUlEKQot ICAgICwgbV9mcmFtZVNjYWxlRmFjdG9yKDEpCi0gICAgLCBtX2hlYWRlckhlaWdodCgwKQotICAg ICwgbV9mb290ZXJIZWlnaHQoMCkKLSAgICAsIG1fdG9wQ29udGVudEluc2V0KDApCi0gICAgLCBt X3N5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucygwKQotICAgICwgbV9iZWhhdmlvckZvckZpeGVk KFN0aWNrVG9Eb2N1bWVudEJvdW5kcykKIHsKIH0KIApAQCAtNzEsNiArNjUsOSBAQCB2b2lkIFNj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0 IFNjcm9sbGluZ1N0YXRlTgogCiAgICAgaWYgKHN0YXRlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3Jv bGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6VG9wQ29udGVudEluc2V0KSkKICAgICAgICAg bV90b3BDb250ZW50SW5zZXQgPSBzdGF0ZS50b3BDb250ZW50SW5zZXQoKTsKKworICAgIGlmIChz dGF0ZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6 OkZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUpKQorICAgICAgICBtX2ZpeGVkRWxl bWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUgPSBzdGF0ZS5maXhlZEVsZW1lbnRzTGF5b3V0UmVs YXRpdmVUb0ZyYW1lKCk7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9k ZTo6c2Nyb2xsQnkoY29uc3QgRmxvYXRTaXplJiBvZmZzZXQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxp bmdOb2RlLmgKaW5kZXggODE1Nzg0MmUxY2RiNWRiN2E3ODJmOTllMjRkZWI3ZWVmM2UwYTNkMy4u YWM0NDkwNWQ2MDQwNTE3YTk5MDFjOTdkZjNkMjliMjY3MDQxNjIyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9k ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGUuaApAQCAtNTQsNiArNTQsNyBAQCBwdWJsaWM6CiAKICAgICBTeW5jaHJv bm91c1Njcm9sbGluZ1JlYXNvbnMgc3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zKCkgY29uc3Qg eyByZXR1cm4gbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7IH0KICAgICBib29sIHNob3Vs ZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25TeW5jaHJvbm91c2x5KCkgY29uc3QgeyByZXR1cm4g bV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7IH0KKyAgICBib29sIGZpeGVkRWxlbWVudHNM YXlvdXRSZWxhdGl2ZVRvRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZpeGVkRWxlbWVudHNMYXlv dXRSZWxhdGl2ZVRvRnJhbWU7IH0KIAogICAgIEZsb2F0U2l6ZSB2aWV3VG9Db250ZW50c09mZnNl dChjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxPZmZzZXQpIGNvbnN0OwogCkBAIC03MSwxNCArNzIs MTYgQEAgcHJvdGVjdGVkOgogICAgIFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyBzY3Jv bGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHMoKSBjb25zdCB7IHJldHVybiBtX2JlaGF2aW9yRm9y Rml4ZWQ7IH0KICAgICAKIHByaXZhdGU6Ci0gICAgZmxvYXQgbV9mcmFtZVNjYWxlRmFjdG9yOwor ICAgIGZsb2F0IG1fZnJhbWVTY2FsZUZhY3RvciB7IDEgfTsKKyAgICBmbG9hdCBtX3RvcENvbnRl bnRJbnNldCB7IDAgfTsKIAotICAgIGludCBtX2hlYWRlckhlaWdodDsKLSAgICBpbnQgbV9mb290 ZXJIZWlnaHQ7Ci0gICAgZmxvYXQgbV90b3BDb250ZW50SW5zZXQ7CisgICAgaW50IG1faGVhZGVy SGVpZ2h0IHsgMCB9OworICAgIGludCBtX2Zvb3RlckhlaWdodCB7IDAgfTsKICAgICAKLSAgICBT eW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnM7 Ci0gICAgU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzIG1fYmVoYXZpb3JGb3JGaXhlZDsK KyAgICBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMgbV9zeW5jaHJvbm91c1Njcm9sbGluZ1Jl YXNvbnMgeyAwIH07CisgICAgU2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzIG1fYmVoYXZp b3JGb3JGaXhlZCB7IFN0aWNrVG9Eb2N1bWVudEJvdW5kcyB9OworICAgIAorICAgIGJvb2wgbV9m aXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlSU9TLm1tIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJ T1MubW0KaW5kZXggNzA3ODhmODBmZGY0OWVmMmU3MDEwZDg2YzRiOTI4ZGJjNjkzOTFiYS4uNWUz YzZkODI1MGZlOGYwY2VlY2E2MmQyZDQ2MzNlYzg1MTA2MTFmYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvaW9zL1Njcm9sbGlu Z1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1MubW0KQEAgLTE0OCw3ICsxNDgsNyBAQCB2b2lkIFNj cm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVJT1M6OnVwZGF0ZUNoaWxkTm9kZXNBZnRlclNj cm9sbChjb25zdCBGbG9hdAogICAgIFNjcm9sbEJlaGF2aW9yRm9yRml4ZWRFbGVtZW50cyBiZWhh dmlvckZvckZpeGVkID0gc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCk7CiAgICAgRmxv YXRQb2ludCBzY3JvbGxPZmZzZXQgPSBzY3JvbGxQb3NpdGlvbiAtIHRvSW50U2l6ZShzY3JvbGxP cmlnaW4oKSk7CiAgICAgRmxvYXRSZWN0IHZpZXdwb3J0UmVjdChGbG9hdFBvaW50KCksIHNjcm9s bGFibGVBcmVhU2l6ZSgpKTsKLSAgICBGbG9hdFNpemUgc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRDaGls ZHJlbiA9IEZyYW1lVmlldzo6c2Nyb2xsT2Zmc2V0Rm9yRml4ZWRQb3NpdGlvbihlbmNsb3NpbmdM YXlvdXRSZWN0KHZpZXdwb3J0UmVjdCksIExheW91dFNpemUodG90YWxDb250ZW50c1NpemUoKSks IExheW91dFBvaW50KHNjcm9sbE9mZnNldCksIHNjcm9sbE9yaWdpbigpLCBmcmFtZVNjYWxlRmFj dG9yKCksIGZhbHNlLCBiZWhhdmlvckZvckZpeGVkLCBoZWFkZXJIZWlnaHQoKSwgZm9vdGVySGVp Z2h0KCkpOworICAgIEZsb2F0U2l6ZSBzY3JvbGxPZmZzZXRGb3JGaXhlZENoaWxkcmVuID0gRnJh bWVWaWV3OjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKGVuY2xvc2luZ0xheW91dFJlY3Qo dmlld3BvcnRSZWN0KSwgTGF5b3V0U2l6ZSh0b3RhbENvbnRlbnRzU2l6ZSgpKSwgTGF5b3V0UG9p bnQoc2Nyb2xsT2Zmc2V0KSwgc2Nyb2xsT3JpZ2luKCksIGZyYW1lU2NhbGVGYWN0b3IoKSwgZml4 ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpLCBiZWhhdmlvckZvckZpeGVkLCBoZWFk ZXJIZWlnaHQoKSwgZm9vdGVySGVpZ2h0KCkpOwogCiAgICAgW21fY291bnRlclNjcm9sbGluZ0xh eWVyIHNldFBvc2l0aW9uOkZsb2F0UG9pbnQoc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRDaGlsZHJlbild OwogCkBAIC0xNTgsNyArMTU4LDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdO b2RlSU9TOjp1cGRhdGVDaGlsZE5vZGVzQWZ0ZXJTY3JvbGwoY29uc3QgRmxvYXQKICAgICAgICAg Ly8gdGhlbiB3ZSBzaG91bGQgcmVjb21wdXRlIHNjcm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4g Zm9yIHRoZSBiYW5uZXIgd2l0aCBhIHNjYWxlIGZhY3RvciBvZiAxLgogICAgICAgICBmbG9hdCBo b3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVyID0gc2Nyb2xsT2Zmc2V0Rm9yRml4ZWRDaGls ZHJlbi53aWR0aCgpOwogICAgICAgICBpZiAoZnJhbWVTY2FsZUZhY3RvcigpICE9IDEpCi0gICAg ICAgICAgICBob3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVyID0gRnJhbWVWaWV3OjpzY3Jv bGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKGVuY2xvc2luZ0xheW91dFJlY3Qodmlld3BvcnRSZWN0 KSwgTGF5b3V0U2l6ZSh0b3RhbENvbnRlbnRzU2l6ZSgpKSwgTGF5b3V0UG9pbnQoc2Nyb2xsT2Zm c2V0KSwgc2Nyb2xsT3JpZ2luKCksIDEsIGZhbHNlLCBiZWhhdmlvckZvckZpeGVkLCBoZWFkZXJI ZWlnaHQoKSwgZm9vdGVySGVpZ2h0KCkpLndpZHRoKCk7CisgICAgICAgICAgICBob3Jpem9udGFs U2Nyb2xsT2Zmc2V0Rm9yQmFubmVyID0gRnJhbWVWaWV3OjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBv c2l0aW9uKGVuY2xvc2luZ0xheW91dFJlY3Qodmlld3BvcnRSZWN0KSwgTGF5b3V0U2l6ZSh0b3Rh bENvbnRlbnRzU2l6ZSgpKSwgTGF5b3V0UG9pbnQoc2Nyb2xsT2Zmc2V0KSwgc2Nyb2xsT3JpZ2lu KCksIDEsIGZpeGVkRWxlbWVudHNMYXlvdXRSZWxhdGl2ZVRvRnJhbWUoKSwgYmVoYXZpb3JGb3JG aXhlZCwgaGVhZGVySGVpZ2h0KCksIGZvb3RlckhlaWdodCgpKS53aWR0aCgpOwogCiAgICAgICAg IGlmIChtX2hlYWRlckxheWVyKQogICAgICAgICAgICAgW21faGVhZGVyTGF5ZXIgc2V0UG9zaXRp b246RmxvYXRQb2ludChob3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVyLCAwKV07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZy YW1lU2Nyb2xsaW5nTm9kZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21h Yy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCmluZGV4IDk0ZDE1N2NjMWMx M2QwYTM0YWIwNWRlNmQ5NzhmOTg0NmM2MGVkMmEuLmE1NDU1MTgxMTYxMjc1ZjA4YTc4MzA0Nzdh NDUwNGIzYzg3NzY2ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl TWFjLm1tCkBAIC0zODEsNyArMzgxLDcgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxp bmdOb2RlTWFjOjpzZXRTY3JvbGxMYXllclBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQKICAgICBG bG9hdFJlY3Qgdmlld3BvcnRSZWN0KEZsb2F0UG9pbnQoKSwgc2Nyb2xsYWJsZUFyZWFTaXplKCkp OwogICAgIAogICAgIEZsb2F0U2l6ZSBzY3JvbGxPZmZzZXRGb3JGaXhlZENoaWxkcmVuID0gRnJh bWVWaWV3OjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKGVuY2xvc2luZ0xheW91dFJlY3Qo dmlld3BvcnRSZWN0KSwgTGF5b3V0U2l6ZSh0b3RhbENvbnRlbnRzU2l6ZSgpKSwgc2Nyb2xsT2Zm c2V0LCBzY3JvbGxPcmlnaW4oKSwgZnJhbWVTY2FsZUZhY3RvcigpLAotICAgICAgICBmYWxzZSwg YmVoYXZpb3JGb3JGaXhlZCwgaGVhZGVySGVpZ2h0KCksIGZvb3RlckhlaWdodCgpKTsKKyAgICAg ICAgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpLCBiZWhhdmlvckZvckZpeGVk LCBoZWFkZXJIZWlnaHQoKSwgZm9vdGVySGVpZ2h0KCkpOwogICAgIAogICAgIGlmIChtX2NvdW50 ZXJTY3JvbGxpbmdMYXllcikKICAgICAgICAgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXIuZ2V0KCku cG9zaXRpb24gPSBGbG9hdFBvaW50KHNjcm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4pOwpAQCAt NDAxLDcgKzQwMSw3IEBAIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6 c2V0U2Nyb2xsTGF5ZXJQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50CiAgICAgICAgIC8vIHRoZW4g d2Ugc2hvdWxkIHJlY29tcHV0ZSBzY3JvbGxPZmZzZXRGb3JGaXhlZENoaWxkcmVuIGZvciB0aGUg YmFubmVyIHdpdGggYSBzY2FsZSBmYWN0b3Igb2YgMS4KICAgICAgICAgZmxvYXQgaG9yaXpvbnRh bFNjcm9sbE9mZnNldEZvckJhbm5lciA9IHNjcm9sbE9mZnNldEZvckZpeGVkQ2hpbGRyZW4ud2lk dGgoKTsKICAgICAgICAgaWYgKGZyYW1lU2NhbGVGYWN0b3IoKSAhPSAxKQotICAgICAgICAgICAg aG9yaXpvbnRhbFNjcm9sbE9mZnNldEZvckJhbm5lciA9IEZyYW1lVmlldzo6c2Nyb2xsT2Zmc2V0 Rm9yRml4ZWRQb3NpdGlvbihlbmNsb3NpbmdMYXlvdXRSZWN0KHZpZXdwb3J0UmVjdCksIExheW91 dFNpemUodG90YWxDb250ZW50c1NpemUoKSksIHNjcm9sbE9mZnNldCwgc2Nyb2xsT3JpZ2luKCks IDEsIGZhbHNlLCBiZWhhdmlvckZvckZpeGVkLCBoZWFkZXJIZWlnaHQoKSwgZm9vdGVySGVpZ2h0 KCkpLndpZHRoKCk7CisgICAgICAgICAgICBob3Jpem9udGFsU2Nyb2xsT2Zmc2V0Rm9yQmFubmVy ID0gRnJhbWVWaWV3OjpzY3JvbGxPZmZzZXRGb3JGaXhlZFBvc2l0aW9uKGVuY2xvc2luZ0xheW91 dFJlY3Qodmlld3BvcnRSZWN0KSwgTGF5b3V0U2l6ZSh0b3RhbENvbnRlbnRzU2l6ZSgpKSwgc2Ny b2xsT2Zmc2V0LCBzY3JvbGxPcmlnaW4oKSwgMSwgZml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZl VG9GcmFtZSgpLCBiZWhhdmlvckZvckZpeGVkLCBoZWFkZXJIZWlnaHQoKSwgZm9vdGVySGVpZ2h0 KCkpLndpZHRoKCk7CiAKICAgICAgICAgaWYgKG1faGVhZGVyTGF5ZXIpCiAgICAgICAgICAgICBt X2hlYWRlckxheWVyLmdldCgpLnBvc2l0aW9uID0gRmxvYXRQb2ludChob3Jpem9udGFsU2Nyb2xs T2Zmc2V0Rm9yQmFubmVyLCBGcmFtZVZpZXc6OnlQb3NpdGlvbkZvckhlYWRlckxheWVyKHBvc2l0 aW9uLCB0b3BDb250ZW50SW5zZXQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL21hYy9XZWJMYXllci5tbQppbmRleCBmYjU5ZmQ3YjViZmU5MGIyODNkMmYxNWFkYjU3 YWEzNWM0YTc4NjllLi5hNzM3NGRlMWMwZjdkNzExN2Y4NmIyMGJkMjU4NzlmOWZhNjI1YjcxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvV2ViTGF5ZXIu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1t CkBAIC0xMzQsOCArMTM0LDYgQEAgLSAodm9pZClkcmF3SW5Db250ZXh0OihDR0NvbnRleHRSZWYp Y29udGV4dAogCiBAZW5kIC8vIGltcGxlbWVudGF0aW9uIFdlYlNpbXBsZUxheWVyCiAKLS8vIE1B Uks6IC0KLQogI2lmbmRlZiBOREVCVUcKIAogQGltcGxlbWVudGF0aW9uIENBTGF5ZXIoRXh0ZW5k ZWREZXNjcmlwdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TY3JvbGxp bmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rp b24uY3BwCmluZGV4IGYwMGNjNjZiM2QzMWUzN2RkMmU0YTJlNjcxZmI1OTZmMDgxZGU0OWIuLjgw NGZjYzhjMmJmZWVhMTI5ZDY0MjgyMDMzMWI2YTljMjM1NDlkM2IgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFu c2FjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Njcm9sbGluZy9SZW1vdGVT Y3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uLmNwcApAQCAtMTQ4LDYgKzE0OCw3IEBAIHZv aWQgQXJndW1lbnRDb2RlcjxTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT46OmVuY29k ZShBcmd1bWVudEVuY29kZXImIGVuCiAgICAgU0NST0xMSU5HX05PREVfRU5DT0RFKFNjcm9sbGlu Z1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIZWFkZXJIZWlnaHQsIGhlYWRlckhlaWdodCkKICAg ICBTQ1JPTExJTkdfTk9ERV9FTkNPREUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6 OkZvb3RlckhlaWdodCwgZm9vdGVySGVpZ2h0KQogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShT Y3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6VG9wQ29udGVudEluc2V0LCB0b3BDb250 ZW50SW5zZXQpCisgICAgU0NST0xMSU5HX05PREVfRU5DT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlOjpGaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lLCBmaXhlZEVs ZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lKQogCiAgICAgaWYgKG5vZGUuaGFzQ2hhbmdlZFBy b3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpTY3JvbGxlZENvbnRlbnRz TGF5ZXIpKQogICAgICAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5ZXI6OlBs YXRmb3JtTGF5ZXJJRD4obm9kZS5zY3JvbGxlZENvbnRlbnRzTGF5ZXIoKSk7CkBAIC0yMzAsNiAr MjMxLDcgQEAgYm9vbCBBcmd1bWVudENvZGVyPFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdO b2RlPjo6ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGUKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNP REUoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkhlYWRlckhlaWdodCwgaW50LCBz ZXRIZWFkZXJIZWlnaHQpOwogICAgIFNDUk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rm9vdGVySGVpZ2h0LCBpbnQsIHNldEZvb3RlckhlaWdodCk7 CiAgICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdO b2RlOjpUb3BDb250ZW50SW5zZXQsIGZsb2F0LCBzZXRUb3BDb250ZW50SW5zZXQpOworICAgIFND Uk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rml4 ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSwgYm9vbCwgc2V0Rml4ZWRFbGVtZW50c0xh eW91dFJlbGF0aXZlVG9GcmFtZSk7CiAKICAgICBpZiAobm9kZS5oYXNDaGFuZ2VkUHJvcGVydHko U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlNjcm9sbGVkQ29udGVudHNMYXllcikp IHsKICAgICAgICAgR3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGxheWVySUQ7Cg==