155026 2016-03-04 11:11:00 -0800 Add ability to retrieve raw data from release harness 2016-03-07 19:45:41 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jonlee jonlee cdumez commit-queue rniwa sabouhallawa simon.fraser oldest_to_newest 1170946 0 jonlee 2016-03-04 11:11:00 -0800 SSIA 1170948 1 273018 jonlee 2016-03-04 11:12:26 -0800 Created attachment 273018 Patch 1170977 2 273018 sabouhallawa 2016-03-04 12:23:19 -0800 Comment on attachment 273018 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273018&action=review > PerformanceTests/Animometer/developer.html:98 > + 'j': Show JSON results<br/> Why is the JSON overlay invoked through a shortcut and not by clicking a button? > PerformanceTests/Animometer/resources/runner/animometer.js:401 > + benchmarkController.getDebugInfo(); We do not check whether the JSON overlay is visible or not before creating a new one. So the JSON results overlay will be stacked on top of each other every time 'j' is clicked. And because the "Done" button is stacked also, if I click the 'j' key 30 times, I will have to click the "Done" button 30 times to go back to the results page. > PerformanceTests/Animometer/resources/runner/animometer.js:434 > + }; Can't we have the overlay elements inside a hidden section in the index.html instead of creating the elements dynamically? > PerformanceTests/Animometer/resources/runner/animometer.js:436 > + var button = Utilities.createElement("button", {}, container); It is weird that the overlay is added by the keyboard but removed by the button "Done". I would expect if I invoke the overlay by clicking a key, pressing the Esc key or clicking outside the overlay should make it disappear. > PerformanceTests/Animometer/resources/runner/animometer.js:445 > + target.selectRange = ((target.selectRange || 0) + 1) % 3; Why do we start target.selectRange at 1? Shouldn't we do it like that: target.selectRange = ((target.selectRange || -1) + 1) % 3; > PerformanceTests/Animometer/resources/runner/animometer.js:452 > + range.selectNode(document.getElementById("results-score")); This change will not be needed if we fix the initial value of target.selectRange. > PerformanceTests/Animometer/resources/runner/animometer.js:457 > + range.setEndAfter(document.querySelector("#results-score > tr:last-of-type"), 0); Ditto. 1171501 3 273018 jonlee 2016-03-06 18:59:47 -0800 Comment on attachment 273018 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273018&action=review >> PerformanceTests/Animometer/developer.html:98 >> + 'j': Show JSON results<br/> > > Why is the JSON overlay invoked through a shortcut and not by clicking a button? Goes through the same path as the release harness. >> PerformanceTests/Animometer/resources/runner/animometer.js:401 >> + benchmarkController.getDebugInfo(); > > We do not check whether the JSON overlay is visible or not before creating a new one. So the JSON results overlay will be stacked on top of each other every time 'j' is clicked. And because the "Done" button is stacked also, if I click the 'j' key 30 times, I will have to click the "Done" button 30 times to go back to the results page. Fixed. >> PerformanceTests/Animometer/resources/runner/animometer.js:434 >> + }; > > Can't we have the overlay elements inside a hidden section in the index.html instead of creating the elements dynamically? We could. I didn't want to expose it outright in the markup. >> PerformanceTests/Animometer/resources/runner/animometer.js:436 >> + var button = Utilities.createElement("button", {}, container); > > It is weird that the overlay is added by the keyboard but removed by the button "Done". I would expect if I invoke the overlay by clicking a key, pressing the Esc key or clicking outside the overlay should make it disappear. Added 'esc' key. >> PerformanceTests/Animometer/resources/runner/animometer.js:445 >> + target.selectRange = ((target.selectRange || 0) + 1) % 3; > > Why do we start target.selectRange at 1? Shouldn't we do it like that: > > target.selectRange = ((target.selectRange || -1) + 1) % 3; No. It will always be 0. >> PerformanceTests/Animometer/resources/runner/animometer.js:452 >> + range.selectNode(document.getElementById("results-score")); > > This change will not be needed if we fix the initial value of target.selectRange. See above. >> PerformanceTests/Animometer/resources/runner/animometer.js:457 >> + range.setEndAfter(document.querySelector("#results-score > tr:last-of-type"), 0); > > Ditto. See above. 1171502 4 273158 jonlee 2016-03-06 19:00:48 -0800 Created attachment 273158 Patch 1171873 5 273158 simon.fraser 2016-03-07 18:08:28 -0800 Comment on attachment 273158 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273158&action=review > PerformanceTests/Animometer/resources/runner/animometer.js:422 > + if (!!document.getElementById("overlay")) Is the !! required? 1171903 6 273158 jonlee 2016-03-07 19:39:49 -0800 Comment on attachment 273158 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=273158&action=review >> PerformanceTests/Animometer/resources/runner/animometer.js:422 >> + if (!!document.getElementById("overlay")) > > Is the !! required? no. removed. 1171905 7 jonlee 2016-03-07 19:45:41 -0800 Committed r197723: <http://trac.webkit.org/changeset/197723> 273018 2016-03-04 11:12:26 -0800 2016-03-06 19:00:43 -0800 Patch bug-155026-20160304111211.patch text/plain 9839 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NTQ2CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0FuaW1vbWV0ZXIvZGV2ZWxvcGVyLmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIv ZGV2ZWxvcGVyLmh0bWwKaW5kZXggOThjMmNiZmVkMzU2ZWIzYzUxYzEyOTllMDc3YWQwZTA5YTVm ZWU1Ni4uZDJhOGQ2ZmU3NTBkN2YyNDU1ZGQ1NDM2YmJiMDM2NWRmM2VkOGE2NCAxMDA2NDQKLS0t IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL2RldmVsb3Blci5odG1sCisrKyBiL1BlcmZv cm1hbmNlVGVzdHMvQW5pbW9tZXRlci9kZXZlbG9wZXIuaHRtbApAQCAtOTMsMTUgKzkzLDExIEBA CiAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgPHRhYmxlIGlkPSJyZXN1 bHRzLWhlYWRlciI+PC90YWJsZT4KICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgPGRp diBpZD0icmVzdWx0cy1qc29uIj4KLSAgICAgICAgICAgICAgICA8YnV0dG9uIGNsYXNzPSJzbWFs bC1idXR0b24iIG9uY2xpY2s9ImJlbmNobWFya0NvbnRyb2xsZXIuc2hvd0pTT05SZXN1bHRzKCki PkpTT04gcmVzdWx0czwvYnV0dG9uPgotICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImhpZGRl biI+Ci0gICAgICAgICAgICAgICAgICAgIEpTT046Ci0gICAgICAgICAgICAgICAgICAgIDx0ZXh0 YXJlYSByb3dzPTEgb25jbGljaz0idGhpcy5mb2N1cygpO3RoaXMuc2VsZWN0KCkiIHJlYWRvbmx5 PjwvdGV4dGFyZWE+Ci0gICAgICAgICAgICAgICAgPC9kaXY+Ci0gICAgICAgICAgICA8L2Rpdj4K ICAgICAgICAgICAgIDxidXR0b24gb25jbGljaz0iYmVuY2htYXJrQ29udHJvbGxlci5zdGFydEJl bmNobWFyaygpIj5UZXN0IEFnYWluPC9idXR0b24+Ci0gICAgICAgICAgICA8cD4ncyc6IFNlbGVj dCBkaWZmZXJlbnQgZGF0YSBmb3IgY29weS9wYXN0ZTwvcD4KKyAgICAgICAgICAgIDxwPgorICAg ICAgICAgICAgICAgICdqJzogU2hvdyBKU09OIHJlc3VsdHM8YnIvPgorICAgICAgICAgICAgICAg ICdzJzogU2VsZWN0IHZhcmlvdXMgcmVzdWx0cyBmb3IgY29weS9wYXN0ZSAodXNlIHJlcGVhdGVk bHkgdG8gY3ljbGUpCisgICAgICAgICAgICA8L3A+CiAgICAgICAgIDwvc2VjdGlvbj4KICAgICAg ICAgPHNlY3Rpb24gaWQ9InRlc3QtZ3JhcGgiPgogICAgICAgICAgICAgPGhlYWRlcj4KZGlmZiAt LWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVidWctcnVubmVy L2FuaW1vbWV0ZXIuY3NzIGIvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9k ZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3MKaW5kZXggZTZlN2JiNjFlOGQ1Y2QyNDAxMTQyOGRh YjVjYjQxMWQ1NTRkOWEyNi4uOGFkYzQ4YmJlNmJkZmI1YzA2NjM4YzE2MzBjNGRkYTM2YmNiYThi MSAxMDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1 Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3MKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVy L3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3MKQEAgLTM1MywxNCArMzUzLDYg QEAgbGFiZWwudHJlZS1sYWJlbCB7CiAgICAgZmxleC1kaXJlY3Rpb246IHJvdzsKIH0KIAotI3Jl c3VsdHMtanNvbiB7Ci0gICAgbWFyZ2luLWJvdHRvbTogM2VtOwotfQotCi0jcmVzdWx0cy1qc29u IHRleHRhcmVhIHsKLSAgICB2ZXJ0aWNhbC1hbGlnbjogc3ViOwotfQotCiAjdGVzdC1ncmFwaCB7 CiAgICAgZmxleDogMSAwIGNhbGMoMTAwJSAtIDQwcHgpOwogfQpkaWZmIC0tZ2l0IGEvUGVyZm9y bWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5q cyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVidWctcnVubmVyL2Fu aW1vbWV0ZXIuanMKaW5kZXggNTBmZTk2ZmRlY2ZhMGNiZmQyZmYxNGZkMGE0YmQ0MmQ3NmVhYzFj Yy4uZmZjNzFiYWM0Zjg4YjkzNTFhMWYzZmNhYWIzYmRkNTFkMmRjNTY1NiAxMDA2NDQKLS0tIGEv UGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9t ZXRlci5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL2RlYnVn LXJ1bm5lci9hbmltb21ldGVyLmpzCkBAIC00OTAsNyArNDkwLDcgQEAgVXRpbGl0aWVzLmV4dGVu ZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrQ29udHJvbGxlciwgewogICAgIHNob3dSZXN1bHRzOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuYWRkZWRLZXlFdmVudCkgewotICAg ICAgICAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJlc3MiLCB0aGlzLnNlbGVj dFJlc3VsdHMsIGZhbHNlKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImtleXByZXNzIiwgdGhpcy5oYW5kbGVLZXlQcmVzcywgZmFsc2UpOwogICAgICAgICAgICAgdGhp cy5hZGRlZEtleUV2ZW50ID0gdHJ1ZTsKICAgICAgICAgfQogCkBAIC01MTEsMTcgKzUxMSw2IEBA IFV0aWxpdGllcy5leHRlbmRPYmplY3Qod2luZG93LmJlbmNobWFya0NvbnRyb2xsZXIsIHsKICAg ICAgICAgc3VpdGVzTWFuYWdlci51cGRhdGVMb2NhbFN0b3JhZ2VGcm9tSlNPTihkYXNoYm9hcmQu cmVzdWx0c1swXSk7CiAgICAgfSwKIAotICAgIHNob3dKU09OUmVzdWx0czogZnVuY3Rpb24oKQot ICAgIHsKLSAgICAgICAgdmFyIG91dHB1dCA9IHsKLSAgICAgICAgICAgIG9wdGlvbnM6IGJlbmNo bWFya1J1bm5lckNsaWVudC5yZXN1bHRzLm9wdGlvbnMsCi0gICAgICAgICAgICBkYXRhOiBiZW5j aG1hcmtSdW5uZXJDbGllbnQucmVzdWx0cy5kYXRhCi0gICAgICAgIH07Ci0gICAgICAgIHZhciB0 ZXh0YXJlYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLWpzb24gdGV4dGFyZWEi KS50ZXh0Q29udGVudCA9IEpTT04uc3RyaW5naWZ5KG91dHB1dCwgbnVsbCwgMSk7Ci0gICAgICAg IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLWpzb24gYnV0dG9uIikucmVtb3ZlKCk7 Ci0gICAgICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLWpzb24gZGl2IikuY2xh c3NMaXN0LnJlbW92ZSgiaGlkZGVuIik7Ci0gICAgfSwKLQogICAgIHNob3dUZXN0R3JhcGg6IGZ1 bmN0aW9uKHRlc3ROYW1lLCB0ZXN0UmVzdWx0LCB0ZXN0RGF0YSkKICAgICB7CiAgICAgICAgIHNl Y3Rpb25zTWFuYWdlci5zZXRTZWN0aW9uSGVhZGVyKCJ0ZXN0LWdyYXBoIiwgdGVzdE5hbWUpOwpk aWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9ydW5uZXIv YW5pbW9tZXRlci5jc3MgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1 bm5lci9hbmltb21ldGVyLmNzcwppbmRleCBlZDQ0MjgyMDNiNDNiNjQ0NWRlOTlmMmQ5YmRjYTFj ODI3MWZlZjg4Li5jM2FhZGM5MmYxZGMxNjRlNDczNWVkYWUxYjBkMjFhYTZlZTZhYzBmIDEwMDY0 NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmlt b21ldGVyLmNzcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1 bm5lci9hbmltb21ldGVyLmNzcwpAQCAtMjQwLDMgKzI0MCw1NSBAQCBidXR0b246YWN0aXZlIHsK ICAgICAgICAgZm9udC1zaXplOiAzZW07CiAgICAgfQogfQorCisjb3ZlcmxheSB7CisgICAgcG9z aXRpb246IGZpeGVkOworICAgIHdpZHRoOiAxMDAlOworICAgIGhlaWdodDogMTAwJTsKKyAgICB0 b3A6IDA7CisgICAgbGVmdDogMDsKKyAgICBjb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOworICAg IGJhY2tncm91bmQ6IHJnYmEoMCwgMCwgMTAsIC44KTsKK30KKworQHN1cHBvcnRzICgtd2Via2l0 LWJhY2tkcm9wLWZpbHRlcjogYmx1cigxMHB4KSkgeworICAgICNvdmVybGF5IHsKKyAgICAgICAg YmFja2dyb3VuZDogcmdiYSgwLCAwLCAxMCwgLjQpOworICAgICAgICAtd2Via2l0LWJhY2tkcm9w LWZpbHRlcjogYmx1cigxMHB4KTsKKyAgICB9Cit9CisKKyNvdmVybGF5ID4gZGl2IHsKKyAgICB3 aWR0aDogNTAwcHg7CisgICAgaGVpZ2h0OiA1MDBweDsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CisgICAgbWFyZ2luLXRvcDogLTI1MHB4OworICAgIG1hcmdpbi1sZWZ0OiAtMjUwcHg7CisgICAg dG9wOiA1MCU7CisgICAgbGVmdDogNTAlOworICAgIGRpc3BsYXk6IGZsZXg7CisgICAganVzdGlm eS1jb250ZW50OiBmbGV4LXN0YXJ0OworICAgIGZsZXgtZmxvdzogY29sdW1uOworfQorCisjb3Zl cmxheSA+IGRpdiBkaXYgeworICAgIGZsZXg6IDEgMSBhdXRvOworICAgIG92ZXJmbG93OiBzY3Jv bGw7CisgICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDI0MSwgMjQxLCAyNDEpOworICAgIHBhZGRp bmc6IDJweDsKKyAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OworfQorCisjb3ZlcmxheSBidXR0 b24geworICAgIG1hcmdpbjogMWVtIDVlbTsKKyAgICBib3JkZXItY29sb3I6IHJnYigyNDEsIDI0 MSwgMjQxKTsKKyAgICBjb2xvcjogcmdiKDI0MSwgMjQxLCAyNDEpOworfQorCisjb3ZlcmxheSBi dXR0b246aG92ZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwg LjEpOworfQorCisjb3ZlcmxheSBidXR0b246YWN0aXZlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiByZ2JhKDI1NSwgMjU1LCAyNTUsIC4yKTsKK30KZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVz dHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvcnVubmVyL2FuaW1vbWV0ZXIuanMgYi9QZXJmb3JtYW5j ZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVyLmpzCmluZGV4IDc1 OWZlYmNkYzQ1NjNjMmRlMGRmZmI3ZmFmOTk3OTJiNWUxZjU2YTEuLjMwOWY2OTFjZjRjODc4MGZl ZjQwN2M2MDYzM2FjZmI2Y2U0OWY2MWUgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQW5p bW9tZXRlci9yZXNvdXJjZXMvcnVubmVyL2FuaW1vbWV0ZXIuanMKKysrIGIvUGVyZm9ybWFuY2VU ZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9ydW5uZXIvYW5pbW9tZXRlci5qcwpAQCAtMzgxLDcg KzM4MSw3IEBAIHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVyID0gewogICAgIHNob3dSZXN1bHRz OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuYWRkZWRLZXlFdmVudCkgewot ICAgICAgICAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJlc3MiLCB0aGlzLnNl bGVjdFJlc3VsdHMsIGZhbHNlKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImtleXByZXNzIiwgdGhpcy5oYW5kbGVLZXlQcmVzcywgZmFsc2UpOwogICAgICAgICAgICAg dGhpcy5hZGRlZEtleUV2ZW50ID0gdHJ1ZTsKICAgICAgICAgfQogCkBAIC0zOTMsMjggKzM5Myw3 MiBAQCB3aW5kb3cuYmVuY2htYXJrQ29udHJvbGxlciA9IHsKICAgICAgICAgc2VjdGlvbnNNYW5h Z2VyLnNob3dTZWN0aW9uKCJyZXN1bHRzIiwgdHJ1ZSk7CiAgICAgfSwKIAotICAgIHNlbGVjdFJl c3VsdHM6IGZ1bmN0aW9uKGV2ZW50KQorICAgIGhhbmRsZUtleVByZXNzOiBmdW5jdGlvbihldmVu dCkKICAgICB7Ci0gICAgICAgIGlmIChldmVudC5jaGFyQ29kZSAhPSAxMTUpIC8vICdzJwotICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICBzd2l0Y2ggKGV2ZW50LmNoYXJDb2RlKQorICAgICAg ICB7CisgICAgICAgIGNhc2UgMTA2OiAvLyBqCisgICAgICAgICAgICBiZW5jaG1hcmtDb250cm9s bGVyLmdldERlYnVnSW5mbygpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgMTE1 OiAvLyBzCisgICAgICAgICAgICBiZW5jaG1hcmtDb250cm9sbGVyLnNlbGVjdFJlc3VsdHMoZXZl bnQudGFyZ2V0KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfSwKKworICAg IGdldERlYnVnSW5mbzogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIG92ZXJsYXkgPSBV dGlsaXRpZXMuY3JlYXRlRWxlbWVudCgiZGl2IiwgeworICAgICAgICAgICAgaWQ6ICJvdmVybGF5 IgorICAgICAgICB9LCBkb2N1bWVudC5ib2R5KTsKKyAgICAgICAgdmFyIGNvbnRhaW5lciA9IFV0 aWxpdGllcy5jcmVhdGVFbGVtZW50KCJkaXYiLCB7fSwgb3ZlcmxheSk7CisKKyAgICAgICAgdmFy IGhlYWRlciA9IFV0aWxpdGllcy5jcmVhdGVFbGVtZW50KCJoMyIsIHt9LCBjb250YWluZXIpOwor ICAgICAgICBoZWFkZXIudGV4dENvbnRlbnQgPSAiRGVidWcgb3V0cHV0IjsKKworICAgICAgICB2 YXIgZGF0YSA9IFV0aWxpdGllcy5jcmVhdGVFbGVtZW50KCJkaXYiLCB7fSwgY29udGFpbmVyKTsK KyAgICAgICAgZGF0YS50ZXh0Q29udGVudCA9ICJQbGVhc2Ugd2FpdC4uLiI7CisgICAgICAgIHNl dFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICB2YXIgb3V0cHV0ID0geworICAgICAg ICAgICAgICAgIG9wdGlvbnM6IGJlbmNobWFya1J1bm5lckNsaWVudC5yZXN1bHRzLm9wdGlvbnMs CisgICAgICAgICAgICAgICAgZGF0YTogYmVuY2htYXJrUnVubmVyQ2xpZW50LnJlc3VsdHMuZGF0 YQorICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIGRhdGEudGV4dENvbnRlbnQgPSBKU09OLnN0 cmluZ2lmeShvdXRwdXQsIG51bGwsIDEpOworICAgICAgICB9LCAwKTsKKyAgICAgICAgZGF0YS5v bmNsaWNrID0gZnVuY3Rpb24oKSB7CisgICAgICAgICAgICB2YXIgc2VsZWN0aW9uID0gd2luZG93 LmdldFNlbGVjdGlvbigpOworICAgICAgICAgICAgc2VsZWN0aW9uLnJlbW92ZUFsbFJhbmdlcygp OworICAgICAgICAgICAgdmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKyAgICAg ICAgICAgIHJhbmdlLnNlbGVjdE5vZGUoZGF0YSk7CisgICAgICAgICAgICBzZWxlY3Rpb24uYWRk UmFuZ2UocmFuZ2UpOworICAgICAgICB9OworCisgICAgICAgIHZhciBidXR0b24gPSBVdGlsaXRp ZXMuY3JlYXRlRWxlbWVudCgiYnV0dG9uIiwge30sIGNvbnRhaW5lcik7CisgICAgICAgIGJ1dHRv bi50ZXh0Q29udGVudCA9ICJEb25lIjsKKyAgICAgICAgYnV0dG9uLm9uY2xpY2sgPSBmdW5jdGlv bigpIHsKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQob3ZlcmxheSk7Cisg ICAgICAgIH07CisgICAgfSwKIAotICAgICAgICBldmVudC50YXJnZXQuc2VsZWN0UmFuZ2UgPSAo KGV2ZW50LnRhcmdldC5zZWxlY3RSYW5nZSB8fCAwKSArIDEpICUgMzsKKyAgICBzZWxlY3RSZXN1 bHRzOiBmdW5jdGlvbih0YXJnZXQpCisgICAgeworICAgICAgICB0YXJnZXQuc2VsZWN0UmFuZ2Ug PSAoKHRhcmdldC5zZWxlY3RSYW5nZSB8fCAwKSArIDEpICUgMzsKIAogICAgICAgICB2YXIgc2Vs ZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOwogICAgICAgICBzZWxlY3Rpb24ucmVtb3Zl QWxsUmFuZ2VzKCk7CiAgICAgICAgIHZhciByYW5nZSA9IGRvY3VtZW50LmNyZWF0ZVJhbmdlKCk7 Ci0gICAgICAgIHN3aXRjaCAoZXZlbnQudGFyZ2V0LnNlbGVjdFJhbmdlKSB7CisgICAgICAgIHN3 aXRjaCAodGFyZ2V0LnNlbGVjdFJhbmdlKSB7CiAgICAgICAgICAgICBjYXNlIDA6IHsKLSAgICAg ICAgICAgICAgICByYW5nZS5zZXRTdGFydChkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCIjcmVzdWx0 cyAuc2NvcmUiKSwgMCk7Ci0gICAgICAgICAgICAgICAgcmFuZ2Uuc2V0RW5kQWZ0ZXIoZG9jdW1l bnQucXVlcnlTZWxlY3RvcigiI3Jlc3VsdHMtc2NvcmUgPiB0cjpsYXN0LW9mLXR5cGUiKSwgMCk7 CisgICAgICAgICAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9kZShkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgicmVzdWx0cy1zY29yZSIpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGNhc2UgMTogewotICAgICAgICAgICAgICAgIHJhbmdlLnNlbGVjdE5v ZGVDb250ZW50cyhkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCIjcmVzdWx0cyAuc2NvcmUiKSk7Cisg ICAgICAgICAgICAgICAgcmFuZ2Uuc2V0U3RhcnQoZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiI3Jl c3VsdHMgLnNjb3JlIiksIDApOworICAgICAgICAgICAgICAgIHJhbmdlLnNldEVuZEFmdGVyKGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLXNjb3JlID4gdHI6bGFzdC1vZi10eXBlIiks IDApOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg Y2FzZSAyOiB7Ci0gICAgICAgICAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9kZShkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicmVzdWx0cy1zY29yZSIpKTsKKyAgICAgICAgICAgICAgICByYW5nZS5zZWxl Y3ROb2RlQ29udGVudHMoZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiI3Jlc3VsdHMgLnNjb3JlIikp OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICB9CmRpZmYg LS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hh bmdlTG9nCmluZGV4IGU5Y2NkYjEzN2RkMDZlMzUyZDRjYTBlMzUxMWUyODJiZWM4ZTczMDQuLjUy MzgyNWNlNGE2MTQ3NDcyN2IyNGMxMjJiOTI1ZTg3OTQwNTQyNjMgMTAwNjQ0Ci0tLSBhL1BlcmZv cm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjggQEAKIDIwMTYtMDMtMDMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgog CisgICAgICAgIEFkZCBhYmlsaXR5IHRvIHJldHJpZXZlIHJhdyBkYXRhIGZyb20gcmVsZWFzZSBo YXJuZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTUwMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEFuaW1vbWV0ZXIvZGV2ZWxvcGVyLmh0bWw6IFJlbW92ZSB0aGUgc3BlY2lhbCBVSSBpbiB0aGUg ZGVidWcKKyAgICAgICAgaGFybmVzcy4KKyAgICAgICAgKiBBbmltb21ldGVyL3Jlc291cmNlcy9y dW5uZXIvYW5pbW9tZXRlci5jc3M6IEFkZCBzdHlsZXMgZm9yIHRoZQorICAgICAgICBvdmVybGF5 LgorICAgICAgICAqIEFuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVyLmpzOiBM ZXQgJ2onIHNob3cgdGhlIEpTT04KKyAgICAgICAgcmVzdWx0cy4KKyAgICAgICAgKHdpbmRvdy5i ZW5jaG1hcmtDb250cm9sbGVyLmRhdGEub25jbGljayk6CisgICAgICAgICh3aW5kb3cuYmVuY2ht YXJrQ29udHJvbGxlci5idXR0b24ub25jbGljayk6CisgICAgICAgICh3aW5kb3cuYmVuY2htYXJr Q29udHJvbGxlci5zZWxlY3RSZXN1bHRzKTogQ3ljbGUgdGhlIGNhc2VzIGFyb3VuZAorICAgICAg ICBzbyB0aGF0IHRoZSBmaXJzdCAncycgcHJlc3Mgc2VsZWN0cyBib3RoIHRoZSBiZW5jaG1hcmsg c2NvcmUgYW5kCisgICAgICAgIHRoZSBpbmRpdmlkdWFsIHRlc3Qgc2NvcmVzLgorICAgICAgICAq IEFuaW1vbWV0ZXIvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci9hbmltb21ldGVyLmNzczogUmVtb3Zl CisgICAgICAgIHVubmVlZGVkIHJ1bGVzLgorICAgICAgICAqIEFuaW1vbWV0ZXIvcmVzb3VyY2Vz L2RlYnVnLXJ1bm5lci9hbmltb21ldGVyLmpzOiBNYWtlIHRoZSBzYW1lCisgICAgICAgIGNhbGwg dG8gaGFuZGxlS2V5UHJlc3MuCisKKzIwMTYtMDMtMDMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUu Y29tPgorCiAgICAgICAgIFVwZGF0ZSBpbWFnZSB0ZXN0CiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ5NjIKIAo= 273158 2016-03-06 19:00:48 -0800 2016-03-07 18:08:28 -0800 Patch bug-155026-20160306190034.patch text/plain 10210 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NjUyCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0FuaW1vbWV0ZXIvZGV2ZWxvcGVyLmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIv ZGV2ZWxvcGVyLmh0bWwKaW5kZXggOThjMmNiZmVkMzU2ZWIzYzUxYzEyOTllMDc3YWQwZTA5YTVm ZWU1Ni4uZDJhOGQ2ZmU3NTBkN2YyNDU1ZGQ1NDM2YmJiMDM2NWRmM2VkOGE2NCAxMDA2NDQKLS0t IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL2RldmVsb3Blci5odG1sCisrKyBiL1BlcmZv cm1hbmNlVGVzdHMvQW5pbW9tZXRlci9kZXZlbG9wZXIuaHRtbApAQCAtOTMsMTUgKzkzLDExIEBA CiAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgPHRhYmxlIGlkPSJyZXN1 bHRzLWhlYWRlciI+PC90YWJsZT4KICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgPGRp diBpZD0icmVzdWx0cy1qc29uIj4KLSAgICAgICAgICAgICAgICA8YnV0dG9uIGNsYXNzPSJzbWFs bC1idXR0b24iIG9uY2xpY2s9ImJlbmNobWFya0NvbnRyb2xsZXIuc2hvd0pTT05SZXN1bHRzKCki PkpTT04gcmVzdWx0czwvYnV0dG9uPgotICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImhpZGRl biI+Ci0gICAgICAgICAgICAgICAgICAgIEpTT046Ci0gICAgICAgICAgICAgICAgICAgIDx0ZXh0 YXJlYSByb3dzPTEgb25jbGljaz0idGhpcy5mb2N1cygpO3RoaXMuc2VsZWN0KCkiIHJlYWRvbmx5 PjwvdGV4dGFyZWE+Ci0gICAgICAgICAgICAgICAgPC9kaXY+Ci0gICAgICAgICAgICA8L2Rpdj4K ICAgICAgICAgICAgIDxidXR0b24gb25jbGljaz0iYmVuY2htYXJrQ29udHJvbGxlci5zdGFydEJl bmNobWFyaygpIj5UZXN0IEFnYWluPC9idXR0b24+Ci0gICAgICAgICAgICA8cD4ncyc6IFNlbGVj dCBkaWZmZXJlbnQgZGF0YSBmb3IgY29weS9wYXN0ZTwvcD4KKyAgICAgICAgICAgIDxwPgorICAg ICAgICAgICAgICAgICdqJzogU2hvdyBKU09OIHJlc3VsdHM8YnIvPgorICAgICAgICAgICAgICAg ICdzJzogU2VsZWN0IHZhcmlvdXMgcmVzdWx0cyBmb3IgY29weS9wYXN0ZSAodXNlIHJlcGVhdGVk bHkgdG8gY3ljbGUpCisgICAgICAgICAgICA8L3A+CiAgICAgICAgIDwvc2VjdGlvbj4KICAgICAg ICAgPHNlY3Rpb24gaWQ9InRlc3QtZ3JhcGgiPgogICAgICAgICAgICAgPGhlYWRlcj4KZGlmZiAt LWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVidWctcnVubmVy L2FuaW1vbWV0ZXIuY3NzIGIvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9k ZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3MKaW5kZXggZTZlN2JiNjFlOGQ1Y2QyNDAxMTQyOGRh YjVjYjQxMWQ1NTRkOWEyNi4uOGFkYzQ4YmJlNmJkZmI1YzA2NjM4YzE2MzBjNGRkYTM2YmNiYThi MSAxMDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1 Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3MKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVy L3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3MKQEAgLTM1MywxNCArMzUzLDYg QEAgbGFiZWwudHJlZS1sYWJlbCB7CiAgICAgZmxleC1kaXJlY3Rpb246IHJvdzsKIH0KIAotI3Jl c3VsdHMtanNvbiB7Ci0gICAgbWFyZ2luLWJvdHRvbTogM2VtOwotfQotCi0jcmVzdWx0cy1qc29u IHRleHRhcmVhIHsKLSAgICB2ZXJ0aWNhbC1hbGlnbjogc3ViOwotfQotCiAjdGVzdC1ncmFwaCB7 CiAgICAgZmxleDogMSAwIGNhbGMoMTAwJSAtIDQwcHgpOwogfQpkaWZmIC0tZ2l0IGEvUGVyZm9y bWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5q cyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvZGVidWctcnVubmVyL2Fu aW1vbWV0ZXIuanMKaW5kZXggNTBmZTk2ZmRlY2ZhMGNiZmQyZmYxNGZkMGE0YmQ0MmQ3NmVhYzFj Yy4uZmZjNzFiYWM0Zjg4YjkzNTFhMWYzZmNhYWIzYmRkNTFkMmRjNTY1NiAxMDA2NDQKLS0tIGEv UGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9t ZXRlci5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL2RlYnVn LXJ1bm5lci9hbmltb21ldGVyLmpzCkBAIC00OTAsNyArNDkwLDcgQEAgVXRpbGl0aWVzLmV4dGVu ZE9iamVjdCh3aW5kb3cuYmVuY2htYXJrQ29udHJvbGxlciwgewogICAgIHNob3dSZXN1bHRzOiBm dW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuYWRkZWRLZXlFdmVudCkgewotICAg ICAgICAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJlc3MiLCB0aGlzLnNlbGVj dFJlc3VsdHMsIGZhbHNlKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIo ImtleXByZXNzIiwgdGhpcy5oYW5kbGVLZXlQcmVzcywgZmFsc2UpOwogICAgICAgICAgICAgdGhp cy5hZGRlZEtleUV2ZW50ID0gdHJ1ZTsKICAgICAgICAgfQogCkBAIC01MTEsMTcgKzUxMSw2IEBA IFV0aWxpdGllcy5leHRlbmRPYmplY3Qod2luZG93LmJlbmNobWFya0NvbnRyb2xsZXIsIHsKICAg ICAgICAgc3VpdGVzTWFuYWdlci51cGRhdGVMb2NhbFN0b3JhZ2VGcm9tSlNPTihkYXNoYm9hcmQu cmVzdWx0c1swXSk7CiAgICAgfSwKIAotICAgIHNob3dKU09OUmVzdWx0czogZnVuY3Rpb24oKQot ICAgIHsKLSAgICAgICAgdmFyIG91dHB1dCA9IHsKLSAgICAgICAgICAgIG9wdGlvbnM6IGJlbmNo bWFya1J1bm5lckNsaWVudC5yZXN1bHRzLm9wdGlvbnMsCi0gICAgICAgICAgICBkYXRhOiBiZW5j aG1hcmtSdW5uZXJDbGllbnQucmVzdWx0cy5kYXRhCi0gICAgICAgIH07Ci0gICAgICAgIHZhciB0 ZXh0YXJlYSA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLWpzb24gdGV4dGFyZWEi KS50ZXh0Q29udGVudCA9IEpTT04uc3RyaW5naWZ5KG91dHB1dCwgbnVsbCwgMSk7Ci0gICAgICAg IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLWpzb24gYnV0dG9uIikucmVtb3ZlKCk7 Ci0gICAgICAgIGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLWpzb24gZGl2IikuY2xh c3NMaXN0LnJlbW92ZSgiaGlkZGVuIik7Ci0gICAgfSwKLQogICAgIHNob3dUZXN0R3JhcGg6IGZ1 bmN0aW9uKHRlc3ROYW1lLCB0ZXN0UmVzdWx0LCB0ZXN0RGF0YSkKICAgICB7CiAgICAgICAgIHNl Y3Rpb25zTWFuYWdlci5zZXRTZWN0aW9uSGVhZGVyKCJ0ZXN0LWdyYXBoIiwgdGVzdE5hbWUpOwpk aWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9ydW5uZXIv YW5pbW9tZXRlci5jc3MgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1 bm5lci9hbmltb21ldGVyLmNzcwppbmRleCBlZDQ0MjgyMDNiNDNiNjQ0NWRlOTlmMmQ5YmRjYTFj ODI3MWZlZjg4Li5jM2FhZGM5MmYxZGMxNjRlNDczNWVkYWUxYjBkMjFhYTZlZTZhYzBmIDEwMDY0 NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmlt b21ldGVyLmNzcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1 bm5lci9hbmltb21ldGVyLmNzcwpAQCAtMjQwLDMgKzI0MCw1NSBAQCBidXR0b246YWN0aXZlIHsK ICAgICAgICAgZm9udC1zaXplOiAzZW07CiAgICAgfQogfQorCisjb3ZlcmxheSB7CisgICAgcG9z aXRpb246IGZpeGVkOworICAgIHdpZHRoOiAxMDAlOworICAgIGhlaWdodDogMTAwJTsKKyAgICB0 b3A6IDA7CisgICAgbGVmdDogMDsKKyAgICBjb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOworICAg IGJhY2tncm91bmQ6IHJnYmEoMCwgMCwgMTAsIC44KTsKK30KKworQHN1cHBvcnRzICgtd2Via2l0 LWJhY2tkcm9wLWZpbHRlcjogYmx1cigxMHB4KSkgeworICAgICNvdmVybGF5IHsKKyAgICAgICAg YmFja2dyb3VuZDogcmdiYSgwLCAwLCAxMCwgLjQpOworICAgICAgICAtd2Via2l0LWJhY2tkcm9w LWZpbHRlcjogYmx1cigxMHB4KTsKKyAgICB9Cit9CisKKyNvdmVybGF5ID4gZGl2IHsKKyAgICB3 aWR0aDogNTAwcHg7CisgICAgaGVpZ2h0OiA1MDBweDsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7 CisgICAgbWFyZ2luLXRvcDogLTI1MHB4OworICAgIG1hcmdpbi1sZWZ0OiAtMjUwcHg7CisgICAg dG9wOiA1MCU7CisgICAgbGVmdDogNTAlOworICAgIGRpc3BsYXk6IGZsZXg7CisgICAganVzdGlm eS1jb250ZW50OiBmbGV4LXN0YXJ0OworICAgIGZsZXgtZmxvdzogY29sdW1uOworfQorCisjb3Zl cmxheSA+IGRpdiBkaXYgeworICAgIGZsZXg6IDEgMSBhdXRvOworICAgIG92ZXJmbG93OiBzY3Jv bGw7CisgICAgYm9yZGVyOiAxcHggc29saWQgcmdiKDI0MSwgMjQxLCAyNDEpOworICAgIHBhZGRp bmc6IDJweDsKKyAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OworfQorCisjb3ZlcmxheSBidXR0 b24geworICAgIG1hcmdpbjogMWVtIDVlbTsKKyAgICBib3JkZXItY29sb3I6IHJnYigyNDEsIDI0 MSwgMjQxKTsKKyAgICBjb2xvcjogcmdiKDI0MSwgMjQxLCAyNDEpOworfQorCisjb3ZlcmxheSBi dXR0b246aG92ZXIgeworICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwg LjEpOworfQorCisjb3ZlcmxheSBidXR0b246YWN0aXZlIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiByZ2JhKDI1NSwgMjU1LCAyNTUsIC4yKTsKK30KZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVz dHMvQW5pbW9tZXRlci9yZXNvdXJjZXMvcnVubmVyL2FuaW1vbWV0ZXIuanMgYi9QZXJmb3JtYW5j ZVRlc3RzL0FuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVyLmpzCmluZGV4IDc1 OWZlYmNkYzQ1NjNjMmRlMGRmZmI3ZmFmOTk3OTJiNWUxZjU2YTEuLmZiNWY5OTZjYWZmZTZmOGU2 NjBkYjU1NjA4ODE4OWZjZjJkMjBmY2UgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQW5p bW9tZXRlci9yZXNvdXJjZXMvcnVubmVyL2FuaW1vbWV0ZXIuanMKKysrIGIvUGVyZm9ybWFuY2VU ZXN0cy9Bbmltb21ldGVyL3Jlc291cmNlcy9ydW5uZXIvYW5pbW9tZXRlci5qcwpAQCAtMzgxLDcg KzM4MSw3IEBAIHdpbmRvdy5iZW5jaG1hcmtDb250cm9sbGVyID0gewogICAgIHNob3dSZXN1bHRz OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuYWRkZWRLZXlFdmVudCkgewot ICAgICAgICAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJlc3MiLCB0aGlzLnNl bGVjdFJlc3VsdHMsIGZhbHNlKTsKKyAgICAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVu ZXIoImtleXByZXNzIiwgdGhpcy5oYW5kbGVLZXlQcmVzcywgZmFsc2UpOwogICAgICAgICAgICAg dGhpcy5hZGRlZEtleUV2ZW50ID0gdHJ1ZTsKICAgICAgICAgfQogCkBAIC0zOTMsMjggKzM5Myw4 NiBAQCB3aW5kb3cuYmVuY2htYXJrQ29udHJvbGxlciA9IHsKICAgICAgICAgc2VjdGlvbnNNYW5h Z2VyLnNob3dTZWN0aW9uKCJyZXN1bHRzIiwgdHJ1ZSk7CiAgICAgfSwKIAotICAgIHNlbGVjdFJl c3VsdHM6IGZ1bmN0aW9uKGV2ZW50KQorICAgIGhhbmRsZUtleVByZXNzOiBmdW5jdGlvbihldmVu dCkKICAgICB7Ci0gICAgICAgIGlmIChldmVudC5jaGFyQ29kZSAhPSAxMTUpIC8vICdzJworICAg ICAgICBzd2l0Y2ggKGV2ZW50LmNoYXJDb2RlKQorICAgICAgICB7CisgICAgICAgIGNhc2UgMjc6 ICAvLyBlc2MKKyAgICAgICAgICAgIGJlbmNobWFya0NvbnRyb2xsZXIuaGlkZURlYnVnSW5mbygp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgMTA2OiAvLyBqCisgICAgICAgICAg ICBiZW5jaG1hcmtDb250cm9sbGVyLnNob3dEZWJ1Z0luZm8oKTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICBjYXNlIDExNTogLy8gcworICAgICAgICAgICAgYmVuY2htYXJrQ29udHJvbGxl ci5zZWxlY3RSZXN1bHRzKGV2ZW50LnRhcmdldCk7CisgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgfQorICAgIH0sCisKKyAgICBoaWRlRGVidWdJbmZvOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICB2YXIgb3ZlcmxheSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVybGF5Iik7Cisg ICAgICAgIGlmICghb3ZlcmxheSkKICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZG9jdW1l bnQuYm9keS5yZW1vdmVDaGlsZChvdmVybGF5KTsKKyAgICB9LAogCi0gICAgICAgIGV2ZW50LnRh cmdldC5zZWxlY3RSYW5nZSA9ICgoZXZlbnQudGFyZ2V0LnNlbGVjdFJhbmdlIHx8IDApICsgMSkg JSAzOworICAgIHNob3dEZWJ1Z0luZm86IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICgh IWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvdmVybGF5IikpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgdmFyIG92ZXJsYXkgPSBVdGlsaXRpZXMuY3JlYXRlRWxlbWVudCgiZGl2Iiwg eworICAgICAgICAgICAgaWQ6ICJvdmVybGF5IgorICAgICAgICB9LCBkb2N1bWVudC5ib2R5KTsK KyAgICAgICAgdmFyIGNvbnRhaW5lciA9IFV0aWxpdGllcy5jcmVhdGVFbGVtZW50KCJkaXYiLCB7 fSwgb3ZlcmxheSk7CisKKyAgICAgICAgdmFyIGhlYWRlciA9IFV0aWxpdGllcy5jcmVhdGVFbGVt ZW50KCJoMyIsIHt9LCBjb250YWluZXIpOworICAgICAgICBoZWFkZXIudGV4dENvbnRlbnQgPSAi RGVidWcgb3V0cHV0IjsKKworICAgICAgICB2YXIgZGF0YSA9IFV0aWxpdGllcy5jcmVhdGVFbGVt ZW50KCJkaXYiLCB7fSwgY29udGFpbmVyKTsKKyAgICAgICAgZGF0YS50ZXh0Q29udGVudCA9ICJQ bGVhc2Ugd2FpdC4uLiI7CisgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAgICAg ICAgICB2YXIgb3V0cHV0ID0geworICAgICAgICAgICAgICAgIG9wdGlvbnM6IGJlbmNobWFya1J1 bm5lckNsaWVudC5yZXN1bHRzLm9wdGlvbnMsCisgICAgICAgICAgICAgICAgZGF0YTogYmVuY2ht YXJrUnVubmVyQ2xpZW50LnJlc3VsdHMuZGF0YQorICAgICAgICAgICAgfTsKKyAgICAgICAgICAg IGRhdGEudGV4dENvbnRlbnQgPSBKU09OLnN0cmluZ2lmeShvdXRwdXQsIG51bGwsIDEpOworICAg ICAgICB9LCAwKTsKKyAgICAgICAgZGF0YS5vbmNsaWNrID0gZnVuY3Rpb24oKSB7CisgICAgICAg ICAgICB2YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOworICAgICAgICAgICAg c2VsZWN0aW9uLnJlbW92ZUFsbFJhbmdlcygpOworICAgICAgICAgICAgdmFyIHJhbmdlID0gZG9j dW1lbnQuY3JlYXRlUmFuZ2UoKTsKKyAgICAgICAgICAgIHJhbmdlLnNlbGVjdE5vZGUoZGF0YSk7 CisgICAgICAgICAgICBzZWxlY3Rpb24uYWRkUmFuZ2UocmFuZ2UpOworICAgICAgICB9OworCisg ICAgICAgIHZhciBidXR0b24gPSBVdGlsaXRpZXMuY3JlYXRlRWxlbWVudCgiYnV0dG9uIiwge30s IGNvbnRhaW5lcik7CisgICAgICAgIGJ1dHRvbi50ZXh0Q29udGVudCA9ICJEb25lIjsKKyAgICAg ICAgYnV0dG9uLm9uY2xpY2sgPSBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIGJlbmNobWFya0Nv bnRyb2xsZXIuaGlkZURlYnVnSW5mbygpOworICAgICAgICB9OworICAgIH0sCisKKyAgICBzZWxl Y3RSZXN1bHRzOiBmdW5jdGlvbih0YXJnZXQpCisgICAgeworICAgICAgICB0YXJnZXQuc2VsZWN0 UmFuZ2UgPSAoKHRhcmdldC5zZWxlY3RSYW5nZSB8fCAwKSArIDEpICUgMzsKIAogICAgICAgICB2 YXIgc2VsZWN0aW9uID0gd2luZG93LmdldFNlbGVjdGlvbigpOwogICAgICAgICBzZWxlY3Rpb24u cmVtb3ZlQWxsUmFuZ2VzKCk7CiAgICAgICAgIHZhciByYW5nZSA9IGRvY3VtZW50LmNyZWF0ZVJh bmdlKCk7Ci0gICAgICAgIHN3aXRjaCAoZXZlbnQudGFyZ2V0LnNlbGVjdFJhbmdlKSB7CisgICAg ICAgIHN3aXRjaCAodGFyZ2V0LnNlbGVjdFJhbmdlKSB7CiAgICAgICAgICAgICBjYXNlIDA6IHsK LSAgICAgICAgICAgICAgICByYW5nZS5zZXRTdGFydChkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCIj cmVzdWx0cyAuc2NvcmUiKSwgMCk7Ci0gICAgICAgICAgICAgICAgcmFuZ2Uuc2V0RW5kQWZ0ZXIo ZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiI3Jlc3VsdHMtc2NvcmUgPiB0cjpsYXN0LW9mLXR5cGUi KSwgMCk7CisgICAgICAgICAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9kZShkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgicmVzdWx0cy1zY29yZSIpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGNhc2UgMTogewotICAgICAgICAgICAgICAgIHJhbmdlLnNl bGVjdE5vZGVDb250ZW50cyhkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCIjcmVzdWx0cyAuc2NvcmUi KSk7CisgICAgICAgICAgICAgICAgcmFuZ2Uuc2V0U3RhcnQoZG9jdW1lbnQucXVlcnlTZWxlY3Rv cigiI3Jlc3VsdHMgLnNjb3JlIiksIDApOworICAgICAgICAgICAgICAgIHJhbmdlLnNldEVuZEFm dGVyKGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNyZXN1bHRzLXNjb3JlID4gdHI6bGFzdC1vZi10 eXBlIiksIDApOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgY2FzZSAyOiB7Ci0gICAgICAgICAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9kZShkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgicmVzdWx0cy1zY29yZSIpKTsKKyAgICAgICAgICAgICAgICByYW5n ZS5zZWxlY3ROb2RlQ29udGVudHMoZG9jdW1lbnQucXVlcnlTZWxlY3RvcigiI3Jlc3VsdHMgLnNj b3JlIikpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICB9 CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVz dHMvQ2hhbmdlTG9nCmluZGV4IDJjODMxZjA5MmFmN2ZlOWM0YmFlYmI0MGNmYzMxMzBhMjdhMDg3 YTYuLjI5MzhmYTY0ODRlOGY5MGQzZTUzZTkwNjQ5ZmNhMDYxMjQxYzA0OGUgMTAwNjQ0Ci0tLSBh L1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDUgKzEsMjcgQEAKIDIwMTYtMDMtMDMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUu Y29tPgogCisgICAgICAgIEFkZCBhYmlsaXR5IHRvIHJldHJpZXZlIHJhdyBkYXRhIGZyb20gcmVs ZWFzZSBoYXJuZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTUwMjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEFuaW1vbWV0ZXIvZGV2ZWxvcGVyLmh0bWw6IFJlbW92ZSB0aGUgc3BlY2lhbCBVSSBp biB0aGUgZGVidWcKKyAgICAgICAgaGFybmVzcy4KKyAgICAgICAgKiBBbmltb21ldGVyL3Jlc291 cmNlcy9ydW5uZXIvYW5pbW9tZXRlci5jc3M6IEFkZCBzdHlsZXMgZm9yIHRoZQorICAgICAgICBv dmVybGF5LgorICAgICAgICAqIEFuaW1vbWV0ZXIvcmVzb3VyY2VzL3J1bm5lci9hbmltb21ldGVy LmpzOiBMZXQgJ2onIHNob3cgdGhlIEpTT04KKyAgICAgICAgcmVzdWx0cywgYnV0IG9ubHkgaWYg dGhlIG92ZXJsYXkgZG9lc24ndCBleGlzdC4gQWRkICdlc2MnIGtleSB0byBkaXNtaXNzCisgICAg ICAgIHRoZSBvdmVybGF5LgorICAgICAgICAod2luZG93LmJlbmNobWFya0NvbnRyb2xsZXIuc2Vs ZWN0UmVzdWx0cyk6IEN5Y2xlIHRoZSBjYXNlcyBhcm91bmQKKyAgICAgICAgc28gdGhhdCB0aGUg Zmlyc3QgJ3MnIHByZXNzIHNlbGVjdHMgYm90aCB0aGUgYmVuY2htYXJrIHNjb3JlIGFuZAorICAg ICAgICB0aGUgaW5kaXZpZHVhbCB0ZXN0IHNjb3Jlcy4KKyAgICAgICAgKiBBbmltb21ldGVyL3Jl c291cmNlcy9kZWJ1Zy1ydW5uZXIvYW5pbW9tZXRlci5jc3M6IFJlbW92ZQorICAgICAgICB1bm5l ZWRlZCBydWxlcy4KKyAgICAgICAgKiBBbmltb21ldGVyL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIv YW5pbW9tZXRlci5qczogTWFrZSB0aGUgc2FtZQorICAgICAgICBjYWxsIHRvIGhhbmRsZUtleVBy ZXNzLgorCisyMDE2LTAzLTAzICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKwogICAgICAg ICBNYWtlIHN1cmUgbXVsdGlwbHkgdGVzdCBwYXJ0aWNsZXMgaGF2ZSBhdCBsZWFzdCBzb21lIG9w YWNpdHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NTAyNwogCg==