73879 2011-12-05 17:15:13 -0800 Revert WebCore track settings changes made in r101977 2011-12-06 11:01:43 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 43668 1 eric.carlson eric.carlson webkit-bug-importer webkit.review.bot oldest_to_newest 515521 0 eric.carlson 2011-12-05 17:15:13 -0800 From https://bugs.webkit.org/show_bug.cgi?id=73721: > Source/WebCore/page/Settings.cpp:854 > +#if ENABLE(VIDEO_TRACK) > +void Settings::setShouldDisplaySubtitles(bool flag) > +{ > + m_shouldDisplaySubtitles = flag; > +} > + > +void Settings::setShouldDisplayCaptions(bool flag) > +{ > + m_shouldDisplayCaptions = flag; > +} > + > +void Settings::setShouldDisplayTextDescriptions(bool flag) > +{ > + m_shouldDisplayTextDescriptions = flag; > +} > +#endif Why this change? You moved these into the cpp file, but they are the same as what was in the .h file? 515522 1 webkit-bug-importer 2011-12-05 17:15:53 -0800 <rdar://problem/10531518> 515531 2 117960 eric.carlson 2011-12-05 17:28:29 -0800 Created attachment 117960 Proposed patch 516044 3 117960 webkit.review.bot 2011-12-06 11:01:39 -0800 Comment on attachment 117960 Proposed patch Clearing flags on attachment: 117960 Committed r102154: <http://trac.webkit.org/changeset/102154> 516045 4 webkit.review.bot 2011-12-06 11:01:43 -0800 All reviewed patches have been landed. Closing bug. 117960 2011-12-05 17:28:29 -0800 2011-12-06 11:01:39 -0800 Proposed patch patch_settings_revert_1.txt text/plain 2629 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjA3MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDExLTEyLTA1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmVydCBXZWJDb3Jl IHRyYWNrIFNldHRpbmdzIGNoYW5nZXMgbWFkZSBpbiByMTAxOTc3CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mzg3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyB5ZXQsIHN0aWxsIG5v dGhpbmcgdG8gdGVzdC4KKworICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOiBNb3ZlIHRoZSBw cmVmZXJlbmNlIHNldHRlcnMgYmFjayBpbnRvIHRoZSAuaCBmaWxlLgorICAgICAgICAqIHBhZ2Uv U2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRTaG91bGREaXNwbGF5 U3VidGl0bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRTaG91bGREaXNwbGF5 Q2FwdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OnNldFNob3VsZERpc3BsYXlU ZXh0RGVzY3JpcHRpb25zKToKKwogMjAxMS0xMi0wNSAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmph bWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIG1ldGhvZHMgZGVjbGFyZWQgYnV0IG5l dmVyIGltcGxlbWVudGVkIHdpdGggR09PR0xFVVJMCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz LmNwcAkocmV2aXNpb24gMTAyMDczKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTgzNiwyMSArODM2LDQgQEAgYm9vbCBTZXR0aW5nczo6bW9j a1Njcm9sbGJhcnNFbmFibGVkKCkKICAgICByZXR1cm4gZ01vY2tTY3JvbGxiYXJzRW5hYmxlZDsK IH0KIAotI2lmIEVOQUJMRShWSURFT19UUkFDSykKLXZvaWQgU2V0dGluZ3M6OnNldFNob3VsZERp c3BsYXlTdWJ0aXRsZXMoYm9vbCBmbGFnKQotewotICAgIG1fc2hvdWxkRGlzcGxheVN1YnRpdGxl cyA9IGZsYWc7Ci19Ci0KLXZvaWQgU2V0dGluZ3M6OnNldFNob3VsZERpc3BsYXlDYXB0aW9ucyhi b29sIGZsYWcpCi17Ci0gICAgbV9zaG91bGREaXNwbGF5Q2FwdGlvbnMgPSBmbGFnOwotfQotCi12 b2lkIFNldHRpbmdzOjpzZXRTaG91bGREaXNwbGF5VGV4dERlc2NyaXB0aW9ucyhib29sIGZsYWcp Ci17Ci0gICAgbV9zaG91bGREaXNwbGF5VGV4dERlc2NyaXB0aW9ucyA9IGZsYWc7Ci19Ci0jZW5k aWYKLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9T ZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAko cmV2aXNpb24gMTAyMDczKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00ODcsMTMgKzQ4NywxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIGJvb2wgdmlzdWFsV29yZE1vdmVtZW50RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fdmlz dWFsV29yZE1vdmVtZW50RW5hYmxlZDsgfQogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQotICAg ICAgICB2b2lkIHNldFNob3VsZERpc3BsYXlTdWJ0aXRsZXMoYm9vbCk7CisgICAgICAgIHZvaWQg c2V0U2hvdWxkRGlzcGxheVN1YnRpdGxlcyhib29sIGZsYWcpIHsgbV9zaG91bGREaXNwbGF5U3Vi dGl0bGVzID0gZmxhZzsgfQogICAgICAgICBib29sIHNob3VsZERpc3BsYXlTdWJ0aXRsZXMoKSBj b25zdCB7IHJldHVybiBtX3Nob3VsZERpc3BsYXlTdWJ0aXRsZXM7IH0KIAotICAgICAgICB2b2lk IHNldFNob3VsZERpc3BsYXlDYXB0aW9ucyhib29sKTsKKyAgICAgICAgdm9pZCBzZXRTaG91bGRE aXNwbGF5Q2FwdGlvbnMoYm9vbCBmbGFnKSB7IG1fc2hvdWxkRGlzcGxheUNhcHRpb25zID0gZmxh ZzsgfQogICAgICAgICBib29sIHNob3VsZERpc3BsYXlDYXB0aW9ucygpIGNvbnN0IHsgcmV0dXJu IG1fc2hvdWxkRGlzcGxheUNhcHRpb25zOyB9CiAKLSAgICAgICAgdm9pZCBzZXRTaG91bGREaXNw bGF5VGV4dERlc2NyaXB0aW9ucyhib29sKTsKKyAgICAgICAgdm9pZCBzZXRTaG91bGREaXNwbGF5 VGV4dERlc2NyaXB0aW9ucyhib29sIGZsYWcpIHsgbV9zaG91bGREaXNwbGF5VGV4dERlc2NyaXB0 aW9ucyA9IGZsYWc7IH0KICAgICAgICAgYm9vbCBzaG91bGREaXNwbGF5VGV4dERlc2NyaXB0aW9u cygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkRGlzcGxheVRleHREZXNjcmlwdGlvbnM7IH0KICNl bmRpZgogCg==