57444 2011-03-30 05:20:47 -0700 Web Inspector: remove unnecessary newBody output parameter from editScriptSource protocol method. 2011-03-31 10:34:03 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 376214 0 podivilov 2011-03-30 05:20:47 -0700 Web Inspector: remove unnecessary newBody output parameter from editScriptSource protocol method. 376215 1 87508 podivilov 2011-03-30 05:21:40 -0700 Created attachment 87508 Patch. 376344 2 87508 pfeldman 2011-03-30 08:25:48 -0700 Comment on attachment 87508 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=87508&action=review > Source/WebCore/inspector/Inspector.json:1195 > { "name": "stackFrames", "type": "array", "items": { "$ref" : "CallFrame"}, "description": "New stack trace in case editing has happened while VM was stopped." } could you call this variable callFrames instead of stackFrames while you are there? 377244 3 podivilov 2011-03-31 09:37:35 -0700 Committed r82590: <http://trac.webkit.org/changeset/82590> 377310 4 webkit.review.bot 2011-03-31 10:34:03 -0700 http://trac.webkit.org/changeset/82590 might have broken Qt Linux Release The following tests are not passing: fast/dom/HTMLMeterElement/meter-boundary-values.html fast/dom/HTMLMeterElement/meter-optimums.html fast/dom/HTMLMeterElement/meter-styles-changing-pseudo.html fast/dom/HTMLMeterElement/meter-styles.html 87508 2011-03-30 05:21:40 -0700 2011-03-30 08:25:48 -0700 Patch. patch text/plain 17815 podivilov ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0ZTQ3MTJjLi4xNzFlMDU0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMt MzAgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVt b3ZlIHVubmVjZXNzYXJ5IG5ld0JvZHkgb3V0cHV0IHBhcmFtZXRlciBmcm9tIGVkaXRTY3JpcHRT b3VyY2UgcHJvdG9jb2wgbWV0aG9kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTc0NDQKKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0RlYnVnZ2VyVGVzdCk6CisgICAg ICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC1leHBlY3RlZC50eHQ6CisgICAgICAg ICogaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC5odG1sOgorICAgICAgICAqIGluc3BlY3Rv ci9kZWJ1Z2dlci9yZXNvdXJjZXMvZWRpdC1tZS13aGVuLXBhdXNlZC5qczogQWRkZWQuCisgICAg ICAgIChmMik6CisgICAgICAgIChmMSk6CisKIDIwMTEtMDMtMjkgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBEb2N1bWVudCB0aGF0IHdlJ3JlIG5vdyBwYXNzaW5n IHRoZXNlIHRlc3RzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXItdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyLXRlc3QuanMKaW5kZXggZjE0YTRlOS4uOGRhMGZhMCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcworKysgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCkBAIC0xMDcsOCArMTA3 LDExIEBAIEluc3BlY3RvclRlc3QuY2FwdHVyZVN0YWNrVHJhY2UgPSBmdW5jdGlvbihjYWxsRnJh bWVzKQogICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2FsbEZyYW1lcy5sZW5ndGg7IGkrKykgewog ICAgICAgICB2YXIgZnJhbWUgPSBjYWxsRnJhbWVzW2ldOwogICAgICAgICB2YXIgc2NyaXB0ID0g V2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuc2NyaXB0Rm9yU291cmNlSUQoZnJhbWUuc291cmNl SUQpOwotICAgICAgICB2YXIgc2NyaXB0T3JSZXNvdXJjZSA9IHNjcmlwdC5yZXNvdXJjZSB8fCBz Y3JpcHQ7Ci0gICAgICAgIHZhciB1cmwgPSBzY3JpcHRPclJlc291cmNlICYmIFdlYkluc3BlY3Rv ci5kaXNwbGF5TmFtZUZvclVSTChzY3JpcHRPclJlc291cmNlLnNvdXJjZVVSTCB8fCBzY3JpcHRP clJlc291cmNlLnVybCk7CisgICAgICAgIHZhciB1cmw7CisgICAgICAgIGlmIChzY3JpcHQpCisg ICAgICAgICAgICB1cmwgPSBXZWJJbnNwZWN0b3IuZGlzcGxheU5hbWVGb3JVUkwoc2NyaXB0LnNv dXJjZVVSTCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHVybCA9ICIoaW50ZXJuYWwgc2Ny aXB0KSIKICAgICAgICAgdmFyIHMgPSAiICAgICIgKyBpICsgIikgIiArIGZyYW1lLmZ1bmN0aW9u TmFtZSArICIgKCIgKyB1cmwgKyAiOiIgKyAoZnJhbWUubGluZSArIDEpICsgIikiOwogICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChzKTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQtZXhwZWN0ZWQudHh0CmluZGV4IDdkYzNm ZTkuLmE3NjM3ZDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9s aXZlLWVkaXQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9saXZlLWVkaXQtZXhwZWN0ZWQudHh0CkBAIC0xMCw1ICsxMCwxNiBAQCBmdW5jdGlvbiBmKCkK IH0KIAogPT1Tb3VyY2UgZnJhbWUgY29udGVudHMgZW5kPT0KKworUnVubmluZzogdGVzdExpdmVF ZGl0V2hlblBhdXNlZAorU2NyaXB0IGV4ZWN1dGlvbiBwYXVzZWQuCitDYWxsIHN0YWNrOgorICAg IDApIGYxIChlZGl0LW1lLXdoZW4tcGF1c2VkLmpzOjEzKQorICAgIDEpICAoOjEpCisgICAgMikg ZXZhbCAoKGludGVybmFsIHNjcmlwdCk6MTQ2KQorICAgIDMpIEluamVjdGVkU2NyaXB0Ll9ldmFs dWF0ZU9uICg6MjgzKQorICAgIDQpIEluamVjdGVkU2NyaXB0Ll9ldmFsdWF0ZUFuZFdyYXAgKDoy NjUpCisgICAgNSkgSW5qZWN0ZWRTY3JpcHQuZXZhbHVhdGUgKDoyNDUpCitTY3JpcHQgZXhlY3V0 aW9uIHJlc3VtZWQuCiBEZWJ1Z2dlciB3YXMgZGlzYWJsZWQuCiAKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQuaHRtbCBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci9saXZlLWVkaXQuaHRtbAppbmRleCA2Y2QyYjQ3Li4zZTBiZDhkIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvbGl2ZS1lZGl0Lmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2xpdmUtZWRpdC5odG1sCkBAIC0z LDYgKzMsNyBAQAogPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3Bl Y3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2lu c3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSJyZXNvdXJj ZXMvZWRpdC1tZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2VkaXQtbWUt d2hlbi1wYXVzZWQuanMiPjwvc2NyaXB0PgogCiA8c2NyaXB0PgogCkBAIC0xOCwxMSArMTksNyBA QCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3Vy Y2Uoc291cmNlRnJhbWUpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLCAiX2RpZEVkaXRTY3Jp cHRTb3VyY2UiLCBkaWRFZGl0U2NyaXB0U291cmNlKTsKLSAgICAgICAgICAgICAgICBzb3VyY2VG cmFtZS5fdGV4dFZpZXdlci5yZWFkT25seSA9IGZhbHNlOwotICAgICAgICAgICAgICAgIHNvdXJj ZUZyYW1lLl9zdGFydEVkaXRpbmcoKTsKLSAgICAgICAgICAgICAgICB2YXIgbmV3VGV4dCA9IHNv dXJjZUZyYW1lLl90ZXh0TW9kZWwudGV4dC5yZXBsYWNlKCJyZXR1cm4gMDsiLCAicmV0dXJuIFwi bGl2ZS1lZGl0ZWQgc3RyaW5nXCI7Iik7Ci0gICAgICAgICAgICAgICAgc291cmNlRnJhbWUuX3Rl eHRNb2RlbC5zZXRUZXh0KG51bGwsIG5ld1RleHQpOwotICAgICAgICAgICAgICAgIHNvdXJjZUZy YW1lLl9oYW5kbGVTYXZlKCk7CisgICAgICAgICAgICAgICAgcmVwbGFjZUluU291cmNlKHNvdXJj ZUZyYW1lLCAicmV0dXJuIDA7IiwgInJldHVybiBcImxpdmUtZWRpdGVkIHN0cmluZ1wiOyIpOwog ICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmdW5jdGlvbiBkaWRFZGl0U2NyaXB0U291cmNl KCkKQEAgLTM2LDggKzMzLDQ2IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZHVtcFNvdXJjZUZyYW1lQ29udGVudHMocGFuZWwudmlzaWJsZVZpZXcpOwog ICAgICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSwKKworICAg ICAgICBmdW5jdGlvbiB0ZXN0TGl2ZUVkaXRXaGVuUGF1c2VkKG5leHQpCisgICAgICAgIHsKKyAg ICAgICAgICAgIEluc3BlY3RvclRlc3Quc2hvd1NjcmlwdFNvdXJjZSgiZWRpdC1tZS13aGVuLXBh dXNlZC5qcyIsIGRpZFNob3dTY3JpcHRTb3VyY2UpOworCisgICAgICAgICAgICBmdW5jdGlvbiBk aWRTaG93U2NyaXB0U291cmNlKHNvdXJjZUZyYW1lKQorICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3Qud2FpdFVudGlsUGF1c2VkKHBhdXNlZCk7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgiZjEoKSIsIGRpZEV2YWx1YXRlSW5Q YWdlKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gcGF1c2VkKGNhbGxG cmFtZXMpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRT bmlmZmVyKFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLCAiX2RpZEVkaXRTY3JpcHRTb3VyY2Ui LCBkaWRFZGl0U2NyaXB0U291cmNlKTsKKyAgICAgICAgICAgICAgICByZXBsYWNlSW5Tb3VyY2Uo cGFuZWwudmlzaWJsZVZpZXcsICJyZXR1cm4gMTsiLCAicmV0dXJuIDI7XG5cblxuXG4iKTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gZGlkRWRpdFNjcmlwdFNvdXJjZSgp CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5jYXB0dXJlU3Rh Y2tUcmFjZShXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5jYWxsRnJhbWVzKTsKKyAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LnJlc3VtZUV4ZWN1dGlvbigpOworICAgICAgICAgICAgfQor CisgICAgICAgICAgICBmdW5jdGlvbiBkaWRFdmFsdWF0ZUluUGFnZShyZXN1bHQpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnRFcXVhbHMoIjMiLCBy ZXN1bHQuZGVzY3JpcHRpb24sICJlZGl0ZWQgZnVuY3Rpb24gcmV0dXJucyB3cm9uZyByZXN1bHQi KTsKKyAgICAgICAgICAgICAgICBuZXh0KCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICBdKTsKKworICAgIGZ1bmN0aW9uIHJlcGxhY2VJblNvdXJjZShzb3VyY2VGcmFtZSwgc3RyaW5n LCByZXBsYWNlbWVudCkKKyAgICB7CisgICAgICAgIHNvdXJjZUZyYW1lLl90ZXh0Vmlld2VyLnJl YWRPbmx5ID0gZmFsc2U7CisgICAgICAgIHNvdXJjZUZyYW1lLl9zdGFydEVkaXRpbmcoKTsKKyAg ICAgICAgdmFyIG5ld1RleHQgPSBzb3VyY2VGcmFtZS5fdGV4dE1vZGVsLnRleHQucmVwbGFjZShz dHJpbmcsIHJlcGxhY2VtZW50KTsKKyAgICAgICAgc291cmNlRnJhbWUuX3RleHRNb2RlbC5zZXRU ZXh0KG51bGwsIG5ld1RleHQpOworICAgICAgICBzb3VyY2VGcmFtZS5faGFuZGxlU2F2ZSgpOwor ICAgIH0KIH07CiAKIDwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3Jlc291cmNlcy9lZGl0LW1lLXdoZW4tcGF1c2VkLmpzIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL3Jlc291cmNlcy9lZGl0LW1lLXdoZW4tcGF1c2VkLmpzCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU4YjljOGUKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmVzb3VyY2VzL2VkaXQtbWUtd2hlbi1w YXVzZWQuanMKQEAgLTAsMCArMSwxMSBAQAorZnVuY3Rpb24gZjIoKQoreworICAgIHJldHVybiAx OworfQorCitmdW5jdGlvbiBmMSgpCit7CisgICAgdmFyIHggPSAxOworICAgIGRlYnVnZ2VyOwor ICAgIHJldHVybiB4ICsgZjIoKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZWQ0OTQ4Li4yZjhlMDg3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDMtMzAgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVubmVjZXNzYXJ5IG5ld0Jv ZHkgb3V0cHV0IHBhcmFtZXRlciBmcm9tIGVkaXRTY3JpcHRTb3VyY2UgcHJvdG9jb2wgbWV0aG9k LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc0NDQK KworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcmlwdERlYnVnU2VydmVyOjplZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAg KiBiaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5oOgorICAgICAgICAqIGJpbmRpbmdzL3Y4 L1NjcmlwdERlYnVnU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdERlYnVnU2Vy dmVyOjplZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHREZWJ1 Z1NlcnZlci5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGVidWdnZXJNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dl ck1vZGVsLnByb3RvdHlwZS5lZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5fZGlkRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLmVk aXRTY3JpcHRTb3VyY2UuZGlkRWRpdFNjcmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuZWRpdFNjcmlwdFNvdXJjZSk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2hhbmRsZVNhdmUuZGlkRWRpdFNj cmlwdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBl Ll9oYW5kbGVTYXZlKToKKwogMjAxMS0wMy0yOSAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbW92ZSB0aGUgZXh0cmFuZW91cyBkZWNsYXJhdGlv biBJIGFjY2lkZW50YWxseSBhZGRlZCBpbiByODIzNzYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5jcHAKaW5kZXggMzJhM2IyZC4uNTUwZGNiYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERlYnVnU2VydmVyLmNw cApAQCAtMjQ4LDcgKzI0OCw3IEBAIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OnN0ZXBPdXRPZkZ1 bmN0aW9uKCkKICAgICBtX2RvbmVQcm9jZXNzaW5nRGVidWdnZXJFdmVudHMgPSB0cnVlOwogfQog Ci1ib29sIFNjcmlwdERlYnVnU2VydmVyOjplZGl0U2NyaXB0U291cmNlKGNvbnN0IFN0cmluZyYs IGNvbnN0IFN0cmluZyYsIFN0cmluZyYpCitib29sIFNjcmlwdERlYnVnU2VydmVyOjplZGl0U2Ny aXB0U291cmNlKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIFN0cmluZyopCiB7CiAgICAg Ly8gRklYTUUoNDAzMDApOiBpbXBsZW1lbnQgdGhpcy4KICAgICByZXR1cm4gZmFsc2U7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHREZWJ1Z1NlcnZlci5oIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RGVidWdTZXJ2ZXIuaAppbmRleCBlN2U4 NTAyLi4zYzhjOGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHREZWJ1Z1NlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdERl YnVnU2VydmVyLmgKQEAgLTg3LDcgKzg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgc3RlcE92ZXJT dGF0ZW1lbnQoKTsKICAgICB2b2lkIHN0ZXBPdXRPZkZ1bmN0aW9uKCk7CiAKLSAgICBib29sIGVk aXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiBuZXdD b250ZW50LCBTdHJpbmcmIG5ld1NvdXJjZU9yRXJyb3JNZXNzYWdlKTsKKyAgICBib29sIGVkaXRT Y3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiBuZXdDb250 ZW50LCBTdHJpbmcqIGVycm9yKTsKIAogICAgIHZvaWQgcmVjb21waWxlQWxsSlNGdW5jdGlvbnNT b29uKCk7CiAgICAgdm9pZCByZWNvbXBpbGVBbGxKU0Z1bmN0aW9ucyhUaW1lcjxTY3JpcHREZWJ1 Z1NlcnZlcj4qID0gMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHREZWJ1Z1NlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRE ZWJ1Z1NlcnZlci5jcHAKaW5kZXggYTJjZjMwYS4uZWIwNTUxYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmNwcApAQCAtMjkyLDcgKzI5Miw3 IEBAIHZvaWQgU2NyaXB0RGVidWdTZXJ2ZXI6OnN0ZXBPdXRPZkZ1bmN0aW9uKCkKICAgICBjb250 aW51ZVByb2dyYW0oKTsKIH0KIAotYm9vbCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZWRpdFNjcmlwdFNv dXJjZShjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBjb25zdCBTdHJpbmcmIG5ld0NvbnRlbnQsIFN0 cmluZyYgbmV3U291cmNlT3JFcnJvck1lc3NhZ2UpCitib29sIFNjcmlwdERlYnVnU2VydmVyOjpl ZGl0U2NyaXB0U291cmNlKGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgbmV3 Q29udGVudCwgU3RyaW5nKiBlcnJvcikKIHsKICAgICBlbnN1cmVEZWJ1Z2dlclNjcmlwdENvbXBp bGVkKCk7CiAgICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOwpAQCAtMzEwLDExICszMTAsMTIgQEAg Ym9vbCBTY3JpcHREZWJ1Z1NlcnZlcjo6ZWRpdFNjcmlwdFNvdXJjZShjb25zdCBTdHJpbmcmIHNv dXJjZUlELCBjb25zdCBTdHJpbmcmIG4KICAgICBpZiAodHJ5Q2F0Y2guSGFzQ2F1Z2h0KCkpIHsK ICAgICAgICAgdjg6OkxvY2FsPHY4OjpNZXNzYWdlPiBtZXNzYWdlID0gdHJ5Q2F0Y2guTWVzc2Fn ZSgpOwogICAgICAgICBpZiAoIW1lc3NhZ2UuSXNFbXB0eSgpKQotICAgICAgICAgICAgbmV3U291 cmNlT3JFcnJvck1lc3NhZ2UgPSB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hl Y2sobWVzc2FnZS0+R2V0KCkpOworICAgICAgICAgICAgKmVycm9yID0gdG9XZWJDb3JlU3RyaW5n V2l0aE51bGxPclVuZGVmaW5lZENoZWNrKG1lc3NhZ2UtPkdldCgpKTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgKmVycm9yID0gIlVua25vd24gZXJyb3IuIjsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KICAgICBBU1NFUlQoIXJlc3VsdC5Jc0VtcHR5KCkpOwotICAgIG5ld1NvdXJj ZU9yRXJyb3JNZXNzYWdlID0gdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNr KHJlc3VsdCk7CiAKICAgICAvLyBDYWxsIHN0YWNrIG1heSBoYXZlIGNoYW5nZWQgYWZ0ZXIgaWYg dGhlIGVkaXRlZCBmdW5jdGlvbiB3YXMgb24gdGhlIHN0YWNrLgogICAgIGlmIChtX2N1cnJlbnRD YWxsRnJhbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRE ZWJ1Z1NlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0RGVidWdTZXJ2 ZXIuaAppbmRleCBlZTkyZDA4Li45Mjk3NDhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHREZWJ1Z1NlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdERlYnVnU2VydmVyLmgKQEAgLTc4LDcgKzc4LDcgQEAgcHVibGljOgogICAg IHZvaWQgc3RlcE92ZXJTdGF0ZW1lbnQoKTsKICAgICB2b2lkIHN0ZXBPdXRPZkZ1bmN0aW9uKCk7 CiAKLSAgICBib29sIGVkaXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29u c3QgU3RyaW5nJiBuZXdDb250ZW50LCBTdHJpbmcmIG5ld1NvdXJjZU9yRXJyb3JNZXNzYWdlKTsK KyAgICBib29sIGVkaXRTY3JpcHRTb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3Qg U3RyaW5nJiBuZXdDb250ZW50LCBTdHJpbmcqIGVycm9yKTsKIAogICAgIHZvaWQgcmVjb21waWxl QWxsSlNGdW5jdGlvbnNTb29uKCkgeyB9CiAgICAgdm9pZCByZWNvbXBpbGVBbGxKU0Z1bmN0aW9u cyhUaW1lcjxTY3JpcHREZWJ1Z1NlcnZlcj4qID0gMCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggMGU4MjQ2Ni4uMTc5NWM4MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMTE5Miw3ICsxMTkyLDYgQEAKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJuZXdDb250ZW50IiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIk5ldyBjb250ZW50IG9mIHRoZSBzY3JpcHQuIiB9CiAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJyZXN1bHQiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiTmV3 IGNvbnRlbnQgb2YgdGhlIHNjcmlwdC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAic3RhY2tGcmFtZXMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiIDogIkNh bGxGcmFtZSJ9LCAiZGVzY3JpcHRpb24iOiAiTmV3IHN0YWNrIHRyYWNlIGluIGNhc2UgZWRpdGlu ZyBoYXMgaGFwcGVuZWQgd2hpbGUgVk0gd2FzIHN0b3BwZWQuIiB9CiAgICAgICAgICAgICAgICAg XSwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiRWRpdHMgSmF2YVNjcmlwdCBzY3Jp cHQgbGl2ZS4iCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVi dWdnZXJBZ2VudC5jcHAKaW5kZXggZDQ1OTUzYS4uMmRmMDNkMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcApAQCAtMjQ0LDE0 ICsyNDQsMTAgQEAgYm9vbCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpyZXNvbHZlQnJlYWtwb2lu dChjb25zdCBTdHJpbmcmIGJyZWFrcG9pbnRJZCwgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0K IAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjplZGl0U2NyaXB0U291cmNlKEVycm9yU3Ry aW5nKiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBzb3VyY2VJRCwgY29uc3QgU3RyaW5nJiBu ZXdDb250ZW50LCBTdHJpbmcqIHJlc3VsdCwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogbmV3Q2Fs bEZyYW1lcykKK3ZvaWQgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6ZWRpdFNjcmlwdFNvdXJjZShF cnJvclN0cmluZyogZXJyb3IsIGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYg bmV3Q29udGVudCwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogbmV3Q2FsbEZyYW1lcykKIHsKLSAg ICBTdHJpbmcgZWRpdFJlc3VsdDsKLSAgICBpZiAoU2NyaXB0RGVidWdTZXJ2ZXI6OnNoYXJlZCgp LmVkaXRTY3JpcHRTb3VyY2Uoc291cmNlSUQsIG5ld0NvbnRlbnQsIGVkaXRSZXN1bHQpKSB7Cisg ICAgaWYgKFNjcmlwdERlYnVnU2VydmVyOjpzaGFyZWQoKS5lZGl0U2NyaXB0U291cmNlKHNvdXJj ZUlELCBuZXdDb250ZW50LCBlcnJvcikpCiAgICAgICAgICpuZXdDYWxsRnJhbWVzID0gY3VycmVu dENhbGxGcmFtZXMoKTsKLSAgICAgICAgKnJlc3VsdCA9IGVkaXRSZXN1bHQ7Ci0gICAgfSBlbHNl Ci0gICAgICAgICplcnJvclN0cmluZyA9IGVkaXRSZXN1bHQ7CiB9CiAKIHZvaWQgSW5zcGVjdG9y RGVidWdnZXJBZ2VudDo6Z2V0U2NyaXB0U291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5n JiBzb3VyY2VJRCwgU3RyaW5nKiBzY3JpcHRTb3VyY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaAppbmRleCA0NjNiYjhhLi4zMjZlYzY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJB Z2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFn ZW50LmgKQEAgLTg1LDcgKzg1LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQnJlYWtwb2lu dChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgYnJlYWtwb2ludElkKTsKICAgICB2b2lkIGNv bnRpbnVlVG9Mb2NhdGlvbihFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSWQsIGlu dCBsaW5lTnVtYmVyLCBpbnQgY29sdW1uTnVtYmVyKTsKIAotICAgIHZvaWQgZWRpdFNjcmlwdFNv dXJjZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYg bmV3Q29udGVudCwgU3RyaW5nKiByZXN1bHQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4qIG5ld0Nh bGxGcmFtZXMpOworICAgIHZvaWQgZWRpdFNjcmlwdFNvdXJjZShFcnJvclN0cmluZyosIGNvbnN0 IFN0cmluZyYgc291cmNlSUQsIGNvbnN0IFN0cmluZyYgbmV3Q29udGVudCwgUmVmUHRyPEluc3Bl Y3RvckFycmF5PiogbmV3Q2FsbEZyYW1lcyk7CiAgICAgdm9pZCBnZXRTY3JpcHRTb3VyY2UoRXJy b3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlELCBTdHJpbmcqIHNjcmlwdFNvdXJjZSk7 CiAgICAgdm9pZCBzY2hlZHVsZVBhdXNlT25OZXh0U3RhdGVtZW50KERlYnVnZ2VyRXZlbnRUeXBl IHR5cGUsIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGRhdGEpOwogICAgIHZvaWQgY2FuY2Vs UGF1c2VPbk5leHRTdGF0ZW1lbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwppbmRleCBkMDFlYWI2Li43ODc1ZjNmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVs LmpzCkBAIC0xNzYsMTUgKzE3NiwxNSBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90 b3R5cGUgPSB7CiAKICAgICBlZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbihzb3VyY2VJRCwgbmV3 U291cmNlLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIERlYnVnZ2VyQWdlbnQuZWRpdFNjcmlw dFNvdXJjZShzb3VyY2VJRCwgbmV3U291cmNlLCB0aGlzLl9kaWRFZGl0U2NyaXB0U291cmNlLmJp bmQodGhpcywgc291cmNlSUQsIGNhbGxiYWNrKSk7CisgICAgICAgIERlYnVnZ2VyQWdlbnQuZWRp dFNjcmlwdFNvdXJjZShzb3VyY2VJRCwgbmV3U291cmNlLCB0aGlzLl9kaWRFZGl0U2NyaXB0U291 cmNlLmJpbmQodGhpcywgc291cmNlSUQsIG5ld1NvdXJjZSwgY2FsbGJhY2spKTsKICAgICB9LAog Ci0gICAgX2RpZEVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJjZUlELCBjYWxsYmFjaywg ZXJyb3IsIGVycm9yLCBuZXdCb2R5LCBjYWxsRnJhbWVzKQorICAgIF9kaWRFZGl0U2NyaXB0U291 cmNlOiBmdW5jdGlvbihzb3VyY2VJRCwgbmV3U291cmNlLCBjYWxsYmFjaywgZXJyb3IsIGNhbGxG cmFtZXMpCiAgICAgewotICAgICAgICBjYWxsYmFjayghZXJyb3IsIGVycm9yIHx8IG5ld0JvZHkp OworICAgICAgICBjYWxsYmFjayhlcnJvcik7CiAgICAgICAgIGlmIChlcnJvcikKICAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0uc291cmNlID0gbmV3 Qm9keTsKKyAgICAgICAgdGhpcy5fc2NyaXB0c1tzb3VyY2VJRF0uc291cmNlID0gbmV3U291cmNl OwogICAgICAgICB0aGlzLl9kZWJ1Z2dlclBhdXNlZERldGFpbHMuY2FsbEZyYW1lcyA9IGNhbGxG cmFtZXM7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmluZGV4IGQxMmFm ZmUuLmFjZWY4ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKQEAgLTEyMiwxOSAr MTIyLDE3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuICAhc2NyaXB0LmxpbmVPZmZzZXQgJiYgIXNjcmlwdC5jb2x1 bW5PZmZzZXQ7CiAgICAgfSwKIAotICAgIGVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKHNvdXJj ZUZpbGVJZCwgdGV4dCwgY2FsbGJhY2spCisgICAgZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24o c291cmNlRmlsZUlkLCBuZXdTb3VyY2UsIGNhbGxiYWNrKQogICAgIHsKICAgICAgICAgdmFyIHNj cmlwdCA9IHRoaXMuX3NjcmlwdEZvclNvdXJjZUZpbGVJZChzb3VyY2VGaWxlSWQpOwogICAgICAg ICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3NvdXJjZUZpbGVzW3NvdXJjZUZpbGVJZF07CiAgICAg ICAgIHZhciBvbGRTb3VyY2UgPSBzb3VyY2VGaWxlLmNvbnRlbnQ7Ci0gICAgICAgIGZ1bmN0aW9u IGRpZEVkaXRTY3JpcHRTb3VyY2Uoc3VjY2VzcywgbmV3Qm9keU9yRXJyb3JNZXNzYWdlKQorICAg ICAgICBmdW5jdGlvbiBkaWRFZGl0U2NyaXB0U291cmNlKGVycm9yKQogICAgICAgICB7Ci0gICAg ICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhmYWxzZSwg bmV3Qm9keU9yRXJyb3JNZXNzYWdlKTsKKyAgICAgICAgICAgIGNhbGxiYWNrKGVycm9yKTsKKyAg ICAgICAgICAgIGlmIChlcnJvcikKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAg ICB9CiAKLSAgICAgICAgICAgIHZhciBuZXdTb3VyY2UgPSBuZXdCb2R5T3JFcnJvck1lc3NhZ2U7 CiAgICAgICAgICAgICB0aGlzLl91cGRhdGVCcmVha3BvaW50c0FmdGVyTGl2ZUVkaXQoc291cmNl RmlsZUlkLCBvbGRTb3VyY2UsIG5ld1NvdXJjZSk7CiAKICAgICAgICAgICAgIHZhciByZXNvdXJj ZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChzY3JpcHQuc291cmNlVVJMKTsKQEAgLTE0 MywxMiArMTQxLDEwIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXNvdXJjZS5zZXRDb250ZW50KG5ld1NvdXJj ZSwgcmV2ZXJ0SGFuZGxlKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgY2FsbGJhY2so dHJ1ZSwgbmV3U291cmNlKTsKLQogICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kZWJ1Z2dl ck1vZGVsLmNhbGxGcmFtZXMpCiAgICAgICAgICAgICAgICAgdGhpcy5fZGVidWdnZXJQYXVzZWQo KTsKICAgICAgICAgfQotICAgICAgICBXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5lZGl0U2Ny aXB0U291cmNlKHNjcmlwdC5zb3VyY2VJRCwgdGV4dCwgZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5k KHRoaXMpKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVnZ2VyTW9kZWwuZWRpdFNjcmlwdFNv dXJjZShzY3JpcHQuc291cmNlSUQsIG5ld1NvdXJjZSwgZGlkRWRpdFNjcmlwdFNvdXJjZS5iaW5k KHRoaXMpKTsKICAgICB9LAogCiAgICAgX3VwZGF0ZUJyZWFrcG9pbnRzQWZ0ZXJMaXZlRWRpdDog ZnVuY3Rpb24oc291cmNlRmlsZUlkLCBvbGRTb3VyY2UsIG5ld1NvdXJjZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDc0ODJm MzQuLjVhOGIxODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcwpAQCAtODIxLDEzICs4MjEsMTMgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9 IHRydWU7CiAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0 ZWQoZmFsc2UpOwogCi0gICAgICAgIGZ1bmN0aW9uIGRpZEVkaXRTY3JpcHRTb3VyY2Uoc3VjY2Vz cywgbmV3Qm9keU9yRXJyb3JNZXNzYWdlKQorICAgICAgICBmdW5jdGlvbiBkaWRFZGl0U2NyaXB0 U291cmNlKGVycm9yKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXN1Y2Nlc3MgJiYgdGhp cy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ID09PSB1bmRlZmluZWQgJiYgdGhpcy5fdGV4dE1v ZGVsLnRleHQgPT09IG5ld1NvdXJjZSkgeworICAgICAgICAgICAgaWYgKGVycm9yICYmIHRoaXMu X29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCA9PT0gdW5kZWZpbmVkICYmIHRoaXMuX3RleHRNb2Rl bC50ZXh0ID09PSBuZXdTb3VyY2UpIHsKICAgICAgICAgICAgICAgICB0aGlzLl9vcmlnaW5hbFRl eHRNb2RlbENvbnRlbnQgPSBvcmlnaW5hbFRleHRNb2RlbENvbnRlbnQ7CiAgICAgICAgICAgICAg ICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9IGZhbHNlOwogICAgICAgICAgICAgICAgIHRo aXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQodHJ1ZSk7Ci0gICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLmxvZyhuZXdCb2R5T3JFcnJvck1lc3NhZ2UsIFdlYkluc3Bl Y3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRXJyb3IpOworICAgICAgICAgICAgICAg IFdlYkluc3BlY3Rvci5sb2coZXJyb3IsIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNz YWdlTGV2ZWwuRXJyb3IpOwogICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93Q29uc29s ZSgpOwogICAgICAgICAgICAgfQogICAgICAgICB9Cg==