172361 2017-05-19 09:31:21 -0700 matchMedia('print').addListener() fires in WK1 but never in WK2 when printing (breaks printing Google maps, QuickLooks) 2017-05-21 08:08:23 -0700 1 1 1 Unclassified WebKit Printing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned ap commit-queue sam oldest_to_newest 1310626 0 koivisto 2017-05-19 09:31:21 -0700 <html><body> <div id="main">Before print</div> <script> var mql = window.matchMedia("print"); mql.addListener(onPrint); function onPrint(e) { if (e.matches) { document.getElementById("main").innerHTML = "Printing"; } else { document.getElementById("main").innerHTML = "After print"; } } </script></body></html> 1310627 1 koivisto 2017-05-19 09:31:43 -0700 <rdar://problem/28777408> 1310631 2 310665 koivisto 2017-05-19 09:42:28 -0700 Created attachment 310665 patch 1310641 3 310665 sam 2017-05-19 10:01:58 -0700 Comment on attachment 310665 patch View in context: https://bugs.webkit.org/attachment.cgi?id=310665&action=review > Source/WebCore/ChangeLog:14 > + (WebCore::FrameView::layout): > + > + Evaluate matchMedia queries unconditionally. No idea why it wasn't like that. Out of curiosity, what made this work in WK1 but not WK2? 1310644 4 koivisto 2017-05-19 10:06:55 -0700 If anything triggers an additional layout the bug goes away. I think WK1 worked by just by having different printing code that ended up doing more layouts. I had to add a clean printing simulation to Internals to test this. 1310650 5 310665 ap 2017-05-19 10:14:50 -0700 Comment on attachment 310665 patch View in context: https://bugs.webkit.org/attachment.cgi?id=310665&action=review > Source/WebCore/testing/Internals.h:348 > + void setPrinting(int width, int height); What resets m_printContext between tests? > LayoutTests/fast/media/matchMedia-print.html:15 > +if (window.internals) > + window.internals.setPrinting(500,500); Is it doable with one of the existing print testing functions? There are some in Internals (search for PeintContext in Internals.cpp), and there is setPrinting in TestRunner too. 1310655 6 koivisto 2017-05-19 10:54:03 -0700 > What resets m_printContext between tests? Internals gets recreated for each test. Lifetime of m_printContext might still be problematic as GC could keep Internals alive too long. I'll look into it. > Is it doable with one of the existing print testing functions? There are > some in Internals (search for PeintContext in Internals.cpp), and there is > setPrinting in TestRunner too. No, as mentioned above and in the ChangeLog. 1311124 7 310806 koivisto 2017-05-21 05:31:56 -0700 Created attachment 310806 patch 1311131 8 310806 commit-queue 2017-05-21 08:08:21 -0700 Comment on attachment 310806 patch Clearing flags on attachment: 310806 Committed r217197: <http://trac.webkit.org/changeset/217197> 1311132 9 commit-queue 2017-05-21 08:08:23 -0700 All reviewed patches have been landed. Closing bug. 310665 2017-05-19 09:42:28 -0700 2017-05-21 05:31:56 -0700 patch matchMedia-print.patch text/plain 5837 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzEzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA1LTE5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBtYXRjaE1lZGlhKCdwcmludCcp LmFkZExpc3RlbmVyKCkgZmlyZXMgaW4gV0sxIGJ1dCBuZXZlciBpbiBXSzIgd2hlbiBwcmludGlu ZyAoYnJlYWtzIHByaW50aW5nIEdvb2dsZSBtYXBzLCBRdWlja0xvb2tzKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyMzYxCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yODc3NzQwOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBmYXN0L21lZGlhL21hdGNoTWVkaWEtcHJpbnQuaHRtbAorCisg ICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 OjpsYXlvdXQpOgorCisgICAgICAgICAgICBFdmFsdWF0ZSBtYXRjaE1lZGlhIHF1ZXJpZXMgdW5j b25kaXRpb25hbGx5LiBObyBpZGVhIHdoeSBpdCB3YXNuJ3QgbGlrZSB0aGF0LgorCisgICAgICAg ICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpz ZXRQcmludGluZyk6CisKKyAgICAgICAgICAgIEFkZCB0ZXN0aW5nIHN1cHBvcnQuIFRoZSBleGlz dGluZyB3YXlzIHRvIGRvIHByaW50aW5nIHRlc3Rpbmcgd2VyZSB1bmFibGUgdG8gaGl0IHRoaXMg YnVnIGFzCisgICAgICAgICAgICB0aGV5IGhhZCB0b28gbXVjaCBhZGRpdGlvbmFsIGd1bmsuCisK KyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5oOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJu YWxzLmlkbDoKKwogMjAxNy0wNS0xOSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTiAocjIxNzA3OCk6IHdpbmRvdy5BcHBsZVBheVNlc3Npb24gaXMg dW5kZWZpbmVkIG9uIG1hY09TIFNpZXJyYQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cAkocmV2aXNpb24gMjE2OTAxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMzY3LDggKzEzNjcsOSBAQCB2b2lkIEZyYW1lVmlldzo6bGF5 b3V0KGJvb2wgYWxsb3dTdWJ0cmVlCiAgICAgICAgICAgICBkb2N1bWVudC5zdHlsZVNjb3BlKCku ZGlkQ2hhbmdlU3R5bGVTaGVldEVudmlyb25tZW50KCk7CiAgICAgICAgICAgICAvLyBGSVhNRTog VGhpcyBpbnN0cnVtZW50YXRpb24gZXZlbnQgaXMgbm90IHN0cmljdGx5IGFjY3VyYXRlIHNpbmNl IGNhY2hlZCBtZWRpYSBxdWVyeSByZXN1bHRzIGRvIG5vdCBwZXJzaXN0IGFjcm9zcyBTdHlsZVJl c29sdmVyIHJlYnVpbGRzLgogICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpt ZWRpYVF1ZXJ5UmVzdWx0Q2hhbmdlZChkb2N1bWVudCk7Ci0gICAgICAgIH0gZWxzZQotICAgICAg ICAgICAgZG9jdW1lbnQuZXZhbHVhdGVNZWRpYVF1ZXJ5TGlzdCgpOworICAgICAgICB9CisgICAg ICAgIAorICAgICAgICBkb2N1bWVudC5ldmFsdWF0ZU1lZGlhUXVlcnlMaXN0KCk7CiAKICAgICAg ICAgLy8gSWYgdGhlcmUgaXMgYW55IHBhZ2luYXRpb24gdG8gYXBwbHksIGl0IHdpbGwgYWZmZWN0 IHRoZSBSZW5kZXJWaWV3J3Mgc3R5bGUsIHNvIHdlIHNob3VsZAogICAgICAgICAvLyB0YWtlIGNh cmUgb2YgdGhhdCBub3cuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCShy ZXZpc2lvbiAyMTY5MDEpCisrKyBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI2MDIsNiArMjYwMiwxMiBAQCBFeGNlcHRpb25Pcjx2b2lkPiBJ bnRlcm5hbHM6OnNldFZpZXdFeHBvCiAgICAgcmV0dXJuIHsgfTsKIH0KIAordm9pZCBJbnRlcm5h bHM6OnNldFByaW50aW5nKGludCB3aWR0aCwgaW50IGhlaWdodCkKK3sKKyAgICBtX3ByaW50Q29u dGV4dCA9IHN0ZDo6bWFrZV91bmlxdWU8UHJpbnRDb250ZXh0PihmcmFtZSgpKTsKKyAgICBtX3By aW50Q29udGV4dC0+YmVnaW4od2lkdGgsIGhlaWdodCk7Cit9CisKIHZvaWQgSW50ZXJuYWxzOjpz ZXRIZWFkZXJIZWlnaHQoZmxvYXQgaGVpZ2h0KQogewogICAgIERvY3VtZW50KiBkb2N1bWVudCA9 IGNvbnRleHREb2N1bWVudCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h bHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCShy ZXZpc2lvbiAyMTY5MDEpCisrKyBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw2ICs2Nyw3IEBAIGNsYXNzIE1vY2tDb250ZW50RmlsdGVyU2V0 dGluZ3M7CiBjbGFzcyBNb2NrUGFnZU92ZXJsYXk7CiBjbGFzcyBOb2RlTGlzdDsKIGNsYXNzIFBh Z2U7CitjbGFzcyBQcmludENvbnRleHQ7CiBjbGFzcyBSYW5nZTsKIGNsYXNzIFJlbmRlcmVkRG9j dW1lbnRNYXJrZXI7CiBjbGFzcyBSVENQZWVyQ29ubmVjdGlvbjsKQEAgLTM0NCw2ICszNDUsNyBA QCBwdWJsaWM6CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0VXNlRml4ZWRMYXlvdXQoYm9vbCk7 CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0Rml4ZWRMYXlvdXRTaXplKGludCB3aWR0aCwgaW50 IGhlaWdodCk7CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4gc2V0Vmlld0V4cG9zZWRSZWN0KGZsb2F0 IGxlZnQsIGZsb2F0IHRvcCwgZmxvYXQgd2lkdGgsIGZsb2F0IGhlaWdodCk7CisgICAgdm9pZCBz ZXRQcmludGluZyhpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogCiAgICAgdm9pZCBzZXRIZWFkZXJI ZWlnaHQoZmxvYXQpOwogICAgIHZvaWQgc2V0Rm9vdGVySGVpZ2h0KGZsb2F0KTsKQEAgLTU5Myw2 ICs1OTUsNyBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8SW5zcGVj dG9yU3R1YkZyb250ZW5kPiBtX2luc3BlY3RvckZyb250ZW5kOworICAgIHN0ZDo6dW5pcXVlX3B0 cjxQcmludENvbnRleHQ+IG1fcHJpbnRDb250ZXh0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbAkocmV2aXNpb24gMjE2 OTAxKQorKysgU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCSh3b3JraW5nIGNv cHkpCkBAIC0zMjMsNiArMzIzLDcgQEAgZW51bSBFdmVudFRocm90dGxpbmdCZWhhdmlvciB7CiAK ICAgICBbTWF5VGhyb3dFeGNlcHRpb25dIHZvaWQgc2V0VXNlRml4ZWRMYXlvdXQoYm9vbGVhbiB1 c2VGaXhlZExheW91dCk7CiAgICAgW01heVRocm93RXhjZXB0aW9uXSB2b2lkIHNldEZpeGVkTGF5 b3V0U2l6ZShsb25nIHdpZHRoLCBsb25nIGhlaWdodCk7CisgICAgdm9pZCBzZXRQcmludGluZyhs b25nIHdpZHRoLCBsb25nIGhlaWdodCk7CiAKICAgICBbTWF5VGhyb3dFeGNlcHRpb25dIHZvaWQg c2V0Vmlld0V4cG9zZWRSZWN0KHVucmVzdHJpY3RlZCBmbG9hdCB4LCB1bnJlc3RyaWN0ZWQgZmxv YXQgeSwgdW5yZXN0cmljdGVkIGZsb2F0IHdpZHRoLCB1bnJlc3RyaWN0ZWQgZmxvYXQgaGVpZ2h0 KTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjE3MDQ2KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTctMDUtMTkgIEFudHRpIEtvaXZp c3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIG1hdGNoTWVkaWEoJ3ByaW50JykuYWRk TGlzdGVuZXIoKSBmaXJlcyBpbiBXSzEgYnV0IG5ldmVyIGluIFdLMiB3aGVuIHByaW50aW5nIChi cmVha3MgcHJpbnRpbmcgR29vZ2xlIG1hcHMsIFF1aWNrTG9va3MpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzIzNjEKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzI4Nzc3NDA4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZmFzdC9tZWRpYS9tYXRjaE1lZGlhLXByaW50LWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9tZWRpYS9tYXRjaE1lZGlhLXByaW50Lmh0bWw6IEFkZGVkLgor CiAyMDE3LTA1LTE4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBEZXNpZ24gbW9kZSBzaG91bGQgbm90IGFmZmVjdCBVQSBzaGFkb3cgdHJlZXMKSW5kZXg6IExh eW91dFRlc3RzL2Zhc3QvbWVkaWEvbWF0Y2hNZWRpYS1wcmludC1leHBlY3RlZC50eHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9tZWRpYS9tYXRjaE1lZGlhLXByaW50LWV4cGVjdGVk LnR4dAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9mYXN0L21lZGlhL21hdGNoTWVkaWEt cHJpbnQtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMiBAQAorVGhpcyBk b2N1bWVudCB3YXMKK3ByaW50ZWQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbWVkaWEvbWF0Y2hN ZWRpYS1wcmludC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbWVkaWEvbWF0 Y2hNZWRpYS1wcmludC5odG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL2Zhc3QvbWVk aWEvbWF0Y2hNZWRpYS1wcmludC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTYgQEAK KzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNU ZXh0KCk7Cis8L3NjcmlwdD4KK1RoaXMgZG9jdW1lbnQgd2FzCis8ZGl2IGlkPXRlc3Q+bm90IHBy aW50ZWQ8L2Rpdj4KKzxzY3JpcHQ+Cit2YXIgbWVkaWFRdWVyeUxpc3QgPSB3aW5kb3cubWF0Y2hN ZWRpYSgicHJpbnQiKTsKK21lZGlhUXVlcnlMaXN0LmFkZExpc3RlbmVyKChlKSA9PiB7CisgICAg aWYgKGUubWF0Y2hlcykKKyAgICAgICAgdGVzdC5pbm5lckhUTUwgPSAicHJpbnRlZCI7Cit9KTsK KworaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgd2luZG93LmludGVybmFscy5zZXRQcmludGlu Zyg1MDAsNTAwKTsKKzwvc2NyaXB0Pgo= 310806 2017-05-21 05:31:56 -0700 2017-05-21 08:08:21 -0700 patch matchMedia-print-2.patch text/plain 6087 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzEzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA1LTE5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBtYXRjaE1lZGlhKCdwcmludCcp LmFkZExpc3RlbmVyKCkgZmlyZXMgaW4gV0sxIGJ1dCBuZXZlciBpbiBXSzIgd2hlbiBwcmludGlu ZyAoYnJlYWtzIHByaW50aW5nIEdvb2dsZSBtYXBzLCBRdWlja0xvb2tzKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyMzYxCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yODc3NzQwOD4KKworICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgor CisgICAgICAgIFRlc3Q6IGZhc3QvbWVkaWEvbWF0Y2hNZWRpYS1wcmludC5odG1sCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6Omxh eW91dCk6CisKKyAgICAgICAgICAgIEV2YWx1YXRlIG1hdGNoTWVkaWEgcXVlcmllcyB1bmNvbmRp dGlvbmFsbHkuIE5vIGlkZWEgd2h5IGl0IHdhc24ndCBsaWtlIHRoYXQuCisKKyAgICAgICAgKiB0 ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNldFBy aW50aW5nKToKKworICAgICAgICAgICAgQWRkIHRlc3Rpbmcgc3VwcG9ydC4gVGhlIGV4aXN0aW5n IHdheXMgdG8gZG8gcHJpbnRpbmcgdGVzdGluZyB3ZXJlIHVuYWJsZSB0byBoaXQgdGhpcyBidWcg YXMKKyAgICAgICAgICAgIHRoZXkgaGFkIHRvbyBtdWNoIGFkZGl0aW9uYWwgZ3Vuay4KKworICAg ICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMu aWRsOgorCiAyMDE3LTA1LTE5ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OIChyMjE3MDc4KTogd2luZG93LkFwcGxlUGF5U2Vzc2lvbiBpcyB1bmRl ZmluZWQgb24gbWFjT1MgU2llcnJhCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShy ZXZpc2lvbiAyMTY5MDEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEzNjcsOCArMTM2Nyw5IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQo Ym9vbCBhbGxvd1N1YnRyZWUKICAgICAgICAgICAgIGRvY3VtZW50LnN0eWxlU2NvcGUoKS5kaWRD aGFuZ2VTdHlsZVNoZWV0RW52aXJvbm1lbnQoKTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlz IGluc3RydW1lbnRhdGlvbiBldmVudCBpcyBub3Qgc3RyaWN0bHkgYWNjdXJhdGUgc2luY2UgY2Fj aGVkIG1lZGlhIHF1ZXJ5IHJlc3VsdHMgZG8gbm90IHBlcnNpc3QgYWNyb3NzIFN0eWxlUmVzb2x2 ZXIgcmVidWlsZHMuCiAgICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Om1lZGlh UXVlcnlSZXN1bHRDaGFuZ2VkKGRvY3VtZW50KTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICBkb2N1bWVudC5ldmFsdWF0ZU1lZGlhUXVlcnlMaXN0KCk7CisgICAgICAgIH0KKyAgICAgICAg CisgICAgICAgIGRvY3VtZW50LmV2YWx1YXRlTWVkaWFRdWVyeUxpc3QoKTsKIAogICAgICAgICAv LyBJZiB0aGVyZSBpcyBhbnkgcGFnaW5hdGlvbiB0byBhcHBseSwgaXQgd2lsbCBhZmZlY3QgdGhl IFJlbmRlclZpZXcncyBzdHlsZSwgc28gd2Ugc2hvdWxkCiAgICAgICAgIC8vIHRha2UgY2FyZSBv ZiB0aGF0IG5vdy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAJKHJldmlz aW9uIDIxNjkwMSkKKysrIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzY3LDYgKzM2NywxMiBAQCBzdGF0aWMgYm9vbCBtYXJrZXJUeXBlc0Zy b20oY29uc3QgU3RyaW5nCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK3N0YXRpYyBzdGQ6OnVuaXF1 ZV9wdHI8UHJpbnRDb250ZXh0PiYgcHJpbnRDb250ZXh0Rm9yVGVzdGluZygpCit7CisgICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkPHN0ZDo6dW5pcXVlX3B0cjxQcmludENvbnRleHQ+PiBjb250ZXh0 OworICAgIHJldHVybiBjb250ZXh0OworfQorCiBjb25zdCBjaGFyKiBJbnRlcm5hbHM6OmludGVy bmFsc0lkID0gImludGVybmFscyI7CiAKIFJlZjxJbnRlcm5hbHM+IEludGVybmFsczo6Y3JlYXRl KERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTQ0OCw2ICs0NTQsOCBAQCB2b2lkIEludGVybmFsczo6 cmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShQCiAgICAgTW9ja1ByZXZpZXdMb2FkZXJDbGllbnQ6OnNp bmdsZXRvbigpLnNldFBhc3N3b3JkKCIiKTsKICAgICBQcmV2aWV3TG9hZGVyOjpzZXRDbGllbnRG b3JUZXN0aW5nKG51bGxwdHIpOwogI2VuZGlmCisKKyAgICBwcmludENvbnRleHRGb3JUZXN0aW5n KCkgPSBudWxscHRyOwogfQogCiBJbnRlcm5hbHM6OkludGVybmFscyhEb2N1bWVudCYgZG9jdW1l bnQpCkBAIC0yNjAyLDYgKzI2MTAsMTIgQEAgRXhjZXB0aW9uT3I8dm9pZD4gSW50ZXJuYWxzOjpz ZXRWaWV3RXhwbwogICAgIHJldHVybiB7IH07CiB9CiAKK3ZvaWQgSW50ZXJuYWxzOjpzZXRQcmlu dGluZyhpbnQgd2lkdGgsIGludCBoZWlnaHQpCit7CisgICAgcHJpbnRDb250ZXh0Rm9yVGVzdGlu ZygpID0gc3RkOjptYWtlX3VuaXF1ZTxQcmludENvbnRleHQ+KGZyYW1lKCkpOworICAgIHByaW50 Q29udGV4dEZvclRlc3RpbmcoKS0+YmVnaW4od2lkdGgsIGhlaWdodCk7Cit9CisKIHZvaWQgSW50 ZXJuYWxzOjpzZXRIZWFkZXJIZWlnaHQoZmxvYXQgaGVpZ2h0KQogewogICAgIERvY3VtZW50KiBk b2N1bWVudCA9IGNvbnRleHREb2N1bWVudCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvdGVzdGlu Zy9JbnRlcm5hbHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVy bmFscy5oCShyZXZpc2lvbiAyMTY5MDEpCisrKyBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVy bmFscy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNDQsNiArMzQ0LDcgQEAgcHVibGljOgogICAgIEV4 Y2VwdGlvbk9yPHZvaWQ+IHNldFVzZUZpeGVkTGF5b3V0KGJvb2wpOwogICAgIEV4Y2VwdGlvbk9y PHZvaWQ+IHNldEZpeGVkTGF5b3V0U2l6ZShpbnQgd2lkdGgsIGludCBoZWlnaHQpOwogICAgIEV4 Y2VwdGlvbk9yPHZvaWQ+IHNldFZpZXdFeHBvc2VkUmVjdChmbG9hdCBsZWZ0LCBmbG9hdCB0b3As IGZsb2F0IHdpZHRoLCBmbG9hdCBoZWlnaHQpOworICAgIHZvaWQgc2V0UHJpbnRpbmcoaW50IHdp ZHRoLCBpbnQgaGVpZ2h0KTsKIAogICAgIHZvaWQgc2V0SGVhZGVySGVpZ2h0KGZsb2F0KTsKICAg ICB2b2lkIHNldEZvb3RlckhlaWdodChmbG9hdCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuaWRsCShyZXZpc2lvbiAyMTY5MDEpCisrKyBTb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTMyMyw2ICszMjMsNyBAQCBlbnVtIEV2 ZW50VGhyb3R0bGluZ0JlaGF2aW9yIHsKIAogICAgIFtNYXlUaHJvd0V4Y2VwdGlvbl0gdm9pZCBz ZXRVc2VGaXhlZExheW91dChib29sZWFuIHVzZUZpeGVkTGF5b3V0KTsKICAgICBbTWF5VGhyb3dF eGNlcHRpb25dIHZvaWQgc2V0Rml4ZWRMYXlvdXRTaXplKGxvbmcgd2lkdGgsIGxvbmcgaGVpZ2h0 KTsKKyAgICB2b2lkIHNldFByaW50aW5nKGxvbmcgd2lkdGgsIGxvbmcgaGVpZ2h0KTsKIAogICAg IFtNYXlUaHJvd0V4Y2VwdGlvbl0gdm9pZCBzZXRWaWV3RXhwb3NlZFJlY3QodW5yZXN0cmljdGVk IGZsb2F0IHgsIHVucmVzdHJpY3RlZCBmbG9hdCB5LCB1bnJlc3RyaWN0ZWQgZmxvYXQgd2lkdGgs IHVucmVzdHJpY3RlZCBmbG9hdCBoZWlnaHQpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMTcwNDYp CisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBA QAorMjAxNy0wNS0xOSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAg ICAgbWF0Y2hNZWRpYSgncHJpbnQnKS5hZGRMaXN0ZW5lcigpIGZpcmVzIGluIFdLMSBidXQgbmV2 ZXIgaW4gV0syIHdoZW4gcHJpbnRpbmcgKGJyZWFrcyBwcmludGluZyBHb29nbGUgbWFwcywgUXVp Y2tMb29rcykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE3MjM2MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjg3Nzc0MDg+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgU2FtIFdlaW5pZy4KKworICAgICAgICAqIGZhc3QvbWVkaWEvbWF0Y2hNZWRpYS1w cmludC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWEvbWF0Y2hNZWRp YS1wcmludC5odG1sOiBBZGRlZC4KKwogMjAxNy0wNS0xOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0 aUBhcHBsZS5jb20+CiAKICAgICAgICAgRGVzaWduIG1vZGUgc2hvdWxkIG5vdCBhZmZlY3QgVUEg c2hhZG93IHRyZWVzCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L21lZGlhL21hdGNoTWVkaWEtcHJp bnQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvbWVkaWEvbWF0 Y2hNZWRpYS1wcmludC1leHBlY3RlZC50eHQJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMv ZmFzdC9tZWRpYS9tYXRjaE1lZGlhLXByaW50LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDIgQEAKK1RoaXMgZG9jdW1lbnQgd2FzCitwcmludGVkCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L21lZGlhL21hdGNoTWVkaWEtcHJpbnQuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L21lZGlhL21hdGNoTWVkaWEtcHJpbnQuaHRtbAkobm9uZXhpc3RlbnQpCisr KyBMYXlvdXRUZXN0cy9mYXN0L21lZGlhL21hdGNoTWVkaWEtcHJpbnQuaHRtbAkod29ya2luZyBj b3B5KQpAQCAtMCwwICsxLDE2IEBACis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+CitUaGlzIGRvY3VtZW50IHdh cworPGRpdiBpZD10ZXN0Pm5vdCBwcmludGVkPC9kaXY+Cis8c2NyaXB0PgordmFyIG1lZGlhUXVl cnlMaXN0ID0gd2luZG93Lm1hdGNoTWVkaWEoInByaW50Iik7CittZWRpYVF1ZXJ5TGlzdC5hZGRM aXN0ZW5lcigoZSkgPT4geworICAgIGlmIChlLm1hdGNoZXMpCisgICAgICAgIHRlc3QuaW5uZXJI VE1MID0gInByaW50ZWQiOworfSk7CisKK2lmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIHdpbmRv dy5pbnRlcm5hbHMuc2V0UHJpbnRpbmcoNTAwLDUwMCk7Cis8L3NjcmlwdD4K