170750 2017-04-11 14:29:41 -0700 BreakingContext::WordTrailingSpace cleanup. 2017-04-13 10:39:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan bfulgham commit-queue mmaxfield simon.fraser zalan oldest_to_newest 1296549 0 zalan 2017-04-11 14:29:41 -0700 SSIA. 1296554 1 306852 zalan 2017-04-11 14:35:15 -0700 Created attachment 306852 Patch 1296945 2 306852 mmaxfield 2017-04-12 22:00:39 -0700 Comment on attachment 306852 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306852&action=review > Source/WebCore/rendering/line/BreakingContext.h:67 > + WordTrailingSpace(const RenderStyle& style, bool measuringWithTrailingWhitespaceIsEnabled = true) I'd get rid of the "Is" from the name. > Source/WebCore/rendering/line/BreakingContext.h:834 > + WordTrailingSpace wordTrailingSpace(style, !textLayout); Wow, Lyin' width measurements really went wacko today. Made all sorts of crazy repaint errors. Can't function under complex scripts - not very presidential. Sad! 1297017 3 306992 zalan 2017-04-13 09:56:22 -0700 Created attachment 306992 Patch 1297027 4 306992 commit-queue 2017-04-13 10:39:06 -0700 Comment on attachment 306992 Patch Clearing flags on attachment: 306992 Committed r215325: <http://trac.webkit.org/changeset/215325> 1297028 5 commit-queue 2017-04-13 10:39:08 -0700 All reviewed patches have been landed. Closing bug. 306852 2017-04-11 14:35:15 -0700 2017-04-13 09:56:21 -0700 Patch bug-170750-20170411143514.patch text/plain 5087 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEyZDg5Y2EzMjJiM2Vi MjM2ZGU3YzJkZjJhNzUxNDJlY2VjNzkzZi4uZWQ4MjNmZTE0MjM4MzZiYzk1Y2JhM2ExNzZlYmUx MDk2MTJiMzdjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA0LTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQnJlYWtpbmdDb250ZXh0OjpX b3JkVHJhaWxpbmdTcGFjZSBjbGVhbnVwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0 Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVyaW5nL2xp bmUvQnJlYWtpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpXb3JkVHJhaWxpbmdTcGFj ZTo6V29yZFRyYWlsaW5nU3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6V29yZFRyYWlsaW5nU3Bh Y2U6OndpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6aGFuZGxlVGV4 dCk6CisKIDIwMTctMDQtMTAgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIERvbid0IGdlbmVyYXRlIGV4dHJhIHNjcm9sbGluZyB0aWxlcyBmb3Igbm9uLXZpc2li bGUgcGFnZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggMmE1 MjJkY2E4ODQwNTM1ZjliMjQ0NmVlNzhiZGUxOWRlOGFkZDcyMi4uMjM0OGIzY2Q1M2U2NGMzYzc4 MDU2YzQyZGNjZDI1MDcwMWRmZDYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcApAQCAtODIwLDggKzgyMCw2IEBAIHZvaWQgUmVuZGVyVGV4dDo6Y29tcHV0ZVByZWZl cnJlZExvZ2ljYWxXaWR0aHMoZmxvYXQgbGVhZFdpZHRoLCBIYXNoU2V0PGNvbnN0IEZvCiAgICAg c3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gbmV4dEJyZWFrYWJsZTsKICAgICB1bnNpZ25lZCBsYXN0 V29yZEJvdW5kYXJ5ID0gMDsKIAotICAgIC8vIE5vbi16ZXJvIG9ubHkgd2hlbiBrZXJuaW5nIGlz IGVuYWJsZWQsIGluIHdoaWNoIGNhc2Ugd2UgbWVhc3VyZSB3b3JkcyB3aXRoIHRoZWlyIHRyYWls aW5nCi0gICAgLy8gc3BhY2UsIHRoZW4gc3VidHJhY3QgaXRzIHdpZHRoLgogICAgIFdvcmRUcmFp bGluZ1NwYWNlIHdvcmRUcmFpbGluZ1NwYWNlKHN0eWxlKTsKICAgICAvLyBJZiBhdXRvbWF0aWMg aHlwaGVuYXRpb24gaXMgYWxsb3dlZCwgd2Uga2VlcCB0cmFjayBvZiB0aGUgd2lkdGggb2YgdGhl IHdpZGVzdCB3b3JkIChvciB3b3JkCiAgICAgLy8gZnJhZ21lbnQpIGVuY291bnRlcmVkIHNvIGZh ciwgYW5kIG9ubHkgdHJ5IGh5cGhlbmF0aW5nIHdvcmRzIHRoYXQgYXJlIHdpZGVyLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRleCA3OGYz ZmRhNzAzZTdjYzlmOThhNmYwZmI4MTQwOTFlNTQ5Mzk2NzAyLi45MGI4NGJkZDI5ZjU0OWVhNDJi MjQ0NjZmYTJmNTMzM2UwODlkMjhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv bGluZS9CcmVha2luZ0NvbnRleHQuaApAQCAtNjQsMzAgKzY0LDI5IEBAIHN0cnVjdCBXb3JkTWVh c3VyZW1lbnQgewogfTsKIAogc3RydWN0IFdvcmRUcmFpbGluZ1NwYWNlIHsKLSAgICBXb3JkVHJh aWxpbmdTcGFjZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFRleHRMYXlvdXQqIHRleHRMYXlv dXQgPSBudWxscHRyKQorICAgIFdvcmRUcmFpbGluZ1NwYWNlKGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZSwgYm9vbCBtZWFzdXJpbmdXaXRoVHJhaWxpbmdXaGl0ZXNwYWNlSXNFbmFibGVkID0gdHJ1 ZSkKICAgICAgICAgOiBtX3N0eWxlKHN0eWxlKQotICAgICAgICAsIG1fdGV4dExheW91dCh0ZXh0 TGF5b3V0KQogICAgIHsKKyAgICAgICAgaWYgKCFtZWFzdXJpbmdXaXRoVHJhaWxpbmdXaGl0ZXNw YWNlSXNFbmFibGVkIHx8ICFtX3N0eWxlLmZvbnRDYXNjYWRlKCkuZW5hYmxlS2VybmluZygpKQor ICAgICAgICAgICAgbV9zdGF0ZSA9IFdvcmRUcmFpbGluZ1NwYWNlU3RhdGU6OkluaXRpYWxpemVk OwogICAgIH0KIAogICAgIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IHdpZHRoKEhhc2hTZXQ8Y29uc3Qg Rm9udCo+JiBmYWxsYmFja0ZvbnRzKQogICAgIHsKLSAgICAgICAgaWYgKG1fc3RhdGUgPT0gV29y ZFRyYWlsaW5nU3BhY2VTdGF0ZTo6Q29tcHV0ZWQpCisgICAgICAgIGlmIChtX3N0YXRlID09IFdv cmRUcmFpbGluZ1NwYWNlU3RhdGU6OkluaXRpYWxpemVkKQogICAgICAgICAgICAgcmV0dXJuIG1f d2lkdGg7CiAKLSAgICAgICAgY29uc3QgRm9udENhc2NhZGUmIGZvbnQgPSBtX3N0eWxlLmZvbnRD YXNjYWRlKCk7Ci0gICAgICAgIGlmIChmb250LmVuYWJsZUtlcm5pbmcoKSAmJiAhbV90ZXh0TGF5 b3V0KQotICAgICAgICAgICAgbV93aWR0aCA9IGZvbnQud2lkdGgoUmVuZGVyQmxvY2s6OmNvbnN0 cnVjdFRleHRSdW4oJnNwYWNlLCAxLCBtX3N0eWxlKSwgJmZhbGxiYWNrRm9udHMpICsgZm9udC53 b3JkU3BhY2luZygpOwotICAgICAgICBtX3N0YXRlID0gV29yZFRyYWlsaW5nU3BhY2VTdGF0ZTo6 Q29tcHV0ZWQ7CisgICAgICAgIGF1dG8mIGZvbnQgPSBtX3N0eWxlLmZvbnRDYXNjYWRlKCk7Cisg ICAgICAgIG1fd2lkdGggPSBmb250LndpZHRoKFJlbmRlckJsb2NrOjpjb25zdHJ1Y3RUZXh0UnVu KCZzcGFjZSwgMSwgbV9zdHlsZSksICZmYWxsYmFja0ZvbnRzKSArIGZvbnQud29yZFNwYWNpbmco KTsKKyAgICAgICAgbV9zdGF0ZSA9IFdvcmRUcmFpbGluZ1NwYWNlU3RhdGU6OkluaXRpYWxpemVk OwogICAgICAgICByZXR1cm4gbV93aWR0aDsKICAgICB9CiAKIHByaXZhdGU6Ci0gICAgZW51bSBj bGFzcyBXb3JkVHJhaWxpbmdTcGFjZVN0YXRlIHsgVW5pbml0aWFsaXplZCwgQ29tcHV0ZWQgfTsK KyAgICBlbnVtIGNsYXNzIFdvcmRUcmFpbGluZ1NwYWNlU3RhdGUgeyBVbmluaXRpYWxpemVkLCBJ bml0aWFsaXplZCB9OworICAgIGNvbnN0IFJlbmRlclN0eWxlJiBtX3N0eWxlOwogICAgIFdvcmRU cmFpbGluZ1NwYWNlU3RhdGUgbV9zdGF0ZSB7IFdvcmRUcmFpbGluZ1NwYWNlU3RhdGU6OlVuaW5p dGlhbGl6ZWQgfTsKICAgICBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBtX3dpZHRoOwotICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBtX3N0eWxlOwotICAgIFRleHRMYXlvdXQqIG1fdGV4dExheW91dCB7IG51 bGxwdHIgfTsKIH07CiAKIGNsYXNzIEJyZWFraW5nQ29udGV4dCB7CkBAIC04MjUsMTUgKzgyNCwx NCBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVt ZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICBtX3JlbmRlclRleHRJbmZvLmxh eW91dCA9IGZvbnQuY3JlYXRlTGF5b3V0KHJlbmRlclRleHQsIG1fd2lkdGguY3VycmVudFdpZHRo KCksIG1fY29sbGFwc2VXaGl0ZVNwYWNlKTsKICAgICB9CiAKLSAgICBUZXh0TGF5b3V0KiB0ZXh0 TGF5b3V0ID0gbV9yZW5kZXJUZXh0SW5mby5sYXlvdXQuZ2V0KCk7Ci0KLSAgICAvLyBOb24temVy byBvbmx5IHdoZW4ga2VybmluZyBpcyBlbmFibGVkIGFuZCBUZXh0TGF5b3V0IGlzbid0IHVzZWQs IGluIHdoaWNoIGNhc2Ugd2UgbWVhc3VyZQotICAgIC8vIHdvcmRzIHdpdGggdGhlaXIgdHJhaWxp bmcgc3BhY2UsIHRoZW4gc3VidHJhY3QgaXRzIHdpZHRoLgogICAgIEhhc2hTZXQ8Y29uc3QgRm9u dCo+IGZhbGxiYWNrRm9udHM7CiAgICAgVUNoYXIgbGFzdENoYXJhY3RlckZyb21QcmV2aW91c1Jl bmRlclRleHQgPSBtX3JlbmRlclRleHRJbmZvLmxpbmVCcmVha0l0ZXJhdG9yLmxhc3RDaGFyYWN0 ZXIoKTsKICAgICBVQ2hhciBsYXN0Q2hhcmFjdGVyID0gbV9yZW5kZXJUZXh0SW5mby5saW5lQnJl YWtJdGVyYXRvci5sYXN0Q2hhcmFjdGVyKCk7CiAgICAgVUNoYXIgc2Vjb25kVG9MYXN0Q2hhcmFj dGVyID0gbV9yZW5kZXJUZXh0SW5mby5saW5lQnJlYWtJdGVyYXRvci5zZWNvbmRUb0xhc3RDaGFy YWN0ZXIoKTsKLSAgICBXb3JkVHJhaWxpbmdTcGFjZSB3b3JkVHJhaWxpbmdTcGFjZShzdHlsZSwg dGV4dExheW91dCk7CisgICAgLy8gTm9uLXplcm8gb25seSB3aGVuIGtlcm5pbmcgaXMgZW5hYmxl ZCBhbmQgVGV4dExheW91dCBpc24ndCB1c2VkLCBpbiB3aGljaCBjYXNlIHdlIG1lYXN1cmUKKyAg ICAvLyB3b3JkcyB3aXRoIHRoZWlyIHRyYWlsaW5nIHNwYWNlLCB0aGVuIHN1YnRyYWN0IGl0cyB3 aWR0aC4KKyAgICBUZXh0TGF5b3V0KiB0ZXh0TGF5b3V0ID0gbV9yZW5kZXJUZXh0SW5mby5sYXlv dXQuZ2V0KCk7CisgICAgV29yZFRyYWlsaW5nU3BhY2Ugd29yZFRyYWlsaW5nU3BhY2Uoc3R5bGUs ICF0ZXh0TGF5b3V0KTsKICAgICBmb3IgKDsgbV9jdXJyZW50Lm9mZnNldCgpIDwgcmVuZGVyVGV4 dC50ZXh0TGVuZ3RoKCk7IG1fY3VycmVudC5mYXN0SW5jcmVtZW50SW5UZXh0Tm9kZSgpKSB7CiAg ICAgICAgIGJvb2wgcHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlID0gbV9jdXJyZW50Q2hhcmFjdGVy SXNTcGFjZTsKICAgICAgICAgYm9vbCBwcmV2aW91c0NoYXJhY3RlcklzV1MgPSBtX2N1cnJlbnRD aGFyYWN0ZXJJc1dTOwo= 306992 2017-04-13 09:56:22 -0700 2017-04-13 10:39:06 -0700 Patch bug-170750-20170413095621.patch text/plain 5105 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MzIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTY4MWEwOTMwNTgzZTdm ZmY4ODkxNmQ3MjYwMGY5OTI1ZTZlNjJjNC4uNGIxOTYxMjVkNjU1NTQ1ZDhkZTM4ODM4NWQyNTA2 NThkZjk1MzlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA0LTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQnJlYWtpbmdDb250ZXh0OjpX b3JkVHJhaWxpbmdTcGFjZSBjbGVhbnVwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTXlsZXMgQy4g TWF4ZmllbGQuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU ZXh0Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisgICAgICAgICogcmVuZGVyaW5n L2xpbmUvQnJlYWtpbmdDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpXb3JkVHJhaWxpbmdT cGFjZTo6V29yZFRyYWlsaW5nU3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6V29yZFRyYWlsaW5n U3BhY2U6OndpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6aGFuZGxl VGV4dCk6CisKIDIwMTctMDQtMTMgIFJvbWFpbiBCZWxsZXNzb3J0ICA8cm9tYWluLmJlbGxlc3Nv cnRAY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFtSZWFkYWJsZSBTdHJlYW1zIEFQSV0gSW1wbGVt ZW50IGNsb25lQXJyYXlCdWZmZXIgaW4gV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwCmluZGV4IDJhNTIyZGNhODg0MDUzNWY5YjI0NDZlZTc4YmRlMTlkZThhZGQ3 MjIuLjIzNDhiM2NkNTNlNjRjM2M3ODA1NmM0MmRjY2QyNTA3MDFkZmQ2MTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTgyMCw4ICs4MjAsNiBAQCB2b2lkIFJl bmRlclRleHQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKGZsb2F0IGxlYWRXaWR0aCwg SGFzaFNldDxjb25zdCBGbwogICAgIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQ+IG5leHRCcmVha2Fi bGU7CiAgICAgdW5zaWduZWQgbGFzdFdvcmRCb3VuZGFyeSA9IDA7CiAKLSAgICAvLyBOb24temVy byBvbmx5IHdoZW4ga2VybmluZyBpcyBlbmFibGVkLCBpbiB3aGljaCBjYXNlIHdlIG1lYXN1cmUg d29yZHMgd2l0aCB0aGVpciB0cmFpbGluZwotICAgIC8vIHNwYWNlLCB0aGVuIHN1YnRyYWN0IGl0 cyB3aWR0aC4KICAgICBXb3JkVHJhaWxpbmdTcGFjZSB3b3JkVHJhaWxpbmdTcGFjZShzdHlsZSk7 CiAgICAgLy8gSWYgYXV0b21hdGljIGh5cGhlbmF0aW9uIGlzIGFsbG93ZWQsIHdlIGtlZXAgdHJh Y2sgb2YgdGhlIHdpZHRoIG9mIHRoZSB3aWRlc3Qgd29yZCAob3Igd29yZAogICAgIC8vIGZyYWdt ZW50KSBlbmNvdW50ZXJlZCBzbyBmYXIsIGFuZCBvbmx5IHRyeSBoeXBoZW5hdGluZyB3b3JkcyB0 aGF0IGFyZSB3aWRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5l L0JyZWFraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtp bmdDb250ZXh0LmgKaW5kZXggNzhmM2ZkYTcwM2U3Y2M5Zjk4YTZmMGZiODE0MDkxZTU0OTM5Njcw Mi4uMTBlNDZjNTAwYzcxYzk4MjM1ZDU2ZDE3OWQ2ZTZkZGQ2YmFhYTRkMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmgKQEAgLTY0LDMwICs2 NCwyOSBAQCBzdHJ1Y3QgV29yZE1lYXN1cmVtZW50IHsKIH07CiAKIHN0cnVjdCBXb3JkVHJhaWxp bmdTcGFjZSB7Ci0gICAgV29yZFRyYWlsaW5nU3BhY2UoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl LCBUZXh0TGF5b3V0KiB0ZXh0TGF5b3V0ID0gbnVsbHB0cikKKyAgICBXb3JkVHJhaWxpbmdTcGFj ZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGJvb2wgbWVhc3VyaW5nV2l0aFRyYWlsaW5nV2hp dGVzcGFjZUVuYWJsZWQgPSB0cnVlKQogICAgICAgICA6IG1fc3R5bGUoc3R5bGUpCi0gICAgICAg ICwgbV90ZXh0TGF5b3V0KHRleHRMYXlvdXQpCiAgICAgeworICAgICAgICBpZiAoIW1lYXN1cmlu Z1dpdGhUcmFpbGluZ1doaXRlc3BhY2VFbmFibGVkIHx8ICFtX3N0eWxlLmZvbnRDYXNjYWRlKCku ZW5hYmxlS2VybmluZygpKQorICAgICAgICAgICAgbV9zdGF0ZSA9IFdvcmRUcmFpbGluZ1NwYWNl U3RhdGU6OkluaXRpYWxpemVkOwogICAgIH0KIAogICAgIHN0ZDo6b3B0aW9uYWw8ZmxvYXQ+IHdp ZHRoKEhhc2hTZXQ8Y29uc3QgRm9udCo+JiBmYWxsYmFja0ZvbnRzKQogICAgIHsKLSAgICAgICAg aWYgKG1fc3RhdGUgPT0gV29yZFRyYWlsaW5nU3BhY2VTdGF0ZTo6Q29tcHV0ZWQpCisgICAgICAg IGlmIChtX3N0YXRlID09IFdvcmRUcmFpbGluZ1NwYWNlU3RhdGU6OkluaXRpYWxpemVkKQogICAg ICAgICAgICAgcmV0dXJuIG1fd2lkdGg7CiAKLSAgICAgICAgY29uc3QgRm9udENhc2NhZGUmIGZv bnQgPSBtX3N0eWxlLmZvbnRDYXNjYWRlKCk7Ci0gICAgICAgIGlmIChmb250LmVuYWJsZUtlcm5p bmcoKSAmJiAhbV90ZXh0TGF5b3V0KQotICAgICAgICAgICAgbV93aWR0aCA9IGZvbnQud2lkdGgo UmVuZGVyQmxvY2s6OmNvbnN0cnVjdFRleHRSdW4oJnNwYWNlLCAxLCBtX3N0eWxlKSwgJmZhbGxi YWNrRm9udHMpICsgZm9udC53b3JkU3BhY2luZygpOwotICAgICAgICBtX3N0YXRlID0gV29yZFRy YWlsaW5nU3BhY2VTdGF0ZTo6Q29tcHV0ZWQ7CisgICAgICAgIGF1dG8mIGZvbnQgPSBtX3N0eWxl LmZvbnRDYXNjYWRlKCk7CisgICAgICAgIG1fd2lkdGggPSBmb250LndpZHRoKFJlbmRlckJsb2Nr Ojpjb25zdHJ1Y3RUZXh0UnVuKCZzcGFjZSwgMSwgbV9zdHlsZSksICZmYWxsYmFja0ZvbnRzKSAr IGZvbnQud29yZFNwYWNpbmcoKTsKKyAgICAgICAgbV9zdGF0ZSA9IFdvcmRUcmFpbGluZ1NwYWNl U3RhdGU6OkluaXRpYWxpemVkOwogICAgICAgICByZXR1cm4gbV93aWR0aDsKICAgICB9CiAKIHBy aXZhdGU6Ci0gICAgZW51bSBjbGFzcyBXb3JkVHJhaWxpbmdTcGFjZVN0YXRlIHsgVW5pbml0aWFs aXplZCwgQ29tcHV0ZWQgfTsKKyAgICBlbnVtIGNsYXNzIFdvcmRUcmFpbGluZ1NwYWNlU3RhdGUg eyBVbmluaXRpYWxpemVkLCBJbml0aWFsaXplZCB9OworICAgIGNvbnN0IFJlbmRlclN0eWxlJiBt X3N0eWxlOwogICAgIFdvcmRUcmFpbGluZ1NwYWNlU3RhdGUgbV9zdGF0ZSB7IFdvcmRUcmFpbGlu Z1NwYWNlU3RhdGU6OlVuaW5pdGlhbGl6ZWQgfTsKICAgICBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBt X3dpZHRoOwotICAgIGNvbnN0IFJlbmRlclN0eWxlJiBtX3N0eWxlOwotICAgIFRleHRMYXlvdXQq IG1fdGV4dExheW91dCB7IG51bGxwdHIgfTsKIH07CiAKIGNsYXNzIEJyZWFraW5nQ29udGV4dCB7 CkBAIC04MjUsMTUgKzgyNCwxNCBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRs ZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICBt X3JlbmRlclRleHRJbmZvLmxheW91dCA9IGZvbnQuY3JlYXRlTGF5b3V0KHJlbmRlclRleHQsIG1f d2lkdGguY3VycmVudFdpZHRoKCksIG1fY29sbGFwc2VXaGl0ZVNwYWNlKTsKICAgICB9CiAKLSAg ICBUZXh0TGF5b3V0KiB0ZXh0TGF5b3V0ID0gbV9yZW5kZXJUZXh0SW5mby5sYXlvdXQuZ2V0KCk7 Ci0KLSAgICAvLyBOb24temVybyBvbmx5IHdoZW4ga2VybmluZyBpcyBlbmFibGVkIGFuZCBUZXh0 TGF5b3V0IGlzbid0IHVzZWQsIGluIHdoaWNoIGNhc2Ugd2UgbWVhc3VyZQotICAgIC8vIHdvcmRz IHdpdGggdGhlaXIgdHJhaWxpbmcgc3BhY2UsIHRoZW4gc3VidHJhY3QgaXRzIHdpZHRoLgogICAg IEhhc2hTZXQ8Y29uc3QgRm9udCo+IGZhbGxiYWNrRm9udHM7CiAgICAgVUNoYXIgbGFzdENoYXJh Y3RlckZyb21QcmV2aW91c1JlbmRlclRleHQgPSBtX3JlbmRlclRleHRJbmZvLmxpbmVCcmVha0l0 ZXJhdG9yLmxhc3RDaGFyYWN0ZXIoKTsKICAgICBVQ2hhciBsYXN0Q2hhcmFjdGVyID0gbV9yZW5k ZXJUZXh0SW5mby5saW5lQnJlYWtJdGVyYXRvci5sYXN0Q2hhcmFjdGVyKCk7CiAgICAgVUNoYXIg c2Vjb25kVG9MYXN0Q2hhcmFjdGVyID0gbV9yZW5kZXJUZXh0SW5mby5saW5lQnJlYWtJdGVyYXRv ci5zZWNvbmRUb0xhc3RDaGFyYWN0ZXIoKTsKLSAgICBXb3JkVHJhaWxpbmdTcGFjZSB3b3JkVHJh aWxpbmdTcGFjZShzdHlsZSwgdGV4dExheW91dCk7CisgICAgLy8gTm9uLXplcm8gb25seSB3aGVu IGtlcm5pbmcgaXMgZW5hYmxlZCBhbmQgVGV4dExheW91dCBpc24ndCB1c2VkLCBpbiB3aGljaCBj YXNlIHdlIG1lYXN1cmUKKyAgICAvLyB3b3JkcyB3aXRoIHRoZWlyIHRyYWlsaW5nIHNwYWNlLCB0 aGVuIHN1YnRyYWN0IGl0cyB3aWR0aC4KKyAgICBUZXh0TGF5b3V0KiB0ZXh0TGF5b3V0ID0gbV9y ZW5kZXJUZXh0SW5mby5sYXlvdXQuZ2V0KCk7CisgICAgV29yZFRyYWlsaW5nU3BhY2Ugd29yZFRy YWlsaW5nU3BhY2Uoc3R5bGUsICF0ZXh0TGF5b3V0KTsKICAgICBmb3IgKDsgbV9jdXJyZW50Lm9m ZnNldCgpIDwgcmVuZGVyVGV4dC50ZXh0TGVuZ3RoKCk7IG1fY3VycmVudC5mYXN0SW5jcmVtZW50 SW5UZXh0Tm9kZSgpKSB7CiAgICAgICAgIGJvb2wgcHJldmlvdXNDaGFyYWN0ZXJJc1NwYWNlID0g bV9jdXJyZW50Q2hhcmFjdGVySXNTcGFjZTsKICAgICAgICAgYm9vbCBwcmV2aW91c0NoYXJhY3Rl cklzV1MgPSBtX2N1cnJlbnRDaGFyYWN0ZXJJc1dTOwo=