156379 2016-04-07 17:07:07 -0700 Fix leaks in WebAVMediaSelectionOptionMac and WebPlaybackControlsManager 2016-04-08 11:32:52 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned andersca bdakin thorton oldest_to_newest 1181983 0 bdakin 2016-04-07 17:07:07 -0700 Fix leaks in WebAVMediaSelectionOptionMac and WebPlaybackControlsManager 1181984 1 275962 bdakin 2016-04-07 17:09:16 -0700 Created attachment 275962 Patch 1182228 2 bdakin 2016-04-08 11:32:43 -0700 http://trac.webkit.org/changeset/199238 1182229 3 bdakin 2016-04-08 11:32:52 -0700 Thanks Tim! 275962 2016-04-07 17:09:16 -0700 2016-04-07 17:11:56 -0700 Patch for-review.txt text/plain 6184 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTIwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA0LTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggbGVha3MgaW4gV2ViQVZNZWRp YVNlbGVjdGlvbk9wdGlvbk1hYyBhbmQgV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjM3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNlIGNsYXNzZXMg c2hvdWxkIHVzZSBSZXRhaW5QdHJzLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VNYWMubW06CisgICAgICAgICgtW1dlYkFWTWVkaWFTZWxlY3Rpb25P cHRpb25NYWMgbG9jYWxpemVkRGlzcGxheU5hbWVdKToKKyAgICAgICAgKC1bV2ViQVZNZWRpYVNl bGVjdGlvbk9wdGlvbk1hYyBzZXRMb2NhbGl6ZWREaXNwbGF5TmFtZTpdKToKKyAgICAgICAgKC1b V2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgdGltaW5nXSk6CisgICAgICAgICgtW1dlYlBsYXli YWNrQ29udHJvbHNNYW5hZ2VyIHNldFRpbWluZzpdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tD b250cm9sc01hbmFnZXIgc2Vla2FibGVUaW1lUmFuZ2VzXSk6CisgICAgICAgICgtW1dlYlBsYXli YWNrQ29udHJvbHNNYW5hZ2VyIHNldFNlZWthYmxlVGltZVJhbmdlczpdKToKKyAgICAgICAgKC1b V2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnNdKToK KyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgc2V0QXVkaW9NZWRpYVNlbGVj dGlvbk9wdGlvbnM6XSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGN1 cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uXSk6CisgICAgICAgICgtW1dlYlBsYXliYWNr Q29udHJvbHNNYW5hZ2VyIHNldEN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uOl0pOgor ICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBsZWdpYmxlTWVkaWFTZWxlY3Rp b25PcHRpb25zXSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIHNldExl Z2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6XSk6CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29u dHJvbHNNYW5hZ2VyIGN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25dKToKKyAgICAg ICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgc2V0Q3VycmVudExlZ2libGVNZWRpYVNl bGVjdGlvbk9wdGlvbjpdKToKKwogMjAxNi0wNC0wNyAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5A YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxOTkxOTkuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJW aWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMubW0JKHJldmlzaW9uIDE5OTE5OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTQ5LDI2ICs0OSwzNiBAQCBTT0ZUX0xJTktfQ0xBU1MoQVZLaXQs IEFWVmFsdWVUaW1pbmcpCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogQGludGVyZmFjZSBX ZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjIDogTlNPYmplY3QgewotICAgIE5TU3RyaW5nICpf bG9jYWxpemVkRGlzcGxheU5hbWU7CisgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBfbG9jYWxpemVk RGlzcGxheU5hbWU7CiB9CiBAcHJvcGVydHkgKHJldGFpbikgTlNTdHJpbmcgKmxvY2FsaXplZERp c3BsYXlOYW1lOwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV2ViQVZNZWRpYVNlbGVjdGlvbk9w dGlvbk1hYwotQHN5bnRoZXNpemUgbG9jYWxpemVkRGlzcGxheU5hbWU9X2xvY2FsaXplZERpc3Bs YXlOYW1lOworCistIChOU1N0cmluZyAqKWxvY2FsaXplZERpc3BsYXlOYW1lCit7CisgICAgcmV0 dXJuIF9sb2NhbGl6ZWREaXNwbGF5TmFtZS5nZXQoKTsKK30KKworLSAodm9pZClzZXRMb2NhbGl6 ZWREaXNwbGF5TmFtZTooTlNTdHJpbmcgKiluYW1lCit7CisgICAgX2xvY2FsaXplZERpc3BsYXlO YW1lID0gbmFtZTsKK30KKwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYlBsYXliYWNrQ29udHJvbHNN YW5hZ2VyIDogTlNPYmplY3QgewogICAgIE5TVGltZUludGVydmFsIF9jb250ZW50RHVyYXRpb247 Ci0gICAgQVZWYWx1ZVRpbWluZyAqX3RpbWluZzsKKyAgICBSZXRhaW5QdHI8QVZWYWx1ZVRpbWlu Zz4gX3RpbWluZzsKICAgICBOU1RpbWVJbnRlcnZhbCBfc2Vla1RvVGltZTsKLSAgICBOU0FycmF5 ICpfc2Vla2FibGVUaW1lUmFuZ2VzOworICAgIFJldGFpblB0cjxOU0FycmF5PiBfc2Vla2FibGVU aW1lUmFuZ2VzOwogICAgIEJPT0wgX2hhc0VuYWJsZWRBdWRpbzsKICAgICBCT09MIF9oYXNFbmFi bGVkVmlkZW87Ci0gICAgTlNBcnJheTxBVk1lZGlhU2VsZWN0aW9uT3B0aW9uICo+ICpfYXVkaW9N ZWRpYVNlbGVjdGlvbk9wdGlvbnM7Ci0gICAgQVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqX2N1cnJl bnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uOwotICAgIE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlv bk9wdGlvbiAqPiAqX2xlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM7Ci0gICAgQVZNZWRpYVNl bGVjdGlvbk9wdGlvbiAqX2N1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb247CisgICAg UmV0YWluUHRyPE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPj4gX2F1ZGlvTWVkaWFT ZWxlY3Rpb25PcHRpb25zOworICAgIFJldGFpblB0cjxBVk1lZGlhU2VsZWN0aW9uT3B0aW9uPiBf Y3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb247CisgICAgUmV0YWluUHRyPE5TQXJyYXk8 QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPj4gX2xlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM7 CisgICAgUmV0YWluUHRyPEFWTWVkaWFTZWxlY3Rpb25PcHRpb24+IF9jdXJyZW50TGVnaWJsZU1l ZGlhU2VsZWN0aW9uT3B0aW9uOwogICAgIAogICAgIGZsb2F0IF9yYXRlOwogCkBAIC0xMDAsMTYg KzExMCwxMCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJWaWRlb0Z1bGxzY3JlCiBAaW1w bGVtZW50YXRpb24gV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIKIAogQHN5bnRoZXNpemUgY29u dGVudER1cmF0aW9uPV9jb250ZW50RHVyYXRpb247Ci1Ac3ludGhlc2l6ZSB0aW1pbmc9X3RpbWlu ZzsKIEBzeW50aGVzaXplIHNlZWtUb1RpbWU9X3NlZWtUb1RpbWU7Ci1Ac3ludGhlc2l6ZSBzZWVr YWJsZVRpbWVSYW5nZXM9X3NlZWthYmxlVGltZVJhbmdlczsKIEBzeW50aGVzaXplIGhhc0VuYWJs ZWRBdWRpbz1faGFzRW5hYmxlZEF1ZGlvOwogQHN5bnRoZXNpemUgaGFzRW5hYmxlZFZpZGVvPV9o YXNFbmFibGVkVmlkZW87CiBAc3ludGhlc2l6ZSByYXRlPV9yYXRlOwotQHN5bnRoZXNpemUgYXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM9X2F1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zOwotQHN5 bnRoZXNpemUgY3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb249X2N1cnJlbnRBdWRpb01l ZGlhU2VsZWN0aW9uT3B0aW9uOwotQHN5bnRoZXNpemUgbGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0 aW9ucz1fbGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uczsKLUBzeW50aGVzaXplIGN1cnJlbnRM ZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb249X2N1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25P cHRpb247CiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFdlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZU1hYzooV2ViQ29yZTo6V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjKil3ZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMKIHsKQEAgLTEyMSw2ICsxMjUsMjYgQEAgLSAoaW5zdGFu Y2V0eXBlKWluaXRXaXRoV2ViVmlkZW9GdWxsc2NyZQogICAgIHJldHVybiBzZWxmOwogfQogCist IChBVlZhbHVlVGltaW5nICopdGltaW5nCit7CisgICAgcmV0dXJuIF90aW1pbmcuZ2V0KCk7Cit9 CisKKy0gKHZvaWQpc2V0VGltaW5nOihBVlZhbHVlVGltaW5nICopdGltaW5nCit7CisgICAgX3Rp bWluZyA9IHRpbWluZzsKK30KKworLSAoTlNBcnJheSAqKXNlZWthYmxlVGltZVJhbmdlcworewor ICAgIHJldHVybiBfc2Vla2FibGVUaW1lUmFuZ2VzLmdldCgpOworfQorCistICh2b2lkKXNldFNl ZWthYmxlVGltZVJhbmdlczooTlNBcnJheSAqKXRpbWVSYW5nZXMKK3sKKyAgICBfc2Vla2FibGVU aW1lUmFuZ2VzID0gdGltZVJhbmdlczsKK30KKwogLSAoQk9PTClpc1NlZWtpbmcKIHsKICAgICBy ZXR1cm4gTk87CkBAIC0xMzMsNiArMTU3LDIxIEBAIC0gKHZvaWQpc2Vla1RvVGltZTooTlNUaW1l SW50ZXJ2YWwpdGltZSAKICAgICBfd2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLT53ZWJW aWRlb0Z1bGxzY3JlZW5Nb2RlbCgpLT5zZWVrVG9UaW1lKHRpbWUpOwogfQogCistIChOU0FycmF5 PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9ucwor eworICAgIHJldHVybiBfYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMuZ2V0KCk7Cit9CisKKy0g KHZvaWQpc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM6KE5TQXJyYXk8QVZNZWRpYVNlbGVj dGlvbk9wdGlvbiAqPiAqKWF1ZGlvT3B0aW9ucworeworICAgIF9hdWRpb01lZGlhU2VsZWN0aW9u T3B0aW9ucyA9IGF1ZGlvT3B0aW9uczsKK30KKworLSAoQVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAq KWN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uCit7CisgICAgcmV0dXJuIF9jdXJyZW50 QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbi5nZXQoKTsKK30KKwogLSAodm9pZClzZXRDdXJyZW50 QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbjooQVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWF1ZGlv TWVkaWFTZWxlY3Rpb25PcHRpb24KIHsKICAgICBpZiAoYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlv biA9PSBfY3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb24pCkBAIC0xNDgsNiArMTg3LDIx IEBAIC0gKHZvaWQpc2V0Q3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHQKICAgICBfd2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLT53ZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCgpLT5zZWxl Y3RBdWRpb01lZGlhT3B0aW9uKGluZGV4ICE9IE5TTm90Rm91bmQgPyBpbmRleCA6IFVJTlQ2NF9N QVgpOwogfQogCistIChOU0FycmF5PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilsZWdpYmxl TWVkaWFTZWxlY3Rpb25PcHRpb25zCit7CisgICAgcmV0dXJuIF9sZWdpYmxlTWVkaWFTZWxlY3Rp b25PcHRpb25zLmdldCgpOworfQorCistICh2b2lkKXNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9w dGlvbnM6KE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPiAqKWxlZ2libGVPcHRpb25z Cit7CisgICAgX2xlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMgPSBsZWdpYmxlT3B0aW9uczsK K30KKworLSAoQVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRMZWdpYmxlTWVkaWFTZWxl Y3Rpb25PcHRpb24KK3sKKyAgICByZXR1cm4gX2N1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25P cHRpb24uZ2V0KCk7Cit9CisKIC0gKHZvaWQpc2V0Q3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlv bk9wdGlvbjooQVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWxlZ2libGVNZWRpYVNlbGVjdGlvbk9w dGlvbgogewogICAgIGlmIChsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24gPT0gX2N1cnJlbnRM ZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24pCg==