118076 2013-06-26 13:42:42 -0700 [Windows] Enable CaptionUserPreferencesMediaAF on Windows 2013-06-26 15:03:16 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham benjamin cmarcelo commit-queue eric.carlson glenn jer.noble webkit-bug-importer oldest_to_newest 903872 0 bfulgham 2013-06-26 13:42:42 -0700 This bug begins using the CaptionUserPreferencesMediaAF class on the Apple Windows port: 1. Enable sources in the build for the Apple Windows port. 2. Modify some of the feature activation logic in WTF/wtf/Platform.h to use the Media Accessibility Framework if present. 3. Enable Video Tracking localized strings for the Windows port. This change should not modify any behavior, as the Windows port does not yet support In-Band Caption display. 903876 1 205524 bfulgham 2013-06-26 13:47:53 -0700 Created attachment 205524 Patch 903877 2 webkit-bug-importer 2013-06-26 13:51:46 -0700 <rdar://problem/14280545> 903913 3 205524 eric.carlson 2013-06-26 14:33:26 -0700 Comment on attachment 205524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205524&action=review > Source/WTF/wtf/Platform.h:957 > +#if (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 > #define WTF_USE_AVFOUNDATION 1 > #endif Did you mean to include this in this patch? > Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:139 > +SOFT_LINK_DLL_IMPORT(CoreText, CTFontDescriptorCopyAttribute, CFTypeRef, __cdecl, (CTFontDescriptorRef descriptor, CFStringRef attribute), (descriptor, attribute)); > +#define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute > + > +SOFT_LINK_VARIABLE_DLL_IMPORT(CoreText, kCTFontNameAttribute, CFStringRef) > +#define kCTFontNameAttribute get_kCTFontNameAttribute() > + Doesn't this need to be inside of "PLATFORM(WIN)"? > Source/WebCore/platform/LocalizedStrings.cpp:1055 > +#if USE(CF) Why "USE(CF)" instead of Mac and Windows explicitly? > Source/WebCore/platform/LocalizedStrings.h:246 > -#if PLATFORM(MAC) > +#if USE(CF) Ditto. 903926 4 205524 bfulgham 2013-06-26 14:50:32 -0700 Comment on attachment 205524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205524&action=review >> Source/WTF/wtf/Platform.h:957 >> #endif > > Did you mean to include this in this patch? I'll remove it. We don't need this turned on for this patch. >> Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:139 >> + > > Doesn't this need to be inside of "PLATFORM(WIN)"? It is -- the CoreText stuff is part of the same stanza as the soft-link for the MediaAccessibility library, which is conditionally compiled for Windows only. >> Source/WebCore/platform/LocalizedStrings.cpp:1055 >> +#if USE(CF) > > Why "USE(CF)" instead of Mac and Windows explicitly? Yeah -- that would probably be better. I'll change that. >> Source/WebCore/platform/LocalizedStrings.h:246 >> +#if USE(CF) > > Ditto. Ditto! :-) 903931 5 bfulgham 2013-06-26 15:03:16 -0700 Committed r152035: <http://trac.webkit.org/changeset/152035> 205524 2013-06-26 13:47:53 -0700 2013-06-26 14:50:32 -0700 Patch bug-118076-20130626134653.patch text/plain 6486 bfulgham SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNTIwMDYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA2LTI2ICBCcmVudCBGdWxnaGFtICA8YmZ1 bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBFbmFibGUgQ2FwdGlvblVzZXJQ cmVmZXJlbmNlTWVkaWFBRiBvbiBXaW5kb3dzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDogRW5hYmxlIE1lZGlhIEFjY2Vz c2liaWxpdHkgRnJhbWV3b3JrIGluIFdpbmRvd3MgYnVpbGQgZW52aXJvbm1lbnRzCisgICAgICAg ICAgdGhhdCBzdXBwb3J0IGl0LgorCiAyMDEzLTA2LTI0ICBSb2dlciBGb25nICA8cm9nZXJfZm9u Z0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQXBwbGVXaW4gYnVpbGQgZml4LCBm b2xsb3d1cCB0byByMTUxOTE1LgpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCShyZXZpc2lvbiAxNTIwMDQpCisr KyBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NjcsNyArNDY3 LDcgQEAKIC8qIEdyYXBoaWNzIGVuZ2luZXMgKi8KIAogLyogVVNFKENHKSBhbmQgUExBVEZPUk0o Q0kpICovCi0jaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1MpCisjaWYgUExBVEZPUk0o TUFDKSB8fCBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShXSU4pICYmICFVU0UoV0lOR0RJKSAm JiAhUExBVEZPUk0oV0lOX0NBSVJPKSkKICNkZWZpbmUgV1RGX1VTRV9DRyAxCiAjZW5kaWYKICNp ZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKFdJTikgJiYgVVNF KENHKSkKQEAgLTk1Miw3ICs5NTIsNyBAQAogI2RlZmluZSBFTkFCTEVfQklORElOR19JTlRFR1JJ VFkgMQogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpICYmICFQTEFURk9STShJT1MpICYmIF9f TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA3MAorI2lmIChQTEFURk9STShNQUMp IHx8IChPUyhXSU5ET1dTKSAmJiBVU0UoQ0cpKSkgJiYgIVBMQVRGT1JNKElPUykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDcwCiAjZGVmaW5lIFdURl9VU0VfQVZGT1VO REFUSU9OIDEKICNlbmRpZgogCkBAIC05NjgsNyArOTY4LDcgQEAKICNkZWZpbmUgSEFWRV9BVkZP VU5EQVRJT05fTEVHSUJMRV9PVVRQVVRfU1VQUE9SVCAxCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JN KE1BQykgJiYgIVBMQVRGT1JNKElPUykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA+PSAxMDkwCisjaWYgKFBMQVRGT1JNKE1BQykgfHwgKE9TKFdJTkRPV1MpICYmIFVTRShDRykp KSAmJiAhUExBVEZPUk0oSU9TKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEwOTAKICNkZWZpbmUgSEFWRV9NRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSyAxCiAjZW5k aWYKIApJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUyMDA2KQorKysgU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDYtMjYgIEJy ZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dpbmRvd3NdIEVu YWJsZSBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRiBvbiBXaW5kb3dzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MDc2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLnZjeHByb2ov V2ViQ29yZS52Y3hwcm9qOiBFbmFibGUgYnVpbGRpbmcgdGhlIENhcHRpb25Vc2VyUHJlZmVyZW5j ZXNNZWRpYUFGIHNvdXJjZSBmaWxlLgorICAgICAgICAqIHBhZ2UvQ2FwdGlvblVzZXJQcmVmZXJl bmNlc01lZGlhQUYuY3BwOiBBZGQgc29mdC1saW5rIGNvbW1hbmRzIGZvciBDb3JlVGV4dCBzeW1i b2xzIG5lZWRlZCBpbgorICAgICAgICAgIHRoZSBpbXBsZW1lbnRhdGlvbiBmb3IgV2luZG93cy4K KyAgICAgICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcDogRW5hYmxlIFRleHQgVHJh Y2stcmVsYXRlZCBzdHJpbmdzIG9uIFdpbmRvd3MuCisgICAgICAgICogcGxhdGZvcm0vTG9jYWxp emVkU3RyaW5ncy5oOiBEaXR0by4KKwogMjAxMy0wNi0yNiAgRGF2aWQgS2lsemVyICA8ZGRraWx6 ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJVSUxEIEZJWCAocjE1MTk4MSk6IEluY2x1ZGUgSFRN TEF1ZGlvRWxlbWVudC5oIGZvciBFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvagkocmV2 aXNpb24gMTUyMDA0KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUu dmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNDE0MiwxMiArNDE0Miw4IEBACiAgICAgPENsQ29t cGlsZSBJbmNsdWRlPSIuLlxwYWdlXEJhclByb3AuY3BwIiAvPgogICAgIDxDbENvbXBpbGUgSW5j bHVkZT0iLi5ccGFnZVxDYXB0aW9uVXNlclByZWZlcmVuY2VzLmNwcCIgLz4KICAgICA8Q2xDb21w aWxlIEluY2x1ZGU9Ii4uXHBhZ2VcQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUYuY3BwIj4K LSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J0RlYnVnU3VmZml4fFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+ Ci0gICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9uKXwk KFBsYXRmb3JtKSc9PSdEZWJ1Z19XaW5DYWlyb3xXaW4zMiciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1 aWxkPgotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlv bil8JChQbGF0Zm9ybSknPT0nRGVidWd8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4K LSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J1Byb2R1Y3Rpb258V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4K ICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J1JlbGVhc2VfV2luQ2Fpcm98V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRp b24pfCQoUGxhdGZvcm0pJz09J1JlbGVhc2V8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWls ZD4KKyAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24p fCQoUGxhdGZvcm0pJz09J0RlYnVnX1dpbkNhaXJvfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9t QnVpbGQ+CiAgICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxwYWdl XENocm9tZS5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxwYWdlXGFuaW1hdGlv blxDb21wb3NpdGVBbmltYXRpb24uY3BwIiAvPgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9D YXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzTWVkaWFBRi5jcHAJKHJldmlzaW9uIDE1 MjAwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlh QUYuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsNiArMTMxLDEyIEBAIFNPRlRfTElOS19WQVJJ QUJMRV9ETExfSU1QT1JUKE1lZGlhQWNjZXMKIAogU09GVF9MSU5LX0xJQlJBUlkoQ29yZVRleHQp CiAKK1NPRlRfTElOS19ETExfSU1QT1JUKENvcmVUZXh0LCBDVEZvbnREZXNjcmlwdG9yQ29weUF0 dHJpYnV0ZSwgIENGVHlwZVJlZiwgX19jZGVjbCwgKENURm9udERlc2NyaXB0b3JSZWYgZGVzY3Jp cHRvciwgQ0ZTdHJpbmdSZWYgYXR0cmlidXRlKSwgKGRlc2NyaXB0b3IsIGF0dHJpYnV0ZSkpOwor I2RlZmluZSBDVEZvbnREZXNjcmlwdG9yQ29weUF0dHJpYnV0ZSBzb2Z0TGlua19DVEZvbnREZXNj cmlwdG9yQ29weUF0dHJpYnV0ZQorCitTT0ZUX0xJTktfVkFSSUFCTEVfRExMX0lNUE9SVChDb3Jl VGV4dCwga0NURm9udE5hbWVBdHRyaWJ1dGUsIENGU3RyaW5nUmVmKQorI2RlZmluZSBrQ1RGb250 TmFtZUF0dHJpYnV0ZSBnZXRfa0NURm9udE5hbWVBdHRyaWJ1dGUoKQorCiAKICNlbmRpZgogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAkocmV2 aXNpb24gMTUyMDA0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5n cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNTIsNyArMTA1Miw3IEBAIFN0cmluZyB0ZXh0VHJh Y2tOb0xhYmVsVGV4dCgpCiAgICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJVbmtub3duIiwg IlVua25vd24gKHRleHQgdHJhY2spIiwgIk1lbnUgaXRlbSBsYWJlbCBmb3IgYSB0ZXh0IHRyYWNr IHRoYXQgaGFzIG5vIG90aGVyIG5hbWUiKTsKIH0KICAgICAKLSNpZiBQTEFURk9STShNQUMpCisj aWYgVVNFKENGKQogU3RyaW5nIHRleHRUcmFja0NvdW50cnlBbmRMYW5ndWFnZU1lbnVJdGVtVGV4 dChjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGNvdW50cnksIGNvbnN0IFN0cmlu ZyYgbGFuZ3VhZ2UpCiB7CiAgICAgcmV0dXJuIGZvcm1hdExvY2FsaXplZFN0cmluZyhXRUJfVUlf U1RSSU5HKCIlQCAoJUAtJUApIiwgIlRleHQgdHJhY2sgZGlzcGxheSBuYW1lIGZvcm1hdCB0aGF0 IGluY2x1ZGVzIHRoZSBjb3VudHJ5IGFuZCBsYW5ndWFnZSBvZiB0aGUgc3VidGl0bGUsIGluIHRo ZSBmb3JtIG9mICdUaXRsZSAoTGFuZ3VhZ2UtQ291bnRyeSknIiksIHRpdGxlLmNyZWF0ZUNGU3Ry aW5nKCkuZ2V0KCksIGxhbmd1YWdlLmNyZWF0ZUNGU3RyaW5nKCkuZ2V0KCksIGNvdW50cnkuY3Jl YXRlQ0ZTdHJpbmcoKS5nZXQoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2Nh bGl6ZWRTdHJpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9j YWxpemVkU3RyaW5ncy5oCShyZXZpc2lvbiAxNTIwMDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI0Myw3ICsyNDMsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgU3RyaW5nIHRleHRUcmFja09mZk1lbnVJdGVtVGV4 dCgpOwogICAgIFN0cmluZyB0ZXh0VHJhY2tBdXRvbWF0aWNNZW51SXRlbVRleHQoKTsKICAgICBT dHJpbmcgdGV4dFRyYWNrTm9MYWJlbFRleHQoKTsKLSNpZiBQTEFURk9STShNQUMpCisjaWYgVVNF KENGKQogICAgIFN0cmluZyB0ZXh0VHJhY2tDb3VudHJ5QW5kTGFuZ3VhZ2VNZW51SXRlbVRleHQo Y29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBjb3VudHJ5LCBjb25zdCBTdHJpbmcm IGxhbmd1YWdlKTsKICAgICBTdHJpbmcgdGV4dFRyYWNrTGFuZ3VhZ2VNZW51SXRlbVRleHQoY29u c3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBsYW5ndWFnZSk7CiAgICAgU3RyaW5nIGNs b3NlZENhcHRpb25UcmFja01lbnVJdGVtVGV4dChjb25zdCBTdHJpbmcmKTsK