224057 2021-04-01 11:01:28 -0700 Expand on shouldComputeLogicalWidthFromAspectRatioAndInsets return logic 2021-04-01 21:03:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr rbuis simon.fraser webkit-bug-importer zalan oldest_to_newest 1746102 0 zalan 2021-04-01 11:01:28 -0700 trying to replace "return style().width().isAuto() && style().height().isAuto() && !style().logicalTop().isAuto() && !style().logicalBottom().isAuto() && (style().logicalLeft().isAuto() || style().logicalRight().isAuto());" with something easier to parse. 1746103 1 424913 zalan 2021-04-01 11:04:19 -0700 Created attachment 424913 Patch 1746251 2 424913 rbuis 2021-04-01 13:56:05 -0700 Comment on attachment 424913 Patch This looks good to me once the commit message is fixed. Thanks for working on this :) 1746369 3 424980 zalan 2021-04-01 19:48:54 -0700 Created attachment 424980 Patch 1746379 4 zalan 2021-04-01 20:48:14 -0700 (In reply to Rob Buis from comment #2) > Comment on attachment 424913 [details] > Patch > > This looks good to me once the commit message is fixed. Thanks for the review! >Thanks for working on this :) I am trying to figure out an infinite recursion bug and I realized I should have involved myself more during the initial patch reviews. It's all new to me now. 1746380 5 ews-feeder 2021-04-01 21:02:10 -0700 Committed r275402: <https://commits.webkit.org/r275402> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424980. 1746381 6 webkit-bug-importer 2021-04-01 21:03:15 -0700 <rdar://problem/76136339> 424913 2021-04-01 11:04:19 -0700 2021-04-01 19:48:52 -0700 Patch bug-224057-20210401110418.patch text/plain 4565 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBhMGVlMGMxZDliMTQ5 ODUwMWIzODk1ZmQzMjI3ZWFkMjA4OGI2MS4uNGZmMjgzZDY0ZjUyMWNjMjNmMmU3YWUyZjdkZGE1 NWVkMDdkOTg3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwYW5kIG9uIHNob3VsZENv bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMgcmV0dXJuIGxvZ2ljCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwNTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAgKGV3cyB0 ZXN0aW5nIGEgbm9uLWxvZ2ljYWwgLT4gbG9naWNhbCBjaGFuZ2UpLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8gY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRo RnJvbUFzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2hv dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cyBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorCiAyMDIxLTA0LTAxICBN YXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggc29tZSBtaXNzaW5n IGV4Y2VwdGlvbiBjaGVja3MgaW4gSFRNTE1lZGlhRWxlbWVudCBtZXRob2RzLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA0ZDc1YWNmMzRlYTA1M2I2OWI2ZTNjZDBj NDhhMjU0YmQwMDA1YWEwLi41ZGQxZTcyNDllZGNlMjRhMjYyMmFiOTNiYzk5ZDEyMmY3YjE4NTZh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNTEwMCwxMiArNTEw MCwzNSBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkSWdub3JlQXNwZWN0UmF0aW8oKSBjb25zdAog ICAgIHJldHVybiAhc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpIHx8IGlzVGFibGVQYXJ0KCk7CiB9 CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvQW5kSW5zZXRzKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyZXIpCit7CisgICAgaWYgKCFy ZW5kZXJlci5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgYXV0byYgc3R5bGUgPSByZW5kZXJlci5zdHlsZSgpOworICAgIGlmICghc3R5bGUubG9n aWNhbFdpZHRoKCkuaXNBdXRvKCkpIHsKKyAgICAgICAgLy8gTm90IGFwcGxpY2FibGUgZm9yIGFz cGVjdCByYXRpbyBjb21wdXRhdGlvbi4KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAg ICAvLyBXaGVuIGJvdGggbGVmdCBhbmQgcmlnaHQgYXJlIHNldCwgdGhlIG91dC1vZi1mbG93IHBv c2l0aW9uZWQgYm94IGlzIGhvcml6b250YWxseSBjb25zdHJhaW5lZCBhbmQgYXNwZWN0IHJhdGlv IGZvciB0aGUgbG9naWNhbCB3aWR0aCBpcyBub3QgYXBwbGljYWJsZS4KKyAgICBhdXRvIGhhc0Nv bnN0cmFpbmVkV2lkdGggPSAhc3R5bGUubG9naWNhbExlZnQoKS5pc0F1dG8oKSAmJiAhc3R5bGUu bG9naWNhbFJpZ2h0KCkuaXNBdXRvKCk7CisgICAgaWYgKGhhc0NvbnN0cmFpbmVkV2lkdGgpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIFdoZW4gYm90aCB0b3AgYW5kIGJvdHRvbSBh cmUgc2V0LCB0aGUgb3V0LW9mLWZsb3cgcG9zaXRpb25lZCBib3ggaXMgdmVydGljYWxseSBjb25z dHJhaW5lZCBhbmQgaXQgY2FuIGJlIHVzZWQgYXMgaWYgaXQgaGFkIGEgbm9uLWF1dG8gaGVpZ2h0 IHZhbHVlLgorICAgIGF1dG8gaGFzQ29uc3RyYWluZWRIZWlnaHQgPSAhc3R5bGUubG9naWNhbFRv cCgpLmlzQXV0bygpICYmICFzdHlsZS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCk7CisgICAgaWYg KCFoYXNDb25zdHJhaW5lZEhlaWdodCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIC8vIE5v IGlkZWEuCisgICAgcmV0dXJuIHN0eWxlLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKTsKK30KKwog Ym9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlv KCkgY29uc3QKIHsKICAgICBpZiAoc2hvdWxkSWdub3JlQXNwZWN0UmF0aW8oKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW9BbmRJbnNldHMoKSkKKyAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy b21Bc3BlY3RSYXRpb0FuZEluc2V0cygqdGhpcykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwpAQCAtNTEyMCwxNCArNTE0Myw3 IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvKCkgY29uc3QKICAgICBhdXRvIGlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VIZWlnaHQgPSBbJl0g ewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxj dWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IHBlcmNlbnRhZ2VMb2dpY2Fs SGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwogICAgIH07Ci0gICAgcmV0dXJuIGhhc092ZXJyaWRpbmdM b2dpY2FsSGVpZ2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRp b0FuZEluc2V0cygpIHx8IHN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSB8fCBpc1Jl c29sdmFibGVQZXJjZW50YWdlSGVpZ2h0KCk7Ci19Ci0KLWJvb2wgUmVuZGVyQm94OjpzaG91bGRD b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3QKLXsKLSAg ICBpZiAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgcmV0dXJuIHN0eWxlKCkud2lkdGgoKS5pc0F1dG8oKSAmJiBzdHlsZSgpLmhlaWdodCgpLmlz QXV0bygpICYmICFzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSAmJiAhc3R5bGUoKS5sb2dp Y2FsQm90dG9tKCkuaXNBdXRvKCkgJiYgKHN0eWxlKCkubG9naWNhbExlZnQoKS5pc0F1dG8oKSB8 fCBzdHlsZSgpLmxvZ2ljYWxSaWdodCgpLmlzQXV0bygpKTsKKyAgICByZXR1cm4gaGFzT3ZlcnJp ZGluZ0xvZ2ljYWxIZWlnaHQoKSB8fCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvQW5kSW5zZXRzKCp0aGlzKSB8fCBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVk KCkgfHwgaXNSZXNvbHZhYmxlUGVyY2VudGFnZUhlaWdodCgpOwogfQogCiBMYXlvdXRVbml0IFJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVu dENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmgKaW5kZXggYzVhOGQ4ZmM5NTdkZGUzOTA2MmMwM2VhMWZhZjdjNmRjYWNjZTUxMi4uY2EzZTZh YmY5NTg2NTgyODdkYzJkNmFiZTM5NDI5ZTdlZWU1Yjg5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guaApAQCAtNzAzLDcgKzcwMyw2IEBAIHByb3RlY3RlZDoKIAogICAgIGJvb2wg c2hvdWxkSWdub3JlQXNwZWN0UmF0aW8oKSBjb25zdDsKICAgICBib29sIHNob3VsZENvbXB1dGVM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKLSAgICBib29sIHNob3VsZENvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdDsKICAgICBMYXlv dXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRD b250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgc3RkOjpwYWlyPExheW91dFVuaXQsIExh eW91dFVuaXQ+IGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25z dDsKIAo= 424980 2021-04-01 19:48:54 -0700 2021-04-01 21:02:11 -0700 Patch bug-224057-20210401194853.patch text/plain 4752 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODMxMmRlNDM3ODJlNWJl NjZjZjdkZmY2NWZlNjdiNTZjY2JmNzA2Mi4uM2FhYTYwMWEwMGM0NTNlZDVjYTZmNmM2NGNkODRk ZjMwYmE0NTlhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwYW5kIG9uIHNob3VsZENv bXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMgcmV0dXJuIGxvZ2ljCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwNTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBSb2IgQnVpcy4KKworICAgICAgICBJbiB0aGlzIHBhdGNoIHdl IGFsc28gc3RhcnQgY2hlY2tpbmcgYWdhaW5zdCBsb2dpY2FsV2lkdGgvaGVpZ2h0IGluc3RlYWQg b2YganVzdCB3aWR0aC9oZWlnaHQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW9BbmRJbnNldHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21w dXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjEtMDQtMDEgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBDbGVhbnVwIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8gYW5kIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW9BbmRJbnNldHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNGQ3 NWFjZjM0ZWEwNTNiNjliNmUzY2QwYzQ4YTI1NGJkMDAwNWFhMC4uZjNiNmMxOTI1OWE0MDI4Nzcx MmMwMjk5ZWExNGEzMGM3NDYyMTk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKQEAgLTUxMDAsMTIgKzUxMDAsMzUgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZElnbm9y ZUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICByZXR1cm4gIXN0eWxlKCkuaGFzQXNwZWN0UmF0aW8o KSB8fCBpc1RhYmxlUGFydCgpOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkQ29tcHV0 ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cyhjb25zdCBSZW5kZXJCb3gmIHJl bmRlcmVyKQoreworICAgIGlmICghcmVuZGVyZXIuaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGF1dG8mIHN0eWxlID0gcmVuZGVyZXIuc3R5bGUo KTsKKyAgICBpZiAoIXN0eWxlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKSB7CisgICAgICAgIC8v IE5vdCBhcHBsaWNhYmxlIGZvciBhc3BlY3QgcmF0aW8gY29tcHV0YXRpb24uCisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9CisgICAgLy8gV2hlbiBib3RoIGxlZnQgYW5kIHJpZ2h0IGFyZSBz ZXQsIHRoZSBvdXQtb2YtZmxvdyBwb3NpdGlvbmVkIGJveCBpcyBob3Jpem9udGFsbHkgY29uc3Ry YWluZWQgYW5kIGFzcGVjdCByYXRpbyBmb3IgdGhlIGxvZ2ljYWwgd2lkdGggaXMgbm90IGFwcGxp Y2FibGUuCisgICAgYXV0byBoYXNDb25zdHJhaW5lZFdpZHRoID0gIXN0eWxlLmxvZ2ljYWxMZWZ0 KCkuaXNBdXRvKCkgJiYgIXN0eWxlLmxvZ2ljYWxSaWdodCgpLmlzQXV0bygpOworICAgIGlmICho YXNDb25zdHJhaW5lZFdpZHRoKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBXaGVu IGJvdGggdG9wIGFuZCBib3R0b20gYXJlIHNldCwgdGhlIG91dC1vZi1mbG93IHBvc2l0aW9uZWQg Ym94IGlzIHZlcnRpY2FsbHkgY29uc3RyYWluZWQgYW5kIGl0IGNhbiBiZSB1c2VkIGFzIGlmIGl0 IGhhZCBhIG5vbi1hdXRvIGhlaWdodCB2YWx1ZS4KKyAgICBhdXRvIGhhc0NvbnN0cmFpbmVkSGVp Z2h0ID0gIXN0eWxlLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSAmJiAhc3R5bGUubG9naWNhbEJvdHRv bSgpLmlzQXV0bygpOworICAgIGlmICghaGFzQ29uc3RyYWluZWRIZWlnaHQpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAvLyBGSVhNRTogVGhpcyBjb3VsZCBwcm9iYWJseSBiZSBvbWl0dGVk IGFuZCBsZXQgdGhlIGNhbGxlcnMgaGFuZGxlIHRoZSBoZWlnaHQgY2hlY2sgKGFzIHRoZXkgc2Vl bSB0byBiZSBkb2luZyBhbnl3YXkpLgorICAgIHJldHVybiBzdHlsZS5sb2dpY2FsSGVpZ2h0KCku aXNBdXRvKCk7Cit9CisKIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdo dEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiB7CiAgICAgaWYgKHNob3VsZElnbm9yZUFzcGVjdFJh dGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkpCisgICAgaWYgKHNob3VsZENvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKnRoaXMpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIGggPSBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKQEAg LTUxMjAsMTQgKzUxNDMsNyBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgYXV0byBpc1Jlc29sdmFibGVQZXJjZW50 YWdlSGVpZ2h0ID0gWyZdIHsKICAgICAgICAgcmV0dXJuIHN0eWxlKCkubG9naWNhbEhlaWdodCgp LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSB8fCBw ZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKICAgICB9OwotICAgIHJldHVy biBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpIHx8IHNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSB8fCBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5p c0ZpeGVkKCkgfHwgaXNSZXNvbHZhYmxlUGVyY2VudGFnZUhlaWdodCgpOwotfQotCi1ib29sIFJl bmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0 cygpIGNvbnN0Ci17Ci0gICAgaWYgKCFpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIHJldHVybiBzdHlsZSgpLndpZHRoKCkuaXNBdXRvKCkgJiYgc3R5 bGUoKS5oZWlnaHQoKS5pc0F1dG8oKSAmJiAhc3R5bGUoKS5sb2dpY2FsVG9wKCkuaXNBdXRvKCkg JiYgIXN0eWxlKCkubG9naWNhbEJvdHRvbSgpLmlzQXV0bygpICYmIChzdHlsZSgpLmxvZ2ljYWxM ZWZ0KCkuaXNBdXRvKCkgfHwgc3R5bGUoKS5sb2dpY2FsUmlnaHQoKS5pc0F1dG8oKSk7CisgICAg cmV0dXJuIGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgfHwgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygqdGhpcykgfHwgc3R5bGUoKS5sb2dpY2Fs SGVpZ2h0KCkuaXNGaXhlZCgpIHx8IGlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VIZWlnaHQoKTsKIH0K IAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IGM1YThkOGZjOTU3ZGRlMzkwNjJjMDNlYTFmYWY3YzZk Y2FjY2U1MTIuLmNhM2U2YWJmOTU4NjU4Mjg3ZGMyZDZhYmUzOTQyOWU3ZWVlNWI4OTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTcwMyw3ICs3MDMsNiBAQCBwcm90ZWN0 ZWQ6CiAKICAgICBib29sIHNob3VsZElnbm9yZUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAgICAgYm9v bCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7Ci0gICAg Ym9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkg Y29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv KFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIHN0ZDo6cGFp cjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKCkgY29uc3Q7CiAK