236002 2022-02-01 22:02:17 -0800 Rename FontCascade::spaceWidth() to FontCascade::spaceWidthOfPrimaryFont() 2022-02-01 23:55:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 236007 P2 Normal --- 1 mmaxfield mmaxfield changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr oldest_to_newest 1836331 0 mmaxfield 2022-02-01 22:02:17 -0800 Rename FontCascade::spaceWidth() to FontCascade::spaceWidthOfPrimaryFont() 1836332 1 450609 mmaxfield 2022-02-01 22:04:20 -0800 Created attachment 450609 Patch 1836336 2 450612 mmaxfield 2022-02-01 22:24:02 -0800 Created attachment 450612 Patch 1836339 3 450612 mmaxfield 2022-02-01 23:00:25 -0800 Comment on attachment 450612 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450612&action=review > Source/WebCore/platform/graphics/FontCascade.h:167 > + float spaceWidthOfPrimaryFont() const { return primaryFont().spaceWidth() + m_letterSpacing; } This probably isn't a great name, because it includes letter spacing. 1836363 4 mmaxfield 2022-02-01 23:55:21 -0800 *** This bug has been marked as a duplicate of bug 236007 *** 450609 2022-02-01 22:04:20 -0800 2022-02-01 22:24:01 -0800 Patch bug-236002-20220201220419.patch text/plain 7810 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyZjlhYzRjMDA0YmZl Y2IwYWVlNTAxZjY4NGMyMjA3MWZiM2VmZi4uMmI1NTQzYzhhMzNhNGM4ZmNkNGRhMTNjNDEzOTA1 YmU5ZmZiYmQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAyLTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIEZv bnRDYXNjYWRlOjpzcGFjZVdpZHRoKCkgdG8gRm9udENhc2NhZGU6OnNwYWNlV2lkdGhPZlByaW1h cnlGb250KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNjAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgbWF0Y2hlcyBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjg4ODY4L3dl YmtpdCBhbmQgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI4ODk0Mi93ZWJraXQs CisgICAgICAgIGFuZCBoYXMgdGhlIHNhbWUgcmF0aW9uYWxlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGxh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6Y29tcHV0ZUlubGlu ZVRleHRJdGVtV2lkdGhzKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS90ZXh0L1RleHRVdGlsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0 aWw6OndpZHRoKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OnNwYWNlV2lkdGhPZlByaW1hcnlGb250IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpzcGFjZVdpZHRoIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnNldFdvcmRTcGFjaW5nKToKKwogMjAyMi0wMi0w MSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFJl bmFtZSBGb250Q2FzY2FkZTo6Zm9udE1ldHJpY3MoKSBhbmQgUmVuZGVyU3R5bGU6OmZvbnRNZXRy aWNzKCkgdG8gZm9udE1ldHJpY3NPZlByaW1hcnlGb250KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVJdGVtc0J1aWxkZXIuY3BwCmluZGV4IDdkOTI3ODU0NDA4ZjEzM2IxZmNlZmQxMjkwYzgx Y2JmNWUwZTY5MTUuLjQ4NDRhZThiODlkYTIzM2E0ZDg3YjkzMzU5ZTVlNWJjYWEyNWMxNjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUl0ZW1zQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcApAQCAtNDY5LDcgKzQ2 OSw3IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpjb21wdXRlSW5saW5lVGV4dEl0ZW1XaWR0 aHMoSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQogICAgICAgICBhdXRvIHdpZHRoID0gWyZdKCkg LT4gc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7CiAgICAgICAgICAgICBhdXRvIHNp bmdsZVdoaXRlU3BhY2UgPSBpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAoIVRleHRV dGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEJveCkgfHwgKGxlbmd0 aCA9PSAxICYmIGlubGluZVRleHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmco KSkpOwogICAgICAgICAgICAgaWYgKHNpbmdsZVdoaXRlU3BhY2UpCi0gICAgICAgICAgICAgICAg cmV0dXJuIGlubGluZVRleHRJdGVtLnN0eWxlKCkuZm9udENhc2NhZGUoKS5zcGFjZVdpZHRoKCk7 CisgICAgICAgICAgICAgICAgcmV0dXJuIGlubGluZVRleHRJdGVtLnN0eWxlKCkuZm9udENhc2Nh ZGUoKS5zcGFjZVdpZHRoT2ZQcmltYXJ5Rm9udCgpOwogICAgICAgICAgICAgaWYgKGxlbmd0aCAm JiAhaW5saW5lVGV4dEl0ZW0uaXNaZXJvV2lkdGhTcGFjZVNlcGFyYXRvcigpKQogICAgICAgICAg ICAgICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEJveCwgaW5saW5lVGV4dEl0 ZW0uc3R5bGUoKS5mb250Q2FzY2FkZSgpLCBzdGFydCwgc3RhcnQgKyBsZW5ndGgsIHsgfSk7CiAg ICAgICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvdGV4dC9UZXh0VXRpbC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcApp bmRleCBjZDIzMWZjZDM4ZjgzNmU2MzY2NmFhYWI3YTMxNzQ0ZTk0OWU1MGI3Li4xYWU5NWNiNzU1 YTQ4Y2MxYTQ0NGU5YzEzMTEwY2IzOTIzZThlYmI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1RleHRVdGlsLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS90ZXh0L1Rl eHRVdGlsLmNwcApAQCAtNTIsNyArNTIsNyBAQCBJbmxpbmVMYXlvdXRVbml0IFRleHRVdGlsOjp3 aWR0aChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIGNvbnN0IEZvbgogICAg IFJFTEVBU0VfQVNTRVJUKGZyb20gPj0gaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSk7CiAgICAgUkVM RUFTRV9BU1NFUlQodG8gPD0gaW5saW5lVGV4dEl0ZW0uZW5kKCkpOwogICAgIGlmIChpbmxpbmVU ZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhVGV4dFV0aWw6OnNob3VsZFByZXNlcnZlU3BhY2Vz QW5kVGFicyhpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSkpIHsKLSAgICAgICAgYXV0byBzcGFj ZVdpZHRoID0gZm9udENhc2NhZGUuc3BhY2VXaWR0aCgpOworICAgICAgICBhdXRvIHNwYWNlV2lk dGggPSBmb250Q2FzY2FkZS5zcGFjZVdpZHRoT2ZQcmltYXJ5Rm9udCgpOwogICAgICAgICByZXR1 cm4gc3RkOjppc25hbihzcGFjZVdpZHRoKSA/IDAuMGYgOiBzdGQ6OmlzaW5mKHNwYWNlV2lkdGgp ID8gbWF4SW5saW5lTGF5b3V0VW5pdCgpIDogc3BhY2VXaWR0aDsKICAgICB9CiAgICAgcmV0dXJu IFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94KCksIGZvbnRDYXNj YWRlLCBmcm9tLCB0bywgY29udGVudExvZ2ljYWxMZWZ0KTsKQEAgLTg0LDcgKzg0LDcgQEAgSW5s aW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5l VGV4dEJveCwgY29uc3QgRm9udEMKICAgICB9CiAKICAgICBpZiAoZXh0ZW5kZWRNZWFzdXJpbmcp Ci0gICAgICAgIHdpZHRoIC09IChmb250Q2FzY2FkZS5zcGFjZVdpZHRoKCkgKyBmb250Q2FzY2Fk ZS53b3JkU3BhY2luZygpKTsKKyAgICAgICAgd2lkdGggLT0gKGZvbnRDYXNjYWRlLnNwYWNlV2lk dGhPZlByaW1hcnlGb250KCkgKyBmb250Q2FzY2FkZS53b3JkU3BhY2luZygpKTsKIAogICAgIHJl dHVybiBzdGQ6OmlzbmFuKHdpZHRoKSA/IDAuMGYgOiBzdGQ6OmlzaW5mKHdpZHRoKSA/IG1heElu bGluZUxheW91dFVuaXQoKSA6IHdpZHRoOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmgKaW5kZXggMzZhODM3MjMzYzc4OTVjMTNiMTliNTc1ODVi Y2YzMTg3NGI1MGFlZS4uM2I1ZmQ1OTMwZTg3MDAzMDRlNTI4MmZmZmE5OTcyYjQ5OTg2NjEwOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oCkBA IC0xNjQsNyArMTY0LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNQbGF0Zm9ybUZvbnQoKSBjb25z dCB7IHJldHVybiBtX2ZvbnRzLT5pc0ZvclBsYXRmb3JtRm9udCgpOyB9CiAKICAgICBjb25zdCBG b250TWV0cmljcyYgbWV0cmljc09mUHJpbWFyeUZvbnQoKSBjb25zdCB7IHJldHVybiBwcmltYXJ5 Rm9udCgpLmZvbnRNZXRyaWNzKCk7IH0KLSAgICBmbG9hdCBzcGFjZVdpZHRoKCkgY29uc3QgeyBy ZXR1cm4gcHJpbWFyeUZvbnQoKS5zcGFjZVdpZHRoKCkgKyBtX2xldHRlclNwYWNpbmc7IH0KKyAg ICBmbG9hdCBzcGFjZVdpZHRoT2ZQcmltYXJ5Rm9udCgpIGNvbnN0IHsgcmV0dXJuIHByaW1hcnlG b250KCkuc3BhY2VXaWR0aCgpICsgbV9sZXR0ZXJTcGFjaW5nOyB9CiAgICAgZmxvYXQgdGFiV2lk dGgoY29uc3QgRm9udCYsIGNvbnN0IFRhYlNpemUmLCBmbG9hdCkgY29uc3Q7CiAgICAgZmxvYXQg dGFiV2lkdGgoY29uc3QgVGFiU2l6ZSYgdGFiU2l6ZSwgZmxvYXQgcG9zaXRpb24pIGNvbnN0IHsg cmV0dXJuIHRhYldpZHRoKHByaW1hcnlGb250KCksIHRhYlNpemUsIHBvc2l0aW9uKTsgfQogICAg IGJvb2wgaGFzVmFsaWRBdmVyYWdlQ2hhcldpZHRoKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCAzNTM3MWExNzU1M2VmOTdi MjVkM2E1YWMzYmY0MDQxMjUyYWRkYjMwLi4zMTBkZTY5Y2YwYzJkYzdiMDZiYjM3NDQ0ZTBlMWZh MDgzMjUzNzY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAKQEAgLTE5MTIsNyArMTkxMiw3IEBAIHZvaWQgUmVuZGVyU3R5bGU6OnNldFdvcmRT cGFjaW5nKExlbmd0aCYmIHZhbHVlKQogICAgICAgICBmb250V29yZFNwYWNpbmcgPSAwOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIExlbmd0aFR5cGU6OlBlcmNlbnQ6Ci0gICAgICAgIGZvbnRX b3JkU3BhY2luZyA9IHZhbHVlLnBlcmNlbnQoKSAqIGZvbnRDYXNjYWRlKCkuc3BhY2VXaWR0aCgp IC8gMTAwOworICAgICAgICBmb250V29yZFNwYWNpbmcgPSB2YWx1ZS5wZXJjZW50KCkgKiBmb250 Q2FzY2FkZSgpLnNwYWNlV2lkdGhPZlByaW1hcnlGb250KCkgLyAxMDA7CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgTGVuZ3RoVHlwZTo6Rml4ZWQ6CiAgICAgICAgIGZvbnRXb3JkU3BhY2luZyA9 IHZhbHVlLnZhbHVlKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggM2YzMmFjM2NlZDc2NGQ1Njg0NjFmZjY4YjI5YzI3NWUxZTZlNTU0My4uMzA4 NDg4NGY2MWVkNTI3ZDM1YzYzNTIwYWRjMGE4NzNiOTVjYzNkOSAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTAy LTAxICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAg UmVuYW1lIEZvbnRDYXNjYWRlOjpzcGFjZVdpZHRoKCkgdG8gRm9udENhc2NhZGU6OnNwYWNlV2lk dGhPZlByaW1hcnlGb250KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzNjAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbXBsZXhUZXh0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUX0YpOgorCiAyMDIyLTAyLTAx ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIE1pdGln YXRlIGhhbmdzIHVuZGVybmVhdGggLXJlcXVlc3RBdXRvY29ycmVjdGlvbkNvbnRleHRXaXRoQ29t cGxldGlvbkhhbmRsZXI6IHdoZW4gZm9jdXNpbmcgdGV4dCBmaWVsZHMKZGlmZiAtLWdpdCBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3Bw IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbXBsZXhUZXh0Q29udHJvbGxl ci5jcHAKaW5kZXggYmNmMDMyOTU1YmUyZWJkZmZlNjkzZDhhOGJiZDgyYmY5NDJmOWQ5OS4uNmY4 YTg2ZDcyMjllMmE0MzhhYTcxYzZhZTk5ZTI5ODhhNDcyMzM3MCAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbXBsZXhUZXh0Q29udHJvbGxlci5jcHAKKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbXBsZXhUZXh0Q29udHJvbGxl ci5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgVEVTVF9GKENvbXBsZXhUZXh0Q29udHJvbGxlclRlc3Qs IEluaXRpYWxBZHZhbmNlV2l0aExlZnRSdW5JblJUTCkKICAgICBkZXNjcmlwdGlvbi5zZXRDb21w dXRlZFNpemUoODApOwogICAgIEZvbnRDYXNjYWRlIGZvbnQoV1RGTW92ZShkZXNjcmlwdGlvbikp OwogICAgIGZvbnQudXBkYXRlKCk7Ci0gICAgYXV0byBzcGFjZVdpZHRoID0gZm9udC5wcmltYXJ5 Rm9udCgpLnNwYWNlV2lkdGgoKTsKKyAgICBhdXRvIHNwYWNlV2lkdGggPSBmb250LnNwYWNlV2lk dGhPZlByaW1hcnlGb250KCk7CiAKICAgICBWZWN0b3I8RmxvYXRTaXplPiBhZHZhbmNlcyA9IHsg RmxvYXRTaXplKCksIEZsb2F0U2l6ZSgyMS42NDA2MjUsIDAuMCksIEZsb2F0U2l6ZSg0Mi4zMDQ2 ODc1LCAwLjApLCBGbG9hdFNpemUoNTUuODk4NDM3NSwgMC4wKSwgRmxvYXRTaXplKDIyLjM0Mzc1 LCAwLjApIH07CiAgICAgVmVjdG9yPEZsb2F0UG9pbnQ+IG9yaWdpbnMgPSB7IEZsb2F0UG9pbnQo LTE1LjE1NjI1LCAxOC4wNDY4NzUpLCBGbG9hdFBvaW50KCksIEZsb2F0UG9pbnQoKSwgRmxvYXRQ b2ludCgpLCBGbG9hdFBvaW50KCkgfTsKQEAgLTE0Miw3ICsxNDIsNyBAQCBURVNUX0YoQ29tcGxl eFRleHRDb250cm9sbGVyVGVzdCwgSW5pdGlhbEFkdmFuY2VXaXRoTGVmdFJ1bkluTFRSKQogICAg IGRlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZSg4MCk7CiAgICAgRm9udENhc2NhZGUgZm9udChX VEZNb3ZlKGRlc2NyaXB0aW9uKSk7CiAgICAgZm9udC51cGRhdGUoKTsKLSAgICBhdXRvIHNwYWNl V2lkdGggPSBmb250LnByaW1hcnlGb250KCkuc3BhY2VXaWR0aCgpOworICAgIGF1dG8gc3BhY2VX aWR0aCA9IGZvbnQuc3BhY2VXaWR0aE9mUHJpbWFyeUZvbnQoKTsKIAogICAgIFZlY3RvcjxGbG9h dFNpemU+IGFkdmFuY2VzID0geyBGbG9hdFNpemUoNzYuMzQ3NjU2LCAwLjAwMDAwMCksIEZsb2F0 U2l6ZSgwLjAwMDAwMCwgMC4wMDAwMDApIH07CiAgICAgVmVjdG9yPEZsb2F0UG9pbnQ+IG9yaWdp bnMgPSB7IEZsb2F0UG9pbnQoKSwgRmxvYXRQb2ludCgtMjMuMjgxMjUwLCAtOC4zOTg0MzgpIH07 Cg== 450612 2022-02-01 22:24:02 -0800 2022-02-01 23:00:25 -0800 Patch bug-236002-20220201222401.patch text/plain 5149 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTUwMDE3NzM5M2ExNTBl MjhkMzA2YjczZDMxY2VlNDIzMWViMDU5MS4uOTJmMDQ3OWZjZjJjNGNhNzU2ZjY3NjJmYzEwMTQ1 YWUyZGY1ZWJhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAyLTAxICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIEZv bnRDYXNjYWRlOjpzcGFjZVdpZHRoKCkgdG8gRm9udENhc2NhZGU6OnNwYWNlV2lkdGhPZlByaW1h cnlGb250KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzNjAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgbWF0Y2hlcyBodHRwczovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMjg4ODY4L3dl YmtpdCBhbmQgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzI4ODk0Mi93ZWJraXQs CisgICAgICAgIGFuZCBoYXMgdGhlIHNhbWUgcmF0aW9uYWxlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGxh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6Y29tcHV0ZUlubGlu ZVRleHRJdGVtV2lkdGhzKToKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS90ZXh0L1RleHRVdGlsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0 aWw6OndpZHRoKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OnNwYWNlV2lkdGhPZlByaW1hcnlGb250IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpzcGFjZVdpZHRoIGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnNldFdvcmRTcGFjaW5nKToKKwogMjAyMi0wMi0w MSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBV c2luZyBGb250Y2FzY2FkZTo6c3BhY2VXaWR0aCB0byBzdWJ0cmFjdCB0aGUgdHJhaWxpbmcgc3Bh Y2Ugd2lkdGggbWF5IHJlc3VsdCBpbiBpbmNvcnJlY3QgbGF5b3V0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuaAppbmRleCAzNmE4MzcyMzNjNzg5NWMx M2IxOWI1NzU4NWJjZjMxODc0YjUwYWVlLi4zYjVmZDU5MzBlODcwMDMwNGU1MjgyZmZmYTk5NzJi NDk5ODY2MTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FzY2FkZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRD YXNjYWRlLmgKQEAgLTE2NCw3ICsxNjQsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc1BsYXRmb3Jt Rm9udCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9udHMtPmlzRm9yUGxhdGZvcm1Gb250KCk7IH0KIAog ICAgIGNvbnN0IEZvbnRNZXRyaWNzJiBtZXRyaWNzT2ZQcmltYXJ5Rm9udCgpIGNvbnN0IHsgcmV0 dXJuIHByaW1hcnlGb250KCkuZm9udE1ldHJpY3MoKTsgfQotICAgIGZsb2F0IHNwYWNlV2lkdGgo KSBjb25zdCB7IHJldHVybiBwcmltYXJ5Rm9udCgpLnNwYWNlV2lkdGgoKSArIG1fbGV0dGVyU3Bh Y2luZzsgfQorICAgIGZsb2F0IHNwYWNlV2lkdGhPZlByaW1hcnlGb250KCkgY29uc3QgeyByZXR1 cm4gcHJpbWFyeUZvbnQoKS5zcGFjZVdpZHRoKCkgKyBtX2xldHRlclNwYWNpbmc7IH0KICAgICBm bG9hdCB0YWJXaWR0aChjb25zdCBGb250JiwgY29uc3QgVGFiU2l6ZSYsIGZsb2F0KSBjb25zdDsK ICAgICBmbG9hdCB0YWJXaWR0aChjb25zdCBUYWJTaXplJiB0YWJTaXplLCBmbG9hdCBwb3NpdGlv bikgY29uc3QgeyByZXR1cm4gdGFiV2lkdGgocHJpbWFyeUZvbnQoKSwgdGFiU2l6ZSwgcG9zaXRp b24pOyB9CiAgICAgYm9vbCBoYXNWYWxpZEF2ZXJhZ2VDaGFyV2lkdGgoKSBjb25zdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDM1Mzcx YTE3NTUzZWY5N2IyNWQzYTVhYzNiZjQwNDEyNTJhZGRiMzAuLjMxMGRlNjljZjBjMmRjN2IwNmJi Mzc0NDRlMGUxZmEwODMyNTM3NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMTkxMiw3ICsxOTEyLDcgQEAgdm9pZCBSZW5kZXJTdHls ZTo6c2V0V29yZFNwYWNpbmcoTGVuZ3RoJiYgdmFsdWUpCiAgICAgICAgIGZvbnRXb3JkU3BhY2lu ZyA9IDA7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTGVuZ3RoVHlwZTo6UGVyY2VudDoKLSAg ICAgICAgZm9udFdvcmRTcGFjaW5nID0gdmFsdWUucGVyY2VudCgpICogZm9udENhc2NhZGUoKS5z cGFjZVdpZHRoKCkgLyAxMDA7CisgICAgICAgIGZvbnRXb3JkU3BhY2luZyA9IHZhbHVlLnBlcmNl bnQoKSAqIGZvbnRDYXNjYWRlKCkuc3BhY2VXaWR0aE9mUHJpbWFyeUZvbnQoKSAvIDEwMDsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBMZW5ndGhUeXBlOjpGaXhlZDoKICAgICAgICAgZm9udFdv cmRTcGFjaW5nID0gdmFsdWUudmFsdWUoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5MzUxYzczMTRkNGI4NGMzNmQ5YjI5YzJlOTliODNkMjA4 ZDEwNzRmLi4xNGVkYTFkYjRiMjM0ODhhM2QxOGVlN2ZiOGNhM2I3NWQxYmVhODM1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMjItMDItMDEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4K KworICAgICAgICBSZW5hbWUgRm9udENhc2NhZGU6OnNwYWNlV2lkdGgoKSB0byBGb250Q2FzY2Fk ZTo6c3BhY2VXaWR0aE9mUHJpbWFyeUZvbnQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ29tcGxl eFRleHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1RfRik6CisK IDIwMjItMDItMDEgIFJvYmVydCBKZW5uZXIgIDxKZW5uZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFVwZGF0ZSB3YXRjaE9TIHNpbXVsYXRvcnMgdG8gcnVuIG9uIHRoZSBuZXdlciA0NG1tIGRpc3Bs YXkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db21wbGV4 VGV4dENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0Nv bXBsZXhUZXh0Q29udHJvbGxlci5jcHAKaW5kZXggYmNmMDMyOTU1YmUyZWJkZmZlNjkzZDhhOGJi ZDgyYmY5NDJmOWQ5OS4uNmY4YTg2ZDcyMjllMmE0MzhhYTcxYzZhZTk5ZTI5ODhhNDcyMzM3MCAx MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbXBsZXhUZXh0 Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0Nv bXBsZXhUZXh0Q29udHJvbGxlci5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgVEVTVF9GKENvbXBsZXhU ZXh0Q29udHJvbGxlclRlc3QsIEluaXRpYWxBZHZhbmNlV2l0aExlZnRSdW5JblJUTCkKICAgICBk ZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoODApOwogICAgIEZvbnRDYXNjYWRlIGZvbnQoV1RG TW92ZShkZXNjcmlwdGlvbikpOwogICAgIGZvbnQudXBkYXRlKCk7Ci0gICAgYXV0byBzcGFjZVdp ZHRoID0gZm9udC5wcmltYXJ5Rm9udCgpLnNwYWNlV2lkdGgoKTsKKyAgICBhdXRvIHNwYWNlV2lk dGggPSBmb250LnNwYWNlV2lkdGhPZlByaW1hcnlGb250KCk7CiAKICAgICBWZWN0b3I8RmxvYXRT aXplPiBhZHZhbmNlcyA9IHsgRmxvYXRTaXplKCksIEZsb2F0U2l6ZSgyMS42NDA2MjUsIDAuMCks IEZsb2F0U2l6ZSg0Mi4zMDQ2ODc1LCAwLjApLCBGbG9hdFNpemUoNTUuODk4NDM3NSwgMC4wKSwg RmxvYXRTaXplKDIyLjM0Mzc1LCAwLjApIH07CiAgICAgVmVjdG9yPEZsb2F0UG9pbnQ+IG9yaWdp bnMgPSB7IEZsb2F0UG9pbnQoLTE1LjE1NjI1LCAxOC4wNDY4NzUpLCBGbG9hdFBvaW50KCksIEZs b2F0UG9pbnQoKSwgRmxvYXRQb2ludCgpLCBGbG9hdFBvaW50KCkgfTsKQEAgLTE0Miw3ICsxNDIs NyBAQCBURVNUX0YoQ29tcGxleFRleHRDb250cm9sbGVyVGVzdCwgSW5pdGlhbEFkdmFuY2VXaXRo TGVmdFJ1bkluTFRSKQogICAgIGRlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZSg4MCk7CiAgICAg Rm9udENhc2NhZGUgZm9udChXVEZNb3ZlKGRlc2NyaXB0aW9uKSk7CiAgICAgZm9udC51cGRhdGUo KTsKLSAgICBhdXRvIHNwYWNlV2lkdGggPSBmb250LnByaW1hcnlGb250KCkuc3BhY2VXaWR0aCgp OworICAgIGF1dG8gc3BhY2VXaWR0aCA9IGZvbnQuc3BhY2VXaWR0aE9mUHJpbWFyeUZvbnQoKTsK IAogICAgIFZlY3RvcjxGbG9hdFNpemU+IGFkdmFuY2VzID0geyBGbG9hdFNpemUoNzYuMzQ3NjU2 LCAwLjAwMDAwMCksIEZsb2F0U2l6ZSgwLjAwMDAwMCwgMC4wMDAwMDApIH07CiAgICAgVmVjdG9y PEZsb2F0UG9pbnQ+IG9yaWdpbnMgPSB7IEZsb2F0UG9pbnQoKSwgRmxvYXRQb2ludCgtMjMuMjgx MjUwLCAtOC4zOTg0MzgpIH07Cg==