198530 2019-06-04 08:26:26 -0700 Improve performance of the lazy image loader 2019-06-04 19:25:08 -0700 1 1 1 Unclassified WebKit WebKit Website WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jond jond commit-queue ews-feeder hi jond webkit-bug-importer oldest_to_newest 1541572 0 jond 2019-06-04 08:26:26 -0700 Improve CPU performance on webkit.org pages by using an IntersectionObserver implementation. 1541581 1 371285 jond 2019-06-04 08:41:17 -0700 Created attachment 371285 Patch 1541594 2 371285 hi 2019-06-04 08:55:55 -0700 Comment on attachment 371285 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371285&action=review r=me, neat! It may be worth a simple `if (window.IntersectionObserver)` check around (or as an early return in) `lazyLoadImages` so we don't throw an error if it's not supported. > Websites/webkit.org/ChangeLog:-101 > - I don't think we normally go back and edit ChangeLog entries, no matter how "bad" they may be. > Websites/webkit.org/wp-content/themes/webkit/scripts/global.js:-2 > - var openClass = ' open-menu', A comment explaining why this isn't needed would be nice :) > Websites/webkit.org/wp-content/themes/webkit/scripts/global.js:6 > + for (let table of tables) { Are we using `let` now??!? =D > Websites/webkit.org/wp-content/themes/webkit/scripts/global.js:22 > + if (backgroundImages.length == 0) NIT: you could use `!backgroundImages.length` instead 1541648 3 371301 jond 2019-06-04 10:53:23 -0700 Created attachment 371301 Patch 1541824 4 371301 ews-feeder 2019-06-04 18:43:35 -0700 Comment on attachment 371301 Patch Rejecting attachment 371301 from review queue. jond@apple.com does not have reviewer permissions according to https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 1541838 5 371301 commit-queue 2019-06-04 19:21:32 -0700 Comment on attachment 371301 Patch Clearing flags on attachment: 371301 Committed r246094: <https://trac.webkit.org/changeset/246094> 1541839 6 commit-queue 2019-06-04 19:21:34 -0700 All reviewed patches have been landed. Closing bug. 1541841 7 webkit-bug-importer 2019-06-04 19:25:08 -0700 <rdar://problem/51425204> 371285 2019-06-04 08:41:17 -0700 2019-06-04 10:53:21 -0700 Patch bug-198530-20190604084116.patch text/plain 7105 jond U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDYyCmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQu b3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDVlM2Rj MjliNWRjMjUyNDA1MTUzZDFhYjk2MWJhOTg4YTU5MjZmODYuLmI3ODhmZTY4NDcyYTUzMzY3YWI0 ZGZkYTVhOTZhNWY4NDY4Mjc1NTkgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hh bmdlTG9nCisrKyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTktMDYtMDQgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgorCisgICAgICAgIElt cHJvdmVkIHRoZSBwZXJmb3JtYW5jZSBvZiB0aGUgbGF6eSBpbWFnZSBsb2FkZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODUzMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3AtY29udGVudC90aGVt ZXMvd2Via2l0L3NjcmlwdHMvZ2xvYmFsLmpzOgorICAgICAgICAoZW5hYmxlU2Nyb2xsYWJsZVRh Ymxlcyk6CisgICAgICAgIChsYXp5TG9hZEltYWdlcyk6CisgICAgICAgIChmaW5kUGFyZW50TWVu dSk6IERlbGV0ZWQuCisgICAgICAgIChpLm0ubWVudXMubS50YXJnZXRNZW51LnRhcmdldE1lbnVD bGFzcy5pbmRleE9mKTogRGVsZXRlZC4KKyAgICAgICAgKGluVmlldyk6IERlbGV0ZWQuCisgICAg ICAgICgpOiBEZWxldGVkLgorICAgICAgICAobG9hZEltYWdlLmVsc2UuaW1nLm9ubG9hZCk6IERl bGV0ZWQuCisgICAgICAgIChsb2FkSW1hZ2UpOiBEZWxldGVkLgorICAgICAgICAob25Nb3ZlbWVu dCk6IERlbGV0ZWQuCisgICAgICAgICh1cGRhdGVJbWFnZXMpOiBEZWxldGVkLgorCiAyMDE5LTA1 LTA2ICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBH UFVdIEFkZCBkZW1vcyB0byB3ZWJraXQub3JnCkBAIC05OCw5ICsxMTcsOSBAQAogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MzkzCiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgotICAgICAgICAKKwogICAgICAgICBUaGUgc2hvcnQg dmlld3BvcnQgYnJlYWtwb2ludCBzdHlsZXMgc2hvdWxkIGFwcGx5IGZvciBzbWFsbCB3aWR0aAot ICAgICAgICB3aW5kb3dzIGFzIHdlbGwsIGFuZCBwYWdpbmF0aW9uIHN0eWxlcyBuZWVkIHRvIGFj Y29tbW9kYXRlIHdyYXBwZWQgCisgICAgICAgIHdpbmRvd3MgYXMgd2VsbCwgYW5kIHBhZ2luYXRp b24gc3R5bGVzIG5lZWQgdG8gYWNjb21tb2RhdGUgd3JhcHBlZAogICAgICAgICB0ZXh0IGxhYmVs cy4KIAogICAgICAgICAqIHdwLWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9zdHlsZS5jc3M6CmRpZmYg LS1naXQgYS9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9zY3Jp cHRzL2dsb2JhbC5qcyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC90aGVtZXMvd2Vi a2l0L3NjcmlwdHMvZ2xvYmFsLmpzCmluZGV4IDk2YmU1NDEwMDgxZDE0OGRjYTJhOTU3MTAyNDA2 OWExNmM0MGU5MTIuLmM4YTUxNWQ1NjZiYjE5NGQ2ODI3N2IyMDRlMDhkZDgzM2M1NzY2YzkgMTAw NjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC90aGVtZXMvd2Via2l0L3Nj cmlwdHMvZ2xvYmFsLmpzCisrKyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC90aGVt ZXMvd2Via2l0L3NjcmlwdHMvZ2xvYmFsLmpzCkBAIC0xLDExOCArMSw0MCBAQAogZG9jdW1lbnQu YWRkRXZlbnRMaXN0ZW5lcignRE9NQ29udGVudExvYWRlZCcsIGZ1bmN0aW9uICgpIHsKLSAgICB2 YXIgb3BlbkNsYXNzID0gJyBvcGVuLW1lbnUnLAotICAgICAgICBtZW51Q2xhc3MgPSAnbWVudS1p dGVtLWhhcy1jaGlsZHJlbicsCi0gICAgICAgIG1lbnVzID0gZG9jdW1lbnQucXVlcnlTZWxlY3Rv ckFsbCgnI3NpdGUtbmF2ID4gZGl2ID4gLm1lbnUgPiAubWVudS1pdGVtJyksCi0gICAgICAgIG1l bnVMaW5rcyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJyNzaXRlLW5hdiA+IGRpdiA+IC5t ZW51ID4gLm1lbnUtaXRlbSA+IGEnKSwKLSAgICAgICAgbWVudWl0ZW1zID0gZG9jdW1lbnQucXVl cnlTZWxlY3RvckFsbCgnI3NpdGUtbmF2IC5tZW51LWl0ZW0taGFzLWNoaWxkcmVuIC5tZW51LWl0 ZW0gPiBhJyk7Ci0KLSAgICBmdW5jdGlvbiBmaW5kUGFyZW50TWVudSAoZWxlbWVudCwgY2xhc3NO YW1lKSB7Ci0gICAgICAgIHdoaWxlICggKGVsZW1lbnQgPSBlbGVtZW50LnBhcmVudEVsZW1lbnQp ICYmICEgZWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoY2xhc3NOYW1lKSApOwotICAgICAgICBy ZXR1cm4gZWxlbWVudDsKLSAgICB9Ci0KLSAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1lbnVMaW5r cy5sZW5ndGg7ICsraSkgewotICAgICAgICBtZW51TGlua3NbaV0uYWRkRXZlbnRMaXN0ZW5lcign Zm9jdXMnLCBmdW5jdGlvbiAoZSkgewotICAgICAgICAgICAgdmFyIG9wZW5NZW51cyA9IGZpbmRQ YXJlbnRNZW51KGUudGFyZ2V0LCAnbWVudScpLmdldEVsZW1lbnRzQnlDbGFzc05hbWUob3BlbkNs YXNzLnRyaW0oKSk7Ci0gICAgICAgICAgICBmb3IgKHZhciBtID0gMDsgbSA8IG9wZW5NZW51cy5s ZW5ndGg7ICsrbSkgewotICAgICAgICAgICAgICAgIG9wZW5NZW51c1ttXS5jbGFzc05hbWUgPSBv cGVuTWVudXNbbV0uY2xhc3NOYW1lLnJlcGxhY2Uob3BlbkNsYXNzLCAiIik7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgIH0pOwotICAgIH0KLQotICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbWVudWl0 ZW1zLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgIG1lbnVpdGVtc1tpXS5hZGRFdmVudExpc3RlbmVy KCdmb2N1cycsIGZ1bmN0aW9uIChlKSB7Ci0gICAgICAgICAgICB2YXIgdGFyZ2V0TWVudSA9IGZp bmRQYXJlbnRNZW51KGUudGFyZ2V0LCBtZW51Q2xhc3MpLAotICAgICAgICAgICAgICAgIHRhcmdl dE1lbnVDbGFzcyA9IG51bGw7Ci0KLSAgICAgICAgICAgIGlmICggdGFyZ2V0TWVudSAhPSB1bmRl ZmluZWQgKQotICAgICAgICAgICAgICAgIHRhcmdldE1lbnVDbGFzcyA9IHRhcmdldE1lbnUuY2xh c3NOYW1lOwotCi0gICAgICAgICAgICBmb3IgKHZhciBtID0gMDsgbSA8IG1lbnVzLmxlbmd0aDsg KyttKSB7Ci0gICAgICAgICAgICAgICAgbWVudXNbbV0uY2xhc3NOYW1lLnJlcGxhY2Uob3BlbkNs YXNzLCAiIik7Ci0gICAgICAgICAgICAgICAgaWYgKG1lbnVzW21dID09IHRhcmdldE1lbnUpIHsK LSAgICAgICAgICAgICAgICAgICAgaWYgKHRhcmdldE1lbnVDbGFzcy5pbmRleE9mKG9wZW5DbGFz cykgPT0gLTEpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRhcmdldE1lbnUuY2xhc3NOYW1l ICs9IG9wZW5DbGFzczsKLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIG1lbnVzW21dLmNsYXNzTmFtZSA9IG1lbnVzW21d LmNsYXNzTmFtZS5yZXBsYWNlKG9wZW5DbGFzcywgIiIpOwotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIH0KLSAgICAgICAgfSk7Ci0gICAgfQotCi0gICAgdmFyIGxhdGVzdCA9IFtdLCB1 cGRhdGluZyA9IGZhbHNlOwotICAgIGZ1bmN0aW9uIGluVmlldyhlbGVtZW50KSB7Ci0gICAgICAg IHZhciBib3ggPSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwotICAgICAgICByZXR1 cm4gKCAoYm94LnRvcCA+PSAwICYmIGJveC5sZWZ0ID49IDAgJiYgYm94LnRvcCkgPD0gKHdpbmRv dy5pbm5lckhlaWdodCB8fCBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuY2xpZW50SGVpZ2h0KSk7 Ci0gICAgfQotCi0gICAgZnVuY3Rpb24gc3RhZ2VJbWFnZShlbGVtZW50LCBzcmMpIHsKLSAgICAg ICAgZWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kSW1hZ2UgPSAndXJsKCcgKyBzcmMgKyAnKSc7Ci0g ICAgICAgIGlmICghZWxlbWVudC5wYXJlbnRFbGVtZW50LmNsYXNzTGlzdC5jb250YWlucygnbG9h ZGVkJykpCi0gICAgICAgICAgICBlbGVtZW50LnBhcmVudEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgn bG9hZGVkJyk7Ci0gICAgfQotCi0gICAgZnVuY3Rpb24gbG9hZEltYWdlKGVsZW1lbnQpIHsKLSAg ICAgICAgdmFyIHNyYyA9IGVsZW1lbnQuZ2V0QXR0cmlidXRlKCdkYXRhLXVybCcpOwotCi0gICAg ICAgIGlmIChzZXNzaW9uU3RvcmFnZS5nZXRJdGVtKHNyYykpIHsKLSAgICAgICAgICAgIHNldFRp bWVvdXQoZnVuY3Rpb24gKCkgeyBzdGFnZUltYWdlKGVsZW1lbnQsIHNyYyk7IH0sIDEpOwotICAg ICAgICB9IGVsc2UgewotICAgICAgICAgICAgdmFyIGltZyA9IG5ldyBJbWFnZSgpOwotICAgICAg ICAgICAgaW1nLnNyYyA9IHNyYzsKLSAgICAgICAgICAgIGltZy5vbmxvYWQgPSBmdW5jdGlvbigp IHsKLSAgICAgICAgICAgICAgICBzdGFnZUltYWdlKGVsZW1lbnQsc3JjKTsKLQotICAgICAgICAg ICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgICAgICAgIHNlc3Npb25TdG9yYWdlLnNldEl0ZW0o c3JjLCB0cnVlKTsKLSAgICAgICAgICAgICAgICB9IGNhdGNoIChlcnJvcikgewotICAgICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7IC8vIHByaXZhdGUgYnJvd3NpbmcKLSAgICAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICAgICAgaW1nID0gdW5kZWZpbmVkOwotICAgICAgICAgICAgfQot ICAgICAgICB9Ci0KLSAgICB9Ci0KLSAgICBmdW5jdGlvbiBvbk1vdmVtZW50KCkgewotICAgICAg ICBpZiAoIXVwZGF0aW5nKQotICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKHVwZGF0 ZUltYWdlcyk7Ci0gICAgICAgIHVwZGF0aW5nID0gdHJ1ZTsKLSAgICB9Ci0KLSAgICBmdW5jdGlv biB1cGRhdGVJbWFnZXMoKSB7Ci0gICAgICAgIHVwZGF0aW5nID0gZmFsc2U7Ci0KLSAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBpbWdzLmxlbmd0aDsgaSsrKSB7Ci0gICAgICAgICAgICBpZiAo IGluVmlldyhpbWdzW2ldKSApCi0gICAgICAgICAgICAgICAgbG9hZEltYWdlKGltZ3NbaV0pOwot ICAgICAgICB9Ci0KLSAgICB9CiAKICAgICBmdW5jdGlvbiBlbmFibGVTY3JvbGxhYmxlVGFibGVz ICgpIHsKLSAgICAgICAgdmFyIHRhYmxlcyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5i b2R5Y29weSA+IHRhYmxlJyk7Ci0gICAgICAgIHZhciB0YWJsZUNvdW50ID0gdGFibGVzLmxlbmd0 aDsKKyAgICAgICAgbGV0IHRhYmxlcyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJyNjb250 ZW50IC5ib2R5Y29weSA+IHRhYmxlJyk7CiAKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0 YWJsZUNvdW50OyBpKyspIHsKLSAgICAgICAgICAgIHZhciBzY3JvbGxhYmxlRGl2ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7Ci0gICAgICAgICAgICB2YXIgcGFkZGluZ0RpdiA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOworICAgICAgICBmb3IgKGxldCB0YWJsZSBvZiB0 YWJsZXMpIHsKKyAgICAgICAgICAgIGxldCBzY3JvbGxhYmxlRGl2ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgnZGl2Jyk7CisgICAgICAgICAgICBsZXQgcGFkZGluZ0RpdiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoJ2RpdicpOwogCiAgICAgICAgICAgICBzY3JvbGxhYmxlRGl2LmNsYXNzTGlz dC5hZGQoJ3Njcm9sbGFibGUnKTsKICAgICAgICAgICAgIHBhZGRpbmdEaXYuY2xhc3NMaXN0LmFk ZCgnc2Nyb2xsYWJsZS1wYWRkaW5nJyk7CiAKICAgICAgICAgICAgIHNjcm9sbGFibGVEaXYuYXBw ZW5kQ2hpbGQocGFkZGluZ0Rpdik7Ci0gICAgICAgICAgICB0YWJsZXNbaV0ucGFyZW50Tm9kZS5p bnNlcnRCZWZvcmUoc2Nyb2xsYWJsZURpdiwgdGFibGVzW2ldKTsKKyAgICAgICAgICAgIHRhYmxl LnBhcmVudE5vZGUuaW5zZXJ0QmVmb3JlKHNjcm9sbGFibGVEaXYsIHRhYmxlKTsKIAotICAgICAg ICAgICAgcGFkZGluZ0Rpdi5hcHBlbmRDaGlsZCh0YWJsZXNbaV0pOworICAgICAgICAgICAgcGFk ZGluZ0Rpdi5hcHBlbmRDaGlsZCh0YWJsZSk7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICB2YXIg aW1ncyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJ2RpdltkYXRhLXVybF0nKTsKLSAgICBk b2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCdzY3JvbGwnLCBvbk1vdmVtZW50KTsKLSAgICBkb2N1 bWVudC5hZGRFdmVudExpc3RlbmVyKCdyZXNpemUnLCBvbk1vdmVtZW50KTsKKyAgICBmdW5jdGlv biBsYXp5TG9hZEltYWdlcyAoKSB7CisgICAgICAgIGxldCBiYWNrZ3JvdW5kSW1hZ2VzID0gZG9j dW1lbnQucXVlcnlTZWxlY3RvckFsbCgnI2NvbnRlbnQgZGl2W2RhdGEtdXJsXScpOworICAgICAg ICBpZiAoYmFja2dyb3VuZEltYWdlcy5sZW5ndGggPT0gMCkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgbGV0IGxhenlsb2FkSW1hZ2VPYnNlcnZlciA9IG5ldyBJbnRlcnNlY3Rpb25PYnNl cnZlcihmdW5jdGlvbiAoY2hhbmdlcykgeworICAgICAgICAgICAgZm9yIChsZXQgY2hhbmdlIG9m IGNoYW5nZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWNoYW5nZS5pc0ludGVyc2VjdGluZykK KyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGNoYW5nZS50YXJn ZXQuc3R5bGUuYmFja2dyb3VuZEltYWdlID0gJ3VybCgnICsgY2hhbmdlLnRhcmdldC5nZXRBdHRy aWJ1dGUoJ2RhdGEtdXJsJykgKyAnKSc7CisgICAgICAgICAgICAgICAgY2hhbmdlLnRhcmdldC5w YXJlbnRFbGVtZW50LmNsYXNzTGlzdC5hZGQoJ2xvYWRlZCcpOworICAgICAgICAgICAgICAgIGxh enlsb2FkSW1hZ2VPYnNlcnZlci51bm9ic2VydmUoY2hhbmdlLnRhcmdldCk7CisgICAgICAgICAg ICB9CisgICAgICAgIH0pOworICAgICAgICBmb3IgKGxldCBlbGVtZW50IG9mIGJhY2tncm91bmRJ bWFnZXMpCisgICAgICAgICAgICBsYXp5bG9hZEltYWdlT2JzZXJ2ZXIub2JzZXJ2ZShlbGVtZW50 KTsKKyAgICB9CiAKLSAgICB1cGRhdGVJbWFnZXMoKTsKKyAgICBsYXp5TG9hZEltYWdlcygpOwog ICAgIGVuYWJsZVNjcm9sbGFibGVUYWJsZXMoKTsKIAogfSk7Cg== 371301 2019-06-04 10:53:23 -0700 2019-06-04 19:21:32 -0700 Patch bug-198530-20190604105321.patch text/plain 7142 jond U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDYyCmRpZmYgLS1naXQgYS9XZWJzaXRlcy93ZWJraXQu b3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCmluZGV4IDVlM2Rj MjliNWRjMjUyNDA1MTUzZDFhYjk2MWJhOTg4YTU5MjZmODYuLmQ3MjZmMjdhZDIwNWE2YmU5MGRh Y2VhOTFjZjA4NjgyODQ3YjNiNTAgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hh bmdlTG9nCisrKyBiL1dlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTktMDYtMDQgIEpvbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgorCisgICAgICAgIElt cHJvdmUgcGVyZm9ybWFuY2Ugb2YgdGhlIGxhenkgaW1hZ2UgbG9hZGVyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg1MzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdwLWNvbnRlbnQvdGhlbWVzL3dl YmtpdC9zY3JpcHRzL2dsb2JhbC5qczoKKyAgICAgICAgKGVuYWJsZVNjcm9sbGFibGVUYWJsZXMp OgorICAgICAgICAobGF6eUxvYWRJbWFnZXMpOgorICAgICAgICAoZmluZFBhcmVudE1lbnUpOiBE ZWxldGVkLgorICAgICAgICAoaS5tLm1lbnVzLm0udGFyZ2V0TWVudS50YXJnZXRNZW51Q2xhc3Mu aW5kZXhPZik6IERlbGV0ZWQuCisgICAgICAgIChpblZpZXcpOiBEZWxldGVkLgorICAgICAgICAo KTogRGVsZXRlZC4KKyAgICAgICAgKGxvYWRJbWFnZS5lbHNlLmltZy5vbmxvYWQpOiBEZWxldGVk LgorICAgICAgICAobG9hZEltYWdlKTogRGVsZXRlZC4KKyAgICAgICAgKG9uTW92ZW1lbnQpOiBE ZWxldGVkLgorICAgICAgICAodXBkYXRlSW1hZ2VzKTogRGVsZXRlZC4KKwogMjAxOS0wNS0wNiAg SnVzdGluIEZhbiAgPGp1c3Rpbl9mYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWIgR1BVXSBB ZGQgZGVtb3MgdG8gd2Via2l0Lm9yZwpAQCAtOTgsOSArMTE3LDkgQEAKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDM5MwogCiAgICAgICAgIFJldmll d2VkIGJ5IERldmluIFJvdXNzby4KLSAgICAgICAgCisKICAgICAgICAgVGhlIHNob3J0IHZpZXdw b3J0IGJyZWFrcG9pbnQgc3R5bGVzIHNob3VsZCBhcHBseSBmb3Igc21hbGwgd2lkdGgKLSAgICAg ICAgd2luZG93cyBhcyB3ZWxsLCBhbmQgcGFnaW5hdGlvbiBzdHlsZXMgbmVlZCB0byBhY2NvbW1v ZGF0ZSB3cmFwcGVkIAorICAgICAgICB3aW5kb3dzIGFzIHdlbGwsIGFuZCBwYWdpbmF0aW9uIHN0 eWxlcyBuZWVkIHRvIGFjY29tbW9kYXRlIHdyYXBwZWQKICAgICAgICAgdGV4dCBsYWJlbHMuCiAK ICAgICAgICAgKiB3cC1jb250ZW50L3RoZW1lcy93ZWJraXQvc3R5bGUuY3NzOgpkaWZmIC0tZ2l0 IGEvV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3RoZW1lcy93ZWJraXQvc2NyaXB0cy9n bG9iYWwuanMgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9z Y3JpcHRzL2dsb2JhbC5qcwppbmRleCA5NmJlNTQxMDA4MWQxNDhkY2EyYTk1NzEwMjQwNjlhMTZj NDBlOTEyLi45NWVkYjc5MTE4YWRmMjc4YTY5Zjc5OTEzYWJlOTNmZTYyZDY4YWZkIDEwMDY0NAot LS0gYS9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9zY3JpcHRz L2dsb2JhbC5qcworKysgYi9XZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvdGhlbWVzL3dl YmtpdC9zY3JpcHRzL2dsb2JhbC5qcwpAQCAtMSwxMTggKzEsNDEgQEAKIGRvY3VtZW50LmFkZEV2 ZW50TGlzdGVuZXIoJ0RPTUNvbnRlbnRMb2FkZWQnLCBmdW5jdGlvbiAoKSB7Ci0gICAgdmFyIG9w ZW5DbGFzcyA9ICcgb3Blbi1tZW51JywKLSAgICAgICAgbWVudUNsYXNzID0gJ21lbnUtaXRlbS1o YXMtY2hpbGRyZW4nLAotICAgICAgICBtZW51cyA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwo JyNzaXRlLW5hdiA+IGRpdiA+IC5tZW51ID4gLm1lbnUtaXRlbScpLAotICAgICAgICBtZW51TGlu a3MgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcjc2l0ZS1uYXYgPiBkaXYgPiAubWVudSA+ IC5tZW51LWl0ZW0gPiBhJyksCi0gICAgICAgIG1lbnVpdGVtcyA9IGRvY3VtZW50LnF1ZXJ5U2Vs ZWN0b3JBbGwoJyNzaXRlLW5hdiAubWVudS1pdGVtLWhhcy1jaGlsZHJlbiAubWVudS1pdGVtID4g YScpOwotCi0gICAgZnVuY3Rpb24gZmluZFBhcmVudE1lbnUgKGVsZW1lbnQsIGNsYXNzTmFtZSkg ewotICAgICAgICB3aGlsZSAoIChlbGVtZW50ID0gZWxlbWVudC5wYXJlbnRFbGVtZW50KSAmJiAh IGVsZW1lbnQuY2xhc3NMaXN0LmNvbnRhaW5zKGNsYXNzTmFtZSkgKTsKLSAgICAgICAgcmV0dXJu IGVsZW1lbnQ7Ci0gICAgfQotCi0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtZW51TGlua3MubGVu Z3RoOyArK2kpIHsKLSAgICAgICAgbWVudUxpbmtzW2ldLmFkZEV2ZW50TGlzdGVuZXIoJ2ZvY3Vz JywgZnVuY3Rpb24gKGUpIHsKLSAgICAgICAgICAgIHZhciBvcGVuTWVudXMgPSBmaW5kUGFyZW50 TWVudShlLnRhcmdldCwgJ21lbnUnKS5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKG9wZW5DbGFzcy50 cmltKCkpOwotICAgICAgICAgICAgZm9yICh2YXIgbSA9IDA7IG0gPCBvcGVuTWVudXMubGVuZ3Ro OyArK20pIHsKLSAgICAgICAgICAgICAgICBvcGVuTWVudXNbbV0uY2xhc3NOYW1lID0gb3Blbk1l bnVzW21dLmNsYXNzTmFtZS5yZXBsYWNlKG9wZW5DbGFzcywgIiIpOwotICAgICAgICAgICAgfQot ICAgICAgICB9KTsKLSAgICB9Ci0KLSAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1lbnVpdGVtcy5s ZW5ndGg7ICsraSkgewotICAgICAgICBtZW51aXRlbXNbaV0uYWRkRXZlbnRMaXN0ZW5lcignZm9j dXMnLCBmdW5jdGlvbiAoZSkgewotICAgICAgICAgICAgdmFyIHRhcmdldE1lbnUgPSBmaW5kUGFy ZW50TWVudShlLnRhcmdldCwgbWVudUNsYXNzKSwKLSAgICAgICAgICAgICAgICB0YXJnZXRNZW51 Q2xhc3MgPSBudWxsOwotCi0gICAgICAgICAgICBpZiAoIHRhcmdldE1lbnUgIT0gdW5kZWZpbmVk ICkKLSAgICAgICAgICAgICAgICB0YXJnZXRNZW51Q2xhc3MgPSB0YXJnZXRNZW51LmNsYXNzTmFt ZTsKLQotICAgICAgICAgICAgZm9yICh2YXIgbSA9IDA7IG0gPCBtZW51cy5sZW5ndGg7ICsrbSkg ewotICAgICAgICAgICAgICAgIG1lbnVzW21dLmNsYXNzTmFtZS5yZXBsYWNlKG9wZW5DbGFzcywg IiIpOwotICAgICAgICAgICAgICAgIGlmIChtZW51c1ttXSA9PSB0YXJnZXRNZW51KSB7Ci0gICAg ICAgICAgICAgICAgICAgIGlmICh0YXJnZXRNZW51Q2xhc3MuaW5kZXhPZihvcGVuQ2xhc3MpID09 IC0xKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB0YXJnZXRNZW51LmNsYXNzTmFtZSArPSBv cGVuQ2xhc3M7Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9IGVsc2Ug ewotICAgICAgICAgICAgICAgICAgICBtZW51c1ttXS5jbGFzc05hbWUgPSBtZW51c1ttXS5jbGFz c05hbWUucmVwbGFjZShvcGVuQ2xhc3MsICIiKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0pOwotICAgIH0KLQotICAgIHZhciBsYXRlc3QgPSBbXSwgdXBkYXRp bmcgPSBmYWxzZTsKLSAgICBmdW5jdGlvbiBpblZpZXcoZWxlbWVudCkgewotICAgICAgICB2YXIg Ym94ID0gZWxlbWVudC5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKLSAgICAgICAgcmV0dXJuICgg KGJveC50b3AgPj0gMCAmJiBib3gubGVmdCA+PSAwICYmIGJveC50b3ApIDw9ICh3aW5kb3cuaW5u ZXJIZWlnaHQgfHwgZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LmNsaWVudEhlaWdodCkpOwotICAg IH0KLQotICAgIGZ1bmN0aW9uIHN0YWdlSW1hZ2UoZWxlbWVudCwgc3JjKSB7Ci0gICAgICAgIGVs ZW1lbnQuc3R5bGUuYmFja2dyb3VuZEltYWdlID0gJ3VybCgnICsgc3JjICsgJyknOwotICAgICAg ICBpZiAoIWVsZW1lbnQucGFyZW50RWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoJ2xvYWRlZCcp KQotICAgICAgICAgICAgZWxlbWVudC5wYXJlbnRFbGVtZW50LmNsYXNzTGlzdC5hZGQoJ2xvYWRl ZCcpOwotICAgIH0KLQotICAgIGZ1bmN0aW9uIGxvYWRJbWFnZShlbGVtZW50KSB7Ci0gICAgICAg IHZhciBzcmMgPSBlbGVtZW50LmdldEF0dHJpYnV0ZSgnZGF0YS11cmwnKTsKLQotICAgICAgICBp ZiAoc2Vzc2lvblN0b3JhZ2UuZ2V0SXRlbShzcmMpKSB7Ci0gICAgICAgICAgICBzZXRUaW1lb3V0 KGZ1bmN0aW9uICgpIHsgc3RhZ2VJbWFnZShlbGVtZW50LCBzcmMpOyB9LCAxKTsKLSAgICAgICAg fSBlbHNlIHsKLSAgICAgICAgICAgIHZhciBpbWcgPSBuZXcgSW1hZ2UoKTsKLSAgICAgICAgICAg IGltZy5zcmMgPSBzcmM7Ci0gICAgICAgICAgICBpbWcub25sb2FkID0gZnVuY3Rpb24oKSB7Ci0g ICAgICAgICAgICAgICAgc3RhZ2VJbWFnZShlbGVtZW50LHNyYyk7Ci0KLSAgICAgICAgICAgICAg ICB0cnkgewotICAgICAgICAgICAgICAgICAgICBzZXNzaW9uU3RvcmFnZS5zZXRJdGVtKHNyYywg dHJ1ZSk7Ci0gICAgICAgICAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKLSAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOyAvLyBwcml2YXRlIGJyb3dzaW5nCi0gICAgICAgICAgICAgICAg fQotICAgICAgICAgICAgICAgIGltZyA9IHVuZGVmaW5lZDsKLSAgICAgICAgICAgIH0KLSAgICAg ICAgfQotCi0gICAgfQotCi0gICAgZnVuY3Rpb24gb25Nb3ZlbWVudCgpIHsKLSAgICAgICAgaWYg KCF1cGRhdGluZykKLSAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSh1cGRhdGVJbWFn ZXMpOwotICAgICAgICB1cGRhdGluZyA9IHRydWU7Ci0gICAgfQotCi0gICAgZnVuY3Rpb24gdXBk YXRlSW1hZ2VzKCkgewotICAgICAgICB1cGRhdGluZyA9IGZhbHNlOwotCi0gICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgaW1ncy5sZW5ndGg7IGkrKykgewotICAgICAgICAgICAgaWYgKCBpblZp ZXcoaW1nc1tpXSkgKQotICAgICAgICAgICAgICAgIGxvYWRJbWFnZShpbWdzW2ldKTsKLSAgICAg ICAgfQotCi0gICAgfQogCiAgICAgZnVuY3Rpb24gZW5hYmxlU2Nyb2xsYWJsZVRhYmxlcyAoKSB7 Ci0gICAgICAgIHZhciB0YWJsZXMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcuYm9keWNv cHkgPiB0YWJsZScpOwotICAgICAgICB2YXIgdGFibGVDb3VudCA9IHRhYmxlcy5sZW5ndGg7Cisg ICAgICAgIGxldCB0YWJsZXMgPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcjY29udGVudCAu Ym9keWNvcHkgPiB0YWJsZScpOwogCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGFibGVD b3VudDsgaSsrKSB7Ci0gICAgICAgICAgICB2YXIgc2Nyb2xsYWJsZURpdiA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoJ2RpdicpOwotICAgICAgICAgICAgdmFyIHBhZGRpbmdEaXYgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKKyAgICAgICAgZm9yIChsZXQgdGFibGUgb2YgdGFibGVz KSB7CisgICAgICAgICAgICBsZXQgc2Nyb2xsYWJsZURpdiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoJ2RpdicpOworICAgICAgICAgICAgbGV0IHBhZGRpbmdEaXYgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCdkaXYnKTsKIAogICAgICAgICAgICAgc2Nyb2xsYWJsZURpdi5jbGFzc0xpc3QuYWRk KCdzY3JvbGxhYmxlJyk7CiAgICAgICAgICAgICBwYWRkaW5nRGl2LmNsYXNzTGlzdC5hZGQoJ3Nj cm9sbGFibGUtcGFkZGluZycpOwogCiAgICAgICAgICAgICBzY3JvbGxhYmxlRGl2LmFwcGVuZENo aWxkKHBhZGRpbmdEaXYpOwotICAgICAgICAgICAgdGFibGVzW2ldLnBhcmVudE5vZGUuaW5zZXJ0 QmVmb3JlKHNjcm9sbGFibGVEaXYsIHRhYmxlc1tpXSk7CisgICAgICAgICAgICB0YWJsZS5wYXJl bnROb2RlLmluc2VydEJlZm9yZShzY3JvbGxhYmxlRGl2LCB0YWJsZSk7CiAKLSAgICAgICAgICAg IHBhZGRpbmdEaXYuYXBwZW5kQ2hpbGQodGFibGVzW2ldKTsKKyAgICAgICAgICAgIHBhZGRpbmdE aXYuYXBwZW5kQ2hpbGQodGFibGUpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgdmFyIGltZ3Mg PSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCdkaXZbZGF0YS11cmxdJyk7Ci0gICAgZG9jdW1l bnQuYWRkRXZlbnRMaXN0ZW5lcignc2Nyb2xsJywgb25Nb3ZlbWVudCk7Ci0gICAgZG9jdW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigncmVzaXplJywgb25Nb3ZlbWVudCk7CisgICAgZnVuY3Rpb24gbGF6 eUxvYWRJbWFnZXMgKCkgeworICAgICAgICBsZXQgYmFja2dyb3VuZEltYWdlcyA9IGRvY3VtZW50 LnF1ZXJ5U2VsZWN0b3JBbGwoJyNjb250ZW50IGRpdltkYXRhLXVybF0nKTsKKyAgICAgICAgaWYg KGJhY2tncm91bmRJbWFnZXMubGVuZ3RoID09IDApCisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIGxldCBsYXp5bG9hZEltYWdlT2JzZXJ2ZXIgPSBuZXcgSW50ZXJzZWN0aW9uT2JzZXJ2ZXIo ZnVuY3Rpb24gKGNoYW5nZXMpIHsKKyAgICAgICAgICAgIGZvciAobGV0IGNoYW5nZSBvZiBjaGFu Z2VzKSB7CisgICAgICAgICAgICAgICAgaWYgKCFjaGFuZ2UuaXNJbnRlcnNlY3RpbmcpCisgICAg ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICBjaGFuZ2UudGFyZ2V0LnN0 eWxlLmJhY2tncm91bmRJbWFnZSA9ICd1cmwoJyArIGNoYW5nZS50YXJnZXQuZ2V0QXR0cmlidXRl KCdkYXRhLXVybCcpICsgJyknOworICAgICAgICAgICAgICAgIGNoYW5nZS50YXJnZXQucGFyZW50 RWxlbWVudC5jbGFzc0xpc3QuYWRkKCdsb2FkZWQnKTsKKyAgICAgICAgICAgICAgICBsYXp5bG9h ZEltYWdlT2JzZXJ2ZXIudW5vYnNlcnZlKGNoYW5nZS50YXJnZXQpOworICAgICAgICAgICAgfQor ICAgICAgICB9KTsKKyAgICAgICAgZm9yIChsZXQgZWxlbWVudCBvZiBiYWNrZ3JvdW5kSW1hZ2Vz KQorICAgICAgICAgICAgbGF6eWxvYWRJbWFnZU9ic2VydmVyLm9ic2VydmUoZWxlbWVudCk7Cisg ICAgfQogCi0gICAgdXBkYXRlSW1hZ2VzKCk7CisgICAgaWYgKHdpbmRvdy5JbnRlcnNlY3Rpb25P YnNlcnZlcikKKyAgICAgICAgbGF6eUxvYWRJbWFnZXMoKTsKICAgICBlbmFibGVTY3JvbGxhYmxl VGFibGVzKCk7CiAKIH0pOwo=