175966 2017-08-24 16:52:59 -0700 InlineTextBox::paintDocumentMarker() does not need to special case painting of grammar and dictation alternatives 2017-08-25 16:41:59 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates bfulgham simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1342251 0 dbates 2017-08-24 16:52:59 -0700 Following <https://trac.webkit.org/changeset/190363> (bug #149643) InlineTextBox::paintDocumentMarker() no longer needs to special case the handling of grammar and dictation alternative markers. 1342253 1 319038 dbates 2017-08-24 16:56:41 -0700 Created attachment 319038 Patch 1342573 2 319038 dbates 2017-08-25 16:41:15 -0700 Comment on attachment 319038 Patch Clearing flags on attachment: 319038 Committed r221212: <http://trac.webkit.org/changeset/221212> 1342574 3 dbates 2017-08-25 16:41:16 -0700 All reviewed patches have been landed. Closing bug. 1342575 4 webkit-bug-importer 2017-08-25 16:41:59 -0700 <rdar://problem/34092283> 319038 2017-08-24 16:56:41 -0700 2017-08-25 16:41:15 -0700 Patch bug-175966-20170824165642.patch text/plain 5532 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxMTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU1YzMzNWEwZGQxMWI4 MTJkZjliZThlMmVmOGY1ZWEzMzQ0Yjk4ZC4uNTUwMjBjYmI3OWZlY2ViZjJjOWFlNWMyYmEyNWQy MjUyNDNlMGM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA4LTI0ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBJbmxpbmVUZXh0Qm94Ojpw YWludERvY3VtZW50TWFya2VyKCkgZG9lcyBub3QgbmVlZCB0byBzcGVjaWFsIGNhc2UgcGFpbnRp bmcgb2YgZ3JhbW1hciBhbmQKKyAgICAgICAgZGljdGF0aW9uIGFsdGVybmF0aXZlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1OTY2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGNvZGUgdGhh dCBmb3JjZWQgY29tcHV0aW5nIHRoZSBtYXJrZXIgcmVjdCBmb3IgZ3JhbW1hciBhbmQgZGljdGF0 aW9uIGFsdGVybmF0aXZlCisgICAgICAgIHJlZ2FyZGxlc3Mgb2Ygd2hldGhlciB0aGUgbWFya2Vy IHNwYW5zIHRoZSBlbnRpcmUgd2lkdGggb2YgdGhlIGxpbmUgYm94LiBJbmxpbmVUZXh0Qm94Ojpw YWludERvY3VtZW50TWFya2VyKCkKKyAgICAgICAgaGFzIHBlcmZvcm1hbmNlIG9wdGltaXphdGlv bnMgdG8gYXZvaWQgY29tcHV0aW5nIHRoZSBtYXJrZXIgcmVjdCBpZiBpdCBzcGFucyB0aGUgZW50 aXJlIGxpbmUgYm94LgorICAgICAgICBQcmlvciB0byByMTkwMzYzIHdlIGhhZCB0byBvcHQgb3V0 IG9mIHRoZXNlIG9wdGltaXphdGlvbnMgZm9yIGdyYW1tYXIgYW5kIGRpY3RhdGlvbiBhbHRlcm5h dGl2ZQorICAgICAgICBtYXJrZXJzIHNvIHRoYXQgd2UgY291bGQgc3RvcmUgdGhlaXIgY29tcHV0 ZWQgbWFya2VyIHJlY3QuIEluIHIxOTAzNjMgd2UgcmVtb3ZlZCB0aGUgbG9naWMgaW4KKyAgICAg ICAgSW5saW5lVGV4dEJveDo6cGFpbnREb2N1bWVudE1hcmtlcigpIHRvIHN0b3JlIHRoZSBjb21w dXRlZCBtYXJrZXIgcmVjdCBhbmQgaGVuY2Ugbm8gbG9uZ2VyCisgICAgICAgIG5lZWRlZCB0byBv cHQgb3V0IG9mIHRoZSBvcHRpbWl6YXRpb24gZm9yIHRoZXNlIG1hcmtlciB0eXBlcywgYnV0IGlu YWR2ZXJ0ZW50bHkgbGVmdCBpbiB0aGUKKyAgICAgICAgY29uZGl0aW9uYWwgY29kZSB0aGF0IG9w dHMgdGhlbSBvdXQuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbGl0eSBjaGFuZ2VkLiBTbyBubyBu ZXcgdGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50TWFya2VyKTogUmVtb3Zl IHVubmVjZXNzYXJ5IGFyZ3VtZW50IGdyYW1tYXIgYW5kCisgICAgICAgIGNvZGUgdGhhdCBzcGVj aWFsIGNhc2VkIGhhbmRsaW5nIG9mIGdyYW1tYXIgYW4gZGljdGF0aW9uIGFsdGVybmF0aXZlIG1h cmtlcnMuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50TWFy a2Vycyk6IFVwZGF0ZSBhcyBuZWNlc3NhcnkuCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRl eHRCb3guaDoKKwogMjAxNy0wOC0yNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIFN0b3AgdXNpbmcgUG9saWN5Q2FsbGJhY2sgZm9yIG5ldyB3 aW5kb3cgcG9saWNpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Jbmxp bmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNw cAppbmRleCAyNDc3NGM1NjBjYzdlNzI0OWZmZWIwNmM0MGE3MWRkMjQ4OWZmYmM4Li41NzVmYTA2 YWRlNjBjNTAxM2FlZTQ1MWI3ZTQzYTkxZDMwZjJmZDViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZVRleHRCb3guY3BwCkBAIC04MDQsNyArODA0LDcgQEAgc3RhdGljIEdyYXBo aWNzQ29udGV4dDo6RG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgbGluZVN0eWxlRm9yTWFya2VyVHlw ZShEb2N1bWVudE0KICAgICB9CiB9CiAKLXZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnREb2N1bWVu dE1hcmtlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9y aWdpbiwgUmVuZGVyZWREb2N1bWVudE1hcmtlciYgbWFya2VyLCBjb25zdCBSZW5kZXJTdHlsZSYg c3R5bGUsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250LCBib29sIGdyYW1tYXIpCit2b2lkIElubGlu ZVRleHRCb3g6OnBhaW50RG9jdW1lbnRNYXJrZXIoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBj b25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXImIG1hcmtl ciwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBGb250Q2FzY2FkZSYgZm9udCkKIHsK ICAgICAvLyBOZXZlciBwcmludCBzcGVsbGluZy9ncmFtbWFyIG1hcmtlcnMgKDUzMjc4ODcpCiAg ICAgaWYgKHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5wcmludGluZygpKQpAQCAtODI1LDggKzgyNSw3 IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnREb2N1bWVudE1hcmtlcihHcmFwaGljc0NvbnRl eHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pCiAgICAgaWYgKG1fdHJ1bmNhdGlvbiAhPSBjTm9U cnVuY2F0aW9uKQogICAgICAgICBtYXJrZXJTcGFuc1dob2xlQm94ID0gZmFsc2U7CiAKLSAgICBi b29sIGlzRGljdGF0aW9uTWFya2VyID0gbWFya2VyLnR5cGUoKSA9PSBEb2N1bWVudE1hcmtlcjo6 RGljdGF0aW9uQWx0ZXJuYXRpdmVzOwotICAgIGlmICghbWFya2VyU3BhbnNXaG9sZUJveCB8fCBn cmFtbWFyIHx8IGlzRGljdGF0aW9uTWFya2VyKSB7CisgICAgaWYgKCFtYXJrZXJTcGFuc1dob2xl Qm94KSB7CiAgICAgICAgIHVuc2lnbmVkIHN0YXJ0UG9zaXRpb24gPSBjbGFtcGVkT2Zmc2V0KG1h cmtlci5zdGFydE9mZnNldCgpKTsKICAgICAgICAgdW5zaWduZWQgZW5kUG9zaXRpb24gPSBjbGFt cGVkT2Zmc2V0KG1hcmtlci5lbmRPZmZzZXQoKSk7CiAgICAgICAgIApAQCAtOTQwLDE1ICs5Mzks MTUgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50TWFya2VycyhHcmFwaGljc0Nv bnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UG8KICAgICAgICAgICAgIGNhc2UgRG9jdW1lbnRN YXJrZXI6OlNwZWxsaW5nOgogICAgICAgICAgICAgY2FzZSBEb2N1bWVudE1hcmtlcjo6Q29ycmVj dGlvbkluZGljYXRvcjoKICAgICAgICAgICAgIGNhc2UgRG9jdW1lbnRNYXJrZXI6OkRpY3RhdGlv bkFsdGVybmF0aXZlczoKLSAgICAgICAgICAgICAgICBwYWludERvY3VtZW50TWFya2VyKGNvbnRl eHQsIGJveE9yaWdpbiwgKm1hcmtlciwgc3R5bGUsIGZvbnQsIGZhbHNlKTsKKyAgICAgICAgICAg ICAgICBwYWludERvY3VtZW50TWFya2VyKGNvbnRleHQsIGJveE9yaWdpbiwgKm1hcmtlciwgc3R5 bGUsIGZvbnQpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBEb2N1 bWVudE1hcmtlcjo6R3JhbW1hcjoKLSAgICAgICAgICAgICAgICBwYWludERvY3VtZW50TWFya2Vy KGNvbnRleHQsIGJveE9yaWdpbiwgKm1hcmtlciwgc3R5bGUsIGZvbnQsIHRydWUpOworICAgICAg ICAgICAgICAgIHBhaW50RG9jdW1lbnRNYXJrZXIoY29udGV4dCwgYm94T3JpZ2luLCAqbWFya2Vy LCBzdHlsZSwgZm9udCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAjaWYgUExBVEZPUk0oSU9T KQogICAgICAgICAgICAgLy8gRklYTUU6IFNlZSA8cmRhcjovL3Byb2JsZW0vODkzMzM1Mj4uIEFs c28sIHJlbW92ZSB0aGUgUExBVEZPUk0oSU9TKS1ndWFyZC4KICAgICAgICAgICAgIGNhc2UgRG9j dW1lbnRNYXJrZXI6OkRpY3RhdGlvblBocmFzZVdpdGhBbHRlcm5hdGl2ZXM6Ci0gICAgICAgICAg ICAgICAgcGFpbnREb2N1bWVudE1hcmtlcihjb250ZXh0LCBib3hPcmlnaW4sICptYXJrZXIsIHN0 eWxlLCBmb250LCB0cnVlKTsKKyAgICAgICAgICAgICAgICBwYWludERvY3VtZW50TWFya2VyKGNv bnRleHQsIGJveE9yaWdpbiwgKm1hcmtlciwgc3R5bGUsIGZvbnQpOwogICAgICAgICAgICAgICAg IGJyZWFrOwogI2VuZGlmCiAgICAgICAgICAgICBjYXNlIERvY3VtZW50TWFya2VyOjpUZXh0TWF0 Y2g6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guaAppbmRleCA1YzQ4N2Zm YTQ4MzMwY2JmMGU2YjZhYWUyZTkwMjBlM2QzNDc2YThiLi4yMjc0ZGM3N2UwMzY5OWRhMDZhOWY5 MWUzNWVkMzcyN2FjYTU1ZDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lVGV4dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0 Qm94LmgKQEAgLTE2MSw3ICsxNjEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcGFpbnREZWNvcmF0 aW9uKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgUmVuZGVyQ29tYmluZVRl eHQqLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgRmxvYXRQb2ludCYgdGV4dE9yaWdpbiwgY29uc3Qg RmxvYXRSZWN0JiBib3hSZWN0LAogICAgICAgICBUZXh0RGVjb3JhdGlvbiwgVGV4dFBhaW50U3R5 bGUsIGNvbnN0IFNoYWRvd0RhdGEqLCBjb25zdCBGbG9hdFJlY3QmIGNsaXBPdXRSZWN0KTsKICAg ICB2b2lkIHBhaW50U2VsZWN0aW9uKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEZsb2F0UG9pbnQm IGJveE9yaWdpbiwgY29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0 IENvbG9yJiB0ZXh0Q29sb3IpOwotICAgIHZvaWQgcGFpbnREb2N1bWVudE1hcmtlcihHcmFwaGlj c0NvbnRleHQmLCBjb25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIFJlbmRlcmVkRG9jdW1lbnRN YXJrZXImLCBjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgYm9vbCBncmFt bWFyKTsKKyAgICB2b2lkIHBhaW50RG9jdW1lbnRNYXJrZXIoR3JhcGhpY3NDb250ZXh0JiwgY29u c3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBSZW5kZXJlZERvY3VtZW50TWFya2VyJiwgY29uc3Qg UmVuZGVyU3R5bGUmLCBjb25zdCBGb250Q2FzY2FkZSYpOwogICAgIHZvaWQgcGFpbnRUZXh0TWF0 Y2hNYXJrZXIoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBS ZW5kZXJlZERvY3VtZW50TWFya2VyJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBGb250Q2Fz Y2FkZSYpOwogCiAgICAgRXhwYW5zaW9uQmVoYXZpb3IgZXhwYW5zaW9uQmVoYXZpb3IoKSBjb25z dDsK