192358 2018-12-04 03:03:41 -0800 Always pass scrollingGeometry to update*ScrollingNode functions 2018-12-04 19:59:29 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 172917 176454 1 fred.wang fred.wang commit-queue simon.fraser webkit-bug-importer oldest_to_newest 1484780 0 fred.wang 2018-12-04 03:03:41 -0800 Always pass scrollingGeometry to update*ScrollingNode functions 1484781 1 356478 fred.wang 2018-12-04 03:04:25 -0800 Created attachment 356478 Patch 1484785 2 356481 fred.wang 2018-12-04 03:27:56 -0800 Created attachment 356481 Patch 1484914 3 356517 fred.wang 2018-12-04 11:07:33 -0800 Created attachment 356517 Patch I'm not sure how much this is aligned / conflicting with your work, but I wonder whether we could take this so that's it's more convenient to experiment tasks that adds info to the scrolling tree (e.g. bug 172917 and bug 176454). 1484941 4 356517 simon.fraser 2018-12-04 11:43:47 -0800 Comment on attachment 356517 Patch Sure. 1485122 5 356517 commit-queue 2018-12-04 19:58:09 -0800 Comment on attachment 356517 Patch Clearing flags on attachment: 356517 Committed r238885: <https://trac.webkit.org/changeset/238885> 1485123 6 commit-queue 2018-12-04 19:58:10 -0800 All reviewed patches have been landed. Closing bug. 1485124 7 webkit-bug-importer 2018-12-04 19:59:29 -0800 <rdar://problem/46475451> 356478 2018-12-04 03:04:25 -0800 2018-12-04 03:27:56 -0800 Patch bug-192358-20181204120423.patch text/plain 13120 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzZGRmNjEzMDcxMmVk YjExZWE3OTkxZjRiYjRlZTE4YzZhMzQ2Mi4uNTk5NDVmYTZmY2U2MjQ3Yzg2NjIzOTAxNmMwNDdl MzY0ZTkwNzEyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEyLTA0ICBGcmVk ZXJpYyBXYW5nICA8ZnJlZC53YW5nQGZyZWUuZnI+CisKKyAgICAgICAgQWx3YXlzIHBhc3Mgc2Ny b2xsaW5nR2VvbWV0cnkgdG8gdXBkYXRlKlNjcm9sbGluZ05vZGUgZnVuY3Rpb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIzNTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5v IGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpB c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUpOgor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlT3ZlcmZsb3dT Y3JvbGxpbmdOb2RlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Ny b2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcik6CisKIDIwMTgtMTIt MDQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEF1ZGl0OiB0ZXN0cyBzaG91bGQgc3VwcG9ydCBhc3luYyBvcGVyYXRpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwCmluZGV4IGRjMzBhN2UzNjgxYzkxNGY5MWE1YTM5YzkxZmIzYjg1OTQ0 NzA4NDkuLjhiNDJiZjZjOGQyMzEwNjVlYjgwOTNiNGRlNjAyMzJmYzYzYjdiNGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwCkBAIC01MTIsNyArNTEyLDcgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nv b3JkaW5hdG9yOjplbnN1cmVSb290U3RhdGVOb2RlRm9yRnJhbWVWaWV3KEZyYW1lVmlldyYgZnJh bWUKICAgICBhdHRhY2hUb1N0YXRlVHJlZShNYWluRnJhbWVTY3JvbGxpbmdOb2RlLCBmcmFtZVZp ZXcuc2Nyb2xsTGF5ZXJJRCgpLCAwKTsKIH0KIAotdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yOjp1cGRhdGVGcmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3Jh cGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwg R3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGluZ0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNl dENsaXBMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqIHNjcm9sbGluZ0dlb21ldHJ5KQor dm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVGcmFtZVNjcm9sbGluZ05vZGUo U2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5 ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgR3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGlu Z0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNldENsaXBMYXllciwgY29uc3QgU2Nyb2xsaW5nR2Vv bWV0cnkmIHNjcm9sbGluZ0dlb21ldHJ5KQogewogICAgIGF1dG8qIG5vZGUgPSBkb3duY2FzdDxT Y3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT4obV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnN0 YXRlTm9kZUZvcklEKG5vZGVJRCkpOwogICAgIEFTU0VSVChub2RlKTsKQEAgLTUyMywxOCArNTIz LDE1IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlRnJhbWVTY3JvbGxp bmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsCiAgICAgbm9kZS0+c2V0SW5zZXRDbGlwTGF5 ZXIoaW5zZXRDbGlwTGF5ZXIpOwogICAgIG5vZGUtPnNldFNjcm9sbGVkQ29udGVudHNMYXllcihz Y3JvbGxlZENvbnRlbnRzTGF5ZXIpOwogICAgIG5vZGUtPnNldENvdW50ZXJTY3JvbGxpbmdMYXll cihjb3VudGVyU2Nyb2xsaW5nTGF5ZXIpOwotCi0gICAgaWYgKHNjcm9sbGluZ0dlb21ldHJ5KSB7 Ci0gICAgICAgIG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qoc2Nyb2xsaW5n R2VvbWV0cnktPnBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3QpOwotICAgICAgICBub2RlLT5z ZXRTY3JvbGxPcmlnaW4oc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbE9yaWdpbik7Ci0gICAgICAg IG5vZGUtPnNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3JvbGxQb3NpdGlv bik7Ci0gICAgICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5 LT5jb250ZW50U2l6ZSk7Ci0gICAgICAgIG5vZGUtPnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6ZShz Y3JvbGxpbmdHZW9tZXRyeS0+cmVhY2hhYmxlQ29udGVudFNpemUpOwotICAgICAgICBub2RlLT5z ZXRTY3JvbGxhYmxlQXJlYVNpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbGFibGVBcmVhU2l6 ZSk7Ci0gICAgfQorICAgIG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qoc2Ny b2xsaW5nR2VvbWV0cnkucGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdCk7CisgICAgbm9kZS0+ c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbE9yaWdpbik7CisgICAgbm9k ZS0+c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRpb24pOwor ICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LmNvbnRlbnRT aXplKTsKKyAgICBub2RlLT5zZXRSZWFjaGFibGVDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0 cnkucmVhY2hhYmxlQ29udGVudFNpemUpOworICAgIG5vZGUtPnNldFNjcm9sbGFibGVBcmVhU2l6 ZShzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxhYmxlQXJlYVNpemUpOwogfQogICAgIAotdm9pZCBB c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Ny b2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIq IHNjcm9sbGVkQ29udGVudHNMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqIHNjcm9sbGlu Z0dlb21ldHJ5KQordm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxv d1Njcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5 ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgY29uc3QgU2Nyb2xsaW5n R2VvbWV0cnkmIHNjcm9sbGluZ0dlb21ldHJ5KQogewogICAgIGF1dG8qIG5vZGUgPSBkb3duY2Fz dDxTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZT4obV9zY3JvbGxpbmdTdGF0ZVRy ZWUtPnN0YXRlTm9kZUZvcklEKG5vZGVJRCkpOwogICAgIEFTU0VSVChub2RlKTsKQEAgLTU0Mywy MSArNTQwLDE4IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlT3ZlcmZs b3dTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlCiAKICAgICBub2RlLT5zZXRMYXll cihsYXllcik7CiAgICAgbm9kZS0+c2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKHNjcm9sbGVkQ29u dGVudHNMYXllcik7Ci0gICAgCi0gICAgaWYgKHNjcm9sbGluZ0dlb21ldHJ5KSB7Ci0gICAgICAg IG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qoc2Nyb2xsaW5nR2VvbWV0cnkt PnBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3QpOwotICAgICAgICBub2RlLT5zZXRTY3JvbGxP cmlnaW4oc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbE9yaWdpbik7Ci0gICAgICAgIG5vZGUtPnNl dFNjcm9sbFBvc2l0aW9uKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3JvbGxQb3NpdGlvbik7Ci0gICAg ICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LT5jb250ZW50 U2l6ZSk7Ci0gICAgICAgIG5vZGUtPnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6ZShzY3JvbGxpbmdH ZW9tZXRyeS0+cmVhY2hhYmxlQ29udGVudFNpemUpOwotICAgICAgICBub2RlLT5zZXRTY3JvbGxh YmxlQXJlYVNpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbGFibGVBcmVhU2l6ZSk7CisgICAg bm9kZS0+c2V0UGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdChzY3JvbGxpbmdHZW9tZXRyeS5w YXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0KTsKKyAgICBub2RlLT5zZXRTY3JvbGxPcmlnaW4o c2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luKTsKKyAgICBub2RlLT5zZXRTY3JvbGxQb3Np dGlvbihzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxQb3NpdGlvbik7CisgICAgbm9kZS0+c2V0VG90 YWxDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNpemUpOworICAgIG5vZGUt PnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS5yZWFjaGFibGVDb250 ZW50U2l6ZSk7CisgICAgbm9kZS0+c2V0U2Nyb2xsYWJsZUFyZWFTaXplKHNjcm9sbGluZ0dlb21l dHJ5LnNjcm9sbGFibGVBcmVhU2l6ZSk7CiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKLSAg ICAgICAgc2V0U3RhdGVTY3JvbGxpbmdOb2RlU25hcE9mZnNldHNBc0Zsb2F0KCpub2RlLCBTY3Jv bGxFdmVudEF4aXM6Okhvcml6b250YWwsICZzY3JvbGxpbmdHZW9tZXRyeS0+aG9yaXpvbnRhbFNu YXBPZmZzZXRzLCAmc2Nyb2xsaW5nR2VvbWV0cnktPmhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2Vz LCBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgICAgICBzZXRTdGF0ZVNjcm9sbGlu Z05vZGVTbmFwT2Zmc2V0c0FzRmxvYXQoKm5vZGUsIFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWws ICZzY3JvbGxpbmdHZW9tZXRyeS0+dmVydGljYWxTbmFwT2Zmc2V0cywgJnNjcm9sbGluZ0dlb21l dHJ5LT52ZXJ0aWNhbFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3Io KSk7Ci0gICAgICAgIG5vZGUtPnNldEN1cnJlbnRIb3Jpem9udGFsU25hcFBvaW50SW5kZXgoc2Ny b2xsaW5nR2VvbWV0cnktPmN1cnJlbnRIb3Jpem9udGFsU25hcFBvaW50SW5kZXgpOwotICAgICAg ICBub2RlLT5zZXRDdXJyZW50VmVydGljYWxTbmFwUG9pbnRJbmRleChzY3JvbGxpbmdHZW9tZXRy eS0+Y3VycmVudFZlcnRpY2FsU25hcFBvaW50SW5kZXgpOworICAgIHNldFN0YXRlU2Nyb2xsaW5n Tm9kZVNuYXBPZmZzZXRzQXNGbG9hdCgqbm9kZSwgU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFs LCAmc2Nyb2xsaW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNuYXBPZmZzZXRzLCAmc2Nyb2xsaW5nR2Vv bWV0cnkuaG9yaXpvbnRhbFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS5kZXZpY2VTY2FsZUZhY3Rv cigpKTsKKyAgICBzZXRTdGF0ZVNjcm9sbGluZ05vZGVTbmFwT2Zmc2V0c0FzRmxvYXQoKm5vZGUs IFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWwsICZzY3JvbGxpbmdHZW9tZXRyeS52ZXJ0aWNhbFNu YXBPZmZzZXRzLCAmc2Nyb2xsaW5nR2VvbWV0cnkudmVydGljYWxTbmFwT2Zmc2V0UmFuZ2VzLCBt X3BhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgbm9kZS0+c2V0Q3VycmVudEhvcml6b250 YWxTbmFwUG9pbnRJbmRleChzY3JvbGxpbmdHZW9tZXRyeS5jdXJyZW50SG9yaXpvbnRhbFNuYXBQ b2ludEluZGV4KTsKKyAgICBub2RlLT5zZXRDdXJyZW50VmVydGljYWxTbmFwUG9pbnRJbmRleChz Y3JvbGxpbmdHZW9tZXRyeS5jdXJyZW50VmVydGljYWxTbmFwUG9pbnRJbmRleCk7CiAjZW5kaWYK LSAgICB9CiB9CiAKIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlTm9kZUxh eWVyKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGlu Z0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggM2Q2NDMyN2E1Y2IxMDhmMDAxYTEyNzZiYmM3ZWI3ODg0 MmNiMDdiNS4uNWQ2NzhlNDAwZTU5OTI4NTQ4ZjM4NDM3Yzc0ZjA2OWNiY2RjMmZkMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuaApAQCAtMTA0LDggKzEwNCw4IEBAIHByaXZhdGU6CiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCB1cGRhdGVOb2RlTGF5ZXIoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGljc0xheWVy Kikgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVOb2RlVmlld3BvcnRD b25zdHJhaW50cyhTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFZpZXdwb3J0Q29uc3RyYWludHMmKSBv dmVycmlkZTsKICAgICAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbExheWVyLCBHcmFw aGljc0xheWVyKiBzY3JvbGxlZENvbnRlbnRzTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIGNvdW50ZXJT Y3JvbGxpbmdMYXllciwgR3JhcGhpY3NMYXllciogaW5zZXRDbGlwTGF5ZXIsIGNvbnN0IFNjcm9s bGluZ0dlb21ldHJ5KiA9IG51bGxwdHIpIG92ZXJyaWRlOwotICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgdXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NM YXllciogc2Nyb2xsTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwg Y29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqID0gbnVsbHB0cikgb3ZlcnJpZGU7CisgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCB1cGRhdGVGcmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlELCBH cmFwaGljc0xheWVyKiBzY3JvbGxMYXllciwgR3JhcGhpY3NMYXllciogc2Nyb2xsZWRDb250ZW50 c0xheWVyLCBHcmFwaGljc0xheWVyKiBjb3VudGVyU2Nyb2xsaW5nTGF5ZXIsIEdyYXBoaWNzTGF5 ZXIqIGluc2V0Q2xpcExheWVyLCBjb25zdCBTY3JvbGxpbmdHZW9tZXRyeSYpIG92ZXJyaWRlOwor ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKFNjcm9s bGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogc2Nyb2xsTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNj cm9sbGVkQ29udGVudHNMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkmKSBvdmVycmlkZTsK ICAgICAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlY29uY2lsZVNjcm9sbGluZ1N0YXRlKEZy YW1lVmlldyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBMYXlvdXRWaWV3cG9ydE9yaWdpbk9y T3ZlcnJpZGVSZWN0JiwgYm9vbCBwcm9ncmFtbWF0aWNTY3JvbGwsIFZpZXdwb3J0UmVjdFN0YWJp bGl0eSwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikgb3ZlcnJpZGU7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCmlu ZGV4IGE1MDMzYjdjM2Q0NWE2Yzg5NTM1YzFhZDdmM2YwZGRlNDhhZjZmM2UuLmY5MTcwODlhNWFm ZTQyOWM2NjMxYmQyZjcxNTdmZjNlYWUxZTBlZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtMTg5LDggKzE4OSw4 IEBAIHB1YmxpYzoKICNlbmRpZgogICAgIH07CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJh bWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypzY3JvbGxM YXllciovLCBHcmFwaGljc0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovLCBHcmFwaGlj c0xheWVyKiAvKmNvdW50ZXJTY3JvbGxpbmdMYXllciovLCBHcmFwaGljc0xheWVyKiAvKmluc2V0 Q2xpcExheWVyKi8sIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5KiA9IG51bGxwdHIpIHsgfQotICAg IHZpcnR1YWwgdm9pZCB1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlE LCBHcmFwaGljc0xheWVyKiAvKnNjcm9sbExheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qc2Nyb2xs ZWRDb250ZW50c0xheWVyKi8sIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5KiA9IG51bGxwdHIpIHsg fQorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVGcmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9k ZUlELCBHcmFwaGljc0xheWVyKiAvKnNjcm9sbExheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qc2Ny b2xsZWRDb250ZW50c0xheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qY291bnRlclNjcm9sbGluZ0xh eWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qaW5zZXRDbGlwTGF5ZXIqLywgY29uc3QgU2Nyb2xsaW5n R2VvbWV0cnkmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdO b2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypzY3JvbGxMYXllciovLCBHcmFw aGljc0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovLCBjb25zdCBTY3JvbGxpbmdHZW9t ZXRyeSYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCByZWNvbmNpbGVWaWV3cG9ydENvbnN0cmFpbmVk TGF5ZXJQb3NpdGlvbnMoU2Nyb2xsaW5nTm9kZUlELCBjb25zdCBMYXlvdXRSZWN0JiwgU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbkFjdGlvbikgeyB9CiAgICAgdmlydHVhbCBTdHJpbmcgc2Nyb2xsaW5n U3RhdGVUcmVlQXNUZXh0KFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yID0gU2Nyb2xs aW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3JOb3JtYWwpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9v bCBpc1J1YmJlckJhbmRJblByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5k ZXggMjA4YzY1NjEyNDM3NTMwM2Q2Zjc5MjZkOTI5NWZhNjkwMTQ4NTljNi4uZWMyZjVhMDUzOWQw NzdhMWM2M2Y0OWM5NGIxNjMxNzQ2MzU5ODRkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTM4NjksMTAgKzM4NjksMjEg QEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5 ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBPcHQKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1 cGRhdGVTY3JvbGxDb29yZGluYXRpb25Gb3JUaGlzRnJhbWUoU2Nyb2xsaW5nTm9kZUlEIHBhcmVu dE5vZGVJRCkKIHsKICAgICBhdXRvKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9s bGluZ0Nvb3JkaW5hdG9yKCk7Ci0gICAgQVNTRVJUKHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5jb29y ZGluYXRlc1Njcm9sbGluZ0ZvckZyYW1lVmlldyhtX3JlbmRlclZpZXcuZnJhbWVWaWV3KCkpKTsK KyAgICBGcmFtZVZpZXcmIGZyYW1lVmlldyA9IG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKTsKKyAg ICBBU1NFUlQoc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmNvb3JkaW5hdGVzU2Nyb2xsaW5nRm9yRnJh bWVWaWV3KGZyYW1lVmlldykpOwogCiAgICAgU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCA9IGF0dGFj aFNjcm9sbGluZ05vZGUoKm1fcmVuZGVyVmlldy5sYXllcigpLCBtX3JlbmRlclZpZXcuZnJhbWUo KS5pc01haW5GcmFtZSgpID8gTWFpbkZyYW1lU2Nyb2xsaW5nTm9kZSA6IFN1YmZyYW1lU2Nyb2xs aW5nTm9kZSwgcGFyZW50Tm9kZUlEKTsKLSAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dXBkYXRl RnJhbWVTY3JvbGxpbmdOb2RlKG5vZGVJRCwgbV9zY3JvbGxMYXllci5nZXQoKSwgbV9yb290Q29u dGVudExheWVyLmdldCgpLCBmaXhlZFJvb3RCYWNrZ3JvdW5kTGF5ZXIoKSwgY2xpcExheWVyKCkp OworICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpTY3JvbGxpbmdHZW9tZXRyeSBzY3JvbGxpbmdH ZW9tZXRyeTsKKyAgICAvLyBGSVhNRShodHRwczovL3dlYmtpdC5vcmcvYi8xNzI5MTcpOiBQYXNz IHBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Q/CisgICAgc2Nyb2xsaW5nR2VvbWV0cnkuc2Ny b2xsT3JpZ2luID0gZnJhbWVWaWV3LnNjcm9sbE9yaWdpbigpOworICAgIHNjcm9sbGluZ0dlb21l dHJ5LnNjcm9sbGFibGVBcmVhU2l6ZSA9IGZyYW1lVmlldy52aXNpYmxlQ29udGVudFJlY3QoKS5z aXplKCk7CisgICAgc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNpemUgPSBmcmFtZVZpZXcudG90 YWxDb250ZW50c1NpemUoKTsKKyAgICBzY3JvbGxpbmdHZW9tZXRyeS5yZWFjaGFibGVDb250ZW50 U2l6ZSA9IGZyYW1lVmlldy50b3RhbENvbnRlbnRzU2l6ZSgpOworI2lmIEVOQUJMRShDU1NfU0NS T0xMX1NOQVApCisgICAgZnJhbWVWaWV3LnVwZGF0ZVNuYXBPZmZzZXRzKCk7CisgICAgc2Nyb2xs aW5nQ29vcmRpbmF0b3ItPnVwZGF0ZVNjcm9sbFNuYXBQcm9wZXJ0aWVzV2l0aEZyYW1lVmlldyhm cmFtZVZpZXcpOworI2VuZGlmCisgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVwZGF0ZUZyYW1l U2Nyb2xsaW5nTm9kZShub2RlSUQsIG1fc2Nyb2xsTGF5ZXIuZ2V0KCksIG1fcm9vdENvbnRlbnRM YXllci5nZXQoKSwgZml4ZWRSb290QmFja2dyb3VuZExheWVyKCksIGNsaXBMYXllcigpLCBzY3Jv bGxpbmdHZW9tZXRyeSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVT Y3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgT3B0aW9uU2V0PExheWVy U2Nyb2xsQ29vcmRpbmF0aW9uUm9sZT4gcmVhc29ucywgT3B0aW9uU2V0PFNjcm9sbGluZ05vZGVD aGFuZ2VGbGFncz4gY2hhbmdlcykKQEAgLTM5NTEsNiArMzk2Miw3IEBAIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBs YXllciwgT3B0CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICBTY3JvbGxp bmdDb29yZGluYXRvcjo6U2Nyb2xsaW5nR2VvbWV0cnkgc2Nyb2xsaW5nR2VvbWV0cnk7CisgICAg ICAgICAgICAvLyBGSVhNRShodHRwczovL3dlYmtpdC5vcmcvYi8xNzI5MTcpOiBQYXNzIHBhcmVu dFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Q/CiAgICAgICAgICAgICBzY3JvbGxpbmdHZW9tZXRyeS5z Y3JvbGxPcmlnaW4gPSBsYXllci5zY3JvbGxPcmlnaW4oKTsKICAgICAgICAgICAgIHNjcm9sbGlu Z0dlb21ldHJ5LnNjcm9sbFBvc2l0aW9uID0gbGF5ZXIuc2Nyb2xsUG9zaXRpb24oKTsKICAgICAg ICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbGFibGVBcmVhU2l6ZSA9IGxheWVyLnZpc2li bGVTaXplKCk7CkBAIC0zOTcxLDcgKzM5ODMsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRv cjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYgbGF5ZXIsIE9wdAog CiAgICAgICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJSZWdpc3RlcmluZyBTY3JvbGxpbmcgc2Ny b2xsaW5nIG5vZGUgJSIgUFJJdTY0ICIgKGxheWVyICUiIFBSSXU2NCAiKSBhcyBjaGlsZCBvZiAl IiBQUkl1NjQsIG5vZGVJRCwgYmFja2luZy0+Z3JhcGhpY3NMYXllcigpLT5wcmltYXJ5TGF5ZXJJ RCgpLCBwYXJlbnROb2RlSUQpOwogCi0gICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+ dXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKG5vZGVJRCwgYmFja2luZy0+c2Nyb2xsaW5nTGF5 ZXIoKSwgYmFja2luZy0+c2Nyb2xsaW5nQ29udGVudHNMYXllcigpLCAmc2Nyb2xsaW5nR2VvbWV0 cnkpOworICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVwZGF0ZU92ZXJmbG93U2Ny b2xsaW5nTm9kZShub2RlSUQsIGJhY2tpbmctPnNjcm9sbGluZ0xheWVyKCksIGJhY2tpbmctPnNj cm9sbGluZ0NvbnRlbnRzTGF5ZXIoKSwgc2Nyb2xsaW5nR2VvbWV0cnkpOwogICAgICAgICB9CiAg ICAgfSBlbHNlCiAgICAgICAgIGRldGFjaFNjcm9sbENvb3JkaW5hdGVkTGF5ZXIobGF5ZXIsIFNj cm9sbGluZyk7Cg== 356481 2018-12-04 03:27:56 -0800 2018-12-04 03:27:56 -0800 Patch bug-192358-20181204120423.patch text/plain 13122 fred.wang U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMzZGRmNjEzMDcxMmVk YjExZWE3OTkxZjRiYjRlZTE4YzZhMzQ2Mi4uNTk5NDVmYTZmY2U2MjQ3Yzg2NjIzOTAxNmMwNDdl MzY0ZTkwNzEyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEyLTA0ICBGcmVk ZXJpYyBXYW5nICA8ZnJlZC53YW5nQGZyZWUuZnI+CisKKyAgICAgICAgQWx3YXlzIHBhc3Mgc2Ny b2xsaW5nR2VvbWV0cnkgdG8gdXBkYXRlKlNjcm9sbGluZ05vZGUgZnVuY3Rpb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIzNTgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5v IGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpB c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUpOgor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaDoKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlT3ZlcmZsb3dT Y3JvbGxpbmdOb2RlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Ny b2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcik6CisKIDIwMTgtMTIt MDQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEF1ZGl0OiB0ZXN0cyBzaG91bGQgc3VwcG9ydCBhc3luYyBvcGVyYXRpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwCmluZGV4IGRjMzBhN2UzNjgxYzkxNGY5MWE1YTM5YzkxZmIzYjg1OTQ0 NzA4NDkuLjhiNDJiZjZjOGQyMzEwNjVlYjgwOTNiNGRlNjAyMzJmYzYzYjdiNGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwCkBAIC01MTIsNyArNTEyLDcgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nv b3JkaW5hdG9yOjplbnN1cmVSb290U3RhdGVOb2RlRm9yRnJhbWVWaWV3KEZyYW1lVmlldyYgZnJh bWUKICAgICBhdHRhY2hUb1N0YXRlVHJlZShNYWluRnJhbWVTY3JvbGxpbmdOb2RlLCBmcmFtZVZp ZXcuc2Nyb2xsTGF5ZXJJRCgpLCAwKTsKIH0KIAotdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yOjp1cGRhdGVGcmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3Jh cGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwg R3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGluZ0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNl dENsaXBMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqIHNjcm9sbGluZ0dlb21ldHJ5KQor dm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVGcmFtZVNjcm9sbGluZ05vZGUo U2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5 ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgR3JhcGhpY3NMYXllciogY291bnRlclNjcm9sbGlu Z0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNldENsaXBMYXllciwgY29uc3QgU2Nyb2xsaW5nR2Vv bWV0cnkmIHNjcm9sbGluZ0dlb21ldHJ5KQogewogICAgIGF1dG8qIG5vZGUgPSBkb3duY2FzdDxT Y3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT4obV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnN0 YXRlTm9kZUZvcklEKG5vZGVJRCkpOwogICAgIEFTU0VSVChub2RlKTsKQEAgLTUyMywxOCArNTIz LDE1IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlRnJhbWVTY3JvbGxp bmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsCiAgICAgbm9kZS0+c2V0SW5zZXRDbGlwTGF5 ZXIoaW5zZXRDbGlwTGF5ZXIpOwogICAgIG5vZGUtPnNldFNjcm9sbGVkQ29udGVudHNMYXllcihz Y3JvbGxlZENvbnRlbnRzTGF5ZXIpOwogICAgIG5vZGUtPnNldENvdW50ZXJTY3JvbGxpbmdMYXll cihjb3VudGVyU2Nyb2xsaW5nTGF5ZXIpOwotCi0gICAgaWYgKHNjcm9sbGluZ0dlb21ldHJ5KSB7 Ci0gICAgICAgIG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qoc2Nyb2xsaW5n R2VvbWV0cnktPnBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3QpOwotICAgICAgICBub2RlLT5z ZXRTY3JvbGxPcmlnaW4oc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbE9yaWdpbik7Ci0gICAgICAg IG5vZGUtPnNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3JvbGxQb3NpdGlv bik7Ci0gICAgICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5 LT5jb250ZW50U2l6ZSk7Ci0gICAgICAgIG5vZGUtPnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6ZShz Y3JvbGxpbmdHZW9tZXRyeS0+cmVhY2hhYmxlQ29udGVudFNpemUpOwotICAgICAgICBub2RlLT5z ZXRTY3JvbGxhYmxlQXJlYVNpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbGFibGVBcmVhU2l6 ZSk7Ci0gICAgfQorICAgIG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qoc2Ny b2xsaW5nR2VvbWV0cnkucGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdCk7CisgICAgbm9kZS0+ c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbE9yaWdpbik7CisgICAgbm9k ZS0+c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRpb24pOwor ICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LmNvbnRlbnRT aXplKTsKKyAgICBub2RlLT5zZXRSZWFjaGFibGVDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0 cnkucmVhY2hhYmxlQ29udGVudFNpemUpOworICAgIG5vZGUtPnNldFNjcm9sbGFibGVBcmVhU2l6 ZShzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxhYmxlQXJlYVNpemUpOwogfQogICAgIAotdm9pZCBB c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Ny b2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIq IHNjcm9sbGVkQ29udGVudHNMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqIHNjcm9sbGlu Z0dlb21ldHJ5KQordm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVyZmxv d1Njcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogbGF5 ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgY29uc3QgU2Nyb2xsaW5n R2VvbWV0cnkmIHNjcm9sbGluZ0dlb21ldHJ5KQogewogICAgIGF1dG8qIG5vZGUgPSBkb3duY2Fz dDxTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZT4obV9zY3JvbGxpbmdTdGF0ZVRy ZWUtPnN0YXRlTm9kZUZvcklEKG5vZGVJRCkpOwogICAgIEFTU0VSVChub2RlKTsKQEAgLTU0Mywy MSArNTQwLDE4IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlT3ZlcmZs b3dTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlCiAKICAgICBub2RlLT5zZXRMYXll cihsYXllcik7CiAgICAgbm9kZS0+c2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKHNjcm9sbGVkQ29u dGVudHNMYXllcik7Ci0gICAgCi0gICAgaWYgKHNjcm9sbGluZ0dlb21ldHJ5KSB7Ci0gICAgICAg IG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qoc2Nyb2xsaW5nR2VvbWV0cnkt PnBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3QpOwotICAgICAgICBub2RlLT5zZXRTY3JvbGxP cmlnaW4oc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbE9yaWdpbik7Ci0gICAgICAgIG5vZGUtPnNl dFNjcm9sbFBvc2l0aW9uKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3JvbGxQb3NpdGlvbik7Ci0gICAg ICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LT5jb250ZW50 U2l6ZSk7Ci0gICAgICAgIG5vZGUtPnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6ZShzY3JvbGxpbmdH ZW9tZXRyeS0+cmVhY2hhYmxlQ29udGVudFNpemUpOwotICAgICAgICBub2RlLT5zZXRTY3JvbGxh YmxlQXJlYVNpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnNjcm9sbGFibGVBcmVhU2l6ZSk7CisgICAg bm9kZS0+c2V0UGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdChzY3JvbGxpbmdHZW9tZXRyeS5w YXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0KTsKKyAgICBub2RlLT5zZXRTY3JvbGxPcmlnaW4o c2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luKTsKKyAgICBub2RlLT5zZXRTY3JvbGxQb3Np dGlvbihzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxQb3NpdGlvbik7CisgICAgbm9kZS0+c2V0VG90 YWxDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNpemUpOworICAgIG5vZGUt PnNldFJlYWNoYWJsZUNvbnRlbnRzU2l6ZShzY3JvbGxpbmdHZW9tZXRyeS5yZWFjaGFibGVDb250 ZW50U2l6ZSk7CisgICAgbm9kZS0+c2V0U2Nyb2xsYWJsZUFyZWFTaXplKHNjcm9sbGluZ0dlb21l dHJ5LnNjcm9sbGFibGVBcmVhU2l6ZSk7CiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKLSAg ICAgICAgc2V0U3RhdGVTY3JvbGxpbmdOb2RlU25hcE9mZnNldHNBc0Zsb2F0KCpub2RlLCBTY3Jv bGxFdmVudEF4aXM6Okhvcml6b250YWwsICZzY3JvbGxpbmdHZW9tZXRyeS0+aG9yaXpvbnRhbFNu YXBPZmZzZXRzLCAmc2Nyb2xsaW5nR2VvbWV0cnktPmhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2Vz LCBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgICAgICBzZXRTdGF0ZVNjcm9sbGlu Z05vZGVTbmFwT2Zmc2V0c0FzRmxvYXQoKm5vZGUsIFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWws ICZzY3JvbGxpbmdHZW9tZXRyeS0+dmVydGljYWxTbmFwT2Zmc2V0cywgJnNjcm9sbGluZ0dlb21l dHJ5LT52ZXJ0aWNhbFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3Io KSk7Ci0gICAgICAgIG5vZGUtPnNldEN1cnJlbnRIb3Jpem9udGFsU25hcFBvaW50SW5kZXgoc2Ny b2xsaW5nR2VvbWV0cnktPmN1cnJlbnRIb3Jpem9udGFsU25hcFBvaW50SW5kZXgpOwotICAgICAg ICBub2RlLT5zZXRDdXJyZW50VmVydGljYWxTbmFwUG9pbnRJbmRleChzY3JvbGxpbmdHZW9tZXRy eS0+Y3VycmVudFZlcnRpY2FsU25hcFBvaW50SW5kZXgpOworICAgIHNldFN0YXRlU2Nyb2xsaW5n Tm9kZVNuYXBPZmZzZXRzQXNGbG9hdCgqbm9kZSwgU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFs LCAmc2Nyb2xsaW5nR2VvbWV0cnkuaG9yaXpvbnRhbFNuYXBPZmZzZXRzLCAmc2Nyb2xsaW5nR2Vv bWV0cnkuaG9yaXpvbnRhbFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0 b3IoKSk7CisgICAgc2V0U3RhdGVTY3JvbGxpbmdOb2RlU25hcE9mZnNldHNBc0Zsb2F0KCpub2Rl LCBTY3JvbGxFdmVudEF4aXM6OlZlcnRpY2FsLCAmc2Nyb2xsaW5nR2VvbWV0cnkudmVydGljYWxT bmFwT2Zmc2V0cywgJnNjcm9sbGluZ0dlb21ldHJ5LnZlcnRpY2FsU25hcE9mZnNldFJhbmdlcywg bV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICBub2RlLT5zZXRDdXJyZW50SG9yaXpv bnRhbFNuYXBQb2ludEluZGV4KHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRIb3Jpem9udGFsU25h cFBvaW50SW5kZXgpOworICAgIG5vZGUtPnNldEN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludEluZGV4 KHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludEluZGV4KTsKICNlbmRp ZgotICAgIH0KIH0KIAogdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVOb2Rl TGF5ZXIoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCwgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXll cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Ny b2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCAzZDY0MzI3YTVjYjEwOGYwMDFhMTI3NmJiYzdlYjc4 ODQyY2IwN2I1Li41ZDY3OGU0MDBlNTk5Mjg1NDhmMzg0MzdjNzRmMDY5Y2JjZGMyZmQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3Jk aW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxp bmdDb29yZGluYXRvci5oCkBAIC0xMDQsOCArMTA0LDggQEAgcHJpdmF0ZToKICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIHVwZGF0ZU5vZGVMYXllcihTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5 ZXIqKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZU5vZGVWaWV3cG9y dENvbnN0cmFpbnRzKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgVmlld3BvcnRDb25zdHJhaW50cyYp IG92ZXJyaWRlOwogICAgIAotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlRnJhbWVTY3Jv bGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogc2Nyb2xsTGF5ZXIsIEdy YXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgR3JhcGhpY3NMYXllciogY291bnRl clNjcm9sbGluZ0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNldENsaXBMYXllciwgY29uc3QgU2Ny b2xsaW5nR2VvbWV0cnkqID0gbnVsbHB0cikgb3ZlcnJpZGU7Ci0gICAgV0VCQ09SRV9FWFBPUlQg dm9pZCB1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGlj c0xheWVyKiBzY3JvbGxMYXllciwgR3JhcGhpY3NMYXllciogc2Nyb2xsZWRDb250ZW50c0xheWVy LCBjb25zdCBTY3JvbGxpbmdHZW9tZXRyeSogPSBudWxscHRyKSBvdmVycmlkZTsKKyAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQs IEdyYXBoaWNzTGF5ZXIqIHNjcm9sbExheWVyLCBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENvbnRl bnRzTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIGNvdW50ZXJTY3JvbGxpbmdMYXllciwgR3JhcGhpY3NM YXllciogaW5zZXRDbGlwTGF5ZXIsIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5Jikgb3ZlcnJpZGU7 CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Ny b2xsaW5nTm9kZUlELCBHcmFwaGljc0xheWVyKiBzY3JvbGxMYXllciwgR3JhcGhpY3NMYXllciog c2Nyb2xsZWRDb250ZW50c0xheWVyLCBjb25zdCBTY3JvbGxpbmdHZW9tZXRyeSYpIG92ZXJyaWRl OwogICAgIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVjb25jaWxlU2Nyb2xsaW5nU3RhdGUo RnJhbWVWaWV3JiwgY29uc3QgRmxvYXRQb2ludCYsIGNvbnN0IExheW91dFZpZXdwb3J0T3JpZ2lu T3JPdmVycmlkZVJlY3QmLCBib29sIHByb2dyYW1tYXRpY1Njcm9sbCwgVmlld3BvcnRSZWN0U3Rh YmlsaXR5LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKSBvdmVycmlkZTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu aCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgK aW5kZXggYTUwMzNiN2MzZDQ1YTZjODk1MzVjMWFkN2YzZjBkZGU0OGFmNmYzZS4uZjkxNzA4OWE1 YWZlNDI5YzY2MzFiZDJmNzE1N2ZmM2VhZTFlMGVkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC0xODksOCArMTg5 LDggQEAgcHVibGljOgogI2VuZGlmCiAgICAgfTsKIAotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVG cmFtZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGljc0xheWVyKiAvKnNjcm9s bExheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qc2Nyb2xsZWRDb250ZW50c0xheWVyKi8sIEdyYXBo aWNzTGF5ZXIqIC8qY291bnRlclNjcm9sbGluZ0xheWVyKi8sIEdyYXBoaWNzTGF5ZXIqIC8qaW5z ZXRDbGlwTGF5ZXIqLywgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqID0gbnVsbHB0cikgeyB9Ci0g ICAgdmlydHVhbCB2b2lkIHVwZGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2Rl SUQsIEdyYXBoaWNzTGF5ZXIqIC8qc2Nyb2xsTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypzY3Jv bGxlZENvbnRlbnRzTGF5ZXIqLywgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqID0gbnVsbHB0cikg eyB9CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdO b2RlSUQsIEdyYXBoaWNzTGF5ZXIqIC8qc2Nyb2xsTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypz Y3JvbGxlZENvbnRlbnRzTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypjb3VudGVyU2Nyb2xsaW5n TGF5ZXIqLywgR3JhcGhpY3NMYXllciogLyppbnNldENsaXBMYXllciovLCBjb25zdCBTY3JvbGxp bmdHZW9tZXRyeSYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVPdmVyZmxvd1Njcm9sbGlu Z05vZGUoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGljc0xheWVyKiAvKnNjcm9sbExheWVyKi8sIEdy YXBoaWNzTGF5ZXIqIC8qc2Nyb2xsZWRDb250ZW50c0xheWVyKi8sIGNvbnN0IFNjcm9sbGluZ0dl b21ldHJ5JikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlY29uY2lsZVZpZXdwb3J0Q29uc3RyYWlu ZWRMYXllclBvc2l0aW9ucyhTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IExheW91dFJlY3QmLCBTY3Jv bGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKSB7IH0KICAgICB2aXJ0dWFsIFN0cmluZyBzY3JvbGxp bmdTdGF0ZVRyZWVBc1RleHQoU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IgPSBTY3Jv bGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvck5vcm1hbCkgY29uc3Q7CiAgICAgdmlydHVhbCBi b29sIGlzUnViYmVyQmFuZEluUHJvZ3Jlc3MoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApp bmRleCAyMDhjNjU2MTI0Mzc1MzAzZDZmNzkyNmQ5Mjk1ZmE2OTAxNDg1OWM2Li5lYzJmNWEwNTM5 ZDA3N2ExYzYzZjQ5Yzk0YjE2MzE3NDYzNTk4NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzg2OSwxMCArMzg2OSwy MSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRM YXllcihSZW5kZXJMYXllciYgbGF5ZXIsIE9wdAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGlvbkZvclRoaXNGcmFtZShTY3JvbGxpbmdOb2RlSUQgcGFy ZW50Tm9kZUlEKQogewogICAgIGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+c2Ny b2xsaW5nQ29vcmRpbmF0b3IoKTsKLSAgICBBU1NFUlQoc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmNv b3JkaW5hdGVzU2Nyb2xsaW5nRm9yRnJhbWVWaWV3KG1fcmVuZGVyVmlldy5mcmFtZVZpZXcoKSkp OworICAgIEZyYW1lVmlldyYgZnJhbWVWaWV3ID0gbV9yZW5kZXJWaWV3LmZyYW1lVmlldygpOwor ICAgIEFTU0VSVChzY3JvbGxpbmdDb29yZGluYXRvci0+Y29vcmRpbmF0ZXNTY3JvbGxpbmdGb3JG cmFtZVZpZXcoZnJhbWVWaWV3KSk7CiAKICAgICBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEID0gYXR0 YWNoU2Nyb2xsaW5nTm9kZSgqbV9yZW5kZXJWaWV3LmxheWVyKCksIG1fcmVuZGVyVmlldy5mcmFt ZSgpLmlzTWFpbkZyYW1lKCkgPyBNYWluRnJhbWVTY3JvbGxpbmdOb2RlIDogU3ViZnJhbWVTY3Jv bGxpbmdOb2RlLCBwYXJlbnROb2RlSUQpOwotICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT51cGRh dGVGcmFtZVNjcm9sbGluZ05vZGUobm9kZUlELCBtX3Njcm9sbExheWVyLmdldCgpLCBtX3Jvb3RD b250ZW50TGF5ZXIuZ2V0KCksIGZpeGVkUm9vdEJhY2tncm91bmRMYXllcigpLCBjbGlwTGF5ZXIo KSk7CisgICAgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OlNjcm9sbGluZ0dlb21ldHJ5IHNjcm9sbGlu Z0dlb21ldHJ5OworICAgIC8vIEZJWE1FKGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE3MjkxNyk6IFBh c3MgcGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdD8KKyAgICBzY3JvbGxpbmdHZW9tZXRyeS5z Y3JvbGxPcmlnaW4gPSBmcmFtZVZpZXcuc2Nyb2xsT3JpZ2luKCk7CisgICAgc2Nyb2xsaW5nR2Vv bWV0cnkuc2Nyb2xsYWJsZUFyZWFTaXplID0gZnJhbWVWaWV3LnZpc2libGVDb250ZW50UmVjdCgp LnNpemUoKTsKKyAgICBzY3JvbGxpbmdHZW9tZXRyeS5jb250ZW50U2l6ZSA9IGZyYW1lVmlldy50 b3RhbENvbnRlbnRzU2l6ZSgpOworICAgIHNjcm9sbGluZ0dlb21ldHJ5LnJlYWNoYWJsZUNvbnRl bnRTaXplID0gZnJhbWVWaWV3LnRvdGFsQ29udGVudHNTaXplKCk7CisjaWYgRU5BQkxFKENTU19T Q1JPTExfU05BUCkKKyAgICBmcmFtZVZpZXcudXBkYXRlU25hcE9mZnNldHMoKTsKKyAgICBzY3Jv bGxpbmdDb29yZGluYXRvci0+dXBkYXRlU2Nyb2xsU25hcFByb3BlcnRpZXNXaXRoRnJhbWVWaWV3 KGZyYW1lVmlldyk7CisjZW5kaWYKKyAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dXBkYXRlRnJh bWVTY3JvbGxpbmdOb2RlKG5vZGVJRCwgbV9zY3JvbGxMYXllci5nZXQoKSwgbV9yb290Q29udGVu dExheWVyLmdldCgpLCBmaXhlZFJvb3RCYWNrZ3JvdW5kTGF5ZXIoKSwgY2xpcExheWVyKCksIHNj cm9sbGluZ0dlb21ldHJ5KTsKIH0KIAogdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0 ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBPcHRpb25TZXQ8TGF5 ZXJTY3JvbGxDb29yZGluYXRpb25Sb2xlPiByZWFzb25zLCBPcHRpb25TZXQ8U2Nyb2xsaW5nTm9k ZUNoYW5nZUZsYWdzPiBjaGFuZ2VzKQpAQCAtMzk1MSw2ICszOTYyLDcgQEAgdm9pZCBSZW5kZXJM YXllckNvbXBvc2l0b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXIm IGxheWVyLCBPcHQKICAgICAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgICAgIFNjcm9s bGluZ0Nvb3JkaW5hdG9yOjpTY3JvbGxpbmdHZW9tZXRyeSBzY3JvbGxpbmdHZW9tZXRyeTsKKyAg ICAgICAgICAgIC8vIEZJWE1FKGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE3MjkxNyk6IFBhc3MgcGFy ZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdD8KICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5 LnNjcm9sbE9yaWdpbiA9IGxheWVyLnNjcm9sbE9yaWdpbigpOwogICAgICAgICAgICAgc2Nyb2xs aW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRpb24gPSBsYXllci5zY3JvbGxQb3NpdGlvbigpOwogICAg ICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsYWJsZUFyZWFTaXplID0gbGF5ZXIudmlz aWJsZVNpemUoKTsKQEAgLTM5NzEsNyArMzk4Myw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3Np dG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgT3B0 CiAKICAgICAgICAgICAgIExPRyhDb21wb3NpdGluZywgIlJlZ2lzdGVyaW5nIFNjcm9sbGluZyBz Y3JvbGxpbmcgbm9kZSAlIiBQUkl1NjQgIiAobGF5ZXIgJSIgUFJJdTY0ICIpIGFzIGNoaWxkIG9m ICUiIFBSSXU2NCwgbm9kZUlELCBiYWNraW5nLT5ncmFwaGljc0xheWVyKCktPnByaW1hcnlMYXll cklEKCksIHBhcmVudE5vZGVJRCk7CiAKLSAgICAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9y LT51cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUobm9kZUlELCBiYWNraW5nLT5zY3JvbGxpbmdM YXllcigpLCBiYWNraW5nLT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCksICZzY3JvbGxpbmdHZW9t ZXRyeSk7CisgICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dXBkYXRlT3ZlcmZsb3dT Y3JvbGxpbmdOb2RlKG5vZGVJRCwgYmFja2luZy0+c2Nyb2xsaW5nTGF5ZXIoKSwgYmFja2luZy0+ c2Nyb2xsaW5nQ29udGVudHNMYXllcigpLCBzY3JvbGxpbmdHZW9tZXRyeSk7CiAgICAgICAgIH0K ICAgICB9IGVsc2UKICAgICAgICAgZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihsYXllciwg U2Nyb2xsaW5nKTsK 356517 2018-12-04 11:07:33 -0800 2018-12-04 19:58:09 -0800 Patch 0001-Bug-192358-Always-pass-scrollingGeometry-to-update-S.patch text/plain 14062 fred.wang RnJvbSBlMjQwMGJlNGMwZjQ3MzlhZTAxY2ZlZGFhODEwZGFmZjViZTZjMDZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmVkZXJpYyBXYW5nIDxmd2FuZ0BpZ2FsaWEuY29tPgpEYXRl OiBUdWUsIDQgRGVjIDIwMTggMTU6NDE6MzkgKzAxMDAKU3ViamVjdDogW1BBVENIIHhzZXJ2ZXIg MS8yXSBCdWcgMTkyMzU4IC0gQWx3YXlzIHBhc3Mgc2Nyb2xsaW5nR2VvbWV0cnkgdG8KIHVwZGF0 ZSpTY3JvbGxpbmdOb2RlIGZ1bmN0aW9ucwoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgfCAyOCArKysrKysrKysrKysrCiAuLi4vc2Nyb2xsaW5nL0Fz eW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwICAgfCA0MiArKysrKysrKy0tLS0tLS0tLS0tCiAu Li4vc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCAgICAgfCAgNCArLQogLi4u L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggICAgIHwgIDQgKy0KIC4uLi9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCAgICAgICB8IDE4ICsrKysrKy0tCiA1 IGZpbGVzIGNoYW5nZWQsIDY1IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBkODViOGRhYzdkMC4uNzgyOWZhMmI1MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwz MSBAQAorMjAxOC0xMi0wNCAgRnJlZGVyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CisKKyAg ICAgICAgQWx3YXlzIHBhc3Mgc2Nyb2xsaW5nR2VvbWV0cnkgdG8gdXBkYXRlKlNjcm9sbGluZ05v ZGUgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTIzNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDdXJyZW50bHksIHRoZSBzY3JvbGxpbmdHZW9tZXRyeSBwYXJhbWV0ZXIgb2YgdXBkYXRl T3ZlcmZsb3dTY3JvbGxpbmdOb2RlIGlzIGFsd2F5cyB1c2VkCisgICAgICAgIHdoaWxlIHRoZSBv bmUgb2YgdXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlIGlzIG5ldmVyIHVzZWQuIEJvdGggb2YgdGhl bSBhcmUgcGFzc2VkIGFzIHBvc3NpYmx5CisgICAgICAgIG51bGwgcG9pbnRlcnMuIFRoaXMgY29t bWl0IG1ha2VzIHRoaW5ncyBtb3JlIGNvbnNpc3RlbnQgYnkgbWFraW5nIHRoZSBwYXJhbWV0ZXIg YSByZWZlcmVuY2UKKyAgICAgICAgYW5kIGV4cGxpY2l0bHkgc2V0dGluZyB0aGUgc2Nyb2xsaW5n R2VvbWV0cnkgb2YgdXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlLiBUaGlzIHdpbGwgaGVscAorICAg ICAgICBvdGhlciBlZmZvcnRzIChzdWNoIGFzIHN1cHBvcnQgZm9yIG1hY09TL2lPUyBhc3luY2hy b25vdXMgc2Nyb2xsaW5nIG9mIG92ZXJmbG93IG5vZGVzIC8KKyAgICAgICAgc3ViZnJhbWVzIG9y IGZvciBDU1Mgb3ZlcnNjcm9sbC1iZWhhdmlvcikgZm9yIHdoaWNoIG5ldyBkYXRhIG1lbWJlcnMg aGF2ZSB0byBiZSBwYXNzZWQgdG8gdGhlCisgICAgICAgIHNjcm9sbGluZyBub2Rlcy4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6 CisgICAgICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVPdmVy Zmxvd1Njcm9sbGluZ05vZGUpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3IuaDoKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29y ZGluYXRvci5oOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGlu YXRvcjo6dXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0aW9uRm9yVGhpc0ZyYW1lKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0 ZWRMYXllcik6CisKIDIwMTgtMTItMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBNb3ZlIFVSTFNvdXAgYmFjayB0byBXZWJDb3Jl IGFmdGVyIHIyMzg3NzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHAKaW5kZXggZGMzMGE3ZTM2ODEuLjI2 Mzg4MjZiNTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3lu Y1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtNTEyLDcgKzUxMiw3IEBAIHZv aWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZW5zdXJlUm9vdFN0YXRlTm9kZUZvckZyYW1l VmlldyhGcmFtZVZpZXcmIGZyYW1lCiAgICAgYXR0YWNoVG9TdGF0ZVRyZWUoTWFpbkZyYW1lU2Ny b2xsaW5nTm9kZSwgZnJhbWVWaWV3LnNjcm9sbExheWVySUQoKSwgMCk7CiB9CiAKLXZvaWQgQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9sbGlu Z05vZGVJRCBub2RlSUQsIEdyYXBoaWNzTGF5ZXIqIGxheWVyLCBHcmFwaGljc0xheWVyKiBzY3Jv bGxlZENvbnRlbnRzTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIGNvdW50ZXJTY3JvbGxpbmdMYXllciwg R3JhcGhpY3NMYXllciogaW5zZXRDbGlwTGF5ZXIsIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5KiBz Y3JvbGxpbmdHZW9tZXRyeSkKK3ZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRl RnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIEdyYXBoaWNzTGF5ZXIq IGxheWVyLCBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENvbnRlbnRzTGF5ZXIsIEdyYXBoaWNzTGF5 ZXIqIGNvdW50ZXJTY3JvbGxpbmdMYXllciwgR3JhcGhpY3NMYXllciogaW5zZXRDbGlwTGF5ZXIs IGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5JiBzY3JvbGxpbmdHZW9tZXRyeSkKIHsKICAgICBhdXRv KiBub2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU+KG1fc2Ny b2xsaW5nU3RhdGVUcmVlLT5zdGF0ZU5vZGVGb3JJRChub2RlSUQpKTsKICAgICBBU1NFUlQobm9k ZSk7CkBAIC01MjMsMTggKzUyMywxNSBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6 OnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQgbm9kZUlELAogICAgIG5v ZGUtPnNldEluc2V0Q2xpcExheWVyKGluc2V0Q2xpcExheWVyKTsKICAgICBub2RlLT5zZXRTY3Jv bGxlZENvbnRlbnRzTGF5ZXIoc2Nyb2xsZWRDb250ZW50c0xheWVyKTsKICAgICBub2RlLT5zZXRD b3VudGVyU2Nyb2xsaW5nTGF5ZXIoY291bnRlclNjcm9sbGluZ0xheWVyKTsKLQotICAgIGlmIChz Y3JvbGxpbmdHZW9tZXRyeSkgewotICAgICAgICBub2RlLT5zZXRQYXJlbnRSZWxhdGl2ZVNjcm9s bGFibGVSZWN0KHNjcm9sbGluZ0dlb21ldHJ5LT5wYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0 KTsKLSAgICAgICAgbm9kZS0+c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3Jv bGxPcmlnaW4pOwotICAgICAgICBub2RlLT5zZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxpbmdHZW9t ZXRyeS0+c2Nyb2xsUG9zaXRpb24pOwotICAgICAgICBub2RlLT5zZXRUb3RhbENvbnRlbnRzU2l6 ZShzY3JvbGxpbmdHZW9tZXRyeS0+Y29udGVudFNpemUpOwotICAgICAgICBub2RlLT5zZXRSZWFj aGFibGVDb250ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnJlYWNoYWJsZUNvbnRlbnRTaXpl KTsKLSAgICAgICAgbm9kZS0+c2V0U2Nyb2xsYWJsZUFyZWFTaXplKHNjcm9sbGluZ0dlb21ldHJ5 LT5zY3JvbGxhYmxlQXJlYVNpemUpOwotICAgIH0KKyAgICBub2RlLT5zZXRQYXJlbnRSZWxhdGl2 ZVNjcm9sbGFibGVSZWN0KHNjcm9sbGluZ0dlb21ldHJ5LnBhcmVudFJlbGF0aXZlU2Nyb2xsYWJs ZVJlY3QpOworICAgIG5vZGUtPnNldFNjcm9sbE9yaWdpbihzY3JvbGxpbmdHZW9tZXRyeS5zY3Jv bGxPcmlnaW4pOworICAgIG5vZGUtPnNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbGluZ0dlb21ldHJ5 LnNjcm9sbFBvc2l0aW9uKTsKKyAgICBub2RlLT5zZXRUb3RhbENvbnRlbnRzU2l6ZShzY3JvbGxp bmdHZW9tZXRyeS5jb250ZW50U2l6ZSk7CisgICAgbm9kZS0+c2V0UmVhY2hhYmxlQ29udGVudHNT aXplKHNjcm9sbGluZ0dlb21ldHJ5LnJlYWNoYWJsZUNvbnRlbnRTaXplKTsKKyAgICBub2RlLT5z ZXRTY3JvbGxhYmxlQXJlYVNpemUoc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsYWJsZUFyZWFTaXpl KTsKIH0KICAgICAKLXZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlT3ZlcmZs b3dTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIEdyYXBoaWNzTGF5ZXIqIGxh eWVyLCBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENvbnRlbnRzTGF5ZXIsIGNvbnN0IFNjcm9sbGlu Z0dlb21ldHJ5KiBzY3JvbGxpbmdHZW9tZXRyeSkKK3ZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvcjo6dXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCBub2RlSUQs IEdyYXBoaWNzTGF5ZXIqIGxheWVyLCBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENvbnRlbnRzTGF5 ZXIsIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5JiBzY3JvbGxpbmdHZW9tZXRyeSkKIHsKICAgICBh dXRvKiBub2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGU+ KG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zdGF0ZU5vZGVGb3JJRChub2RlSUQpKTsKICAgICBBU1NF UlQobm9kZSk7CkBAIC01NDMsMjEgKzU0MCwxOCBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRp bmF0b3I6OnVwZGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQgbm9kZQog CiAgICAgbm9kZS0+c2V0TGF5ZXIobGF5ZXIpOwogICAgIG5vZGUtPnNldFNjcm9sbGVkQ29udGVu dHNMYXllcihzY3JvbGxlZENvbnRlbnRzTGF5ZXIpOwotICAgIAotICAgIGlmIChzY3JvbGxpbmdH ZW9tZXRyeSkgewotICAgICAgICBub2RlLT5zZXRQYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0 KHNjcm9sbGluZ0dlb21ldHJ5LT5wYXJlbnRSZWxhdGl2ZVNjcm9sbGFibGVSZWN0KTsKLSAgICAg ICAgbm9kZS0+c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3JvbGxPcmlnaW4p OwotICAgICAgICBub2RlLT5zZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxpbmdHZW9tZXRyeS0+c2Ny b2xsUG9zaXRpb24pOwotICAgICAgICBub2RlLT5zZXRUb3RhbENvbnRlbnRzU2l6ZShzY3JvbGxp bmdHZW9tZXRyeS0+Y29udGVudFNpemUpOwotICAgICAgICBub2RlLT5zZXRSZWFjaGFibGVDb250 ZW50c1NpemUoc2Nyb2xsaW5nR2VvbWV0cnktPnJlYWNoYWJsZUNvbnRlbnRTaXplKTsKLSAgICAg ICAgbm9kZS0+c2V0U2Nyb2xsYWJsZUFyZWFTaXplKHNjcm9sbGluZ0dlb21ldHJ5LT5zY3JvbGxh YmxlQXJlYVNpemUpOworICAgIG5vZGUtPnNldFBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Qo c2Nyb2xsaW5nR2VvbWV0cnkucGFyZW50UmVsYXRpdmVTY3JvbGxhYmxlUmVjdCk7CisgICAgbm9k ZS0+c2V0U2Nyb2xsT3JpZ2luKHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbE9yaWdpbik7CisgICAg bm9kZS0+c2V0U2Nyb2xsUG9zaXRpb24oc2Nyb2xsaW5nR2VvbWV0cnkuc2Nyb2xsUG9zaXRpb24p OworICAgIG5vZGUtPnNldFRvdGFsQ29udGVudHNTaXplKHNjcm9sbGluZ0dlb21ldHJ5LmNvbnRl bnRTaXplKTsKKyAgICBub2RlLT5zZXRSZWFjaGFibGVDb250ZW50c1NpemUoc2Nyb2xsaW5nR2Vv bWV0cnkucmVhY2hhYmxlQ29udGVudFNpemUpOworICAgIG5vZGUtPnNldFNjcm9sbGFibGVBcmVh U2l6ZShzY3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxhYmxlQXJlYVNpemUpOwogI2lmIEVOQUJMRShD U1NfU0NST0xMX1NOQVApCi0gICAgICAgIHNldFN0YXRlU2Nyb2xsaW5nTm9kZVNuYXBPZmZzZXRz QXNGbG9hdCgqbm9kZSwgU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFsLCAmc2Nyb2xsaW5nR2Vv bWV0cnktPmhvcml6b250YWxTbmFwT2Zmc2V0cywgJnNjcm9sbGluZ0dlb21ldHJ5LT5ob3Jpem9u dGFsU25hcE9mZnNldFJhbmdlcywgbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpKTsKLSAgICAg ICAgc2V0U3RhdGVTY3JvbGxpbmdOb2RlU25hcE9mZnNldHNBc0Zsb2F0KCpub2RlLCBTY3JvbGxF dmVudEF4aXM6OlZlcnRpY2FsLCAmc2Nyb2xsaW5nR2VvbWV0cnktPnZlcnRpY2FsU25hcE9mZnNl dHMsICZzY3JvbGxpbmdHZW9tZXRyeS0+dmVydGljYWxTbmFwT2Zmc2V0UmFuZ2VzLCBtX3BhZ2Ut PmRldmljZVNjYWxlRmFjdG9yKCkpOwotICAgICAgICBub2RlLT5zZXRDdXJyZW50SG9yaXpvbnRh bFNuYXBQb2ludEluZGV4KHNjcm9sbGluZ0dlb21ldHJ5LT5jdXJyZW50SG9yaXpvbnRhbFNuYXBQ b2ludEluZGV4KTsKLSAgICAgICAgbm9kZS0+c2V0Q3VycmVudFZlcnRpY2FsU25hcFBvaW50SW5k ZXgoc2Nyb2xsaW5nR2VvbWV0cnktPmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludEluZGV4KTsKKyAg ICBzZXRTdGF0ZVNjcm9sbGluZ05vZGVTbmFwT2Zmc2V0c0FzRmxvYXQoKm5vZGUsIFNjcm9sbEV2 ZW50QXhpczo6SG9yaXpvbnRhbCwgJnNjcm9sbGluZ0dlb21ldHJ5Lmhvcml6b250YWxTbmFwT2Zm c2V0cywgJnNjcm9sbGluZ0dlb21ldHJ5Lmhvcml6b250YWxTbmFwT2Zmc2V0UmFuZ2VzLCBtX3Bh Z2UtPmRldmljZVNjYWxlRmFjdG9yKCkpOworICAgIHNldFN0YXRlU2Nyb2xsaW5nTm9kZVNuYXBP ZmZzZXRzQXNGbG9hdCgqbm9kZSwgU2Nyb2xsRXZlbnRBeGlzOjpWZXJ0aWNhbCwgJnNjcm9sbGlu Z0dlb21ldHJ5LnZlcnRpY2FsU25hcE9mZnNldHMsICZzY3JvbGxpbmdHZW9tZXRyeS52ZXJ0aWNh bFNuYXBPZmZzZXRSYW5nZXMsIG1fcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7CisgICAgbm9k ZS0+c2V0Q3VycmVudEhvcml6b250YWxTbmFwUG9pbnRJbmRleChzY3JvbGxpbmdHZW9tZXRyeS5j dXJyZW50SG9yaXpvbnRhbFNuYXBQb2ludEluZGV4KTsKKyAgICBub2RlLT5zZXRDdXJyZW50VmVy dGljYWxTbmFwUG9pbnRJbmRleChzY3JvbGxpbmdHZW9tZXRyeS5jdXJyZW50VmVydGljYWxTbmFw UG9pbnRJbmRleCk7CiAjZW5kaWYKLSAgICB9CiB9CiAKIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvcjo6dXBkYXRlTm9kZUxheWVyKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIEdyYXBoaWNz TGF5ZXIqIGdyYXBoaWNzTGF5ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggM2Q2NDMyN2E1Y2Iu LjVkNjc4ZTQwMGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9B c3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC0xMDQsOCArMTA0LDggQEAgcHJp dmF0ZToKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZU5vZGVMYXllcihTY3JvbGxpbmdO b2RlSUQsIEdyYXBoaWNzTGF5ZXIqKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHVwZGF0ZU5vZGVWaWV3cG9ydENvbnN0cmFpbnRzKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgVmll d3BvcnRDb25zdHJhaW50cyYpIG92ZXJyaWRlOwogICAgIAotICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgdXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXll ciogc2Nyb2xsTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGVkQ29udGVudHNMYXllciwgR3Jh cGhpY3NMYXllciogY291bnRlclNjcm9sbGluZ0xheWVyLCBHcmFwaGljc0xheWVyKiBpbnNldENs aXBMYXllciwgY29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkqID0gbnVsbHB0cikgb3ZlcnJpZGU7Ci0g ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGUoU2Nyb2xs aW5nTm9kZUlELCBHcmFwaGljc0xheWVyKiBzY3JvbGxMYXllciwgR3JhcGhpY3NMYXllciogc2Ny b2xsZWRDb250ZW50c0xheWVyLCBjb25zdCBTY3JvbGxpbmdHZW9tZXRyeSogPSBudWxscHRyKSBv dmVycmlkZTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9k ZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbExheWVyLCBHcmFwaGljc0xh eWVyKiBzY3JvbGxlZENvbnRlbnRzTGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIGNvdW50ZXJTY3JvbGxp bmdMYXllciwgR3JhcGhpY3NMYXllciogaW5zZXRDbGlwTGF5ZXIsIGNvbnN0IFNjcm9sbGluZ0dl b21ldHJ5Jikgb3ZlcnJpZGU7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVPdmVyZmxv d1Njcm9sbGluZ05vZGUoU2Nyb2xsaW5nTm9kZUlELCBHcmFwaGljc0xheWVyKiBzY3JvbGxMYXll ciwgR3JhcGhpY3NMYXllciogc2Nyb2xsZWRDb250ZW50c0xheWVyLCBjb25zdCBTY3JvbGxpbmdH ZW9tZXRyeSYpIG92ZXJyaWRlOwogICAgIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVjb25j aWxlU2Nyb2xsaW5nU3RhdGUoRnJhbWVWaWV3JiwgY29uc3QgRmxvYXRQb2ludCYsIGNvbnN0IExh eW91dFZpZXdwb3J0T3JpZ2luT3JPdmVycmlkZVJlY3QmLCBib29sIHByb2dyYW1tYXRpY1Njcm9s bCwgVmlld3BvcnRSZWN0U3RhYmlsaXR5LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKSBv dmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggYTUwMzNiN2MzZDQuLmY5MTcwODlhNWFmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmgKQEAgLTE4OSw4ICsxODksOCBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB9OwogCi0gICAgdmly dHVhbCB2b2lkIHVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBo aWNzTGF5ZXIqIC8qc2Nyb2xsTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypzY3JvbGxlZENvbnRl bnRzTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypjb3VudGVyU2Nyb2xsaW5nTGF5ZXIqLywgR3Jh cGhpY3NMYXllciogLyppbnNldENsaXBMYXllciovLCBjb25zdCBTY3JvbGxpbmdHZW9tZXRyeSog PSBudWxscHRyKSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdO b2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypzY3JvbGxMYXllciovLCBHcmFw aGljc0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovLCBjb25zdCBTY3JvbGxpbmdHZW9t ZXRyeSogPSBudWxscHRyKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJhbWVTY3JvbGxp bmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypzY3JvbGxMYXllciovLCBH cmFwaGljc0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovLCBHcmFwaGljc0xheWVyKiAv KmNvdW50ZXJTY3JvbGxpbmdMYXllciovLCBHcmFwaGljc0xheWVyKiAvKmluc2V0Q2xpcExheWVy Ki8sIGNvbnN0IFNjcm9sbGluZ0dlb21ldHJ5JikgeyB9CisgICAgdmlydHVhbCB2b2lkIHVwZGF0 ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdyYXBoaWNzTGF5ZXIqIC8q c2Nyb2xsTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypzY3JvbGxlZENvbnRlbnRzTGF5ZXIqLywg Y29uc3QgU2Nyb2xsaW5nR2VvbWV0cnkmKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVjb25jaWxl Vmlld3BvcnRDb25zdHJhaW5lZExheWVyUG9zaXRpb25zKFNjcm9sbGluZ05vZGVJRCwgY29uc3Qg TGF5b3V0UmVjdCYsIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24pIHsgfQogICAgIHZpcnR1 YWwgU3RyaW5nIHNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1Rl eHRCZWhhdmlvciA9IFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yTm9ybWFsKSBjb25z dDsKICAgICB2aXJ0dWFsIGJvb2wgaXNSdWJiZXJCYW5kSW5Qcm9ncmVzcygpIGNvbnN0IHsgcmV0 dXJuIGZhbHNlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwCmluZGV4IDIwOGM2NTYxMjQzLi5lYzJmNWEwNTM5ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAg LTM4NjksMTAgKzM4NjksMjEgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmRldGFjaFNj cm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBPcHQKIHZvaWQgUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRpb25Gb3JUaGlzRnJhbWUoU2Ny b2xsaW5nTm9kZUlEIHBhcmVudE5vZGVJRCkKIHsKICAgICBhdXRvKiBzY3JvbGxpbmdDb29yZGlu YXRvciA9IHRoaXMtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yKCk7Ci0gICAgQVNTRVJUKHNjcm9sbGlu Z0Nvb3JkaW5hdG9yLT5jb29yZGluYXRlc1Njcm9sbGluZ0ZvckZyYW1lVmlldyhtX3JlbmRlclZp ZXcuZnJhbWVWaWV3KCkpKTsKKyAgICBGcmFtZVZpZXcmIGZyYW1lVmlldyA9IG1fcmVuZGVyVmll dy5mcmFtZVZpZXcoKTsKKyAgICBBU1NFUlQoc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPmNvb3JkaW5h dGVzU2Nyb2xsaW5nRm9yRnJhbWVWaWV3KGZyYW1lVmlldykpOwogCiAgICAgU2Nyb2xsaW5nTm9k ZUlEIG5vZGVJRCA9IGF0dGFjaFNjcm9sbGluZ05vZGUoKm1fcmVuZGVyVmlldy5sYXllcigpLCBt X3JlbmRlclZpZXcuZnJhbWUoKS5pc01haW5GcmFtZSgpID8gTWFpbkZyYW1lU2Nyb2xsaW5nTm9k ZSA6IFN1YmZyYW1lU2Nyb2xsaW5nTm9kZSwgcGFyZW50Tm9kZUlEKTsKLSAgICBzY3JvbGxpbmdD b29yZGluYXRvci0+dXBkYXRlRnJhbWVTY3JvbGxpbmdOb2RlKG5vZGVJRCwgbV9zY3JvbGxMYXll ci5nZXQoKSwgbV9yb290Q29udGVudExheWVyLmdldCgpLCBmaXhlZFJvb3RCYWNrZ3JvdW5kTGF5 ZXIoKSwgY2xpcExheWVyKCkpOworICAgIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpTY3JvbGxpbmdH ZW9tZXRyeSBzY3JvbGxpbmdHZW9tZXRyeTsKKyAgICAvLyBGSVhNRShodHRwczovL3dlYmtpdC5v cmcvYi8xNzI5MTcpOiBQYXNzIHBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Q/CisgICAgc2Ny b2xsaW5nR2VvbWV0cnkuc2Nyb2xsT3JpZ2luID0gZnJhbWVWaWV3LnNjcm9sbE9yaWdpbigpOwor ICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbGFibGVBcmVhU2l6ZSA9IGZyYW1lVmlldy52aXNp YmxlQ29udGVudFJlY3QoKS5zaXplKCk7CisgICAgc2Nyb2xsaW5nR2VvbWV0cnkuY29udGVudFNp emUgPSBmcmFtZVZpZXcudG90YWxDb250ZW50c1NpemUoKTsKKyAgICBzY3JvbGxpbmdHZW9tZXRy eS5yZWFjaGFibGVDb250ZW50U2l6ZSA9IGZyYW1lVmlldy50b3RhbENvbnRlbnRzU2l6ZSgpOwor I2lmIEVOQUJMRShDU1NfU0NST0xMX1NOQVApCisgICAgZnJhbWVWaWV3LnVwZGF0ZVNuYXBPZmZz ZXRzKCk7CisgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVwZGF0ZVNjcm9sbFNuYXBQcm9wZXJ0 aWVzV2l0aEZyYW1lVmlldyhmcmFtZVZpZXcpOworI2VuZGlmCisgICAgc2Nyb2xsaW5nQ29vcmRp bmF0b3ItPnVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZShub2RlSUQsIG1fc2Nyb2xsTGF5ZXIuZ2V0 KCksIG1fcm9vdENvbnRlbnRMYXllci5nZXQoKSwgZml4ZWRSb290QmFja2dyb3VuZExheWVyKCks IGNsaXBMYXllcigpLCBzY3JvbGxpbmdHZW9tZXRyeSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXll ciwgT3B0aW9uU2V0PExheWVyU2Nyb2xsQ29vcmRpbmF0aW9uUm9sZT4gcmVhc29ucywgT3B0aW9u U2V0PFNjcm9sbGluZ05vZGVDaGFuZ2VGbGFncz4gY2hhbmdlcykKQEAgLTM5NTEsNiArMzk2Miw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExh eWVyKFJlbmRlckxheWVyJiBsYXllciwgT3B0CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAg ICAgICAgICAgICBTY3JvbGxpbmdDb29yZGluYXRvcjo6U2Nyb2xsaW5nR2VvbWV0cnkgc2Nyb2xs aW5nR2VvbWV0cnk7CisgICAgICAgICAgICAvLyBGSVhNRShodHRwczovL3dlYmtpdC5vcmcvYi8x NzI5MTcpOiBQYXNzIHBhcmVudFJlbGF0aXZlU2Nyb2xsYWJsZVJlY3Q/CiAgICAgICAgICAgICBz Y3JvbGxpbmdHZW9tZXRyeS5zY3JvbGxPcmlnaW4gPSBsYXllci5zY3JvbGxPcmlnaW4oKTsKICAg ICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbFBvc2l0aW9uID0gbGF5ZXIuc2Nyb2xs UG9zaXRpb24oKTsKICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LnNjcm9sbGFibGVBcmVh U2l6ZSA9IGxheWVyLnZpc2libGVTaXplKCk7CkBAIC0zOTcxLDcgKzM5ODMsNyBAQCB2b2lkIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJM YXllciYgbGF5ZXIsIE9wdAogCiAgICAgICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJSZWdpc3Rl cmluZyBTY3JvbGxpbmcgc2Nyb2xsaW5nIG5vZGUgJSIgUFJJdTY0ICIgKGxheWVyICUiIFBSSXU2 NCAiKSBhcyBjaGlsZCBvZiAlIiBQUkl1NjQsIG5vZGVJRCwgYmFja2luZy0+Z3JhcGhpY3NMYXll cigpLT5wcmltYXJ5TGF5ZXJJRCgpLCBwYXJlbnROb2RlSUQpOwogCi0gICAgICAgICAgICBzY3Jv bGxpbmdDb29yZGluYXRvci0+dXBkYXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlKG5vZGVJRCwgYmFj a2luZy0+c2Nyb2xsaW5nTGF5ZXIoKSwgYmFja2luZy0+c2Nyb2xsaW5nQ29udGVudHNMYXllcigp LCAmc2Nyb2xsaW5nR2VvbWV0cnkpOworICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3It PnVwZGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShub2RlSUQsIGJhY2tpbmctPnNjcm9sbGluZ0xh eWVyKCksIGJhY2tpbmctPnNjcm9sbGluZ0NvbnRlbnRzTGF5ZXIoKSwgc2Nyb2xsaW5nR2VvbWV0 cnkpOwogICAgICAgICB9CiAgICAgfSBlbHNlCiAgICAgICAgIGRldGFjaFNjcm9sbENvb3JkaW5h dGVkTGF5ZXIobGF5ZXIsIFNjcm9sbGluZyk7Ci0tIAoyLjE5LjEKCg==