128190 2014-02-04 09:40:35 -0800 [CSS Shapes] Add initial performance test for shape-outside: content-box 2014-02-04 20:05:58 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128188 1 zoltan zoltan commit-queue rniwa oldest_to_newest 976394 0 zoltan 2014-02-04 09:40:35 -0800 I've introduced Shapes subdirectory in Layout, every CSS Shapes related performance tests should go here in the future. The initial performance tests uses 'shape-outside: content-box' in order to tests the code paths of the Shapes implementation. I also introduced shapes.js, which allows us to easily add new, simple performance tests for shape-outside. The entire progress is tracked under #128188 meta bug. 976396 1 223127 zoltan 2014-02-04 09:43:59 -0800 Created attachment 223127 Patch 976482 2 223127 rniwa 2014-02-04 13:04:17 -0800 Comment on attachment 223127 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223127&action=review > PerformanceTests/ChangeLog:15 > + * Layout/Shapes/ShapeOutsideContentBox.html: Added. Please skip the test by default in Skipped for now since this looks like a micro benchmark. > PerformanceTests/Layout/Shapes/ShapeOutsideContentBox.html:6 > + <script src="resources/shapes.js"></script> We should include the script in this file instead for now and extract the shared code into js as needed. 976621 3 223199 zoltan 2014-02-04 19:30:32 -0800 Created attachment 223199 Patch for landing (In reply to comment #2) > (From update of attachment 223127 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223127&action=review > > > PerformanceTests/ChangeLog:15 > > + * Layout/Shapes/ShapeOutsideContentBox.html: Added. > > Please skip the test by default in Skipped for now since this looks like a micro benchmark. I skipped the test. > > PerformanceTests/Layout/Shapes/ShapeOutsideContentBox.html:6 > > + <script src="resources/shapes.js"></script> > > We should include the script in this file instead for now and extract the shared code into js as needed. Okay. I moved into the html for now. 976629 4 223199 commit-queue 2014-02-04 20:05:54 -0800 Comment on attachment 223199 Patch for landing Clearing flags on attachment: 223199 Committed r163424: <http://trac.webkit.org/changeset/163424> 976630 5 commit-queue 2014-02-04 20:05:58 -0800 All reviewed patches have been landed. Closing bug. 223127 2014-02-04 09:43:59 -0800 2014-02-04 19:30:32 -0800 Patch SOcontentbox.patch text/plain 6440 zoltan ZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nIGIvUGVyZm9ybWFuY2VUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggNzIyOWQxNi4uYmU3NTZlMSAxMDA2NDQKLS0tIGEvUGVyZm9ybWFu Y2VUZXN0cy9DaGFuZ2VMb2cKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNC0wMi0wNCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9y Zz4KKworICAgICAgICBbQ1NTIFNoYXBlc10gQWRkIGluaXRpYWwgcGVyZm9ybWFuY2UgdGVzdCBm b3Igc2hhcGUtb3V0c2lkZTogY29udGVudC1ib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODE5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEkndmUgaW50cm9kdWNlZCBTaGFwZXMgc3ViZGlyZWN0b3J5 IGluIExheW91dCwgZXZlcnkgQ1NTIFNoYXBlcyByZWxhdGVkIHBlcmZvcm1hbmNlIHRlc3RzIHNo b3VsZAorICAgICAgICBnbyB0aGVyZSBpbiB0aGUgZnV0dXJlLiBUaGUgaW5pdGlhbCBwZXJmb3Jt YW5jZSB0ZXN0cyB1c2VzICdzaGFwZS1vdXRzaWRlOiBjb250ZW50LWJveCcgaW4gb3JkZXIKKyAg ICAgICAgdG8gdGVzdHMgdGhlIGNvZGUgcGF0aHMgb2YgdGhlIFNoYXBlcyBpbXBsZW1lbnRhdGlv bi4gSSBhbHNvIGludHJvZHVjZWQgc2hhcGVzLmpzLCB3aGljaCBhbGxvd3MgdXMKKyAgICAgICAg dG8gZWFzaWx5IGFkZCBuZXcsIHNpbXBsZSBwZXJmb3JtYW5jZSB0ZXN0cyBmb3Igc2hhcGUtb3V0 c2lkZS4KKworICAgICAgICBUaGUgZW50aXJlIHByb2dyZXNzIGlzIHRyYWNrZWQgdW5kZXIgIzEy ODE4OCBtZXRhIGJ1Zy4KKworICAgICAgICAqIExheW91dC9TaGFwZXMvU2hhcGVPdXRzaWRlQ29u dGVudEJveC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBMYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9z aGFwZXMuY3NzOiBBZGRlZC4KKyAgICAgICAgKiBMYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9zaGFw ZXMuanM6IEFkZGVkLgorCiAyMDE0LTAxLTE3ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVn b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MgUmVnaW9uc10gTWlub3IgZml4ZXMgaW4gcmVn aW9ucyBwZXJmb3JtYW5jZSB0ZXN0cwpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9MYXlv dXQvU2hhcGVzL1NoYXBlT3V0c2lkZUNvbnRlbnRCb3guaHRtbCBiL1BlcmZvcm1hbmNlVGVzdHMv TGF5b3V0L1NoYXBlcy9TaGFwZU91dHNpZGVDb250ZW50Qm94Lmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uYjFmZDQ0NgotLS0gL2Rldi9udWxsCisrKyBiL1BlcmZvcm1h bmNlVGVzdHMvTGF5b3V0L1NoYXBlcy9TaGFwZU91dHNpZGVDb250ZW50Qm94Lmh0bWwKQEAgLTAs MCArMSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAg PGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJyZXNvdXJjZXMvc2hhcGVzLmNzcyIgdHlwZT0i dGV4dC9jc3MiPjwvbGluaz4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9y dW5uZXIuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3NoYXBl cy5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8cHJlIGlk PSJsb2ciPjwvcHJlPgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgdmFyIHNoYXBlID0g ImNvbnRlbnQtYm94IjsKKyAgICAgICAgICAgIFBlcmZUZXN0UnVubmVyLm1lYXN1cmVUaW1lKGNy ZWF0ZVNoYXBlT3V0c2lkZVRlc3QoIjIwMHB4IiwgIjIwMHB4Iiwgc2hhcGUsIDEwMDApKTsKKyAg ICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvUGVyZm9y bWFuY2VUZXN0cy9MYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9zaGFwZXMuY3NzIGIvUGVyZm9ybWFu Y2VUZXN0cy9MYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9zaGFwZXMuY3NzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJkZWU0YzUKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJmb3Jt YW5jZVRlc3RzL0xheW91dC9TaGFwZXMvcmVzb3VyY2VzL3NoYXBlcy5jc3MKQEAgLTAsMCArMSw3 IEBACisudGVzdEJveCB7CisgICAgd2lkdGg6IDgwMHB4OworfQorCisuZmxvYXRpbmdPYmplY3Qg eworICAgIGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOworfQpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFu Y2VUZXN0cy9MYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9zaGFwZXMuanMgYi9QZXJmb3JtYW5jZVRl c3RzL0xheW91dC9TaGFwZXMvcmVzb3VyY2VzL3NoYXBlcy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi4zNGZkMmU5Ci0tLSAvZGV2L251bGwKKysrIGIvUGVyZm9ybWFuY2VU ZXN0cy9MYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9zaGFwZXMuanMKQEAgLTAsMCArMSw4NSBAQAor KGZ1bmN0aW9uKCkgeworICAgIHZhciB0ZW1wbGF0ZVBhcmFncmFwaCA9IG51bGw7CisgICAgdmFy IHRlbXBsYXRlRmxvYXRpbmdOb2RlID0gbnVsbDsKKyAgICB2YXIgREVGQVVMVF9TSEFQRV9PQkpF Q1RfQ09VTlQgPSAxMDA7CisKKyAgICBmdW5jdGlvbiBjcmVhdGVQYXJhZ3JhcGhOb2RlKCkgewor ICAgICAgICBpZiAoIXRlbXBsYXRlUGFyYWdyYXBoKSB7CisgICAgICAgICAgICB0ZW1wbGF0ZVBh cmFncmFwaCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInAiKTsKKyAgICAgICAgICAgIHRlbXBs YXRlUGFyYWdyYXBoLmlubmVySFRNTCA9ICJMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29u c2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LiBFdGlhbSBhdCB0dXJwaXMgcGxhY2VyYXQgc2FwaWVu IGNvbmd1ZSB2aXZlcnJhIG5lYyBzZWQgZmVsaXMuXAorICAgICAgICAgICAgICAgIEFlbmVhbiBh bGlxdWFtLCBqdXN0byBldSBjb25kaW1lbnR1bSBwaGFyZXRyYSwgYXJjdSBlcm9zIGJsYW5kaXQg bWV0dXMsIG5lYyBsYWNpbmlhIG5pc2kgb3JjaSB2aXRhZSBudW5jLlwKKyAgICAgICAgICAgICAg ICBQcm9pbiBvcmNpIGxpYmVybywgYWNjdW1zYW4gbm9uIGRpZ25pc3NpbSBhdCwgc29kYWxlcyBp biBzYXBpZW4uIEN1cmFiaXR1ciBkdWkgbmliaCwgdmVuZW5hdGlzIHZlbCB0ZW1wdXMgdmVsLCBh Y2N1bXNhbiBuZWMgdmVsaXQuXAorICAgICAgICAgICAgICAgIE5hbSBzaXQgYW1ldCB0ZW1wb3Ig bGFjdXMuIFNlZCBtb2xsaXMgZG9sb3IgbmliaCwgbm9uIHRlbXB1cyBsZW8uIERvbmVjIG1hZ25h IG9kaW8sIGNvbW1vZG8gaWQgcG9ydGEgaW4sIGFsaXF1YW0gbW9sbGlzIGVyb3MuXAorICAgICAg ICAgICAgICAgIFBlbGxlbnRlc3F1ZSB2dWxwdXRhdGUgZ3JhdmlkYSBsaWd1bGEgaW4gZWxlbWVu dHVtLiBGdXNjZSBsYWNpbmlhIG1hc3NhIGp1c3RvLCBhdCBwb3J0dGl0b3Igb3JjaS5cCisgICAg ICAgICAgICAgICAgVmVzdGlidWx1bSBhbnRlIGlwc3VtIHByaW1pcyBpbiBmYXVjaWJ1cyBvcmNp IGx1Y3R1cyBldCB1bHRyaWNlcyBwb3N1ZXJlIGN1YmlsaWEgQ3VyYWU7IERvbmVjIG9kaW8gcXVh bSwgcHVsdmluYXIgdXQgcG9ydHRpdG9yIGFjLCB0ZW1wb3Igdml0YWUgbGlndWxhLlwKKyAgICAg ICAgICAgICAgICBDcmFzIGFsaXF1ZXQgc2FwaWVuIGlkIHNhcGllbiBtb2xsaXMgbmVjIHB1bHZp bmFyIG1hdXJpcyBhZGlwaXNjaW5nLiBQcmFlc2VudCBwb3J0dGl0b3IgY29uc2VxdWF0IGF1Z3Vl LCBzaXQgYW1ldCBtb2xsaXMganVzdG8gY29uZGltZW50dW0gZXUuXAorICAgICAgICAgICAgICAg IEV0aWFtIHV0IGVyYXQgcGVsbGVudGVzcXVlIG9yY2kgY29uZ3VlIGludGVyZHVtLiBOdWxsYSBl dSBlcm9zIG1pLlwKKyAgICAgICAgICAgICAgICBDdXJhYml0dXIgcnV0cnVtLCBsb3JlbSBhYyBt YWxlc3VhZGEgcGVsbGVudGVzcXVlLCBzYXBpZW4gcmlzdXMgY29uc2VxdWF0IG1hc3NhLCBlZ2V0 IHBlbGxlbnRlc3F1ZSBudW5jIG51bGxhIHZlbCBzZW0uIjsKKyAgICAgICAgICAgICAgICB0ZW1w bGF0ZVBhcmFncmFwaC5jbGFzc05hbWUgPSAiY29udGVudFBhcmFncmFwaCI7CisgICAgICAgIH0K KworICAgICAgICB2YXIgcGFyYWdyYXBoID0gdGVtcGxhdGVQYXJhZ3JhcGguY2xvbmVOb2RlKHRy dWUpOworICAgICAgICByZXR1cm4gcGFyYWdyYXBoOworICAgIH0KKworICAgIGZ1bmN0aW9uIGNy ZWF0ZUZsb2F0aW5nTm9kZSh3aWR0aCwgaGVpZ2h0LCBzaGFwZSkgeworICAgICAgICBpZiAoIXRl bXBsYXRlRmxvYXRpbmdOb2RlKSB7CisgICAgICAgICAgICB0ZW1wbGF0ZUZsb2F0aW5nTm9kZSA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgdGVtcGxhdGVGbG9h dGluZ05vZGUuY2xhc3NOYW1lID0gImZsb2F0aW5nT2JqZWN0IjsKKyAgICAgICAgfQorCisgICAg ICAgIHZhciBmbG9hdCA9IHRlbXBsYXRlRmxvYXRpbmdOb2RlLmNsb25lTm9kZShmYWxzZSk7Cisg ICAgICAgIGZsb2F0LnN0eWxlLndpZHRoID0gd2lkdGg7CisgICAgICAgIGZsb2F0LnN0eWxlLmhl aWdodCA9IGhlaWdodDsKKyAgICAgICAgZmxvYXQuc3R5bGUud2Via2l0U2hhcGVPdXRzaWRlID0g c2hhcGU7CisgICAgICAgIHJldHVybiBmbG9hdDsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBhZGRB cnRpY2xlcyhmbG9hdGluZ09iamVjdHMsIHBhcmFncmFwaENvdW50KSB7CisgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgcGFyYWdyYXBoQ291bnQ7ICsraSkgeworICAgICAgICAgICAgZmxvYXRp bmdPYmplY3RzLmFwcGVuZENoaWxkKGNyZWF0ZVBhcmFncmFwaE5vZGUoKSk7CisgICAgICAgIH0K KyAgICB9CisKKyAgICBmdW5jdGlvbiBjcmVhdGVGbG9hdGluZ09iamVjdHMod2lkdGgsIGhlaWdo dCwgc2hhcGUsIGZsb2F0aW5nT2JqZWN0Q291bnQpIHsKKyAgICAgICAgdmFyIHRlc3RCb3ggPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBmbG9hdGluZ09iamVjdENvdW50OyArK2kpIHsKKyAgICAgICAgICAgIHRlc3RCb3guYXBwZW5k Q2hpbGQoY3JlYXRlRmxvYXRpbmdOb2RlKHdpZHRoLCBoZWlnaHQsIHNoYXBlKSk7CisgICAgICAg ICAgICB0ZXN0Qm94LmFwcGVuZENoaWxkKGNyZWF0ZVBhcmFncmFwaE5vZGUoKSkKKyAgICAgICAg fQorICAgICAgICB0ZXN0Qm94LmNsYXNzTmFtZSA9ICJ0ZXN0Qm94IjsKKyAgICAgICAgcmV0dXJu IHRlc3RCb3g7CisgICAgfQorCisgICAgZnVuY3Rpb24gYXBwbHlGbG9hdGluZygpIHsKKyAgICAg ICAgdmFyIGZsb2F0aW5nT2JqZWN0cyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlDbGFzc05hbWUo J2Zsb2F0aW5nT2JqZWN0Jyk7CisgICAgICAgIGZvciAoaSA9IDA7IGkgPCBmbG9hdGluZ09iamVj dHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIGZsb2F0aW5nT2JqZWN0c1tpXS5zdHlsZS5j c3NGbG9hdCA9ICdsZWZ0JzsKKyAgICAgICAgfQorICAgIH0KKworICAgIGZ1bmN0aW9uIGNyZWF0 ZVNoYXBlT3V0c2lkZVRlc3Qod2lkdGgsIGhlaWdodCwgc2hhcGUsIHNoYXBlT2JqZWN0Q291bnQp IHsKKyAgICAgICAgc2hhcGVPYmplY3RDb3VudCA9IHNoYXBlT2JqZWN0Q291bnQgfHwgREVGQVVM VF9TSEFQRV9PQkpFQ1RfQ09VTlQ7CisKKyAgICAgICAgdmFyIGZsb2F0aW5nT2JqZWN0cyA9IGNy ZWF0ZUZsb2F0aW5nT2JqZWN0cyh3aWR0aCwgaGVpZ2h0LCBzaGFwZSwgc2hhcGVPYmplY3RDb3Vu dCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZmxvYXRpbmdPYmplY3RzKTsK KyAgICAgICAgcmV0dXJuIHsKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAiVGVzdGluZyBzaGFw ZXMgd2l0aCAiICsgc2hhcGUgKyIgdXNpbmcgIiArIHNoYXBlT2JqZWN0Q291bnQgKyAiIHNoYXBl cy4iLAorICAgICAgICAgICAgcnVuOiBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICBhcHBs eUZsb2F0aW5nKCk7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7Cisg ICAgICAgICAgICB9LAorICAgICAgICAgICAgc2V0dXA6IGZ1bmN0aW9uKCkgeworICAgICAgICAg ICAgICAgIFBlcmZUZXN0UnVubmVyLnJlc2V0UmFuZG9tU2VlZCgpOworICAgICAgICAgICAgICAg IGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOworICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIGRv bmU6IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hp bGQoZmxvYXRpbmdPYmplY3RzKTsKKyAgICAgICAgICAgICAgICB0ZW1wbGF0ZVBhcmFncmFwaCA9 IG51bGw7CisgICAgICAgICAgICB9CisgICAgICAgIH07CisgICAgfQorCisgICAgd2luZG93LmNy ZWF0ZVNoYXBlT3V0c2lkZVRlc3QgPSBjcmVhdGVTaGFwZU91dHNpZGVUZXN0OworCit9KSgpOwo= 223199 2014-02-04 19:30:32 -0800 2014-02-04 20:05:54 -0800 Patch for landing SOcontentbox.patch text/plain 7118 zoltan ZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nIGIvUGVyZm9ybWFuY2VUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggNzIyOWQxNi4uMDhmNzIzMyAxMDA2NDQKLS0tIGEvUGVyZm9ybWFu Y2VUZXN0cy9DaGFuZ2VMb2cKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNC0wMi0wNCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9y Zz4KKworICAgICAgICBbQ1NTIFNoYXBlc10gQWRkIGluaXRpYWwgcGVyZm9ybWFuY2UgdGVzdCBm b3Igc2hhcGUtb3V0c2lkZTogY29udGVudC1ib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODE5MAorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1 a2UgTml3YS4KKworICAgICAgICBJJ3ZlIGludHJvZHVjZWQgU2hhcGVzIHN1YmRpcmVjdG9yeSBp biBMYXlvdXQsIGV2ZXJ5IENTUyBTaGFwZXMgcmVsYXRlZCBwZXJmb3JtYW5jZSB0ZXN0cyBzaG91 bGQKKyAgICAgICAgZ28gdGhlcmUgaW4gdGhlIGZ1dHVyZS4gVGhlIGluaXRpYWwgcGVyZm9ybWFu Y2UgdGVzdHMgdXNlcyAnc2hhcGUtb3V0c2lkZTogY29udGVudC1ib3gnIGluIG9yZGVyCisgICAg ICAgIHRvIHRlc3RzIHRoZSBjb2RlIHBhdGhzIG9mIHRoZSBTaGFwZXMgaW1wbGVtZW50YXRpb24u IEkgYWxzbyBpbnRyb2R1Y2VkIHNoYXBlcy5qcywgd2hpY2ggYWxsb3dzIHVzCisgICAgICAgIHRv IGVhc2lseSBhZGQgbmV3LCBzaW1wbGUgcGVyZm9ybWFuY2UgdGVzdHMgZm9yIHNoYXBlLW91dHNp ZGUuCisKKyAgICAgICAgVGhlIGVudGlyZSBwcm9ncmVzcyBpcyB0cmFja2VkIHVuZGVyICMxMjgx ODggbWV0YSBidWcuCisKKyAgICAgICAgKiBMYXlvdXQvU2hhcGVzL1NoYXBlT3V0c2lkZUNvbnRl bnRCb3guaHRtbDogQWRkZWQuCisgICAgICAgICogTGF5b3V0L1NoYXBlcy9yZXNvdXJjZXMvc2hh cGVzLmNzczogQWRkZWQuCisgICAgICAgICogTGF5b3V0L1NoYXBlcy9yZXNvdXJjZXMvc2hhcGVz LmpzOiBBZGRlZC4KKyAgICAgICAgKiBTa2lwcGVkOiBXZSBza2lwIHJ1bm5pbmcgdGhlIHRlc3Rz IGJ5IGRlZmF1bHQgZm9yIG5vdy4KKwogMjAxNC0wMS0xNyAgTWFudWVsIFJlZ28gQ2FzYXNub3Zh cyAgPHJlZ29AaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ1NTIFJlZ2lvbnNdIE1pbm9yIGZpeGVz IGluIHJlZ2lvbnMgcGVyZm9ybWFuY2UgdGVzdHMKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVz dHMvTGF5b3V0L1NoYXBlcy9TaGFwZU91dHNpZGVDb250ZW50Qm94Lmh0bWwgYi9QZXJmb3JtYW5j ZVRlc3RzL0xheW91dC9TaGFwZXMvU2hhcGVPdXRzaWRlQ29udGVudEJveC5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ2NzdkMGUKLS0tIC9kZXYvbnVsbAorKysgYi9Q ZXJmb3JtYW5jZVRlc3RzL0xheW91dC9TaGFwZXMvU2hhcGVPdXRzaWRlQ29udGVudEJveC5odG1s CkBAIC0wLDAgKzEsOTYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+Cisg ICAgICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0icmVzb3VyY2VzL3NoYXBlcy5jc3Mi IHR5cGU9InRleHQvY3NzIj48L2xpbms+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv dXJjZXMvcnVubmVyLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAg IHZhciB0ZW1wbGF0ZVBhcmFncmFwaCA9IG51bGw7CisgICAgICAgICAgICB2YXIgdGVtcGxhdGVG bG9hdGluZ05vZGUgPSBudWxsOworICAgICAgICAgICAgdmFyIERFRkFVTFRfU0hBUEVfT0JKRUNU X0NPVU5UID0gMTAwOworCisgICAgICAgICAgICBmdW5jdGlvbiBjcmVhdGVQYXJhZ3JhcGhOb2Rl KCkgeworICAgICAgICAgICAgICAgIGlmICghdGVtcGxhdGVQYXJhZ3JhcGgpIHsKKyAgICAgICAg ICAgICAgICAgICAgdGVtcGxhdGVQYXJhZ3JhcGggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJw Iik7CisgICAgICAgICAgICAgICAgICAgIHRlbXBsYXRlUGFyYWdyYXBoLmlubmVySFRNTCA9ICJM b3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LiBF dGlhbSBhdCB0dXJwaXMgcGxhY2VyYXQgc2FwaWVuIGNvbmd1ZSB2aXZlcnJhIG5lYyBzZWQgZmVs aXMuXAorICAgICAgICAgICAgICAgICAgICAgICAgQWVuZWFuIGFsaXF1YW0sIGp1c3RvIGV1IGNv bmRpbWVudHVtIHBoYXJldHJhLCBhcmN1IGVyb3MgYmxhbmRpdCBtZXR1cywgbmVjIGxhY2luaWEg bmlzaSBvcmNpIHZpdGFlIG51bmMuXAorICAgICAgICAgICAgICAgICAgICAgICAgUHJvaW4gb3Jj aSBsaWJlcm8sIGFjY3Vtc2FuIG5vbiBkaWduaXNzaW0gYXQsIHNvZGFsZXMgaW4gc2FwaWVuLiBD dXJhYml0dXIgZHVpIG5pYmgsIHZlbmVuYXRpcyB2ZWwgdGVtcHVzIHZlbCwgYWNjdW1zYW4gbmVj IHZlbGl0LlwKKyAgICAgICAgICAgICAgICAgICAgICAgIE5hbSBzaXQgYW1ldCB0ZW1wb3IgbGFj dXMuIFNlZCBtb2xsaXMgZG9sb3IgbmliaCwgbm9uIHRlbXB1cyBsZW8uIERvbmVjIG1hZ25hIG9k aW8sIGNvbW1vZG8gaWQgcG9ydGEgaW4sIGFsaXF1YW0gbW9sbGlzIGVyb3MuXAorICAgICAgICAg ICAgICAgICAgICAgICAgUGVsbGVudGVzcXVlIHZ1bHB1dGF0ZSBncmF2aWRhIGxpZ3VsYSBpbiBl bGVtZW50dW0uIEZ1c2NlIGxhY2luaWEgbWFzc2EganVzdG8sIGF0IHBvcnR0aXRvciBvcmNpLlwK KyAgICAgICAgICAgICAgICAgICAgICAgIFZlc3RpYnVsdW0gYW50ZSBpcHN1bSBwcmltaXMgaW4g ZmF1Y2lidXMgb3JjaSBsdWN0dXMgZXQgdWx0cmljZXMgcG9zdWVyZSBjdWJpbGlhIEN1cmFlOyBE b25lYyBvZGlvIHF1YW0sIHB1bHZpbmFyIHV0IHBvcnR0aXRvciBhYywgdGVtcG9yIHZpdGFlIGxp Z3VsYS5cCisgICAgICAgICAgICAgICAgICAgICAgICBDcmFzIGFsaXF1ZXQgc2FwaWVuIGlkIHNh cGllbiBtb2xsaXMgbmVjIHB1bHZpbmFyIG1hdXJpcyBhZGlwaXNjaW5nLiBQcmFlc2VudCBwb3J0 dGl0b3IgY29uc2VxdWF0IGF1Z3VlLCBzaXQgYW1ldCBtb2xsaXMganVzdG8gY29uZGltZW50dW0g ZXUuXAorICAgICAgICAgICAgICAgICAgICAgICAgRXRpYW0gdXQgZXJhdCBwZWxsZW50ZXNxdWUg b3JjaSBjb25ndWUgaW50ZXJkdW0uIE51bGxhIGV1IGVyb3MgbWkuXAorICAgICAgICAgICAgICAg ICAgICAgICAgQ3VyYWJpdHVyIHJ1dHJ1bSwgbG9yZW0gYWMgbWFsZXN1YWRhIHBlbGxlbnRlc3F1 ZSwgc2FwaWVuIHJpc3VzIGNvbnNlcXVhdCBtYXNzYSwgZWdldCBwZWxsZW50ZXNxdWUgbnVuYyBu dWxsYSB2ZWwgc2VtLiI7CisgICAgICAgICAgICAgICAgICAgICAgICB0ZW1wbGF0ZVBhcmFncmFw aC5jbGFzc05hbWUgPSAiY29udGVudFBhcmFncmFwaCI7CisgICAgICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAgICAgdmFyIHBhcmFncmFwaCA9IHRlbXBsYXRlUGFyYWdyYXBoLmNsb25lTm9k ZSh0cnVlKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcGFyYWdyYXBoOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICBmdW5jdGlvbiBjcmVhdGVGbG9hdGluZ05vZGUod2lkdGgsIGhlaWdo dCwgc2hhcGUpIHsKKyAgICAgICAgICAgICAgICBpZiAoIXRlbXBsYXRlRmxvYXRpbmdOb2RlKSB7 CisgICAgICAgICAgICAgICAgICAgIHRlbXBsYXRlRmxvYXRpbmdOb2RlID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICAgICAgICAgIHRlbXBsYXRlRmxvYXRpbmdO b2RlLmNsYXNzTmFtZSA9ICJmbG9hdGluZ09iamVjdCI7CisgICAgICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAgICAgdmFyIGZsb2F0ID0gdGVtcGxhdGVGbG9hdGluZ05vZGUuY2xvbmVOb2Rl KGZhbHNlKTsKKyAgICAgICAgICAgICAgICBmbG9hdC5zdHlsZS53aWR0aCA9IHdpZHRoOworICAg ICAgICAgICAgICAgIGZsb2F0LnN0eWxlLmhlaWdodCA9IGhlaWdodDsKKyAgICAgICAgICAgICAg ICBmbG9hdC5zdHlsZS53ZWJraXRTaGFwZU91dHNpZGUgPSBzaGFwZTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gZmxvYXQ7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGFk ZEFydGljbGVzKGZsb2F0aW5nT2JqZWN0cywgcGFyYWdyYXBoQ291bnQpIHsKKyAgICAgICAgICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBhcmFncmFwaENvdW50OyArK2kpIHsKKyAgICAgICAg ICAgICAgICAgICAgZmxvYXRpbmdPYmplY3RzLmFwcGVuZENoaWxkKGNyZWF0ZVBhcmFncmFwaE5v ZGUoKSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICBm dW5jdGlvbiBjcmVhdGVGbG9hdGluZ09iamVjdHMod2lkdGgsIGhlaWdodCwgc2hhcGUsIGZsb2F0 aW5nT2JqZWN0Q291bnQpIHsKKyAgICAgICAgICAgICAgICB2YXIgdGVzdEJveCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgZmxvYXRpbmdPYmplY3RDb3VudDsgKytpKSB7CisgICAgICAgICAgICAgICAgICAgIHRlc3RC b3guYXBwZW5kQ2hpbGQoY3JlYXRlRmxvYXRpbmdOb2RlKHdpZHRoLCBoZWlnaHQsIHNoYXBlKSk7 CisgICAgICAgICAgICAgICAgICAgIHRlc3RCb3guYXBwZW5kQ2hpbGQoY3JlYXRlUGFyYWdyYXBo Tm9kZSgpKQorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB0ZXN0Qm94LmNsYXNz TmFtZSA9ICJ0ZXN0Qm94IjsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGVzdEJveDsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gYXBwbHlGbG9hdGluZygpIHsKKyAgICAg ICAgICAgICAgICB2YXIgZmxvYXRpbmdPYmplY3RzID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeUNs YXNzTmFtZSgnZmxvYXRpbmdPYmplY3QnKTsKKyAgICAgICAgICAgICAgICBmb3IgKGkgPSAwOyBp IDwgZmxvYXRpbmdPYmplY3RzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAgICAgIGZs b2F0aW5nT2JqZWN0c1tpXS5zdHlsZS5jc3NGbG9hdCA9ICdsZWZ0JzsKKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIGNyZWF0ZVNoYXBlT3V0 c2lkZVRlc3Qod2lkdGgsIGhlaWdodCwgc2hhcGUsIHNoYXBlT2JqZWN0Q291bnQpIHsKKyAgICAg ICAgICAgICAgICBzaGFwZU9iamVjdENvdW50ID0gc2hhcGVPYmplY3RDb3VudCB8fCBERUZBVUxU X1NIQVBFX09CSkVDVF9DT1VOVDsKKworICAgICAgICAgICAgICAgIHZhciBmbG9hdGluZ09iamVj dHMgPSBjcmVhdGVGbG9hdGluZ09iamVjdHMod2lkdGgsIGhlaWdodCwgc2hhcGUsIHNoYXBlT2Jq ZWN0Q291bnQpOworICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZmxv YXRpbmdPYmplY3RzKTsKKyAgICAgICAgICAgICAgICByZXR1cm4geworICAgICAgICAgICAgICAg ICAgICBkZXNjcmlwdGlvbjogIlRlc3Rpbmcgc2hhcGVzIHdpdGggIiArIHNoYXBlICsiIHVzaW5n ICIgKyBzaGFwZU9iamVjdENvdW50ICsgIiBzaGFwZXMuIiwKKyAgICAgICAgICAgICAgICAgICAg cnVuOiBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFwcGx5RmxvYXRpbmco KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOworICAg ICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICBzZXR1cDogZnVuY3Rpb24o KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBQZXJmVGVzdFJ1bm5lci5yZXNldFJhbmRvbVNl ZWQoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOwor ICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICBkb25lOiBmdW5jdGlv bigpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQo ZmxvYXRpbmdPYmplY3RzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRlbXBsYXRlUGFyYWdy YXBoID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH07Cisg ICAgICAgICAgICB9CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4K KyAgICAgICAgPHByZSBpZD0ibG9nIj48L3ByZT4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAg ICAgIHZhciBzaGFwZSA9ICJjb250ZW50LWJveCI7CisgICAgICAgICAgICBQZXJmVGVzdFJ1bm5l ci5tZWFzdXJlVGltZShjcmVhdGVTaGFwZU91dHNpZGVUZXN0KCIyMDBweCIsICIyMDBweCIsIHNo YXBlLCAxMDAwKSk7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlm ZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvTGF5b3V0L1NoYXBlcy9yZXNvdXJjZXMvc2hhcGVz LmNzcyBiL1BlcmZvcm1hbmNlVGVzdHMvTGF5b3V0L1NoYXBlcy9yZXNvdXJjZXMvc2hhcGVzLmNz cwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iZGVlNGM1Ci0tLSAvZGV2L251 bGwKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvU2hhcGVzL3Jlc291cmNlcy9zaGFwZXMu Y3NzCkBAIC0wLDAgKzEsNyBAQAorLnRlc3RCb3ggeworICAgIHdpZHRoOiA4MDBweDsKK30KKwor LmZsb2F0aW5nT2JqZWN0IHsKKyAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKK30KZGlmZiAt LWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvU2tpcHBlZCBiL1BlcmZvcm1hbmNlVGVzdHMvU2tpcHBl ZAppbmRleCAxMmU4NDk3Li44NmEzMDNiIDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL1Nr aXBwZWQKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Ta2lwcGVkCkBAIC05MSwzICs5MSw2IEBAIExh eW91dC9MaW5lTGF5b3V0SmFwYW5lc2UuaHRtbAogCiAjIERvbid0IHJ1biB0aGUgaW50ZXJhY3Rp dmUgcnVubmVyLiBXZSBydW4gRnVsbC5odG1sCiBEb1lvdUV2ZW5CZW5jaC9JbnRlcmFjdGl2ZVJ1 bm5lci5odG1sCisKKyMgV2Ugc2tpcCBTaGFwZXMgdGVzdHMgZm9yIG5vdzogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODE4OAorTGF5b3V0L1NoYXBlcwo=