222175 2021-02-19 08:59:34 -0800 [css-flex] Refactoring of code retrieving main/cross size lengths from children 2021-02-22 09:35:14 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 svillar svillar changseok darin esprehn+autocc ews-watchlist glenn kondapallykalyan mmaxfield pdr rbuis rego sam svillar webkit-bug-importer oldest_to_newest 1731361 0 svillar 2021-02-19 08:59:34 -0800 [css-flex] Refactoring of code retrieving main/cross size lengths from children 1731365 1 420977 svillar 2021-02-19 09:07:40 -0800 Created attachment 420977 Patch 1732162 2 svillar 2021-02-22 09:34:38 -0800 Committed r273242 (234428@main): <https://commits.webkit.org/234428@main> 1732163 3 webkit-bug-importer 2021-02-22 09:35:14 -0800 <rdar://problem/74599513> 420977 2021-02-19 09:07:40 -0800 2021-02-19 10:31:01 -0800 Patch bug-222175-20210219180739.patch text/plain 9753 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjczMTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzUxNjI5MGYzYjlkOTVh YjVmMDk4NjBmOTg1NjJmMDZjZmVjZmZiMy4uMTkwMzNkMDJjZmNmMDU5YTU1NDYwNWE0OWI1YzE5 Zjc0YmRhZTVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAyLTE5ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl eF0gUmVmYWN0b3Jpbmcgb2YgY29kZSByZXRyaWV2aW5nIG1haW4vY3Jvc3Mgc2l6ZSBsZW5ndGhz IGZyb20gY2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyMjE3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZGVkIGEgY291cGxlIG9mIG5ldyBwcml2YXRlIG1ldGhvZHMgd2hpY2ggcmV0cmll dmUgdGhlIG1haW4gYW5kIGNyb3NzIHNpemUgbGVuZ3RocyBvZiBjaGlsZHJlbgorICAgICAgICBh cyBpdCdzIHVzZWQgZXZlcnl3aGVyZS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYXMgdGhlcmUg aXMgbm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHksIGp1c3QgYSBjb2RlIHJlZmFjdG9yaW5nLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpzaG91bGRBcHBseU1pblNpemVBdXRvRm9yQ2hpbGQg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNpc0Zv ckNoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjcm9z c1NpemVMZW5ndGhGb3JDaGlsZCBjb25zdCk6IE5ldyBtZXRob2QuCisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6bWFpblNpemVMZW5ndGhGb3JDaGlsZCBjb25zdCk6IERpdHRv LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkQXNwZWN0UmF0 aW8gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJ bm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp YmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlz TWluQW5kTWF4KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEhh c0ludHJpbnNpY01haW5BeGlzU2l6ZSBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94Lmg6CisKIDIwMjEtMDItMTkgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIEltcGxlbWVudCBhIEdDIHZlcmlmaWVyLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggY2IyM2Y2ZDE5MzdhM2Q2 MDVjZTE5NGQzNTc0ZDI2NzAwOTBjNWZjYy4uYjEzNzQ1MTI4NGQ4NmRkNDRjMjllYjJkNjVjN2Ey M2Q2MmY2YzcyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwCkBAIC00MjcsNyArNDI3LDcgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6aXNN dWx0aWxpbmUoKSBjb25zdAogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6c2hvdWxkQXBwbHlNaW5T aXplQXV0b0ZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgLy8g Y3NzLWZsZXhib3ggc2VjdGlvbiA0LjUKLSAgICBhdXRvIG1pblNpemUgPSBpc0hvcml6b250YWxG bG93KCkgPyBjaGlsZC5zdHlsZSgpLm1pbldpZHRoKCkgOiBjaGlsZC5zdHlsZSgpLm1pbkhlaWdo dCgpOworICAgIGF1dG8gbWluU2l6ZSA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwg Y2hpbGQpOwogICAgIHJldHVybiBtaW5TaXplLmlzQXV0bygpICYmIG1haW5BeGlzT3ZlcmZsb3dG b3JDaGlsZChjaGlsZCkgPT0gT3ZlcmZsb3c6OlZpc2libGU7CiB9CiAKQEAgLTQzNSw3ICs0MzUs NyBAQCBMZW5ndGggUmVuZGVyRmxleGlibGVCb3g6OmZsZXhCYXNpc0ZvckNoaWxkKGNvbnN0IFJl bmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgTGVuZ3RoIGZsZXhMZW5ndGggPSBjaGlsZC5z dHlsZSgpLmZsZXhCYXNpcygpOwogICAgIGlmIChmbGV4TGVuZ3RoLmlzQXV0bygpKQotICAgICAg ICBmbGV4TGVuZ3RoID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuc3R5bGUoKS53aWR0aCgp IDogY2hpbGQuc3R5bGUoKS5oZWlnaHQoKTsKKyAgICAgICAgZmxleExlbmd0aCA9IG1haW5TaXpl TGVuZ3RoRm9yQ2hpbGQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpOwogICAgIHJldHVybiBm bGV4TGVuZ3RoOwogfQogCkBAIC03MzgsNiArNzM4LDM0IEBAIExheW91dFBvaW50IFJlbmRlckZs ZXhpYmxlQm94OjpmbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hp bGQpCiAgICAgcmV0dXJuIGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkLmxvY2F0aW9uKCkgOiBj aGlsZC5sb2NhdGlvbigpLnRyYW5zcG9zZWRQb2ludCgpOwogfQogCitMZW5ndGggUmVuZGVyRmxl eGlibGVCb3g6OmNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKFNpemVUeXBlIHNpemVUeXBlLCBjb25z dCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIHN3aXRjaCAoc2l6ZVR5cGUpIHsKKyAg ICBjYXNlIE1pblNpemU6CisgICAgICAgIHJldHVybiBpc0hvcml6b250YWxGbG93KCkgPyBjaGls ZC5zdHlsZSgpLm1pbkhlaWdodCgpIDogY2hpbGQuc3R5bGUoKS5taW5XaWR0aCgpOworICAgIGNh c2UgTWFpbk9yUHJlZmVycmVkU2l6ZToKKyAgICAgICAgcmV0dXJuIGlzSG9yaXpvbnRhbEZsb3co KSA/IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkgOiBjaGlsZC5zdHlsZSgpLndpZHRoKCk7CisgICAg Y2FzZSBNYXhTaXplOgorICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQu c3R5bGUoKS5tYXhIZWlnaHQoKSA6IGNoaWxkLnN0eWxlKCkubWF4V2lkdGgoKTsKKyAgICB9Cisg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIHsgfTsKK30KKworTGVuZ3RoIFJl bmRlckZsZXhpYmxlQm94OjptYWluU2l6ZUxlbmd0aEZvckNoaWxkKFNpemVUeXBlIHNpemVUeXBl LCBjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIHN3aXRjaCAoc2l6ZVR5cGUp IHsKKyAgICBjYXNlIE1pblNpemU6CisgICAgICAgIHJldHVybiBpc0hvcml6b250YWxGbG93KCkg PyBjaGlsZC5zdHlsZSgpLm1pbldpZHRoKCkgOiBjaGlsZC5zdHlsZSgpLm1pbkhlaWdodCgpOwor ICAgIGNhc2UgTWFpbk9yUHJlZmVycmVkU2l6ZToKKyAgICAgICAgcmV0dXJuIGlzSG9yaXpvbnRh bEZsb3coKSA/IGNoaWxkLnN0eWxlKCkud2lkdGgoKSA6IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCk7 CisgICAgY2FzZSBNYXhTaXplOgorICAgICAgICByZXR1cm4gaXNIb3Jpem9udGFsRmxvdygpID8g Y2hpbGQuc3R5bGUoKS5tYXhXaWR0aCgpIDogY2hpbGQuc3R5bGUoKS5tYXhIZWlnaHQoKTsKKyAg ICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIHsgfTsKK30KKwogYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRBc3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gm IGNoaWxkKSBjb25zdAogewogICAgIGlmICghY2hpbGQuaGFzQXNwZWN0UmF0aW8oKSkKQEAgLTc0 Niw3ICs3NzQsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZEFzcGVjdFJhdGlv KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiAgICAgICAgIC8vIFdlIGNhbid0IGNvbXB1 dGUgYSByYXRpbyBpbiB0aGlzIGNhc2UuCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0g ICAgcmV0dXJuIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgaXNIb3Jpem9udGFsRmxv dygpID8gY2hpbGQuc3R5bGUoKS5oZWlnaHQoKSA6IGNoaWxkLnN0eWxlKCkud2lkdGgoKSk7Cisg ICAgcmV0dXJuIGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NTaXplTGVuZ3Ro Rm9yQ2hpbGQoTWFpbk9yUHJlZmVycmVkU2l6ZSwgY2hpbGQpKTsKIH0KIAogICAgIApAQCAtODkz LDcgKzkyMSw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJbm5lckZs ZXhCYXNlU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsCiAgICAgICAgIHJldHVybiBzdGQ6 Om1heCgwX2x1LCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWFpbk9yUHJl ZmVycmVkU2l6ZSwgZmxleEJhc2lzKS52YWx1ZSgpKTsKIAogICAgIGlmICh1c2VDaGlsZEFzcGVj dFJhdGlvKGNoaWxkKSB8fCBjaGlsZENyb3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6 ZShjaGlsZCkpIHsKLSAgICAgICAgY29uc3QgTGVuZ3RoJiBjcm9zc1NpemVMZW5ndGggPSBpc0hv cml6b250YWxGbG93KCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpIDogY2hpbGQuc3R5bGUoKS53 aWR0aCgpOworICAgICAgICBjb25zdCBMZW5ndGgmIGNyb3NzU2l6ZUxlbmd0aCA9IGNyb3NzU2l6 ZUxlbmd0aEZvckNoaWxkKE1haW5PclByZWZlcnJlZFNpemUsIGNoaWxkKTsKICAgICAgICAgcmV0 dXJuIGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxk LCBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY3Jvc3NTaXplTGVu Z3RoKSk7CiAgICAgfQogCkBAIC0xMTU2LDE0ICsxMTg0LDE0IEBAIHZvaWQgUmVuZGVyRmxleGli bGVCb3g6OnByZXBhcmVPcmRlckl0ZXJhdG9yQW5kTWFyZ2lucygpCiAKIExheW91dFVuaXQgUmVu ZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJC b3gmIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSkKIHsKLSAgICBMZW5ndGggbWF4ID0gaXNI b3Jpem9udGFsRmxvdygpID8gY2hpbGQuc3R5bGUoKS5tYXhXaWR0aCgpIDogY2hpbGQuc3R5bGUo KS5tYXhIZWlnaHQoKTsKKyAgICBMZW5ndGggbWF4ID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChN YXhTaXplLCBjaGlsZCk7CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gbWF4RXh0ZW50ID0gV1RG OjpudWxsb3B0OwogICAgIGlmIChtYXguaXNTcGVjaWZpZWRPckludHJpbnNpYygpKSB7CiAgICAg ICAgIG1heEV4dGVudCA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYXhT aXplLCBtYXgpOwogICAgICAgICBjaGlsZFNpemUgPSBzdGQ6Om1pbihjaGlsZFNpemUsIG1heEV4 dGVudC52YWx1ZU9yKGNoaWxkU2l6ZSkpOwogICAgIH0KIAotICAgIExlbmd0aCBtaW4gPSBpc0hv cml6b250YWxGbG93KCkgPyBjaGlsZC5zdHlsZSgpLm1pbldpZHRoKCkgOiBjaGlsZC5zdHlsZSgp Lm1pbkhlaWdodCgpOworICAgIExlbmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1p blNpemUsIGNoaWxkKTsKICAgICBpZiAobWluLmlzU3BlY2lmaWVkT3JJbnRyaW5zaWMoKSkKICAg ICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29tcHV0ZU1h aW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcihjaGlsZFNp emUpKSk7CiAgICAgCkBAIC0xMTcxLDcgKzExOTksNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhp YmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGls ZAogICAgICAgICAvLyBGSVhNRTogSWYgdGhlIG1pbiB2YWx1ZSBpcyBleHBlY3RlZCB0byBiZSB2 YWxpZCBoZXJlLCB3ZSBuZWVkIHRvIGNvbWUgdXAgd2l0aCBhIG5vbiBvcHRpb25hbCB2ZXJzaW9u IG9mIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkIGFuZAogICAgICAgICAvLyBlbnN1cmUg aXQncyB2YWxpZCB0aHJvdWdoIHRoZSB2aXJ0dWFsIGNhbGxzIG9mIGNvbXB1dGVJbnRyaW5zaWNM b2dpY2FsQ29udGVudEhlaWdodFVzaW5nLgogICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRTaXpl OwotICAgICAgICBMZW5ndGggY2hpbGRDcm9zc1NpemVMZW5ndGggPSBpc0hvcml6b250YWxGbG93 KCkgPyBjaGlsZC5zdHlsZSgpLmhlaWdodCgpIDogY2hpbGQuc3R5bGUoKS53aWR0aCgpOworICAg ICAgICBMZW5ndGggY2hpbGRDcm9zc1NpemVMZW5ndGggPSBjcm9zc1NpemVMZW5ndGhGb3JDaGls ZChNYWluT3JQcmVmZXJyZWRTaXplLCBjaGlsZCk7CiAgICAgICAgIGlmICh1c2VDaGlsZEFzcGVj dFJhdGlvKGNoaWxkKSkKICAgICAgICAgICAgIGNvbnRlbnRTaXplID0gY29tcHV0ZU1haW5TaXpl RnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoKTsKICAgICAg ICAgZWxzZQpAQCAtMTE4MSw3ICsxMjA5LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJv eDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAg ICAgICAgQVNTRVJUKGNvbnRlbnRTaXplID49IDApOwogICAgICAgICBjb250ZW50U2l6ZSA9IHN0 ZDo6bWluKGNvbnRlbnRTaXplLCBtYXhFeHRlbnQudmFsdWVPcihjb250ZW50U2l6ZSkpOwogICAg ICAgICAKLSAgICAgICAgTGVuZ3RoIG1haW5TaXplID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hp bGQuc3R5bGUoKS53aWR0aCgpIDogY2hpbGQuc3R5bGUoKS5oZWlnaHQoKTsKKyAgICAgICAgTGVu Z3RoIG1haW5TaXplID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChNYWluT3JQcmVmZXJyZWRTaXpl LCBjaGlsZCk7CiAgICAgICAgIGlmIChjaGlsZE1haW5TaXplSXNEZWZpbml0ZShjaGlsZCwgbWFp blNpemUpKSB7CiAgICAgICAgICAgICBMYXlvdXRVbml0IHJlc29sdmVkTWFpblNpemUgPSBjb21w dXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgbWFp blNpemUpLnZhbHVlT3IoMCk7CiAgICAgICAgICAgICBBU1NFUlQocmVzb2x2ZWRNYWluU2l6ZSA+ PSAwKTsKQEAgLTEyNDMsOCArMTI3MSw4IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZs ZXhpYmxlQm94OjpjaGlsZExvZ2ljYWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvCiAKIExh eW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlv Q3Jvc3NBeGlzTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgY2hp bGRTaXplKQogewotICAgIExlbmd0aCBjcm9zc01pbiA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNo aWxkLnN0eWxlKCkubWluSGVpZ2h0KCkgOiBjaGlsZC5zdHlsZSgpLm1pbldpZHRoKCk7Ci0gICAg TGVuZ3RoIGNyb3NzTWF4ID0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQuc3R5bGUoKS5tYXhI ZWlnaHQoKSA6IGNoaWxkLnN0eWxlKCkubWF4V2lkdGgoKTsKKyAgICBMZW5ndGggY3Jvc3NNaW4g PSBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChNaW5TaXplLCBjaGlsZCk7CisgICAgTGVuZ3RoIGNy b3NzTWF4ID0gY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoTWF4U2l6ZSwgY2hpbGQpOwogCiAgICAg aWYgKGNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZShjaGlsZCwgY3Jvc3NNYXgpKSB7CiAgICAgICAg IExheW91dFVuaXQgbWF4VmFsdWUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2lu ZyhjaGlsZCwgY3Jvc3NNYXgpOwpAQCAtMTYwMyw4ICsxNjMxLDggQEAgYm9vbCBSZW5kZXJGbGV4 aWJsZUJveDo6Y2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1NpemUoY29uc3QgUmVuZGVyQm94JiBj aGlsZCkgY28KICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgTGVuZ3RoIGNoaWxkRmxleEJh c2lzID0gZmxleEJhc2lzRm9yQ2hpbGQoY2hpbGQpOwotICAgIExlbmd0aCBjaGlsZE1pblNpemUg PSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5zdHlsZSgpLm1pbldpZHRoKCkgOiBjaGlsZC5z dHlsZSgpLm1pbkhlaWdodCgpOwotICAgIExlbmd0aCBjaGlsZE1heFNpemUgPSBpc0hvcml6b250 YWxGbG93KCkgPyBjaGlsZC5zdHlsZSgpLm1heFdpZHRoKCkgOiBjaGlsZC5zdHlsZSgpLm1heEhl aWdodCgpOworICAgIExlbmd0aCBjaGlsZE1pblNpemUgPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxk KE1pblNpemUsIGNoaWxkKTsKKyAgICBMZW5ndGggY2hpbGRNYXhTaXplID0gbWFpblNpemVMZW5n dGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CiAgICAgLy8gRklYTUU6IHdlIG11c3QgcnVuIGNo aWxkTWFpblNpemVJc0RlZmluaXRlKCkgYmVjYXVzZSBpdCBtaWdodCBlbmQgdXAgY2FsbGluZyBj b21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoKQogICAgIC8vIHdoaWNoIGhhcyBzb21lIHNp ZGUgZWZmZWN0cyBsaWtlIGNhbGxpbmcgYWRkUGVyY2VudEhlaWdodERlc2NlbmRhbnQoKSBmb3Ig ZXhhbXBsZSBzbyBpdCBpcyBub3QgcG9zc2libGUgdG8gc2tpcAogICAgIC8vIHRoZSBjYWxsIGZv ciBleGFtcGxlIGJ5IG1vdmluZyBpdCB0byB0aGUgZW5kIG9mIHRoZSBjb25kaXRpb25hbCBleHBy ZXNzaW9uLiBUaGlzIGlzIGVycm9yLXByb25lIGFuZCB3ZSBzaG91bGQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggMjZlNWYxY2VlZWJmMTViMWNj N2MyNDBiZGVjMzgxZWJhNWY1YWZiYy4uNDY4MGRjNzI1NGNiZTliYTQ2NmNmOTQyZWEyMDQyNzhi MTlhY2FlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmgKQEAgLTExMiw2ICsxMTIsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNMZWZ0VG9SaWdodEZs b3coKSBjb25zdDsKICAgICBib29sIGlzTXVsdGlsaW5lKCkgY29uc3Q7CiAgICAgTGVuZ3RoIGZs ZXhCYXNpc0ZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OworICAgIExlbmd0 aCBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKFNpemVUeXBlLCBjb25zdCBSZW5kZXJCb3gmKSBjb25z dDsKKyAgICBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoRm9yQ2hpbGQoU2l6ZVR5cGUsIGNvbnN0IFJl bmRlckJveCYpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkQXBwbHlNaW5TaXplQXV0b0ZvckNoaWxk KGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwogICAgIExheW91dFVuaXQgY3Jvc3NBeGlzRXh0ZW50 Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBj cm9zc0F4aXNJbnRyaW5zaWNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj b25zdDsK