186886 2018-06-21 03:25:46 -0700 [WPE][ThreadedRendering] WPE crashes rendering some pieces of text when using ThreadedRendering 2018-06-22 02:50:03 -0700 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 magomez magomez bugs-noreply calvaris commit-queue zan oldest_to_newest 1435078 0 magomez 2018-06-21 03:25:46 -0700 As an optimization, FontCascade may render some glyphs to a DisplayList and then replay that list instead of rendering again. But when replaying, the glyphs are not rendered through a GraphicsContext as we would expect, but using FontCascade directly. In the cairo case this means that FontCascade requires a cairo context to render, but if we are in the recording phase of the rendering there's no platform context and we have the crash. 1435079 1 343231 magomez 2018-06-21 03:34:51 -0700 Created attachment 343231 Patch 1435383 2 343313 magomez 2018-06-22 01:03:45 -0700 Created attachment 343313 Patch 1435389 3 343313 commit-queue 2018-06-22 02:50:01 -0700 Comment on attachment 343313 Patch Clearing flags on attachment: 343313 Committed r233075: <https://trac.webkit.org/changeset/233075> 1435390 4 commit-queue 2018-06-22 02:50:03 -0700 All reviewed patches have been landed. Closing bug. 343231 2018-06-21 03:34:51 -0700 2018-06-22 01:03:41 -0700 Patch bug-186886-20180621123450.patch text/plain 8871 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGFhNTgzYWVkMzA4ZDZm ZWRiYjU4ZmI0ODBmZmJhY2U2NDI3MzNiMS4uZTg1ZTIyOTYyYjBkNmVhMTA5OGQ0M2U3NTBjNjg1 Y2NjZTM3ZjczMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA2LTIxICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dQRV1bVGhyZWFkZWRS ZW5kZXJpbmddIFdQRSBjcmFzaGVzIHJlbmRlcmluZyBzb21lIHBpZWNlcyBvZiB0ZXh0IHdoZW4g dXNpbmcgVGhyZWFkZWRSZW5kZXJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4Njg4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1vZGlmeSBEaXNwbGF5TGlzdCBEcmF3R2x5cGhzIGVsZW1lbnQgdG8g dXNlIGEgR3JhcGhpY3NDb250ZXh0IGZvciByZXBsYXlpbmcuIFRvIGRvIHNvLCBtb2RpZnkKKyAg ICAgICAgR3JhcGhpY3NDb250ZXh0OjpkcmF3R2x5cGhzKCkgQVBJIHNvIGl0IGRvZXNuJ3QgcmVx dWlyZSBhIEZvbnRDYXNjYWRlLCBhbmQgdXBkYXRlIGFsbCB0aGUgY2FsbHMKKyAgICAgICAgdG8g aXQuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGVudCB0ZXN0cy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRD YXNjYWRlOjpkcmF3R2x5cGhCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5 TGlzdEl0ZW1zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhz OjphcHBseSBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWF0aE9wZXJhdG9yOjpwYWludEdseXBoKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1hdGhPcGVyYXRvcjo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MVG9rZW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0 aE1MVG9rZW46OnBhaW50KToKKwogMjAxOC0wNi0yMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9y aS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBBU1NFUlRJT04gRkFJTEVE OiBlbmQuaXNWYWxpZCgpIGluIFBsYXRmb3JtVGltZVJhbmdlczo6YWRkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKaW5kZXggYmZiY2I4Mzdk MWM3YTMxNGM1ZmE0MWVmNGQ3MDA3ZWMyNTNhOTk1ZS4uNzljOWFhNjI5OGYxMTU0ZWE4NTM4YmVl M2Y1OTdmOTc0M2E2Mzg1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udENhc2NhZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ZvbnRDYXNjYWRlLmNwcApAQCAtMTQzMCw3ICsxNDMwLDcgQEAgdm9pZCBGb250Q2FzY2Fk ZTo6ZHJhd0dseXBoQnVmZmVyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgR2x5cGhC dWZmZXImIGcKIAogICAgICAgICBpZiAobmV4dEZvbnREYXRhICE9IGZvbnREYXRhIHx8IG5leHRP ZmZzZXQgIT0gb2Zmc2V0KSB7CiAgICAgICAgICAgICBpZiAoc2hvdWxkRHJhd0lmTG9hZGluZygq Zm9udERhdGEsIGN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbikpCi0gICAgICAgICAgICAgICAgY29u dGV4dC5kcmF3R2x5cGhzKCp0aGlzLCAqZm9udERhdGEsIGdseXBoQnVmZmVyLCBsYXN0RnJvbSwg bmV4dEdseXBoIC0gbGFzdEZyb20sIHN0YXJ0UG9pbnQpOworICAgICAgICAgICAgICAgIGNvbnRl eHQuZHJhd0dseXBocygqZm9udERhdGEsIGdseXBoQnVmZmVyLCBsYXN0RnJvbSwgbmV4dEdseXBo IC0gbGFzdEZyb20sIHN0YXJ0UG9pbnQsIG1fZm9udERlc2NyaXB0aW9uLmZvbnRTbW9vdGhpbmco KSk7CiAKICAgICAgICAgICAgIGxhc3RGcm9tID0gbmV4dEdseXBoOwogICAgICAgICAgICAgZm9u dERhdGEgPSBuZXh0Rm9udERhdGE7CkBAIC0xNDQ0LDcgKzE0NDQsNyBAQCB2b2lkIEZvbnRDYXNj YWRlOjpkcmF3R2x5cGhCdWZmZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBHbHlw aEJ1ZmZlciYgZwogICAgIH0KIAogICAgIGlmIChzaG91bGREcmF3SWZMb2FkaW5nKCpmb250RGF0 YSwgY3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uKSkKLSAgICAgICAgY29udGV4dC5kcmF3R2x5cGhz KCp0aGlzLCAqZm9udERhdGEsIGdseXBoQnVmZmVyLCBsYXN0RnJvbSwgbmV4dEdseXBoIC0gbGFz dEZyb20sIHN0YXJ0UG9pbnQpOworICAgICAgICBjb250ZXh0LmRyYXdHbHlwaHMoKmZvbnREYXRh LCBnbHlwaEJ1ZmZlciwgbGFzdEZyb20sIG5leHRHbHlwaCAtIGxhc3RGcm9tLCBzdGFydFBvaW50 LCBtX2ZvbnREZXNjcmlwdGlvbi5mb250U21vb3RoaW5nKCkpOwogICAgIHBvaW50LnNldFgobmV4 dFgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmNwcAppbmRleCBiYzNiNjUxYzQ1NzhhNWZiMmJjNTFmMjQyNTk1NmNkYTIy YTNhNWFkLi4xZTBmMmI4YzdlMjUxYzg4YzA3YTM4Njg2YzIwYjMyYjZlYWZlZDgwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHAKQEAgLTY0MCwxNyArNjQwLDE3IEBAIGZsb2F0IEdyYXBoaWNzQ29udGV4dDo6ZHJhd1RleHQo Y29uc3QgRm9udENhc2NhZGUmIGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1biwgY29uCiAgICAgcmV0 dXJuIGZvbnQuZHJhd1RleHQoKnRoaXMsIHJ1biwgcG9pbnQsIGZyb20sIHRvKTsKIH0KIAotdm9p ZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdHbHlwaHMoY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNj YWRlLCBjb25zdCBGb250JiBmb250LCBjb25zdCBHbHlwaEJ1ZmZlciYgYnVmZmVyLCB1bnNpZ25l ZCBmcm9tLCB1bnNpZ25lZCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KQordm9p ZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdHbHlwaHMoY29uc3QgRm9udCYgZm9udCwgY29uc3QgR2x5 cGhCdWZmZXImIGJ1ZmZlciwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgbnVtR2x5cGhzLCBjb25z dCBGbG9hdFBvaW50JiBwb2ludCwgRm9udFNtb290aGluZ01vZGUgZm9udFNtb290aGluZ01vZGUp CiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg aWYgKG1faW1wbCkgewotICAgICAgICBtX2ltcGwtPmRyYXdHbHlwaHMoZm9udCwgYnVmZmVyLCBm cm9tLCBudW1HbHlwaHMsIHBvaW50LCBmb250Q2FzY2FkZS5mb250RGVzY3JpcHRpb24oKS5mb250 U21vb3RoaW5nKCkpOworICAgICAgICBtX2ltcGwtPmRyYXdHbHlwaHMoZm9udCwgYnVmZmVyLCBm cm9tLCBudW1HbHlwaHMsIHBvaW50LCBmb250U21vb3RoaW5nTW9kZSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBmb250Q2FzY2FkZS5kcmF3R2x5cGhzKCp0aGlzLCBmb250LCBidWZm ZXIsIGZyb20sIG51bUdseXBocywgcG9pbnQsIGZvbnRDYXNjYWRlLmZvbnREZXNjcmlwdGlvbigp LmZvbnRTbW9vdGhpbmcoKSk7CisgICAgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMoKnRoaXMsIGZv bnQsIGJ1ZmZlciwgZnJvbSwgbnVtR2x5cGhzLCBwb2ludCwgZm9udFNtb290aGluZ01vZGUpOwog fQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0VtcGhhc2lzTWFya3MoY29uc3QgRm9udENh c2NhZGUmIGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1biwgY29uc3QgQXRvbWljU3RyaW5nJiBtYXJr LCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgdW5zaWduZWQgZnJvbSwgc3RkOjpvcHRpb25hbDx1 bnNpZ25lZD4gdG8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oCmluZGV4IDYxMTEyYTA5M2RjNzI2NDIyYzJiOWI4NDAzNzU2MjUxZmMz ZWM3MWYuLjQwYTk2OTFmYjY0MTc2NDc5MmJkNGNiODAzZTc3YjIzMGFiOWZhNDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBA IC0zOTYsNyArMzk2LDcgQEAgcHVibGljOgogICAgIFRleHREcmF3aW5nTW9kZUZsYWdzIHRleHRE cmF3aW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGUudGV4dERyYXdpbmdNb2RlOyB9CiAK ICAgICBmbG9hdCBkcmF3VGV4dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBj b25zdCBGbG9hdFBvaW50JiwgdW5zaWduZWQgZnJvbSA9IDAsIHN0ZDo6b3B0aW9uYWw8dW5zaWdu ZWQ+IHRvID0gc3RkOjpudWxsb3B0KTsKLSAgICB2b2lkIGRyYXdHbHlwaHMoY29uc3QgRm9udENh c2NhZGUmLCBjb25zdCBGb250JiwgY29uc3QgR2x5cGhCdWZmZXImLCB1bnNpZ25lZCBmcm9tLCB1 bnNpZ25lZCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQmKTsKKyAgICB2b2lkIGRyYXdHbHlw aHMoY29uc3QgRm9udCYsIGNvbnN0IEdseXBoQnVmZmVyJiwgdW5zaWduZWQgZnJvbSwgdW5zaWdu ZWQgbnVtR2x5cGhzLCBjb25zdCBGbG9hdFBvaW50JiwgRm9udFNtb290aGluZ01vZGUpOwogICAg IHZvaWQgZHJhd0VtcGhhc2lzTWFya3MoY29uc3QgRm9udENhc2NhZGUmLCBjb25zdCBUZXh0UnVu JiwgY29uc3QgQXRvbWljU3RyaW5nJiBtYXJrLCBjb25zdCBGbG9hdFBvaW50JiwgdW5zaWduZWQg ZnJvbSA9IDAsIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQ+IHRvID0gc3RkOjpudWxsb3B0KTsKICAg ICB2b2lkIGRyYXdCaWRpVGV4dChjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFRleHRSdW4mLCBj b25zdCBGbG9hdFBvaW50JiwgRm9udENhc2NhZGU6OkN1c3RvbUZvbnROb3RSZWFkeUFjdGlvbiA9 IEZvbnRDYXNjYWRlOjpEb05vdFBhaW50SWZGb250Tm90UmVhZHkpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJ dGVtcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMv RGlzcGxheUxpc3RJdGVtcy5jcHAKaW5kZXggZTg4YzQ0ODM2MDQ5ZDRhMDQzZmFmZWM5Y2UwMTdi MDQyYmU3OTIxOS4uMWZjZWU4YjM4NDM3MzAzNmQyM2YwOTExMmFiNjNlNzk2OTVlYzA0MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rp c3BsYXlMaXN0SXRlbXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmNwcApAQCAtMzcxLDcgKzM3MSw3IEBAIGlu bGluZSBHbHlwaEJ1ZmZlciBEcmF3R2x5cGhzOjpnZW5lcmF0ZUdseXBoQnVmZmVyKCkgY29uc3QK IAogdm9pZCBEcmF3R2x5cGhzOjphcHBseShHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpIGNvbnN0 CiB7Ci0gICAgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMoY29udGV4dCwgbV9mb250LCBnZW5lcmF0 ZUdseXBoQnVmZmVyKCksIDAsIG1fZ2x5cGhzLnNpemUoKSwgYW5jaG9yUG9pbnQoKSwgbV9zbW9v dGhpbmdNb2RlKTsKKyAgICBjb250ZXh0LmRyYXdHbHlwaHMobV9mb250LCBnZW5lcmF0ZUdseXBo QnVmZmVyKCksIDAsIG1fZ2x5cGhzLnNpemUoKSwgYW5jaG9yUG9pbnQoKSwgbV9zbW9vdGhpbmdN b2RlKTsKIH0KIAogdm9pZCBEcmF3R2x5cGhzOjpjb21wdXRlQm91bmRzKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvTWF0aE9wZXJhdG9yLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvTWF0aE9wZXJhdG9yLmNwcAppbmRleCA4MzU0NGZk Njg2ODk1NzlmOWU1ZDRkMGVjNjE3ZDU1NzY3MDhkN2Q4Li44NWUwMmE0NTY4MTY4YjZmNjNlYzJm YjE0MjVlZGVjZmEwNTFhNjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv bWF0aG1sL01hdGhPcGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9NYXRoT3BlcmF0b3IuY3BwCkBAIC01MzksNyArNTM5LDcgQEAgTGF5b3V0UmVjdCBNYXRo T3BlcmF0b3I6OnBhaW50R2x5cGgoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBQYWludEluZm8m IGluZm8sIGMKIAogICAgIEdseXBoQnVmZmVyIGJ1ZmZlcjsKICAgICBidWZmZXIuYWRkKGRhdGEu Z2x5cGgsIGRhdGEuZm9udCwgYWR2YW5jZVdpZHRoRm9yR2x5cGgoZGF0YSkpOwotICAgIGluZm8u Y29udGV4dCgpLmRyYXdHbHlwaHMoc3R5bGUuZm9udENhc2NhZGUoKSwgKmRhdGEuZm9udCwgYnVm ZmVyLCAwLCAxLCBvcmlnaW4pOworICAgIGluZm8uY29udGV4dCgpLmRyYXdHbHlwaHMoKmRhdGEu Zm9udCwgYnVmZmVyLCAwLCAxLCBvcmlnaW4sIHN0eWxlLmZvbnRDYXNjYWRlKCkuZm9udERlc2Ny aXB0aW9uKCkuZm9udFNtb290aGluZygpKTsKIAogICAgIHJldHVybiBnbHlwaFBhaW50UmVjdDsK IH0KQEAgLTc0Niw3ICs3NDYsNyBAQCB2b2lkIE1hdGhPcGVyYXRvcjo6cGFpbnQoY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlLCBQYWludEluZm8mIGluZm8sIGNvbnN0IExheW91dAogICAgIExheW91 dFBvaW50IG9wZXJhdG9yVG9wTGVmdCA9IHBhaW50T2Zmc2V0OwogICAgIEZsb2F0UmVjdCBnbHlw aEJvdW5kcyA9IGJvdW5kc0ZvckdseXBoKGdseXBoRGF0YSk7CiAgICAgTGF5b3V0UG9pbnQgb3Bl cmF0b3JPcmlnaW4ob3BlcmF0b3JUb3BMZWZ0LngoKSwgb3BlcmF0b3JUb3BMZWZ0LnkoKSAtIGds eXBoQm91bmRzLnkoKSk7Ci0gICAgcGFpbnRJbmZvLmNvbnRleHQoKS5kcmF3R2x5cGhzKHN0eWxl LmZvbnRDYXNjYWRlKCksICpnbHlwaERhdGEuZm9udCwgYnVmZmVyLCAwLCAxLCBvcGVyYXRvck9y aWdpbik7CisgICAgcGFpbnRJbmZvLmNvbnRleHQoKS5kcmF3R2x5cGhzKCpnbHlwaERhdGEuZm9u dCwgYnVmZmVyLCAwLCAxLCBvcGVyYXRvck9yaWdpbiwgc3R5bGUuZm9udENhc2NhZGUoKS5mb250 RGVzY3JpcHRpb24oKS5mb250U21vb3RoaW5nKCkpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFRva2VuLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MVG9rZW4uY3BwCmluZGV4IDQ0 NjIxZjFiZjY2OGM2MWMyMWRiNzM5OWJhOWVhZDM5MDhmYTVjMzkuLjY0ZTNhOGNjOGFjNTA3YTQ4 MzNkNWZhNmYyOWJiYzk4NzRkNjM2MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9tYXRobWwvUmVuZGVyTWF0aE1MVG9rZW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MVG9rZW4uY3BwCkBAIC02MDcsNyArNjA3LDcgQEAg dm9pZCBSZW5kZXJNYXRoTUxUb2tlbjo6cGFpbnQoUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBMYXlv dXRQb2ludCYgcGFpbnRPZmZzZXQpCiAgICAgR2x5cGhCdWZmZXIgYnVmZmVyOwogICAgIGJ1ZmZl ci5hZGQobWF0aFZhcmlhbnRHbHlwaC5nbHlwaCwgbWF0aFZhcmlhbnRHbHlwaC5mb250LCBtYXRo VmFyaWFudEdseXBoLmZvbnQtPndpZHRoRm9yR2x5cGgobWF0aFZhcmlhbnRHbHlwaC5nbHlwaCkp OwogICAgIExheW91dFVuaXQgZ2x5cGhBc2NlbnQgPSBzdGF0aWNfY2FzdDxpbnQ+KGxyb3VuZGYo LW1hdGhWYXJpYW50R2x5cGguZm9udC0+Ym91bmRzRm9yR2x5cGgobWF0aFZhcmlhbnRHbHlwaC5n bHlwaCkueSgpKSk7Ci0gICAgaW5mby5jb250ZXh0KCkuZHJhd0dseXBocyhzdHlsZSgpLmZvbnRD YXNjYWRlKCksICptYXRoVmFyaWFudEdseXBoLmZvbnQsIGJ1ZmZlciwgMCwgMSwgcGFpbnRPZmZz ZXQgKyBsb2NhdGlvbigpICsgTGF5b3V0UG9pbnQoMCwgZ2x5cGhBc2NlbnQpKTsKKyAgICBpbmZv LmNvbnRleHQoKS5kcmF3R2x5cGhzKCptYXRoVmFyaWFudEdseXBoLmZvbnQsIGJ1ZmZlciwgMCwg MSwgcGFpbnRPZmZzZXQgKyBsb2NhdGlvbigpICsgTGF5b3V0UG9pbnQoMCwgZ2x5cGhBc2NlbnQp LCBzdHlsZSgpLmZvbnRDYXNjYWRlKCkuZm9udERlc2NyaXB0aW9uKCkuZm9udFNtb290aGluZygp KTsKIH0KIAogdm9pZCBSZW5kZXJNYXRoTUxUb2tlbjo6cGFpbnRDaGlsZHJlbihQYWludEluZm8m IHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBQYWludEluZm8mIHBh aW50SW5mb0ZvckNoaWxkLCBib29sIHVzZVByaW50UmVjdCkK 343313 2018-06-22 01:03:45 -0700 2018-06-22 02:50:01 -0700 Patch bug-186886-20180622100343.patch text/plain 8831 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTZmMjZkZTNjYjQ2M2E0 NjNjMTMyN2I2NzQ5YjVlZGJjNjZiN2MwNy4uMjU0OTdiMGY2YWQyYzhiYWUwZjcyMTExZWM3MTI0 ZjNjYmQ5NDUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA2LTIyICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dQRV1bVGhyZWFkZWRS ZW5kZXJpbmddIFdQRSBjcmFzaGVzIHJlbmRlcmluZyBzb21lIHBpZWNlcyBvZiB0ZXh0IHdoZW4g dXNpbmcgVGhyZWFkZWRSZW5kZXJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4Njg4NgorCisgICAgICAgIFJldmlld2VkIGJ5IMW9YW4gRG9iZXLF oWVrLgorCisgICAgICAgIE1vZGlmeSBEaXNwbGF5TGlzdCBEcmF3R2x5cGhzIGVsZW1lbnQgdG8g dXNlIGEgR3JhcGhpY3NDb250ZXh0IGZvciByZXBsYXlpbmcuIFRvIGRvIHNvLCBtb2RpZnkKKyAg ICAgICAgR3JhcGhpY3NDb250ZXh0OjpkcmF3R2x5cGhzKCkgQVBJIHNvIGl0IGRvZXNuJ3QgcmVx dWlyZSBhIEZvbnRDYXNjYWRlLCBhbmQgdXBkYXRlIGFsbCB0aGUgY2FsbHMKKyAgICAgICAgdG8g aXQuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGVudCB0ZXN0cy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRD YXNjYWRlOjpkcmF3R2x5cGhCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5 TGlzdEl0ZW1zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhz OjphcHBseSBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWF0aE9wZXJhdG9yOjpwYWludEdseXBoKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1hdGhPcGVyYXRvcjo6cGFpbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MVG9rZW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0 aE1MVG9rZW46OnBhaW50KToKKwogMjAxOC0wNi0xNSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBBZGRyZXNzIGZ1bGxzY3JlZW4gYXBpIENTUyBlbnYgZmVlZGJh Y2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNj YWRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNw cAppbmRleCBiZmJjYjgzN2QxYzdhMzE0YzVmYTQxZWY0ZDcwMDdlYzI1M2E5OTVlLi43OWM5YWE2 Mjk4ZjExNTRlYTg1MzhiZWUzZjU5N2Y5NzQzYTYzODVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCkBAIC0xNDMwLDcgKzE0MzAsNyBA QCB2b2lkIEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhCdWZmZXIoR3JhcGhpY3NDb250ZXh0JiBjb250 ZXh0LCBjb25zdCBHbHlwaEJ1ZmZlciYgZwogCiAgICAgICAgIGlmIChuZXh0Rm9udERhdGEgIT0g Zm9udERhdGEgfHwgbmV4dE9mZnNldCAhPSBvZmZzZXQpIHsKICAgICAgICAgICAgIGlmIChzaG91 bGREcmF3SWZMb2FkaW5nKCpmb250RGF0YSwgY3VzdG9tRm9udE5vdFJlYWR5QWN0aW9uKSkKLSAg ICAgICAgICAgICAgICBjb250ZXh0LmRyYXdHbHlwaHMoKnRoaXMsICpmb250RGF0YSwgZ2x5cGhC dWZmZXIsIGxhc3RGcm9tLCBuZXh0R2x5cGggLSBsYXN0RnJvbSwgc3RhcnRQb2ludCk7CisgICAg ICAgICAgICAgICAgY29udGV4dC5kcmF3R2x5cGhzKCpmb250RGF0YSwgZ2x5cGhCdWZmZXIsIGxh c3RGcm9tLCBuZXh0R2x5cGggLSBsYXN0RnJvbSwgc3RhcnRQb2ludCwgbV9mb250RGVzY3JpcHRp b24uZm9udFNtb290aGluZygpKTsKIAogICAgICAgICAgICAgbGFzdEZyb20gPSBuZXh0R2x5cGg7 CiAgICAgICAgICAgICBmb250RGF0YSA9IG5leHRGb250RGF0YTsKQEAgLTE0NDQsNyArMTQ0NCw3 IEBAIHZvaWQgRm9udENhc2NhZGU6OmRyYXdHbHlwaEJ1ZmZlcihHcmFwaGljc0NvbnRleHQmIGNv bnRleHQsIGNvbnN0IEdseXBoQnVmZmVyJiBnCiAgICAgfQogCiAgICAgaWYgKHNob3VsZERyYXdJ ZkxvYWRpbmcoKmZvbnREYXRhLCBjdXN0b21Gb250Tm90UmVhZHlBY3Rpb24pKQotICAgICAgICBj b250ZXh0LmRyYXdHbHlwaHMoKnRoaXMsICpmb250RGF0YSwgZ2x5cGhCdWZmZXIsIGxhc3RGcm9t LCBuZXh0R2x5cGggLSBsYXN0RnJvbSwgc3RhcnRQb2ludCk7CisgICAgICAgIGNvbnRleHQuZHJh d0dseXBocygqZm9udERhdGEsIGdseXBoQnVmZmVyLCBsYXN0RnJvbSwgbmV4dEdseXBoIC0gbGFz dEZyb20sIHN0YXJ0UG9pbnQsIG1fZm9udERlc2NyaXB0aW9uLmZvbnRTbW9vdGhpbmcoKSk7CiAg ICAgcG9pbnQuc2V0WChuZXh0WCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCmluZGV4IGJjM2I2NTFjNDU3OGE1ZmIy YmM1MWYyNDI1OTU2Y2RhMjJhM2E1YWQuLjFlMGYyYjhjN2UyNTFjODhjMDdhMzg2ODZjMjBiMzJi NmVhZmVkODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0LmNwcApAQCAtNjQwLDE3ICs2NDAsMTcgQEAgZmxvYXQgR3JhcGhpY3ND b250ZXh0OjpkcmF3VGV4dChjb25zdCBGb250Q2FzY2FkZSYgZm9udCwgY29uc3QgVGV4dFJ1biYg cnVuLCBjb24KICAgICByZXR1cm4gZm9udC5kcmF3VGV4dCgqdGhpcywgcnVuLCBwb2ludCwgZnJv bSwgdG8pOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0dseXBocyhjb25zdCBGb250 Q2FzY2FkZSYgZm9udENhc2NhZGUsIGNvbnN0IEZvbnQmIGZvbnQsIGNvbnN0IEdseXBoQnVmZmVy JiBidWZmZXIsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIG51bUdseXBocywgY29uc3QgRmxvYXRQ b2ludCYgcG9pbnQpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0dseXBocyhjb25zdCBGb250 JiBmb250LCBjb25zdCBHbHlwaEJ1ZmZlciYgYnVmZmVyLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25l ZCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBGb250U21vb3RoaW5nTW9kZSBm b250U21vb3RoaW5nTW9kZSkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAg ICByZXR1cm47CiAKICAgICBpZiAobV9pbXBsKSB7Ci0gICAgICAgIG1faW1wbC0+ZHJhd0dseXBo cyhmb250LCBidWZmZXIsIGZyb20sIG51bUdseXBocywgcG9pbnQsIGZvbnRDYXNjYWRlLmZvbnRE ZXNjcmlwdGlvbigpLmZvbnRTbW9vdGhpbmcoKSk7CisgICAgICAgIG1faW1wbC0+ZHJhd0dseXBo cyhmb250LCBidWZmZXIsIGZyb20sIG51bUdseXBocywgcG9pbnQsIGZvbnRTbW9vdGhpbmdNb2Rl KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGZvbnRDYXNjYWRlLmRyYXdHbHlwaHMo KnRoaXMsIGZvbnQsIGJ1ZmZlciwgZnJvbSwgbnVtR2x5cGhzLCBwb2ludCwgZm9udENhc2NhZGUu Zm9udERlc2NyaXB0aW9uKCkuZm9udFNtb290aGluZygpKTsKKyAgICBGb250Q2FzY2FkZTo6ZHJh d0dseXBocygqdGhpcywgZm9udCwgYnVmZmVyLCBmcm9tLCBudW1HbHlwaHMsIHBvaW50LCBmb250 U21vb3RoaW5nTW9kZSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3RW1waGFzaXNN YXJrcyhjb25zdCBGb250Q2FzY2FkZSYgZm9udCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBB dG9taWNTdHJpbmcmIG1hcmssIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCB1bnNpZ25lZCBmcm9t LCBzdGQ6Om9wdGlvbmFsPHVuc2lnbmVkPiB0bykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggNjExMTJhMDkzZGM3MjY0MjJj MmI5Yjg0MDM3NTYyNTFmYzNlYzcxZi4uNDBhOTY5MWZiNjQxNzY0NzkyYmQ0Y2I4MDNlNzdiMjMw YWI5ZmE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmgKQEAgLTM5Niw3ICszOTYsNyBAQCBwdWJsaWM6CiAgICAgVGV4dERyYXdp bmdNb2RlRmxhZ3MgdGV4dERyYXdpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZS50ZXh0 RHJhd2luZ01vZGU7IH0KIAogICAgIGZsb2F0IGRyYXdUZXh0KGNvbnN0IEZvbnRDYXNjYWRlJiwg Y29uc3QgVGV4dFJ1biYsIGNvbnN0IEZsb2F0UG9pbnQmLCB1bnNpZ25lZCBmcm9tID0gMCwgc3Rk OjpvcHRpb25hbDx1bnNpZ25lZD4gdG8gPSBzdGQ6Om51bGxvcHQpOwotICAgIHZvaWQgZHJhd0ds eXBocyhjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IEZvbnQmLCBjb25zdCBHbHlwaEJ1ZmZlciYs IHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIG51bUdseXBocywgY29uc3QgRmxvYXRQb2ludCYpOwor ICAgIHZvaWQgZHJhd0dseXBocyhjb25zdCBGb250JiwgY29uc3QgR2x5cGhCdWZmZXImLCB1bnNp Z25lZCBmcm9tLCB1bnNpZ25lZCBudW1HbHlwaHMsIGNvbnN0IEZsb2F0UG9pbnQmLCBGb250U21v b3RoaW5nTW9kZSk7CiAgICAgdm9pZCBkcmF3RW1waGFzaXNNYXJrcyhjb25zdCBGb250Q2FzY2Fk ZSYsIGNvbnN0IFRleHRSdW4mLCBjb25zdCBBdG9taWNTdHJpbmcmIG1hcmssIGNvbnN0IEZsb2F0 UG9pbnQmLCB1bnNpZ25lZCBmcm9tID0gMCwgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gdG8gPSBz dGQ6Om51bGxvcHQpOwogICAgIHZvaWQgZHJhd0JpZGlUZXh0KGNvbnN0IEZvbnRDYXNjYWRlJiwg Y29uc3QgVGV4dFJ1biYsIGNvbnN0IEZsb2F0UG9pbnQmLCBGb250Q2FzY2FkZTo6Q3VzdG9tRm9u dE5vdFJlYWR5QWN0aW9uID0gRm9udENhc2NhZGU6OkRvTm90UGFpbnRJZkZvbnROb3RSZWFkeSk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXls aXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmNwcAppbmRleCBlODhjNDQ4MzYwNDlk NGEwNDNmYWZlYzljZTAxN2IwNDJiZTc5MjE5Li4xZmNlZThiMzg0MzczMDM2ZDIzZjA5MTEyYWI2 M2U3OTY5NWVjMDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCkBAIC0z NzEsNyArMzcxLDcgQEAgaW5saW5lIEdseXBoQnVmZmVyIERyYXdHbHlwaHM6OmdlbmVyYXRlR2x5 cGhCdWZmZXIoKSBjb25zdAogCiB2b2lkIERyYXdHbHlwaHM6OmFwcGx5KEdyYXBoaWNzQ29udGV4 dCYgY29udGV4dCkgY29uc3QKIHsKLSAgICBGb250Q2FzY2FkZTo6ZHJhd0dseXBocyhjb250ZXh0 LCBtX2ZvbnQsIGdlbmVyYXRlR2x5cGhCdWZmZXIoKSwgMCwgbV9nbHlwaHMuc2l6ZSgpLCBhbmNo b3JQb2ludCgpLCBtX3Ntb290aGluZ01vZGUpOworICAgIGNvbnRleHQuZHJhd0dseXBocyhtX2Zv bnQsIGdlbmVyYXRlR2x5cGhCdWZmZXIoKSwgMCwgbV9nbHlwaHMuc2l6ZSgpLCBhbmNob3JQb2lu dCgpLCBtX3Ntb290aGluZ01vZGUpOwogfQogCiB2b2lkIERyYXdHbHlwaHM6OmNvbXB1dGVCb3Vu ZHMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3Bl cmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9NYXRoT3BlcmF0b3Iu Y3BwCmluZGV4IDgzNTQ0ZmQ2ODY4OTU3OWY5ZTVkNGQwZWM2MTdkNTU3NjcwOGQ3ZDguLjg1ZTAy YTQ1NjgxNjhiNmY2M2VjMmZiMTQyNWVkZWNmYTA1MWE2MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvTWF0aE9wZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvbWF0aG1sL01hdGhPcGVyYXRvci5jcHAKQEAgLTUzOSw3ICs1MzksNyBA QCBMYXlvdXRSZWN0IE1hdGhPcGVyYXRvcjo6cGFpbnRHbHlwaChjb25zdCBSZW5kZXJTdHlsZSYg c3R5bGUsIFBhaW50SW5mbyYgaW5mbywgYwogCiAgICAgR2x5cGhCdWZmZXIgYnVmZmVyOwogICAg IGJ1ZmZlci5hZGQoZGF0YS5nbHlwaCwgZGF0YS5mb250LCBhZHZhbmNlV2lkdGhGb3JHbHlwaChk YXRhKSk7Ci0gICAgaW5mby5jb250ZXh0KCkuZHJhd0dseXBocyhzdHlsZS5mb250Q2FzY2FkZSgp LCAqZGF0YS5mb250LCBidWZmZXIsIDAsIDEsIG9yaWdpbik7CisgICAgaW5mby5jb250ZXh0KCku ZHJhd0dseXBocygqZGF0YS5mb250LCBidWZmZXIsIDAsIDEsIG9yaWdpbiwgc3R5bGUuZm9udENh c2NhZGUoKS5mb250RGVzY3JpcHRpb24oKS5mb250U21vb3RoaW5nKCkpOwogCiAgICAgcmV0dXJu IGdseXBoUGFpbnRSZWN0OwogfQpAQCAtNzQ2LDcgKzc0Niw3IEBAIHZvaWQgTWF0aE9wZXJhdG9y OjpwYWludChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFBhaW50SW5mbyYgaW5mbywgY29uc3Qg TGF5b3V0CiAgICAgTGF5b3V0UG9pbnQgb3BlcmF0b3JUb3BMZWZ0ID0gcGFpbnRPZmZzZXQ7CiAg ICAgRmxvYXRSZWN0IGdseXBoQm91bmRzID0gYm91bmRzRm9yR2x5cGgoZ2x5cGhEYXRhKTsKICAg ICBMYXlvdXRQb2ludCBvcGVyYXRvck9yaWdpbihvcGVyYXRvclRvcExlZnQueCgpLCBvcGVyYXRv clRvcExlZnQueSgpIC0gZ2x5cGhCb3VuZHMueSgpKTsKLSAgICBwYWludEluZm8uY29udGV4dCgp LmRyYXdHbHlwaHMoc3R5bGUuZm9udENhc2NhZGUoKSwgKmdseXBoRGF0YS5mb250LCBidWZmZXIs IDAsIDEsIG9wZXJhdG9yT3JpZ2luKTsKKyAgICBwYWludEluZm8uY29udGV4dCgpLmRyYXdHbHlw aHMoKmdseXBoRGF0YS5mb250LCBidWZmZXIsIDAsIDEsIG9wZXJhdG9yT3JpZ2luLCBzdHlsZS5m b250Q2FzY2FkZSgpLmZvbnREZXNjcmlwdGlvbigpLmZvbnRTbW9vdGhpbmcoKSk7CiB9CiAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1M VG9rZW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxU b2tlbi5jcHAKaW5kZXggNDQ2MjFmMWJmNjY4YzYxYzIxZGI3Mzk5YmE5ZWFkMzkwOGZhNWMzOS4u NjRlM2E4Y2M4YWM1MDdhNDgzM2Q1ZmE2ZjI5YmJjOTg3NGQ2MzYzMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxUb2tlbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxUb2tlbi5jcHAKQEAg LTYwNyw3ICs2MDcsNyBAQCB2b2lkIFJlbmRlck1hdGhNTFRva2VuOjpwYWludChQYWludEluZm8m IGluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKICAgICBHbHlwaEJ1ZmZlciBi dWZmZXI7CiAgICAgYnVmZmVyLmFkZChtYXRoVmFyaWFudEdseXBoLmdseXBoLCBtYXRoVmFyaWFu dEdseXBoLmZvbnQsIG1hdGhWYXJpYW50R2x5cGguZm9udC0+d2lkdGhGb3JHbHlwaChtYXRoVmFy aWFudEdseXBoLmdseXBoKSk7CiAgICAgTGF5b3V0VW5pdCBnbHlwaEFzY2VudCA9IHN0YXRpY19j YXN0PGludD4obHJvdW5kZigtbWF0aFZhcmlhbnRHbHlwaC5mb250LT5ib3VuZHNGb3JHbHlwaCht YXRoVmFyaWFudEdseXBoLmdseXBoKS55KCkpKTsKLSAgICBpbmZvLmNvbnRleHQoKS5kcmF3R2x5 cGhzKHN0eWxlKCkuZm9udENhc2NhZGUoKSwgKm1hdGhWYXJpYW50R2x5cGguZm9udCwgYnVmZmVy LCAwLCAxLCBwYWludE9mZnNldCArIGxvY2F0aW9uKCkgKyBMYXlvdXRQb2ludCgwLCBnbHlwaEFz Y2VudCkpOworICAgIGluZm8uY29udGV4dCgpLmRyYXdHbHlwaHMoKm1hdGhWYXJpYW50R2x5cGgu Zm9udCwgYnVmZmVyLCAwLCAxLCBwYWludE9mZnNldCArIGxvY2F0aW9uKCkgKyBMYXlvdXRQb2lu dCgwLCBnbHlwaEFzY2VudCksIHN0eWxlKCkuZm9udENhc2NhZGUoKS5mb250RGVzY3JpcHRpb24o KS5mb250U21vb3RoaW5nKCkpOwogfQogCiB2b2lkIFJlbmRlck1hdGhNTFRva2VuOjpwYWludENo aWxkcmVuKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZz ZXQsIFBhaW50SW5mbyYgcGFpbnRJbmZvRm9yQ2hpbGQsIGJvb2wgdXNlUHJpbnRSZWN0KQo=