117884 2013-06-21 11:13:58 -0700 Update platform text track menu 2013-06-21 13:41:26 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson commit-queue esprehn+autocc glenn jer.noble oldest_to_newest 902620 0 eric.carlson 2013-06-21 11:13:58 -0700 Allow a text track menu implemented by the platform media player to have "Off" and "Auto" menu items. 902626 1 205203 eric.carlson 2013-06-21 11:24:58 -0700 Created attachment 205203 Proposed patch 902645 2 205203 jer.noble 2013-06-21 13:00:47 -0700 Comment on attachment 205203 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=205203&action=review > Source/WebCore/platform/graphics/PlatformTextTrack.h:66 > - static PassRefPtr<PlatformTextTrack> create(PlatformTextTrackClient* client, const String& label, const String& language, TrackKind kind, TrackType type) > + static PassRefPtr<PlatformTextTrack> create(PlatformTextTrackClient* client, const String& label, const String& language, TrackKind kind, TrackType type, int uniqueId) > { > - return adoptRef(new PlatformTextTrack(client, label, language, kind, type)); > + return adoptRef(new PlatformTextTrack(client, label, language, kind, type, uniqueId)); > } This will break the call point in TextTrack.cpp - TextTrack::platformTextTrack(), which does not pass in a uniqueId. Please update that call before you land. 902656 3 eric.carlson 2013-06-21 13:41:18 -0700 https://trac.webkit.org/r151853 205203 2013-06-21 11:24:58 -0700 2013-06-21 13:41:26 -0700 Proposed patch patch_1.txt text/plain 4665 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTg0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA2LTIxICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBwbGF0Zm9y bSB0ZXh0IHRyYWNrIG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExNzg4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnNldFNl bGVjdGVkVGV4dFRyYWNrKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybVRl eHRUcmFjay5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1UZXh0VHJhY2s6OmNyZWF0ZSk6 IAorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1UZXh0VHJhY2s6OnVuaXF1ZUlkKToKKyAgICAg ICAgKFdlYkNvcmU6OlBsYXRmb3JtVGV4dFRyYWNrOjpjYXB0aW9uTWVudU9mZkl0ZW0pOgorICAg ICAgICAoV2ViQ29yZTo6UGxhdGZvcm1UZXh0VHJhY2s6OmNhcHRpb25NZW51QXV0b21hdGljSXRl bSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVRleHRUcmFjazo6UGxhdGZvcm1UZXh0VHJh Y2spOgorCiAyMDEzLTA2LTIxICBSdXRoIEZvbmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeCBUZXh0VHJhY2tDdWU6OmN1ZUluZGV4KCkgdG8gaGFuZGxlIHRoZSBudWxsIGNh c2Ugb2YgVGV4dFRyYWNrOjpjdWVzKCgpIHByb3Blcmx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDE1MTg0MykKKysrIFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5NDgsMjEg KzI5NDgsMjcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRTZWxlY3RlZFRleHRUcgogICAg IFRyYWNrRGlzcGxheVVwZGF0ZVNjb3BlIHNjb3BlKHRoaXMpOwogCiAgICAgaWYgKCFwbGF0Zm9y bVRyYWNrKSB7Ci0gICAgICAgIHNldFNlbGVjdGVkVGV4dFRyYWNrKDApOworICAgICAgICBzZXRT ZWxlY3RlZFRleHRUcmFjayhUZXh0VHJhY2s6OmNhcHRpb25NZW51T2ZmSXRlbSgpKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAogICAgIFRleHRUcmFjayogdGV4dFRyYWNrOwotICAgIHNpemVf dCBpOwotICAgIGZvciAoaSA9IDA7IGkgPCBtX3RleHRUcmFja3MtPmxlbmd0aCgpOyArK2kpIHsK LSAgICAgICAgdGV4dFRyYWNrID0gbV90ZXh0VHJhY2tzLT5pdGVtKGkpOwotICAgICAgICAKLSAg ICAgICAgaWYgKHRleHRUcmFjay0+cGxhdGZvcm1UZXh0VHJhY2soKSA9PSBwbGF0Zm9ybVRyYWNr KQotICAgICAgICAgICAgYnJlYWs7CisgICAgaWYgKHBsYXRmb3JtVHJhY2sgPT0gUGxhdGZvcm1U ZXh0VHJhY2s6OmNhcHRpb25NZW51T2ZmSXRlbSgpKQorICAgICAgICB0ZXh0VHJhY2sgPSBUZXh0 VHJhY2s6OmNhcHRpb25NZW51T2ZmSXRlbSgpOworICAgIGVsc2UgaWYgKHBsYXRmb3JtVHJhY2sg PT0gUGxhdGZvcm1UZXh0VHJhY2s6OmNhcHRpb25NZW51QXV0b21hdGljSXRlbSgpKQorICAgICAg ICB0ZXh0VHJhY2sgPSBUZXh0VHJhY2s6OmNhcHRpb25NZW51QXV0b21hdGljSXRlbSgpOworICAg IGVsc2UgeworICAgICAgICBzaXplX3QgaTsKKyAgICAgICAgZm9yIChpID0gMDsgaSA8IG1fdGV4 dFRyYWNrcy0+bGVuZ3RoKCk7ICsraSkgeworICAgICAgICAgICAgdGV4dFRyYWNrID0gbV90ZXh0 VHJhY2tzLT5pdGVtKGkpOworICAgICAgICAgICAgCisgICAgICAgICAgICBpZiAodGV4dFRyYWNr LT5wbGF0Zm9ybVRleHRUcmFjaygpID09IHBsYXRmb3JtVHJhY2spCisgICAgICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGkgPT0gbV90ZXh0VHJhY2tzLT5sZW5ndGgo KSkKKyAgICAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoaSA9PSBtX3RleHRUcmFj a3MtPmxlbmd0aCgpKQotICAgICAgICByZXR1cm47CiAgICAgc2V0U2VsZWN0ZWRUZXh0VHJhY2so dGV4dFRyYWNrKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv UGxhdGZvcm1UZXh0VHJhY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9QbGF0Zm9ybVRleHRUcmFjay5oCShyZXZpc2lvbiAxNTE4NDMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybVRleHRUcmFjay5oCSh3b3JraW5n IGNvcHkpCkBAIC02MCw5ICs2MCw5IEBAIHB1YmxpYzoKICAgICAgICAgU2NyaXB0ID0gMgogICAg IH07CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4gY3JlYXRlKFBs YXRmb3JtVGV4dFRyYWNrQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0 IFN0cmluZyYgbGFuZ3VhZ2UsIFRyYWNrS2luZCBraW5kLCBUcmFja1R5cGUgdHlwZSkKKyAgICBz dGF0aWMgUGFzc1JlZlB0cjxQbGF0Zm9ybVRleHRUcmFjaz4gY3JlYXRlKFBsYXRmb3JtVGV4dFRy YWNrQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0cmluZyYgbGFu Z3VhZ2UsIFRyYWNrS2luZCBraW5kLCBUcmFja1R5cGUgdHlwZSwgaW50IHVuaXF1ZUlkKQogICAg IHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBQbGF0Zm9ybVRleHRUcmFjayhjbGllbnQs IGxhYmVsLCBsYW5ndWFnZSwga2luZCwgdHlwZSkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IFBsYXRmb3JtVGV4dFRyYWNrKGNsaWVudCwgbGFiZWwsIGxhbmd1YWdlLCBraW5kLCB0eXBl LCB1bmlxdWVJZCkpOwogICAgIH0KIAogICAgIHZpcnR1YWwgflBsYXRmb3JtVGV4dFRyYWNrKCkg eyB9CkBAIC03MiwxNCArNzIsMjggQEAgcHVibGljOgogICAgIFN0cmluZyBsYWJlbCgpIGNvbnN0 IHsgcmV0dXJuIG1fbGFiZWw7IH0KICAgICBTdHJpbmcgbGFuZ3VhZ2UoKSBjb25zdCB7IHJldHVy biBtX2xhbmd1YWdlOyB9CiAgICAgUGxhdGZvcm1UZXh0VHJhY2tDbGllbnQqIGNsaWVudCgpIGNv bnN0IHsgcmV0dXJuIG1fY2xpZW50OyB9Ci0gICAgCisgICAgaW50IHVuaXF1ZUlkKCkgY29uc3Qg eyByZXR1cm4gbV91bmlxdWVJZDsgfQorCisgICAgc3RhdGljIFBsYXRmb3JtVGV4dFRyYWNrKiBj YXB0aW9uTWVudU9mZkl0ZW0oKQorICAgIHsKKyAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChS ZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2s+LCBvZmYsIChQbGF0Zm9ybVRleHRUcmFjazo6Y3JlYXRl KDAsICJvZmYgbWVudSBpdGVtIiwgIiIsIFN1YnRpdGxlLCBJbkJhbmQsIDApKSk7CisgICAgICAg IHJldHVybiBvZmYuZ2V0KCk7CisgICAgfQorCisgICAgc3RhdGljIFBsYXRmb3JtVGV4dFRyYWNr KiBjYXB0aW9uTWVudUF1dG9tYXRpY0l0ZW0oKQorICAgIHsKKyAgICAgICAgREVGSU5FX1NUQVRJ Q19MT0NBTChSZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2s+LCBhdXRvbWF0aWMsIChQbGF0Zm9ybVRl eHRUcmFjazo6Y3JlYXRlKDAsICJhdXRvbWF0aWMgbWVudSBpdGVtIiwgIiIsIFN1YnRpdGxlLCBJ bkJhbmQsIDApKSk7CisgICAgICAgIHJldHVybiBhdXRvbWF0aWMuZ2V0KCk7CisgICAgfQorCiBw cm90ZWN0ZWQ6Ci0gICAgUGxhdGZvcm1UZXh0VHJhY2soUGxhdGZvcm1UZXh0VHJhY2tDbGllbnQq IGNsaWVudCwgY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgU3RyaW5nJiBsYW5ndWFnZSwgVHJh Y2tLaW5kIGtpbmQsIFRyYWNrVHlwZSB0eXBlKQorICAgIFBsYXRmb3JtVGV4dFRyYWNrKFBsYXRm b3JtVGV4dFRyYWNrQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0 cmluZyYgbGFuZ3VhZ2UsIFRyYWNrS2luZCBraW5kLCBUcmFja1R5cGUgdHlwZSwgaW50IHVuaXF1 ZUlkKQogICAgICAgICA6IG1fbGFiZWwobGFiZWwpCiAgICAgICAgICwgbV9sYW5ndWFnZShsYW5n dWFnZSkKICAgICAgICAgLCBtX2tpbmQoa2luZCkKICAgICAgICAgLCBtX3R5cGUodHlwZSkKICAg ICAgICAgLCBtX2NsaWVudChjbGllbnQpCisgICAgICAgICwgbV91bmlxdWVJZCh1bmlxdWVJZCkK ICAgICB7CiAgICAgfQogCkBAIC04OCw2ICsxMDIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgVHJhY2tL aW5kIG1fa2luZDsKICAgICBUcmFja1R5cGUgbV90eXBlOwogICAgIFBsYXRmb3JtVGV4dFRyYWNr Q2xpZW50KiBtX2NsaWVudDsKKyAgICBpbnQgbV91bmlxdWVJZDsKIH07CiAKIH0K