236285 2022-02-07 21:30:30 -0800 [LFC][Integration] Take isHorizontalWritingMode value into account when converting incoming margin/border/padding values 2022-02-08 06:37:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1838523 0 zalan 2022-02-07 21:30:30 -0800 ssia 1838525 1 451207 zalan 2022-02-07 21:32:39 -0800 Created attachment 451207 Patch 1838641 2 ews-feeder 2022-02-08 06:36:17 -0800 Committed r289373 (246961@main): <https://commits.webkit.org/246961@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451207. 1838642 3 webkit-bug-importer 2022-02-08 06:37:17 -0800 <rdar://problem/88626621> 451207 2022-02-07 21:32:39 -0800 2022-02-08 06:36:18 -0800 Patch bug-236285-20220207213238.patch text/plain 9370 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q4ODAyMzE2MmYwMzI4 NWYzODlmYzNkMThjMDc4MzY1NGMyNWQ4Ni4uOGI4YzkyYzU4MDI5YTkwMjg0NjA2YTNkZjJhMzc5 MGU3NGRkOGVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0g VGFrZSBpc0hvcml6b250YWxXcml0aW5nTW9kZSB2YWx1ZSBpbnRvIGFjY291bnQgd2hlbiBjb252 ZXJ0aW5nIGluY29taW5nIG1hcmdpbi9ib3JkZXIvcGFkZGluZyB2YWx1ZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjI4NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6bG9naWNhbE1hcmdpbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6bG9naWNhbEJvcmRlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6bG9naWNhbFBhZGRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmVMYXlvdXQ6OnVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OnVwZGF0ZUlubGluZUJveERpbWVuc2lv bnMpOgorCiAyMDIyLTAyLTA3ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIFRha2Ugd3JpdGluZyBkaXJlY3Rpb24gaW50byBhY2NvdW50IHdoZW4g YXBwbHlpbmcgUmVuZGVyQmxvY2tGbG93IGVuZCBwYWRkaW5nIHF1aXJrCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5 b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDI0ZDA2YTMxODRmZjViNDhmYzZhNDIwZDA1ZjRmYzg1 NzJhZDg5OTMuLmM3YTI0Yjg4NWU0OWE3OGNlZWM5ODg5ZmVhYzhlMTNiYjE4MWJmZmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBAIC0xNTgsMzcgKzE1OCw1NyBAQCBzdGF0 aWMgaW5saW5lIExheW91dFVuaXQgY29udGVudExvZ2ljYWxIZWlnaHRGb3JSZW5kZXJlcihjb25z dCBSZW5kZXJCb3gmIHJlbmRlcgogICAgIHJldHVybiByZW5kZXJlci5wYXJlbnQoKS0+c3R5bGUo KS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gcmVuZGVyZXIuY29udGVudEhlaWdodCgpIDog cmVuZGVyZXIuY29udGVudFdpZHRoKCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgTGF5b3V0OjpCb3hH ZW9tZXRyeTo6SG9yaXpvbnRhbE1hcmdpbiBsb2dpY2FsTWFyZ2luKGNvbnN0IFJlbmRlckJveE1v ZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBib29sIHJl dGFpbk1hcmdpblN0YXJ0ID0gdHJ1ZSwgYm9vbCByZXRhaW5NYXJnaW5FbmQgPSB0cnVlKQotewot ICAgIGF1dG8gbWFyZ2luU3RhcnQgPSBMYXlvdXRVbml0IHsgMF9sdSB9OwotICAgIGF1dG8gbWFy Z2luRW5kID0gTGF5b3V0VW5pdCB7IDBfbHUgfTsKLSAgICBpZiAocmV0YWluTWFyZ2luU3RhcnQp Ci0gICAgICAgIG1hcmdpblN0YXJ0ID0gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IHJlbmRlcmVy Lm1hcmdpbkxlZnQoKSA6IHJlbmRlcmVyLm1hcmdpblJpZ2h0KCk7Ci0gICAgaWYgKHJldGFpbk1h cmdpbkVuZCkKLSAgICAgICAgbWFyZ2luRW5kID0gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IHJl bmRlcmVyLm1hcmdpblJpZ2h0KCkgOiByZW5kZXJlci5tYXJnaW5MZWZ0KCk7Ci0gICAgcmV0dXJu IHsgbWFyZ2luU3RhcnQsIG1hcmdpbkVuZCB9Oworc3RhdGljIGlubGluZSBMYXlvdXQ6OkJveEdl b21ldHJ5OjpIb3Jpem9udGFsTWFyZ2luIGxvZ2ljYWxNYXJnaW4oY29uc3QgUmVuZGVyQm94TW9k ZWxPYmplY3QmIHJlbmRlcmVyLCBib29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24sIGJvb2wgaXNI b3Jpem9udGFsV3JpdGluZ01vZGUsIGJvb2wgcmV0YWluTWFyZ2luU3RhcnQgPSB0cnVlLCBib29s IHJldGFpbk1hcmdpbkVuZCA9IHRydWUpCit7CisgICAgYXV0byBtYXJnaW5MZWZ0ID0gcmVuZGVy ZXIubWFyZ2luTGVmdCgpOworICAgIGF1dG8gbWFyZ2luUmlnaHQgPSByZW5kZXJlci5tYXJnaW5S aWdodCgpOworICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSkgeworICAgICAgICBpZiAo aXNMZWZ0VG9SaWdodERpcmVjdGlvbikKKyAgICAgICAgICAgIHJldHVybiB7IHJldGFpbk1hcmdp blN0YXJ0ID8gbWFyZ2luTGVmdCA6IDBfbHUsIHJldGFpbk1hcmdpbkVuZCA/IG1hcmdpblJpZ2h0 IDogMF9sdSB9OworICAgICAgICByZXR1cm4geyByZXRhaW5NYXJnaW5TdGFydCA/IG1hcmdpblJp Z2h0IDogMF9sdSwgcmV0YWluTWFyZ2luRW5kID8gbWFyZ2luTGVmdCA6IDBfbHUgfTsKKyAgICB9 CisKKyAgICBhdXRvIG1hcmdpblRvcCA9IHJlbmRlcmVyLm1hcmdpblRvcCgpOworICAgIGF1dG8g bWFyZ2luQm90dG9tID0gcmVuZGVyZXIubWFyZ2luQm90dG9tKCk7CisgICAgaWYgKGlzTGVmdFRv UmlnaHREaXJlY3Rpb24pCisgICAgICAgIHJldHVybiB7IHJldGFpbk1hcmdpblN0YXJ0ID8gbWFy Z2luVG9wIDogMF9sdSwgcmV0YWluTWFyZ2luRW5kID8gbWFyZ2luQm90dG9tIDogMF9sdSB9Owor ICAgIHJldHVybiB7IHJldGFpbk1hcmdpblN0YXJ0ID8gbWFyZ2luQm90dG9tIDogMF9sdSwgcmV0 YWluTWFyZ2luRW5kID8gbWFyZ2luVG9wIDogMF9sdSB9OwogfQogCi1zdGF0aWMgaW5saW5lIExh eW91dDo6RWRnZXMgbG9naWNhbEJvcmRlcihjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgcmVu ZGVyZXIsIGJvb2wgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgYm9vbCByZXRhaW5Cb3JkZXJTdGFy dCA9IHRydWUsIGJvb2wgcmV0YWluQm9yZGVyRW5kID0gdHJ1ZSkKK3N0YXRpYyBpbmxpbmUgTGF5 b3V0OjpFZGdlcyBsb2dpY2FsQm9yZGVyKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5k ZXJlciwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBib29sIGlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlLCBib29sIHJldGFpbkJvcmRlclN0YXJ0ID0gdHJ1ZSwgYm9vbCByZXRhaW5Cb3JkZXJF bmQgPSB0cnVlKQogewotICAgIGF1dG8gYm9yZGVyU3RhcnQgPSBMYXlvdXRVbml0IHsgMF9sdSB9 OwotICAgIGF1dG8gYm9yZGVyRW5kID0gTGF5b3V0VW5pdCB7IDBfbHUgfTsKLSAgICBpZiAocmV0 YWluQm9yZGVyU3RhcnQpCi0gICAgICAgIGJvcmRlclN0YXJ0ID0gaXNMZWZ0VG9SaWdodERpcmVj dGlvbiA/IHJlbmRlcmVyLmJvcmRlckxlZnQoKSA6IHJlbmRlcmVyLmJvcmRlclJpZ2h0KCk7Ci0g ICAgaWYgKHJldGFpbkJvcmRlckVuZCkKLSAgICAgICAgYm9yZGVyRW5kID0gaXNMZWZ0VG9SaWdo dERpcmVjdGlvbiA/IHJlbmRlcmVyLmJvcmRlclJpZ2h0KCkgOiByZW5kZXJlci5ib3JkZXJMZWZ0 KCk7Ci0gICAgcmV0dXJuIHsgeyBib3JkZXJTdGFydCwgYm9yZGVyRW5kIH0sIHsgcmVuZGVyZXIu Ym9yZGVyVG9wKCksIHJlbmRlcmVyLmJvcmRlckJvdHRvbSgpIH0gfTsKKyAgICBhdXRvIGJvcmRl ckxlZnQgPSByZW5kZXJlci5ib3JkZXJMZWZ0KCk7CisgICAgYXV0byBib3JkZXJSaWdodCA9IHJl bmRlcmVyLmJvcmRlclJpZ2h0KCk7CisgICAgYXV0byBib3JkZXJUb3AgPSByZW5kZXJlci5ib3Jk ZXJUb3AoKTsKKyAgICBhdXRvIGJvcmRlckJvdHRvbSA9IHJlbmRlcmVyLmJvcmRlckJvdHRvbSgp OworCisgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKSB7CisgICAgICAgIGlmIChpc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uKQorICAgICAgICAgICAgcmV0dXJuIHsgeyByZXRhaW5Cb3JkZXJT dGFydCA/IGJvcmRlckxlZnQgOiAwX2x1LCByZXRhaW5Cb3JkZXJFbmQgPyBib3JkZXJSaWdodCA6 IDBfbHUgfSwgeyBib3JkZXJUb3AsIGJvcmRlckJvdHRvbSB9IH07CisgICAgICAgIHJldHVybiB7 IHsgcmV0YWluQm9yZGVyU3RhcnQgPyBib3JkZXJSaWdodCA6IDBfbHUsIHJldGFpbkJvcmRlckVu ZCA/IGJvcmRlckxlZnQgOiAwX2x1IH0sIHsgYm9yZGVyVG9wLCBib3JkZXJCb3R0b20gfSB9Owor ICAgIH0KKworICAgIGlmIChpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQorICAgICAgICByZXR1cm4g eyB7IHJldGFpbkJvcmRlclN0YXJ0ID8gYm9yZGVyVG9wIDogMF9sdSwgcmV0YWluQm9yZGVyRW5k ID8gYm9yZGVyQm90dG9tIDogMF9sdSB9LCB7IGJvcmRlckxlZnQsIGJvcmRlclJpZ2h0IH0gfTsK KyAgICByZXR1cm4geyB7IHJldGFpbkJvcmRlclN0YXJ0ID8gYm9yZGVyQm90dG9tIDogMF9sdSwg cmV0YWluQm9yZGVyRW5kID8gYm9yZGVyVG9wIDogMF9sdSB9LCB7IGJvcmRlckxlZnQsIGJvcmRl clJpZ2h0IH0gfTsKIH0KIAotc3RhdGljIGlubGluZSBMYXlvdXQ6OkVkZ2VzIGxvZ2ljYWxQYWRk aW5nKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiByZW5kZXJlciwgYm9vbCBpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uLCBib29sIHJldGFpblBhZGRpbmdTdGFydCA9IHRydWUsIGJvb2wgcmV0YWlu UGFkZGluZ0VuZCA9IHRydWUpCitzdGF0aWMgaW5saW5lIExheW91dDo6RWRnZXMgbG9naWNhbFBh ZGRpbmcoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBib29sIGlzTGVmdFRv UmlnaHREaXJlY3Rpb24sIGJvb2wgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUsIGJvb2wgcmV0YWlu UGFkZGluZ1N0YXJ0ID0gdHJ1ZSwgYm9vbCByZXRhaW5QYWRkaW5nRW5kID0gdHJ1ZSkKIHsKLSAg ICBhdXRvIHBhZGRpbmdTdGFydCA9IExheW91dFVuaXQgeyAwX2x1IH07Ci0gICAgYXV0byBwYWRk aW5nRW5kID0gTGF5b3V0VW5pdCB7IDBfbHUgfTsKLSAgICBpZiAocmV0YWluUGFkZGluZ1N0YXJ0 KQotICAgICAgICBwYWRkaW5nU3RhcnQgPSBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gcmVuZGVy ZXIucGFkZGluZ0xlZnQoKSA6IHJlbmRlcmVyLnBhZGRpbmdSaWdodCgpOwotICAgIGlmIChyZXRh aW5QYWRkaW5nRW5kKQotICAgICAgICBwYWRkaW5nRW5kID0gaXNMZWZ0VG9SaWdodERpcmVjdGlv biA/IHJlbmRlcmVyLnBhZGRpbmdSaWdodCgpIDogcmVuZGVyZXIucGFkZGluZ0xlZnQoKTsKLSAg ICByZXR1cm4gTGF5b3V0OjpFZGdlcyB7IHsgcGFkZGluZ1N0YXJ0LCBwYWRkaW5nRW5kIH0sIHsg cmVuZGVyZXIucGFkZGluZ1RvcCgpLCByZW5kZXJlci5wYWRkaW5nQm90dG9tKCkgfSB9OworICAg IGF1dG8gcGFkZGluZ0xlZnQgPSByZW5kZXJlci5wYWRkaW5nTGVmdCgpOworICAgIGF1dG8gcGFk ZGluZ1JpZ2h0ID0gcmVuZGVyZXIucGFkZGluZ1JpZ2h0KCk7CisgICAgYXV0byBwYWRkaW5nVG9w ID0gcmVuZGVyZXIucGFkZGluZ1RvcCgpOworICAgIGF1dG8gcGFkZGluZ0JvdHRvbSA9IHJlbmRl cmVyLnBhZGRpbmdCb3R0b20oKTsKKworICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSkg eworICAgICAgICBpZiAoaXNMZWZ0VG9SaWdodERpcmVjdGlvbikKKyAgICAgICAgICAgIHJldHVy biB7IHsgcmV0YWluUGFkZGluZ1N0YXJ0ID8gcGFkZGluZ0xlZnQgOiAwX2x1LCByZXRhaW5QYWRk aW5nRW5kID8gcGFkZGluZ1JpZ2h0IDogMF9sdSB9LCB7IHBhZGRpbmdUb3AsIHBhZGRpbmdCb3R0 b20gfSB9OworICAgICAgICByZXR1cm4geyB7IHJldGFpblBhZGRpbmdTdGFydCA/IHBhZGRpbmdS aWdodCA6IDBfbHUsIHJldGFpblBhZGRpbmdFbmQgPyBwYWRkaW5nTGVmdCA6IDBfbHUgfSwgeyBw YWRkaW5nVG9wLCBwYWRkaW5nQm90dG9tIH0gfTsKKyAgICB9CisKKyAgICBpZiAoaXNMZWZ0VG9S aWdodERpcmVjdGlvbikKKyAgICAgICAgcmV0dXJuIHsgeyByZXRhaW5QYWRkaW5nU3RhcnQgPyBw YWRkaW5nVG9wIDogMF9sdSwgcmV0YWluUGFkZGluZ0VuZCA/IHBhZGRpbmdCb3R0b20gOiAwX2x1 IH0sIHsgcGFkZGluZ0xlZnQsIHBhZGRpbmdSaWdodCB9IH07CisgICAgcmV0dXJuIHsgeyByZXRh aW5QYWRkaW5nU3RhcnQgPyBwYWRkaW5nQm90dG9tIDogMF9sdSwgcmV0YWluUGFkZGluZ0VuZCA/ IHBhZGRpbmdUb3AgOiAwX2x1IH0sIHsgcGFkZGluZ0xlZnQsIHBhZGRpbmdSaWdodCB9IH07CiB9 CiAKIHZvaWQgTGluZUxheW91dDo6dXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyhjb25zdCBSZW5k ZXJCb3gmIHJlcGxhY2VkT3JJbmxpbmVCbG9jaykKQEAgLTIxMiw5ICsyMzIsMTEgQEAgdm9pZCBM aW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRCb3hEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVw bGFjZWRPcklubGluZUJsb2MKIAogICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0VmVydGljYWxN YXJnaW4oeyByZXBsYWNlZE9ySW5saW5lQmxvY2subWFyZ2luVG9wKCksIHJlcGxhY2VkT3JJbmxp bmVCbG9jay5tYXJnaW5Cb3R0b20oKSB9KTsKICAgICBhdXRvIGlzTGVmdFRvUmlnaHREaXJlY3Rp b24gPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFyZW50KCktPnN0eWxlKCkuaXNMZWZ0VG9SaWdo dERpcmVjdGlvbigpOwotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdp bihsb2dpY2FsTWFyZ2luKHJlcGxhY2VkT3JJbmxpbmVCbG9jaywgaXNMZWZ0VG9SaWdodERpcmVj dGlvbikpOwotICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0Qm9yZGVyKGxvZ2ljYWxCb3JkZXIo cmVwbGFjZWRPcklubGluZUJsb2NrLCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKSk7Ci0gICAgcmVw bGFjZWRCb3hHZW9tZXRyeS5zZXRQYWRkaW5nKGxvZ2ljYWxQYWRkaW5nKHJlcGxhY2VkT3JJbmxp bmVCbG9jaywgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikpOworICAgIGF1dG8gaXNIb3Jpem9udGFs V3JpdGluZ01vZGUgPSByZXBsYWNlZE9ySW5saW5lQmxvY2sucGFyZW50KCktPnN0eWxlKCkuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKTsKKworICAgIHJlcGxhY2VkQm94R2VvbWV0cnkuc2V0SG9y aXpvbnRhbE1hcmdpbihsb2dpY2FsTWFyZ2luKHJlcGxhY2VkT3JJbmxpbmVCbG9jaywgaXNMZWZ0 VG9SaWdodERpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpKTsKKyAgICByZXBsYWNl ZEJveEdlb21ldHJ5LnNldEJvcmRlcihsb2dpY2FsQm9yZGVyKHJlcGxhY2VkT3JJbmxpbmVCbG9j aywgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpKTsKKyAg ICByZXBsYWNlZEJveEdlb21ldHJ5LnNldFBhZGRpbmcobG9naWNhbFBhZGRpbmcocmVwbGFjZWRP cklubGluZUJsb2NrLCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uLCBpc0hvcml6b250YWxXcml0aW5n TW9kZSkpOwogCiAgICAgYXV0byBiYXNlbGluZSA9IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5iYXNl bGluZVBvc2l0aW9uKEFscGhhYmV0aWNCYXNlbGluZSwgZmFsc2UgLyogZmlyc3RMaW5lICovLCBI b3Jpem9udGFsTGluZSwgUG9zaXRpb25PbkNvbnRhaW5pbmdMaW5lKTsKICAgICByZXBsYWNlZEJv eC5zZXRCYXNlbGluZShyb3VuZFRvSW50KGJhc2VsaW5lKSk7CkBAIC0yNDIsOSArMjY0LDExIEBA IHZvaWQgTGluZUxheW91dDo6dXBkYXRlSW5saW5lQm94RGltZW5zaW9ucyhjb25zdCBSZW5kZXJJ bmxpbmUmIHJlbmRlcklubGluZSkKIAogICAgIGJveEdlb21ldHJ5LnNldFZlcnRpY2FsTWFyZ2lu KHsgfSk7CiAgICAgYXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gcmVuZGVySW5saW5lLnN0 eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOwotICAgIGJveEdlb21ldHJ5LnNldEhvcml6 b250YWxNYXJnaW4obG9naWNhbE1hcmdpbihyZW5kZXJJbmxpbmUsIGlzTGVmdFRvUmlnaHREaXJl Y3Rpb24sICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFzaG91 bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7Ci0gICAgYm94R2VvbWV0cnku c2V0Qm9yZGVyKGxvZ2ljYWxCb3JkZXIocmVuZGVySW5saW5lLCBpc0xlZnRUb1JpZ2h0RGlyZWN0 aW9uLCAhc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpblN0YXJ0LCAhc2hvdWxk Tm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVuZCkpOwotICAgIGJveEdlb21ldHJ5LnNl dFBhZGRpbmcobG9naWNhbFBhZGRpbmcocmVuZGVySW5saW5lLCBpc0xlZnRUb1JpZ2h0RGlyZWN0 aW9uLCAhc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpblN0YXJ0LCAhc2hvdWxk Tm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVuZCkpOworICAgIGF1dG8gaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUgPSByZW5kZXJJbmxpbmUuc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5n TW9kZSgpOworCisgICAgYm94R2VvbWV0cnkuc2V0SG9yaXpvbnRhbE1hcmdpbihsb2dpY2FsTWFy Z2luKHJlbmRlcklubGluZSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUsICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFz aG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7CisgICAgYm94R2VvbWV0 cnkuc2V0Qm9yZGVyKGxvZ2ljYWxCb3JkZXIocmVuZGVySW5saW5lLCBpc0xlZnRUb1JpZ2h0RGly ZWN0aW9uLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSwgIXNob3VsZE5vdFJldGFpbkJvcmRlclBh ZGRpbmdBbmRNYXJnaW5TdGFydCwgIXNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJn aW5FbmQpKTsKKyAgICBib3hHZW9tZXRyeS5zZXRQYWRkaW5nKGxvZ2ljYWxQYWRkaW5nKHJlbmRl cklubGluZSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUs ICFzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQsICFzaG91bGROb3RS ZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kKSk7CiB9CiAKIHZvaWQgTGluZUxheW91dDo6 dXBkYXRlU3R5bGUoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIHJlbmRlcmVyLCBjb25zdCBS ZW5kZXJTdHlsZSYgb2xkU3R5bGUpCg==