55373 2011-02-28 07:25:39 -0800 Web Inspector: [Text editor] Handle decorated lines in the editor 2011-03-01 02:21:28 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 53588 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 359033 0 aandrey 2011-02-28 07:25:39 -0800 We should remove decorations from the lines that were edited. Also we should invalidate search results, if any. 359036 1 84057 aandrey 2011-02-28 07:29:08 -0800 Created attachment 84057 Patch 359759 2 84057 podivilov 2011-03-01 02:21:19 -0800 Comment on attachment 84057 Patch Clearing flags on attachment: 84057 Committed r79984: <http://trac.webkit.org/changeset/79984> 359760 3 podivilov 2011-03-01 02:21:28 -0800 All reviewed patches have been landed. Closing bug. 84057 2011-02-28 07:29:08 -0800 2011-03-01 02:21:19 -0800 Patch bug-55373-20110228182906.patch text/plain 12862 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogNzk4NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ODBkNmFkNjFjODNkNDVi OWE5NTIzYzVhMDFlN2UxMGQ5NmVkMThkLi43MmM2OGQ0MmZmZWZkOGUxNzUwYTY5NTcwNDcyNTg4 YzkzM2I4MmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDItMjggIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtUZXh0IGVkaXRvcl0gSGFu ZGxlIGRlY29yYXRlZCBsaW5lcyBpbiB0aGUgZWRpdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTM3MworCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuX3N0YXJ0RWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlLl9lbmRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5wcm90b3R5cGUuX2NyZWF0ZVRleHRWaWV3ZXIpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRp dG9yR3V0dGVyUGFuZWwucHJvdG90eXBlLnRleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlLmFkZERlY29yYXRpb24pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUucmVtb3Zl RGVjb3JhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUuc2V0IHJlYWRPbmx5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZS5faGFuZGxlRE9NVXBkYXRlcyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX2hhbmRsZURPTVN1YnRyZWVNb2Rp ZmllZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5 cGUuX21hcmtEaXJ0eUxpbmVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFp blBhbmVsLnByb3RvdHlwZS5fYXBwbHlEb21VcGRhdGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fcmVtb3ZlRGVjb3JhdGlvbnNJblJhbmdl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5f dXBkYXRlQ2h1bmtzRm9yUmFuZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZS5fY29sbGVjdExpbmVzRnJvbURpdik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5DaHVuay5wcm90b3R5cGUuYWRkRGVjb3JhdGlvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5DaHVuay5wcm90b3R5cGUucmVtb3Zl RGVjb3JhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5DaHVuay5w cm90b3R5cGUucmVtb3ZlQWxsRGVjb3JhdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3JNYWluQ2h1bmsucHJvdG90eXBlLmdldCBkZWNvcmF0ZWQpOgorCiAyMDExLTAyLTI4 ICBSb2xhbmQgU3RlaW5lciAgPHJvbGFuZHN0ZWluZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEtlbnQgVGFtdXJhLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggODA1MThiMzIzYjA1NmNhY2EzMjViZDM2 YTk4NTc4OWZkNzhhYjVmYi4uOWRiZmNiNTk1ZTkzM2MzMTc1N2MyOTk4YjBmN2U4NjA3YzhiMzRh NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG cmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZy YW1lLmpzCkBAIC0xNDEsMTIgKzE0MSw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlc2l6ZSgpOwogICAgIH0s CiAKLSAgICBzaXplVG9GaXRDb250ZW50SGVpZ2h0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAg ICBpZiAodGhpcy5fdGV4dFZpZXdlcikKLSAgICAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmV2 YWxpZGF0ZURlY29yYXRpb25zQW5kUGFpbnQoKTsKLSAgICB9LAotCiAgICAgZ2V0IHRleHRNb2Rl bCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fdGV4dE1vZGVsOwpAQCAtMTgwLDEyICsx NzQsMjYgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLl9saW5lVG9IaWdobGlnaHQ7CiAgICAgfSwKIAorICAgIF9zdGFydEVk aXRpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5jYW5jZWxTZWFy Y2goKTsKKyAgICAgICAgdGhpcy5jbGVhck1lc3NhZ2VzKCk7CisgICAgfSwKKworICAgIF9lbmRF ZGl0aW5nOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCisgICAgeworICAgICAgICAvLyBG SVhNRTogSW1wbGVtZW50IHRoaXMuCisgICAgfSwKKwogICAgIF9jcmVhdGVUZXh0Vmlld2VyOiBm dW5jdGlvbihtaW1lVHlwZSwgY29udGVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnQg PSBjb250ZW50OwogICAgICAgICB0aGlzLl90ZXh0TW9kZWwuc2V0VGV4dChudWxsLCBjb250ZW50 LnRleHQpOwogCiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRl eHRWaWV3ZXIodGhpcy5fdGV4dE1vZGVsLCBXZWJJbnNwZWN0b3IucGxhdGZvcm0sIHRoaXMuX3Vy bCk7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuc3RhcnRFZGl0aW5nTGlzdGVuZXIgPSB0aGlz Ll9zdGFydEVkaXRpbmcuYmluZCh0aGlzKTsKKyAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5lbmRF ZGl0aW5nTGlzdGVuZXIgPSB0aGlzLl9lbmRFZGl0aW5nLmJpbmQodGhpcyk7CisKICAgICAgICAg dmFyIGVsZW1lbnQgPSB0aGlzLl90ZXh0Vmlld2VyLmVsZW1lbnQ7CiAgICAgICAgIGVsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250ZXh0TWVudS5iaW5kKHRo aXMpLCB0cnVlKTsKICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24i LCB0aGlzLl9tb3VzZURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKaW5kZXggY2RjYjI3MThjYjZiMWQ0 YTkwMWNmMjMxOTMxMDFiMjA4NDFiYzFmMi4uMGM3OGU1OGI2ZmZkYmY0YjIwY2Y4Y2RhN2NiMDgx ZWQ3MmFhMTIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UZXh0Vmlld2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VGV4dFZpZXdlci5qcwpAQCAtNTI2LDYgKzUyNiwxNSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRv ckd1dHRlclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLmVsZW1lbnQu YXBwZW5kQ2hpbGQoY2h1bmsuZWxlbWVudCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICB0 aGlzLl9yZXBhaW50QWxsKCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBEZWNv cmF0aW9ucyBtYXkgaGF2ZSBiZWVuIHJlbW92ZWQsIHNvIHdlIG1heSBoYXZlIHRvIHN5bmMgdGhv c2UgbGluZXMuCisgICAgICAgICAgICB2YXIgY2h1bmtOdW1iZXIgPSB0aGlzLl9jaHVua051bWJl ckZvckxpbmUobmV3UmFuZ2Uuc3RhcnRMaW5lKTsKKyAgICAgICAgICAgIHZhciBjaHVuayA9IHRo aXMuX3RleHRDaHVua3NbY2h1bmtOdW1iZXJdOworICAgICAgICAgICAgd2hpbGUgKGNodW5rICYm IGNodW5rLnN0YXJ0TGluZSA8PSBuZXdSYW5nZS5lbmRMaW5lKSB7CisgICAgICAgICAgICAgICAg aWYgKGNodW5rLmxpbmVzQ291bnQgPT09IDEpCisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3N5 bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lcihjaHVuay5zdGFydExpbmUpOworICAgICAgICAg ICAgICAgIGNodW5rID0gdGhpcy5fdGV4dENodW5rc1srK2NodW5rTnVtYmVyXTsKKyAgICAgICAg ICAgIH0KICAgICAgICAgfQogICAgIH0KIH0KQEAgLTU2OCwxNCArNTc3LDE4IEBAIFdlYkluc3Bl Y3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsgPSBmdW5jdGlvbih0ZXh0Vmlld2VyLCBzdGFydExp bmUsIGVuZExpbmUpCiBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5rLnByb3RvdHlw ZSA9IHsKICAgICBhZGREZWNvcmF0aW9uOiBmdW5jdGlvbihkZWNvcmF0aW9uKQogICAgIHsKKyAg ICAgICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpbkRvbVVwZGF0ZXMoKTsKICAgICAgICAgaWYgKHR5 cGVvZiBkZWNvcmF0aW9uID09PSAic3RyaW5nIikKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5h ZGRTdHlsZUNsYXNzKGRlY29yYXRpb24pOworICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmVuZERv bVVwZGF0ZXMoKTsKICAgICB9LAogCiAgICAgcmVtb3ZlRGVjb3JhdGlvbjogZnVuY3Rpb24oZGVj b3JhdGlvbikKICAgICB7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYmVnaW5Eb21VcGRhdGVz KCk7CiAgICAgICAgIGlmICh0eXBlb2YgZGVjb3JhdGlvbiA9PT0gInN0cmluZyIpCiAgICAgICAg ICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcyhkZWNvcmF0aW9uKTsKKyAgICAgICAg dGhpcy5fdGV4dFZpZXdlci5lbmREb21VcGRhdGVzKCk7CiAgICAgfSwKIAogICAgIGdldCBleHBh bmRlZCgpCkBAIC02OTEsMTEgKzcwNCwxMyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5Q YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghUHJlZmVyZW5jZXMuc291cmNlRWRpdG9y RW5hYmxlZCkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLmJlZ2luRG9tVXBk YXRlcygpOwogICAgICAgICB0aGlzLl9yZWFkT25seSA9IHJlYWRPbmx5OwogICAgICAgICBpZiAo dGhpcy5fcmVhZE9ubHkpCiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFz cygidGV4dC1lZGl0b3ItZWRpdGFibGUiKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhp cy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInRleHQtZWRpdG9yLWVkaXRhYmxlIik7CisgICAgICAg IHRoaXMuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCiAKICAgICBtYXJrQW5kUmV2ZWFsUmFuZ2U6 IGZ1bmN0aW9uKHJhbmdlKQpAQCAtMTEzOCwxMyArMTE1Myw3IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog Ci0gICAgICAgIGlmICh0aGlzLl9kaXJ0eUxpbmVzKSB7Ci0gICAgICAgICAgICB0aGlzLl9kaXJ0 eUxpbmVzLnN0YXJ0ID0gTWF0aC5taW4odGhpcy5fZGlydHlMaW5lcy5zdGFydCwgc3RhcnRMaW5l KTsKLSAgICAgICAgICAgIHRoaXMuX2RpcnR5TGluZXMuZW5kID0gTWF0aC5tYXgodGhpcy5fZGly dHlMaW5lcy5lbmQsIGVuZExpbmUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhp cy5fZGlydHlMaW5lcyA9IHsgc3RhcnQ6IHN0YXJ0TGluZSwgZW5kOiBlbmRMaW5lIH07Ci0gICAg ICAgICAgICBzZXRUaW1lb3V0KHRoaXMuX2FwcGx5RG9tVXBkYXRlcy5iaW5kKHRoaXMpLCAwKTsK LSAgICAgICAgfQorICAgICAgICB0aGlzLl9tYXJrRGlydHlMaW5lcyhzdGFydExpbmUsIGVuZExp bmUpOwogICAgIH0sCiAKICAgICBfaGFuZGxlRE9NU3VidHJlZU1vZGlmaWVkOiBmdW5jdGlvbihl KQpAQCAtMTE2NCw4ICsxMTczLDIwIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGVuZExpbmUgPSBNYXRoLm1heChzZWxlY3Rpb24u c3RhcnRMaW5lLCBzZWxlY3Rpb24uZW5kTGluZSkgKyAxOwogICAgICAgICBlbmRMaW5lID0gTWF0 aC5taW4odGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQsIGVuZExpbmUpOwogCi0gICAgICAgIHRo aXMuX2RpcnR5TGluZXMgPSB7IHN0YXJ0OiBzdGFydExpbmUsIGVuZDogZW5kTGluZSB9OwotICAg ICAgICBzZXRUaW1lb3V0KHRoaXMuX2FwcGx5RG9tVXBkYXRlcy5iaW5kKHRoaXMpLCAwKTsKKyAg ICAgICAgdGhpcy5fbWFya0RpcnR5TGluZXMoc3RhcnRMaW5lLCBlbmRMaW5lKTsKKyAgICB9LAor CisgICAgX21hcmtEaXJ0eUxpbmVzOiBmdW5jdGlvbihzdGFydExpbmUsIGVuZExpbmUpCisgICAg eworICAgICAgICBpZiAodGhpcy5fZGlydHlMaW5lcykgeworICAgICAgICAgICAgdGhpcy5fZGly dHlMaW5lcy5zdGFydCA9IE1hdGgubWluKHRoaXMuX2RpcnR5TGluZXMuc3RhcnQsIHN0YXJ0TGlu ZSk7CisgICAgICAgICAgICB0aGlzLl9kaXJ0eUxpbmVzLmVuZCA9IE1hdGgubWF4KHRoaXMuX2Rp cnR5TGluZXMuZW5kLCBlbmRMaW5lKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRo aXMuX2RpcnR5TGluZXMgPSB7IHN0YXJ0OiBzdGFydExpbmUsIGVuZDogZW5kTGluZSB9OworICAg ICAgICAgICAgc2V0VGltZW91dCh0aGlzLl9hcHBseURvbVVwZGF0ZXMuYmluZCh0aGlzKSwgMCk7 CisgICAgICAgICAgICAvLyBSZW1vdmUgbWFya2VkIHJhbmdlcywgaWYgYW55LgorICAgICAgICAg ICAgdGhpcy5tYXJrQW5kUmV2ZWFsUmFuZ2UobnVsbCk7CisgICAgICAgIH0KICAgICB9LAogCiAg ICAgX2FwcGx5RG9tVXBkYXRlczogZnVuY3Rpb24oKQpAQCAtMTE3MywxOSArMTE5NCwxOCBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlm ICghdGhpcy5fZGlydHlMaW5lcykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YXIg ZGlydHlMaW5lcyA9IHRoaXMuX2RpcnR5TGluZXM7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9kaXJ0 eUxpbmVzOwotCiAgICAgICAgIC8vIENoZWNrIGlmIHRoZSBlZGl0b3IgaGFkIGJlZW4gc2V0IHJl YWRPbmx5IGJ5IHRoZSBtb21lbnQgd2hlbiB0aGlzIGFzeW5jIGNhbGxiYWNrIGdvdCBleGVjdXRl ZC4KLSAgICAgICAgaWYgKHRoaXMuX3JlYWRPbmx5KQorICAgICAgICBpZiAodGhpcy5fcmVhZE9u bHkpIHsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9kaXJ0eUxpbmVzOwogICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CiAKKyAgICAgICAgLy8gVGhpcyBpcyBhICJmb3JlaWduIiBjYWxs IG91dHNpZGUgb2YgdGhpcyBjbGFzcy4gU2hvdWxkIGJlIGJlZm9yZSB3ZSBkZWxldGUgdGhlIGRp cnR5IGxpbmVzIGZsYWcuCiAgICAgICAgIHRoaXMuX2VudGVyVGV4dENoYW5nZU1vZGUoKTsKIAot ICAgICAgICAvLyBGSVhNRTogREVMRVRFIERFQ09SQVRJT05TIElOIFRIRSBJTlZPTFZFRCBDSFVO S1MgSUYgQU5ZISBTWU5DIFRIRSBHVVRURVIgQUxTTy4KKyAgICAgICAgdmFyIGRpcnR5TGluZXMg PSB0aGlzLl9kaXJ0eUxpbmVzOworICAgICAgICBkZWxldGUgdGhpcy5fZGlydHlMaW5lczsKIAot ICAgICAgICAvLyBGSVhNRTogREVMRVRFIE1BUktFRCBBTkQgSElHSExJR0hURUQgTElORVMgKElO VkFMSURBVEUgU0VBUkNIIFJFU1VMVFMpISB0aGlzLl9tYXJrZWRSYW5nZUVsZW1lbnQKLSAgICAg ICAgCiAgICAgICAgIHZhciBmaXJzdENodW5rTnVtYmVyID0gdGhpcy5fY2h1bmtOdW1iZXJGb3JM aW5lKGRpcnR5TGluZXMuc3RhcnQpOwogICAgICAgICB2YXIgc3RhcnRMaW5lID0gdGhpcy5fdGV4 dENodW5rc1tmaXJzdENodW5rTnVtYmVyXS5zdGFydExpbmU7CiAgICAgICAgIHZhciBlbmRMaW5l ID0gdGhpcy5fdGV4dE1vZGVsLmxpbmVzQ291bnQ7CkBAIC0xMjQwLDYgKzEyNjAsNyBAQCBXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAog ICAgICAgICB0aGlzLmJlZ2luRG9tVXBkYXRlcygpOworICAgICAgICB0aGlzLl9yZW1vdmVEZWNv cmF0aW9uc0luUmFuZ2Uob2xkUmFuZ2UpOwogICAgICAgICB0aGlzLl91cGRhdGVDaHVua3NGb3JS YW5nZXMob2xkUmFuZ2UsIG5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5fdXBkYXRlSGlnaGxpZ2h0 c0ZvclJhbmdlKG5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5fcGFpbnRTa2lwcGVkTGluZXMoKTsK QEAgLTEyNTAsNiArMTI3MSwxNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2V4aXRUZXh0Q2hhbmdlTW9kZShvbGRSYW5nZSwg bmV3UmFuZ2UpOwogICAgIH0sCiAKKyAgICBfcmVtb3ZlRGVjb3JhdGlvbnNJblJhbmdlOiBmdW5j dGlvbihyYW5nZSkKKyAgICB7CisgICAgICAgIGZvciAodmFyIGkgPSB0aGlzLl9jaHVua051bWJl ckZvckxpbmUocmFuZ2Uuc3RhcnRMaW5lKTsgaSA8IHRoaXMuX3RleHRDaHVua3MubGVuZ3RoOyAr K2kpIHsKKyAgICAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3RleHRDaHVua3NbaV07CisgICAg ICAgICAgICBpZiAoY2h1bmsuc3RhcnRMaW5lID4gcmFuZ2UuZW5kTGluZSkKKyAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgIGNodW5rLnJlbW92ZUFsbERlY29yYXRpb25zKCk7Cisg ICAgICAgIH0KKyAgICB9LAorCiAgICAgX3VwZGF0ZUNodW5rc0ZvclJhbmdlczogZnVuY3Rpb24o b2xkUmFuZ2UsIG5ld1JhbmdlKQogICAgIHsKICAgICAgICAgLy8gVXBkYXRlIHRoZSBjaHVua3Mg aW4gcmFuZ2U6IGZpcnN0Q2h1bmtOdW1iZXIgPD0gaW5kZXggPD0gbGFzdENodW5rTnVtYmVyCkBA IC0xMzA0LDcgKzEzMzUsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIC8vIE1heWJlIG1lcmdlIHdpdGggdGhlIG5leHQgY2h1bmssIHNv IHRoYXQgd2Ugc2hvdWxkIG5vdCBjcmVhdGUgMS1zaXplZCBjaHVua3Mgd2hlbiBhcHBlbmRpbmcg bmV3IGxpbmVzIG9uZSBieSBvbmUuCiAgICAgICAgIHZhciBjaHVuayA9IHRoaXMuX3RleHRDaHVu a3NbbGFzdENodW5rTnVtYmVyICsgMV07CiAgICAgICAgIHZhciBsaW5lc0luTGFzdENodW5rID0g bGluZXNDb3VudCAlIHRoaXMuX2RlZmF1bHRDaHVua1NpemU7Ci0gICAgICAgIGlmIChjaHVuayAm JiBsaW5lc0luTGFzdENodW5rID4gMCAmJiBsaW5lc0luTGFzdENodW5rICsgY2h1bmsubGluZXND b3VudCA8PSB0aGlzLl9kZWZhdWx0Q2h1bmtTaXplKSB7CisgICAgICAgIGlmIChjaHVuayAmJiAh Y2h1bmsuZGVjb3JhdGVkICYmIGxpbmVzSW5MYXN0Q2h1bmsgPiAwICYmIGxpbmVzSW5MYXN0Q2h1 bmsgKyBjaHVuay5saW5lc0NvdW50IDw9IHRoaXMuX2RlZmF1bHRDaHVua1NpemUpIHsKICAgICAg ICAgICAgICsrbGFzdENodW5rTnVtYmVyOwogICAgICAgICAgICAgbGluZXNDb3VudCArPSBjaHVu ay5saW5lc0NvdW50OwogICAgICAgICB9CkBAIC0xMzc4LDYgKzE0MDksMTAgQEAgV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgdGV4dENv bnRlbnRzID0gW107CiAgICAgICAgIHZhciBub2RlID0gZWxlbWVudC50cmF2ZXJzZU5leHROb2Rl KGVsZW1lbnQpOwogICAgICAgICB3aGlsZSAobm9kZSkgeworICAgICAgICAgICAgaWYgKGVsZW1l bnQuZGVjb3JhdGlvbnNFbGVtZW50ID09PSBub2RlKSB7CisgICAgICAgICAgICAgICAgbm9kZSA9 IG5vZGUubmV4dFNpYmxpbmc7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAg ICB9CiAgICAgICAgICAgICBpZiAobm9kZS5ub2RlTmFtZS50b0xvd2VyQ2FzZSgpID09PSAiYnIi KQogICAgICAgICAgICAgICAgIHRleHRDb250ZW50cy5wdXNoKCJcbiIpOwogICAgICAgICAgICAg ZWxzZSBpZiAobm9kZS5ub2RlVHlwZSA9PT0gTm9kZS5URVhUX05PREUpCkBAIC0xNDE4LDMzICsx NDUzLDQ2IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpbkNodW5rID0gZnVuY3Rpb24odGV4 dFZpZXdlciwgc3RhcnRMaW5lLCBlbmRMaW5lKQogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWlu Q2h1bmsucHJvdG90eXBlID0gewogICAgIGFkZERlY29yYXRpb246IGZ1bmN0aW9uKGRlY29yYXRp b24pCiAgICAgewotICAgICAgICBpZiAodHlwZW9mIGRlY29yYXRpb24gPT09ICJzdHJpbmciKSB7 Ci0gICAgICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcyhkZWNvcmF0aW9uKTsKLSAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmJl Z2luRG9tVXBkYXRlcygpOwotICAgICAgICBpZiAoIXRoaXMuZWxlbWVudC5kZWNvcmF0aW9uc0Vs ZW1lbnQpIHsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5kZWNvcmF0aW9uc0VsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5k ZWNvcmF0aW9uc0VsZW1lbnQuY2xhc3NOYW1lID0gIndlYmtpdC1saW5lLWRlY29yYXRpb25zIjsK LSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmVsZW1lbnQuZGVjb3Jh dGlvbnNFbGVtZW50KTsKKyAgICAgICAgaWYgKHR5cGVvZiBkZWNvcmF0aW9uID09PSAic3RyaW5n IikKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKGRlY29yYXRpb24pOwor ICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5lbGVtZW50LmRlY29yYXRpb25z RWxlbWVudCkgeworICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5kZWNvcmF0aW9uc0VsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAgICAgICB0aGlz LmVsZW1lbnQuZGVjb3JhdGlvbnNFbGVtZW50LmNsYXNzTmFtZSA9ICJ3ZWJraXQtbGluZS1kZWNv cmF0aW9ucyI7CisgICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMu ZWxlbWVudC5kZWNvcmF0aW9uc0VsZW1lbnQpOworICAgICAgICAgICAgfQorICAgICAgICAgICAg dGhpcy5lbGVtZW50LmRlY29yYXRpb25zRWxlbWVudC5hcHBlbmRDaGlsZChkZWNvcmF0aW9uKTsK ICAgICAgICAgfQotICAgICAgICB0aGlzLmVsZW1lbnQuZGVjb3JhdGlvbnNFbGVtZW50LmFwcGVu ZENoaWxkKGRlY29yYXRpb24pOwogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmVuZERvbVVwZGF0 ZXMoKTsKICAgICB9LAogCiAgICAgcmVtb3ZlRGVjb3JhdGlvbjogZnVuY3Rpb24oZGVjb3JhdGlv bikKICAgICB7Ci0gICAgICAgIGlmICh0eXBlb2YgZGVjb3JhdGlvbiA9PT0gInN0cmluZyIpIHsK KyAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpbkRvbVVwZGF0ZXMoKTsKKyAgICAgICAgaWYg KHR5cGVvZiBkZWNvcmF0aW9uID09PSAic3RyaW5nIikKICAgICAgICAgICAgIHRoaXMuZWxlbWVu dC5yZW1vdmVTdHlsZUNsYXNzKGRlY29yYXRpb24pOwotICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICB9Ci0gICAgICAgIGlmICghdGhpcy5lbGVtZW50LmRlY29yYXRpb25zRWxlbWVudCkKLSAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgZWxzZSBpZiAodGhpcy5lbGVtZW50LmRlY29yYXRp b25zRWxlbWVudCkKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5kZWNvcmF0aW9uc0VsZW1lbnQu cmVtb3ZlQ2hpbGQoZGVjb3JhdGlvbik7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuZW5kRG9t VXBkYXRlcygpOworICAgIH0sCisKKyAgICByZW1vdmVBbGxEZWNvcmF0aW9uczogZnVuY3Rpb24o KQorICAgIHsKICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpbkRvbVVwZGF0ZXMoKTsKLSAg ICAgICAgdGhpcy5lbGVtZW50LmRlY29yYXRpb25zRWxlbWVudC5yZW1vdmVDaGlsZChkZWNvcmF0 aW9uKTsKKyAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJ3ZWJraXQtbGluZS1jb250 ZW50IjsKKyAgICAgICAgaWYgKHRoaXMuZWxlbWVudC5kZWNvcmF0aW9uc0VsZW1lbnQpIHsKKyAg ICAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZCh0aGlzLmVsZW1lbnQuZGVjb3JhdGlv bnNFbGVtZW50KTsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLmVsZW1lbnQuZGVjb3JhdGlvbnNF bGVtZW50OworICAgICAgICB9CiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuZW5kRG9tVXBkYXRl cygpOwogICAgIH0sCiAKKyAgICBnZXQgZGVjb3JhdGVkKCkKKyAgICB7CisgICAgICAgIHJldHVy biB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lICE9PSAid2Via2l0LWxpbmUtY29udGVudCIgfHwgISEo dGhpcy5lbGVtZW50LmRlY29yYXRpb25zRWxlbWVudCAmJiB0aGlzLmVsZW1lbnQuZGVjb3JhdGlv bnNFbGVtZW50LmZpcnN0Q2hpbGQpOworICAgIH0sCisKICAgICBnZXQgc3RhcnRMaW5lKCkKICAg ICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9zdGFydExpbmU7Cg==