206569 2020-01-21 20:14:50 -0800 [LFC][BFC] No need to special case formatting context root layout 2020-01-22 07:40:53 -0800 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 simon.fraser webkit-bug-importer zalan oldest_to_newest 1609443 0 zalan 2020-01-21 20:14:50 -0800 ssia 1609444 1 webkit-bug-importer 2020-01-21 20:15:12 -0800 <rdar://problem/58784767> 1609445 2 388394 zalan 2020-01-21 20:28:05 -0800 Created attachment 388394 Patch 1609527 3 388418 zalan 2020-01-22 07:23:16 -0800 Created attachment 388418 Patch 1609533 4 388418 commit-queue 2020-01-22 07:40:51 -0800 Comment on attachment 388418 Patch Clearing flags on attachment: 388418 Committed r254922: <https://trac.webkit.org/changeset/254922> 1609534 5 commit-queue 2020-01-22 07:40:53 -0800 All reviewed patches have been landed. Closing bug. 388394 2020-01-21 20:28:05 -0800 2020-01-22 07:23:14 -0800 Patch bug-206569-20200121202805.patch text/plain 8855 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0ODc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzY2MGJlZmVjZDRiNTQ2 ODFiMjY0ZDFkMGZjYmEwZTBjMzRjOGIyMi4uMDYxMTY0ZGU5OTFlNzc0ZmEyMDY4NDIwYjUzOTcx MmM3MDA5ZjM3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBObyBuZWVk IHRvIHNwZWNpYWwgY2FzZSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCBsYXlvdXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjU2OQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTg3ODQ3Njc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTGV0J3MgbW92ZSBvdXQgYWxsIHRoZSBmb3JtYXR0aW5nIGNvbnRl eHQgbGF5b3V0IGxvZ2ljIGZyb20gbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290LgorCisgICAg ICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCk6IERlbGV0ZWQuCisgICAgICAg ICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisKIDIw MjAtMDEtMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtCRkNdIE1vdmUgZmxvYXQgYXZvaWRlciBzcGVjaWFsIGF2YWlsYWJsZSB3aWR0aCBoYW5kbGlu ZyB0byBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGNkMjU3YjAwYmFkZTQ4NjgwNDcyZTQ0NjMx NDU4ODk5MDJiNjFiMGMuLjhiZWNiYzI5MTM2MDIzMzFiOTcxYjcwZDUzZGEwNjY2OTkzNzA0OTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTI0LDEyICsxMjQsMTQgQEAg dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRh dGlvblN0YXRlJiBpbnZhbGlkYXRpb24KICAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNIb3Jpem9u dGFsUG9zaXRpb24obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwogCiAgICAgICAg ICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAg ICAgICAgICAgICAgIC8vIGxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCgpIHRha2VzIGNhcmUg b2YgdGhlIGxheW91dEJveCBpdHNlbGYgYW5kIGl0cyBkZXNjZW5kYW50cy4KLSAgICAgICAgICAg ICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QobGF5b3V0Qm94LCBmbG9hdGluZ0NvbnRl eHQsIGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29u c3RyYWludHMpOwotICAgICAgICAgICAgICAgIGxheW91dFF1ZXVlLnJlbW92ZUxhc3QoKTsKLSAg ICAgICAgICAgICAgICBpZiAoIWFwcGVuZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJveCwgTGF5 b3V0RGlyZWN0aW9uOjpTaWJsaW5nKSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgaWYgKGlzPENvbnRhaW5lcj4o bGF5b3V0Qm94KSAmJiBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93T3JG bG9hdGluZ0NoaWxkKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gTGF5b3V0IHRoZSBpbmZs b3cgZGVzY2VuZGFudHMgb2YgdGhpcyBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdC4KKyAgICAgICAg ICAgICAgICAgICAgYXV0byYgcm9vdERpc3BsYXlCb3ggPSBnZW9tZXRyeUZvckJveChsYXlvdXRC b3gpOworICAgICAgICAgICAgICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50c0ZvckZv cm1hdHRpbmdDb250ZXh0ID0gR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxv dyhyb290RGlzcGxheUJveCk7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gdmVydGljYWxDb25z dHJhaW50c0ZvckZvcm1hdHRpbmdDb250ZXh0ID0gR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWlu dHNGb3JJbkZsb3cocm9vdERpc3BsYXlCb3gpOworICAgICAgICAgICAgICAgICAgICBMYXlvdXRD b250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChkb3duY2FzdDxDb250YWluZXI+KGxheW91 dEJveCksIGxheW91dFN0YXRlKCkpLT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0 YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHNGb3JGb3JtYXR0aW5nQ29udGV4dCwgdmVydGljYWxD b25zdHJhaW50c0ZvckZvcm1hdHRpbmdDb250ZXh0KTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIWFwcGVu ZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJveCwgTGF5b3V0RGlyZWN0aW9uOjpDaGlsZCkpCiAg ICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0xMzcsMTUgKzEzOSwzMCBAQCB2b2lkIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGlu dmFsaWRhdGlvbgogCiAgICAgICAgIC8vIENsaW1iIGJhY2sgb24gdGhlIGFuY2VzdG9ycyBhbmQg Y29tcHV0ZSBoZWlnaHQvZmluYWwgcG9zaXRpb24uCiAgICAgICAgIHdoaWxlICghbGF5b3V0UXVl dWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAvLyBBbGwgaW5mbG93IGRlc2NlbmRhbnRzIChp ZiB0aGVyZSBhcmUgYW55KSBhcmUgbGFpZCBvdXQgYnkgbm93LiBMZXQncyBjb21wdXRlIHRoZSBi b3gncyBoZWlnaHQuCiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSAqbGF5b3V0UXVldWUu dGFrZUxhc3QoKTsKICAgICAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzID0gaG9y aXpvbnRhbENvbnN0cmFpbnRzRm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBh dXRvIHZlcnRpY2FsQ29uc3RyYWludHMgPSB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yTGF5b3V0Qm94 KGxheW91dEJveCk7Ci0gICAgICAgICAgICAvLyBGb3JtYXR0aW5nIHJvb3QgYm94ZXMgYXJlIHNw ZWNpYWwtY2FzZWQgYW5kIHRoZXkgZG9uJ3QgY29tZSBoZXJlLgotICAgICAgICAgICAgQVNTRVJU KCFsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKKworICAgICAgICAg ICAgLy8gQWxsIGluZmxvdyBkZXNjZW5kYW50cyAoaWYgdGhlcmUgYXJlIGFueSkgYXJlIGxhaWQg b3V0IGJ5IG5vdy4gTGV0J3MgY29tcHV0ZSB0aGUgYm94J3MgaGVpZ2h0LgogICAgICAgICAgICAg Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywg dmVydGljYWxDb25zdHJhaW50cyk7Ci0gICAgICAgICAgICAvLyBNb3ZlIGluLWZsb3cgcG9zaXRp b25lZCBjaGlsZHJlbiB0byB0aGVpciBmaW5hbCBwb3NpdGlvbi4KKworICAgICAgICAgICAgaWYg KGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgICAg ICAgICAvLyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGxh eW91dCB0aGUgb3V0LW9mLWZsb3cgZGVzY2VuZGFudHMuCisgICAgICAgICAgICAgICAgaWYgKGlz PENvbnRhaW5lcj4obGF5b3V0Qm94KSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvJiByb290 RGlzcGxheUJveCA9IGdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CisgICAgICAgICAgICAgICAg ICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93ID0gIEdlb21ldHJ5Ojpo b3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cocm9vdERpc3BsYXlCb3gpOworICAgICAg ICAgICAgICAgICAgICBhdXRvIHZlcnRpY2FsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cgPSBHZW9t ZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290RGlzcGxheUJveCk7Cisg ICAgICAgICAgICAgICAgICAgIExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0 KGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KSwgbGF5b3V0U3RhdGUoKSktPmxheW91dE91 dE9mRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25zdHJhaW50c0Zv ck91dE9mRmxvdywgdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyk7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgLy8gUmVzb2x2ZSBmaW5hbCBwb3Np dGlvbnMuCiAgICAgICAgICAgICBwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihsYXlvdXRC b3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAgICAgICAgICBpZiAobGF5b3V0Qm94Lmlz RmxvYXRpbmdQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgICAgICAgICBjb21wdXRlRmxvYXRpbmdQ b3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CisgICAgICAgICAgICAgICAgZmxv YXRpbmdDb250ZXh0LmFwcGVuZChsYXlvdXRCb3gpOworICAgICAgICAgICAgfSBlbHNlIGlmIChs YXlvdXRCb3guaXNGbG9hdEF2b2lkZXIoKSkKKyAgICAgICAgICAgICAgICBjb21wdXRlUG9zaXRp b25Ub0F2b2lkRmxvYXRzKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94KTsKKwogICAgICAgICAg ICAgaWYgKGFwcGVuZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJveCwgTGF5b3V0RGlyZWN0aW9u OjpTaWJsaW5nKSkKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtMTg5LDM1 ICsyMDYsNiBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp1 c2VkQXZhaWxhYmxlV2lkdGhGb3JGbG9hdEF2b2lkZXIoYwogICAgIHJldHVybiBhdmFpbGFibGVX aWR0aDsKIH0KIAotdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5n Q29udGV4dFJvb3QoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIEZsb2F0aW5nQ29u dGV4dCYgZmxvYXRpbmdDb250ZXh0LCBJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3Rh dGUsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiBob3Jpem9u dGFsQ29uc3RyYWludHMsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxWZXJ0aWNhbENvbnN0cmFpbnRz PiYgdmVydGljYWxDb25zdHJhaW50cykKLXsKLSAgICBBU1NFUlQoZm9ybWF0dGluZ0NvbnRleHRS b290LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgLy8gU3RhcnQgbGF5aW5n IG91dCB0aGlzIGZvcm1hdHRpbmcgcm9vdCBpbiB0aGUgZm9ybWF0dGluZyBjb250ZW54dCBpdCBs aXZlcyBpbi4KLSAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0 cmVhbSA8PCAiW0NvbXB1dGVdIC0+IFtQb3NpdGlvbl1bQm9yZGVyXVtQYWRkaW5nXVtXaWR0aF1b TWFyZ2luXSAtPiBmb3IgbGF5b3V0Qm94KCIgPDwgJmZvcm1hdHRpbmdDb250ZXh0Um9vdCA8PCAi KSIpOwotCi0gICAgaWYgKGlzPENvbnRhaW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSkgewot ICAgICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUg b25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIg PSBkb3duY2FzdDxDb250YWluZXI+KGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7Ci0gICAgICAgIGF1 dG8mIHJvb3RDb250YWluZXJEaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3gocm9vdENvbnRhaW5l cik7Ci0gICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVh dGVGb3JtYXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsKLSAgICAg ICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3Rh dGUsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3cocm9vdENvbnRhaW5l ckRpc3BsYXlCb3gpLCBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0ZvckluRmxvdyhyb290 Q29udGFpbmVyRGlzcGxheUJveCkpOwotICAgICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXpl IHRoZSByb290J3MgZ2VvbWV0cnkuCi0gICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9v dENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsK LSAgICAgICAgLy8gTm93IHRoYXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNh biBnbyBiYWNrIGFuZCBsYXlvdXQgdGhlIG91dC1vZi1mbG93IGNvbnRlbnQuCi0gICAgICAgIGF1 dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93ID0gIEdlb21ldHJ5Ojpob3Jpem9u dGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cocm9vdENvbnRhaW5lckRpc3BsYXlCb3gpOwotICAg ICAgICBhdXRvIHZlcnRpY2FsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cgPSBHZW9tZXRyeTo6dmVy dGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCk7Ci0g ICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KGludmFsaWRh dGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3csIHZlcnRpY2FsQ29u c3RyYWludHNGb3JPdXRPZkZsb3cpOwotICAgIH0gZWxzZQotICAgICAgICBjb21wdXRlSGVpZ2h0 QW5kTWFyZ2luKGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2 ZXJ0aWNhbENvbnN0cmFpbnRzKTsKLSAgICAvLyBGbG9hdCByZWxhdGVkIGZpbmFsIHBvc2l0aW9u aW5nLgotICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaXNGbG9hdGluZ1Bvc2l0aW9uZWQo KSkgewotICAgICAgICBjb21wdXRlRmxvYXRpbmdQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGZv cm1hdHRpbmdDb250ZXh0Um9vdCk7Ci0gICAgICAgIGZsb2F0aW5nQ29udGV4dC5hcHBlbmQoZm9y bWF0dGluZ0NvbnRleHRSb290KTsKLSAgICB9Ci0gICAgaWYgKGZvcm1hdHRpbmdDb250ZXh0Um9v dC5pc0Zsb2F0QXZvaWRlcigpKQotICAgICAgICBjb21wdXRlUG9zaXRpb25Ub0F2b2lkRmxvYXRz KGZsb2F0aW5nQ29udGV4dCwgZm9ybWF0dGluZ0NvbnRleHRSb290KTsKLX0KLQogdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihjb25zdCBC b3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50 cz4mIGhvcml6b250YWxDb25zdHJhaW50cykKIHsKICAgICBpZiAoIWlzPENvbnRhaW5lcj4obGF5 b3V0Qm94KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZmRiYTA5MjA4YjE1Zjhl NDIzOGVjMmY4ZDQyMzY1MjU5ZDFmOWMxMy4uN2IwMmQ3NWY3OTcwYjgzOGE0MmFmMThjZjFiMjYw ODVhODliZGU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTU3LDcgKzU3LDYg QEAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgVCByb290OwogICAgICAgICBjb25zdCBUIGNvbnRh aW5pbmdCbG9jazsKICAgICB9OwotICAgIHZvaWQgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290 KGNvbnN0IEJveCYsIEZsb2F0aW5nQ29udGV4dCYsIEludmFsaWRhdGlvblN0YXRlJiwgY29uc3Qg Q29uc3RyYWludHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mLCBjb25zdCBDb25zdHJhaW50 c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4mKTsKICAgICB2b2lkIHBsYWNlSW5GbG93UG9zaXRp b25lZENoaWxkcmVuKGNvbnN0IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFs Q29uc3RyYWludHM+Jik7CiAKICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBG bG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmLCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpv bnRhbENvbnN0cmFpbnRzPiYpOwo= 388418 2020-01-22 07:23:16 -0800 2020-01-22 07:40:51 -0800 Patch bug-206569-20200122072315.patch text/plain 8855 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0OTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRmZTQwMDFhZDA0NTg4 MTJjN2NhYTUwZWEyNDJhNGUyYjkyMTg1OS4uNjY2YjBlMGExM2U0MDgyYzAzZjlmNjFhZGJmNjAx MWM0MGVlYTM4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBObyBuZWVk IHRvIHNwZWNpYWwgY2FzZSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCBsYXlvdXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjU2OQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTg3ODQ3Njc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29p dmlzdG8uCisKKyAgICAgICAgTGV0J3MgbW92ZSBvdXQgYWxsIHRoZSBmb3JtYXR0aW5nIGNvbnRl eHQgbGF5b3V0IGxvZ2ljIGZyb20gbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290LgorCisgICAg ICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCk6IERlbGV0ZWQuCisgICAgICAg ICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisKIDIw MjAtMDEtMjIgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtCRkNdIE1vdmUgZmxvYXQgYXZvaWRlciBzcGVjaWFsIGF2YWlsYWJsZSB3aWR0aCBoYW5kbGlu ZyB0byBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGNkMjU3YjAwYmFkZTQ4NjgwNDcyZTQ0NjMx NDU4ODk5MDJiNjFiMGMuLjhiZWNiYzI5MTM2MDIzMzFiOTcxYjcwZDUzZGEwNjY2OTkzNzA0OTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTI0LDEyICsxMjQsMTQgQEAg dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRh dGlvblN0YXRlJiBpbnZhbGlkYXRpb24KICAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNIb3Jpem9u dGFsUG9zaXRpb24obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwogCiAgICAgICAg ICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewotICAg ICAgICAgICAgICAgIC8vIGxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCgpIHRha2VzIGNhcmUg b2YgdGhlIGxheW91dEJveCBpdHNlbGYgYW5kIGl0cyBkZXNjZW5kYW50cy4KLSAgICAgICAgICAg ICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QobGF5b3V0Qm94LCBmbG9hdGluZ0NvbnRl eHQsIGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29u c3RyYWludHMpOwotICAgICAgICAgICAgICAgIGxheW91dFF1ZXVlLnJlbW92ZUxhc3QoKTsKLSAg ICAgICAgICAgICAgICBpZiAoIWFwcGVuZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJveCwgTGF5 b3V0RGlyZWN0aW9uOjpTaWJsaW5nKSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgaWYgKGlzPENvbnRhaW5lcj4o bGF5b3V0Qm94KSAmJiBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuaGFzSW5GbG93T3JG bG9hdGluZ0NoaWxkKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gTGF5b3V0IHRoZSBpbmZs b3cgZGVzY2VuZGFudHMgb2YgdGhpcyBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdC4KKyAgICAgICAg ICAgICAgICAgICAgYXV0byYgcm9vdERpc3BsYXlCb3ggPSBnZW9tZXRyeUZvckJveChsYXlvdXRC b3gpOworICAgICAgICAgICAgICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50c0ZvckZv cm1hdHRpbmdDb250ZXh0ID0gR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxv dyhyb290RGlzcGxheUJveCk7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gdmVydGljYWxDb25z dHJhaW50c0ZvckZvcm1hdHRpbmdDb250ZXh0ID0gR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWlu dHNGb3JJbkZsb3cocm9vdERpc3BsYXlCb3gpOworICAgICAgICAgICAgICAgICAgICBMYXlvdXRD b250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChkb3duY2FzdDxDb250YWluZXI+KGxheW91 dEJveCksIGxheW91dFN0YXRlKCkpLT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0 YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHNGb3JGb3JtYXR0aW5nQ29udGV4dCwgdmVydGljYWxD b25zdHJhaW50c0ZvckZvcm1hdHRpbmdDb250ZXh0KTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIWFwcGVu ZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJveCwgTGF5b3V0RGlyZWN0aW9uOjpDaGlsZCkpCiAg ICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0xMzcsMTUgKzEzOSwzMCBAQCB2b2lkIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGlu dmFsaWRhdGlvbgogCiAgICAgICAgIC8vIENsaW1iIGJhY2sgb24gdGhlIGFuY2VzdG9ycyBhbmQg Y29tcHV0ZSBoZWlnaHQvZmluYWwgcG9zaXRpb24uCiAgICAgICAgIHdoaWxlICghbGF5b3V0UXVl dWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAvLyBBbGwgaW5mbG93IGRlc2NlbmRhbnRzIChp ZiB0aGVyZSBhcmUgYW55KSBhcmUgbGFpZCBvdXQgYnkgbm93LiBMZXQncyBjb21wdXRlIHRoZSBi b3gncyBoZWlnaHQuCiAgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSAqbGF5b3V0UXVldWUu dGFrZUxhc3QoKTsKICAgICAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzID0gaG9y aXpvbnRhbENvbnN0cmFpbnRzRm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBh dXRvIHZlcnRpY2FsQ29uc3RyYWludHMgPSB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yTGF5b3V0Qm94 KGxheW91dEJveCk7Ci0gICAgICAgICAgICAvLyBGb3JtYXR0aW5nIHJvb3QgYm94ZXMgYXJlIHNw ZWNpYWwtY2FzZWQgYW5kIHRoZXkgZG9uJ3QgY29tZSBoZXJlLgotICAgICAgICAgICAgQVNTRVJU KCFsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKKworICAgICAgICAg ICAgLy8gQWxsIGluZmxvdyBkZXNjZW5kYW50cyAoaWYgdGhlcmUgYXJlIGFueSkgYXJlIGxhaWQg b3V0IGJ5IG5vdy4gTGV0J3MgY29tcHV0ZSB0aGUgYm94J3MgaGVpZ2h0LgogICAgICAgICAgICAg Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywg dmVydGljYWxDb25zdHJhaW50cyk7Ci0gICAgICAgICAgICAvLyBNb3ZlIGluLWZsb3cgcG9zaXRp b25lZCBjaGlsZHJlbiB0byB0aGVpciBmaW5hbCBwb3NpdGlvbi4KKworICAgICAgICAgICAgaWYg KGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgICAg ICAgICAvLyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdodCwgd2UgY2FuIGxh eW91dCB0aGUgb3V0LW9mLWZsb3cgZGVzY2VuZGFudHMuCisgICAgICAgICAgICAgICAgaWYgKGlz PENvbnRhaW5lcj4obGF5b3V0Qm94KSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvJiByb290 RGlzcGxheUJveCA9IGdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CisgICAgICAgICAgICAgICAg ICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93ID0gIEdlb21ldHJ5Ojpo b3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cocm9vdERpc3BsYXlCb3gpOworICAgICAg ICAgICAgICAgICAgICBhdXRvIHZlcnRpY2FsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cgPSBHZW9t ZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290RGlzcGxheUJveCk7Cisg ICAgICAgICAgICAgICAgICAgIExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0 KGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KSwgbGF5b3V0U3RhdGUoKSktPmxheW91dE91 dE9mRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25zdHJhaW50c0Zv ck91dE9mRmxvdywgdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyk7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgLy8gUmVzb2x2ZSBmaW5hbCBwb3Np dGlvbnMuCiAgICAgICAgICAgICBwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihsYXlvdXRC b3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAgICAgICAgICBpZiAobGF5b3V0Qm94Lmlz RmxvYXRpbmdQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgICAgICAgICBjb21wdXRlRmxvYXRpbmdQ b3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CisgICAgICAgICAgICAgICAgZmxv YXRpbmdDb250ZXh0LmFwcGVuZChsYXlvdXRCb3gpOworICAgICAgICAgICAgfSBlbHNlIGlmIChs YXlvdXRCb3guaXNGbG9hdEF2b2lkZXIoKSkKKyAgICAgICAgICAgICAgICBjb21wdXRlUG9zaXRp b25Ub0F2b2lkRmxvYXRzKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94KTsKKwogICAgICAgICAg ICAgaWYgKGFwcGVuZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJveCwgTGF5b3V0RGlyZWN0aW9u OjpTaWJsaW5nKSkKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtMTg5LDM1 ICsyMDYsNiBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp1 c2VkQXZhaWxhYmxlV2lkdGhGb3JGbG9hdEF2b2lkZXIoYwogICAgIHJldHVybiBhdmFpbGFibGVX aWR0aDsKIH0KIAotdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5n Q29udGV4dFJvb3QoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIEZsb2F0aW5nQ29u dGV4dCYgZmxvYXRpbmdDb250ZXh0LCBJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3Rh dGUsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiBob3Jpem9u dGFsQ29uc3RyYWludHMsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxWZXJ0aWNhbENvbnN0cmFpbnRz PiYgdmVydGljYWxDb25zdHJhaW50cykKLXsKLSAgICBBU1NFUlQoZm9ybWF0dGluZ0NvbnRleHRS b290LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7Ci0gICAgLy8gU3RhcnQgbGF5aW5n IG91dCB0aGlzIGZvcm1hdHRpbmcgcm9vdCBpbiB0aGUgZm9ybWF0dGluZyBjb250ZW54dCBpdCBs aXZlcyBpbi4KLSAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0 cmVhbSA8PCAiW0NvbXB1dGVdIC0+IFtQb3NpdGlvbl1bQm9yZGVyXVtQYWRkaW5nXVtXaWR0aF1b TWFyZ2luXSAtPiBmb3IgbGF5b3V0Qm94KCIgPDwgJmZvcm1hdHRpbmdDb250ZXh0Um9vdCA8PCAi KSIpOwotCi0gICAgaWYgKGlzPENvbnRhaW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSkgewot ICAgICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUg b25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCi0gICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIg PSBkb3duY2FzdDxDb250YWluZXI+KGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7Ci0gICAgICAgIGF1 dG8mIHJvb3RDb250YWluZXJEaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3gocm9vdENvbnRhaW5l cik7Ci0gICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVh dGVGb3JtYXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsKLSAgICAg ICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3Rh dGUsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3cocm9vdENvbnRhaW5l ckRpc3BsYXlCb3gpLCBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0ZvckluRmxvdyhyb290 Q29udGFpbmVyRGlzcGxheUJveCkpOwotICAgICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXpl IHRoZSByb290J3MgZ2VvbWV0cnkuCi0gICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9v dENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsK LSAgICAgICAgLy8gTm93IHRoYXQgd2UgY29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNh biBnbyBiYWNrIGFuZCBsYXlvdXQgdGhlIG91dC1vZi1mbG93IGNvbnRlbnQuCi0gICAgICAgIGF1 dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93ID0gIEdlb21ldHJ5Ojpob3Jpem9u dGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cocm9vdENvbnRhaW5lckRpc3BsYXlCb3gpOwotICAg ICAgICBhdXRvIHZlcnRpY2FsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cgPSBHZW9tZXRyeTo6dmVy dGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCk7Ci0g ICAgICAgIGZvcm1hdHRpbmdDb250ZXh0LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KGludmFsaWRh dGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3csIHZlcnRpY2FsQ29u c3RyYWludHNGb3JPdXRPZkZsb3cpOwotICAgIH0gZWxzZQotICAgICAgICBjb21wdXRlSGVpZ2h0 QW5kTWFyZ2luKGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2 ZXJ0aWNhbENvbnN0cmFpbnRzKTsKLSAgICAvLyBGbG9hdCByZWxhdGVkIGZpbmFsIHBvc2l0aW9u aW5nLgotICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaXNGbG9hdGluZ1Bvc2l0aW9uZWQo KSkgewotICAgICAgICBjb21wdXRlRmxvYXRpbmdQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGZv cm1hdHRpbmdDb250ZXh0Um9vdCk7Ci0gICAgICAgIGZsb2F0aW5nQ29udGV4dC5hcHBlbmQoZm9y bWF0dGluZ0NvbnRleHRSb290KTsKLSAgICB9Ci0gICAgaWYgKGZvcm1hdHRpbmdDb250ZXh0Um9v dC5pc0Zsb2F0QXZvaWRlcigpKQotICAgICAgICBjb21wdXRlUG9zaXRpb25Ub0F2b2lkRmxvYXRz KGZsb2F0aW5nQ29udGV4dCwgZm9ybWF0dGluZ0NvbnRleHRSb290KTsKLX0KLQogdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihjb25zdCBC b3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50 cz4mIGhvcml6b250YWxDb25zdHJhaW50cykKIHsKICAgICBpZiAoIWlzPENvbnRhaW5lcj4obGF5 b3V0Qm94KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZmRiYTA5MjA4YjE1Zjhl NDIzOGVjMmY4ZDQyMzY1MjU5ZDFmOWMxMy4uN2IwMmQ3NWY3OTcwYjgzOGE0MmFmMThjZjFiMjYw ODVhODliZGU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTU3LDcgKzU3LDYg QEAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgVCByb290OwogICAgICAgICBjb25zdCBUIGNvbnRh aW5pbmdCbG9jazsKICAgICB9OwotICAgIHZvaWQgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290 KGNvbnN0IEJveCYsIEZsb2F0aW5nQ29udGV4dCYsIEludmFsaWRhdGlvblN0YXRlJiwgY29uc3Qg Q29uc3RyYWludHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mLCBjb25zdCBDb25zdHJhaW50 c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4mKTsKICAgICB2b2lkIHBsYWNlSW5GbG93UG9zaXRp b25lZENoaWxkcmVuKGNvbnN0IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFs Q29uc3RyYWludHM+Jik7CiAKICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBG bG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmLCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpv bnRhbENvbnN0cmFpbnRzPiYpOwo=