210972 2020-04-24 08:31:31 -0700 [LFC][TFC] Take first in-flow table-row baseline into account when computing cell baseline 2020-04-24 09:23: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 1645203 0 zalan 2020-04-24 08:31:31 -0700 The baseline of a cell is defined as the baseline of the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first. 1645205 1 397459 zalan 2020-04-24 08:36:10 -0700 Created attachment 397459 Patch 1645213 2 ews-feeder 2020-04-24 09:22:49 -0700 Committed r260647: <https://trac.webkit.org/changeset/260647> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397459. 1645214 3 webkit-bug-importer 2020-04-24 09:23:14 -0700 <rdar://problem/62317906> 397459 2020-04-24 08:36:10 -0700 2020-04-24 09:22:50 -0700 Patch bug-210972-20200424083609.patch text/plain 12690 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZlOGQ0MDdlZWVlN2Vk M2UwNjcyMThjODYyMmE4OWYxMzE0NTRmYy4uMzRkOWFjYzU0NGY1ZGQzNTFjOTAzZTRkZTFjOTgy MjE2NGI2ODU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA0LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBUYWtlIGZp cnN0IGluLWZsb3cgdGFibGUtcm93IGJhc2VsaW5lIGludG8gYWNjb3VudCB3aGVuIGNvbXB1dGlu ZyBjZWxsIGJhc2VsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTA5NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDaGVjayBpZiB0aGUgY2VsbCBoYXMgYSBuZXN0ZWQgdGFibGUgYW5kIHVzZSBpdHMg Zmlyc3Qgcm93IGFzIHRoZSBiYXNlbGluZSBmb3IgdGhlIGNlbGwgKHVubGVzcyB0aGVyZSdzIGFu IElGQyBiZWZvcmUpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRl eHQvdGFibGUtYmFzaWMtcm93LWJhc2VsaW5lLXdpdGgtbmVzdGVkLXRhYmxlLmh0bWwKKworICAg ICAgICAqIGxheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dENlbGwpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhVmVydGljYWxTcGFjZSk6CisgICAgICAgICogbGF5 b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICog bGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6dXNlZEJhc2VsaW5lRm9yQ2VsbCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0 dGluZy9UYWJsZUdyaWQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVHcmlkOjpS b3c6OnNldEJhc2VsaW5lT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVH cmlkOjpSb3c6OmJhc2VsaW5lT2Zmc2V0IGNvbnN0KToKKwogMjAyMC0wNC0yMyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gQWRkIHN1cHBvcnQg Zm9yIGJhc2ljIGJhc2VsaW5lIGFsaWduIGluc2lkZSBhIHRhYmxlIHJvdwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3Jt YXR0aW5nQ29udGV4dC5jcHAKaW5kZXggODVmNDZmZjFjYWQ5OWQwM2E5YzVlMDllNGJiMGU3MWY3 NzIwNDJmMi4uYjZiZDVjY2QzOTlkZGVmOTg2N2MyNzc4YTYwNzc2ZjdiMDk5NTQ3MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRp bmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5n L1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMzMsNiArMTMzLDcgQEAgdm9pZCBUYWJs ZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRDZWxsKGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYgY2Vs bCwgSW52YWxpZGF0aW8KICAgICAgICAgLy8gdXNlIHNvbWUga2luZCBvZiBpbnRyaW5zaWMgcGFk ZGluZyBzaW1pbGFyIHRvIFJlbmRlclRhYmxlQ2VsbC4KICAgICAgICAgYXV0byB2ZXJ0aWNhbEJv cmRlciA9IGNlbGxEaXNwbGF5Qm94LnZlcnRpY2FsQm9yZGVyKCk7CiAgICAgICAgIGF1dG8gaW50 cmluc2ljVmVydGljYWxQYWRkaW5nID0gc3RkOjptYXgoMF9sdSwgKnVzZWRDZWxsSGVpZ2h0IC0g dmVydGljYWxCb3JkZXIgLSBjb250ZW50SGVpZ2h0KTsKKyAgICAgICAgLy8gRklYTUU6IFRha2Ug dmVydGljYWwtYWxpZ24gaW50byBhY2NvdW50IGhlcmUuCiAgICAgICAgIGNlbGxEaXNwbGF5Qm94 LnNldFZlcnRpY2FsUGFkZGluZyh7IGludHJpbnNpY1ZlcnRpY2FsUGFkZGluZyAvIDIsIGludHJp bnNpY1ZlcnRpY2FsUGFkZGluZyAvIDIgfSk7CiAgICAgfQogICAgIGNlbGxEaXNwbGF5Qm94LnNl dENvbnRlbnRCb3hIZWlnaHQoY29udGVudEhlaWdodCk7CkBAIC00NTEsMTEgKzQ1MiwxMiBAQCB2 b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBbmREaXN0cmlidXRlRXh0cmFWZXJ0 aWNhbFNwYWNlKExheW91dFVuaXQgYQogICAgIGF1dG8mIGNvbHVtbnMgPSBncmlkLmNvbHVtbnMo KS5saXN0KCk7CiAgICAgYXV0byYgcm93cyA9IGdyaWQucm93cygpOwogCi0gICAgVmVjdG9yPGZs b2F0PiByb3duSGVpZ2h0czsKKyAgICBWZWN0b3I8TGF5b3V0VW5pdD4gcm93c0hlaWdodDsKKyAg ICBWZWN0b3I8SW5saW5lTGF5b3V0VW5pdD4gcm93c0Jhc2VsaW5lT2Zmc2V0OwogICAgIC8vIDEu IENvbGxlY3QgaW5pdGlhbCByb3cgaGVpZ2h0cy4KICAgICBmb3IgKHNpemVfdCByb3dJbmRleCA9 IDA7IHJvd0luZGV4IDwgcm93cy5zaXplKCk7ICsrcm93SW5kZXgpIHsKLSAgICAgICAgZmxvYXQg bWF4aW11bUNvbHVtbkFzY2VudCA9IDA7Ci0gICAgICAgIGZsb2F0IG1heGltdW1Db2x1bW5EZXNj ZW50ID0gMDsKKyAgICAgICAgYXV0byBtYXhpbXVtQ29sdW1uQXNjZW50ID0gSW5saW5lTGF5b3V0 VW5pdCB7IH07CisgICAgICAgIGF1dG8gbWF4aW11bUNvbHVtbkRlc2NlbnQgPSBJbmxpbmVMYXlv dXRVbml0IHsgfTsKICAgICAgICAgZm9yIChzaXplX3QgY29sdW1uSW5kZXggPSAwOyBjb2x1bW5J bmRleCA8IGNvbHVtbnMuc2l6ZSgpOyArK2NvbHVtbkluZGV4KSB7CiAgICAgICAgICAgICBhdXRv JiBzbG90ID0gKmdyaWQuc2xvdCh7IGNvbHVtbkluZGV4LCByb3dJbmRleCB9KTsKICAgICAgICAg ICAgIGlmIChzbG90LmlzQ29sdW1uU3Bhbm5lZCgpKQpAQCAtNDY1LDI3ICs0NjcsMjEgQEAgdm9p ZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQW5kRGlzdHJpYnV0ZUV4dHJhVmVydGlj YWxTcGFjZShMYXlvdXRVbml0IGEKICAgICAgICAgICAgIC8vIFRoZSBtaW5pbXVtIGhlaWdodCBv ZiBhIHJvdyAod2l0aG91dCBzcGFubmluZy1yZWxhdGVkIGhlaWdodCBkaXN0cmlidXRpb24pIGlz IGRlZmluZWQgYXMgdGhlIGhlaWdodCBvZiBhbiBoeXBvdGhldGljYWwKICAgICAgICAgICAgIC8v IGxpbmVib3ggY29udGFpbmluZyB0aGUgY2VsbHMgb3JpZ2luYXRpbmcgaW4gdGhlIHJvdy4KICAg ICAgICAgICAgIGF1dG8mIGNlbGxCb3ggPSBzbG90LmNlbGwoKS5ib3goKTsKLSAgICAgICAgICAg IGF1dG8mIGNlbGxEaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3goY2VsbEJveCk7Ci0gICAgICAg ICAgICBhdXRvIGNlbGxCYXNlbGluZU9mZnNldCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAg ICAgICAgICAgaWYgKGNlbGxCb3guZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgp KSB7Ci0gICAgICAgICAgICAgICAgLy8gVGhlIGJhc2VsaW5lIG9mIGEgY2VsbCBpcyBkZWZpbmVk IGFzIHRoZSBiYXNlbGluZSBvZiB0aGUgZmlyc3QgaW4tZmxvdyBsaW5lIGJveCBpbiB0aGUgY2Vs bCwKLSAgICAgICAgICAgICAgICAvLyBvciB0aGUgZmlyc3QgaW4tZmxvdyB0YWJsZS1yb3cgaW4g dGhlIGNlbGwsIHdoaWNoZXZlciBjb21lcyBmaXJzdAotICAgICAgICAgICAgICAgIGF1dG8mIGZp cnN0TGluZUJveCA9IGxheW91dFN0YXRlKCkuZXN0YWJsaXNoZWRJbmxpbmVGb3JtYXR0aW5nU3Rh dGUoY2VsbEJveCkuZGlzcGxheUlubGluZUNvbnRlbnQoKS0+bGluZUJveGVzWzBdOwotICAgICAg ICAgICAgICAgIGNlbGxCYXNlbGluZU9mZnNldCA9IGZpcnN0TGluZUJveC5iYXNlbGluZU9mZnNl dCgpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBJZiB0aGVyZSBp cyBubyBzdWNoIGxpbmUgYm94LCB0aGUgYmFzZWxpbmUgaXMgdGhlIGJvdHRvbSBvZiBjb250ZW50 IGVkZ2Ugb2YgdGhlIGNlbGwgYm94LgotICAgICAgICAgICAgICAgIGNlbGxCYXNlbGluZU9mZnNl dCA9IGNlbGxEaXNwbGF5Qm94LmNvbnRlbnRCb3hCb3R0b20oKTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIG1heGltdW1Db2x1bW5Bc2NlbnQgPSBzdGQ6Om1heDxmbG9hdD4obWF4aW11bUNv bHVtbkFzY2VudCwgY2VsbEJhc2VsaW5lT2Zmc2V0KTsKLSAgICAgICAgICAgIG1heGltdW1Db2x1 bW5EZXNjZW50ID0gc3RkOjptYXg8ZmxvYXQ+KG1heGltdW1Db2x1bW5EZXNjZW50LCBjZWxsRGlz cGxheUJveC5oZWlnaHQoKSAtIGNlbGxCYXNlbGluZU9mZnNldCk7CisgICAgICAgICAgICBhdXRv IGNlbGxCYXNlbGluZU9mZnNldCA9IGdlb21ldHJ5KCkudXNlZEJhc2VsaW5lRm9yQ2VsbChjZWxs Qm94KTsKKyAgICAgICAgICAgIG1heGltdW1Db2x1bW5Bc2NlbnQgPSBzdGQ6Om1heChtYXhpbXVt Q29sdW1uQXNjZW50LCBjZWxsQmFzZWxpbmVPZmZzZXQpOworICAgICAgICAgICAgbWF4aW11bUNv bHVtbkRlc2NlbnQgPSBzdGQ6Om1heChtYXhpbXVtQ29sdW1uRGVzY2VudCwgZ2VvbWV0cnlGb3JC b3goY2VsbEJveCkuaGVpZ2h0KCkgLSBjZWxsQmFzZWxpbmVPZmZzZXQpOwogICAgICAgICB9CiAg ICAgICAgIC8vIDx0ciBzdHlsZT0iaGVpZ2h0OiAxMHB4Ij4gaXMgY29uc2lkZXJlZCBhcyBtaW4g aGVpZ2h0LgogICAgICAgICBhdXRvIGNvbXB1dGVkUm93SGVpZ2h0ID0gZ2VvbWV0cnkoKS5jb21w dXRlZENvbnRlbnRIZWlnaHQocm93cy5saXN0KClbcm93SW5kZXhdLmJveCgpLCB7IH0pLnZhbHVl T3IoTGF5b3V0VW5pdCB7IH0pOwotICAgICAgICByb3duSGVpZ2h0cy5hcHBlbmQoc3RkOjptYXgo Y29tcHV0ZWRSb3dIZWlnaHQudG9GbG9hdCgpLCBtYXhpbXVtQ29sdW1uQXNjZW50ICsgbWF4aW11 bUNvbHVtbkRlc2NlbnQpKTsKKyAgICAgICAgcm93c0hlaWdodC5hcHBlbmQoc3RkOjptYXgoY29t cHV0ZWRSb3dIZWlnaHQsIExheW91dFVuaXQgeyBtYXhpbXVtQ29sdW1uQXNjZW50ICsgbWF4aW11 bUNvbHVtbkRlc2NlbnQgfSkpOworICAgICAgICByb3dzQmFzZWxpbmVPZmZzZXQuYXBwZW5kKG1h eGltdW1Db2x1bW5Bc2NlbnQpOwogICAgIH0KIAotICAgIGZvciAoc2l6ZV90IHJvd0luZGV4ID0g MDsgcm93SW5kZXggPCByb3dzLnNpemUoKTsgKytyb3dJbmRleCkKLSAgICAgICAgZ3JpZC5yb3dz KCkubGlzdCgpW3Jvd0luZGV4XS5zZXRMb2dpY2FsSGVpZ2h0KExheW91dFVuaXQgeyByb3duSGVp Z2h0c1tyb3dJbmRleF0gfSk7CisgICAgZm9yIChzaXplX3Qgcm93SW5kZXggPSAwOyByb3dJbmRl eCA8IHJvd3Muc2l6ZSgpOyArK3Jvd0luZGV4KSB7CisgICAgICAgIGF1dG8mIHJvdyA9IGdyaWQu cm93cygpLmxpc3QoKVtyb3dJbmRleF07CisgICAgICAgIHJvdy5zZXRMb2dpY2FsSGVpZ2h0KHJv d3NIZWlnaHRbcm93SW5kZXhdKTsKKyAgICAgICAgcm93LnNldEJhc2VsaW5lT2Zmc2V0KHJvd3NC YXNlbGluZU9mZnNldFtyb3dJbmRleF0pOworICAgIH0KIH0KIAogdm9pZCBUYWJsZUZvcm1hdHRp bmdDb250ZXh0OjpzZXRDb21wdXRlZEdlb21ldHJ5Rm9yUm93cygpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5oCmluZGV4IDI0MjA3NWI5ZjVjM2VmZjI3M2NlZWE5NTc0OWJmNzIwMmVkYmU4MGQu LjIwMjc0MDBmMzhjNTYzODM2MTMyNjNlMTFmN2E4NzU2YjBiODllNDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3Jt YXR0aW5nQ29udGV4dC5oCkBAIC01MCw2ICs1MCw3IEBAIHByaXZhdGU6CiAgICAgICAgIENvbnRl bnRIZWlnaHRBbmRNYXJnaW4gdGFibGVDZWxsSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYpIGNv bnN0OwogICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZENvbHVtbldpZHRoKGNv bnN0IEJveCYgY29sdW1uQm94KSBjb25zdDsKICAgICAgICAgRm9ybWF0dGluZ0NvbnRleHQ6Oklu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckNlbGwo Y29uc3QgQ29udGFpbmVyQm94JiBjZWxsQm94KTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB1 c2VkQmFzZWxpbmVGb3JDZWxsKGNvbnN0IENvbnRhaW5lckJveCYgY2VsbEJveCk7CiAKICAgICBw cml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgVGFibGVGb3JtYXR0aW5nQ29udGV4dDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBkMDhlOTgw NzJiYjFhZTExMjgxYjJkMzc1ZWFkMTBjMjAyNjQ2MDkxLi42YWY3YjE1ODUyMzJmNzE2M2E4Zjc4 MTM0NWE5MjJlOTZiM2Y3ZWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFi bGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJMYXlvdXRCb3guaCIK ICNpbmNsdWRlICJMYXlvdXRDb250ZXh0LmgiCisjaW5jbHVkZSAiTGF5b3V0RGVzY2VuZGFudEl0 ZXJhdG9yLmgiCiAjaW5jbHVkZSAiVGFibGVGb3JtYXR0aW5nU3RhdGUuaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewpAQCAtODQsNiArODUsMjEgQEAgRm9ybWF0dGluZ0NvbnRleHQ6OkludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmkKICAg ICByZXR1cm4gaW50cmluc2ljV2lkdGhDb25zdHJhaW50czsKIH0KIAorCitJbmxpbmVMYXlvdXRV bml0IFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojp1c2VkQmFzZWxpbmVGb3JDZWxs KGNvbnN0IENvbnRhaW5lckJveCYgY2VsbEJveCkKK3sKKyAgICAvLyBUaGUgYmFzZWxpbmUgb2Yg YSBjZWxsIGlzIGRlZmluZWQgYXMgdGhlIGJhc2VsaW5lIG9mIHRoZSBmaXJzdCBpbi1mbG93IGxp bmUgYm94IGluIHRoZSBjZWxsLAorICAgIC8vIG9yIHRoZSBmaXJzdCBpbi1mbG93IHRhYmxlLXJv dyBpbiB0aGUgY2VsbCwgd2hpY2hldmVyIGNvbWVzIGZpcnN0LgorICAgIC8vIElmIHRoZXJlIGlz IG5vIHN1Y2ggbGluZSBib3gsIHRoZSBiYXNlbGluZSBpcyB0aGUgYm90dG9tIG9mIGNvbnRlbnQg ZWRnZSBvZiB0aGUgY2VsbCBib3guCisgICAgZm9yIChhdXRvJiBjZWxsRGVzY2VuZGFudCA6IGRl c2NlbmRhbnRzT2ZUeXBlPENvbnRhaW5lckJveD4oY2VsbEJveCkpIHsKKyAgICAgICAgaWYgKGNl bGxEZXNjZW5kYW50LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkKKyAgICAg ICAgICAgIHJldHVybiBsYXlvdXRTdGF0ZSgpLmVzdGFibGlzaGVkSW5saW5lRm9ybWF0dGluZ1N0 YXRlKGNlbGxEZXNjZW5kYW50KS5kaXNwbGF5SW5saW5lQ29udGVudCgpLT5saW5lQm94ZXNbMF0u YmFzZWxpbmVPZmZzZXQoKTsKKyAgICAgICAgaWYgKGNlbGxEZXNjZW5kYW50LmVzdGFibGlzaGVz VGFibGVGb3JtYXR0aW5nQ29udGV4dCgpKQorICAgICAgICAgICAgcmV0dXJuIGxheW91dFN0YXRl KCkuZXN0YWJsaXNoZWRUYWJsZUZvcm1hdHRpbmdTdGF0ZShjZWxsRGVzY2VuZGFudCkudGFibGVH cmlkKCkucm93cygpLmxpc3QoKVswXS5iYXNlbGluZU9mZnNldCgpOworICAgIH0KKyAgICByZXR1 cm4gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChjZWxsQm94KS5jb250ZW50Qm94 Qm90dG9tKCk7Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmgKaW5kZXggNjM0MzZlYzA2YTMzZDc3ZDMwY2QyZTk3NDc3 ZDY2ODM1MWU3ODYwOC4uOTgyMTVlMmYwMGFkYzQwOGFlZTJjOWQyZDhjOTk5ZjcwYjMxNDg5NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdy aWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlR3Jp ZC5oCkBAIC0xMTYsMTEgKzExNiwxNSBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2V0TG9naWNh bEhlaWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQpIHsgbV9sb2dpY2FsSGVpZ2h0ID0gbG9n aWNhbEhlaWdodDsgfQogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7 IHJldHVybiBtX2xvZ2ljYWxIZWlnaHQ7IH0KIAorICAgICAgICB2b2lkIHNldEJhc2VsaW5lT2Zm c2V0KElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQpIHsgbV9iYXNlbGluZU9mZnNldCA9 IGJhc2VsaW5lT2Zmc2V0OyB9CisgICAgICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmVPZmZz ZXQoKSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5lT2Zmc2V0OyB9CisKICAgICAgICAgY29uc3Qg Q29udGFpbmVyQm94JiBib3goKSBjb25zdCB7IHJldHVybiAqbV9sYXlvdXRCb3guZ2V0KCk7IH0K IAogICAgIHByaXZhdGU6CiAgICAgICAgIExheW91dFVuaXQgbV9sb2dpY2FsVG9wOwogICAgICAg ICBMYXlvdXRVbml0IG1fbG9naWNhbEhlaWdodDsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBt X2Jhc2VsaW5lT2Zmc2V0OwogICAgICAgICBXZWFrUHRyPGNvbnN0IENvbnRhaW5lckJveD4gbV9s YXlvdXRCb3g7CiAgICAgfTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDEwNjZjOTk2MTE0OWY4ZDZjZTUyOWY2MTFkM2I2 N2NhNzA3OTBhZTkuLmFiOTIwMWZjMmQxMzVmY2VjMDIxYTgwZjg3N2MyNDk3YjQwMWJjY2EgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNC0yNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgorCisgICAgICAgIFtMRkNdW1RGQ10gVGFrZSBmaXJzdCBpbi1mbG93IHRhYmxlLXJv dyBiYXNlbGluZSBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgY2VsbCBiYXNlbGluZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwOTcyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91 dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLWJhc2ljLXJvdy1iYXNlbGluZS13aXRoLW5lc3RlZC10 YWJsZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvdGFibGUtYmFzaWMtcm93LWJhc2VsaW5lLXdpdGgtbmVzdGVkLXRhYmxlLmh0bWw6 IEFkZGVkLgorCiAyMDIwLTA0LTIzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3VwcG9ydCBmb3IgYmFzaWMgYmFzZWxpbmUgYWxpZ24g aW5zaWRlIGEgdGFibGUgcm93CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZv cm1hdHRpbmdjb250ZXh0L3RhYmxlLWJhc2ljLXJvdy1iYXNlbGluZS13aXRoLW5lc3RlZC10YWJs ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L3RhYmxlLWJhc2ljLXJvdy1iYXNlbGluZS13aXRoLW5lc3RlZC10YWJsZS1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uOThhMjg2ZGQyZjUyNzk3YTcyODE5Mzk2Yzk3MTExN2JjYzEzNDMyMwotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQv dGFibGUtYmFzaWMtcm93LWJhc2VsaW5lLXdpdGgtbmVzdGVkLXRhYmxlLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDI1IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmll dyBhdCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDc5CisgIFJl bmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg3OQorICAgIFJlbmRlckJvZHkge0JP RFl9IGF0ICg4LDgpIHNpemUgNzg0eDYzCisgICAgICBSZW5kZXJUYWJsZSB7VEFCTEV9IGF0ICgw LDApIHNpemUgMjl4NjMKKyAgICAgICAgUmVuZGVyVGFibGVTZWN0aW9uIHtUQk9EWX0gYXQgKDAs MCkgc2l6ZSAyOXg2MworICAgICAgICAgIFJlbmRlclRhYmxlUm93IHtUUn0gYXQgKDAsMikgc2l6 ZSAyOXgzNAorICAgICAgICAgICAgUmVuZGVyVGFibGVDZWxsIHtURH0gYXQgKDIsMikgc2l6ZSAx NXgzNCBbcj0wIGM9MCBycz0xIGNzPTFdCisgICAgICAgICAgICAgIFJlbmRlclRhYmxlIHtUQUJM RX0gYXQgKDEsMSkgc2l6ZSAxMXgxOQorICAgICAgICAgICAgICAgIFJlbmRlclRhYmxlU2VjdGlv biB7VEJPRFl9IGF0ICgwLDApIHNpemUgMTF4MTkKKyAgICAgICAgICAgICAgICAgIFJlbmRlclRh YmxlUm93IHtUUn0gYXQgKDAsMikgc2l6ZSAxMXgxNQorICAgICAgICAgICAgICAgICAgICBSZW5k ZXJUYWJsZUNlbGwge1REfSBhdCAoMiwyKSBzaXplIDd4MTUgW3I9MCBjPTAgcnM9MSBjcz0xXQor ICAgICAgICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMSwxKSBzaXplIDV4 MTMKKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDEpIHdpZHRoIDU6ICIj IgorICAgICAgICAgICAgICBSZW5kZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMSwyMCkgc2l6ZSAx M3gxMworICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwwKSBzaXplIDV4 MTMKKyAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDU6ICIjIgorICAg ICAgICAgICAgUmVuZGVyVGFibGVDZWxsIHtURH0gYXQgKDE4LDExKSBzaXplIDEweDE2IFtyPTAg Yz0xIHJzPTEgY3M9MV0KKyAgICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxLDEp IHNpemUgNXgxNAorICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgxLDIpIHdpZHRoIDU6ICIj IgorICAgICAgICAgIFJlbmRlclRhYmxlUm93IHtUUn0gYXQgKDAsMzgpIHNpemUgMjl4MjMKKyAg ICAgICAgICAgIFJlbmRlclRhYmxlQ2VsbCB7VER9IGF0ICgyLDM4KSBzaXplIDI2eDIzIFtyPTEg Yz0wIHJzPTEgY3M9Ml0KKyAgICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICg1LDUp IHNpemUgMTV4MTMKKyAgICAgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoNSw1KSB3aWR0aCAxNTog IiMjIyIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRl eHQvdGFibGUtYmFzaWMtcm93LWJhc2VsaW5lLXdpdGgtbmVzdGVkLXRhYmxlLmh0bWwgYi9MYXlv dXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLWJhc2ljLXJvdy1iYXNl bGluZS13aXRoLW5lc3RlZC10YWJsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk4NDgyYTczYjdiZWMyMjk0 Y2IxMWIzNmY0OGUzMzE3NmRiYThkMDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L3RhYmxlLWJhc2ljLXJvdy1iYXNlbGluZS13aXRo LW5lc3RlZC10YWJsZS5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0t IHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5h YmxlZD10cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFi bGVkPWZhbHNlIF0gLS0+Cis8c3R5bGU+Cit0YWJsZSB7CisgICAgZm9udC1zaXplOiAxMHB4Owor fQorPC9zdHlsZT4KKzx0YWJsZT4KKzx0cj48dGQ+PHRhYmxlPjx0cj48dGQ+IzwvdGQ+PC90cj48 L3RhYmxlPiM8L3RkPjx0ZD4jPC90ZD48L3RyPgorPHRyPjx0ZCBjb2xzcGFuPTIgc3R5bGU9InBh ZGRpbmc6IDVweCI+IyMjPC90ZD48L3RyPgorPC90YWJsZT4K