92999 2012-08-02 09:16:48 -0700 Web Inspector: Make textModel private to textEditor 2012-08-03 02:03:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 janx janx apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 685474 0 janx 2012-08-02 09:16:48 -0700 The textModel belongs to the textEditor and should be private to it. Currently, it is created outside textEditor and is sometimes accessed directly by a SourceFrame, JavaScriptSourceFrame or UISourceCodeFrame. 685659 1 156137 janx 2012-08-02 12:19:34 -0700 Created attachment 156137 Patch 686450 2 156137 webkit.review.bot 2012-08-03 02:03:21 -0700 Comment on attachment 156137 Patch Clearing flags on attachment: 156137 Committed r124584: <http://trac.webkit.org/changeset/124584> 686451 3 webkit.review.bot 2012-08-03 02:03:26 -0700 All reviewed patches have been landed. Closing bug. 156137 2012-08-02 12:19:34 -0700 2012-08-03 02:03:21 -0700 Patch bug-92999-20120802231914.patch text/plain 17320 janx U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NmYjFlMmY5OWQzYWJi MDAyYWUyZDk0ZGRmZmJlYWQ0NjYyY2JlNy4uMGVkNGFkY2YyNWYxZDdhMjc5ZTQ4NzU3YjRlZDJh NzEyMDUyZDQ3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTA4LTAyICBKYW4g S2Vyb21uZXMgIDxqYW54QGxpbnV4LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtl IHRleHRNb2RlbCBwcml2YXRlIHRvIHRleHRFZGl0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyOTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTWFraW5nIHRleHRNb2RlbCBwcml2YXRlIHRvIHRoZSB0 ZXh0RWRpdG9yIGVuc3VyZXMgdGhhdCBpdCBpcyBhY2Nlc3NlZAorICAgICAgICBvbmx5IHRocm91 Z2ggdGhlIHRleHRFZGl0b3IsIG1ha2luZyB0aGUgbGF0dGVyIG1vcmUgbW9kdWxhci4KKworICAg ICAgICBUZXN0cyB3ZXJlIGNoYW5nZWQgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLmFmdGVyVGV4dENoYW5nZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX3Jl c3RvcmVCcmVha3BvaW50c0FmdGVyRWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2 YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fYWRkQnJlYWtwb2ludERlY29yYXRpb24pOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX3Jl bW92ZUJyZWFrcG9pbnREZWNvcmF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2Ny aXB0U291cmNlRnJhbWUucHJvdG90eXBlLl9saW5lTnVtYmVyQWZ0ZXJFZGl0aW5nKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5w cm90b3R5cGUuc2V0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLnJlcGxhY2VBbGxXaXRoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5wcm90b3R5cGUuX2NvbGxlY3RSZWdleE1hdGNoZXMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5hZGRNZXNzYWdlVG9Tb3VyY2UpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5yZW1vdmVNZXNzYWdlRnJvbVNvdXJj ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckRlbGVnYXRlRm9yU291cmNlRnJh bWUucHJvdG90eXBlLmNvbW1pdEVkaXRpbmcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3Rv dHlwZS5zZXRUZXh0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlw ZS50ZXh0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZS5yYW5n ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUubGluZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuZ2V0IGxpbmVzQ291bnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3IucHJvdG90eXBlLnNldEF0dHJpYnV0 ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvci5wcm90b3R5cGUuZ2V0QXR0cmli dXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZS5yZW1vdmVB dHRyaWJ1dGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlRnJh bWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBl LmFmdGVyVGV4dENoYW5nZWQpOgorCiAyMDEyLTA4LTAyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVy eXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbmFtZSByZXBvcnRN ZW1vcnlVc2FnZSB0byByZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UgaW4gU3R5bGVSdWxlQmFz ZSBkZXNjZW5kYW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwppbmRleCA1NGZhMWEwOTY0YTMyZWMx YjcxMWE2NDNlNjI1ODU2ZGNkN2UzYzRlLi43YzBhZThjZDQ5NTdmYjZhMGQ1MzQxNTM3MzMyY2Qw YTYyOTVjZjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwpAQCAtMTUwLDcgKzE1MCw3IEBAIFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgIGFmdGVy VGV4dENoYW5nZWQ6IGZ1bmN0aW9uKG9sZFJhbmdlLCBuZXdSYW5nZSkKICAgICB7CiAgICAgICAg IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuYWZ0ZXJUZXh0Q2hhbmdlZC5jYWxs KHRoaXMsIG9sZFJhbmdlLCBuZXdSYW5nZSk7Ci0gICAgICAgIHRoaXMuX2phdmFTY3JpcHRTb3Vy Y2Uuc2V0V29ya2luZ0NvcHkodGhpcy50ZXh0TW9kZWwudGV4dCgpKTsKKyAgICAgICAgdGhpcy5f amF2YVNjcmlwdFNvdXJjZS5zZXRXb3JraW5nQ29weSh0aGlzLl90ZXh0RWRpdG9yLnRleHQoKSk7 CiAgICAgICAgIHRoaXMuX3Jlc3RvcmVCcmVha3BvaW50c0FmdGVyRWRpdGluZygpOwogICAgIH0s CiAKQEAgLTE5Miw4ICsxOTIsOCBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1l LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5famF2YVNjcmlwdFNvdXJj ZS5pc0RpcnR5KCkgfHwgdGhpcy5famF2YVNjcmlwdFNvdXJjZS5zdXBwb3J0c0VuYWJsZWRCcmVh a3BvaW50c1doaWxlRWRpdGluZygpKSB7CiAgICAgICAgICAgICAvLyBSZXN0b3JlIGFsbCBtdXRl ZCBicmVha3BvaW50cy4KLSAgICAgICAgICAgIGZvciAodmFyIGxpbmVOdW1iZXIgPSAwOyBsaW5l TnVtYmVyIDwgdGhpcy50ZXh0TW9kZWwubGluZXNDb3VudDsgKytsaW5lTnVtYmVyKSB7Ci0gICAg ICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnREZWNvcmF0aW9uID0gdGhpcy50ZXh0TW9kZWwuZ2V0 QXR0cmlidXRlKGxpbmVOdW1iZXIsICJicmVha3BvaW50Iik7CisgICAgICAgICAgICBmb3IgKHZh ciBsaW5lTnVtYmVyID0gMDsgbGluZU51bWJlciA8IHRoaXMuX3RleHRFZGl0b3IubGluZXNDb3Vu dDsgKytsaW5lTnVtYmVyKSB7CisgICAgICAgICAgICAgICAgdmFyIGJyZWFrcG9pbnREZWNvcmF0 aW9uID0gdGhpcy5fdGV4dEVkaXRvci5nZXRBdHRyaWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9p bnQiKTsKICAgICAgICAgICAgICAgICBpZiAoYnJlYWtwb2ludERlY29yYXRpb24pIHsKICAgICAg ICAgICAgICAgICAgICAgLy8gUmVtb3ZlIGZha2UgZGVjb3JhdGlvbgogICAgICAgICAgICAgICAg ICAgICB0aGlzLl9yZW1vdmVCcmVha3BvaW50RGVjb3JhdGlvbihsaW5lTnVtYmVyKTsKQEAgLTMz Myw3ICszMzMsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgIGNvbmRpdGlvbjogY29uZGl0aW9uLAogICAgICAgICAgICAgZW5h YmxlZDogZW5hYmxlZAogICAgICAgICB9OwotICAgICAgICB0aGlzLnRleHRNb2RlbC5zZXRBdHRy aWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9pbnQiLCBicmVha3BvaW50KTsKKyAgICAgICAgdGhp cy50ZXh0RWRpdG9yLnNldEF0dHJpYnV0ZShsaW5lTnVtYmVyLCAiYnJlYWtwb2ludCIsIGJyZWFr cG9pbnQpOwogCiAgICAgICAgIHRoaXMudGV4dEVkaXRvci5iZWdpblVwZGF0ZXMoKTsKICAgICAg ICAgdGhpcy50ZXh0RWRpdG9yLmFkZERlY29yYXRpb24obGluZU51bWJlciwgIndlYmtpdC1icmVh a3BvaW50Iik7CkBAIC0zNTAsNyArMzUwLDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBfcmVtb3ZlQnJlYWtwb2ludERlY29yYXRpb246 IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCiAgICAgewotICAgICAgICB0aGlzLnRleHRNb2RlbC5yZW1v dmVBdHRyaWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9pbnQiKTsKKyAgICAgICAgdGhpcy50ZXh0 RWRpdG9yLnJlbW92ZUF0dHJpYnV0ZShsaW5lTnVtYmVyLCAiYnJlYWtwb2ludCIpOwogICAgICAg ICB0aGlzLnRleHRFZGl0b3IuYmVnaW5VcGRhdGVzKCk7CiAgICAgICAgIHRoaXMudGV4dEVkaXRv ci5yZW1vdmVEZWNvcmF0aW9uKGxpbmVOdW1iZXIsICJ3ZWJraXQtYnJlYWtwb2ludCIpOwogICAg ICAgICB0aGlzLnRleHRFZGl0b3IucmVtb3ZlRGVjb3JhdGlvbihsaW5lTnVtYmVyLCAid2Via2l0 LWJyZWFrcG9pbnQtZGlzYWJsZWQiKTsKQEAgLTQ2MCw3ICs0NjAsNyBAQCBXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKGxpbmVOdW1i ZXIgPT09IG9sZFJhbmdlLnN0YXJ0TGluZSkgewogICAgICAgICAgICAgdmFyIHdoaXRlU3BhY2Vz UmVnZXggPSAvXltcc1x4QTBdKiQvOwogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGxpbmVO dW1iZXIgKyBpIDw9IG5ld1JhbmdlLmVuZExpbmU7ICsraSkgewotICAgICAgICAgICAgICAgIGlm ICghd2hpdGVTcGFjZXNSZWdleC50ZXN0KHRoaXMudGV4dE1vZGVsLmxpbmUobGluZU51bWJlciAr IGkpKSkgeworICAgICAgICAgICAgICAgIGlmICghd2hpdGVTcGFjZXNSZWdleC50ZXN0KHRoaXMu dGV4dEVkaXRvci5saW5lKGxpbmVOdW1iZXIgKyBpKSkpIHsKICAgICAgICAgICAgICAgICAgICAg c2hpZnRPZmZzZXQgPSBpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG cmFtZS5qcwppbmRleCAyOTQ2NGRmZWVjZWMxMjFhMmEwMmI2MGFmZWMzMmYxMmIzNWNjZjczLi42 ZDE4MTllOTFmYmUwODVhNmY5NGIyZjE0NzM4NTI3NDJlMDQ3NDEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAgLTQxLDEwICs0 MSw4IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKGNvbnRlbnRQcm92aWRl cikKICAgICB0aGlzLl91cmwgPSBjb250ZW50UHJvdmlkZXIuY29udGVudFVSTCgpOwogICAgIHRo aXMuX2NvbnRlbnRQcm92aWRlciA9IGNvbnRlbnRQcm92aWRlcjsKIAotICAgIHRoaXMuX3RleHRN b2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsKCk7Ci0KICAgICB2YXIgdGV4 dEVkaXRvckRlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yRGVsZWdhdGVGb3JT b3VyY2VGcmFtZSh0aGlzKTsKLSAgICB0aGlzLl90ZXh0RWRpdG9yID0gbmV3IFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yKHRoaXMuX3RleHRNb2RlbCwgdGhpcy5fdXJsLCB0ZXh0RWRpdG9yRGVsZWdh dGUpOworICAgIHRoaXMuX3RleHRFZGl0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3Io dGhpcy5fdXJsLCB0ZXh0RWRpdG9yRGVsZWdhdGUpOwogCiAgICAgdGhpcy5fY3VycmVudFNlYXJj aFJlc3VsdEluZGV4ID0gLTE7CiAgICAgdGhpcy5fc2VhcmNoUmVzdWx0cyA9IFtdOwpAQCAtMTYw LDExICsxNTgsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl90ZXh0RWRpdG9yLmRvUmVzaXplKCk7CiAgICAgfSwKIAotICAgIGdldCB0ZXh0 TW9kZWwoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbDsKLSAgICB9LAot CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtudW1iZXJ9IGxpbmUKICAgICAgKi8KQEAgLTI5OSw3 ICsyOTIsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl90ZXh0RWRpdG9yLm1pbWVUeXBlID0gbWltZVR5cGU7CiAKICAgICAgICAgdGhpcy5f bG9hZGVkID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnNldFRleHQoY29udGVudCB8 fCAiIik7CisgICAgICAgIHRoaXMuX3RleHRFZGl0b3Iuc2V0VGV4dChjb250ZW50IHx8ICIiKTsK IAogICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLmJlZ2luVXBkYXRlcygpOwogCkBAIC00NTYsOCAr NDQ5LDggQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICB7CiAg ICAgICAgIHRoaXMuX3RleHRFZGl0b3IubWFya0FuZFJldmVhbFJhbmdlKG51bGwpOwogCi0gICAg ICAgIHZhciB0ZXh0ID0gdGhpcy5fdGV4dE1vZGVsLnRleHQoKTsKLSAgICAgICAgdmFyIHJhbmdl ID0gdGhpcy5fdGV4dE1vZGVsLnJhbmdlKCk7CisgICAgICAgIHZhciB0ZXh0ID0gdGhpcy5fdGV4 dEVkaXRvci50ZXh0KCk7CisgICAgICAgIHZhciByYW5nZSA9IHRoaXMuX3RleHRFZGl0b3IucmFu Z2UoKTsKICAgICAgICAgdGV4dCA9IHRleHQucmVwbGFjZShXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUuY3JlYXRlU2VhcmNoUmVnZXgocXVlcnksICJnIiksIHJlcGxhY2VtZW50KTsKIAogICAgICAg ICB0aGlzLl9pc1JlcGxhY2luZyA9IHRydWU7CkBAIC00NjgsOCArNDYxLDggQEAgV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICBfY29sbGVjdFJlZ2V4TWF0Y2hlczog ZnVuY3Rpb24ocmVnZXhPYmplY3QpCiAgICAgewogICAgICAgICB2YXIgcmFuZ2VzID0gW107Ci0g ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQ7ICsr aSkgewotICAgICAgICAgICAgdmFyIGxpbmUgPSB0aGlzLl90ZXh0TW9kZWwubGluZShpKTsKKyAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl90ZXh0RWRpdG9yLmxpbmVzQ291bnQ7ICsr aSkgeworICAgICAgICAgICAgdmFyIGxpbmUgPSB0aGlzLl90ZXh0RWRpdG9yLmxpbmUoaSk7CiAg ICAgICAgICAgICB2YXIgb2Zmc2V0ID0gMDsKICAgICAgICAgICAgIGRvIHsKICAgICAgICAgICAg ICAgICB2YXIgbWF0Y2ggPSByZWdleE9iamVjdC5leGVjKGxpbmUpOwpAQCAtNDkzLDggKzQ4Niw4 IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBhZGRNZXNz YWdlVG9Tb3VyY2U6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIG1zZykKICAgICB7Ci0gICAgICAgIGlm IChsaW5lTnVtYmVyID49IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50KQotICAgICAgICAgICAg bGluZU51bWJlciA9IHRoaXMuX3RleHRNb2RlbC5saW5lc0NvdW50IC0gMTsKKyAgICAgICAgaWYg KGxpbmVOdW1iZXIgPj0gdGhpcy5fdGV4dEVkaXRvci5saW5lc0NvdW50KQorICAgICAgICAgICAg bGluZU51bWJlciA9IHRoaXMuX3RleHRFZGl0b3IubGluZXNDb3VudCAtIDE7CiAgICAgICAgIGlm IChsaW5lTnVtYmVyIDwgMCkKICAgICAgICAgICAgIGxpbmVOdW1iZXIgPSAwOwogCkBAIC01Njcs OCArNTYwLDggQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKIAogICAg IHJlbW92ZU1lc3NhZ2VGcm9tU291cmNlOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBtc2cpCiAgICAg ewotICAgICAgICBpZiAobGluZU51bWJlciA+PSB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3VudCkK LSAgICAgICAgICAgIGxpbmVOdW1iZXIgPSB0aGlzLl90ZXh0TW9kZWwubGluZXNDb3VudCAtIDE7 CisgICAgICAgIGlmIChsaW5lTnVtYmVyID49IHRoaXMuX3RleHRFZGl0b3IubGluZXNDb3VudCkK KyAgICAgICAgICAgIGxpbmVOdW1iZXIgPSB0aGlzLl90ZXh0RWRpdG9yLmxpbmVzQ291bnQgLSAx OwogICAgICAgICBpZiAobGluZU51bWJlciA8IDApCiAgICAgICAgICAgICBsaW5lTnVtYmVyID0g MDsKIApAQCAtNjYyLDcgKzY1NSw3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yRGVsZWdhdGVG b3JTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBjb21taXRFZGl0aW5nOiBmdW5jdGlv bigpCiAgICAgewotICAgICAgICB0aGlzLl9zb3VyY2VGcmFtZS5jb21taXRFZGl0aW5nKHRoaXMu X3NvdXJjZUZyYW1lLl90ZXh0TW9kZWwudGV4dCgpKTsKKyAgICAgICAgdGhpcy5fc291cmNlRnJh bWUuY29tbWl0RWRpdGluZyh0aGlzLl9zb3VyY2VGcmFtZS5fdGV4dEVkaXRvci50ZXh0KCkpOwog ICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGV4dEVkaXRvci5qcwppbmRleCBmYTZmNGQyMDk2NTJkNjEyMGQxNDNjYWI0MzllNWJhMGE1 ZmZjNmQwLi4wYjAyOGMzM2MyZGMzNTkzZGViMzdlOTA0OWExYzIyMDAzNTI0NzVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3IuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yLmpzCkBAIC0z MiwxNiArMzIsMTUgQEAKIC8qKgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICog QGNvbnN0cnVjdG9yCi0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWx9IHRl eHRNb2RlbAogICogQHBhcmFtIHs/c3RyaW5nfSB1cmwKICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlRleHRFZGl0b3JEZWxlZ2F0ZX0gZGVsZWdhdGUKICAqLwotV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3IgPSBmdW5jdGlvbih0ZXh0TW9kZWwsIHVybCwgZGVsZWdhdGUpCitXZWJJbnNwZWN0b3IuVGV4 dEVkaXRvciA9IGZ1bmN0aW9uKHVybCwgZGVsZWdhdGUpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlZp ZXcuY2FsbCh0aGlzKTsKICAgICB0aGlzLnJlZ2lzdGVyUmVxdWlyZWRDU1MoInRleHRFZGl0b3Iu Y3NzIik7CiAKLSAgICB0aGlzLl90ZXh0TW9kZWwgPSB0ZXh0TW9kZWw7CisgICAgdGhpcy5fdGV4 dE1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwoKTsKICAgICB0aGlzLl90 ZXh0TW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLkV2 ZW50cy5UZXh0Q2hhbmdlZCwgdGhpcy5fdGV4dENoYW5nZWQsIHRoaXMpOwogICAgIHRoaXMuX3Rl eHRNb2RlbC5yZXNldFVuZG9TdGFjaygpOwogICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGU7 CkBAIC00MjcsNiArNDI2LDc2IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMuX21haW5QYW5lbC5fcmVzdG9yZVNlbGVjdGlvbih0ZXh0UmFu Z2UpOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdGV4dCAKKyAg ICAgKi8KKyAgICBzZXRUZXh0OiBmdW5jdGlvbih0ZXh0KQorICAgIHsKKyAgICAgICAgdGhpcy5f dGV4dE1vZGVsLnNldFRleHQodGV4dCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1 cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICB0ZXh0OiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fdGV4dE1vZGVsLnRleHQoKTsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlRleHRSYW5nZX0KKyAgICAgKi8KKyAgICByYW5nZTog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbC5yYW5nZSgp OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gbGluZU51bWJlcgor ICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICBsaW5lOiBmdW5jdGlvbihsaW5l TnVtYmVyKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbC5saW5lKGxpbmVO dW1iZXIpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtudW1iZXJ9CisgICAg ICovCisgICAgZ2V0IGxpbmVzQ291bnQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Rl eHRNb2RlbC5saW5lc0NvdW50OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251 bWJlcn0gbGluZQorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBuYW1lICAKKyAgICAgKiBAcGFyYW0g e09iamVjdD99IHZhbHVlICAKKyAgICAgKi8KKyAgICBzZXRBdHRyaWJ1dGU6IGZ1bmN0aW9uKGxp bmUsIG5hbWUsIHZhbHVlKQorICAgIHsKKyAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnNldEF0dHJp YnV0ZShsaW5lLCBuYW1lLCB2YWx1ZSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJh bSB7bnVtYmVyfSBsaW5lCisgICAgICogQHBhcmFtIHtzdHJpbmd9IG5hbWUgIAorICAgICAqIEBy ZXR1cm4ge09iamVjdHxudWxsfSB2YWx1ZSAgCisgICAgICovCisgICAgZ2V0QXR0cmlidXRlOiBm dW5jdGlvbihsaW5lLCBuYW1lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2Rl bC5nZXRBdHRyaWJ1dGUobGluZSwgbmFtZSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBw YXJhbSB7bnVtYmVyfSBsaW5lCisgICAgICogQHBhcmFtIHtzdHJpbmd9IG5hbWUKKyAgICAgKi8K KyAgICByZW1vdmVBdHRyaWJ1dGU6IGZ1bmN0aW9uKGxpbmUsIG5hbWUpCisgICAgeworICAgICAg ICB0aGlzLl90ZXh0TW9kZWwucmVtb3ZlQXR0cmlidXRlKGxpbmUsIG5hbWUpOworICAgIH0sCisK ICAgICB3YXNTaG93bjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLnJlYWRP bmx5KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJ U291cmNlQ29kZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9V SVNvdXJjZUNvZGVGcmFtZS5qcwppbmRleCBkYjk4ZGY4NzdjZDY2OWE0NTllYTFiYjk0MzJlNzNj ODg0ZmJhZDhhLi40YTM5ZjIxNTUyZWM1ZTk4MDY5MjE0NTk4ZmU2YTliYTE3YjhlMzA2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZy YW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VD b2RlRnJhbWUuanMKQEAgLTYxLDcgKzYxLDcgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZy YW1lLnByb3RvdHlwZSA9IHsKIAogICAgIGFmdGVyVGV4dENoYW5nZWQ6IGZ1bmN0aW9uKG9sZFJh bmdlLCBuZXdSYW5nZSkKICAgICB7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5zZXRXb3Jr aW5nQ29weSh0aGlzLnRleHRNb2RlbC50ZXh0KCkpOworICAgICAgICB0aGlzLl91aVNvdXJjZUNv ZGUuc2V0V29ya2luZ0NvcHkodGhpcy5fdGV4dEVkaXRvci50ZXh0KCkpOwogICAgIH0sCiAKICAg ICBfZGlkRWRpdENvbnRlbnQ6IGZ1bmN0aW9uKGVycm9yKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDc4MGFlZWI3NGYwYzI1 M2NjNDZlYWE3M2QyMDEyZGY4NWJkYjg4MTYuLmE4OGExMzg1M2RjOGMzNDRkZTQ3ZmMwZTJkY2Ew Yzk3NGE0M2NiMjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wOC0wMiAgSmFuIEtlcm9t bmVzICA8amFueEBsaW51eC5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSB0ZXh0 TW9kZWwgcHJpdmF0ZSB0byB0ZXh0RWRpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05Mjk5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRlc3RzIG5vIGxvbmdlciBhY2Nlc3MgdGV4dE1vZGVsIGRpcmVj dGx5IGZyb20gc291cmNlRnJhbWUuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9EZWJ1Z2dlclRlc3QpOgorICAg ICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2xpdmUtZWRpdC10ZXN0LmpzOgorICAgICAgICAo aW5pdGlhbGl6ZV9MaXZlRWRpdFRlc3QuSW5zcGVjdG9yVGVzdC5yZXBsYWNlSW5Tb3VyY2UpOgor ICAgICAgICAoaW5pdGlhbGl6ZV9MaXZlRWRpdFRlc3QpOgorICAgICAgICAqIGluc3BlY3Rvci9k ZWJ1Z2dlci9wYXVzZS1pbi1pbmxpbmUtc2NyaXB0Lmh0bWw6CisgICAgICAgICogaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXIuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVi dWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWw6CisKIDIwMTItMDgtMDIgIEFsZXhhbmRlciBQ YXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFVucmV2 aWV3ZWQsIG1hcmsgMyA0MDQtcmVsYXRlZCBhcHBjYWNoZSB0ZXN0cyBhcyBURVhULgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyLXRlc3QuanMKaW5kZXgg YzYwZTVlNzE3YzExZjhjYWFkNmU4YzdjMmNlZTQzOGZlMjJlOWRiZC4uMWEzNGRjNjU1MWE2ZWQ3 YTExNzg3YTU1MGZiODYwN2U4MDJlYzljNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCkBAIC0xMjgsOSArMTI4LDkgQEAgSW5zcGVj dG9yVGVzdC5jYXB0dXJlU3RhY2tUcmFjZSA9IGZ1bmN0aW9uKGNhbGxGcmFtZXMsIGRyb3BMaW5l TnVtYmVycykKIEluc3BlY3RvclRlc3QuZHVtcFNvdXJjZUZyYW1lQ29udGVudHMgPSBmdW5jdGlv bihzb3VyY2VGcmFtZSkKIHsKICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiPT1Tb3VyY2Ug ZnJhbWUgY29udGVudHMgc3RhcnQ9PSIpOwotICAgIHZhciB0ZXh0TW9kZWwgPSBzb3VyY2VGcmFt ZS5fdGV4dE1vZGVsOwotICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGV4dE1vZGVsLmxpbmVzQ291 bnQ7ICsraSkKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQodGV4dE1vZGVsLmxpbmUo aSkpOworICAgIHZhciB0ZXh0RWRpdG9yID0gc291cmNlRnJhbWUuX3RleHRFZGl0b3I7CisgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCB0ZXh0RWRpdG9yLmxpbmVzQ291bnQ7ICsraSkKKyAgICAgICAg SW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQodGV4dEVkaXRvci5saW5lKGkpKTsKICAgICBJbnNwZWN0 b3JUZXN0LmFkZFJlc3VsdCgiPT1Tb3VyY2UgZnJhbWUgY29udGVudHMgZW5kPT0iKTsKIH07CiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2xpdmUtZWRpdC10 ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbGl2ZS1lZGl0LXRlc3Qu anMKaW5kZXggMzdjNjNjOWFjMWI2Mjg3MTg3NDg4NGQzMjc5MDY3MmU2MzkxMDI2Ni4uYjhjMTk1 YjcxYzE2YWNmOTAyNjA1MTgzOTFmZDQyODJlZWFiMTk3YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbGl2ZS1lZGl0LXRlc3QuanMKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbGl2ZS1lZGl0LXRlc3QuanMKQEAgLTUsNyArNSw3IEBA IEluc3BlY3RvclRlc3QucmVwbGFjZUluU291cmNlID0gZnVuY3Rpb24oc291cmNlRnJhbWUsIHN0 cmluZywgcmVwbGFjZW1lbnQsIGNhbGxiCiAgICAgc291cmNlRnJhbWUuX3RleHRFZGl0b3IuX21h aW5QYW5lbC5zZXRSZWFkT25seShmYWxzZSk7CiAgICAgc291cmNlRnJhbWUuYmVmb3JlVGV4dENo YW5nZWQoKTsKICAgICB2YXIgb2xkUmFuZ2UsIG5ld1JhbmdlOwotICAgIHZhciBsaW5lcyA9IHNv dXJjZUZyYW1lLl90ZXh0TW9kZWwuX2xpbmVzOworICAgIHZhciBsaW5lcyA9IHNvdXJjZUZyYW1l Ll90ZXh0RWRpdG9yLl90ZXh0TW9kZWwuX2xpbmVzOwogICAgIGZvciAodmFyIGkgPSAwOyBpIDwg bGluZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgdmFyIGNvbHVtbiA9IGxpbmVzW2ldLmluZGV4 T2Yoc3RyaW5nKTsKICAgICAgICAgaWYgKGNvbHVtbiA9PT0gLTEpCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcGF1c2UtaW4taW5saW5lLXNjcmlwdC5odG1sIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3BhdXNlLWluLWlubGluZS1zY3JpcHQuaHRt bAppbmRleCBmOTNkOTVhMWZlZGU1N2FlNzI3MDRlNDZmNTM0MjJkZjBjMzBhZGM4Li45NGQ5MDEz NWZiZTc5ODQzODUyNDg1MDQzMDY3NjM5MzgyYjBhOWUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvcGF1c2UtaW4taW5saW5lLXNjcmlwdC5odG1sCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9wYXVzZS1pbi1pbmxpbmUtc2NyaXB0Lmh0bWwK QEAgLTY1LDcgKzY1LDcgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigpCiAgICAgZnVuY3Rpb24gZGlk U2hvd1NjcmlwdChzb3VyY2VGcmFtZSkKICAgICB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KCJkaWRTaG93U2NyaXB0Iik7Ci0gICAgICAgIHZhciByZXNvdXJjZVRleHQgPSBzb3Vy Y2VGcmFtZS5fdGV4dE1vZGVsLnRleHQoKTsKKyAgICAgICAgdmFyIHJlc291cmNlVGV4dCA9IHNv dXJjZUZyYW1lLl90ZXh0RWRpdG9yLnRleHQoKTsKICAgICAgICAgdmFyIGxpbmVzID0gcmVzb3Vy Y2VUZXh0LnNwbGl0KCJcbiIpOwogICAgICAgICB2YXIgY2FsbEZyYW1lcyA9IFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmNhbGxGcmFtZXM7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCJTb3VyY2Ugc3RyaW5ncyBjb3JyZXNwb25kaW5nIHRvIHRoZSBjYWxsIHN0YWNrOiIpOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0 ZXIuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHQtZm9ybWF0dGVy Lmh0bWwKaW5kZXggZjJkMGNjZWQ1ZTFkYzE4OTQ4OTRmNTA2ODBlNWE1MWFjNzgwMmY1MC4uZjFh ZDQ2ZDQzZTU0MjE3MTI2NjdmZjA5MGNmN2U3ZjY3NjY2M2NlNCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdC1mb3JtYXR0ZXIuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0LWZvcm1hdHRlci5odG1sCkBAIC0zNiwx MiArMzYsMTIgQEAgdmFyIHRlc3QgPSBmdW5jdGlvbigpCiAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LnNob3dTY3JpcHRTb3VyY2UoIm9iZnVzY2F0ZWQuanMiLCBkaWRTaG93U2NyaXB0U291cmNl KTsKICAgICAgICAgICAgIGZ1bmN0aW9uIGRpZFNob3dTY3JpcHRTb3VyY2Uoc291cmNlRnJhbWUp CiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgZm9ybWF0dGVyLmZvcm1hdENvbnRlbnQo InRleHQvamF2YXNjcmlwdCIsIHNvdXJjZUZyYW1lLl90ZXh0TW9kZWwudGV4dCgpLCBkaWRGb3Jt YXRDb250ZW50KTsKKyAgICAgICAgICAgICAgICBmb3JtYXR0ZXIuZm9ybWF0Q29udGVudCgidGV4 dC9qYXZhc2NyaXB0Iiwgc291cmNlRnJhbWUuX3RleHRFZGl0b3IudGV4dCgpLCBkaWRGb3JtYXRD b250ZW50KTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgZnVuY3Rpb24gZGlkRm9ybWF0 Q29udGVudChjb250ZW50LCBtYXBwaW5nKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAg IHZhciBzb3VyY2UgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudmlzaWJsZVZpZXcuX3Rl eHRNb2RlbC50ZXh0KCk7CisgICAgICAgICAgICAgICAgdmFyIHNvdXJjZSA9IFdlYkluc3BlY3Rv ci5wYW5lbHMuc2NyaXB0cy52aXNpYmxlVmlldy5fdGV4dEVkaXRvci50ZXh0KCk7CiAgICAgICAg ICAgICAgICAgdmFyIGZvcm1hdHRlZFNvdXJjZSA9IGNvbnRlbnQ7CiAKICAgICAgICAgICAgICAg ICBmdW5jdGlvbiB0ZXN0TWFwcGluZyhzdHJpbmcpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWwgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc291cmNlLXVybC1jb21tZW50Lmh0bWwKaW5kZXggZDNhOGZmMWIx ZjViYTJmYzRkYjczNDg1MGE4Yjg4MjdjMGZmNjVmMS4uMWViMjhhOThmYTAyOWIyODE0ZGI0ZjFh NjcwYTM5YzkyZDY3MjRjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVn Z2VyL3NvdXJjZS11cmwtY29tbWVudC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9k ZWJ1Z2dlci9zb3VyY2UtdXJsLWNvbW1lbnQuaHRtbApAQCAtMjAsNyArMjAsNyBAQCBmdW5jdGlv biB0ZXN0KCkKIAogICAgICAgICAgICAgZnVuY3Rpb24gZGlkU2hvd1NjcmlwdFNvdXJjZShzb3Vy Y2VGcmFtZSkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFk ZFJlc3VsdChzb3VyY2VGcmFtZS50ZXh0TW9kZWwudGV4dCgpKTsKKyAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdChzb3VyY2VGcmFtZS50ZXh0RWRpdG9yLnRleHQoKSk7CiAg ICAgICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9Cg==