185598 2018-05-13 20:20:22 -0700 [LFC] Implement width computation for non-replaced out of flow elements. 2018-05-14 07:53:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1423489 0 zalan 2018-05-13 20:20:22 -0700 ssia 1423490 1 340286 zalan 2018-05-13 20:23:39 -0700 Created attachment 340286 Patch 1423511 2 340286 koivisto 2018-05-14 00:11:22 -0700 Comment on attachment 340286 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=340286&action=review > Source/WebCore/layout/FormattingContext.cpp:174 > + computedWidthValue= shrinkToFitWidth(layoutContext, layoutBox); Missing space before = 1423584 3 340310 zalan 2018-05-14 07:13:48 -0700 Created attachment 340310 Patch 1423602 4 340310 commit-queue 2018-05-14 07:52:55 -0700 Comment on attachment 340310 Patch Clearing flags on attachment: 340310 Committed r231756: <https://trac.webkit.org/changeset/231756> 1423603 5 commit-queue 2018-05-14 07:52:57 -0700 All reviewed patches have been landed. Closing bug. 1423604 6 webkit-bug-importer 2018-05-14 07:53:19 -0700 <rdar://problem/40217458> 340286 2018-05-13 20:23:39 -0700 2018-05-14 07:13:47 -0700 Patch bug-185598-20180513202338.patch text/plain 10006 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBjMjdjODUzYjE0NTc4 Y2U1YjNmZjY4YzA3YmZhZWY5ZGFlNWQ3Ni4uYTJkNDdiMzJjNmQzNmU1OTFhZjlkN2QxNGNmNjBl Njg0OTFkOTZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHdp ZHRoIGNvbXB1dGF0aW9uIGZvciBub24tcmVwbGFjZWQgb3V0IG9mIGZsb3cgZWxlbWVudHMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU1OTgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9G b3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlV2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1dpZHRoIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rl c2NlbmRhbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dOb25SZXBsYWNlZFdpZHRoIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OnNocmlua1RvRml0V2lkdGggY29u c3QpOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dCBjb25zdCk6 CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKwogMjAxOC0wNS0x MiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBXZWFrUHRy IGZvciBtX2VuY2xvc2luZ1BhZ2luYXRpb25MYXllciBpbiBSZW5kZXJMYXllcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggM2MxMTg5Y2FkODAzN2Vh YmMxOTZmMjJlNjhjZGM5ZmEzMTJmNTgwOC4uMDJiNGI2MTczZTJiMjExOGJmNDgxYTRlMTE4MjU5 MDc4YWIzNWQ3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu Y3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09O VEVYVCkKIAorI2luY2x1ZGUgIkRpc3BsYXlCb3guaCIKICNpbmNsdWRlICJMYXlvdXRCb3guaCIK ICNpbmNsdWRlICJMYXlvdXRDb250YWluZXIuaCIKICNpbmNsdWRlICJMYXlvdXRDb250ZXh0Lmgi CkBAIC01OSwxMCArNjAsMTAgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9m Rmxvd1Bvc2l0aW9uKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnMKIHsKIH0KIAotdm9p ZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBE aXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0Cit2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlV2lkdGgoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlv dXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKICAgICBpZiAobGF5b3V0 Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQotICAgICAgICByZXR1cm4gY29tcHV0ZU91dE9m Rmxvd1dpZHRoKGxheW91dEJveCwgZGlzcGxheUJveCk7CisgICAgICAgIHJldHVybiBjb21wdXRl T3V0T2ZGbG93V2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAg ICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAgICAgICAgIHJldHVybiBj b21wdXRlRmxvYXRpbmdXaWR0aChsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOwogICAgIHJldHVybiBj b21wdXRlSW5GbG93V2lkdGgobGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKQEAgLTc3LDggKzc4LDEz IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHQoTGF5b3V0Q29udGV4dCYg bGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsCiAgICAgcmV0dXJuIGNvbXB1dGVJbkZsb3dIZWln aHQobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKIH0KIAotdm9pZCBGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1dpZHRoKGNvbnN0IEJveCYsIERpc3BsYXk6 OkJveCYpIGNvbnN0Cit2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93V2lk dGgoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERp c3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKKyAgICBpZiAoIWxheW91dEJveC5pc1Jl cGxhY2VkKCkpIHsKKyAgICAgICAgY29tcHV0ZU91dE9mRmxvd05vblJlcGxhY2VkV2lkdGgobGF5 b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAogdm9pZCBGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUZsb2F0aW5nV2lkdGgoY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QK QEAgLTEyNiw3ICsxMzIsNyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZs b3dEZXNjZW5kYW50cyhMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0KQogICAgICAgICBhdXRv JiBkaXNwbGF5Qm94ID0gbGF5b3V0Q29udGV4dC5jcmVhdGVEaXNwbGF5Qm94KGxheW91dEJveCk7 CiAKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uKGxheW91dEJveCwgZGlzcGxheUJv eCk7Ci0gICAgICAgIGNvbXB1dGVPdXRPZkZsb3dXaWR0aChsYXlvdXRCb3gsIGRpc3BsYXlCb3gp OworICAgICAgICBjb21wdXRlT3V0T2ZGbG93V2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94 LCBkaXNwbGF5Qm94KTsKIAogICAgICAgICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9y bWF0dGluZ0NvbnRleHQoKSk7CiAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBsYXlv dXRDb250ZXh0LmZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7CkBAIC0xMzYsNiArMTQyLDYx IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRzKExh eW91dENvbnRleHQmIGxheW91dENvbnRleHQpCiAgICAgfQogfQogCit2b2lkIEZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93Tm9uUmVwbGFjZWRXaWR0aChMYXlvdXRDb250ZXh0JiBs YXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5 Qm94KSBjb25zdAoreworICAgIC8vICdsZWZ0JyArICdtYXJnaW4tbGVmdCcgKyAnYm9yZGVyLWxl ZnQtd2lkdGgnICsgJ3BhZGRpbmctbGVmdCcgKyAnd2lkdGgnICsgJ3BhZGRpbmctcmlnaHQnICsg J2JvcmRlci1yaWdodC13aWR0aCcgKyAnbWFyZ2luLXJpZ2h0JyArICdyaWdodCcKKyAgICAvLyA9 IHdpZHRoIG9mIGNvbnRhaW5pbmcgYmxvY2sKKworICAgIC8vIElmIGFsbCB0aHJlZSBvZiAnbGVm dCcsICd3aWR0aCcsIGFuZCAncmlnaHQnIGFyZSAnYXV0byc6IEZpcnN0IHNldCBhbnkgJ2F1dG8n IHZhbHVlcyBmb3IgJ21hcmdpbi1sZWZ0JyBhbmQgJ21hcmdpbi1yaWdodCcgdG8gMC4KKyAgICAv LyBUaGVuLCBpZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGVsZW1lbnQgZXN0YWJs aXNoaW5nIHRoZSBzdGF0aWMtcG9zaXRpb24gY29udGFpbmluZyBibG9jayBpcyAnbHRyJyBzZXQg J2xlZnQnIHRvIHRoZSBzdGF0aWMKKyAgICAvLyBwb3NpdGlvbiBhbmQgYXBwbHkgcnVsZSBudW1i ZXIgdGhyZWUgYmVsb3c7IG90aGVyd2lzZSwgc2V0ICdyaWdodCcgdG8gdGhlIHN0YXRpYyBwb3Np dGlvbiBhbmQgYXBwbHkgcnVsZSBudW1iZXIgb25lIGJlbG93LgorCisgICAgLy8gMS4gJ2xlZnQn IGFuZCAnd2lkdGgnIGFyZSAnYXV0bycgYW5kICdyaWdodCcgaXMgbm90ICdhdXRvJywgdGhlbiB0 aGUgd2lkdGggaXMgc2hyaW5rLXRvLWZpdC4gVGhlbiBzb2x2ZSBmb3IgJ2xlZnQnCisgICAgLy8g Mi4gJ2xlZnQnIGFuZCAncmlnaHQnIGFyZSAnYXV0bycgYW5kICd3aWR0aCcgaXMgbm90ICdhdXRv JywgdGhlbiBpZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGVsZW1lbnQgZXN0YWJs aXNoaW5nIHRoZSBzdGF0aWMtcG9zaXRpb24gCisgICAgLy8gICAgY29udGFpbmluZyBibG9jayBp cyAnbHRyJyBzZXQgJ2xlZnQnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24sIG90aGVyd2lzZSBzZXQg J3JpZ2h0JyB0byB0aGUgc3RhdGljIHBvc2l0aW9uLgorICAgIC8vICAgIFRoZW4gc29sdmUgZm9y ICdsZWZ0JyAoaWYgJ2RpcmVjdGlvbiBpcyAncnRsJykgb3IgJ3JpZ2h0JyAoaWYgJ2RpcmVjdGlv bicgaXMgJ2x0cicpLgorICAgIC8vIDMuICd3aWR0aCcgYW5kICdyaWdodCcgYXJlICdhdXRvJyBh bmQgJ2xlZnQnIGlzIG5vdCAnYXV0bycsIHRoZW4gdGhlIHdpZHRoIGlzIHNocmluay10by1maXQg LiBUaGVuIHNvbHZlIGZvciAncmlnaHQnCisgICAgLy8gNC4gJ2xlZnQnIGlzICdhdXRvJywgJ3dp ZHRoJyBhbmQgJ3JpZ2h0JyBhcmUgbm90ICdhdXRvJywgdGhlbiBzb2x2ZSBmb3IgJ2xlZnQnCisg ICAgLy8gNS4gJ3dpZHRoJyBpcyAnYXV0bycsICdsZWZ0JyBhbmQgJ3JpZ2h0JyBhcmUgbm90ICdh dXRvJywgdGhlbiBzb2x2ZSBmb3IgJ3dpZHRoJworICAgIC8vIDYuICdyaWdodCcgaXMgJ2F1dG8n LCAnbGVmdCcgYW5kICd3aWR0aCcgYXJlIG5vdCAnYXV0bycsIHRoZW4gc29sdmUgZm9yICdyaWdo dCcKKyAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOworICAgIGF1dG8gbGVmdCA9 IHN0eWxlLmxvZ2ljYWxMZWZ0KCk7CisgICAgYXV0byByaWdodCA9IHN0eWxlLmxvZ2ljYWxSaWdo dCgpOworICAgIGF1dG8gd2lkdGggPSBzdHlsZS5sb2dpY2FsV2lkdGgoKTsKKworICAgIGF1dG8g Y29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRC b3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPndpZHRoKCk7CisgICAgTGF5b3V0VW5p dCBjb21wdXRlZFdpZHRoVmFsdWU7CisKKyAgICBpZiAoKGxlZnQuaXNBdXRvKCkgJiYgd2lkdGgu aXNBdXRvKCkgJiYgcmlnaHQuaXNBdXRvKCkpCisgICAgICAgIHx8IChsZWZ0LmlzQXV0bygpICYm IHdpZHRoLmlzQXV0bygpICYmICFyaWdodC5pc0F1dG8oKSkKKyAgICAgICAgfHwgKCFsZWZ0Lmlz QXV0bygpICYmIHdpZHRoLmlzQXV0bygpICYmIHJpZ2h0LmlzQXV0bygpKSkgeworICAgICAgICAv LyBBbGwgYXV0byAoIzEpLCAjMSBhbmQgIzMKKyAgICAgICAgY29tcHV0ZWRXaWR0aFZhbHVlPSBz aHJpbmtUb0ZpdFdpZHRoKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgfSBlbHNlIGlm ICghbGVmdC5pc0F1dG8oKSAmJiB3aWR0aC5pc0F1dG8oKSAmJiAhcmlnaHQuaXNBdXRvKCkpIHsK KyAgICAgICAgLy8gIzUKKyAgICAgICAgYXV0byBtYXJnaW5MZWZ0ID0gc3R5bGUubWFyZ2luTGVm dCgpLmlzQXV0bygpID8gTGF5b3V0VW5pdCgpIDogdmFsdWVGb3JMZW5ndGgoc3R5bGUubWFyZ2lu TGVmdCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CisgICAgICAgIGF1dG8gbWFyZ2luUmlnaHQg PSBzdHlsZS5tYXJnaW5SaWdodCgpLmlzQXV0bygpID8gTGF5b3V0VW5pdCgpIDogdmFsdWVGb3JM ZW5ndGgoc3R5bGUubWFyZ2luUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgIAor ICAgICAgICBhdXRvIHBhZGRpbmdMZWZ0ID0gdmFsdWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ1Rv cCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CisgICAgICAgIGF1dG8gcGFkZGluZ1JpZ2h0ID0g dmFsdWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ0JvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0 aCk7CisKKyAgICAgICAgYXV0byBib3JkZXJMZWZ0V2lkdGggPSBzdHlsZS5ib3JkZXJTdGFydFdp ZHRoKCk7CisgICAgICAgIGF1dG8gYm9yZGVyUmlnaHRXaWR0aCA9IHN0eWxlLmJvcmRlckVuZFdp ZHRoKCk7CisKKyAgICAgICAgY29tcHV0ZWRXaWR0aFZhbHVlID0gY29udGFpbmluZ0Jsb2NrV2lk dGggLSAobGVmdC52YWx1ZSgpICsgbWFyZ2luTGVmdCArIGJvcmRlckxlZnRXaWR0aCArIHBhZGRp bmdMZWZ0ICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHRXaWR0aCArIG1hcmdpblJpZ2h0ICsg cmlnaHQudmFsdWUoKSk7CisgICAgfSBlbHNlIGlmICghd2lkdGguaXNBdXRvKCkpCisgICAgICAg IGNvbXB1dGVkV2lkdGhWYWx1ZSA9IHZhbHVlRm9yTGVuZ3RoKHdpZHRoLCBjb250YWluaW5nQmxv Y2tXaWR0aCk7CisgICAgZWxzZQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKworICAg IGRpc3BsYXlCb3guc2V0V2lkdGgoY29tcHV0ZWRXaWR0aFZhbHVlKTsKK30KKworTGF5b3V0VW5p dCBGb3JtYXR0aW5nQ29udGV4dDo6c2hyaW5rVG9GaXRXaWR0aChMYXlvdXRDb250ZXh0JiwgY29u c3QgQm94JikgY29uc3QKK3sKKyAgICByZXR1cm4gMDsKK30KKwogfQogfQogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDNlNWU4NzA2MWMxNzk5 OTlhZTYyNmIzZmMzYTljNmU5NDY5ZjhkMzQuLmJhODNiODU1ODBiZDMxMThmYTBhNzc4YzRjYThl ZGEzZjhmMWM1MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5o CkBAIC02OCwxMCArNjgsMTAgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRl SW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0 OwogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oY29uc3QgQm94Jiwg RGlzcGxheTo6Qm94JikgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVdpZHRoKGNv bnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBjb21wdXRl V2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0Owog ICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlSGVpZ2h0KExheW91dENvbnRleHQmLCBjb25zdCBCb3gm LCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlT3V0T2ZG bG93V2lkdGgoY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CisgICAgdmlydHVhbCB2 b2lkIGNvbXB1dGVPdXRPZkZsb3dXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlz cGxheTo6Qm94JikgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVGbG9hdGluZ1dpZHRo KGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBjb21w dXRlSW5GbG93V2lkdGgoY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QgPSAwOwogCkBA IC04OCw2ICs4OCw5IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIGxheW91dE91dE9mRmxvd0Rlc2Nl bmRhbnRzKExheW91dENvbnRleHQmcykgY29uc3Q7CiAKIHByaXZhdGU6CisgICAgdm9pZCBjb21w dXRlT3V0T2ZGbG93Tm9uUmVwbGFjZWRXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jiwg RGlzcGxheTo6Qm94JikgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBzaHJpbmtUb0ZpdFdpZHRoKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmKSBjb25zdDsKKwogICAgIFdlYWtQdHI8Qm94PiBtX3Jv b3Q7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBlMmM5YzJkYWU0 Y2FlNGFlYzg3Mzc4ZmVhN2M3MmI1ZTAwZjY1MDhmLi4wNTQyMTM2MWIxY2UwNTg2NTUwYTg5NmRh ZmNmYzE1YjFhYTRiNzI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTc0 LDcgKzc0LDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQoTGF5b3V0Q29u dGV4dCYgbGF5b3V0Q29udGV4dCwgRm9ybWF0dGluZ1N0YXQKICAgICAgICAgICAgIGF1dG8mIGxh eW91dEJveCA9IGxheW91dFBhaXIubGF5b3V0Qm94OwogICAgICAgICAgICAgYXV0byYgZGlzcGxh eUJveCA9IGxheW91dFBhaXIuZGlzcGxheUJveDsKICAgICAgICAgICAgIAotICAgICAgICAgICAg Y29tcHV0ZVdpZHRoKGxheW91dEJveCwgZGlzcGxheUJveCk7CisgICAgICAgICAgICBjb21wdXRl V2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAgICAgICAgICAg IGNvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGxheW91dFBh aXIuZGlzcGxheUJveCk7CiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9y bWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRl eHQgPSBsYXlvdXRDb250ZXh0LmZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaAppbmRleCAzY2RmYjFj NWQwOGZlMWMzYmYyMTEyNjc5MTcwMTIzZWZhZDE3YjliLi40OWExZDEwNTQxZmU3M2QyMjAwZDMw MmZkMmEwOGQyZTRmMmE1MzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlz cGxheXRyZWUvRGlzcGxheUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5 dHJlZS9EaXNwbGF5Qm94LmgKQEAgLTM1LDggKzM1LDkgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogbmFtZXNwYWNlIExheW91dCB7Ci1jbGFzcyBMYXlvdXRDb250ZXh0OwogY2xhc3MgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDsKK2NsYXNzIEZvcm1hdHRpbmdDb250ZXh0OworY2xhc3MgTGF5b3V0 Q29udGV4dDsKIH0KIAogbmFtZXNwYWNlIERpc3BsYXkgewpAQCAtNDUsNiArNDYsNyBAQCBjbGFz cyBCb3ggewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoQm94KTsKIHB1YmxpYzoKICAgICBm cmllbmQgY2xhc3MgTGF5b3V0OjpMYXlvdXRDb250ZXh0OworICAgIGZyaWVuZCBjbGFzcyBMYXlv dXQ6OkZvcm1hdHRpbmdDb250ZXh0OwogICAgIGZyaWVuZCBjbGFzcyBMYXlvdXQ6OkJsb2NrRm9y bWF0dGluZ0NvbnRleHQ7CiAKICAgICB+Qm94KCk7Cg== 340310 2018-05-14 07:13:48 -0700 2018-05-14 07:52:55 -0700 Patch bug-185598-20180514071347.patch text/plain 10007 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBjMjdjODUzYjE0NTc4 Y2U1YjNmZjY4YzA3YmZhZWY5ZGFlNWQ3Ni4uM2JlZGRjOGUzZDlkNTgwMzQ2YzQyM2Y3YTYzNjI1 YjRmZTE2YjY1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHdp ZHRoIGNvbXB1dGF0aW9uIGZvciBub24tcmVwbGFjZWQgb3V0IG9mIGZsb3cgZWxlbWVudHMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU1OTgKKwor ICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAqIGxheW91dC9G b3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlV2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1dpZHRoIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rl c2NlbmRhbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVPdXRPZkZsb3dOb25SZXBsYWNlZFdpZHRoIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OnNocmlua1RvRml0V2lkdGggY29u c3QpOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dCBjb25zdCk6 CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKwogMjAxOC0wNS0x MiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBXZWFrUHRy IGZvciBtX2VuY2xvc2luZ1BhZ2luYXRpb25MYXllciBpbiBSZW5kZXJMYXllcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggM2MxMTg5Y2FkODAzN2Vh YmMxOTZmMjJlNjhjZGM5ZmEzMTJmNTgwOC4uMTBmNDFmM2IxZmFkZDAyZGRjMWFiZTc3NjA4ODZm NzBmYzRkODY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu Y3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09O VEVYVCkKIAorI2luY2x1ZGUgIkRpc3BsYXlCb3guaCIKICNpbmNsdWRlICJMYXlvdXRCb3guaCIK ICNpbmNsdWRlICJMYXlvdXRDb250YWluZXIuaCIKICNpbmNsdWRlICJMYXlvdXRDb250ZXh0Lmgi CkBAIC01OSwxMCArNjAsMTAgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9m Rmxvd1Bvc2l0aW9uKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnMKIHsKIH0KIAotdm9p ZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBE aXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0Cit2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlV2lkdGgoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlv dXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKICAgICBpZiAobGF5b3V0 Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQotICAgICAgICByZXR1cm4gY29tcHV0ZU91dE9m Rmxvd1dpZHRoKGxheW91dEJveCwgZGlzcGxheUJveCk7CisgICAgICAgIHJldHVybiBjb21wdXRl T3V0T2ZGbG93V2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAg ICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCiAgICAgICAgIHJldHVybiBj b21wdXRlRmxvYXRpbmdXaWR0aChsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOwogICAgIHJldHVybiBj b21wdXRlSW5GbG93V2lkdGgobGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKQEAgLTc3LDggKzc4LDEz IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHQoTGF5b3V0Q29udGV4dCYg bGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsCiAgICAgcmV0dXJuIGNvbXB1dGVJbkZsb3dIZWln aHQobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKIH0KIAotdm9pZCBGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1dpZHRoKGNvbnN0IEJveCYsIERpc3BsYXk6 OkJveCYpIGNvbnN0Cit2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93V2lk dGgoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERp c3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKKyAgICBpZiAoIWxheW91dEJveC5pc1Jl cGxhY2VkKCkpIHsKKyAgICAgICAgY29tcHV0ZU91dE9mRmxvd05vblJlcGxhY2VkV2lkdGgobGF5 b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAogdm9pZCBGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUZsb2F0aW5nV2lkdGgoY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QK QEAgLTEyNiw3ICsxMzIsNyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRPZkZs b3dEZXNjZW5kYW50cyhMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0KQogICAgICAgICBhdXRv JiBkaXNwbGF5Qm94ID0gbGF5b3V0Q29udGV4dC5jcmVhdGVEaXNwbGF5Qm94KGxheW91dEJveCk7 CiAKICAgICAgICAgY29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uKGxheW91dEJveCwgZGlzcGxheUJv eCk7Ci0gICAgICAgIGNvbXB1dGVPdXRPZkZsb3dXaWR0aChsYXlvdXRCb3gsIGRpc3BsYXlCb3gp OworICAgICAgICBjb21wdXRlT3V0T2ZGbG93V2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94 LCBkaXNwbGF5Qm94KTsKIAogICAgICAgICBBU1NFUlQobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9y bWF0dGluZ0NvbnRleHQoKSk7CiAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBsYXlv dXRDb250ZXh0LmZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7CkBAIC0xMzYsNiArMTQyLDYx IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dE91dE9mRmxvd0Rlc2NlbmRhbnRzKExh eW91dENvbnRleHQmIGxheW91dENvbnRleHQpCiAgICAgfQogfQogCit2b2lkIEZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93Tm9uUmVwbGFjZWRXaWR0aChMYXlvdXRDb250ZXh0JiBs YXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5 Qm94KSBjb25zdAoreworICAgIC8vICdsZWZ0JyArICdtYXJnaW4tbGVmdCcgKyAnYm9yZGVyLWxl ZnQtd2lkdGgnICsgJ3BhZGRpbmctbGVmdCcgKyAnd2lkdGgnICsgJ3BhZGRpbmctcmlnaHQnICsg J2JvcmRlci1yaWdodC13aWR0aCcgKyAnbWFyZ2luLXJpZ2h0JyArICdyaWdodCcKKyAgICAvLyA9 IHdpZHRoIG9mIGNvbnRhaW5pbmcgYmxvY2sKKworICAgIC8vIElmIGFsbCB0aHJlZSBvZiAnbGVm dCcsICd3aWR0aCcsIGFuZCAncmlnaHQnIGFyZSAnYXV0byc6IEZpcnN0IHNldCBhbnkgJ2F1dG8n IHZhbHVlcyBmb3IgJ21hcmdpbi1sZWZ0JyBhbmQgJ21hcmdpbi1yaWdodCcgdG8gMC4KKyAgICAv LyBUaGVuLCBpZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGVsZW1lbnQgZXN0YWJs aXNoaW5nIHRoZSBzdGF0aWMtcG9zaXRpb24gY29udGFpbmluZyBibG9jayBpcyAnbHRyJyBzZXQg J2xlZnQnIHRvIHRoZSBzdGF0aWMKKyAgICAvLyBwb3NpdGlvbiBhbmQgYXBwbHkgcnVsZSBudW1i ZXIgdGhyZWUgYmVsb3c7IG90aGVyd2lzZSwgc2V0ICdyaWdodCcgdG8gdGhlIHN0YXRpYyBwb3Np dGlvbiBhbmQgYXBwbHkgcnVsZSBudW1iZXIgb25lIGJlbG93LgorCisgICAgLy8gMS4gJ2xlZnQn IGFuZCAnd2lkdGgnIGFyZSAnYXV0bycgYW5kICdyaWdodCcgaXMgbm90ICdhdXRvJywgdGhlbiB0 aGUgd2lkdGggaXMgc2hyaW5rLXRvLWZpdC4gVGhlbiBzb2x2ZSBmb3IgJ2xlZnQnCisgICAgLy8g Mi4gJ2xlZnQnIGFuZCAncmlnaHQnIGFyZSAnYXV0bycgYW5kICd3aWR0aCcgaXMgbm90ICdhdXRv JywgdGhlbiBpZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGVsZW1lbnQgZXN0YWJs aXNoaW5nIHRoZSBzdGF0aWMtcG9zaXRpb24gCisgICAgLy8gICAgY29udGFpbmluZyBibG9jayBp cyAnbHRyJyBzZXQgJ2xlZnQnIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24sIG90aGVyd2lzZSBzZXQg J3JpZ2h0JyB0byB0aGUgc3RhdGljIHBvc2l0aW9uLgorICAgIC8vICAgIFRoZW4gc29sdmUgZm9y ICdsZWZ0JyAoaWYgJ2RpcmVjdGlvbiBpcyAncnRsJykgb3IgJ3JpZ2h0JyAoaWYgJ2RpcmVjdGlv bicgaXMgJ2x0cicpLgorICAgIC8vIDMuICd3aWR0aCcgYW5kICdyaWdodCcgYXJlICdhdXRvJyBh bmQgJ2xlZnQnIGlzIG5vdCAnYXV0bycsIHRoZW4gdGhlIHdpZHRoIGlzIHNocmluay10by1maXQg LiBUaGVuIHNvbHZlIGZvciAncmlnaHQnCisgICAgLy8gNC4gJ2xlZnQnIGlzICdhdXRvJywgJ3dp ZHRoJyBhbmQgJ3JpZ2h0JyBhcmUgbm90ICdhdXRvJywgdGhlbiBzb2x2ZSBmb3IgJ2xlZnQnCisg ICAgLy8gNS4gJ3dpZHRoJyBpcyAnYXV0bycsICdsZWZ0JyBhbmQgJ3JpZ2h0JyBhcmUgbm90ICdh dXRvJywgdGhlbiBzb2x2ZSBmb3IgJ3dpZHRoJworICAgIC8vIDYuICdyaWdodCcgaXMgJ2F1dG8n LCAnbGVmdCcgYW5kICd3aWR0aCcgYXJlIG5vdCAnYXV0bycsIHRoZW4gc29sdmUgZm9yICdyaWdo dCcKKyAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOworICAgIGF1dG8gbGVmdCA9 IHN0eWxlLmxvZ2ljYWxMZWZ0KCk7CisgICAgYXV0byByaWdodCA9IHN0eWxlLmxvZ2ljYWxSaWdo dCgpOworICAgIGF1dG8gd2lkdGggPSBzdHlsZS5sb2dpY2FsV2lkdGgoKTsKKworICAgIGF1dG8g Y29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRC b3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPndpZHRoKCk7CisgICAgTGF5b3V0VW5p dCBjb21wdXRlZFdpZHRoVmFsdWU7CisKKyAgICBpZiAoKGxlZnQuaXNBdXRvKCkgJiYgd2lkdGgu aXNBdXRvKCkgJiYgcmlnaHQuaXNBdXRvKCkpCisgICAgICAgIHx8IChsZWZ0LmlzQXV0bygpICYm IHdpZHRoLmlzQXV0bygpICYmICFyaWdodC5pc0F1dG8oKSkKKyAgICAgICAgfHwgKCFsZWZ0Lmlz QXV0bygpICYmIHdpZHRoLmlzQXV0bygpICYmIHJpZ2h0LmlzQXV0bygpKSkgeworICAgICAgICAv LyBBbGwgYXV0byAoIzEpLCAjMSBhbmQgIzMKKyAgICAgICAgY29tcHV0ZWRXaWR0aFZhbHVlID0g c2hyaW5rVG9GaXRXaWR0aChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOworICAgIH0gZWxzZSBp ZiAoIWxlZnQuaXNBdXRvKCkgJiYgd2lkdGguaXNBdXRvKCkgJiYgIXJpZ2h0LmlzQXV0bygpKSB7 CisgICAgICAgIC8vICM1CisgICAgICAgIGF1dG8gbWFyZ2luTGVmdCA9IHN0eWxlLm1hcmdpbkxl ZnQoKS5pc0F1dG8oKSA/IExheW91dFVuaXQoKSA6IHZhbHVlRm9yTGVuZ3RoKHN0eWxlLm1hcmdp bkxlZnQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgICAgICBhdXRvIG1hcmdpblJpZ2h0 ID0gc3R5bGUubWFyZ2luUmlnaHQoKS5pc0F1dG8oKSA/IExheW91dFVuaXQoKSA6IHZhbHVlRm9y TGVuZ3RoKHN0eWxlLm1hcmdpblJpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICAK KyAgICAgICAgYXV0byBwYWRkaW5nTGVmdCA9IHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBhZGRpbmdU b3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgICAgICBhdXRvIHBhZGRpbmdSaWdodCA9 IHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBhZGRpbmdCb3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lk dGgpOworCisgICAgICAgIGF1dG8gYm9yZGVyTGVmdFdpZHRoID0gc3R5bGUuYm9yZGVyU3RhcnRX aWR0aCgpOworICAgICAgICBhdXRvIGJvcmRlclJpZ2h0V2lkdGggPSBzdHlsZS5ib3JkZXJFbmRX aWR0aCgpOworCisgICAgICAgIGNvbXB1dGVkV2lkdGhWYWx1ZSA9IGNvbnRhaW5pbmdCbG9ja1dp ZHRoIC0gKGxlZnQudmFsdWUoKSArIG1hcmdpbkxlZnQgKyBib3JkZXJMZWZ0V2lkdGggKyBwYWRk aW5nTGVmdCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJpZ2h0V2lkdGggKyBtYXJnaW5SaWdodCAr IHJpZ2h0LnZhbHVlKCkpOworICAgIH0gZWxzZSBpZiAoIXdpZHRoLmlzQXV0bygpKQorICAgICAg ICBjb21wdXRlZFdpZHRoVmFsdWUgPSB2YWx1ZUZvckxlbmd0aCh3aWR0aCwgY29udGFpbmluZ0Js b2NrV2lkdGgpOworICAgIGVsc2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisKKyAg ICBkaXNwbGF5Qm94LnNldFdpZHRoKGNvbXB1dGVkV2lkdGhWYWx1ZSk7Cit9CisKK0xheW91dFVu aXQgRm9ybWF0dGluZ0NvbnRleHQ6OnNocmlua1RvRml0V2lkdGgoTGF5b3V0Q29udGV4dCYsIGNv bnN0IEJveCYpIGNvbnN0Cit7CisgICAgcmV0dXJuIDA7Cit9CisKIH0KIH0KICNlbmRpZgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAzZTVlODcwNjFjMTc5 OTk5YWU2MjZiM2ZjM2E5YzZlOTQ2OWY4ZDM0Li5iYTgzYjg1NTgwYmQzMTE4ZmEwYTc3OGM0Y2E4 ZWRhM2Y4ZjFjNTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu aApAQCAtNjgsMTAgKzY4LDEwIEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0 ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25z dDsKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZU91dE9mRmxvd1Bvc2l0aW9uKGNvbnN0IEJveCYs IERpc3BsYXk6OkJveCYpIGNvbnN0OwogCi0gICAgdmlydHVhbCB2b2lkIGNvbXB1dGVXaWR0aChj b25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgY29tcHV0 ZVdpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsK ICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUhlaWdodChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94 JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZU91dE9m Rmxvd1dpZHRoKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OworICAgIHZpcnR1YWwg dm9pZCBjb21wdXRlT3V0T2ZGbG93V2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERp c3BsYXk6OkJveCYpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlRmxvYXRpbmdXaWR0 aChjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgY29t cHV0ZUluRmxvd1dpZHRoKGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0ID0gMDsKIApA QCAtODgsNiArODgsOSBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBsYXlvdXRPdXRPZkZsb3dEZXNj ZW5kYW50cyhMYXlvdXRDb250ZXh0JnMpIGNvbnN0OwogCiBwcml2YXRlOgorICAgIHZvaWQgY29t cHV0ZU91dE9mRmxvd05vblJlcGxhY2VkV2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYs IERpc3BsYXk6OkJveCYpIGNvbnN0OworICAgIExheW91dFVuaXQgc2hyaW5rVG9GaXRXaWR0aChM YXlvdXRDb250ZXh0JiwgY29uc3QgQm94JikgY29uc3Q7CisKICAgICBXZWFrUHRyPEJveD4gbV9y b290OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZTJjOWMyZGFl NGNhZTRhZWM4NzM3OGZlYTdjNzJiNWUwMGY2NTA4Zi4uMDU0MjEzNjFiMWNlMDU4NjU1MGE4OTZk YWZjZmMxNWIxYWE0YjcyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC03 NCw3ICs3NCw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KExheW91dENv bnRleHQmIGxheW91dENvbnRleHQsIEZvcm1hdHRpbmdTdGF0CiAgICAgICAgICAgICBhdXRvJiBs YXlvdXRCb3ggPSBsYXlvdXRQYWlyLmxheW91dEJveDsKICAgICAgICAgICAgIGF1dG8mIGRpc3Bs YXlCb3ggPSBsYXlvdXRQYWlyLmRpc3BsYXlCb3g7CiAgICAgICAgICAgICAKLSAgICAgICAgICAg IGNvbXB1dGVXaWR0aChsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOworICAgICAgICAgICAgY29tcHV0 ZVdpZHRoKGxheW91dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CiAgICAgICAgICAg ICBjb21wdXRlU3RhdGljUG9zaXRpb24obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBsYXlvdXRQ YWlyLmRpc3BsYXlCb3gpOwogICAgICAgICAgICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zv cm1hdHRpbmdDb250ZXh0KCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIGZvcm1hdHRpbmdDb250 ZXh0ID0gbGF5b3V0Q29udGV4dC5mb3JtYXR0aW5nQ29udGV4dChsYXlvdXRCb3gpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKaW5kZXggM2NkZmIx YzVkMDhmZTFjM2JmMjExMjY3OTE3MDEyM2VmYWQxN2I5Yi4uNDlhMWQxMDU0MWZlNzNkMjIwMGQz MDJmZDJhMDhkMmU0ZjJhNTMyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rp c3BsYXl0cmVlL0Rpc3BsYXlCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxh eXRyZWUvRGlzcGxheUJveC5oCkBAIC0zNSw4ICszNSw5IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKIG5hbWVzcGFjZSBMYXlvdXQgewotY2xhc3MgTGF5b3V0Q29udGV4dDsKIGNsYXNzIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ7CitjbGFzcyBGb3JtYXR0aW5nQ29udGV4dDsKK2NsYXNzIExheW91 dENvbnRleHQ7CiB9CiAKIG5hbWVzcGFjZSBEaXNwbGF5IHsKQEAgLTQ1LDYgKzQ2LDcgQEAgY2xh c3MgQm94IHsKICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKEJveCk7CiBwdWJsaWM6CiAgICAg ZnJpZW5kIGNsYXNzIExheW91dDo6TGF5b3V0Q29udGV4dDsKKyAgICBmcmllbmQgY2xhc3MgTGF5 b3V0OjpGb3JtYXR0aW5nQ29udGV4dDsKICAgICBmcmllbmQgY2xhc3MgTGF5b3V0OjpCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OwogCiAgICAgfkJveCgpOwo=