126072 2013-12-20 09:58:43 -0800 [CSS Shapes] set correct fallback values for <box> 2014-03-04 14:49:05 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 125108 1 rwlbuis rwlbuis betravis commit-queue dino dstockwell esprehn+autocc glenn kondapallykalyan simon.fraser zoltan oldest_to_newest 961901 0 rwlbuis 2013-12-20 09:58:43 -0800 Right now when no value for <box> is set margin-box is used. However that is only valid for shape-outside, for shape-inside and webkit-clipPath it should be content-box. 961906 1 219768 rwlbuis 2013-12-20 10:32:14 -0800 Created attachment 219768 Patch 962038 2 219768 rwlbuis 2013-12-20 14:02:01 -0800 Comment on attachment 219768 Patch Clear review flags for now until we are sure we get the right solution for basic shape interpolation, the spec is still a bit in flux. Keep the bug open as a reminder to revisit this. 986998 3 betravis 2014-03-04 14:49:05 -0800 Fixed as part of moving layout box into shape value. See bug 127200. 219768 2013-12-20 10:32:14 -0800 2013-12-20 14:02:01 -0800 Patch bug-126072-20131220133210.patch text/plain 16211 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwOTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc5MzljZTI5OTc2ZTI5 NGQ1Njg2Y2Y1NDk1Y2Y4YTliNTllNDgxNy4uMmIwY2MyMWVjODBjZmViYmRmYWFhOTJkMzk1YThl YzhkMDQwMjQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTIwICBSb2Ig QnVpcyAgPHJvYi5idWlzQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtDU1Mgc2hhcGVzXSBzZXQg Y29ycmVjdCBmYWxsYmFjayB2YWx1ZXMgZm9yIDxib3g+CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYwNzIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgdGhlIGNvcnJlY3QgZmFsbGJhY2sgdG8gdXNl IHdoZW4gbm8gPGJveD4gaXMgc2V0LCBmb3Igc2hhcGUtb3V0c2lkZSBpdCBpcyBtYXJnaW4tYm94 IGJ1dAorICAgICAgICBmb3Igc2hhcGUtaW5zaWRlIGFuZCB3ZWJraXQtY2xpcC1wYXRoIGl0IHNo b3VsZCBiZSBjb250ZW50LWJveC4KKworICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0NTU1Byb3Bl cnR5QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJsZW5kRnVuYyk6CisgICAgICAg IChXZWJDb3JlOjpQcm9wZXJ0eVdyYXBwZXJTaGFwZTo6UHJvcGVydHlXcmFwcGVyU2hhcGUpOgor ICAgICAgICAoV2ViQ29yZTo6UHJvcGVydHlXcmFwcGVyU2hhcGU6OmVxdWFscyk6CisgICAgICAg IChXZWJDb3JlOjpQcm9wZXJ0eVdyYXBwZXJTaGFwZTo6YmxlbmQpOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVyTWFwOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbldy YXBwZXJNYXApOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlOjpyZWZlcmVuY2VCb3hTaXplKToKKyAgICAgICAg KFdlYkNvcmU6OkJhc2ljU2hhcGVSZWN0YW5nbGU6OmJsZW5kKToKKyAgICAgICAgKFdlYkNvcmU6 OkRlcHJlY2F0ZWRCYXNpY1NoYXBlQ2lyY2xlOjpibGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpC YXNpY1NoYXBlQ2lyY2xlOjpibGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkQmFz aWNTaGFwZUVsbGlwc2U6OmJsZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2hhcGVFbGxp cHNlOjpibGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlUG9seWdvbjo6YmxlbmQp OgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlOjpibGVuZCk6Cisg ICAgICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlSW5zZXQ6OmJsZW5kKToKKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaDoKKwogMjAxMy0xMi0yMCAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGFzc2VydGluZyBhY2Nlc2liaWxpdHkg dGVzdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9w ZXJ0eUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9w ZXJ0eUFuaW1hdGlvbi5jcHAKaW5kZXggODAxZWFhMzFiMWFiMDMxZDRjNjkzYmFiMmJkZjljYjJl MmE5NzIzYi4uN2ZmNDk4M2FiYTdkODMxYjA0NjUzZjExNDJlYTNhYzEzYTBlODAyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0 aW9uLmNwcApAQCAtMTQxLDExICsxNDEsMTAgQEAgc3RhdGljIGlubGluZSBQYXNzUmVmUHRyPENs aXBQYXRoT3BlcmF0aW9uPiBibGVuZEZ1bmMoY29uc3QgQW5pbWF0aW9uQmFzZSogYW5pbSwKICAg ICAgICAgcmV0dXJuIHRvOwogCiAgICAgQVNTRVJUKGFuaW0tPnJlbmRlcmVyKCktPmlzQm94KCkp OwotICAgIHJldHVybiBTaGFwZUNsaXBQYXRoT3BlcmF0aW9uOjpjcmVhdGUodG9TaGFwZS0+Ymxl bmQoZnJvbVNoYXBlLCBwcm9ncmVzcywgKnRvUmVuZGVyQm94KGFuaW0tPnJlbmRlcmVyKCkpKSk7 CisgICAgcmV0dXJuIFNoYXBlQ2xpcFBhdGhPcGVyYXRpb246OmNyZWF0ZSh0b1NoYXBlLT5ibGVu ZChmcm9tU2hhcGUsIHByb2dyZXNzLCAqdG9SZW5kZXJCb3goYW5pbS0+cmVuZGVyZXIoKSksIEJh c2ljU2hhcGU6OkNvbnRlbnRCb3gpKTsKIH0KIAotI2lmIEVOQUJMRShDU1NfU0hBUEVTKQotc3Rh dGljIGlubGluZSBQYXNzUmVmUHRyPFNoYXBlVmFsdWU+IGJsZW5kRnVuYyhjb25zdCBBbmltYXRp b25CYXNlKiBhbmltLCBTaGFwZVZhbHVlKiBmcm9tLCBTaGFwZVZhbHVlKiB0bywgZG91YmxlIHBy b2dyZXNzKQorc3RhdGljIGlubGluZSBQYXNzUmVmUHRyPFNoYXBlVmFsdWU+IGJsZW5kRnVuYyhj b25zdCBBbmltYXRpb25CYXNlKiBhbmltLCBTaGFwZVZhbHVlKiBmcm9tLCBTaGFwZVZhbHVlKiB0 bywgZG91YmxlIHByb2dyZXNzLCBCYXNpY1NoYXBlOjpSZWZlcmVuY2VCb3ggYm94RmFsbGJhY2sp CiB7CiAgICAgaWYgKCFmcm9tIHx8ICF0bykKICAgICAgICAgcmV0dXJuIHRvOwpAQCAtMTYxLDkg KzE2MCw4IEBAIHN0YXRpYyBpbmxpbmUgUGFzc1JlZlB0cjxTaGFwZVZhbHVlPiBibGVuZEZ1bmMo Y29uc3QgQW5pbWF0aW9uQmFzZSogYW5pbSwgU2hhcGVWCiAgICAgICAgIHJldHVybiB0bzsKIAog ICAgIEFTU0VSVChhbmltLT5yZW5kZXJlcigpLT5pc0JveCgpKTsKLSAgICByZXR1cm4gU2hhcGVW YWx1ZTo6Y3JlYXRlU2hhcGVWYWx1ZSh0b1NoYXBlLT5ibGVuZChmcm9tU2hhcGUsIHByb2dyZXNz LCAqdG9SZW5kZXJCb3goYW5pbS0+cmVuZGVyZXIoKSkpKTsKKyAgICByZXR1cm4gU2hhcGVWYWx1 ZTo6Y3JlYXRlU2hhcGVWYWx1ZSh0b1NoYXBlLT5ibGVuZChmcm9tU2hhcGUsIHByb2dyZXNzLCAq dG9SZW5kZXJCb3goYW5pbS0+cmVuZGVyZXIoKSksIGJveEZhbGxiYWNrKSk7CiB9Ci0jZW5kaWYK IAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKIHN0YXRpYyBpbmxpbmUgUGFzc1JlZlB0cjxGaWx0 ZXJPcGVyYXRpb24+IGJsZW5kRnVuYyhjb25zdCBBbmltYXRpb25CYXNlKiBhbmltLCBGaWx0ZXJP cGVyYXRpb24qIGZyb21PcCwgRmlsdGVyT3BlcmF0aW9uKiB0b09wLCBkb3VibGUgcHJvZ3Jlc3Ms IGJvb2wgYmxlbmRUb1Bhc3N0aHJvdWdoID0gZmFsc2UpCkBAIC00ODMsMTIgKzQ4MSwzNSBAQCBw dWJsaWM6CiB9OwogCiAjaWYgRU5BQkxFKENTU19TSEFQRVMpCi1jbGFzcyBQcm9wZXJ0eVdyYXBw ZXJTaGFwZSA6IHB1YmxpYyBSZWZDb3VudGVkUHJvcGVydHlXcmFwcGVyPFNoYXBlVmFsdWU+IHsK K2NsYXNzIFByb3BlcnR5V3JhcHBlclNoYXBlIDogcHVibGljIEFuaW1hdGlvblByb3BlcnR5V3Jh cHBlckJhc2UgewogcHVibGljOgotICAgIFByb3BlcnR5V3JhcHBlclNoYXBlKENTU1Byb3BlcnR5 SUQgcHJvcCwgU2hhcGVWYWx1ZSogKFJlbmRlclN0eWxlOjoqZ2V0dGVyKSgpIGNvbnN0LCB2b2lk IChSZW5kZXJTdHlsZTo6KnNldHRlcikoUGFzc1JlZlB0cjxTaGFwZVZhbHVlPikpCi0gICAgICAg IDogUmVmQ291bnRlZFByb3BlcnR5V3JhcHBlcjxTaGFwZVZhbHVlPihwcm9wLCBnZXR0ZXIsIHNl dHRlcikKKyAgICBQcm9wZXJ0eVdyYXBwZXJTaGFwZShDU1NQcm9wZXJ0eUlEIHByb3AsIFNoYXBl VmFsdWUqIChSZW5kZXJTdHlsZTo6KmdldHRlcikoKSBjb25zdCkKKyAgICAgICAgOiBBbmltYXRp b25Qcm9wZXJ0eVdyYXBwZXJCYXNlKHByb3ApCisgICAgICAgICwgbV9nZXR0ZXIoZ2V0dGVyKQor ICAgIHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIGJvb2wgZXF1YWxzKGNvbnN0IFJlbmRlclN0eWxl KiBhLCBjb25zdCBSZW5kZXJTdHlsZSogYikgY29uc3QKKyAgICB7CisgICAgICAgIC8vIElmIHRo ZSBzdHlsZSBwb2ludGVycyBhcmUgdGhlIHNhbWUsIGRvbid0IGJvdGhlciBkb2luZyB0aGUgdGVz dC4KKyAgICAgICAgLy8gSWYgZWl0aGVyIGlzIG51bGwsIHJldHVybiBmYWxzZS4gSWYgYm90aCBh cmUgbnVsbCwgcmV0dXJuIHRydWUuCisgICAgICAgIGlmICgoIWEgJiYgIWIpIHx8IGEgPT0gYikK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBpZiAoIWEgfHwgIWIpCisgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiAoYS0+Km1fZ2V0dGVyKSgpID09IChi LT4qbV9nZXR0ZXIpKCk7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGJsZW5kKGNvbnN0IEFu aW1hdGlvbkJhc2UqIGFuaW0sIFJlbmRlclN0eWxlKiBkc3QsIGNvbnN0IFJlbmRlclN0eWxlKiBh LCBjb25zdCBSZW5kZXJTdHlsZSogYiwgZG91YmxlIHByb2dyZXNzKSBjb25zdAogICAgIHsKKyAg ICAgICAgaWYgKHByb3BlcnR5KCkgPT0gQ1NTUHJvcGVydHlXZWJraXRTaGFwZUluc2lkZSkKKyAg ICAgICAgICAgIGRzdC0+c2V0U2hhcGVJbnNpZGUoYmxlbmRGdW5jKGFuaW0sIGEtPnNoYXBlSW5z aWRlKCksIGItPnNoYXBlSW5zaWRlKCksIHByb2dyZXNzLCBCYXNpY1NoYXBlOjpDb250ZW50Qm94 KSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRzdC0+c2V0U2hhcGVPdXRzaWRlKGJsZW5k RnVuYyhhbmltLCBhLT5zaGFwZU91dHNpZGUoKSwgYi0+c2hhcGVPdXRzaWRlKCksIHByb2dyZXNz LCBCYXNpY1NoYXBlOjpNYXJnaW5Cb3gpKTsKICAgICB9CisKK3ByaXZhdGU6CisgICAgU2hhcGVW YWx1ZSogKFJlbmRlclN0eWxlOjoqbV9nZXR0ZXIpKCkgY29uc3Q7CiB9OwogI2VuZGlmCiAKQEAg LTEyNDgsOCArMTI2OSw4IEBAIENTU1Byb3BlcnR5QW5pbWF0aW9uV3JhcHBlck1hcDo6Q1NTUHJv cGVydHlBbmltYXRpb25XcmFwcGVyTWFwKCkKICAgICAgICAgbmV3IFByb3BlcnR5V3JhcHBlckNs aXBQYXRoKENTU1Byb3BlcnR5V2Via2l0Q2xpcFBhdGgsICZSZW5kZXJTdHlsZTo6Y2xpcFBhdGgs ICZSZW5kZXJTdHlsZTo6c2V0Q2xpcFBhdGgpLAogCiAjaWYgRU5BQkxFKENTU19TSEFQRVMpCi0g ICAgICAgIG5ldyBQcm9wZXJ0eVdyYXBwZXJTaGFwZShDU1NQcm9wZXJ0eVdlYmtpdFNoYXBlSW5z aWRlLCAmUmVuZGVyU3R5bGU6OnNoYXBlSW5zaWRlLCAmUmVuZGVyU3R5bGU6OnNldFNoYXBlSW5z aWRlKSwKLSAgICAgICAgbmV3IFByb3BlcnR5V3JhcHBlclNoYXBlKENTU1Byb3BlcnR5V2Via2l0 U2hhcGVPdXRzaWRlLCAmUmVuZGVyU3R5bGU6OnNoYXBlT3V0c2lkZSwgJlJlbmRlclN0eWxlOjpz ZXRTaGFwZU91dHNpZGUpLAorICAgICAgICBuZXcgUHJvcGVydHlXcmFwcGVyU2hhcGUoQ1NTUHJv cGVydHlXZWJraXRTaGFwZUluc2lkZSwgJlJlbmRlclN0eWxlOjpzaGFwZUluc2lkZSksCisgICAg ICAgIG5ldyBQcm9wZXJ0eVdyYXBwZXJTaGFwZShDU1NQcm9wZXJ0eVdlYmtpdFNoYXBlT3V0c2lk ZSwgJlJlbmRlclN0eWxlOjpzaGFwZU91dHNpZGUpLAogICAgICAgICBuZXcgTGVuZ3RoUHJvcGVy dHlXcmFwcGVyPExlbmd0aD4oQ1NTUHJvcGVydHlXZWJraXRTaGFwZU1hcmdpbiwgJlJlbmRlclN0 eWxlOjpzaGFwZU1hcmdpbiwgJlJlbmRlclN0eWxlOjpzZXRTaGFwZU1hcmdpbiksCiAgICAgICAg IG5ldyBQcm9wZXJ0eVdyYXBwZXI8ZmxvYXQ+KENTU1Byb3BlcnR5V2Via2l0U2hhcGVJbWFnZVRo cmVzaG9sZCwgJlJlbmRlclN0eWxlOjpzaGFwZUltYWdlVGhyZXNob2xkLCAmUmVuZGVyU3R5bGU6 OnNldFNoYXBlSW1hZ2VUaHJlc2hvbGQpLAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmNwcAppbmRleCA4ODUwYjVhZTk2MTNkODY3ZDZhYjFj MWNhZWMzODdlMzRiNDc0NmQxLi5hZjQ0ODAxNzA3NTEyZTkxMWQ1NTc1YTI5MTJhZGUzNDAyMjI0 NmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFw ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5j cHAKQEAgLTczLDE5ICs3MywyNCBAQCBib29sIEJhc2ljU2hhcGU6OmNhbkJsZW5kKGNvbnN0IEJh c2ljU2hhcGUqIG90aGVyKSBjb25zdAogICAgICAgICAmJiB0aGlzRWxsaXBzZS0+cmFkaXVzWSgp LmNhbkJsZW5kKG90aGVyRWxsaXBzZS0+cmFkaXVzWSgpKSk7CiB9CiAKLUZsb2F0U2l6ZSBCYXNp Y1NoYXBlOjpyZWZlcmVuY2VCb3hTaXplKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIpIGNvbnN0 CitGbG9hdFNpemUgQmFzaWNTaGFwZTo6cmVmZXJlbmNlQm94U2l6ZShjb25zdCBSZW5kZXJCb3gm IHJlbmRlcmVyLCBSZWZlcmVuY2VCb3ggYm94RmFsbGJhY2spIGNvbnN0CiB7Ci0gICAgc3dpdGNo IChib3goKSkgeworICAgIFJlZmVyZW5jZUJveCBib3ggPSB0aGlzLT5ib3goKTsKKyAgICBpZiAo Ym94ID09IE5vbmUpCisgICAgICAgIGJveCA9IGJveEZhbGxiYWNrOworCisgICAgc3dpdGNoIChi b3gpIHsKICAgICBjYXNlIENvbnRlbnRCb3g6CiAgICAgICAgIHJldHVybiByZW5kZXJlci5jb250 ZW50Qm94UmVjdCgpLnNpemUoKTsKICAgICBjYXNlIFBhZGRpbmdCb3g6CiAgICAgICAgIHJldHVy biByZW5kZXJlci5wYWRkaW5nQm94UmVjdCgpLnNpemUoKTsKICAgICBjYXNlIEJvcmRlckJveDoK ICAgICAgICAgcmV0dXJuIHJlbmRlcmVyLnNpemUoKTsKLSAgICBjYXNlIE5vbmU6IC8vIElmIDxi b3g+IGlzIG5vdCBzdXBwbGllZCwgdGhlbiB0aGUgcmVmZXJlbmNlIGJveCBkZWZhdWx0cyB0byBt YXJnaW4tYm94LgogICAgIGNhc2UgTWFyZ2luQm94OgogICAgICAgICByZXR1cm4gRmxvYXRTaXpl KHJlbmRlcmVyLm1hcmdpbkxlZnQoKSArIHJlbmRlcmVyLndpZHRoKCkgKyByZW5kZXJlci5tYXJn aW5SaWdodCgpLAogICAgICAgICAgICAgcmVuZGVyZXIubWFyZ2luVG9wKCkgKyByZW5kZXJlci5o ZWlnaHQoKSArIHJlbmRlcmVyLm1hcmdpbkJvdHRvbSgpKTsKKyAgICBjYXNlIE5vbmU6CisgICAg ICAgIGJyZWFrOwogICAgIH0KIAogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtMTE5LDcg KzEyNCw3IEBAIHZvaWQgQmFzaWNTaGFwZVJlY3RhbmdsZTo6cGF0aChQYXRoJiBwYXRoLCBjb25z dCBGbG9hdFJlY3QmIGJvdW5kaW5nQm94KQogICAgICk7CiB9CiAKLVBhc3NSZWZQdHI8QmFzaWNT aGFwZT4gQmFzaWNTaGFwZVJlY3RhbmdsZTo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIs IGRvdWJsZSBwcm9ncmVzcywgY29uc3QgUmVuZGVyQm94JikgY29uc3QKK1Bhc3NSZWZQdHI8QmFz aWNTaGFwZT4gQmFzaWNTaGFwZVJlY3RhbmdsZTo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3Ro ZXIsIGRvdWJsZSBwcm9ncmVzcywgY29uc3QgUmVuZGVyQm94JiwgUmVmZXJlbmNlQm94KSBjb25z dAogewogICAgIEFTU0VSVCh0eXBlKCkgPT0gb3RoZXItPnR5cGUoKSk7CiAKQEAgLTE0OSw3ICsx NTQsNyBAQCB2b2lkIERlcHJlY2F0ZWRCYXNpY1NoYXBlQ2lyY2xlOjpwYXRoKFBhdGgmIHBhdGgs IGNvbnN0IEZsb2F0UmVjdCYgYm91bmRpbmdCb3gpCiAgICAgKSk7CiB9CiAKLVBhc3NSZWZQdHI8 QmFzaWNTaGFwZT4gRGVwcmVjYXRlZEJhc2ljU2hhcGVDaXJjbGU6OmJsZW5kKGNvbnN0IEJhc2lj U2hhcGUqIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3MsIGNvbnN0IFJlbmRlckJveCYpIGNvbnN0CitQ YXNzUmVmUHRyPEJhc2ljU2hhcGU+IERlcHJlY2F0ZWRCYXNpY1NoYXBlQ2lyY2xlOjpibGVuZChj b25zdCBCYXNpY1NoYXBlKiBvdGhlciwgZG91YmxlIHByb2dyZXNzLCBjb25zdCBSZW5kZXJCb3gm LCBSZWZlcmVuY2VCb3gpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHR5cGUoKSA9PSBvdGhlci0+dHlw ZSgpKTsKIApAQCAtMTkxLDEzICsxOTYsMTMgQEAgdm9pZCBCYXNpY1NoYXBlQ2lyY2xlOjpwYXRo KFBhdGgmIHBhdGgsIGNvbnN0IEZsb2F0UmVjdCYgYm91bmRpbmdCb3gpCiAgICAgKSk7CiB9CiAK LVBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gQmFzaWNTaGFwZUNpcmNsZTo6YmxlbmQoY29uc3QgQmFz aWNTaGFwZSogb3RoZXIsIGRvdWJsZSBwcm9ncmVzcywgY29uc3QgUmVuZGVyQm94JiByZW5kZXJl cikgY29uc3QKK1Bhc3NSZWZQdHI8QmFzaWNTaGFwZT4gQmFzaWNTaGFwZUNpcmNsZTo6YmxlbmQo Y29uc3QgQmFzaWNTaGFwZSogb3RoZXIsIGRvdWJsZSBwcm9ncmVzcywgY29uc3QgUmVuZGVyQm94 JiByZW5kZXJlciwgUmVmZXJlbmNlQm94IGJveEZhbGxiYWNrKSBjb25zdAogewogICAgIEFTU0VS VCh0eXBlKCkgPT0gb3RoZXItPnR5cGUoKSk7CiAgICAgY29uc3QgQmFzaWNTaGFwZUNpcmNsZSog byA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVDaXJjbGUqPihvdGhlcik7CiAgICAgUmVm UHRyPEJhc2ljU2hhcGVDaXJjbGU+IHJlc3VsdCA9ICBCYXNpY1NoYXBlQ2lyY2xlOjpjcmVhdGUo KTsKIAotICAgIEZsb2F0U2l6ZSBib3hTaXplID0gcmVmZXJlbmNlQm94U2l6ZShyZW5kZXJlcik7 CisgICAgRmxvYXRTaXplIGJveFNpemUgPSByZWZlcmVuY2VCb3hTaXplKHJlbmRlcmVyLCBib3hG YWxsYmFjayk7CiAgICAgcmVzdWx0LT5zZXRDZW50ZXJYKG1fY2VudGVyWC5ibGVuZChvLT5jZW50 ZXJYKCksIHByb2dyZXNzLCBib3hTaXplKSk7CiAgICAgcmVzdWx0LT5zZXRDZW50ZXJZKG1fY2Vu dGVyWS5ibGVuZChvLT5jZW50ZXJZKCksIHByb2dyZXNzLCBib3hTaXplKSk7CiAgICAgcmVzdWx0 LT5zZXRSYWRpdXMobV9yYWRpdXMuYmxlbmQoby0+cmFkaXVzKCksIHByb2dyZXNzKSk7CkBAIC0y MTksNyArMjI0LDcgQEAgdm9pZCBEZXByZWNhdGVkQmFzaWNTaGFwZUVsbGlwc2U6OnBhdGgoUGF0 aCYgcGF0aCwgY29uc3QgRmxvYXRSZWN0JiBib3VuZGluZ0JveCkKICAgICApKTsKIH0KIAotUGFz c1JlZlB0cjxCYXNpY1NoYXBlPiBEZXByZWNhdGVkQmFzaWNTaGFwZUVsbGlwc2U6OmJsZW5kKGNv bnN0IEJhc2ljU2hhcGUqIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3MsIGNvbnN0IFJlbmRlckJveCYp IGNvbnN0CitQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IERlcHJlY2F0ZWRCYXNpY1NoYXBlRWxsaXBz ZTo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIsIGRvdWJsZSBwcm9ncmVzcywgY29uc3Qg UmVuZGVyQm94JiwgUmVmZXJlbmNlQm94KSBjb25zdAogewogICAgIEFTU0VSVCh0eXBlKCkgPT0g b3RoZXItPnR5cGUoKSk7CiAKQEAgLTI1OSw3ICsyNjQsNyBAQCB2b2lkIEJhc2ljU2hhcGVFbGxp cHNlOjpwYXRoKFBhdGgmIHBhdGgsIGNvbnN0IEZsb2F0UmVjdCYgYm91bmRpbmdCb3gpCiAgICAg ICAgIHJhZGl1c1kgKiAyKSk7CiB9CiAKLVBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gQmFzaWNTaGFw ZUVsbGlwc2U6OmJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3Ms IGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIpIGNvbnN0CitQYXNzUmVmUHRyPEJhc2ljU2hhcGU+ IEJhc2ljU2hhcGVFbGxpcHNlOjpibGVuZChjb25zdCBCYXNpY1NoYXBlKiBvdGhlciwgZG91Ymxl IHByb2dyZXNzLCBjb25zdCBSZW5kZXJCb3gmIHJlbmRlcmVyLCBSZWZlcmVuY2VCb3ggYm94RmFs bGJhY2spIGNvbnN0CiB7CiAgICAgQVNTRVJUKHR5cGUoKSA9PSBvdGhlci0+dHlwZSgpKTsKICAg ICBjb25zdCBCYXNpY1NoYXBlRWxsaXBzZSogbyA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hh cGVFbGxpcHNlKj4ob3RoZXIpOwpAQCAtMjc0LDcgKzI3OSw3IEBAIFBhc3NSZWZQdHI8QmFzaWNT aGFwZT4gQmFzaWNTaGFwZUVsbGlwc2U6OmJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqIG90aGVyLCBk b3VibGUKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAKLSAgICBGbG9hdFNpemUgYm94 U2l6ZSA9IHJlZmVyZW5jZUJveFNpemUocmVuZGVyZXIpOworICAgIEZsb2F0U2l6ZSBib3hTaXpl ID0gcmVmZXJlbmNlQm94U2l6ZShyZW5kZXJlciwgYm94RmFsbGJhY2spOwogICAgIHJlc3VsdC0+ c2V0Q2VudGVyWChtX2NlbnRlclguYmxlbmQoby0+Y2VudGVyWCgpLCBwcm9ncmVzcywgYm94U2l6 ZSkpOwogICAgIHJlc3VsdC0+c2V0Q2VudGVyWShtX2NlbnRlclkuYmxlbmQoby0+Y2VudGVyWSgp LCBwcm9ncmVzcywgYm94U2l6ZSkpOwogICAgIHJlc3VsdC0+c2V0UmFkaXVzWChtX3JhZGl1c1gu YmxlbmQoby0+cmFkaXVzWCgpLCBwcm9ncmVzcykpOwpAQCAtMzAwLDcgKzMwNSw3IEBAIHZvaWQg QmFzaWNTaGFwZVBvbHlnb246OnBhdGgoUGF0aCYgcGF0aCwgY29uc3QgRmxvYXRSZWN0JiBib3Vu ZGluZ0JveCkKICAgICBwYXRoLmNsb3NlU3VicGF0aCgpOwogfQogCi1QYXNzUmVmUHRyPEJhc2lj U2hhcGU+IEJhc2ljU2hhcGVQb2x5Z29uOjpibGVuZChjb25zdCBCYXNpY1NoYXBlKiBvdGhlciwg ZG91YmxlIHByb2dyZXNzLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdAorUGFzc1JlZlB0cjxCYXNp Y1NoYXBlPiBCYXNpY1NoYXBlUG9seWdvbjo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIs IGRvdWJsZSBwcm9ncmVzcywgY29uc3QgUmVuZGVyQm94JiwgUmVmZXJlbmNlQm94KSBjb25zdAog ewogICAgIEFTU0VSVCh0eXBlKCkgPT0gb3RoZXItPnR5cGUoKSk7CiAKQEAgLTM0Miw3ICszNDcs NyBAQCB2b2lkIEJhc2ljU2hhcGVJbnNldFJlY3RhbmdsZTo6cGF0aChQYXRoJiBwYXRoLCBjb25z dCBGbG9hdFJlY3QmIGJvdW5kaW5nQm94KQogICAgICk7CiB9CiAKLVBhc3NSZWZQdHI8QmFzaWNT aGFwZT4gQmFzaWNTaGFwZUluc2V0UmVjdGFuZ2xlOjpibGVuZChjb25zdCBCYXNpY1NoYXBlKiBv dGhlciwgZG91YmxlIHByb2dyZXNzLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdAorUGFzc1JlZlB0 cjxCYXNpY1NoYXBlPiBCYXNpY1NoYXBlSW5zZXRSZWN0YW5nbGU6OmJsZW5kKGNvbnN0IEJhc2lj U2hhcGUqIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3MsIGNvbnN0IFJlbmRlckJveCYsIFJlZmVyZW5j ZUJveCkgY29uc3QKIHsKICAgICBBU1NFUlQodHlwZSgpID09IG90aGVyLT50eXBlKCkpOwogCkBA IC0zODgsNyArMzkzLDcgQEAgdm9pZCBCYXNpY1NoYXBlSW5zZXQ6OnBhdGgoUGF0aCYgcGF0aCwg Y29uc3QgRmxvYXRSZWN0JiBib3VuZGluZ0JveCkKICAgICApOwogfQogCi1QYXNzUmVmUHRyPEJh c2ljU2hhcGU+IEJhc2ljU2hhcGVJbnNldDo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIs IGRvdWJsZSBwcm9ncmVzcywgY29uc3QgUmVuZGVyQm94JikgY29uc3QKK1Bhc3NSZWZQdHI8QmFz aWNTaGFwZT4gQmFzaWNTaGFwZUluc2V0OjpibGVuZChjb25zdCBCYXNpY1NoYXBlKiBvdGhlciwg ZG91YmxlIHByb2dyZXNzLCBjb25zdCBSZW5kZXJCb3gmLCBSZWZlcmVuY2VCb3gpIGNvbnN0CiB7 CiAgICAgQVNTRVJUKHR5cGUoKSA9PSBvdGhlci0+dHlwZSgpKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaAppbmRleCBmOWRkZjE2NjVjNjQwY2UzYjk2 MjBiOTRlODIyZWEzMTZlYjNlYzE1Li41YzE2MjUyODNmOGI0YmJjYzdjMmM1N2I2ZjlmYmRhNWNi MDliOGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNT aGFwZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMu aApAQCAtNzAsNyArNzAsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGF0aChQYXRo JiwgY29uc3QgRmxvYXRSZWN0JikgPSAwOwogICAgIHZpcnR1YWwgV2luZFJ1bGUgd2luZFJ1bGUo KSBjb25zdCB7IHJldHVybiBSVUxFX05PTlpFUk87IH0KLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8 QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFzaWNTaGFwZSosIGRvdWJsZSwgY29uc3QgUmVuZGVy Qm94JikgY29uc3QgPSAwOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBibGVu ZChjb25zdCBCYXNpY1NoYXBlKiwgZG91YmxlLCBjb25zdCBSZW5kZXJCb3gmLCBSZWZlcmVuY2VC b3ggYm94RmFsbGJhY2spIGNvbnN0ID0gMDsKIAogICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29u c3QgPSAwOwogCkBAIC04Myw3ICs4Myw3IEBAIHByb3RlY3RlZDoKICAgICB7CiAgICAgfQogCi0g ICAgRmxvYXRTaXplIHJlZmVyZW5jZUJveFNpemUoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7Cisg ICAgRmxvYXRTaXplIHJlZmVyZW5jZUJveFNpemUoY29uc3QgUmVuZGVyQm94JiwgUmVmZXJlbmNl Qm94IGJveEZhbGxiYWNrKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBSZWZlcmVuY2VCb3ggbV9i b3g7CkBAIC0xMTYsNyArMTE2LDcgQEAgcHVibGljOgogICAgIH0KIAogICAgIHZpcnR1YWwgdm9p ZCBwYXRoKFBhdGgmLCBjb25zdCBGbG9hdFJlY3QmKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFzaWNTaGFwZSosIGRvdWJsZSwgY29u c3QgUmVuZGVyQm94JikgY29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPEJh c2ljU2hhcGU+IGJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqLCBkb3VibGUsIGNvbnN0IFJlbmRlckJv eCYsIFJlZmVyZW5jZUJveCBib3hGYWxsYmFjaykgY29uc3QgT1ZFUlJJREU7CiAKICAgICB2aXJ0 dWFsIFR5cGUgdHlwZSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIEJhc2ljU2hhcGVSZWN0YW5n bGVUeXBlOyB9CiBwcml2YXRlOgpAQCAtMjA3LDcgKzIwNyw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldFJhZGl1cyhCYXNpY1NoYXBlUmFkaXVzIHJhZGl1cykgeyBtX3JhZGl1cyA9IHN0ZDo6bW92 ZShyYWRpdXMpOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcGF0aChQYXRoJiwgY29uc3QgRmxvYXRS ZWN0JikgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJsZW5k KGNvbnN0IEJhc2ljU2hhcGUqLCBkb3VibGUsIGNvbnN0IFJlbmRlckJveCYpIGNvbnN0IE9WRVJS SURFOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBibGVuZChjb25zdCBCYXNp Y1NoYXBlKiwgZG91YmxlLCBjb25zdCBSZW5kZXJCb3gmLCBSZWZlcmVuY2VCb3ggYm94RmFsbGJh Y2spIGNvbnN0IE9WRVJSSURFOwogCiAgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCBPVkVS UklERSB7IHJldHVybiBCYXNpY1NoYXBlQ2lyY2xlVHlwZTsgfQogcHJpdmF0ZToKQEAgLTIzMSw3 ICsyMzEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRSYWRpdXMoTGVuZ3RoIHJhZGl1cykgeyBt X3JhZGl1cyA9IHN0ZDo6bW92ZShyYWRpdXMpOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcGF0aChQ YXRoJiwgY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCBQYXNzUmVmUHRy PEJhc2ljU2hhcGU+IGJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqLCBkb3VibGUsIGNvbnN0IFJlbmRl ckJveCYpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNpY1NoYXBl PiBibGVuZChjb25zdCBCYXNpY1NoYXBlKiwgZG91YmxlLCBjb25zdCBSZW5kZXJCb3gmLCBSZWZl cmVuY2VCb3ggYm94RmFsbGJhY2spIGNvbnN0IE9WRVJSSURFOwogCiAgICAgdmlydHVhbCBUeXBl IHR5cGUoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBEZXByZWNhdGVkQmFzaWNTaGFwZUNpcmNs ZVR5cGU7IH0KIHByaXZhdGU6CkBAIC0yNTgsNyArMjU4LDcgQEAgcHVibGljOgogICAgIHZvaWQg c2V0UmFkaXVzWShCYXNpY1NoYXBlUmFkaXVzIHJhZGl1c1kpIHsgbV9yYWRpdXNZID0gc3RkOjpt b3ZlKHJhZGl1c1kpOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgcGF0aChQYXRoJiwgY29uc3QgRmxv YXRSZWN0JikgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJs ZW5kKGNvbnN0IEJhc2ljU2hhcGUqLCBkb3VibGUsIGNvbnN0IFJlbmRlckJveCYpIGNvbnN0IE9W RVJSSURFOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBibGVuZChjb25zdCBC YXNpY1NoYXBlKiwgZG91YmxlLCBjb25zdCBSZW5kZXJCb3gmLCBSZWZlcmVuY2VCb3ggYm94RmFs bGJhY2spIGNvbnN0IE9WRVJSSURFOwogCiAgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCBP VkVSUklERSB7IHJldHVybiBCYXNpY1NoYXBlRWxsaXBzZVR5cGU7IH0KIHByaXZhdGU6CkBAIC0y ODUsNyArMjg1LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UmFkaXVzWShMZW5ndGggcmFkaXVz WSkgeyBtX3JhZGl1c1kgPSBzdGQ6Om1vdmUocmFkaXVzWSk7IH0KIAogICAgIHZpcnR1YWwgdm9p ZCBwYXRoKFBhdGgmLCBjb25zdCBGbG9hdFJlY3QmKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFzaWNTaGFwZSosIGRvdWJsZSwgY29u c3QgUmVuZGVyQm94JikgY29uc3QgT1ZFUlJJREU7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPEJh c2ljU2hhcGU+IGJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqLCBkb3VibGUsIGNvbnN0IFJlbmRlckJv eCYsIFJlZmVyZW5jZUJveCBib3hGYWxsYmFjaykgY29uc3QgT1ZFUlJJREU7CiAKICAgICB2aXJ0 dWFsIFR5cGUgdHlwZSgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIERlcHJlY2F0ZWRCYXNpY1No YXBlRWxsaXBzZVR5cGU7IH0KIHByaXZhdGU6CkBAIC0zMDksNyArMzA5LDcgQEAgcHVibGljOgog ICAgIHZvaWQgYXBwZW5kUG9pbnQoTGVuZ3RoIHgsIExlbmd0aCB5KSB7IG1fdmFsdWVzLmFwcGVu ZChzdGQ6Om1vdmUoeCkpOyBtX3ZhbHVlcy5hcHBlbmQoc3RkOjptb3ZlKHkpKTsgfQogCiAgICAg dmlydHVhbCB2b2lkIHBhdGgoUGF0aCYsIGNvbnN0IEZsb2F0UmVjdCYpIE9WRVJSSURFOwotICAg IHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBibGVuZChjb25zdCBCYXNpY1NoYXBlKiwg ZG91YmxlLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFzaWNTaGFwZSosIGRvdWJsZSwgY29u c3QgUmVuZGVyQm94JiwgUmVmZXJlbmNlQm94IGJveEZhbGxiYWNrKSBjb25zdCBPVkVSUklERTsK IAogICAgIHZpcnR1YWwgV2luZFJ1bGUgd2luZFJ1bGUoKSBjb25zdCBPVkVSUklERSB7IHJldHVy biBtX3dpbmRSdWxlOyB9CiAKQEAgLTM1MCw3ICszNTAsNyBAQCBwdWJsaWM6CiAgICAgfQogCiAg ICAgdmlydHVhbCB2b2lkIHBhdGgoUGF0aCYsIGNvbnN0IEZsb2F0UmVjdCYpIE9WRVJSSURFOwot ICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBibGVuZChjb25zdCBCYXNpY1NoYXBl KiwgZG91YmxlLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFs IFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gYmxlbmQoY29uc3QgQmFzaWNTaGFwZSosIGRvdWJsZSwg Y29uc3QgUmVuZGVyQm94JiwgUmVmZXJlbmNlQm94IGJveEZhbGxiYWNrKSBjb25zdCBPVkVSUklE RTsKIAogICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gQmFz aWNTaGFwZUluc2V0UmVjdGFuZ2xlVHlwZTsgfQogcHJpdmF0ZToKQEAgLTM4OSw3ICszODksNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRCb3R0b21MZWZ0UmFkaXVzKExlbmd0aFNpemUgcmFkaXVz KSB7IG1fYm90dG9tTGVmdFJhZGl1cyA9IHN0ZDo6bW92ZShyYWRpdXMpOyB9CiAKICAgICB2aXJ0 dWFsIHZvaWQgcGF0aChQYXRoJiwgY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7Ci0gICAgdmly dHVhbCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqLCBkb3Vi bGUsIGNvbnN0IFJlbmRlckJveCYpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgUGFzc1Jl ZlB0cjxCYXNpY1NoYXBlPiBibGVuZChjb25zdCBCYXNpY1NoYXBlKiwgZG91YmxlLCBjb25zdCBS ZW5kZXJCb3gmLCBSZWZlcmVuY2VCb3ggYm94RmFsbGJhY2spIGNvbnN0IE9WRVJSSURFOwogCiAg ICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBCYXNpY1NoYXBl SW5zZXRUeXBlOyB9CiBwcml2YXRlOgo=