198889 2019-06-15 07:14:18 -0700 [LFC][Floats] Add bottom value to FloatingState::Constraints 2019-06-16 13:15:07 -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 1545022 0 zalan 2019-06-15 07:14:18 -0700 This is going to be used by inline layout to check where the next line is supposed to be. 1545023 1 webkit-bug-importer 2019-06-15 07:14:36 -0700 <rdar://problem/51776730> 1545026 2 372192 zalan 2019-06-15 07:34:40 -0700 Created attachment 372192 Patch 1545030 3 372193 zalan 2019-06-15 08:27:12 -0700 Created attachment 372193 Patch 1545044 4 372198 zalan 2019-06-15 12:36:46 -0700 Created attachment 372198 Patch 1545144 5 372198 koivisto 2019-06-16 12:19:15 -0700 Comment on attachment 372198 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372198&action=review > Source/WebCore/layout/LayoutUnits.h:63 > + void moveBy(LayoutSize); IntPoint calls this move. Generally it would be good to match existing interfaces unless there is a good reason not to. 1545162 6 zalan 2019-06-16 13:15:07 -0700 Committed r246482: <https://trac.webkit.org/changeset/246482> 372192 2019-06-15 07:34:40 -0700 2019-06-15 07:48:31 -0700 Patch bug-198889-20190615073439.patch text/plain 4178 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjMyOGJjYTFjOGQ0ZTJk ZWUwMzJkNTdkNWM3MGI5Y2QwMmM0MjExYi4uMDNiNmM4ZjQwMTdjNDg2YzhiMDdjZWM3OTlhYmMw NzAxMzhjOTJmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRmxvYXRzXSBBZGQg Ym90dG9tIHZhbHVlIHRvIEZsb2F0aW5nU3RhdGU6OkNvbnN0cmFpbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg4ODkKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUxNzc2NzMwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvbnN0cmFpbnRzOjpib3R0b20gaW5kaWNhdGVzIHdoZXJlIHRoaXMgcGFy dGljdWxhciBjb25zdHJhaW4gZW5kcy4gVGhpcyBpcyBnb2luZyB0byBiZSB1c2VkIGJ5IGlubGlu ZSBsYXlvdXQgdG8gZmlndXJlIHdoZXJlCisgICAgICAgIHRoZSBuZXh0IGxpbmUgc2hvdWxkIGdv ICh2ZXJ0aWNhbCBwb3NpdGlvbikuCisKKyAgICAgICAgKiBsYXlvdXQvZmxvYXRzL0Zsb2F0aW5n U3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdGluZ1N0YXRlOjpjb25z dHJhaW50cyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmg6 CisKIDIwMTktMDYtMTUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXSBBZGQgTGF5b3V0OjpCb3g6OmlzQ29udGFpbmluZ0Jsb2NrRGVzY2VuZGFudE9mCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nU3RhdGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmNwcAppbmRleCA3 NjUxZWM2OTZjNmRlMjc2MDZiNGQ5OTE2ODQwZTMzYzg5YzBjNjExLi4zMWFjMmFiZmQwNGQwNjkw ZmI2N2MyODNjYjgwOGQwNTIwM2Y4OGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZmxvYXRzL0Zsb2F0aW5nU3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m bG9hdHMvRmxvYXRpbmdTdGF0ZS5jcHAKQEAgLTExOSw5ICsxMTksMTIgQEAgRmxvYXRpbmdTdGF0 ZTo6Q29uc3RyYWludHMgRmxvYXRpbmdTdGF0ZTo6Y29uc3RyYWludHMoUG9zaXRpb25JbkNvbnRl eHRSb290IHZlcnQKICAgICAvLyAzLiBDb252ZXJ0IGxlZnQvcmlnaHQgcG9zaXRpb25zIGJhY2sg dG8gZm9ybWF0dGluZ0NvbnRleHRSb290J3MgY29vcmlkbmF0ZSBzeXN0ZW0uCiAgICAgYXV0byBj b29yZGluYXRlTWFwcGluZ0lzUmVxdWlyZWQgPSAmcm9vdCgpICE9ICZmb3JtYXR0aW5nQ29udGV4 dFJvb3Q7CiAgICAgYXV0byBhZGp1c3RlZFBvc2l0aW9uID0gUG9pbnQgeyAwLCB2ZXJ0aWNhbFBv c2l0aW9uIH07CisgICAgTGF5b3V0U2l6ZSBhZGp1c3RpbmdEZWx0YTsKIAotICAgIGlmIChjb29y ZGluYXRlTWFwcGluZ0lzUmVxdWlyZWQpCisgICAgaWYgKGNvb3JkaW5hdGVNYXBwaW5nSXNSZXF1 aXJlZCkgewogICAgICAgICBhZGp1c3RlZFBvc2l0aW9uID0gRm9ybWF0dGluZ0NvbnRleHQ6Om1h cFBvaW50VG9BbmNlc3RvcihtX2xheW91dFN0YXRlLCBhZGp1c3RlZFBvc2l0aW9uLCBkb3duY2Fz dDxDb250YWluZXI+KGZvcm1hdHRpbmdDb250ZXh0Um9vdCksIGRvd25jYXN0PENvbnRhaW5lcj4o cm9vdCgpKSk7CisgICAgICAgIGFkanVzdGluZ0RlbHRhID0geyBhZGp1c3RlZFBvc2l0aW9uLngs IGFkanVzdGVkUG9zaXRpb24ueSAtIHZlcnRpY2FsUG9zaXRpb24gfTsKKyAgICB9CiAKICAgICBD b25zdHJhaW50cyBjb25zdHJhaW50czsKICAgICBmb3IgKGludCBpbmRleCA9IG1fZmxvYXRzLnNp emUoKSAtIDE7IGluZGV4ID49IDA7IC0taW5kZXgpIHsKQEAgLTE0MSw2ICsxNDQsNyBAQCBGbG9h dGluZ1N0YXRlOjpDb25zdHJhaW50cyBGbG9hdGluZ1N0YXRlOjpjb25zdHJhaW50cyhQb3NpdGlv bkluQ29udGV4dFJvb3QgdmVydAogICAgICAgICAgICAgY29uc3RyYWludHMubGVmdCA9IFBvc2l0 aW9uSW5Db250ZXh0Um9vdCB7IHJlY3QucmlnaHQoKSB9OwogICAgICAgICBlbHNlCiAgICAgICAg ICAgICBjb25zdHJhaW50cy5yaWdodCA9IFBvc2l0aW9uSW5Db250ZXh0Um9vdCB7IHJlY3QubGVm dCgpIH07CisgICAgICAgIGNvbnN0cmFpbnRzLmJvdHRvbSA9IHN0ZDo6bWF4KFBvc2l0aW9uSW5D b250ZXh0Um9vdCB7IHJlY3QuYm90dG9tKCkgfSwgY29uc3RyYWludHMuYm90dG9tLnZhbHVlT3Io UG9zaXRpb25JbkNvbnRleHRSb290IHsgfSkpOwogCiAgICAgICAgIGlmIChjb25zdHJhaW50cy5s ZWZ0ICYmIGNvbnN0cmFpbnRzLnJpZ2h0KQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xNDgsMTIg KzE1MiwxNiBAQCBGbG9hdGluZ1N0YXRlOjpDb25zdHJhaW50cyBGbG9hdGluZ1N0YXRlOjpjb25z dHJhaW50cyhQb3NpdGlvbkluQ29udGV4dFJvb3QgdmVydAogCiAgICAgaWYgKGNvb3JkaW5hdGVN YXBwaW5nSXNSZXF1aXJlZCkgewogICAgICAgICBpZiAoY29uc3RyYWludHMubGVmdCkKLSAgICAg ICAgICAgIGNvbnN0cmFpbnRzLmxlZnQgPSBQb3NpdGlvbkluQ29udGV4dFJvb3QgeyAqY29uc3Ry YWludHMubGVmdCAtIGFkanVzdGVkUG9zaXRpb24ueCB9OworICAgICAgICAgICAgY29uc3RyYWlu dHMubGVmdCA9IFBvc2l0aW9uSW5Db250ZXh0Um9vdCB7ICpjb25zdHJhaW50cy5sZWZ0IC0gYWRq dXN0aW5nRGVsdGEud2lkdGgoKSB9OwogCiAgICAgICAgIGlmIChjb25zdHJhaW50cy5yaWdodCkK LSAgICAgICAgICAgIGNvbnN0cmFpbnRzLnJpZ2h0ID0gUG9zaXRpb25JbkNvbnRleHRSb290IHsg KmNvbnN0cmFpbnRzLnJpZ2h0IC0gYWRqdXN0ZWRQb3NpdGlvbi54IH07CisgICAgICAgICAgICBj b25zdHJhaW50cy5yaWdodCA9IFBvc2l0aW9uSW5Db250ZXh0Um9vdCB7ICpjb25zdHJhaW50cy5y aWdodCAtIGFkanVzdGluZ0RlbHRhLndpZHRoKCkgfTsKKworICAgICAgICBpZiAoY29uc3RyYWlu dHMuYm90dG9tKQorICAgICAgICAgICAgY29uc3RyYWludHMuYm90dG9tID0gUG9zaXRpb25JbkNv bnRleHRSb290IHsgKmNvbnN0cmFpbnRzLmJvdHRvbSAtIGFkanVzdGluZ0RlbHRhLmhlaWdodCgp IH07CiAgICAgfQogCisgICAgQVNTRVJUKCFjb25zdHJhaW50cy5ib3R0b20gfHwgKGNvbnN0cmFp bnRzLmxlZnQgfHwgY29uc3RyYWludHMucmlnaHQpKTsKICAgICByZXR1cm4gY29uc3RyYWludHM7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdT dGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKaW5k ZXggZjI1M2YyYzNlNGQ4ZGVjZTZhNTJlOGMwYTU2M2U2YTJhNGQ4N2Y0MS4uNGE2ODJmZWE5ZmQy NzdhM2RhMWY1ZmNhMGIzMWU4NWU4NGJmNmQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKQEAgLTYyLDYgKzYyLDggQEAgcHVibGljOgogICAgIHN0 cnVjdCBDb25zdHJhaW50cyB7CiAgICAgICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250ZXh0Um9v dD4gbGVmdDsKICAgICAgICAgT3B0aW9uYWw8UG9zaXRpb25JbkNvbnRleHRSb290PiByaWdodDsK KyAgICAgICAgLy8gRklYTUU6IGNvbnNpZGVyIGFkZGluZyBhIG1pbi9tYXggYm90dG9tIHRvIGJl IGFibGUgdG8gdGVsbCBpZiB0aGlzIGNvbnN0cmFpbnQgcGFpciBnZXRzIHdpZGVyIGF0IHNvbWUg dmVydGljYWwgcG9zaXRpb24uCisgICAgICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250ZXh0Um9v dD4gYm90dG9tOwogICAgIH07CiAgICAgQ29uc3RyYWludHMgY29uc3RyYWludHMoUG9zaXRpb25J bkNvbnRleHRSb290IHZlcnRpY2FsUG9zaXRpb24sIGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRl eHRSb290KSBjb25zdDsKIAo= 372193 2019-06-15 08:27:12 -0700 2019-06-15 12:36:45 -0700 Patch bug-198889-20190615082712.patch text/plain 8780 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjMyOGJjYTFjOGQ0ZTJk ZWUwMzJkNTdkNWM3MGI5Y2QwMmM0MjExYi4uZjM4OWEwYjE3YTVmMjY1MzM0Yjg5NGFiMTU1OWE5 ZGRmMWQ4NzI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRmxvYXRzXSBBZGQg Ym90dG9tIHZhbHVlIHRvIEZsb2F0aW5nU3RhdGU6OkNvbnN0cmFpbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg4ODkKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUxNzc2NzMwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvbnN0cmFpbnRzOjpsZWZ0L3JpZ2h0LT55IGluZGljYXRlcyB3aGVyZSB0 aGlzIHBhcnRpY3VsYXIgY29uc3RyYWluIGVuZHMuIFRoaXMgaXMgZ29pbmcgdG8gYmUgdXNlZCBi eSBpbmxpbmUgbGF5b3V0IHRvIGZpZ3VyZSB3aGVyZQorICAgICAgICB0aGUgbmV4dCBsaW5lIHNo b3VsZCBnbyAodmVydGljYWwgcG9zaXRpb24pLgorCisgICAgICAgICogbGF5b3V0L2Zsb2F0cy9G bG9hdGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRpbmdTdGF0 ZTo6Y29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxvYXRpbmdT dGF0ZS5oOgorCiAyMDE5LTA2LTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ10gQWRkIExheW91dDo6Qm94Ojppc0NvbnRhaW5pbmdCbG9ja0Rlc2NlbmRh bnRPZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaAppbmRleCAwODkyN2JmZmI1ZjNhM2M0 OTllMTRlM2MyMWUxY2JmOGJhM2Q2NTgxLi4yNDE5MzE0NWY5YTk3YmExYzRmM2I2ZDMzMGE3YTFm NzgzMGRiYjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaApAQCAtNjAsNiArNjAs NyBAQCBzdHJ1Y3QgUG9pbnQgewogICAgIFBvaW50KExheW91dFVuaXQsIExheW91dFVuaXQpOwog ICAgIFBvaW50KExheW91dFBvaW50KTsKICAgICB2b2lkIG1vdmVCeShMYXlvdXRQb2ludCk7Cisg ICAgdm9pZCBtb3ZlQnkoTGF5b3V0U2l6ZSk7CiAgICAgb3BlcmF0b3IgTGF5b3V0UG9pbnQoKSBj b25zdCB7IHJldHVybiB7IHgsIHkgfTsgfQogfTsKIApAQCAtODUsNiArODYsMTIgQEAgaW5saW5l IHZvaWQgUG9pbnQ6Om1vdmVCeShMYXlvdXRQb2ludCBvZmZzZXQpCiAgICAgeSArPSBvZmZzZXQu eSgpOwogfQogCitpbmxpbmUgdm9pZCBQb2ludDo6bW92ZUJ5KExheW91dFNpemUgb2Zmc2V0KQor eworICAgIHggKz0gb2Zmc2V0LndpZHRoKCk7CisgICAgeSArPSBvZmZzZXQuaGVpZ2h0KCk7Cit9 CisKIC8vIE1hcmdpbiwgYm9yZGVyLCBwYWRkaW5nCiBzdHJ1Y3QgSG9yaXpvbnRhbEVkZ2VzIHsK ICAgICBMYXlvdXRVbml0IGxlZnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRl eCAxM2Q2MzZjMjdmOGJmYjJkN2Y4ZTdkZDg1ZWY2NWYyN2UwNGZmYmJjLi5jNDlmOTIyNDE2NDAz OWI1NDgxZmE3ZTc5NTYyZTY3NTNlNjU0ZTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHAKQEAgLTE0OCw4ICsxNDgsMTAgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6dXNlZEF2YWlsYWJsZVdpZHRoRm9yRmxvYXRBdm9pZGVyKGMKICAgICBh dXRvIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCA9IGNvbnRhaW5pbmdCbG9ja1JpZ2h0 IC0gY29udGFpbmluZ0Jsb2NrRGlzcGxheUJveC5ib3JkZXJSaWdodCgpICsgY29udGFpbmluZ0Js b2NrRGlzcGxheUJveC5wYWRkaW5nUmlnaHQoKS52YWx1ZU9yKDApOwogCiAgICAgLy8gU2hyaW5r IHRoZSBhdmFpbGFibGUgc3BhY2UgaWYgdGhlIGZsb2F0cyBhcmUgYWN0dWFsbHkgaW50cnVkaW5n IGF0IHRoaXMgdmVydGljYWwgcG9zaXRpb24uCi0gICAgYXZhaWxhYmxlV2lkdGggLT0gKHN0ZDo6 bWF4PExheW91dFVuaXQ+KDAsIGNvbnN0cmFpbnRzLmxlZnQudmFsdWVPcihQb3NpdGlvbkluQ29u dGV4dFJvb3QgeyAwIH0pIC0gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQpCi0gICAgICAg ICsgc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgY29udGFpbmluZ0Jsb2NrQ29udGVudEJveFJpZ2h0 IC0gY29uc3RyYWludHMucmlnaHQudmFsdWVPcihQb3NpdGlvbkluQ29udGV4dFJvb3QgeyBjb250 YWluaW5nQmxvY2tDb250ZW50Qm94UmlnaHQgfSkpKTsKKyAgICBpZiAoY29uc3RyYWludHMubGVm dCkKKyAgICAgICAgYXZhaWxhYmxlV2lkdGggLT0gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgY29u c3RyYWludHMubGVmdC0+eCAtIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hMZWZ0KTsKKyAgICBp ZiAoY29uc3RyYWludHMucmlnaHQpCisgICAgICAgIGF2YWlsYWJsZVdpZHRoIC09IHN0ZDo6bWF4 PExheW91dFVuaXQ+KDAsIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCAtIGNvbnN0cmFp bnRzLnJpZ2h0LT54KTsKICAgICByZXR1cm4gYXZhaWxhYmxlV2lkdGg7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdTdGF0ZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nU3RhdGUuY3BwCmluZGV4IDc2NTFlYzY5 NmM2ZGUyNzYwNmI0ZDk5MTY4NDBlMzNjODljMGM2MTEuLjUwZDI0ZWUyNmI4Y2M0NjQzZjBkYmZm NWJmYTFiOGE5ZTM1ODJlY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9h dHMvRmxvYXRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9G bG9hdGluZ1N0YXRlLmNwcApAQCAtMTE5LDkgKzExOSwxMiBAQCBGbG9hdGluZ1N0YXRlOjpDb25z dHJhaW50cyBGbG9hdGluZ1N0YXRlOjpjb25zdHJhaW50cyhQb3NpdGlvbkluQ29udGV4dFJvb3Qg dmVydAogICAgIC8vIDMuIENvbnZlcnQgbGVmdC9yaWdodCBwb3NpdGlvbnMgYmFjayB0byBmb3Jt YXR0aW5nQ29udGV4dFJvb3QncyBjb29yaWRuYXRlIHN5c3RlbS4KICAgICBhdXRvIGNvb3JkaW5h dGVNYXBwaW5nSXNSZXF1aXJlZCA9ICZyb290KCkgIT0gJmZvcm1hdHRpbmdDb250ZXh0Um9vdDsK ICAgICBhdXRvIGFkanVzdGVkUG9zaXRpb24gPSBQb2ludCB7IDAsIHZlcnRpY2FsUG9zaXRpb24g fTsKKyAgICBMYXlvdXRTaXplIGFkanVzdGluZ0RlbHRhOwogCi0gICAgaWYgKGNvb3JkaW5hdGVN YXBwaW5nSXNSZXF1aXJlZCkKKyAgICBpZiAoY29vcmRpbmF0ZU1hcHBpbmdJc1JlcXVpcmVkKSB7 CiAgICAgICAgIGFkanVzdGVkUG9zaXRpb24gPSBGb3JtYXR0aW5nQ29udGV4dDo6bWFwUG9pbnRU b0FuY2VzdG9yKG1fbGF5b3V0U3RhdGUsIGFkanVzdGVkUG9zaXRpb24sIGRvd25jYXN0PENvbnRh aW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSwgZG93bmNhc3Q8Q29udGFpbmVyPihyb290KCkp KTsKKyAgICAgICAgYWRqdXN0aW5nRGVsdGEgPSB7IGFkanVzdGVkUG9zaXRpb24ueCwgYWRqdXN0 ZWRQb3NpdGlvbi55IC0gdmVydGljYWxQb3NpdGlvbiB9OworICAgIH0KIAogICAgIENvbnN0cmFp bnRzIGNvbnN0cmFpbnRzOwogICAgIGZvciAoaW50IGluZGV4ID0gbV9mbG9hdHMuc2l6ZSgpIC0g MTsgaW5kZXggPj0gMDsgLS1pbmRleCkgewpAQCAtMTM4LDkgKzE0MSw5IEBAIEZsb2F0aW5nU3Rh dGU6OkNvbnN0cmFpbnRzIEZsb2F0aW5nU3RhdGU6OmNvbnN0cmFpbnRzKFBvc2l0aW9uSW5Db250 ZXh0Um9vdCB2ZXJ0CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoZmxvYXRJ dGVtLmlzTGVmdFBvc2l0aW9uZWQoKSkKLSAgICAgICAgICAgIGNvbnN0cmFpbnRzLmxlZnQgPSBQ b3NpdGlvbkluQ29udGV4dFJvb3QgeyByZWN0LnJpZ2h0KCkgfTsKKyAgICAgICAgICAgIGNvbnN0 cmFpbnRzLmxlZnQgPSBQb2ludEluQ29udGV4dFJvb3QgeyByZWN0LnJpZ2h0KCksIHJlY3QuYm90 dG9tKCkgfTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgY29uc3RyYWludHMucmlnaHQgPSBQ b3NpdGlvbkluQ29udGV4dFJvb3QgeyByZWN0LmxlZnQoKSB9OworICAgICAgICAgICAgY29uc3Ry YWludHMucmlnaHQgPSBQb2ludEluQ29udGV4dFJvb3QgeyByZWN0LmxlZnQoKSwgcmVjdC5ib3R0 b20oKSB9OwogCiAgICAgICAgIGlmIChjb25zdHJhaW50cy5sZWZ0ICYmIGNvbnN0cmFpbnRzLnJp Z2h0KQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xNDgsMTIgKzE1MSwxMSBAQCBGbG9hdGluZ1N0 YXRlOjpDb25zdHJhaW50cyBGbG9hdGluZ1N0YXRlOjpjb25zdHJhaW50cyhQb3NpdGlvbkluQ29u dGV4dFJvb3QgdmVydAogCiAgICAgaWYgKGNvb3JkaW5hdGVNYXBwaW5nSXNSZXF1aXJlZCkgewog ICAgICAgICBpZiAoY29uc3RyYWludHMubGVmdCkKLSAgICAgICAgICAgIGNvbnN0cmFpbnRzLmxl ZnQgPSBQb3NpdGlvbkluQ29udGV4dFJvb3QgeyAqY29uc3RyYWludHMubGVmdCAtIGFkanVzdGVk UG9zaXRpb24ueCB9OworICAgICAgICAgICAgY29uc3RyYWludHMubGVmdC0+bW92ZUJ5KC1hZGp1 c3RpbmdEZWx0YSk7CiAKICAgICAgICAgaWYgKGNvbnN0cmFpbnRzLnJpZ2h0KQotICAgICAgICAg ICAgY29uc3RyYWludHMucmlnaHQgPSBQb3NpdGlvbkluQ29udGV4dFJvb3QgeyAqY29uc3RyYWlu dHMucmlnaHQgLSBhZGp1c3RlZFBvc2l0aW9uLnggfTsKKyAgICAgICAgICAgIGNvbnN0cmFpbnRz LnJpZ2h0LT5tb3ZlQnkoLWFkanVzdGluZ0RlbHRhKTsKICAgICB9Ci0KICAgICByZXR1cm4gY29u c3RyYWludHM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMv RmxvYXRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0 YXRlLmgKaW5kZXggZjI1M2YyYzNlNGQ4ZGVjZTZhNTJlOGMwYTU2M2U2YTJhNGQ4N2Y0MS4uN2U0 OTFkYmI2NjQ4NGUyZTg4Y2YxN2I1YmE1MTIwM2Y4YWZhNzBmMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKQEAgLTYwLDggKzYwLDggQEAgcHVibGlj OgogICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250ZXh0Um9vdD4gYm90dG9tKGNvbnN0IEJveCYg Zm9ybWF0dGluZ0NvbnRleHRSb290KSBjb25zdDsKIAogICAgIHN0cnVjdCBDb25zdHJhaW50cyB7 Ci0gICAgICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250ZXh0Um9vdD4gbGVmdDsKLSAgICAgICAg T3B0aW9uYWw8UG9zaXRpb25JbkNvbnRleHRSb290PiByaWdodDsKKyAgICAgICAgT3B0aW9uYWw8 UG9pbnRJbkNvbnRleHRSb290PiBsZWZ0OworICAgICAgICBPcHRpb25hbDxQb2ludEluQ29udGV4 dFJvb3Q+IHJpZ2h0OwogICAgIH07CiAgICAgQ29uc3RyYWludHMgY29uc3RyYWludHMoUG9zaXRp b25JbkNvbnRleHRSb290IHZlcnRpY2FsUG9zaXRpb24sIGNvbnN0IEJveCYgZm9ybWF0dGluZ0Nv bnRleHRSb290KSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0TGluZUxheW91dC5jcHAKaW5kZXggMjAzMmNhZjY3NmVmMzM2MjQ0YjMyMjY5N2YwMDkwNTI0 ZjU2MmEwMi4uNjJjZTIzYjRkNjg0YTE0YzY1MTNkZDc4ZTg5OGIxNGZjOTllM2RjYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCkBAIC0y MzAsMjMgKzIzMCwyMyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0 OjpsYXlvdXQoTGF5b3V0VW5pdCB3aWR0aENvbnN0cmFpbnQpIGNvbgogICAgICAgICBhdXRvIGxp bmVMb2dpY2FsTGVmdCA9IGxpbmVIb3Jpem9udGFsQ29uc3RyYWludC5sb2dpY2FsVG9wTGVmdC54 KCk7CiAgICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IG1fZmxvYXRpbmdTdGF0ZS5jb25z dHJhaW50cyh7IGxpbmVMb2dpY2FsVG9wIH0sIG1fZm9ybWF0dGluZ1Jvb3QpOwogICAgICAgICAv LyBDaGVjayBpZiB0aGVzZSBjb25zdHJhaW50cyBhY3R1YWxseSBwdXQgbGltaXRhdGlvbiBvbiB0 aGUgbGluZS4KLSAgICAgICAgaWYgKGZsb2F0Q29uc3RyYWludHMubGVmdCAmJiAqZmxvYXRDb25z dHJhaW50cy5sZWZ0IDw9IGZvcm1hdHRpbmdSb290RGlzcGxheUJveC5jb250ZW50Qm94TGVmdCgp KQorICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZsb2F0Q29uc3RyYWludHMu bGVmdC0+eCA8PSBmb3JtYXR0aW5nUm9vdERpc3BsYXlCb3guY29udGVudEJveExlZnQoKSkKICAg ICAgICAgICAgIGZsb2F0Q29uc3RyYWludHMubGVmdCA9IHsgfTsKIAotICAgICAgICBpZiAoZmxv YXRDb25zdHJhaW50cy5yaWdodCAmJiAqZmxvYXRDb25zdHJhaW50cy5yaWdodCA+PSBmb3JtYXR0 aW5nUm9vdERpc3BsYXlCb3guY29udGVudEJveFJpZ2h0KCkpCisgICAgICAgIGlmIChmbG9hdENv bnN0cmFpbnRzLnJpZ2h0ICYmIGZsb2F0Q29uc3RyYWludHMucmlnaHQtPnggPj0gZm9ybWF0dGlu Z1Jvb3REaXNwbGF5Qm94LmNvbnRlbnRCb3hSaWdodCgpKQogICAgICAgICAgICAgZmxvYXRDb25z dHJhaW50cy5yaWdodCA9IHsgfTsKIAogICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0 ICYmIGZsb2F0Q29uc3RyYWludHMucmlnaHQpIHsKLSAgICAgICAgICAgIEFTU0VSVCgqZmxvYXRD b25zdHJhaW50cy5sZWZ0IDwgKmZsb2F0Q29uc3RyYWludHMucmlnaHQpOwotICAgICAgICAgICAg YXZhaWxhYmxlV2lkdGggPSAqZmxvYXRDb25zdHJhaW50cy5yaWdodCAtICpmbG9hdENvbnN0cmFp bnRzLmxlZnQ7Ci0gICAgICAgICAgICBsaW5lTG9naWNhbExlZnQgPSAqZmxvYXRDb25zdHJhaW50 cy5sZWZ0OworICAgICAgICAgICAgQVNTRVJUKGZsb2F0Q29uc3RyYWludHMubGVmdC0+eCA8IGZs b2F0Q29uc3RyYWludHMucmlnaHQtPngpOworICAgICAgICAgICAgYXZhaWxhYmxlV2lkdGggPSBm bG9hdENvbnN0cmFpbnRzLnJpZ2h0LT54IC0gZmxvYXRDb25zdHJhaW50cy5sZWZ0LT54OworICAg ICAgICAgICAgbGluZUxvZ2ljYWxMZWZ0ID0gZmxvYXRDb25zdHJhaW50cy5sZWZ0LT54OwogICAg ICAgICB9IGVsc2UgaWYgKGZsb2F0Q29uc3RyYWludHMubGVmdCkgewotICAgICAgICAgICAgQVNT RVJUKCpmbG9hdENvbnN0cmFpbnRzLmxlZnQgPiBsaW5lTG9naWNhbExlZnQpOwotICAgICAgICAg ICAgYXZhaWxhYmxlV2lkdGggLT0gKCpmbG9hdENvbnN0cmFpbnRzLmxlZnQgLSBsaW5lTG9naWNh bExlZnQpOwotICAgICAgICAgICAgbGluZUxvZ2ljYWxMZWZ0ID0gKmZsb2F0Q29uc3RyYWludHMu bGVmdDsKKyAgICAgICAgICAgIEFTU0VSVChmbG9hdENvbnN0cmFpbnRzLmxlZnQtPnggPiBsaW5l TG9naWNhbExlZnQpOworICAgICAgICAgICAgYXZhaWxhYmxlV2lkdGggLT0gKGZsb2F0Q29uc3Ry YWludHMubGVmdC0+eCAtIGxpbmVMb2dpY2FsTGVmdCk7CisgICAgICAgICAgICBsaW5lTG9naWNh bExlZnQgPSBmbG9hdENvbnN0cmFpbnRzLmxlZnQtPng7CiAgICAgICAgIH0gZWxzZSBpZiAoZmxv YXRDb25zdHJhaW50cy5yaWdodCkgewotICAgICAgICAgICAgQVNTRVJUKCpmbG9hdENvbnN0cmFp bnRzLnJpZ2h0ID4gbGluZUxvZ2ljYWxMZWZ0KTsKLSAgICAgICAgICAgIGF2YWlsYWJsZVdpZHRo ID0gKmZsb2F0Q29uc3RyYWludHMucmlnaHQgLSBsaW5lTG9naWNhbExlZnQ7CisgICAgICAgICAg ICBBU1NFUlQoZmxvYXRDb25zdHJhaW50cy5yaWdodC0+eCA+IGxpbmVMb2dpY2FsTGVmdCk7Cisg ICAgICAgICAgICBhdmFpbGFibGVXaWR0aCA9IGZsb2F0Q29uc3RyYWludHMucmlnaHQtPnggLSBs aW5lTG9naWNhbExlZnQ7CiAgICAgICAgIH0KICAgICAgICAgbGluZUhvcml6b250YWxDb25zdHJh aW50LmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCA9IGF2YWlsYWJsZVdpZHRoOwogICAgICAgICBsaW5l SG9yaXpvbnRhbENvbnN0cmFpbnQubG9naWNhbFRvcExlZnQuc2V0WChsaW5lTG9naWNhbExlZnQp Owo= 372198 2019-06-15 12:36:46 -0700 2019-06-16 12:19:15 -0700 Patch bug-198889-20190615123646.patch text/plain 8780 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJkMzg2ZTQxOGI3MjJk ODRlZGI0MWFlOTQ1NjU5ZmZhYTdiMDBjZC4uY2EyYjZmYzNjNGUyZjUzNzc3ZThjYzZkOWM3NDQ0 NGUwNWZkY2IxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bRmxvYXRzXSBBZGQg Ym90dG9tIHZhbHVlIHRvIEZsb2F0aW5nU3RhdGU6OkNvbnN0cmFpbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg4ODkKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzUxNzc2NzMwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENvbnN0cmFpbnRzOjpsZWZ0L3JpZ2h0LT55IGluZGljYXRlcyB3aGVyZSB0 aGlzIHBhcnRpY3VsYXIgY29uc3RyYWluIGVuZHMuIFRoaXMgaXMgZ29pbmcgdG8gYmUgdXNlZCBi eSBpbmxpbmUgbGF5b3V0IHRvIGZpZ3VyZSB3aGVyZQorICAgICAgICB0aGUgbmV4dCBsaW5lIHNo b3VsZCBnbyAodmVydGljYWwgcG9zaXRpb24pLgorCisgICAgICAgICogbGF5b3V0L2Zsb2F0cy9G bG9hdGluZ1N0YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRpbmdTdGF0 ZTo6Y29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxvYXRpbmdT dGF0ZS5oOgorCiAyMDE5LTA2LTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ10gQWRkIExheW91dDo6Qm94Ojppc0NvbnRhaW5pbmdCbG9ja0Rlc2NlbmRh bnRPZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaAppbmRleCAwODkyN2JmZmI1ZjNhM2M0 OTllMTRlM2MyMWUxY2JmOGJhM2Q2NTgxLi4yNDE5MzE0NWY5YTk3YmExYzRmM2I2ZDMzMGE3YTFm NzgzMGRiYjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0VW5pdHMuaApAQCAtNjAsNiArNjAs NyBAQCBzdHJ1Y3QgUG9pbnQgewogICAgIFBvaW50KExheW91dFVuaXQsIExheW91dFVuaXQpOwog ICAgIFBvaW50KExheW91dFBvaW50KTsKICAgICB2b2lkIG1vdmVCeShMYXlvdXRQb2ludCk7Cisg ICAgdm9pZCBtb3ZlQnkoTGF5b3V0U2l6ZSk7CiAgICAgb3BlcmF0b3IgTGF5b3V0UG9pbnQoKSBj b25zdCB7IHJldHVybiB7IHgsIHkgfTsgfQogfTsKIApAQCAtODUsNiArODYsMTIgQEAgaW5saW5l IHZvaWQgUG9pbnQ6Om1vdmVCeShMYXlvdXRQb2ludCBvZmZzZXQpCiAgICAgeSArPSBvZmZzZXQu eSgpOwogfQogCitpbmxpbmUgdm9pZCBQb2ludDo6bW92ZUJ5KExheW91dFNpemUgb2Zmc2V0KQor eworICAgIHggKz0gb2Zmc2V0LndpZHRoKCk7CisgICAgeSArPSBvZmZzZXQuaGVpZ2h0KCk7Cit9 CisKIC8vIE1hcmdpbiwgYm9yZGVyLCBwYWRkaW5nCiBzdHJ1Y3QgSG9yaXpvbnRhbEVkZ2VzIHsK ICAgICBMYXlvdXRVbml0IGxlZnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRl eCBlYzA5Njk3Yjk3MzExODdlZmFlYjZiNTMyYTJjMDM5YzY2NzcwOTU0Li40MmM2ZmQ4MzM4ODU3 MmQwMWRkYjYwMDQwMDc4Y2M3N2RmNmE4YTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHAKQEAgLTE0OCw4ICsxNDgsMTAgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6dXNlZEF2YWlsYWJsZVdpZHRoRm9yRmxvYXRBdm9pZGVyKGMKICAgICBh dXRvIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCA9IGNvbnRhaW5pbmdCbG9ja1JpZ2h0 IC0gY29udGFpbmluZ0Jsb2NrRGlzcGxheUJveC5ib3JkZXJSaWdodCgpICsgY29udGFpbmluZ0Js b2NrRGlzcGxheUJveC5wYWRkaW5nUmlnaHQoKS52YWx1ZU9yKDApOwogCiAgICAgLy8gU2hyaW5r IHRoZSBhdmFpbGFibGUgc3BhY2UgaWYgdGhlIGZsb2F0cyBhcmUgYWN0dWFsbHkgaW50cnVkaW5n IGF0IHRoaXMgdmVydGljYWwgcG9zaXRpb24uCi0gICAgYXZhaWxhYmxlV2lkdGggLT0gKHN0ZDo6 bWF4PExheW91dFVuaXQ+KDAsIGNvbnN0cmFpbnRzLmxlZnQudmFsdWVPcihQb3NpdGlvbkluQ29u dGV4dFJvb3QgeyAwIH0pIC0gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveExlZnQpCi0gICAgICAg ICsgc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgY29udGFpbmluZ0Jsb2NrQ29udGVudEJveFJpZ2h0 IC0gY29uc3RyYWludHMucmlnaHQudmFsdWVPcihQb3NpdGlvbkluQ29udGV4dFJvb3QgeyBjb250 YWluaW5nQmxvY2tDb250ZW50Qm94UmlnaHQgfSkpKTsKKyAgICBpZiAoY29uc3RyYWludHMubGVm dCkKKyAgICAgICAgYXZhaWxhYmxlV2lkdGggLT0gc3RkOjptYXg8TGF5b3V0VW5pdD4oMCwgY29u c3RyYWludHMubGVmdC0+eCAtIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hMZWZ0KTsKKyAgICBp ZiAoY29uc3RyYWludHMucmlnaHQpCisgICAgICAgIGF2YWlsYWJsZVdpZHRoIC09IHN0ZDo6bWF4 PExheW91dFVuaXQ+KDAsIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3hSaWdodCAtIGNvbnN0cmFp bnRzLnJpZ2h0LT54KTsKICAgICByZXR1cm4gYXZhaWxhYmxlV2lkdGg7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdTdGF0ZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nU3RhdGUuY3BwCmluZGV4IDc2NTFlYzY5 NmM2ZGUyNzYwNmI0ZDk5MTY4NDBlMzNjODljMGM2MTEuLjUwZDI0ZWUyNmI4Y2M0NjQzZjBkYmZm NWJmYTFiOGE5ZTM1ODJlY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9h dHMvRmxvYXRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9G bG9hdGluZ1N0YXRlLmNwcApAQCAtMTE5LDkgKzExOSwxMiBAQCBGbG9hdGluZ1N0YXRlOjpDb25z dHJhaW50cyBGbG9hdGluZ1N0YXRlOjpjb25zdHJhaW50cyhQb3NpdGlvbkluQ29udGV4dFJvb3Qg dmVydAogICAgIC8vIDMuIENvbnZlcnQgbGVmdC9yaWdodCBwb3NpdGlvbnMgYmFjayB0byBmb3Jt YXR0aW5nQ29udGV4dFJvb3QncyBjb29yaWRuYXRlIHN5c3RlbS4KICAgICBhdXRvIGNvb3JkaW5h dGVNYXBwaW5nSXNSZXF1aXJlZCA9ICZyb290KCkgIT0gJmZvcm1hdHRpbmdDb250ZXh0Um9vdDsK ICAgICBhdXRvIGFkanVzdGVkUG9zaXRpb24gPSBQb2ludCB7IDAsIHZlcnRpY2FsUG9zaXRpb24g fTsKKyAgICBMYXlvdXRTaXplIGFkanVzdGluZ0RlbHRhOwogCi0gICAgaWYgKGNvb3JkaW5hdGVN YXBwaW5nSXNSZXF1aXJlZCkKKyAgICBpZiAoY29vcmRpbmF0ZU1hcHBpbmdJc1JlcXVpcmVkKSB7 CiAgICAgICAgIGFkanVzdGVkUG9zaXRpb24gPSBGb3JtYXR0aW5nQ29udGV4dDo6bWFwUG9pbnRU b0FuY2VzdG9yKG1fbGF5b3V0U3RhdGUsIGFkanVzdGVkUG9zaXRpb24sIGRvd25jYXN0PENvbnRh aW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSwgZG93bmNhc3Q8Q29udGFpbmVyPihyb290KCkp KTsKKyAgICAgICAgYWRqdXN0aW5nRGVsdGEgPSB7IGFkanVzdGVkUG9zaXRpb24ueCwgYWRqdXN0 ZWRQb3NpdGlvbi55IC0gdmVydGljYWxQb3NpdGlvbiB9OworICAgIH0KIAogICAgIENvbnN0cmFp bnRzIGNvbnN0cmFpbnRzOwogICAgIGZvciAoaW50IGluZGV4ID0gbV9mbG9hdHMuc2l6ZSgpIC0g MTsgaW5kZXggPj0gMDsgLS1pbmRleCkgewpAQCAtMTM4LDkgKzE0MSw5IEBAIEZsb2F0aW5nU3Rh dGU6OkNvbnN0cmFpbnRzIEZsb2F0aW5nU3RhdGU6OmNvbnN0cmFpbnRzKFBvc2l0aW9uSW5Db250 ZXh0Um9vdCB2ZXJ0CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoZmxvYXRJ dGVtLmlzTGVmdFBvc2l0aW9uZWQoKSkKLSAgICAgICAgICAgIGNvbnN0cmFpbnRzLmxlZnQgPSBQ b3NpdGlvbkluQ29udGV4dFJvb3QgeyByZWN0LnJpZ2h0KCkgfTsKKyAgICAgICAgICAgIGNvbnN0 cmFpbnRzLmxlZnQgPSBQb2ludEluQ29udGV4dFJvb3QgeyByZWN0LnJpZ2h0KCksIHJlY3QuYm90 dG9tKCkgfTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgY29uc3RyYWludHMucmlnaHQgPSBQ b3NpdGlvbkluQ29udGV4dFJvb3QgeyByZWN0LmxlZnQoKSB9OworICAgICAgICAgICAgY29uc3Ry YWludHMucmlnaHQgPSBQb2ludEluQ29udGV4dFJvb3QgeyByZWN0LmxlZnQoKSwgcmVjdC5ib3R0 b20oKSB9OwogCiAgICAgICAgIGlmIChjb25zdHJhaW50cy5sZWZ0ICYmIGNvbnN0cmFpbnRzLnJp Z2h0KQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xNDgsMTIgKzE1MSwxMSBAQCBGbG9hdGluZ1N0 YXRlOjpDb25zdHJhaW50cyBGbG9hdGluZ1N0YXRlOjpjb25zdHJhaW50cyhQb3NpdGlvbkluQ29u dGV4dFJvb3QgdmVydAogCiAgICAgaWYgKGNvb3JkaW5hdGVNYXBwaW5nSXNSZXF1aXJlZCkgewog ICAgICAgICBpZiAoY29uc3RyYWludHMubGVmdCkKLSAgICAgICAgICAgIGNvbnN0cmFpbnRzLmxl ZnQgPSBQb3NpdGlvbkluQ29udGV4dFJvb3QgeyAqY29uc3RyYWludHMubGVmdCAtIGFkanVzdGVk UG9zaXRpb24ueCB9OworICAgICAgICAgICAgY29uc3RyYWludHMubGVmdC0+bW92ZUJ5KC1hZGp1 c3RpbmdEZWx0YSk7CiAKICAgICAgICAgaWYgKGNvbnN0cmFpbnRzLnJpZ2h0KQotICAgICAgICAg ICAgY29uc3RyYWludHMucmlnaHQgPSBQb3NpdGlvbkluQ29udGV4dFJvb3QgeyAqY29uc3RyYWlu dHMucmlnaHQgLSBhZGp1c3RlZFBvc2l0aW9uLnggfTsKKyAgICAgICAgICAgIGNvbnN0cmFpbnRz LnJpZ2h0LT5tb3ZlQnkoLWFkanVzdGluZ0RlbHRhKTsKICAgICB9Ci0KICAgICByZXR1cm4gY29u c3RyYWludHM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMv RmxvYXRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0 YXRlLmgKaW5kZXggZjI1M2YyYzNlNGQ4ZGVjZTZhNTJlOGMwYTU2M2U2YTJhNGQ4N2Y0MS4uN2U0 OTFkYmI2NjQ4NGUyZTg4Y2YxN2I1YmE1MTIwM2Y4YWZhNzBmMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKQEAgLTYwLDggKzYwLDggQEAgcHVibGlj OgogICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250ZXh0Um9vdD4gYm90dG9tKGNvbnN0IEJveCYg Zm9ybWF0dGluZ0NvbnRleHRSb290KSBjb25zdDsKIAogICAgIHN0cnVjdCBDb25zdHJhaW50cyB7 Ci0gICAgICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250ZXh0Um9vdD4gbGVmdDsKLSAgICAgICAg T3B0aW9uYWw8UG9zaXRpb25JbkNvbnRleHRSb290PiByaWdodDsKKyAgICAgICAgT3B0aW9uYWw8 UG9pbnRJbkNvbnRleHRSb290PiBsZWZ0OworICAgICAgICBPcHRpb25hbDxQb2ludEluQ29udGV4 dFJvb3Q+IHJpZ2h0OwogICAgIH07CiAgICAgQ29uc3RyYWludHMgY29uc3RyYWludHMoUG9zaXRp b25JbkNvbnRleHRSb290IHZlcnRpY2FsUG9zaXRpb24sIGNvbnN0IEJveCYgZm9ybWF0dGluZ0Nv bnRleHRSb290KSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0TGluZUxheW91dC5jcHAKaW5kZXggMjAzMmNhZjY3NmVmMzM2MjQ0YjMyMjY5N2YwMDkwNTI0 ZjU2MmEwMi4uNjJjZTIzYjRkNjg0YTE0YzY1MTNkZDc4ZTg5OGIxNGZjOTllM2RjYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCkBAIC0y MzAsMjMgKzIzMCwyMyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0 OjpsYXlvdXQoTGF5b3V0VW5pdCB3aWR0aENvbnN0cmFpbnQpIGNvbgogICAgICAgICBhdXRvIGxp bmVMb2dpY2FsTGVmdCA9IGxpbmVIb3Jpem9udGFsQ29uc3RyYWludC5sb2dpY2FsVG9wTGVmdC54 KCk7CiAgICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IG1fZmxvYXRpbmdTdGF0ZS5jb25z dHJhaW50cyh7IGxpbmVMb2dpY2FsVG9wIH0sIG1fZm9ybWF0dGluZ1Jvb3QpOwogICAgICAgICAv LyBDaGVjayBpZiB0aGVzZSBjb25zdHJhaW50cyBhY3R1YWxseSBwdXQgbGltaXRhdGlvbiBvbiB0 aGUgbGluZS4KLSAgICAgICAgaWYgKGZsb2F0Q29uc3RyYWludHMubGVmdCAmJiAqZmxvYXRDb25z dHJhaW50cy5sZWZ0IDw9IGZvcm1hdHRpbmdSb290RGlzcGxheUJveC5jb250ZW50Qm94TGVmdCgp KQorICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZsb2F0Q29uc3RyYWludHMu bGVmdC0+eCA8PSBmb3JtYXR0aW5nUm9vdERpc3BsYXlCb3guY29udGVudEJveExlZnQoKSkKICAg ICAgICAgICAgIGZsb2F0Q29uc3RyYWludHMubGVmdCA9IHsgfTsKIAotICAgICAgICBpZiAoZmxv YXRDb25zdHJhaW50cy5yaWdodCAmJiAqZmxvYXRDb25zdHJhaW50cy5yaWdodCA+PSBmb3JtYXR0 aW5nUm9vdERpc3BsYXlCb3guY29udGVudEJveFJpZ2h0KCkpCisgICAgICAgIGlmIChmbG9hdENv bnN0cmFpbnRzLnJpZ2h0ICYmIGZsb2F0Q29uc3RyYWludHMucmlnaHQtPnggPj0gZm9ybWF0dGlu Z1Jvb3REaXNwbGF5Qm94LmNvbnRlbnRCb3hSaWdodCgpKQogICAgICAgICAgICAgZmxvYXRDb25z dHJhaW50cy5yaWdodCA9IHsgfTsKIAogICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0 ICYmIGZsb2F0Q29uc3RyYWludHMucmlnaHQpIHsKLSAgICAgICAgICAgIEFTU0VSVCgqZmxvYXRD b25zdHJhaW50cy5sZWZ0IDwgKmZsb2F0Q29uc3RyYWludHMucmlnaHQpOwotICAgICAgICAgICAg YXZhaWxhYmxlV2lkdGggPSAqZmxvYXRDb25zdHJhaW50cy5yaWdodCAtICpmbG9hdENvbnN0cmFp bnRzLmxlZnQ7Ci0gICAgICAgICAgICBsaW5lTG9naWNhbExlZnQgPSAqZmxvYXRDb25zdHJhaW50 cy5sZWZ0OworICAgICAgICAgICAgQVNTRVJUKGZsb2F0Q29uc3RyYWludHMubGVmdC0+eCA8IGZs b2F0Q29uc3RyYWludHMucmlnaHQtPngpOworICAgICAgICAgICAgYXZhaWxhYmxlV2lkdGggPSBm bG9hdENvbnN0cmFpbnRzLnJpZ2h0LT54IC0gZmxvYXRDb25zdHJhaW50cy5sZWZ0LT54OworICAg ICAgICAgICAgbGluZUxvZ2ljYWxMZWZ0ID0gZmxvYXRDb25zdHJhaW50cy5sZWZ0LT54OwogICAg ICAgICB9IGVsc2UgaWYgKGZsb2F0Q29uc3RyYWludHMubGVmdCkgewotICAgICAgICAgICAgQVNT RVJUKCpmbG9hdENvbnN0cmFpbnRzLmxlZnQgPiBsaW5lTG9naWNhbExlZnQpOwotICAgICAgICAg ICAgYXZhaWxhYmxlV2lkdGggLT0gKCpmbG9hdENvbnN0cmFpbnRzLmxlZnQgLSBsaW5lTG9naWNh bExlZnQpOwotICAgICAgICAgICAgbGluZUxvZ2ljYWxMZWZ0ID0gKmZsb2F0Q29uc3RyYWludHMu bGVmdDsKKyAgICAgICAgICAgIEFTU0VSVChmbG9hdENvbnN0cmFpbnRzLmxlZnQtPnggPiBsaW5l TG9naWNhbExlZnQpOworICAgICAgICAgICAgYXZhaWxhYmxlV2lkdGggLT0gKGZsb2F0Q29uc3Ry YWludHMubGVmdC0+eCAtIGxpbmVMb2dpY2FsTGVmdCk7CisgICAgICAgICAgICBsaW5lTG9naWNh bExlZnQgPSBmbG9hdENvbnN0cmFpbnRzLmxlZnQtPng7CiAgICAgICAgIH0gZWxzZSBpZiAoZmxv YXRDb25zdHJhaW50cy5yaWdodCkgewotICAgICAgICAgICAgQVNTRVJUKCpmbG9hdENvbnN0cmFp bnRzLnJpZ2h0ID4gbGluZUxvZ2ljYWxMZWZ0KTsKLSAgICAgICAgICAgIGF2YWlsYWJsZVdpZHRo ID0gKmZsb2F0Q29uc3RyYWludHMucmlnaHQgLSBsaW5lTG9naWNhbExlZnQ7CisgICAgICAgICAg ICBBU1NFUlQoZmxvYXRDb25zdHJhaW50cy5yaWdodC0+eCA+IGxpbmVMb2dpY2FsTGVmdCk7Cisg ICAgICAgICAgICBhdmFpbGFibGVXaWR0aCA9IGZsb2F0Q29uc3RyYWludHMucmlnaHQtPnggLSBs aW5lTG9naWNhbExlZnQ7CiAgICAgICAgIH0KICAgICAgICAgbGluZUhvcml6b250YWxDb25zdHJh aW50LmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCA9IGF2YWlsYWJsZVdpZHRoOwogICAgICAgICBsaW5l SG9yaXpvbnRhbENvbnN0cmFpbnQubG9naWNhbFRvcExlZnQuc2V0WChsaW5lTG9naWNhbExlZnQp Owo=