218194 2020-10-26 10:09:51 -0700 Move some functions from RenderBlockFlow to RenderDeprecatedFlexbox 2020-10-26 10:55:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1701495 0 koivisto 2020-10-26 10:09:51 -0700 It is the only client. 1701498 1 412326 koivisto 2020-10-26 10:11:41 -0700 Created attachment 412326 patch 1701499 2 412327 koivisto 2020-10-26 10:13:05 -0700 Created attachment 412327 patch 1701533 3 ews-feeder 2020-10-26 10:54:36 -0700 Committed r268986: <https://trac.webkit.org/changeset/268986> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412327. 1701534 4 webkit-bug-importer 2020-10-26 10:55:23 -0700 <rdar://problem/70685908> 412326 2020-10-26 10:11:41 -0700 2020-10-26 10:13:05 -0700 patch flow-to-deprecated-flexbox.patch text/plain 9255 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODA2MDE2YTQwZjQuLjFiZWYzYWYzNGQ0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIwLTEwLTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBNb3ZlIHNvbWUgZnVuY3Rpb25zIGZyb20gUmVuZGVyQmxvY2tGbG93IHRv IFJlbmRlckRlcHJlY2F0ZWRGbGV4Ym94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTgxOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCBpcyB0aGUgb25seSBjbGllbnQuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvRWxsaXBzaXNCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxsaXBzaXNCb3g6Om1h cmt1cEJveCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxpbmVBdEluZGV4IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmdldEhlaWdodEZvckxpbmVDb3VudCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmhlaWdodEZvckxpbmVDb3Vu dCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6c2hvdWxkQ2hlY2tMaW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpsaW5lQXRJ bmRleCk6CisgICAgICAgIChXZWJDb3JlOjpnZXRIZWlnaHRGb3JMaW5lQ291bnQpOgorICAgICAg ICAoV2ViQ29yZTo6aGVpZ2h0Rm9yTGluZUNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXApOgorCiAyMDIwLTEwLTI1ICBT YW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbm9uLXN0YW5k YXJkICdjc3MnLydDc3MnIHByZWZpeGVkIHByb3BlcnRpZXMgb24gQ1NTU3R5bGVEZWNsYXJhdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAKaW5kZXggZGJjNWE0Mjcw OGI3Li43NmVhNDRhY2VkMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9F bGxpcHNpc0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94 LmNwcApAQCAtODcsNyArODcsNyBAQCBJbmxpbmVCb3gqIEVsbGlwc2lzQm94OjptYXJrdXBCb3go KSBjb25zdAogICAgIGlmICghbV9zaG91bGRQYWludE1hcmt1cEJveCkKICAgICAgICAgcmV0dXJu IDA7CiAKLSAgICBSb290SW5saW5lQm94KiBsYXN0TGluZSA9IGJsb2NrRmxvdygpLmxpbmVBdElu ZGV4KGJsb2NrRmxvdygpLmxpbmVDb3VudCgpIC0gMSk7CisgICAgUm9vdElubGluZUJveCogbGFz dExpbmUgPSBibG9ja0Zsb3coKS5sYXN0Um9vdEJveCgpOwogICAgIGlmICghbGFzdExpbmUpCiAg ICAgICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwCmluZGV4IGE1MzJkZjNkZTRiMC4uYWUzM2MxNjQwMWE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzI0NywzMSArMzI0Nyw2 IEBAIHN0YXRpYyBib29sIHNob3VsZENoZWNrTGluZXMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBi bG9ja0Zsb3cpCiAgICAgcmV0dXJuICFibG9ja0Zsb3cuaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9z aXRpb25lZCgpICYmIGJsb2NrRmxvdy5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOwogfQogCi1S b290SW5saW5lQm94KiBSZW5kZXJCbG9ja0Zsb3c6OmxpbmVBdEluZGV4KGludCBpKSBjb25zdAot ewotICAgIEFTU0VSVChpID49IDApOwotCi0gICAgaWYgKHN0eWxlKCkudmlzaWJpbGl0eSgpICE9 IFZpc2liaWxpdHk6OlZpc2libGUpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgaWYg KGNoaWxkcmVuSW5saW5lKCkpIHsKLSAgICAgICAgZm9yIChhdXRvKiBib3ggPSBmaXJzdFJvb3RC b3goKTsgYm94OyBib3ggPSBib3gtPm5leHRSb290Qm94KCkpIHsKLSAgICAgICAgICAgIGlmICgh aS0tKQotICAgICAgICAgICAgICAgIHJldHVybiBib3g7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIG51bGxwdHI7Ci0gICAgfQotCi0gICAgZm9yIChhdXRvJiBibG9ja0Zsb3cgOiBjaGlsZHJl bk9mVHlwZTxSZW5kZXJCbG9ja0Zsb3c+KCp0aGlzKSkgewotICAgICAgICBpZiAoIXNob3VsZENo ZWNrTGluZXMoYmxvY2tGbG93KSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAo Um9vdElubGluZUJveCogYm94ID0gYmxvY2tGbG93LmxpbmVBdEluZGV4KGkpKQotICAgICAgICAg ICAgcmV0dXJuIGJveDsKLSAgICB9Ci0KLSAgICByZXR1cm4gbnVsbHB0cjsKLX0KLQogaW50IFJl bmRlckJsb2NrRmxvdzo6bGluZUNvdW50KCkgY29uc3QKIHsKICAgICAvLyBGSVhNRTogVGhpcyBz aG91bGQgYmUgdGVzdGVkIGJ5IGNsaWVudHMuCkBAIC0zMjk5LDM5ICszMjc0LDYgQEAgaW50IFJl bmRlckJsb2NrRmxvdzo6bGluZUNvdW50KCkgY29uc3QKICAgICByZXR1cm4gY291bnQ7CiB9CiAK LXN0YXRpYyBpbnQgZ2V0SGVpZ2h0Rm9yTGluZUNvdW50KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYg YmxvY2ssIGludCBsaW5lQ291bnQsIGJvb2wgaW5jbHVkZUJvdHRvbSwgaW50JiBjb3VudCkKLXsK LSAgICBpZiAoYmxvY2suc3R5bGUoKS52aXNpYmlsaXR5KCkgIT0gVmlzaWJpbGl0eTo6VmlzaWJs ZSkKLSAgICAgICAgcmV0dXJuIC0xOwotCi0gICAgaWYgKGJsb2NrLmNoaWxkcmVuSW5saW5lKCkp IHsKLSAgICAgICAgZm9yIChhdXRvKiBib3ggPSBibG9jay5maXJzdFJvb3RCb3goKTsgYm94OyBi b3ggPSBib3gtPm5leHRSb290Qm94KCkpIHsKLSAgICAgICAgICAgIGlmICgrK2NvdW50ID09IGxp bmVDb3VudCkKLSAgICAgICAgICAgICAgICByZXR1cm4gYm94LT5saW5lQm90dG9tKCkgKyAoaW5j bHVkZUJvdHRvbSA/IChibG9jay5ib3JkZXJCb3R0b20oKSArIGJsb2NrLnBhZGRpbmdCb3R0b20o KSkgOiAwX2x1KTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIFJlbmRlckJveCog bm9ybWFsRmxvd0NoaWxkV2l0aG91dExpbmVzID0gbnVsbHB0cjsKLSAgICAgICAgZm9yIChhdXRv KiBvYmogPSBibG9jay5maXJzdENoaWxkQm94KCk7IG9iajsgb2JqID0gb2JqLT5uZXh0U2libGlu Z0JveCgpKSB7Ci0gICAgICAgICAgICBpZiAoaXM8UmVuZGVyQmxvY2tGbG93Pigqb2JqKSAmJiBz aG91bGRDaGVja0xpbmVzKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKm9iaikpKSB7Ci0gICAg ICAgICAgICAgICAgaW50IHJlc3VsdCA9IGdldEhlaWdodEZvckxpbmVDb3VudChkb3duY2FzdDxS ZW5kZXJCbG9ja0Zsb3c+KCpvYmopLCBsaW5lQ291bnQsIGZhbHNlLCBjb3VudCk7Ci0gICAgICAg ICAgICAgICAgaWYgKHJlc3VsdCAhPSAtMSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJl c3VsdCArIG9iai0+eSgpICsgKGluY2x1ZGVCb3R0b20gPyAoYmxvY2suYm9yZGVyQm90dG9tKCkg KyBibG9jay5wYWRkaW5nQm90dG9tKCkpIDogMF9sdSk7Ci0gICAgICAgICAgICB9IGVsc2UgaWYg KCFvYmotPmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgICAgICAg ICBub3JtYWxGbG93Q2hpbGRXaXRob3V0TGluZXMgPSBvYmo7Ci0gICAgICAgIH0KLSAgICAgICAg aWYgKG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcyAmJiAhbGluZUNvdW50KQotICAgICAgICAg ICAgcmV0dXJuIG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcy0+eSgpICsgbm9ybWFsRmxvd0No aWxkV2l0aG91dExpbmVzLT5oZWlnaHQoKTsKLSAgICB9Ci0gICAgCi0gICAgcmV0dXJuIC0xOwot fQotCi1pbnQgUmVuZGVyQmxvY2tGbG93OjpoZWlnaHRGb3JMaW5lQ291bnQoaW50IGxpbmVDb3Vu dCkKLXsKLSAgICBpbnQgY291bnQgPSAwOwotICAgIHJldHVybiBnZXRIZWlnaHRGb3JMaW5lQ291 bnQoKnRoaXMsIGxpbmVDb3VudCwgdHJ1ZSwgY291bnQpOwotfQotCiB2b2lkIFJlbmRlckJsb2Nr Rmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKIHsKICAgICBpZiAoc3R5bGUoKS52aXNpYmlsaXR5KCkg IT0gVmlzaWJpbGl0eTo6VmlzaWJsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuaAppbmRleCA5YWZhOWU5YWNiZjcuLjI4MmE2OTIzYjBhZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaApAQCAtMzQ4LDkgKzM0OCw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIHNldExpbmVMYXlvdXRQYXRoKExpbmVMYXlvdXRQYXRoIHBhdGgpIHsg c2V0UmVuZGVyQmxvY2tGbG93TGluZUxheW91dFBhdGgocGF0aCk7IH0KIAogICAgIC8vIEhlbHBl ciBtZXRob2RzIGZvciBjb21wdXRpbmcgbGluZSBjb3VudHMgYW5kIGhlaWdodHMgZm9yIGxpbmUg Y291bnRzLgotICAgIFJvb3RJbmxpbmVCb3gqIGxpbmVBdEluZGV4KGludCkgY29uc3Q7CiAgICAg aW50IGxpbmVDb3VudCgpIGNvbnN0OwotICAgIGludCBoZWlnaHRGb3JMaW5lQ291bnQoaW50KTsK ICAgICB2b2lkIGNsZWFyVHJ1bmNhdGlvbigpOwogCiAgICAgdm9pZCBzZXRIYXNNYXJrdXBUcnVu Y2F0aW9uKGJvb2wgYikgeyBzZXRSZW5kZXJCbG9ja0Zsb3dIYXNNYXJrdXBUcnVuY2F0aW9uKGIp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNh dGVkRmxleGlibGVCb3guY3BwCmluZGV4IDAwMzA1NGVjMjVmNC4uMzk2OGUxOGEwYmI3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxl Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZs ZXhpYmxlQm94LmNwcApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSAiRm9udENhc2NhZGUu aCIKICNpbmNsdWRlICJMYXlvdXRSZXBhaW50ZXIuaCIKKyNpbmNsdWRlICJSZW5kZXJJdGVyYXRv ci5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5b3V0U3Rh dGUuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCkBAIC05NDAsNiArOTQxLDY5IEBAIHZvaWQg UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29sIHJlbGF5 b3V0Q2hpbGRyZW4pCiAgICAgICAgIHNldEhlaWdodChvbGRIZWlnaHQpOwogfQogCitzdGF0aWMg Ym9vbCBzaG91bGRDaGVja0xpbmVzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgYmxvY2tGbG93KQor eworICAgIHJldHVybiAhYmxvY2tGbG93LmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQo KSAmJiBibG9ja0Zsb3cuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKTsKK30KKworc3RhdGljIFJv b3RJbmxpbmVCb3gqIGxpbmVBdEluZGV4KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgaW50 IGkpCit7CisgICAgQVNTRVJUKGkgPj0gMCk7CisKKyAgICBpZiAoZmxvdy5zdHlsZSgpLnZpc2li aWxpdHkoKSAhPSBWaXNpYmlsaXR5OjpWaXNpYmxlKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsK KworICAgIGlmIChmbG93LmNoaWxkcmVuSW5saW5lKCkpIHsKKyAgICAgICAgZm9yIChhdXRvKiBi b3ggPSBmbG93LmZpcnN0Um9vdEJveCgpOyBib3g7IGJveCA9IGJveC0+bmV4dFJvb3RCb3goKSkg eworICAgICAgICAgICAgaWYgKCFpLS0pCisgICAgICAgICAgICAgICAgcmV0dXJuIGJveDsKKyAg ICAgICAgfQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKKyAgICBmb3IgKGF1dG8m IGJsb2NrRmxvdyA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckJsb2NrRmxvdz4oZmxvdykpIHsKKyAg ICAgICAgaWYgKCFzaG91bGRDaGVja0xpbmVzKGJsb2NrRmxvdykpCisgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgaWYgKFJvb3RJbmxpbmVCb3gqIGJveCA9IGxpbmVBdEluZGV4KGJsb2Nr RmxvdywgaSkpCisgICAgICAgICAgICByZXR1cm4gYm94OworICAgIH0KKworICAgIHJldHVybiBu dWxscHRyOworfQorCitzdGF0aWMgaW50IGdldEhlaWdodEZvckxpbmVDb3VudChjb25zdCBSZW5k ZXJCbG9ja0Zsb3cmIGJsb2NrLCBpbnQgbGluZUNvdW50LCBib29sIGluY2x1ZGVCb3R0b20sIGlu dCYgY291bnQpCit7CisgICAgaWYgKGJsb2NrLnN0eWxlKCkudmlzaWJpbGl0eSgpICE9IFZpc2li aWxpdHk6OlZpc2libGUpCisgICAgICAgIHJldHVybiAtMTsKKworICAgIGlmIChibG9jay5jaGls ZHJlbklubGluZSgpKSB7CisgICAgICAgIGZvciAoYXV0byogYm94ID0gYmxvY2suZmlyc3RSb290 Qm94KCk7IGJveDsgYm94ID0gYm94LT5uZXh0Um9vdEJveCgpKSB7CisgICAgICAgICAgICBpZiAo Kytjb3VudCA9PSBsaW5lQ291bnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIGJveC0+bGluZUJv dHRvbSgpICsgKGluY2x1ZGVCb3R0b20gPyAoYmxvY2suYm9yZGVyQm90dG9tKCkgKyBibG9jay5w YWRkaW5nQm90dG9tKCkpIDogMF9sdSk7CisgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAg ICBSZW5kZXJCb3gqIG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcyA9IG51bGxwdHI7CisgICAg ICAgIGZvciAoYXV0byogb2JqID0gYmxvY2suZmlyc3RDaGlsZEJveCgpOyBvYmo7IG9iaiA9IG9i ai0+bmV4dFNpYmxpbmdCb3goKSkgeworICAgICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrRmxv dz4oKm9iaikgJiYgc2hvdWxkQ2hlY2tMaW5lcyhkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpv YmopKSkgeworICAgICAgICAgICAgICAgIGludCByZXN1bHQgPSBnZXRIZWlnaHRGb3JMaW5lQ291 bnQoZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93Pigqb2JqKSwgbGluZUNvdW50LCBmYWxzZSwgY291 bnQpOworICAgICAgICAgICAgICAgIGlmIChyZXN1bHQgIT0gLTEpCisgICAgICAgICAgICAgICAg ICAgIHJldHVybiByZXN1bHQgKyBvYmotPnkoKSArIChpbmNsdWRlQm90dG9tID8gKGJsb2NrLmJv cmRlckJvdHRvbSgpICsgYmxvY2sucGFkZGluZ0JvdHRvbSgpKSA6IDBfbHUpOworICAgICAgICAg ICAgfSBlbHNlIGlmICghb2JqLT5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisg ICAgICAgICAgICAgICAgbm9ybWFsRmxvd0NoaWxkV2l0aG91dExpbmVzID0gb2JqOworICAgICAg ICB9CisgICAgICAgIGlmIChub3JtYWxGbG93Q2hpbGRXaXRob3V0TGluZXMgJiYgIWxpbmVDb3Vu dCkKKyAgICAgICAgICAgIHJldHVybiBub3JtYWxGbG93Q2hpbGRXaXRob3V0TGluZXMtPnkoKSAr IG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcy0+aGVpZ2h0KCk7CisgICAgfQorCisgICAgcmV0 dXJuIC0xOworfQorCitzdGF0aWMgaW50IGhlaWdodEZvckxpbmVDb3VudChjb25zdCBSZW5kZXJC bG9ja0Zsb3cmIGZsb3csIGludCBsaW5lQ291bnQpCit7CisgICAgaW50IGNvdW50ID0gMDsKKyAg ICByZXR1cm4gZ2V0SGVpZ2h0Rm9yTGluZUNvdW50KGZsb3csIGxpbmVDb3VudCwgdHJ1ZSwgY291 bnQpOworfQorCiB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xh bXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCByZWxheW91dENoaWxkcmVuKQogewog ICAgIGludCBtYXhMaW5lQ291bnQgPSAwOwpAQCAtOTc5LDcgKzEwNDMsNyBAQCB2b2lkIFJlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9yJiBp dGVyYXRvciwgYm9vbAogICAgICAgICBpZiAobGluZUNvdW50IDw9IG51bVZpc2libGVMaW5lcykK ICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIExheW91dFVuaXQgbmV3SGVpZ2h0ID0g YmxvY2tDaGlsZC5oZWlnaHRGb3JMaW5lQ291bnQobnVtVmlzaWJsZUxpbmVzKTsKKyAgICAgICAg TGF5b3V0VW5pdCBuZXdIZWlnaHQgPSBoZWlnaHRGb3JMaW5lQ291bnQoYmxvY2tDaGlsZCwgbnVt VmlzaWJsZUxpbmVzKTsKICAgICAgICAgaWYgKG5ld0hlaWdodCA9PSBjaGlsZC0+aGVpZ2h0KCkp CiAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtOTkyLDExICsxMDU2LDExIEBAIHZvaWQgUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0b3Im IGl0ZXJhdG9yLCBib29sCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAvLyBHZXQg dGhlIGxhc3QgbGluZQotICAgICAgICBSb290SW5saW5lQm94KiBsYXN0TGluZSA9IGJsb2NrQ2hp bGQubGluZUF0SW5kZXgobGluZUNvdW50IC0gMSk7CisgICAgICAgIFJvb3RJbmxpbmVCb3gqIGxh c3RMaW5lID0gbGluZUF0SW5kZXgoYmxvY2tDaGlsZCwgbGluZUNvdW50IC0gMSk7CiAgICAgICAg IGlmICghbGFzdExpbmUpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBSb290SW5s aW5lQm94KiBsYXN0VmlzaWJsZUxpbmUgPSBibG9ja0NoaWxkLmxpbmVBdEluZGV4KG51bVZpc2li bGVMaW5lcyAtIDEpOworICAgICAgICBSb290SW5saW5lQm94KiBsYXN0VmlzaWJsZUxpbmUgPSBs aW5lQXRJbmRleChibG9ja0NoaWxkLCBudW1WaXNpYmxlTGluZXMgLSAxKTsKICAgICAgICAgaWYg KCFsYXN0VmlzaWJsZUxpbmUgfHwgIWxhc3RWaXNpYmxlTGluZS0+Zmlyc3RDaGlsZCgpKQogICAg ICAgICAgICAgY29udGludWU7CiAK 412327 2020-10-26 10:13:05 -0700 2020-10-26 10:54:36 -0700 patch flow-to-deprecated-flexbox-2.patch text/plain 9372 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODA2MDE2YTQwZjQuLjFiZWYzYWYzNGQ0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIwLTEwLTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBNb3ZlIHNvbWUgZnVuY3Rpb25zIGZyb20gUmVuZGVyQmxvY2tGbG93IHRv IFJlbmRlckRlcHJlY2F0ZWRGbGV4Ym94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTgxOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJdCBpcyB0aGUgb25seSBjbGllbnQuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvRWxsaXBzaXNCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxsaXBzaXNCb3g6Om1h cmt1cEJveCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxpbmVBdEluZGV4IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmdldEhlaWdodEZvckxpbmVDb3VudCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmhlaWdodEZvckxpbmVDb3Vu dCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6c2hvdWxkQ2hlY2tMaW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpsaW5lQXRJ bmRleCk6CisgICAgICAgIChXZWJDb3JlOjpnZXRIZWlnaHRGb3JMaW5lQ291bnQpOgorICAgICAg ICAoV2ViQ29yZTo6aGVpZ2h0Rm9yTGluZUNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXApOgorCiAyMDIwLTEwLTI1ICBT YW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgbm9uLXN0YW5k YXJkICdjc3MnLydDc3MnIHByZWZpeGVkIHByb3BlcnRpZXMgb24gQ1NTU3R5bGVEZWNsYXJhdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAKaW5kZXggZGJjNWE0Mjcw OGI3Li43NmVhNDRhY2VkMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9F bGxpcHNpc0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94 LmNwcApAQCAtODcsNyArODcsNyBAQCBJbmxpbmVCb3gqIEVsbGlwc2lzQm94OjptYXJrdXBCb3go KSBjb25zdAogICAgIGlmICghbV9zaG91bGRQYWludE1hcmt1cEJveCkKICAgICAgICAgcmV0dXJu IDA7CiAKLSAgICBSb290SW5saW5lQm94KiBsYXN0TGluZSA9IGJsb2NrRmxvdygpLmxpbmVBdElu ZGV4KGJsb2NrRmxvdygpLmxpbmVDb3VudCgpIC0gMSk7CisgICAgUm9vdElubGluZUJveCogbGFz dExpbmUgPSBibG9ja0Zsb3coKS5sYXN0Um9vdEJveCgpOwogICAgIGlmICghbGFzdExpbmUpCiAg ICAgICAgIHJldHVybiAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwCmluZGV4IGE1MzJkZjNkZTRiMC4uYWUzM2MxNjQwMWE0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzI0NywzMSArMzI0Nyw2 IEBAIHN0YXRpYyBib29sIHNob3VsZENoZWNrTGluZXMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBi bG9ja0Zsb3cpCiAgICAgcmV0dXJuICFibG9ja0Zsb3cuaXNGbG9hdGluZ09yT3V0T2ZGbG93UG9z aXRpb25lZCgpICYmIGJsb2NrRmxvdy5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOwogfQogCi1S b290SW5saW5lQm94KiBSZW5kZXJCbG9ja0Zsb3c6OmxpbmVBdEluZGV4KGludCBpKSBjb25zdAot ewotICAgIEFTU0VSVChpID49IDApOwotCi0gICAgaWYgKHN0eWxlKCkudmlzaWJpbGl0eSgpICE9 IFZpc2liaWxpdHk6OlZpc2libGUpCi0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgaWYg KGNoaWxkcmVuSW5saW5lKCkpIHsKLSAgICAgICAgZm9yIChhdXRvKiBib3ggPSBmaXJzdFJvb3RC b3goKTsgYm94OyBib3ggPSBib3gtPm5leHRSb290Qm94KCkpIHsKLSAgICAgICAgICAgIGlmICgh aS0tKQotICAgICAgICAgICAgICAgIHJldHVybiBib3g7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIG51bGxwdHI7Ci0gICAgfQotCi0gICAgZm9yIChhdXRvJiBibG9ja0Zsb3cgOiBjaGlsZHJl bk9mVHlwZTxSZW5kZXJCbG9ja0Zsb3c+KCp0aGlzKSkgewotICAgICAgICBpZiAoIXNob3VsZENo ZWNrTGluZXMoYmxvY2tGbG93KSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAo Um9vdElubGluZUJveCogYm94ID0gYmxvY2tGbG93LmxpbmVBdEluZGV4KGkpKQotICAgICAgICAg ICAgcmV0dXJuIGJveDsKLSAgICB9Ci0KLSAgICByZXR1cm4gbnVsbHB0cjsKLX0KLQogaW50IFJl bmRlckJsb2NrRmxvdzo6bGluZUNvdW50KCkgY29uc3QKIHsKICAgICAvLyBGSVhNRTogVGhpcyBz aG91bGQgYmUgdGVzdGVkIGJ5IGNsaWVudHMuCkBAIC0zMjk5LDM5ICszMjc0LDYgQEAgaW50IFJl bmRlckJsb2NrRmxvdzo6bGluZUNvdW50KCkgY29uc3QKICAgICByZXR1cm4gY291bnQ7CiB9CiAK LXN0YXRpYyBpbnQgZ2V0SGVpZ2h0Rm9yTGluZUNvdW50KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYg YmxvY2ssIGludCBsaW5lQ291bnQsIGJvb2wgaW5jbHVkZUJvdHRvbSwgaW50JiBjb3VudCkKLXsK LSAgICBpZiAoYmxvY2suc3R5bGUoKS52aXNpYmlsaXR5KCkgIT0gVmlzaWJpbGl0eTo6VmlzaWJs ZSkKLSAgICAgICAgcmV0dXJuIC0xOwotCi0gICAgaWYgKGJsb2NrLmNoaWxkcmVuSW5saW5lKCkp IHsKLSAgICAgICAgZm9yIChhdXRvKiBib3ggPSBibG9jay5maXJzdFJvb3RCb3goKTsgYm94OyBi b3ggPSBib3gtPm5leHRSb290Qm94KCkpIHsKLSAgICAgICAgICAgIGlmICgrK2NvdW50ID09IGxp bmVDb3VudCkKLSAgICAgICAgICAgICAgICByZXR1cm4gYm94LT5saW5lQm90dG9tKCkgKyAoaW5j bHVkZUJvdHRvbSA/IChibG9jay5ib3JkZXJCb3R0b20oKSArIGJsb2NrLnBhZGRpbmdCb3R0b20o KSkgOiAwX2x1KTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7Ci0gICAgICAgIFJlbmRlckJveCog bm9ybWFsRmxvd0NoaWxkV2l0aG91dExpbmVzID0gbnVsbHB0cjsKLSAgICAgICAgZm9yIChhdXRv KiBvYmogPSBibG9jay5maXJzdENoaWxkQm94KCk7IG9iajsgb2JqID0gb2JqLT5uZXh0U2libGlu Z0JveCgpKSB7Ci0gICAgICAgICAgICBpZiAoaXM8UmVuZGVyQmxvY2tGbG93Pigqb2JqKSAmJiBz aG91bGRDaGVja0xpbmVzKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKm9iaikpKSB7Ci0gICAg ICAgICAgICAgICAgaW50IHJlc3VsdCA9IGdldEhlaWdodEZvckxpbmVDb3VudChkb3duY2FzdDxS ZW5kZXJCbG9ja0Zsb3c+KCpvYmopLCBsaW5lQ291bnQsIGZhbHNlLCBjb3VudCk7Ci0gICAgICAg ICAgICAgICAgaWYgKHJlc3VsdCAhPSAtMSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHJl c3VsdCArIG9iai0+eSgpICsgKGluY2x1ZGVCb3R0b20gPyAoYmxvY2suYm9yZGVyQm90dG9tKCkg KyBibG9jay5wYWRkaW5nQm90dG9tKCkpIDogMF9sdSk7Ci0gICAgICAgICAgICB9IGVsc2UgaWYg KCFvYmotPmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgICAgICAg ICBub3JtYWxGbG93Q2hpbGRXaXRob3V0TGluZXMgPSBvYmo7Ci0gICAgICAgIH0KLSAgICAgICAg aWYgKG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcyAmJiAhbGluZUNvdW50KQotICAgICAgICAg ICAgcmV0dXJuIG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcy0+eSgpICsgbm9ybWFsRmxvd0No aWxkV2l0aG91dExpbmVzLT5oZWlnaHQoKTsKLSAgICB9Ci0gICAgCi0gICAgcmV0dXJuIC0xOwot fQotCi1pbnQgUmVuZGVyQmxvY2tGbG93OjpoZWlnaHRGb3JMaW5lQ291bnQoaW50IGxpbmVDb3Vu dCkKLXsKLSAgICBpbnQgY291bnQgPSAwOwotICAgIHJldHVybiBnZXRIZWlnaHRGb3JMaW5lQ291 bnQoKnRoaXMsIGxpbmVDb3VudCwgdHJ1ZSwgY291bnQpOwotfQotCiB2b2lkIFJlbmRlckJsb2Nr Rmxvdzo6Y2xlYXJUcnVuY2F0aW9uKCkKIHsKICAgICBpZiAoc3R5bGUoKS52aXNpYmlsaXR5KCkg IT0gVmlzaWJpbGl0eTo6VmlzaWJsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuaAppbmRleCA5YWZhOWU5YWNiZjcuLjczYmUyOGRmMWQyOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaApAQCAtMzQ3LDEwICszNDcsNyBAQCBw dWJsaWM6CiAgICAgTGluZUxheW91dFBhdGggbGluZUxheW91dFBhdGgoKSBjb25zdCB7IHJldHVy biBzdGF0aWNfY2FzdDxMaW5lTGF5b3V0UGF0aD4ocmVuZGVyQmxvY2tGbG93TGluZUxheW91dFBh dGgoKSk7IH0KICAgICB2b2lkIHNldExpbmVMYXlvdXRQYXRoKExpbmVMYXlvdXRQYXRoIHBhdGgp IHsgc2V0UmVuZGVyQmxvY2tGbG93TGluZUxheW91dFBhdGgocGF0aCk7IH0KIAotICAgIC8vIEhl bHBlciBtZXRob2RzIGZvciBjb21wdXRpbmcgbGluZSBjb3VudHMgYW5kIGhlaWdodHMgZm9yIGxp bmUgY291bnRzLgotICAgIFJvb3RJbmxpbmVCb3gqIGxpbmVBdEluZGV4KGludCkgY29uc3Q7CiAg ICAgaW50IGxpbmVDb3VudCgpIGNvbnN0OwotICAgIGludCBoZWlnaHRGb3JMaW5lQ291bnQoaW50 KTsKICAgICB2b2lkIGNsZWFyVHJ1bmNhdGlvbigpOwogCiAgICAgdm9pZCBzZXRIYXNNYXJrdXBU cnVuY2F0aW9uKGJvb2wgYikgeyBzZXRSZW5kZXJCbG9ja0Zsb3dIYXNNYXJrdXBUcnVuY2F0aW9u KGIpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXBy ZWNhdGVkRmxleGlibGVCb3guY3BwCmluZGV4IDAwMzA1NGVjMjVmNC4uMzk2OGUxOGEwYmI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94LmNwcApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSAiRm9udENhc2Nh ZGUuaCIKICNpbmNsdWRlICJMYXlvdXRSZXBhaW50ZXIuaCIKKyNpbmNsdWRlICJSZW5kZXJJdGVy YXRvci5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5b3V0 U3RhdGUuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCkBAIC05NDAsNiArOTQxLDY5IEBAIHZv aWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJveChib29sIHJl bGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgIHNldEhlaWdodChvbGRIZWlnaHQpOwogfQogCitzdGF0 aWMgYm9vbCBzaG91bGRDaGVja0xpbmVzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgYmxvY2tGbG93 KQoreworICAgIHJldHVybiAhYmxvY2tGbG93LmlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9u ZWQoKSAmJiBibG9ja0Zsb3cuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKTsKK30KKworc3RhdGlj IFJvb3RJbmxpbmVCb3gqIGxpbmVBdEluZGV4KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywg aW50IGkpCit7CisgICAgQVNTRVJUKGkgPj0gMCk7CisKKyAgICBpZiAoZmxvdy5zdHlsZSgpLnZp c2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5OjpWaXNpYmxlKQorICAgICAgICByZXR1cm4gbnVsbHB0 cjsKKworICAgIGlmIChmbG93LmNoaWxkcmVuSW5saW5lKCkpIHsKKyAgICAgICAgZm9yIChhdXRv KiBib3ggPSBmbG93LmZpcnN0Um9vdEJveCgpOyBib3g7IGJveCA9IGJveC0+bmV4dFJvb3RCb3go KSkgeworICAgICAgICAgICAgaWYgKCFpLS0pCisgICAgICAgICAgICAgICAgcmV0dXJuIGJveDsK KyAgICAgICAgfQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisKKyAgICBmb3IgKGF1 dG8mIGJsb2NrRmxvdyA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckJsb2NrRmxvdz4oZmxvdykpIHsK KyAgICAgICAgaWYgKCFzaG91bGRDaGVja0xpbmVzKGJsb2NrRmxvdykpCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgaWYgKFJvb3RJbmxpbmVCb3gqIGJveCA9IGxpbmVBdEluZGV4KGJs b2NrRmxvdywgaSkpCisgICAgICAgICAgICByZXR1cm4gYm94OworICAgIH0KKworICAgIHJldHVy biBudWxscHRyOworfQorCitzdGF0aWMgaW50IGdldEhlaWdodEZvckxpbmVDb3VudChjb25zdCBS ZW5kZXJCbG9ja0Zsb3cmIGJsb2NrLCBpbnQgbGluZUNvdW50LCBib29sIGluY2x1ZGVCb3R0b20s IGludCYgY291bnQpCit7CisgICAgaWYgKGJsb2NrLnN0eWxlKCkudmlzaWJpbGl0eSgpICE9IFZp c2liaWxpdHk6OlZpc2libGUpCisgICAgICAgIHJldHVybiAtMTsKKworICAgIGlmIChibG9jay5j aGlsZHJlbklubGluZSgpKSB7CisgICAgICAgIGZvciAoYXV0byogYm94ID0gYmxvY2suZmlyc3RS b290Qm94KCk7IGJveDsgYm94ID0gYm94LT5uZXh0Um9vdEJveCgpKSB7CisgICAgICAgICAgICBp ZiAoKytjb3VudCA9PSBsaW5lQ291bnQpCisgICAgICAgICAgICAgICAgcmV0dXJuIGJveC0+bGlu ZUJvdHRvbSgpICsgKGluY2x1ZGVCb3R0b20gPyAoYmxvY2suYm9yZGVyQm90dG9tKCkgKyBibG9j ay5wYWRkaW5nQm90dG9tKCkpIDogMF9sdSk7CisgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAg ICAgICBSZW5kZXJCb3gqIG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcyA9IG51bGxwdHI7Cisg ICAgICAgIGZvciAoYXV0byogb2JqID0gYmxvY2suZmlyc3RDaGlsZEJveCgpOyBvYmo7IG9iaiA9 IG9iai0+bmV4dFNpYmxpbmdCb3goKSkgeworICAgICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2Nr Rmxvdz4oKm9iaikgJiYgc2hvdWxkQ2hlY2tMaW5lcyhkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+ KCpvYmopKSkgeworICAgICAgICAgICAgICAgIGludCByZXN1bHQgPSBnZXRIZWlnaHRGb3JMaW5l Q291bnQoZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93Pigqb2JqKSwgbGluZUNvdW50LCBmYWxzZSwg Y291bnQpOworICAgICAgICAgICAgICAgIGlmIChyZXN1bHQgIT0gLTEpCisgICAgICAgICAgICAg ICAgICAgIHJldHVybiByZXN1bHQgKyBvYmotPnkoKSArIChpbmNsdWRlQm90dG9tID8gKGJsb2Nr LmJvcmRlckJvdHRvbSgpICsgYmxvY2sucGFkZGluZ0JvdHRvbSgpKSA6IDBfbHUpOworICAgICAg ICAgICAgfSBlbHNlIGlmICghb2JqLT5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkp CisgICAgICAgICAgICAgICAgbm9ybWFsRmxvd0NoaWxkV2l0aG91dExpbmVzID0gb2JqOworICAg ICAgICB9CisgICAgICAgIGlmIChub3JtYWxGbG93Q2hpbGRXaXRob3V0TGluZXMgJiYgIWxpbmVD b3VudCkKKyAgICAgICAgICAgIHJldHVybiBub3JtYWxGbG93Q2hpbGRXaXRob3V0TGluZXMtPnko KSArIG5vcm1hbEZsb3dDaGlsZFdpdGhvdXRMaW5lcy0+aGVpZ2h0KCk7CisgICAgfQorCisgICAg cmV0dXJuIC0xOworfQorCitzdGF0aWMgaW50IGhlaWdodEZvckxpbmVDb3VudChjb25zdCBSZW5k ZXJCbG9ja0Zsb3cmIGZsb3csIGludCBsaW5lQ291bnQpCit7CisgICAgaW50IGNvdW50ID0gMDsK KyAgICByZXR1cm4gZ2V0SGVpZ2h0Rm9yTGluZUNvdW50KGZsb3csIGxpbmVDb3VudCwgdHJ1ZSwg Y291bnQpOworfQorCiB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5l Q2xhbXAoRmxleEJveEl0ZXJhdG9yJiBpdGVyYXRvciwgYm9vbCByZWxheW91dENoaWxkcmVuKQog ewogICAgIGludCBtYXhMaW5lQ291bnQgPSAwOwpAQCAtOTc5LDcgKzEwNDMsNyBAQCB2b2lkIFJl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXAoRmxleEJveEl0ZXJhdG9y JiBpdGVyYXRvciwgYm9vbAogICAgICAgICBpZiAobGluZUNvdW50IDw9IG51bVZpc2libGVMaW5l cykKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIExheW91dFVuaXQgbmV3SGVpZ2h0 ID0gYmxvY2tDaGlsZC5oZWlnaHRGb3JMaW5lQ291bnQobnVtVmlzaWJsZUxpbmVzKTsKKyAgICAg ICAgTGF5b3V0VW5pdCBuZXdIZWlnaHQgPSBoZWlnaHRGb3JMaW5lQ291bnQoYmxvY2tDaGlsZCwg bnVtVmlzaWJsZUxpbmVzKTsKICAgICAgICAgaWYgKG5ld0hlaWdodCA9PSBjaGlsZC0+aGVpZ2h0 KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKIApAQCAtOTkyLDExICsxMDU2LDExIEBAIHZvaWQg UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjphcHBseUxpbmVDbGFtcChGbGV4Qm94SXRlcmF0 b3ImIGl0ZXJhdG9yLCBib29sCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAvLyBH ZXQgdGhlIGxhc3QgbGluZQotICAgICAgICBSb290SW5saW5lQm94KiBsYXN0TGluZSA9IGJsb2Nr Q2hpbGQubGluZUF0SW5kZXgobGluZUNvdW50IC0gMSk7CisgICAgICAgIFJvb3RJbmxpbmVCb3gq IGxhc3RMaW5lID0gbGluZUF0SW5kZXgoYmxvY2tDaGlsZCwgbGluZUNvdW50IC0gMSk7CiAgICAg ICAgIGlmICghbGFzdExpbmUpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBSb290 SW5saW5lQm94KiBsYXN0VmlzaWJsZUxpbmUgPSBibG9ja0NoaWxkLmxpbmVBdEluZGV4KG51bVZp c2libGVMaW5lcyAtIDEpOworICAgICAgICBSb290SW5saW5lQm94KiBsYXN0VmlzaWJsZUxpbmUg PSBsaW5lQXRJbmRleChibG9ja0NoaWxkLCBudW1WaXNpYmxlTGluZXMgLSAxKTsKICAgICAgICAg aWYgKCFsYXN0VmlzaWJsZUxpbmUgfHwgIWxhc3RWaXNpYmxlTGluZS0+Zmlyc3RDaGlsZCgpKQog ICAgICAgICAgICAgY29udGludWU7CiAK