191837 2018-11-19 08:14:45 -0800 [LFC][IFC] InlineRunProvider::append() should just take const InlineItem&. 2018-11-20 07:49:40 -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 1480233 0 zalan 2018-11-19 08:14:45 -0800 Instead of const Box& and create the inline item. 1480234 1 355281 zalan 2018-11-19 08:23:57 -0800 Created attachment 355281 Patch 1480238 2 355282 zalan 2018-11-19 08:28:46 -0800 Created attachment 355282 Patch 1480492 3 zalan 2018-11-20 07:48:21 -0800 Committed r238399: <https://trac.webkit.org/changeset/238399> 1480493 4 webkit-bug-importer 2018-11-20 07:49:40 -0800 <rdar://problem/46186418> 355281 2018-11-19 08:23:57 -0800 2018-11-19 08:28:45 -0800 Patch bug-191837-20181119082356.patch text/plain 6218 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM0Yzc1Yzc1Y2JiZDcx ZmQ0ZWJhNjY1YjZmYjE0ODgyMTljY2Y2Yi4uOTBkYzBmZmJkNTlkODE2MzRhZGQ3N2FjNWU4MWM0 YzE0MzkzNDQyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTExLTE5ICBaYWxh biBCdWpqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gSW5saW5l UnVuUHJvdmlkZXI6OmFwcGVuZCgpIHNob3VsZCBqdXN0IHRha2UgY29uc3QgSW5saW5lSXRlbSYu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE4MzcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFs bG93cyB1cyB0byByZW1vdmUgdGhlIElubGluZUZvcm1hdHRpbmdTdGF0ZSBkZXBlbmRlbmN5IGFz IHdlbGwuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRp bmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudEZvclN1YnRyZWUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZVJ1blByb3ZpZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l UnVuUHJvdmlkZXI6OklubGluZVJ1blByb3ZpZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lUnVuUHJvdmlkZXI6OmFwcGVuZCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lUnVuUHJvdmlkZXIuaDoKKwogMjAxOC0xMS0xOCAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgSGFyZkJ1enpGYWNlOjpDYWNoZUVu dHJ5IHNob3VsZCB1c2UgMzItYml0IHZhbHVlcyBpbiBpdHMgSGFzaE1hcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDYwZGZhNTJhNDM5YzllOWMzZjA3ZDc3M2ViNTBk ZGYxMzRkZTIyZmEuLmJjMjA2NjczMmFiOTY3YjJkNGM3Y2UyZjgzMWU0ZjcxNzk4OGNjNGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQ1MiwxNSArNDUyLDIxIEBA IHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxpbmVDb250ZW50Rm9yU3Vi dHJlZShjb25zdCBCb3gmIHJvb3QsIEluCiAgICAgLy8gQ29sbGVjdCBpbmxpbmUgY29udGVudCBy ZWN1cnNpdmVseSBhbmQgc2V0IGJyZWFraW5nIHJ1bGVzIGZvciB0aGUgaW5saW5lIGVsZW1lbnRz IChmb3IgcGFkZGluZ3MsIG1hcmdpbnMsIHBvc2l0aW9uZWQgZWxlbWVudCBldGMpLgogICAgIGF1 dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmlubGluZUZvcm1hdHRpbmdTdGF0ZSgp OwogCisgICAgYXV0byBjcmVhdGVBbmRBcHBlbmRJbmxpbmVJdGVtID0gWyZdIHsKKyAgICAgICAg YXV0byBpbmxpbmVJdGVtID0gc3RkOjptYWtlX3VuaXF1ZTxJbmxpbmVJdGVtPihyb290KTsKKyAg ICAgICAgaW5saW5lUnVuUHJvdmlkZXIuYXBwZW5kKCppbmxpbmVJdGVtKTsKKyAgICAgICAgaW5s aW5lRm9ybWF0dGluZ1N0YXRlLmlubGluZUNvbnRlbnQoKS5hZGQoV1RGTW92ZShpbmxpbmVJdGVt KSk7CisgICAgfTsKKwogICAgIGlmIChyb290LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KSAmJiAmcm9vdCAhPSAmKHRoaXMtPnJvb3QoKSkpIHsKKyAgICAgICAgY3JlYXRlQW5kQXBwZW5k SW5saW5lSXRlbSgpOwogICAgICAgICAvLyBTa2lwIGZvcm1hdHRpbmcgcm9vdCBzdWJ0cmVlLiBU aGV5IGFyZSBub3QgcGFydCBvZiB0aGlzIGlubGluZSBmb3JtYXR0aW5nIGNvbnRleHQuCi0gICAg ICAgIGlubGluZVJ1blByb3ZpZGVyLmFwcGVuZChyb290KTsKICAgICAgICAgaW5saW5lRm9ybWF0 dGluZ1N0YXRlLnNldERldGFjaGluZ1J1bGVzKHJvb3QsIHsgSW5saW5lRm9ybWF0dGluZ1N0YXRl OjpEZXRhY2hpbmdSdWxlOjpCcmVha0F0U3RhcnQsIElubGluZUZvcm1hdHRpbmdTdGF0ZTo6RGV0 YWNoaW5nUnVsZTo6QnJlYWtBdEVuZCB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAg IGlmICghaXM8Q29udGFpbmVyPihyb290KSkgewotICAgICAgICBpbmxpbmVSdW5Qcm92aWRlci5h cHBlbmQocm9vdCk7CisgICAgICAgIGNyZWF0ZUFuZEFwcGVuZElubGluZUl0ZW0oKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTE3LDcgKzUyMyw3IEBAIEZvcm1hdHRpbmdDb250ZXh0 OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5z dHJpbnNpCiAgICAgICAgIHJldHVybiAqaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHM7CiAKICAg ICBhdXRvJiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5pbmxpbmVGb3JtYXR0aW5nU3Rh dGUoKTsKLSAgICBJbmxpbmVSdW5Qcm92aWRlciBpbmxpbmVSdW5Qcm92aWRlcihpbmxpbmVGb3Jt YXR0aW5nU3RhdGUpOworICAgIElubGluZVJ1blByb3ZpZGVyIGlubGluZVJ1blByb3ZpZGVyOwog ICAgIGNvbGxlY3RJbmxpbmVDb250ZW50KGlubGluZVJ1blByb3ZpZGVyKTsKIAogICAgIC8vIENv bXB1dGUgd2lkdGggZm9yIG5vbi10ZXh0IGNvbnRlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW5Qcm92aWRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW5Qcm92aWRlci5jcHAK aW5kZXggOWFiYjNjZmYyN2E2MzY2NTQ2MDcwNmIwMjAyNTNlZmVjNDljYjVlZi4uNmNlYTIyYzQ5 ODYwMjcyMTBlZDUwNjk3Y2NiYjRhZjQxZjhkOTM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lUnVuUHJvdmlkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1blByb3ZpZGVyLmNw cApAQCAtMzcsMzQgKzM3LDI5IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09f QUxMT0NBVEVEX0lNUEwoSW5saW5lUnVuUHJvdmlkZXIpOwogCi1JbmxpbmVSdW5Qcm92aWRlcjo6 SW5saW5lUnVuUHJvdmlkZXIoSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBpbmxpbmVGb3JtYXR0aW5n U3RhdGUpCi0gICAgOiBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZShpbmxpbmVGb3JtYXR0aW5nU3Rh dGUpCitJbmxpbmVSdW5Qcm92aWRlcjo6SW5saW5lUnVuUHJvdmlkZXIoKQogewogfQogCi12b2lk IElubGluZVJ1blByb3ZpZGVyOjphcHBlbmQoY29uc3QgQm94JiBsYXlvdXRCb3gpCit2b2lkIElu bGluZVJ1blByb3ZpZGVyOjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKIHsK LSAgICBhdXRvIGlubGluZUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVlPElubGluZUl0ZW0+KGxheW91 dEJveCk7Ci0KLSAgICAvLyBTcGVjaWFsIGNhc2UgdGV4dCBpdGVtLiBUZXh0cyBjYW4gb3Zlcmxh cCBtdWx0aXBsZSBpdGVtcy4gPHNwYW4+Zm9vPC9zcGFuPjxzcGFuPmJhcjwvc3Bhbj4KLSAgICBz d2l0Y2ggKGlubGluZUl0ZW0tPnR5cGUoKSkgeworICAgIHN3aXRjaCAoaW5saW5lSXRlbS50eXBl KCkpIHsKICAgICBjYXNlIElubGluZUl0ZW06OlR5cGU6OlRleHQ6Ci0gICAgICAgIHByb2Nlc3NJ bmxpbmVUZXh0SXRlbSgqaW5saW5lSXRlbSk7CisgICAgICAgIC8vIFNwZWNpYWwgY2FzZSB0ZXh0 IGNvbnRlbnQuIFRoZXkgY2FuIG92ZXJsYXAgbXVsdGlwbGUgaXRlbXMuIDxzcGFuPmZvbzwvc3Bh bj48c3Bhbj5iYXI8L3NwYW4+CisgICAgICAgIHByb2Nlc3NJbmxpbmVUZXh0SXRlbShpbmxpbmVJ dGVtKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpIYXJkTGlu ZUJyZWFrOgotICAgICAgICBtX2lubGluZVJ1bnMuYXBwZW5kKElubGluZVJ1blByb3ZpZGVyOjpS dW46OmNyZWF0ZUhhcmRMaW5lQnJlYWtSdW4oKmlubGluZUl0ZW0pKTsKKyAgICAgICAgbV9pbmxp bmVSdW5zLmFwcGVuZChJbmxpbmVSdW5Qcm92aWRlcjo6UnVuOjpjcmVhdGVIYXJkTGluZUJyZWFr UnVuKGlubGluZUl0ZW0pKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJbmxpbmVJdGVtOjpU eXBlOjpJbmxpbmVCb3g6Ci0gICAgICAgIG1faW5saW5lUnVucy5hcHBlbmQoSW5saW5lUnVuUHJv dmlkZXI6OlJ1bjo6Y3JlYXRlQm94UnVuKCppbmxpbmVJdGVtKSk7CisgICAgICAgIG1faW5saW5l UnVucy5hcHBlbmQoSW5saW5lUnVuUHJvdmlkZXI6OlJ1bjo6Y3JlYXRlQm94UnVuKGlubGluZUl0 ZW0pKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpGbG9hdDoK LSAgICAgICAgbV9pbmxpbmVSdW5zLmFwcGVuZChJbmxpbmVSdW5Qcm92aWRlcjo6UnVuOjpjcmVh dGVGbG9hdFJ1bigqaW5saW5lSXRlbSkpOworICAgICAgICBtX2lubGluZVJ1bnMuYXBwZW5kKElu bGluZVJ1blByb3ZpZGVyOjpSdW46OmNyZWF0ZUZsb2F0UnVuKGlubGluZUl0ZW0pKTsKICAgICAg ICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9Z RVQoKTsKICAgICB9Ci0KLSAgICBtX2lubGluZUZvcm1hdHRpbmdTdGF0ZS5pbmxpbmVDb250ZW50 KCkuYWRkKFdURk1vdmUoaW5saW5lSXRlbSkpOwogfQogCiB2b2lkIElubGluZVJ1blByb3ZpZGVy OjppbnNlcnRCZWZvcmUoY29uc3QgQm94JiwgY29uc3QgQm94JikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1blByb3ZpZGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW5Qcm92aWRlci5o CmluZGV4IDI4MzQxZTEzYTE2Zjg0N2ZlNzFiNjFjMWYzZTQ1NmJmZjZmNjI0N2EuLjRjZGZlMzNj ZGE4NmMxOGNhMDA1NTk0Zjc4OWQ3YTA2ZjFhNTU0ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1blByb3ZpZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lUnVuUHJvdmlkZXIuaApA QCAtMzQsMTYgKzM0LDE0IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0 IHsKIAotY2xhc3MgSW5saW5lRm9ybWF0dGluZ1N0YXRlOwotCiB1c2luZyBJdGVtUG9zaXRpb24g PSB1bnNpZ25lZDsKIAogY2xhc3MgSW5saW5lUnVuUHJvdmlkZXIgewogICAgIFdURl9NQUtFX0lT T19BTExPQ0FURUQoSW5saW5lUnVuUHJvdmlkZXIpOwogcHVibGljOgotICAgIElubGluZVJ1blBy b3ZpZGVyKElubGluZUZvcm1hdHRpbmdTdGF0ZSYpOworICAgIElubGluZVJ1blByb3ZpZGVyKCk7 CiAKLSAgICB2b2lkIGFwcGVuZChjb25zdCBCb3gmKTsKKyAgICB2b2lkIGFwcGVuZChjb25zdCBJ bmxpbmVJdGVtJik7CiAgICAgdm9pZCBpbnNlcnRCZWZvcmUoY29uc3QgQm94JiwgY29uc3QgQm94 JiBiZWZvcmUpOwogICAgIHZvaWQgcmVtb3ZlKGNvbnN0IEJveCYpOwogCkBAIC0xMTcsNyArMTE1 LDYgQEAgcHJpdmF0ZToKIAogICAgIExhenlMaW5lQnJlYWtJdGVyYXRvciBtX2xpbmVCcmVha0l0 ZXJhdG9yOwogCi0gICAgSW5saW5lRm9ybWF0dGluZ1N0YXRlJiBtX2lubGluZUZvcm1hdHRpbmdT dGF0ZTsKICAgICBWZWN0b3I8SW5saW5lUnVuUHJvdmlkZXI6OlJ1bj4gbV9pbmxpbmVSdW5zOwog fTsKIAo= 355282 2018-11-19 08:28:46 -0800 2018-11-20 07:01:03 -0800 Patch bug-191837-20181119082845.patch text/plain 6682 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM0Yzc1Yzc1Y2JiZDcx ZmQ0ZWJhNjY1YjZmYjE0ODgyMTljY2Y2Yi4uOTBkYzBmZmJkNTlkODE2MzRhZGQ3N2FjNWU4MWM0 YzE0MzkzNDQyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTExLTE5ICBaYWxh biBCdWpqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gSW5saW5l UnVuUHJvdmlkZXI6OmFwcGVuZCgpIHNob3VsZCBqdXN0IHRha2UgY29uc3QgSW5saW5lSXRlbSYu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE4MzcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGFs bG93cyB1cyB0byByZW1vdmUgdGhlIElubGluZUZvcm1hdHRpbmdTdGF0ZSBkZXBlbmRlbmN5IGFz IHdlbGwuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRp bmdDb250ZXh0Ojpjb2xsZWN0SW5saW5lQ29udGVudEZvclN1YnRyZWUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZVJ1blByb3ZpZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l UnVuUHJvdmlkZXI6OklubGluZVJ1blByb3ZpZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lUnVuUHJvdmlkZXI6OmFwcGVuZCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lUnVuUHJvdmlkZXIuaDoKKwogMjAxOC0xMS0xOCAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgSGFyZkJ1enpGYWNlOjpDYWNoZUVu dHJ5IHNob3VsZCB1c2UgMzItYml0IHZhbHVlcyBpbiBpdHMgSGFzaE1hcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDYwZGZhNTJhNDM5YzllOWMzZjA3ZDc3M2ViNTBk ZGYxMzRkZTIyZmEuLjVkYTQ4YjZlZTNjZjVjNTFmYzBmM2QwOGU2Y2ZkMGJlYjNjYjAzMTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTU4LDcgKzU4LDcgQEAgdm9p ZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KCkgY29uc3QKIAogICAgIExPR19XSVRI X1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbU3RhcnRdIC0+IGlu bGluZSBmb3JtYXR0aW5nIGNvbnRleHQgLT4gZm9ybWF0dGluZyByb290KCIgPDwgJnJvb3QoKSA8 PCAiKSIpOwogCi0gICAgSW5saW5lUnVuUHJvdmlkZXIgaW5saW5lUnVuUHJvdmlkZXIoaW5saW5l Rm9ybWF0dGluZ1N0YXRlKCkpOworICAgIElubGluZVJ1blByb3ZpZGVyIGlubGluZVJ1blByb3Zp ZGVyOwogICAgIGNvbGxlY3RJbmxpbmVDb250ZW50KGlubGluZVJ1blByb3ZpZGVyKTsKICAgICAv LyBDb21wdXRlIHdpZHRoL2hlaWdodCBmb3Igbm9uLXRleHQgY29udGVudC4KICAgICBmb3IgKGF1 dG8mIGlubGluZVJ1biA6IGlubGluZVJ1blByb3ZpZGVyLnJ1bnMoKSkgewpAQCAtNDUyLDE1ICs0 NTIsMjEgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29sbGVjdElubGluZUNvbnRl bnRGb3JTdWJ0cmVlKGNvbnN0IEJveCYgcm9vdCwgSW4KICAgICAvLyBDb2xsZWN0IGlubGluZSBj b250ZW50IHJlY3Vyc2l2ZWx5IGFuZCBzZXQgYnJlYWtpbmcgcnVsZXMgZm9yIHRoZSBpbmxpbmUg ZWxlbWVudHMgKGZvciBwYWRkaW5ncywgbWFyZ2lucywgcG9zaXRpb25lZCBlbGVtZW50IGV0Yyku CiAgICAgYXV0byYgaW5saW5lRm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+aW5saW5lRm9ybWF0dGlu Z1N0YXRlKCk7CiAKKyAgICBhdXRvIGNyZWF0ZUFuZEFwcGVuZElubGluZUl0ZW0gPSBbJl0gewor ICAgICAgICBhdXRvIGlubGluZUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVlPElubGluZUl0ZW0+KHJv b3QpOworICAgICAgICBpbmxpbmVSdW5Qcm92aWRlci5hcHBlbmQoKmlubGluZUl0ZW0pOworICAg ICAgICBpbmxpbmVGb3JtYXR0aW5nU3RhdGUuaW5saW5lQ29udGVudCgpLmFkZChXVEZNb3ZlKGlu bGluZUl0ZW0pKTsKKyAgICB9OworCiAgICAgaWYgKHJvb3QuZXN0YWJsaXNoZXNGb3JtYXR0aW5n Q29udGV4dCgpICYmICZyb290ICE9ICYodGhpcy0+cm9vdCgpKSkgeworICAgICAgICBjcmVhdGVB bmRBcHBlbmRJbmxpbmVJdGVtKCk7CiAgICAgICAgIC8vIFNraXAgZm9ybWF0dGluZyByb290IHN1 YnRyZWUuIFRoZXkgYXJlIG5vdCBwYXJ0IG9mIHRoaXMgaW5saW5lIGZvcm1hdHRpbmcgY29udGV4 dC4KLSAgICAgICAgaW5saW5lUnVuUHJvdmlkZXIuYXBwZW5kKHJvb3QpOwogICAgICAgICBpbmxp bmVGb3JtYXR0aW5nU3RhdGUuc2V0RGV0YWNoaW5nUnVsZXMocm9vdCwgeyBJbmxpbmVGb3JtYXR0 aW5nU3RhdGU6OkRldGFjaGluZ1J1bGU6OkJyZWFrQXRTdGFydCwgSW5saW5lRm9ybWF0dGluZ1N0 YXRlOjpEZXRhY2hpbmdSdWxlOjpCcmVha0F0RW5kIH0pOwogICAgICAgICByZXR1cm47CiAgICAg fQogCiAgICAgaWYgKCFpczxDb250YWluZXI+KHJvb3QpKSB7Ci0gICAgICAgIGlubGluZVJ1blBy b3ZpZGVyLmFwcGVuZChyb290KTsKKyAgICAgICAgY3JlYXRlQW5kQXBwZW5kSW5saW5lSXRlbSgp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC01MTcsNyArNTIzLDcgQEAgRm9ybWF0dGlu Z0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250 ZXh0OjppbnN0cmluc2kKICAgICAgICAgcmV0dXJuICppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50 czsKIAogICAgIGF1dG8mIGlubGluZUZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmlubGluZUZvcm1h dHRpbmdTdGF0ZSgpOwotICAgIElubGluZVJ1blByb3ZpZGVyIGlubGluZVJ1blByb3ZpZGVyKGlu bGluZUZvcm1hdHRpbmdTdGF0ZSk7CisgICAgSW5saW5lUnVuUHJvdmlkZXIgaW5saW5lUnVuUHJv dmlkZXI7CiAgICAgY29sbGVjdElubGluZUNvbnRlbnQoaW5saW5lUnVuUHJvdmlkZXIpOwogCiAg ICAgLy8gQ29tcHV0ZSB3aWR0aCBmb3Igbm9uLXRleHQgY29udGVudC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1blByb3ZpZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1blByb3Zp ZGVyLmNwcAppbmRleCA5YWJiM2NmZjI3YTYzNjY1NDYwNzA2YjAyMDI1M2VmZWM0OWNiNWVmLi42 Y2VhMjJjNDk4NjAyNzIxMGVkNTA2OTdjY2JiNGFmNDFmOGQ5MzlmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW5Qcm92aWRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lUnVuUHJv dmlkZXIuY3BwCkBAIC0zNywzNCArMzcsMjkgQEAgbmFtZXNwYWNlIExheW91dCB7CiAKIFdURl9N QUtFX0lTT19BTExPQ0FURURfSU1QTChJbmxpbmVSdW5Qcm92aWRlcik7CiAKLUlubGluZVJ1blBy b3ZpZGVyOjpJbmxpbmVSdW5Qcm92aWRlcihJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGluZUZv cm1hdHRpbmdTdGF0ZSkKLSAgICA6IG1faW5saW5lRm9ybWF0dGluZ1N0YXRlKGlubGluZUZvcm1h dHRpbmdTdGF0ZSkKK0lubGluZVJ1blByb3ZpZGVyOjpJbmxpbmVSdW5Qcm92aWRlcigpCiB7CiB9 CiAKLXZvaWQgSW5saW5lUnVuUHJvdmlkZXI6OmFwcGVuZChjb25zdCBCb3gmIGxheW91dEJveCkK K3ZvaWQgSW5saW5lUnVuUHJvdmlkZXI6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJ dGVtKQogewotICAgIGF1dG8gaW5saW5lSXRlbSA9IHN0ZDo6bWFrZV91bmlxdWU8SW5saW5lSXRl bT4obGF5b3V0Qm94KTsKLQotICAgIC8vIFNwZWNpYWwgY2FzZSB0ZXh0IGl0ZW0uIFRleHRzIGNh biBvdmVybGFwIG11bHRpcGxlIGl0ZW1zLiA8c3Bhbj5mb288L3NwYW4+PHNwYW4+YmFyPC9zcGFu PgotICAgIHN3aXRjaCAoaW5saW5lSXRlbS0+dHlwZSgpKSB7CisgICAgc3dpdGNoIChpbmxpbmVJ dGVtLnR5cGUoKSkgewogICAgIGNhc2UgSW5saW5lSXRlbTo6VHlwZTo6VGV4dDoKLSAgICAgICAg cHJvY2Vzc0lubGluZVRleHRJdGVtKCppbmxpbmVJdGVtKTsKKyAgICAgICAgLy8gU3BlY2lhbCBj YXNlIHRleHQgY29udGVudC4gVGhleSBjYW4gb3ZlcmxhcCBtdWx0aXBsZSBpdGVtcy4gPHNwYW4+ Zm9vPC9zcGFuPjxzcGFuPmJhcjwvc3Bhbj4KKyAgICAgICAgcHJvY2Vzc0lubGluZVRleHRJdGVt KGlubGluZUl0ZW0pOwogICAgICAgICBicmVhazsKICAgICBjYXNlIElubGluZUl0ZW06OlR5cGU6 OkhhcmRMaW5lQnJlYWs6Ci0gICAgICAgIG1faW5saW5lUnVucy5hcHBlbmQoSW5saW5lUnVuUHJv dmlkZXI6OlJ1bjo6Y3JlYXRlSGFyZExpbmVCcmVha1J1bigqaW5saW5lSXRlbSkpOworICAgICAg ICBtX2lubGluZVJ1bnMuYXBwZW5kKElubGluZVJ1blByb3ZpZGVyOjpSdW46OmNyZWF0ZUhhcmRM aW5lQnJlYWtSdW4oaW5saW5lSXRlbSkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIElubGlu ZUl0ZW06OlR5cGU6OklubGluZUJveDoKLSAgICAgICAgbV9pbmxpbmVSdW5zLmFwcGVuZChJbmxp bmVSdW5Qcm92aWRlcjo6UnVuOjpjcmVhdGVCb3hSdW4oKmlubGluZUl0ZW0pKTsKKyAgICAgICAg bV9pbmxpbmVSdW5zLmFwcGVuZChJbmxpbmVSdW5Qcm92aWRlcjo6UnVuOjpjcmVhdGVCb3hSdW4o aW5saW5lSXRlbSkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIElubGluZUl0ZW06OlR5cGU6 OkZsb2F0OgotICAgICAgICBtX2lubGluZVJ1bnMuYXBwZW5kKElubGluZVJ1blByb3ZpZGVyOjpS dW46OmNyZWF0ZUZsb2F0UnVuKCppbmxpbmVJdGVtKSk7CisgICAgICAgIG1faW5saW5lUnVucy5h cHBlbmQoSW5saW5lUnVuUHJvdmlkZXI6OlJ1bjo6Y3JlYXRlRmxvYXRSdW4oaW5saW5lSXRlbSkp OwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX0lNUExF TUVOVEVEX1lFVCgpOwogICAgIH0KLQotICAgIG1faW5saW5lRm9ybWF0dGluZ1N0YXRlLmlubGlu ZUNvbnRlbnQoKS5hZGQoV1RGTW92ZShpbmxpbmVJdGVtKSk7CiB9CiAKIHZvaWQgSW5saW5lUnVu UHJvdmlkZXI6Omluc2VydEJlZm9yZShjb25zdCBCb3gmLCBjb25zdCBCb3gmKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lUnVuUHJvdmlk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVJ1blBy b3ZpZGVyLmgKaW5kZXggMjgzNDFlMTNhMTZmODQ3ZmU3MWI2MWMxZjNlNDU2YmZmNmY2MjQ3YS4u NGNkZmUzM2NkYTg2YzE4Y2EwMDU1OTRmNzg5ZDdhMDZmMWE1NTQ4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lUnVuUHJvdmlkZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW5Qcm92 aWRlci5oCkBAIC0zNCwxNiArMzQsMTQgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFj ZSBMYXlvdXQgewogCi1jbGFzcyBJbmxpbmVGb3JtYXR0aW5nU3RhdGU7Ci0KIHVzaW5nIEl0ZW1Q b3NpdGlvbiA9IHVuc2lnbmVkOwogCiBjbGFzcyBJbmxpbmVSdW5Qcm92aWRlciB7CiAgICAgV1RG X01BS0VfSVNPX0FMTE9DQVRFRChJbmxpbmVSdW5Qcm92aWRlcik7CiBwdWJsaWM6Ci0gICAgSW5s aW5lUnVuUHJvdmlkZXIoSW5saW5lRm9ybWF0dGluZ1N0YXRlJik7CisgICAgSW5saW5lUnVuUHJv dmlkZXIoKTsKIAotICAgIHZvaWQgYXBwZW5kKGNvbnN0IEJveCYpOworICAgIHZvaWQgYXBwZW5k KGNvbnN0IElubGluZUl0ZW0mKTsKICAgICB2b2lkIGluc2VydEJlZm9yZShjb25zdCBCb3gmLCBj b25zdCBCb3gmIGJlZm9yZSk7CiAgICAgdm9pZCByZW1vdmUoY29uc3QgQm94Jik7CiAKQEAgLTEx Nyw3ICsxMTUsNiBAQCBwcml2YXRlOgogCiAgICAgTGF6eUxpbmVCcmVha0l0ZXJhdG9yIG1fbGlu ZUJyZWFrSXRlcmF0b3I7CiAKLSAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIG1faW5saW5lRm9y bWF0dGluZ1N0YXRlOwogICAgIFZlY3RvcjxJbmxpbmVSdW5Qcm92aWRlcjo6UnVuPiBtX2lubGlu ZVJ1bnM7CiB9OwogCg==