34263 2010-01-28 06:53:08 -0800 Web Inspector: No need to render backgroud sources when performing search. 2010-01-29 02:38:30 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 185467 0 pfeldman 2010-01-28 06:53:08 -0800 Patch will follow. 185468 1 47617 pfeldman 2010-01-28 06:57:48 -0800 Created attachment 47617 [PATCH] Proposed change. 185785 2 pfeldman 2010-01-29 02:38:30 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/Drawer.js M WebCore/inspector/front-end/ScriptView.js M WebCore/inspector/front-end/SourceFrame.js M WebCore/inspector/front-end/SourceView.js M WebCore/inspector/front-end/TextEditor.js M WebCore/inspector/front-end/TextEditorHighlighter.js M WebCore/inspector/front-end/TextEditorModel.js Committed r54052 47617 2010-01-28 06:57:48 -0800 2010-01-28 22:32:55 -0800 [PATCH] Proposed change. search text/plain 15395 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODhkYjRhMS4uYTk4ODlhNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NSBAQAorMjAxMC0wMS0yOCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBObyBuZWVkIHRvIHJlbmRlciBiYWNr Z3JvdW5kIHNvdXJjZXMKKyAgICAgICAgd2hlbiBwZXJmb3JtaW5nIHNlYXJjaC4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQyNjMKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TY3JpcHRWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRWaWV3LnByb3Rv dHlwZS5zaG93KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuc2V0IHZpc2libGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5zZXQgZXhlY3V0aW9uTGluZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnJldmVhbExpbmUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5jbGVhck1lc3NhZ2VzKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuc2l6ZVRvRml0Q29udGVu dEhlaWdodCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnNl dENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5f Y3JlYXRlRWRpdG9ySWZOZWVkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l LnByb3RvdHlwZS5zZXRTZWxlY3Rpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZS5jbGVhclNlbGVjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlLl9jb250ZXh0TWVudS5hZGRDb25kaXRpb25hbEJyZWFrcG9pbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY29udGV4dE1l bnUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fdG9nZ2xl QnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBl LnJlc2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWtwb2ludExpbmVOdW1iZXJEZWNv cmF0b3IpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VW aWV3LnByb3RvdHlwZS5oaWRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3LnBy b3RvdHlwZS5yZXNpemUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRv ci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JIaWdobGlnaHRlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UZXh0RWRpdG9ySGlnaGxpZ2h0ZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0 b3JNb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlw ZS5zZXQgY2hhbmdlTGlzdGVuZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN b2RlbC5wcm90b3R5cGUuc2V0VGV4dCk6CisKIDIwMTAtMDEtMjggIE1pa2hhaWwgTmFnYW5vdiAg PG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhh dGNoZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0Vmll dy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRWaWV3LmpzCmluZGV4IDU3 Zjc3YTIuLmNmN2YxYjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRWaWV3 LmpzCkBAIC0zMyw5ICszMyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRWaWV3ID0gZnVuY3Rpb24o c2NyaXB0KQogCiAgICAgdGhpcy5fZnJhbWVOZWVkc1NldHVwID0gdHJ1ZTsKICAgICB0aGlzLl9z b3VyY2VGcmFtZVNldHVwID0gZmFsc2U7Ci0gICAgdGhpcy5zb3VyY2VGcmFtZSA9IG5ldyBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUodGhpcy5fYWRkQnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKLQot ICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnNvdXJjZUZyYW1lLmVsZW1lbnQpOwor ICAgIHRoaXMuc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKHRoaXMu ZWxlbWVudCwgdGhpcy5fYWRkQnJlYWtwb2ludC5iaW5kKHRoaXMpKTsKIH0KIAogV2ViSW5zcGVj dG9yLlNjcmlwdFZpZXcucHJvdG90eXBlID0gewpAQCAtNDMsNiArNDEsNyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3Iu Vmlldy5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMsIHBhcmVudEVsZW1lbnQpOwogICAgICAgICB0 aGlzLnNldHVwU291cmNlRnJhbWVJZk5lZWRlZCgpOworICAgICAgICB0aGlzLnNvdXJjZUZyYW1l LnZpc2libGUgPSB0cnVlOwogICAgICAgICB0aGlzLnJlc2l6ZSgpOwogICAgIH0sCiAKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCA5YjRlOTUyLi5hZGIy MWE1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC0y OCwyNyArMjgsMzEgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lID0gZnVuY3Rpb24oYWRkQnJlYWtwb2ludERlbGVnYXRlKQorV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lID0gZnVuY3Rpb24ocGFyZW50RWxlbWVudCwgYWRkQnJlYWtwb2ludERlbGVnYXRl KQogewotICAgIHRoaXMuX2VkaXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvcihXZWJJ bnNwZWN0b3IucGxhdGZvcm0pOwotICAgIHRoaXMuX3RleHRNb2RlbCA9IHRoaXMuX2VkaXRvci50 ZXh0TW9kZWw7Ci0gICAgdGhpcy5fZWRpdG9yLmxpbmVOdW1iZXJEZWNvcmF0b3IgPSBuZXcgV2Vi SW5zcGVjdG9yLkJyZWFrcG9pbnRMaW5lTnVtYmVyRGVjb3JhdG9yKHRoaXMpOwotICAgIHRoaXMu X2VkaXRvci5saW5lRGVjb3JhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5FeGVjdXRpb25MaW5lRGVj b3JhdG9yKHRoaXMpOwotICAgIHRoaXMuX2VkaXRvci5yZWFkT25seSA9IHRydWU7CisgICAgdGhp cy5fcGFyZW50RWxlbWVudCA9IHBhcmVudEVsZW1lbnQ7CisKKyAgICB0aGlzLl90ZXh0TW9kZWwg PSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNb2RlbCgpOworCiAgICAgdGhpcy5fbWVzc2Fn ZXMgPSBbXTsKICAgICB0aGlzLl9yb3dNZXNzYWdlcyA9IHt9OwogICAgIHRoaXMuX21lc3NhZ2VC dWJibGVzID0ge307CiAgICAgdGhpcy5icmVha3BvaW50cyA9IFtdOwogICAgIHRoaXMuX3Nob3J0 Y3V0cyA9IHt9OwotICAgIHRoaXMuZWxlbWVudCA9IHRoaXMuX2VkaXRvci5lbGVtZW50OwotICAg IHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5fa2V5RG93bi5i aW5kKHRoaXMpLCB0cnVlKTsKKwogICAgIHRoaXMuX2xvYWRlZCA9IGZhbHNlOwogCi0gICAgdGhp cy5hZGRCcmVha3BvaW50RGVsZWdhdGUgPSBhZGRCcmVha3BvaW50RGVsZWdhdGU7CisgICAgdGhp cy5fYWRkQnJlYWtwb2ludERlbGVnYXRlID0gYWRkQnJlYWtwb2ludERlbGVnYXRlOwogfQogCiBX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogCisgICAgc2V0IHZpc2libGUo dmlzaWJsZSkKKyAgICB7CisgICAgICAgIHRoaXMuX3Zpc2libGUgPSB2aXNpYmxlOworICAgICAg ICB0aGlzLl9jcmVhdGVFZGl0b3JJZk5lZWRlZCgpOworICAgIH0sCisKICAgICBnZXQgZXhlY3V0 aW9uTGluZSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fZXhlY3V0aW9uTGluZTsKQEAg LTU5LDE1ICs2MywxNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewog ICAgICAgICBpZiAodGhpcy5fZXhlY3V0aW9uTGluZSA9PT0geCkKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgdGhpcy5fZXhlY3V0aW9uTGluZSA9IHg7Ci0gICAgICAgIHRoaXMuX2VkaXRv ci5yZXBhaW50QWxsKCk7CisgICAgICAgIGlmICh0aGlzLl9lZGl0b3IpCisgICAgICAgICAgICB0 aGlzLl9lZGl0b3IucmVwYWludEFsbCgpOwogICAgIH0sCiAKICAgICByZXZlYWxMaW5lOiBmdW5j dGlvbihsaW5lTnVtYmVyKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9sb2FkZWQpCi0gICAg ICAgICAgICB0aGlzLl9saW5lTnVtYmVyVG9SZXZlYWwgPSBsaW5lTnVtYmVyOwotICAgICAgICBl bHNlCisgICAgICAgIGlmICh0aGlzLl9lZGl0b3IpCiAgICAgICAgICAgICB0aGlzLl9lZGl0b3Iu cmV2ZWFsKGxpbmVOdW1iZXIgLSAxLCAwKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhp cy5fbGluZU51bWJlclRvUmV2ZWFsID0gbGluZU51bWJlcjsKICAgICB9LAogCiAgICAgYWRkQnJl YWtwb2ludDogZnVuY3Rpb24oYnJlYWtwb2ludCkKQEAgLTEwNywyMiArMTEyLDQ2IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX21lc3NhZ2Vz ID0gW107CiAgICAgICAgIHRoaXMuX3Jvd01lc3NhZ2VzID0ge307CiAgICAgICAgIHRoaXMuX21l c3NhZ2VCdWJibGVzID0ge307Ci0gICAgICAgIHRoaXMuX2VkaXRvci5wYWNrQW5kUmVwYWludEFs bCgpOworICAgICAgICBpZiAodGhpcy5fZWRpdG9yKQorICAgICAgICAgICAgdGhpcy5fZWRpdG9y LnBhY2tBbmRSZXBhaW50QWxsKCk7CiAgICAgfSwKIAogICAgIHNpemVUb0ZpdENvbnRlbnRIZWln aHQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2VkaXRvci5wYWNrQW5kUmVwYWlu dEFsbCgpOworICAgICAgICBpZiAodGhpcy5fZWRpdG9yKQorICAgICAgICAgICAgdGhpcy5fZWRp dG9yLnBhY2tBbmRSZXBhaW50QWxsKCk7CiAgICAgfSwKIAogICAgIHNldENvbnRlbnQ6IGZ1bmN0 aW9uKG1pbWVUeXBlLCBjb250ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fbG9hZGVkID0gdHJ1 ZTsKLSAgICAgICAgdGhpcy5fZWRpdG9yLm1pbWVUeXBlID0gbWltZVR5cGU7Ci0gICAgICAgIHRo aXMuX2VkaXRvci50ZXh0ID0gY29udGVudDsKKyAgICAgICAgdGhpcy5fdGV4dE1vZGVsLnNldFRl eHQobnVsbCwgY29udGVudCk7CisgICAgICAgIHRoaXMuX21pbWVUeXBlID0gbWltZVR5cGU7Cisg ICAgICAgIHRoaXMuX2NyZWF0ZUVkaXRvcklmTmVlZGVkKCk7CisgICAgfSwKKworICAgIF9jcmVh dGVFZGl0b3JJZk5lZWRlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl92 aXNpYmxlIHx8ICF0aGlzLl9sb2FkZWQgfHwgdGhpcy5fZWRpdG9yKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIHZhciBlZGl0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3Io dGhpcy5fdGV4dE1vZGVsLCBXZWJJbnNwZWN0b3IucGxhdGZvcm0pOworICAgICAgICBlZGl0b3Iu bGluZU51bWJlckRlY29yYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludExpbmVOdW1i ZXJEZWNvcmF0b3IodGhpcywgZWRpdG9yLnRleHRNb2RlbCk7CisgICAgICAgIGVkaXRvci5saW5l RGVjb3JhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5FeGVjdXRpb25MaW5lRGVjb3JhdG9yKHRoaXMp OworICAgICAgICBlZGl0b3IucmVhZE9ubHkgPSB0cnVlOworICAgICAgICB0aGlzLl9lbGVtZW50 ID0gZWRpdG9yLmVsZW1lbnQ7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigia2V5ZG93biIsIHRoaXMuX2tleURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgICAgIHRo aXMuX3BhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZWxlbWVudCk7CisKKyAgICAgICAg ZWRpdG9yLm1pbWVUeXBlID0gdGhpcy5fbWltZVR5cGU7CiAKICAgICAgICAgdGhpcy5fYWRkRXhp c3RpbmdNZXNzYWdlc1RvU291cmNlKCk7CiAgICAgICAgIHRoaXMuX2FkZEV4aXN0aW5nQnJlYWtw b2ludHNUb1NvdXJjZSgpOworCisgICAgICAgIGVkaXRvci5zZXRDb2FsZXNjaW5nVXBkYXRlKHRy dWUpOworICAgICAgICBlZGl0b3IudXBkYXRlQ2FudmFzU2l6ZSgpOworICAgICAgICBlZGl0b3Iu cGFja0FuZFJlcGFpbnRBbGwoKTsKKwogICAgICAgICBpZiAodGhpcy5fZXhlY3V0aW9uTGluZSkK ICAgICAgICAgICAgIHRoaXMucmV2ZWFsTGluZSh0aGlzLl9leGVjdXRpb25MaW5lKTsKIApAQCAt MTMwLDEwICsxNTksMTQgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMucmV2ZWFsTGluZSh0aGlzLl9saW5lTnVtYmVyVG9SZXZlYWwpOwog ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xpbmVOdW1iZXJUb1JldmVhbDsKICAgICAgICAgfQot ICAgICAgICB0aGlzLl9lZGl0b3Iuc2V0Q29hbGVzY2luZ1VwZGF0ZSh0cnVlKTsKLSAgICAgICAg dGhpcy5fZWRpdG9yLnVwZGF0ZUNhbnZhc1NpemUoKTsKLSAgICAgICAgdGhpcy5fZWRpdG9yLnBh Y2tBbmRSZXBhaW50QWxsKCk7Ci0gICAgICAgIHRoaXMuX2VkaXRvci5zZXRDb2FsZXNjaW5nVXBk YXRlKGZhbHNlKTsKKworICAgICAgICBpZiAodGhpcy5fcGVuZGluZ1NlbGVjdGlvblJhbmdlKSB7 CisgICAgICAgICAgICB2YXIgcmFuZ2UgPSB0aGlzLl9wZW5kaW5nU2VsZWN0aW9uUmFuZ2U7Cisg ICAgICAgICAgICBlZGl0b3Iuc2V0U2VsZWN0aW9uKHJhbmdlLnN0YXJ0TGluZSwgcmFuZ2Uuc3Rh cnRDb2x1bW4sIHJhbmdlLmVuZExpbmUsIHJhbmdlLmVuZENvbHVtbik7CisgICAgICAgICAgICBk ZWxldGUgdGhpcy5fcGVuZGluZ1NlbGVjdGlvblJhbmdlOworICAgICAgICB9CisgICAgICAgIGVk aXRvci5zZXRDb2FsZXNjaW5nVXBkYXRlKGZhbHNlKTsKKyAgICAgICAgdGhpcy5fZWRpdG9yID0g ZWRpdG9yOwogICAgIH0sCiAKICAgICBmaW5kU2VhcmNoTWF0Y2hlczogZnVuY3Rpb24ocXVlcnkp CkBAIC0xODAsMTMgKzIxMywxOSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBl ID0gewogCiAgICAgc2V0U2VsZWN0aW9uOiBmdW5jdGlvbihyYW5nZSkKICAgICB7Ci0gICAgICAg IHRoaXMuX2VkaXRvci5zZXRTZWxlY3Rpb24ocmFuZ2Uuc3RhcnRMaW5lLCByYW5nZS5zdGFydENv bHVtbiwgcmFuZ2UuZW5kTGluZSwgcmFuZ2UuZW5kQ29sdW1uKTsKKyAgICAgICAgaWYgKHRoaXMu X2VkaXRvcikKKyAgICAgICAgICAgIHRoaXMuX2VkaXRvci5zZXRTZWxlY3Rpb24ocmFuZ2Uuc3Rh cnRMaW5lLCByYW5nZS5zdGFydENvbHVtbiwgcmFuZ2UuZW5kTGluZSwgcmFuZ2UuZW5kQ29sdW1u KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fcGVuZGluZ1NlbGVjdGlvblJhbmdl ID0gcmFuZ2U7CiAgICAgfSwKIAogICAgIGNsZWFyU2VsZWN0aW9uOiBmdW5jdGlvbigpCiAgICAg ewotICAgICAgICB2YXIgcmFuZ2UgPSB0aGlzLl9lZGl0b3Iuc2VsZWN0aW9uOwotICAgICAgICB0 aGlzLl9lZGl0b3Iuc2V0U2VsZWN0aW9uKHJhbmdlLmVuZExpbmUsIHJhbmdlLmVuZENvbHVtbiwg cmFuZ2UuZW5kTGluZSwgcmFuZ2UuZW5kQ29sdW1uKTsKKyAgICAgICAgaWYgKHRoaXMuX2VkaXRv cikgeworICAgICAgICAgICAgdmFyIHJhbmdlID0gdGhpcy5fZWRpdG9yLnNlbGVjdGlvbjsKKyAg ICAgICAgICAgIHRoaXMuX2VkaXRvci5zZXRTZWxlY3Rpb24ocmFuZ2UuZW5kTGluZSwgcmFuZ2Uu ZW5kQ29sdW1uLCByYW5nZS5lbmRMaW5lLCByYW5nZS5lbmRDb2x1bW4pOworICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9wZW5kaW5nU2VsZWN0aW9uUmFuZ2U7CiAgICAg fSwKIAogICAgIF9pbmNyZW1lbnRNZXNzYWdlUmVwZWF0Q291bnQ6IGZ1bmN0aW9uKG1zZywgcmVw ZWF0RGVsdGEpCkBAIC0yODksNyArMzI4LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZSA9IHsKIAogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24obGluZU51bWJlciwgZXZl bnQpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuYWRkQnJlYWtwb2ludERlbGVnYXRlKQorICAg ICAgICBpZiAoIXRoaXMuX2FkZEJyZWFrcG9pbnREZWxlZ2F0ZSkKICAgICAgICAgICAgIHJldHVy bjsKIAogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRN ZW51KCk7CkBAIC0yOTcsMTEgKzMzNiwxMSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX3RleHRNb2RlbC5nZXRB dHRyaWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9pbnQiKTsKICAgICAgICAgaWYgKCFicmVha3Bv aW50KSB7CiAgICAgICAgICAgICAvLyBUaGlzIHJvdyBkb2Vzbid0IGhhdmUgYSBicmVha3BvaW50 OiBXZSB3YW50IHRvIHNob3cgQWRkIEJyZWFrcG9pbnQgYW5kIEFkZCBhbmQgRWRpdCBCcmVha3Bv aW50LgotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkFkZCBCcmVha3BvaW50IiksIHRoaXMuYWRkQnJlYWtwb2ludERlbGVnYXRlLmJpbmQo dGhpcywgbGluZU51bWJlciArIDEpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBZGQgQnJlYWtwb2ludCIpLCB0aGlzLl9hZGRCcmVh a3BvaW50RGVsZWdhdGUuYmluZCh0aGlzLCBsaW5lTnVtYmVyICsgMSkpOwogCiAgICAgICAgICAg ICBmdW5jdGlvbiBhZGRDb25kaXRpb25hbEJyZWFrcG9pbnQoKSAKICAgICAgICAgICAgIHsKLSAg ICAgICAgICAgICAgICB0aGlzLmFkZEJyZWFrcG9pbnREZWxlZ2F0ZShsaW5lTnVtYmVyICsgMSk7 CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkQnJlYWtwb2ludERlbGVnYXRlKGxpbmVOdW1iZXIg KyAxKTsKICAgICAgICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX3RleHRNb2RlbC5n ZXRBdHRyaWJ1dGUobGluZU51bWJlciwgImJyZWFrcG9pbnQiKTsKICAgICAgICAgICAgICAgICBp ZiAoYnJlYWtwb2ludCkKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fZWRpdEJyZWFrcG9pbnRD b25kaXRpb24oYnJlYWtwb2ludCk7CkBAIC0zMjcsOCArMzY2LDggQEAgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGJyZWFrcG9pbnQgPSB0aGlzLl90 ZXh0TW9kZWwuZ2V0QXR0cmlidXRlKGxpbmVOdW1iZXIsICJicmVha3BvaW50Iik7CiAgICAgICAg IGlmIChicmVha3BvaW50KQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRz LnJlbW92ZUJyZWFrcG9pbnQoYnJlYWtwb2ludCk7Ci0gICAgICAgIGVsc2UgaWYgKHRoaXMuYWRk QnJlYWtwb2ludERlbGVnYXRlKQotICAgICAgICAgICAgdGhpcy5hZGRCcmVha3BvaW50RGVsZWdh dGUobGluZU51bWJlciArIDEpOworICAgICAgICBlbHNlIGlmICh0aGlzLl9hZGRCcmVha3BvaW50 RGVsZWdhdGUpCisgICAgICAgICAgICB0aGlzLl9hZGRCcmVha3BvaW50RGVsZWdhdGUobGluZU51 bWJlciArIDEpOwogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgIH0sCiAKQEAg LTQyMCwxNiArNDU5LDE3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7 CiAKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2VkaXRvci51 cGRhdGVDYW52YXNTaXplKCk7CisgICAgICAgIGlmICh0aGlzLl9lZGl0b3IpCisgICAgICAgICAg ICB0aGlzLl9lZGl0b3IudXBkYXRlQ2FudmFzU2l6ZSgpOwogICAgIH0KIH0KIAogV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0 LnByb3RvdHlwZTsKIAotV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRMaW5lTnVtYmVyRGVjb3JhdG9y ID0gZnVuY3Rpb24oc291cmNlRnJhbWUpCitXZWJJbnNwZWN0b3IuQnJlYWtwb2ludExpbmVOdW1i ZXJEZWNvcmF0b3IgPSBmdW5jdGlvbihzb3VyY2VGcmFtZSwgdGV4dE1vZGVsKQogewogICAgIHRo aXMuX3NvdXJjZUZyYW1lID0gc291cmNlRnJhbWU7Ci0gICAgdGhpcy5fdGV4dE1vZGVsID0gc291 cmNlRnJhbWUuX2VkaXRvci50ZXh0TW9kZWw7CisgICAgdGhpcy5fdGV4dE1vZGVsID0gdGV4dE1v ZGVsOwogfQogCiBXZWJJbnNwZWN0b3IuQnJlYWtwb2ludExpbmVOdW1iZXJEZWNvcmF0b3IucHJv dG90eXBlID0gewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcwppbmRl eCAzZGQ2ZTBiLi4yOTJiOGFmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU291cmNlVmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl Vmlldy5qcwpAQCAtMzAsMTkgKzMwLDExIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VWaWV3ID0gZnVu Y3Rpb24ocmVzb3VyY2UpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5jYWxsKHRo aXMsIHJlc291cmNlKTsKIAotICAgIHRoaXMuc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lKHRoaXMuX2FkZEJyZWFrcG9pbnQuYmluZCh0aGlzKSk7Ci0KLSAgICByZXNv dXJjZS5hZGRFdmVudExpc3RlbmVyKCJmaW5pc2hlZCIsIHRoaXMuX3Jlc291cmNlTG9hZGluZ0Zp bmlzaGVkLCB0aGlzKTsKLQogICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzb3VyY2Ui KTsKIAorICAgIHRoaXMuc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l KHRoaXMuY29udGVudEVsZW1lbnQsIHRoaXMuX2FkZEJyZWFrcG9pbnQuYmluZCh0aGlzKSk7Cisg ICAgcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcigiZmluaXNoZWQiLCB0aGlzLl9yZXNvdXJjZUxv YWRpbmdGaW5pc2hlZCwgdGhpcyk7CiAgICAgdGhpcy5fZnJhbWVOZWVkc1NldHVwID0gdHJ1ZTsK LQotICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zb3VyY2VGcmFtZS5l bGVtZW50KTsKLQotICAgIHZhciBndXR0ZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgZ3V0dGVyRWxlbWVudC5jbGFzc05hbWUgPSAid2Via2l0LWxpbmUtZ3V0 dGVyLWJhY2tkcm9wIjsKLSAgICB0aGlzLmNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKGd1dHRl ckVsZW1lbnQpOwogfQogCiBXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUgPSB7CkBA IC01MCwxOCArNDIsMjAgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZVZpZXcucHJvdG90eXBlID0gewog ICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUuc2hvdy5j YWxsKHRoaXMsIHBhcmVudEVsZW1lbnQpOwogICAgICAgICB0aGlzLnNldHVwU291cmNlRnJhbWVJ Zk5lZWRlZCgpOworICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLnZpc2libGUgPSB0cnVlOwogICAg ICAgICB0aGlzLnJlc2l6ZSgpOwogICAgIH0sCiAKICAgICBoaWRlOiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICBXZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUuaGlkZS5jYWxsKHRoaXMpOwor ICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgdGhpcy5f Y3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0gLTE7CiAgICAgfSwKIAogICAgIHJlc2l6ZTogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3NvdXJjZUZyYW1lU2V0dXApCisgICAg ICAgIGlmICh0aGlzLnNvdXJjZUZyYW1lKQogICAgICAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5y ZXNpemUoKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGV4dEVkaXRvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9y LmpzCmluZGV4IGRkNDMwYzQuLmFlZjVkOWEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9UZXh0RWRpdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UZXh0RWRpdG9yLmpzCkBAIC0yOCw5ICsyOCwxMCBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci1XZWJJbnNwZWN0b3IuVGV4dEVkaXRvciA9IGZ1bmN0aW9uKHBsYXRmb3JtKQorV2ViSW5zcGVj dG9yLlRleHRFZGl0b3IgPSBmdW5jdGlvbih0ZXh0TW9kZWwsIHBsYXRmb3JtKQogewotICAgIHRo aXMuX3RleHRNb2RlbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsKHRoaXMuX3Rl eHRDaGFuZ2VkLmJpbmQodGhpcykpOworICAgIHRoaXMuX3RleHRNb2RlbCA9IHRleHRNb2RlbDsK KyAgICB0aGlzLl90ZXh0TW9kZWwuY2hhbmdlTGlzdGVuZXIgPSB0aGlzLl90ZXh0Q2hhbmdlZC5i aW5kKHRoaXMpOwogICAgIHRoaXMuX2hpZ2hsaWdodGVyID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9ySGlnaGxpZ2h0ZXIodGhpcy5fdGV4dE1vZGVsLCB0aGlzLl9oaWdobGlnaHRDaGFuZ2Vk LmJpbmQodGhpcykpOwogCiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVk aXRvckhpZ2hsaWdodGVyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0 b3JIaWdobGlnaHRlci5qcwppbmRleCBlYTBlZDNiLi44NTNiNjY2IDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvckhpZ2hsaWdodGVyLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9ySGlnaGxpZ2h0ZXIuanMKQEAgLTYy LDcgKzYyLDggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JIaWdobGlnaHRlciA9IGZ1bmN0aW9u KHRleHRNb2RlbCwgZGFtYWdlQ2FsbGJhY2spCiAgICAgdGhpcy5fdG9rZW5pemVyQ29uc3RydWN0 b3JzID0gewogICAgICAgICAidGV4dC9jc3MiOiBXZWJJbnNwZWN0b3IuU291cmNlQ1NTVG9rZW5p emVyLAogICAgICAgICAidGV4dC9odG1sIjogV2ViSW5zcGVjdG9yLlNvdXJjZUhUTUxUb2tlbml6 ZXIsCi0gICAgICAgICJ0ZXh0L2phdmFzY3JpcHQiOiBXZWJJbnNwZWN0b3IuU291cmNlSmF2YVNj cmlwdFRva2VuaXplcgorICAgICAgICAidGV4dC9qYXZhc2NyaXB0IjogV2ViSW5zcGVjdG9yLlNv dXJjZUphdmFTY3JpcHRUb2tlbml6ZXIsCisgICAgICAgICJhcHBsaWNhdGlvbi94LWphdmFzY3Jp cHQiOiBXZWJJbnNwZWN0b3IuU291cmNlSmF2YVNjcmlwdFRva2VuaXplcgogICAgIH07CiAKICAg ICB0aGlzLm1pbWVUeXBlID0gInRleHQvaHRtbCI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcwppbmRleCBjNWY1MmI3Li5mYzU2MDI2IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMKQEAgLTUzLDkg KzUzLDggQEAgV2ViSW5zcGVjdG9yLlRleHRSYW5nZS5wcm90b3R5cGUgPSB7CiAgICAgfQogfQog Ci1XZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsID0gZnVuY3Rpb24oY2hhbmdlTGlzdGVuZXIp CitXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1vZGVsID0gZnVuY3Rpb24oKQogewotICAgIHRoaXMu X2NoYW5nZUxpc3RlbmVyID0gY2hhbmdlTGlzdGVuZXI7CiAgICAgdGhpcy5fbGluZXMgPSBbIiJd OwogICAgIHRoaXMuX2F0dHJpYnV0ZXMgPSBbXTsKICAgICB0aGlzLl91bmRvU3RhY2sgPSBbXTsK QEAgLTYzLDYgKzYyLDEwIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwgPSBmdW5jdGlv bihjaGFuZ2VMaXN0ZW5lcikKIH0KIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNb2RlbC5wcm90 b3R5cGUgPSB7CisgICAgc2V0IGNoYW5nZUxpc3RlbmVyKGNoYW5nZUxpc3RlbmVyKQorICAgIHsK KyAgICAgICAgdGhpcy5fY2hhbmdlTGlzdGVuZXIgPSBjaGFuZ2VMaXN0ZW5lcjsKKyAgICB9LAog CiAgICAgZ2V0IGxpbmVzQ291bnQoKQogICAgIHsKQEAgLTg5LDcgKzkyLDggQEAgV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBuZXdSYW5nZSA9 IHRoaXMuX2lubmVyU2V0VGV4dChyYW5nZSwgdGV4dCk7CiAgICAgICAgIGNvbW1hbmQucmFuZ2Ug PSBuZXdSYW5nZS5jbG9uZSgpOwogCi0gICAgICAgIHRoaXMuX2NoYW5nZUxpc3RlbmVyKHJhbmdl LCBuZXdSYW5nZSwgY29tbWFuZC50ZXh0LCB0ZXh0KTsKKyAgICAgICAgaWYgKHRoaXMuX2NoYW5n ZUxpc3RlbmVyKQorICAgICAgICAgICAgdGhpcy5fY2hhbmdlTGlzdGVuZXIocmFuZ2UsIG5ld1Jh bmdlLCBjb21tYW5kLnRleHQsIHRleHQpOwogICAgICAgICByZXR1cm4gbmV3UmFuZ2U7CiAgICAg fSwKIAo=