143731 2015-04-14 15:14:53 -0700 Make sure media element loads hit content filter extensions 2015-04-14 16:48:06 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson commit-queue jer.noble oldest_to_newest 1085283 0 beidson 2015-04-14 15:14:53 -0700 Make sure media element loads hit content filter extensions rdar://problem/20014012 1085288 1 250746 beidson 2015-04-14 15:19:50 -0700 Created attachment 250746 Patch v1 1085289 2 250746 jer.noble 2015-04-14 15:27:09 -0700 Comment on attachment 250746 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=250746&action=review > LayoutTests/http/tests/contentextensions/media-filtered.html:3 > +if (window.testRunner) > + testRunner.waitUntilDone(); This should probably also call 'testRunner.dumpAsText()' so that the test doesn't start failing when there's an unrelated font or layout change. > LayoutTests/http/tests/contentextensions/media-filtered.html:17 > +function videoError() > +{ > + console.log("Video error"); > + if (window.testRunner) > + testRunner.notifyDone(); > +} video-test.js has these nice functions called `waitForEventAndEnd()` and `waitForEventAndFail()` which would sure be handy here. > LayoutTests/http/tests/contentextensions/text-track-blocked.html:3 > + testRunner.waitUntilDone(); Ditto. > LayoutTests/http/tests/contentextensions/text-track-blocked.html:17 > +function vttLoaded() > +{ > + console.log("vttLoaded"); > + if (window.testRunner) > + testRunner.notifyDone(); > +} > + > +function vttError() > +{ > + console.log("vttError"); > + if (window.testRunner) > + testRunner.notifyDone(); > +} Ditto about `waitForEventAndEnd()` and `waitForEventAndFail()`. 1085290 3 beidson 2015-04-14 15:32:44 -0700 (In reply to comment #2) > Comment on attachment 250746 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=250746&action=review > > > LayoutTests/http/tests/contentextensions/media-filtered.html:3 > > +if (window.testRunner) > > + testRunner.waitUntilDone(); > > This should probably also call 'testRunner.dumpAsText()' so that the test > doesn't start failing when there's an unrelated font or layout change. I wanted to also capture the default size of RenderVideo as opposed to the actual video size as further evidence of load/not load. We've had bugs where a resource loads but sends onerror instead of onload, and this helps. > > > LayoutTests/http/tests/contentextensions/media-filtered.html:17 > > +function videoError() > > +{ > > + console.log("Video error"); > > + if (window.testRunner) > > + testRunner.notifyDone(); > > +} > > video-test.js has these nice functions called `waitForEventAndEnd()` and > `waitForEventAndFail()` which would sure be handy here. I'm totally fine with (and prefer) keeping all the code for a test self contained for small tests like these :) Thanks for the review! 1085326 4 250746 commit-queue 2015-04-14 16:48:03 -0700 Comment on attachment 250746 Patch v1 Clearing flags on attachment: 250746 Committed r182820: <http://trac.webkit.org/changeset/182820> 1085327 5 commit-queue 2015-04-14 16:48:06 -0700 All reviewed patches have been landed. Closing bug. 250746 2015-04-14 15:19:50 -0700 2015-04-14 16:48:03 -0700 Patch v1 patch text/plain 7994 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2OTc5YjdlLi4zNzQ3OGI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTUtMDQt MTQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3Vy ZSBtZWRpYSBlbGVtZW50IGxvYWRzIGhpdCBjb250ZW50IGZpbHRlciBleHRlbnNpb25zLgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMjAwMTQwMTI+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL21lZGlhLWZp bHRlcmVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9jb250ZW50 ZXh0ZW5zaW9ucy9tZWRpYS1maWx0ZXJlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rl c3RzL2NvbnRlbnRleHRlbnNpb25zL21lZGlhLWZpbHRlcmVkLmh0bWwuanNvbjogQWRkZWQuCisg ICAgICAgICogaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy90ZXh0LXRyYWNrLWJsb2NrZWQt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNp b25zL3RleHQtdHJhY2stYmxvY2tlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz L2NvbnRlbnRleHRlbnNpb25zL3RleHQtdHJhY2stYmxvY2tlZC5odG1sLmpzb246IEFkZGVkLgor CiAyMDE1LTA0LTE0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFNldCB0aGUgZm9udCBzaXplIHRvIDExcHggZXhwbGljaXRseSB0byB0cnkgdG8gZml4 IHRoaXMgdGVzdCBvbiBXaW5kb3dzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9jb250ZW50ZXh0ZW5zaW9ucy9tZWRpYS1maWx0ZXJlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL21lZGlhLWZpbHRlcmVkLWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xYmYyZTA1Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9tZWRp YS1maWx0ZXJlZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMiBAQAorQ09OU09MRSBNRVNTQUdF OiBsaW5lIDE0OiBWaWRlbyBlcnJvcgorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJl bmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2 MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDYwMAorICAgIFJlbmRl ckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgwLDApIHNpemUgMjM4eDE4CisgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRo IDIzODogIlRoZSBmb2xsb3dpbmcgdmlkZW8gc2hvdWxkIG5vdCBsb2FkLiIKKyAgICAgIFJlbmRl ckJSIHtCUn0gYXQgKDIzNywxNCkgc2l6ZSAxeDAKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwwKSBzaXplIDB4MAorbGF5ZXIgYXQgKDgsMjYpIHNpemUgMzAweDE1MAorICBSZW5kZXJW aWRlbyB7VklERU99IGF0ICgwLDE4KSBzaXplIDMwMHgxNTAKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVuc2lvbnMvbWVkaWEtZmlsdGVyZWQuaHRtbCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVuc2lvbnMvbWVkaWEtZmlsdGVyZWQuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xZTI3MDZhCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9tZWRpYS1m aWx0ZXJlZC5odG1sCkBAIC0wLDAgKzEsMjEgQEAKKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RS dW5uZXIpCisgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKK2Z1bmN0aW9uIHZpZGVv Q2FuUGxheSgpCit7CisgICAgY29uc29sZS5sb2coIlZpZGVvIGNhbiBwbGF5Iik7CisgICAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKK30K KworZnVuY3Rpb24gdmlkZW9FcnJvcigpCit7CisgICAgY29uc29sZS5sb2coIlZpZGVvIGVycm9y Iik7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLm5vdGlm eURvbmUoKTsKK30KKworPC9zY3JpcHQ+CitUaGUgZm9sbG93aW5nIHZpZGVvIHNob3VsZCBub3Qg bG9hZC48YnI+Cis8dmlkZW8gb25lcnJvcj0idmlkZW9FcnJvcigpOyIgb25jYW5wbGF5PSJ2aWRl b0NhblBsYXkoKTsiIHNyYz0iaHR0cDovL2xvY2FsaG9zdDo4MDAwL21lZGlhL3Jlc291cmNlcy90 ZXN0Lm1wNCIgYXV0b3BsYXk+PC92aWRlbz4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvY29udGVudGV4dGVuc2lvbnMvbWVkaWEtZmlsdGVyZWQuaHRtbC5qc29uIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9tZWRpYS1maWx0ZXJlZC5odG1sLmpz b24KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTY2NzE5YgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvY29udGVudGV4dGVuc2lvbnMvbWVkaWEt ZmlsdGVyZWQuaHRtbC5qc29uCkBAIC0wLDAgKzEsMTAgQEAKK1sKKyAgICB7CisgICAgICAgICJh Y3Rpb24iOiB7CisgICAgICAgICAgICAidHlwZSI6ICJibG9jayIKKyAgICAgICAgfSwKKyAgICAg ICAgInRyaWdnZXIiOiB7CisgICAgICAgICAgICAidXJsLWZpbHRlciI6ICIuKnRlc3QubXA0Igor ICAgICAgICB9CisgICAgfQorXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9j b250ZW50ZXh0ZW5zaW9ucy90ZXh0LXRyYWNrLWJsb2NrZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy90ZXh0LXRyYWNrLWJsb2NrZWQtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNlMGJlMmQKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25z L3RleHQtdHJhY2stYmxvY2tlZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorQ09OU09M RSBNRVNTQUdFOiBsaW5lIDIxOiB2aWRlbyBsb2FkZWQKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAx NDogdnR0RXJyb3IKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJWaWV3IGF0 ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRl ckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtCT0RZ fSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCww KSBzaXplIDI2MngxOAorICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAyNjI6ICJUaGUg Zm9sbG93aW5nIHRleHQgdHJhY2sgc2hvdWxkIG5vdCBsb2FkLiIKKyAgICAgIFJlbmRlckJSIHtC Un0gYXQgKDI2MSwxNCkgc2l6ZSAxeDAKKyAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCww KSBzaXplIDB4MAorbGF5ZXIgYXQgKDgsMjYpIHNpemUgMzIweDI0MAorICBSZW5kZXJWaWRlbyB7 VklERU99IGF0ICgwLDE4KSBzaXplIDMyMHgyNDAKK2xheWVyIGF0ICg4LDI2KSBzaXplIDMyMHgy NDAKKyAgUmVuZGVyRmxleGlibGVCb3gge0RJVn0gYXQgKDAsMCkgc2l6ZSAzMjB4MjQwCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL3RleHQtdHJh Y2stYmxvY2tlZC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9u cy90ZXh0LXRyYWNrLWJsb2NrZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5iMTc4ZjQxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9j b250ZW50ZXh0ZW5zaW9ucy90ZXh0LXRyYWNrLWJsb2NrZWQuaHRtbApAQCAtMCwwICsxLDMzIEBA Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIud2FpdFVu dGlsRG9uZSgpOworCitmdW5jdGlvbiB2dHRMb2FkZWQoKQoreworICAgIGNvbnNvbGUubG9nKCJ2 dHRMb2FkZWQiKTsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5u ZXIubm90aWZ5RG9uZSgpOworfQorCitmdW5jdGlvbiB2dHRFcnJvcigpCit7CisgICAgY29uc29s ZS5sb2coInZ0dEVycm9yIik7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0 ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKK30KKworZnVuY3Rpb24gdmlkZW9Mb2FkZWQoKQorewor CWNvbnNvbGUubG9nKCJ2aWRlbyBsb2FkZWQiKTsKKwl2YXIgdmlkZW8gPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgidmlkZW8iKTsKKwl2aWRlby50ZXh0VHJhY2tzWzBdLm1vZGUgPSAic2hvd2lu ZyI7Cit9CisKKzwvc2NyaXB0PgorVGhlIGZvbGxvd2luZyB0ZXh0IHRyYWNrIHNob3VsZCBub3Qg bG9hZC48YnI+Cis8dmlkZW8gaWQ9InZpZGVvIiBzcmM9Ii9tZWRpYS1yZXNvdXJjZXMvY29udGVu dC90ZXN0Lm1wNCIgYXV0b3BsYXkgb25jYW5wbGF5PSJ2aWRlb0xvYWRlZCgpOyI+Cis8dHJhY2sg aWQ9InRyYWNrIiBzcmM9Ii9tZWRpYS1yZXNvdXJjZXMvdHJhY2svY2FwdGlvbnMtd2VidnR0L2Nh cHRpb25zLWZhc3QudnR0IiBraW5kPSJjYXB0aW9ucyIgc3JjbGFuZz0iZW4iIG9ubG9hZD0idnR0 TG9hZGVkKCk7IiBvbmVycm9yPSJ2dHRFcnJvcigpOyI+PC90cmFjaz4KKzwvdmlkZW8+CisJCisJ Cis8L3ZpZGVvPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb250ZW50ZXh0 ZW5zaW9ucy90ZXh0LXRyYWNrLWJsb2NrZWQuaHRtbC5qc29uIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy90ZXh0LXRyYWNrLWJsb2NrZWQuaHRtbC5qc29uCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc3YjVjYzkKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL3RleHQtdHJhY2stYmxv Y2tlZC5odG1sLmpzb24KQEAgLTAsMCArMSwxMCBAQAorWworICAgIHsKKyAgICAgICAgImFjdGlv biI6IHsKKyAgICAgICAgICAgICJ0eXBlIjogImJsb2NrIgorICAgICAgICB9LAorICAgICAgICAi dHJpZ2dlciI6IHsKKyAgICAgICAgICAgICJ1cmwtZmlsdGVyIjogIi4qY2FwdGlvbnMtZmFzdC52 dHQiCisgICAgICAgIH0KKyAgICB9CitdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVkMWIxMC4uMjI5YTY0NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMjEsNiArMjEsMTkgQEAKIAogMjAxNS0wNC0xNCAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSBzdXJlIG1lZGlhIGVsZW1lbnQg bG9hZHMgaGl0IGNvbnRlbnQgZmlsdGVyIGV4dGVuc2lvbnMuCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yMDAxNDAxMj4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDM3MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUZXN0czogaHR0cC90ZXN0cy9jb250ZW50ZXh0ZW5zaW9ucy9tZWRpYS1maWx0ZXJlZC5odG1s CisgICAgICAgICAgICAgICBodHRwL3Rlc3RzL2NvbnRlbnRleHRlbnNpb25zL3RleHQtdHJhY2st YmxvY2tlZC5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOiBTa2lwIGxv YWRzIHRoYXQgYXJlIGZpbHRlcmVkLgorCisyMDE1LTA0LTE0ICBCcmFkeSBFaWRzb24gIDxiZWlk c29uQGFwcGxlLmNvbT4KKwogICAgICAgICBNZWRpYSBlbGVtZW50cyBub3QgaW4gYSBwYWdlIHNo b3VsZG4ndCBsb2FkLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQzNzIwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmlu ZGV4IDI1NTkwZWUuLjkwYmE2ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcApAQCAtNzIsNiArNzIsNyBAQAogI2luY2x1ZGUgIlJlbmRlckxheWVyQ29tcG9zaXRv ci5oIgogI2luY2x1ZGUgIlJlbmRlclZpZGVvLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgor I2luY2x1ZGUgIlJlc291cmNlTG9hZEluZm8uaCIKICNpbmNsdWRlICJTY3JpcHRDb250cm9sbGVy LmgiCiAjaW5jbHVkZSAiU2NyaXB0U291cmNlQ29kZS5oIgogI2luY2x1ZGUgIlNlY3VyaXR5UG9s aWN5LmgiCkBAIC03OSw2ICs4MCw3IEBACiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRl ICJTaGFkb3dSb290LmgiCiAjaW5jbHVkZSAiVGltZVJhbmdlcy5oIgorI2luY2x1ZGUgIlVzZXJD b250ZW50Q29udHJvbGxlci5oIgogI2luY2x1ZGUgPGxpbWl0cz4KICNpbmNsdWRlIDxydW50aW1l L1VpbnQ4QXJyYXkuaD4KICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KQEAgLTEwOTAsNyAr MTA5Miw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKGNvbnN0IFVSTCYg aW5pdGlhbFVSTCwgQ29udGVudFR5cGUmIGNvbnRlbnRUCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICBpZiAoIWZyYW1lLT5wYWdlKCkpIHsKKyAgICBQYWdlKiBwYWdlID0gZnJhbWUtPnBh Z2UoKTsKKyAgICBpZiAoIXBhZ2UpIHsKICAgICAgICAgbWVkaWFMb2FkaW5nRmFpbGVkKE1lZGlh UGxheWVyOjpGb3JtYXRFcnJvcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xMTAxLDYg KzExMDQsMTkgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojpsb2FkUmVzb3VyY2UoY29uc3QgVVJM JiBpbml0aWFsVVJMLCBDb250ZW50VHlwZSYgY29udGVudFQKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAorI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCisgICAgUmVzb3VyY2VSZXF1ZXN0 IHJlcXVlc3QodXJsKTsKKyAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFt ZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKTsKKworICAgIGlmIChwYWdlLT51c2VyQ29udGVu dENvbnRyb2xsZXIoKSAmJiBkb2N1bWVudExvYWRlcikKKyAgICAgICAgcGFnZS0+dXNlckNvbnRl bnRDb250cm9sbGVyKCktPnByb2Nlc3NDb250ZW50RXh0ZW5zaW9uUnVsZXNGb3JMb2FkKHJlcXVl c3QsIFJlc291cmNlVHlwZTo6TWVkaWEsICpkb2N1bWVudExvYWRlcik7CisKKyAgICBpZiAocmVx dWVzdC5pc051bGwoKSkgeworICAgICAgICBtZWRpYUxvYWRpbmdGYWlsZWQoTWVkaWFQbGF5ZXI6 OkZvcm1hdEVycm9yKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgorCiAgICAgLy8g VGhlIHJlc291cmNlIGZldGNoIGFsZ29yaXRobSAKICAgICBtX25ldHdvcmtTdGF0ZSA9IE5FVFdP UktfTE9BRElORzsKIAo=