45263 2010-09-06 06:53:00 -0700 Add mediaPlayerPlaybackStateChanged to MediaPlayerClient 2011-01-24 07:42:16 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 51249 1 vestbo vestbo ademar eric.carlson oldest_to_newest 274594 0 vestbo 2010-09-06 06:53:00 -0700 Add mediaPlayerPlaybackStateChanged to MediaPlayerClient 274595 1 66635 vestbo 2010-09-06 06:54:28 -0700 Created attachment 66635 Patch 274597 2 vestbo 2010-09-06 07:01:25 -0700 (In reply to comment #1) > Created an attachment (id=66635) [details] > Patch Tried to keep the logic of updatePlayState() in the refactor, but wondering about if (playerPaused && couldPlayIfEnoughData()), should this check be moved out of the play/not-playing block? Or perhaps be done like this? if (!playerPaused) m_player->pause(); if (couldPlayIfEnoughData()) m_player->prepareToPlay(); 275046 3 66635 eric.carlson 2010-09-07 08:21:50 -0700 Comment on attachment 66635 Patch > + updatePlayState() is then refactored to take into account the > + situation where the backend is already in the correct state but > + WebCore is not, so that we update thee playback progress timer Typo - "thee" > > +void HTMLMediaElement::mediaPlayerPlaybackStateChanged(MediaPlayer*) > +{ > + beginProcessingMediaPlayerCallback(); > + if (m_player) { > + if (m_player->paused()) > + pauseInternal(); > + else > + playInternal(); > + } > + endProcessingMediaPlayerCallback(); > +} > + Might as well return early if m_player is NULL. > + // Set rate before calling play in case the rate was set before the media engine wasn't setup. Old typo you might as well fix, "wasn't" should be "was". > Tried to keep the logic of updatePlayState() in the refactor, but wondering about if (playerPaused && > couldPlayIfEnoughData()), should this check be moved out of the play/not-playing block? Or perhaps be > done like this? > > if (!playerPaused) > m_player->pause(); > > if (couldPlayIfEnoughData()) > m_player->prepareToPlay(); Good idea, this seems much clearer. Thanks! r=me 275697 4 vestbo 2010-09-08 02:22:27 -0700 Landed in http://trac.webkit.org/changeset/66961 339006 5 ademar 2011-01-24 07:42:16 -0800 Revision r66961 cherry-picked into qtwebkit-2.2 with commit b9014dd <http://gitorious.org/webkit/qtwebkit/commit/b9014dd> 66635 2010-09-06 06:54:28 -0700 2010-09-07 08:21:50 -0700 Patch bug-45263-20100906155425.patch text/plain 6662 vestbo ZGlmZiAtLWdpdCBjL1dlYkNvcmUvQ2hhbmdlTG9nIHcvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmE2ZjAyNDg2YjNhZGMxOWNhNmJjM2EwZGFhOGVhM2I1OGQxMzcyZi4uNjdiOWIzZjViY2NlOGUx YjhjMjc4YTMxYjZjMTVhMDVjMzNlZTZlYSAxMDA2NDQKLS0tIGMvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIHcvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMC0wOS0wNiAgVG9y IEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1lZGlhUGxheWVyUGxheWJh Y2tTdGF0ZUNoYW5nZWQgdG8gTWVkaWFQbGF5ZXJDbGllbnQKKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUyNjMKKworICAgICAgICBUaGUgcGxhdGZv cm0gYmFja2VuZCBtYXkgY2hhbmdlIHN0YXRlLCBmb3IgZXhhbXBsZSBhcyBhIHJlc3VsdAorICAg ICAgICBvZiBhbiBleHRlcm5hbCBwbHVnaW4gY29udHJvbGxpbmcgdGhlIGJhY2tlbmQsIHNvIHdl IG5lZWQgdG8KKyAgICAgICAgcmVhY3QgdG8gdGhpcyBzaXR1YXRpb24gYnkgc3luY2luZyB1cCB0 aGUgV2ViQ29yZSBzdGF0ZSB3aXRoIHRoZQorICAgICAgICBwbGF0Zm9ybSBiYWNrZW5kLiAKKwor ICAgICAgICBXZSBjYWxsIHBsYXlJbnRlcm5hbCgpL3BhdXNlSW50ZXJuYWwoKSBkZXBlbmRpbmcg b24gdGhlIGJhY2tlbmQKKyAgICAgICAgc3RhdGUsIHRvIHRyaWdnZXIgdGhlIGNvcnJlc3BvbmRp bmcgRE9NIGV2ZW50cyB0byBtYXRjaCB0aGUgc3RhdGUuCisKKyAgICAgICAgdXBkYXRlUGxheVN0 YXRlKCkgaXMgdGhlbiByZWZhY3RvcmVkIHRvIHRha2UgaW50byBhY2NvdW50IHRoZQorICAgICAg ICBzaXR1YXRpb24gd2hlcmUgdGhlIGJhY2tlbmQgaXMgYWxyZWFkeSBpbiB0aGUgY29ycmVjdCBz dGF0ZSBidXQKKyAgICAgICAgV2ViQ29yZSBpcyBub3QsIHNvIHRoYXQgd2UgdXBkYXRlIHRoZWUg cGxheWJhY2sgcHJvZ3Jlc3MgdGltZXIKKyAgICAgICAgYW5kIHNldCBtX3BsYXlpbmcgY29ycmVj dGx5LgorCisgICAgICAgIHVwZGF0ZVBsYXlTdGF0ZSgpIGNoYW5nZXMgU2hvdWxkIGJlIGNvdmVy ZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJQbGF5 YmFja1N0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1 cGRhdGVQbGF5U3RhdGUpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyOjpwbGF5YmFja1N0YXRlQ2hhbmdlZCk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy Q2xpZW50OjptZWRpYVBsYXllclBsYXliYWNrU3RhdGVDaGFuZ2VkKToKKwogMjAxMC0wOC0yNiAg SmVyZW15IE9ybG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTdGV2ZSBCbG9jay4KZGlmZiAtLWdpdCBjL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcCB3L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAwZjRhNTE0NzQz NjZkM2JhZTY5YmRjYTE3ZTZiOTg0MDg2MzNkZDJhLi5kZjNjMmRlMjkzMGIxYTMwYTgzYWVjMmFh YmZjZDlmZjQxZWJjNTIyIDEwMDY0NAotLS0gYy9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKKysrIHcvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0xNTk5LDYg KzE1OTksMTggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclJhdGVDaGFuZ2Vk KE1lZGlhUGxheWVyKikKICAgICBlbmRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjaygpOwog fQogCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyUGxheWJhY2tTdGF0ZUNoYW5n ZWQoTWVkaWFQbGF5ZXIqKQoreworICAgIGJlZ2luUHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJh Y2soKTsKKyAgICBpZiAobV9wbGF5ZXIpIHsKKyAgICAgICAgaWYgKG1fcGxheWVyLT5wYXVzZWQo KSkKKyAgICAgICAgICAgIHBhdXNlSW50ZXJuYWwoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgcGxheUludGVybmFsKCk7CisgICAgfQorICAgIGVuZFByb2Nlc3NpbmdNZWRpYVBsYXllckNh bGxiYWNrKCk7Cit9CisKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJTYXdVbnN1 cHBvcnRlZFRyYWNrcyhNZWRpYVBsYXllciopCiB7CiAgICAgLy8gVGhlIE1lZGlhUGxheWVyIGNh bWUgYWNyb3NzIGNvbnRlbnQgaXQgY2Fubm90IGNvbXBsZXRlbHkgaGFuZGxlLgpAQCAtMTc3NCwy NCArMTc4NiwzNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVBsYXlTdGF0ZSgpCiAg ICAgCiAgICAgYm9vbCBzaG91bGRCZVBsYXlpbmcgPSBwb3RlbnRpYWxseVBsYXlpbmcoKTsKICAg ICBib29sIHBsYXllclBhdXNlZCA9IG1fcGxheWVyLT5wYXVzZWQoKTsKLSAgICBpZiAoc2hvdWxk QmVQbGF5aW5nICYmIHBsYXllclBhdXNlZCkgeworCisgICAgaWYgKHNob3VsZEJlUGxheWluZykg ewogICAgICAgICBzZXREaXNwbGF5TW9kZShWaWRlbyk7CiAKLSAgICAgICAgLy8gU2V0IHJhdGUg YmVmb3JlIGNhbGxpbmcgcGxheSBpbiBjYXNlIHRoZSByYXRlIHdhcyBzZXQgYmVmb3JlIHRoZSBt ZWRpYSBlbmdpbmUgd2Fzbid0IHNldHVwLgotICAgICAgICAvLyBUaGUgbWVkaWEgZW5naW5lIHNo b3VsZCBqdXN0IHN0YXNoIHRoZSByYXRlIHNpbmNlIGl0IGlzbid0IGFscmVhZHkgcGxheWluZy4K LSAgICAgICAgbV9wbGF5ZXItPnNldFJhdGUobV9wbGF5YmFja1JhdGUpOwotICAgICAgICBtX3Bs YXllci0+cGxheSgpOworICAgICAgICAvLyBNYWtlIHN1cmUgd2UncmUgaW4gc3luYyB3aXRoIHRo ZSBwbGF0Zm9ybSBiYWNrZW5kCisgICAgICAgIGlmIChwbGF5ZXJQYXVzZWQpIHsKKyAgICAgICAg ICAgIC8vIFNldCByYXRlIGJlZm9yZSBjYWxsaW5nIHBsYXkgaW4gY2FzZSB0aGUgcmF0ZSB3YXMg c2V0IGJlZm9yZSB0aGUgbWVkaWEgZW5naW5lIHdhc24ndCBzZXR1cC4KKyAgICAgICAgICAgIC8v IFRoZSBtZWRpYSBlbmdpbmUgc2hvdWxkIGp1c3Qgc3Rhc2ggdGhlIHJhdGUgc2luY2UgaXQgaXNu J3QgYWxyZWFkeSBwbGF5aW5nLgorICAgICAgICAgICAgbV9wbGF5ZXItPnNldFJhdGUobV9wbGF5 YmFja1JhdGUpOworICAgICAgICAgICAgbV9wbGF5ZXItPnBsYXkoKTsKKyAgICAgICAgfQorCiAg ICAgICAgIHN0YXJ0UGxheWJhY2tQcm9ncmVzc1RpbWVyKCk7CiAgICAgICAgIG1fcGxheWluZyA9 IHRydWU7Ci0gICAgfSBlbHNlIGlmICghc2hvdWxkQmVQbGF5aW5nICYmICFwbGF5ZXJQYXVzZWQp IHsKLSAgICAgICAgbV9wbGF5ZXItPnBhdXNlKCk7Ci0gICAgICAgIG1fcGxheWJhY2tQcm9ncmVz c1RpbWVyLnN0b3AoKTsKLSAgICAgICAgbV9wbGF5aW5nID0gZmFsc2U7Ci0gICAgICAgIGZsb2F0 IHRpbWUgPSBjdXJyZW50VGltZSgpOwotICAgICAgICBpZiAodGltZSA+IG1fbGFzdFNlZWtUaW1l KQotICAgICAgICAgICAgYWRkUGxheWVkUmFuZ2UobV9sYXN0U2Vla1RpbWUsIHRpbWUpOwotICAg IH0gZWxzZSBpZiAoY291bGRQbGF5SWZFbm91Z2hEYXRhKCkgJiYgcGxheWVyUGF1c2VkKQotICAg ICAgICBtX3BsYXllci0+cHJlcGFyZVRvUGxheSgpOworCisgICAgfSBlbHNlIHsgLy8gU2hvdWxk IG5vdCBiZSBwbGF5aW5nIHJpZ2h0IG5vdworICAgICAgICBpZiAocGxheWVyUGF1c2VkICYmIGNv dWxkUGxheUlmRW5vdWdoRGF0YSgpKSB7CisgICAgICAgICAgICAvLyBCdXQgd2UgY2FuIHByZXBh cmUgZm9yIHBsYXliYWNrCisgICAgICAgICAgICBtX3BsYXllci0+cHJlcGFyZVRvUGxheSgpOwor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHdlJ3JlIGluIHN5bmMg d2l0aCB0aGUgcGxhdGZvcm0gYmFja2VuZAorICAgICAgICAgICAgaWYgKCFwbGF5ZXJQYXVzZWQp CisgICAgICAgICAgICAgICAgbV9wbGF5ZXItPnBhdXNlKCk7CisKKyAgICAgICAgICAgIG1fcGxh eWJhY2tQcm9ncmVzc1RpbWVyLnN0b3AoKTsKKyAgICAgICAgICAgIG1fcGxheWluZyA9IGZhbHNl OworICAgICAgICAgICAgZmxvYXQgdGltZSA9IGN1cnJlbnRUaW1lKCk7CisgICAgICAgICAgICBp ZiAodGltZSA+IG1fbGFzdFNlZWtUaW1lKQorICAgICAgICAgICAgICAgIGFkZFBsYXllZFJhbmdl KG1fbGFzdFNlZWtUaW1lLCB0aW1lKTsKKyAgICAgICAgfQorICAgIH0KICAgICAKICAgICBpZiAo cmVuZGVyZXIoKSkKICAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlRnJvbUVsZW1lbnQoKTsKZGlm ZiAtLWdpdCBjL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmggdy9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IGI1OTU2MDRkYjIxN2FkYTA1NzY5ZTVhZDQ0ZmU0OGE2 YzY5NjVkZWIuLmZiMzhmMTY0MDY3Y2U1ZmYyNzNjNGE3OWI1ZDhlNGQ1ZWJjZGYzMjUgMTAwNjQ0 Ci0tLSBjL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIHcvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuaApAQCAtMjEzLDYgKzIxMyw3IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCB2b2lkIG1lZGlhUGxheWVyTXV0ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKTsKICAgICB2aXJ0 dWFsIHZvaWQgbWVkaWFQbGF5ZXJEdXJhdGlvbkNoYW5nZWQoTWVkaWFQbGF5ZXIqKTsKICAgICB2 aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJSYXRlQ2hhbmdlZChNZWRpYVBsYXllciopOworICAgIHZp cnR1YWwgdm9pZCBtZWRpYVBsYXllclBsYXliYWNrU3RhdGVDaGFuZ2VkKE1lZGlhUGxheWVyKik7 CiAgICAgdmlydHVhbCB2b2lkIG1lZGlhUGxheWVyU2F3VW5zdXBwb3J0ZWRUcmFja3MoTWVkaWFQ bGF5ZXIqKTsKICAgICB2aXJ0dWFsIHZvaWQgbWVkaWFQbGF5ZXJSZXBhaW50KE1lZGlhUGxheWVy Kik7CiAgICAgdmlydHVhbCB2b2lkIG1lZGlhUGxheWVyU2l6ZUNoYW5nZWQoTWVkaWFQbGF5ZXIq KTsKZGlmZiAtLWdpdCBjL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3Bw IHcvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKaW5kZXggOTRjN2Ux NGFlYjEzNzVlZjgwZjk2ZjkxZmExMjdlZDU5YzI4NDZiYS4uNWFlNWY1NTFlNzE3YzAzZjU1ZTA5 ZjczOGYxMDVhM2VkNDY0MDA2YSAxMDA2NDQKLS0tIGMvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9NZWRpYVBsYXllci5jcHAKKysrIHcvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAKQEAgLTY5NCw2ICs2OTQsMTIgQEAgdm9pZCBNZWRpYVBsYXllcjo6cmF0ZUNoYW5n ZWQoKQogICAgICAgICBtX21lZGlhUGxheWVyQ2xpZW50LT5tZWRpYVBsYXllclJhdGVDaGFuZ2Vk KHRoaXMpOwogfQogCit2b2lkIE1lZGlhUGxheWVyOjpwbGF5YmFja1N0YXRlQ2hhbmdlZCgpCit7 CisgICAgaWYgKG1fbWVkaWFQbGF5ZXJDbGllbnQpCisgICAgICAgIG1fbWVkaWFQbGF5ZXJDbGll bnQtPm1lZGlhUGxheWVyUGxheWJhY2tTdGF0ZUNoYW5nZWQodGhpcyk7Cit9CisKIH0KIAogI2Vu ZGlmCmRpZmYgLS1naXQgYy9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgg dy9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKaW5kZXggNjgyM2Q5ZDdj NmYzMGI4MWYwNmM4OTM3YmZiY2Q2MThjNWJjZTQ1OS4uNWY5ZWJjYTVlMmM1YzJiMDMyYTBlZGMx ZTZmN2U0ZmQ5NDczN2ZiNiAxMDA2NDQKLS0tIGMvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5oCisrKyB3L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu aApAQCAtMTE5LDYgKzExOSw5IEBAIHB1YmxpYzoKICAgICAvLyB0aGUgcGxheWJhY2sgcmF0ZSBo YXMgY2hhbmdlZAogICAgIHZpcnR1YWwgdm9pZCBtZWRpYVBsYXllclJhdGVDaGFuZ2VkKE1lZGlh UGxheWVyKikgeyB9CiAKKyAgICAvLyB0aGUgcGxheS9wYXVzZSBzdGF0dXMgY2hhbmdlZAorICAg IHZpcnR1YWwgdm9pZCBtZWRpYVBsYXllclBsYXliYWNrU3RhdGVDaGFuZ2VkKE1lZGlhUGxheWVy KikgeyB9CisKICAgICAvLyBUaGUgTWVkaWFQbGF5ZXIgaGFzIGZvdW5kIHBvdGVudGlhbGx5IHBy b2JsZW1hdGljIG1lZGlhIGNvbnRlbnQuCiAgICAgLy8gVGhpcyBpcyB1c2VkIGludGVybmFsbHkg dG8gdHJpZ2dlciBzd2FwcGluZyBmcm9tIGEgPHZpZGVvPgogICAgIC8vIGVsZW1lbnQgdG8gYW4g PGVtYmVkPiBpbiBzdGFuZGFsb25lIGRvY3VtZW50cwpAQCAtMjM5LDYgKzI0Miw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHRpbWVDaGFuZ2VkKCk7CiAgICAgdm9pZCBzaXplQ2hhbmdlZCgpOwogICAg IHZvaWQgcmF0ZUNoYW5nZWQoKTsKKyAgICB2b2lkIHBsYXliYWNrU3RhdGVDaGFuZ2VkKCk7CiAg ICAgdm9pZCBkdXJhdGlvbkNoYW5nZWQoKTsKIAogICAgIHZvaWQgcmVwYWludCgpOwo=