69327 2011-10-04 01:53:52 -0700 Web Inspector: remove dependency from GoToLine dialog from Panel. 2011-10-04 02:16:18 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 477496 0 pfeldman 2011-10-04 01:53:52 -0700 Patch to follow. 477501 1 109597 pfeldman 2011-10-04 02:09:23 -0700 Created attachment 109597 Patch 477502 2 109597 yurys 2011-10-04 02:14:16 -0700 Comment on attachment 109597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109597&action=review > Source/WebCore/inspector/front-end/GoToLineDialog.js:84 > + if (!sourceView || !sourceView.canHighlightLine()) !sourceView check is redundant, please remove. 477503 3 pfeldman 2011-10-04 02:16:18 -0700 Committed r96577: <http://trac.webkit.org/changeset/96577> 109597 2011-10-04 02:09:23 -0700 2011-10-04 02:14:16 -0700 Patch bug-69327-20111004130921.patch text/plain 10175 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY1NzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlZGE1NjExNjg4MWRlMzg2 NmE0NTA3ODkyYjg3NjJlOTM0M2IxZjJhLi42ZGVjNmNkMzlkOTk1ODZiNzRhMThiZTY2NmE5ZWI2 NTQxMDBlYTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTEtMTAtMDQgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IHJlbW92ZSBkZXBlbmRlbmN5IGZyb20gR29Ub0xpbmUgZGlhbG9nIGZyb20gUGFuZWwuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTMyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Hb1RvTGluZURpYWxvZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Hb1RvTGlu ZURpYWxvZy5pbnN0YWxsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5f c2hvdyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrSXRlbVZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0l0ZW1WaWV3LnByb3RvdHlwZS5fdGFiU2Vs ZWN0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90 eXBlLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVu dFZpZXcucHJvdG90eXBlLmNhbkhpZ2hsaWdodExpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmhpZ2hsaWdodExpbmUpOgorICAgICAgICAo c2V0IFdlYkluc3BlY3Rvcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr UGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnZpZXdHZXR0ZXIp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90 b3R5cGUucmVnaXN0ZXJTaG9ydGN1dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC52 aWV3R2V0dGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dSZXNvdXJjZSk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnZpZXdHZXR0ZXIpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlLmNhbkhpZ2hsaWdodExpbmUpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQ YW5lLnByb3RvdHlwZS5faGlkZVRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFu ZS5wcm90b3R5cGUuY2FuSGlnaGxpZ2h0TGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFi YmVkUGFuZS5wcm90b3R5cGUuaGlnaGxpZ2h0TGluZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9WaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLmNh bkhpZ2hsaWdodExpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLmhp Z2hsaWdodExpbmUpOgorCiAyMDExLTEwLTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29v Z2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbCBhbmQgQ29uc29sZVZpZXcgdG8gY29tcGlsYXRpb24uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0dvVG9MaW5lRGlhbG9nLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Hb1RvTGluZURpYWxvZy5qcwppbmRleCBlZWJk NDNhMjA2ODRlNWU1NjdkNjc2YTQ5MGM3NzNmZWRlOGU1OGU4Li5mOWU5NDA5MjU1YmQ0NDhkNzk5 ZjNlM2VkM2JiYmFjZTg1ZTJiZGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0dvVG9MaW5lRGlhbG9nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvR29Ub0xpbmVEaWFsb2cuanMKQEAgLTY2LDkgKzY2LDIyIEBAIFdlYklu c3BlY3Rvci5Hb1RvTGluZURpYWxvZyA9IGZ1bmN0aW9uKHZpZXcpCiAgICAgdGhpcy5faW5wdXQu c2VsZWN0KCk7CiB9CiAKLVdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5zaG93ID0gZnVuY3Rp b24oc291cmNlVmlldykKK1dlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5pbnN0YWxsID0gZnVu Y3Rpb24ocGFuZWwsIHZpZXdHZXR0ZXIpCiB7Ci0gICAgaWYgKCFzb3VyY2VWaWV3IHx8IHR5cGVv ZiBzb3VyY2VWaWV3LmhpZ2hsaWdodExpbmUgIT09ICJmdW5jdGlvbiIpCisgICAgZnVuY3Rpb24g c2hvd0dvVG9MaW5lRGlhbG9nKCkKKyAgICB7CisgICAgICAgICB2YXIgdmlldyA9IHZpZXdHZXR0 ZXIoKTsKKyAgICAgICAgIGlmICh2aWV3KQorICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Hb1Rv TGluZURpYWxvZy5fc2hvdyh2aWV3KTsKKyAgICB9CisKKyAgICB2YXIgZ29Ub0xpbmVTaG9ydGN1 dCA9IFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOworICAgIHBh bmVsLnJlZ2lzdGVyU2hvcnRjdXQoZ29Ub0xpbmVTaG9ydGN1dC5rZXksIHNob3dHb1RvTGluZURp YWxvZyk7Cit9CisKK1dlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5fc2hvdyA9IGZ1bmN0aW9u KHNvdXJjZVZpZXcpCit7CisgICAgaWYgKCFzb3VyY2VWaWV3IHx8ICFzb3VyY2VWaWV3LmNhbkhp Z2hsaWdodExpbmUoKSkKICAgICAgICAgcmV0dXJuOwogICAgIGlmICh0aGlzLl9pbnN0YW5jZSkK ICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrSXRlbVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL05ldHdvcmtJdGVtVmlldy5qcwppbmRleCA1NzgzOThhZjBiYTYzMmMyOGFiYmE0NDcz MmQyNjg1ZDU1OTU1ZGQzLi42ZWZiMWFlYWMyNjdkNjMxOGRiNmYxYzkzN2Y5NDk5OTI3ZTgyNWFl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtJ dGVtVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtJdGVtVmlldy5qcwpAQCAtNzksMTUgKzc5LDYgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtJdGVt Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAoZXZlbnQuZGF0YS5pc1VzZXJH ZXN0dXJlKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNlVmlld1Rh Yi5zZXQoZXZlbnQuZGF0YS50YWJJZCk7Ci0gICAgICAgIHRoaXMuX2luc3RhbGxIaWdobGlnaHRT dXBwb3J0KGV2ZW50LmRhdGEudmlldyk7Ci0gICAgfSwKLQotICAgIF9pbnN0YWxsSGlnaGxpZ2h0 U3VwcG9ydDogZnVuY3Rpb24odmlldykKLSAgICB7Ci0gICAgICAgIGlmICh0eXBlb2Ygdmlldy5o aWdobGlnaHRMaW5lID09PSAiZnVuY3Rpb24iKQotICAgICAgICAgICAgdGhpcy5oaWdobGlnaHRM aW5lID0gdmlldy5oaWdobGlnaHRMaW5lLmJpbmQodmlldyk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLmhpZ2hsaWdodExpbmU7CiAgICAgfQogfQogCkBAIC0xNDUsNiAr MTM2LDE3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsK ICAgICBjb250ZW50TG9hZGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICAvLyBTaG91bGQg YmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KKyAgICB9LAorCisgICAgY2FuSGlnaGxpZ2h0 TGluZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2lubmVyVmlldyAm JiB0aGlzLl9pbm5lclZpZXcuY2FuSGlnaGxpZ2h0TGluZSgpOworICAgIH0sCisKKyAgICBoaWdo bGlnaHRMaW5lOiBmdW5jdGlvbihsaW5lKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuY2FuSGln aGxpZ2h0TGluZSgpKQorICAgICAgICAgICAgdGhpcy5faW5uZXJWaWV3LmhpZ2hsaWdodExpbmUo bGluZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDViYmI1OWI0OTIyN2M5YzhlMDlhNmEwZTJhOGE0 MzgzZDk4YWU5MzEuLjNhYTFmNzY0OGZlZTYwYTJhYjI1ZTU0YTFmZjdmZDVjZDdiODM5ZGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVs LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVs LmpzCkBAIC0xMzAwLDcgKzEzMDAsMTEgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbCA9IGZ1 bmN0aW9uKCkKICAgICB0aGlzLl9jbG9zZUJ1dHRvbkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi Y2xpY2siLCB0aGlzLl90b2dnbGVHcmlkTW9kZS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhp cy5fdmlld3NDb250YWluZXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2Nsb3NlQnV0dG9uRWxl bWVudCk7CiAKLSAgICB0aGlzLnJlZ2lzdGVyU2hvcnRjdXRzKCk7CisgICAgZnVuY3Rpb24gdmll d0dldHRlcigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy52aXNpYmxlVmlldzsKKyAgICB9 CisgICAgV2ViSW5zcGVjdG9yLkdvVG9MaW5lRGlhbG9nLmluc3RhbGwodGhpcywgdmlld0dldHRl ci5iaW5kKHRoaXMpKTsKIH0KIAogV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUg PSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCAw Y2M1ZDE3ZDBlYzAzODdhYmIxZWYxMWMwZjZhNTQwNmRkMTFlZWVmLi5mMzBjZmY1MTFlYWNmOTc0 YjBhZGQ3OTEyMWNlMGNkZGQzOGM1OWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUGFuZWwuanMKQEAgLTQwNywyNCArNDA3LDkgQEAgV2ViSW5zcGVjdG9yLlBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICByZWdpc3RlclNob3J0Y3V0 czogZnVuY3Rpb24oc2hvcnRjdXRzKQotICAgIHsKLSAgICAgICAgdGhpcy5fc2hvcnRjdXRzID0g c2hvcnRjdXRzIHx8IHt9OwotICAgICAgICB2YXIgZ29Ub0xpbmVTaG9ydGN1dCA9IFdlYkluc3Bl Y3Rvci5Hb1RvTGluZURpYWxvZy5jcmVhdGVTaG9ydGN1dCgpOwotICAgICAgICB0aGlzLl9zaG9y dGN1dHNbZ29Ub0xpbmVTaG9ydGN1dC5rZXldID0gdGhpcy5fc2hvd0dvVG9MaW5lRGlhbG9nLmJp bmQodGhpcyk7Ci0gICAgfSwKLQogICAgIHJlZ2lzdGVyU2hvcnRjdXQ6IGZ1bmN0aW9uKGtleSwg aGFuZGxlcikKICAgICB7CiAgICAgICAgIHRoaXMuX3Nob3J0Y3V0c1trZXldID0gaGFuZGxlcjsK LSAgICB9LAotCi0gICAgX3Nob3dHb1RvTGluZURpYWxvZzogZnVuY3Rpb24oZSkKLSAgICB7Ci0g ICAgICAgICB2YXIgdmlldyA9IHRoaXMudmlzaWJsZVZpZXc7Ci0gICAgICAgICBXZWJJbnNwZWN0 b3IuR29Ub0xpbmVEaWFsb2cuc2hvdyh2aWV3KTsKLSAgICAgICAgIGlmICh2aWV3KQotICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZy5zaG93KHZpZXcpOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKaW5kZXggMmE4OGMxZWIzNzNmNzg1MzhiNzkwNWQwY2UzNzVlMzI2NWJiMDJhNy4u Y2QyMWEwYmFkMjk4YmM2NzUzM2ZkMzU5MDk3NzdiZmVlMTk2YzUwOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC03 NSw3ICs3NSwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwgPSBmdW5jdGlvbihkYXRh YmFzZSkKICAgICB0aGlzLnNpZGViYXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92 ZSIsIHRoaXMuX29ubW91c2Vtb3ZlLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlzLnNpZGVi YXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fb25tb3VzZW91dC5i aW5kKHRoaXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLnJlZ2lzdGVyU2hvcnRjdXRzKCk7CisgICAg ZnVuY3Rpb24gdmlld0dldHRlcigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy52aXNpYmxl VmlldzsKKyAgICB9CisgICAgV2ViSW5zcGVjdG9yLkdvVG9MaW5lRGlhbG9nLmluc3RhbGwodGhp cywgdmlld0dldHRlci5iaW5kKHRoaXMpKTsKIAogICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRy ZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5F dmVudFR5cGVzLk9uTG9hZCwgdGhpcy5fb25Mb2FkRXZlbnRGaXJlZCwgdGhpcyk7CiB9CkBAIC0z MzksNyArMzQzLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsK IAogICAgICAgICBpZiAobGluZSAhPT0gdW5kZWZpbmVkKSB7CiAgICAgICAgICAgICB2YXIgdmll dyA9IHRoaXMuX3Jlc291cmNlVmlld0ZvclJlc291cmNlKHJlc291cmNlKTsKLSAgICAgICAgICAg IGlmICh2aWV3LmhpZ2hsaWdodExpbmUpCisgICAgICAgICAgICBpZiAodmlldy5jYW5IaWdobGln aHRMaW5lKCkpCiAgICAgICAgICAgICAgICAgdmlldy5oaWdobGlnaHRMaW5lKGxpbmUpOwogICAg ICAgICB9CiAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCA2MTE1NTkzM2JkMWZkZGJiMGY0 OGNkYmIzNjE2YjYyYzY3M2ZmMDVjLi5jODUwYjcyNjRhZTE2Y2JiMzE3ZjJjNWJhNzVmM2NlMjFm NDdkMjZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcwpAQCAtMzIsNyArMzIsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bCA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVsKQogCiAgICAgdGhpcy5fcHJlc2VudGF0aW9u TW9kZWwgPSBwcmVzZW50YXRpb25Nb2RlbDsKIAotICAgIHRoaXMucmVnaXN0ZXJTaG9ydGN1dHMo KTsKKyAgICBmdW5jdGlvbiB2aWV3R2V0dGVyKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz LnZpc2libGVWaWV3OworICAgIH0KKyAgICBXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFsb2cuaW5z dGFsbCh0aGlzLCB2aWV3R2V0dGVyLmJpbmQodGhpcykpOwogCiAgICAgdGhpcy50b3BTdGF0dXNC YXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLnRvcFN0YXR1c0Jh ci5jbGFzc05hbWUgPSAic3RhdHVzLWJhciI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCAwN2IxOTExNWQ5MDUzNmE3ZmE1ZDg1 ZDMzNWM0M2ZmMGVhNzAxYzg1Li5kNmQyNGIwNTU0ZTJlNmJmYWU1ZjZhZGY5NTU0Y2M1YzM1MzI2 ZjI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNl RnJhbWUuanMKQEAgLTE2Myw2ICsxNjMsMTEgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRNb2RlbDsKICAgICB9LAogCisg ICAgY2FuSGlnaGxpZ2h0TGluZTogZnVuY3Rpb24obGluZSkKKyAgICB7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0sCisKICAgICBoaWdobGlnaHRMaW5lOiBmdW5jdGlvbihsaW5lKQogICAg IHsKICAgICAgICAgaWYgKHRoaXMubG9hZGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCmluZGV4IDRmZWY1ZDZmYTYxMGQ5MDI5NmQwYjAw MDhjMDAyYTFhYzZiYmE5YzMuLmMzZjRmZDAzMjFlM2Q3NjM3OWU2ZDUxZGM1NGE4NjkxODQzOGE2 OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVk UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBh bmUuanMKQEAgLTgzLDYgKzgzLDE3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlw ZSA9IHsKICAgICB7CiAgICAgICAgIHRhYi50YWJFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNl bGVjdGVkIik7CiAgICAgICAgIHRhYi52aWV3LnZpc2libGUgPSBmYWxzZTsKKyAgICB9LAorCisg ICAgY2FuSGlnaGxpZ2h0TGluZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRo aXMuX2N1cnJlbnRUYWIgJiYgdGhpcy5fY3VycmVudFRhYi52aWV3ICYmIHRoaXMuX2N1cnJlbnRU YWIudmlldy5jYW5IaWdobGlnaHRMaW5lKCk7CisgICAgfSwKKworICAgIGhpZ2hsaWdodExpbmU6 IGZ1bmN0aW9uKGxpbmUpCisgICAgeworICAgICAgICBpZiAodGhpcy5jYW5IaWdobGlnaHRMaW5l KCkpCisgICAgICAgICAgICB0aGlzLl9jdXJyZW50VGFiLnZpZXcuaGlnaGxpZ2h0TGluZShsaW5l KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmlldy5q cwppbmRleCA4OGZmN2M2MzQ5MzM5NWZlNGIzZmUxMDEyZDc0NTUxMmMwMDk5NzkyLi4yMjI5MmQx MzljZjY3Y2IzOGZhNDE5N2IwMDlmNWY0OTNlNTk0NzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9WaWV3LmpzCkBAIC0xNTksNiArMTU5LDE1IEBAIFdlYkluc3BlY3Rv ci5WaWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgfSwKIAorICAgIGNhbkhpZ2hsaWdodExp bmU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9LAorCisg ICAgaGlnaGxpZ2h0TGluZTogZnVuY3Rpb24obGluZSkKKyAgICB7CisgICAgfSwKKwogICAgIGRv UmVzaXplOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLmRpc3BhdGNoVG9TZWxmQW5k VmlzaWJsZUNoaWxkcmVuKCJvblJlc2l6ZSIpOwo=