100690 2012-10-29 11:06:51 -0700 Support captions when PLUGIN_PROXY_FOR_VIDEO 2012-10-29 13:02:14 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson eric feature-media-reviews simon.fraser webkit.review.bot oldest_to_newest 753623 0 eric.carlson 2012-10-29 11:06:51 -0700 Support text tracks when PLUGIN_PROXY_FOR_VIDEO is defined. 753666 1 171289 eric.carlson 2012-10-29 12:13:13 -0700 Created attachment 171289 Proposed patch 753686 2 171289 simon.fraser 2012-10-29 12:44:13 -0700 Comment on attachment 171289 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=171289&action=review > Source/WebCore/rendering/RenderEmbeddedObject.cpp:258 > +#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) > + RenderBox* controlsRenderer = toRenderBox(m_children.firstChild()); I think it would be good to have a comment here pointing out that this code is duplicated from RenderVideo (or maybe even share code). 753696 3 eric.carlson 2012-10-29 13:02:14 -0700 http://trac.webkit.org/changeset/132842 171289 2012-10-29 12:13:13 -0700 2012-10-29 12:44:13 -0700 Proposed patch patch_3.txt text/plain 5564 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMjgyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTI5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFN1cHBvcnQgY2FwdGlv bnMgd2hlbiBQTFVHSU5fUFJPWFlfRk9SX1ZJREVPCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA2OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGJ1aWx0IHdpdGggUExVR0lOX1BST1hZX0ZPUl9W SURFTywgV2ViQ29yZSB1c2VzIGEgcGx1Zy1pbiBmb3IgdGhlIG1lZGlhIGVsZW1lbnQncworICAg ICAgICBwbGF0Zm9ybSBtZWRpYSBlbmdpbmUuIFVwZGF0ZSB0aGlzIGNvZGUgcGF0aCBzbyB0aGUg c2hhZG93IERPTSBlbGVtZW50cyB1c2VkIHRvIGRpc3BsYXkKKyAgICAgICAgdGV4dCB0cmFja3Mg YXJlIGNyZWF0ZWQgYW5kIGNvbmZpZ3VyZWQgY29ycmVjdGx5LgorCisgICAgICAgICogaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OmNvbmZpZ3VyZU1lZGlhQ29udHJvbHMpOiBDcmVhdGUgbWVkaWEgY29udHJvbHMgaWYgbmVjZXNz YXJ5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckVtYmVkZGVkT2JqZWN0OjpsYXlvdXQpOiBTZXQgdGhlIHBv c2l0aW9uIGFuZCBzaXplIG9mIHRoZSBzaGFkb3cgRE9NIHdoZW4gdGhlCisgICAgICAgICAgICBw b3NpdGlvbiBvZiB0aGUgZW1iZWRkZWQgZWxlbWVudCBjaGFuZ2VzLgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5oOgorCiAyMDEyLTEwLTI5ICBBcm5hdWQgUmVuZXZp ZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgd2VidmlldyBub3Qg cmVkcmF3biBhcyBuZWVkZWQgd2hlbiBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVk LgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lv biAxMzI4MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00MTcyLDYgKzQxNzIsOSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmNvbmZpZ3VyZU1lZGlhQ29uCiAKICAgICBtZWRpYUNvbnRyb2xzKCktPnNob3coKTsKICNlbHNl CisgICAgaWYgKCFoYXNNZWRpYUNvbnRyb2xzKCkpCisgICAgICAgIGNyZWF0ZU1lZGlhQ29udHJv bHMoKTsKKwogICAgIGlmIChtX3BsYXllcikKICAgICAgICAgbV9wbGF5ZXItPnNldENvbnRyb2xz KGNvbnRyb2xzKCkpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRW1iZWRkZWRPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAJKHJldmlzaW9uIDEzMjgwNykKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTUzLDYgKzUzLDEwIEBACiAjaW5jbHVkZSAiVGV4dC5oIgogI2luY2x1ZGUgIlRleHRS dW4uaCIKIAorI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQorI2luY2x1ZGUgIkhU TUxNZWRpYUVsZW1lbnQuaCIKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5n IG5hbWVzcGFjZSBIVE1MTmFtZXM7CkBAIC0yMzEsNiArMjM1LDEwIEBAIHZvaWQgUmVuZGVyRW1i ZWRkZWRPYmplY3Q6OmxheW91dCgpCiAgICAgU3RhY2tTdGF0czo6TGF5b3V0Q2hlY2tQb2ludCBs YXlvdXRDaGVja1BvaW50OwogICAgIEFTU0VSVChuZWVkc0xheW91dCgpKTsKIAorI2lmIEVOQUJM RShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQorICAgIExheW91dFNpemUgb2xkU2l6ZSA9IGNvbnRl bnRCb3hSZWN0KCkuc2l6ZSgpOworI2VuZGlmCisKICAgICB1cGRhdGVMb2dpY2FsV2lkdGgoKTsK ICAgICB1cGRhdGVMb2dpY2FsSGVpZ2h0KCk7CiAKQEAgLTI0NSw2ICsyNTMsMzAgQEAgdm9pZCBS ZW5kZXJFbWJlZGRlZE9iamVjdDo6bGF5b3V0KCkKICAgICAgICAgZnJhbWVWaWV3KCktPmFkZFdp ZGdldFRvVXBkYXRlKHRoaXMpOwogCiAgICAgc2V0TmVlZHNMYXlvdXQoZmFsc2UpOworCisjaWYg RU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCisgICAgUmVuZGVyQm94KiBjb250cm9sc1Jl bmRlcmVyID0gdG9SZW5kZXJCb3gobV9jaGlsZHJlbi5maXJzdENoaWxkKCkpOworICAgIGlmICgh Y29udHJvbHNSZW5kZXJlcikKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIExheW91dFNpemUg bmV3U2l6ZSA9IGNvbnRlbnRCb3hSZWN0KCkuc2l6ZSgpOworICAgIGlmIChuZXdTaXplID09IG9s ZFNpemUgJiYgIWNvbnRyb2xzUmVuZGVyZXItPm5lZWRzTGF5b3V0KCkpCisgICAgICAgIHJldHVy bjsKKyAgICAKKyAgICAvLyBXaGVuIGNhbGxpbmcgbGF5b3V0KCkgb24gYSBjaGlsZCBub2RlLCBh IHBhcmVudCBtdXN0IGVpdGhlciBwdXNoIGEgTGF5b3V0U3RhdGVNYWludGFpbnRlciwgb3IKKyAg ICAvLyBpbnN0YW50aWF0ZSBMYXlvdXRTdGF0ZURpc2FibGVyLiBTaW5jZSB1c2luZyBhIExheW91 dFN0YXRlTWFpbnRhaW5lciBpcyBzbGlnaHRseSBtb3JlIGVmZmljaWVudCwKKyAgICAvLyBhbmQg dGhpcyBtZXRob2Qgd2lsbCBiZSBjYWxsZWQgbWFueSB0aW1lcyBwZXIgc2Vjb25kIGR1cmluZyBw bGF5YmFjaywgdXNlIGEgTGF5b3V0U3RhdGVNYWludGFpbmVyOgorICAgIExheW91dFN0YXRlTWFp bnRhaW5lciBzdGF0ZVB1c2hlcih2aWV3KCksIHRoaXMsIGxvY2F0aW9uT2Zmc2V0KCksIGhhc1Ry YW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZSgpLT5pc0ZsaXBwZWRCbG9ja3NX cml0aW5nTW9kZSgpKTsKKyAgICAKKyAgICBjb250cm9sc1JlbmRlcmVyLT5zZXRMb2NhdGlvbihM YXlvdXRQb2ludChib3JkZXJMZWZ0KCksIGJvcmRlclRvcCgpKSArIExheW91dFNpemUocGFkZGlu Z0xlZnQoKSwgcGFkZGluZ1RvcCgpKSk7CisgICAgY29udHJvbHNSZW5kZXJlci0+c3R5bGUoKS0+ c2V0SGVpZ2h0KExlbmd0aChuZXdTaXplLmhlaWdodCgpLCBGaXhlZCkpOworICAgIGNvbnRyb2xz UmVuZGVyZXItPnN0eWxlKCktPnNldFdpZHRoKExlbmd0aChuZXdTaXplLndpZHRoKCksIEZpeGVk KSk7CisgICAgY29udHJvbHNSZW5kZXJlci0+c2V0TmVlZHNMYXlvdXQodHJ1ZSwgTWFya09ubHlU aGlzKTsKKyAgICBjb250cm9sc1JlbmRlcmVyLT5sYXlvdXQoKTsKKyAgICBzZXRDaGlsZE5lZWRz TGF5b3V0KGZhbHNlKTsKKyAgICAKKyAgICBzdGF0ZVB1c2hlci5wb3AoKTsKKyNlbmRpZgogfQog CiB2b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0Ojp2aWV3Q2xlYXJlZCgpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAkocmV2aXNpb24g MTMyODA3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0 LmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDYgKzYyLDExIEBAIHByb3RlY3RlZDoKIAogICAgIHZp cnR1YWwgQ3Vyc29yRGlyZWN0aXZlIGdldEN1cnNvcihjb25zdCBMYXlvdXRQb2ludCYsIEN1cnNv ciYpIGNvbnN0OwogCisjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCisgICAgY29u c3QgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0KiBjaGlsZHJlbigpIGNvbnN0IHsgcmV0dXJuICZtX2No aWxkcmVuOyB9CisgICAgUmVuZGVyT2JqZWN0Q2hpbGRMaXN0KiBjaGlsZHJlbigpIHsgcmV0dXJu ICZtX2NoaWxkcmVuOyB9CisjZW5kaWYKKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGNvbnN0IGNo YXIqIHJlbmRlck5hbWUoKSBjb25zdCB7IHJldHVybiAiUmVuZGVyRW1iZWRkZWRPYmplY3QiOyB9 CiAgICAgdmlydHVhbCBib29sIGlzRW1iZWRkZWRPYmplY3QoKSBjb25zdCB7IHJldHVybiB0cnVl OyB9CkBAIC04Myw2ICs4OCwxMiBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNJblVuYXZhaWxhYmxl UGx1Z2luSW5kaWNhdG9yKGNvbnN0IExheW91dFBvaW50JikgY29uc3Q7CiAgICAgYm9vbCBnZXRS ZXBsYWNlbWVudFRleHRHZW9tZXRyeShjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZz ZXQsIEZsb2F0UmVjdCYgY29udGVudFJlY3QsIFBhdGgmLCBGbG9hdFJlY3QmIHJlcGxhY2VtZW50 VGV4dFJlY3QsIEZvbnQmLCBUZXh0UnVuJiwgZmxvYXQmIHRleHRXaWR0aCkgY29uc3Q7CiAKKyNp ZiBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKKyAgICB2aXJ0dWFsIGJvb2wgY2FuSGF2 ZUNoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbm9kZSgpICYmIHRvRWxlbWVudChub2RlKCkpLT5p c01lZGlhRWxlbWVudCgpOyB9CisgICAgdmlydHVhbCBSZW5kZXJPYmplY3RDaGlsZExpc3QqIHZp cnR1YWxDaGlsZHJlbigpIHsgcmV0dXJuIGNoaWxkcmVuKCk7IH0KKyAgICB2aXJ0dWFsIGNvbnN0 IFJlbmRlck9iamVjdENoaWxkTGlzdCogdmlydHVhbENoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4g Y2hpbGRyZW4oKTsgfQorI2VuZGlmCisKICAgICBib29sIG1faGFzRmFsbGJhY2tDb250ZW50OyAv LyBGSVhNRTogVGhpcyBiZWxvbmdzIG9uIEhUTUxPYmplY3RFbGVtZW50LgogCiAgICAgYm9vbCBt X3Nob3dzVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3I7CkBAIC05MCw2ICsxMDEsOSBAQCBwcml2 YXRlOgogICAgIFN0cmluZyBtX3VuYXZhaWxhYmxlUGx1Z2luUmVwbGFjZW1lbnRUZXh0OwogICAg IGJvb2wgbV91bmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcklzUHJlc3NlZDsKICAgICBib29sIG1f bW91c2VEb3duV2FzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcjsKKyNpZiBFTkFCTEUoUExV R0lOX1BST1hZX0ZPUl9WSURFTykKKyAgICBSZW5kZXJPYmplY3RDaGlsZExpc3QgbV9jaGlsZHJl bjsKKyNlbmRpZgogfTsKIAogaW5saW5lIFJlbmRlckVtYmVkZGVkT2JqZWN0KiB0b1JlbmRlckVt YmVkZGVkT2JqZWN0KFJlbmRlck9iamVjdCogb2JqZWN0KQo=