184993 2018-04-25 13:10:15 -0700 Add lazy initialization of caption display mode for videos. 2018-04-26 08:04:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue dean_johnson eric.carlson graouts jer.noble jonlee webkit-bug-importer oldest_to_newest 1417712 0 pvollan 2018-04-25 13:10:15 -0700 The call to MACaptionAppearanceGetDisplayType in CaptionUserPreferencesMediaAF::captionDisplayMode() is showing up in samples when called from HTMLMediaElement::finishInitialization(). 1417733 1 338781 pvollan 2018-04-25 13:32:08 -0700 Created attachment 338781 Patch 1417810 2 webkit-bug-importer 2018-04-25 15:23:19 -0700 <rdar://problem/39737230> 1418034 3 338781 pvollan 2018-04-26 07:37:50 -0700 Comment on attachment 338781 Patch Thanks for reviewing! 1418037 4 338781 commit-queue 2018-04-26 08:04:22 -0700 Comment on attachment 338781 Patch Clearing flags on attachment: 338781 Committed r231045: <https://trac.webkit.org/changeset/231045> 1418038 5 commit-queue 2018-04-26 08:04:23 -0700 All reviewed patches have been landed. Closing bug. 338781 2018-04-25 13:32:08 -0700 2018-04-26 08:04:22 -0700 Patch bug-184993-20180425133207.patch text/plain 5149 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTAxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA0LTI1ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbGF6eSBpbml0aWFs aXphdGlvbiBvZiBjYXB0aW9uIGRpc3BsYXkgbW9kZSBmb3IgdmlkZW9zLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0OTkzCisKKyAgICAgICAgVGhl IGNhbGwgdG8gTUFDYXB0aW9uQXBwZWFyYW5jZUdldERpc3BsYXlUeXBlIGluIENhcHRpb25Vc2Vy UHJlZmVyZW5jZXNNZWRpYUFGOjpjYXB0aW9uRGlzcGxheU1vZGUoKQorICAgICAgICBpcyBzaG93 aW5nIHVwIGluIHNhbXBsZXMgd2hlbiBjYWxsZWQgZnJvbSBIVE1MTWVkaWFFbGVtZW50OjpmaW5p c2hJbml0aWFsaXphdGlvbigpLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI VE1MTWVkaWFFbGVtZW50OjpmaW5pc2hJbml0aWFsaXphdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzZXRTZWxlY3RlZFRleHRUcmFjayk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckNoYXJhY3RlcmlzdGljQ2hhbmdlZCk6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpjYXB0aW9uUHJlZmVyZW5jZXND aGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNhcHRpb25EaXNw bGF5TW9kZSk6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisKIDIwMTgtMDQt MjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBJbXBs ZW1lbnQgTGF5b3V0OjpDb250YWluZXIgZnVuY3Rpb25zLgpJbmRleDogU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzA5MTUpCisrKyBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NjAsMTEg KzU2MCw2IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZmluaXNoSW5pdGlhbGl6YXQKICAgICB9 CiAjZW5kaWYKIAotI2lmIEVOQUJMRShWSURFT19UUkFDSykKLSAgICBpZiAocGFnZSkKLSAgICAg ICAgbV9jYXB0aW9uRGlzcGxheU1vZGUgPSBwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNl cygpLmNhcHRpb25EaXNwbGF5TW9kZSgpOwotI2VuZGlmCi0KICNpZiBFTkFCTEUoTUVESUFfU0VT U0lPTikKICAgICBtX2VsZW1lbnRJRCA9IG5leHRFbGVtZW50SUQoKTsKICAgICBlbGVtZW50SURz VG9FbGVtZW50cygpLmFkZChtX2VsZW1lbnRJRCwgdGhpcyk7CkBAIC00Mzc2LDEzICs0MzcxLDEz IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0U2VsZWN0ZWRUZXh0VHIKICAgICAgICAgcmV0 dXJuOwogCiAgICAgaWYgKHRyYWNrVG9TZWxlY3QgPT0gVGV4dFRyYWNrOjpjYXB0aW9uTWVudUF1 dG9tYXRpY0l0ZW0oKSkgewotICAgICAgICBpZiAobV9jYXB0aW9uRGlzcGxheU1vZGUgIT0gQ2Fw dGlvblVzZXJQcmVmZXJlbmNlczo6QXV0b21hdGljKQorICAgICAgICBpZiAoY2FwdGlvbkRpc3Bs YXlNb2RlKCkgIT0gQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6QXV0b21hdGljKQogICAgICAgICAg ICAgbV90ZXh0VHJhY2tzLT5zY2hlZHVsZUNoYW5nZUV2ZW50KCk7CiAgICAgfSBlbHNlIGlmICh0 cmFja1RvU2VsZWN0ID09IFRleHRUcmFjazo6Y2FwdGlvbk1lbnVPZmZJdGVtKCkpIHsKICAgICAg ICAgZm9yIChpbnQgaSA9IDAsIGxlbmd0aCA9IHRyYWNrTGlzdC5sZW5ndGgoKTsgaSA8IGxlbmd0 aDsgKytpKQogICAgICAgICAgICAgdHJhY2tMaXN0Lml0ZW0oaSktPnNldE1vZGUoVGV4dFRyYWNr OjpNb2RlOjpEaXNhYmxlZCk7CiAKLSAgICAgICAgaWYgKG1fY2FwdGlvbkRpc3BsYXlNb2RlICE9 IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OkZvcmNlZE9ubHkgJiYgIXRyYWNrTGlzdC5pc0NoYW5n ZUV2ZW50U2NoZWR1bGVkKCkpCisgICAgICAgIGlmIChjYXB0aW9uRGlzcGxheU1vZGUoKSAhPSBD YXB0aW9uVXNlclByZWZlcmVuY2VzOjpGb3JjZWRPbmx5ICYmICF0cmFja0xpc3QuaXNDaGFuZ2VF dmVudFNjaGVkdWxlZCgpKQogICAgICAgICAgICAgbV90ZXh0VHJhY2tzLT5zY2hlZHVsZUNoYW5n ZUV2ZW50KCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKCF0cmFja1RvU2VsZWN0IHx8ICF0 cmFja0xpc3QuY29udGFpbnMoKnRyYWNrVG9TZWxlY3QpKQpAQCAtNTAxNiw3ICs1MDExLDcgQEAg dm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckNoYXJhYwogICAgIGJlZ2luUHJvY2Vz c2luZ01lZGlhUGxheWVyQ2FsbGJhY2soKTsKIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKLSAg ICBpZiAobV9jYXB0aW9uRGlzcGxheU1vZGUgPT0gQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6QXV0 b21hdGljICYmIG1fc3VidGl0bGVUcmFja0xhbmd1YWdlICE9IG1fcGxheWVyLT5sYW5ndWFnZU9m UHJpbWFyeUF1ZGlvVHJhY2soKSkKKyAgICBpZiAoY2FwdGlvbkRpc3BsYXlNb2RlKCkgPT0gQ2Fw dGlvblVzZXJQcmVmZXJlbmNlczo6QXV0b21hdGljICYmIG1fc3VidGl0bGVUcmFja0xhbmd1YWdl ICE9IG1fcGxheWVyLT5sYW5ndWFnZU9mUHJpbWFyeUF1ZGlvVHJhY2soKSkKICAgICAgICAgbWFy a0NhcHRpb25BbmRTdWJ0aXRsZVRyYWNrc0FzVW5jb25maWd1cmVkKEFmdGVyRGVsYXkpOwogI2Vu ZGlmCiAKQEAgLTY0MjQsMTEgKzY0MTksMjMgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjYXB0 aW9uUHJlZmVyZW5jZQogICAgICAgICByZXR1cm47CiAKICAgICBDYXB0aW9uVXNlclByZWZlcmVu Y2VzOjpDYXB0aW9uRGlzcGxheU1vZGUgZGlzcGxheU1vZGUgPSBkb2N1bWVudCgpLnBhZ2UoKS0+ Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKS5jYXB0aW9uRGlzcGxheU1vZGUoKTsKLSAgICBp ZiAobV9jYXB0aW9uRGlzcGxheU1vZGUgPT0gZGlzcGxheU1vZGUpCisgICAgaWYgKGNhcHRpb25E aXNwbGF5TW9kZSgpID09IGRpc3BsYXlNb2RlKQogICAgICAgICByZXR1cm47CiAKICAgICBtX2Nh cHRpb25EaXNwbGF5TW9kZSA9IGRpc3BsYXlNb2RlOwotICAgIHNldFdlYmtpdENsb3NlZENhcHRp b25zVmlzaWJsZShtX2NhcHRpb25EaXNwbGF5TW9kZSA9PSBDYXB0aW9uVXNlclByZWZlcmVuY2Vz OjpBbHdheXNPbik7CisgICAgc2V0V2Via2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxlKGNhcHRpb25E aXNwbGF5TW9kZSgpID09IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OkFsd2F5c09uKTsKK30KKwor Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6Q2FwdGlvbkRpc3BsYXlNb2RlIEhUTUxNZWRpYUVsZW1l bnQ6OmNhcHRpb25EaXNwbGF5TW9kZSgpCit7CisgICAgaWYgKCFtX2NhcHRpb25EaXNwbGF5TW9k ZS5oYXNfdmFsdWUoKSkgeworICAgICAgICBpZiAoZG9jdW1lbnQoKS5wYWdlKCkpCisgICAgICAg ICAgICBtX2NhcHRpb25EaXNwbGF5TW9kZSA9IGRvY3VtZW50KCkucGFnZSgpLT5ncm91cCgpLmNh cHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25EaXNwbGF5TW9kZSgpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBtX2NhcHRpb25EaXNwbGF5TW9kZSA9IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6 OkF1dG9tYXRpYzsKKyAgICB9CisKKyAgICByZXR1cm4gbV9jYXB0aW9uRGlzcGxheU1vZGUudmFs dWUoKTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptYXJrQ2FwdGlvbkFuZFN1YnRpdGxl VHJhY2tzQXNVbmNvbmZpZ3VyZWQoUmVjb25maWd1cmVNb2RlIG1vZGUpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gMjMwOTE1KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTc3Miw2 ICs3NzIsNyBAQCBwcml2YXRlOgogICAgIH07CiAgICAgdm9pZCBtYXJrQ2FwdGlvbkFuZFN1YnRp dGxlVHJhY2tzQXNVbmNvbmZpZ3VyZWQoUmVjb25maWd1cmVNb2RlKTsKICAgICB2b2lkIGNhcHRp b25QcmVmZXJlbmNlc0NoYW5nZWQoKSBvdmVycmlkZTsKKyAgICBDYXB0aW9uVXNlclByZWZlcmVu Y2VzOjpDYXB0aW9uRGlzcGxheU1vZGUgY2FwdGlvbkRpc3BsYXlNb2RlKCk7CiAjZW5kaWYKIAog ICAgIC8vIFRoZXNlICJpbnRlcm5hbCIgZnVuY3Rpb25zIGRvIG5vdCBjaGVjayB1c2VyIGdlc3R1 cmUgcmVzdHJpY3Rpb25zLgpAQCAtMTA4Nyw3ICsxMDg4LDcgQEAgcHJpdmF0ZToKICAgICBTdHJp bmcgbV9zdWJ0aXRsZVRyYWNrTGFuZ3VhZ2U7CiAgICAgTWVkaWFUaW1lIG1fbGFzdFRleHRUcmFj a1VwZGF0ZVRpbWUgeyAtMSwgMSB9OwogCi0gICAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6Q2Fw dGlvbkRpc3BsYXlNb2RlIG1fY2FwdGlvbkRpc3BsYXlNb2RlIHsgQ2FwdGlvblVzZXJQcmVmZXJl bmNlczo6QXV0b21hdGljIH07CisgICAgc3RkOjpvcHRpb25hbDxDYXB0aW9uVXNlclByZWZlcmVu Y2VzOjpDYXB0aW9uRGlzcGxheU1vZGU+IG1fY2FwdGlvbkRpc3BsYXlNb2RlOwogCiAgICAgUmVm UHRyPEF1ZGlvVHJhY2tMaXN0PiBtX2F1ZGlvVHJhY2tzOwogICAgIFJlZlB0cjxUZXh0VHJhY2tM aXN0PiBtX3RleHRUcmFja3M7Cg==