130681 2014-03-24 10:29:15 -0700 Merge Minor WebVTT Cleanups from Blink 2014-03-24 10:38:56 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham calvaris cdumez commit-queue eric.carlson esprehn+autocc gyuyoung.kim kondapallykalyan philipj webkit-bug-importer oldest_to_newest 993869 0 bfulgham 2014-03-24 10:29:15 -0700 This bug merges the following two improvements in the WebVTT code: 1. Use TextTrackMode and TextTrackKind enums in TextTrack IDL Merged from Blink (patch by philipj@opera.com): https://chromium.googlesource.com/chromium/blink/+/693eb5e2933dca0eab5bbd604e9f3406fe9fd1ab http://crbug.com/52593009 2. Merge bools into bit fields in TextTrackCue and VTTCue Merged from Blink (patch by philipj@opera.com): https://chromium.googlesource.com/chromium/blink/+/40b3602feab34e9be829fd742b6ad6ded322a09f http://crbug.com/104243003 993873 1 webkit-bug-importer 2014-03-24 10:31:08 -0700 <rdar://problem/16407541> 993874 2 227665 bfulgham 2014-03-24 10:31:54 -0700 Created attachment 227665 Patch 993877 3 227665 eric.carlson 2014-03-24 10:35:22 -0700 Comment on attachment 227665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227665&action=review > Source/WebCore/ChangeLog:7 > + https://bugs.webkit.org/show_bug.cgi?id=130681 > + > + Reviewed by NOBODY (OOPS!). > + You should reference the Blink bugs these changes are based on. 993880 4 227665 bfulgham 2014-03-24 10:38:18 -0700 Comment on attachment 227665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227665&action=review >> Source/WebCore/ChangeLog:7 >> + > > You should reference the Blink bugs these changes are based on. Doh! 993881 5 bfulgham 2014-03-24 10:38:56 -0700 Committed r166180: <http://trac.webkit.org/changeset/166180> 227665 2014-03-24 10:31:54 -0700 2014-03-24 10:38:18 -0700 Patch bug-130681-20140324103132.patch text/plain 5057 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjE3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI0ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIE1lcmdlIE1pbm9yIFdlYlZU VCBDbGVhbnVwcyBmcm9tIEJsaW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzA2ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlRleHRUcmFjazo6c2V0TW9kZSk6CisgICAgICAgICogaHRtbC90cmFjay9UZXh0VHJhY2su aWRsOgorICAgICAgICAqIGh0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmg6CisgICAgICAgICogaHRt bC90cmFjay9WVFRDdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VlRUQ3VlOjpWVFRDdWUpOgor ICAgICAgICAqIGh0bWwvdHJhY2svVlRUQ3VlLmg6CisKIDIwMTQtMDMtMjQgIE1hcnRpbiBIb2Rv dmFuICA8bWhvZG92YW5AaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIEVOQUJMRShDU1NfR1JJ RF9MQVlPVVQpIGd1YXJkIGZvciBDU1NHcmlkTGluZU5hbWVzVmFsdWUKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5jcHAJKHJldmlzaW9uIDE2NjE3MikKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEw LDExICsyMTAsMTAgQEAgdm9pZCBUZXh0VHJhY2s6OnNldEtpbmQoY29uc3QgQXRvbWljU3RyaQog CiB2b2lkIFRleHRUcmFjazo6c2V0TW9kZShjb25zdCBBdG9taWNTdHJpbmcmIG1vZGUpCiB7Cisg ICAgQVNTRVJUKG1vZGUgPT0gZGlzYWJsZWRLZXl3b3JkKCkgfHwgbW9kZSA9PSBoaWRkZW5LZXl3 b3JkKCkgfHwgbW9kZSA9PSBzaG93aW5nS2V5d29yZCgpKTsKKwogICAgIC8vIE9uIHNldHRpbmcs IGlmIHRoZSBuZXcgdmFsdWUgaXNuJ3QgZXF1YWwgdG8gd2hhdCB0aGUgYXR0cmlidXRlIHdvdWxk IGN1cnJlbnRseQogICAgIC8vIHJldHVybiwgdGhlIG5ldyB2YWx1ZSBtdXN0IGJlIHByb2Nlc3Nl ZCBhcyBmb2xsb3dzIC4uLgotICAgIGlmIChtb2RlICE9IGRpc2FibGVkS2V5d29yZCgpICYmIG1v ZGUgIT0gaGlkZGVuS2V5d29yZCgpICYmIG1vZGUgIT0gc2hvd2luZ0tleXdvcmQoKSkKLSAgICAg ICAgcmV0dXJuOwotCiAgICAgaWYgKG1fbW9kZSA9PSBtb2RlKQogICAgICAgICByZXR1cm47CiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmlkbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFjay5pZGwJKHJldmlzaW9uIDE2 NjE3MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrLmlkbAkod29ya2lu ZyBjb3B5KQpAQCAtMjMsNiArMjMsOSBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCiAgKi8KIAorZW51bSBU ZXh0VHJhY2tNb2RlIHsgImRpc2FibGVkIiwgICJoaWRkZW4iLCAgInNob3dpbmciIH07CitlbnVt IFRleHRUcmFja0tpbmQgeyAic3VidGl0bGVzIiwgICJjYXB0aW9ucyIsICAiZGVzY3JpcHRpb25z IiwgICJjaGFwdGVycyIsICJtZXRhZGF0YSIgfTsKKwogWwogICAgIENvbmRpdGlvbmFsPVZJREVP X1RSQUNLLAogICAgIEV2ZW50VGFyZ2V0LApAQCAtMzEsMTkgKzM0LDIwIEBACiAgICAgU2tpcFZU YWJsZVZhbGlkYXRpb24sCiBdIGludGVyZmFjZSBUZXh0VHJhY2sgewogICAgIHJlYWRvbmx5IGF0 dHJpYnV0ZSBET01TdHJpbmcgaWQ7Ci0gICAgW0N1c3RvbVNldHRlcl0gYXR0cmlidXRlIERPTVN0 cmluZyBraW5kOworICAgIFtDdXN0b21TZXR0ZXJdIGF0dHJpYnV0ZSBUZXh0VHJhY2tLaW5kIGtp bmQ7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBsYWJlbDsKICAgICBbQ3VzdG9t U2V0dGVyXSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGxhbmd1YWdlOwogCi0gICAgYXR0cmlidXRlIERP TVN0cmluZyBtb2RlOworICAgIGF0dHJpYnV0ZSBUZXh0VHJhY2tNb2RlIG1vZGU7CiAKICAgICBy ZWFkb25seSBhdHRyaWJ1dGUgVGV4dFRyYWNrQ3VlTGlzdCBjdWVzOwogICAgIHJlYWRvbmx5IGF0 dHJpYnV0ZSBUZXh0VHJhY2tDdWVMaXN0IGFjdGl2ZUN1ZXM7Ci0gICAgICAgICAgICAgYXR0cmli dXRlIEV2ZW50TGlzdGVuZXIgb25jdWVjaGFuZ2U7CiAKICAgICBbUmFpc2VzRXhjZXB0aW9uXSB2 b2lkIGFkZEN1ZShUZXh0VHJhY2tDdWUgY3VlKTsKICAgICBbUmFpc2VzRXhjZXB0aW9uXSB2b2lk IHJlbW92ZUN1ZShUZXh0VHJhY2tDdWUgY3VlKTsKIAorICAgICAgICAgICAgIGF0dHJpYnV0ZSBF dmVudExpc3RlbmVyIG9uY3VlY2hhbmdlOworCiAjaWYgZGVmaW5lZChFTkFCTEVfV0VCVlRUX1JF R0lPTlMpICYmIEVOQUJMRV9XRUJWVFRfUkVHSU9OUwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBW VFRSZWdpb25MaXN0IHJlZ2lvbnM7CiAgICAgdm9pZCBhZGRSZWdpb24oVlRUUmVnaW9uIHJlZ2lv bik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1RleHRUcmFja0N1ZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgJKHJldmlz aW9uIDE2NjE3MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVGV4dFRyYWNrQ3VlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEyMCw4ICsxMjAsOCBAQCBwcml2YXRlOgogCiAgICAgU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCYgbV9zY3JpcHRFeGVjdXRpb25Db250ZXh0OwogCi0gICAgYm9vbCBt X2lzQWN0aXZlOwotICAgIGJvb2wgbV9wYXVzZU9uRXhpdDsKKyAgICBib29sIG1faXNBY3RpdmUg OiAxOworICAgIGJvb2wgbV9wYXVzZU9uRXhpdCA6IDE7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WVFRDdWUuY3BwCShyZXZpc2lvbiAx NjYxNzIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTIxOCwxMiArMjE4LDEyIEBAIFZUVEN1ZTo6VlRUQ3VlKFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQmIGMKICAgICAsIG1fY3VlU2l6ZSgxMDApCiAgICAgLCBtX3dyaXRpbmdEaXJlY3Rp b24oSG9yaXpvbnRhbCkKICAgICAsIG1fY3VlQWxpZ25tZW50KE1pZGRsZSkKLSAgICAsIG1fd2Vi VlRUTm9kZVRyZWUoMCkKLSAgICAsIG1fc25hcFRvTGluZXModHJ1ZSkKKyAgICAsIG1fd2ViVlRU Tm9kZVRyZWUobnVsbHB0cikKICAgICAsIG1fY3VlQmFja2dyb3VuZEJveChIVE1MU3BhbkVsZW1l bnQ6OmNyZWF0ZShzcGFuVGFnLCB0b0RvY3VtZW50KGNvbnRleHQpKSkKLSAgICAsIG1fZGlzcGxh eVRyZWVTaG91bGRDaGFuZ2UodHJ1ZSkKICAgICAsIG1fZGlzcGxheURpcmVjdGlvbihDU1NWYWx1 ZUx0cikKICAgICAsIG1fZGlzcGxheVNpemUoMCkKKyAgICAsIG1fc25hcFRvTGluZXModHJ1ZSkK KyAgICAsIG1fZGlzcGxheVRyZWVTaG91bGRDaGFuZ2UodHJ1ZSkKICAgICAsIG1fbm90aWZ5UmVn aW9uKHRydWUpCiB7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZUVEN1ZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmgJKHJldmlz aW9uIDE2NjE3MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVlRUQ3VlLmgJKHdvcmtp bmcgY29weSkKQEAgLTIwMSwyNSArMjAxLDIxIEBAIHByaXZhdGU6CiAKICAgICBXcml0aW5nRGly ZWN0aW9uIG1fd3JpdGluZ0RpcmVjdGlvbjsKICAgICBDdWVBbGlnbm1lbnQgbV9jdWVBbGlnbm1l bnQ7CisjaWYgRU5BQkxFKFdFQlZUVF9SRUdJT05TKQorICAgIFN0cmluZyBtX3JlZ2lvbklkOwor I2VuZGlmCiAKICAgICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gbV93ZWJWVFROb2RlVHJlZTsK LQotICAgIGJvb2wgbV9zbmFwVG9MaW5lczsKLQogICAgIFJlZlB0cjxIVE1MU3BhbkVsZW1lbnQ+ IG1fY3VlQmFja2dyb3VuZEJveDsKLQotICAgIGJvb2wgbV9kaXNwbGF5VHJlZVNob3VsZENoYW5n ZTsKICAgICBSZWZQdHI8VlRUQ3VlQm94PiBtX2Rpc3BsYXlUcmVlOwogCiAgICAgQ1NTVmFsdWVJ RCBtX2Rpc3BsYXlEaXJlY3Rpb247Ci0KICAgICBpbnQgbV9kaXNwbGF5U2l6ZTsKLQogICAgIHN0 ZDo6cGFpcjxmbG9hdCwgZmxvYXQ+IG1fZGlzcGxheVBvc2l0aW9uOwotI2lmIEVOQUJMRShXRUJW VFRfUkVHSU9OUykKLSAgICBTdHJpbmcgbV9yZWdpb25JZDsKLSNlbmRpZgotICAgIGJvb2wgbV9u b3RpZnlSZWdpb247CisKKyAgICBib29sIG1fc25hcFRvTGluZXMgOiAxOworICAgIGJvb2wgbV9k aXNwbGF5VHJlZVNob3VsZENoYW5nZSA6IDE7CisgICAgYm9vbCBtX25vdGlmeVJlZ2lvbiA6IDE7 CiB9OwogCiBWVFRDdWUqIHRvVlRUQ3VlKFRleHRUcmFja0N1ZSopOwo=