194194 2019-02-02 11:43:20 -0800 Rename "scrollingLayer" in RenderLayerBacking to "scrollContainerLayer" for clarity 2019-02-02 12:06:28 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser fred.wang koivisto simon.fraser webkit-bug-importer oldest_to_newest 1501511 0 simon.fraser 2019-02-02 11:43:20 -0800 Rename "scrollingLayer" in RenderLayerBacking to "scrollContainerLayer" for clarity 1501512 1 360980 simon.fraser 2019-02-02 11:44:33 -0800 Created attachment 360980 Patch 1501517 2 simon.fraser 2019-02-02 12:05:52 -0800 https://trac.webkit.org/r240899 1501518 3 webkit-bug-importer 2019-02-02 12:06:28 -0800 <rdar://problem/47764034> 360980 2019-02-02 11:44:33 -0800 2019-02-02 11:59:48 -0800 Patch bug-194194-20190202114432.patch text/plain 17713 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwODk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThkOWRmZTNhZjliZTQx ZDVkZWM2YWQ1YTdhMmM5MWVmNzE2YjI3OS4uNmE4NGMwMDBhMjI4ZDVhN2M3OWExODMyMDY2YWRl N2FlNzBkMTkxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTAyLTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSAic2Ny b2xsaW5nTGF5ZXIiIGluIFJlbmRlckxheWVyQmFja2luZyB0byAic2Nyb2xsQ29udGFpbmVyTGF5 ZXIiIGZvciBjbGFyaXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTQxOTQKKworICAgICAgICBSdWJiZXItc3RhbXB0ZWQgYnkgQW50dGkgS29pdmlz dG8uCisKKyAgICAgICAgT3VyIGRlc2lyZWQgdGVybWlub2xvZ3kgaXMgInNjcm9sbENvbnRhaW5l ckxheWVyIiBmb3IgdGhlIG91dGVyLCBjbGlwcGluZyBsYXllcgorICAgICAgICBmb3Igc2Nyb2xs aW5nLCBhbmQgInNjcm9sbGVkQ29udGVudHNMYXllciIgZm9yIHRoZSBjb250ZW50cyB0aGF0IG1v dmUgd2hlbiB5b3Ugc2Nyb2xsLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZURl YnVnSW5kaWNhdG9ycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OmRl c3Ryb3lHcmFwaGljc0xheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2lu Zzo6c2V0TG9jYXRpb25PZlNjcm9sbGVkQ29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlSW50ZXJuYWxIaWVyYXJjaHkpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVEcmF3c0NvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVTY3JvbGxpbmdMYXllcnMp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlUGxhdGZvcm1MYXllckZvckxheWVyKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsaW5nTm9k ZUZvclNjcm9sbGluZ1JvbGUpOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5V2ViS2l0U2Nyb2xs aW5nTGF5ZXJDb29yZGluYXRvcjo6cmVnaXN0ZXJBbGxWaWV3cG9ydENvbnN0cmFpbmVkTGF5ZXJz KToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYktpdFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0 b3I6OnVwZGF0ZVNjcm9sbGluZ0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdlYktp dFNjcm9sbGluZ0xheWVyQ29vcmRpbmF0b3I6OnVucmVnaXN0ZXJBbGxTY3JvbGxpbmdMYXllcnMp OgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5V2ViS2l0U2Nyb2xsaW5nTGF5ZXJDb29yZGluYXRv cjo6cmVtb3ZlU2Nyb2xsaW5nTGF5ZXIpOgorCiAyMDE5LTAyLTAxICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFzeW5jIG92ZXJmbG93IHNjcm9sbCBp cyBqdW1weSBvbiBtYWNPUyBpZiB0aGUgbWFpbiB0aHJlYWQgaXMgYnVzeQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAzNTQyNDllNjcw Y2NiZDlkZmY3ZmYzMzc0MzJlNGNiNDI4ZjU1NDU2Li5lYjNiYjNiOTE5NWEzYzUwZTY5Y2Q2ZWEy MzI2YWRlZjM4MTVhYWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmNwcApAQCAtMzkxLDggKzM5MSw4IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNr aW5nOjp1cGRhdGVEZWJ1Z0luZGljYXRvcnMoYm9vbCBzaG93Qm9yZGVyLCBib29sIHNob3dSZXBh aW50CiAgICAgaWYgKG1fbGF5ZXJGb3JTY3JvbGxDb3JuZXIpCiAgICAgICAgIG1fbGF5ZXJGb3JT Y3JvbGxDb3JuZXItPnNldFNob3dEZWJ1Z0JvcmRlcihzaG93Qm9yZGVyKTsKIAotICAgIGlmICht X3Njcm9sbGluZ0xheWVyKQotICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRTaG93RGVidWdC b3JkZXIoc2hvd0JvcmRlcik7CisgICAgaWYgKG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIpCisgICAg ICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXItPnNldFNob3dEZWJ1Z0JvcmRlcihzaG93Qm9yZGVy KTsKIAogICAgIGlmIChtX3Njcm9sbGVkQ29udGVudHNMYXllcikgewogICAgICAgICBtX3Njcm9s bGVkQ29udGVudHNMYXllci0+c2V0U2hvd0RlYnVnQm9yZGVyKHNob3dCb3JkZXIpOwpAQCAtNDgy LDcgKzQ4Miw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpkZXN0cm95R3JhcGhpY3NMYXll cnMoKQogICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9iYWNrZ3JvdW5kTGF5 ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9jaGlsZENvbnRhaW5t ZW50TGF5ZXIpOwogICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9jaGlsZENs aXBwaW5nTWFza0xheWVyKTsKLSAgICBHcmFwaGljc0xheWVyOjp1bnBhcmVudEFuZENsZWFyKG1f c2Nyb2xsaW5nTGF5ZXIpOworICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xlYXIobV9z Y3JvbGxDb250YWluZXJMYXllcik7CiAgICAgR3JhcGhpY3NMYXllcjo6dW5wYXJlbnRBbmRDbGVh cihtX3Njcm9sbGVkQ29udGVudHNMYXllcik7CiAgICAgR3JhcGhpY3NMYXllcjo6dW5wYXJlbnRB bmRDbGVhcihtX2dyYXBoaWNzTGF5ZXIpOwogfQpAQCAtMTA5MCw3ICsxMDkwLDcgQEAgdm9pZCBS ZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdlb21ldHJ5KCkKICAgICAgICAgY2xpcExheWVyLT5z ZXRTaXplKHNuYXBwZWRDbGlwcGluZ0dyYXBoaWNzTGF5ZXIubV9zbmFwcGVkUmVjdC5zaXplKCkp OwogICAgICAgICBjbGlwTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcih0b0xheW91dFNpemUo Y2xpcHBpbmdCb3gubG9jYXRpb24oKSAtIHNuYXBwZWRDbGlwcGluZ0dyYXBoaWNzTGF5ZXIubV9z bmFwRGVsdGEpKTsKIAotICAgICAgICBpZiAobV9jaGlsZENsaXBwaW5nTWFza0xheWVyICYmICFt X3Njcm9sbGluZ0xheWVyKSB7CisgICAgICAgIGlmIChtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXIg JiYgIW1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIpIHsKICAgICAgICAgICAgIG1fY2hpbGRDbGlwcGlu Z01hc2tMYXllci0+c2V0U2l6ZShjbGlwTGF5ZXItPnNpemUoKSk7CiAgICAgICAgICAgICBtX2No aWxkQ2xpcHBpbmdNYXNrTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoKSk7CiAgICAgICAg ICAgICBtX2NoaWxkQ2xpcHBpbmdNYXNrTGF5ZXItPnNldE9mZnNldEZyb21SZW5kZXJlcihjbGlw TGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpKTsKQEAgLTExODEsMzEgKzExODEsMzEgQEAgdm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdlb21ldHJ5KCkKICAgICAgICAgcmVmbGVjdGlv bkJhY2tpbmctPmdyYXBoaWNzTGF5ZXIoKS0+c2V0UmVwbGljYXRlZExheWVyUG9zaXRpb24oRmxv YXRQb2ludChsYXllckJvdW5kcy5sb2NhdGlvbigpIC0gcmVmbGVjdGlvbkxheWVyQm91bmRzLmxv Y2F0aW9uKCkpKTsKICAgICB9CiAKLSAgICBpZiAobV9zY3JvbGxpbmdMYXllcikgeworICAgIGlm IChtX3Njcm9sbENvbnRhaW5lckxheWVyKSB7CiAgICAgICAgIEFTU0VSVChtX3Njcm9sbGVkQ29u dGVudHNMYXllcik7CiAgICAgICAgIGF1dG8mIHJlbmRlckJveCA9IGRvd25jYXN0PFJlbmRlckJv eD4ocmVuZGVyZXIoKSk7CiAgICAgICAgIExheW91dFJlY3QgcGFkZGluZ0JveEluY2x1ZGluZ1Nj cm9sbGJhciA9IHJlbmRlckJveC5wYWRkaW5nQm94UmVjdEluY2x1ZGluZ1Njcm9sbGJhcigpOwog ICAgICAgICBTY3JvbGxPZmZzZXQgc2Nyb2xsT2Zmc2V0ID0gbV9vd25pbmdMYXllci5zY3JvbGxP ZmZzZXQoKTsKIAogICAgICAgICAvLyBGSVhNRTogbmVlZCB0byBkbyBzb21lIHBpeGVsIHNuYXBw aW5nIGhlcmUuCi0gICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9p bnQocGFkZGluZ0JveEluY2x1ZGluZ1Njcm9sbGJhci5sb2NhdGlvbigpIC0gY29tcG9zaXRlZEJv dW5kcygpLmxvY2F0aW9uKCkpKTsKLSAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0U2l6ZShy b3VuZGVkSW50U2l6ZShMYXlvdXRTaXplKHJlbmRlckJveC5jbGllbnRXaWR0aCgpLCByZW5kZXJC b3guY2xpZW50SGVpZ2h0KCkpKSk7CisgICAgICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXItPnNl dFBvc2l0aW9uKEZsb2F0UG9pbnQocGFkZGluZ0JveEluY2x1ZGluZ1Njcm9sbGJhci5sb2NhdGlv bigpIC0gY29tcG9zaXRlZEJvdW5kcygpLmxvY2F0aW9uKCkpKTsKKyAgICAgICAgbV9zY3JvbGxD b250YWluZXJMYXllci0+c2V0U2l6ZShyb3VuZGVkSW50U2l6ZShMYXlvdXRTaXplKHJlbmRlckJv eC5jbGllbnRXaWR0aCgpLCByZW5kZXJCb3guY2xpZW50SGVpZ2h0KCkpKSk7CiAKICAgICAgICAg dXBkYXRlU2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCk7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlM WSkKICAgICAgICAgbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXItPnNldFBvc2l0aW9uKHsgfSk7IC8v IEZJWE1FOiBuZWNlc3Nhcnk/CiAjZW5kaWYKIAotICAgICAgICBGbG9hdFNpemUgb2xkU2Nyb2xs aW5nTGF5ZXJPZmZzZXQgPSBtX3Njcm9sbGluZ0xheWVyLT5vZmZzZXRGcm9tUmVuZGVyZXIoKTsK LSAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0T2Zmc2V0RnJvbVJlbmRlcmVyKC10b0Zsb2F0 U2l6ZShwYWRkaW5nQm94SW5jbHVkaW5nU2Nyb2xsYmFyLmxvY2F0aW9uKCkpKTsKKyAgICAgICAg RmxvYXRTaXplIG9sZFNjcm9sbGluZ0xheWVyT2Zmc2V0ID0gbV9zY3JvbGxDb250YWluZXJMYXll ci0+b2Zmc2V0RnJvbVJlbmRlcmVyKCk7CisgICAgICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIt PnNldE9mZnNldEZyb21SZW5kZXJlcigtdG9GbG9hdFNpemUocGFkZGluZ0JveEluY2x1ZGluZ1Nj cm9sbGJhci5sb2NhdGlvbigpKSk7CiAKICAgICAgICAgaWYgKG1fY2hpbGRDbGlwcGluZ01hc2tM YXllcikgewotICAgICAgICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xheWVyLT5zZXRQb3NpdGlv bihtX3Njcm9sbGluZ0xheWVyLT5wb3NpdGlvbigpKTsKLSAgICAgICAgICAgIG1fY2hpbGRDbGlw cGluZ01hc2tMYXllci0+c2V0U2l6ZShtX3Njcm9sbGluZ0xheWVyLT5zaXplKCkpOworICAgICAg ICAgICAgbV9jaGlsZENsaXBwaW5nTWFza0xheWVyLT5zZXRQb3NpdGlvbihtX3Njcm9sbENvbnRh aW5lckxheWVyLT5wb3NpdGlvbigpKTsKKyAgICAgICAgICAgIG1fY2hpbGRDbGlwcGluZ01hc2tM YXllci0+c2V0U2l6ZShtX3Njcm9sbENvbnRhaW5lckxheWVyLT5zaXplKCkpOwogICAgICAgICAg ICAgbV9jaGlsZENsaXBwaW5nTWFza0xheWVyLT5zZXRPZmZzZXRGcm9tUmVuZGVyZXIoLXRvRmxv YXRTaXplKHBhZGRpbmdCb3hJbmNsdWRpbmdTY3JvbGxiYXIubG9jYXRpb24oKSkpOwogICAgICAg ICB9CiAKLSAgICAgICAgYm9vbCBwYWRkaW5nQm94T2Zmc2V0Q2hhbmdlZCA9IG9sZFNjcm9sbGlu Z0xheWVyT2Zmc2V0ICE9IG1fc2Nyb2xsaW5nTGF5ZXItPm9mZnNldEZyb21SZW5kZXJlcigpOwor ICAgICAgICBib29sIHBhZGRpbmdCb3hPZmZzZXRDaGFuZ2VkID0gb2xkU2Nyb2xsaW5nTGF5ZXJP ZmZzZXQgIT0gbV9zY3JvbGxDb250YWluZXJMYXllci0+b2Zmc2V0RnJvbVJlbmRlcmVyKCk7CiAK ICAgICAgICAgSW50U2l6ZSBzY3JvbGxTaXplKG1fb3duaW5nTGF5ZXIuc2Nyb2xsV2lkdGgoKSwg bV9vd25pbmdMYXllci5zY3JvbGxIZWlnaHQoKSk7CiAgICAgICAgIGlmIChzY3JvbGxTaXplICE9 IG1fc2Nyb2xsZWRDb250ZW50c0xheWVyLT5zaXplKCkgfHwgcGFkZGluZ0JveE9mZnNldENoYW5n ZWQpCkBAIC0xMjM4LDkgKzEyMzgsOSBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6c2V0TG9j YXRpb25PZlNjcm9sbGVkQ29udGVudHMoU2Nyb2xsT2Zmc2V0IHNjcm9sbE9mZnNldAogewogI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaWYgKHNldE9yU3luYyA9PSBTY3JvbGxpbmdMYXll clBvc2l0aW9uQWN0aW9uOjpTeW5jKQotICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zeW5jQm91 bmRzT3JpZ2luKHNjcm9sbE9mZnNldCk7CisgICAgICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIt PnN5bmNCb3VuZHNPcmlnaW4oc2Nyb2xsT2Zmc2V0KTsKICAgICBlbHNlCi0gICAgICAgIG1fc2Ny b2xsaW5nTGF5ZXItPnNldEJvdW5kc09yaWdpbihzY3JvbGxPZmZzZXQpOworICAgICAgICBtX3Nj cm9sbENvbnRhaW5lckxheWVyLT5zZXRCb3VuZHNPcmlnaW4oc2Nyb2xsT2Zmc2V0KTsKICNlbHNl CiAgICAgaWYgKHNldE9yU3luYyA9PSBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uOjpTeW5j KQogICAgICAgICBtX3Njcm9sbGVkQ29udGVudHNMYXllci0+c3luY1Bvc2l0aW9uKC1zY3JvbGxP ZmZzZXQpOwpAQCAtMTI3OCw5ICsxMjc4LDkgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUFmdGVyRGVzY2VuZGFudHMoKQogICAgIHVwZGF0ZURyYXdzQ29udGVudChjb250ZW50c0lu Zm8pOwogCiAgICAgbV9ncmFwaGljc0xheWVyLT5zZXRDb250ZW50c1Zpc2libGUobV9vd25pbmdM YXllci5oYXNWaXNpYmxlQ29udGVudCgpIHx8IGhhc1Zpc2libGVOb25Db21wb3NpdGVkRGVzY2Vu ZGFudHMoKSk7Ci0gICAgaWYgKG1fc2Nyb2xsaW5nTGF5ZXIpIHsKLSAgICAgICAgbV9zY3JvbGxp bmdMYXllci0+c2V0Q29udGVudHNWaXNpYmxlKHJlbmRlcmVyKCkuc3R5bGUoKS52aXNpYmlsaXR5 KCkgPT0gVmlzaWJpbGl0eTo6VmlzaWJsZSk7Ci0gICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNl dFVzZXJJbnRlcmFjdGlvbkVuYWJsZWQocmVuZGVyZXIoKS5zdHlsZSgpLnBvaW50ZXJFdmVudHMo KSAhPSBQb2ludGVyRXZlbnRzOjpOb25lKTsKKyAgICBpZiAobV9zY3JvbGxDb250YWluZXJMYXll cikgeworICAgICAgICBtX3Njcm9sbENvbnRhaW5lckxheWVyLT5zZXRDb250ZW50c1Zpc2libGUo cmVuZGVyZXIoKS5zdHlsZSgpLnZpc2liaWxpdHkoKSA9PSBWaXNpYmlsaXR5OjpWaXNpYmxlKTsK KyAgICAgICAgbV9zY3JvbGxDb250YWluZXJMYXllci0+c2V0VXNlckludGVyYWN0aW9uRW5hYmxl ZChyZW5kZXJlcigpLnN0eWxlKCkucG9pbnRlckV2ZW50cygpICE9IFBvaW50ZXJFdmVudHM6Ok5v bmUpOwogICAgIH0KIH0KIApAQCAtMTM0Nyw5ICsxMzQ3LDkgQEAgdm9pZCBSZW5kZXJMYXllckJh Y2tpbmc6OnVwZGF0ZUludGVybmFsSGllcmFyY2h5KCkKICAgICBpZiAobV9jaGlsZENvbnRhaW5t ZW50TGF5ZXIpCiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+YWRkQ2hpbGQoKm1fY2hpbGRDb250 YWlubWVudExheWVyKTsKIAotICAgIGlmIChtX3Njcm9sbGluZ0xheWVyKSB7CisgICAgaWYgKG1f c2Nyb2xsQ29udGFpbmVyTGF5ZXIpIHsKICAgICAgICAgYXV0byogc3VwZXJsYXllciA9IG1fY2hp bGRDb250YWlubWVudExheWVyID8gbV9jaGlsZENvbnRhaW5tZW50TGF5ZXIuZ2V0KCkgOiBtX2dy YXBoaWNzTGF5ZXIuZ2V0KCk7Ci0gICAgICAgIHN1cGVybGF5ZXItPmFkZENoaWxkKCptX3Njcm9s bGluZ0xheWVyKTsKKyAgICAgICAgc3VwZXJsYXllci0+YWRkQ2hpbGQoKm1fc2Nyb2xsQ29udGFp bmVyTGF5ZXIpOwogICAgIH0KIAogICAgIC8vIFRoZSBjbGlwIGZvciBjaGlsZCBsYXllcnMgZG9l cyBub3QgaW5jbHVkZSBzcGFjZSBmb3Igb3ZlcmZsb3cgY29udHJvbHMsIHNvIHRoZXkgZXhpc3Qg YXMKQEAgLTEzOTAsMTAgKzEzOTAsMTAgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZURyYXdzQ29udGVudCgpCiAKIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVEcmF3c0Nv bnRlbnQoUGFpbnRlZENvbnRlbnRzSW5mbyYgY29udGVudHNJbmZvKQogewotICAgIGlmIChtX3Nj cm9sbGluZ0xheWVyKSB7CisgICAgaWYgKG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIpIHsKICAgICAg ICAgLy8gV2UgZG9uJ3QgaGF2ZSB0byBjb25zaWRlciBvdmVyZmxvdyBjb250cm9scywgYmVjYXVz ZSB3ZSBrbm93IHRoYXQgdGhlIHNjcm9sbGJhcnMgYXJlIGRyYXduIGVsc2V3aGVyZS4KICAgICAg ICAgLy8gbV9ncmFwaGljc0xheWVyIG9ubHkgbmVlZHMgYmFja2luZyBzdG9yZSBpZiB0aGUgbm9u LXNjcm9sbGluZyBwYXJ0cyAoYmFja2dyb3VuZCwgb3V0bGluZXMsIGJvcmRlcnMsIHNoYWRvd3Mg ZXRjKSBuZWVkIHRvIHBhaW50LgotICAgICAgICAvLyBtX3Njcm9sbGluZ0xheWVyIG5ldmVyIGhh cyBiYWNraW5nIHN0b3JlLgorICAgICAgICAvLyBtX3Njcm9sbENvbnRhaW5lckxheWVyIG5ldmVy IGhhcyBiYWNraW5nIHN0b3JlLgogICAgICAgICAvLyBtX3Njcm9sbGVkQ29udGVudHNMYXllciBv bmx5IG5lZWRzIGJhY2tpbmcgc3RvcmUgaWYgdGhlIHNjcm9sbGVkIGNvbnRlbnRzIG5lZWQgdG8g cGFpbnQuCiAgICAgICAgIGJvb2wgaGFzTm9uU2Nyb2xsaW5nUGFpbnRlZENvbnRlbnQgPSBtX293 bmluZ0xheWVyLmhhc1Zpc2libGVDb250ZW50KCkgJiYgbV9vd25pbmdMYXllci5oYXNWaXNpYmxl Qm94RGVjb3JhdGlvbnNPckJhY2tncm91bmQoKTsKICAgICAgICAgbV9ncmFwaGljc0xheWVyLT5z ZXREcmF3c0NvbnRlbnQoaGFzTm9uU2Nyb2xsaW5nUGFpbnRlZENvbnRlbnQpOwpAQCAtMTczOCwx NCArMTczOCwxNCBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ2hpbGRDbGlwcGlu Z1N0cmF0ZWd5KGJvb2wgbmVlZHNEZXNjZW5kYW50c0NsaXBwaQogCiBib29sIFJlbmRlckxheWVy QmFja2luZzo6dXBkYXRlU2Nyb2xsaW5nTGF5ZXJzKGJvb2wgbmVlZHNTY3JvbGxpbmdMYXllcnMp CiB7Ci0gICAgaWYgKG5lZWRzU2Nyb2xsaW5nTGF5ZXJzID09ICEhbV9zY3JvbGxpbmdMYXllcikK KyAgICBpZiAobmVlZHNTY3JvbGxpbmdMYXllcnMgPT0gISFtX3Njcm9sbENvbnRhaW5lckxheWVy KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIW1fc2Nyb2xsaW5nTGF5ZXIpIHsK KyAgICBpZiAoIW1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIpIHsKICAgICAgICAgLy8gT3V0ZXIgbGF5 ZXIgd2hpY2ggY29ycmVzcG9uZHMgd2l0aCB0aGUgc2Nyb2xsIHZpZXcuCi0gICAgICAgIG1fc2Ny b2xsaW5nTGF5ZXIgPSBjcmVhdGVHcmFwaGljc0xheWVyKCJzY3JvbGxpbmcgY29udGFpbmVyIiwg R3JhcGhpY3NMYXllcjo6VHlwZTo6U2Nyb2xsaW5nKTsKLSAgICAgICAgbV9zY3JvbGxpbmdMYXll ci0+c2V0RHJhd3NDb250ZW50KGZhbHNlKTsKLSAgICAgICAgbV9zY3JvbGxpbmdMYXllci0+c2V0 TWFza3NUb0JvdW5kcyh0cnVlKTsKKyAgICAgICAgbV9zY3JvbGxDb250YWluZXJMYXllciA9IGNy ZWF0ZUdyYXBoaWNzTGF5ZXIoInNjcm9sbGluZyBjb250YWluZXIiLCBHcmFwaGljc0xheWVyOjpU eXBlOjpTY3JvbGxpbmcpOworICAgICAgICBtX3Njcm9sbENvbnRhaW5lckxheWVyLT5zZXREcmF3 c0NvbnRlbnQoZmFsc2UpOworICAgICAgICBtX3Njcm9sbENvbnRhaW5lckxheWVyLT5zZXRNYXNr c1RvQm91bmRzKHRydWUpOwogCiAgICAgICAgIC8vIElubmVyIGxheWVyIHdoaWNoIHJlbmRlcnMg dGhlIGNvbnRlbnQgdGhhdCBzY3JvbGxzLgogICAgICAgICBtX3Njcm9sbGVkQ29udGVudHNMYXll ciA9IGNyZWF0ZUdyYXBoaWNzTGF5ZXIoInNjcm9sbGVkIGNvbnRlbnRzIik7CkBAIC0xNzU2LDIx ICsxNzU2LDIxIEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVTY3JvbGxpbmdMYXll cnMoYm9vbCBuZWVkc1Njcm9sbGluZ0xheWVycykKICAgICAgICAgaWYgKCFtX2ZvcmVncm91bmRM YXllcikKICAgICAgICAgICAgIHBhaW50UGhhc2UgfD0gR3JhcGhpY3NMYXllclBhaW50Rm9yZWdy b3VuZDsKICAgICAgICAgbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXItPnNldFBhaW50aW5nUGhhc2Uo cGFpbnRQaGFzZSk7Ci0gICAgICAgIG1fc2Nyb2xsaW5nTGF5ZXItPmFkZENoaWxkKCptX3Njcm9s bGVkQ29udGVudHNMYXllcik7CisgICAgICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXItPmFkZENo aWxkKCptX3Njcm9sbGVkQ29udGVudHNMYXllcik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgY29t cG9zaXRvcigpLndpbGxSZW1vdmVTY3JvbGxpbmdMYXllcldpdGhCYWNraW5nKG1fb3duaW5nTGF5 ZXIsICp0aGlzKTsKIAotICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fc2Nyb2xsaW5nTGF5ZXIu Z2V0KCkpOworICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIu Z2V0KCkpOwogICAgICAgICB3aWxsRGVzdHJveUxheWVyKG1fc2Nyb2xsZWRDb250ZW50c0xheWVy LmdldCgpKTsKICAgICAgICAgCi0gICAgICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5kQ2xl YXIobV9zY3JvbGxpbmdMYXllcik7CisgICAgICAgIEdyYXBoaWNzTGF5ZXI6OnVucGFyZW50QW5k Q2xlYXIobV9zY3JvbGxDb250YWluZXJMYXllcik7CiAgICAgICAgIEdyYXBoaWNzTGF5ZXI6OnVu cGFyZW50QW5kQ2xlYXIobV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIpOwogICAgIH0KIAogICAgIG1f Z3JhcGhpY3NMYXllci0+c2V0UGFpbnRpbmdQaGFzZShwYWludGluZ1BoYXNlRm9yUHJpbWFyeUxh eWVyKCkpOwogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7IC8vIEJlY2F1 c2UgcGFpbnRpbmcgcGhhc2VzIGNoYW5nZWQuCiAKLSAgICBpZiAobV9zY3JvbGxpbmdMYXllcikK KyAgICBpZiAobV9zY3JvbGxDb250YWluZXJMYXllcikKICAgICAgICAgY29tcG9zaXRvcigpLmRp ZEFkZFNjcm9sbGluZ0xheWVyKG1fb3duaW5nTGF5ZXIpOwogICAgIAogICAgIHJldHVybiB0cnVl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4 IDdiYjEzZjlmNzQzZWM1YjBmMzU4MzkzOGIxY2JmYzkyZGFkYjhkNWYuLjEwZDFkNzcyNTc1ZTVh ZTM5YTc4NTdhZjdhYWJiYzIzYTZkMzVlZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAgLTEwNCw5ICsxMDQsOSBAQCBwdWJsaWM6CiAgICAg Ym9vbCByZXF1aXJlc0JhY2tncm91bmRMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fcmVxdWlyZXNC YWNrZ3JvdW5kTGF5ZXI7IH0KICAgICB2b2lkIHNldFJlcXVpcmVzQmFja2dyb3VuZExheWVyKGJv b2wpOwogCi0gICAgYm9vbCBoYXNTY3JvbGxpbmdMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fc2Ny b2xsaW5nTGF5ZXIgIT0gbnVsbHB0cjsgfQotICAgIEdyYXBoaWNzTGF5ZXIqIHNjcm9sbGluZ0xh eWVyKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxpbmdMYXllci5nZXQoKTsgfQotICAgIEdyYXBo aWNzTGF5ZXIqIHNjcm9sbGluZ0NvbnRlbnRzTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3Njcm9s bGVkQ29udGVudHNMYXllci5nZXQoKTsgfQorICAgIGJvb2wgaGFzU2Nyb2xsaW5nTGF5ZXIoKSBj b25zdCB7IHJldHVybiBtX3Njcm9sbENvbnRhaW5lckxheWVyICE9IG51bGxwdHI7IH0KKyAgICBH cmFwaGljc0xheWVyKiBzY3JvbGxDb250YWluZXJMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1fc2Ny b2xsQ29udGFpbmVyTGF5ZXIuZ2V0KCk7IH0KKyAgICBHcmFwaGljc0xheWVyKiBzY3JvbGxlZENv bnRlbnRzTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGVkQ29udGVudHNMYXllci5nZXQo KTsgfQogCiAgICAgT3B0aW9uU2V0PFNjcm9sbENvb3JkaW5hdGlvblJvbGU+IGNvb3JkaW5hdGVk U2Nyb2xsaW5nUm9sZXMoKSBjb25zdDsKIApAQCAtMzg1LDcgKzM4NSw3IEBAIHByaXZhdGU6CiAg ICAgUmVmUHRyPEdyYXBoaWNzTGF5ZXI+IG1fbGF5ZXJGb3JWZXJ0aWNhbFNjcm9sbGJhcjsKICAg ICBSZWZQdHI8R3JhcGhpY3NMYXllcj4gbV9sYXllckZvclNjcm9sbENvcm5lcjsKIAotICAgIFJl ZlB0cjxHcmFwaGljc0xheWVyPiBtX3Njcm9sbGluZ0xheWVyOyAvLyBPbmx5IHVzZWQgaWYgdGhl IGxheWVyIGlzIHVzaW5nIGNvbXBvc2l0ZWQgc2Nyb2xsaW5nLgorICAgIFJlZlB0cjxHcmFwaGlj c0xheWVyPiBtX3Njcm9sbENvbnRhaW5lckxheWVyOyAvLyBPbmx5IHVzZWQgaWYgdGhlIGxheWVy IGlzIHVzaW5nIGNvbXBvc2l0ZWQgc2Nyb2xsaW5nLgogICAgIFJlZlB0cjxHcmFwaGljc0xheWVy PiBtX3Njcm9sbGVkQ29udGVudHNMYXllcjsgLy8gT25seSB1c2VkIGlmIHRoZSBsYXllciBpcyB1 c2luZyBjb21wb3NpdGVkIHNjcm9sbGluZy4KIAogICAgIExheW91dFJlY3QgbV9jb21wb3NpdGVk Qm91bmRzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy Q29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAppbmRleCA5MWY0MDVkOTNjZjJkMzhkODA0NTFjN2E2ZDM2NmMwNWU1ODA2NWQz Li5mMmVhYzMxMGFmYTIzOWRjOTcxODc4NDIzZGI4NmMyZTAxOTJlYTA5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtNTUz LDcgKzU1Myw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpkaWRDaGFuZ2VQbGF0Zm9y bUxheWVyRm9yTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBjCiAgICAgICAgICAgICAvLyBGSVhN RTogUmVvcmdhbml6ZSB0aGUgbGF5ZXJzIGFuZCBwYXNzIHRoZSBzY3JvbGxDb250YWluZXJMYXll ci4KICAgICAgICAgICAgIG5vZGVMYXllcnMgPSB7IG51bGxwdHIsIG51bGxwdHIsIG1fc2Nyb2xs TGF5ZXIuZ2V0KCksIGZpeGVkUm9vdEJhY2tncm91bmRMYXllcigpLCBjbGlwTGF5ZXIoKSwgbV9y b290Q29udGVudHNMYXllci5nZXQoKSB9OwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIG5v ZGVMYXllcnMgPSB7IGxheWVyLmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpLCBiYWNraW5nLT5z Y3JvbGxpbmdMYXllcigpLCBiYWNraW5nLT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCkgfTsKKyAg ICAgICAgICAgIG5vZGVMYXllcnMgPSB7IGxheWVyLmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigp LCBiYWNraW5nLT5zY3JvbGxDb250YWluZXJMYXllcigpLCBiYWNraW5nLT5zY3JvbGxlZENvbnRl bnRzTGF5ZXIoKSB9OwogCiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5zZXROb2RlTGF5 ZXJzKG5vZGVJRCwgbm9kZUxheWVycyk7CiAgICAgfQpAQCAtNDAyNyw3ICs0MDI3LDcgQEAgU2Ny b2xsaW5nTm9kZUlEIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsaW5nTm9kZUZv clNjcm9sbGluZ1JvbGUoUmVuZGUKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYgKGNo YW5nZXMgJiBTY3JvbGxpbmdOb2RlQ2hhbmdlRmxhZ3M6OkxheWVyKQotICAgICAgICAgICAgc2Ny b2xsaW5nQ29vcmRpbmF0b3ItPnNldE5vZGVMYXllcnMobmV3Tm9kZUlELCB7IGxheWVyLmJhY2tp bmcoKS0+Z3JhcGhpY3NMYXllcigpLCBsYXllci5iYWNraW5nKCktPnNjcm9sbGluZ0xheWVyKCks IGxheWVyLmJhY2tpbmcoKS0+c2Nyb2xsaW5nQ29udGVudHNMYXllcigpIH0pOworICAgICAgICAg ICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNldE5vZGVMYXllcnMobmV3Tm9kZUlELCB7IGxheWVy LmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpLCBsYXllci5iYWNraW5nKCktPnNjcm9sbENvbnRh aW5lckxheWVyKCksIGxheWVyLmJhY2tpbmcoKS0+c2Nyb2xsZWRDb250ZW50c0xheWVyKCkgfSk7 CiAKICAgICAgICAgaWYgKGNoYW5nZXMgJiBTY3JvbGxpbmdOb2RlQ2hhbmdlRmxhZ3M6OkxheWVy R2VvbWV0cnkgJiYgdHJlZVN0YXRlLnBhcmVudE5vZGVJRCkgewogICAgICAgICAgICAgUmVuZGVy TGF5ZXIqIHNjcm9sbGluZ0FuY2VzdG9yTGF5ZXIgPSBtX3Njcm9sbGluZ05vZGVUb0xheWVyTWFw LmdldCh0cmVlU3RhdGUucGFyZW50Tm9kZUlELnZhbHVlKCkpOwpAQCAtNDIzNSw3ICs0MjM1LDgg QEAgdm9pZCBMZWdhY3lXZWJLaXRTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yOjpyZWdpc3RlckFs bFZpZXdwb3J0Q29uc3RyYWluZWRMYXllcnMKICAgICAgICAgICAgIGNvbnN0IFJlbmRlckxheWVy KiBlbmNsb3NpbmdUb3VjaFNjcm9sbGFibGVMYXllciA9IG51bGxwdHI7CiAgICAgICAgICAgICBp ZiAoY29tcG9zaXRvci5pc0FzeW5jU2Nyb2xsYWJsZVN0aWNreUxheWVyKCpsYXllciwgJmVuY2xv c2luZ1RvdWNoU2Nyb2xsYWJsZUxheWVyKSAmJiBlbmNsb3NpbmdUb3VjaFNjcm9sbGFibGVMYXll cikgewogICAgICAgICAgICAgICAgIEFTU0VSVChlbmNsb3NpbmdUb3VjaFNjcm9sbGFibGVMYXll ci0+aXNDb21wb3NpdGVkKCkpOwotICAgICAgICAgICAgICAgIHN0aWNreUNvbnRhaW5lck1hcC5h ZGQobGF5ZXItPmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpLT5wbGF0Zm9ybUxheWVyKCksIGVu Y2xvc2luZ1RvdWNoU2Nyb2xsYWJsZUxheWVyLT5iYWNraW5nKCktPnNjcm9sbGluZ0xheWVyKCkt PnBsYXRmb3JtTGF5ZXIoKSk7CisgICAgICAgICAgICAgICAgLy8gd2hhdAorICAgICAgICAgICAg ICAgIHN0aWNreUNvbnRhaW5lck1hcC5hZGQobGF5ZXItPmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXll cigpLT5wbGF0Zm9ybUxheWVyKCksIGVuY2xvc2luZ1RvdWNoU2Nyb2xsYWJsZUxheWVyLT5iYWNr aW5nKCktPnNjcm9sbENvbnRhaW5lckxheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAobGF5ZXItPnJlbmRlcmVyKCkuaXNGaXhlZFBvc2l0 aW9uZWQoKSkKICAgICAgICAgICAgIGNvbnN0cmFpbnRzID0gc3RkOjptYWtlX3VuaXF1ZTxGaXhl ZFBvc2l0aW9uVmlld3BvcnRDb25zdHJhaW50cz4oY29tcG9zaXRvci5jb21wdXRlRml4ZWRWaWV3 cG9ydENvbnN0cmFpbnRzKCpsYXllcikpOwpAQCAtNDI3Myw3ICs0Mjc0LDcgQEAgdm9pZCBMZWdh Y3lXZWJLaXRTY3JvbGxpbmdMYXllckNvb3JkaW5hdG9yOjp1cGRhdGVTY3JvbGxpbmdMYXllcihS ZW5kZXJMYXllciYgbGEKIAogICAgIGJvb2wgYWxsb3dIb3Jpem9udGFsU2Nyb2xsYmFyID0gIXNj cm9sbGJhckhhc0Rpc3BsYXlOb25lKGxheWVyLmhvcml6b250YWxTY3JvbGxiYXIoKSk7CiAgICAg Ym9vbCBhbGxvd1ZlcnRpY2FsU2Nyb2xsYmFyID0gIXNjcm9sbGJhckhhc0Rpc3BsYXlOb25lKGxh eWVyLnZlcnRpY2FsU2Nyb2xsYmFyKCkpOwotICAgIG1fY2hyb21lQ2xpZW50LmFkZE9yVXBkYXRl U2Nyb2xsaW5nTGF5ZXIobGF5ZXIucmVuZGVyZXIoKS5lbGVtZW50KCksIGJhY2tpbmctPnNjcm9s bGluZ0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSwgYmFja2luZy0+c2Nyb2xsaW5nQ29udGVudHNM YXllcigpLT5wbGF0Zm9ybUxheWVyKCksCisgICAgbV9jaHJvbWVDbGllbnQuYWRkT3JVcGRhdGVT Y3JvbGxpbmdMYXllcihsYXllci5yZW5kZXJlcigpLmVsZW1lbnQoKSwgYmFja2luZy0+c2Nyb2xs Q29udGFpbmVyTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpLCBiYWNraW5nLT5zY3JvbGxlZENvbnRl bnRzTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpLAogICAgICAgICBsYXllci5zY3JvbGxhYmxlQ29u dGVudHNTaXplKCksIGFsbG93SG9yaXpvbnRhbFNjcm9sbGJhciwgYWxsb3dWZXJ0aWNhbFNjcm9s bGJhcik7CiB9CiAKQEAgLTQyOTYsNyArNDI5Nyw3IEBAIHZvaWQgTGVnYWN5V2ViS2l0U2Nyb2xs aW5nTGF5ZXJDb29yZGluYXRvcjo6dW5yZWdpc3RlckFsbFNjcm9sbGluZ0xheWVycygpCiAgICAg Zm9yIChhdXRvKiBsYXllciA6IG1fc2Nyb2xsaW5nTGF5ZXJzKSB7CiAgICAgICAgIGF1dG8qIGJh Y2tpbmcgPSBsYXllci0+YmFja2luZygpOwogICAgICAgICBBU1NFUlQoYmFja2luZyk7Ci0gICAg ICAgIG1fY2hyb21lQ2xpZW50LnJlbW92ZVNjcm9sbGluZ0xheWVyKGxheWVyLT5yZW5kZXJlcigp LmVsZW1lbnQoKSwgYmFja2luZy0+c2Nyb2xsaW5nTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpLCBi YWNraW5nLT5zY3JvbGxpbmdDb250ZW50c0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKSk7CisgICAg ICAgIG1fY2hyb21lQ2xpZW50LnJlbW92ZVNjcm9sbGluZ0xheWVyKGxheWVyLT5yZW5kZXJlcigp LmVsZW1lbnQoKSwgYmFja2luZy0+c2Nyb2xsQ29udGFpbmVyTGF5ZXIoKS0+cGxhdGZvcm1MYXll cigpLCBiYWNraW5nLT5zY3JvbGxlZENvbnRlbnRzTGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpKTsK ICAgICB9CiB9CiAKQEAgLTQzMTAsOSArNDMxMSw5IEBAIHZvaWQgTGVnYWN5V2ViS2l0U2Nyb2xs aW5nTGF5ZXJDb29yZGluYXRvcjo6cmVtb3ZlU2Nyb2xsaW5nTGF5ZXIoUmVuZGVyTGF5ZXImIGxh CiB7CiAgICAgbV9zY3JvbGxpbmdMYXllcnNOZWVkaW5nVXBkYXRlLnJlbW92ZSgmbGF5ZXIpOwog ICAgIGlmIChtX3Njcm9sbGluZ0xheWVycy5yZW1vdmUoJmxheWVyKSkgewotICAgICAgICBhdXRv KiBzY3JvbGxpbmdMYXllciA9IGJhY2tpbmcuc2Nyb2xsaW5nTGF5ZXIoKS0+cGxhdGZvcm1MYXll cigpOwotICAgICAgICBhdXRvKiBjb250ZW50c0xheWVyID0gYmFja2luZy5zY3JvbGxpbmdDb250 ZW50c0xheWVyKCktPnBsYXRmb3JtTGF5ZXIoKTsKLSAgICAgICAgbV9jaHJvbWVDbGllbnQucmVt b3ZlU2Nyb2xsaW5nTGF5ZXIobGF5ZXIucmVuZGVyZXIoKS5lbGVtZW50KCksIHNjcm9sbGluZ0xh eWVyLCBjb250ZW50c0xheWVyKTsKKyAgICAgICAgYXV0byogc2Nyb2xsQ29udGFpbmVyTGF5ZXIg PSBiYWNraW5nLnNjcm9sbENvbnRhaW5lckxheWVyKCktPnBsYXRmb3JtTGF5ZXIoKTsKKyAgICAg ICAgYXV0byogc2Nyb2xsZWRDb250ZW50c0xheWVyID0gYmFja2luZy5zY3JvbGxlZENvbnRlbnRz TGF5ZXIoKS0+cGxhdGZvcm1MYXllcigpOworICAgICAgICBtX2Nocm9tZUNsaWVudC5yZW1vdmVT Y3JvbGxpbmdMYXllcihsYXllci5yZW5kZXJlcigpLmVsZW1lbnQoKSwgc2Nyb2xsQ29udGFpbmVy TGF5ZXIsIHNjcm9sbGVkQ29udGVudHNMYXllcik7CiAgICAgfQogfQogCg==