188296 2018-08-02 20:30:04 -0700 [LFC][BFC] Apply the "10.6.6 Complicated cases" when computing height and margin for the document renderer 2018-08-02 21:33:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1447500 0 zalan 2018-08-02 20:30:04 -0700 until after I figure out where it actually belongs. 1447501 1 346446 zalan 2018-08-02 20:33:51 -0700 Created attachment 346446 Patch 1447508 2 346451 zalan 2018-08-02 21:26:00 -0700 Created attachment 346451 Patch 1447511 3 zalan 2018-08-02 21:32:11 -0700 Committed r234537: <https://trac.webkit.org/changeset/234537> 1447512 4 webkit-bug-importer 2018-08-02 21:33:28 -0700 <rdar://problem/42886962> 346446 2018-08-02 20:33:51 -0700 2018-08-02 21:25:59 -0700 Patch bug-188296-20180802203350.patch text/plain 8756 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZjZjgzMzE3ZmU1OWU0 NzBiNTIzZTM5N2U4YjhlMDIwN2Y1YzFiZC4uZDE5MjVmOGE1NWNiMzIzNTcwNGZlYjcwM2VmNWVm YWE2OGJhZmYxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA4LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBBcHBseSB0 aGUgIjEwLjYuNiBDb21wbGljYXRlZCBjYXNlcyIgd2hlbiBjb21wdXRpbmcgaGVpZ2h0IGFuZCBt YXJnaW4gZm9yIHRoZSBkb2N1bWVudCByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4Mjk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNwZWMgaXMgbm90IGNsZWFyIGFib3V0IHdoYXQg dG8gZG8gd2l0aCB0aGUgZG9jdW1lbnQgcmVuZGVyZXIuIEl0IGJlaGF2ZXMgYXMgaWYgaXQgd2Fz IGEgZm9ybWF0dGluZyBjb250ZXh0IHJvb3Qgd2hlbgorICAgICAgICBpdCBjb21lcyB0byBjb21w dXRpbmcgaXRzIGhlaWdodC4gTGV0J3MgYXBwbHkgIjEwLjYuNiBDb21wbGljYXRlZCBjYXNlcyIg Zm9yIG5vdy4gCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAg ICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNl cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6ZmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nTm9uUmVwbGFjZWRIZWlnaHRBbmRN YXJnaW4pOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0 QW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0 L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qm94 Ojplc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQgY29uc3QpOgorICAgICAgICAqIGxh eW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oOgorCiAyMDE4LTA4LTAyICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bRmxvYXRpbmddIEFkZCBGbG9hdGlu Z1N0YXRlOjpib3R0b20oKSB0byBlbmFibGUgY29udGVudCBoZWlnaHQgY29tcHV0YXRpb24gZm9y IGZvcm1hdHRpbmcgcm9vdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4 dC5oCmluZGV4IGNlMjAxY2ZmNjRkNDQzNjg0Y2IzM2MxMmVlODU1MWQyMTUyZGMzM2EuLjU3MTM5 YTVlNjg0N2Q4MWEwNzU1MzE5ZWM0NDYxZDM4YWU0ZmYwMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBAIC05Nyw2ICs5Nyw4IEBAIHByb3RlY3RlZDoKICAg ICAgICAgc3RhdGljIFdpZHRoQW5kTWFyZ2luIGlubGluZVJlcGxhY2VkV2lkdGhBbmRNYXJnaW4o TGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gcHJl Y29tcHV0ZWRNYXJnaW5MZWZ0ID0geyB9LAogICAgICAgICAgICAgc3RkOjpvcHRpb25hbDxMYXlv dXRVbml0PiBwcmVjb21wdXRlZE1hcmdpblJpZ2h0ID0geyB9KTsKIAorICAgICAgICBzdGF0aWMg SGVpZ2h0QW5kTWFyZ2luIGNvbXBsaWNhdGVkQ2FzZXMoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJv eCYpOworCiAgICAgICAgIHN0YXRpYyBFZGdlcyBjb21wdXRlZEJvcmRlcihMYXlvdXRDb250ZXh0 JiwgY29uc3QgQm94Jik7CiAgICAgICAgIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPEVkZ2VzPiBjb21w dXRlZFBhZGRpbmcoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogCkBAIC0xMTYsNyArMTE4 LDYgQEAgcHJvdGVjdGVkOgogICAgICAgICBzdGF0aWMgSGVpZ2h0QW5kTWFyZ2luIGZsb2F0aW5n UmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogICAg ICAgICBzdGF0aWMgV2lkdGhBbmRNYXJnaW4gZmxvYXRpbmdSZXBsYWNlZFdpZHRoQW5kTWFyZ2lu KExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKIAotICAgICAgICBzdGF0aWMgSGVpZ2h0QW5k TWFyZ2luIGZsb2F0aW5nTm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYs IGNvbnN0IEJveCYpOwogICAgICAgICBzdGF0aWMgV2lkdGhBbmRNYXJnaW4gZmxvYXRpbmdOb25S ZXBsYWNlZFdpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmLCBjb25zdCBGb3JtYXR0aW5nQ29u dGV4dCYsIGNvbnN0IEJveCYpOwogCiAgICAgICAgIHN0YXRpYyBMYXlvdXRVbml0IHNocmlua1Rv Rml0V2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3Qg Qm94Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKaW5kZXggNzMxMzM4OGYyMjkxZTdlNzEzZWZjY2Q5NjkyMmZhNWJmNDBiN2Q3 Ny4uYTdhOGMyNzRjZjg5YWYwNjE3NDdjMTg1MTUwNWIyODQ5YTkyOGY3ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAt NTc0LDkgKzU3NCwxMSBAQCBIb3Jpem9udGFsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxHZW9tZQogICAgIHJldHVybiB7ICps ZWZ0LCAqcmlnaHQsIHsgd2lkdGgsIHsgKm1hcmdpbkxlZnQsICptYXJnaW5SaWdodCB9IH0gfTsK IH0KIAotSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRp bmdOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0 LCBjb25zdCBCb3gmIGxheW91dEJveCkKK0hlaWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNvbXBsaWNhdGVkQ2FzZXMoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4 dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7Ci0gICAgQVNTRVJUKGxheW91dEJveC5pc0Zsb2F0 aW5nUG9zaXRpb25lZCgpICYmICFsYXlvdXRCb3gucmVwbGFjZWQoKSk7CisgICAgQVNTRVJUKCFs YXlvdXRCb3gucmVwbGFjZWQoKSk7CisgICAgLy8gVE9ETzogVXNlIGNvbXBsaWNhdGVkLWNhc2Ug Zm9yIGRvY3VtZW50IHJlbmRlcmVyIGZvciBub3cgKHNlZSBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKS4KKyAgICBBU1NFUlQoKGxheW91dEJv eC5pc0Jsb2NrTGV2ZWxCb3goKSAmJiBsYXlvdXRCb3guaXNJbkZsb3coKSAmJiAhbGF5b3V0Qm94 LmlzT3ZlcmZsb3dWaXNpYmxlKCkpIHx8IGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgfHwg bGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzRG9jdW1lbnRC b3goKSk7CiAKICAgICAvLyAxMC42LjYgQ29tcGxpY2F0ZWQgY2FzZXMKICAgICAvLwpAQCAtNjg1 LDcgKzY4Nyw3IEBAIEhlaWdodEFuZE1hcmdpbiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmZsb2F0aW5nSGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRlCiAgICAgQVNTRVJUKGxheW91dEJv eC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKTsKIAogICAgIGlmICghbGF5b3V0Qm94LnJlcGxhY2Vk KCkpCi0gICAgICAgIHJldHVybiBmbG9hdGluZ05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxh eW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgICAgIHJldHVybiBjb21wbGljYXRlZENhc2Vz KGxheW91dENvbnRleHQsIGxheW91dEJveCk7CiAgICAgcmV0dXJuIGZsb2F0aW5nUmVwbGFjZWRI ZWlnaHRBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDhiNTI2NWExOTc5ODI2 ZGM0ZDI2OGNiMWYzMzI5ODFhNWE5NTMwNGYuLmE2ZDdmMDlmNDU2OGM0ODlhZjRhNzAwZTRiYWVi YWMwZTIwNmUwMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKQEAgLTYwLDYgKzYwLDcgQEAgc3RhdGljIGNvbnN0IENvbnRhaW5lciYgaW5pdGlhbENv bnRhaW5pbmdCbG9jayhjb25zdCBCb3gmIGxheW91dEJveCkKIEhlaWdodEFuZE1hcmdpbiBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRN YXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gp CiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5pc0luRmxvdygpICYmICFsYXlvdXRCb3gucmVwbGFj ZWQoKSk7CisgICAgQVNTRVJUKGxheW91dEJveC5pc092ZXJmbG93VmlzaWJsZSgpKTsKIAogICAg IGF1dG8gY29tcHV0ZSA9IFsmXSgpIC0+IEhlaWdodEFuZE1hcmdpbiB7CiAKQEAgLTM2NCwxMSAr MzY1LDE4IEBAIEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKExheW91dENvCiB7CiAgICAgQVNTRVJUKGxheW91dEJv eC5pc0luRmxvdygpKTsKIAotICAgIGlmICghbGF5b3V0Qm94LnJlcGxhY2VkKCkpCi0gICAgICAg IHJldHVybiBpbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBs YXlvdXRCb3gpOwogICAgIC8vIDEwLjYuMiBJbmxpbmUgcmVwbGFjZWQgZWxlbWVudHMsIGJsb2Nr LWxldmVsIHJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93LCAnaW5saW5lLWJsb2NrJwog ICAgIC8vIHJlcGxhY2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93IGFuZCBmbG9hdGluZyByZXBs YWNlZCBlbGVtZW50cwotICAgIHJldHVybiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Omlu bGluZVJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxheW91dEJveCk7Cisg ICAgaWYgKGxheW91dEJveC5yZXBsYWNlZCgpKQorICAgICAgICByZXR1cm4gRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250 ZXh0LCBsYXlvdXRCb3gpOworCisgICAgLy8gVE9ETzogRmlndXJlIG91dCB0aGUgY2FzZSBmb3Ig dGhlIGRvY3VtZW50IGVsZW1lbnQuIExldCdzIGp1c3QgY29tcGxpY2F0ZWQtY2FzZSBpdCBmb3Ig bm93LgorICAgIGlmIChsYXlvdXRCb3guaXNPdmVyZmxvd1Zpc2libGUoKSAmJiAhbGF5b3V0Qm94 LmlzRG9jdW1lbnRCb3goKSkKKyAgICAgICAgcmV0dXJuIGluRmxvd05vblJlcGxhY2VkSGVpZ2h0 QW5kTWFyZ2luKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisKKyAgICAvLyAxMC42LjYgQ29t cGxpY2F0ZWQgY2FzZXMKKyAgICAvLyBCbG9jay1sZXZlbCwgbm9uLXJlcGxhY2VkIGVsZW1lbnRz IGluIG5vcm1hbCBmbG93IHdoZW4gJ292ZXJmbG93JyBkb2VzIG5vdCBjb21wdXRlIHRvICd2aXNp YmxlJyAoZXhjZXB0IGlmIHRoZSAnb3ZlcmZsb3cnIHByb3BlcnR5J3MgdmFsdWUgaGFzIGJlZW4g cHJvcGFnYXRlZCB0byB0aGUgdmlld3BvcnQpLgorICAgIHJldHVybiBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNvbXBsaWNhdGVkQ2FzZXMobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsK IH0KIAogV2lkdGhBbmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Omlu Rmxvd1dpZHRoQW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJv eCYgbGF5b3V0Qm94KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91 dEJveC5jcHAKaW5kZXggMTNhODlkNDQyZTA2NjY5MjliY2Y5M2E3ZjIzNTE0Mjc2NzU2OWU4OS4u YjYwMjU2OTZkNmFiNDcxNzI5ZWE4NDQ4N2RhZjEyMTU0M2VmNWQzOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCkBAIC01NywxNiArNTcsMjAg QEAgYm9vbCBCb3g6OmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0CiAg ICAgLy8gSW5pdGlhbCBDb250YWluaW5nIEJsb2NrIGFsd2F5cyBjcmVhdGVzIGEgbmV3IChpbml0 YWwpIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dC4KICAgICBpZiAoIXBhcmVudCgpKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKKwogICAgIC8vIDkuNC4xIEJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMK ICAgICAvLyBGbG9hdHMsIGFic29sdXRlbHkgcG9zaXRpb25lZCBlbGVtZW50cywgYmxvY2sgY29u dGFpbmVycyAoc3VjaCBhcyBpbmxpbmUtYmxvY2tzLCB0YWJsZS1jZWxscywgYW5kIHRhYmxlLWNh cHRpb25zKQogICAgIC8vIHRoYXQgYXJlIG5vdCBibG9jayBib3hlcywgYW5kIGJsb2NrIGJveGVz IHdpdGggJ292ZXJmbG93JyBvdGhlciB0aGFuICd2aXNpYmxlJyAoZXhjZXB0IHdoZW4gdGhhdCB2 YWx1ZSBoYXMgYmVlbiBwcm9wYWdhdGVkIHRvIHRoZSB2aWV3cG9ydCkKICAgICAvLyBlc3RhYmxp c2ggbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMgZm9yIHRoZWlyIGNvbnRlbnRzLgogICAg IGlmIChpc0Zsb2F0aW5nUG9zaXRpb25lZCgpIHx8IGlzQWJzb2x1dGVseVBvc2l0aW9uZWQoKSkK ICAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBpZiAoaXNCbG9ja0NvbnRhaW5lckJveCgpICYm ICFpc0Jsb2NrTGV2ZWxCb3goKSkKICAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBpZiAoaXNC bG9ja0xldmVsQm94KCkgJiYgIWlzT3ZlcmZsb3dWaXNpYmxlKCkpCiAgICAgICAgIHJldHVybiB0 cnVlOworCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9s YXlvdXR0cmVlL0xheW91dEJveC5oCmluZGV4IGY4M2E3M2E5YmViZjJkOTUxNDk2YzFkN2E0MmQ3 NmMwNmM0ZTYwNmUuLmY1NDQ1MTViMzZhMWFjNmVlMzE0YjdiNjZhMjczYzVlMTcxMWI2N2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCkBAIC05NSw2 ICs5NSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzSW5saW5lQ29udGFpbmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9iYXNlVHlwZUZsYWdzICYgSW5saW5lQ29udGFpbmVyRmxhZzsgfQogCiAgICAgYm9v bCBpc1BhZGRpbmdBcHBsaWNhYmxlKCkgY29uc3Q7CisgICAgYm9vbCBpc092ZXJmbG93VmlzaWJs ZSgpIGNvbnN0OwogCiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKCkgY29uc3QgeyByZXR1 cm4gbV9zdHlsZTsgfQogCkBAIC0xMjUsOCArMTI2LDYgQEAgcHJvdGVjdGVkOgogICAgIH07CiAg ICAgQm94KHN0ZDo6b3B0aW9uYWw8RWxlbWVudEF0dHJpYnV0ZXM+LCBSZW5kZXJTdHlsZSYmLCBC YXNlVHlwZUZsYWdzKTsKIAotICAgIGJvb2wgaXNPdmVyZmxvd1Zpc2libGUoKSBjb25zdDsKLQog cHJpdmF0ZToKICAgICB2b2lkIHNldFBhcmVudChDb250YWluZXImIHBhcmVudCkgeyBtX3BhcmVu dCA9ICZwYXJlbnQ7IH0KICAgICB2b2lkIHNldE5leHRTaWJsaW5nKEJveCYgbmV4dFNpYmxpbmcp IHsgbV9uZXh0U2libGluZyA9ICZuZXh0U2libGluZzsgfQo= 346451 2018-08-02 21:26:00 -0700 2018-08-02 21:29:47 -0700 Patch bug-188296-20180802212600.patch text/plain 8814 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZjZjgzMzE3ZmU1OWU0 NzBiNTIzZTM5N2U4YjhlMDIwN2Y1YzFiZC4uM2ZkNDBlZTM1YTE3N2U1OTYxNzkzYmM1YzBjY2Ew ZDEwM2EwNTNkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA4LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBBcHBseSB0 aGUgIjEwLjYuNiBDb21wbGljYXRlZCBjYXNlcyIgd2hlbiBjb21wdXRpbmcgaGVpZ2h0IGFuZCBt YXJnaW4gZm9yIHRoZSBkb2N1bWVudCByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4Mjk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNwZWMgaXMgbm90IGNsZWFyIGFib3V0IHdoYXQg dG8gZG8gd2l0aCB0aGUgZG9jdW1lbnQgcmVuZGVyZXIuIEl0IGJlaGF2ZXMgYXMgaWYgaXQgd2Fz IGEgZm9ybWF0dGluZyBjb250ZXh0IHJvb3Qgd2hlbgorICAgICAgICBpdCBjb21lcyB0byBjb21w dXRpbmcgdGhlIGNvbnRlbnQgaGVpZ2h0LiBMZXQncyBhcHBseSAiMTAuNi42IENvbXBsaWNhdGVk IGNhc2VzIiBmb3Igbm93LiAKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5o OgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wbGlj YXRlZENhc2VzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpmbG9hdGluZ0hlaWdodEFuZE1hcmdpbik6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdOb25SZXBsYWNlZEhl aWdodEFuZE1hcmdpbik6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFj ZWRIZWlnaHRBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAg KiBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCb3g6OmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBjb25zdCk6CisgICAg ICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94Lmg6CisKIDIwMTgtMDgtMDIgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGbG9hdGluZ10gQWRk IEZsb2F0aW5nU3RhdGU6OmJvdHRvbSgpIHRvIGVuYWJsZSBjb250ZW50IGhlaWdodCBjb21wdXRh dGlvbiBmb3IgZm9ybWF0dGluZyByb290cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0LmgKaW5kZXggY2UyMDFjZmY2NGQ0NDM2ODRjYjMzYzEyZWU4NTUxZDIxNTJkYzMz YS4uNTcxMzlhNWU2ODQ3ZDgxYTA3NTUzMTllYzQ0NjFkMzhhZTRmZjAyNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTk3LDYgKzk3LDggQEAgcHJvdGVj dGVkOgogICAgICAgICBzdGF0aWMgV2lkdGhBbmRNYXJnaW4gaW5saW5lUmVwbGFjZWRXaWR0aEFu ZE1hcmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jiwgc3RkOjpvcHRpb25hbDxMYXlvdXRV bml0PiBwcmVjb21wdXRlZE1hcmdpbkxlZnQgPSB7IH0sCiAgICAgICAgICAgICBzdGQ6Om9wdGlv bmFsPExheW91dFVuaXQ+IHByZWNvbXB1dGVkTWFyZ2luUmlnaHQgPSB7IH0pOwogCisgICAgICAg IHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4gY29tcGxpY2F0ZWRDYXNlcyhMYXlvdXRDb250ZXh0Jiwg Y29uc3QgQm94Jik7CisKICAgICAgICAgc3RhdGljIEVkZ2VzIGNvbXB1dGVkQm9yZGVyKExheW91 dENvbnRleHQmLCBjb25zdCBCb3gmKTsKICAgICAgICAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8RWRn ZXM+IGNvbXB1dGVkUGFkZGluZyhMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CiAKQEAgLTEx Niw3ICsxMTgsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIHN0YXRpYyBIZWlnaHRBbmRNYXJnaW4g ZmxvYXRpbmdSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94 Jik7CiAgICAgICAgIHN0YXRpYyBXaWR0aEFuZE1hcmdpbiBmbG9hdGluZ1JlcGxhY2VkV2lkdGhB bmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogCi0gICAgICAgIHN0YXRpYyBI ZWlnaHRBbmRNYXJnaW4gZmxvYXRpbmdOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94Jik7CiAgICAgICAgIHN0YXRpYyBXaWR0aEFuZE1hcmdpbiBmbG9h dGluZ05vblJlcGxhY2VkV2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEZvcm1h dHRpbmdDb250ZXh0JiwgY29uc3QgQm94Jik7CiAKICAgICAgICAgc3RhdGljIExheW91dFVuaXQg c2hyaW5rVG9GaXRXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgRm9ybWF0dGluZ0NvbnRleHQm LCBjb25zdCBCb3gmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA3MzEzMzg4ZjIyOTFlN2U3MTNlZmNjZDk2OTIyZmE1 YmY0MGI3ZDc3Li5hN2E4YzI3NGNmODlhZjA2MTc0N2MxODUxNTA1YjI4NDlhOTI4ZjdkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCkBAIC01NzQsOSArNTc0LDExIEBAIEhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21lCiAgICAgcmV0 dXJuIHsgKmxlZnQsICpyaWdodCwgeyB3aWR0aCwgeyAqbWFyZ2luTGVmdCwgKm1hcmdpblJpZ2h0 IH0gfSB9OwogfQogCi1IZWlnaHRBbmRNYXJnaW4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpmbG9hdGluZ05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKExheW91dENvbnRleHQmIGxheW91 dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQorSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNlcyhMYXlvdXRDb250ZXh0JiBsYXlv dXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKIHsKLSAgICBBU1NFUlQobGF5b3V0Qm94 LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgJiYgIWxheW91dEJveC5yZXBsYWNlZCgpKTsKKyAgICBB U1NFUlQoIWxheW91dEJveC5yZXBsYWNlZCgpKTsKKyAgICAvLyBUT0RPOiBVc2UgY29tcGxpY2F0 ZWQtY2FzZSBmb3IgZG9jdW1lbnQgcmVuZGVyZXIgZm9yIG5vdyAoc2VlIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dIZWlnaHRBbmRNYXJnaW4pLgorICAgIEFTU0VSVCgo bGF5b3V0Qm94LmlzQmxvY2tMZXZlbEJveCgpICYmIGxheW91dEJveC5pc0luRmxvdygpICYmICFs YXlvdXRCb3guaXNPdmVyZmxvd1Zpc2libGUoKSkgfHwgbGF5b3V0Qm94LmlzSW5saW5lQmxvY2tC b3goKSB8fCBsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSB8fCBsYXlvdXRCb3guaXNE b2N1bWVudEJveCgpKTsKIAogICAgIC8vIDEwLjYuNiBDb21wbGljYXRlZCBjYXNlcwogICAgIC8v CkBAIC02ODUsNyArNjg3LDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6ZmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q29udGUKICAgICBBU1NFUlQo bGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpOwogCiAgICAgaWYgKCFsYXlvdXRCb3gu cmVwbGFjZWQoKSkKLSAgICAgICAgcmV0dXJuIGZsb2F0aW5nTm9uUmVwbGFjZWRIZWlnaHRBbmRN YXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICAgICAgcmV0dXJuIGNvbXBsaWNh dGVkQ2FzZXMobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKICAgICByZXR1cm4gZmxvYXRpbmdS ZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9y bWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggOGI1MjY1 YTE5Nzk4MjZkYzRkMjY4Y2IxZjMzMjk4MWE1YTk1MzA0Zi4uYTZkN2YwOWY0NTY4YzQ4OWFmNGE3 MDBlNGJhZWJhYzBlMjA2ZTAwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcApAQCAtNjAsNiArNjAsNyBAQCBzdGF0aWMgY29uc3QgQ29udGFpbmVyJiBp bml0aWFsQ29udGFpbmluZ0Jsb2NrKGNvbnN0IEJveCYgbGF5b3V0Qm94KQogSGVpZ2h0QW5kTWFy Z2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhl aWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxh eW91dEJveCkKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93KCkgJiYgIWxheW91dEJv eC5yZXBsYWNlZCgpKTsKKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzT3ZlcmZsb3dWaXNpYmxlKCkp OwogCiAgICAgYXV0byBjb21wdXRlID0gWyZdKCkgLT4gSGVpZ2h0QW5kTWFyZ2luIHsKIApAQCAt MzY0LDExICszNjUsMTggQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjppbkZsb3dIZWlnaHRBbmRNYXJnaW4oTGF5b3V0Q28KIHsKICAgICBBU1NFUlQo bGF5b3V0Qm94LmlzSW5GbG93KCkpOwogCi0gICAgaWYgKCFsYXlvdXRCb3gucmVwbGFjZWQoKSkK LSAgICAgICAgcmV0dXJuIGluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dENv bnRleHQsIGxheW91dEJveCk7CiAgICAgLy8gMTAuNi4yIElubGluZSByZXBsYWNlZCBlbGVtZW50 cywgYmxvY2stbGV2ZWwgcmVwbGFjZWQgZWxlbWVudHMgaW4gbm9ybWFsIGZsb3csICdpbmxpbmUt YmxvY2snCiAgICAgLy8gcmVwbGFjZWQgZWxlbWVudHMgaW4gbm9ybWFsIGZsb3cgYW5kIGZsb2F0 aW5nIHJlcGxhY2VkIGVsZW1lbnRzCi0gICAgcmV0dXJuIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6aW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0 Qm94KTsKKyAgICBpZiAobGF5b3V0Qm94LnJlcGxhY2VkKCkpCisgICAgICAgIHJldHVybiBGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmlubGluZVJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGxh eW91dENvbnRleHQsIGxheW91dEJveCk7CisKKyAgICAvLyBUT0RPOiBGaWd1cmUgb3V0IHRoZSBj YXNlIGZvciB0aGUgZG9jdW1lbnQgZWxlbWVudC4gTGV0J3MganVzdCBjb21wbGljYXRlZC1jYXNl IGl0IGZvciBub3cuCisgICAgaWYgKGxheW91dEJveC5pc092ZXJmbG93VmlzaWJsZSgpICYmICFs YXlvdXRCb3guaXNEb2N1bWVudEJveCgpKQorICAgICAgICByZXR1cm4gaW5GbG93Tm9uUmVwbGFj ZWRIZWlnaHRBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKKworICAgIC8vIDEw LjYuNiBDb21wbGljYXRlZCBjYXNlcworICAgIC8vIEJsb2NrLWxldmVsLCBub24tcmVwbGFjZWQg ZWxlbWVudHMgaW4gbm9ybWFsIGZsb3cgd2hlbiAnb3ZlcmZsb3cnIGRvZXMgbm90IGNvbXB1dGUg dG8gJ3Zpc2libGUnIChleGNlcHQgaWYgdGhlICdvdmVyZmxvdycgcHJvcGVydHkncyB2YWx1ZSBo YXMgYmVlbiBwcm9wYWdhdGVkIHRvIHRoZSB2aWV3cG9ydCkuCisgICAgcmV0dXJuIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNlcyhsYXlvdXRDb250ZXh0LCBsYXlv dXRCb3gpOwogfQogCiBXaWR0aEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6aW5GbG93V2lkdGhBbmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwg Y29uc3QgQm94JiBsYXlvdXRCb3gpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv bGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94LmNwcAppbmRleCAxM2E4OWQ0NDJlMDY2NjkyOWJjZjkzYTdmMjM1MTQyNzY3 NTY5ZTg5Li41ZmQ1ODI5MWMzMjA5OTA3MjA4NzhiNzMzMzgxNGQ1MzI3YTA1N2FkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAKQEAgLTU3LDE2 ICs1NywyMyBAQCBib29sIEJveDo6ZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkg Y29uc3QKICAgICAvLyBJbml0aWFsIENvbnRhaW5pbmcgQmxvY2sgYWx3YXlzIGNyZWF0ZXMgYSBu ZXcgKGluaXRhbCkgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0LgogICAgIGlmICghcGFyZW50KCkp CiAgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgLy8gOS40LjEgQmxvY2sgZm9ybWF0dGluZyBj b250ZXh0cwogICAgIC8vIEZsb2F0cywgYWJzb2x1dGVseSBwb3NpdGlvbmVkIGVsZW1lbnRzLCBi bG9jayBjb250YWluZXJzIChzdWNoIGFzIGlubGluZS1ibG9ja3MsIHRhYmxlLWNlbGxzLCBhbmQg dGFibGUtY2FwdGlvbnMpCiAgICAgLy8gdGhhdCBhcmUgbm90IGJsb2NrIGJveGVzLCBhbmQgYmxv Y2sgYm94ZXMgd2l0aCAnb3ZlcmZsb3cnIG90aGVyIHRoYW4gJ3Zpc2libGUnIChleGNlcHQgd2hl biB0aGF0IHZhbHVlIGhhcyBiZWVuIHByb3BhZ2F0ZWQgdG8gdGhlIHZpZXdwb3J0KQogICAgIC8v IGVzdGFibGlzaCBuZXcgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0cyBmb3IgdGhlaXIgY29udGVu dHMuCiAgICAgaWYgKGlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgfHwgaXNBYnNvbHV0ZWx5UG9zaXRp b25lZCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIGlmIChpc0Jsb2NrQ29udGFpbmVy Qm94KCkgJiYgIWlzQmxvY2tMZXZlbEJveCgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAg IGlmIChpc0Jsb2NrTGV2ZWxCb3goKSAmJiAhaXNPdmVyZmxvd1Zpc2libGUoKSkKICAgICAgICAg cmV0dXJuIHRydWU7CisKKyAgICBpZiAoaXNEb2N1bWVudEJveCgpKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKwogICAgIHJldHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv bGF5b3V0dHJlZS9MYXlvdXRCb3guaAppbmRleCBmODNhNzNhOWJlYmYyZDk1MTQ5NmMxZDdhNDJk NzZjMDZjNGU2MDZlLi5mNTQ0NTE1YjM2YTFhYzZlZTMxNGI3YjY2YTI3M2M1ZTE3MTFiNjdlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaApAQCAtOTUs NiArOTUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0lubGluZUNvbnRhaW5lcigpIGNvbnN0IHsg cmV0dXJuIG1fYmFzZVR5cGVGbGFncyAmIElubGluZUNvbnRhaW5lckZsYWc7IH0KIAogICAgIGJv b2wgaXNQYWRkaW5nQXBwbGljYWJsZSgpIGNvbnN0OworICAgIGJvb2wgaXNPdmVyZmxvd1Zpc2li bGUoKSBjb25zdDsKIAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSgpIGNvbnN0IHsgcmV0 dXJuIG1fc3R5bGU7IH0KIApAQCAtMTI1LDggKzEyNiw2IEBAIHByb3RlY3RlZDoKICAgICB9Owog ICAgIEJveChzdGQ6Om9wdGlvbmFsPEVsZW1lbnRBdHRyaWJ1dGVzPiwgUmVuZGVyU3R5bGUmJiwg QmFzZVR5cGVGbGFncyk7CiAKLSAgICBib29sIGlzT3ZlcmZsb3dWaXNpYmxlKCkgY29uc3Q7Ci0K IHByaXZhdGU6CiAgICAgdm9pZCBzZXRQYXJlbnQoQ29udGFpbmVyJiBwYXJlbnQpIHsgbV9wYXJl bnQgPSAmcGFyZW50OyB9CiAgICAgdm9pZCBzZXROZXh0U2libGluZyhCb3gmIG5leHRTaWJsaW5n KSB7IG1fbmV4dFNpYmxpbmcgPSAmbmV4dFNpYmxpbmc7IH0K