198901 2019-06-15 20:54:00 -0700 [LFC][IFC] Decouple baseline ascent/descent and baseline offset. 2019-06-16 13:42:04 -0700 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 1545093 0 zalan 2019-06-15 20:54:00 -0700 baseline offset = baseline top + baseline ascent (baseline's distance from the top of the line -not always the same as baseline ascent) 1545094 1 webkit-bug-importer 2019-06-15 20:54:25 -0700 <rdar://problem/51782393> 1545095 2 372215 zalan 2019-06-15 20:59:44 -0700 Created attachment 372215 Patch 1545139 3 372215 koivisto 2019-06-16 11:59:52 -0700 Comment on attachment 372215 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372215&action=review > Source/WebCore/layout/inlineformatting/InlineLineBox.h:54 > + // baseline offset from line logical top. Note that offset does not necessarily equal to ascent. Start with capital letter. This could use some ascii art! 1545140 4 zalan 2019-06-16 12:00:56 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 372215 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372215&action=review > > > Source/WebCore/layout/inlineformatting/InlineLineBox.h:54 > > + // baseline offset from line logical top. Note that offset does not necessarily equal to ascent. > > Start with capital letter. > > This could use some ascii art! Indeed! 1545166 5 zalan 2019-06-16 13:42:04 -0700 Committed r246484: <https://trac.webkit.org/changeset/246484> 372215 2019-06-15 20:59:44 -0700 2019-06-16 11:59:52 -0700 Patch bug-198901-20190615205945.patch text/plain 9812 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y0NjU3MTM4Y2MxOTQw MjA4YjEyZjRlYjRlN2Q5NTU5ZTg4YjUwZC4uODFlMWI2N2FiZWU0OTBmZTMwNDZiNTU1ZTFmNDBk ZmQ0ZDhmNDJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA2LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEZWNvdXBs ZSBiYXNlbGluZSBhc2NlbnQvZGVzY2VudCBhbmQgYmFzZWxpbmUgb2Zmc2V0LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4OTAxCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS81MTc4MjM5Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCYXNlbGluZSBvZmZzZXQgaXMgdGhlIGJhc2VsaW5lJ3MgZGlzdGFu Y2UgZnJvbSB0aGUgbGluZSdzIGxvZ2ljYWwgdG9wIC1hbmQgaXQgaXMgbm90IG5lY2Vzc2FyaWx5 IHRoZSBzYW1lIGFzIHRoZSBiYXNlbGluZSdzIGFzY2VudC4KKyAgICAgICAgSXQncyBlYXNpZXIg dG8gdHJhY2sgdGhlIGJhc2VsaW5lIGFuZCBpdHMgdG9wIHNlcGFyYXRlbHkgc2luY2UgY2VydGFp biBwcm9wZXJ0aWVzIG9ubHkgY2hhbmdlIG9uZSBvciB0aGUgb3RoZXIuCisKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 TGluZUxheW91dDo6cGxhY2VJbmxpbmVJdGVtcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpjcmVhdGVEaXNwbGF5 UnVucyBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkxpbmUpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpjbG9zZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmU6OmhhbGZMZWFkaW5nTWV0cmljcyk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjpDb250ZW50OjpiYXNlbGluZU9mZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OkNvbnRlbnQ6OnNldEJhc2VsaW5lT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZTo6YmFzZWxpbmVPZmZzZXQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZUJveDo6YmFzZWxpbmVPZmZzZXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQm94OjpMaW5lQm94KToKKwogMjAxOS0wNi0xNSAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQ29tcGxldGVseSBjb2xsYXBzZWQg cnVucyBzaG91bGQgbm90IGdvIHRvIHRoZSB0cmltbWFibGUgcnVuIGxpc3QuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dExpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAppbmRleCBlNzQwMDgx MWJhMzdiN2U5NjE1YWQ0YzliNjA2ZDc2M2E2YjhjNjQwLi4zZjBhZGFjZTA2ZGYzZTAxYjgzNWY3 ZWJjODljZDA0OWIwNjYyOTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0TGluZUxheW91dC5jcHAKQEAgLTEzMCw3ICsxMzAsNyBAQCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6TGluZUxheW91dDo6TGluZUNvbnRlbnQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OkxpbmVMYQogICAgIHN0ZDo6dW5pcXVlX3B0cjxMaW5lPiBsaW5lOwogICAgIGlmIChsaW5lSW5w dXQuc2tpcFZlcnRpY2FsQWxpZ21lbnQgPT0gTGluZUlucHV0OjpTa2lwVmVydGljYWxBbGlnbWVu dDo6Tm8pIHsKICAgICAgICAgYXV0byBtaW1pbXVtTGluZUhlaWdodCA9IG1fZm9ybWF0dGluZ1Jv b3Quc3R5bGUoKS5jb21wdXRlZExpbmVIZWlnaHQoKTsKLSAgICAgICAgYXV0byBpbml0aWFsQmFz ZWxpbmVPZmZzZXQgPSBMaW5lOjpoYWxmTGVhZGluZ01ldHJpY3MobV9mb3JtYXR0aW5nUm9vdC5z dHlsZSgpLmZvbnRNZXRyaWNzKCksIG1pbWltdW1MaW5lSGVpZ2h0KS5vZmZzZXQ7CisgICAgICAg IGF1dG8gaW5pdGlhbEJhc2VsaW5lT2Zmc2V0ID0gTGluZTo6aGFsZkxlYWRpbmdNZXRyaWNzKG1f Zm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBtaW1pbXVtTGluZUhlaWdodCku YXNjZW50OwogICAgICAgICBsaW5lID0gc3RkOjptYWtlX3VuaXF1ZTxMaW5lPihsYXlvdXRTdGF0 ZSgpLCBsaW5lSW5wdXQuaG9yaXpvbnRhbENvbnN0cmFpbnQubG9naWNhbFRvcExlZnQsIGxpbmVJ bnB1dC5ob3Jpem9udGFsQ29uc3RyYWludC5hdmFpbGFibGVMb2dpY2FsV2lkdGgsIG1pbWltdW1M aW5lSGVpZ2h0LCBpbml0aWFsQmFzZWxpbmVPZmZzZXQpOwogICAgIH0gZWxzZQogICAgICAgICBs aW5lID0gc3RkOjptYWtlX3VuaXF1ZTxMaW5lPihsYXlvdXRTdGF0ZSgpLCBsaW5lSW5wdXQuaG9y aXpvbnRhbENvbnN0cmFpbnQubG9naWNhbFRvcExlZnQueCgpLCBsaW5lSW5wdXQuaG9yaXpvbnRh bENvbnN0cmFpbnQuYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsKQEAgLTMxNSw3ICszMTUsNyBAQCB2 b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpjcmVhdGVEaXNwbGF5UnVu cyhjb25zdCBMaW5lOjpDb250ZW50JgogICAgIGlmIChsaW5lQ29udGVudC5pc0VtcHR5KCkpIHsK ICAgICAgICAgLy8gU3BlYyB0ZWxscyB1cyB0byBjcmVhdGUgYSB6ZXJvIGhlaWdodCwgZW1wdHkg bGluZSBib3guCiAgICAgICAgIGF1dG8gbGluZUJveCA9IERpc3BsYXk6OlJlY3QgeyBsaW5lQ29u dGVudC5sb2dpY2FsVG9wKCksIGxpbmVDb250ZW50LmxvZ2ljYWxMZWZ0KCksIDAgLCAwIH07Ci0g ICAgICAgIG1fZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goeyBsaW5lQm94LCBsaW5lQ29udGVu dC5iYXNlbGluZSgpIH0pOworICAgICAgICBtX2Zvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lQm94KHsg bGluZUJveCwgbGluZUNvbnRlbnQuYmFzZWxpbmUoKSwgbGluZUNvbnRlbnQuYmFzZWxpbmVPZmZz ZXQoKSB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDA2LDcgKzQwNiw3IEBAIHZv aWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5z KGNvbnN0IExpbmU6OkNvbnRlbnQmCiAgICAgICAgIH0KICAgICB9CiAgICAgLy8gRklYTUUgbGlu ZWJveCBuZWVkcyB0byBiZSBhanVzdGVkIGFmdGVyIGNvbnRlbnQgYWxpZ25tZW50LgotICAgIG1f Zm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goeyBsaW5lQm94LCBsaW5lQ29udGVudC5iYXNlbGlu ZSgpIH0pOworICAgIG1fZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVCb3goeyBsaW5lQm94LCBsaW5l Q29udGVudC5iYXNlbGluZSgpLCBsaW5lQ29udGVudC5iYXNlbGluZU9mZnNldCgpIH0pOwogICAg IGFsaWduUnVucyhtX2Zvcm1hdHRpbmdSb290LnN0eWxlKCkudGV4dEFsaWduKCksIHByZXZpb3Vz TGluZUxhc3RSdW5JbmRleC52YWx1ZU9yKC0xKSArIDEsIHdpZHRoQ29uc3RyYWludCAtIGxpbmVD b250ZW50LmxvZ2ljYWxXaWR0aCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCBlOGVlN2FmZGRiYmFk ZDdkZDJlNjNmZDRiMDMxMWZiMjA3ZmQ5NWVhLi5hOTAzOGJjNzJjNzZiNDcyNjE3ZGU2YjM0YjAw ZWNmZWY5MTgyZWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtNTcsNyArNTcsNyBAQCBMaW5lOjpMaW5lKGNv bnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgTGF5b3V0UG9pbnQmIHRvcExlZnQs IExheW91dFVuaQogICAgIDogbV9sYXlvdXRTdGF0ZShsYXlvdXRTdGF0ZSkKICAgICAsIG1fY29u dGVudChzdGQ6Om1ha2VfdW5pcXVlPExpbmU6OkNvbnRlbnQ+KCkpCiAgICAgLCBtX2xvZ2ljYWxU b3BMZWZ0KHRvcExlZnQpCi0gICAgLCBtX2Jhc2VsaW5lKHsgYmFzZWxpbmVPZmZzZXQsIG1pbmlt dW1IZWlnaHQgLSBiYXNlbGluZU9mZnNldCwgeyB9IH0pCisgICAgLCBtX2Jhc2VsaW5lKHsgYmFz ZWxpbmVPZmZzZXQsIG1pbmltdW1IZWlnaHQgLSBiYXNlbGluZU9mZnNldCB9KQogICAgICwgbV9j b250ZW50TG9naWNhbEhlaWdodChtaW5pbXVtSGVpZ2h0KQogICAgICwgbV9saW5lTG9naWNhbFdp ZHRoKGF2YWlsYWJsZVdpZHRoKQogewpAQCAtOTYsNiArOTYsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8 TGluZTo6Q29udGVudD4gTGluZTo6Y2xvc2UoKQogICAgIGlmICghbV9za2lwVmVydGljYWxBbGln bWVudCkgewogICAgICAgICBpZiAoaXNWaXN1YWxseUVtcHR5KCkpIHsKICAgICAgICAgICAgIG1f YmFzZWxpbmUgPSB7IH07CisgICAgICAgICAgICBtX2Jhc2VsaW5lVG9wID0geyB9OwogICAgICAg ICAgICAgbV9jb250ZW50TG9naWNhbEhlaWdodCA9IHsgfTsKICAgICAgICAgfQogCkBAIC0xNDgs NiArMTQ5LDcgQEAgc3RkOjp1bmlxdWVfcHRyPExpbmU6OkNvbnRlbnQ+IExpbmU6OmNsb3NlKCkK ICAgICB9CiAgICAgbV9jb250ZW50LT5zZXRMb2dpY2FsUmVjdCh7IGxvZ2ljYWxUb3AoKSwgbG9n aWNhbExlZnQoKSwgY29udGVudExvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVpZ2h0KCkgfSk7CiAg ICAgbV9jb250ZW50LT5zZXRCYXNlbGluZShtX2Jhc2VsaW5lKTsKKyAgICBtX2NvbnRlbnQtPnNl dEJhc2VsaW5lT2Zmc2V0KGJhc2VsaW5lT2Zmc2V0KCkpOwogICAgIHJldHVybiBXVEZNb3ZlKG1f Y29udGVudCk7CiB9CiAKQEAgLTMzNSw3ICszMzcsNyBAQCB2b2lkIExpbmU6OmFkanVzdEJhc2Vs aW5lQW5kTGluZUhlaWdodChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0 CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVmVydGljYWxBbGlnbjo6Qm90dG9tOgogICAgICAg ICBpZiAobV9jb250ZW50TG9naWNhbEhlaWdodCA8IHJ1bkhlaWdodCkgewotICAgICAgICAgICAg bV9iYXNlbGluZS5vZmZzZXQgPSBtX2Jhc2VsaW5lLm9mZnNldCArIChydW5IZWlnaHQgLSBtX2Nv bnRlbnRMb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIG1fYmFzZWxpbmVUb3AgKz0gcnVuSGVp Z2h0IC0gbV9jb250ZW50TG9naWNhbEhlaWdodDsKICAgICAgICAgICAgIG1fY29udGVudExvZ2lj YWxIZWlnaHQgPSBydW5IZWlnaHQ7CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CkBAIC0zNzgs NyArMzgwLDcgQEAgTGluZUJveDo6QmFzZWxpbmUgTGluZTo6aGFsZkxlYWRpbmdNZXRyaWNzKGNv bnN0IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcywgTGF5b3UKICAgICAvLyBJbmxpbmUgdHJlZSBp cyBhbGwgaW50ZWdlciBiYXNlZC4KICAgICBhdXRvIGFkanVzdGVkQXNjZW50ID0gc3RkOjptYXgo KGFzY2VudCArIGxlYWRpbmcgLyAyKS5mbG9vcigpLCAwKTsKICAgICBhdXRvIGFkanVzdGVkRGVz Y2VudCA9IHN0ZDo6bWF4KChkZXNjZW50ICsgbGVhZGluZyAvIDIpLmNlaWwoKSwgMCk7Ci0gICAg cmV0dXJuIHsgYWRqdXN0ZWRBc2NlbnQsIGFkanVzdGVkRGVzY2VudCwgYWRqdXN0ZWRBc2NlbnQg fTsKKyAgICByZXR1cm4geyBhZGp1c3RlZEFzY2VudCwgYWRqdXN0ZWREZXNjZW50IH07CiB9CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmUuaAppbmRleCAwOGMxMDg2NzQ5NzY0NzI0MDY0MTIxYjgzNmNjNjMxZGMyOTRkYTFkLi5j MjViN2I1N2EwYzhjYmZiMjQ3YmQyMTM5NjVmZDM3YWU5MGYwYmM4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBAIC02OCwx NiArNjgsMTkgQEAgcHVibGljOgogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNv bnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Qud2lkdGgoKTsgfQogICAgICAgICBMYXlvdXRVbml0 IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiBtX2xvZ2ljYWxSZWN0LmhlaWdodCgpOyB9 CiAgICAgICAgIExpbmVCb3g6OkJhc2VsaW5lIGJhc2VsaW5lKCkgY29uc3QgeyByZXR1cm4gbV9i YXNlbGluZTsgfQorICAgICAgICBMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0KCkgY29uc3QgeyBy ZXR1cm4gbV9iYXNlbGluZU9mZnNldDsgfQogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5k IGNsYXNzIExpbmU7CiAKICAgICAgICAgdm9pZCBzZXRMb2dpY2FsUmVjdChjb25zdCBEaXNwbGF5 OjpSZWN0JiBsb2dpY2FsUmVjdCkgeyBtX2xvZ2ljYWxSZWN0ID0gbG9naWNhbFJlY3Q7IH0KICAg ICAgICAgdm9pZCBzZXRCYXNlbGluZShMaW5lQm94OjpCYXNlbGluZSBiYXNlbGluZSkgeyBtX2Jh c2VsaW5lID0gYmFzZWxpbmU7IH0KKyAgICAgICAgdm9pZCBzZXRCYXNlbGluZU9mZnNldChMYXlv dXRVbml0IGJhc2VsaW5lT2Zmc2V0KSB7IG1fYmFzZWxpbmVPZmZzZXQgPSBiYXNlbGluZU9mZnNl dDsgfQogICAgICAgICBSdW5zJiBydW5zKCkgeyByZXR1cm4gbV9ydW5zOyB9CiAKICAgICAgICAg RGlzcGxheTo6UmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgICAgICBMaW5lQm94OjpCYXNlbGluZSBt X2Jhc2VsaW5lOworICAgICAgICBMYXlvdXRVbml0IG1fYmFzZWxpbmVPZmZzZXQ7CiAgICAgICAg IFJ1bnMgbV9ydW5zOwogICAgIH07CiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnQ+IGNsb3Nl KCk7CkBAIC0xMTIsNyArMTE1LDcgQEAgcHJpdmF0ZToKIAogICAgIExheW91dFVuaXQgY29udGVu dExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudExvZ2ljYWxXaWR0aDsgfQog ICAgIExheW91dFVuaXQgYmFzZWxpbmVBbGlnbmVkQ29udGVudEhlaWdodCgpIGNvbnN0IHsgcmV0 dXJuIG1fYmFzZWxpbmUuYXNjZW50ICsgbV9iYXNlbGluZS5kZXNjZW50OyB9Ci0gICAgTGF5b3V0 VW5pdCBiYXNlbGluZU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxpbmUub2Zmc2V0OyB9 CisgICAgTGF5b3V0VW5pdCBiYXNlbGluZU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxp bmUuYXNjZW50ICsgbV9iYXNlbGluZVRvcDsgfQogCiAgICAgdm9pZCBhcHBlbmROb25CcmVha2Fi bGVTcGFjZShjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgRGlzcGxheTo6UmVjdCYgbG9naWNhbFJl Y3QpOwogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCk7CkBAIC0xMjks NiArMTMyLDggQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0IG1fY29udGVudExvZ2ljYWxXaWR0 aDsKIAogICAgIExpbmVCb3g6OkJhc2VsaW5lIG1fYmFzZWxpbmU7CisgICAgTGF5b3V0VW5pdCBt X2Jhc2VsaW5lVG9wOworCiAgICAgTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0Owog ICAgIExheW91dFVuaXQgbV9saW5lTG9naWNhbFdpZHRoOwogICAgIGJvb2wgbV9za2lwVmVydGlj YWxBbGlnbWVudCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggZDg2M2I2M2VjMzJmODUzMTky MDBlYjA0MGVlNmMxNDMwZjI2NzE4ZC4uNmRjNjM2MTY2OGQ1YTRkMWI0ZTk1NzAyYjVmMzk5YzNl MmIzYmY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMzcsOSArMzcsOCBAQCBwdWJsaWM6CiAgICAgc3Ry dWN0IEJhc2VsaW5lIHsKICAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnQ7CiAgICAgICAgIExheW91 dFVuaXQgZGVzY2VudDsKLSAgICAgICAgTGF5b3V0VW5pdCBvZmZzZXQ7IC8vIGJhc2VsaW5lIG9m ZnNldCBmcm9tIGxpbmUgbG9naWNhbCB0b3AuIE5vdGUgdGhhdCBvZmZzZXQgZG9lcyBub3QgbmVj ZXNzYXJpbHkgZXF1YWwgdG8gYXNjZW50LgogICAgIH07Ci0gICAgTGluZUJveChEaXNwbGF5OjpS ZWN0LCBjb25zdCBCYXNlbGluZSYpOworICAgIExpbmVCb3goRGlzcGxheTo6UmVjdCwgY29uc3Qg QmFzZWxpbmUmLCBMYXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0KTsKICAgICAKICAgICBMYXlvdXRQ b2ludCBsb2dpY2FsVG9wTGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdC50b3BMZWZ0KCk7IH0K IApAQCAtNTIsMTUgKzUxLDE5IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHQoKSBjb25zdCB7IHJldHVybiBtX3JlY3QuaGVpZ2h0KCk7IH0KIAogICAgIEJhc2VsaW5lIGJh c2VsaW5lKCkgY29uc3QgeyByZXR1cm4gbV9iYXNlbGluZTsgfQorICAgIC8vIGJhc2VsaW5lIG9m ZnNldCBmcm9tIGxpbmUgbG9naWNhbCB0b3AuIE5vdGUgdGhhdCBvZmZzZXQgZG9lcyBub3QgbmVj ZXNzYXJpbHkgZXF1YWwgdG8gYXNjZW50LgorICAgIExheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQo KSBjb25zdCB7IHJldHVybiBtX2Jhc2VsaW5lT2Zmc2V0OyB9CiAKIHByaXZhdGU6CiAgICAgRGlz cGxheTo6UmVjdCBtX3JlY3Q7CiAgICAgQmFzZWxpbmUgbV9iYXNlbGluZTsKKyAgICBMYXlvdXRV bml0IG1fYmFzZWxpbmVPZmZzZXQ7CiB9OwogCi1pbmxpbmUgTGluZUJveDo6TGluZUJveChEaXNw bGF5OjpSZWN0IHJlY3QsIGNvbnN0IEJhc2VsaW5lJiBiYXNlbGluZSkKK2lubGluZSBMaW5lQm94 OjpMaW5lQm94KERpc3BsYXk6OlJlY3QgcmVjdCwgY29uc3QgQmFzZWxpbmUmIGJhc2VsaW5lLCBM YXlvdXRVbml0IGJhc2VsaW5lT2Zmc2V0KQogICAgIDogbV9yZWN0KHJlY3QpCiAgICAgLCBtX2Jh c2VsaW5lKGJhc2VsaW5lKQorICAgICwgbV9iYXNlbGluZU9mZnNldChiYXNlbGluZU9mZnNldCkK IHsKIH0KIAo=