194785 2019-02-18 12:21:49 -0800 Clean up and modernize RenderThemeIOS::paintCheckboxDecorations() 2019-02-18 16:16:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193599 InRadar P2 Normal --- 1 dbates dbates bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1507360 0 dbates 2019-02-18 12:21:49 -0800 Cleanup and modernize RenderThemeIOS::paintCheckboxDecorations(). 1507363 1 362314 dbates 2019-02-18 12:30:53 -0800 Created attachment 362314 Patch 1507520 2 362314 dbates 2019-02-18 16:15:38 -0800 Comment on attachment 362314 Patch Clearing flags on attachment: 362314 Committed r241748: <https://trac.webkit.org/changeset/241748> 1507521 3 dbates 2019-02-18 16:15:39 -0800 All reviewed patches have been landed. Closing bug. 1507522 4 webkit-bug-importer 2019-02-18 16:16:31 -0800 <rdar://problem/48182484> 362314 2019-02-18 12:30:53 -0800 2019-02-18 16:15:38 -0800 Patch bug-194785-20190218123052.patch text/plain 6954 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RmNDJkMjk5ODc0NzA2 NzY2MGM2NTNmZWU4ZTU4MTZjY2E0MmQyNC4uOTczN2EyYjE0YTUyYzY3MTBiMGQwNDA1NmM4YjNl NjU2NGJjMjBiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAyLTE4ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBhbmQgbW9k ZXJuaXplIFJlbmRlclRoZW1lSU9TOjpwYWludENoZWNrYm94RGVjb3JhdGlvbnMoKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0Nzg1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIGZyb20gZWFy bHkgcmV0dXJuIHRvIGVsc2UtY2xhdXNlIHRvIG1ha2UgdGhlIHN0YXRlcyBjbGVhcmVyIGFuZCBt YWtlIGl0IG1vcmUgc3RyYWlnaHRmb3J3YXJkCisgICAgICAgIHRvIHNoYXJlIG1vcmUgY29tbW9u IGNvZGUuIFVzZSBjb25zdGV4cHIsIGFsbG9jYXRlIHRlbXBvcmFyeSB2ZWN0b3JzIHdpdGggaW5s aW5lIGNhcGFjaXR5LCBhbmQKKyAgICAgICAgc3dpdGNoIHRvIHVuaWZvcm0gaW5pdGlhbGl6ZXIg c3ludGF4LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVJT1M6OnBhaW50Q2hlY2tib3hEZWNvcmF0aW9ucyk6CisK IDIwMTktMDItMTggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAg IFtpT1NdIEZvY3VzIHJpbmcgZm9yIGNoZWNrYm94ZXMsIHJhZGlvIGJ1dHRvbnMsIGJ1dHRvbnMg YW5kIHNlYXJjaCBmaWVsZHMgc2hvdWxkIGh1ZyB0aWdodGVyIHRvIHRoZSBjb250b3VyCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KaW5kZXggNWE2NzlkNGRmZDQ0 MTIwZDgyNGYxNTBjYTFmZWJjN2E3ZGU3ZjNiMC4uNGIwN2FlMTk5OTRmMGRlYTNhMmQyNWY2Njgy MjJhNWI1YmY5YjAyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlP Uy5tbQpAQCAtMzg3LDY4ICszODcsNTcgQEAgdm9pZCBSZW5kZXJUaGVtZUlPUzo6YWRqdXN0UGFp bnRSZWN0KGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIsIExheW91dFJlY3QmIHAKIAogYm9v bCBSZW5kZXJUaGVtZUlPUzo6cGFpbnRDaGVja2JveERlY29yYXRpb25zKGNvbnN0IFJlbmRlck9i amVjdCYgYm94LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVj dCkKIHsKLSAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIocGFpbnRJbmZv LmNvbnRleHQoKSk7Ci0gICAgRmxvYXRSZWN0IGNsaXAgPSBhZGRSb3VuZGVkQm9yZGVyQ2xpcChi b3gsIHBhaW50SW5mby5jb250ZXh0KCksIHJlY3QpOwotCi0gICAgZmxvYXQgd2lkdGggPSBjbGlw LndpZHRoKCk7Ci0gICAgZmxvYXQgaGVpZ2h0ID0gY2xpcC5oZWlnaHQoKTsKLQogICAgIGJvb2wg Y2hlY2tlZCA9IGlzQ2hlY2tlZChib3gpOwogICAgIGJvb2wgaW5kZXRlcm1pbmF0ZSA9IGlzSW5k ZXRlcm1pbmF0ZShib3gpOwotCiAgICAgQ0dDb250ZXh0UmVmIGNnQ29udGV4dCA9IHBhaW50SW5m by5jb250ZXh0KCkucGxhdGZvcm1Db250ZXh0KCk7Ci0gICAgaWYgKCFjaGVja2VkICYmICFpbmRl dGVybWluYXRlKSB7Ci0gICAgICAgIEZsb2F0UG9pbnQgYm90dG9tQ2VudGVyKGNsaXAueCgpICsg Y2xpcC53aWR0aCgpIC8gMi4wZiwgY2xpcC5tYXhZKCkpOwotICAgICAgICBkcmF3QXhpYWxHcmFk aWVudChjZ0NvbnRleHQsIGdyYWRpZW50V2l0aE5hbWUoU2hhZGVHcmFkaWVudCksIGNsaXAubG9j YXRpb24oKSwgRmxvYXRQb2ludChjbGlwLngoKSwgY2xpcC5tYXhZKCkpLCBMaW5lYXJJbnRlcnBv bGF0aW9uKTsKLSAgICAgICAgZHJhd1JhZGlhbEdyYWRpZW50KGNnQ29udGV4dCwgZ3JhZGllbnRX aXRoTmFtZShTaGluZUdyYWRpZW50KSwgYm90dG9tQ2VudGVyLCAwLCBib3R0b21DZW50ZXIsIHNx cnRmKCh3aWR0aCAqIHdpZHRoKSAvIDQuMGYgKyBoZWlnaHQgKiBoZWlnaHQpLCBFeHBvbmVudGlh bEludGVycG9sYXRpb24pOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgZHJh d0F4aWFsR3JhZGllbnQoY2dDb250ZXh0LCBncmFkaWVudFdpdGhOYW1lKENvbmNhdmVHcmFkaWVu dCksIGNsaXAubG9jYXRpb24oKSwgRmxvYXRQb2ludChjbGlwLngoKSwgY2xpcC5tYXhZKCkpLCBM aW5lYXJJbnRlcnBvbGF0aW9uKTsKIAotICAgIHN0YXRpYyBjb25zdCBmbG9hdCB0aGlja25lc3NS YXRpbyA9IDIgLyAxNC4wOwotICAgIHN0YXRpYyBjb25zdCBDR1NpemUgc2l6ZSA9IHsgMTQuMGYs IDE0LjBmIH07Ci0gICAgZmxvYXQgbGluZVdpZHRoID0gc3RkOjptaW4od2lkdGgsIGhlaWdodCkg KiAyLjBmICogdGhpY2tuZXNzUmF0aW87CisgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBz dGF0ZVNhdmVyIHsgcGFpbnRJbmZvLmNvbnRleHQoKSB9OworICAgIGF1dG8gY2xpcCA9IGFkZFJv dW5kZWRCb3JkZXJDbGlwKGJveCwgcGFpbnRJbmZvLmNvbnRleHQoKSwgcmVjdCk7CisgICAgZmxv YXQgd2lkdGggPSBjbGlwLndpZHRoKCk7CisgICAgZmxvYXQgaGVpZ2h0ID0gY2xpcC5oZWlnaHQo KTsKIAotICAgIFZlY3RvcjxDR1BvaW50PiBsaW5lOwotICAgIFZlY3RvcjxDR1BvaW50PiBzaGFk b3c7CisgICAgaWYgKGNoZWNrZWQgfHwgaW5kZXRlcm1pbmF0ZSkgeworICAgICAgICBkcmF3QXhp YWxHcmFkaWVudChjZ0NvbnRleHQsIGdyYWRpZW50V2l0aE5hbWUoQ29uY2F2ZUdyYWRpZW50KSwg Y2xpcC5sb2NhdGlvbigpLCBGbG9hdFBvaW50IHsgY2xpcC54KCksIGNsaXAubWF4WSgpIH0sIExp bmVhckludGVycG9sYXRpb24pOworCisgICAgICAgIGNvbnN0ZXhwciBmbG9hdCB0aGlja25lc3NS YXRpbyA9IDIgLyAxNC4wOworICAgICAgICBmbG9hdCBsaW5lV2lkdGggPSBzdGQ6Om1pbih3aWR0 aCwgaGVpZ2h0KSAqIDIuMGYgKiB0aGlja25lc3NSYXRpbzsKKworICAgICAgICBWZWN0b3I8Q0dQ b2ludCwgMz4gbGluZTsKKyAgICAgICAgVmVjdG9yPENHUG9pbnQsIDM+IHNoYWRvdzsKKyAgICAg ICAgaWYgKGNoZWNrZWQpIHsKKyAgICAgICAgICAgIGNvbnN0ZXhwciBDR1NpemUgc2l6ZSB7IDE0 LjBmLCAxNC4wZiB9OworICAgICAgICAgICAgY29uc3RleHByIENHUG9pbnQgcGF0aFJhdGlvc1td ID0geworICAgICAgICAgICAgICAgIHsgMi41ZiAvIHNpemUud2lkdGgsIDcuNWYgLyBzaXplLmhl aWdodCB9LAorICAgICAgICAgICAgICAgIHsgNS41ZiAvIHNpemUud2lkdGgsIDEwLjVmIC8gc2l6 ZS5oZWlnaHQgfSwKKyAgICAgICAgICAgICAgICB7IDExLjVmIC8gc2l6ZS53aWR0aCwgMi41ZiAv IHNpemUuaGVpZ2h0IH0KKyAgICAgICAgICAgIH07CisKKyAgICAgICAgICAgIGxpbmUudW5jaGVj a2VkQXBwZW5kKENHUG9pbnRNYWtlKGNsaXAueCgpICsgd2lkdGggKiBwYXRoUmF0aW9zWzBdLngs IGNsaXAueSgpICsgaGVpZ2h0ICogcGF0aFJhdGlvc1swXS55KSk7CisgICAgICAgICAgICBsaW5l LnVuY2hlY2tlZEFwcGVuZChDR1BvaW50TWFrZShjbGlwLngoKSArIHdpZHRoICogcGF0aFJhdGlv c1sxXS54LCBjbGlwLnkoKSArIGhlaWdodCAqIHBhdGhSYXRpb3NbMV0ueSkpOworICAgICAgICAg ICAgbGluZS51bmNoZWNrZWRBcHBlbmQoQ0dQb2ludE1ha2UoY2xpcC54KCkgKyB3aWR0aCAqIHBh dGhSYXRpb3NbMl0ueCwgY2xpcC55KCkgKyBoZWlnaHQgKiBwYXRoUmF0aW9zWzJdLnkpKTsKKwor ICAgICAgICAgICAgc2hhZG93LnVuY2hlY2tlZEFwcGVuZChzaG9ydGVuZWQobGluZVswXSwgbGlu ZVsxXSwgbGluZVdpZHRoIC8gNC4wZikpOworICAgICAgICAgICAgc2hhZG93LnVuY2hlY2tlZEFw cGVuZChsaW5lWzFdKTsKKyAgICAgICAgICAgIHNoYWRvdy51bmNoZWNrZWRBcHBlbmQoc2hvcnRl bmVkKGxpbmVbMl0sIGxpbmVbMV0sIGxpbmVXaWR0aCAvIDQuMGYpKTsKKyAgICAgICAgfSBlbHNl IHsKKyAgICAgICAgICAgIGxpbmUudW5jaGVja2VkQXBwZW5kKENHUG9pbnRNYWtlKGNsaXAueCgp ICsgMy41LCBjbGlwLmNlbnRlcigpLnkoKSkpOworICAgICAgICAgICAgbGluZS51bmNoZWNrZWRB cHBlbmQoQ0dQb2ludE1ha2UoY2xpcC5tYXhYKCkgLSAzLjUsIGNsaXAuY2VudGVyKCkueSgpKSk7 CiAKLSAgICBpZiAoY2hlY2tlZCkgewotICAgICAgICBzdGF0aWMgY29uc3QgQ0dQb2ludCBwYXRo UmF0aW9zWzNdID0gewotICAgICAgICAgICAgeyAyLjVmIC8gc2l6ZS53aWR0aCwgNy41ZiAvIHNp emUuaGVpZ2h0IH0sCi0gICAgICAgICAgICB7IDUuNWYgLyBzaXplLndpZHRoLCAxMC41ZiAvIHNp emUuaGVpZ2h0IH0sCi0gICAgICAgICAgICB7IDExLjVmIC8gc2l6ZS53aWR0aCwgMi41ZiAvIHNp emUuaGVpZ2h0IH0KLSAgICAgICAgfTsKKyAgICAgICAgICAgIHNoYWRvdy51bmNoZWNrZWRBcHBl bmQoc2hvcnRlbmVkKGxpbmVbMF0sIGxpbmVbMV0sIGxpbmVXaWR0aCAvIDQuMGYpKTsKKyAgICAg ICAgICAgIHNoYWRvdy51bmNoZWNrZWRBcHBlbmQoc2hvcnRlbmVkKGxpbmVbMV0sIGxpbmVbMF0s IGxpbmVXaWR0aCAvIDQuMGYpKTsKKyAgICAgICAgfQogCi0gICAgICAgIGxpbmUgPSB7Ci0gICAg ICAgICAgICBDR1BvaW50TWFrZShjbGlwLngoKSArIHdpZHRoICogcGF0aFJhdGlvc1swXS54LCBj bGlwLnkoKSArIGhlaWdodCAqIHBhdGhSYXRpb3NbMF0ueSksCi0gICAgICAgICAgICBDR1BvaW50 TWFrZShjbGlwLngoKSArIHdpZHRoICogcGF0aFJhdGlvc1sxXS54LCBjbGlwLnkoKSArIGhlaWdo dCAqIHBhdGhSYXRpb3NbMV0ueSksCi0gICAgICAgICAgICBDR1BvaW50TWFrZShjbGlwLngoKSAr IHdpZHRoICogcGF0aFJhdGlvc1syXS54LCBjbGlwLnkoKSArIGhlaWdodCAqIHBhdGhSYXRpb3Nb Ml0ueSkKLSAgICAgICAgfTsKKyAgICAgICAgbGluZVdpZHRoID0gc3RkOjptYXg8ZmxvYXQ+KGxp bmVXaWR0aCwgMSk7CisgICAgICAgIGRyYXdKb2luZWRMaW5lcyhjZ0NvbnRleHQsIFZlY3RvcjxD R1BvaW50PiB7IFdURk1vdmUoc2hhZG93KSB9LCBrQ0dMaW5lQ2FwU3F1YXJlLCBsaW5lV2lkdGgs IENvbG9yIHsgMC4wZiwgMC4wZiwgMC4wZiwgMC43ZiB9KTsKIAotICAgICAgICBzaGFkb3cgPSB7 Ci0gICAgICAgICAgICBzaG9ydGVuZWQobGluZVswXSwgbGluZVsxXSwgbGluZVdpZHRoIC8gNC4w ZiksCi0gICAgICAgICAgICBsaW5lWzFdLAotICAgICAgICAgICAgc2hvcnRlbmVkKGxpbmVbMl0s IGxpbmVbMV0sIGxpbmVXaWR0aCAvIDQuMGYpCi0gICAgICAgIH07Ci0gICAgfSBlbHNlIGlmIChp bmRldGVybWluYXRlKSB7Ci0gICAgICAgIGxpbmUgPSB7Ci0gICAgICAgICAgICBDR1BvaW50TWFr ZShjbGlwLngoKSArIDMuNSwgY2xpcC5jZW50ZXIoKS55KCkpLAotICAgICAgICAgICAgQ0dQb2lu dE1ha2UoY2xpcC5tYXhYKCkgLSAzLjUsIGNsaXAuY2VudGVyKCkueSgpKQotICAgICAgICB9Owor ICAgICAgICBsaW5lV2lkdGggPSBzdGQ6Om1heDxmbG9hdD4oc3RkOjptaW4oY2xpcC53aWR0aCgp LCBjbGlwLmhlaWdodCgpKSAqIHRoaWNrbmVzc1JhdGlvLCAxKTsKKyAgICAgICAgZHJhd0pvaW5l ZExpbmVzKGNnQ29udGV4dCwgVmVjdG9yPENHUG9pbnQ+IHsgV1RGTW92ZShsaW5lKSB9LCBrQ0dM aW5lQ2FwQnV0dCwgbGluZVdpZHRoLCBDb2xvciB7IDEuMGYsIDEuMGYsIDEuMGYsIDI0MCAvIDI1 NS4wZiB9KTsKKyAgICB9IGVsc2UgeworICAgICAgICBGbG9hdFBvaW50IGJvdHRvbUNlbnRlciB7 IGNsaXAueCgpICsgY2xpcC53aWR0aCgpIC8gMi4wZiwgY2xpcC5tYXhZKCkgfTsKIAotICAgICAg ICBzaGFkb3cgPSB7Ci0gICAgICAgICAgICBzaG9ydGVuZWQobGluZVswXSwgbGluZVsxXSwgbGlu ZVdpZHRoIC8gNC4wZiksCi0gICAgICAgICAgICBzaG9ydGVuZWQobGluZVsxXSwgbGluZVswXSwg bGluZVdpZHRoIC8gNC4wZikKLSAgICAgICAgfTsKKyAgICAgICAgZHJhd0F4aWFsR3JhZGllbnQo Y2dDb250ZXh0LCBncmFkaWVudFdpdGhOYW1lKFNoYWRlR3JhZGllbnQpLCBjbGlwLmxvY2F0aW9u KCksIEZsb2F0UG9pbnQgeyBjbGlwLngoKSwgY2xpcC5tYXhZKCkgfSwgTGluZWFySW50ZXJwb2xh dGlvbik7CisgICAgICAgIGRyYXdSYWRpYWxHcmFkaWVudChjZ0NvbnRleHQsIGdyYWRpZW50V2l0 aE5hbWUoU2hpbmVHcmFkaWVudCksIGJvdHRvbUNlbnRlciwgMCwgYm90dG9tQ2VudGVyLCBzcXJ0 Zigod2lkdGggKiB3aWR0aCkgLyA0LjBmICsgaGVpZ2h0ICogaGVpZ2h0KSwgRXhwb25lbnRpYWxJ bnRlcnBvbGF0aW9uKTsKICAgICB9Ci0KLSAgICBsaW5lV2lkdGggPSBzdGQ6Om1heDxmbG9hdD4o bGluZVdpZHRoLCAxKTsKLSAgICBkcmF3Sm9pbmVkTGluZXMoY2dDb250ZXh0LCBzaGFkb3csIGtD R0xpbmVDYXBTcXVhcmUsIGxpbmVXaWR0aCwgQ29sb3IoMC4wZiwgMC4wZiwgMC4wZiwgMC43Zikp OwotCi0gICAgbGluZVdpZHRoID0gc3RkOjptYXg8ZmxvYXQ+KHN0ZDo6bWluKGNsaXAud2lkdGgo KSwgY2xpcC5oZWlnaHQoKSkgKiB0aGlja25lc3NSYXRpbywgMSk7Ci0gICAgZHJhd0pvaW5lZExp bmVzKGNnQ29udGV4dCwgbGluZSwga0NHTGluZUNhcEJ1dHQsIGxpbmVXaWR0aCwgQ29sb3IoMS4w ZiwgMS4wZiwgMS4wZiwgMjQwIC8gMjU1LjBmKSk7Ci0KICAgICByZXR1cm4gZmFsc2U7CiB9CiAK