171692 2017-05-04 14:26:33 -0700 Use if instead of return early for 13 places in WebAVPlayerController 2017-05-04 17:57:55 -0700 1 1 1 Unclassified WebKit Media WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue jer.noble oldest_to_newest 1304838 0 jeremyj-wk 2017-05-04 14:26:33 -0700 From feedback on https://bugs.webkit.org/show_bug.cgi?id=171592 > Source/WebCore/platform/ios/WebAVPlayerController.mm:433 > + UNUSED_PARAM(sender); > + if (!self.delegate) > + return; > + self.delegate->toggleMuted(); Nit: this could probably just drop the ! from the if and skip the return. 1304896 1 309114 jeremyj-wk 2017-05-04 16:54:18 -0700 Created attachment 309114 Patch 1304920 2 309114 commit-queue 2017-05-04 17:57:54 -0700 Comment on attachment 309114 Patch Clearing flags on attachment: 309114 Committed r216221: <http://trac.webkit.org/changeset/216221> 1304921 3 commit-queue 2017-05-04 17:57:55 -0700 All reviewed patches have been landed. Closing bug. 309114 2017-05-04 16:54:18 -0700 2017-05-04 17:57:54 -0700 Patch bug-171692-20170504165417.patch text/plain 5147 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwYzRkZjBlZDExZjg2 YTE3MTlhZDlkZWJjODMyMjI1YTZmNTdlZi4uMTQ2Yzg4ZTE1ZjE1YTRmYTJhNzY4ZWE0MThkZWFk YjJhZmY1NmNlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA1LTA0ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgaWYgaW5zdGVhZCBv ZiByZXR1cm4gZWFybHkgZm9yIDEzIHBsYWNlcyBpbiBXZWJBVlBsYXllckNvbnRyb2xsZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTY5MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyBiZWNhdXNlIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9X ZWJBVlBsYXllckNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYkFWUGxheWVyQ29udHJvbGxl ciBwbGF5Ol0pOgorICAgICAgICAoLVtXZWJBVlBsYXllckNvbnRyb2xsZXIgcGF1c2U6XSk6Cisg ICAgICAgICgtW1dlYkFWUGxheWVyQ29udHJvbGxlciB0b2dnbGVQbGF5YmFjazpdKToKKyAgICAg ICAgKC1bV2ViQVZQbGF5ZXJDb250cm9sbGVyIGJlZ2luU2NydWJiaW5nOl0pOgorICAgICAgICAo LVtXZWJBVlBsYXllckNvbnRyb2xsZXIgZW5kU2NydWJiaW5nOl0pOgorICAgICAgICAoLVtXZWJB VlBsYXllckNvbnRyb2xsZXIgc2Vla1RvVGltZTpdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJD b250cm9sbGVyIGJlZ2luU2Nhbm5pbmdGb3J3YXJkOl0pOgorICAgICAgICAoLVtXZWJBVlBsYXll ckNvbnRyb2xsZXIgZW5kU2Nhbm5pbmdGb3J3YXJkOl0pOgorICAgICAgICAoLVtXZWJBVlBsYXll ckNvbnRyb2xsZXIgYmVnaW5TY2FubmluZ0JhY2t3YXJkOl0pOgorICAgICAgICAoLVtXZWJBVlBs YXllckNvbnRyb2xsZXIgZW5kU2Nhbm5pbmdCYWNrd2FyZDpdKToKKyAgICAgICAgKC1bV2ViQVZQ bGF5ZXJDb250cm9sbGVyIHNlZWtUb0JlZ2lubmluZzpdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5 ZXJDb250cm9sbGVyIHNlZWtUb0VuZDpdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJDb250cm9s bGVyIHRvZ2dsZU11dGVkOl0pOgorCiAyMDE3LTA1LTA0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0Bh cHBsZS5jb20+CiAKICAgICAgICAgSlNDOjpIZWFwIHNob3VsZCBleHBvc2UgYSByaWNoZXIgQVBJ IGZvciByZXF1ZXN0aW5nIEdDcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYkFWUGxheWVyQ29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lv cy9XZWJBVlBsYXllckNvbnRyb2xsZXIubW0KaW5kZXggNTc3ZjMxMDlmODYxMWE1YjdlY2UxNDRi NzlmZThlYzAyMDhlNDI3Mi4uYTUzZmYxZmU2OTM0MTdjYmIzNTJkMjY4NDI3OWExMzc5YjBkMDg4 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkFWUGxheWVyQ29u dHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQVZQbGF5ZXJD b250cm9sbGVyLm1tCkBAIC04OCwyNSArODgsMjIgQEAgLSAoaWQpZm9yd2FyZGluZ1RhcmdldEZv clNlbGVjdG9yOihTRUwpc2VsZWN0b3IKIC0gKHZvaWQpcGxheTooaWQpc2VuZGVyCiB7CiAgICAg VU5VU0VEX1BBUkFNKHNlbmRlcik7Ci0gICAgaWYgKCFzZWxmLmRlbGVnYXRlKQotICAgICAgICBy ZXR1cm47Ci0gICAgc2VsZi5kZWxlZ2F0ZS0+cGxheSgpOworICAgIGlmIChzZWxmLmRlbGVnYXRl KQorICAgICAgICBzZWxmLmRlbGVnYXRlLT5wbGF5KCk7CiB9CiAKIC0gKHZvaWQpcGF1c2U6KGlk KXNlbmRlcgogewogICAgIFVOVVNFRF9QQVJBTShzZW5kZXIpOwotICAgIGlmICghc2VsZi5kZWxl Z2F0ZSkKLSAgICAgICAgcmV0dXJuOwotICAgIHNlbGYuZGVsZWdhdGUtPnBhdXNlKCk7CisgICAg aWYgKHNlbGYuZGVsZWdhdGUpCisgICAgICAgIHNlbGYuZGVsZWdhdGUtPnBhdXNlKCk7CiB9CiAK IC0gKHZvaWQpdG9nZ2xlUGxheWJhY2s6KGlkKXNlbmRlcgogewogICAgIFVOVVNFRF9QQVJBTShz ZW5kZXIpOwotICAgIGlmICghc2VsZi5kZWxlZ2F0ZSkKLSAgICAgICAgcmV0dXJuOwotICAgIHNl bGYuZGVsZWdhdGUtPnRvZ2dsZVBsYXlTdGF0ZSgpOworICAgIGlmIChzZWxmLmRlbGVnYXRlKQor ICAgICAgICBzZWxmLmRlbGVnYXRlLT50b2dnbGVQbGF5U3RhdGUoKTsKIH0KIAogLSAodm9pZCl0 b2dnbGVQbGF5YmFja0V2ZW5XaGVuSW5CYWNrZ3JvdW5kOihpZClzZW5kZXIKQEAgLTEzNywyNCAr MTM0LDIxIEBAICsgKE5TU2V0ICopa2V5UGF0aHNGb3JWYWx1ZXNBZmZlY3RpbmdQbGF5aW5nCiAt ICh2b2lkKWJlZ2luU2NydWJiaW5nOihpZClzZW5kZXIKIHsKICAgICBVTlVTRURfUEFSQU0oc2Vu ZGVyKTsKLSAgICBpZiAoIXNlbGYuZGVsZWdhdGUpCi0gICAgICAgIHJldHVybjsKLSAgICBzZWxm LmRlbGVnYXRlLT5iZWdpblNjcnViYmluZygpOworICAgIGlmIChzZWxmLmRlbGVnYXRlKQorICAg ICAgICBzZWxmLmRlbGVnYXRlLT5iZWdpblNjcnViYmluZygpOwogfQogCiAtICh2b2lkKWVuZFNj cnViYmluZzooaWQpc2VuZGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHNlbmRlcik7Ci0gICAgaWYg KCFzZWxmLmRlbGVnYXRlKQotICAgICAgICByZXR1cm47Ci0gICAgc2VsZi5kZWxlZ2F0ZS0+ZW5k U2NydWJiaW5nKCk7CisgICAgaWYgKHNlbGYuZGVsZWdhdGUpCisgICAgICAgIHNlbGYuZGVsZWdh dGUtPmVuZFNjcnViYmluZygpOwogfQogCiAtICh2b2lkKXNlZWtUb1RpbWU6KE5TVGltZUludGVy dmFsKXRpbWUKIHsKLSAgICBpZiAoIXNlbGYuZGVsZWdhdGUpCi0gICAgICAgIHJldHVybjsKLSAg ICBzZWxmLmRlbGVnYXRlLT5mYXN0U2Vlayh0aW1lKTsKKyAgICBpZiAoc2VsZi5kZWxlZ2F0ZSkK KyAgICAgICAgc2VsZi5kZWxlZ2F0ZS0+ZmFzdFNlZWsodGltZSk7CiB9CiAKIC0gKE5TVGltZUlu dGVydmFsKWN1cnJlbnRUaW1lV2l0aGluRW5kVGltZXMKQEAgLTIzMSwzMyArMjI1LDI5IEBAICsg KE5TU2V0ICopa2V5UGF0aHNGb3JWYWx1ZXNBZmZlY3RpbmdDYW5TY2FuRm9yd2FyZAogLSAodm9p ZCliZWdpblNjYW5uaW5nRm9yd2FyZDooaWQpc2VuZGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHNl bmRlcik7Ci0gICAgaWYgKCFzZWxmLmRlbGVnYXRlKQotICAgICAgICByZXR1cm47Ci0gICAgc2Vs Zi5kZWxlZ2F0ZS0+YmVnaW5TY2FubmluZ0ZvcndhcmQoKTsKKyAgICBpZiAoc2VsZi5kZWxlZ2F0 ZSkKKyAgICAgICAgc2VsZi5kZWxlZ2F0ZS0+YmVnaW5TY2FubmluZ0ZvcndhcmQoKTsKIH0KIAog LSAodm9pZCllbmRTY2FubmluZ0ZvcndhcmQ6KGlkKXNlbmRlcgogewogICAgIFVOVVNFRF9QQVJB TShzZW5kZXIpOwotICAgIGlmICghc2VsZi5kZWxlZ2F0ZSkKLSAgICAgICAgcmV0dXJuOwotICAg IHNlbGYuZGVsZWdhdGUtPmVuZFNjYW5uaW5nKCk7CisgICAgaWYgKHNlbGYuZGVsZWdhdGUpCisg ICAgICAgIHNlbGYuZGVsZWdhdGUtPmVuZFNjYW5uaW5nKCk7CiB9CiAKIC0gKHZvaWQpYmVnaW5T Y2FubmluZ0JhY2t3YXJkOihpZClzZW5kZXIKIHsKICAgICBVTlVTRURfUEFSQU0oc2VuZGVyKTsK LSAgICBpZiAoIXNlbGYuZGVsZWdhdGUpCi0gICAgICAgIHJldHVybjsKLSAgICBzZWxmLmRlbGVn YXRlLT5iZWdpblNjYW5uaW5nQmFja3dhcmQoKTsKKyAgICBpZiAoc2VsZi5kZWxlZ2F0ZSkKKyAg ICAgICAgc2VsZi5kZWxlZ2F0ZS0+YmVnaW5TY2FubmluZ0JhY2t3YXJkKCk7CiB9CiAKIC0gKHZv aWQpZW5kU2Nhbm5pbmdCYWNrd2FyZDooaWQpc2VuZGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHNl bmRlcik7Ci0gICAgaWYgKCFzZWxmLmRlbGVnYXRlKQotICAgICAgICByZXR1cm47Ci0gICAgc2Vs Zi5kZWxlZ2F0ZS0+ZW5kU2Nhbm5pbmcoKTsKKyAgICBpZiAoc2VsZi5kZWxlZ2F0ZSkKKyAgICAg ICAgc2VsZi5kZWxlZ2F0ZS0+ZW5kU2Nhbm5pbmcoKTsKIH0KIAogLSAoQk9PTCljYW5TZWVrVG9C ZWdpbm5pbmcKQEAgLTI3OCw5ICsyNjgsOCBAQCArIChOU1NldCAqKWtleVBhdGhzRm9yVmFsdWVz QWZmZWN0aW5nQ2FuU2Vla1RvQmVnaW5uaW5nCiAtICh2b2lkKXNlZWtUb0JlZ2lubmluZzooaWQp c2VuZGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHNlbmRlcik7Ci0gICAgaWYgKCFzZWxmLmRlbGVn YXRlKQotICAgICAgICByZXR1cm47Ci0gICAgc2VsZi5kZWxlZ2F0ZS0+c2Vla1RvVGltZSgtSU5G SU5JVFkpOworICAgIGlmIChzZWxmLmRlbGVnYXRlKQorICAgICAgICBzZWxmLmRlbGVnYXRlLT5z ZWVrVG9UaW1lKC1JTkZJTklUWSk7CiB9CiAKIC0gKHZvaWQpc2Vla0NoYXB0ZXJCYWNrd2FyZDoo aWQpc2VuZGVyCkBAIC0zMDYsOSArMjk1LDggQEAgKyAoTlNTZXQgKilrZXlQYXRoc0ZvclZhbHVl c0FmZmVjdGluZ0NhblNlZWtUb0VuZAogLSAodm9pZClzZWVrVG9FbmQ6KGlkKXNlbmRlcgogewog ICAgIFVOVVNFRF9QQVJBTShzZW5kZXIpOwotICAgIGlmICghc2VsZi5kZWxlZ2F0ZSkKLSAgICAg ICAgcmV0dXJuOwotICAgIHNlbGYuZGVsZWdhdGUtPnNlZWtUb1RpbWUoSU5GSU5JVFkpOworICAg IGlmIChzZWxmLmRlbGVnYXRlKQorICAgICAgICBzZWxmLmRlbGVnYXRlLT5zZWVrVG9UaW1lKElO RklOSVRZKTsKIH0KIAogLSAodm9pZClzZWVrQ2hhcHRlckZvcndhcmQ6KGlkKXNlbmRlcgpAQCAt NDI4LDkgKzQxNiw4IEBAIC0gKHZvaWQpc2V0UGljdHVyZUluUGljdHVyZUludGVycnVwdGVkOihC T09MKXBpY3R1cmVJblBpY3R1cmVJbnRlcnJ1cHRlZAogLSAodm9pZCl0b2dnbGVNdXRlZDooaWQp c2VuZGVyCiB7CiAgICAgVU5VU0VEX1BBUkFNKHNlbmRlcik7Ci0gICAgaWYgKCFzZWxmLmRlbGVn YXRlKQotICAgICAgICByZXR1cm47Ci0gICAgc2VsZi5kZWxlZ2F0ZS0+dG9nZ2xlTXV0ZWQoKTsK KyAgICBpZiAoc2VsZi5kZWxlZ2F0ZSkKKyAgICAgICAgc2VsZi5kZWxlZ2F0ZS0+dG9nZ2xlTXV0 ZWQoKTsKIH0KIAogQGVuZAo=