23923 2009-02-12 08:44:38 -0800 HTMLMediaElement should implement mediaPlayerVolumeChanged 2009-02-12 15:14:35 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 eric.carlson webkit-unassigned oldest_to_newest 109480 0 eric.carlson 2009-02-12 08:44:38 -0800 The MediaPlayerClient interface has a mediaPlayerVolumeChanged method so a media engine can report volume changes triggered by the media engine. HTMLMediaElement implements all MediaPlayerClient methods except this. 109484 1 27604 eric.carlson 2009-02-12 09:00:35 -0800 Created attachment 27604 proposed patch 109556 2 27604 simon.fraser 2009-02-12 14:16:03 -0800 Comment on attachment 27604 proposed patch > Index: WebCore/html/HTMLMediaElement.cpp > =================================================================== > + // avoid recursion when the player reports volume changes Sentence case. > Index: WebCore/html/HTMLMediaElement.h > =================================================================== > + bool processingMediaPlayerCallback() { return m_processingMediaPlayerCallback > 0; }; Make this |const| > + void setProcessingMediaPlayerCallback(bool processing) { m_processingMediaPlayerCallback += (processing ? 1 : -1); } To avoid the somewhat hard to read 'true', 'false' args, maybe have 2 methods (begin/end). Add an assertion to check that m_processingMediaPlayerCallback never goes negative, and make it signed. 109569 3 eric.carlson 2009-02-12 15:14:35 -0800 Committed revision 40943. 27604 2009-02-12 09:00:35 -0800 2009-02-12 14:16:03 -0800 proposed patch patch.txt text/plain 6689 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDkwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDktMDItMTIgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTIzCisgICAgICAg IEltcGxlbWVudCBtZWRpYVBsYXllclZvbHVtZUNoYW5nZWQgc28gYSBtZWRpYSBlbmdpbmUgY2Fu IHJlcG9ydCBhdXRvbm9tb3VzIHZvbHVtZSBjaGFuZ2VzLgorICAgICAgICBTdXBwb3J0aW5nIHRo aXMgcmVxdWlyZXMgdGhhdCB3ZSBrbm93IHdoZW4gd2UgYXJlIHByb2Nlc3NpbmcgYSBtZWRpYSBl bmdpbmUgY2FsbGJhY2sgc28KKyAgICAgICAgd2UgZG9uJ3QgdHVybiBhcm91bmQgYW5kIHRlbGwg dGhlIG1lZGlhIHBsYXllciB0byBjaGFuZ2UgdGhlIHZvbHVtZSB3aGVuIGl0IGlzIHJlcG9ydGlu ZworICAgICAgICBhIHZvbHVtZSBjaGFuZ2UuCisgICAgICAgIAorICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpI VE1MTWVkaWFFbGVtZW50KTogaW5pdGlhbGl6ZSBtX3Byb2Nlc3NpbmdNZWRpYVBsYXllckNhbGxi YWNrCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllck5ldHdv cmtTdGF0ZUNoYW5nZWQpOiB1cGRhdGUgbV9wcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjawor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0TmV0d29ya1N0YXRlKTogbG9n aWMgc3BsaXQgb3V0IG9mIG1lZGlhUGxheWVyTmV0d29ya1N0YXRlQ2hhbmdlZCAKKyAgICAgICAg dG8gbWFrZSBpdCBlYXNpZXIgdG8gbWFpbnRhaW4gbV9wcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxs YmFjay4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyUmVh ZHlTdGF0ZUNoYW5nZWQpOiAgdXBkYXRlIG1fcHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2sK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyVGltZUNoYW5n ZWQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxh eWVyUmVwYWludCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6 bWVkaWFQbGF5ZXJWb2x1bWVDaGFuZ2VkKTogTmV3CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50Ojp1cGRhdGVWb2x1bWUpOiBEb24ndCBjaGFuZ2UgbWVkaWEgZW5naW5lIHZvbHVt ZSBpZiB3ZSBhcmUgcHJvY2Vzc2luZworICAgICAgICBhIGNhbGxiYWNrIGZyb20gdGhlIG1lZGlh IGVuZ2luZS4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnByb2Nlc3NpbmdNZWRpYVBsYXllckNhbGxiYWNrKTog TmV3CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRQcm9jZXNzaW5nTWVk aWFQbGF5ZXJDYWxsYmFjayk6IE5ldworCiAyMDA5LTAyLTEyICBBZGFtIFRyZWF0ICA8YWRhbS50 cmVhdEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgRml4IHRoZSBRdCBidWlsZCBmb2xsb3dp bmcgcjQwODcxIHdoaWNoIGNoYW5nZWQgUmVuZGVyT2JqZWN0OjplbGVtZW50KCkKSW5kZXg6IFdl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDQwOTAwKQorKysgV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NSw2ICs4NSw3IEBAIEhU TUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRpYUVsZW1lbnQoY29uc3QKICAgICAsIG1faW5BY3RpdmVE b2N1bWVudCh0cnVlKQogICAgICwgbV9wbGF5ZXIoMCkKICAgICAsIG1fbG9hZFJlc3RyaWN0aW9u cyhOb0xvYWRSZXN0cmljdGlvbikKKyAgICAsIG1fcHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJh Y2soMCkKICAgICAsIG1fc2VuZFByb2dyZXNzRXZlbnRzKHRydWUpCiB7CiAgICAgZG9jdW1lbnQo KS0+cmVnaXN0ZXJGb3JEb2N1bWVudEFjdGl2YXRpb25DYWxsYmFja3ModGhpcyk7CkBAIC0zNzUs MTQgKzM3NiwyMyBAQCBlbmQ6CiAgICAgbV9sb2FkTmVzdGluZ0xldmVsLS07CiB9CiAKKwogdm9p ZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllck5ldHdvcmtTdGF0ZUNoYW5nZWQoTWVkaWFQ bGF5ZXIqKQogewotICAgIGlmICghbV9iZWd1biB8fCBtX25ldHdvcmtTdGF0ZSA9PSBFTVBUWSkK KyAgICBpZiAoIW1fYmVndW4pCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBtX3Rlcm1pbmF0 ZUxvYWRCZWxvd05lc3RpbmdMZXZlbCA9IG1fbG9hZE5lc3RpbmdMZXZlbDsKKyAgICBzZXRQcm9j ZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjayh0cnVlKTsKKyAgICBzZXROZXR3b3JrU3RhdGUobV9w bGF5ZXItPm5ldHdvcmtTdGF0ZSgpKTsKKyAgICBzZXRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxs YmFjayhmYWxzZSk7Cit9CiAKLSAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIHN0YXRlID0g bV9wbGF5ZXItPm5ldHdvcmtTdGF0ZSgpOwordm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXROZXR3 b3JrU3RhdGUoTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBzdGF0ZSkKK3sKKyAgICBpZiAobV9u ZXR3b3JrU3RhdGUgPT0gRU1QVFkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICBtX3Rlcm1p bmF0ZUxvYWRCZWxvd05lc3RpbmdMZXZlbCA9IG1fbG9hZE5lc3RpbmdMZXZlbDsKICAgICAKICAg ICAvLyAzLjE0LjkuNC4gTG9hZGluZyB0aGUgbWVkaWEgcmVzb3VyY2UKICAgICAvLyAxNApAQCAt NDYyLDggKzQ3MiwxMiBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyTmV0d29y CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdlZChN ZWRpYVBsYXllciopCiB7CisgICAgc2V0UHJvY2Vzc2luZ01lZGlhUGxheWVyQ2FsbGJhY2sodHJ1 ZSk7CisKICAgICBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSBzdGF0ZSA9IG1fcGxheWVyLT5yZWFk eVN0YXRlKCk7CiAgICAgc2V0UmVhZHlTdGF0ZSgoUmVhZHlTdGF0ZSlzdGF0ZSk7CisKKyAgICBz ZXRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjayhmYWxzZSk7CiB9CiAKIHZvaWQgSFRNTE1l ZGlhRWxlbWVudDo6c2V0UmVhZHlTdGF0ZShSZWFkeVN0YXRlIHN0YXRlKQpAQCAtOTM0LDYgKzk0 OCw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6Y2hlY2tJZlNlZWtOZWVkZWQKIAogdm9pZCBI VE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclRpbWVDaGFuZ2VkKE1lZGlhUGxheWVyKikKIHsK KyAgICBzZXRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjayh0cnVlKTsKKwogICAgIGlmIChy ZWFkeVN0YXRlKCkgPj0gQ0FOX1BMQVkpCiAgICAgICAgIG1fc2Vla2luZyA9IGZhbHNlOwogICAg IApAQCAtOTUxLDEyICs5NjcsMjMgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXll clRpbWVDaAogICAgIH0KIAogICAgIHVwZGF0ZVBsYXlTdGF0ZSgpOworCisgICAgc2V0UHJvY2Vz c2luZ01lZGlhUGxheWVyQ2FsbGJhY2soZmFsc2UpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1l bnQ6Om1lZGlhUGxheWVyUmVwYWludChNZWRpYVBsYXllciopCiB7CisgICAgc2V0UHJvY2Vzc2lu Z01lZGlhUGxheWVyQ2FsbGJhY2sodHJ1ZSk7CiAgICAgaWYgKHJlbmRlcmVyKCkpCiAgICAgICAg IHJlbmRlcmVyKCktPnJlcGFpbnQoKTsKKyAgICBzZXRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxs YmFjayhmYWxzZSk7Cit9CisKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJWb2x1 bWVDaGFuZ2VkKE1lZGlhUGxheWVyKikKK3sKKyAgICBzZXRQcm9jZXNzaW5nTWVkaWFQbGF5ZXJD YWxsYmFjayh0cnVlKTsKKyAgICB1cGRhdGVWb2x1bWUoKTsKKyAgICBzZXRQcm9jZXNzaW5nTWVk aWFQbGF5ZXJDYWxsYmFjayhmYWxzZSk7CiB9CiAKIFBhc3NSZWZQdHI8VGltZVJhbmdlcz4gSFRN TE1lZGlhRWxlbWVudDo6YnVmZmVyZWQoKSBjb25zdApAQCAtMTAyNCwxMCArMTA1MSwxMyBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVZvbHVtZSgpCiAgICAgaWYgKCFtX3BsYXllcikK ICAgICAgICAgcmV0dXJuOwogCi0gICAgUGFnZSogcGFnZSA9IGRvY3VtZW50KCktPnBhZ2UoKTsK LSAgICBmbG9hdCB2b2x1bWVNdWx0aXBsaWVyID0gcGFnZSA/IHBhZ2UtPm1lZGlhVm9sdW1lKCkg OiAxOwotCi0gICAgbV9wbGF5ZXItPnNldFZvbHVtZShtX211dGVkID8gMCA6IG1fdm9sdW1lICog dm9sdW1lTXVsdGlwbGllcik7CisgICAgLy8gYXZvaWQgcmVjdXJzaW9uIHdoZW4gdGhlIHBsYXll ciByZXBvcnRzIHZvbHVtZSBjaGFuZ2VzCisgICAgaWYgKCFwcm9jZXNzaW5nTWVkaWFQbGF5ZXJD YWxsYmFjaygpKSB7CisgICAgICAgIFBhZ2UqIHBhZ2UgPSBkb2N1bWVudCgpLT5wYWdlKCk7Cisg ICAgICAgIGZsb2F0IHZvbHVtZU11bHRpcGxpZXIgPSBwYWdlID8gcGFnZS0+bWVkaWFWb2x1bWUo KSA6IDE7CisgICAgCisgICAgICAgIG1fcGxheWVyLT5zZXRWb2x1bWUobV9tdXRlZCA/IDAgOiBt X3ZvbHVtZSAqIHZvbHVtZU11bHRpcGxpZXIpOworICAgIH0KICAgICAKICAgICBpZiAocmVuZGVy ZXIoKSkKICAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlRnJvbUVsZW1lbnQoKTsKSW5kZXg6IFdl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gNDA5MDApCisrKyBXZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUsMTIgKzE0NSwxNSBAQCBwcm90 ZWN0ZWQ6CiAgICAgdm9pZCBkaXNwYXRjaEV2ZW50QXN5bmMoY29uc3QgQXRvbWljU3RyaW5nJiBl dmVudE5hbWUpOwogICAgIAogICAgIHZvaWQgc2V0UmVhZHlTdGF0ZShSZWFkeVN0YXRlKTsKKyAg ICB2b2lkIHNldE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIHN0YXRlKTsK KwogICAgIAogcHJpdmF0ZTogLy8gTWVkaWFQbGF5ZXJPYnNlcnZlcgogICAgIHZpcnR1YWwgdm9p ZCBtZWRpYVBsYXllck5ldHdvcmtTdGF0ZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKTsKICAgICB2aXJ0 dWFsIHZvaWQgbWVkaWFQbGF5ZXJSZWFkeVN0YXRlQ2hhbmdlZChNZWRpYVBsYXllciopOwogICAg IHZpcnR1YWwgdm9pZCBtZWRpYVBsYXllclRpbWVDaGFuZ2VkKE1lZGlhUGxheWVyKik7CiAgICAg dmlydHVhbCB2b2lkIG1lZGlhUGxheWVyUmVwYWludChNZWRpYVBsYXllciopOworICAgIHZpcnR1 YWwgdm9pZCBtZWRpYVBsYXllclZvbHVtZUNoYW5nZWQoTWVkaWFQbGF5ZXIqKTsKIAogcHJpdmF0 ZToKICAgICB2b2lkIGxvYWRUaW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+Kik7CkBA IC0xNjAsNiArMTYzLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNoZWNrSWZTZWVrTmVlZGVkKCk7 CiAgICAgCiAgICAgYm9vbCBwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSBjb25zdDsKKyAgICBib29s IHByb2Nlc3NpbmdNZWRpYVBsYXllckNhbGxiYWNrKCkgeyByZXR1cm4gbV9wcm9jZXNzaW5nTWVk aWFQbGF5ZXJDYWxsYmFjayA+IDA7IH07CisgICAgdm9pZCBzZXRQcm9jZXNzaW5nTWVkaWFQbGF5 ZXJDYWxsYmFjayhib29sIHByb2Nlc3NpbmcpIHsgbV9wcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxs YmFjayArPSAocHJvY2Vzc2luZyA/IDEgOiAtMSk7IH0KIAogICAgIFN0cmluZyBwaWNrTWVkaWEo KTsKICAgICB2b2lkIHVwZGF0ZVZvbHVtZSgpOwpAQCAtMjIxLDcgKzIyNiwxMSBAQCBwcm90ZWN0 ZWQ6CiAgICAgT3duUHRyPE1lZGlhUGxheWVyPiBtX3BsYXllcjsKIAogICAgIExvYWRSZXN0cmlj dGlvbnMgbV9sb2FkUmVzdHJpY3Rpb25zOwotICAgIAorCisgICAgLy8gY291bnRlciBpbmNyZW1l bnRlZCB3aGlsZSBwcm9jZXNzaW5nIGEgY2FsbGJhY2sgZnJvbSB0aGUgbWVkaWEgcGxheWVyLCBz byB3ZSBjYW4gYXZvaWQKKyAgICAvLyAgY2FsbGluZyB0aGUgbWVkaWEgZW5naW5lIHJlY3Vyc2l2 ZWx5CisgICAgdW5zaWduZWQgbV9wcm9jZXNzaW5nTWVkaWFQbGF5ZXJDYWxsYmFjazsKKwogICAg IC8vIE5vdCBhbGwgbWVkaWEgZW5naW5lcyBwcm92aWRlIGVub3VnaCBpbmZvcm1hdGlvbiBhYm91 dCBhIGZpbGUgdG8gYmUgYWJsZSB0bwogICAgIC8vIHN1cHBvcnQgcHJvZ3Jlc3MgZXZlbnRzIHNv IHNldHRpbmcgbV9zZW5kUHJvZ3Jlc3NFdmVudHMgZGlzYWJsZXMgdGhlbSAKICAgICBib29sIG1f c2VuZFByb2dyZXNzRXZlbnRzOwo=