183761 2018-03-19 19:28:08 -0700 [LayoutReloaded] Remove border/padding/contentBox() functions from Layout.Box 2018-03-19 19:31:20 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1407547 0 zalan 2018-03-19 19:28:08 -0700 Display.Box has them. 1407549 1 336096 zalan 2018-03-19 19:29:33 -0700 Created attachment 336096 Patch 1407550 2 zalan 2018-03-19 19:30:57 -0700 Committed r229734: <https://trac.webkit.org/changeset/229734> 1407552 3 webkit-bug-importer 2018-03-19 19:31:20 -0700 <rdar://problem/38647142> 336096 2018-03-19 19:29:33 -0700 2018-03-19 19:29:33 -0700 Patch bug-183761-20180319192932.patch text/plain 9646 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5NzMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDZjYjdlZDUzZTlhOTAwZmM4NTVjMjdlNzZhNjkzOGMz ZGM5YzYzMi4uN2M4NTdmMThjZGUyMzg0NWEwOWE2ZWUzN2VjZTE0NDdlZmMxN2M4OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE4LTAzLTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBSZW1vdmUgYm9yZGVyL3BhZGRpbmcvY29udGVudEJveCgpIGZ1 bmN0aW9ucyBmcm9tIExheW91dC5Cb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4Mzc2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERpc3BsYXkuQm94IGhhcyB0aGVtLgorCisgICAgICAgICogTGF5b3V0 UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvQmxvY2tGb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQuanM6CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5f Y29tcHV0ZU91dE9mRmxvd1dpZHRoKToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQu cHJvdG90eXBlLl9jb21wdXRlT3V0T2ZGbG93SGVpZ2h0KToKKyAgICAgICAgKEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQucHJvdG90eXBlLl9ob3Jpem9udGFsQ29uc3RyYWludCk6CisgICAgICAgIChC bG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fY29udGVudEhlaWdodCk6CisgICAgICAg IChCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fYWRqdXN0Qm90dG9tV2l0aEZJWE1F KToKKyAgICAgICAgKEJsb2NrRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9jb21wdXRlT3V0 T2ZGbG93UG9zaXRpb24pOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250 ZXh0L0Zsb2F0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90b3R5 cGUuX2F2YWlsYWJsZVNwYWNlKToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5n Q29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qczoKKyAgICAgICAgKEZvcm1hdHRpbmdDb250ZXh0 LnByb3RvdHlwZS5hYnNvbHV0ZUJvcmRlckJveCk6CisgICAgICAgIChGb3JtYXR0aW5nQ29udGV4 dC5wcm90b3R5cGUuYWJzb2x1dGVQYWRkaW5nQm94KToKKyAgICAgICAgKEZvcm1hdHRpbmdDb250 ZXh0LnByb3RvdHlwZS5hYnNvbHV0ZUNvbnRlbnRCb3gpOgorICAgICAgICAqIExheW91dFJlbG9h ZGVkL0xheW91dFRyZWUvQm94LmpzOgorICAgICAgICAoTGF5b3V0LkJveC5wcm90b3R5cGUuaXNE ZXNjZW5kYW50T2YpOgorICAgICAgICAoTGF5b3V0LkJveCk6CisgICAgICAgIChMYXlvdXQuQm94 LnByb3RvdHlwZS5ib3JkZXJCb3gpOiBEZWxldGVkLgorICAgICAgICAoTGF5b3V0LkJveC5wcm90 b3R5cGUucGFkZGluZ0JveCk6IERlbGV0ZWQuCisgICAgICAgIChMYXlvdXQuQm94LnByb3RvdHlw ZS5jb250ZW50Qm94KTogRGVsZXRlZC4KKwogMjAxOC0wMy0xOSAgSmlld2VuIFRhbiAgPGppZXdl bl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGFub3RoZXIgcXVpY2sgZml4 IGZvciByMjI5Njk5CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5n Q29udGV4dC9CbG9ja0Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xz L0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0LmpzCmluZGV4IDBiYjEyNzMyZjBkYjdmNTEwODZiZDRlNTIyNzYxYTI2 MjlkNzY4YWUuLmU5MTc5NjMyMmFmMmFmMjE2OTliZjc4MDA5NTAyMWFjZDQxZTkwMzUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVk L0Zvcm1hdHRpbmdDb250ZXh0L0Jsb2NrRm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 LmpzCkBAIC0xNzEsNyArMTcxLDcgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRl bmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgZWxzZSBpZiAoVXRpbHMuaXNMZWZ0QXV0 byhsYXlvdXRCb3gpICYmICFVdGlscy5pc1dpZHRoQXV0byhsYXlvdXRCb3gpICYmICFVdGlscy5p c1JpZ2h0QXV0byhsYXlvdXRCb3gpKQogICAgICAgICAgICAgd2lkdGggPSBVdGlscy53aWR0aChs YXlvdXRCb3gpOyAvLyA0CiAgICAgICAgIGVsc2UgaWYgKFV0aWxzLmlzV2lkdGhBdXRvKGxheW91 dEJveCkgJiYgIVV0aWxzLmlzTGVmdEF1dG8obGF5b3V0Qm94KSAmJiAhVXRpbHMuaXNSaWdodEF1 dG8obGF5b3V0Qm94KSkKLSAgICAgICAgICAgIHdpZHRoID0gTWF0aC5tYXgoMCwgbGF5b3V0Qm94 LmNvbnRhaW5pbmdCbG9jaygpLmNvbnRlbnRCb3goKS53aWR0aCgpIC0gVXRpbHMucmlnaHQobGF5 b3V0Qm94KSAtIFV0aWxzLmxlZnQobGF5b3V0Qm94KSk7IC8vIDUKKyAgICAgICAgICAgIHdpZHRo ID0gTWF0aC5tYXgoMCwgdGhpcy50b0Rpc3BsYXlCb3gobGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9j aygpKS5jb250ZW50Qm94KCkud2lkdGgoKSAtIFV0aWxzLnJpZ2h0KGxheW91dEJveCkgLSBVdGls cy5sZWZ0KGxheW91dEJveCkpOyAvLyA1CiAgICAgICAgIGVsc2UgaWYgKFV0aWxzLmlzUmlnaHRB dXRvKGxheW91dEJveCkgJiYgIVV0aWxzLmlzTGVmdEF1dG8obGF5b3V0Qm94KSAmJiAhVXRpbHMu aXNXaWR0aEF1dG8obGF5b3V0Qm94KSkKICAgICAgICAgICAgIHdpZHRoID0gVXRpbHMud2lkdGgo bGF5b3V0Qm94KTsgLy8gNgogICAgICAgICBlbHNlCkBAIC0yMTksNyArMjE5LDcgQEAgY2xhc3Mg QmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAg ICAgZWxzZSBpZiAoVXRpbHMuaXNUb3BBdXRvKChsYXlvdXRCb3gpKSAmJiAhVXRpbHMuaXNIZWln aHRBdXRvKChsYXlvdXRCb3gpKSAmJiAhVXRpbHMuaXNCb3R0b21BdXRvKChsYXlvdXRCb3gpKSkK ICAgICAgICAgICAgIGhlaWdodCA9IFV0aWxzLmhlaWdodChsYXlvdXRCb3gpOyAvLyA2CiAgICAg ICAgIGVsc2UgaWYgKFV0aWxzLmlzSGVpZ2h0QXV0bygobGF5b3V0Qm94KSkgJiYgIVV0aWxzLmlz VG9wQXV0bygobGF5b3V0Qm94KSkgJiYgIVV0aWxzLmlzQm90dG9tQXV0bygobGF5b3V0Qm94KSkp Ci0gICAgICAgICAgICBoZWlnaHQgPSBNYXRoLm1heCgwLCBsYXlvdXRCb3guY29udGFpbmluZ0Js b2NrKCkuY29udGVudEJveCgpLmhlaWdodCgpIC0gVXRpbHMuYm90dG9tKGxheW91dEJveCkgLSBV dGlscy50b3AobGF5b3V0Qm94KSk7IC8vIDcKKyAgICAgICAgICAgIGhlaWdodCA9IE1hdGgubWF4 KDAsIHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVu dEJveCgpLmhlaWdodCgpIC0gVXRpbHMuYm90dG9tKGxheW91dEJveCkgLSBVdGlscy50b3AobGF5 b3V0Qm94KSk7IC8vIDcKICAgICAgICAgZWxzZSBpZiAoVXRpbHMuaXNCb3R0b21BdXRvKChsYXlv dXRCb3gpKSAmJiAhVXRpbHMuaXNUb3BBdXRvKChsYXlvdXRCb3gpKSAmJiAhVXRpbHMuaXNIZWln aHRBdXRvKChsYXlvdXRCb3gpKSkKICAgICAgICAgICAgIGhlaWdodCA9IFV0aWxzLmhlaWdodChs YXlvdXRCb3gpOyAvLyA4CiAgICAgICAgIGVsc2UKQEAgLTI0Niw3ICsyNDYsNyBAQCBjbGFzcyBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgIH0K IAogICAgIF9ob3Jpem9udGFsQ29uc3RyYWludChsYXlvdXRCb3gpIHsKLSAgICAgICAgbGV0IGhv cml6b250YWxDb25zdHJhaW50ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpLmNvbnRlbnRC b3goKS53aWR0aCgpOworICAgICAgICBsZXQgaG9yaXpvbnRhbENvbnN0cmFpbnQgPSB0aGlzLnRv RGlzcGxheUJveChsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLmNvbnRlbnRCb3goKS53aWR0 aCgpOwogICAgICAgICBob3Jpem9udGFsQ29uc3RyYWludCAtPSB0aGlzLm1hcmdpbkxlZnQobGF5 b3V0Qm94KSArIHRoaXMubWFyZ2luUmlnaHQobGF5b3V0Qm94KTsKICAgICAgICAgcmV0dXJuIGhv cml6b250YWxDb25zdHJhaW50OwogICAgIH0KQEAgLTI3MCw3ICsyNzAsNyBAQCBjbGFzcyBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRleHQgewogICAgICAgICAg ICAgbGV0IGxhc3RMaW5lID0gbGluZXNbbGluZXMubGVuZ3RoIC0gMV07CiAgICAgICAgICAgICBy ZXR1cm4gbGFzdExpbmUucmVjdCgpLmJvdHRvbSgpOwogICAgICAgICB9Ci0gICAgICAgIGxldCB0 b3AgPSBsYXlvdXRCb3guY29udGVudEJveCgpLnRvcCgpOworICAgICAgICBsZXQgdG9wID0gdGhp cy50b0Rpc3BsYXlCb3gobGF5b3V0Qm94KS5jb250ZW50Qm94KCkudG9wKCk7CiAgICAgICAgIGxl dCBib3R0b20gPSB0aGlzLl9hZGp1c3RCb3R0b21XaXRoRklYTUUobGF5b3V0Qm94KTsKICAgICAg ICAgcmV0dXJuIGJvdHRvbSAtIHRvcDsKICAgICB9CkBAIC0yODEsNyArMjgxLDcgQEAgY2xhc3Mg QmxvY2tGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAg ICAgbGV0IGxhc3RJbkZsb3dEaXNwbGF5Qm94ID0gbGFzdEluRmxvd0NoaWxkLmRpc3BsYXlCb3go KTsKICAgICAgICAgbGV0IGJvdHRvbSA9IGxhc3RJbkZsb3dEaXNwbGF5Qm94LmJvdHRvbSgpICsg dGhpcy5tYXJnaW5Cb3R0b20obGFzdEluRmxvd0NoaWxkKTsKICAgICAgICAgLy8gRklYTUU6IG1h cmdpbiBmb3IgYm9keQotICAgICAgICBpZiAobGFzdEluRmxvd0NoaWxkLm5hbWUoKSA9PSAiUmVu ZGVyQm9keSIgJiYgVXRpbHMuaXNIZWlnaHRBdXRvKGxhc3RJbkZsb3dDaGlsZCkgJiYgIWxhc3RJ bkZsb3dDaGlsZC5jb250ZW50Qm94KCkuaGVpZ2h0KCkpCisgICAgICAgIGlmIChsYXN0SW5GbG93 Q2hpbGQubmFtZSgpID09ICJSZW5kZXJCb2R5IiAmJiBVdGlscy5pc0hlaWdodEF1dG8obGFzdElu Rmxvd0NoaWxkKSAmJiAhdGhpcy50b0Rpc3BsYXlCb3gobGFzdEluRmxvd0NoaWxkKS5jb250ZW50 Qm94KCkuaGVpZ2h0KCkpCiAgICAgICAgICAgICBib3R0b20gLT0gdGhpcy5tYXJnaW5Cb3R0b20o bGFzdEluRmxvd0NoaWxkKTsKICAgICAgICAgLy8gRklYTUU6IGZpZ3VyZSBvdXQgd2h5IGZsb2F0 aW5ncyBwYXJ0IG9mIHRoZSBpbml0aWFsIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBnZXQgcHJv cGFnYXRlZCB0byBIVE1MCiAgICAgICAgIGlmIChsYXlvdXRCb3gubm9kZSgpLnRhZ05hbWUgPT0g IkhUTUwiKSB7CkBAIC0zMTIsNyArMzEyLDcgQEAgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICBfY29tcHV0ZU91dE9mRmxvd1Bvc2l0 aW9uKGxheW91dEJveCkgewogICAgICAgICBsZXQgZGlzcGxheUJveCA9IHRoaXMudG9EaXNwbGF5 Qm94KGxheW91dEJveCk7CiAgICAgICAgIGxldCB0b3AgPSBOdW1iZXIuTmFOOwotICAgICAgICBs ZXQgY29udGFpbmVyU2l6ZSA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKS5jb250ZW50Qm94 KCkuc2l6ZSgpOworICAgICAgICBsZXQgY29udGFpbmVyU2l6ZSA9IHRoaXMudG9EaXNwbGF5Qm94 KGxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVudEJveCgpLnNpemUoKTsKICAgICAg ICAgLy8gVG9wL2JvdHRvbQogICAgICAgICBpZiAoVXRpbHMuaXNUb3BBdXRvKGxheW91dEJveCkg JiYgVXRpbHMuaXNCb3R0b21BdXRvKGxheW91dEJveCkpIHsKICAgICAgICAgICAgIEFTU0VSVChV dGlscy5pc1N0YXRpY2FsbHlQb3NpdGlvbmVkKGxheW91dEJveCkpOwpkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzIGIv VG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250ZXh0Lmpz CmluZGV4IGIwOTEzOTdkYTVkN2QyNmExMzViMDQ3N2YxYjA5NDAyMzE1MDFkOGQuLmNlODg4MzYy NmFiNGEyNTJkYTQ5MjM4YzczNTU1MDMxZTkzYzc0ZjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91 dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qcworKysgYi9Ub29s cy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMKQEAg LTEzMiwxMyArMTMyLDE0IEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgfQogCiAgICAg X2F2YWlsYWJsZVNwYWNlKGNvbnRhaW5pbmdCbG9jaywgZmxvYXRpbmdQYWlyKSB7CisgICAgICAg IGxldCBjb250YWluaW5nQmxvY2tDb250ZW50Qm94ID0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQo KS50b0Rpc3BsYXlCb3goY29udGFpbmluZ0Jsb2NrKTsKICAgICAgICAgaWYgKGZsb2F0aW5nUGFp ci5sZWZ0ICYmIGZsb2F0aW5nUGFpci5yaWdodCkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9m b3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nUGFpci5yaWdodCku bGVmdCgpIC0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJveChmbG9h dGluZ1BhaXIubGVmdCkucmlnaHQoKTsKICAgICAgICAgaWYgKGZsb2F0aW5nUGFpci5sZWZ0KQot ICAgICAgICAgICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9jay5jb250ZW50Qm94KCkud2lkdGgoKSAt ICh0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nUGFp ci5sZWZ0KS5yaWdodCgpIC0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZUJvcmRl ckJveChjb250YWluaW5nQmxvY2spLmxlZnQoKSk7CisgICAgICAgICAgICByZXR1cm4gY29udGFp bmluZ0Jsb2NrQ29udGVudEJveC53aWR0aCgpIC0gKHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCku YWJzb2x1dGVNYXJnaW5Cb3goZmxvYXRpbmdQYWlyLmxlZnQpLnJpZ2h0KCkgLSB0aGlzLl9mb3Jt YXR0aW5nQ29udGV4dCgpLmFic29sdXRlQm9yZGVyQm94KGNvbnRhaW5pbmdCbG9jaykubGVmdCgp KTsKICAgICAgICAgaWYgKGZsb2F0aW5nUGFpci5yaWdodCkKICAgICAgICAgICAgIHJldHVybiB0 aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nUGFpci5y aWdodCkubGVmdCgpOwotICAgICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrLmNvbnRlbnRCb3go KS53aWR0aCgpOworICAgICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveC53aWR0 aCgpOwogICAgIH0KIAogICAgIF9maW5kRmxvYXRpbmdBdFZlcnRpY2FsUG9zaXRpb24odmVydGlj YWxQb3NpdGlvbiwgZmxvYXRpbmdTdGFjaykgewpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVs b2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRm9ybWF0dGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwppbmRleCBk ZDQyY2Y3ZDdhMWFjYmRjZWM5YjFhZDc2MDNmZmNhOGNlNzA1ODQwLi5hNmE2NDY4NDM1MjY0NDUw YzU0OGRkNmIzMmM5OWEzZTViODlkZTU2IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Gb3JtYXR0aW5nQ29udGV4dC5qcwpAQCAtNzQs MjEgKzc0LDIxIEBAIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICB9CiAKICAgICBhYnNv bHV0ZUJvcmRlckJveChsYXlvdXRCb3gpIHsKLSAgICAgICAgbGV0IGJvcmRlckJveCA9IGxheW91 dEJveC5ib3JkZXJCb3goKTsKKyAgICAgICAgbGV0IGJvcmRlckJveCA9IHRoaXMudG9EaXNwbGF5 Qm94KGxheW91dEJveCkuYm9yZGVyQm94KCk7CiAgICAgICAgIGxldCBhYnNvbHV0ZVJlY3QgPSBu ZXcgTGF5b3V0UmVjdCh0aGlzLl90b1Jvb3RBYnNvbHV0ZVBvc2l0aW9uKGxheW91dEJveCksIGJv cmRlckJveC5zaXplKCkpOwogICAgICAgICBhYnNvbHV0ZVJlY3QubW92ZUJ5KGJvcmRlckJveC50 b3BMZWZ0KCkpOwogICAgICAgICByZXR1cm4gYWJzb2x1dGVSZWN0OwogICAgIH0KIAogICAgIGFi c29sdXRlUGFkZGluZ0JveChsYXlvdXRCb3gpIHsKLSAgICAgICAgbGV0IHBhZGRpbmdCb3ggPSBs YXlvdXRCb3gucGFkZGluZ0JveCgpOworICAgICAgICBsZXQgcGFkZGluZ0JveCA9IHRoaXMudG9E aXNwbGF5Qm94KGxheW91dEJveCkucGFkZGluZ0JveCgpOwogICAgICAgICBsZXQgYWJzb2x1dGVS ZWN0ID0gbmV3IExheW91dFJlY3QodGhpcy5fdG9Sb290QWJzb2x1dGVQb3NpdGlvbihsYXlvdXRC b3gpLCBwYWRkaW5nQm94LnNpemUoKSk7CiAgICAgICAgIGFic29sdXRlUmVjdC5tb3ZlQnkocGFk ZGluZ0JveC50b3BMZWZ0KCkpOwogICAgICAgICByZXR1cm4gYWJzb2x1dGVSZWN0OwogICAgIH0K IAogICAgIGFic29sdXRlQ29udGVudEJveChsYXlvdXRCb3gpIHsKLSAgICAgICAgbGV0IGNvbnRl bnRCb3ggPSBsYXlvdXRCb3guY29udGVudEJveCgpOworICAgICAgICBsZXQgY29udGVudEJveCA9 IHRoaXMudG9EaXNwbGF5Qm94KGxheW91dEJveCkuY29udGVudEJveCgpOwogICAgICAgICBsZXQg YWJzb2x1dGVSZWN0ID0gbmV3IExheW91dFJlY3QodGhpcy5fdG9Sb290QWJzb2x1dGVQb3NpdGlv bihsYXlvdXRCb3gpLCBjb250ZW50Qm94LnNpemUoKSk7CiAgICAgICAgIGFic29sdXRlUmVjdC5t b3ZlQnkoY29udGVudEJveC50b3BMZWZ0KCkpOwogICAgICAgICByZXR1cm4gYWJzb2x1dGVSZWN0 OwpkaWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJlZS9Cb3guanMgYi9U b29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qcwppbmRleCBjMjJkNTZlN2MzNTgz NDIyMzBhYjM2MzY5ZWZmOWM1NjIxY2UyMzdkLi5kY2M1YTQzZTkxYjI4NzBjYjljZWM4ZTYzMWQ1 ZjQyOWUzYTcyNmU0IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVl L0JveC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9MYXlvdXRUcmVlL0JveC5qcwpAQCAt MjM5LDE2ICsyMzksNCBAQCBMYXlvdXQuQm94ID0gY2xhc3MgQm94IHsKICAgICAgICAgICAgIGFz Y2VuZGFudCA9IGFzY2VuZGFudC5wYXJlbnQoKTsKICAgICAgICAgcmV0dXJuICEhYXNjZW5kYW50 OwogICAgIH0KLQotICAgIGJvcmRlckJveCgpIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuZGlzcGxh eUJveCgpLmJvcmRlckJveCgpOwotICAgIH0KLQotICAgIHBhZGRpbmdCb3goKSB7Ci0gICAgICAg IHJldHVybiB0aGlzLmRpc3BsYXlCb3goKS5wYWRkaW5nQm94KCk7Ci0gICAgfQotCi0gICAgY29u dGVudEJveCgpIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuZGlzcGxheUJveCgpLmNvbnRlbnRCb3go KTsKLSAgICB9CiB9Cg==