185672 2018-05-15 21:49:14 -0700 [LFC] Implement width computation for replaced inflow elements. 2018-05-16 07:52:36 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1424240 0 zalan 2018-05-15 21:49:14 -0700 Width for block float and inline elements compute the same way. 1424241 1 340468 zalan 2018-05-15 21:55:15 -0700 Created attachment 340468 Patch 1424324 2 340468 commit-queue 2018-05-16 07:51:45 -0700 Comment on attachment 340468 Patch Clearing flags on attachment: 340468 Committed r231847: <https://trac.webkit.org/changeset/231847> 1424325 3 commit-queue 2018-05-16 07:51:46 -0700 All reviewed patches have been landed. Closing bug. 1424326 4 webkit-bug-importer 2018-05-16 07:52:36 -0700 <rdar://problem/40293650> 340468 2018-05-15 21:55:15 -0700 2018-05-16 07:51:45 -0700 Patch bug-185672-20180515215515.patch text/plain 10566 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNzk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQyMTA4OGFkMjQ1MTEz MmExNDFhYWQ2YWNhODE3N2VjZDBhOTJjMy4uZWMwY2U3ZGY2MDFlMDRlZTI0ZjdiNzQ0YjBiY2Y0 MTNlMzY3ZmM1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTA1LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHdp ZHRoIGNvbXB1dGF0aW9uIGZvciByZXBsYWNlZCBpbmZsb3cgZWxlbWVudHMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODU2NzIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlZCB3aWR0aCBmb3Ig YmxvY2ssIGlubGluZSBhbmQgZmxvYXQgZWxlbWVudHMgY29tcHV0ZSB0aGUgc2FtZSB3YXkuIAor CisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVXaWR0aCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRmxvYXRpbmdX aWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdXRlSW5GbG93UmVwbGFjZWRXaWR0aCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L0Zv cm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1dpZHRoIGNvbnN0KToKKyAgICAgICAgKiBs YXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpCb3g6Omhhc0ludHJpbnNpY1dpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94OjpoYXNJbnRyaW5zaWNIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCb3g6Omhhc0ludHJpbnNpY1JhdGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Qm94OjppbnRyaW5zaWNXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJveDo6aW50cmluc2ljSGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Qm94OjppbnRyaW5zaWNSYXRpbyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRy ZWUvTGF5b3V0Qm94Lmg6CisKIDIwMTgtMDUtMTUgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0 Lm9yZz4KIAogICAgICAgICBBZGQgbmV3IFNWR0RPTSBTVkdGRUJMRU5EIGNvbnN0YW50cwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMDk0OTU5ODIz ZjFhOGZhMWU5YjY0Njk0Y2VhMDk2YjE4MGRiMDc5YS4uOGRmOWRmZjQzNTIyNTgyNTk4M2NkOTA2 MjM5YTU2ZGI2MTgxZmQxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuY3BwCkBAIC02NSw3ICs2NSw3IEBAIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVXaWR0aChMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxhCiAgICAg aWYgKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKICAgICAgICAgcmV0dXJuIGNv bXB1dGVPdXRPZkZsb3dXaWR0aChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gp OwogICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgcmV0 dXJuIGNvbXB1dGVGbG9hdGluZ1dpZHRoKGxheW91dEJveCwgZGlzcGxheUJveCk7CisgICAgICAg IHJldHVybiBjb21wdXRlRmxvYXRpbmdXaWR0aChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRp c3BsYXlCb3gpOwogICAgIHJldHVybiBjb21wdXRlSW5GbG93V2lkdGgobGF5b3V0Q29udGV4dCwg bGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKIH0KIApAQCAtODcsOCArODcsMTMgQEAgdm9pZCBGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1dpZHRoKExheW91dENvbnRleHQmIGxheW91 dENvbnRleHQsIGNvbnMKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZUZsb2F0aW5nV2lkdGgoY29uc3QgQm94JiwgRGlzcGxheTo6 Qm94JikgY29uc3QKK3ZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVGbG9hdGluZ1dpZHRo KExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNw bGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0CiB7CisgICAgaWYgKCFsYXlvdXRCb3guaXNSZXBs YWNlZCgpKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47 CisgICAgfQorICAgIGNvbXB1dGVJbkZsb3dSZXBsYWNlZFdpZHRoKGxheW91dENvbnRleHQsIGxh eW91dEJveCwgZGlzcGxheUJveCk7CiB9CiAKIHZvaWQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1 dGVPdXRPZkZsb3dIZWlnaHQoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94 JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKQEAgLTIwMyw2ICsy MDgsNTUgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd05vblJlcGxh Y2VkSGVpZ2h0KExheW91dENvbnRleHQmIGxheW91dEMKICAgICBkaXNwbGF5Qm94LnNldEhlaWdo dChjb21wdXRlZEhlaWdodFZhbHVlKTsKIH0KIAordm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZUluRmxvd1JlcGxhY2VkV2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBEaXNwbGF5OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0Cit7CisgICAgLy8gMTAuMy40IEJs b2NrLWxldmVsLCByZXBsYWNlZCBlbGVtZW50cyBpbiBub3JtYWwgZmxvdzogVGhlIHVzZWQgdmFs dWUgb2YgJ3dpZHRoJyBpcyBkZXRlcm1pbmVkIGFzIGZvciBpbmxpbmUgcmVwbGFjZWQgZWxlbWVu dHMKKyAgICAvLyAxMC4zLjYgRmxvYXRpbmcsIHJlcGxhY2VkIGVsZW1lbnRzOiBUaGUgdXNlZCB2 YWx1ZSBvZiAnd2lkdGgnIGlzIGRldGVybWluZWQgYXMgZm9yIGlubGluZSByZXBsYWNlZCBlbGVt ZW50cy4gICAKKworICAgIC8vIDEwLjMuMiBJbmxpbmUsIHJlcGxhY2VkIGVsZW1lbnRzCisgICAg Ly8KKyAgICAvLyAxLiBJZiAnaGVpZ2h0JyBhbmQgJ3dpZHRoJyBib3RoIGhhdmUgY29tcHV0ZWQg dmFsdWVzIG9mICdhdXRvJyBhbmQgdGhlIGVsZW1lbnQgYWxzbyBoYXMgYW4gaW50cmluc2ljIHdp ZHRoLCB0aGVuIHRoYXQgaW50cmluc2ljIHdpZHRoIGlzIHRoZSB1c2VkIHZhbHVlIG9mICd3aWR0 aCcuCisgICAgLy8KKyAgICAvLyAyLiBJZiAnaGVpZ2h0JyBhbmQgJ3dpZHRoJyBib3RoIGhhdmUg Y29tcHV0ZWQgdmFsdWVzIG9mICdhdXRvJyBhbmQgdGhlIGVsZW1lbnQgaGFzIG5vIGludHJpbnNp YyB3aWR0aCwgYnV0IGRvZXMgaGF2ZSBhbiBpbnRyaW5zaWMgaGVpZ2h0IGFuZCBpbnRyaW5zaWMg cmF0aW87IAorICAgIC8vICAgIG9yIGlmICd3aWR0aCcgaGFzIGEgY29tcHV0ZWQgdmFsdWUgb2Yg J2F1dG8nLCAnaGVpZ2h0JyBoYXMgc29tZSBvdGhlciBjb21wdXRlZCB2YWx1ZSwgYW5kIHRoZSBl bGVtZW50IGRvZXMgaGF2ZSBhbiBpbnRyaW5zaWMgcmF0aW87CisgICAgLy8gICAgdGhlbiB0aGUg dXNlZCB2YWx1ZSBvZiAnd2lkdGgnIGlzOiAodXNlZCBoZWlnaHQpICogKGludHJpbnNpYyByYXRp bykKKyAgICAvLworICAgIC8vIDMuIElmICdoZWlnaHQnIGFuZCAnd2lkdGgnIGJvdGggaGF2ZSBj b21wdXRlZCB2YWx1ZXMgb2YgJ2F1dG8nIGFuZCB0aGUgZWxlbWVudCBoYXMgYW4gaW50cmluc2lj IHJhdGlvIGJ1dCBubyBpbnRyaW5zaWMgaGVpZ2h0IG9yIHdpZHRoLAorICAgIC8vICAgIHRoZW4g dGhlIHVzZWQgdmFsdWUgb2YgJ3dpZHRoJyBpcyB1bmRlZmluZWQgaW4gQ1NTIDIuMi4gSG93ZXZl ciwgaXQgaXMgc3VnZ2VzdGVkIHRoYXQsIGlmIHRoZSBjb250YWluaW5nIGJsb2NrJ3Mgd2lkdGgg ZG9lcyBub3QgaXRzZWxmIGRlcGVuZCBvbiB0aGUgcmVwbGFjZWQgCisgICAgLy8gICAgZWxlbWVu dCdzIHdpZHRoLCB0aGVuIHRoZSB1c2VkIHZhbHVlIG9mICd3aWR0aCcgaXMgY2FsY3VsYXRlZCBm cm9tIHRoZSBjb25zdHJhaW50IGVxdWF0aW9uIHVzZWQgZm9yIGJsb2NrLWxldmVsLCBub24tcmVw bGFjZWQgZWxlbWVudHMgaW4gbm9ybWFsIGZsb3cuCisgICAgLy8KKyAgICAvLyA0LiBPdGhlcndp c2UsIGlmICd3aWR0aCcgaGFzIGEgY29tcHV0ZWQgdmFsdWUgb2YgJ2F1dG8nLCBhbmQgdGhlIGVs ZW1lbnQgaGFzIGFuIGludHJpbnNpYyB3aWR0aCwgdGhlbiB0aGF0IGludHJpbnNpYyB3aWR0aCBp cyB0aGUgdXNlZCB2YWx1ZSBvZiAnd2lkdGgnLgorICAgIC8vIAorICAgIC8vIDUuIE90aGVyd2lz ZSwgaWYgJ3dpZHRoJyBoYXMgYSBjb21wdXRlZCB2YWx1ZSBvZiAnYXV0bycsIGJ1dCBub25lIG9m IHRoZSBjb25kaXRpb25zIGFib3ZlIGFyZSBtZXQsIHRoZW4gdGhlIHVzZWQgdmFsdWUgb2YgJ3dp ZHRoJyBiZWNvbWVzIDMwMHB4LiAKKyAgICAvLyAgICBJZiAzMDBweCBpcyB0b28gd2lkZSB0byBm aXQgdGhlIGRldmljZSwgVUFzIHNob3VsZCB1c2UgdGhlIHdpZHRoIG9mIHRoZSBsYXJnZXN0IHJl Y3RhbmdsZSB0aGF0IGhhcyBhIDI6MSByYXRpbyBhbmQgZml0cyB0aGUgZGV2aWNlIGluc3RlYWQu CisgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKKyAgICBhdXRvIHdpZHRoID0g c3R5bGUubG9naWNhbFdpZHRoKCk7CisgICAgYXV0byBoZWlnaHQgPSBzdHlsZS5sb2dpY2FsSGVp Z2h0KCk7CisKKyAgICBMYXlvdXRVbml0IGNvbXB1dGVkV2lkdGhWYWx1ZTsKKworICAgIGlmICh3 aWR0aC5pc0F1dG8oKSAmJiBoZWlnaHQuaXNBdXRvKCkgJiYgbGF5b3V0Qm94Lmhhc0ludHJpbnNp Y1dpZHRoKCkpIHsKKyAgICAgICAgLy8gIzEKKyAgICAgICAgY29tcHV0ZWRXaWR0aFZhbHVlID0g bGF5b3V0Qm94LmludHJpbnNpY1dpZHRoKCk7CisgICAgfSBlbHNlIGlmICh3aWR0aC5pc0F1dG8o KSAmJiAoaGVpZ2h0LmlzQ2FsY3VsYXRlZCgpIHx8IGxheW91dEJveC5oYXNJbnRyaW5zaWNIZWln aHQoKSkgJiYgbGF5b3V0Qm94Lmhhc0ludHJpbnNpY1JhdGlvKCkpIHsKKyAgICAgICAgLy8gIzIK KyAgICAgICAgYXV0byB1c2VkSGVpZ2h0ID0gaGVpZ2h0LmlzQ2FsY3VsYXRlZCgpID8gTGF5b3V0 VW5pdChoZWlnaHQudmFsdWUoKSkgOiBsYXlvdXRCb3guaW50cmluc2ljSGVpZ2h0KCk7ICAgCisg ICAgICAgIGNvbXB1dGVkV2lkdGhWYWx1ZSA9IHVzZWRIZWlnaHQgKiBsYXlvdXRCb3guaW50cmlu c2ljUmF0aW8oKTsKKyAgICB9IGVsc2UgaWYgKHdpZHRoLmlzQXV0bygpICYmIGhlaWdodC5pc0F1 dG8oKSAmJiBsYXlvdXRCb3guaGFzSW50cmluc2ljUmF0aW8oKSkgeworICAgICAgICAvLyAjMwor ICAgICAgICAvLyBGSVhNRTogdW5kZWZpbmVkIGJ1dCBzdXJlbHkgZG9hYmxlLgorICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9IGVsc2UgaWYgKHdpZHRoLmlzQXV0bygpICYmIGxh eW91dEJveC5oYXNJbnRyaW5zaWNXaWR0aCgpKSB7CisgICAgICAgIC8vICM0CisgICAgICAgIGNv bXB1dGVkV2lkdGhWYWx1ZSA9IGxheW91dEJveC5pbnRyaW5zaWNXaWR0aCgpOworICAgIH0gZWxz ZSB7CisgICAgICAgIC8vICM1CisgICAgICAgIGNvbXB1dGVkV2lkdGhWYWx1ZSA9IDMwMDsKKyAg ICB9CisKKyAgICBkaXNwbGF5Qm94LnNldFdpZHRoKGNvbXB1dGVkV2lkdGhWYWx1ZSk7ICAgCit9 CisKIExheW91dFVuaXQgRm9ybWF0dGluZ0NvbnRleHQ6OmNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0 aW5nQ29udGV4dFJvb3QoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBs YXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5zdHlsZSgpLmxvZ2ljYWxI ZWlnaHQoKS5pc0F1dG8oKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4 dC5oCmluZGV4IDI0MjRiMWExZDEyZjZmNzhhZmQ5MzdhOTU5YWUyM2ZkNGY3MDdkNmYuLjJmYmZm NjVmMzVlM2U1OGUzYjE3YmVlODcwZmFlMzI5M2I5NzMyYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBAIC03Miw3ICs3Miw3IEBAIHByb3RlY3RlZDoKICAg ICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUhlaWdodChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jiwg RGlzcGxheTo6Qm94JikgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZU91dE9mRmxv d1dpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsK LSAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZUZsb2F0aW5nV2lkdGgoY29uc3QgQm94JiwgRGlzcGxh eTo6Qm94JikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVGbG9hdGluZ1dpZHRoKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKICAgICB2aXJ0 dWFsIHZvaWQgY29tcHV0ZUluRmxvd1dpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBE aXNwbGF5OjpCb3gmKSBjb25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZU91dE9m Rmxvd0hlaWdodChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29u c3Q7CkBAIC04Nyw2ICs4Nyw4IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHBsYWNlSW5GbG93UG9z aXRpb25lZENoaWxkcmVuKGNvbnN0IENvbnRhaW5lciYpIGNvbnN0OwogICAgIHZvaWQgbGF5b3V0 T3V0T2ZGbG93RGVzY2VuZGFudHMoTGF5b3V0Q29udGV4dCZzKSBjb25zdDsKIAorICAgIHZvaWQg Y29tcHV0ZUluRmxvd1JlcGxhY2VkV2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERp c3BsYXk6OkJveCYpIGNvbnN0OworCiBwcml2YXRlOgogICAgIHZvaWQgY29tcHV0ZU91dE9mRmxv d05vblJlcGxhY2VkSGVpZ2h0KExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpC b3gmKSBjb25zdDsKICAgICB2b2lkIGNvbXB1dGVPdXRPZkZsb3dOb25SZXBsYWNlZFdpZHRoKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDRjM2Y0MWI1YzQ5YzE3YzNjNzM1ODMxNTEzNjU1 ODBmYTE4Njk3NDUuLmU3OGI1OTJhOGExODBkMWU2NjcyYTEzMmYzMjZkM2RiZWJhNDQ5ZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTQ5LDcgKzE0OSw3IEBAIHZvaWQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1dpZHRoKExheW91dENvbnRleHQm IGxheW91dENvbnRleHQsIGNvCiAgICAgICAgIGNvbXB1dGVJbkZsb3dOb25SZXBsYWNlZFdpZHRo KGxheW91dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgY29tcHV0ZUluRmxvd1JlcGxh Y2VkV2lkdGgobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCBkaXNwbGF5Qm94KTsKIH0KIAogdm9p ZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW5GbG93Tm9uUmVwbGFjZWRXaWR0aChM YXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxh eTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dEJveC5jcHAKaW5kZXggZmUwZDVjYWVlMjhlZjVhNWY4NDVkZDk1YjA1NjFh ZjdkZmVjMTljOC4uOTQwZjkwOGE5MDNhMDhmMjM4ZjY4NTQ1NGM0OTllZTJkYTIxMzUxNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCkBAIC0y MzAsNiArMjMwLDM5IEBAIGJvb2wgQm94Ojppc092ZXJmbG93VmlzaWJsZSgpIGNvbnN0CiAgICAg cmV0dXJuIG1fc3R5bGUub3ZlcmZsb3dYKCkgPT0gT1ZJU0lCTEUgfHwgbV9zdHlsZS5vdmVyZmxv d1koKSA9PSBPVklTSUJMRTsKIH0KIAorYm9vbCBCb3g6Omhhc0ludHJpbnNpY1dpZHRoKCkgY29u c3QKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgQm94OjpoYXNJbnRyaW5zaWNIZWln aHQoKSBjb25zdAoreworICAgIHJldHVybiBmYWxzZTsKK30KKworYm9vbCBCb3g6Omhhc0ludHJp bnNpY1JhdGlvKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK0xheW91dFVuaXQg Qm94OjppbnRyaW5zaWNXaWR0aCgpIGNvbnN0Cit7CisgICAgQVNTRVJUKGhhc0ludHJpbnNpY1dp ZHRoKCkpOworICAgIHJldHVybiB7IH07Cit9CisKK0xheW91dFVuaXQgQm94OjppbnRyaW5zaWNI ZWlnaHQoKSBjb25zdAoreworICAgIEFTU0VSVChoYXNJbnRyaW5zaWNIZWlnaHQoKSk7CisgICAg cmV0dXJuIHsgfTsKK30KKworTGF5b3V0VW5pdCBCb3g6OmludHJpbnNpY1JhdGlvKCkgY29uc3QK K3sKKyAgICBBU1NFUlQoaGFzSW50cmluc2ljUmF0aW8oKSk7CisgICAgcmV0dXJuIHsgfTsKK30K KwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9M YXlvdXRCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5o CmluZGV4IDIzYWY4NDYxNDkxNzljYzA3YWQwOGU4YmU3ZTRjZTEyM2U2NzAxNjcuLjcwNDM3Yzk5 YjYzNWUzMDI0YzdlNzI2NjEzNzAxZTI1MjkyNTg0YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCkBAIC03Miw3ICs3Miw2IEBAIHB1YmxpYzoKICAg ICBib29sIGlzSW5saW5lQmxvY2tCb3goKSBjb25zdDsKICAgICBib29sIGlzQmxvY2tDb250YWlu ZXJCb3goKSBjb25zdDsKICAgICBib29sIGlzSW5pdGlhbENvbnRhaW5pbmdCbG9jaygpIGNvbnN0 OwotICAgIGJvb2wgaXNSZXBsYWNlZCgpIGNvbnN0OwogCiAgICAgY29uc3QgQ29udGFpbmVyKiBw YXJlbnQoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudDsgfQogICAgIGNvbnN0IEJveCogbmV4dFNp YmxpbmcoKSBjb25zdCB7IHJldHVybiBtX25leHRTaWJsaW5nOyB9CkBAIC05MSw2ICs5MCwxNSBA QCBwdWJsaWM6CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKCkgY29uc3QgeyByZXR1cm4g bV9zdHlsZTsgfQogICAgIGF1dG8mIHdlYWtQdHJGYWN0b3J5KCkgY29uc3QgeyByZXR1cm4gbV93 ZWFrRmFjdG9yeTsgfQogCisgICAgYm9vbCBpc1JlcGxhY2VkKCkgY29uc3Q7CisgICAgLy8gRklY TUU6IGZpbmQgb3V0IGhvdyB0byBub3QgcG9sbHV0ZSB0aGUgQm94IGludGVyZmFjZQorICAgIGJv b2wgaGFzSW50cmluc2ljV2lkdGgoKSBjb25zdDsKKyAgICBib29sIGhhc0ludHJpbnNpY0hlaWdo dCgpIGNvbnN0OworICAgIGJvb2wgaGFzSW50cmluc2ljUmF0aW8oKSBjb25zdDsKKyAgICBMYXlv dXRVbml0IGludHJpbnNpY1dpZHRoKCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBpbnRyaW5zaWNI ZWlnaHQoKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGludHJpbnNpY1JhdGlvKCkgY29uc3Q7CisK IHByb3RlY3RlZDoKICAgICBlbnVtIEJhc2VUeXBlRmxhZyB7CiAgICAgICAgIENvbnRhaW5lckZs YWcgICAgICAgICA9IDEgPDwgMCwK