79674 2012-02-27 08:00:34 -0800 Web Inspector: Scripts navigator overlay should not consume mouse actions. 2012-02-27 10:16:02 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 565649 0 vsevik 2012-02-27 08:00:34 -0800 Scripts navigator overlay should not consume mouse actions. 565651 1 129036 vsevik 2012-02-27 08:02:46 -0800 Created attachment 129036 Patch 565774 2 vsevik 2012-02-27 10:16:02 -0800 Committed r109006: <http://trac.webkit.org/changeset/109006> 129036 2012-02-27 08:02:46 -0800 2012-02-27 09:42:05 -0800 Patch bug-79674-20120227200244.patch text/plain 14485 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJjNmVkYTcwMWY3ZTVk OGUwZTIyYWJmMjhkOTIxNWQwYjg5MWM4YS4uMTVhNDg2OTRiZTg5ZTIyMjRmODFmMjU1Y2FhOTg4 MjgxZWY2NzY5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTAyLTI3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFNjcmlwdHMgbmF2aWdhdG9yIG92ZXJsYXkgc2hvdWxkIG5vdCBjb25zdW1lIG1vdXNlIGFj dGlvbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 OTY3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5l bC5wcm90b3R5cGUucmVnaXN0ZXJTaG9ydGN1dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFu ZWwucHJvdG90eXBlLnVucmVnaXN0ZXJTaG9ydGN1dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5fZWRpdG9yQ2xvc2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3Jp cHRzUGFuZWwucHJvdG90eXBlLl9lZGl0b3JTZWxlY3RlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fZmlsZVNlbGVjdGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9lc2NEb3duV2hpbGVOYXZpZ2F0b3JPdmVy bGF5T3Blbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5z ZXQgX3Nob3dOYXZpZ2F0b3JPdmVybGF5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRz UGFuZWwucHJvdG90eXBlLl9oaWRlTmF2aWdhdG9yT3ZlcmxheSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fbmF2aWdhdG9yT3ZlcmxheVdhc1Nob3duKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJPdmVybGF5LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T aWRlYmFyT3ZlcmxheS5wcm90b3R5cGUuc2hvdyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lk ZWJhck92ZXJsYXkucHJvdG90eXBlLl9jb250YWluaW5nRWxlbWVudEZvY3VzZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5LnByb3RvdHlwZS5wb3NpdGlvbik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhck92ZXJsYXkucHJvdG90eXBlLmhpZGUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5LnByb3RvdHlwZS5fc2V0V2lkdGgpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvZGlhbG9nLmNzczoKKyAgICAgICAgKC5nby10by1s aW5lLWRpYWxvZyBidXR0b246YWN0aXZlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L3NjcmlwdHNQYW5lbC5jc3M6CisgICAgICAgICgjc2NyaXB0cy1lZGl0b3ItdmlldyAuc2lkZWJh ci1vdmVybGF5KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3M6 CisgICAgICAgICguc3BsaXQtdmlldy1yZXNpemVyKToKKyAgICAgICAgKC5zaWRlYmFyLW92ZXJs YXkpOgorICAgICAgICAoLnNpZGViYXItb3ZlcmxheS1yZXNpemVyKToKKwogMjAxMi0wMi0yNyAg QW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVzZSBidWls dC1pbiBiaW5kIGluIEV4dGVuc2lvbkFQSS5qcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUGFuZWwuanMKaW5kZXggN2QxMGU1OTAyZWNjNDczZjAzOTRmNzljZTE5NTA4MTQ2 Y2NiYjQ3Ni4uYzlhMWM3ZDdjNDVhMGE4MzJjZTk1NTRjNDg0OGQzZDg2ODJhYjJlNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCkBAIC0yMTIsNiArMjEy LDExIEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgcmVnaXN0ZXJTaG9y dGN1dDogZnVuY3Rpb24oa2V5LCBoYW5kbGVyKQogICAgIHsKICAgICAgICAgdGhpcy5fc2hvcnRj dXRzW2tleV0gPSBoYW5kbGVyOworICAgIH0sCisKKyAgICB1bnJlZ2lzdGVyU2hvcnRjdXQ6IGZ1 bmN0aW9uKGtleSkKKyAgICB7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9zaG9ydGN1dHNba2V5XTsK ICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzUGFuZWwuanMKaW5kZXggM2Y3NzBmYTcwZDQwZmVmYjg2YjZkYmIwOTZiMTBjZjFjOWJk ODI1ZS4uODVmOWI2MzAxYmQyODFjZDUzY2Y0MjZiMmM4ODNhNDhmYWFmMjNjNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAg LTY3LDYgKzY3LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHByZXNl bnRhdGlvbk1vZGVsKQogICAgICAgICBjb25zdCBtaW5pbWFsVmlld3NDb250YWluZXJXaWR0aFBl cmNlbnQgPSA1MDsKICAgICAgICAgdGhpcy5lZGl0b3JWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5T cGxpdFZpZXcoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5TaWRlYmFyUG9zaXRpb24uTGVmdCwgInNj cmlwdHNQYW5lbE5hdmlnYXRvclNpZGViYXJXaWR0aCIsIGluaXRpYWxOYXZpZ2F0b3JXaWR0aCk7 CiAgICAgICAgIHRoaXMuZWRpdG9yVmlldy5lbGVtZW50LmlkID0gInNjcmlwdHMtZWRpdG9yLXZp ZXciOworICAgICAgICB0aGlzLmVkaXRvclZpZXcuZWxlbWVudC50YWJJbmRleCA9IDA7CiAKICAg ICAgICAgdGhpcy5lZGl0b3JWaWV3Lm1pbmltYWxTaWRlYmFyV2lkdGggPSBQcmVmZXJlbmNlcy5t aW5TY3JpcHRzU2lkZWJhcldpZHRoOwogICAgICAgICB0aGlzLmVkaXRvclZpZXcubWluaW1hbE1h aW5XaWR0aFBlcmNlbnQgPSBtaW5pbWFsVmlld3NDb250YWluZXJXaWR0aFBlcmNlbnQ7CkBAIC02 NDMsNiArNjQ0LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAK ICAgICBfZWRpdG9yQ2xvc2VkOiBmdW5jdGlvbihldmVudCkKICAgICB7CisgICAgICAgIHRoaXMu X2hpZGVOYXZpZ2F0b3JPdmVybGF5KCk7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSAvKiog QHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGE7CiAKICAgICAg ICAgaWYgKHRoaXMuX2N1cnJlbnRVSVNvdXJjZUNvZGUgPT09IHVpU291cmNlQ29kZSkKQEAgLTY1 NywxNCArNjU5LDE0IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgX2VkaXRvclNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CisgICAgICAgIHRo aXMuX2hpZGVOYXZpZ2F0b3JPdmVybGF5KCk7CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSAv KiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50LmRhdGE7CiAgICAg ICAgIHRoaXMuX3Nob3dGaWxlKHVpU291cmNlQ29kZSk7CiAgICAgfSwKIAogICAgIF9maWxlU2Vs ZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX25hdmlnYXRv ck92ZXJsYXlTaG93bikKLSAgICAgICAgICAgIHRoaXMuX2hpZGVOYXZpZ2F0b3JPdmVybGF5KCk7 CisgICAgICAgIHRoaXMuX2hpZGVOYXZpZ2F0b3JPdmVybGF5KCk7CiAgICAgICAgIHZhciB1aVNv dXJjZUNvZGUgPSAvKiogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIGV2ZW50 LmRhdGE7CiAgICAgICAgIHRoaXMuX3Nob3dGaWxlKHVpU291cmNlQ29kZSk7CiAgICAgfSwKQEAg LTk1Niw2ICs5NTgsMTEgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiBidXR0b247CiAgICAgfSwKIAorICAgIF9lc2NEb3duV2hpbGVOYXZp Z2F0b3JPdmVybGF5T3BlbjogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9o aWRlTmF2aWdhdG9yT3ZlcmxheSgpOworICAgIH0sCisKICAgICBfbWF5YmVTaG93TmF2aWdhdG9y T3ZlcmxheTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX25hdmlnYXRvciAm JiBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubmF2aWdhdG9ySGlkZGVuLmdldCgpICYmICFXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MubmF2aWdhdG9yV2FzT25jZUhpZGRlbi5nZXQoKSkKQEAgLTEwMTEsMTUg KzEwMTgsMTUgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yT3ZlcmxheVNob3duID0g dHJ1ZTsKLSAgICAgICAgdmFyIHNpZGViYXJPdmVybGF5ID0gbmV3IFdlYkluc3BlY3Rvci5TaWRl YmFyT3ZlcmxheSh0aGlzLl9uYXZpZ2F0b3JWaWV3LCAic2NyaXB0c1BhbmVsTmF2aWdhdG9yT3Zl cmxheVdpZHRoIiwgUHJlZmVyZW5jZXMubWluU2NyaXB0c1NpZGViYXJXaWR0aCk7Ci0gICAgICAg IHNpZGViYXJPdmVybGF5LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVy bGF5LkV2ZW50VHlwZXMuV2FzU2hvd24sIHRoaXMuX25hdmlnYXRvck92ZXJsYXlXYXNTaG93biwg dGhpcyk7Ci0gICAgICAgIHNpZGViYXJPdmVybGF5LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlNpZGViYXJPdmVybGF5LkV2ZW50VHlwZXMuV2lsbEhpZGUsIHRoaXMuX25hdmlnYXRvck92 ZXJsYXlXaWxsSGlkZSwgdGhpcyk7CisgICAgICAgIHRoaXMuX3NpZGViYXJPdmVybGF5ID0gbmV3 IFdlYkluc3BlY3Rvci5TaWRlYmFyT3ZlcmxheSh0aGlzLl9uYXZpZ2F0b3JWaWV3LCAic2NyaXB0 c1BhbmVsTmF2aWdhdG9yT3ZlcmxheVdpZHRoIiwgUHJlZmVyZW5jZXMubWluU2NyaXB0c1NpZGVi YXJXaWR0aCk7CisgICAgICAgIHRoaXMuX3NpZGViYXJPdmVybGF5LmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5LkV2ZW50VHlwZXMuV2FzU2hvd24sIHRoaXMuX25h dmlnYXRvck92ZXJsYXlXYXNTaG93biwgdGhpcyk7CisgICAgICAgIHRoaXMuX3NpZGViYXJPdmVy bGF5LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5LkV2ZW50VHlw ZXMuV2lsbEhpZGUsIHRoaXMuX25hdmlnYXRvck92ZXJsYXlXaWxsSGlkZSwgdGhpcyk7CiAKICAg ICAgICAgdmFyIG5hdmlnYXRvck92ZXJsYXlSZXNpemVXaWRnZXRFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIG5hdmlnYXRvck92ZXJsYXlSZXNpemVXaWRn ZXRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNjcmlwdHMtbmF2aWdhdG9yLXJlc2l6ZXItd2lkZ2V0 Iik7Ci0gICAgICAgIHNpZGViYXJPdmVybGF5LnJlc2l6ZXJXaWRnZXRFbGVtZW50ID0gbmF2aWdh dG9yT3ZlcmxheVJlc2l6ZVdpZGdldEVsZW1lbnQ7CisgICAgICAgIHRoaXMuX3NpZGViYXJPdmVy bGF5LnJlc2l6ZXJXaWRnZXRFbGVtZW50ID0gbmF2aWdhdG9yT3ZlcmxheVJlc2l6ZVdpZGdldEVs ZW1lbnQ7CiAKLSAgICAgICAgc2lkZWJhck92ZXJsYXkuc3RhcnQodGhpcy5lZGl0b3JWaWV3LmVs ZW1lbnQpOworICAgICAgICB0aGlzLl9zaWRlYmFyT3ZlcmxheS5zaG93KHRoaXMuZWRpdG9yVmll dy5lbGVtZW50KTsKICAgICB9LAogCiAgICAgX2hpZGVOYXZpZ2F0b3JPdmVybGF5OiBmdW5jdGlv bigpCkBAIC0xMDI3LDcgKzEwMzQsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgaWYgKCF0aGlzLl9uYXZpZ2F0b3JPdmVybGF5U2hvd24pCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgV2ViSW5zcGVjdG9yLkRpYWxvZy5oaWRlKCk7Cisg ICAgICAgIHRoaXMuX3NpZGViYXJPdmVybGF5LmhpZGUoKTsKICAgICB9LAogCiAgICAgX25hdmln YXRvck92ZXJsYXlXYXNTaG93bjogZnVuY3Rpb24oZXZlbnQpCkBAIC0xMDM2LDYgKzEwNDMsNyBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f bmF2aWdhdG9yU2hvd0hpZGVCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwogICAg ICAgICB0aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiSGlkZSBzY3JpcHRzIG5hdmlnYXRvciIpOwogICAgICAgICB0aGlzLl9uYXZpZ2F0 b3IuZm9jdXMoKTsKKyAgICAgICAgdGhpcy5yZWdpc3RlclNob3J0Y3V0KFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LktleXMuRXNjLmNvZGUsIHRoaXMuX2VzY0Rvd25XaGlsZU5hdmlnYXRv ck92ZXJsYXlPcGVuLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICBfbmF2aWdhdG9yT3Zlcmxh eVdpbGxIaWRlOiBmdW5jdGlvbihldmVudCkKQEAgLTEwNDUsNiArMTA1Myw3IEBAIFdlYkluc3Bl Y3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmVkaXRvclZpZXcu ZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbik7CiAgICAg ICAgIHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uLnJlbW92ZVN0eWxlQ2xhc3MoInRvZ2ds ZWQtb24iKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgc2NyaXB0cyBuYXZpZ2F0b3IiKTsKKyAgICAgICAg dGhpcy51bnJlZ2lzdGVyU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5 cy5Fc2MuY29kZSk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVCdXR0b25BbmRSZWdpc3RlclNob3J0 Y3V0czogZnVuY3Rpb24oYnV0dG9uSWQsIGJ1dHRvblRpdGxlLCBoYW5kbGVyLCBzaG9ydGN1dHMs IHNob3J0Y3V0RGVzY3JpcHRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NpZGViYXJPdmVybGF5LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TaWRlYmFyT3ZlcmxheS5qcwppbmRleCAxN2M5M2U1YzhiYWJjYjUxZTYwZjMy ODM3NjI0YWMzZjg0MWExMmZiLi5kNDBjOGRhMmMzZmE5Nzc5ZmQyN2Q4NDVkNDE0YWM1ZmJlZjM2 NGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGVi YXJPdmVybGF5LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lk ZWJhck92ZXJsYXkuanMKQEAgLTMwLDE1ICszMCwxOCBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3Rv cgotICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5EaWFsb2dEZWxlZ2F0ZX0KKyAqIEBleHRlbmRz IHtXZWJJbnNwZWN0b3IuT2JqZWN0fQogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVmlld30gdmll dwogICogQHBhcmFtIHtzdHJpbmd9IHdpZHRoU2V0dGluZ05hbWUKICAqIEBwYXJhbSB7bnVtYmVy fSBtaW5pbWFsV2lkdGgKICAqLwogV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5ID0gZnVuY3Rp b24odmlldywgd2lkdGhTZXR0aW5nTmFtZSwgbWluaW1hbFdpZHRoKQogewotICAgIFdlYkluc3Bl Y3Rvci5EaWFsb2dEZWxlZ2F0ZS5jYWxsKHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5PYmplY3Qu Y2FsbCh0aGlzKTsKICAgICAKKyAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInNpZGViYXItb3Zlcmxh eSI7CisKICAgICB0aGlzLl92aWV3ID0gdmlldzsKICAgICB0aGlzLl93aWR0aFNldHRpbmdOYW1l ID0gd2lkdGhTZXR0aW5nTmFtZTsKICAgICB0aGlzLl9taW5pbWFsV2lkdGggPSBtaW5pbWFsV2lk dGg7CkBAIC01OSwzNCArNjIsMzYgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJPdmVybGF5LkV2ZW50 VHlwZXMgPSB7CiAKIFdlYkluc3BlY3Rvci5TaWRlYmFyT3ZlcmxheS5wcm90b3R5cGUgPSB7CiAg ICAgLyoqCi0gICAgICogQHBhcmFtIHtFbGVtZW50fSBlbGVtZW50CisgICAgICogQHBhcmFtIHtF bGVtZW50fSByZWxhdGl2ZVRvRWxlbWVudAogICAgICAqLwotICAgIHNob3c6IGZ1bmN0aW9uKGVs ZW1lbnQpCisgICAgc2hvdzogZnVuY3Rpb24ocmVsYXRpdmVUb0VsZW1lbnQpCiAgICAgewotICAg ICAgICB0aGlzLl9lbGVtZW50ID0gZWxlbWVudDsKLSAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJzaWRlYmFyLW92ZXJsYXktZGlhbG9nIik7Ci0gICAgICAgIHRoaXMuX3ZpZXcubWFya0Fz Um9vdCgpOwotICAgICAgICB0aGlzLl92aWV3LnNob3coZWxlbWVudCk7Ci0gICAgICAgIHRoaXMu X2VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fcmVzaXplckVsZW1lbnQpOworICAgICAgICByZWxh dGl2ZVRvRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmVsZW1lbnQpOworICAgICAgICByZWxhdGl2 ZVRvRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzaWRlYmFyLW92ZXJsYXktc2hvd24iKTsKKyAgICAg ICAgdGhpcy5fdmlldy5zaG93KHRoaXMuZWxlbWVudCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9yZXNpemVyRWxlbWVudCk7CiAgICAgICAgIGlmICh0aGlzLl9yZXNp emVyV2lkZ2V0RWxlbWVudCkKLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fcmVzaXplcldpZGdldEVsZW1lbnQpOwotCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5fcmVzaXplcldpZGdldEVsZW1lbnQpOworICAgICAgICB0aGlzLnBv c2l0aW9uKHJlbGF0aXZlVG9FbGVtZW50KTsKKyAgICAgICAgdGhpcy5fYm91bmRDb250YWluaW5n RWxlbWVudEZvY3VzZWQgPSB0aGlzLl9jb250YWluaW5nRWxlbWVudEZvY3VzZWQuYmluZCh0aGlz KTsKKyAgICAgICAgcmVsYXRpdmVUb0VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiRE9NRm9jdXNJ biIsIHRoaXMuX2JvdW5kQ29udGFpbmluZ0VsZW1lbnRGb2N1c2VkLCBmYWxzZSk7CisgICAgICAg IAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2lk ZWJhck92ZXJsYXkuRXZlbnRUeXBlcy5XYXNTaG93biwgbnVsbCk7CiAgICAgfSwKIAorICAgIF9j b250YWluaW5nRWxlbWVudEZvY3VzZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAg aWYgKCFldmVudC50YXJnZXQuaXNTZWxmT3JEZXNjZW5kYW50KHRoaXMuZWxlbWVudCkpCisgICAg ICAgICAgICB0aGlzLmhpZGUoKTsKKyAgICB9LAorCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtF bGVtZW50fSBlbGVtZW50CiAgICAgICogQHBhcmFtIHtFbGVtZW50fSByZWxhdGl2ZVRvRWxlbWVu dAogICAgICAqLwotICAgIHBvc2l0aW9uOiBmdW5jdGlvbihlbGVtZW50LCByZWxhdGl2ZVRvRWxl bWVudCkKKyAgICBwb3NpdGlvbjogZnVuY3Rpb24ocmVsYXRpdmVUb0VsZW1lbnQpCiAgICAgewog ICAgICAgICB0aGlzLl90b3RhbFdpZHRoID0gcmVsYXRpdmVUb0VsZW1lbnQub2Zmc2V0V2lkdGg7 Ci0gICAgICAgIAotICAgICAgICB2YXIgb2Zmc2V0ID0gcmVsYXRpdmVUb0VsZW1lbnQub2Zmc2V0 UmVsYXRpdmVUb1dpbmRvdyh3aW5kb3cpOwotICAgICAgICBlbGVtZW50LnN0eWxlLmxlZnQgPSBv ZmZzZXQueCArICJweCI7Ci0gICAgICAgIGVsZW1lbnQuc3R5bGUudG9wID0gb2Zmc2V0LnkgKyAi cHgiOwogICAgICAgICB0aGlzLl9zZXRXaWR0aCh0aGlzLl9wcmVmZXJyZWRXaWR0aCgpKTsKLSAg ICAgICAgZWxlbWVudC5zdHlsZS5oZWlnaHQgPSByZWxhdGl2ZVRvRWxlbWVudC5vZmZzZXRIZWln aHQgKyAicHgiOwogICAgIH0sCiAKICAgICBmb2N1czogZnVuY3Rpb24oKQpAQCAtOTQsMTcgKzk5 LDIxIEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyT3ZlcmxheS5wcm90b3R5cGUgPSB7CiAgICAgICAg IFdlYkluc3BlY3Rvci5zZXRDdXJyZW50Rm9jdXNFbGVtZW50KHRoaXMuX3ZpZXcuZWxlbWVudCk7 CiAgICAgfSwKIAotICAgIHdpbGxIaWRlOiBmdW5jdGlvbigpIHsKLSAgICAgICAgdGhpcy5fdmll dy5kZXRhY2goKTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLlNpZGViYXJPdmVybGF5LkV2ZW50VHlwZXMuV2lsbEhpZGUsIG51bGwpOwotICAgIH0s Ci0gICAgCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtFbGVtZW50fSByZWxhdGl2ZVRvRWxlbWVu dAotICAgICAqLwotICAgIHN0YXJ0OiBmdW5jdGlvbihyZWxhdGl2ZVRvRWxlbWVudCkKKyAgICBo aWRlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLnNob3co cmVsYXRpdmVUb0VsZW1lbnQsIHRoaXMpOworICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuZWxl bWVudC5wYXJlbnRFbGVtZW50OworICAgICAgICBpZiAoIWVsZW1lbnQpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVj dG9yLlNpZGViYXJPdmVybGF5LkV2ZW50VHlwZXMuV2lsbEhpZGUsIG51bGwpOworICAgICAgICAK KyAgICAgICAgdGhpcy5fdmlldy5kZXRhY2goKTsKKyAgICAgICAgZWxlbWVudC5yZW1vdmVDaGls ZCh0aGlzLmVsZW1lbnQpOworICAgICAgICBlbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNpZGVi YXItb3ZlcmxheS1zaG93biIpOworICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQodGhp cy5fcmVzaXplckVsZW1lbnQpOworICAgICAgICBpZiAodGhpcy5fcmVzaXplcldpZGdldEVsZW1l bnQpCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGQodGhpcy5fcmVzaXplcldp ZGdldEVsZW1lbnQpOworICAgICAgICBlbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoIkRPTUZv Y3VzSW4iLCB0aGlzLl9ib3VuZENvbnRhaW5pbmdFbGVtZW50Rm9jdXNlZCk7CiAgICAgfSwKICAg ICAKICAgICAvKioKQEAgLTExNyw3ICsxMjYsNyBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhck92ZXJs YXkucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fd2lkdGggPT09IHdpZHRoKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX2VsZW1lbnQuc3R5bGUud2lkdGggPSB3 aWR0aCArICJweCI7CisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS53aWR0aCA9IHdpZHRoICsg InB4IjsKICAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQuc3R5bGUubGVmdCA9ICh3aWR0aCAt IDMpICsgInB4IjsKICAgICAgICAgdGhpcy5fd2lkdGggPSB3aWR0aDsKICAgICAgICAgdGhpcy5f dmlldy5kb1Jlc2l6ZSgpOwpAQCAtMTkxLDQgKzIwMCw0IEBAIFdlYkluc3BlY3Rvci5TaWRlYmFy T3ZlcmxheS5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi1XZWJJbnNwZWN0b3IuU2lkZWJhck92 ZXJsYXkucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5EaWFsb2dEZWxlZ2F0ZS5w cm90b3R5cGU7CitXZWJJbnNwZWN0b3IuU2lkZWJhck92ZXJsYXkucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9kaWFsb2cuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9kaWFsb2cuY3NzCmluZGV4IDIwZjNlZTFhZDNmYjgzNWIzN2QzMzg5 NWRiYjQxNTEyNjljMDgxYWYuLmNjZmIzYTQ0MzJlZmEzZTkyNzgyYTZhODIwNTkxZmI3ZThiZmIw ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZGlhbG9n LmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2RpYWxvZy5jc3MK QEAgLTUzLDI0ICs1MywzIEBACiAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDIxNSwgMjE1LCAy MTUpOwogICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0 IHRvcCwgbGVmdCBib3R0b20sIGZyb20ocmdiKDE5NCwgMTk0LCAxOTQpKSwgdG8ocmdiKDIzOSwg MjM5LCAyMzkpKSk7CiB9Ci0KLS5zaWRlYmFyLW92ZXJsYXktZGlhbG9nIHsKLSAgICBwb3NpdGlv bjogYWJzb2x1dGU7Ci0gICAgZGlzcGxheTogLXdlYmtpdC1ib3g7Ci0gICAgaGVpZ2h0OiAwOwot ICAgIHdpZHRoOiAwOwotICAgIC13ZWJraXQtYm94LW9yaWVudDogdmVydGljYWw7Ci0gICAgei1p bmRleDogLTE7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7Ci0gICAgYm9yZGVyLXJpZ2h0 OiAxcHggc29saWQgZ3JheTsKLSAgICAtd2Via2l0LWJveC1zaGFkb3c6IHJnYig5MCw5MCw5MCkg MjBweCAwcHggNTBweCAtMjVweDsKLX0KLQotLnNpZGViYXItb3ZlcmxheS1yZXNpemVyIHsKLSAg ICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgdG9wOiAwOwotICAgIGJvdHRvbTogMDsKLSAgICB3 aWR0aDogNXB4OwotICAgIHotaW5kZXg6IDUwMDsKLSAgICBjdXJzb3I6IGV3LXJlc2l6ZTsKLX0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1Bh bmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1BhbmVs LmNzcwppbmRleCBiNDEyZjAyMDdmZDMzODkwYmQ3NTNjZDAzNjc2ZGM5NGJmYjAwMGNlLi5lNDdh YmQ2MzZjYmM2ZWVjNGM2MmM2MGI1NTI1ZGQ0Yjg4ZGEzODk1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NjcmlwdHNQYW5lbC5jc3MKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zY3JpcHRzUGFuZWwuY3NzCkBAIC0yODIsNiAr MjgyLDE1IEBACiAgICAgbWFyZ2luLXJpZ2h0OiAyOHB4OwogfQogCisjc2NyaXB0cy1lZGl0b3It dmlldyAuc2lkZWJhci1vdmVybGF5IHsKKyAgICBkaXNwbGF5OiAtd2Via2l0LWJveDsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCBncmF5 OworICAgIC13ZWJraXQtYm94LXNoYWRvdzogcmdiKDkwLDkwLDkwKSAyMHB4IDBweCA1MHB4IC0y NXB4OworICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LW9yaWVudDog dmVydGljYWw7Cit9CisKICNzY3JpcHRzLWVkaXRvci1jb250YWluZXItdGFiYmVkLXBhbmUgLnRh YmJlZC1wYW5lLWhlYWRlciB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1ncmFkaWVu dChsaW5lYXIsIDAlIDAlLCAwJSAxMDAlLCBmcm9tKCNGNUY1RjUpLCB0bygjRTVFNUU1KSk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmll dy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3MK aW5kZXggMWU4ZTk2ZGFjNmQ5YTMxMjE4NTYxY2NmZWMwOWVhNWIwMTIyNzAwOC4uMTQ2MWViODQw NTJhMzM5NzczOTk1ZTFhOWI5Nzg2ZTQ0OTFkN2VmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvc3BsaXRWaWV3LmNzcwpAQCAtNjYsNCArNjYsMjEgQEAKICAg ICB3aWR0aDogNXB4OwogICAgIHotaW5kZXg6IDUwMDsKICAgICBjdXJzb3I6IGV3LXJlc2l6ZTsK LX0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit9CisKKy5zaWRlYmFyLW92ZXJsYXkgewor ICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IDA7CisgICAgYm90dG9tOiAwOworICAg IGxlZnQ6IDA7CisgICAgei1pbmRleDogMTA7Cit9CisKKy5zaWRlYmFyLW92ZXJsYXktcmVzaXpl ciB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBib3R0b206IDA7 CisgICAgd2lkdGg6IDVweDsKKyAgICB6LWluZGV4OiA1MDA7CisgICAgY3Vyc29yOiBldy1yZXNp emU7Cit9Cg==