30742 2009-10-24 09:47:18 -0700 Web Inspector: REGRESSION: Can't resize the Element's sidebar 2009-10-24 20:01:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED Regression P2 Normal --- 0 timothy timothy aroben bweinstein joepeck pfeldman rik timothy oldest_to_newest 157450 0 timothy 2009-10-24 09:47:18 -0700 The Element's sidebar can't be resized anymore. It seems the resize div is floating in the middle of the elements tree somewhere. Maybe this was caused by the sidebar migration to Panel? 157455 1 41784 timothy 2009-10-24 11:08:21 -0700 Created attachment 41784 Proposed Patch 157457 2 joepeck 2009-10-24 11:45:55 -0700 Hehe, the patch itself looks good to me. The only thing that caught my eye was something that wasn't changed, but showed up in the context: > + updateMainViewWidth: function(width) > { > // Should be implemented by ancestors. > } "ancestors" means ↑ (up). Really this should be the children (sub "classes") that implement it. 157507 3 41784 pfeldman 2009-10-24 15:54:16 -0700 Comment on attachment 41784 Proposed Patch Nice. I have nearly identical patch locally. 157510 4 pfeldman 2009-10-24 16:06:16 -0700 > "ancestors" means ↑ (up). Really this should be the children (sub "classes") Oops. Should be subclasses. 157530 5 timothy 2009-10-24 20:01:30 -0700 Committed r50033: <http://trac.webkit.org/changeset/50033> 41784 2009-10-24 11:08:21 -0700 2009-10-24 15:54:15 -0700 Proposed Patch bug-30742-20091024110819.patch text/plain 14848 timothy ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTY3OGE4Yy4uNDM4Y2MxNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MCBAQAogMjAwOS0xMC0yNCAgVGltb3RoeSBIYXRj aGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSByZXNpemluZyB0aGUgV2Vi IEluc3BlY3RvcidzIEVsZW1lbnRzIHBhbmVsIHNpZGViYXIgd29yayBhZ2Fpbi4KKyAgICAgICAg QWxzbyBtYWtlcyBSZXNvdXJjZXMgcGFuZWwgdXNlIHRoZSBzaWRlYmFyIGNvZGUgaW4gUGFuZWwu CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNzQy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsKTog RG9uJ3QgY3JlYXRlIHRoZSBzaWRlYmFyIHdpdGggYW4gYXJndW1lbnQuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnNob3cpOiBDYWxsIHVwZGF0ZVNpZGViYXJXaWR0aC4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuaGFuZGxlS2V5RXZlbnQpOiBD YWxsIGhhbmRsZVNpZGViYXJLZXlFdmVudC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5w cm90b3R5cGUuaGFuZGxlU2lkZWJhcktleUV2ZW50KTogQWRkZWQuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuUGFuZWwucHJvdG90eXBlLmNyZWF0ZVNpZGViYXIpOiBSZW5hbWVkIGZyb20gX2NyZWF0 ZVNpZGViYXIuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLl9zaWRlYmFy RHJhZ2dpbmcpOiBDYWxsIHVwZGF0ZVNpZGViYXJXaWR0aC4KKyAgICAgICAgKFdlYkluc3BlY3Rv ci5QYW5lbC5wcm90b3R5cGUudXBkYXRlU2lkZWJhcldpZHRoKTogUmVuYW1lZCBmcm9tIF91cGRh dGVTaWRlYmFyV2lkdGguCisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlLnNl dFNpZGViYXJXaWR0aCk6IEFkZGVkLiBDYWxsZWQgYnkgdXBkYXRlU2lkZWJhcldpZHRoLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS51cGRhdGVNYWluVmlld1dpZHRoKTog UmVuYW1lZCBmcm9tIHNldE1haW5WaWV3V2lkdGguCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwpOiBDYWxsIGNyZWF0ZVNpZGViYXIuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZXNQ YW5lbC5wcm90b3R5cGUudXBkYXRlTWFpblZpZXdXaWR0aCk6IFJlbmFtZWQgZnJvbSBzZXRNYWlu Vmlld1dpZHRoLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3cp OiBSZW1vdmUgY2FsbCB0byBfdXBkYXRlU2lkZWJhcldpZHRoLgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5zaG93UmVzb3VyY2UpOiBDYWxsIHVwZGF0ZVNp ZGViYXJXaWR0aAorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlw ZS5jbG9zZVZpc2libGVSZXNvdXJjZSk6IERpdHRvLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlc1BhbmVsLnByb3RvdHlwZS5zZXRTaWRlYmFyV2lkdGgpOiBBZGRlZC4KKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUudXBkYXRlTWFpblZpZXdXaWR0 aCk6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0b3JhZ2VQYW5lbCk6IENhbGwgY3JlYXRlU2lkZWJh ci4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdG9yYWdlUGFuZWwucHJvdG90eXBlLnVwZGF0ZU1h aW5WaWV3V2lkdGgpOiBSZW5hbWVkIGZyb20gc2V0TWFpblZpZXdXaWR0aC4KKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVQYW5lbCk6IENhbGwgY3JlYXRlU2lkZWJhci4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZS51cGRhdGVNYWluVmlld1dpZHRoKTogUmVuYW1l ZCBmcm9tIHNldE1haW5WaWV3V2lkdGguCisKKzIwMDktMTAtMjQgIFRpbW90aHkgSGF0Y2hlciAg PHRpbW90aHlAYXBwbGUuY29tPgorCiAgICAgICAgIENhbGwgdXBkYXRlU2VsZWN0aW9uKCkgaW4g YSBmZXcgcGxhY2VzIHNvIGhvdmVyaW5nIGluIHRoZSBXZWIgSW5zcGVjdG9yJ3MKICAgICAgICAg RWxlbWVudHMgcGFuZWwgYWx3YXlzIGhhcyB0aGUgY29ycmVjdCByb3cgc2VsZWN0aW9uIGhlaWdo dC4KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCmluZGV4IDM3NmJiODIuLjZjZDIw MGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKQEAgLTI2LDExICsyNiw5IEBA CiAgKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5QYW5lbCA9IGZ1bmN0aW9uKGNyZWF0 ZVNpZGViYXIpCitXZWJJbnNwZWN0b3IuUGFuZWwgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5z cGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKLSAgICBpZiAoY3JlYXRlU2lkZWJhcikKLSAgICAgICAg dGhpcy5fY3JlYXRlU2lkZWJhcigpOwogCiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3Mo InBhbmVsIik7CiB9CkBAIC04NCw3ICs4Miw4IEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90b29sYmFySXRlbS5hZGRTdHlsZUNsYXNzKCJ0b2dn bGVkLW9uIik7CiAKICAgICAgICAgV2ViSW5zcGVjdG9yLmN1cnJlbnRGb2N1c0VsZW1lbnQgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWFpbi1wYW5lbHMiKTsKLSAgICAgICAgdGhpcy5fdXBk YXRlU2lkZWJhcldpZHRoKCk7CisKKyAgICAgICAgdGhpcy51cGRhdGVTaWRlYmFyV2lkdGgoKTsK ICAgICB9LAogCiAgICAgaGlkZTogZnVuY3Rpb24oKQpAQCAtMjc0LDIzICsyNzMsNDEgQEAgV2Vi SW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIGhhbmRsZUtleUV2ZW50OiBmdW5j dGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuc2lkZWJhclRyZWUuaGFuZGxlS2V5RXZl bnQoZXZlbnQpOworICAgICAgICB0aGlzLmhhbmRsZVNpZGViYXJLZXlFdmVudChldmVudCk7Cisg ICAgfSwKKworICAgIGhhbmRsZVNpZGViYXJLZXlFdmVudDogZnVuY3Rpb24oZXZlbnQpCisgICAg eworICAgICAgICBpZiAodGhpcy5oYXNTaWRlYmFyICYmIHRoaXMuc2lkZWJhclRyZWUpCisgICAg ICAgICAgICB0aGlzLnNpZGViYXJUcmVlLmhhbmRsZUtleUV2ZW50KGV2ZW50KTsKICAgICB9LAog Ci0gICAgX2NyZWF0ZVNpZGViYXI6IGZ1bmN0aW9uKCkKKyAgICBjcmVhdGVTaWRlYmFyOiBmdW5j dGlvbihwYXJlbnRFbGVtZW50LCByZXNpemVyUGFyZW50RWxlbWVudCkKICAgICB7CisgICAgICAg IGlmICh0aGlzLmhhc1NpZGViYXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYg KCFwYXJlbnRFbGVtZW50KQorICAgICAgICAgICAgcGFyZW50RWxlbWVudCA9IHRoaXMuZWxlbWVu dDsKKworICAgICAgICBpZiAoIXJlc2l6ZXJQYXJlbnRFbGVtZW50KQorICAgICAgICAgICAgcmVz aXplclBhcmVudEVsZW1lbnQgPSBwYXJlbnRFbGVtZW50OworCisgICAgICAgIHRoaXMuaGFzU2lk ZWJhciA9IHRydWU7CisKICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LmNsYXNzTmFt ZSA9ICJzaWRlYmFyIjsKLSAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc2lk ZWJhckVsZW1lbnQpOworICAgICAgICBwYXJlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc2lk ZWJhckVsZW1lbnQpOwogCiAgICAgICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy5zaWRlYmFyUmVzaXplRWxl bWVudC5jbGFzc05hbWUgPSAic2lkZWJhci1yZXNpemVyLXZlcnRpY2FsIjsKICAgICAgICAgdGhp cy5zaWRlYmFyUmVzaXplRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlz Ll9zdGFydFNpZGViYXJEcmFnZ2luZy5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0gICAgICAgIHRoaXMu ZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50KTsKKyAgICAgICAg cmVzaXplclBhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyUmVzaXplRWxlbWVu dCk7CiAKICAgICAgICAgdGhpcy5zaWRlYmFyVHJlZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJvbCIpOwogICAgICAgICB0aGlzLnNpZGViYXJUcmVlRWxlbWVudC5jbGFzc05hbWUg PSAic2lkZWJhci10cmVlIjsKICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLnNpZGViYXJUcmVlRWxlbWVudCk7CisKICAgICAgICAgdGhpcy5zaWRlYmFyVHJlZSA9 IG5ldyBUcmVlT3V0bGluZSh0aGlzLnNpZGViYXJUcmVlRWxlbWVudCk7CiAgICAgfSwKIApAQCAt MzAxLDcgKzMxOCw3IEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICBf c2lkZWJhckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Vw ZGF0ZVNpZGViYXJXaWR0aChldmVudC5wYWdlWCk7CisgICAgICAgIHRoaXMudXBkYXRlU2lkZWJh cldpZHRoKGV2ZW50LnBhZ2VYKTsKIAogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwog ICAgIH0sCkBAIC0zMTEsOCArMzI4LDExIEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ0VuZChldmVudCk7CiAgICAgfSwK IAotICAgIF91cGRhdGVTaWRlYmFyV2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQorICAgIHVwZGF0ZVNp ZGViYXJXaWR0aDogZnVuY3Rpb24od2lkdGgpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuaGFz U2lkZWJhcikKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBpZiAodGhpcy5zaWRlYmFy RWxlbWVudC5vZmZzZXRXaWR0aCA8PSAwKSB7CiAgICAgICAgICAgICAvLyBUaGUgc3R5bGVzaGVl dCBoYXNuJ3QgbG9hZGVkIHlldCBvciB0aGUgd2luZG93IGlzIGNsb3NlZCwKICAgICAgICAgICAg IC8vIHNvIHdlIGNhbid0IGNhbGN1bGF0ZSB3aGF0IGlzIG5lZWQuIFJldHVybiBlYXJseS4KQEAg LTMyOCwxNyArMzQ4LDIyIEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHdpZHRoID0gTnVtYmVyLmNvbnN0cmFpbih3aWR0aCwgUHJlZmVyZW5jZXMubWluU2lkZWJh cldpZHRoLCB3aW5kb3cuaW5uZXJXaWR0aCAvIDIpOwogCiAgICAgICAgIHRoaXMuX2N1cnJlbnRT aWRlYmFyV2lkdGggPSB3aWR0aDsKKyAgICAgICAgdGhpcy5zZXRTaWRlYmFyV2lkdGgod2lkdGgp OworCisgICAgICAgIHRoaXMudXBkYXRlTWFpblZpZXdXaWR0aCh3aWR0aCk7CiAKLSAgICAgICAg dGhpcy5zaWRlYmFyRWxlbWVudC5zdHlsZS53aWR0aCA9IHdpZHRoICsgInB4IjsKLSAgICAgICAg dGhpcy5zZXRNYWluVmlld1dpZHRoKHdpZHRoKTsKLSAgICAgICAgdGhpcy5zaWRlYmFyUmVzaXpl RWxlbWVudC5zdHlsZS5sZWZ0ID0gKHdpZHRoIC0gMykgKyAicHgiOwotICAgICAgICAKICAgICAg ICAgdmFyIHZpc2libGVWaWV3ID0gdGhpcy52aXNpYmxlVmlldzsKICAgICAgICAgaWYgKHZpc2li bGVWaWV3ICYmICJyZXNpemUiIGluIHZpc2libGVWaWV3KQogICAgICAgICAgICAgdmlzaWJsZVZp ZXcucmVzaXplKCk7CiAgICAgfSwKLSAgICAKLSAgICBzZXRNYWluVmlld1dpZHRoOiBmdW5jdGlv bih3aWR0aCkKKworICAgIHNldFNpZGViYXJXaWR0aDogZnVuY3Rpb24od2lkdGgpCisgICAgewor ICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnN0eWxlLndpZHRoID0gd2lkdGggKyAicHgiOwor ICAgICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LnN0eWxlLmxlZnQgPSAod2lkdGggLSAz KSArICJweCI7CisgICAgfSwKKworICAgIHVwZGF0ZU1haW5WaWV3V2lkdGg6IGZ1bmN0aW9uKHdp ZHRoKQogICAgIHsKICAgICAgICAgLy8gU2hvdWxkIGJlIGltcGxlbWVudGVkIGJ5IGFuY2VzdG9y cy4KICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmls ZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpz CmluZGV4IDZhY2M2NGUuLjc0YzJiYjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC04NSw3ICs4NSw5IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxl VHlwZS5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsID0gZnVuY3Rp b24oKQogewotICAgIFdlYkluc3BlY3Rvci5QYW5lbC5jYWxsKHRoaXMsIHRydWUpOworICAgIFdl Ykluc3BlY3Rvci5QYW5lbC5jYWxsKHRoaXMpOworCisgICAgdGhpcy5jcmVhdGVTaWRlYmFyKCk7 CiAKICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygicHJvZmlsZXMiKTsKICAgICB0aGlz Ll9wcm9maWxlVHlwZXNCeUlkTWFwID0ge307CkBAIC00NDksNyArNDUxLDcgQEAgV2ViSW5zcGVj dG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBkZWxldGUgdGhpcy5fc2hv dWxkUG9wdWxhdGVQcm9maWxlczsKICAgICB9LAogCi0gICAgc2V0TWFpblZpZXdXaWR0aDogZnVu Y3Rpb24od2lkdGgpCisgICAgdXBkYXRlTWFpblZpZXdXaWR0aDogZnVuY3Rpb24od2lkdGgpCiAg ICAgewogICAgICAgICB0aGlzLnByb2ZpbGVWaWV3cy5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgi OwogICAgICAgICB0aGlzLnByb2ZpbGVWaWV3U3RhdHVzQmFySXRlbXNDb250YWluZXIuc3R5bGUu bGVmdCA9IHdpZHRoICsgInB4IjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZXNQYW5lbC5qcwppbmRleCAzNmQ2NTdkLi4zNWZjZDg4IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC00NiwxNSArNDYsOSBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5jb250YWluZXJF bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX3VwZGF0ZURpdmlkZXJzTGFi ZWxCYXJQb3NpdGlvbi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuY29udGFpbmVyRWxlbWVudCk7CiAKLSAgICB0aGlzLnNpZGViYXJFbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5zaWRlYmFyRWxlbWVu dC5pZCA9ICJyZXNvdXJjZXMtc2lkZWJhciI7Ci0gICAgdGhpcy5zaWRlYmFyRWxlbWVudC5jbGFz c05hbWUgPSAic2lkZWJhciI7Ci0gICAgdGhpcy5jb250YWluZXJFbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuc2lkZWJhckVsZW1lbnQpOworICAgIHRoaXMuY3JlYXRlU2lkZWJhcih0aGlzLmNvbnRh aW5lckVsZW1lbnQsIHRoaXMuZWxlbWVudCk7CiAKLSAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5zaWRlYmFyUmVz aXplRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhci1yZXNpemVyLXZlcnRpY2FsIjsKLSAgICB0 aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRo aXMuX3N0YXJ0U2lkZWJhckRyYWdnaW5nLmJpbmQodGhpcyksIGZhbHNlKTsKLSAgICB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudCk7CisgICAgdGhpcy5z aWRlYmFyRWxlbWVudC5pZCA9ICJyZXNvdXJjZXMtc2lkZWJhciI7CiAKICAgICB0aGlzLmNvbnRh aW5lckNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAg dGhpcy5jb250YWluZXJDb250ZW50RWxlbWVudC5pZCA9ICJyZXNvdXJjZXMtY29udGFpbmVyLWNv bnRlbnQiOwpAQCAtODAsMTIgKzc0LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsID0g ZnVuY3Rpb24oKQogICAgIHRoaXMuZGl2aWRlcnNMYWJlbEJhckVsZW1lbnQuaWQgPSAicmVzb3Vy Y2VzLWRpdmlkZXJzLWxhYmVsLWJhciI7CiAgICAgdGhpcy5jb250YWluZXJDb250ZW50RWxlbWVu dC5hcHBlbmRDaGlsZCh0aGlzLmRpdmlkZXJzTGFiZWxCYXJFbGVtZW50KTsKIAotICAgIHRoaXMu c2lkZWJhclRyZWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKLSAgICB0 aGlzLnNpZGViYXJUcmVlRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhci10cmVlIjsKLSAgICB0 aGlzLnNpZGViYXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc2lkZWJhclRyZWVFbGVtZW50KTsK LQotICAgIHRoaXMuc2lkZWJhclRyZWUgPSBuZXcgVHJlZU91dGxpbmUodGhpcy5zaWRlYmFyVHJl ZUVsZW1lbnQpOwotCiAgICAgdmFyIHRpbWVHcmFwaEl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLlNp ZGViYXJUcmVlRWxlbWVudCgicmVzb3VyY2VzLXRpbWUtZ3JhcGgtc2lkZWJhci1pdGVtIiwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lIikpOwogICAgIHRpbWVHcmFwaEl0ZW0ub25zZWxlY3Qg PSB0aGlzLl9ncmFwaFNlbGVjdGVkLmJpbmQodGhpcyk7CiAKQEAgLTI4NCw3ICsyNzIsNiBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNw ZWN0b3IuUGFuZWwucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzKTsKIAogICAgICAgICB0aGlzLl91 cGRhdGVEaXZpZGVyc0xhYmVsQmFyUG9zaXRpb24oKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlU2lk ZWJhcldpZHRoKCk7CiAgICAgICAgIHRoaXMucmVmcmVzaElmTmVlZGVkKCk7CiAKICAgICAgICAg dmFyIHZpc2libGVWaWV3ID0gdGhpcy52aXNpYmxlVmlldzsKQEAgLTY3NSw3ICs2NjIsNyBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMu dmlzaWJsZVJlc291cmNlID0gcmVzb3VyY2U7CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlU2lkZWJh cldpZHRoKCk7CisgICAgICAgIHRoaXMudXBkYXRlU2lkZWJhcldpZHRoKCk7CiAgICAgfSwKIAog ICAgIHNob3dWaWV3OiBmdW5jdGlvbih2aWV3KQpAQCAtNjk3LDcgKzY4NCw3IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLl9sYXN0 U2VsZWN0ZWRHcmFwaFRyZWVFbGVtZW50KQogICAgICAgICAgICAgdGhpcy5fbGFzdFNlbGVjdGVk R3JhcGhUcmVlRWxlbWVudC5zZWxlY3QodHJ1ZSk7CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlU2lk ZWJhcldpZHRoKCk7CisgICAgICAgIHRoaXMudXBkYXRlU2lkZWJhcldpZHRoKCk7CiAgICAgfSwK IAogICAgIHJlc291cmNlVmlld0ZvclJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKQEAgLTcy NiwxMSArNzEzLDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIHZpZXcuc291cmNlRnJhbWU7CiAgICAgfSwKIAotICAgIGhhbmRsZUtl eUV2ZW50OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc2lkZWJhclRyZWUu aGFuZGxlS2V5RXZlbnQoZXZlbnQpOwotICAgIH0sCi0KICAgICBfc29ydFJlc291cmNlc0lmTmVl ZGVkOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgc29ydGVkRWxlbWVudHMgPSBbXS5j b25jYXQodGhpcy5yZXNvdXJjZXNUcmVlRWxlbWVudC5jaGlsZHJlbik7CkBAIC05MjYsNDEgKzkw OCw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0KICAgICB9LAogCi0gICAgX3N0YXJ0U2lkZWJhckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkK LSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ1N0YXJ0KHRoaXMuc2lkZWJh clJlc2l6ZUVsZW1lbnQsIHRoaXMuX3NpZGViYXJEcmFnZ2luZy5iaW5kKHRoaXMpLCB0aGlzLl9l bmRTaWRlYmFyRHJhZ2dpbmcuYmluZCh0aGlzKSwgZXZlbnQsICJjb2wtcmVzaXplIik7Ci0gICAg fSwKLQotICAgIF9zaWRlYmFyRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAg ICAgdGhpcy5fdXBkYXRlU2lkZWJhcldpZHRoKGV2ZW50LnBhZ2VYKTsKLQotICAgICAgICBldmVu dC5wcmV2ZW50RGVmYXVsdCgpOwotICAgIH0sCi0KLSAgICBfZW5kU2lkZWJhckRyYWdnaW5nOiBm dW5jdGlvbihldmVudCkKKyAgICBzZXRTaWRlYmFyV2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQogICAg IHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLmVsZW1lbnREcmFnRW5kKGV2ZW50KTsKLSAgICB9LAot Ci0gICAgX3VwZGF0ZVNpZGViYXJXaWR0aDogZnVuY3Rpb24od2lkdGgpCi0gICAgewotICAgICAg ICBpZiAodGhpcy5zaWRlYmFyRWxlbWVudC5vZmZzZXRXaWR0aCA8PSAwKSB7Ci0gICAgICAgICAg ICAvLyBUaGUgc3R5bGVzaGVldCBoYXNuJ3QgbG9hZGVkIHlldCBvciB0aGUgd2luZG93IGlzIGNs b3NlZCwKLSAgICAgICAgICAgIC8vIHNvIHdlIGNhbid0IGNhbGN1bGF0ZSB3aGF0IGlzIG5lZWQu IFJldHVybiBlYXJseS4KLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAg IGlmICghKCJfY3VycmVudFNpZGViYXJXaWR0aCIgaW4gdGhpcykpCi0gICAgICAgICAgICB0aGlz Ll9jdXJyZW50U2lkZWJhcldpZHRoID0gdGhpcy5zaWRlYmFyRWxlbWVudC5vZmZzZXRXaWR0aDsK LQotICAgICAgICBpZiAodHlwZW9mIHdpZHRoID09PSAidW5kZWZpbmVkIikKLSAgICAgICAgICAg IHdpZHRoID0gdGhpcy5fY3VycmVudFNpZGViYXJXaWR0aDsKLQotICAgICAgICB3aWR0aCA9IE51 bWJlci5jb25zdHJhaW4od2lkdGgsIFByZWZlcmVuY2VzLm1pblNpZGViYXJXaWR0aCwgd2luZG93 LmlubmVyV2lkdGggLyAyKTsKLQotICAgICAgICB0aGlzLl9jdXJyZW50U2lkZWJhcldpZHRoID0g d2lkdGg7Ci0KICAgICAgICAgaWYgKHRoaXMudmlzaWJsZVJlc291cmNlKSB7CiAgICAgICAgICAg ICB0aGlzLmNvbnRhaW5lckVsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCArICJweCI7CiAgICAg ICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ3aWR0aCIp OwpAQCAtOTY5LDE1ICs5MTgsMTUgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuY29udGFpbmVyRWxlbWVudC5zdHlsZS5yZW1vdmVQ cm9wZXJ0eSgid2lkdGgiKTsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuc2lkZWJhclJlc2l6 ZUVsZW1lbnQuc3R5bGUubGVmdCA9ICh3aWR0aCAtIDMpICsgInB4IjsKKyAgICB9LAorCisgICAg dXBkYXRlTWFpblZpZXdXaWR0aDogZnVuY3Rpb24od2lkdGgpCisgICAgewogICAgICAgICB0aGlz LmNvbnRhaW5lckNvbnRlbnRFbGVtZW50LnN0eWxlLmxlZnQgPSB3aWR0aCArICJweCI7CiAgICAg ICAgIHRoaXMudmlld3NDb250YWluZXJFbGVtZW50LnN0eWxlLmxlZnQgPSB3aWR0aCArICJweCI7 Ci0gICAgICAgIHRoaXMuc2lkZWJhclJlc2l6ZUVsZW1lbnQuc3R5bGUubGVmdCA9ICh3aWR0aCAt IDMpICsgInB4IjsKIAogICAgICAgICB0aGlzLl91cGRhdGVHcmFwaERpdmlkZXJzSWZOZWVkZWQo KTsKLQotICAgICAgICB2YXIgdmlzaWJsZVZpZXcgPSB0aGlzLnZpc2libGVWaWV3OwotICAgICAg ICBpZiAodmlzaWJsZVZpZXcgJiYgInJlc2l6ZSIgaW4gdmlzaWJsZVZpZXcpCi0gICAgICAgICAg ICB2aXNpYmxlVmlldy5yZXNpemUoKTsKICAgICB9LAogCiAgICAgX2VuYWJsZVJlc291cmNlVHJh Y2tpbmc6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TdG9yYWdlUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBh bmVsLmpzCmluZGV4IDBmMDY4YzUuLjFhYTExZWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0b3JhZ2VQYW5lbC5qcwpAQCAtMjksNyArMjksOSBAQAogCiBXZWJJbnNwZWN0b3Iu U3RvcmFnZVBhbmVsID0gZnVuY3Rpb24oZGF0YWJhc2UpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlBh bmVsLmNhbGwodGhpcywgdHJ1ZSk7CisgICAgV2ViSW5zcGVjdG9yLlBhbmVsLmNhbGwodGhpcyk7 CisKKyAgICB0aGlzLmNyZWF0ZVNpZGViYXIoKTsKIAogICAgIHRoaXMuZGF0YWJhc2VzTGlzdFRy ZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyU2VjdGlvblRyZWVFbGVtZW50KFdl Ykluc3BlY3Rvci5VSVN0cmluZygiREFUQUJBU0VTIiksIHt9LCB0cnVlKTsKICAgICB0aGlzLnNp ZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuZGF0YWJhc2VzTGlzdFRyZWVFbGVtZW50KTsKQEAg LTExMSwxMSArMTEzLDYgQEAgV2ViSW5zcGVjdG9yLlN0b3JhZ2VQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICB0aGlzLnNpZGViYXJUcmVlLnNlbGVjdGVkVHJlZUVsZW1lbnQuZGVzZWxl Y3QoKTsKICAgICB9LAogCi0gICAgaGFuZGxlS2V5RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQotICAg IHsKLSAgICAgICAgdGhpcy5zaWRlYmFyVHJlZS5oYW5kbGVLZXlFdmVudChldmVudCk7Ci0gICAg fSwKLQogICAgIGFkZERhdGFiYXNlOiBmdW5jdGlvbihkYXRhYmFzZSkKICAgICB7CiAgICAgICAg IHRoaXMuX2RhdGFiYXNlcy5wdXNoKGRhdGFiYXNlKTsKQEAgLTM5NCw3ICszOTEsNyBAQCBXZWJJ bnNwZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG51bGw7 CiAgICAgfSwKIAotICAgIHNldE1haW5WaWV3V2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQorICAgIHVw ZGF0ZU1haW5WaWV3V2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQogICAgIHsKICAgICAgICAgdGhpcy5z dG9yYWdlVmlld3Muc3R5bGUubGVmdCA9IHdpZHRoICsgInB4IjsKICAgICAgICAgdGhpcy5zdG9y YWdlVmlld1N0YXR1c0Jhckl0ZW1zQ29udGFpbmVyLnN0eWxlLmxlZnQgPSB3aWR0aCArICJweCI7 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5q cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDg2 MDM0ZDMuLjkzMzhkZTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U aW1lbGluZVBhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZVBhbmVsLmpzCkBAIC0zMCw3ICszMCw5IEBACiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs ID0gZnVuY3Rpb24oKQogewotICAgIFdlYkluc3BlY3Rvci5QYW5lbC5jYWxsKHRoaXMsIHRydWUp OworICAgIFdlYkluc3BlY3Rvci5QYW5lbC5jYWxsKHRoaXMpOworCisgICAgdGhpcy5jcmVhdGVT aWRlYmFyKCk7CiAKICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygidGltZWxpbmUiKTsK IApAQCAtNTksMTEgKzYxLDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICByZXR1cm4gW3RoaXMudG9nZ2xlVGltZWxpbmVCdXR0b24uZWxlbWVudF07 CiAgICAgfSwKIAotICAgIGhhbmRsZUtleUV2ZW50OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuc2lkZWJhclRyZWUuaGFuZGxlS2V5RXZlbnQoZXZlbnQpOwotICAgIH0sCi0K ICAgICB0aW1lbGluZVdhc1N0YXJ0ZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMu dG9nZ2xlVGltZWxpbmVCdXR0b24udG9nZ2xlZCA9IHRydWU7CkBAIC05Nyw3ICs5NCw3IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIEluc3Bl Y3RvckNvbnRyb2xsZXIuc3RhcnRUaW1lbGluZVByb2ZpbGVyKCk7CiAgICAgfSwKIAotICAgIHNl dE1haW5WaWV3V2lkdGg6IGZ1bmN0aW9uKHdpZHRoKQorICAgIHVwZGF0ZU1haW5WaWV3V2lkdGg6 IGZ1bmN0aW9uKHdpZHRoKQogICAgIHsKICAgICAgICAgdGhpcy50aW1lbGluZVZpZXcuc3R5bGUu bGVmdCA9IHdpZHRoICsgInB4IjsKICAgICB9LA==