114548 2013-04-12 17:00:48 -0700 Update AVFoundationCF code after http://trac.webkit.org/changeset/148291 2013-06-28 09:24:07 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned eric.carlson jer.noble roger_fong oldest_to_newest 875056 0 roger_fong 2013-04-12 17:00:48 -0700 patch incoming 875057 1 roger_fong 2013-04-12 17:01:07 -0700 (In reply to comment #0) > patch incoming This is also to fix the build 875071 2 197913 roger_fong 2013-04-12 17:26:02 -0700 Created attachment 197913 patch 904660 3 roger_fong 2013-06-28 09:24:07 -0700 http://trac.webkit.org/changeset/148323 197913 2013-04-12 17:26:02 -0700 2013-04-12 17:30:54 -0700 patch patch.patch text/plain 7712 roger_fong SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODMx OCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA0 LTA5ICBSb2dlciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRl IEFWRm91bmRhdGlvbkNGIGNvZGUgZm9sbG93aW5nIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzE0ODI5MS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNDU0OC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25DRi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25DRjo6c2Vla1RvVGltZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6cGxhdGZvcm1NaW5UaW1lU2Vla2FibGUpOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRjo6cGxhdGZvcm1NYXhUaW1lU2Vla2FibGUpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25DRi5oOgorICAgICAgICAoTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YpOgorCiAy MDEzLTA0LTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIERlbXlzdGlmeSBzb21lIGNvZGUgaW4gUmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbGFibGVB cmVhU2V0KCkKSW5kZXg6IFdlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvagkocmV2aXNpb24gMTQ4MzEwKQor KysgV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMzYw Niw2ICszNjA2LDcgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXGh0bWxcY2FudmFzXENh bnZhc1BhdGhNZXRob2RzLmNwcCIgLz4KICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXGh0bWxc cGFyc2VyXEhUTUxJZGVudGlmaWVyLmNwcCIgLz4KICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4u XGh0bWxcdHJhY2tcVGV4dFRyYWNrQ3VlR2VuZXJpYy5jcHAiIC8+CisgICAgPENsQ29tcGlsZSBJ bmNsdWRlPSIuLlxodG1sXHRyYWNrXFRyYWNrTGlzdEJhc2UuY3BwIiAvPgogICAgIDxDbENvbXBp bGUgSW5jbHVkZT0iLi5caHRtbFx0cmFja1xXZWJWVFRFbGVtZW50LmNwcCIgLz4KICAgICA8Q2xD b21waWxlIEluY2x1ZGU9Ii4uXGluc3BlY3RvclxUaW1lbGluZVRyYWNlRXZlbnRQcm9jZXNzb3Iu Y3BwIj4KICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRp b24pfCQoUGxhdGZvcm0pJz09J1Byb2R1Y3Rpb258V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21C dWlsZD4KQEAgLTExMTg2LDYgKzExMTg3LDcgQEAKICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4u XEZvcndhcmRpbmdIZWFkZXJzXHlhcnJcWWFyckpJVC5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5j bHVkZT0iLi5caHRtbFxjYW52YXNcQ2FudmFzUGF0aE1ldGhvZHMuaCIgLz4KICAgICA8Q2xJbmNs dWRlIEluY2x1ZGU9Ii4uXGh0bWxcdHJhY2tcVGV4dFRyYWNrQ3VlR2VuZXJpYy5oIiAvPgorICAg IDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caHRtbFx0cmFja1xUcmFja0xpc3RCYXNlLmgiIC8+CiAg ICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxodG1sXHRyYWNrXFdlYlZUVEVsZW1lbnQuaCIgLz4K ICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGluc3BlY3RvclxUaW1lbGluZVRyYWNlRXZlbnRQ cm9jZXNzb3IuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXE1vZHVsZXNcZmlsZXN5 c3RlbVxBc3luY0ZpbGVXcml0ZXIuaCIgLz4KQEAgLTEzNjI0LDQgKzEzNjI2LDQgQEAKICAgPElt cG9ydCBQcm9qZWN0PSIkKFZDVGFyZ2V0c1BhdGgpXE1pY3Jvc29mdC5DcHAudGFyZ2V0cyIgLz4K ICAgPEltcG9ydEdyb3VwIExhYmVsPSJFeHRlbnNpb25UYXJnZXRzIj4KICAgPC9JbXBvcnRHcm91 cD4KLTwvUHJvamVjdD4KKzwvUHJvamVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCklu ZGV4OiBXZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qLmZpbHRlcnMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzCShyZXZpc2lvbiAxNDgz MTApCisrKyBXZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qLmZpbHRlcnMJKHdvcmtpbmcg Y29weSkKQEAgLTI0MTIsOSArMjQxMiw2IEBACiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxs b2FkZXJcY2FjaGVcQ2FjaGVkUmF3UmVzb3VyY2UuY3BwIj4KICAgICAgIDxGaWx0ZXI+bG9hZGVy XGNhY2hlPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+Ci0gICAgPENsQ29tcGlsZSBJbmNsdWRl PSIuLlxsb2FkZXJcY2FjaGVcQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQuY3BwIj4KLSAgICAgIDxG aWx0ZXI+bG9hZGVyXGNhY2hlPC9GaWx0ZXI+Ci0gICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29t cGlsZSBJbmNsdWRlPSIuLlxsb2FkZXJcY2FjaGVcQ2FjaGVkUmVzb3VyY2UuY3BwIj4KICAgICAg IDxGaWx0ZXI+bG9hZGVyXGNhY2hlPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+CkBAIC02ODU5 LDYgKzY4NTYsOSBAQAogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5ccGxhdGZvcm1cZ3JhcGhp Y3NcY2dcU3ViaW1hZ2VDYWNoZVdpdGhUaW1lci5jcHAiPgogICAgICAgPEZpbHRlcj5wbGF0Zm9y bVxncmFwaGljc1xjZzwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgorICAgIDxDbENvbXBpbGUg SW5jbHVkZT0iLi5caHRtbFx0cmFja1xUcmFja0xpc3RCYXNlLmNwcCI+CisgICAgICA8RmlsdGVy Pmh0bWxcdHJhY2s8L0ZpbHRlcj4KKyAgICA8L0NsQ29tcGlsZT4KICAgPC9JdGVtR3JvdXA+CiAg IDxJdGVtR3JvdXA+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRpb25CdWls ZERpcilcb2JqXCQoUHJvamVjdE5hbWUpXERlcml2ZWRTb3VyY2VzXENTU0dyYW1tYXIuaCI+CkBA IC0xNDM3NSw2ICsxNDM3NSwxMSBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5ccGxhdGZv cm1cZ3JhcGhpY3NcY2dcU3ViaW1hZ2VDYWNoZVdpdGhUaW1lci5oIj4KICAgICAgIDxGaWx0ZXI+ cGxhdGZvcm1cZ3JhcGhpY3NcY2c8L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4KKyAgICA8Q2xJ bmNsdWRlIEluY2x1ZGU9Ii4uXGxvYWRlclxjYWNoZVxDYWNoZWRSYXdSZXNvdXJjZUNsaWVudC5o IiAvPgorICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5ccGxhdGZvcm1cVmlzaXRlZExpbmtTdHJh dGVneS5oIiAvPgorICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5caHRtbFx0cmFja1xUcmFja0xp c3RCYXNlLmgiPgorICAgICAgPEZpbHRlcj5odG1sXHRyYWNrPC9GaWx0ZXI+CisgICAgPC9DbElu Y2x1ZGU+CiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdyb3VwPgogICAgIDxOb25lIEluY2x1ZGU9 Ii4uXGNzc1xDU1NHcmFtbWFyLnkuaW4iPgpAQCAtMTUzMjQsNCArMTUzMjksNCBAQAogICAgICAg PEZpbHRlcj5yZW5kZXJpbmc8L0ZpbHRlcj4KICAgICA8L0N1c3RvbUJ1aWxkU3RlcD4KICAgPC9J dGVtR3JvdXA+Ci08L1Byb2plY3Q+Cis8L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg ZmlsZQpJbmRleDogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCShy ZXZpc2lvbiAxNDgzMTApCisrKyBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00ODks NyArNDg5LDcgQEAKICAgICByZXR1cm4gMDsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRjo6c2Vla1RvVGltZShmbG9hdCB0aW1lKQordm9pZCBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25DRjo6c2Vla1RvVGltZShkb3VibGUgdGltZSkKIHsKICAgICBpZiAo IW1fYXZmV3JhcHBlcikKICAgICAgICAgcmV0dXJuOwpAQCAtNTY4LDcgKzU2OCwzMSBAQAogICAg IHJldHVybiB0aW1lUmFuZ2VzLnJlbGVhc2UoKTsKIH0KIAotZmxvYXQgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uQ0Y6OnBsYXRmb3JtTWF4VGltZVNlZWthYmxlKCkgY29uc3QKK2RvdWJs ZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6cGxhdGZvcm1NaW5UaW1lU2Vla2Fi bGUoKSBjb25zdCAKK3sgCisgICAgUmV0YWluUHRyPENGQXJyYXlSZWY+IHNlZWthYmxlUmFuZ2Vz KEFkb3B0Q0YsIEFWQ0ZQbGF5ZXJJdGVtQ29weVNlZWthYmxlVGltZVJhbmdlcyhhdlBsYXllckl0 ZW0obV9hdmZXcmFwcGVyKSkpOworICAgIGlmICghc2Vla2FibGVSYW5nZXMpIAorICAgICAgICBy ZXR1cm4gMDsgCisKKyAgICBkb3VibGUgbWluVGltZVNlZWthYmxlID0gc3RkOjpudW1lcmljX2xp bWl0czxkb3VibGU+OjppbmZpbml0eSgpOyAKKyAgICBib29sIGhhc1ZhbGlkUmFuZ2UgPSBmYWxz ZTsgCisgICAgQ0ZJbmRleCByYW5nZUNvdW50ID0gQ0ZBcnJheUdldENvdW50KHNlZWthYmxlUmFu Z2VzLmdldCgpKTsKKyAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCByYW5nZUNvdW50OyBpKysp IHsKKyAgICAgICAgQ0ZEaWN0aW9uYXJ5UmVmIHJhbmdlID0gc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9u YXJ5UmVmPihDRkFycmF5R2V0VmFsdWVBdEluZGV4KHNlZWthYmxlUmFuZ2VzLmdldCgpLCBpKSk7 CisgICAgICAgIENNVGltZSBzdGFydCA9IENNVGltZU1ha2VGcm9tRGljdGlvbmFyeShzdGF0aWNf Y2FzdDxDRkRpY3Rpb25hcnlSZWY+KENGRGljdGlvbmFyeUdldFZhbHVlKHJhbmdlLCBDTVRpbWVS YW5nZVN0YXJ0S2V5KCkpKSk7CisgICAgICAgIENNVGltZSBkdXJhdGlvbiA9IENNVGltZU1ha2VG cm9tRGljdGlvbmFyeShzdGF0aWNfY2FzdDxDRkRpY3Rpb25hcnlSZWY+KENGRGljdGlvbmFyeUdl dFZhbHVlKHJhbmdlLCBDTVRpbWVSYW5nZUR1cmF0aW9uS2V5KCkpKSk7CisgICAgICAgIGlmICgh dGltZVJhbmdlSXNWYWxpZEFuZE5vdEVtcHR5KHN0YXJ0LCBkdXJhdGlvbikpCisgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICBoYXNWYWxpZFJhbmdlID0gdHJ1ZTsgCisgICAgICAgIGRv dWJsZSBzdGFydE9mUmFuZ2UgPSBDTVRpbWVHZXRTZWNvbmRzKHN0YXJ0KTsgCisgICAgICAgIGlm IChtaW5UaW1lU2Vla2FibGUgPiBzdGFydE9mUmFuZ2UpIAorICAgICAgICAgICAgbWluVGltZVNl ZWthYmxlID0gc3RhcnRPZlJhbmdlOyAKKyAgICB9IAorICAgIHJldHVybiBoYXNWYWxpZFJhbmdl ID8gbWluVGltZVNlZWthYmxlIDogMDsgCit9IAorCitkb3VibGUgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uQ0Y6OnBsYXRmb3JtTWF4VGltZVNlZWthYmxlKCkgY29uc3QKIHsKICAgICBp ZiAoIWF2UGxheWVySXRlbShtX2F2ZldyYXBwZXIpKQogICAgICAgICByZXR1cm4gMDsKQEAgLTU3 Nyw3ICs2MDEsNyBAQAogICAgIGlmICghc2Vla2FibGVSYW5nZXMpCiAgICAgICAgIHJldHVybiAw OwogCi0gICAgZmxvYXQgbWF4VGltZVNlZWthYmxlID0gMDsKKyAgICBkb3VibGUgbWF4VGltZVNl ZWthYmxlID0gMDsKICAgICBDRkluZGV4IHJhbmdlQ291bnQgPSBDRkFycmF5R2V0Q291bnQoc2Vl a2FibGVSYW5nZXMuZ2V0KCkpOwogICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IHJhbmdlQ291 bnQ7IGkrKykgewogICAgICAgICBDRkRpY3Rpb25hcnlSZWYgcmFuZ2UgPSBzdGF0aWNfY2FzdDxD RkRpY3Rpb25hcnlSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgoc2Vla2FibGVSYW5nZXMuZ2V0 KCksIGkpKTsKQEAgLTU4Niw3ICs2MTAsNyBAQAogICAgICAgICBpZiAoIXRpbWVSYW5nZUlzVmFs aWRBbmROb3RFbXB0eShzdGFydCwgZHVyYXRpb24pKQogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIAotICAgICAgICBmbG9hdCBlbmRPZlJhbmdlID0gbmFycm93UHJlY2lzaW9uVG9GbG9h dChDTVRpbWVHZXRTZWNvbmRzKENNVGltZUFkZChzdGFydCwgZHVyYXRpb24pKSk7CisgICAgICAg IGRvdWJsZSBlbmRPZlJhbmdlID0gQ01UaW1lR2V0U2Vjb25kcyhDTVRpbWVBZGQoc3RhcnQsIGR1 cmF0aW9uKSk7CiAgICAgICAgIGlmIChtYXhUaW1lU2Vla2FibGUgPCBlbmRPZlJhbmdlKQogICAg ICAgICAgICAgbWF4VGltZVNlZWthYmxlID0gZW5kT2ZSYW5nZTsKICAgICB9CkluZGV4OiBwbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uQ0YuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2Yv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuaAkocmV2aXNpb24gMTQ4MzEwKQorKysg cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbkNGLmgJKHdvcmtpbmcgY29weSkKQEAgLTc0LDEwICs3NCwxMSBAQAogICAgIHZpcnR1 YWwgdm9pZCBjaGVja1BsYXlhYmlsaXR5KCk7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVJhdGUo KTsKICAgICB2aXJ0dWFsIGZsb2F0IHJhdGUoKSBjb25zdDsKLSAgICB2aXJ0dWFsIHZvaWQgc2Vl a1RvVGltZShmbG9hdCB0aW1lKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2Vla1RvVGltZShkb3VibGUg dGltZSk7CiAgICAgdmlydHVhbCB1bnNpZ25lZCB0b3RhbEJ5dGVzKCkgY29uc3Q7CiAgICAgdmly dHVhbCBQYXNzUmVmUHRyPFRpbWVSYW5nZXM+IHBsYXRmb3JtQnVmZmVyZWRUaW1lUmFuZ2VzKCkg Y29uc3Q7Ci0gICAgdmlydHVhbCBmbG9hdCBwbGF0Zm9ybU1heFRpbWVTZWVrYWJsZSgpIGNvbnN0 OworICAgIHZpcnR1YWwgZG91YmxlIHBsYXRmb3JtTWluVGltZVNlZWthYmxlKCkgY29uc3Q7Cisg ICAgdmlydHVhbCBkb3VibGUgcGxhdGZvcm1NYXhUaW1lU2Vla2FibGUoKSBjb25zdDsKICAgICB2 aXJ0dWFsIGZsb2F0IHBsYXRmb3JtRHVyYXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIGZsb2F0 IHBsYXRmb3JtTWF4VGltZUxvYWRlZCgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBiZWdpbkxv YWRpbmdNZXRhZGF0YSgpOwo=