76449 2012-01-17 06:36:52 -0800 Web Inspector: Dialogs style and DialogDelegate interface fixes. 2012-01-17 07:34:57 -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 537063 0 vsevik 2012-01-17 06:36:52 -0800 Dialogs style and DialogDelegate interface fixes. 537073 1 122761 vsevik 2012-01-17 06:56:16 -0800 Created attachment 122761 Patch 537092 2 vsevik 2012-01-17 07:34:57 -0800 Committed r105156: <http://trac.webkit.org/changeset/105156> 122761 2012-01-17 06:56:16 -0800 2012-01-17 07:12:09 -0800 Patch bug-76449-20120117185614.patch text/plain 10837 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzI2NjliYmFhOWMyMTZh MjBmMGY3YzQyYmUyNjc0YzE0Zjk1YjBjZi4uNjFkNWJhOGRiYTVkNzRkNWU4ZDdmZWUzZGEyNmQ4 ODU3YWFlMDlkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAxLTE3ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERpYWxvZ3Mgc3R5bGUgYW5kIERpYWxvZ0RlbGVnYXRlIGludGVyZmFjZSBmaXhlcy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NDQ5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0RpYWxvZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EaWFsb2cpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRpYWxvZy5jdXJyZW50SW5zdGFuY2UpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRpYWxvZy5zaG93KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EaWFsb2cuaGlk ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGlhbG9nLnByb3RvdHlwZS5faGlkZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRGlhbG9nLnByb3RvdHlwZS5fb25HbGFzc1BhbmVGb2N1cyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGlhbG9nLnByb3RvdHlwZS5fb25Gb2N1cyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRGlhbG9nLnByb3RvdHlwZS5fcG9zaXRpb24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRpYWxvZy5wcm90b3R5cGUuX29uS2V5RG93bik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGlhbG9nRGVsZWdhdGUucHJvdG90eXBlLndhc1Nob3duKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5EaWFsb2dEZWxlZ2F0ZS5wcm90b3R5cGUucG9zaXRpb24pOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRpYWxvZ0RlbGVnYXRlLnByb3RvdHlwZS5mb2N1cyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRGlhbG9nRGVsZWdhdGUucHJvdG90eXBlLm9uRW50ZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRpYWxvZ0RlbGVnYXRlLnByb3RvdHlwZS53aWxsSGlkZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9Hb1RvTGluZURpYWxvZy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Hb1RvTGluZURpYWxvZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuR29Ub0xpbmVEaWFs b2cucHJvdG90eXBlLmZvY3VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxv Zy5wcm90b3R5cGUuX29uR29DbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuR29Ub0xpbmVE aWFsb2cucHJvdG90eXBlLl9hcHBseUxpbmVOdW1iZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkdvVG9MaW5lRGlhbG9nLnByb3RvdHlwZS5vbkVudGVyKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL2RpYWxvZy5jc3M6CisgICAgICAgICguZGlhbG9nKToKKwogMjAxMi0wMS0xNyAg Tmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBMYXJn ZSBTVkcgdGV4dCBsYXlvdXQgcGVyZm9ybWFuY2UgcmVncmVzc2lvbiBpbiByODExNjgKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGlhbG9nLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EaWFsb2cuanMKaW5kZXggNzc5M2QwN2Zk ZWIzNzQ5Y2U2NjliYWYxOWIwMjIyOTEwOWNjNTA3OS4uZjk5NjQ3OTA4NGMwNDY2OTBlMDU1MThm MGI4MmRiMDlkN2ZlMjYyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EaWFsb2cuanMKQEAgLTMwLDQ1ICszMCw2NiBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3Rvcgor ICogQHBhcmFtIHtFbGVtZW50fSByZWxhdGl2ZVRvRWxlbWVudAorICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuRGlhbG9nRGVsZWdhdGV9IGRlbGVnYXRlCiAgKi8KLVdlYkluc3BlY3Rvci5EaWFsb2cg PSBmdW5jdGlvbihyZWxhdGl2ZVRvRWxlbWVudCwgZGlhbG9nRGVsZWdhdGUpCitXZWJJbnNwZWN0 b3IuRGlhbG9nID0gZnVuY3Rpb24ocmVsYXRpdmVUb0VsZW1lbnQsIGRlbGVnYXRlKQogewotICAg IHRoaXMuX2RpYWxvZ0RlbGVnYXRlID0gZGlhbG9nRGVsZWdhdGU7CisgICAgdGhpcy5fZGVsZWdh dGUgPSBkZWxlZ2F0ZTsKICAgICB0aGlzLl9yZWxhdGl2ZVRvRWxlbWVudCA9IHJlbGF0aXZlVG9F bGVtZW50OwogCiAgICAgLy8gSW5zdGFsbCBnbGFzcyBwYW5lIGNhcHR1cmluZyBldmVudHMuCiAg ICAgdGhpcy5fZ2xhc3NQYW5lRWxlbWVudCA9IGRvY3VtZW50LmJvZHkuY3JlYXRlQ2hpbGQoImRp diIpOwogICAgIHRoaXMuX2dsYXNzUGFuZUVsZW1lbnQuY2xhc3NOYW1lID0gImRpYWxvZy1nbGFz cy1wYW5lIjsKICAgICB0aGlzLl9nbGFzc1BhbmVFbGVtZW50LnRhYkluZGV4ID0gMDsKLSAgICB0 aGlzLl9nbGFzc1BhbmVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgdGhpcy5fb25G b2N1cy5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5fZ2xhc3NQYW5lRWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJmb2N1cyIsIHRoaXMuX29uR2xhc3NQYW5lRm9jdXMuYmluZCh0aGlzKSwg ZmFsc2UpOwogICAgIAogICAgIHRoaXMuX2VsZW1lbnQgPSB0aGlzLl9nbGFzc1BhbmVFbGVtZW50 LmNyZWF0ZUNoaWxkKCJkaXYiKTsKICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTmFtZSA9ICJkaWFs b2ciOwogICAgIHRoaXMuX2VsZW1lbnQudGFiSW5kZXggPSAwOworICAgIHRoaXMuX2VsZW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiZm9jdXMiLCB0aGlzLl9vbkZvY3VzLmJpbmQodGhpcyksIGZhbHNl KTsKICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9v bktleURvd24uYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuX2Nsb3NlS2V5cyA9IFsKICAg ICAgICAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5FbnRlci5jb2RlLAogICAg ICAgICBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkVzYy5jb2RlLAogICAgIF07 CiAKLSAgICBpZiAoZGlhbG9nRGVsZWdhdGUub2tCdXR0b24pCi0gICAgICAgIGRpYWxvZ0RlbGVn YXRlLm9rQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fb25DbGljay5iaW5k KHRoaXMpLCBmYWxzZSk7Ci0gICAgZGlhbG9nRGVsZWdhdGUuZWxlbWVudC5hZGRTdHlsZUNsYXNz KCJkaWFsb2ctY29udGVudHMiKTsKLSAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKGRpYWxv Z0RlbGVnYXRlLmVsZW1lbnQpOworICAgIGRlbGVnYXRlLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygi ZGlhbG9nLWNvbnRlbnRzIik7CisgICAgdGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZChkZWxlZ2F0 ZS5lbGVtZW50KTsKICAgICAKKyAgICB0aGlzLl9kZWxlZ2F0ZS53YXNTaG93bigpOwogICAgIHRo aXMuX3Bvc2l0aW9uKCk7CiAgICAgdGhpcy5fd2luZG93UmVzaXplSGFuZGxlciA9IHRoaXMuX3Bv c2l0aW9uLmJpbmQodGhpcyk7CiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoInJlc2l6ZSIs IHRoaXMuX3dpbmRvd1Jlc2l6ZUhhbmRsZXIsIHRydWUpOwogCiAgICAgdGhpcy5fcHJldmlvdXNG b2N1c0VsZW1lbnQgPSBXZWJJbnNwZWN0b3IuY3VycmVudEZvY3VzRWxlbWVudCgpOwotICAgIHRo aXMuX2RvRm9jdXMoKTsKKyAgICB0aGlzLl9kZWxlZ2F0ZS5mb2N1cygpOwogfQogCi1XZWJJbnNw ZWN0b3IuRGlhbG9nLnNob3cgPSBmdW5jdGlvbihyZWxhdGl2ZVRvRWxlbWVudCwgZGlhbG9nRGVs ZWdhdGUpCisvKioKKyAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5EaWFsb2d9CisgKi8KK1dlYklu c3BlY3Rvci5EaWFsb2cuY3VycmVudEluc3RhbmNlID0gZnVuY3Rpb24oKQoreworICAgIHJldHVy biBXZWJJbnNwZWN0b3IuRGlhbG9nLl9pbnN0YW5jZTsKK30KKworLyoqCisgKiBAcGFyYW0ge0Vs ZW1lbnR9IHJlbGF0aXZlVG9FbGVtZW50CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5EaWFsb2dE ZWxlZ2F0ZX0gZGVsZWdhdGUKKyAqLworV2ViSW5zcGVjdG9yLkRpYWxvZy5zaG93ID0gZnVuY3Rp b24ocmVsYXRpdmVUb0VsZW1lbnQsIGRlbGVnYXRlKQogewogICAgIGlmIChXZWJJbnNwZWN0b3Iu RGlhbG9nLl9pbnN0YW5jZSkKICAgICAgICAgcmV0dXJuOwotICAgIFdlYkluc3BlY3Rvci5EaWFs b2cuX2luc3RhbmNlID0gbmV3IFdlYkluc3BlY3Rvci5EaWFsb2cocmVsYXRpdmVUb0VsZW1lbnQs IGRpYWxvZ0RlbGVnYXRlKTsKKyAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLl9pbnN0YW5jZSA9IG5l dyBXZWJJbnNwZWN0b3IuRGlhbG9nKHJlbGF0aXZlVG9FbGVtZW50LCBkZWxlZ2F0ZSk7Cit9CisK K1dlYkluc3BlY3Rvci5EaWFsb2cuaGlkZSA9IGZ1bmN0aW9uKCkKK3sKKyAgICBpZiAoIVdlYklu c3BlY3Rvci5EaWFsb2cuX2luc3RhbmNlKQorICAgICAgICByZXR1cm47CisgICAgV2ViSW5zcGVj dG9yLkRpYWxvZy5faW5zdGFuY2UuX2hpZGUoKTsKIH0KIAogV2ViSW5zcGVjdG9yLkRpYWxvZy5w cm90b3R5cGUgPSB7CkBAIC03OCwzOSArOTksMjcgQEAgV2ViSW5zcGVjdG9yLkRpYWxvZy5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX2lzSGlkaW5nID0g dHJ1ZTsKIAorICAgICAgICB0aGlzLl9kZWxlZ2F0ZS53aWxsSGlkZSgpOworICAgICAgICAKICAg ICAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1c0VsZW1lbnQodGhpcy5fcHJldmlvdXNG b2N1c0VsZW1lbnQpOwogICAgICAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLl9pbnN0YW5jZSA9IG51 bGw7CiAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGhpcy5fZ2xhc3NQYW5lRWxl bWVudCk7CiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJyZXNpemUiLCB0aGlz Ll93aW5kb3dSZXNpemVIYW5kbGVyLCB0cnVlKTsKICAgICB9LAogCi0gICAgX29uRm9jdXM6IGZ1 bmN0aW9uKGV2ZW50KQorICAgIF9vbkdsYXNzUGFuZUZvY3VzOiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIHRoaXMuX2hpZGUoKTsKICAgICB9LAogCi0gICAgX2RvRm9jdXM6IGZ1bmN0 aW9uKCkKKyAgICBfb25Gb2N1czogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICBpZiAo dGhpcy5fZGlhbG9nRGVsZWdhdGUuZGVmYXVsdEZvY3VzZWRFbGVtZW50KSB7Ci0gICAgICAgICAg ICBXZWJJbnNwZWN0b3Iuc2V0Q3VycmVudEZvY3VzRWxlbWVudCh0aGlzLl9kaWFsb2dEZWxlZ2F0 ZS5kZWZhdWx0Rm9jdXNlZEVsZW1lbnQpOwotICAgICAgICAgICAgaWYgKHR5cGVvZih0aGlzLl9k aWFsb2dEZWxlZ2F0ZS5kZWZhdWx0Rm9jdXNlZEVsZW1lbnQuc2VsZWN0KSA9PT0gImZ1bmN0aW9u IikKLSAgICAgICAgICAgICAgICB0aGlzLl9kaWFsb2dEZWxlZ2F0ZS5kZWZhdWx0Rm9jdXNlZEVs ZW1lbnQuc2VsZWN0KCk7Ci0gICAgICAgIH0gZWxzZSAKLSAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5zZXRDdXJyZW50Rm9jdXNFbGVtZW50KHRoaXMuX2VsZW1lbnQpOworICAgICAgICB0aGlzLl9k ZWxlZ2F0ZS5mb2N1cygpOwogICAgIH0sCiAKICAgICBfcG9zaXRpb246IGZ1bmN0aW9uKCkKICAg ICB7Ci0gICAgICAgIHZhciBvZmZzZXQgPSB0aGlzLl9yZWxhdGl2ZVRvRWxlbWVudC5vZmZzZXRS ZWxhdGl2ZVRvV2luZG93KHdpbmRvdyk7Ci0KLSAgICAgICAgdmFyIHBvc2l0aW9uWCA9IG9mZnNl dC54ICsgKHRoaXMuX3JlbGF0aXZlVG9FbGVtZW50Lm9mZnNldFdpZHRoIC0gdGhpcy5fZWxlbWVu dC5vZmZzZXRXaWR0aCkgLyAyOwotICAgICAgICBwb3NpdGlvblggPSBOdW1iZXIuY29uc3RyYWlu KHBvc2l0aW9uWCwgMCwgd2luZG93LmlubmVyV2lkdGggLSB0aGlzLl9lbGVtZW50Lm9mZnNldFdp ZHRoKTsKLSAgICAgICAgCi0gICAgICAgIHZhciBwb3NpdGlvblkgPSBvZmZzZXQueSArICh0aGlz Ll9yZWxhdGl2ZVRvRWxlbWVudC5vZmZzZXRIZWlnaHQgLSB0aGlzLl9lbGVtZW50Lm9mZnNldEhl aWdodCkgLyAyOwotICAgICAgICBwb3NpdGlvblkgPSBOdW1iZXIuY29uc3RyYWluKHBvc2l0aW9u WSwgMCwgd2luZG93LmlubmVySGVpZ2h0IC0gdGhpcy5fZWxlbWVudC5vZmZzZXRIZWlnaHQpOwot ICAgICAgICAKLSAgICAgICAgdGhpcy5fZWxlbWVudC5zdHlsZS5sZWZ0ID0gcG9zaXRpb25YICsg InB4IjsKLSAgICAgICAgdGhpcy5fZWxlbWVudC5zdHlsZS50b3AgPSBwb3NpdGlvblkgKyAicHgi OworICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5wb3NpdGlvbih0aGlzLl9lbGVtZW50LCB0aGlzLl9y ZWxhdGl2ZVRvRWxlbWVudCk7CiAgICAgfSwKIAogICAgIF9vbktleURvd246IGZ1bmN0aW9uKGV2 ZW50KQpAQCAtMTIxLDMzICsxMzAsNDMgQEAgV2ViSW5zcGVjdG9yLkRpYWxvZy5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5FbnRlci5jb2RlKQotICAgICAgICAgICAgdGhpcy5f ZGlhbG9nRGVsZWdhdGUub25BY3Rpb24oKTsKKyAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLm9u RW50ZXIoKTsKIAogICAgICAgICBpZiAodGhpcy5fY2xvc2VLZXlzLmluZGV4T2YoZXZlbnQua2V5 Q29kZSkgPj0gMCkgewogICAgICAgICAgICAgdGhpcy5faGlkZSgpOwogICAgICAgICAgICAgZXZl bnQucHJldmVudERlZmF1bHQoKTsKICAgICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigp OwogICAgICAgICB9Ci0gICAgfSwKLQotICAgIF9vbkNsaWNrOiBmdW5jdGlvbihldmVudCkKLSAg ICB7Ci0gICAgICAgIHRoaXMuX2RpYWxvZ0RlbGVnYXRlLm9uQWN0aW9uKCk7Ci0gICAgICAgIHRo aXMuX2hpZGUoKTsKICAgICB9CiB9OwogCiAvKioKLSAqIEBpbnRlcmZhY2UKKyAqIEBjb25zdHJ1 Y3RvcgogICovCiBXZWJJbnNwZWN0b3IuRGlhbG9nRGVsZWdhdGUgPSBmdW5jdGlvbigpCiB7CiB9 CiAKIFdlYkluc3BlY3Rvci5EaWFsb2dEZWxlZ2F0ZS5wcm90b3R5cGUgPSB7Ci0gICAgZ2V0IGRl ZmF1bHRGb2N1c2VkRWxlbWVudCgpIHsgfSwKKyAgICB3YXNTaG93bjogZnVuY3Rpb24oKSB7IH0s CisgICAgCisgICAgcG9zaXRpb246IGZ1bmN0aW9uKGVsZW1lbnQsIHJlbGF0aXZlVG9FbGVtZW50 KQorICAgIHsKKyAgICAgICAgdmFyIG9mZnNldCA9IHJlbGF0aXZlVG9FbGVtZW50Lm9mZnNldFJl bGF0aXZlVG9XaW5kb3cod2luZG93KTsKKworICAgICAgICB2YXIgcG9zaXRpb25YID0gb2Zmc2V0 LnggKyAocmVsYXRpdmVUb0VsZW1lbnQub2Zmc2V0V2lkdGggLSBlbGVtZW50Lm9mZnNldFdpZHRo KSAvIDI7CisgICAgICAgIHBvc2l0aW9uWCA9IE51bWJlci5jb25zdHJhaW4ocG9zaXRpb25YLCAw LCB3aW5kb3cuaW5uZXJXaWR0aCAtIGVsZW1lbnQub2Zmc2V0V2lkdGgpOworICAgICAgICAKKyAg ICAgICAgdmFyIHBvc2l0aW9uWSA9IG9mZnNldC55ICsgKHJlbGF0aXZlVG9FbGVtZW50Lm9mZnNl dEhlaWdodCAtIGVsZW1lbnQub2Zmc2V0SGVpZ2h0KSAvIDI7CisgICAgICAgIHBvc2l0aW9uWSA9 IE51bWJlci5jb25zdHJhaW4ocG9zaXRpb25ZLCAwLCB3aW5kb3cuaW5uZXJIZWlnaHQgLSBlbGVt ZW50Lm9mZnNldEhlaWdodCk7CisgICAgICAgIAorICAgICAgICBlbGVtZW50LnN0eWxlLmxlZnQg PSBwb3NpdGlvblggKyAicHgiOworICAgICAgICBlbGVtZW50LnN0eWxlLnRvcCA9IHBvc2l0aW9u WSArICJweCI7CisgICAgfSwKKyAgICAKKyAgICBmb2N1czogZnVuY3Rpb24oKSB7IH0sCiAgICAg Ci0gICAgZ2V0IG9rQnV0dG9uKCkgeyB9LAorICAgIG9uRW50ZXI6IGZ1bmN0aW9uKCkgeyB9LAog ICAgIAotICAgIG9uQWN0aW9uOiBmdW5jdGlvbigpIHsgfQorICAgIHdpbGxIaWRlOiBmdW5jdGlv bigpIHsgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvR29Ub0xpbmVEaWFsb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0dvVG9MaW5lRGlhbG9nLmpzCmluZGV4IGIzNmEyZGIyODBlMjFmNGQxNDU2YmM3NGNjZmExZjRm ODc3MzYyMjUuLmE0NGRjM2VmMzJlOWU4YjA5MjYzZjNmNWQ3YjU3NjQ5NjdhZDcyYWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvR29Ub0xpbmVEaWFsb2cu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Hb1RvTGluZURpYWxv Zy5qcwpAQCAtMzAsNyArMzAsNyBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQGltcGxl bWVudHMge1dlYkluc3BlY3Rvci5EaWFsb2dEZWxlZ2F0ZX0KKyAqIEBleHRlbmRzIHtXZWJJbnNw ZWN0b3IuRGlhbG9nRGVsZWdhdGV9CiAgKi8KIFdlYkluc3BlY3Rvci5Hb1RvTGluZURpYWxvZyA9 IGZ1bmN0aW9uKHZpZXcpCiB7CkBAIC00NywxMCArNDcsMTQgQEAgV2ViSW5zcGVjdG9yLkdvVG9M aW5lRGlhbG9nID0gZnVuY3Rpb24odmlldykKIAogICAgIHRoaXMuX2dvQnV0dG9uID0gdGhpcy5l bGVtZW50LmNyZWF0ZUNoaWxkKCJidXR0b24iKTsKICAgICB0aGlzLl9nb0J1dHRvbi50ZXh0Q29u dGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiR28iKTsKKyAgICB0aGlzLl9nb0J1dHRvbi5h ZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX29uR29DbGljay5iaW5kKHRoaXMpLCBmYWxz ZSk7CiAKICAgICB0aGlzLl92aWV3ID0gdmlldzsKIH0KIAorLyoqCisgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5QYW5lbH0gcGFuZWwKKyAqLwogV2ViSW5zcGVjdG9yLkdvVG9MaW5lRGlhbG9nLmlu c3RhbGwgPSBmdW5jdGlvbihwYW5lbCwgdmlld0dldHRlcikKIHsKICAgICBmdW5jdGlvbiBzaG93 R29Ub0xpbmVEaWFsb2coKQpAQCAtODEsMjIgKzg1LDI5IEBAIFdlYkluc3BlY3Rvci5Hb1RvTGlu ZURpYWxvZy5jcmVhdGVTaG9ydGN1dCA9IGZ1bmN0aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLkdv VG9MaW5lRGlhbG9nLnByb3RvdHlwZSA9IHsKLSAgICBnZXQgZGVmYXVsdEZvY3VzZWRFbGVtZW50 KCkKKyAgICBmb2N1czogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2lu cHV0OworICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0Q3VycmVudEZvY3VzRWxlbWVudCh0aGlzLl9p bnB1dCk7CisgICAgICAgIHRoaXMuX2lucHV0LnNlbGVjdCgpOwogICAgIH0sCi0KLSAgICBnZXQg b2tCdXR0b24oKQorICAgIAorICAgIF9vbkdvQ2xpY2s6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLl9nb0J1dHRvbjsKKyAgICAgICAgdGhpcy5fYXBwbHlMaW5lTnVtYmVy KCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5EaWFsb2cuaGlkZSgpOwogICAgIH0sCiAgICAgCi0g ICAgb25BY3Rpb246IGZ1bmN0aW9uKCkKKyAgICBfYXBwbHlMaW5lTnVtYmVyOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB2YXIgdmFsdWUgPSB0aGlzLl9pbnB1dC52YWx1ZTsKICAgICAgICAg dmFyIGxpbmVOdW1iZXIgPSBwYXJzZUludCh2YWx1ZSwgMTApIC0gMTsKICAgICAgICAgaWYgKCFp c05hTihsaW5lTnVtYmVyKSAmJiBsaW5lTnVtYmVyID49IDApCiAgICAgICAgICAgICB0aGlzLl92 aWV3LmhpZ2hsaWdodExpbmUobGluZU51bWJlcik7CisgICAgfSwKKyAgICAKKyAgICBvbkVudGVy OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9hcHBseUxpbmVOdW1iZXIoKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv ZGlhbG9nLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZGlhbG9nLmNz cwppbmRleCA1ZTQzYWQ3NmMyMThlYWZiYWE0MDY3OWFmYTMzMTA3MTg4NTNiYTA2Li5jY2ZiM2E0 NDMyZWZhM2U5Mjc4MmE2YTgyMDU5MWZiN2U4YmZiMGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2RpYWxvZy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9kaWFsb2cuY3NzCkBAIC0xMCwxMSArMTAsMTggQEAKIC5kaWFs b2cgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICAKLSAgICBiYWNrZ3JvdW5kLWltYWdl OiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgMCUgMCUsIDAlIDEwMCUsIGZyb20oI0U5RTlFOSks IHRvKCNDRkNGQ0YpKTsKICAgICBwYWRkaW5nOiAxMHB4OwogICAgIGJvcmRlci1yYWRpdXM6IDEw cHg7CiAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsKKwogICAgIC13ZWJraXQtYm94LXNoYWRv dzogcmdiKDQwLDQwLDQwKSAwcHggMHB4IDUwcHg7CisgICAgCisgICAgZGlzcGxheTogLXdlYmtp dC1ib3g7CisgICAgLXdlYmtpdC1ib3gtb3JpZW50OiB2ZXJ0aWNhbDsKKyAgICAKKyAgICBiYWNr Z3JvdW5kLWltYWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgMCUgMCUsIDAlIDEwMCUsIGZy b20oI0U5RTlFOSksIHRvKCNDRkNGQ0YpKTsKKyAgICBmb250LXNpemU6IDExcHg7CisgICAgZm9u dC1mYW1pbHk6ICdMdWNpZGEgR3JhbmRlJywgc2Fucy1zZXJpZjsKIH0KIAogLmRpYWxvZy1jb250 ZW50cyB7Cg==