141310 2015-02-05 15:58:41 -0800 [iOS] don't get out of sync when interrupt/resume calls are not balanced 2015-02-10 07:47:58 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue oldest_to_newest 1067240 0 eric.carlson 2015-02-05 15:58:41 -0800 It is possible for MediaSession::endInterruption to be called several times when resuming, which confuses the MediaSession state machine. 1067896 1 eric.carlson 2015-02-09 13:43:20 -0800 <rdar://problem/19572894> 1067897 2 246285 eric.carlson 2015-02-09 13:44:27 -0800 Created attachment 246285 Proposed patch 1068056 3 246285 commit-queue 2015-02-10 07:47:54 -0800 Comment on attachment 246285 Proposed patch Clearing flags on attachment: 246285 Committed r179869: <http://trac.webkit.org/changeset/179869> 1068057 4 commit-queue 2015-02-10 07:47:58 -0800 All reviewed patches have been landed. Closing bug. 246285 2015-02-09 13:44:27 -0800 2015-02-10 07:47:54 -0800 Proposed patch patch_3.txt text/plain 5917 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3OTg0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAyLTA5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGRvbid0IGdl dCBvdXQgb2Ygc3luYyB3aGVuIGludGVycnVwdC9yZXN1bWUgY2FsbHMgYXJlIG5vdCBiYWxhbmNl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxMzEw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCB1cGRhdGVkIG1lZGlhL3ZpZGVvLWludGVycnVwdGlvbi13aXRoLXJlc3VtZS1hbGxv d2luZy1wbGF5Lmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uOjpiZWdpbkludGVycnVwdGlvbik6 IENvdW50IGludGVycnVwdGlvbnMuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb246OmVu ZEludGVycnVwdGlvbik6IElnbm9yZSBjYWxscyB3aGVuIG1faW50ZXJydXB0aW9uQ291bnQgaXMg YWxyZWFkeSB6ZXJvLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL01lZGlhU2Vzc2lvbi5oOgor CiAyMDE1LTAyLTA3ICBSb2dlciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViR0wgMjogVGV4dHVyZSBjYWxsIGZvcm1hdCwgaW50ZXJuYWwgZm9ybWF0LCBhbmQgdHlw ZSB2YWxpZGF0aW9uLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFT ZXNzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9N ZWRpYVNlc3Npb24uY3BwCShyZXZpc2lvbiAxNzk4MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSw5ICs4MSw5 IEBAIHZvaWQgTWVkaWFTZXNzaW9uOjpzZXRTdGF0ZShTdGF0ZSBzdGF0ZSkKIAogdm9pZCBNZWRp YVNlc3Npb246OmJlZ2luSW50ZXJydXB0aW9uKEludGVycnVwdGlvblR5cGUgdHlwZSkKIHsKLSAg ICBMT0coTWVkaWEsICJNZWRpYVNlc3Npb246OmJlZ2luSW50ZXJydXB0aW9uKCVwKSwgc3RhdGUg PSAlcyIsIHRoaXMsIHN0YXRlTmFtZShtX3N0YXRlKSk7CisgICAgTE9HKE1lZGlhLCAiTWVkaWFT ZXNzaW9uOjpiZWdpbkludGVycnVwdGlvbiglcCksIHN0YXRlID0gJXMsIGludGVycnVwdGlvbiBj b3VudCA9ICVpIiwgdGhpcywgc3RhdGVOYW1lKG1fc3RhdGUpLCBtX2ludGVycnVwdGlvbkNvdW50 KTsKIAotICAgIGlmICh0eXBlID09IEVudGVyaW5nQmFja2dyb3VuZCAmJiBjbGllbnQoKS5vdmVy cmlkZUJhY2tncm91bmRQbGF5YmFja1Jlc3RyaWN0aW9uKCkpCisgICAgaWYgKCsrbV9pbnRlcnJ1 cHRpb25Db3VudCA+IDEgfHwgKHR5cGUgPT0gRW50ZXJpbmdCYWNrZ3JvdW5kICYmIGNsaWVudCgp Lm92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oKSkpCiAgICAgICAgIHJldHVy bjsKIAogICAgIG1fc3RhdGVUb1Jlc3RvcmUgPSBzdGF0ZSgpOwpAQCAtOTUsNyArOTUsMTUgQEAg dm9pZCBNZWRpYVNlc3Npb246OmJlZ2luSW50ZXJydXB0aW9uKEludAogCiB2b2lkIE1lZGlhU2Vz c2lvbjo6ZW5kSW50ZXJydXB0aW9uKEVuZEludGVycnVwdGlvbkZsYWdzIGZsYWdzKQogewotICAg IExPRyhNZWRpYSwgIk1lZGlhU2Vzc2lvbjo6ZW5kSW50ZXJydXB0aW9uKCVwKSAtIGZsYWdzID0g JWksIHN0YXRlVG9SZXN0b3JlID0gJXMiLCB0aGlzLCAoaW50KWZsYWdzLCBzdGF0ZU5hbWUobV9z dGF0ZVRvUmVzdG9yZSkpOworICAgIExPRyhNZWRpYSwgIk1lZGlhU2Vzc2lvbjo6ZW5kSW50ZXJy dXB0aW9uKCVwKSAtIGZsYWdzID0gJWksIHN0YXRlVG9SZXN0b3JlID0gJXMsIGludGVycnVwdGlv biBjb3VudCA9ICVpIiwgdGhpcywgKGludClmbGFncywgc3RhdGVOYW1lKG1fc3RhdGVUb1Jlc3Rv cmUpLCBtX2ludGVycnVwdGlvbkNvdW50KTsKKworICAgIGlmICghbV9pbnRlcnJ1cHRpb25Db3Vu dCkgeworICAgICAgICBMT0coTWVkaWEsICJNZWRpYVNlc3Npb246OmVuZEludGVycnVwdGlvbigl cCkgLSAhISBpZ25vcmluZyBzcHVyaW91cyBpbnRlcnJ1cHRpb24gZW5kICEhIiwgdGhpcyk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoLS1tX2ludGVycnVwdGlvbkNvdW50KQor ICAgICAgICByZXR1cm47CiAKICAgICBTdGF0ZSBzdGF0ZVRvUmVzdG9yZSA9IG1fc3RhdGVUb1Jl c3RvcmU7CiAgICAgbV9zdGF0ZVRvUmVzdG9yZSA9IElkbGU7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9hdWRpby9NZWRpYVNlc3Npb24uaAkocmV2aXNpb24gMTc5ODM3KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vTWVkaWFTZXNzaW9uLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEyMiw2ICsxMjIsNyBAQCBwcml2YXRlOgogICAgIFRpbWVyIG1fY2xpZW50RGF0YUJ1 ZmZlcmluZ1RpbWVyOwogICAgIFN0YXRlIG1fc3RhdGU7CiAgICAgU3RhdGUgbV9zdGF0ZVRvUmVz dG9yZTsKKyAgICBpbnQgbV9pbnRlcnJ1cHRpb25Db3VudCB7IDAgfTsKICAgICBib29sIG1fbm90 aWZ5aW5nQ2xpZW50OwogfTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTc5ODQyKQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMDIt MDkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW2lP U10gZG9uJ3QgZ2V0IG91dCBvZiBzeW5jIHdoZW4gaW50ZXJydXB0L3Jlc3VtZSBjYWxscyBhcmUg bm90IGJhbGFuY2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDEzMTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIG1lZGlhL3ZpZGVvLWludGVycnVwdGlvbi13aXRoLXJlc3VtZS1hbGxvd2luZy1wbGF5 LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBtZWRpYS92aWRlby1pbnRlcnJ1cHRpb24td2l0aC1y ZXN1bWUtYWxsb3dpbmctcGxheS5odG1sOiBVcGRhdGVkIHRvIHRlc3QgdW5iYWxhbmNlZCBjYWxs cyAKKyAgICAgICAgICAgIHRvIGJlZ2luL2VuZCBpbnRlcnJ1cHRpb24uCisKIDIwMTUtMDItMDkg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkF1ZGlvXSBB dWRpb0J1ZmZlclNvdXJjZU5vZGVzIHNob3VsZCBhY2N1cmF0ZWx5IHBsYXkgYmFja3dhcmRzIGlm IGdpdmVuIGEgbmVnYXRpdmUgcGxheWJhY2tSYXRlLgpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEv dmlkZW8taW50ZXJydXB0aW9uLXdpdGgtcmVzdW1lLWFsbG93aW5nLXBsYXktZXhwZWN0ZWQudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWludGVycnVwdGlvbi13aXRo LXJlc3VtZS1hbGxvd2luZy1wbGF5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTc5ODM3KQorKysg TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8taW50ZXJydXB0aW9uLXdpdGgtcmVzdW1lLWFsbG93aW5n LXBsYXktZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xNSw1ICsxNSwxNSBAQCBSVU4o aW50ZXJuYWxzLmVuZE1lZGlhU2Vzc2lvbkludGVycnVwdGlvCiBFVkVOVChwbGF5aW5nKQogRVhQ RUNURUQgKHZpZGVvLnBhdXNlZCA9PSAnZmFsc2UnKSBPSwogCitFWFBFQ1RFRCAodmlkZW8ucGF1 c2VkID09ICdmYWxzZScpIE9LCitSVU4oaW50ZXJuYWxzLmJlZ2luTWVkaWFTZXNzaW9uSW50ZXJy dXB0aW9uKCkpCisKKzEwMG1zIHRpbWVyIGZpcmVkLi4uCitFWFBFQ1RFRCAodmlkZW8ucGF1c2Vk ID09ICd0cnVlJykgT0sKK1JVTihpbnRlcm5hbHMuZW5kTWVkaWFTZXNzaW9uSW50ZXJydXB0aW9u KCdNYXlSZXN1bWVQbGF5aW5nJykpCisKK0VWRU5UKHBsYXlpbmcpCitFWFBFQ1RFRCAodmlkZW8u cGF1c2VkID09ICdmYWxzZScpIE9LCisKIEVORCBPRiBURVNUCiAKSW5kZXg6IExheW91dFRlc3Rz L21lZGlhL3ZpZGVvLWludGVycnVwdGlvbi13aXRoLXJlc3VtZS1hbGxvd2luZy1wbGF5Lmh0bWwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8taW50ZXJydXB0aW9uLXdpdGgt cmVzdW1lLWFsbG93aW5nLXBsYXkuaHRtbAkocmV2aXNpb24gMTc5ODM3KQorKysgTGF5b3V0VGVz dHMvbWVkaWEvdmlkZW8taW50ZXJydXB0aW9uLXdpdGgtcmVzdW1lLWFsbG93aW5nLXBsYXkuaHRt bAkod29ya2luZyBjb3B5KQpAQCAtNCw2ICs0LDcgQEAKICAgICAgICAgPHNjcmlwdCBzcmM9dmlk ZW8tdGVzdC5qcz48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgICAgIHZhciBz dGF0ZSA9IDA7CisgICAgICAgICAgICB2YXIgcmVzdW1lQ291bnQgPSAwOwogCiAgICAgICAgICAg ICBmdW5jdGlvbiBjaGVja1N0YXRlKCkKICAgICAgICAgICAgIHsKQEAgLTE1LDYgKzE2LDcgQEAK ICAgICAgICAgICAgICAgICAgICAgc2V0VGltZW91dChjaGVja1N0YXRlLCAxMDApOwogICAgICAg ICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwogICAgICAgICAgICAgICAgICAgICBicmVh azsKKwogICAgICAgICAgICAgICAgIGNhc2UgImludGVycnVwdGVkIjoKICAgICAgICAgICAgICAg ICAgICAgY29uc29sZVdyaXRlKCIxMDBtcyB0aW1lciBmaXJlZC4uLiIpOwogICAgICAgICAgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnBhdXNlZCIsIHRydWUpOwpAQCAtMjIsMTAgKzI0 LDE0IEBACiAgICAgICAgICAgICAgICAgICAgIHJ1bigiaW50ZXJuYWxzLmVuZE1lZGlhU2Vzc2lv bkludGVycnVwdGlvbignTWF5UmVzdW1lUGxheWluZycpIik7CiAgICAgICAgICAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiIik7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCiAgICAgICAg ICAgICAgICAgY2FzZSAicmVzdW1pbmciOgogICAgICAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0 ZWQoInZpZGVvLnBhdXNlZCIsIGZhbHNlKTsKICAgICAgICAgICAgICAgICAgICAgY29uc29sZVdy aXRlKCIiKTsKLSAgICAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgICAg ICAgICBpZiAoKytyZXN1bWVDb3VudCA9PSAyKQorICAgICAgICAgICAgICAgICAgICAgICAgZW5k VGVzdCgpOworICAgICAgICAgICAgICAgICAgICBzdGF0ZSA9ICJwbGF5aW5nIjsKKyAgICAgICAg ICAgICAgICAgICAgc2V0VGltZW91dChjaGVja1N0YXRlLCAxMDApOwogICAgICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Cg==