172006 2017-05-11 18:09:54 -0700 [macOS] REGRESSION: Drag images for links with right-to-left titles are incorrect 2017-05-16 17:54:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mitz thorton bdakin dino simon.fraser thorton webkit-bug-importer oldest_to_newest 1307654 0 mitz 2017-05-11 18:09:54 -0700 The drag image for a link whose title runs right-to-left is wrong: truncation happens at the wrong place, and when there are two lines, alignment is wrong. 1308073 1 webkit-bug-importer 2017-05-12 14:49:28 -0700 <rdar://problem/32165137> 1309395 2 310322 thorton 2017-05-16 17:14:42 -0700 Created attachment 310322 Patch 1309410 3 310322 dino 2017-05-16 17:43:18 -0700 Comment on attachment 310322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310322&action=review Where are the tests? > Source/WebCore/platform/mac/DragImageMac.mm:219 > + CTParagraphStyleSetting paragraphStyleSettings[1]; Should paragraphStyleSettings be captured? 1309412 4 310322 dino 2017-05-16 17:47:00 -0700 Comment on attachment 310322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310322&action=review >> Source/WebCore/platform/mac/DragImageMac.mm:219 >> + CTParagraphStyleSetting paragraphStyleSettings[1]; > > Should paragraphStyleSettings be captured? Ignore this. 1309421 5 thorton 2017-05-16 17:54:14 -0700 http://trac.webkit.org/changeset/216962/webkit Consider it ignored. Thank you! 310322 2017-05-16 17:14:42 -0700 2017-05-16 17:43:18 -0700 Patch bug-172006-20170516171519.patch text/plain 11314 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmEwYWZjOWUwN2FmMDdi NDQyZTkxMTg3MjNlODVlMzlmNTRjM2U4My4uNDk1OTMxZTNhZjllODQ1NzU1ZGUxYzhkOGFkZjFk ZGJkZjUzMDE5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA1LTE2ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gUkVH UkVTU0lPTjogRHJhZyBpbWFnZXMgZm9yIGxpbmtzIHdpdGggcmlnaHQtdG8tbGVmdCB0aXRsZXMg YXJlIGluY29ycmVjdCAoMTcyMDA2KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTcyMDA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjE2NTEzNz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRm b3JtL21hYy9EcmFnSW1hZ2VNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpMaW5rSW1hZ2VMYXlv dXQ6OkxpbmtJbWFnZUxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VG b3JMaW5rKToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmtJbWFnZUxheW91dDo6YWRkTGluZSk6IERl bGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0NvcmVUZXh0U1BJLmg6CisgICAg ICAgIFNldCBhbmQgcGFpbnQgdGhlIGVudGlyZSBmcmFtZSBhcyBhIHNpbmdsZSB1bml0LCBtYWtp bmcgdXNlIG9mIHRoZQorICAgICAgICBDVEZyYW1lTWF4aW11bU51bWJlck9mTGluZXMgYXR0cmli dXRlIHRvIGxpbWl0IHRoZSBudW1iZXIgb2YgbGluZXMuCisgICAgICAgIFRoaXMgZ2l2ZXMgQ29y ZVRleHQgcG93ZXIgb3ZlciB0ZXh0IGFsaWdubWVudCBhbmQgbWFrZXMgUlRMIHRleHQgbGF5Cisg ICAgICAgIG91dCBjb3JyZWN0bHkuCisKIDIwMTctMDUtMTYgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IE1vdmUgc2V0Q29sbGFw ZWRXaGl0ZXNwYWNlV2lkdGggY2FsbCB0byB1cGRhdGVMaW5lQ29uc3RyYWlucy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFnSW1hZ2VNYWMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvRHJhZ0ltYWdlTWFjLm1tCmluZGV4IDcxMjJkOWJhNDdhODM2 ZmNjYzYxNDkzZmY2NzA2ZDA3MjcwZDUxNGQuLjVmZjNmYTYxOWZkYmFkNjAwNjE3NWZkOGI5MTA1 MmZiODMwMzU5YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFn SW1hZ2VNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0RyYWdJbWFnZU1h Yy5tbQpAQCAtMzAsNiArMzAsNyBAQAogCiAjaW1wb3J0ICJCaXRtYXBJbWFnZS5oIgogI2ltcG9y dCAiQ29yZUdyYXBoaWNzU1BJLmgiCisjaW1wb3J0ICJDb3JlVGV4dFNQSS5oIgogI2ltcG9ydCAi RWxlbWVudC5oIgogI2ltcG9ydCAiRmxvYXRSb3VuZGVkUmVjdC5oIgogI2ltcG9ydCAiRm9udENh c2NhZGUuaCIKQEAgLTE3OCwxNiArMTc5LDEzIEBAIEZsb2F0UG9pbnQgYW5jaG9yUG9pbnRGb3JM aW5rRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBkcmFnSW1hZ2UpCiBzdHJ1Y3QgTGlua0ltYWdlTGF5 b3V0IHsKICAgICBMaW5rSW1hZ2VMYXlvdXQoVVJMJiwgY29uc3QgU3RyaW5nJiB0aXRsZSk7CiAK LSAgICBzdHJ1Y3QgTGFiZWxMaW5lIHsKKyAgICBzdHJ1Y3QgTGFiZWwgewogICAgICAgICBGbG9h dFBvaW50IG9yaWdpbjsKLSAgICAgICAgUmV0YWluUHRyPENUTGluZVJlZj4gbGluZTsKKyAgICAg ICAgUmV0YWluUHRyPENURnJhbWVSZWY+IGZyYW1lOwogICAgIH07Ci0gICAgVmVjdG9yPExhYmVs TGluZT4gbGluZXM7CisgICAgVmVjdG9yPExhYmVsPiBsYWJlbHM7CiAKICAgICBGbG9hdFJlY3Qg Ym91bmRpbmdSZWN0OwotCi1wcml2YXRlOgotICAgIHZvaWQgYWRkTGluZShDVExpbmVSZWYsIGNv bnN0IFZlY3RvcjxDR1BvaW50PiYgb3JpZ2lucywgQ0ZJbmRleCBsaW5lSW5kZXgsIENHRmxvYXQg eCwgQ0dGbG9hdCYgeSwgQ0dGbG9hdCYgbWF4aW11bVVzZWRUZXh0V2lkdGgsIGJvb2wgaXNMYXN0 TGluZSk7CiB9OwogCiBMaW5rSW1hZ2VMYXlvdXQ6OkxpbmtJbWFnZUxheW91dChVUkwmIHVybCwg Y29uc3QgU3RyaW5nJiB0aXRsZVN0cmluZykKQEAgLTIxNywxOSArMjE1LDMwIEBAIExpbmtJbWFn ZUxheW91dDo6TGlua0ltYWdlTGF5b3V0KFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlU3Ry aW5nKQogICAgIENHRmxvYXQgY3VycmVudFkgPSBsaW5rSW1hZ2VQYWRkaW5nOwogICAgIENHRmxv YXQgbWF4aW11bVVzZWRUZXh0V2lkdGggPSAwOwogCi0gICAgYXV0byBidWlsZExpbmVzID0gW3Ro aXMsIG1heGltdW1BdmFpbGFibGVXaWR0aCwgJm1heGltdW1Vc2VkVGV4dFdpZHRoLCAmY3VycmVu dFldIChOU1N0cmluZyAqdGV4dCwgTlNDb2xvciAqY29sb3IsIE5TRm9udCAqZm9udCwgQ0ZJbmRl eCBtYXhpbXVtTGluZXMsIENUTGluZVRydW5jYXRpb25UeXBlIHRydW5jYXRpb25UeXBlKSB7Cisg ICAgYXV0byBidWlsZExpbmVzID0gW3RoaXMsIG1heGltdW1BdmFpbGFibGVXaWR0aCwgJm1heGlt dW1Vc2VkVGV4dFdpZHRoLCAmY3VycmVudFldIChOU1N0cmluZyAqdGV4dCwgTlNDb2xvciAqY29s b3IsIE5TRm9udCAqZm9udCwgQ0ZJbmRleCBtYXhpbXVtTGluZXMsIENUTGluZUJyZWFrTW9kZSBs aW5lQnJlYWtNb2RlKSB7CisgICAgICAgIENUUGFyYWdyYXBoU3R5bGVTZXR0aW5nIHBhcmFncmFw aFN0eWxlU2V0dGluZ3NbMV07CisgICAgICAgIHBhcmFncmFwaFN0eWxlU2V0dGluZ3NbMF0uc3Bl YyA9IGtDVFBhcmFncmFwaFN0eWxlU3BlY2lmaWVyTGluZUJyZWFrTW9kZTsKKyAgICAgICAgcGFy YWdyYXBoU3R5bGVTZXR0aW5nc1swXS52YWx1ZVNpemUgPSBzaXplb2YoQ1RMaW5lQnJlYWtNb2Rl KTsKKyAgICAgICAgcGFyYWdyYXBoU3R5bGVTZXR0aW5nc1swXS52YWx1ZSA9ICZsaW5lQnJlYWtN b2RlOworICAgICAgICBSZXRhaW5QdHI8Q1RQYXJhZ3JhcGhTdHlsZVJlZj4gcGFyYWdyYXBoU3R5 bGUgPSBDVFBhcmFncmFwaFN0eWxlQ3JlYXRlKHBhcmFncmFwaFN0eWxlU2V0dGluZ3MsIDEpOwor CiAgICAgICAgIE5TRGljdGlvbmFyeSAqdGV4dEF0dHJpYnV0ZXMgPSBAewogICAgICAgICAgICAg KGlkKWtDVEZvbnRBdHRyaWJ1dGVOYW1lOiBmb250LAotICAgICAgICAgICAgKGlkKWtDVEZvcmVn cm91bmRDb2xvckF0dHJpYnV0ZU5hbWU6IGNvbG9yCisgICAgICAgICAgICAoaWQpa0NURm9yZWdy b3VuZENvbG9yQXR0cmlidXRlTmFtZTogY29sb3IsCisgICAgICAgICAgICAoaWQpa0NUUGFyYWdy YXBoU3R5bGVBdHRyaWJ1dGVOYW1lOiAoaWQpcGFyYWdyYXBoU3R5bGUuZ2V0KCkKICAgICAgICAg fTsKKyAgICAgICAgTlNEaWN0aW9uYXJ5ICpmcmFtZUF0dHJpYnV0ZXMgPSBAeworICAgICAgICAg ICAgKGlkKWtDVEZyYW1lTWF4aW11bU51bWJlck9mTGluZXNBdHRyaWJ1dGVOYW1lOiBAKG1heGlt dW1MaW5lcykKKyAgICAgICAgfTsKKwogICAgICAgICBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3Ry aW5nPiBhdHRyaWJ1dGVkVGV4dCA9IGFkb3B0TlMoW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxsb2Nd IGluaXRXaXRoU3RyaW5nOnRleHQgYXR0cmlidXRlczp0ZXh0QXR0cmlidXRlc10pOwogICAgICAg ICBSZXRhaW5QdHI8Q1RGcmFtZXNldHRlclJlZj4gdGV4dEZyYW1lc2V0dGVyID0gYWRvcHRDRihD VEZyYW1lc2V0dGVyQ3JlYXRlV2l0aEF0dHJpYnV0ZWRTdHJpbmcoKENGQXR0cmlidXRlZFN0cmlu Z1JlZilhdHRyaWJ1dGVkVGV4dC5nZXQoKSkpOwogCiAgICAgICAgIENGUmFuZ2UgZml0UmFuZ2U7 Ci0gICAgICAgIENHU2l6ZSB0ZXh0U2l6ZSA9IENURnJhbWVzZXR0ZXJTdWdnZXN0RnJhbWVTaXpl V2l0aENvbnN0cmFpbnRzKHRleHRGcmFtZXNldHRlci5nZXQoKSwgQ0ZSYW5nZU1ha2UoMCwgMCks IG51bGxwdHIsIENHU2l6ZU1ha2UobWF4aW11bUF2YWlsYWJsZVdpZHRoLCBDR0ZMT0FUX01BWCks ICZmaXRSYW5nZSk7CisgICAgICAgIENHU2l6ZSB0ZXh0U2l6ZSA9IENURnJhbWVzZXR0ZXJTdWdn ZXN0RnJhbWVTaXplV2l0aENvbnN0cmFpbnRzKHRleHRGcmFtZXNldHRlci5nZXQoKSwgQ0ZSYW5n ZU1ha2UoMCwgMCksIChDRkRpY3Rpb25hcnlSZWYpZnJhbWVBdHRyaWJ1dGVzLCBDR1NpemVNYWtl KG1heGltdW1BdmFpbGFibGVXaWR0aCwgQ0dGTE9BVF9NQVgpLCAmZml0UmFuZ2UpOwogCiAgICAg ICAgIFJldGFpblB0cjxDR1BhdGhSZWY+IHRleHRQYXRoID0gYWRvcHRDRihDR1BhdGhDcmVhdGVX aXRoUmVjdChDR1JlY3RNYWtlKDAsIDAsIHRleHRTaXplLndpZHRoLCB0ZXh0U2l6ZS5oZWlnaHQp LCBudWxscHRyKSk7Ci0gICAgICAgIFJldGFpblB0cjxDVEZyYW1lUmVmPiB0ZXh0RnJhbWUgPSBh ZG9wdENGKENURnJhbWVzZXR0ZXJDcmVhdGVGcmFtZSh0ZXh0RnJhbWVzZXR0ZXIuZ2V0KCksIGZp dFJhbmdlLCB0ZXh0UGF0aC5nZXQoKSwgbnVsbHB0cikpOworICAgICAgICBSZXRhaW5QdHI8Q1RG cmFtZVJlZj4gdGV4dEZyYW1lID0gYWRvcHRDRihDVEZyYW1lc2V0dGVyQ3JlYXRlRnJhbWUodGV4 dEZyYW1lc2V0dGVyLmdldCgpLCBmaXRSYW5nZSwgdGV4dFBhdGguZ2V0KCksIChDRkRpY3Rpb25h cnlSZWYpZnJhbWVBdHRyaWJ1dGVzKSk7CiAKICAgICAgICAgQ0ZBcnJheVJlZiBjdExpbmVzID0g Q1RGcmFtZUdldExpbmVzKHRleHRGcmFtZS5nZXQoKSk7CiAgICAgICAgIENGSW5kZXggbGluZUNv dW50ID0gQ0ZBcnJheUdldENvdW50KGN0TGluZXMpOwpAQCAtMjM3LDY4ICsyNDYsNDMgQEAgTGlu a0ltYWdlTGF5b3V0OjpMaW5rSW1hZ2VMYXlvdXQoVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0 bGVTdHJpbmcpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgVmVjdG9yPENHUG9pbnQ+ IG9yaWdpbnMobGluZUNvdW50KTsKKyAgICAgICAgQ0dSZWN0IGxpbmVCb3VuZHM7CisgICAgICAg IENHRmxvYXQgaGVpZ2h0ID0gMDsKICAgICAgICAgQ1RGcmFtZUdldExpbmVPcmlnaW5zKHRleHRG cmFtZS5nZXQoKSwgQ0ZSYW5nZU1ha2UoMCwgMCksIG9yaWdpbnMuZGF0YSgpKTsKLQotICAgICAg ICAvLyBMYXkgb3V0IGFuZCByZWNvcmQgdGhlIGZpcnN0IChtYXhpbXVtTGluZXMgLSAxKSBsaW5l cy4KLSAgICAgICAgQ0ZJbmRleCBsaW5lSW5kZXggPSAwOwotICAgICAgICBmb3IgKDsgbGluZUlu ZGV4IDwgc3RkOjptaW4obWF4aW11bUxpbmVzIC0gMSwgbGluZUNvdW50KTsgKytsaW5lSW5kZXgp IHsKKyAgICAgICAgZm9yIChDRkluZGV4IGxpbmVJbmRleCA9IDA7IGxpbmVJbmRleCA8IGxpbmVD b3VudDsgKytsaW5lSW5kZXgpIHsKICAgICAgICAgICAgIENUTGluZVJlZiBsaW5lID0gKENUTGlu ZVJlZilDRkFycmF5R2V0VmFsdWVBdEluZGV4KGN0TGluZXMsIGxpbmVJbmRleCk7Ci0gICAgICAg ICAgICBhZGRMaW5lKGxpbmUsIG9yaWdpbnMsIGxpbmVJbmRleCwgbGlua0ltYWdlUGFkZGluZywg Y3VycmVudFksIG1heGltdW1Vc2VkVGV4dFdpZHRoLCBsaW5lSW5kZXggPT0gbGluZUNvdW50IC0g MSk7CisKKyAgICAgICAgICAgIGxpbmVCb3VuZHMgPSBDVExpbmVHZXRCb3VuZHNXaXRoT3B0aW9u cyhsaW5lLCAwKTsKKyAgICAgICAgICAgIENHRmxvYXQgdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgg PSBDVExpbmVHZXRUcmFpbGluZ1doaXRlc3BhY2VXaWR0aChsaW5lKTsKKyAgICAgICAgICAgIENH RmxvYXQgbGluZVdpZHRoSWdub3JpbmdUcmFpbGluZ1doaXRlc3BhY2UgPSBsaW5lQm91bmRzLnNp emUud2lkdGggLSB0cmFpbGluZ1doaXRlc3BhY2VXaWR0aDsKKyAgICAgICAgICAgIG1heGltdW1V c2VkVGV4dFdpZHRoID0gc3RkOjptYXgobWF4aW11bVVzZWRUZXh0V2lkdGgsIGxpbmVXaWR0aEln bm9yaW5nVHJhaWxpbmdXaGl0ZXNwYWNlKTsKKworICAgICAgICAgICAgaWYgKGxpbmVJbmRleCkK KyAgICAgICAgICAgICAgICBoZWlnaHQgKz0gb3JpZ2luc1tsaW5lSW5kZXggLSAxXS55IC0gb3Jp Z2luc1tsaW5lSW5kZXhdLnk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobGluZUluZGV4ID09 IGxpbmVDb3VudCkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgTGlua0ltYWdlTGF5b3V0 OjpMYWJlbCBsYWJlbDsKKyAgICAgICAgbGFiZWwuZnJhbWUgPSB0ZXh0RnJhbWU7CisgICAgICAg IGxhYmVsLm9yaWdpbiA9IEZsb2F0UG9pbnQobGlua0ltYWdlUGFkZGluZywgY3VycmVudFkgKyBv cmlnaW5zWzBdLnkpOworICAgICAgICBsYWJlbHMuYXBwZW5kKGxhYmVsKTsKIAotICAgICAgICAv LyBXZSBoYWQgdGV4dCB0aGF0IGRpZG4ndCBmaXQgaW4gdGhlIGZpcnN0IChtYXhpbXVtTGluZXMg LSAxKSBsaW5lcy4KLSAgICAgICAgLy8gQ29tYmluZSBpdCBpbnRvIG9uZSBsYXN0IGxpbmUsIGFu ZCB0cnVuY2F0ZSBpdC4KLSAgICAgICAgQ1RMaW5lUmVmIGZpcnN0UmVtYWluaW5nTGluZSA9IChD VExpbmVSZWYpQ0ZBcnJheUdldFZhbHVlQXRJbmRleChjdExpbmVzLCBsaW5lSW5kZXgpOwotICAg ICAgICBDRkluZGV4IHJlbWFpbmluZ1JhbmdlU3RhcnQgPSBDVExpbmVHZXRTdHJpbmdSYW5nZShm aXJzdFJlbWFpbmluZ0xpbmUpLmxvY2F0aW9uOwotICAgICAgICBOU1JhbmdlIHJlbWFpbmluZ1Jh bmdlID0gTlNNYWtlUmFuZ2UocmVtYWluaW5nUmFuZ2VTdGFydCwgW2F0dHJpYnV0ZWRUZXh0IGxl bmd0aF0gLSByZW1haW5pbmdSYW5nZVN0YXJ0KTsKLSAgICAgICAgTlNBdHRyaWJ1dGVkU3RyaW5n ICpyZW1haW5pbmdTdHJpbmcgPSBbYXR0cmlidXRlZFRleHQgYXR0cmlidXRlZFN1YnN0cmluZ0Zy b21SYW5nZTpyZW1haW5pbmdSYW5nZV07Ci0gICAgICAgIFJldGFpblB0cjxDVExpbmVSZWY+IHJl bWFpbmluZ0xpbmUgPSBhZG9wdENGKENUTGluZUNyZWF0ZVdpdGhBdHRyaWJ1dGVkU3RyaW5nKChD RkF0dHJpYnV0ZWRTdHJpbmdSZWYpcmVtYWluaW5nU3RyaW5nKSk7Ci0gICAgICAgIFJldGFpblB0 cjxOU0F0dHJpYnV0ZWRTdHJpbmc+IGVsbGlwc2lzU3RyaW5nID0gYWRvcHROUyhbW05TQXR0cmli dXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6QCJcdTIwMjYiIGF0dHJpYnV0ZXM6dGV4 dEF0dHJpYnV0ZXNdKTsKLSAgICAgICAgUmV0YWluUHRyPENUTGluZVJlZj4gZWxsaXBzaXNMaW5l ID0gYWRvcHRDRihDVExpbmVDcmVhdGVXaXRoQXR0cmlidXRlZFN0cmluZygoQ0ZBdHRyaWJ1dGVk U3RyaW5nUmVmKWVsbGlwc2lzU3RyaW5nLmdldCgpKSk7Ci0gICAgICAgIFJldGFpblB0cjxDVExp bmVSZWY+IHRydW5jYXRlZExpbmUgPSBhZG9wdENGKENUTGluZUNyZWF0ZVRydW5jYXRlZExpbmUo cmVtYWluaW5nTGluZS5nZXQoKSwgbWF4aW11bUF2YWlsYWJsZVdpZHRoLCB0cnVuY2F0aW9uVHlw ZSwgZWxsaXBzaXNMaW5lLmdldCgpKSk7Ci0gICAgICAgIAotICAgICAgICBpZiAoIXRydW5jYXRl ZExpbmUpCi0gICAgICAgICAgICB0cnVuY2F0ZWRMaW5lID0gcmVtYWluaW5nTGluZTsKLSAgICAg ICAgCi0gICAgICAgIGFkZExpbmUodHJ1bmNhdGVkTGluZS5nZXQoKSwgb3JpZ2lucywgbGluZUlu ZGV4LCBsaW5rSW1hZ2VQYWRkaW5nLCBjdXJyZW50WSwgbWF4aW11bVVzZWRUZXh0V2lkdGgsIHRy dWUpOworICAgICAgICBjdXJyZW50WSArPSBoZWlnaHQgKyBsaW5lQm91bmRzLnNpemUuaGVpZ2h0 OwogICAgIH07CiAKICAgICBpZiAodGl0bGUpCi0gICAgICAgIGJ1aWxkTGluZXModGl0bGUsIHRp dGxlQ29sb3IsIHRpdGxlRm9udCwgbGlua0ltYWdlVGl0bGVNYXhpbXVtTGluZUNvdW50LCBrQ1RM aW5lVHJ1bmNhdGlvbkVuZCk7CisgICAgICAgIGJ1aWxkTGluZXModGl0bGUsIHRpdGxlQ29sb3Is IHRpdGxlRm9udCwgbGlua0ltYWdlVGl0bGVNYXhpbXVtTGluZUNvdW50LCBrQ1RMaW5lQnJlYWtC eVRydW5jYXRpbmdUYWlsKTsKIAogICAgIGlmICh0aXRsZSAmJiBkb21haW4pCiAgICAgICAgIGN1 cnJlbnRZICs9IGxpbmtJbWFnZURvbWFpbkJhc2VsaW5lVG9UaXRsZUJhc2VsaW5lIC0gKGRvbWFp bkZvbnQuYXNjZW5kZXIgLSBkb21haW5Gb250LmRlc2NlbmRlcik7CiAKICAgICBpZiAoZG9tYWlu KQotICAgICAgICBidWlsZExpbmVzKGRvbWFpbiwgZG9tYWluQ29sb3IsIGRvbWFpbkZvbnQsIDEs IGtDVExpbmVUcnVuY2F0aW9uTWlkZGxlKTsKKyAgICAgICAgYnVpbGRMaW5lcyhkb21haW4sIGRv bWFpbkNvbG9yLCBkb21haW5Gb250LCAxLCBrQ1RMaW5lQnJlYWtCeVRydW5jYXRpbmdNaWRkbGUp OwogCiAgICAgY3VycmVudFkgKz0gbGlua0ltYWdlUGFkZGluZzsKIAogICAgIGJvdW5kaW5nUmVj dCA9IEZsb2F0UmVjdCgwLCAwLCBtYXhpbXVtVXNlZFRleHRXaWR0aCArIGxpbmtJbWFnZVBhZGRp bmcgKiAyLCBjdXJyZW50WSk7CiB9CiAKLXZvaWQgTGlua0ltYWdlTGF5b3V0OjphZGRMaW5lKENU TGluZVJlZiBjdExpbmUsIGNvbnN0IFZlY3RvcjxDR1BvaW50PiYgb3JpZ2lucywgQ0ZJbmRleCBs aW5lSW5kZXgsIENHRmxvYXQgeCwgQ0dGbG9hdCYgeSwgQ0dGbG9hdCYgbWF4aW11bVVzZWRUZXh0 V2lkdGgsIGJvb2wgaXNMYXN0TGluZSkKLXsKLSAgICBDR1JlY3QgbGluZUJvdW5kcyA9IENUTGlu ZUdldEJvdW5kc1dpdGhPcHRpb25zKGN0TGluZSwgMCk7Ci0gICAgQ0dGbG9hdCB0cmFpbGluZ1do aXRlc3BhY2VXaWR0aCA9IENUTGluZUdldFRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoKGN0TGluZSk7 Ci0gICAgQ0dGbG9hdCBsaW5lV2lkdGhJZ25vcmluZ1RyYWlsaW5nV2hpdGVzcGFjZSA9IGxpbmVC b3VuZHMuc2l6ZS53aWR0aCAtIHRyYWlsaW5nV2hpdGVzcGFjZVdpZHRoOwotICAgIG1heGltdW1V c2VkVGV4dFdpZHRoID0gc3RkOjptYXgobWF4aW11bVVzZWRUZXh0V2lkdGgsIGxpbmVXaWR0aEln bm9yaW5nVHJhaWxpbmdXaGl0ZXNwYWNlKTsKLQotICAgIGlmIChsaW5lSW5kZXgpCi0gICAgICAg IHkgKz0gb3JpZ2luc1tsaW5lSW5kZXggLSAxXS55IC0gb3JpZ2luc1tsaW5lSW5kZXhdLnk7Ci0K LSAgICBMaW5rSW1hZ2VMYXlvdXQ6OkxhYmVsTGluZSBsaW5lOwotICAgIGxpbmUubGluZSA9IGN0 TGluZTsKLSAgICBsaW5lLm9yaWdpbiA9IEZsb2F0UG9pbnQoeCwgeSk7Ci0gICAgbGluZXMuYXBw ZW5kKGxpbmUpOwotCi0gICAgaWYgKGlzTGFzdExpbmUpCi0gICAgICAgIHkgKz0gbGluZUJvdW5k cy5zaXplLmhlaWdodDsKLX0KLQogRHJhZ0ltYWdlUmVmIGNyZWF0ZURyYWdJbWFnZUZvckxpbmso RWxlbWVudCYsIFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBUZXh0SW5kaWNhdG9yRGF0 YSYsIEZvbnRSZW5kZXJpbmdNb2RlLCBmbG9hdCkKIHsKICAgICBMaW5rSW1hZ2VMYXlvdXQgbGF5 b3V0KHVybCwgdGl0bGUpOwpAQCAtMzA5LDExICsyOTMsMTAgQEAgRHJhZ0ltYWdlUmVmIGNyZWF0 ZURyYWdJbWFnZUZvckxpbmsoRWxlbWVudCYsIFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxl LCBUZXgKICAgICBHcmFwaGljc0NvbnRleHQgY29udGV4dCgoQ0dDb250ZXh0UmVmKVtOU0dyYXBo aWNzQ29udGV4dCBjdXJyZW50Q29udGV4dF0uZ3JhcGhpY3NQb3J0KTsKICAgICBjb250ZXh0LmZp bGxSb3VuZGVkUmVjdChGbG9hdFJvdW5kZWRSZWN0KGxheW91dC5ib3VuZGluZ1JlY3QsIEZsb2F0 Um91bmRlZFJlY3Q6OlJhZGlpKGxpbmtJbWFnZUNvcm5lclJhZGl1cykpLCBDb2xvcjo6d2hpdGUp OwogCi0gICAgZm9yIChjb25zdCBhdXRvJiBsaW5lIDogbGF5b3V0LmxpbmVzKSB7CisgICAgZm9y IChjb25zdCBhdXRvJiBsYWJlbCA6IGxheW91dC5sYWJlbHMpIHsKICAgICAgICAgR3JhcGhpY3ND b250ZXh0U3RhdGVTYXZlciBzYXZlcihjb250ZXh0KTsKLSAgICAgICAgY29udGV4dC50cmFuc2xh dGUobGluZS5vcmlnaW4ueCgpLCBsYXlvdXQuYm91bmRpbmdSZWN0LmhlaWdodCgpIC0gbGluZS5v cmlnaW4ueSgpIC0gbGlua0ltYWdlUGFkZGluZyk7Ci0gICAgICAgIENHQ29udGV4dFNldFRleHRQ b3NpdGlvbihjb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLCAwLCAwKTsKLSAgICAgICAgQ1RMaW5l RHJhdyhsaW5lLmxpbmUuZ2V0KCksIGNvbnRleHQucGxhdGZvcm1Db250ZXh0KCkpOworICAgICAg ICBjb250ZXh0LnRyYW5zbGF0ZShsYWJlbC5vcmlnaW4ueCgpLCBsYXlvdXQuYm91bmRpbmdSZWN0 LmhlaWdodCgpIC0gbGFiZWwub3JpZ2luLnkoKSAtIGxpbmtJbWFnZVBhZGRpbmcpOworICAgICAg ICBDVEZyYW1lRHJhdyhsYWJlbC5mcmFtZS5nZXQoKSwgY29udGV4dC5wbGF0Zm9ybUNvbnRleHQo KSk7CiAgICAgfQogCiAgICAgW2RyYWdJbWFnZSB1bmxvY2tGb2N1c107CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvQ29yZVRleHRTUEkuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9Db3JlVGV4dFNQSS5oCmluZGV4IDQxMTNmN2Q5NzRm MWE3ZjU2NzczYzhhNDQxYzU4MmNkOGIyNjUzN2QuLmU1OWY4ZGMwYjNhNjY4OTUwZDgzOWE4YTdk OGZmMjI5MWI0YzBiZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9j b2NvYS9Db3JlVGV4dFNQSS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2Nv YS9Db3JlVGV4dFNQSS5oCkBAIC05MCw2ICs5MCw4IEBAIGV4dGVybiBjb25zdCBDRlN0cmluZ1Jl ZiBrQ1RGb250Q1NTV2lkdGhBdHRyaWJ1dGU7CiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NU Rm9udERlc2NyaXB0b3JUZXh0U3R5bGVBdHRyaWJ1dGU7CiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdS ZWYga0NURm9udFVJRm9udERlc2lnblRyYWl0OwogCitleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYg a0NURnJhbWVNYXhpbXVtTnVtYmVyT2ZMaW5lc0F0dHJpYnV0ZU5hbWU7CisKIGJvb2wgQ1RGb250 RGVzY3JpcHRvcklzU3lzdGVtVUlGb250KENURm9udERlc2NyaXB0b3JSZWYpOwogQ1RGb250UmVm IENURm9udENyZWF0ZUZvckNTUyhDRlN0cmluZ1JlZiBuYW1lLCB1aW50MTZfdCB3ZWlnaHQsIENU Rm9udFN5bWJvbGljVHJhaXRzLCBDR0Zsb2F0IHNpemUpOwogQ1RGb250UmVmIENURm9udENyZWF0 ZUZvckNoYXJhY3RlcnNXaXRoTGFuZ3VhZ2UoQ1RGb250UmVmIGN1cnJlbnRGb250LCBjb25zdCBV VEYxNkNoYXIgKmNoYXJhY3RlcnMsIENGSW5kZXggbGVuZ3RoLCBDRlN0cmluZ1JlZiBsYW5ndWFn ZSwgQ0ZJbmRleCAqY292ZXJlZExlbmd0aCk7Cg==