248806 2022-12-05 21:04:27 -0800 [leading-trim][IFC] Add support for nested block containers with leading-trim: start 2022-12-06 08:09:03 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1916863 0 zalan 2022-12-05 21:04:27 -0800 ssia 1916864 1 463906 zalan 2022-12-05 21:21:49 -0800 Created attachment 463906 [fast-cq]Patch 1916941 2 ews-feeder 2022-12-06 08:08:51 -0800 Committed 257411@main (ef951d1b818e): <https://commits.webkit.org/257411@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 463906. 463906 2022-12-05 21:21:49 -0800 2022-12-06 08:08:55 -0800 [fast-cq]Patch bug-248806-20221205212148.patch text/plain 21596 zalan RnJvbSBiNWRkYTYyYzM4Y2U0ZmZiMjdkMWY2NjZiOWM4Y2NhNGFiYzU0YWExIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IE1vbiwgNSBEZWMgMjAyMiAyMTowNDozNyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtsZWFkaW5n LXRyaW1dW0lGQ10gQWRkIHN1cHBvcnQgZm9yIG5lc3RlZCBibG9jayBjb250YWluZXJzCiB3aXRo IGxlYWRpbmctdHJpbTogc3RhcnQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI0ODgwNgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpXaGlsZSBsZWFkaW5nLXRy aW0gaXMgYSBub24taW5oZXJpdGVkIHByb3BlcnR5LCB0aGUgdHJpbW1pbmcgYmVoYXZpb3IgaXMg cHJvcGFnYXRlZCBkb3duIG9uIHRoZSBibG9jayBjb250YWluZXIgc3VidHJlZSAoc2ltaWxhciB0 byBlLmcuIGxpbmUtY2xhbXApLgo8ZGl2IHN0eWxlPSJsZWFkaW5nLXRyaW06IHN0YXJ0Ij4KICA8 ZGl2PgogICAgPGRpdj5UaGlzIGZpcnN0IGZvcm1hdHRlZCBsaW5lIHNob3VsZCBiZSB0cmltbWVk PC9kaXY+CiAgPC9kaXY+CjwvZGl2PgoKVGhpcyBwYXRjaCBhZGRzIGluaXRpYWwgc3VwcG9ydCBm b3IgcHJvcGFnYXRpbmcgdGhpcyBsZWFkaW5nLXRyaW0gKHN0YXJ0KSB2YWx1ZSBhY3Jvc3MgbXVs dGlwbGUgSUZDcy4KCjEuIFVzZSBSZW5kZXJMYXllclN0YXRlIHRvIHByb3BhZ2F0ZSBsZWFkaW5n LXRyaW0gdmFsdWUgaW5zaWRlIHJlbmRlciB0cmVlIGZyb20gYW5jZXN0b3IgYmxvY2sgY29udGFp bmVyIHRvIGRlc2NlbmRhbnRzLgoyLiBVc2UgQmxvY2tMYXlvdXRTdGF0ZS5oIGluc2lkZSBJRkMg dG8gaW5kaWNhdGUgd2hldGhlciB0aGUgZmlyc3QvbGFzdC9ib3RoIGxpbmVzIHNob3VsZCBiZSB0 cmltbWVkLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2Nr L0Jsb2NrTGF5b3V0U3RhdGUuaDogVGhpcyBhbmQgdGhlIFJlbmRlckxheWVyU3RhdGVzIG1heSBs b29rIHJlZHVuZGFudCwgYnV0IGV2ZW50dWFsbHkgdGhpcyBpcyBhbGwgYmUgaW4gQmxvY2tMYXlv dXRTdGF0ZSAoZnVsbCBMRkMpCgooV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0xheW91dFN0YXRlOjpC bG9ja0xheW91dFN0YXRlKToKKFdlYkNvcmU6OkxheW91dDo6QmxvY2tMYXlvdXRTdGF0ZTo6bGVh ZGluZ1RyaW0gY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQpOgooV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y3JlYXRlRGlzcGxheUNvbnRlbnRGb3JMaW5lKToKKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1 aWxkZXI6OmNvbXB1dGVMaW5lQm94R2VvbWV0cnkgY29uc3QpOiBVc2UgdGhlIHByb3BhZ2F0ZWQg bGVhZGluZy10cmltIHZhbHVlIGluc3RlYWQgb2YgdGhlIHJvb3Qncy4gVGhpcyBlbmFibGVzIGxp bmUgYm94IHRyaW1taW5nIG9uIG5lc3RlZCBJRkNzLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmg6CiogU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVM YXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmxlYWRpbmdUcmltKToKKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpsYXlvdXQpOgoqIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHA6CihXZWJDb3JlOjpGcmFtZVZp ZXdMYXlvdXRDb250ZXh0OjpwdXNoTGF5b3V0U3RhdGUpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgooV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpzZXRM ZWFkaW5nVHJpbUZvclN1YnRyZWUpOgooV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpyZXNldExl YWRpbmdUcmltKToKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2spOgoqIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5b3V0U3RhdGUuY3BwOgooV2ViQ29yZTo6UmVuZGVyTGF5b3V0 U3RhdGU6OlJlbmRlckxheW91dFN0YXRlKToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5b3V0U3RhdGUuaDoKKFdlYkNvcmU6OlJlbmRlckxheW91dFN0YXRlOjpoYXNMZWFkaW5n VHJpbSBjb25zdCk6CihXZWJDb3JlOjpSZW5kZXJMYXlvdXRTdGF0ZTo6bGVhZGluZ1RyaW0gY29u c3QpOgooV2ViQ29yZTo6UmVuZGVyTGF5b3V0U3RhdGU6OmFkZExlYWRpbmdUcmltKToKKFdlYkNv cmU6OlJlbmRlckxheW91dFN0YXRlOjpyZW1vdmVMZWFkaW5nVHJpbSk6CihXZWJDb3JlOjpSZW5k ZXJMYXlvdXRTdGF0ZTo6cmVzZXRMZWFkaW5nVHJpbSk6Ci0tLQogLi4uL2Jsb2NrL0Jsb2NrTGF5 b3V0U3RhdGUuaCAgICAgICAgICAgICAgICAgIHwgMTIgKysrKystCiAuLi4vaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgfCAgNiArLS0KIC4uLi9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuaCAgICAgICAgICB8ICAyICstCiAuLi4vaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmNwcCAgICAgICAgICAgfCAgOCArKy0tCiAuLi4vaW5saW5lL0lubGluZUxp bmVCb3hCdWlsZGVyLmggICAgICAgICAgICAgfCAgNCArLQogLi4uL2lubGluZS9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVMYXlvdXQuY3BwICAgIHwgMTMgKysrKysrLQogLi4uL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcCAgIHwgIDMgKy0KIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwICB8IDM3ICsrKysrKysrKysrKysrKysrKysKIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCAgICB8ICAzICsrCiAuLi4vV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5b3V0U3RhdGUuY3BwICAgfCAgMyArLQogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheW91dFN0YXRlLmggIHwgMTUgKysrKysrKy0KIDExIGZp bGVzIGNoYW5nZWQsIDkyIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxvY2svQmxvY2tM YXlvdXRTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9i bG9jay9CbG9ja0xheW91dFN0YXRlLmgKaW5kZXggYTliMjQwNjVkZTdkLi4xZDU4NDIyNGI2ZTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxv Y2svQmxvY2tMYXlvdXRTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvYmxvY2svQmxvY2tMYXlvdXRTdGF0ZS5oCkBAIC00MCwxOSArNDAsMjcgQEAg cHVibGljOgogICAgICAgICBzaXplX3QgbnVtYmVyT2ZWaXNpYmxlTGluZXMgeyAwIH07CiAgICAg ICAgIGJvb2wgaXNMaW5lQ2xhbXBSb290T3ZlcmZsb3dIaWRkZW4geyB0cnVlIH07CiAgICAgfTsK LSAgICBCbG9ja0xheW91dFN0YXRlKEZsb2F0aW5nU3RhdGUmLCBzdGQ6Om9wdGlvbmFsPExpbmVD bGFtcD4pOworICAgIGVudW0gY2xhc3MgTGVhZGluZ1RyaW1TaWRlIDogdWludDhfdCB7CisgICAg ICAgIFN0YXJ0ID0gMSA8PCAwLAorICAgICAgICBFbmQgICA9IDEgPDwgMQorICAgIH07CisgICAg dXNpbmcgTGVhZGluZ1RyaW0gPSBPcHRpb25TZXQ8TGVhZGluZ1RyaW1TaWRlPjsKKyAgICBCbG9j a0xheW91dFN0YXRlKEZsb2F0aW5nU3RhdGUmLCBzdGQ6Om9wdGlvbmFsPExpbmVDbGFtcD4gPSB7 IH0sIExlYWRpbmdUcmltID0geyB9KTsKIAogICAgIEZsb2F0aW5nU3RhdGUmIGZsb2F0aW5nU3Rh dGUoKSB7IHJldHVybiBtX2Zsb2F0aW5nU3RhdGU7IH0KICAgICBzdGQ6Om9wdGlvbmFsPExpbmVD bGFtcD4gbGluZUNsYW1wKCkgY29uc3QgeyByZXR1cm4gbV9saW5lQ2xhbXA7IH0KKyAgICBMZWFk aW5nVHJpbSBsZWFkaW5nVHJpbSgpIGNvbnN0IHsgcmV0dXJuIG1fbGVhZGluZ1RyaW07IH0KIAog cHJpdmF0ZToKICAgICBGbG9hdGluZ1N0YXRlJiBtX2Zsb2F0aW5nU3RhdGU7CiAgICAgc3RkOjpv cHRpb25hbDxMaW5lQ2xhbXA+IG1fbGluZUNsYW1wOworICAgIExlYWRpbmdUcmltIG1fbGVhZGlu Z1RyaW07CiB9OwogCi1pbmxpbmUgQmxvY2tMYXlvdXRTdGF0ZTo6QmxvY2tMYXlvdXRTdGF0ZShG bG9hdGluZ1N0YXRlJiBmbG9hdGluZ1N0YXRlLCBzdGQ6Om9wdGlvbmFsPExpbmVDbGFtcD4gbGlu ZUNsYW1wKQoraW5saW5lIEJsb2NrTGF5b3V0U3RhdGU6OkJsb2NrTGF5b3V0U3RhdGUoRmxvYXRp bmdTdGF0ZSYgZmxvYXRpbmdTdGF0ZSwgc3RkOjpvcHRpb25hbDxMaW5lQ2xhbXA+IGxpbmVDbGFt cCwgTGVhZGluZ1RyaW0gbGVhZGluZ1RyaW0pCiAgICAgOiBtX2Zsb2F0aW5nU3RhdGUoZmxvYXRp bmdTdGF0ZSkKICAgICAsIG1fbGluZUNsYW1wKGxpbmVDbGFtcCkKKyAgICAsIG1fbGVhZGluZ1Ry aW0obGVhZGluZ1RyaW0pCiB7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAwOGM4NGQ3NzllMWYuLjNmMzkzZDA3YmU2OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAt MjU4LDcgKzI1OCw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQo SW5saW5lSXRlbXMmIGlubGluZUl0ZW1zLCBjb25zdCBMaW5lQnVpCiAgICAgICAgIGlmIChjb250 ZW50SXNUcnVuY2F0ZWRJbkJsb2NrRGlyZWN0aW9uICYmICFpc0xhc3RMaW5lKQogICAgICAgICAg ICAgbGluZUNvbnRlbnQubGluZU5lZWRzVHJhaWxpbmdFbGxpcHNpcyA9IHRydWU7CiAKLSAgICAg ICAgYXV0byBsaW5lTG9naWNhbFJlY3QgPSBjcmVhdGVEaXNwbGF5Q29udGVudEZvckxpbmUobGlu ZUNvbnRlbnQsIGNvbnN0cmFpbnRzKTsKKyAgICAgICAgYXV0byBsaW5lTG9naWNhbFJlY3QgPSBj cmVhdGVEaXNwbGF5Q29udGVudEZvckxpbmUobGluZUNvbnRlbnQsIGNvbnN0cmFpbnRzLCBibG9j a0xheW91dFN0YXRlKTsKICAgICAgICAgaWYgKGxpbmVDb250ZW50LmlzTGFzdExpbmVXaXRoSW5s aW5lQ29udGVudCkKICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5zZXRDbGVhckdhcEFmdGVy TGFzdExpbmUoZm9ybWF0dGluZ0dlb21ldHJ5KCkubG9naWNhbFRvcEZvck5leHRMaW5lKGxpbmVD b250ZW50LCBsaW5lTG9naWNhbFJlY3QsIGZsb2F0aW5nQ29udGV4dCkgLSBsaW5lTG9naWNhbFJl Y3QuYm90dG9tKCkpOwogICAgICAgICBpZiAoaXNMYXN0TGluZSB8fCAoY29udGVudElzVHJ1bmNh dGVkSW5CbG9ja0RpcmVjdGlvbiAmJiBibG9ja0xheW91dFN0YXRlLmxpbmVDbGFtcCgpLT5pc0xp bmVDbGFtcFJvb3RPdmVyZmxvd0hpZGRlbikpIHsKQEAgLTQ2OCwxMiArNDY4LDEyIEBAIHZvaWQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RDb250ZW50SWZOZWVkZWQoKQogICAgIGZv cm1hdHRpbmdTdGF0ZS5hZGRJbmxpbmVJdGVtcyhpbmxpbmVJdGVtc0J1aWxkZXIuYnVpbGQoKSk7 CiB9CiAKLUlubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNyZWF0ZURpc3BsYXlD b250ZW50Rm9yTGluZShjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50 LCBjb25zdCBDb25zdHJhaW50c0ZvcklubGluZUNvbnRlbnQmIGNvbnN0cmFpbnRzKQorSW5saW5l UmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y3JlYXRlRGlzcGxheUNvbnRlbnRGb3JMaW5l KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IENvbnN0 cmFpbnRzRm9ySW5saW5lQ29udGVudCYgY29uc3RyYWludHMsIGNvbnN0IEJsb2NrTGF5b3V0U3Rh dGUmIGJsb2NrTGF5b3V0U3RhdGUpCiB7CiAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhp cy0+Zm9ybWF0dGluZ1N0YXRlKCk7CiAgICAgYXV0byBjdXJyZW50TGluZUluZGV4ID0gZm9ybWF0 dGluZ1N0YXRlLmxpbmVzKCkuc2l6ZSgpOwogCi0gICAgYXV0byBsaW5lQm94ID0gTGluZUJveEJ1 aWxkZXIgeyAqdGhpcywgbGluZUNvbnRlbnQgfS5idWlsZChjdXJyZW50TGluZUluZGV4KTsKKyAg ICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94QnVpbGRlciB7ICp0aGlzLCBsaW5lQ29udGVudCwgYmxv Y2tMYXlvdXRTdGF0ZS5sZWFkaW5nVHJpbSgpIH0uYnVpbGQoY3VycmVudExpbmVJbmRleCk7CiAg ICAgYXV0byBkaXNwbGF5TGluZSA9IElubGluZURpc3BsYXlMaW5lQnVpbGRlciB7ICp0aGlzIH0u YnVpbGQobGluZUNvbnRlbnQsIGxpbmVCb3gsIGNvbnN0cmFpbnRzKTsKICAgICBmb3JtYXR0aW5n U3RhdGUuYWRkQm94ZXMoSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyIHsgKnRoaXMsIGZvcm1h dHRpbmdTdGF0ZSB9LmJ1aWxkKGxpbmVDb250ZW50LCBsaW5lQm94LCBkaXNwbGF5TGluZSwgY3Vy cmVudExpbmVJbmRleCkpOwogICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lQm94KFdURk1vdmUo bGluZUJveCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmgKaW5kZXggMTY5MWY4MGViZDRmLi43MTA2MTQwZDVkMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNzIsNyArNzIsNyBAQCBwcml2YXRl OgogICAgIHZvaWQgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIGNvbnN0IEhvcml6 b250YWxDb25zdHJhaW50cyYpOwogCiAgICAgdm9pZCBjb2xsZWN0Q29udGVudElmTmVlZGVkKCk7 Ci0gICAgSW5saW5lUmVjdCBjcmVhdGVEaXNwbGF5Q29udGVudEZvckxpbmUoY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgQ29uc3RyYWludHNGb3JJbmxpbmVDb250ZW50Jik7 CisgICAgSW5saW5lUmVjdCBjcmVhdGVEaXNwbGF5Q29udGVudEZvckxpbmUoY29uc3QgTGluZUJ1 aWxkZXI6OkxpbmVDb250ZW50JiwgY29uc3QgQ29uc3RyYWludHNGb3JJbmxpbmVDb250ZW50Jiwg Y29uc3QgQmxvY2tMYXlvdXRTdGF0ZSYpOwogICAgIHZvaWQgcmVzZXRHZW9tZXRyeUZvckNsYW1w ZWRDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzRGlzcGxh eUNvbnRlbnRSYW5nZSwgY29uc3QgTGluZUJ1aWxkZXI6OkZsb2F0TGlzdCYgb3ZlcmZsb3dpbmdG bG9hdHMsIExheW91dFBvaW50IHRvcGxlZnQpOwogCiAgICAgdm9pZCBpbnZhbGlkYXRlRm9ybWF0 dGluZ1N0YXRlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5j cHAKaW5kZXggNzZhZWVkZThlNmQ3Li45NTYyNDkzNzI2Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWls ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJJbmxpbmVMaW5lQm94QnVpbGRlci5oIgogCisjaW5jbHVk ZSAiQmxvY2tMYXlvdXRTdGF0ZS5oIgogI2luY2x1ZGUgIklubGluZUxpbmVCb3hWZXJ0aWNhbEFs aWduZXIuaCIKICNpbmNsdWRlICJJbmxpbmVMaW5lQnVpbGRlci5oIgogI2luY2x1ZGUgIkxheW91 dEJveEdlb21ldHJ5LmgiCkBAIC0xMTYsOSArMTE3LDEwIEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFs PElubGluZUxheW91dFVuaXQ+IGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoVGV4dEFsaWduTW9k ZSB0CiAgICAgcmV0dXJuIHsgfTsKIH0KIAotTGluZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVy KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwg Y29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKK0xpbmVCb3hCdWls ZGVyOjpMaW5lQm94QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5l Rm9ybWF0dGluZ0NvbnRleHQsIGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGluZUNv bnRlbnQsIEJsb2NrTGF5b3V0U3RhdGU6OkxlYWRpbmdUcmltIGxlYWRpbmdUcmltKQogICAgIDog bV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKICAgICAs IG1fbGluZUNvbnRlbnQobGluZUNvbnRlbnQpCisgICAgLCBtX2xlYWRpbmdUcmltKGxlYWRpbmdU cmltKQogewogfQogCkBAIC03MDYsOCArNzA4LDggQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29t cHV0ZUxpbmVCb3hHZW9tZXRyeShMaW5lQm94JiBsaW5lQm94KSBjb25zdAogICAgIGF1dG8gbGlu ZUJveExvZ2ljYWxIZWlnaHQgPSBMaW5lQm94VmVydGljYWxBbGlnbmVyIHsgZm9ybWF0dGluZ0Nv bnRleHQoKSB9LmNvbXB1dGVMb2dpY2FsSGVpZ2h0QW5kQWxpZ24obGluZUJveCk7CiAKICAgICBh dXRvJiByb290U3R5bGUgPSB0aGlzLT5yb290U3R5bGUoKTsKLSAgICBhdXRvIHNob3VsZFRyaW1C bG9ja1N0YXJ0T2ZMaW5lQm94ID0gaXNGaXJzdExpbmUoKSAmJiAocm9vdFN0eWxlLmxlYWRpbmdU cmltKCkgPT0gTGVhZGluZ1RyaW06OlN0YXJ0IHx8IHJvb3RTdHlsZS5sZWFkaW5nVHJpbSgpID09 IExlYWRpbmdUcmltOjpCb3RoKSAmJiByb290U3R5bGUudGV4dEVkZ2UoKS5vdmVyICE9IFRleHRF ZGdlVHlwZTo6TGVhZGluZzsKLSAgICBhdXRvIHNob3VsZFRyaW1CbG9ja0VuZE9mTGluZUJveCA9 IGlzTGFzdExpbmUoKSAmJiAocm9vdFN0eWxlLmxlYWRpbmdUcmltKCkgPT0gTGVhZGluZ1RyaW06 OkVuZCB8fCByb290U3R5bGUubGVhZGluZ1RyaW0oKSA9PSBMZWFkaW5nVHJpbTo6Qm90aCkgJiYg cm9vdFN0eWxlLnRleHRFZGdlKCkudW5kZXIgIT0gVGV4dEVkZ2VUeXBlOjpMZWFkaW5nOworICAg IGF1dG8gc2hvdWxkVHJpbUJsb2NrU3RhcnRPZkxpbmVCb3ggPSBpc0ZpcnN0TGluZSgpICYmIG1f bGVhZGluZ1RyaW0uY29udGFpbnMoQmxvY2tMYXlvdXRTdGF0ZTo6TGVhZGluZ1RyaW1TaWRlOjpT dGFydCkgJiYgcm9vdFN0eWxlLnRleHRFZGdlKCkub3ZlciAhPSBUZXh0RWRnZVR5cGU6OkxlYWRp bmc7CisgICAgYXV0byBzaG91bGRUcmltQmxvY2tFbmRPZkxpbmVCb3ggPSBpc0xhc3RMaW5lKCkg JiYgbV9sZWFkaW5nVHJpbS5jb250YWlucyhCbG9ja0xheW91dFN0YXRlOjpMZWFkaW5nVHJpbVNp ZGU6OkVuZCkgJiYgcm9vdFN0eWxlLnRleHRFZGdlKCkudW5kZXIgIT0gVGV4dEVkZ2VUeXBlOjpM ZWFkaW5nOwogCiAgICAgaWYgKHNob3VsZFRyaW1CbG9ja0VuZE9mTGluZUJveCkgewogICAgICAg ICBhdXRvIHRleHRFZGdlVW5kZXJIZWlnaHQgPSBbJl0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZUxpbmVCb3hCdWlsZGVyLmgKaW5kZXggYWMzMjUyMmI4YWY5Li5mNTBkMTNhNzdjZWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCb3hCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuaApAQCAtMjUsNiArMjUs NyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkJsb2NrTGF5b3V0U3RhdGUuaCIKICNp bmNsdWRlICJJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIgogI2luY2x1ZGUgIklubGluZUxpbmVC dWlsZGVyLmgiCiAjaW5jbHVkZSAiVGV4dFV0aWwuaCIKQEAgLTM5LDcgKzQwLDcgQEAgc3RydWN0 IEFzY2VudEFuZERlc2NlbnQ7CiAKIGNsYXNzIExpbmVCb3hCdWlsZGVyIHsKIHB1YmxpYzoKLSAg ICBMaW5lQm94QnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYsIGNvbnN0IExp bmVCdWlsZGVyOjpMaW5lQ29udGVudCYpOworICAgIExpbmVCb3hCdWlsZGVyKGNvbnN0IElubGlu ZUZvcm1hdHRpbmdDb250ZXh0JiwgY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgQmxv Y2tMYXlvdXRTdGF0ZTo6TGVhZGluZ1RyaW0pOwogCiAgICAgTGluZUJveCBidWlsZChzaXplX3Qg bGluZUluZGV4KTsKIApAQCAtNjYsNiArNjcsNyBAQCBwcml2YXRlOgogcHJpdmF0ZToKICAgICBj b25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dDsK ICAgICBjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIG1fbGluZUNvbnRlbnQ7CisgICAg QmxvY2tMYXlvdXRTdGF0ZTo6TGVhZGluZ1RyaW0gbV9sZWFkaW5nVHJpbTsKICAgICBib29sIG1f ZmFsbGJhY2tGb250UmVxdWlyZXNJZGVvZ3JhcGhpY0Jhc2VsaW5lIHsgZmFsc2UgfTsKICAgICBI YXNoTWFwPGNvbnN0IElubGluZUxldmVsQm94KiwgVGV4dFV0aWw6OkZhbGxiYWNrRm9udExpc3Q+ IG1fZmFsbGJhY2tGb250c0ZvcklubGluZUJveGVzOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5 b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAppbmRleCBkNDc2NTgwZGRlYmMuLjk4MjVjMjFiMGUy ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL2lubGluZS9M YXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9pbmxpbmUvTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAt NDczLDYgKzQ3MywxNyBAQCBzdGF0aWMgaW5saW5lIHN0ZDo6b3B0aW9uYWw8TGF5b3V0OjpCbG9j a0xheW91dFN0YXRlOjpMaW5lQ2xhbXA+IGxpbmVDbGFtcChjb25zdAogICAgIHJldHVybiB7IH07 CiB9CiAKK3N0YXRpYyBpbmxpbmUgTGF5b3V0OjpCbG9ja0xheW91dFN0YXRlOjpMZWFkaW5nVHJp bSBsZWFkaW5nVHJpbShjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIHJvb3RSZW5kZXJlcikKK3sKKyAg ICBhdXRvIGxlYWRpbmdUcmltU2lkZXMgPSByb290UmVuZGVyZXIudmlldygpLmZyYW1lVmlldygp LmxheW91dENvbnRleHQoKS5sYXlvdXRTdGF0ZSgpLT5sZWFkaW5nVHJpbSgpOworICAgIGF1dG8g bGVhZGluZ1RyaW1Gb3JJRkMgPSBMYXlvdXQ6OkJsb2NrTGF5b3V0U3RhdGU6OkxlYWRpbmdUcmlt IHsgfTsKKyAgICBpZiAobGVhZGluZ1RyaW1TaWRlcy5jb250YWlucyhSZW5kZXJMYXlvdXRTdGF0 ZTo6TGVhZGluZ1RyaW1TaWRlOjpTdGFydCkpCisgICAgICAgIGxlYWRpbmdUcmltRm9ySUZDLmFk ZChMYXlvdXQ6OkJsb2NrTGF5b3V0U3RhdGU6OkxlYWRpbmdUcmltU2lkZTo6U3RhcnQpOworICAg IGlmIChsZWFkaW5nVHJpbVNpZGVzLmNvbnRhaW5zKFJlbmRlckxheW91dFN0YXRlOjpMZWFkaW5n VHJpbVNpZGU6OkVuZCkpCisgICAgICAgIGxlYWRpbmdUcmltRm9ySUZDLmFkZChMYXlvdXQ6OkJs b2NrTGF5b3V0U3RhdGU6OkxlYWRpbmdUcmltU2lkZTo6RW5kKTsKKyAgICByZXR1cm4gbGVhZGlu Z1RyaW1Gb3JJRkM7Cit9CisKIHZvaWQgTGluZUxheW91dDo6bGF5b3V0KCkKIHsKICAgICBhdXRv JiByb290TGF5b3V0Qm94ID0gdGhpcy0+cm9vdExheW91dEJveCgpOwpAQCAtNDg1LDcgKzQ5Niw3 IEBAIHZvaWQgTGluZUxheW91dDo6bGF5b3V0KCkKICAgICAvLyBGSVhNRTogRG8gbm90IGNsZWFy IHRoZSBsaW5lcyBhbmQgYm94ZXMgaGVyZSB1bmNvbmRpdGlvbmFsbHksIGJ1dCBjb25zdWx0IHdp dGggdGhlIGRhbWFnZSBvYmplY3QgaW5zdGVhZC4KICAgICBjbGVhcklubGluZUNvbnRlbnQoKTsK ICAgICBBU1NFUlQobV9pbmxpbmVDb250ZW50Q29uc3RyYWludHMpOwotICAgIGF1dG8gYmxvY2tM YXlvdXRTdGF0ZSA9IExheW91dDo6QmxvY2tMYXlvdXRTdGF0ZSB7IG1fYmxvY2tGb3JtYXR0aW5n U3RhdGUuZmxvYXRpbmdTdGF0ZSgpLCBsaW5lQ2xhbXAoZmxvdygpKSB9OworICAgIGF1dG8gYmxv Y2tMYXlvdXRTdGF0ZSA9IExheW91dDo6QmxvY2tMYXlvdXRTdGF0ZSB7IG1fYmxvY2tGb3JtYXR0 aW5nU3RhdGUuZmxvYXRpbmdTdGF0ZSgpLCBsaW5lQ2xhbXAoZmxvdygpKSwgbGVhZGluZ1RyaW0o ZmxvdygpKSB9OwogICAgIExheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQgeyByb290TGF5 b3V0Qm94LCBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZSwgbV9saW5lRGFtYWdlLmdldCgpIH0ubGF5 b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKCptX2lubGluZUNvbnRlbnRDb25zdHJhaW50 cywgYmxvY2tMYXlvdXRTdGF0ZSk7CiAKICAgICBjb25zdHJ1Y3RDb250ZW50KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcAppbmRleCA0YWViYmRi ZGNmNTIuLjYwMjg5MWVmZGI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXdMYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll d0xheW91dENvbnRleHQuY3BwCkBAIC02MTEsNyArNjExLDggQEAgYm9vbCBGcmFtZVZpZXdMYXlv dXRDb250ZXh0OjpwdXNoTGF5b3V0U3RhdGUoUmVuZGVyQm94JiByZW5kZXJlciwgY29uc3QgTGF5 b3V0U2kKICAgICAgICAgICAgICwgcGFnZUhlaWdodAogICAgICAgICAgICAgLCBwYWdlSGVpZ2h0 Q2hhbmdlZAogICAgICAgICAgICAgLCBsYXlvdXRTdGF0ZSA/IGxheW91dFN0YXRlLT5tYXhpbXVt TGluZUNvdW50Rm9yTGluZUNsYW1wKCkgOiBzdGQ6Om51bGxvcHQKLSAgICAgICAgICAgICwgbGF5 b3V0U3RhdGUgPyBsYXlvdXRTdGF0ZS0+dmlzaWJsZUxpbmVDb3VudEZvckxpbmVDbGFtcCgpIDog c3RkOjpudWxsb3B0KSk7CisgICAgICAgICAgICAsIGxheW91dFN0YXRlID8gbGF5b3V0U3RhdGUt PnZpc2libGVMaW5lQ291bnRGb3JMaW5lQ2xhbXAoKSA6IHN0ZDo6bnVsbG9wdAorICAgICAgICAg ICAgLCBsYXlvdXRTdGF0ZSA/IGxheW91dFN0YXRlLT5sZWFkaW5nVHJpbSgpIDogUmVuZGVyTGF5 b3V0U3RhdGU6OkxlYWRpbmdUcmltKCkpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQog ICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5jcHAKaW5kZXggZjM0MGM0N2YzMDRmLi4wZTQxMzdiMmIwMzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC00ODAsNiArNDgwLDQwIEBA IHZvaWQgUmVuZGVyQmxvY2tGbG93OjpzZXRDaGlsZHJlbklubGluZShib29sIHZhbHVlKQogICAg IFJlbmRlckJsb2NrOjpzZXRDaGlsZHJlbklubGluZSh2YWx1ZSk7CiB9CiAKK3ZvaWQgUmVuZGVy QmxvY2tGbG93OjpzZXRMZWFkaW5nVHJpbUZvclN1YnRyZWUoKQoreworICAgIGF1dG8qIGxheW91 dFN0YXRlID0gdmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5sYXlvdXRTdGF0ZSgp OworICAgIGlmICghbGF5b3V0U3RhdGUpCisgICAgICAgIHJldHVybjsKKyAgICBhdXRvIGxlYWRp bmdUcmltID0gc3R5bGUoKS5sZWFkaW5nVHJpbSgpOworICAgIGlmIChsZWFkaW5nVHJpbSA9PSBM ZWFkaW5nVHJpbTo6Tm9ybWFsKSB7CisgICAgICAgIGlmIChib3JkZXJBbmRQYWRkaW5nU3RhcnQo KSkgeworICAgICAgICAgICAgLy8gRm9yIGJsb2NrIGNvbnRhaW5lcnM6IHRyaW0gdGhlIGJsb2Nr LXN0YXJ0IHNpZGUgb2YgdGhlIGZpcnN0IGZvcm1hdHRlZCBsaW5lIHRvIHRoZSBjb3JyZXNwb25k aW5nCisgICAgICAgICAgICAvLyB0ZXh0LWVkZ2UgbWV0cmljIG9mIGl0cyByb290IGlubGluZSBi b3guIElmIHRoZXJlIGlzIG5vIHN1Y2ggbGluZSwgb3IgaWYgdGhlcmUgaXMgaW50ZXJ2ZW5pbmcg bm9uLXplcm8gcGFkZGluZyBvciBib3JkZXJzLAorICAgICAgICAgICAgLy8gdGhlcmUgaXMgbm8g ZWZmZWN0LgorICAgICAgICAgICAgbGF5b3V0U3RhdGUtPnJlc2V0TGVhZGluZ1RyaW0oKTsKKyAg ICAgICAgfQorICAgICAgICByZXR1cm47CisgICAgfQorICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9y dCBmb3IgbmVzdGVkIGxlYWRpbmcgdHJpbXMgaWYgYXBwbGljYWJsZS4KKyAgICBsYXlvdXRTdGF0 ZS0+cmVzZXRMZWFkaW5nVHJpbSgpOworICAgIGlmIChsZWFkaW5nVHJpbSA9PSBMZWFkaW5nVHJp bTo6U3RhcnQgfHwgbGVhZGluZ1RyaW0gPT0gTGVhZGluZ1RyaW06OkJvdGgpCisgICAgICAgIGxh eW91dFN0YXRlLT5hZGRMZWFkaW5nVHJpbShSZW5kZXJMYXlvdXRTdGF0ZTo6TGVhZGluZ1RyaW1T aWRlOjpTdGFydCk7CisgICAgaWYgKGxlYWRpbmdUcmltID09IExlYWRpbmdUcmltOjpFbmQgfHwg bGVhZGluZ1RyaW0gPT0gTGVhZGluZ1RyaW06OkJvdGgpCisgICAgICAgIGxheW91dFN0YXRlLT5h ZGRMZWFkaW5nVHJpbShSZW5kZXJMYXlvdXRTdGF0ZTo6TGVhZGluZ1RyaW1TaWRlOjpFbmQpOwor fQorCit2b2lkIFJlbmRlckJsb2NrRmxvdzo6cmVzZXRMZWFkaW5nVHJpbSgpCit7CisgICAgYXV0 byogbGF5b3V0U3RhdGUgPSB2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpLmxheW91 dFN0YXRlKCk7CisgICAgaWYgKCFsYXlvdXRTdGF0ZSB8fCAhbGF5b3V0U3RhdGUtPmxlYWRpbmdU cmltKCkpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAobGF5b3V0U3RhdGUtPmxlYWRpbmdUcmlt KCkuY29udGFpbnMoUmVuZGVyTGF5b3V0U3RhdGU6OkxlYWRpbmdUcmltU2lkZTo6U3RhcnQpICYm IGhhc0xpbmVzKCkpIHsKKyAgICAgICAgLy8gT25seSB0aGUgZmlyc3QgZm9ybWF0dGVkIGxpbmUg aXMgdHJpbW1lZC4KKyAgICAgICAgbGF5b3V0U3RhdGUtPnJlbW92ZUxlYWRpbmdUcmltKFJlbmRl ckxheW91dFN0YXRlOjpMZWFkaW5nVHJpbVNpZGU6OlN0YXJ0KTsKKyAgICB9Cit9CisKIHZvaWQg UmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91 dFVuaXQgcGFnZUxvZ2ljYWxIZWlnaHQpCiB7CiAgICAgQVNTRVJUKG5lZWRzTGF5b3V0KCkpOwpA QCAtNTMyLDYgKzU2Niw4IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9jayhib29s IHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQgcGFnZUxvZ2ljYWxICiAgICAgICAgIGlmICgh Zmlyc3RDaGlsZCgpICYmICFpc0Fub255bW91c0Jsb2NrKCkpCiAgICAgICAgICAgICBzZXRDaGls ZHJlbklubGluZSh0cnVlKTsKICAgICAgICAgZGlydHlGb3JMYXlvdXRGcm9tUGVyY2VudGFnZUhl aWdodERlc2NlbmRhbnRzKCk7CisgICAgICAgIHNldExlYWRpbmdUcmltRm9yU3VidHJlZSgpOwor CiAgICAgICAgIGlmIChjaGlsZHJlbklubGluZSgpKQogICAgICAgICAgICAgbGF5b3V0SW5saW5l Q2hpbGRyZW4ocmVsYXlvdXRDaGlsZHJlbiwgcmVwYWludExvZ2ljYWxUb3AsIHJlcGFpbnRMb2dp Y2FsQm90dG9tKTsKICAgICAgICAgZWxzZQpAQCAtNTQ0LDYgKzU4MCw3IEBAIHZvaWQgUmVuZGVy QmxvY2tGbG93OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQg cGFnZUxvZ2ljYWxICiAgICAgICAgICAgICBzZXRFdmVySGFkTGF5b3V0KHRydWUpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KKyAgICAgICAgcmVzZXRMZWFkaW5nVHJpbSgpOwog ICAgICAgICBicmVhazsKICAgICB9IHdoaWxlICh0cnVlKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCmluZGV4IDAyMzRiNjkyODc5Yy4uYWUzMzRmNDZhMTM5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCkBAIC01MjYs NiArNTI2LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9n aWNhbFdpZHRoKSBjb25zdDsKICAgICB2b2lkIGFkanVzdEluaXRpYWxMZXR0ZXJQb3NpdGlvbihS ZW5kZXJCb3gmIGNoaWxkQm94LCBMYXlvdXRVbml0JiBsb2dpY2FsVG9wT2Zmc2V0LCBMYXlvdXRV bml0JiBtYXJnaW5CZWZvcmVPZmZzZXQpOwogCisgICAgdm9pZCBzZXRMZWFkaW5nVHJpbUZvclN1 YnRyZWUoKTsKKyAgICB2b2lkIHJlc2V0TGVhZGluZ1RyaW0oKTsKKwogI2lmIEVOQUJMRShURVhU X0FVVE9TSVpJTkcpCiAgICAgaW50IG1fd2lkdGhGb3JUZXh0QXV0b3NpemluZzsKICAgICB1bnNp Z25lZCBtX2xpbmVDb3VudEZvclRleHRBdXRvc2l6aW5nIDogMjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXlvdXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5b3V0U3RhdGUuY3BwCmluZGV4IGViZGNlZDJhZDQyYS4uM2Iy YzllYWM0MGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 b3V0U3RhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXlvdXRT dGF0ZS5jcHAKQEAgLTYyLDcgKzYyLDcgQEAgUmVuZGVyTGF5b3V0U3RhdGU6OlJlbmRlckxheW91 dFN0YXRlKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBJc1BhZ2luYXRlZCBpc1BhZ2kKICAgICB9 CiB9CiAKLVJlbmRlckxheW91dFN0YXRlOjpSZW5kZXJMYXlvdXRTdGF0ZShjb25zdCBGcmFtZVZp ZXdMYXlvdXRDb250ZXh0OjpMYXlvdXRTdGF0ZVN0YWNrJiBsYXlvdXRTdGF0ZVN0YWNrLCBSZW5k ZXJCb3gmIHJlbmRlcmVyLCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXQsIExheW91dFVuaXQgcGFn ZUxvZ2ljYWxIZWlnaHQsIGJvb2wgcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2VkLCBzdGQ6Om9wdGlv bmFsPHNpemVfdD4gbWF4aW11bUxpbmVDb3VudEZvckxpbmVDbGFtcCwgc3RkOjpvcHRpb25hbDxz aXplX3Q+IHZpc2libGVMaW5lQ291bnRGb3JMaW5lQ2xhbXApCitSZW5kZXJMYXlvdXRTdGF0ZTo6 UmVuZGVyTGF5b3V0U3RhdGUoY29uc3QgRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6TGF5b3V0U3Rh dGVTdGFjayYgbGF5b3V0U3RhdGVTdGFjaywgUmVuZGVyQm94JiByZW5kZXJlciwgY29uc3QgTGF5 b3V0U2l6ZSYgb2Zmc2V0LCBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsSGVpZ2h0LCBib29sIHBhZ2VM b2dpY2FsSGVpZ2h0Q2hhbmdlZCwgc3RkOjpvcHRpb25hbDxzaXplX3Q+IG1heGltdW1MaW5lQ291 bnRGb3JMaW5lQ2xhbXAsIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiB2aXNpYmxlTGluZUNvdW50Rm9y TGluZUNsYW1wLCBMZWFkaW5nVHJpbSBsZWFkaW5nVHJpbSkKICAgICA6IG1fY2xpcHBlZChmYWxz ZSkKICAgICAsIG1faXNQYWdpbmF0ZWQoZmFsc2UpCiAgICAgLCBtX3BhZ2VMb2dpY2FsSGVpZ2h0 Q2hhbmdlZChmYWxzZSkKQEAgLTcyLDYgKzcyLDcgQEAgUmVuZGVyTGF5b3V0U3RhdGU6OlJlbmRl ckxheW91dFN0YXRlKGNvbnN0IEZyYW1lVmlld0xheW91dENvbnRleHQ6OkxheW91dFN0YXRlU3QK ICNlbmRpZgogICAgICwgbV9tYXhpbXVtTGluZUNvdW50Rm9yTGluZUNsYW1wKG1heGltdW1MaW5l Q291bnRGb3JMaW5lQ2xhbXApCiAgICAgLCBtX3Zpc2libGVMaW5lQ291bnRGb3JMaW5lQ2xhbXAo dmlzaWJsZUxpbmVDb3VudEZvckxpbmVDbGFtcCkKKyAgICAsIG1fbGVhZGluZ1RyaW0obGVhZGlu Z1RyaW0pCiAjaWYgQVNTRVJUX0VOQUJMRUQKICAgICAsIG1fcmVuZGVyZXIoJnJlbmRlcmVyKQog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5b3V0 U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXlvdXRTdGF0ZS5oCmlu ZGV4IGE3NmI3YTAzYzBlOC4uYWM0Y2IxOTM3NWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5b3V0U3RhdGUuaApAQCAtNDIsNiArNDIsMTEgQEAgY2xhc3MgUmVuZGVy TGF5b3V0U3RhdGUgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFJlbmRlckxheW91dFN0YXRl KTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAKIHB1YmxpYzoKKyAgICBlbnVtIExlYWRpbmdU cmltU2lkZSA6IHVpbnQ4X3QgeworICAgICAgICBTdGFydCA9IDEgPDwgMCwKKyAgICAgICAgRW5k ICAgPSAxIDw8IDEKKyAgICB9OworCiAgICAgUmVuZGVyTGF5b3V0U3RhdGUoKQogICAgICAgICA6 IG1fY2xpcHBlZChmYWxzZSkKICAgICAgICAgLCBtX2lzUGFnaW5hdGVkKGZhbHNlKQpAQCAtNTIs NyArNTcsNyBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB7CiAgICAgfQotICAgIFJlbmRlckxheW91 dFN0YXRlKGNvbnN0IEZyYW1lVmlld0xheW91dENvbnRleHQ6OkxheW91dFN0YXRlU3RhY2smLCBS ZW5kZXJCb3gmLCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXQsIExheW91dFVuaXQgcGFnZUhlaWdo dCwgYm9vbCBwYWdlSGVpZ2h0Q2hhbmdlZCwgc3RkOjpvcHRpb25hbDxzaXplX3Q+IG1heGltdW1M aW5lQ291bnRGb3JMaW5lQ2xhbXAsIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiB2aXNpYmxlTGluZUNv dW50Rm9yTGluZUNsYW1wKTsKKyAgICBSZW5kZXJMYXlvdXRTdGF0ZShjb25zdCBGcmFtZVZpZXdM YXlvdXRDb250ZXh0OjpMYXlvdXRTdGF0ZVN0YWNrJiwgUmVuZGVyQm94JiwgY29uc3QgTGF5b3V0 U2l6ZSYgb2Zmc2V0LCBMYXlvdXRVbml0IHBhZ2VIZWlnaHQsIGJvb2wgcGFnZUhlaWdodENoYW5n ZWQsIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBtYXhpbXVtTGluZUNvdW50Rm9yTGluZUNsYW1wLCBz dGQ6Om9wdGlvbmFsPHNpemVfdD4gdmlzaWJsZUxpbmVDb3VudEZvckxpbmVDbGFtcCwgT3B0aW9u U2V0PExlYWRpbmdUcmltU2lkZT4pOwogICAgIGVudW0gY2xhc3MgSXNQYWdpbmF0ZWQgeyBObywg WWVzIH07CiAgICAgZXhwbGljaXQgUmVuZGVyTGF5b3V0U3RhdGUoUmVuZGVyRWxlbWVudCYsIElz UGFnaW5hdGVkID0gSXNQYWdpbmF0ZWQ6Ok5vKTsKIApAQCAtOTUsNiArMTAwLDEzIEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldFZpc2libGVMaW5lQ291bnRGb3JMaW5lQ2xhbXAoc2l6ZV90IHZpc2li bGVMaW5lQ291bnQpIHsgbV92aXNpYmxlTGluZUNvdW50Rm9yTGluZUNsYW1wID0gdmlzaWJsZUxp bmVDb3VudDsgfQogICAgIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiB2aXNpYmxlTGluZUNvdW50Rm9y TGluZUNsYW1wKCkgY29uc3QgeyByZXR1cm4gbV92aXNpYmxlTGluZUNvdW50Rm9yTGluZUNsYW1w OyB9CiAKKyAgICB1c2luZyBMZWFkaW5nVHJpbSA9IE9wdGlvblNldDxMZWFkaW5nVHJpbVNpZGU+ OworICAgIGJvb2wgaGFzTGVhZGluZ1RyaW0oKSBjb25zdCB7IHJldHVybiAhbGVhZGluZ1RyaW0o KS5pc0VtcHR5KCk7IH0KKyAgICBMZWFkaW5nVHJpbSBsZWFkaW5nVHJpbSgpIGNvbnN0IHsgcmV0 dXJuIG1fbGVhZGluZ1RyaW07IH0KKyAgICB2b2lkIGFkZExlYWRpbmdUcmltKExlYWRpbmdUcmlt U2lkZSBsZWFkaW5nVHJpbSkgeyBtX2xlYWRpbmdUcmltLmFkZChsZWFkaW5nVHJpbSk7IH0KKyAg ICB2b2lkIHJlbW92ZUxlYWRpbmdUcmltKExlYWRpbmdUcmltU2lkZSBsZWFkaW5nVHJpbSkgeyBt X2xlYWRpbmdUcmltLnJlbW92ZShsZWFkaW5nVHJpbSk7IH0KKyAgICB2b2lkIHJlc2V0TGVhZGlu Z1RyaW0oKSB7IG1fbGVhZGluZ1RyaW0gPSB7IH07IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIGNv bXB1dGVPZmZzZXRzKGNvbnN0IFJlbmRlckxheW91dFN0YXRlJiBhbmNlc3RvciwgUmVuZGVyQm94 JiwgTGF5b3V0U2l6ZSBvZmZzZXQpOwogICAgIHZvaWQgY29tcHV0ZUNsaXBSZWN0KGNvbnN0IFJl bmRlckxheW91dFN0YXRlJiBhbmNlc3RvciwgUmVuZGVyQm94Jik7CkBAIC0xMzcsNiArMTQ5LDcg QEAgcHJpdmF0ZToKICAgICBMYXlvdXRTaXplIG1fbGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luOwog ICAgIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBtX21heGltdW1MaW5lQ291bnRGb3JMaW5lQ2xhbXA7 CiAgICAgc3RkOjpvcHRpb25hbDxzaXplX3Q+IG1fdmlzaWJsZUxpbmVDb3VudEZvckxpbmVDbGFt cDsKKyAgICBMZWFkaW5nVHJpbSBtX2xlYWRpbmdUcmltOwogI2lmIEFTU0VSVF9FTkFCTEVECiAg ICAgUmVuZGVyRWxlbWVudCogbV9yZW5kZXJlciB7IG51bGxwdHIgfTsKICNlbmRpZgo=