188885 2018-08-23 04:41:22 -0700 Use OptionSet::containsAny and containsAll in some more places 2018-08-24 00:44:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue sam webkit-bug-importer oldest_to_newest 1453038 0 koivisto 2018-08-23 04:41:22 -0700 Improve readability. 1453039 1 347919 koivisto 2018-08-23 04:46:58 -0700 Created attachment 347919 patch 1453407 2 347919 commit-queue 2018-08-24 00:43:52 -0700 Comment on attachment 347919 patch Clearing flags on attachment: 347919 Committed r235281: <https://trac.webkit.org/changeset/235281> 1453408 3 commit-queue 2018-08-24 00:43:53 -0700 All reviewed patches have been landed. Closing bug. 1453409 4 webkit-bug-importer 2018-08-24 00:44:19 -0700 <rdar://problem/43675378> 347919 2018-08-23 04:46:58 -0700 2018-08-24 00:43:52 -0700 patch optionset-containsall-webcore.patch text/plain 4900 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTIyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA4LTIzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgT3B0aW9uU2V0Ojpjb250 YWluc0FueSBhbmQgY29udGFpbnNBbGwgaW4gc29tZSBtb3JlIHBsYWNlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4ODg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BlcmZvcm1hbmNlTW9u aXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5 U3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zQWZ0ZXJTY3Jv bGwpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzIGNvbnN0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6flJlbmRlckxheWVyQmFja2luZyk6CisKIDIw MTgtMDgtMjIgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAg IFtDb29yZEdyYXBoaWNzXSBEcm9wIG9sZC1zY2hvb2wgUGxhdGZvcm1MYXllciBtYW5hZ2VtZW50 IGluIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Q ZXJmb3JtYW5jZU1vbml0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv UGVyZm9ybWFuY2VNb25pdG9yLmNwcAkocmV2aXNpb24gMjM1MjIwKQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9QZXJmb3JtYW5jZU1vbml0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsNyAr MTMxLDcgQEAgdm9pZCBQZXJmb3JtYW5jZU1vbml0b3I6OmFjdGl2aXR5U3RhdGVDaAogICAgICAg ICAgICAgbV9wb3N0QmFja2dyb3VuZGluZ01lbW9yeVVzYWdlVGltZXIuc3RhcnRPbmVTaG90KG1l bW9yeVVzYWdlTWVhc3VyZW1lbnREZWxheSk7CiAgICAgfQogCi0gICAgaWYgKG5ld1N0YXRlICYg QWN0aXZpdHlTdGF0ZTo6SXNWaXNpYmxlICYmIG5ld1N0YXRlICYgQWN0aXZpdHlTdGF0ZTo6V2lu ZG93SXNBY3RpdmUpIHsKKyAgICBpZiAobmV3U3RhdGUuY29udGFpbnNBbGwoeyBBY3Rpdml0eVN0 YXRlOjpJc1Zpc2libGUsIEFjdGl2aXR5U3RhdGU6OldpbmRvd0lzQWN0aXZlIH0pKSB7CiAgICAg ICAgIG1fcHJvY2Vzc01heUJlY29tZUluYWN0aXZlID0gZmFsc2U7CiAgICAgICAgIG1fcHJvY2Vz c01heUJlY29tZUluYWN0aXZlVGltZXIuc3RvcCgpOwogICAgIH0gZWxzZSBpZiAoIW1fcHJvY2Vz c01heUJlY29tZUluYWN0aXZlICYmICFtX3Byb2Nlc3NNYXlCZWNvbWVJbmFjdGl2ZVRpbWVyLmlz QWN0aXZlKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJ KHJldmlzaW9uIDIzNTIyMCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1Myw3ICs4NTMsNyBAQCB2b2lkIFJlbmRlckxheWVy Ojp1cGRhdGVMYXllclBvc2l0aW9uc0FmCiAgICAgaWYgKHBvc2l0aW9uQ2hhbmdlZCkKICAgICAg ICAgZmxhZ3MgfD0gSGFzQ2hhbmdlZEFuY2VzdG9yOwogCi0gICAgaWYgKGZsYWdzICYgSGFzQ2hh bmdlZEFuY2VzdG9yIHx8IGZsYWdzICYgSGFzU2VlblZpZXdwb3J0Q29uc3RyYWluZWRBbmNlc3Rv ciB8fCBmbGFncyAmIElzT3ZlcmZsb3dTY3JvbGwpCisgICAgaWYgKGZsYWdzLmNvbnRhaW5zQW55 KHsgSGFzQ2hhbmdlZEFuY2VzdG9yLCBIYXNTZWVuVmlld3BvcnRDb25zdHJhaW5lZEFuY2VzdG9y LCBJc092ZXJmbG93U2Nyb2xsIH0pKQogICAgICAgICBjbGVhckNsaXBSZWN0cygpOwogCiAgICAg aWYgKHJlbmRlcmVyKCkuc3R5bGUoKS5oYXNWaWV3cG9ydENvbnN0cmFpbmVkUG9zaXRpb24oKSkK QEAgLTg2Miw3ICs4NjIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9u c0FmCiAgICAgaWYgKHJlbmRlcmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkpCiAgICAgICAgIGZsYWdz IHw9IEhhc1NlZW5BbmNlc3RvcldpdGhPdmVyZmxvd0NsaXA7CiAgICAgCi0gICAgYm9vbCBzaG91 bGRDb21wdXRlUmVwYWludFJlY3RzID0gKGZsYWdzICYgSGFzU2VlblZpZXdwb3J0Q29uc3RyYWlu ZWRBbmNlc3RvciB8fCAoZmxhZ3MgJiBJc092ZXJmbG93U2Nyb2xsICYmIGZsYWdzICYgSGFzU2Vl bkFuY2VzdG9yV2l0aE92ZXJmbG93Q2xpcCkpICYmIGlzU2VsZlBhaW50aW5nTGF5ZXIoKTsKKyAg ICBib29sIHNob3VsZENvbXB1dGVSZXBhaW50UmVjdHMgPSAoZmxhZ3MuY29udGFpbnMoSGFzU2Vl blZpZXdwb3J0Q29uc3RyYWluZWRBbmNlc3RvcikgfHwgZmxhZ3MuY29udGFpbnNBbGwoeyBJc092 ZXJmbG93U2Nyb2xsLCBIYXNTZWVuQW5jZXN0b3JXaXRoT3ZlcmZsb3dDbGlwIH0pKSAmJiBpc1Nl bGZQYWludGluZ0xheWVyKCk7CiAgICAgYm9vbCBpc1Zpc3VhbGx5RW1wdHkgPSAhaXNWaXN1YWxs eU5vbkVtcHR5KCk7CiAgICAgYm9vbCBzaG91bGRQdXNoQW5kUG9wTWFwcGluZ3MgPSBnZW9tZXRy eU1hcCAmJiAoKHNob3VsZENvbXB1dGVSZXBhaW50UmVjdHMgJiYgIWlzVmlzdWFsbHlFbXB0eSkg fHwgZmlyc3RDaGlsZCgpKTsKICAgICBpZiAoc2hvdWxkUHVzaEFuZFBvcE1hcHBpbmdzKQpAQCAt NDQ1Niw3ICs0NDU2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRlbnRzKEdy YQogICAgICAgICAgICAgcGFpbnRDaGlsZENsaXBwaW5nTWFza0ZvckZyYWdtZW50cyhsYXllckZy YWdtZW50cywgY29udGV4dCwgcGFpbnRpbmdJbmZvLCBwYWludEJlaGF2aW9yLCBzdWJ0cmVlUGFp bnRSb290Rm9yUmVuZGVyZXIpOwogICAgICAgICB9CiAgICAgICAgIAotICAgICAgICBpZiAoKGxv Y2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJQYWludGluZ0NoaWxkQ2xpcHBpbmdNYXNrUGhhc2Up KSB7CisgICAgICAgIGlmIChsb2NhbFBhaW50RmxhZ3MgJiBQYWludExheWVyUGFpbnRpbmdDaGls ZENsaXBwaW5nTWFza1BoYXNlKSB7CiAgICAgICAgICAgICAvLyBQYWludCB0aGUgYm9yZGVyIHJh ZGl1cyBtYXNrIGZvciB0aGUgZnJhZ21lbnRzLgogICAgICAgICAgICAgcGFpbnRDaGlsZENsaXBw aW5nTWFza0ZvckZyYWdtZW50cyhsYXllckZyYWdtZW50cywgY29udGV4dCwgcGFpbnRpbmdJbmZv LCBwYWludEJlaGF2aW9yLCBzdWJ0cmVlUGFpbnRSb290Rm9yUmVuZGVyZXIpOwogICAgICAgICB9 CkBAIC01NzcxLDcgKzU3NzEsNyBAQCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpib3VuZGluZ0Jv eChjb25zCiAgICAgICAgIGluY2x1c2lvbk1vZGUgPSBJbmNsdWRlQ29tcG9zaXRlZFBhZ2luYXRl ZExheWVyczsKIAogICAgIGNvbnN0IFJlbmRlckxheWVyKiBwYWdpbmF0aW9uTGF5ZXIgPSBudWxs cHRyOwotICAgIGlmIChmbGFncyAmIFVzZUZyYWdtZW50Qm94ZXNFeGNsdWRpbmdDb21wb3NpdGlu ZyB8fCBmbGFncyAmIFVzZUZyYWdtZW50Qm94ZXNJbmNsdWRpbmdDb21wb3NpdGluZykKKyAgICBp ZiAoZmxhZ3MuY29udGFpbnNBbnkoeyBVc2VGcmFnbWVudEJveGVzRXhjbHVkaW5nQ29tcG9zaXRp bmcsIFVzZUZyYWdtZW50Qm94ZXNJbmNsdWRpbmdDb21wb3NpdGluZyB9KSkKICAgICAgICAgcGFn aW5hdGlvbkxheWVyID0gZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVySW5TdWJ0cmVlKGFuY2VzdG9y TGF5ZXIsIGluY2x1c2lvbk1vZGUpOwogICAgIAogICAgIGNvbnN0IFJlbmRlckxheWVyKiBjaGls ZExheWVyID0gdGhpczsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckJhY2tpbmcuY3BwCShyZXZpc2lvbiAyMzUyMjApCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQ1LDcg KzI0NSw3IEBAIFJlbmRlckxheWVyQmFja2luZzo6flJlbmRlckxheWVyQmFja2luZygKICAgICB1 cGRhdGVCYWNrZ3JvdW5kTGF5ZXIoZmFsc2UpOwogICAgIHVwZGF0ZU1hc2tpbmdMYXllcihmYWxz ZSwgZmFsc2UpOwogICAgIHVwZGF0ZVNjcm9sbGluZ0xheWVycyhmYWxzZSk7Ci0gICAgZGV0YWNo RnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKHtTY3JvbGxpbmcsIFZpZXdwb3J0Q29uc3RyYWluZWQg fSk7CisgICAgZGV0YWNoRnJvbVNjcm9sbGluZ0Nvb3JkaW5hdG9yKHsgU2Nyb2xsaW5nLCBWaWV3 cG9ydENvbnN0cmFpbmVkIH0pOwogICAgIGRlc3Ryb3lHcmFwaGljc0xheWVycygpOwogfQogCg==