212354 2020-05-25 09:00:18 -0700 [LFC][TFC] Add support for multiple sections 2020-05-26 08:55:14 -0700 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 1655871 0 zalan 2020-05-25 09:00:18 -0700 ssia 1655876 1 400203 zalan 2020-05-25 09:05:54 -0700 Created attachment 400203 Patch 1656050 2 ews-feeder 2020-05-26 08:54:12 -0700 Committed r262144: <https://trac.webkit.org/changeset/262144> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400203. 1656051 3 webkit-bug-importer 2020-05-26 08:55:14 -0700 <rdar://problem/63625471> 400203 2020-05-25 09:05:54 -0700 2020-05-26 08:54:12 -0700 Patch bug-212354-20200525090553.patch text/plain 14192 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTIxZjQzMWJiN2EyYjZi MWYyNTc5NzM3NjNjOTI1NzE1YjY0NzBiNy4uNDJiZTQzNDZhNWUxZjg0MmRiYWJjYTYwMmE0ZWIx YTBjMjYxZjFkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA1LTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3Vw cG9ydCBmb3IgbXVsdGlwbGUgc2VjdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMjM1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIExldCdzIGtlZXAgdGhlIGdyaWQgYWJvdXQgcm93cyBhbmQgY29s dW1ucyBhbmQgYWJvdXQgZGlzdHJpYnV0aW5nIGF2YWlsYWJsZSBzcGFjZS4KKyAgICAgICAgVXNl IHRoZSBsYXlvdXQgdHJlZSB0byBmaW5kIHNlY3Rpb25zLiAKKworICAgICAgICBUZXN0OiBmYXN0 L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1tdWx0aXBsZS1zZWN0aW9ucy5o dG1sCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL3RhYmxld3JhcHBlci9UYWJs ZVdyYXBwZXJCbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6VGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUJvcmRlckFu ZFBhZGRpbmdGb3JUYWJsZUJveCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFi bGVGb3JtYXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yQ2VsbHMpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlG b3JSb3dzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4 dDo6c2V0VXNlZEdlb21ldHJ5Rm9yU2VjdGlvbnMpOgorICAgICAgICAqIGxheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVH cmlkOjphcHBlbmRDZWxsKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVHcmlkOjpT ZWN0aW9uOjpTZWN0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlR3JpZC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUdyaWQ6OlNl Y3Rpb246OmJveCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRh YmxlR3JpZDo6c2VjdGlvbnMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpUYWJsZUdyaWQ6OnNlY3Rpb25zKTogRGVsZXRlZC4KKwogMjAyMC0wNS0yNCAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gSWdub3JlIHNl Y3Rpb24gYm9yZGVycyBldmVuIHdoZW4gYm9yZGVyIGNvbGxhcHNlIGlzIG9mZi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvdGFibGV3cmFwcGVyL1Rh YmxlV3JhcHBlckJsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBwZXIvVGFibGVXcmFwcGVyQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHAKaW5kZXggZjIxN2RkYWE0NDZmMjAxN2UwMDhkZGEzMWUzMGU4MTA2NTg2 YWMwMy4uNjQ1YWQ3MGQ1YzViOGRiZGViYjZhOGI2OTE5NjQwYjQ1YjE1MDJhYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBwZXIvVGFi bGVXcmFwcGVyQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy90YWJsZXdyYXBwZXIvVGFibGVXcmFwcGVyQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKQEAgLTExMSwxNCArMTExLDEzIEBAIHZvaWQgVGFibGVXcmFwcGVy QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUJvcmRlckFuZFBhZGRpbmdGb3JUYWJsZUJv eChjb25zCiAgICAgICAgICAgICBib3R0b21Cb3JkZXIgPSBzdGQ6Om1heChib3R0b21Cb3JkZXIs IGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoYm94SW5MYXN0Um93KS52ZXJ0aWNhbC5ib3R0b20p OwogICAgICAgICB9CiAKLSAgICAgICAgYXV0byYgc2VjdGlvbnMgPSBncmlkLnNlY3Rpb25zKCk7 Ci0gICAgICAgIHRvcEJvcmRlciA9IHN0ZDo6bWF4KHRvcEJvcmRlciwgZ2VvbWV0cnkoKS5jb21w dXRlZEJvcmRlcihzZWN0aW9ucy5maXJzdCgpLmJveCgpKS52ZXJ0aWNhbC50b3ApOwotICAgICAg ICBmb3IgKGF1dG8mIHNlY3Rpb24gOiBzZWN0aW9ucykgewotICAgICAgICAgICAgYXV0byBob3Jp enRvbmFsQm9yZGVyID0gZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcihzZWN0aW9uLmJveCgpKS5o b3Jpem9udGFsOworICAgICAgICB0b3BCb3JkZXIgPSBzdGQ6Om1heCh0b3BCb3JkZXIsIGdlb21l dHJ5KCkuY29tcHV0ZWRCb3JkZXIoKnRhYmxlQm94LmZpcnN0Q2hpbGQoKSkudmVydGljYWwudG9w KTsKKyAgICAgICAgZm9yIChhdXRvJiBzZWN0aW9uIDogY2hpbGRyZW5PZlR5cGU8Q29udGFpbmVy Qm94Pih0YWJsZUJveCkpIHsKKyAgICAgICAgICAgIGF1dG8gaG9yaXp0b25hbEJvcmRlciA9IGdl b21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIoc2VjdGlvbikuaG9yaXpvbnRhbDsKICAgICAgICAgICAg IGxlZnRCb3JkZXIgPSBzdGQ6Om1heChsZWZ0Qm9yZGVyLCBob3JpenRvbmFsQm9yZGVyLmxlZnQp OwogICAgICAgICAgICAgcmlnaHRCb3JkZXIgPSBzdGQ6Om1heChyaWdodEJvcmRlciwgaG9yaXp0 b25hbEJvcmRlci5yaWdodCk7CiAgICAgICAgIH0KLSAgICAgICAgYm90dG9tQm9yZGVyID0gc3Rk OjptYXgoYm90dG9tQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHNlY3Rpb25zLmxh c3QoKS5ib3goKSkudmVydGljYWwuYm90dG9tKTsKKyAgICAgICAgYm90dG9tQm9yZGVyID0gc3Rk OjptYXgoYm90dG9tQm9yZGVyLCBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKCp0YWJsZUJveC5s YXN0Q2hpbGQoKSkudmVydGljYWwuYm90dG9tKTsKIAogICAgICAgICBhdXRvJiByb3dzID0gZ3Jp ZC5yb3dzKCkubGlzdCgpOwogICAgICAgICB0b3BCb3JkZXIgPSBzdGQ6Om1heCh0b3BCb3JkZXIs IGdlb21ldHJ5KCkuY29tcHV0ZWRCb3JkZXIocm93cy5maXJzdCgpLmJveCgpKS52ZXJ0aWNhbC50 b3ApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggNzM3NzI3NTExZDc2NWRm NTIxMzhlMjRmYTBhY2QwZDcxZTJjNTAyMi4uOWVlNDBhNjllZTZkZTM4ZDk0N2NiMDEwMDE1Nzhk Zjc5MzYzZWI3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0 dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02OCwxNyAr NjgsMjQgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JD ZWxscyhMYXlvdXRVbml0IGF2YWlsYWJsZUhvcml6b24KICAgICBhdXRvJiBjb2x1bW5MaXN0ID0g Z3JpZC5jb2x1bW5zKCkubGlzdCgpOwogICAgIGF1dG8mIHJvd0xpc3QgPSBncmlkLnJvd3MoKS5s aXN0KCk7CiAgICAgLy8gRmluYWwgdGFibGUgY2VsbCBsYXlvdXQuIEF0IHRoaXMgcG9pbnQgYWxs IHBlcmNlbnRhZ2UgdmFsdWVzIGNhbiBiZSByZXNvbHZlZC4KKyAgICBhdXRvIHNlY3Rpb25PZmZz ZXQgPSBMYXlvdXRVbml0IHsgfTsKKyAgICBhdXRvKiBjdXJyZW50U2VjdGlvbiA9ICZyb3dMaXN0 LmZpcnN0KCkuYm94KCkucGFyZW50KCk7CiAgICAgZm9yIChhdXRvJiBjZWxsIDogZ3JpZC5jZWxs cygpKSB7CiAgICAgICAgIGF1dG8mIGNlbGxCb3ggPSBjZWxsLT5ib3goKTsKICAgICAgICAgYXV0 byYgY2VsbERpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KGNlbGxCb3gp OwotICAgICAgICBjZWxsRGlzcGxheUJveC5zZXRUb3Aocm93TGlzdFtjZWxsLT5zdGFydFJvdygp XS5sb2dpY2FsVG9wKCkpOworICAgICAgICBhdXRvJiBzZWN0aW9uID0gcm93TGlzdFtjZWxsLT5z dGFydFJvdygpXS5ib3goKS5wYXJlbnQoKTsKKyAgICAgICAgaWYgKCZzZWN0aW9uICE9IGN1cnJl bnRTZWN0aW9uKSB7CisgICAgICAgICAgICBjdXJyZW50U2VjdGlvbiA9ICZzZWN0aW9uOworICAg ICAgICAgICAgLy8gV2hpbGUgdGhlIGdyaWQgaXMgYSBjb250aW51b3VzIGZsb3cgb2Ygcm93cywg aW4gdGhlIGRpc3BsYXkgdHJlZSB0aGV5IGFyZSByZWxhdGl2ZSB0byB0aGVpciBzZWN0aW9ucy4K KyAgICAgICAgICAgIHNlY3Rpb25PZmZzZXQgPSByb3dMaXN0W2NlbGwtPnN0YXJ0Um93KCldLmxv Z2ljYWxUb3AoKTsKKyAgICAgICAgfQorICAgICAgICBjZWxsRGlzcGxheUJveC5zZXRUb3Aocm93 TGlzdFtjZWxsLT5zdGFydFJvdygpXS5sb2dpY2FsVG9wKCkgLSBzZWN0aW9uT2Zmc2V0KTsKICAg ICAgICAgY2VsbERpc3BsYXlCb3guc2V0TGVmdChjb2x1bW5MaXN0W2NlbGwtPnN0YXJ0Q29sdW1u KCldLmxvZ2ljYWxMZWZ0KCkpOwogICAgICAgICBhdXRvIGF2YWlsYWJsZVZlcnRpY2FsU3BhY2Ug PSByb3dMaXN0W2NlbGwtPnN0YXJ0Um93KCldLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgZm9y IChzaXplX3Qgcm93SW5kZXggPSBjZWxsLT5zdGFydFJvdygpICsgMTsgcm93SW5kZXggPCBjZWxs LT5lbmRSb3coKTsgKytyb3dJbmRleCkKICAgICAgICAgICAgIGF2YWlsYWJsZVZlcnRpY2FsU3Bh Y2UgKz0gcm93TGlzdFtyb3dJbmRleF0ubG9naWNhbEhlaWdodCgpOwogICAgICAgICBhdmFpbGFi bGVWZXJ0aWNhbFNwYWNlICs9IChjZWxsLT5yb3dTcGFuKCkgLSAxKSAqIGdyaWQudmVydGljYWxT cGFjaW5nKCk7CiAgICAgICAgIGxheW91dENlbGwoKmNlbGwsIGF2YWlsYWJsZUhvcml6b250YWxT cGFjZSwgYXZhaWxhYmxlVmVydGljYWxTcGFjZSk7Ci0gICAgICAgIAogICAgICAgICAvLyBGSVhN RTogRmluZCBvdXQgaWYgaXQgaXMgb2sgdG8gdXNlIHRoZSByZWd1bGFyIHBhZGRpbmcgaGVyZSB0 byBhbGlnbiB0aGUgY29udGVudCBib3ggaW5zaWRlIGEgdGFsbCBjZWxsIG9yIHdlIG5lZWQgdG8g CiAgICAgICAgIC8vIHVzZSBzb21lIGtpbmQgb2YgaW50cmluc2ljIHBhZGRpbmcgc2ltaWxhciB0 byBSZW5kZXJUYWJsZUNlbGwuCiAgICAgICAgIGF1dG8gcGFkZGluZ1RvcCA9IGNlbGxEaXNwbGF5 Qm94LnBhZGRpbmdUb3AoKS52YWx1ZU9yKExheW91dFVuaXQgeyB9KTsKQEAgLTExNCw2ICsxMjEs NyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvclJvd3Mo TGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9udAogICAgIGF1dG8mIHJvd3MgPSBncmlkLnJvd3Mo KS5saXN0KCk7CiAKICAgICBhdXRvIHJvd0xvZ2ljYWxUb3AgPSBncmlkLnZlcnRpY2FsU3BhY2lu ZygpOworICAgIGNvbnN0IENvbnRhaW5lckJveCogcHJldmlvdXNSb3cgPSBudWxscHRyOwogICAg IGZvciAoc2l6ZV90IHJvd0luZGV4ID0gMDsgcm93SW5kZXggPCByb3dzLnNpemUoKTsgKytyb3dJ bmRleCkgewogICAgICAgICBhdXRvJiByb3cgPSByb3dzW3Jvd0luZGV4XTsKICAgICAgICAgYXV0 byYgcm93Qm94ID0gcm93LmJveCgpOwpAQCAtMTI1LDcgKzEzMyw2IEBAIHZvaWQgVGFibGVGb3Jt YXR0aW5nQ29udGV4dDo6c2V0VXNlZEdlb21ldHJ5Rm9yUm93cyhMYXlvdXRVbml0IGF2YWlsYWJs ZUhvcml6b250CiAgICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0SG9yaXpvbnRhbENvbXB1dGVkTWFy Z2luKHsgfSk7CiAgICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oeyB7IH0s IHsgfSB9KTsKIAotCiAgICAgICAgIGF1dG8gY29tcHV0ZWRSb3dCb3JkZXIgPSBbJl0gewogICAg ICAgICAgICAgYXV0byBib3JkZXIgPSBnZW9tZXRyeSgpLmNvbXB1dGVkQm9yZGVyKHJvd0JveCk7 CiAgICAgICAgICAgICBpZiAoIWdyaWQuY29sbGFwc2VkQm9yZGVyKCkpCkBAIC0xNTcsMTQgKzE2 NCwxNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OnNldFVzZWRHZW9tZXRyeUZvclJv d3MoTGF5b3V0VW5pdCBhdmFpbGFibGVIb3Jpem9udAogICAgICAgICAgICAgY29tcHV0ZWRSb3dC b3JkZXIuaG9yaXpvbnRhbC5yaWdodCA9IHsgfTsKICAgICAgICAgfQogICAgICAgICByb3dEaXNw bGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aChyb3dMb2dpY2FsV2lkdGggLSBjb21wdXRlZFJvd0Jv cmRlci53aWR0aCgpKTsKLQogICAgICAgICByb3dEaXNwbGF5Qm94LnNldEJvcmRlcihjb21wdXRl ZFJvd0JvcmRlcik7CiAKKyAgICAgICAgaWYgKHByZXZpb3VzUm93ICYmICZwcmV2aW91c1Jvdy0+ cGFyZW50KCkgIT0gJnJvd0JveC5wYXJlbnQoKSkgeworICAgICAgICAgICAgLy8gVGhpcyByb3cg aXMgaW4gYSBkaWZmZXJlbnQgc2VjdGlvbi4KKyAgICAgICAgICAgIHJvd0xvZ2ljYWxUb3AgPSB7 IH07CisgICAgICAgIH0KICAgICAgICAgcm93RGlzcGxheUJveC5zZXRUb3Aocm93TG9naWNhbFRv cCk7CiAgICAgICAgIHJvd0Rpc3BsYXlCb3guc2V0TGVmdCh7IH0pOwogCi0gICAgICAgIHJvdy5z ZXRMb2dpY2FsVG9wKHJvd0xvZ2ljYWxUb3ApOwogICAgICAgICByb3dMb2dpY2FsVG9wICs9IHJv dy5sb2dpY2FsSGVpZ2h0KCkgKyBncmlkLnZlcnRpY2FsU3BhY2luZygpOworICAgICAgICBwcmV2 aW91c1JvdyA9ICZyb3dCb3g7CiAgICAgfQogCiAgICAgYXV0byYgY29sdW1ucyA9IGdyaWQuY29s dW1ucygpOwpAQCAtMTkwLDggKzIwMCw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6 c2V0VXNlZEdlb21ldHJ5Rm9yU2VjdGlvbnMoY29uc3QgQ29uc3RyYWludHNGb3JJbkZsCiAgICAg YXV0byYgZ3JpZCA9IGZvcm1hdHRpbmdTdGF0ZSgpLnRhYmxlR3JpZCgpOwogICAgIGF1dG8gc2Vj dGlvbldpZHRoID0gZ3JpZC5jb2x1bW5zKCkubG9naWNhbFdpZHRoKCkgKyAyICogZ3JpZC5ob3Jp em9udGFsU3BhY2luZygpOwogICAgIGF1dG8gbG9naWNhbFRvcCA9IGNvbnN0cmFpbnRzLnZlcnRp Y2FsLmxvZ2ljYWxUb3A7Ci0gICAgZm9yIChhdXRvJiBzZWN0aW9uIDogZ3JpZC5zZWN0aW9ucygp KSB7Ci0gICAgICAgIGF1dG8mIHNlY3Rpb25Cb3ggPSBzZWN0aW9uLmJveCgpOworICAgIGZvciAo YXV0byYgc2VjdGlvbkJveCA6IGNoaWxkcmVuT2ZUeXBlPENvbnRhaW5lckJveD4ocm9vdCgpKSkg ewogICAgICAgICBhdXRvJiBzZWN0aW9uRGlzcGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZSgpLmRp c3BsYXlCb3goc2VjdGlvbkJveCk7CiAgICAgICAgIC8vIFNlY3Rpb24gYm9yZGVycyBhcmUgZWl0 aGVyIGNvbGxhcHNlZCBvciBpZ25vcmVkLgogICAgICAgICBzZWN0aW9uRGlzcGxheUJveC5zZXRC b3JkZXIoeyB9KTsKQEAgLTIwMiw4ICsyMTEsMTIgQEAgdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250 ZXh0OjpzZXRVc2VkR2VvbWV0cnlGb3JTZWN0aW9ucyhjb25zdCBDb25zdHJhaW50c0ZvckluRmwK ICAgICAgICAgc2VjdGlvbkRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4oeyB7IH0sIHsgfSB9 KTsKIAogICAgICAgICBzZWN0aW9uRGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgoc2VjdGlv bldpZHRoKTsKLSAgICAgICAgc2VjdGlvbkRpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChn cmlkLnJvd3MoKS5saXN0KCkubGFzdCgpLmxvZ2ljYWxCb3R0b20oKSArIGdyaWQudmVydGljYWxT cGFjaW5nKCkpOwotCisgICAgICAgIGF1dG8gc2VjdGlvbkNvbnRlbnRIZWlnaHQgPSBMYXlvdXRV bml0IHsgfTsKKyAgICAgICAgZm9yIChhdXRvJiByb3dCb3ggOiBjaGlsZHJlbk9mVHlwZTxDb250 YWluZXJCb3g+KHNlY3Rpb25Cb3gpKQorICAgICAgICAgICAgc2VjdGlvbkNvbnRlbnRIZWlnaHQg Kz0gZ2VvbWV0cnlGb3JCb3gocm93Qm94KS5oZWlnaHQoKSArIGdyaWQudmVydGljYWxTcGFjaW5n KCk7CisgICAgICAgIC8vIEZJWE1FOiBMZXQncyB0cnkgbm90IGFkZCB2ZXJ0aWNhbCBzcGFjaW5n IHRvIHRoZSBjb250ZW50IGJveC4KKyAgICAgICAgc2VjdGlvbkNvbnRlbnRIZWlnaHQgKz0gZ3Jp ZC52ZXJ0aWNhbFNwYWNpbmcoKTsKKyAgICAgICAgc2VjdGlvbkRpc3BsYXlCb3guc2V0Q29udGVu dEJveEhlaWdodChzZWN0aW9uQ29udGVudEhlaWdodCk7CiAgICAgICAgIHNlY3Rpb25EaXNwbGF5 Qm94LnNldExlZnQoY29uc3RyYWludHMuaG9yaXpvbnRhbC5sb2dpY2FsTGVmdCk7CiAgICAgICAg IHNlY3Rpb25EaXNwbGF5Qm94LnNldFRvcChsb2dpY2FsVG9wKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuY3BwCmluZGV4IGJkNTdl Njk4OWEwNDRiNTY4MGM2MjkxMTdkYWNkM2MwZWZhZTljNjIuLjNjNDFkOGQwOGE1MjVlNzU2YWJj ZGNiMWEyMTVjOWY0NjU2YWNmYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90 YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv dGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5jcHAKQEAgLTM1LDExICszNSw2IEBAIG5hbWVzcGFj ZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoVGFibGVHcmlkKTsKIAot VGFibGVHcmlkOjpTZWN0aW9uOjpTZWN0aW9uKGNvbnN0IENvbnRhaW5lckJveCYgc2VjdGlvbkJv eCkKLSAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKHNlY3Rpb25Cb3gpKQotewotfQotCiBU YWJsZUdyaWQ6OkNvbHVtbjo6Q29sdW1uKGNvbnN0IENvbnRhaW5lckJveCogY29sdW1uQm94KQog ICAgIDogbV9sYXlvdXRCb3gobWFrZVdlYWtQdHIoY29sdW1uQm94KSkKIHsKQEAgLTE4MywxNCAr MTc4LDYgQEAgdm9pZCBUYWJsZUdyaWQ6OmFwcGVuZENlbGwoY29uc3QgQ29udGFpbmVyQm94JiBj ZWxsQm94KQogICAgIGlmIChpc0luTmV3Um93KQogICAgICAgICBtX3Jvd3MuYWRkUm93KGNlbGxC b3gucGFyZW50KCkpOwogCi0gICAgYXV0byYgbGFzdFJvd0JveCA9IG1fcm93cy5saXN0KCkubGFz dCgpLmJveCgpOwotICAgIGF1dG8gbmVlZHNOZXdTZWN0aW9uID0gbV9zZWN0aW9ucy5pc0VtcHR5 KCkgfHwgJmxhc3RSb3dCb3gucGFyZW50KCkgIT0gJm1fc2VjdGlvbnMubGFzdCgpLmJveCgpOwot ICAgIGlmIChuZWVkc05ld1NlY3Rpb24pIHsKLSAgICAgICAgYXV0byYgdGFibGVTZWN0aW9uID0g bGFzdFJvd0JveC5wYXJlbnQoKTsKLSAgICAgICAgQVNTRVJUKHRhYmxlU2VjdGlvbi5pc1RhYmxl SGVhZGVyKCkgfHwgdGFibGVTZWN0aW9uLmlzVGFibGVCb2R5KCkgfHwgdGFibGVTZWN0aW9uLmlz VGFibGVGb290ZXIoKSk7Ci0gICAgICAgIG1fc2VjdGlvbnMuYXBwZW5kKHsgdGFibGVTZWN0aW9u IH0pOwotICAgIH0KLQogICAgIG1fY2VsbHMuYWRkKFdURk1vdmUoY2VsbCkpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaAppbmRl eCA4ZDRkYjc4MjNjNGJiOTBhMGJiM2JkMDBhNjZmN2U4Zjc1YTIxYTY0Li45YTkyZjhiMzEzZTI3 ODVlNDNkNTE4NDdmOGU5MzAyNDYxMGVmMjViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVHcmlkLmgKQEAgLTYxLDE2ICs2MSw2IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldFdpZHRoQ29uc3RyYWludHMoRm9ybWF0dGluZ0NvbnRleHQ6OkludHJp bnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cykgeyBtX2ludHJp bnNpY1dpZHRoQ29uc3RyYWludHMgPSBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzOyB9CiAgICAg T3B0aW9uYWw8Rm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHM+IHdp ZHRoQ29uc3RyYWludHMoKSBjb25zdCB7IHJldHVybiBtX2ludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHM7IH0KIAotICAgIGNsYXNzIFNlY3Rpb24gewotICAgIHB1YmxpYzoKLSAgICAgICAgU2VjdGlv bihjb25zdCBDb250YWluZXJCb3gmKTsKLQotICAgICAgICBjb25zdCBDb250YWluZXJCb3gmIGJv eCgpIGNvbnN0IHsgcmV0dXJuICptX2xheW91dEJveC5nZXQoKTsgfQotCi0gICAgcHJpdmF0ZToK LSAgICAgICAgV2Vha1B0cjxjb25zdCBDb250YWluZXJCb3g+IG1fbGF5b3V0Qm94OwotICAgIH07 Ci0KICAgICAvLyBDb2x1bW4gcmVwcmVzZW50cyBhIHZlcnRpY2FsIHNldCBvZiBzbG90cyBpbiB0 aGUgZ3JpZC4gQSBjb2x1bW4gaGFzIGhvcml6b250YWwgcG9zaXRpb24gYW5kIHdpZHRoLgogICAg IGNsYXNzIENvbHVtbiB7CiAgICAgcHVibGljOgpAQCAtMjE3LDEwICsyMDcsNiBAQCBwdWJsaWM6 CiAgICAgICAgIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIG1f d2lkdGhDb25zdHJhaW50czsKICAgICB9OwogCi0gICAgdXNpbmcgU2VjdGlvbnMgPSBWZWN0b3I8 U2VjdGlvbj47Ci0gICAgY29uc3QgU2VjdGlvbnMmIHNlY3Rpb25zKCkgY29uc3QgeyByZXR1cm4g bV9zZWN0aW9uczsgfQotICAgIFNlY3Rpb25zJiBzZWN0aW9ucygpIHsgcmV0dXJuIG1fc2VjdGlv bnM7IH0KLQogICAgIGNvbnN0IENvbHVtbnMmIGNvbHVtbnMoKSBjb25zdCB7IHJldHVybiBtX2Nv bHVtbnM7IH0KICAgICBDb2x1bW5zJiBjb2x1bW5zKCkgeyByZXR1cm4gbV9jb2x1bW5zOyB9CiAK QEAgLTI0MCw3ICsyMjYsNiBAQCBwcml2YXRlOgogICAgIENvbHVtbnMgbV9jb2x1bW5zOwogICAg IFJvd3MgbV9yb3dzOwogICAgIENlbGxzIG1fY2VsbHM7Ci0gICAgU2VjdGlvbnMgbV9zZWN0aW9u czsKICAgICBTbG90TWFwIG1fc2xvdE1hcDsKIAogICAgIExheW91dFVuaXQgbV9ob3Jpem9udGFs U3BhY2luZzsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCAyN2VhOTFmYzc3Y2FiNmI2NjI0NGZjNDU3Yjg4MWFmMjYzODYwNDE5 Li4xNjI0NDQ2ZWJlYThiYTQ0M2IwY2M4YzQwNjhiYTNjNmYxMDU1YTYyIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTMgQEAKKzIwMjAtMDUtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwor ICAgICAgICBbTEZDXVtURkNdIEFkZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBzZWN0aW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzU0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91 dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1tdWx0aXBsZS1zZWN0aW9ucy1leHBlY3Rl ZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3Rh YmxlLXNpbXBsZS1tdWx0aXBsZS1zZWN0aW9ucy5odG1sOiBBZGRlZC4KKwogMjAyMC0wNS0yNCAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gSWdu b3JlIHNlY3Rpb24gYm9yZGVycyBldmVuIHdoZW4gYm9yZGVyIGNvbGxhcHNlIGlzIG9mZi4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUt c2ltcGxlLW11bHRpcGxlLXNlY3Rpb25zLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1tdWx0aXBsZS1zZWN0aW9ucy1l eHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBjM2E1N2MyNTNhNGQyMTRjZTNlZjhhMTcxMjFiOTI4 ZTc4NmM4ZTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1h dHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1tdWx0aXBsZS1zZWN0aW9ucy1leHBlY3RlZC5odG1s CkBAIC0wLDAgKzEsMTQgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5l ciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5hYmxlZD10cnVlIGludGVybmFs OkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFibGVkPWZhbHNlIF0gLS0+Cis8 c3R5bGU+Citib2R5IHsKKyAgICBtYXJnaW46IDBweDsKK30KK2RpdiB7CisgICAgaGVpZ2h0OiA1 MHB4OworICAgIHdpZHRoOiA0MHB4OworICAgIGJvcmRlcjogMTBweCBzb2xpZCBncmVlbjsKK30K Kzwvc3R5bGU+Cis8ZGl2PjwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiA0MHB4OyI+PC9kaXY+ Cis8ZGl2PjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0 aW5nY29udGV4dC90YWJsZS1zaW1wbGUtbXVsdGlwbGUtc2VjdGlvbnMuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLW11bHRpcGxlLXNl Y3Rpb25zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTUzMTA2NWNkODA0YjBmMjdlMzQyODcyZTBiNTM1ODdk OWJiZDczYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0 dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLW11bHRpcGxlLXNlY3Rpb25zLmh0bWwKQEAgLTAsMCAr MSw1MCBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJu YWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9y bWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KK2Jv ZHkgeworICAgbWFyZ2luOiAxMHB4OworfQordGFibGUgeworICAgIGJvcmRlci1zcGFjaW5nOiAw cHg7Cit9CisKK3RkIHsKKyAgICB3aWR0aDogMjBweDsKKyAgICBoZWlnaHQ6IDIwcHg7CisgICAg cGFkZGluZzogMHB4OworfQorCit0aCB7CisgICAgd2lkdGg6IDIwcHg7CisgICAgaGVpZ2h0OiAy MHB4OworICAgIHBhZGRpbmc6IDBweDsKK30KKwordGhlYWQgeworICAgIG91dGxpbmU6IDEwcHgg c29saWQgZ3JlZW47Cit9CisKK3Rib2R5IHsKKyAgICBvdXRsaW5lOiAxMHB4IHNvbGlkIGdyZWVu OworfQorCit0Zm9vdCB7CisgICAgb3V0bGluZTogMTBweCBzb2xpZCBncmVlbjsKK30KKzwvc3R5 bGU+Cis8dGFibGU+Cis8dGhlYWQ+Cis8dHI+PHRoPjwvdGg+PHRoPjwvdGg+PC90cj4KKzx0cj48 dGg+PC90aD48dGg+PC90aD48L3RyPgorPHRyPjx0aD48L3RoPjx0aD48L3RoPjwvdHI+Cis8L3Ro ZWFkPgorPHRib2R5PgorPHRyPjx0ZD48L3RkPjx0ZD48L3RkPjwvdHI+Cis8dHI+PHRkPjwvdGQ+ PHRkPjwvdGQ+PC90cj4KKzx0cj48dGQ+PC90ZD48dGQ+PC90ZD48L3RyPgorPC90Ym9keT4KKzx0 Zm9vdD4KKzx0cj48dGg+PC90aD48dGg+PC90aD48L3RyPgorPHRyPjx0aD48L3RoPjx0aD48L3Ro PjwvdHI+Cis8dHI+PHRoPjwvdGg+PHRoPjwvdGg+PC90cj4KKzwvdGZvb3Q+Cis8L3RhYmxlPgo=