111087 2013-02-28 09:55:37 -0800 [Mac] use HAVE() macro instead of version check 2013-02-28 14:04:53 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson benjamin cmarcelo dino ojan.autocc webkit-bug-importer webkit.review.bot oldest_to_newest 844164 0 eric.carlson 2013-02-28 09:55:37 -0800 Define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK so we can use HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK) instead of testing __MAC_OS_X_VERSION_XXX directly. 844165 1 webkit-bug-importer 2013-02-28 09:55:50 -0800 <rdar://problem/13315073> 844185 2 190748 eric.carlson 2013-02-28 10:19:45 -0800 Created attachment 190748 Proposed patch 844282 3 190748 webkit.review.bot 2013-02-28 11:37:13 -0800 Comment on attachment 190748 Proposed patch Clearing flags on attachment: 190748 Committed r144336: <http://trac.webkit.org/changeset/144336> 844283 4 webkit.review.bot 2013-02-28 11:37:16 -0800 All reviewed patches have been landed. Closing bug. 844460 5 190748 rniwa 2013-02-28 14:04:53 -0800 Comment on attachment 190748 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=190748&action=review > Source/WebCore/page/PageGroup.cpp:42 > -#if PLATFORM(MAC) && !PLATFORM(IOS) > +#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK) Reverted this and > Source/WebCore/page/PageGroup.cpp:423 > -#if PLATFORM(MAC) && !PLATFORM(IOS) > +#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK) this in r144367 to fix media/video-controls-captions-trackmenu-sorted.html. 190748 2013-02-28 10:19:45 -0800 2013-02-28 14:04:53 -0800 Proposed patch patch_1.txt text/plain 5956 eric.carlson SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNDQzMjIpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEzLTAyLTI4ICBFcmljIENhcmxzb24gIDxlcmlj LmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIHVzZSBIQVZFKCkgbWFjcm8gaW5z dGVhZCBvZiB2ZXJzaW9uIGNoZWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTEwODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiBEZWZpbmUgSEFWRV9NRURJQV9BQ0NFU1NJ QklMSVRZX0ZSQU1FV09SSy4KKwogMjAxMy0wMi0yNyAgQmFsYXpzIEtpbHZhZHkgIDxraWx2YWR5 YkBob21lamlubmkuY29tPgogCiAgICAgICAgIEJ1ZyBpbiBhdG9taWNJbmNyZW1lbnQgaW1wbGVt ZW50YXRpb24gZm9yIE1JUFMgR0NDCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHJldmlzaW9uIDE0NDMxNSkK KysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMjAsNiAr MTAyMCwxMCBAQAogI2RlZmluZSBIQVZFX0FWRk9VTkRBVElPTl9URVhUX1RSQUNLX1NVUFBPUlQg MQogI2VuZGlmCiAKKyNpZiBQTEFURk9STShNQUMpICYmICFQTEFURk9STShJT1MpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAorI2RlZmluZSBIQVZFX01FRElBX0FD Q0VTU0lCSUxJVFlfRlJBTUVXT1JLIDEKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKSB8fCBQ TEFURk9STShHVEspIHx8IFBMQVRGT1JNKEVGTCkgfHwgKFBMQVRGT1JNKFdJTikgJiYgIU9TKFdJ TkNFKSAmJiAhUExBVEZPUk0oV0lOX0NBSVJPKSkgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICNk ZWZpbmUgV1RGX1VTRV9SRVFVRVNUX0FOSU1BVElPTl9GUkFNRV9USU1FUiAxCiAjZW5kaWYKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDMyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTI4ICBFcmljIENhcmxz b24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIHVzZSBIQVZFKCkg bWFjcm8gaW5zdGVhZCBvZiB2ZXJzaW9uIGNoZWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTEwODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3Rpbmcg dGVzdHMuCisKKyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNYWMuaDogVXNl IEhBVkUoTUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspLgorICAgICAgICAqIHBhZ2UvQ2Fw dGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDYXB0 aW9uVXNlclByZWZlcmVuY2VzTWFjOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjKTogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjOjp+Q2FwdGlvblVz ZXJQcmVmZXJlbmNlc01hYyk6IERpdHRvLgorCisgICAgICAgICogcGFnZS9QYWdlR3JvdXAuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjpjYXB0aW9uUHJlZmVyZW5jZXMpOiBEaXR0 by4KKwogMjAxMy0wMi0yOCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE0NDE1Ny4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5oCShyZXZpc2lvbiAx NDQzMTUpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNYWMu aAkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBh c3NPd25QdHI8Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYz4gY3JlYXRlKFBhZ2VHcm91cCogZ3Jv dXApIHsgcmV0dXJuIGFkb3B0UHRyKG5ldyBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjKGdyb3Vw KSk7IH0KICAgICB2aXJ0dWFsIH5DYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjKCk7CiAKLSNpZiBN QUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisjaWYgSEFWRShNRURJQV9BQ0NF U1NJQklMSVRZX0ZSQU1FV09SSykKICAgICB2aXJ0dWFsIGJvb2wgdXNlckhhc0NhcHRpb25QcmVm ZXJlbmNlcygpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCB1c2VyUHJlZmVyc0Nh cHRpb25zKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNldFVzZXJQcmVmZXJz Q2FwdGlvbnMoYm9vbCkgT1ZFUlJJREU7CkBAIC02MCw3ICs2MCw3IEBAIHB1YmxpYzoKIHByaXZh dGU6CiAgICAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYyhQYWdlR3JvdXAqKTsKIAotI2lmIE1B Q19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKKyNpZiBIQVZFKE1FRElBX0FDQ0VT U0lCSUxJVFlfRlJBTUVXT1JLKQogICAgIFN0cmluZyBjYXB0aW9uc1dpbmRvd0NTUygpIGNvbnN0 OwogICAgIFN0cmluZyBjYXB0aW9uc0JhY2tncm91bmRDU1MoKSBjb25zdDsKICAgICBTdHJpbmcg Y2FwdGlvbnNUZXh0Q29sb3JDU1MoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXNNYWMubW0JKHJldmlzaW9uIDE0NDMxNSkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNDUsMTEgKzQ1LDExIEBACiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAj aW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKLSNpZiBNQUNfT1NfWF9WRVJTSU9O X01JTl9SRVFVSVJFRCA+PSAxMDkwCisjaWYgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1F V09SSykKICNpbXBvcnQgIk1lZGlhQWNjZXNzaWJpbGl0eS9NZWRpYUFjY2Vzc2liaWxpdHkuaCIK ICNlbmRpZgogCi0jaWYgTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAorI2lm IEhBVkUoTUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCiAKIFNPRlRfTElOS19GUkFNRVdP UktfT1BUSU9OQUwoTWVkaWFBY2Nlc3NpYmlsaXR5KQogCkBAIC03Nyw3ICs3Nyw3IEBAIHVzaW5n IG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIE1BQ19PU19YX1ZF UlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKKyNpZiBIQVZFKE1FRElBX0FDQ0VTU0lCSUxJVFlf RlJBTUVXT1JLKQogc3RhdGljIHZvaWQgdXNlckNhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWROb3Rp ZmljYXRpb25DYWxsYmFjayhDRk5vdGlmaWNhdGlvbkNlbnRlclJlZiwgdm9pZCogb2JzZXJ2ZXIs IENGU3RyaW5nUmVmLCBjb25zdCB2b2lkICosIENGRGljdGlvbmFyeVJlZikKIHsKICAgICBzdGF0 aWNfY2FzdDxDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjKj4ob2JzZXJ2ZXIpLT5jYXB0aW9uUHJl ZmVyZW5jZXNDaGFuZ2VkKCk7CkBAIC04Niw3ICs4Niw3IEBAIHN0YXRpYyB2b2lkIHVzZXJDYXB0 aW9uUHJlZmVyZW5jZXNDaGFuZ2UKIAogQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYzo6Q2FwdGlv blVzZXJQcmVmZXJlbmNlc01hYyhQYWdlR3JvdXAqIGdyb3VwKQogICAgIDogQ2FwdGlvblVzZXJQ cmVmZXJlbmNlcyhncm91cCkKLSNpZiBNQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDkwCisjaWYgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykKICAgICAsIG1fbGlz dGVuaW5nRm9yUHJlZmVyZW5jZUNoYW5nZXMoZmFsc2UpCiAjZW5kaWYKIHsKQEAgLTk0LDEzICs5 NCwxMyBAQCBDYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjOjpDYXB0aW9uVXNlclByCiAKIENhcHRp b25Vc2VyUHJlZmVyZW5jZXNNYWM6On5DYXB0aW9uVXNlclByZWZlcmVuY2VzTWFjKCkKIHsKLSNp ZiBNQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCisjaWYgSEFWRShNRURJQV9B Q0NFU1NJQklMSVRZX0ZSQU1FV09SSykKICAgICBpZiAoa01BWENhcHRpb25BcHBlYXJhbmNlU2V0 dGluZ3NDaGFuZ2VkTm90aWZpY2F0aW9uKQogICAgICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclJl bW92ZU9ic2VydmVyKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0TG9jYWxDZW50ZXIoKSwgdGhpcywg a01BWENhcHRpb25BcHBlYXJhbmNlU2V0dGluZ3NDaGFuZ2VkTm90aWZpY2F0aW9uLCBOVUxMKTsK ICNlbmRpZgogfQogCi0jaWYgTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAor I2lmIEhBVkUoTUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCiBib29sIENhcHRpb25Vc2Vy UHJlZmVyZW5jZXNNYWM6OnVzZXJQcmVmZXJzQ2FwdGlvbnMoKSBjb25zdAogewogICAgIGlmICh0 ZXN0aW5nTW9kZSgpIHx8ICFNZWRpYUFjY2Vzc2liaWxpdHlMaWJyYXJ5KCkpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlR3JvdXAuY3BwCShyZXZpc2lvbiAxNDQzMTUpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL1BhZ2VHcm91cC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDcgQEAKICNp bmNsdWRlICJTdG9yYWdlTmFtZXNwYWNlLmgiCiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCi0j aWYgUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oSU9TKQorI2lmIEhBVkUoTUVESUFfQUNDRVNT SUJJTElUWV9GUkFNRVdPUkspCiAjaW5jbHVkZSAiQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYy5o IgogI2Vsc2UKICNpbmNsdWRlICJDYXB0aW9uVXNlclByZWZlcmVuY2VzLmgiCkBAIC00MjAsNyAr NDIwLDcgQEAgdm9pZCBQYWdlR3JvdXA6OmludmFsaWRhdGVkSW5qZWN0ZWRTdHlsZQogQ2FwdGlv blVzZXJQcmVmZXJlbmNlcyogUGFnZUdyb3VwOjpjYXB0aW9uUHJlZmVyZW5jZXMoKQogewogICAg IGlmICghbV9jYXB0aW9uUHJlZmVyZW5jZXMpCi0jaWYgUExBVEZPUk0oTUFDKSAmJiAhUExBVEZP Uk0oSU9TKQorI2lmIEhBVkUoTUVESUFfQUNDRVNTSUJJTElUWV9GUkFNRVdPUkspCiAgICAgICAg IG1fY2FwdGlvblByZWZlcmVuY2VzID0gQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01hYzo6Y3JlYXRl KHRoaXMpOwogI2Vsc2UKICAgICAgICAgbV9jYXB0aW9uUHJlZmVyZW5jZXMgPSBDYXB0aW9uVXNl clByZWZlcmVuY2VzOjpjcmVhdGUodGhpcyk7Cg==