110091 2013-02-18 01:37:09 -0800 Web Inspector: JavaScriptSourceFrame should inherit UISourceCodeFrame 2013-02-18 02:46:48 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 835228 0 vsevik 2013-02-18 01:37:09 -0800 It is currently duplicating its code essentially. 835230 1 188821 vsevik 2013-02-18 01:38:54 -0800 Created attachment 188821 Patch 835273 2 188821 webkit.review.bot 2013-02-18 02:46:45 -0800 Comment on attachment 188821 Patch Clearing flags on attachment: 188821 Committed r143184: <http://trac.webkit.org/changeset/143184> 835274 3 webkit.review.bot 2013-02-18 02:46:48 -0800 All reviewed patches have been landed. Closing bug. 188821 2013-02-18 01:38:54 -0800 2013-02-18 02:46:45 -0800 Patch bug-110091-20130218133517.patch text/plain 9739 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc1N2RjOTA3ZmIxMjFk ZWYzYjQ3NjljOGM1ZmU0YmFiNTFkZGNjOS4uNDAxOGZlZDk0ZmEzYTA1NDA0NTE4MGQ3MjAzMjc5 YjdiM2FkNWI1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAyLTE4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEphdmFTY3JpcHRTb3VyY2VGcmFtZSBzaG91bGQgaW5oZXJpdCBVSVNvdXJjZUNvZGVGcmFt ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMDkx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3Zl ZCBkdXBsaWNhdGVkIGNvZGUgZnJvbSBKYXZhU2NyaXB0U291cmNlRnJhbWUgYW5kIG1hZGUgaXQg aW5oZXJpdCBVSVNvdXJjZUNvZGVGcmFtZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZS5vblVJU291cmNlQ29kZUNvbnRlbnRDaGFuZ2VkKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLnBvcHVsYXRlVGV4 dEFyZWFDb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGVGcmFt ZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUu Y2FuRWRpdFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUu cHJvdG90eXBlLm9uVGV4dENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZUZyYW1lLnByb3RvdHlwZS5fb25Gb3JtYXR0ZWRDaGFuZ2VkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUub25VSVNvdXJjZUNvZGVDb250ZW50 Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90 eXBlLl9pbm5lclNldENvbnRlbnQpOgorCiAyMDEzLTAyLTE3ICBEaW1pdHJpIEdsYXprb3YgIDxk Z2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgU3RvcCBwYXNzaW5nIGFyb3VuZCBTZWxl Y3RvckNoZWNrZXIgaW4gU2VsZWN0b3JRdWVyeSwgbm93IHRoYXQgaXQncyBzdGFjay1hbGxvY2F0 ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFT Y3JpcHRTb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCmluZGV4IGQzMzExMmFmMWI0ZDVhOGUzYzU1NWVlYmQy N2NlYjU5YjQ5NjI2MjAuLmFjMmU0MzNjMDFjZTE3ZjA0NjlhMDdkYmU1ZTg1MTdkNDlkYTkxNjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlw dFNvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC0zMCw3ICszMCw3IEBACiAKIC8qKgogICogQGNv bnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lfQorICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZX0KICAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlNjcmlwdHNQYW5lbH0gc2NyaXB0c1BhbmVsCiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICovCkBAIC00NCw3ICs0NCw3IEBAIFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRzUGFuZWwsIHVp U291cmNlQ29kZSkKICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxvY2F0aW9ucy5sZW5ndGg7ICsr aSkKICAgICAgICAgdGhpcy5fYnJlYWtwb2ludEFkZGVkKHtkYXRhOmxvY2F0aW9uc1tpXX0pOwog Ci0gICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLmNhbGwodGhpcywgdWlTb3VyY2VDb2RlKTsK KyAgICBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUuY2FsbCh0aGlzLCB1aVNvdXJjZUNv ZGUpOwogCiAgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0 UG9wb3ZlckhlbHBlcih0aGlzLnRleHRFZGl0b3IuZWxlbWVudCwKICAgICAgICAgICAgIHRoaXMu X2dldFBvcG92ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5fcmVzb2x2ZU9iamVjdEZvclBvcG92 ZXIuYmluZCh0aGlzKSwgdGhpcy5fb25IaWRlUG9wb3Zlci5iaW5kKHRoaXMpLCB0cnVlKTsKQEAg LTU2LDkgKzU2LDYgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSA9IGZ1bmN0 aW9uKHNjcmlwdHNQYW5lbCwgdWlTb3VyY2VDb2RlKQogICAgIHRoaXMuX2JyZWFrcG9pbnRNYW5h Z2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnRNYW5hZ2VyLkV2ZW50 cy5CcmVha3BvaW50QWRkZWQsIHRoaXMuX2JyZWFrcG9pbnRBZGRlZCwgdGhpcyk7CiAgICAgdGhp cy5fYnJlYWtwb2ludE1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnJlYWtw b2ludE1hbmFnZXIuRXZlbnRzLkJyZWFrcG9pbnRSZW1vdmVkLCB0aGlzLl9icmVha3BvaW50UmVt b3ZlZCwgdGhpcyk7CiAKLSAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Gb3JtYXR0ZWRDaGFuZ2VkLCB0aGlzLl9v bkZvcm1hdHRlZENoYW5nZWQsIHRoaXMpOwotICAgIHRoaXMuX3VpU291cmNlQ29kZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLldvcmtpbmdDb3B5Q2hh bmdlZCwgdGhpcy5fb25Xb3JraW5nQ29weUNoYW5nZWQsIHRoaXMpOwotICAgIHRoaXMuX3VpU291 cmNlQ29kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRz LldvcmtpbmdDb3B5Q29tbWl0dGVkLCB0aGlzLl9vbldvcmtpbmdDb3B5Q29tbWl0dGVkLCB0aGlz KTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2FnZUFkZGVkLCB0aGlzLl9jb25zb2xlTWVz c2FnZUFkZGVkLCB0aGlzKTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2FnZVJlbW92ZWQs IHRoaXMuX2NvbnNvbGVNZXNzYWdlUmVtb3ZlZCwgdGhpcyk7CiAgICAgdGhpcy5fdWlTb3VyY2VD b2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29u c29sZU1lc3NhZ2VzQ2xlYXJlZCwgdGhpcy5fY29uc29sZU1lc3NhZ2VzQ2xlYXJlZCwgdGhpcyk7 CkBAIC04MSw2MCArNzgsMTQgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEByZXR1cm4ge2Jvb2xlYW59 CisgICAgICogQHBhcmFtIHtzdHJpbmd9IGNvbnRlbnQKICAgICAgKi8KLSAgICBjYW5FZGl0U291 cmNlOiBmdW5jdGlvbigpCisgICAgb25VSVNvdXJjZUNvZGVDb250ZW50Q2hhbmdlZDogZnVuY3Rp b24oY29udGVudCwgY29udGVudEVuY29kZWQsIG1pbWVUeXBlKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX3VpU291cmNlQ29kZS5pc0VkaXRhYmxlKCk7Ci0gICAgfSwKLQotICAgIC8qKgot ICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0ZXh0Ci0gICAgICovCi0gICAgY29tbWl0RWRpdGluZzog ZnVuY3Rpb24odGV4dCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fdWlTb3VyY2VDb2RlLmlz RGlydHkoKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9pc0NvbW1pdHRp bmdFZGl0aW5nID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlLmNvbW1pdFdvcmtp bmdDb3B5KGZ1bmN0aW9uKCkgeyB9KTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2lzQ29tbWl0dGlu Z0VkaXRpbmc7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LkV2ZW50fSBldmVudAotICAgICAqLwotICAgIF9vbkZvcm1hdHRlZENoYW5nZWQ6IGZ1bmN0aW9u KGV2ZW50KQotICAgIHsKLSAgICAgICAgdmFyIGNvbnRlbnQgPSAvKiogQHR5cGUge3N0cmluZ30g Ki8gKGV2ZW50LmRhdGEuY29udGVudCk7Ci0gICAgICAgIHRoaXMuX3RleHRFZGl0b3Iuc2V0UmVh ZE9ubHkodGhpcy5fdWlTb3VyY2VDb2RlLmZvcm1hdHRlZCgpKTsKLSAgICAgICAgdGhpcy5zZXRD b250ZW50KGNvbnRlbnQsIGZhbHNlLCB0aGlzLl91aVNvdXJjZUNvZGUubWltZVR5cGUoKSk7Ci0g ICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVu dAotICAgICAqLwotICAgIF9vbldvcmtpbmdDb3B5Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQpCi0g ICAgewotICAgICAgICB0aGlzLl9pbm5lclNldENvbnRlbnQodGhpcy5fdWlTb3VyY2VDb2RlLndv cmtpbmdDb3B5KCkpOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5FdmVudH0gZXZlbnQKLSAgICAgKi8KLSAgICBfb25Xb3JraW5nQ29weUNvbW1pdHRlZDog ZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICB0aGlzLl9pbm5lclNldENvbnRlbnQodGhp cy5fdWlTb3VyY2VDb2RlLndvcmtpbmdDb3B5KCkpOwotICAgIH0sCi0KLSAgICBfaW5uZXJTZXRD b250ZW50OiBmdW5jdGlvbihjb250ZW50KQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2lzU2V0 dGluZ1dvcmtpbmdDb3B5IHx8IHRoaXMuX2lzQ29tbWl0dGluZ0VkaXRpbmcpCi0gICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIHZhciBicmVha3BvaW50TG9jYXRpb25zID0gdGhpcy5fYnJlYWtw b2ludE1hbmFnZXIuYnJlYWtwb2ludExvY2F0aW9uc0ZvclVJU291cmNlQ29kZSh0aGlzLl91aVNv dXJjZUNvZGUpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGJyZWFrcG9pbnRMb2NhdGlv bnMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICBicmVha3BvaW50TG9jYXRpb25zW2ldLmJyZWFr cG9pbnQucmVtb3ZlKCk7Ci0gICAgICAgIHRoaXMuc2V0Q29udGVudChjb250ZW50LCBmYWxzZSwg dGhpcy5fdWlTb3VyY2VDb2RlLm1pbWVUeXBlKCkpOworICAgICAgICBXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlRnJhbWUucHJvdG90eXBlLm9uVUlTb3VyY2VDb2RlQ29udGVudENoYW5nZWQuY2Fs bCh0aGlzLCBjb250ZW50KTsKICAgICB9LAogCiAgICAgcG9wdWxhdGVMaW5lR3V0dGVyQ29udGV4 dE1lbnU6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKQpAQCAtMTgwLDE1ICsxMzEs NyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0obGl2ZUVkaXRMYWJlbCwgbGl2ZUVkaXQu YmluZCh0aGlzKSk7CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsK ICAgICAgICAgfQotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRBcHBsaWNhYmxlSXRlbXModGhp cy5fdWlTb3VyY2VDb2RlKTsKLSAgICB9LAotCi0gICAgb25UZXh0Q2hhbmdlZDogZnVuY3Rpb24o b2xkUmFuZ2UsIG5ld1JhbmdlKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lLnByb3RvdHlwZS5vblRleHRDaGFuZ2VkLmNhbGwodGhpcywgb2xkUmFuZ2UsIG5ld1Jhbmdl KTsKLSAgICAgICAgdGhpcy5faXNTZXR0aW5nV29ya2luZ0NvcHkgPSB0cnVlOwotICAgICAgICB0 aGlzLl91aVNvdXJjZUNvZGUuc2V0V29ya2luZ0NvcHkodGhpcy5fdGV4dEVkaXRvci50ZXh0KCkp OwotICAgICAgICBkZWxldGUgdGhpcy5faXNTZXR0aW5nV29ya2luZ0NvcHk7CisgICAgICAgIFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5cGUucG9wdWxhdGVUZXh0QXJlYUNv bnRleHRNZW51LmNhbGwodGhpcywgY29udGV4dE1lbnUsIGxpbmVOdW1iZXIpOwogICAgIH0sCiAK ICAgICBfd2lsbE1lcmdlVG9WTTogZnVuY3Rpb24oKQpAQCAtNjQ0LDUgKzU4Nyw1IEBAIFdlYklu c3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBXZWJJ bnNwZWN0b3IuZGVidWdnZXJNb2RlbC5jb250aW51ZVRvTG9jYXRpb24ocmF3TG9jYXRpb24pOwog ICAgIH0sCiAKLSAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUKKyAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFtZS5wcm90b3R5 cGUKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKaW5kZXggN2QwMjQ0NjRmYzdjZTUzNjg1YzJkZDVhMmI1MTI2YTI3M2YyNjRhNC4u ZjE1YzU1ZmI5MTM1ZmU2YzYwNmVhZTQ2NGFjOTY3Y2RjNzkyOWI2YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI3LDYg KzI3LDcgQEAKIGltcG9ydFNjcmlwdCgiQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyIpOwogaW1w b3J0U2NyaXB0KCJDYWxsU3RhY2tTaWRlYmFyUGFuZS5qcyIpOwogaW1wb3J0U2NyaXB0KCJGaWx0 ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMiKTsKK2ltcG9ydFNjcmlwdCgiVUlTb3VyY2VDb2Rl RnJhbWUuanMiKTsKIGltcG9ydFNjcmlwdCgiSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIik7CiBp bXBvcnRTY3JpcHQoIk5hdmlnYXRvck92ZXJsYXlDb250cm9sbGVyLmpzIik7CiBpbXBvcnRTY3Jp cHQoIk5hdmlnYXRvclZpZXcuanMiKTsKQEAgLTM3LDcgKzM4LDYgQEAgaW1wb3J0U2NyaXB0KCJT Y3JpcHRzU2VhcmNoU2NvcGUuanMiKTsKIGltcG9ydFNjcmlwdCgiU25pcHBldEphdmFTY3JpcHRT b3VyY2VGcmFtZS5qcyIpOwogaW1wb3J0U2NyaXB0KCJTdHlsZVNoZWV0T3V0bGluZURpYWxvZy5q cyIpOwogaW1wb3J0U2NyaXB0KCJUYWJiZWRFZGl0b3JDb250YWluZXIuanMiKTsKLWltcG9ydFNj cmlwdCgiVUlTb3VyY2VDb2RlRnJhbWUuanMiKTsKIGltcG9ydFNjcmlwdCgiV2F0Y2hFeHByZXNz aW9uc1NpZGViYXJQYW5lLmpzIik7CiBpbXBvcnRTY3JpcHQoIldvcmtlcnNTaWRlYmFyUGFuZS5q cyIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJ U291cmNlQ29kZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9V SVNvdXJjZUNvZGVGcmFtZS5qcwppbmRleCA0OTBhYTAzYzNlYmQwMzRmZGVlZGFlYjJmOTZmMGM0 YzE3MjE0YzIxLi5lMWQwMWI4ZjAxODQ1NGE1ZjBmZGIxOGE4OTI0ZDZiMmE2ZWU3NDAwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZUZy YW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VD b2RlRnJhbWUuanMKQEAgLTQ2LDcgKzQ2LDcgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZUZy YW1lLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBjYW5FZGl0U291cmNlOiBmdW5jdGlvbigp CiAgICAgewotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291 cmNlQ29kZS5pc0VkaXRhYmxlKCk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtNjQsNiArNjQsNyBA QCBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgb25U ZXh0Q2hhbmdlZDogZnVuY3Rpb24ob2xkUmFuZ2UsIG5ld1JhbmdlKQogICAgIHsKKyAgICAgICAg V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5vblRleHRDaGFuZ2VkLmNhbGwodGhp cywgb2xkUmFuZ2UsIG5ld1JhbmdlKTsKICAgICAgICAgdGhpcy5faXNTZXR0aW5nV29ya2luZ0Nv cHkgPSB0cnVlOwogICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUuc2V0V29ya2luZ0NvcHkodGhp cy5fdGV4dEVkaXRvci50ZXh0KCkpOwogICAgICAgICBkZWxldGUgdGhpcy5faXNTZXR0aW5nV29y a2luZ0NvcHk7CkBAIC04NCw3ICs4NSw3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVGcmFt ZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgY29udGVudCA9IC8qKiBAdHlwZSB7 c3RyaW5nfSAqLyAoZXZlbnQuZGF0YS5jb250ZW50KTsKICAgICAgICAgdGhpcy5fdGV4dEVkaXRv ci5zZXRSZWFkT25seSh0aGlzLl91aVNvdXJjZUNvZGUuZm9ybWF0dGVkKCkpOwotICAgICAgICB0 aGlzLl9pbm5lclNldENvbnRlbnQoY29udGVudCk7CisgICAgICAgIHRoaXMuc2V0Q29udGVudChj b250ZW50LCBmYWxzZSwgdGhpcy5fdWlTb3VyY2VDb2RlLm1pbWVUeXBlKCkpOwogICAgIH0sCiAK ICAgICAvKioKQEAgLTEwMywxMiArMTA0LDIyIEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVG cmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudCh0aGlzLl91 aVNvdXJjZUNvZGUud29ya2luZ0NvcHkoKSk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBw YXJhbSB7c3RyaW5nfSBjb250ZW50CisgICAgICovCisgICAgb25VSVNvdXJjZUNvZGVDb250ZW50 Q2hhbmdlZDogZnVuY3Rpb24oY29udGVudCkKKyAgICB7CisgICAgICAgIHRoaXMuc2V0Q29udGVu dChjb250ZW50LCBmYWxzZSwgdGhpcy5fdWlTb3VyY2VDb2RlLm1pbWVUeXBlKCkpOworICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gY29udGVudAorICAgICAqLwogICAg IF9pbm5lclNldENvbnRlbnQ6IGZ1bmN0aW9uKGNvbnRlbnQpCiAgICAgewogICAgICAgICBpZiAo dGhpcy5faXNTZXR0aW5nV29ya2luZ0NvcHkgfHwgdGhpcy5faXNDb21taXR0aW5nRWRpdGluZykK ICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLnNldENvbnRlbnQodGhpcy5fdWlT b3VyY2VDb2RlLmNvbnRlbnQoKSB8fCAiIiwgZmFsc2UsIHRoaXMuX3VpU291cmNlQ29kZS5jb250 ZW50VHlwZSgpLmNhbm9uaWNhbE1pbWVUeXBlKCkpOworICAgICAgICB0aGlzLm9uVUlTb3VyY2VD b2RlQ29udGVudENoYW5nZWQoY29udGVudCk7CiAgICAgfSwKIAogICAgIHBvcHVsYXRlVGV4dEFy ZWFDb250ZXh0TWVudTogZnVuY3Rpb24oY29udGV4dE1lbnUsIGxpbmVOdW1iZXIpCg==