44370 2010-08-20 16:35:45 -0700 Media engine should not be asked to open all urls 2011-01-24 12:20:46 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 51249 1 eric.carlson eric.carlson ademar oldest_to_newest 267473 0 eric.carlson 2010-08-20 16:35:45 -0700 MediaPlayer::load() currently tries to find a media engine that supports the specified MIME type, if there is one, but it uses the first registered engine if none claims the type so the media engine can sniff the data (if it wishes) and handle misconfigured servers. This is reasonable in the case where no type is specified in the markup, but it should not ask a media engine to open a url if the markup has a type attribute, and canPlayType() would return "" for that type. 267481 1 65010 eric.carlson 2010-08-20 16:46:22 -0700 Created attachment 65010 proposed patch 267589 2 eric.carlson 2010-08-21 11:43:20 -0700 http://trac.webkit.org/changeset/65779 339188 3 ademar 2011-01-24 12:20:46 -0800 Revision r65779 cherry-picked into qtwebkit-2.2 with commit 0386972 <http://gitorious.org/webkit/qtwebkit/commit/0386972> 65010 2010-08-20 16:46:22 -0700 2010-08-20 18:32:15 -0700 proposed patch patch_1.txt text/plain 6805 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTc2MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDgtMjAgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTWVkaWEgZW5naW5lIHNob3VsZCBub3QgYmUgYXNrZWQgdG8gb3BlbiBhbGwgdXJscworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQzNzAKKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyOjpsb2FkKTogRG8gbm90aGluZyB3aXRoIHVybHMgd2l0aCBhIHR5cGUg YXR0cmlidXRlIHRoYXQgd291bGQgYmUKKyAgICAgICAgcmVqZWN0ZWQgYnkgY2FuUGxheVR5cGUo KS4KKwogMjAxMC0wOC0yMCAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkocmV2aXNpb24gNjU3NTgpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjkxLDEyICsyOTEsMTUgQEAgdm9pZCBNZWRpYVBsYXllcjo6bG9hZChjb25zdCBTdHJpbmcmIHVy bAogICAgIGlmICghdHlwZS5pc0VtcHR5KCkpCiAgICAgICAgIGVuZ2luZSA9IGNob29zZUJlc3RF bmdpbmVGb3JUeXBlQW5kQ29kZWNzKHR5cGUsIHR5cGVDb2RlY3MpOwogCi0gICAgLy8gaWYgd2Ug ZGlkbid0IGZpbmQgYW4gZW5naW5lIHRoYXQgY2xhaW1zIHRoZSBNSU1FIHR5cGUsIGp1c3QgdXNl IHRoZSBmaXJzdCBlbmdpbmUKLSAgICBpZiAoIWVuZ2luZSAmJiAhaW5zdGFsbGVkTWVkaWFFbmdp bmVzKCkuaXNFbXB0eSgpKQorICAgIC8vIElmIHdlIGRpZG4ndCBmaW5kIGFuIGVuZ2luZSBhbmQg bm8gTUlNRSB0eXBlIGlzIHNwZWNpZmllZCwganVzdCB1c2UgdGhlIGZpcnN0IGVuZ2luZS4KKyAg ICBpZiAoIWVuZ2luZSAmJiB0eXBlLmlzRW1wdHkoKSAmJiAhaW5zdGFsbGVkTWVkaWFFbmdpbmVz KCkuaXNFbXB0eSgpKQogICAgICAgICBlbmdpbmUgPSBpbnN0YWxsZWRNZWRpYUVuZ2luZXMoKVsw XTsKICAgICAKLSAgICAvLyBkb24ndCBkZWxldGUgYW5kIHJlY3JlYXRlIHRoZSBwbGF5ZXIgdW5s ZXNzIGl0IGNvbWVzIGZyb20gYSBkaWZmZXJlbnQgZW5naW5lCi0gICAgaWYgKGVuZ2luZSAmJiBt X2N1cnJlbnRNZWRpYUVuZ2luZSAhPSBlbmdpbmUpIHsKKyAgICAvLyBEb24ndCBkZWxldGUgYW5k IHJlY3JlYXRlIHRoZSBwbGF5ZXIgdW5sZXNzIGl0IGNvbWVzIGZyb20gYSBkaWZmZXJlbnQgZW5n aW5lCisgICAgaWYgKCFlbmdpbmUpIHsKKyAgICAgICAgbV9jdXJyZW50TWVkaWFFbmdpbmUgPSBl bmdpbmU7CisgICAgICAgIG1fcHJpdmF0ZS5jbGVhcigpOworICAgIH0gZWxzZSBpZiAobV9jdXJy ZW50TWVkaWFFbmdpbmUgIT0gZW5naW5lKSB7CiAgICAgICAgIG1fY3VycmVudE1lZGlhRW5naW5l ID0gZW5naW5lOwogICAgICAgICBtX3ByaXZhdGUuY2xlYXIoKTsKICAgICAgICAgbV9wcml2YXRl LnNldChlbmdpbmUtPmNvbnN0cnVjdG9yKHRoaXMpKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDY1NzYx KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTAtMDgtMjAgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVkaWEgZW5n aW5lIHNob3VsZCBub3QgYmUgYXNrZWQgdG8gb3BlbiBhbGwgdXJscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQzNzAKKworICAgICAgICAqIG1lZGlh L3ZpZGVvLXNvdXJjZS1ub25lLXN1cHBvcnRlZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogbWVk aWEvdmlkZW8tc291cmNlLW5vbmUtc3VwcG9ydGVkLmh0bWw6CisgICAgICAgICogbWVkaWEvdmlk ZW8tc291cmNlLXR5cGUuaHRtbDoKKwogMjAxMC0wOC0yMCAgRXJpYyBDYXJsc29uICA8ZXJpYy5j YXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJ bmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLW5vbmUtc3VwcG9ydGVkLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1zb3VyY2Utbm9u ZS1zdXBwb3J0ZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA2NTYwOCkKKysrIExheW91dFRlc3Rz L21lZGlhL3ZpZGVvLXNvdXJjZS1ub25lLXN1cHBvcnRlZC1leHBlY3RlZC50eHQJKHdvcmtpbmcg Y29weSkKQEAgLTEsNyArMSwxNiBAQAogMS4gVGVzdCB0aGF0IG5vIHVzYWJsZSA8c291cmNlPiBl bGVtZW50IGxlYXZlcyB0aGUgbWVkaWEgZWxlbWVudCB3aXRoIG5ldHdvcmtTdGF0ZSA9PSBORVRX T1JLX05PX1NPVVJDRQogCi1FVkVOVChlcnJvcikKKysrIEVSUk9SLCBzcmMgPSB0ZXN0Lm1wNAog RVhQRUNURUQgKGV2ZW50LnRhcmdldC50YWdOYW1lID09ICdTT1VSQ0UnKSBPSwogRVhQRUNURUQg KHZpZGVvLm5ldHdvcmtTdGF0ZSA9PSAnMycpIE9LCisKKysrIEVSUk9SLCBzcmMgPSB0ZXN0Lm9n dgorRVhQRUNURUQgKGV2ZW50LnRhcmdldC50YWdOYW1lID09ICdTT1VSQ0UnKSBPSworRVhQRUNU RUQgKHZpZGVvLm5ldHdvcmtTdGF0ZSA9PSAnMycpIE9LCisKKysrIEVSUk9SLCBzcmMgPSBkb2Vz bm90ZXhpc3QubXA0CitFWFBFQ1RFRCAoZXZlbnQudGFyZ2V0LnRhZ05hbWUgPT0gJ1NPVVJDRScp IE9LCitFWFBFQ1RFRCAodmlkZW8ubmV0d29ya1N0YXRlID09ICczJykgT0sKKwogRU5EIE9GIFRF U1QKIApJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLW5vbmUtc3VwcG9ydGVk Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291cmNlLW5vbmUt c3VwcG9ydGVkLmh0bWwJKHJldmlzaW9uIDY1NjA4KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tc291cmNlLW5vbmUtc3VwcG9ydGVkLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTQsNiArNCw4 IEBACiAgICAgPHRpdGxlPm5vIHVzYWJsZSAmbHQ7c291cmNlJmd0OyB0ZXN0PC90aXRsZT4KICAg ICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwvc2NyaXB0PgogICAgIDxzY3JpcHQ+CisgICAg ICAgIHZhciBlcnJvckNvdW50ID0gMDsKKwogICAgICAgICBmdW5jdGlvbiBzZXR1cCgpCiAgICAg ICAgIHsKICAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImVycm9yIiwgZXJy b3JFdmVudCwgdHJ1ZSk7CkBAIC0xMSwxOSArMTMsMjUgQEAKIAogICAgICAgICBmdW5jdGlvbiBl cnJvckV2ZW50KGV2dCkKICAgICAgICAgewotICAgICAgICAgICAgY29uc29sZVdyaXRlKCJFVkVO VChlcnJvcikiKTsKLQotICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJldmVudC50YXJnZXQudGFn TmFtZSIsICJTT1VSQ0UiLCAiPT0iKTsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKysgRVJS T1IsIHNyYyA9ICIgKyByZWxhdGl2ZVVSTChldmVudC50YXJnZXQuc3JjKSk7CiAKICAgICAgICAg ICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiZXZlbnQu dGFyZ2V0LnRhZ05hbWUiLCAiU09VUkNFIiwgIj09Iik7CiAgICAgICAgICAgICB0ZXN0RXhwZWN0 ZWQoInZpZGVvLm5ldHdvcmtTdGF0ZSIsIEhUTUxNZWRpYUVsZW1lbnQucHJvdG90eXBlLk5FVFdP UktfTk9fU09VUkNFLCAiPT0iKTsKLSAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiIik7CisKKyAgICAgICAgICAgIGlmICgrK2Vycm9yQ291bnQgPT0gMykK KyAgICAgICAgICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIH0KIAogICAgIDwvc2NyaXB0Pgog PC9oZWFkPgogPGJvZHk+Ci0gICAgPHZpZGVvIGNvbnRyb2xzPjxzb3VyY2Ugc3JjPSJkb2Vzbm90 ZXhpc3QubXA0Ij48L3ZpZGVvPgorICAgIDx2aWRlbyBjb250cm9scz4KKyAgICAgICAgPHNvdXJj ZSBzcmM9InRlc3QubXA0IiB0eXBlPSJhcHBsaWNhdGlvbi94LWNoaWNrZW4tZmFjZSI+CisgICAg ICAgIDxzb3VyY2Ugc3JjPSJ0ZXN0Lm9ndiIgdHlwZT0iYXBwbGljYXRpb24veC1oaWdnbGV0eS1w aWdnbGV0eSI+CisgICAgICAgIDxzb3VyY2Ugc3JjPSJkb2Vzbm90ZXhpc3QubXA0Ij4KKyAgICA8 L3ZpZGVvPgogCiAgICAgPHA+MS4gVGVzdCB0aGF0IG5vIHVzYWJsZSAmbHQ7c291cmNlJmd0OyBl bGVtZW50IGxlYXZlcyB0aGUgbWVkaWEgZWxlbWVudCB3aXRoIAogICAgIG5ldHdvcmtTdGF0ZSA9 PSBORVRXT1JLX05PX1NPVVJDRTwvcD4KSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLXNv dXJjZS10eXBlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tc291 cmNlLXR5cGUuaHRtbAkocmV2aXNpb24gNjU2MDgpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS92aWRl by1zb3VyY2UtdHlwZS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xLDE3ICsxLDMzIEBACi08Ym9k eT4KLTxzY3JpcHQgc3JjPW1lZGlhLWZpbGUuanM+PC9zY3JpcHQ+Ci08c2NyaXB0IHNyYz12aWRl by10ZXN0LmpzPjwvc2NyaXB0PgotPHZpZGVvIGNvbnRyb2xzPgotICAgIDxzb3VyY2Ugc3JjPWNv bnRlbnQvZXJyb3IubXBlZyB0eXBlPXZpZGVvL2JsYWhibGFoPgotICAgIDxzb3VyY2Ugc3JjPWNv bnRlbnQvdGVzdC5tcDQgdHlwZT12aWRlby9tcGVnPgotICAgIDxzb3VyY2Ugc3JjPWNvbnRlbnQv dGVzdC5vZ3YgdHlwZT12aWRlby9vZ2c+Ci0gICAgPHNvdXJjZSBzcmM9Y29udGVudC9lcnJvcjIu bXBlZyB0eXBlPXZpZGVvL21wZWc+Ci08L3ZpZGVvPgotPHNjcmlwdD4KLSAgICB2aWRlbyA9IG1l ZGlhRWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCd2aWRlbycpWzBdOwor PCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT4gJmx0O3NvdXJjZSZn dDsgQHR5cGUgYXR0cmlidXRlPC90aXRsZT4KKworICAgIDxzY3JpcHQgc3JjPW1lZGlhLWZpbGUu anM+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9dmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAg ICA8c2NyaXB0PgorICAgICAgICB2YXIgZXJyb3JDb3VudCA9IDA7CiAKLSAgICB3YWl0Rm9yRXZl bnQoImxvYWRzdGFydCIsIGZ1bmN0aW9uICgpIHsKLSAgICAgICAgdGVzdEV4cGVjdGVkKCJyZWxh dGl2ZVVSTCh2aWRlby5jdXJyZW50U3JjKSAiLCBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250 ZW50L3Rlc3QiKSk7Ci0gICAgICAgIGVuZFRlc3QoKTsKLSAgICB9KTsKLTwvc2NyaXB0PgorICAg ICAgICBmdW5jdGlvbiBzZXR1cCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZpZGVvID0gbWVk aWFFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3ZpZGVvJylbMF07Cisg ICAgICAgIAorICAgICAgICAgICAgd2FpdEZvckV2ZW50KCJsb2Fkc3RhcnQiLCBmdW5jdGlvbiAo KSB7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJyZWxhdGl2ZVVSTCh2aWRlby5jdXJy ZW50U3JjKSAiLCBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKSk7CisgICAg ICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICA8 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDx2aWRlbyBjb250cm9scz4KKyAgICAgICAg PHNvdXJjZSBzcmM9Y29udGVudC9lcnJvci5tcGVnIHR5cGU9dmlkZW8vYmxhaGJsYWg+CisgICAg ICAgIDxzb3VyY2Ugc3JjPSJ0ZXN0Lm1wNCIgdHlwZT0iYXBwbGljYXRpb24veC1jaGlja2VuLWZh Y2UiPgorICAgICAgICA8c291cmNlIHNyYz0idGVzdC5vZ3YiIHR5cGU9ImFwcGxpY2F0aW9uL3gt aGlnZ2xldHktcGlnZ2xldHkiPgorICAgICAgICA8c291cmNlIHNyYz1jb250ZW50L3Rlc3QubXA0 IHR5cGU9dmlkZW8vbXBlZz4KKyAgICAgICAgPHNvdXJjZSBzcmM9Y29udGVudC90ZXN0Lm9ndiB0 eXBlPXZpZGVvL29nZz4KKyAgICAgICAgPHNvdXJjZSBzcmM9Y29udGVudC9lcnJvcjIubXBlZyB0 eXBlPXZpZGVvL21wZWc+CisgICAgPC92aWRlbz4KKyAgICA8c2NyaXB0PnNldHVwKCk7PC9zY3Jp cHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==