179661 2017-11-14 02:49:33 -0800 [Cairo] Move drawLinesForText operation from GraphicsContextCairo to CairoOperations 2017-11-15 09:33:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply cgarcia webkit-bug-importer oldest_to_newest 1371348 0 zan 2017-11-14 02:49:33 -0800 [Cairo] Move drawLinesForText operation from GraphicsContextCairo to CairoOperations 1371351 1 326872 zan 2017-11-14 03:05:25 -0800 Created attachment 326872 Patch 1371364 2 326875 zan 2017-11-14 05:44:26 -0800 Created attachment 326875 Patch for landing 1371365 3 326875 zan 2017-11-14 05:45:11 -0800 Comment on attachment 326875 Patch for landing Clearing flags on attachment: 326875 Committed r224814: <https://trac.webkit.org/changeset/224814> 1371366 4 zan 2017-11-14 05:45:16 -0800 All reviewed patches have been landed. Closing bug. 1371881 5 webkit-bug-importer 2017-11-15 09:33:15 -0800 <rdar://problem/35561921> 326872 2017-11-14 03:05:25 -0800 2017-11-14 05:44:23 -0800 Patch bug-179661-20171114120524.patch text/plain 8886 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk4Mjg4MjMxYzE1YzRj YTk2OGRmYTRlOTY1MmI0YTZkNDdkNTE5MC4uNjRhMjFjMzA2YjQyZTAxYTc4NmQ2YTk4Y2VlNjk3 M2Q3M2ZmYzdiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE3LTExLTE0ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ2Fpcm9dIE1vdmUg ZHJhd0xpbmVzRm9yVGV4dCBvcGVyYXRpb24gZnJvbSBHcmFwaGljc0NvbnRleHRDYWlybyB0byBD YWlyb09wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3OTY2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEVuY2Fwc3VsYXRlIHRoZSBkcmF3TGluZXNGb3JUZXh0KCkgb3BlcmF0aW9uIGluIHRo ZSBXZWJDb3JlOjpDYWlybworICAgICAgICBuYW1lc3BhY2UuIEFwYXJ0IGZyb20gbW92aW5nIGdp c3Qgb2YgdGhlIGNvZGUgZnJvbSBHcmFwaGljc0NvbnRleHRDYWlybworICAgICAgICB0byBDYWly b09wZXJhdGlvbnMsIHdlIGFsc28gKGZvciB0aGUgbW9tZW50KSBoYXZlIHRvIGR1cGxpY2F0ZSB0 aGUKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0Ojpjb21wdXRlTGluZUJvdW5kc0FuZEFudGlhbGlh c2luZ01vZGVGb3JUZXh0KCkgY29kZS4KKyAgICAgICAgVGhpcyBpcyBuZWNlc3NhcnkgYmVjYXVz ZSB0aGUgZ2l2ZW4gbWV0aG9kIGlzIHByaXZhdGUgb24gdGhlCisgICAgICAgIEdyYXBoaWNzQ29u dGV4dCBjbGFzcywgYW5kIHJlbGllcyBvbiBhbiB1bmRlcmx5aW5nIEdyYXBoaWNzQ29udGV4dAor ICAgICAgICBvYmplY3QgdG8gcmV0cmlldmUgdGhlIGN1cnJlbnQgQ1RNIGFuZCBzdHJva2UgdGhp Y2tuZXNzIHZhbHVlcy4KKworICAgICAgICBUaGUgYWRqdXN0ZWQgcmVpbXBsZW1lbnRhdGlvbiB1 c2VzIFBsYXRmb3JtQ29udGV4dENhaXJvIHRvIHJldHJpZXZlCisgICAgICAgIHRoZSBDVE0gKGp1 c3QgbGlrZSBDYWlybydzIEdyYXBoaWNzQ29udGV4dDo6Z2V0Q1RNKCkgZG9lcyksIGFuZAorICAg ICAgICByZXF1aXJlcyB0aGUgc3Ryb2tlIHRoaWNrbmVzcyB2YWx1ZSB0byBiZSBwYXNzZWQgaW4g YXMgYW4gYXJndW1lbnQuCisgICAgICAgIFNpbWlsYXIgbW9kaWZpY2F0aW9ucyB3aWxsIGJlIHBy b3Bvc2VkIGZvciB0aGUgZXhpc3RpbmcKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0Ojpjb21wdXRl TGluZUJvdW5kc0FuZEFudGlhbGlhc2luZ01vZGVGb3JUZXh0KCkgY29kZSwKKyAgICAgICAgYW5k IG9uY2UgdGhhdCdzIGFwcHJvdmVkIHRoZSBkdXBsaWNhdGVkIGNvZGUgd2lsbCBiZSBlbGltaW5h dGVkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtLSBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmNvbXB1dGVMaW5lQm91bmRzQW5kQW50aWFsaWFzaW5n TW9kZUZvclRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmRyYXdMaW5lc0ZvclRleHQp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVzRm9yVGV4dCk6 CisKKzIwMTctMTEtMTQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCiAg ICAgICAgIFtDYWlyb10gUGVyZm9ybSBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGUgbWV0 aG9kIGNhbGxzIGZyb20gQ2Fpcm9PcGVyYXRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk2NTcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKaW5kZXgg MGZjODU0ODhkMDUyMGZmZDIzZTU3NGY5ZWIyMzkzZTk0ODZhZjNjYy4uYTlkMmFhMWM2OTRjY2Zk MWZjZGQyNTVlMGRhNjUxYzc0MzFiODg1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCkBAIC0yMzEs NiArMjMxLDM2IEBAIHN0YXRpYyB2b2lkIGRyYXdHbHlwaHNTaGFkb3coUGxhdGZvcm1Db250ZXh0 Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY29uc3QgR3JhcGhpCiAgICAgfQogfQogCisvLyBGSVhN RTogRml4IEdyYXBoaWNzQ29udGV4dDo6Y29tcHV0ZUxpbmVCb3VuZHNBbmRBbnRpYWxpYXNpbmdN b2RlRm9yVGV4dCgpCisvLyB0byBiZSBhIHN0YXRpYyBwdWJsaWMgZnVuY3Rpb24gdGhhdCBvcGVy YXRlcyBvbiBDVE0gYW5kIHN0cm9rZVRoaWNrbmVzcworLy8gYXJndW1lbnRzIGluc3RlYWQgb2Yg dXNpbmcgYW4gdW5kZXJseWluZyBHcmFwaGljc0NvbnRleHQgb2JqZWN0LgorRmxvYXRSZWN0IGNv bXB1dGVMaW5lQm91bmRzQW5kQW50aWFsaWFzaW5nTW9kZUZvclRleHQoUGxhdGZvcm1Db250ZXh0 Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIGZsb2F0IHdp ZHRoLCBib29sIHByaW50aW5nLCBDb2xvciYgY29sb3IsIGZsb2F0IHN0cm9rZVRoaWNrbmVzcykK K3sKKyAgICBGbG9hdFBvaW50IG9yaWdpbiA9IHBvaW50OworICAgIGZsb2F0IHRoaWNrbmVzcyA9 IHN0ZDo6bWF4KHN0cm9rZVRoaWNrbmVzcywgMC41Zik7CisgICAgaWYgKHByaW50aW5nKQorICAg ICAgICByZXR1cm4gRmxvYXRSZWN0KG9yaWdpbiwgRmxvYXRTaXplKHdpZHRoLCB0aGlja25lc3Mp KTsKKworICAgIEFmZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBDYWlybzo6U3RhdGU6OmdldENU TShwbGF0Zm9ybUNvbnRleHQpOworICAgIC8vIEp1c3QgY29tcHV0ZSBzY2FsZSBpbiB4IGRpbWVu c2lvbiwgYXNzdW1pbmcgeCBhbmQgeSBzY2FsZXMgYXJlIGVxdWFsLgorICAgIGZsb2F0IHNjYWxl ID0gdHJhbnNmb3JtLmIoKSA/IHNxcnRmKHRyYW5zZm9ybS5hKCkgKiB0cmFuc2Zvcm0uYSgpICsg dHJhbnNmb3JtLmIoKSAqIHRyYW5zZm9ybS5iKCkpIDogdHJhbnNmb3JtLmEoKTsKKyAgICBpZiAo c2NhbGUgPCAxLjApIHsKKyAgICAgICAgLy8gVGhpcyBjb2RlIGFsd2F5cyBkcmF3cyBhIGxpbmUg dGhhdCBpcyBhdCBsZWFzdCBvbmUtcGl4ZWwgbGluZSBoaWdoLAorICAgICAgICAvLyB3aGljaCB0 ZW5kcyB0byB2aXN1YWxseSBvdmVyd2hlbG0gdGV4dCBhdCBzbWFsbCBzY2FsZXMuIFRvIGNvdW50 ZXIgdGhpcworICAgICAgICAvLyBlZmZlY3QsIGFuIGFscGhhIGlzIGFwcGxpZWQgdG8gdGhlIHVu ZGVybGluZSBjb2xvciB3aGVuIHRleHQgaXMgYXQgc21hbGwgc2NhbGVzLgorICAgICAgICBzdGF0 aWMgY29uc3QgZmxvYXQgbWluaW11bVVuZGVybGluZUFscGhhID0gMC40ZjsKKyAgICAgICAgZmxv YXQgc2hhZGUgPSBzY2FsZSA+IG1pbmltdW1VbmRlcmxpbmVBbHBoYSA/IHNjYWxlIDogbWluaW11 bVVuZGVybGluZUFscGhhOworICAgICAgICBjb2xvciA9IGNvbG9yLmNvbG9yV2l0aEFscGhhTXVs dGlwbGllZEJ5KHNoYWRlKTsKKyAgICB9CisKKyAgICBGbG9hdFBvaW50IGRldmljZVBvaW50ID0g dHJhbnNmb3JtLm1hcFBvaW50KHBvaW50KTsKKyAgICAvLyBWaXN1YWwgb3ZlcmZsb3cgbWlnaHQg b2NjdXIgaGVyZSBkdWUgdG8gaW50ZWdyYWwgcm91bmRmL2NlaWxmLiB2aXN1YWxPdmVyZmxvd0Zv ckRlY29yYXRpb25zIGFkanVzdHMgdGhlIG92ZXJmbG93IHZhbHVlIGZvciB1bmRlcmxpbmUgZGVj b3JhdGlvbi4KKyAgICBGbG9hdFBvaW50IGRldmljZU9yaWdpbiA9IEZsb2F0UG9pbnQocm91bmRm KGRldmljZVBvaW50LngoKSksIGNlaWxmKGRldmljZVBvaW50LnkoKSkpOworICAgIGlmIChhdXRv IGludmVyc2UgPSB0cmFuc2Zvcm0uaW52ZXJzZSgpKQorICAgICAgICBvcmlnaW4gPSBpbnZlcnNl LnZhbHVlKCkubWFwUG9pbnQoZGV2aWNlT3JpZ2luKTsKKyAgICByZXR1cm4gRmxvYXRSZWN0KG9y aWdpbiwgRmxvYXRTaXplKHdpZHRoLCB0aGlja25lc3MpKTsKK307CisKIG5hbWVzcGFjZSBTdGF0 ZSB7CiAKIHZvaWQgc2V0U3Ryb2tlVGhpY2tuZXNzKFBsYXRmb3JtQ29udGV4dENhaXJvJiBwbGF0 Zm9ybUNvbnRleHQsIGZsb2F0IHN0cm9rZVRoaWNrbmVzcykKQEAgLTU4Niw2ICs2MTYsMzIgQEAg dm9pZCBkcmF3UmVjdChQbGF0Zm9ybUNvbnRleHRDYWlybyYgcGxhdGZvcm1Db250ZXh0LCBjb25z dCBGbG9hdFJlY3QmIHJlY3QsIGZsb2EKICAgICBjYWlyb19yZXN0b3JlKGNyKTsKIH0KIAordm9p ZCBkcmF3TGluZXNGb3JUZXh0KFBsYXRmb3JtQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQs IGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBjb25zdCBEYXNoQXJyYXkmIHdpZHRocywgYm9vbCBw cmludGluZywgYm9vbCBkb3VibGVVbmRlcmxpbmVzLCBjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0 IHN0cm9rZVRoaWNrbmVzcykKK3sKKyAgICBDb2xvciBtb2RpZmllZENvbG9yID0gY29sb3I7Cisg ICAgRmxvYXRSZWN0IGJvdW5kcyA9IGNvbXB1dGVMaW5lQm91bmRzQW5kQW50aWFsaWFzaW5nTW9k ZUZvclRleHQocGxhdGZvcm1Db250ZXh0LCBwb2ludCwgd2lkdGhzLmxhc3QoKSwgcHJpbnRpbmcs IG1vZGlmaWVkQ29sb3IsIHN0cm9rZVRoaWNrbmVzcyk7CisKKyAgICBWZWN0b3I8RmxvYXRSZWN0 LCA0PiBkYXNoQm91bmRzOworICAgIEFTU0VSVCghKHdpZHRocy5zaXplKCkgJSAyKSk7CisgICAg ZGFzaEJvdW5kcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGRhc2hCb3VuZHMuc2l6ZSgpIC8gMik7 CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB3aWR0aHMuc2l6ZSgpOyBpICs9IDIpCisgICAg ICAgIGRhc2hCb3VuZHMuYXBwZW5kKEZsb2F0UmVjdChGbG9hdFBvaW50KGJvdW5kcy54KCkgKyB3 aWR0aHNbaV0sIGJvdW5kcy55KCkpLCBGbG9hdFNpemUod2lkdGhzW2krMV0gLSB3aWR0aHNbaV0s IGJvdW5kcy5oZWlnaHQoKSkpKTsKKworICAgIGlmIChkb3VibGVVbmRlcmxpbmVzKSB7CisgICAg ICAgIC8vIFRoZSBzcGFjZSBiZXR3ZWVuIGRvdWJsZSB1bmRlcmxpbmVzIGlzIGVxdWFsIHRvIHRo ZSBoZWlnaHQgb2YgdGhlIHVuZGVybGluZQorICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHdpZHRocy5zaXplKCk7IGkgKz0gMikKKyAgICAgICAgICAgIGRhc2hCb3VuZHMuYXBwZW5kKEZs b2F0UmVjdChGbG9hdFBvaW50KGJvdW5kcy54KCkgKyB3aWR0aHNbaV0sIGJvdW5kcy55KCkgKyAy ICogYm91bmRzLmhlaWdodCgpKSwgRmxvYXRTaXplKHdpZHRoc1tpKzFdIC0gd2lkdGhzW2ldLCBi b3VuZHMuaGVpZ2h0KCkpKSk7CisgICAgfQorCisgICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNv bnRleHQuY3IoKTsKKyAgICBjYWlyb19zYXZlKGNyKTsKKworICAgIGZvciAoYXV0byYgZGFzaCA6 IGRhc2hCb3VuZHMpCisgICAgICAgIGZpbGxSZWN0V2l0aENvbG9yKGNyLCBkYXNoLCBtb2RpZmll ZENvbG9yKTsKKworICAgIGNhaXJvX3Jlc3RvcmUoY3IpOworfQorCiB2b2lkIGRyYXdMaW5lRm9y RG9jdW1lbnRNYXJrZXIoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY29u c3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9hdCB3aWR0aCwgR3JhcGhpY3NDb250ZXh0OjpEb2N1 bWVudE1hcmtlckxpbmVTdHlsZSBzdHlsZSkKIHsKICAgICBpZiAoc3R5bGUgIT0gR3JhcGhpY3ND b250ZXh0OjpEb2N1bWVudE1hcmtlclNwZWxsaW5nTGluZVN0eWxlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCmlu ZGV4IDIyZGE4NDU1MzdhODRiOWYzMmUwNzQyYTRjMDVhOWEwNTQ4YzQ3ZTguLmUwMGIxMTA0MzVj ZWIyZmM2MTg2NmEwZDA3NDgzZmQ3YjU3NWM3OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCkBAIC05OCw2 ICs5OCw3IEBAIHZvaWQgZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQmLCBjb25zdCBHcmFwaGlj c0NvbnRleHRTdGF0ZSYsIGJvb2wsIGNvbnN0IEZsb2F0CiB2b2lkIGRyYXdQYXR0ZXJuKFBsYXRm b3JtQ29udGV4dENhaXJvJiwgSW1hZ2UmLCBjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFJl Y3QmLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mLCBjb25zdCBGbG9hdFBvaW50JiwgQ29tcG9zaXRl T3BlcmF0b3IsIEJsZW5kTW9kZSk7CiAKIHZvaWQgZHJhd1JlY3QoUGxhdGZvcm1Db250ZXh0Q2Fp cm8mLCBjb25zdCBGbG9hdFJlY3QmLCBmbG9hdCwgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUm KTsKK3ZvaWQgZHJhd0xpbmVzRm9yVGV4dChQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZs b2F0UG9pbnQmLCBjb25zdCBEYXNoQXJyYXkmLCBib29sLCBib29sLCBjb25zdCBDb2xvciYsIGZs b2F0KTsKIHZvaWQgZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihQbGF0Zm9ybUNvbnRleHRDYWly byYsIGNvbnN0IEZsb2F0UG9pbnQmLCBmbG9hdCwgR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1h cmtlckxpbmVTdHlsZSk7CiB2b2lkIGRyYXdFbGxpcHNlKFBsYXRmb3JtQ29udGV4dENhaXJvJiwg Y29uc3QgRmxvYXRSZWN0JiwgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3Jh cGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IDIwNGI3M2JiMjVhMmVmMmNiY2RhN2UzMTkwZDg3 ZjYzNmE0YTMzYTYuLmQyOTUwMGY1NTE5YjIwNGJkNWJkNDRjYmFmYmQxYzVkZjM3ZmU4NjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKQEAgLTUyNSwyOSArNTI1LDggQEAgdm9pZCBH cmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lc0ZvclRleHQoY29uc3QgRmxvYXRQb2ludCYgcG9pbnQs IGNvbnN0IERhc2hBcnJheSYKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIENvbG9yIGxv Y2FsU3Ryb2tlQ29sb3Ioc3Ryb2tlQ29sb3IoKSk7Ci0KLSAgICBGbG9hdFJlY3QgYm91bmRzID0g Y29tcHV0ZUxpbmVCb3VuZHNBbmRBbnRpYWxpYXNpbmdNb2RlRm9yVGV4dChwb2ludCwgd2lkdGhz Lmxhc3QoKSwgcHJpbnRpbmcsIGxvY2FsU3Ryb2tlQ29sb3IpOwotCi0gICAgVmVjdG9yPEZsb2F0 UmVjdCwgND4gZGFzaEJvdW5kczsKLSAgICBBU1NFUlQoISh3aWR0aHMuc2l6ZSgpICUgMikpOwot ICAgIGRhc2hCb3VuZHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShkYXNoQm91bmRzLnNpemUoKSAv IDIpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgd2lkdGhzLnNpemUoKTsgaSArPSAyKQot ICAgICAgICBkYXNoQm91bmRzLmFwcGVuZChGbG9hdFJlY3QoRmxvYXRQb2ludChib3VuZHMueCgp ICsgd2lkdGhzW2ldLCBib3VuZHMueSgpKSwgRmxvYXRTaXplKHdpZHRoc1tpKzFdIC0gd2lkdGhz W2ldLCBib3VuZHMuaGVpZ2h0KCkpKSk7Ci0KLSAgICBpZiAoZG91YmxlVW5kZXJsaW5lcykgewot ICAgICAgICAvLyBUaGUgc3BhY2UgYmV0d2VlbiBkb3VibGUgdW5kZXJsaW5lcyBpcyBlcXVhbCB0 byB0aGUgaGVpZ2h0IG9mIHRoZSB1bmRlcmxpbmUKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCB3aWR0aHMuc2l6ZSgpOyBpICs9IDIpCi0gICAgICAgICAgICBkYXNoQm91bmRzLmFwcGVu ZChGbG9hdFJlY3QoRmxvYXRQb2ludChib3VuZHMueCgpICsgd2lkdGhzW2ldLCBib3VuZHMueSgp ICsgMiAqIGJvdW5kcy5oZWlnaHQoKSksIEZsb2F0U2l6ZSh3aWR0aHNbaSsxXSAtIHdpZHRoc1tp XSwgYm91bmRzLmhlaWdodCgpKSkpOwotICAgIH0KLQotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZv cm1Db250ZXh0KCktPmNyKCk7Ci0gICAgY2Fpcm9fc2F2ZShjcik7Ci0KLSAgICBmb3IgKGF1dG8m IGRhc2ggOiBkYXNoQm91bmRzKQotICAgICAgICBmaWxsUmVjdFdpdGhDb2xvcihjciwgZGFzaCwg bG9jYWxTdHJva2VDb2xvcik7Ci0KLSAgICBjYWlyb19yZXN0b3JlKGNyKTsKKyAgICBBU1NFUlQo aGFzUGxhdGZvcm1Db250ZXh0KCkpOworICAgIENhaXJvOjpkcmF3TGluZXNGb3JUZXh0KCpwbGF0 Zm9ybUNvbnRleHQoKSwgcG9pbnQsIHdpZHRocywgcHJpbnRpbmcsIGRvdWJsZVVuZGVybGluZXMs IG1fc3RhdGUuc3Ryb2tlQ29sb3IsIG1fc3RhdGUuc3Ryb2tlVGhpY2tuZXNzKTsKIH0KIAogdm9p ZCBHcmFwaGljc0NvbnRleHQ6OnVwZGF0ZURvY3VtZW50TWFya2VyUmVzb3VyY2VzKCkK 326875 2017-11-14 05:44:26 -0800 2017-11-14 05:44:26 -0800 Patch for landing bug-179661-20171114144425.patch text/plain 8916 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQ5MDk5ZjJlNTZmNDk4 NDdlZGFmOGVmOTdkZGI4ZmI3YTU5ZTA1MS4uZGZmNDFhMTJjNDUxNWViMzZlYjM1OTdiMjVkNjg1 MGY4MmRiNTA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE3LTExLTE0ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ2Fpcm9dIE1vdmUg ZHJhd0xpbmVzRm9yVGV4dCBvcGVyYXRpb24gZnJvbSBHcmFwaGljc0NvbnRleHRDYWlybyB0byBD YWlyb09wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3OTY2MQorCisgICAgICAgIFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9z LgorCisgICAgICAgIEVuY2Fwc3VsYXRlIHRoZSBkcmF3TGluZXNGb3JUZXh0KCkgb3BlcmF0aW9u IGluIHRoZSBXZWJDb3JlOjpDYWlybworICAgICAgICBuYW1lc3BhY2UuIEFwYXJ0IGZyb20gbW92 aW5nIGdpc3Qgb2YgdGhlIGNvZGUgZnJvbSBHcmFwaGljc0NvbnRleHRDYWlybworICAgICAgICB0 byBDYWlyb09wZXJhdGlvbnMsIHdlIGFsc28gKGZvciB0aGUgbW9tZW50KSBoYXZlIHRvIGR1cGxp Y2F0ZSB0aGUKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0Ojpjb21wdXRlTGluZUJvdW5kc0FuZEFu dGlhbGlhc2luZ01vZGVGb3JUZXh0KCkgY29kZS4KKyAgICAgICAgVGhpcyBpcyBuZWNlc3Nhcnkg YmVjYXVzZSB0aGUgZ2l2ZW4gbWV0aG9kIGlzIHByaXZhdGUgb24gdGhlCisgICAgICAgIEdyYXBo aWNzQ29udGV4dCBjbGFzcywgYW5kIHJlbGllcyBvbiBhbiB1bmRlcmx5aW5nIEdyYXBoaWNzQ29u dGV4dAorICAgICAgICBvYmplY3QgdG8gcmV0cmlldmUgdGhlIGN1cnJlbnQgQ1RNIGFuZCBzdHJv a2UgdGhpY2tuZXNzIHZhbHVlcy4KKworICAgICAgICBUaGUgYWRqdXN0ZWQgcmVpbXBsZW1lbnRh dGlvbiB1c2VzIFBsYXRmb3JtQ29udGV4dENhaXJvIHRvIHJldHJpZXZlCisgICAgICAgIHRoZSBD VE0gKGp1c3QgbGlrZSBDYWlybydzIEdyYXBoaWNzQ29udGV4dDo6Z2V0Q1RNKCkgZG9lcyksIGFu ZAorICAgICAgICByZXF1aXJlcyB0aGUgc3Ryb2tlIHRoaWNrbmVzcyB2YWx1ZSB0byBiZSBwYXNz ZWQgaW4gYXMgYW4gYXJndW1lbnQuCisgICAgICAgIFNpbWlsYXIgbW9kaWZpY2F0aW9ucyB3aWxs IGJlIHByb3Bvc2VkIGZvciB0aGUgZXhpc3RpbmcKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0Ojpj b21wdXRlTGluZUJvdW5kc0FuZEFudGlhbGlhc2luZ01vZGVGb3JUZXh0KCkgY29kZSwKKyAgICAg ICAgYW5kIG9uY2UgdGhhdCdzIGFwcHJvdmVkIHRoZSBkdXBsaWNhdGVkIGNvZGUgd2lsbCBiZSBl bGltaW5hdGVkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtLSBubyBjaGFuZ2UgaW4gYmVoYXZp b3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmNvbXB1dGVMaW5lQm91bmRzQW5kQW50aWFs aWFzaW5nTW9kZUZvclRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmRyYXdMaW5lc0Zv clRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9u cy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENh aXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVzRm9y VGV4dCk6CisKKzIwMTctMTEtMTQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29t PgorCiAgICAgICAgIFtDYWlyb10gTW92ZSBuYXRpdmUgaW1hZ2UgZHJhd2luZyBvcGVyYXRpb24g dG8gQ2Fpcm9PcGVyYXRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzk2NjAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKaW5kZXggYWJlNmU4MjU4MjE5 YWU0N2I5YTI5YjRlMzg3YmZmMTRiMDFjODc1Ny4uNDRhMGI1OGZjZTk5NzhiNDg5MWVmMDkzNGMy Y2UwYTdmNDk0ZTdkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCkBAIC0yMzYsNiArMjM2LDM2IEBA IHN0YXRpYyBib29sIGNhaXJvU3VyZmFjZUhhc0FscGhhKGNhaXJvX3N1cmZhY2VfdCogc3VyZmFj ZSkKICAgICByZXR1cm4gY2Fpcm9fc3VyZmFjZV9nZXRfY29udGVudChzdXJmYWNlKSAhPSBDQUlS T19DT05URU5UX0NPTE9SOwogfQogCisvLyBGSVhNRTogRml4IEdyYXBoaWNzQ29udGV4dDo6Y29t cHV0ZUxpbmVCb3VuZHNBbmRBbnRpYWxpYXNpbmdNb2RlRm9yVGV4dCgpCisvLyB0byBiZSBhIHN0 YXRpYyBwdWJsaWMgZnVuY3Rpb24gdGhhdCBvcGVyYXRlcyBvbiBDVE0gYW5kIHN0cm9rZVRoaWNr bmVzcworLy8gYXJndW1lbnRzIGluc3RlYWQgb2YgdXNpbmcgYW4gdW5kZXJseWluZyBHcmFwaGlj c0NvbnRleHQgb2JqZWN0LgorRmxvYXRSZWN0IGNvbXB1dGVMaW5lQm91bmRzQW5kQW50aWFsaWFz aW5nTW9kZUZvclRleHQoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY29u c3QgRmxvYXRQb2ludCYgcG9pbnQsIGZsb2F0IHdpZHRoLCBib29sIHByaW50aW5nLCBDb2xvciYg Y29sb3IsIGZsb2F0IHN0cm9rZVRoaWNrbmVzcykKK3sKKyAgICBGbG9hdFBvaW50IG9yaWdpbiA9 IHBvaW50OworICAgIGZsb2F0IHRoaWNrbmVzcyA9IHN0ZDo6bWF4KHN0cm9rZVRoaWNrbmVzcywg MC41Zik7CisgICAgaWYgKHByaW50aW5nKQorICAgICAgICByZXR1cm4gRmxvYXRSZWN0KG9yaWdp biwgRmxvYXRTaXplKHdpZHRoLCB0aGlja25lc3MpKTsKKworICAgIEFmZmluZVRyYW5zZm9ybSB0 cmFuc2Zvcm0gPSBDYWlybzo6U3RhdGU6OmdldENUTShwbGF0Zm9ybUNvbnRleHQpOworICAgIC8v IEp1c3QgY29tcHV0ZSBzY2FsZSBpbiB4IGRpbWVuc2lvbiwgYXNzdW1pbmcgeCBhbmQgeSBzY2Fs ZXMgYXJlIGVxdWFsLgorICAgIGZsb2F0IHNjYWxlID0gdHJhbnNmb3JtLmIoKSA/IHNxcnRmKHRy YW5zZm9ybS5hKCkgKiB0cmFuc2Zvcm0uYSgpICsgdHJhbnNmb3JtLmIoKSAqIHRyYW5zZm9ybS5i KCkpIDogdHJhbnNmb3JtLmEoKTsKKyAgICBpZiAoc2NhbGUgPCAxLjApIHsKKyAgICAgICAgLy8g VGhpcyBjb2RlIGFsd2F5cyBkcmF3cyBhIGxpbmUgdGhhdCBpcyBhdCBsZWFzdCBvbmUtcGl4ZWwg bGluZSBoaWdoLAorICAgICAgICAvLyB3aGljaCB0ZW5kcyB0byB2aXN1YWxseSBvdmVyd2hlbG0g dGV4dCBhdCBzbWFsbCBzY2FsZXMuIFRvIGNvdW50ZXIgdGhpcworICAgICAgICAvLyBlZmZlY3Qs IGFuIGFscGhhIGlzIGFwcGxpZWQgdG8gdGhlIHVuZGVybGluZSBjb2xvciB3aGVuIHRleHQgaXMg YXQgc21hbGwgc2NhbGVzLgorICAgICAgICBzdGF0aWMgY29uc3QgZmxvYXQgbWluaW11bVVuZGVy bGluZUFscGhhID0gMC40ZjsKKyAgICAgICAgZmxvYXQgc2hhZGUgPSBzY2FsZSA+IG1pbmltdW1V bmRlcmxpbmVBbHBoYSA/IHNjYWxlIDogbWluaW11bVVuZGVybGluZUFscGhhOworICAgICAgICBj b2xvciA9IGNvbG9yLmNvbG9yV2l0aEFscGhhTXVsdGlwbGllZEJ5KHNoYWRlKTsKKyAgICB9CisK KyAgICBGbG9hdFBvaW50IGRldmljZVBvaW50ID0gdHJhbnNmb3JtLm1hcFBvaW50KHBvaW50KTsK KyAgICAvLyBWaXN1YWwgb3ZlcmZsb3cgbWlnaHQgb2NjdXIgaGVyZSBkdWUgdG8gaW50ZWdyYWwg cm91bmRmL2NlaWxmLiB2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zIGFkanVzdHMgdGhlIG92 ZXJmbG93IHZhbHVlIGZvciB1bmRlcmxpbmUgZGVjb3JhdGlvbi4KKyAgICBGbG9hdFBvaW50IGRl dmljZU9yaWdpbiA9IEZsb2F0UG9pbnQocm91bmRmKGRldmljZVBvaW50LngoKSksIGNlaWxmKGRl dmljZVBvaW50LnkoKSkpOworICAgIGlmIChhdXRvIGludmVyc2UgPSB0cmFuc2Zvcm0uaW52ZXJz ZSgpKQorICAgICAgICBvcmlnaW4gPSBpbnZlcnNlLnZhbHVlKCkubWFwUG9pbnQoZGV2aWNlT3Jp Z2luKTsKKyAgICByZXR1cm4gRmxvYXRSZWN0KG9yaWdpbiwgRmxvYXRTaXplKHdpZHRoLCB0aGlj a25lc3MpKTsKK307CisKIG5hbWVzcGFjZSBTdGF0ZSB7CiAKIHZvaWQgc2V0U3Ryb2tlVGhpY2tu ZXNzKFBsYXRmb3JtQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIGZsb2F0IHN0cm9rZVRo aWNrbmVzcykKQEAgLTYyNiw2ICs2NTYsMzIgQEAgdm9pZCBkcmF3UmVjdChQbGF0Zm9ybUNvbnRl eHRDYWlybyYgcGxhdGZvcm1Db250ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGZsb2EKICAg ICBjYWlyb19yZXN0b3JlKGNyKTsKIH0KIAordm9pZCBkcmF3TGluZXNGb3JUZXh0KFBsYXRmb3Jt Q29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBj b25zdCBEYXNoQXJyYXkmIHdpZHRocywgYm9vbCBwcmludGluZywgYm9vbCBkb3VibGVVbmRlcmxp bmVzLCBjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0IHN0cm9rZVRoaWNrbmVzcykKK3sKKyAgICBD b2xvciBtb2RpZmllZENvbG9yID0gY29sb3I7CisgICAgRmxvYXRSZWN0IGJvdW5kcyA9IGNvbXB1 dGVMaW5lQm91bmRzQW5kQW50aWFsaWFzaW5nTW9kZUZvclRleHQocGxhdGZvcm1Db250ZXh0LCBw b2ludCwgd2lkdGhzLmxhc3QoKSwgcHJpbnRpbmcsIG1vZGlmaWVkQ29sb3IsIHN0cm9rZVRoaWNr bmVzcyk7CisKKyAgICBWZWN0b3I8RmxvYXRSZWN0LCA0PiBkYXNoQm91bmRzOworICAgIEFTU0VS VCghKHdpZHRocy5zaXplKCkgJSAyKSk7CisgICAgZGFzaEJvdW5kcy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KGRhc2hCb3VuZHMuc2l6ZSgpIC8gMik7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCB3aWR0aHMuc2l6ZSgpOyBpICs9IDIpCisgICAgICAgIGRhc2hCb3VuZHMuYXBwZW5kKEZsb2F0 UmVjdChGbG9hdFBvaW50KGJvdW5kcy54KCkgKyB3aWR0aHNbaV0sIGJvdW5kcy55KCkpLCBGbG9h dFNpemUod2lkdGhzW2krMV0gLSB3aWR0aHNbaV0sIGJvdW5kcy5oZWlnaHQoKSkpKTsKKworICAg IGlmIChkb3VibGVVbmRlcmxpbmVzKSB7CisgICAgICAgIC8vIFRoZSBzcGFjZSBiZXR3ZWVuIGRv dWJsZSB1bmRlcmxpbmVzIGlzIGVxdWFsIHRvIHRoZSBoZWlnaHQgb2YgdGhlIHVuZGVybGluZQor ICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHdpZHRocy5zaXplKCk7IGkgKz0gMikKKyAg ICAgICAgICAgIGRhc2hCb3VuZHMuYXBwZW5kKEZsb2F0UmVjdChGbG9hdFBvaW50KGJvdW5kcy54 KCkgKyB3aWR0aHNbaV0sIGJvdW5kcy55KCkgKyAyICogYm91bmRzLmhlaWdodCgpKSwgRmxvYXRT aXplKHdpZHRoc1tpKzFdIC0gd2lkdGhzW2ldLCBib3VuZHMuaGVpZ2h0KCkpKSk7CisgICAgfQor CisgICAgY2Fpcm9fdCogY3IgPSBwbGF0Zm9ybUNvbnRleHQuY3IoKTsKKyAgICBjYWlyb19zYXZl KGNyKTsKKworICAgIGZvciAoYXV0byYgZGFzaCA6IGRhc2hCb3VuZHMpCisgICAgICAgIGZpbGxS ZWN0V2l0aENvbG9yKGNyLCBkYXNoLCBtb2RpZmllZENvbG9yKTsKKworICAgIGNhaXJvX3Jlc3Rv cmUoY3IpOworfQorCiB2b2lkIGRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIoUGxhdGZvcm1Db250 ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9h dCB3aWR0aCwgR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1hcmtlckxpbmVTdHlsZSBzdHlsZSkK IHsKICAgICBpZiAoc3R5bGUgIT0gR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1hcmtlclNwZWxs aW5nTGluZVN0eWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYWlyby9DYWlyb09wZXJhdGlvbnMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCmluZGV4IDVlMGE2ZTJjZTc2YjNmZTAyYzNhMTc3 NWVlMGQ2MDI3MGYyMjkxMmUuLjhlMTU2Yjc5N2M0ZjBlMTVmMDBlYmFmM2RlNmEzZTk5MzYzYzVm OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0Nh aXJvT3BlcmF0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0NhaXJvT3BlcmF0aW9ucy5oCkBAIC05OSw2ICs5OSw3IEBAIHZvaWQgZHJhd05hdGl2ZUlt YWdlKFBsYXRmb3JtQ29udGV4dENhaXJvJiwgY29uc3QgTmF0aXZlSW1hZ2VQdHImLCBjb25zdCBG bG9hdFJlCiB2b2lkIGRyYXdQYXR0ZXJuKFBsYXRmb3JtQ29udGV4dENhaXJvJiwgSW1hZ2UmLCBj b25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0m LCBjb25zdCBGbG9hdFBvaW50JiwgQ29tcG9zaXRlT3BlcmF0b3IsIEJsZW5kTW9kZSk7CiAKIHZv aWQgZHJhd1JlY3QoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mLCBjb25zdCBGbG9hdFJlY3QmLCBmbG9h dCwgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmKTsKK3ZvaWQgZHJhd0xpbmVzRm9yVGV4dChQ bGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBEYXNoQXJyYXkm LCBib29sLCBib29sLCBjb25zdCBDb2xvciYsIGZsb2F0KTsKIHZvaWQgZHJhd0xpbmVGb3JEb2N1 bWVudE1hcmtlcihQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBmbG9h dCwgR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1hcmtlckxpbmVTdHlsZSk7CiB2b2lkIGRyYXdF bGxpcHNlKFBsYXRmb3JtQ29udGV4dENhaXJvJiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgR3Jh cGhpY3NDb250ZXh0U3RhdGUmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4 IDUxNzM5ODgwOGE4NDc1ODJjNWNjZWE3N2VmMDZkYjQyZjMzZjRmMTkuLjFkM2JmZjc2MDEzOWU5 Yjk2N2QzOTRkZjE0M2MwNzBmNmU4N2VhOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5j cHAKQEAgLTUwMywyOSArNTAzLDggQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lc0Zv clRleHQoY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIGNvbnN0IERhc2hBcnJheSYKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIENvbG9yIGxvY2FsU3Ryb2tlQ29sb3Ioc3Ryb2tlQ29sb3Io KSk7Ci0KLSAgICBGbG9hdFJlY3QgYm91bmRzID0gY29tcHV0ZUxpbmVCb3VuZHNBbmRBbnRpYWxp YXNpbmdNb2RlRm9yVGV4dChwb2ludCwgd2lkdGhzLmxhc3QoKSwgcHJpbnRpbmcsIGxvY2FsU3Ry b2tlQ29sb3IpOwotCi0gICAgVmVjdG9yPEZsb2F0UmVjdCwgND4gZGFzaEJvdW5kczsKLSAgICBB U1NFUlQoISh3aWR0aHMuc2l6ZSgpICUgMikpOwotICAgIGRhc2hCb3VuZHMucmVzZXJ2ZUluaXRp YWxDYXBhY2l0eShkYXNoQm91bmRzLnNpemUoKSAvIDIpOwotICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgd2lkdGhzLnNpemUoKTsgaSArPSAyKQotICAgICAgICBkYXNoQm91bmRzLmFwcGVuZChG bG9hdFJlY3QoRmxvYXRQb2ludChib3VuZHMueCgpICsgd2lkdGhzW2ldLCBib3VuZHMueSgpKSwg RmxvYXRTaXplKHdpZHRoc1tpKzFdIC0gd2lkdGhzW2ldLCBib3VuZHMuaGVpZ2h0KCkpKSk7Ci0K LSAgICBpZiAoZG91YmxlVW5kZXJsaW5lcykgewotICAgICAgICAvLyBUaGUgc3BhY2UgYmV0d2Vl biBkb3VibGUgdW5kZXJsaW5lcyBpcyBlcXVhbCB0byB0aGUgaGVpZ2h0IG9mIHRoZSB1bmRlcmxp bmUKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB3aWR0aHMuc2l6ZSgpOyBpICs9IDIp Ci0gICAgICAgICAgICBkYXNoQm91bmRzLmFwcGVuZChGbG9hdFJlY3QoRmxvYXRQb2ludChib3Vu ZHMueCgpICsgd2lkdGhzW2ldLCBib3VuZHMueSgpICsgMiAqIGJvdW5kcy5oZWlnaHQoKSksIEZs b2F0U2l6ZSh3aWR0aHNbaSsxXSAtIHdpZHRoc1tpXSwgYm91bmRzLmhlaWdodCgpKSkpOwotICAg IH0KLQotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1Db250ZXh0KCktPmNyKCk7Ci0gICAgY2Fp cm9fc2F2ZShjcik7Ci0KLSAgICBmb3IgKGF1dG8mIGRhc2ggOiBkYXNoQm91bmRzKQotICAgICAg ICBmaWxsUmVjdFdpdGhDb2xvcihjciwgZGFzaCwgbG9jYWxTdHJva2VDb2xvcik7Ci0KLSAgICBj YWlyb19yZXN0b3JlKGNyKTsKKyAgICBBU1NFUlQoaGFzUGxhdGZvcm1Db250ZXh0KCkpOworICAg IENhaXJvOjpkcmF3TGluZXNGb3JUZXh0KCpwbGF0Zm9ybUNvbnRleHQoKSwgcG9pbnQsIHdpZHRo cywgcHJpbnRpbmcsIGRvdWJsZVVuZGVybGluZXMsIG1fc3RhdGUuc3Ryb2tlQ29sb3IsIG1fc3Rh dGUuc3Ryb2tlVGhpY2tuZXNzKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnVwZGF0ZURv Y3VtZW50TWFya2VyUmVzb3VyY2VzKCkK