177334 2017-09-21 17:15:37 -0700 Make captureCanvas-webrtc.html more robust 2017-09-27 12:19:27 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen commit-queue darin jonlee webkit-bug-importer youennf oldest_to_newest 1351472 0 youennf 2017-09-21 17:15:37 -0700 Make captureCanvas-webrtc.html more robust. 1351475 1 321496 youennf 2017-09-21 17:19:54 -0700 Created attachment 321496 Patch 1352209 2 321496 commit-queue 2017-09-25 09:00:45 -0700 Comment on attachment 321496 Patch Clearing flags on attachment: 321496 Committed r222446: <http://trac.webkit.org/changeset/222446> 1352210 3 commit-queue 2017-09-25 09:00:47 -0700 All reviewed patches have been landed. Closing bug. 1353291 4 webkit-bug-importer 2017-09-27 12:19:27 -0700 <rdar://problem/34693041> 321496 2017-09-21 17:19:54 -0700 2017-09-25 09:00:45 -0700 Patch bug-177334-20170921171954.patch text/plain 4174 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyMzI1CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzk1YWJlMjUxMjQ4YjU5MzQ1NzY5 MjY4MmEzMGIyYjE5ZTBkMDllZC4uY2UzNWNkMTBjODdiNTJlYTk1ZDY4NDM0MzExOTg3NjIyODM0 ODFhOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE3LTA5LTIxICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBNYWtlIGNhcHR1cmVDYW52YXMtd2VicnRjLmh0 bWwgbW9yZSByb2J1c3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3NzMzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1ha2luZyB0ZXN0IG1vcmUgcm9idXN0IGJ5IHByaW50aW5nIHN5bmNocm9ub3VzbHkg dGhlIGNhbnZhcyBhbmQgaW5jcmVhc2luZy4KKyAgICAgICAgdGhlIHRocmVzaG9sZCBmb3IgcGl4 ZWwgY29tcGFyaXNvbi4KKyAgICAgICAgTWlub3IgcmVmYWN0b3JpbmcgZm9yIGltcHJvdmluZyB0 aGUgcmVhZGFiaWxpdHkuCisKKyAgICAgICAgKiB3ZWJydGMvY2FwdHVyZUNhbnZhcy13ZWJydGMu aHRtbDoKKworMjAxNy0wOS0yMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisK ICAgICAgICAgd2VicnRjL3BlZXItY29ubmVjdGlvbi1hdWRpby1tdXRlLmh0bWwgaXMgc29tZXRp bWVzIGZsYWt5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzI2NDkKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL2NhcHR1cmVDYW52YXMt d2VicnRjLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvY2FwdHVyZUNhbnZhcy13ZWJydGMuaHRt bAppbmRleCBhZTU4MDkwMzIwOTU1Njg1YmRlNDY4ZDYxMGQyZjc1NGRlZWE3YzJmLi5hOTI1ZDFj ZTQ1NThmYzVhNGU1NGRhM2EzZjJkYjJmNzVlZDZmOTk0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy93ZWJydGMvY2FwdHVyZUNhbnZhcy13ZWJydGMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy93ZWJy dGMvY2FwdHVyZUNhbnZhcy13ZWJydGMuaHRtbApAQCAtMTAsMTYgKzEwLDIzIEBACiAgICAgICAg IDxzY3JpcHQ+CiAKIHZhciBjb2xvciA9ICJncmVlbiI7Ci1mdW5jdGlvbiBwcmludFJlY3Rhbmds ZSgpCisKK2Z1bmN0aW9uIHByaW50Q2FudmFzKCkKIHsKICAgICB2YXIgY29udGV4dCA9IGNhbnZh czEuZ2V0Q29udGV4dCgiMmQiKTsKICAgICBjb250ZXh0LmZpbGxTdHlsZSA9IGNvbG9yOwotICAg IGNvbnRleHQuZmlsbFJlY3QoMCwgMCwgMzIwLCAyNDApOwotICAgIHNldFRpbWVvdXQocHJpbnRS ZWN0YW5nbGUsIDUwKTsKKyAgICBjb250ZXh0LmZpbGxSZWN0KDAsIDAsIGNhbnZhczEud2lkdGgs IGNhbnZhczEuaGVpZ2h0KTsKK30KKworZnVuY3Rpb24gcHJpbnRSZWN0YW5nbGVFdmVyeTUwbXMo KQoreworICAgIHByaW50Q2FudmFzKCk7CisgICAgc2V0VGltZW91dChwcmludFJlY3RhbmdsZUV2 ZXJ5NTBtcywgNTApOwogfQogCi1mdW5jdGlvbiB0ZXN0Q2FudmFzKHRlc3ROYW1lLCBhcnJheTEs IGlzU2FtZSwgY291bnQpCitmdW5jdGlvbiB0ZXN0Q2FudmFzKHRlc3ROYW1lLCBjYW52YXMsIGlz U2FtZSwgY291bnQpCiB7CisgICAgdmFyIGFycmF5MSA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIp LmdldEltYWdlRGF0YSgyMCwgMjAsIDYwLCA2MCkuZGF0YTsKICAgICBpZiAoY291bnQgPT09IHVu ZGVmaW5lZCkKICAgICAgICAgY291bnQgPSAwOwogICAgIGNhbnZhczIuZ2V0Q29udGV4dCgiMmQi KS5kcmF3SW1hZ2UodmlkZW8sIDAgLDApOwpAQCAtMjksMjQgKzM2LDI0IEBAIGZ1bmN0aW9uIHRl c3RDYW52YXModGVzdE5hbWUsIGFycmF5MSwgaXNTYW1lLCBjb3VudCkKICAgICBmb3IgKGluZGV4 ID0gMDsgaW5kZXggPCBhcnJheTEubGVuZ3RoOyArK2luZGV4KSB7CiAgICAgICAgIC8vIFJvdWdo IGNvbXBhcmlzb24gc2luY2Ugd2UgYXJlIGNvbXByZXNzaW5nIGRhdGEuCiAgICAgICAgIC8vIFRo aXMgdGVzdCBzdGlsbCBjYXRjaGVzIGVycm9ycyBzaW5jZSB3ZSBhcmUgZ29pbmcgZnJvbSBncmVl biB0byBibHVlIHRvIHJlZC4KLSAgICAgICAgaWYgKE1hdGguYWJzKGFycmF5MVtpbmRleF0gLSBh cnJheTJbaW5kZXhdKSA+IDQwKSB7CisgICAgICAgIGlmIChNYXRoLmFicyhhcnJheTFbaW5kZXhd IC0gYXJyYXkyW2luZGV4XSkgPiAxMDApIHsKICAgICAgICAgICAgIGlzRXF1YWwgPSBmYWxzZTsK ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgfQogICAgIGlmIChpc0VxdWFs ID09PSBpc1NhbWUpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIFByb21pc2UucmVz b2x2ZSgpOwogCiAgICAgaWYgKGNvdW50ID09PSAyMCkKICAgICAgICAgcmV0dXJuIFByb21pc2Uu cmVqZWN0KHRlc3ROYW1lICsgIiBmYWlsZWQsIGV4cGVjdGVkICIgKyBKU09OLnN0cmluZ2lmeShh cnJheTEpICsgIiBidXQgZ290ICIgKyBKU09OLnN0cmluZ2lmeShhcnJheTIpKTsKIAogICAgIHJl dHVybiB3YWl0Rm9yKDEwMCkudGhlbigoKSA9PiB7Ci0gICAgICAgIHJldHVybiB0ZXN0Q2FudmFz KHRlc3ROYW1lLCBhcnJheTEsIGlzU2FtZSwgKytjb3VudCk7CisgICAgICAgIHJldHVybiB0ZXN0 Q2FudmFzKHRlc3ROYW1lLCBjYW52YXMsIGlzU2FtZSwgKytjb3VudCk7CiAgICAgfSk7CiB9CiAK IHByb21pc2VfdGVzdCgodGVzdCkgPT4gewotICAgIHByaW50UmVjdGFuZ2xlKCk7CisgICAgcHJp bnRSZWN0YW5nbGVFdmVyeTUwbXMoKTsKICAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUs IHJlamVjdCkgPT4gewogICAgICAgICBjcmVhdGVDb25uZWN0aW9ucygoZmlyc3RDb25uZWN0aW9u KSA9PiB7CiAgICAgICAgICAgICB2YXIgc3RyZWFtID0gY2FudmFzMS5jYXB0dXJlU3RyZWFtKCk7 CkBAIC02OCwyOSArNzUsMjYgQEAgcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CiB9LCAiU2V0dGlu ZyB1cCB0aGUgY29ubmVjdGlvbiIpOwogCiBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKLSAgICBy ZXR1cm4gd2FpdEZvcigxMDApLnRoZW4oKCkgPT4gewotICAgICAgICByZXR1cm4gdGVzdENhbnZh cygidGVzdCAxIiwgY2FudmFzMS5nZXRDb250ZXh0KCIyZCIpLmdldEltYWdlRGF0YSgyMCwgMjAs IDYwLCA2MCkuZGF0YSwgdHJ1ZSk7Ci0gICAgfSk7CisgICAgcmV0dXJuIHRlc3RDYW52YXMoInRl c3QgMSIsIGNhbnZhczEsIHRydWUpOwogfSwgIkNoZWNraW5nIGNhbnZhcyBpcyBncmVlbiIpOwog CiBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICBjb2xvciA9ICJyZWQiOwotICAgIHJldHVy biB3YWl0Rm9yKDMwMCkudGhlbigoKSA9PiB7Ci0gICAgICAgIHJldHVybiB0ZXN0Q2FudmFzKCJ0 ZXN0IDIiLCBjYW52YXMxLmdldENvbnRleHQoIjJkIikuZ2V0SW1hZ2VEYXRhKDIwLCAyMCwgNjAs IDYwKS5kYXRhLCB0cnVlKTsKLSAgICB9KTsKKyAgICBwcmludENhbnZhcygpCisgICAgcmV0dXJu IHRlc3RDYW52YXMoInRlc3QgMiIsIGNhbnZhczEsIHRydWUpOwogfSwgIkNoZWNraW5nIGNhbnZh cyBpcyByZWQiKTsKIAogCiBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICBjb2xvciA9ICJn cmVlbiI7Ci0gICAgcmV0dXJuIHdhaXRGb3IoMzAwKS50aGVuKCgpID0+IHsKLSAgICAgICAgcmV0 dXJuIHRlc3RDYW52YXMoInRlc3QgMyIsIGNhbnZhczEuZ2V0Q29udGV4dCgiMmQiKS5nZXRJbWFn ZURhdGEoMjAsIDIwLCA2MCwgNjApLmRhdGEsIHRydWUpOwotICAgIH0pOworICAgIHByaW50Q2Fu dmFzKCk7CisgICAgcmV0dXJuIHRlc3RDYW52YXMoInRlc3QgMyIsIGNhbnZhczEsIHRydWUpOwog fSwgIkNoZWNraW5nIGNhbnZhcyBpcyBncmVlbiBhZ2FpbiIpOwogCiBwcm9taXNlX3Rlc3QoKHRl c3QpID0+IHsKICAgICBjYW52YXMxLndpZHRoID0gNjQwOwogICAgIGNhbnZhczEuaGVpZ2h0ID0g NDgwOworICAgIHByaW50Q2FudmFzKCk7CiAgICAgcmV0dXJuIHdhaXRGb3JWaWRlb1NpemUodmlk ZW8sIDY0MCwgNDgwKTsKIH0sICJDaGVja2luZyBjYW52YXMgc2l6ZSBjaGFuZ2UiKTsKICAgICAg ICAgPC9zY3JpcHQ+Cg==