30720 2009-10-23 11:12:30 -0700 Web Inspector: pull basic sidebar implementation into the Panel. 2009-10-23 13:48:34 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned timothy oldest_to_newest 157192 0 pfeldman 2009-10-23 11:12:30 -0700 Currently there is a bunch of copypaste in Profiles and Storage. There is almost the same piece in resources, but it scrolls differently... 157195 1 41735 pfeldman 2009-10-23 11:13:35 -0700 Created attachment 41735 patch 157199 2 41735 timothy 2009-10-23 11:21:10 -0700 Comment on attachment 41735 patch Nice! Maybe setMainViewWidth is a better name than setCenterViewWidth? 157289 3 pfeldman 2009-10-23 13:48:23 -0700 Landing with comments addressed Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/Panel.js M WebCore/inspector/front-end/ProfilesPanel.js M WebCore/inspector/front-end/StoragePanel.js Committed r49997 41735 2009-10-23 11:13:35 -0700 2009-10-23 11:21:09 -0700 patch pull text/plain 10986 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmU2OTEyNC4uMzk0Mjk2NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0xMC0yMyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBwdWxsIGJhc2ljIHNpZGViYXIgaW1w bGVtZW50YXRpb24gaW50byB0aGUgUGFuZWwuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNzIwCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuanVtcFRvUHJldmlvdXNTZWFyY2hSZXN1bHQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS5oYW5kbGVLZXlFdmVudCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLl9jcmVhdGVTaWRlYmFyKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuX3N0YXJ0U2lkZWJhckRyYWdnaW5n KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuX3NpZGViYXJEcmFnZ2lu Zyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLl9lbmRTaWRlYmFyRHJh Z2dpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS5fdXBkYXRlU2lk ZWJhcldpZHRoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuc2V0Q2Vu dGVyVmlld1dpZHRoKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUuc2V0Q2VudGVyVmlld1dpZHRoKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdG9yYWdlUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0b3Jh Z2VQYW5lbC5wcm90b3R5cGUuc2V0Q2VudGVyVmlld1dpZHRoKToKKwogMjAwOS0xMC0yMyAgU3Rl dmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFu ZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKaW5kZXggNTA0NmY2 Yi4uMWVhM2NlNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVs LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpAQCAtMjYsOSAr MjYsMTEgQEAKICAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLlBhbmVsID0gZnVuY3Rp b24oKQorV2ViSW5zcGVjdG9yLlBhbmVsID0gZnVuY3Rpb24oY3JlYXRlU2lkZWJhcikKIHsKICAg ICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOworICAgIGlmIChjcmVhdGVTaWRlYmFyKQor ICAgICAgICB0aGlzLl9jcmVhdGVTaWRlYmFyKCk7CiAKICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5 bGVDbGFzcygicGFuZWwiKTsKIH0KQEAgLTI2Nyw2ICsyNjksNzcgQEAgV2ViSW5zcGVjdG9yLlBh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGN1cnJlbnRWaWV3Lmp1bXBUb0xhc3RTZWFy Y2hSZXN1bHQoKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgY3VycmVudFZpZXcuanVtcFRv UHJldmlvdXNTZWFyY2hSZXN1bHQoKTsKKyAgICB9LAorCisgICAgaGFuZGxlS2V5RXZlbnQ6IGZ1 bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5zaWRlYmFyVHJlZS5oYW5kbGVLZXlF dmVudChldmVudCk7CisgICAgfSwKKworICAgIF9jcmVhdGVTaWRlYmFyOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CisgICAgICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuY2xhc3NOYW1lID0gInNpZGVi YXIiOworICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyRWxlbWVu dCk7CisKKyAgICAgICAgdGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOworICAgICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmNsYXNz TmFtZSA9ICJzaWRlYmFyLXJlc2l6ZXItdmVydGljYWwiOworICAgICAgICB0aGlzLnNpZGViYXJS ZXNpemVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX3N0YXJ0U2lk ZWJhckRyYWdnaW5nLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICAgICAgdGhpcy5lbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQpOworCisgICAgICAgIHRoaXMuc2lk ZWJhclRyZWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKKyAgICAgICAg dGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQuY2xhc3NOYW1lID0gInNpZGViYXItdHJlZSI7CisgICAg ICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyVHJlZUVsZW1l bnQpOworICAgICAgICB0aGlzLnNpZGViYXJUcmVlID0gbmV3IFRyZWVPdXRsaW5lKHRoaXMuc2lk ZWJhclRyZWVFbGVtZW50KTsKKyAgICB9LAorCisgICAgX3N0YXJ0U2lkZWJhckRyYWdnaW5nOiBm dW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ1N0 YXJ0KHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQsIHRoaXMuX3NpZGViYXJEcmFnZ2luZy5iaW5k KHRoaXMpLCB0aGlzLl9lbmRTaWRlYmFyRHJhZ2dpbmcuYmluZCh0aGlzKSwgZXZlbnQsICJjb2wt cmVzaXplIik7CisgICAgfSwKKworICAgIF9zaWRlYmFyRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50 KQorICAgIHsKKyAgICAgICAgdGhpcy5fdXBkYXRlU2lkZWJhcldpZHRoKGV2ZW50LnBhZ2VYKTsK KworICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgIH0sCisKKyAgICBfZW5kU2lk ZWJhckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rv ci5lbGVtZW50RHJhZ0VuZChldmVudCk7CisgICAgfSwKKworICAgIF91cGRhdGVTaWRlYmFyV2lk dGg6IGZ1bmN0aW9uKHdpZHRoKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuc2lkZWJhckVsZW1l bnQub2Zmc2V0V2lkdGggPD0gMCkgeworICAgICAgICAgICAgLy8gVGhlIHN0eWxlc2hlZXQgaGFz bid0IGxvYWRlZCB5ZXQgb3IgdGhlIHdpbmRvdyBpcyBjbG9zZWQsCisgICAgICAgICAgICAvLyBz byB3ZSBjYW4ndCBjYWxjdWxhdGUgd2hhdCBpcyBuZWVkLiBSZXR1cm4gZWFybHkuCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBpZiAoISgiX2N1cnJlbnRTaWRlYmFy V2lkdGgiIGluIHRoaXMpKQorICAgICAgICAgICAgdGhpcy5fY3VycmVudFNpZGViYXJXaWR0aCA9 IHRoaXMuc2lkZWJhckVsZW1lbnQub2Zmc2V0V2lkdGg7CisKKyAgICAgICAgaWYgKHR5cGVvZiB3 aWR0aCA9PT0gInVuZGVmaW5lZCIpCisgICAgICAgICAgICB3aWR0aCA9IHRoaXMuX2N1cnJlbnRT aWRlYmFyV2lkdGg7CisKKyAgICAgICAgd2lkdGggPSBOdW1iZXIuY29uc3RyYWluKHdpZHRoLCBQ cmVmZXJlbmNlcy5taW5TaWRlYmFyV2lkdGgsIHdpbmRvdy5pbm5lcldpZHRoIC8gMik7CisKKyAg ICAgICAgdGhpcy5fY3VycmVudFNpZGViYXJXaWR0aCA9IHdpZHRoOworCisgICAgICAgIHRoaXMu c2lkZWJhckVsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCArICJweCI7CisgICAgICAgIHRoaXMu c2V0Q2VudGVyVmlld1dpZHRoKHdpZHRoKTsKKyAgICAgICAgdGhpcy5zaWRlYmFyUmVzaXplRWxl bWVudC5zdHlsZS5sZWZ0ID0gKHdpZHRoIC0gMykgKyAicHgiOworICAgICAgICAKKyAgICAgICAg dmFyIHZpc2libGVWaWV3ID0gdGhpcy52aXNpYmxlVmlldzsKKyAgICAgICAgaWYgKHZpc2libGVW aWV3ICYmICJyZXNpemUiIGluIHZpc2libGVWaWV3KQorICAgICAgICAgICAgdmlzaWJsZVZpZXcu cmVzaXplKCk7CisgICAgfSwKKyAgICAKKyAgICBzZXRDZW50ZXJWaWV3V2lkdGg6IGZ1bmN0aW9u KHdpZHRoKQorICAgIHsKKyAgICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IGFuY2Vz dG9ycy4KICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Qcm9maWxlc1BhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVz UGFuZWwuanMKaW5kZXggYTVhMzU0ZS4uYjUxZDAwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKQEAgLTg1LDcgKzg1LDcgQEAgV2ViSW5zcGVjdG9y LlByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwg PSBmdW5jdGlvbigpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlBhbmVsLmNhbGwodGhpcyk7CisgICAg V2ViSW5zcGVjdG9yLlBhbmVsLmNhbGwodGhpcywgdHJ1ZSk7CiAKICAgICB0aGlzLmVsZW1lbnQu YWRkU3R5bGVDbGFzcygicHJvZmlsZXMiKTsKICAgICB0aGlzLl9wcm9maWxlVHlwZXNCeUlkTWFw ID0ge307CkBAIC05OSwyMSArOTksNiBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbCA9IGZ1 bmN0aW9uKCkKIAogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnBhbmVsRW5hYmxl clZpZXcuZWxlbWVudCk7CiAKLSAgICB0aGlzLnNpZGViYXJFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5zaWRlYmFyRWxlbWVudC5pZCA9ICJwcm9maWxl cy1zaWRlYmFyIjsKLSAgICB0aGlzLnNpZGViYXJFbGVtZW50LmNsYXNzTmFtZSA9ICJzaWRlYmFy IjsKLSAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyRWxlbWVudCk7Ci0K LSAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7Ci0gICAgdGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJh ci1yZXNpemVyLXZlcnRpY2FsIjsKLSAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX3N0YXJ0U2lkZWJhckRyYWdnaW5nLmJpbmQo dGhpcyksIGZhbHNlKTsKLSAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFy UmVzaXplRWxlbWVudCk7Ci0KLSAgICB0aGlzLnNpZGViYXJUcmVlRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAgdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQuY2xhc3NO YW1lID0gInNpZGViYXItdHJlZSI7Ci0gICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnNpZGViYXJUcmVlRWxlbWVudCk7Ci0gICAgdGhpcy5zaWRlYmFyVHJlZSA9IG5ldyBU cmVlT3V0bGluZSh0aGlzLnNpZGViYXJUcmVlRWxlbWVudCk7Ci0KICAgICB0aGlzLnByb2ZpbGVW aWV3cyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRoaXMucHJvZmlsZVZp ZXdzLmlkID0gInByb2ZpbGUtdmlld3MiOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0 aGlzLnByb2ZpbGVWaWV3cyk7CkBAIC0yMTEsMTEgKzE5Niw2IEBAIFdlYkluc3BlY3Rvci5Qcm9m aWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdXBkYXRlSW50ZXJmYWNlKCk7 CiAgICAgfSwKIAotICAgIGhhbmRsZUtleUV2ZW50OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuc2lkZWJhclRyZWUuaGFuZGxlS2V5RXZlbnQoZXZlbnQpOwotICAgIH0sCi0K ICAgICByZWdpc3RlclByb2ZpbGVUeXBlOiBmdW5jdGlvbihwcm9maWxlVHlwZSkKICAgICB7CiAg ICAgICAgIHRoaXMuX3Byb2ZpbGVUeXBlc0J5SWRNYXBbcHJvZmlsZVR5cGUuaWRdID0gcHJvZmls ZVR5cGU7CkBAIC00NzAsNDkgKzQ1MCwxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9zaG91bGRQb3B1bGF0ZVByb2ZpbGVz OwogICAgIH0sCiAKLSAgICBfc3RhcnRTaWRlYmFyRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50KQot ICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmVsZW1lbnREcmFnU3RhcnQodGhpcy5zaWRlYmFy UmVzaXplRWxlbWVudCwgdGhpcy5fc2lkZWJhckRyYWdnaW5nLmJpbmQodGhpcyksIHRoaXMuX2Vu ZFNpZGViYXJEcmFnZ2luZy5iaW5kKHRoaXMpLCBldmVudCwgImNvbC1yZXNpemUiKTsKLSAgICB9 LAotCi0gICAgX3NpZGViYXJEcmFnZ2luZzogZnVuY3Rpb24oZXZlbnQpCisgICAgc2V0Q2VudGVy Vmlld1dpZHRoOiBmdW5jdGlvbih3aWR0aCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVNp ZGViYXJXaWR0aChldmVudC5wYWdlWCk7Ci0KLSAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQo KTsKLSAgICB9LAotCi0gICAgX2VuZFNpZGViYXJEcmFnZ2luZzogZnVuY3Rpb24oZXZlbnQpCi0g ICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuZWxlbWVudERyYWdFbmQoZXZlbnQpOwotICAgIH0s Ci0KLSAgICBfdXBkYXRlU2lkZWJhcldpZHRoOiBmdW5jdGlvbih3aWR0aCkKLSAgICB7Ci0gICAg ICAgIGlmICh0aGlzLnNpZGViYXJFbGVtZW50Lm9mZnNldFdpZHRoIDw9IDApIHsKLSAgICAgICAg ICAgIC8vIFRoZSBzdHlsZXNoZWV0IGhhc24ndCBsb2FkZWQgeWV0IG9yIHRoZSB3aW5kb3cgaXMg Y2xvc2VkLAotICAgICAgICAgICAgLy8gc28gd2UgY2FuJ3QgY2FsY3VsYXRlIHdoYXQgaXMgbmVl ZC4gUmV0dXJuIGVhcmx5LgotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAg ICAgaWYgKCEoIl9jdXJyZW50U2lkZWJhcldpZHRoIiBpbiB0aGlzKSkKLSAgICAgICAgICAgIHRo aXMuX2N1cnJlbnRTaWRlYmFyV2lkdGggPSB0aGlzLnNpZGViYXJFbGVtZW50Lm9mZnNldFdpZHRo OwotCi0gICAgICAgIGlmICh0eXBlb2Ygd2lkdGggPT09ICJ1bmRlZmluZWQiKQotICAgICAgICAg ICAgd2lkdGggPSB0aGlzLl9jdXJyZW50U2lkZWJhcldpZHRoOwotCi0gICAgICAgIHdpZHRoID0g TnVtYmVyLmNvbnN0cmFpbih3aWR0aCwgUHJlZmVyZW5jZXMubWluU2lkZWJhcldpZHRoLCB3aW5k b3cuaW5uZXJXaWR0aCAvIDIpOwotCi0gICAgICAgIHRoaXMuX2N1cnJlbnRTaWRlYmFyV2lkdGgg PSB3aWR0aDsKLQotICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnN0eWxlLndpZHRoID0gd2lk dGggKyAicHgiOwogICAgICAgICB0aGlzLnByb2ZpbGVWaWV3cy5zdHlsZS5sZWZ0ID0gd2lkdGgg KyAicHgiOwogICAgICAgICB0aGlzLnByb2ZpbGVWaWV3U3RhdHVzQmFySXRlbXNDb250YWluZXIu c3R5bGUubGVmdCA9IHdpZHRoICsgInB4IjsKLSAgICAgICAgdGhpcy5zaWRlYmFyUmVzaXplRWxl bWVudC5zdHlsZS5sZWZ0ID0gKHdpZHRoIC0gMykgKyAicHgiOwotICAgICAgICAKLSAgICAgICAg dmFyIHZpc2libGVWaWV3ID0gdGhpcy52aXNpYmxlVmlldzsKLSAgICAgICAgaWYgKHZpc2libGVW aWV3ICYmICJyZXNpemUiIGluIHZpc2libGVWaWV3KQotICAgICAgICAgICAgdmlzaWJsZVZpZXcu cmVzaXplKCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3RvcmFnZVBhbmVsLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3Jh Z2VQYW5lbC5qcwppbmRleCA2NmI0YTkyLi5jMTcxOWY3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKQEAgLTI5LDIzICsyOSw3IEBACiAKIFdlYkluc3Bl Y3Rvci5TdG9yYWdlUGFuZWwgPSBmdW5jdGlvbihkYXRhYmFzZSkKIHsKLSAgICBXZWJJbnNwZWN0 b3IuUGFuZWwuY2FsbCh0aGlzKTsKLQotICAgIHRoaXMuc2lkZWJhckVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLnNpZGViYXJFbGVtZW50LmlkID0gInN0 b3JhZ2Utc2lkZWJhciI7Ci0gICAgdGhpcy5zaWRlYmFyRWxlbWVudC5jbGFzc05hbWUgPSAic2lk ZWJhciI7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc2lkZWJhckVsZW1lbnQp OwotCi0gICAgdGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOwotICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQuY2xhc3NOYW1lID0gInNp ZGViYXItcmVzaXplci12ZXJ0aWNhbCI7Ci0gICAgdGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9zdGFydFNpZGViYXJEcmFnZ2luZy5i aW5kKHRoaXMpLCBmYWxzZSk7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc2lk ZWJhclJlc2l6ZUVsZW1lbnQpOwotCi0gICAgdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJvbCIpOwotICAgIHRoaXMuc2lkZWJhclRyZWVFbGVtZW50LmNs YXNzTmFtZSA9ICJzaWRlYmFyLXRyZWUiOwotICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQpOwotCi0gICAgdGhpcy5zaWRlYmFyVHJlZSA9 IG5ldyBUcmVlT3V0bGluZSh0aGlzLnNpZGViYXJUcmVlRWxlbWVudCk7CisgICAgV2ViSW5zcGVj dG9yLlBhbmVsLmNhbGwodGhpcywgdHJ1ZSk7CiAKICAgICB0aGlzLmRhdGFiYXNlc0xpc3RUcmVl RWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclNlY3Rpb25UcmVlRWxlbWVudChXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkRBVEFCQVNFUyIpLCB7fSwgdHJ1ZSk7CiAgICAgdGhpcy5zaWRl YmFyVHJlZS5hcHBlbmRDaGlsZCh0aGlzLmRhdGFiYXNlc0xpc3RUcmVlRWxlbWVudCk7CkBAIC00 MTYsNDkgKzQwMCwxMCBAQCBXZWJJbnNwZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgfSwKIAotICAgIF9zdGFydFNpZGViYXJEcmFnZ2lu ZzogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuZWxlbWVudERy YWdTdGFydCh0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LCB0aGlzLl9zaWRlYmFyRHJhZ2dpbmcu YmluZCh0aGlzKSwgdGhpcy5fZW5kU2lkZWJhckRyYWdnaW5nLmJpbmQodGhpcyksIGV2ZW50LCAi Y29sLXJlc2l6ZSIpOwotICAgIH0sCi0KLSAgICBfc2lkZWJhckRyYWdnaW5nOiBmdW5jdGlvbihl dmVudCkKKyAgICBzZXRDZW50ZXJWaWV3V2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQogICAgIHsKLSAg ICAgICAgdGhpcy5fdXBkYXRlU2lkZWJhcldpZHRoKGV2ZW50LnBhZ2VYKTsKLQotICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgIH0sCi0KLSAgICBfZW5kU2lkZWJhckRyYWdnaW5n OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJh Z0VuZChldmVudCk7Ci0gICAgfSwKLQotICAgIF91cGRhdGVTaWRlYmFyV2lkdGg6IGZ1bmN0aW9u KHdpZHRoKQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuc2lkZWJhckVsZW1lbnQub2Zmc2V0V2lk dGggPD0gMCkgewotICAgICAgICAgICAgLy8gVGhlIHN0eWxlc2hlZXQgaGFzbid0IGxvYWRlZCB5 ZXQgb3IgdGhlIHdpbmRvdyBpcyBjbG9zZWQsCi0gICAgICAgICAgICAvLyBzbyB3ZSBjYW4ndCBj YWxjdWxhdGUgd2hhdCBpcyBuZWVkLiBSZXR1cm4gZWFybHkuCi0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoISgiX2N1cnJlbnRTaWRlYmFyV2lkdGgiIGluIHRo aXMpKQotICAgICAgICAgICAgdGhpcy5fY3VycmVudFNpZGViYXJXaWR0aCA9IHRoaXMuc2lkZWJh ckVsZW1lbnQub2Zmc2V0V2lkdGg7Ci0KLSAgICAgICAgaWYgKHR5cGVvZiB3aWR0aCA9PT0gInVu ZGVmaW5lZCIpCi0gICAgICAgICAgICB3aWR0aCA9IHRoaXMuX2N1cnJlbnRTaWRlYmFyV2lkdGg7 Ci0KLSAgICAgICAgd2lkdGggPSBOdW1iZXIuY29uc3RyYWluKHdpZHRoLCBQcmVmZXJlbmNlcy5t aW5TaWRlYmFyV2lkdGgsIHdpbmRvdy5pbm5lcldpZHRoIC8gMik7Ci0KLSAgICAgICAgdGhpcy5f Y3VycmVudFNpZGViYXJXaWR0aCA9IHdpZHRoOwotCi0gICAgICAgIHRoaXMuc2lkZWJhckVsZW1l bnQuc3R5bGUud2lkdGggPSB3aWR0aCArICJweCI7CiAgICAgICAgIHRoaXMuc3RvcmFnZVZpZXdz LnN0eWxlLmxlZnQgPSB3aWR0aCArICJweCI7CiAgICAgICAgIHRoaXMuc3RvcmFnZVZpZXdTdGF0 dXNCYXJJdGVtc0NvbnRhaW5lci5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOwotICAgICAgICB0 aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LnN0eWxlLmxlZnQgPSAod2lkdGggLSAzKSArICJweCI7 Ci0gICAgICAgIAotICAgICAgICB2YXIgdmlzaWJsZVZpZXcgPSB0aGlzLnZpc2libGVWaWV3Owot ICAgICAgICBpZiAodmlzaWJsZVZpZXcgJiYgInJlc2l6ZSIgaW4gdmlzaWJsZVZpZXcpCi0gICAg ICAgICAgICB2aXNpYmxlVmlldy5yZXNpemUoKTsKICAgICB9CiB9CiAK