26182 2009-06-03 21:55:02 -0700 Need to be able to resize the columns in LocalStorage view in Web Inspector 2009-09-11 18:13:10 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson jberlin jberlin timothy oldest_to_newest 124271 0 beidson 2009-06-03 21:55:02 -0700 When you have some really long values in LocalStorage, the value column is too wide and cuts off the view of moderate length keys. You should be able to resize the columns to reveal all of one at the expense of the other. 137668 1 34231 jberlin 2009-08-06 15:08:25 -0700 Created attachment 34231 Patch that adds an initial implementation of making the columns of a DataGrid in the Web Inspector resizable This patch makes the columns of the Local Storage View and the Profile View resizable. 137670 2 34231 timothy 2009-08-06 15:22:16 -0700 Comment on attachment 34231 Patch that adds an initial implementation of making the columns of a DataGrid in the Web Inspector resizable You will want to call updateWidths when the window resizes and when the sidebar resizes. Both of those cases will adjust the datagrid widths. Take a look at ResourcesPanel's _updateSidebarWidth. At the end of that method it does: var visibleView = this.visibleView; if (visibleView && "resize" in visibleView) visibleView.resize(); You should add this to ResourcesPanel and ProfilesPanel. Then you can implement a resize method in ProfileView and DOMStorageItemsView to call updateWidths. There is also a resize method on the Panel that is called when the window resizes. You should do what ResourcesPanel does in the other two panels (sans the _updateGraphDividersIfNeeded). resize: function() { this._updateGraphDividersIfNeeded(); var visibleView = this.visibleView; if (visibleView && "resize" in visibleView) visibleView.resize(); }, Otherwise the patch is correct. 137755 3 34242 jberlin 2009-08-06 20:11:46 -0700 Created attachment 34242 Patch that adds an initial implementation of making the columns of a DataGrid in the Web Inspector resizable which respects the Web Inspector being resized. Made the changes that Tim mentioned above, which also required that the columnn widths be set to percentages instead of pixel values. That in turn requires the column widths to be initialized the first time updateWidths is called. That way, when a column is resized and percentages are added for the widths of that column and its neighboring column, all the other columns already have percentages for widths. 137877 4 34242 jberlin 2009-08-07 08:03:50 -0700 Comment on attachment 34242 Patch that adds an initial implementation of making the columns of a DataGrid in the Web Inspector resizable which respects the Web Inspector being resized. committed in r46891 34231 2009-08-06 15:08:25 -0700 2009-08-06 20:11:46 -0700 Patch that adds an initial implementation of making the columns of a DataGrid in the Web Inspector resizable addResizableColumnsToWebInspectorDataGrid.txt text/plain 11006 jberlin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Njg2MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNjIgQEAKKzIwMDktMDgtMDYgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgdGhlIGluaXRpYWwgaW1wbGVtZW50YXRpb24gb2YgdGhlIGFiaWxpdHkgdG8gcmVzaXplIHRo ZSBjb2x1bW5zIGluCisgICAgICAgIGEgRGF0YUdyaWQgaW4gdGhlIFdlYiBJbnNwZWN0b3IuIEVu YWJsZXMgdGhhdCBmdW5jdGlvbmFsaXR5IGluIGJvdGggdGhlCisgICAgICAgIFByb2ZpbGUgVmll dyBhbmQgaW4gdGhlIExvY2FsIFN0b3JhZ2UgVmlldy4KKyAgICAgICAgCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjE4MgorICAgICAgICAKKyAgICAg ICAgSW4gdGhpcyB2ZXJzaW9uLCByZXNpemluZyBhIGNvbHVtbiBjYW4gY2hhbmdlIHRoZSB3aWR0 aCBvZiBhdCBtb3N0IHR3bworICAgICAgICBjb2x1bW5zICh0aGUgY29sdW1ucyB0byB0aGUgbGVm dCBhbmQgcmlnaHQgb2YgdGhlIHJlc2l6ZXIgYmVpbmcgZHJhZ2dlZCkuCisgICAgICAgIAorICAg ICAgICBQb3NzaWJsZSBjaGFuZ2VzIGluIGZ1dHVyZSBwYXRjaGVzOgorICAgICAgICAKKyAgICAg ICAgMSkgQmUgYWJsZSB0byBzcGVjaWZ5IHRoZSBtaW5pbXVtIHNpemUgb2YgYSBjb2x1bW4gYW5k IHRoZSBtYXhpbXVtIHNpemUKKyAgICAgICAgICAgb2YgYSBjb2x1bW4uIElmIHRoZSBtaW5pbXVt IHNpemUgaXMgZXF1YWwgdG8gdGhlIG1heGltdW0gc2l6ZSwgdGhlCisgICAgICAgICAgIGNvbHVt biBjYW4ndCBiZSByZXNpemVkLgorICAgICAgICAyKSBNYWtlIHRoZSBiZWhhdmlvciBtb3JlIGlu IGxpbmUgd2l0aCB0aGUgZm9sbG93aW5nIGRlc2NyaXB0aW9uOgorICAgICAgICAKKyAgICAgICAg RXZlcnl0aGluZyBiZWZvcmUgdGhlIGNvbHVtbiB0aGF0IGlzIHJlc2l6ZWQgc3RheXMgZml4ZWQg c2l6ZS4gVGhlCisgICAgICAgIHJlc2l6ZWQgY29sdW1uIGNoYW5nZXMgc2l6ZXMuIFRoZSBvdGhl ciBjb2x1bW5zIGV4Y2VwdCB0aGUgbGFzdCBzdGF5CisgICAgICAgIHRoZSBzYW1lIHNpemUuIEFu ZCB0aGUgbGFzdCBjb2x1bW4gYWRqdXN0cyB0byBmaXQgd2l0aCBhIG1pbmltdW0gc2l6ZS4KKyAg ICAgICAgSWYgdGhlIGxhc3QgY29sdW1uIGlzIGFscmVhZHkgdGhlIG1pbmltdW0sIHRoZSBuZXh0 IHRvIGxhc3QgY29sdW1uCisgICAgICAgIHNocmlua3MsIGV0Yy4KKyAgICAgICAgCisgICAgICAg IDMpIE1ha2UgaXQgcG9zc2libGUgdG8gc2NhbGUgdGhlIGNvbHVtbiBzaXplcyBhcHByb3ByaWF0 ZWx5IHdoZW4gdGhlCisgICAgICAgICAgIFdlYiBJbnNwZWN0b3Igd2luZG93IGdldHMgcmVzaXpl ZC4gCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2VJdGVtc1ZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUl0ZW1zVmlldy5wcm90b3R5cGUu dXBkYXRlKToKKyAgICAgICAgT25jZSB0aGUgRGF0YUdyaWQgaXMgYWRkZWQgdG8gdGhlIERPTSwg dXBkYXRlIHRoZSB3aWR0aHMgb2YgdGhlCisgICAgICAgIERhdGFHcmlkIGluIG9yZGVyIHRvIHB1 dCB0aGUgcmVzaXplcnMgaW4gcGxhY2UuCisgICAgICAgIAorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvRGF0YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQpOgor ICAgICAgICBTdG9yZSBjb2x1bW4gZ3JvdXBzIHdob3NlIHdpZHRocyBjYW4gbGF0ZXIgYmUgY2hh bmdlZCB3aGVuIHRoZSBjb2x1bW5zCisgICAgICAgIGFyZSByZXNpemVkIGJ5IHRoZSB1c2VyLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS51cGRhdGVXaWR0aHMpOgor ICAgICAgICBDcmVhdGUgdGhlIHJlc2l6ZXJzIGZvciB0aGUgY29sdW1ucy4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX2NsaWNrSW5EYXRhVGFibGUpOgorICAgICAg ICBEaWRuJ3QgYWN0dWFsbHkgY2hhbmdlIGFueXRoaW5nIGluIHRoaXMgbWV0aG9kLCBqdXN0IGFk ZGVkIGEgY29tbWEgdG8KKyAgICAgICAgdGhlIGVuZCBvZiB0aGUgZnVuY3Rpb24uCisgICAgICAg IChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9zdGFydFJlc2l6ZXJEcmFnZ2luZyk6 CisgICAgICAgIFN0b3JlIHRoZSByZXNpemVyIHRoYXQgaXMgY3VycmVudGx5IGRyYWdnaW5nLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fcmVzaXplckRyYWdnaW5n KToKKyAgICAgICAgQ29uc3RyYWluIHRoZSBhcmVhIHRoYXQgdGhlIHJlc2l6ZXIgY2FuIGJlIGRy YWdnZWQgdG8gdGhlIGNvbHVtbiB0bworICAgICAgICBpdCdzIGxlZnQgYW5kIHJpZ2h0LCB3aXRo IHNvbWUgcGFkZGluZyBhZGRlZCB0byBtYWtlIHN1cmUgdGhhdCB0aGUKKyAgICAgICAgbmVpZ2hi b3JpbmcgY29sdW1ucyBkb24ndCBkaXNhcHBlYXIuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0 YUdyaWQucHJvdG90eXBlLl9lbmRSZXNpemVyRHJhZ2dpbmcpOgorICAgICAgICAKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlByb2ZpbGVWaWV3LnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgTm93IHRoYXQgdGhlIERh dGFHcmlkIGlzIGFjdHVhbGx5IGF0dGFjaGVkIHRvIHRoZSBET00sIHVwZGF0ZSB0aGUKKyAgICAg ICAgd2lkdGhzIG9mIHRoZSBEYXRhR3JpZCBpbiBvcmRlciB0byBwdXQgdGhlIHJlc2l6ZXJzIGlu IHBsYWNlLgorICAgICAgICAKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5jc3M6CisgICAgICAgIEFkZCBpbiBhIHN0eWxlIHJ1bGUgZm9yIGEgcmVzaXplciBpbiB0aGUg RGF0YSBHcmlkLgorCiAyMDA5LTA4LTA2ICBKaWFuIExpICA8amlhbmxpQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcwkocmV2aXNp b24gNDY4NDMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1z Vmlldy5qcwkod29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQCBXZWJJbnNwZWN0b3IuRE9N U3RvcmFnZUl0ZW1zVmlldy5wcm90b3R5CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAg ICAgICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwogICAgICAgICAgICAgICAgIHRoaXMuZWxl bWVudC5hcHBlbmRDaGlsZChkYXRhR3JpZC5lbGVtZW50KTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9kYXRhR3JpZC51cGRhdGVXaWR0aHMoKTsKICAgICAgICAgICAgICAgICB0aGlzLmRlbGV0ZUJ1 dHRvbi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcwkocmV2aXNpb24g NDY4NDMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMJKHdvcmtp bmcgY29weSkKQEAgLTg5LDcgKzg5LDggQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gZnVuY3Rp b24oY29sdW1ucwogICAgIGNlbGwuY2xhc3NOYW1lID0gImNvcm5lciI7CiAgICAgaGVhZGVyUm93 LmFwcGVuZENoaWxkKGNlbGwpOwogCi0gICAgdGhpcy5faGVhZGVyVGFibGUuYXBwZW5kQ2hpbGQo Y29sdW1uR3JvdXApOworICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAgPSBjb2x1bW5H cm91cDsKKyAgICB0aGlzLl9oZWFkZXJUYWJsZS5hcHBlbmRDaGlsZCh0aGlzLl9oZWFkZXJUYWJs ZUNvbHVtbkdyb3VwKTsKICAgICB0aGlzLmhlYWRlclRhYmxlQm9keS5hcHBlbmRDaGlsZChoZWFk ZXJSb3cpOwogCiAgICAgdmFyIGZpbGxlclJvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRy Iik7CkBAIC05OSw4ICsxMDAsOSBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBmdW5jdGlvbihj b2x1bW5zCiAgICAgICAgIHZhciBjZWxsID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgidGQiKTsK ICAgICAgICAgZmlsbGVyUm93LmFwcGVuZENoaWxkKGNlbGwpOwogICAgIH0KLQotICAgIHRoaXMu X2RhdGFUYWJsZS5hcHBlbmRDaGlsZChjb2x1bW5Hcm91cC5jbG9uZU5vZGUodHJ1ZSkpOworICAg IAorICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwID0gY29sdW1uR3JvdXAuY2xvbmVOb2Rl KHRydWUpOworICAgIHRoaXMuX2RhdGFUYWJsZS5hcHBlbmRDaGlsZCh0aGlzLl9kYXRhVGFibGVD b2x1bW5Hcm91cCk7CiAgICAgdGhpcy5kYXRhVGFibGVCb2R5LmFwcGVuZENoaWxkKGZpbGxlclJv dyk7CiAKICAgICB0aGlzLmNvbHVtbnMgPSBjb2x1bW5zIHx8IHt9OwpAQCAtMTE0LDYgKzExNiw3 IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9IGZ1bmN0aW9uKGNvbHVtbnMKICAgICB0aGlzLnNl bGVjdGVkID0gZmFsc2U7CiAgICAgdGhpcy5kYXRhR3JpZCA9IHRoaXM7CiAgICAgdGhpcy5pbmRl bnRXaWR0aCA9IDE1OworICAgIHRoaXMucmVzaXplcnMgPSBbXTsKIH0KIAogV2ViSW5zcGVjdG9y LkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKQEAgLTE2MCw2ICsxNjMsNDcgQEAgV2ViSW5zcGVjdG9y LkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKIAogICAgICAgICByZXR1cm4gdGhpcy5fZGF0YVRhYmxl Qm9keTsKICAgICB9LAorIAorICAgIC8vIFVwZGF0ZXMgdGhlIHdpZHRocyBvZiB0aGUgdGFibGUs IGluY2x1ZGluZyB0aGUgcG9zaXRpb25zIG9mIHRoZSBjb2x1bW4KKyAgICAvLyByZXNpemVycy4K KyAgICAvLworICAgIC8vIElNUE9SVEFOVDogVGhpcyBmdW5jdGlvbiBNVVNUIGJlIGNhbGxlZCBv bmNlIGFmdGVyIHRoZSBlbGVtZW50IG9mIHRoZQorICAgIC8vIERhdGFHcmlkIGlzIGF0dGFjaGVk IHRvIGl0cyBwYXJlbnQgZWxlbWVudCBhbmQgZXZlcnkgc3Vic2VxdWVudCB0aW1lIHRoZQorICAg IC8vIHdpZHRoIG9mIHRoZSBwYXJlbnQgZWxlbWVudCBpcyBjaGFuZ2VkIGluIG9yZGVyIHRvIG1h a2UgaXQgcG9zc2libGUgdG8KKyAgICAvLyByZXNpemUgdGhlIGNvbHVtbnMuCisgICAgLy8KKyAg ICAvLyBJZiB0aGlzIGZ1bmN0aW9uIGlzIG5vdCBjYWxsZWQgYWZ0ZXIgdGhlIERhdGFHcmlkIGlz IGF0dGFjaGVkIHRvIGl0cworICAgIC8vIHBhcmVudCBlbGVtZW50LCB0aGVuIHRoZSBEYXRhR3Jp ZCdzIGNvbHVtbnMgd2lsbCBub3QgYmUgcmVzaXphYmxlLgorICAgIHVwZGF0ZVdpZHRoczogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIGhlYWRlclRhYmxlQ29sdW1ucyA9IHRoaXMuX2hl YWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW47CisgICAgICAgIAorICAgICAgICB2YXIgbGVm dCA9IDA7CisgICAgICAgIAorICAgICAgICAvLyBNYWtlIG4gLSAxIHJlc2l6ZXJzIGZvciBuIGNv bHVtbnMuIAorICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGhlYWRlclRhYmxlQ29sdW1ucy5s ZW5ndGggLSAxOyBpKyspIHsKKyAgICAgICAgICAgIHZhciByZXNpemVyID0gdGhpcy5yZXNpemVy c1tpXTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKCFyZXNpemVyKSB7CisgICAgICAg ICAgICAgICAgLy8gVGhpcyBpcyB0aGUgZmlyc3QgY2FsbCB0byB1cGRhdGVXaWR0aCwgc28gdGhl IHJlc2l6ZXJzIG5lZWQKKyAgICAgICAgICAgICAgICAvLyB0byBiZSBjcmVhdGVkLgorICAgICAg ICAgICAgICAgIHJlc2l6ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAg ICAgICAgICAgICByZXNpemVyLmFkZFN0eWxlQ2xhc3MoImRhdGEtZ3JpZC1yZXNpemVyIik7Cisg ICAgICAgICAgICAgICAgLy8gVGhpcyByZXNpemVyIGlzIGFzc29jaWF0ZWQgd2l0aCB0aGUgY29s dW1uIHRvIGl0cyByaWdodC4KKyAgICAgICAgICAgICAgICByZXNpemVyLnJpZ2h0TmVpZ2hib3Jp bmdDb2x1bW5JRCA9IGkgKyAxOworICAgICAgICAgICAgICAgIHJlc2l6ZXIuYWRkRXZlbnRMaXN0 ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fc3RhcnRSZXNpemVyRHJhZ2dpbmcuYmluZCh0aGlzKSwg ZmFsc2UpOworICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChyZXNpemVy KTsKKyAgICAgICAgICAgICAgICB0aGlzLnJlc2l6ZXJzW2ldID0gcmVzaXplcjsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgLy8gR2V0IHRoZSB3aWR0aCBvZiB0aGUgY2VsbCBpbiB0aGUg Zmlyc3QgKGFuZCBvbmx5KSByb3cgb2YgdGhlCisgICAgICAgICAgICAvLyBoZWFkZXIgdGFibGUg aW4gb3JkZXIgdG8gZGV0ZXJtaW5lIHRoZSB3aWR0aCBvZiB0aGUgY29sdW1uLCBzaW5jZQorICAg ICAgICAgICAgLy8gaXQgaXMgbm90IHBvc3NpYmxlIHRvIHF1ZXJ5IGEgY29sdW1uIGZvciBpdHMg d2lkdGguCisgICAgICAgICAgICBsZWZ0ICs9IHRoaXMuaGVhZGVyVGFibGVCb2R5LnJvd3NbMF0u Y2VsbHNbaV0ub2Zmc2V0V2lkdGg7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIHJlc2l6ZXIu c3R5bGUubGVmdCA9IGxlZnQgKyAicHgiOworICAgICAgICB9CisgICAgfSwKIAogICAgIGFkZENy ZWF0aW9uTm9kZTogZnVuY3Rpb24oaGFzQ2hpbGRyZW4pCiAgICAgewpAQCAtNDQxLDcgKzQ4NSw2 MSBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgZWxz ZQogICAgICAgICAgICAgICAgIGdyaWROb2RlLmV4cGFuZCgpOwogICAgICAgICB9Ci0gICAgfQor ICAgIH0sCisgICAgCisgICAgX3N0YXJ0UmVzaXplckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkK KyAgICB7CisgICAgICAgIHRoaXMuY3VycmVudFJlc2l6ZXIgPSBldmVudC50YXJnZXQ7CisgICAg ICAgIGlmICghdGhpcy5jdXJyZW50UmVzaXplci5yaWdodE5laWdoYm9yaW5nQ29sdW1uSUQpCisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ1N0YXJ0 KHRoaXMubGFzdFJlc2l6ZXIsIHRoaXMuX3Jlc2l6ZXJEcmFnZ2luZy5iaW5kKHRoaXMpLAorICAg ICAgICAgICAgdGhpcy5fZW5kUmVzaXplckRyYWdnaW5nLmJpbmQodGhpcyksIGV2ZW50LCAiY29s LXJlc2l6ZSIpOworICAgIH0sCisgICAgCisgICAgX3Jlc2l6ZXJEcmFnZ2luZzogZnVuY3Rpb24o ZXZlbnQpCisgICAgeworICAgICAgICB2YXIgcmVzaXplciA9IHRoaXMuY3VycmVudFJlc2l6ZXI7 CisgICAgICAgIGlmICghcmVzaXplcikKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgCisg ICAgICAgIC8vIENvbnN0cmFpbiB0aGUgZHJhZ3BvaW50IHRvIGJlIHdpdGhpbiB0aGUgY29udGFp bmluZyBkaXYgb2YgdGhlCisgICAgICAgIC8vIGRhdGFncmlkLgorICAgICAgICB2YXIgZHJhZ1Bv aW50ID0gZXZlbnQuY2xpZW50WCAtIHRoaXMuZWxlbWVudC50b3RhbE9mZnNldExlZnQ7CisgICAg ICAgIC8vIENvbnN0cmFpbiB0aGUgZHJhZ3BvaW50IHRvIGJlIHdpdGhpbiB0aGUgc3BhY2UgbWFk ZSB1cCBieSB0aGUKKyAgICAgICAgLy8gY29sdW1uIGRpcmVjdGx5IHRvIHRoZSBsZWZ0IGFuZCB0 aGUgY29sdW1uIGRpcmVjdGx5IHRvIHRoZSByaWdodC4KKyAgICAgICAgdmFyIGxlZnRFZGdlT2ZQ cmV2aW91c0NvbHVtbiA9IDA7CisgICAgICAgIHZhciBmaXJzdFJvd0NlbGxzID0gdGhpcy5oZWFk ZXJUYWJsZUJvZHkucm93c1swXS5jZWxsczsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBy ZXNpemVyLnJpZ2h0TmVpZ2hib3JpbmdDb2x1bW5JRCAtIDE7IGkrKykKKyAgICAgICAgICAgIGxl ZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiArPSBmaXJzdFJvd0NlbGxzW2ldLm9mZnNldFdpZHRoOwor ICAgICAgICAgICAgCisgICAgICAgIHZhciByaWdodEVkZ2VPZk5leHRDb2x1bW4gPSBsZWZ0RWRn ZU9mUHJldmlvdXNDb2x1bW4gKyBmaXJzdFJvd0NlbGxzW3Jlc2l6ZXIucmlnaHROZWlnaGJvcmlu Z0NvbHVtbklEIC0gMV0ub2Zmc2V0V2lkdGggKyBmaXJzdFJvd0NlbGxzW3Jlc2l6ZXIucmlnaHRO ZWlnaGJvcmluZ0NvbHVtbklEXS5vZmZzZXRXaWR0aDsKKyAgICAgICAgCisgICAgICAgIC8vIEdp dmUgZWFjaCBjb2x1bW4gc29tZSBwYWRkaW5nIHNvIHRoYXQgdGhleSBkb24ndCBkaXNhcHBlYXIu ICAgICAgICAgICAgICAgCisgICAgICAgIHZhciBsZWZ0TWluaW11bSA9IGxlZnRFZGdlT2ZQcmV2 aW91c0NvbHVtbiArIHRoaXMuQ29sdW1uUmVzaXplUGFkZGluZzsKKyAgICAgICAgdmFyIHJpZ2h0 TWF4aW11bSA9IHJpZ2h0RWRnZU9mTmV4dENvbHVtbiAtIHRoaXMuQ29sdW1uUmVzaXplUGFkZGlu ZzsKKyAgICAgICAgCisgICAgICAgIGRyYWdQb2ludCA9IE51bWJlci5jb25zdHJhaW4oZHJhZ1Bv aW50LCBsZWZ0TWluaW11bSwgcmlnaHRNYXhpbXVtKTsKKyAgICAgICAgCisgICAgICAgIHJlc2l6 ZXIuc3R5bGUubGVmdCA9IChkcmFnUG9pbnQgLSB0aGlzLkNlbnRlclJlc2l6ZXJPdmVyQm9yZGVy QWRqdXN0bWVudCkgKyAicHgiOworICAgICAgICAKKyAgICAgICAgdGhpcy5faGVhZGVyVGFibGVD b2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLnJpZ2h0TmVpZ2hib3JpbmdDb2x1bW5JRCAtIDFd LnN0eWxlLndpZHRoID0gKGRyYWdQb2ludCAtIGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbikgKyAi cHgiOworICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVy LnJpZ2h0TmVpZ2hib3JpbmdDb2x1bW5JRCAtIDFdLnN0eWxlLndpZHRoID0gKGRyYWdQb2ludCAt IGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbikgKyAicHgiOworICAgICAgICAKKyAgICAgICAgdGhp cy5faGVhZGVyVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLnJpZ2h0TmVpZ2hib3Jp bmdDb2x1bW5JRF0uc3R5bGUud2lkdGggPSAocmlnaHRFZGdlT2ZOZXh0Q29sdW1uIC0gZHJhZ1Bv aW50KSArICJweCI7CisgICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVu W3Jlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklEXS5zdHlsZS53aWR0aCA9IChyaWdodEVk Z2VPZk5leHRDb2x1bW4gLSBkcmFnUG9pbnQpICsgInB4IjsKKyAgICAgICAgCisgICAgICAgIGV2 ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgfSwKKyAgICAKKyAgICBfZW5kUmVzaXplckRyYWdn aW5nOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50 RHJhZ0VuZChldmVudCk7CisgICAgICAgIHRoaXMuY3VycmVudFJlc2l6ZXIgPSBudWxsOworICAg IH0sCisgICAgCisgICAgQ29sdW1uUmVzaXplUGFkZGluZzogMTAsCisgICAgCisgICAgQ2VudGVy UmVzaXplck92ZXJCb3JkZXJBZGp1c3RtZW50OiAzLAogfQogCiBXZWJJbnNwZWN0b3IuRGF0YUdy aWQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwpJ bmRleDogV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwkocmV2aXNp b24gNDY4NDMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMJ KHdvcmtpbmcgY29weSkKQEAgLTE0OCw2ICsxNDgsMTIgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVW aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2JvdHRvbVVwVHJlZTsKICAg ICB9LAogCisgICAgc2hvdzogZnVuY3Rpb24ocGFyZW50RWxlbWVudCkKKyAgICB7CisgICAgICAg IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5zaG93LmNhbGwodGhpcywgcGFyZW50RWxlbWVu dCk7CisgICAgICAgIHRoaXMuZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7CisgICAgfSwKKwogICAg IGhpZGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5WaWV3LnByb3Rv dHlwZS5oaWRlLmNhbGwodGhpcyk7CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv aW5zcGVjdG9yLmNzcwkocmV2aXNpb24gNDY4NDMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmNzcwkod29ya2luZyBjb3B5KQpAQCAtMTg4MSw2ICsxODgxLDE1IEBA IGJvZHkuaW5hY3RpdmUgLmRhdGEtZ3JpZCB0aC5zb3J0LWFzY2VuZGkKICAgICB0ZXh0LWluZGVu dDogMTBweDsKIH0KIAorLmRhdGEtZ3JpZC1yZXNpemVyIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1 dGU7CisgICAgdG9wOiAwOworICAgIGJvdHRvbTogMDsKKyAgICB3aWR0aDogNXB4OworICAgIHot aW5kZXg6IDUwMDsKKyAgICBjdXJzb3I6IGNvbC1yZXNpemU7Cit9CisKIC5zdG9yYWdlLXZpZXcu cXVlcnkgewogICAgIGZvbnQtc2l6ZTogaW5pdGlhbDsKICAgICBmb250LWZhbWlseTogbW9ub3Nw YWNlOwo= 34242 2009-08-06 20:11:46 -0700 2009-08-07 08:03:49 -0700 Patch that adds an initial implementation of making the columns of a DataGrid in the Web Inspector resizable which respects the Web Inspector being resized. addResizableColumnsToWebInspectorDataGrid.txt text/plain 15559 jberlin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Njg3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsODIgQEAKKzIwMDktMDgtMDYgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisg ICAgICAgIEFkZCB0aGUgaW5pdGlhbCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgYWJpbGl0eSB0byBy ZXNpemUgdGhlIGNvbHVtbnMgaW4KKyAgICAgICAgYSBEYXRhR3JpZCBpbiB0aGUgV2ViIEluc3Bl Y3Rvci4gRW5hYmxlcyB0aGF0IGZ1bmN0aW9uYWxpdHkgaW4gYm90aCB0aGUKKyAgICAgICAgUHJv ZmlsZSBWaWV3IGFuZCBpbiB0aGUgTG9jYWwgU3RvcmFnZSBWaWV3LgorICAgICAgICAKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MTgyCisgICAgICAg IAorICAgICAgICBJbiB0aGlzIHZlcnNpb24sIHJlc2l6aW5nIGEgY29sdW1uIGNhbiBjaGFuZ2Ug dGhlIHdpZHRoIG9mIGF0IG1vc3QgdHdvCisgICAgICAgIGNvbHVtbnMgKHRoZSBjb2x1bW5zIHRv IHRoZSBsZWZ0IGFuZCByaWdodCBvZiB0aGUgcmVzaXplciBiZWluZyBkcmFnZ2VkKS4KKyAgICAg ICAgCisgICAgICAgIFBvc3NpYmxlIGNoYW5nZXMgaW4gZnV0dXJlIHBhdGNoZXM6CisgICAgICAg IAorICAgICAgICAxKSBCZSBhYmxlIHRvIHNwZWNpZnkgdGhlIG1pbmltdW0gc2l6ZSBvZiBhIGNv bHVtbiBhbmQgdGhlIG1heGltdW0gc2l6ZQorICAgICAgICAgICBvZiBhIGNvbHVtbi4gSWYgdGhl IG1pbmltdW0gc2l6ZSBpcyBlcXVhbCB0byB0aGUgbWF4aW11bSBzaXplLCB0aGUKKyAgICAgICAg ICAgY29sdW1uIGNhbid0IGJlIHJlc2l6ZWQuCisgICAgICAgIDIpIE1ha2UgdGhlIGJlaGF2aW9y IG1vcmUgaW4gbGluZSB3aXRoIHRoZSBmb2xsb3dpbmcgZGVzY3JpcHRpb246CisgICAgICAgIAor ICAgICAgICBFdmVyeXRoaW5nIGJlZm9yZSB0aGUgY29sdW1uIHRoYXQgaXMgcmVzaXplZCBzdGF5 cyBmaXhlZCBzaXplLiBUaGUKKyAgICAgICAgcmVzaXplZCBjb2x1bW4gY2hhbmdlcyBzaXplcy4g VGhlIG90aGVyIGNvbHVtbnMgZXhjZXB0IHRoZSBsYXN0IHN0YXkKKyAgICAgICAgdGhlIHNhbWUg c2l6ZS4gQW5kIHRoZSBsYXN0IGNvbHVtbiBhZGp1c3RzIHRvIGZpdCB3aXRoIGEgbWluaW11bSBz aXplLgorICAgICAgICBJZiB0aGUgbGFzdCBjb2x1bW4gaXMgYWxyZWFkeSB0aGUgbWluaW11bSwg dGhlIG5leHQgdG8gbGFzdCBjb2x1bW4KKyAgICAgICAgc2hyaW5rcywgZXRjLgorICAgICAgICAK KyAgICAgICAgMykgTWFrZSBpdCBwb3NzaWJsZSB0byBzY2FsZSB0aGUgY29sdW1uIHNpemVzIGFw cHJvcHJpYXRlbHkgd2hlbiB0aGUKKyAgICAgICAgICAgV2ViIEluc3BlY3RvciB3aW5kb3cgZ2V0 cyByZXNpemVkLiAKKyAgICAgICAgCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01T dG9yYWdlSXRlbXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVt c1ZpZXcucHJvdG90eXBlLnVwZGF0ZSk6CisgICAgICAgIE9uY2UgdGhlIERhdGFHcmlkIGlzIGFk ZGVkIHRvIHRoZSBET00sIHVwZGF0ZSB0aGUgd2lkdGhzIG9mIHRoZQorICAgICAgICBEYXRhR3Jp ZCBpbiBvcmRlciB0byBwdXQgdGhlIHJlc2l6ZXJzIGluIHBsYWNlLgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlLnJlc2l6ZSk6CisgICAgICAgIFVw ZGF0ZSB0aGUgd2lkdGhzIG9mIHRoZSBEYXRhR3JpZCBpbiBvcmRlciB0byBjb3JyZWN0bHkgYWRq dXN0IHRoZQorICAgICAgICBwb3NpdGlvbnMgb2YgdGhlIHJlc2l6ZXJzLgorICAgICAgICAKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRhdGFHcmlkKToKKyAgICAgICAgU3RvcmUgY29sdW1uIGdyb3VwcyB3aG9zZSB3aWR0 aHMgY2FuIGxhdGVyIGJlIGNoYW5nZWQgd2hlbiB0aGUgY29sdW1ucworICAgICAgICBhcmUgcmVz aXplZCBieSB0aGUgdXNlci4KKyAgICAgICAgQWxzbywga2VlcCB0cmFjayBvZiB3aGV0aGVyIHRo ZSB3aWR0aHMgb2YgdGhlIGNvbHVtbnMgaGF2ZSBiZWVuCisgICAgICAgIGluaXRpYWxpemVkLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS51cGRhdGVXaWR0aHMpOgor ICAgICAgICBDcmVhdGUgdGhlIHJlc2l6ZXJzIGZvciB0aGUgY29sdW1ucy4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX2NsaWNrSW5EYXRhVGFibGUpOgorICAgICAg ICBEaWRuJ3QgYWN0dWFsbHkgY2hhbmdlIGFueXRoaW5nIGluIHRoaXMgbWV0aG9kLCBqdXN0IGFk ZGVkIGEgY29tbWEgdG8KKyAgICAgICAgdGhlIGVuZCBvZiB0aGUgZnVuY3Rpb24uCisgICAgICAg IChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9zdGFydFJlc2l6ZXJEcmFnZ2luZyk6 CisgICAgICAgIFN0b3JlIHRoZSByZXNpemVyIHRoYXQgaXMgY3VycmVudGx5IGRyYWdnaW5nLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5fcmVzaXplckRyYWdnaW5n KToKKyAgICAgICAgQ29uc3RyYWluIHRoZSBhcmVhIHRoYXQgdGhlIHJlc2l6ZXIgY2FuIGJlIGRy YWdnZWQgdG8gdGhlIGNvbHVtbiB0bworICAgICAgICBpdCdzIGxlZnQgYW5kIHJpZ2h0LCB3aXRo IHNvbWUgcGFkZGluZyBhZGRlZCB0byBtYWtlIHN1cmUgdGhhdCB0aGUKKyAgICAgICAgbmVpZ2hi b3JpbmcgY29sdW1ucyBkb24ndCBkaXNhcHBlYXIuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0 YUdyaWQucHJvdG90eXBlLl9lbmRSZXNpemVyRHJhZ2dpbmcpOgorICAgICAgICAKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRhdGFiYXNlc1BhbmVsLnByb3RvdHlwZS5yZXNpemUpOgorICAgICAgICBSZXNpemUg dGhlIHZpZXcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VzUGFuZWwucHJvdG90eXBl Ll91cGRhdGVTaWRlYmFyV2lkdGgpOgorICAgICAgICBkaXR0by4KKyAgICAgICAgCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUuc2hvdyk6CisgICAgICAgIE5vdyB0aGF0IHRoZSBE YXRhR3JpZCBpcyBhY3R1YWxseSBhdHRhY2hlZCB0byB0aGUgRE9NLCB1cGRhdGUgdGhlCisgICAg ICAgIHdpZHRocyBvZiB0aGUgRGF0YUdyaWQgaW4gb3JkZXIgdG8gcHV0IHRoZSByZXNpemVycyBp biBwbGFjZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUucmVz aXplKToKKyAgICAgICAgVXBkYXRlIHRoZSB3aWR0aHMgb2YgdGhlIERhdGFHcmlkIGluIG9yZGVy IHRvIGNvcnJlY3RseSBhZGp1c3QgdGhlCisgICAgICAgIHBvc2l0aW9ucyBvZiB0aGUgcmVzaXpl cnMuCisgICAgICAgIAorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5yZXNp emUpOgorICAgICAgICBSZXNpemUgdGhlIHZpZXcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJv ZmlsZXNQYW5lbC5wcm90b3R5cGUuX3VwZGF0ZVNpZGViYXJXaWR0aCk6CisgICAgICAgIGRpdHRv LgorICAgICAgICAKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6 CisgICAgICAgIEFkZCBpbiBhIHN0eWxlIHJ1bGUgZm9yIGEgcmVzaXplciBpbiB0aGUgRGF0YSBH cmlkLgorCiAyMDA5LTA4LTA2ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcwkocmV2aXNpb24g NDY4NDMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmll dy5qcwkod29ya2luZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQCBXZWJJbnNwZWN0b3IuRE9NU3Rv cmFnZUl0ZW1zVmlldy5wcm90b3R5CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAg ICB0aGlzLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwogICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVu dC5hcHBlbmRDaGlsZChkYXRhR3JpZC5lbGVtZW50KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9k YXRhR3JpZC51cGRhdGVXaWR0aHMoKTsKICAgICAgICAgICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRv bi5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpA QCAtODksNiArOTAsMTIgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90 eQogICAgICAgICAgICAgdGhpcy5kZWxldGVCdXR0b24uYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7 CiAgICAgICAgIH0KICAgICB9LAorICAgIAorICAgIHJlc2l6ZTogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgaWYgKHRoaXMuX2RhdGFHcmlkKQorICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQu dXBkYXRlV2lkdGhzKCk7CisgICAgfSwKIAogICAgIF9kZWxldGVCdXR0b25DbGlja2VkOiBmdW5j dGlvbihldmVudCkKICAgICB7CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0 YUdyaWQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFH cmlkLmpzCShyZXZpc2lvbiA0Njg0MykKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E YXRhR3JpZC5qcwkod29ya2luZyBjb3B5KQpAQCAtODksNyArODksOCBAQCBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1bW5zCiAgICAgY2VsbC5jbGFzc05hbWUgPSAiY29ybmVy IjsKICAgICBoZWFkZXJSb3cuYXBwZW5kQ2hpbGQoY2VsbCk7CiAKLSAgICB0aGlzLl9oZWFkZXJU YWJsZS5hcHBlbmRDaGlsZChjb2x1bW5Hcm91cCk7CisgICAgdGhpcy5faGVhZGVyVGFibGVDb2x1 bW5Hcm91cCA9IGNvbHVtbkdyb3VwOworICAgIHRoaXMuX2hlYWRlclRhYmxlLmFwcGVuZENoaWxk KHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXApOwogICAgIHRoaXMuaGVhZGVyVGFibGVCb2R5 LmFwcGVuZENoaWxkKGhlYWRlclJvdyk7CiAKICAgICB2YXIgZmlsbGVyUm93ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgidHIiKTsKQEAgLTk5LDggKzEwMCw5IEBAIFdlYkluc3BlY3Rvci5EYXRh R3JpZCA9IGZ1bmN0aW9uKGNvbHVtbnMKICAgICAgICAgdmFyIGNlbGwgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJ0ZCIpOwogICAgICAgICBmaWxsZXJSb3cuYXBwZW5kQ2hpbGQoY2VsbCk7CiAg ICAgfQotCi0gICAgdGhpcy5fZGF0YVRhYmxlLmFwcGVuZENoaWxkKGNvbHVtbkdyb3VwLmNsb25l Tm9kZSh0cnVlKSk7CisgICAgCisgICAgdGhpcy5fZGF0YVRhYmxlQ29sdW1uR3JvdXAgPSBjb2x1 bW5Hcm91cC5jbG9uZU5vZGUodHJ1ZSk7CisgICAgdGhpcy5fZGF0YVRhYmxlLmFwcGVuZENoaWxk KHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwKTsKICAgICB0aGlzLmRhdGFUYWJsZUJvZHkuYXBw ZW5kQ2hpbGQoZmlsbGVyUm93KTsKIAogICAgIHRoaXMuY29sdW1ucyA9IGNvbHVtbnMgfHwge307 CkBAIC0xMTQsNiArMTE2LDggQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkID0gZnVuY3Rpb24oY29s dW1ucwogICAgIHRoaXMuc2VsZWN0ZWQgPSBmYWxzZTsKICAgICB0aGlzLmRhdGFHcmlkID0gdGhp czsKICAgICB0aGlzLmluZGVudFdpZHRoID0gMTU7CisgICAgdGhpcy5yZXNpemVycyA9IFtdOwor ICAgIHRoaXMuY29sdW1uV2lkdGhzSW5pdGlhbGl6ZWQgPSBmYWxzZTsKIH0KIAogV2ViSW5zcGVj dG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKQEAgLTE2MCw2ICsxNjQsNjMgQEAgV2ViSW5zcGVj dG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKIAogICAgICAgICByZXR1cm4gdGhpcy5fZGF0YVRh YmxlQm9keTsKICAgICB9LAorIAorICAgIC8vIFVwZGF0ZXMgdGhlIHdpZHRocyBvZiB0aGUgdGFi bGUsIGluY2x1ZGluZyB0aGUgcG9zaXRpb25zIG9mIHRoZSBjb2x1bW4KKyAgICAvLyByZXNpemVy cy4KKyAgICAvLworICAgIC8vIElNUE9SVEFOVDogVGhpcyBmdW5jdGlvbiBNVVNUIGJlIGNhbGxl ZCBvbmNlIGFmdGVyIHRoZSBlbGVtZW50IG9mIHRoZQorICAgIC8vIERhdGFHcmlkIGlzIGF0dGFj aGVkIHRvIGl0cyBwYXJlbnQgZWxlbWVudCBhbmQgZXZlcnkgc3Vic2VxdWVudCB0aW1lIHRoZQor ICAgIC8vIHdpZHRoIG9mIHRoZSBwYXJlbnQgZWxlbWVudCBpcyBjaGFuZ2VkIGluIG9yZGVyIHRv IG1ha2UgaXQgcG9zc2libGUgdG8KKyAgICAvLyByZXNpemUgdGhlIGNvbHVtbnMuCisgICAgLy8K KyAgICAvLyBJZiB0aGlzIGZ1bmN0aW9uIGlzIG5vdCBjYWxsZWQgYWZ0ZXIgdGhlIERhdGFHcmlk IGlzIGF0dGFjaGVkIHRvIGl0cworICAgIC8vIHBhcmVudCBlbGVtZW50LCB0aGVuIHRoZSBEYXRh R3JpZCdzIGNvbHVtbnMgd2lsbCBub3QgYmUgcmVzaXphYmxlLgorICAgIHVwZGF0ZVdpZHRoczog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIGhlYWRlclRhYmxlQ29sdW1ucyA9IHRoaXMu X2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW47CisgICAgICAgIAorICAgICAgICB2YXIg bGVmdCA9IDA7CisgICAgICAgIHZhciB0YWJsZVdpZHRoID0gdGhpcy5fZGF0YVRhYmxlLm9mZnNl dFdpZHRoOworICAgICAgICB2YXIgbnVtQ29sdW1ucyA9IGhlYWRlclRhYmxlQ29sdW1ucy5sZW5n dGg7CisgICAgICAgIAorICAgICAgICBpZiAoIXRoaXMuY29sdW1uV2lkdGhzSW5pdGlhbGl6ZWQp IHsKKyAgICAgICAgICAgIC8vIEdpdmUgYWxsIHRoZSBjb2x1bW5zIGluaXRpYWwgd2lkdGhzIG5v dyBzbyB0aGF0IGR1cmluZyBhIHJlc2l6ZSwKKyAgICAgICAgICAgIC8vIHdoZW4gdGhlIHR3byBj b2x1bW5zIHRoYXQgZ2V0IHJlc2l6ZWQgZ2V0IGEgcGVyY2VudCB2YWx1ZSBmb3IKKyAgICAgICAg ICAgIC8vIHRoZWlyIHdpZHRocywgYWxsIHRoZSBvdGhlciBjb2x1bW5zIGFscmVhZHkgaGF2ZSBw ZXJjZW50IHZhbHVlcworICAgICAgICAgICAgLy8gZm9yIHRoZWlyIHdpZHRocy4KKyAgICAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbnVtQ29sdW1uczsgaSsrKSB7CisgICAgICAgICAgICAg ICAgdmFyIGNvbHVtbldpZHRoID0gdGhpcy5oZWFkZXJUYWJsZUJvZHkucm93c1swXS5jZWxsc1tp XS5vZmZzZXRXaWR0aDsKKyAgICAgICAgICAgICAgICB2YXIgcGVyY2VudFdpZHRoID0gKChjb2x1 bW5XaWR0aCAvIHRhYmxlV2lkdGgpICogMTAwKSArICIlIjsKKyAgICAgICAgICAgICAgICB0aGlz Ll9oZWFkZXJUYWJsZUNvbHVtbkdyb3VwLmNoaWxkcmVuW2ldLnN0eWxlLndpZHRoID0gcGVyY2Vu dFdpZHRoOworICAgICAgICAgICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwLmNoaWxk cmVuW2ldLnN0eWxlLndpZHRoID0gcGVyY2VudFdpZHRoOworICAgICAgICAgICAgfQorICAgICAg ICAgICAgdGhpcy5jb2x1bW5XaWR0aHNJbml0aWFsaXplZCA9IHRydWU7CisgICAgICAgIH0KKyAg ICAgICAgCisgICAgICAgIC8vIE1ha2UgbiAtIDEgcmVzaXplcnMgZm9yIG4gY29sdW1ucy4gCisg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbnVtQ29sdW1ucyAtIDE7IGkrKykgeworICAgICAg ICAgICAgdmFyIHJlc2l6ZXIgPSB0aGlzLnJlc2l6ZXJzW2ldOworCisgICAgICAgICAgICBpZiAo IXJlc2l6ZXIpIHsKKyAgICAgICAgICAgICAgICAvLyBUaGlzIGlzIHRoZSBmaXJzdCBjYWxsIHRv IHVwZGF0ZVdpZHRoLCBzbyB0aGUgcmVzaXplcnMgbmVlZAorICAgICAgICAgICAgICAgIC8vIHRv IGJlIGNyZWF0ZWQuCisgICAgICAgICAgICAgICAgcmVzaXplciA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOworICAgICAgICAgICAgICAgIHJlc2l6ZXIuYWRkU3R5bGVDbGFzcygiZGF0 YS1ncmlkLXJlc2l6ZXIiKTsKKyAgICAgICAgICAgICAgICAvLyBUaGlzIHJlc2l6ZXIgaXMgYXNz b2NpYXRlZCB3aXRoIHRoZSBjb2x1bW4gdG8gaXRzIHJpZ2h0LgorICAgICAgICAgICAgICAgIHJl c2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklEID0gaSArIDE7CisgICAgICAgICAgICAgICAg cmVzaXplci5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9zdGFydFJlc2l6ZXJE cmFnZ2luZy5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50 LmFwcGVuZENoaWxkKHJlc2l6ZXIpOworICAgICAgICAgICAgICAgIHRoaXMucmVzaXplcnNbaV0g PSByZXNpemVyOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBHZXQgdGhlIHdpZHRo IG9mIHRoZSBjZWxsIGluIHRoZSBmaXJzdCAoYW5kIG9ubHkpIHJvdyBvZiB0aGUKKyAgICAgICAg ICAgIC8vIGhlYWRlciB0YWJsZSBpbiBvcmRlciB0byBkZXRlcm1pbmUgdGhlIHdpZHRoIG9mIHRo ZSBjb2x1bW4sIHNpbmNlCisgICAgICAgICAgICAvLyBpdCBpcyBub3QgcG9zc2libGUgdG8gcXVl cnkgYSBjb2x1bW4gZm9yIGl0cyB3aWR0aC4KKyAgICAgICAgICAgIGxlZnQgKz0gdGhpcy5oZWFk ZXJUYWJsZUJvZHkucm93c1swXS5jZWxsc1tpXS5vZmZzZXRXaWR0aDsKKyAgICAgICAgICAgIAor ICAgICAgICAgICAgcmVzaXplci5zdHlsZS5sZWZ0ID0gbGVmdCArICJweCI7CisgICAgICAgIH0K KyAgICB9LAogCiAgICAgYWRkQ3JlYXRpb25Ob2RlOiBmdW5jdGlvbihoYXNDaGlsZHJlbikKICAg ICB7CkBAIC00NDEsNyArNTAyLDYzIEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgZ3JpZE5vZGUuZXhwYW5kKCk7 CiAgICAgICAgIH0KLSAgICB9CisgICAgfSwKKyAgICAKKyAgICBfc3RhcnRSZXNpemVyRHJhZ2dp bmc6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5jdXJyZW50UmVzaXplciA9 IGV2ZW50LnRhcmdldDsKKyAgICAgICAgaWYgKCF0aGlzLmN1cnJlbnRSZXNpemVyLnJpZ2h0TmVp Z2hib3JpbmdDb2x1bW5JRCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgV2ViSW5zcGVj dG9yLmVsZW1lbnREcmFnU3RhcnQodGhpcy5sYXN0UmVzaXplciwgdGhpcy5fcmVzaXplckRyYWdn aW5nLmJpbmQodGhpcyksCisgICAgICAgICAgICB0aGlzLl9lbmRSZXNpemVyRHJhZ2dpbmcuYmlu ZCh0aGlzKSwgZXZlbnQsICJjb2wtcmVzaXplIik7CisgICAgfSwKKyAgICAKKyAgICBfcmVzaXpl ckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciByZXNpemVyID0g dGhpcy5jdXJyZW50UmVzaXplcjsKKyAgICAgICAgaWYgKCFyZXNpemVyKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAKKyAgICAgICAgLy8gQ29uc3RyYWluIHRoZSBkcmFncG9pbnQgdG8g YmUgd2l0aGluIHRoZSBjb250YWluaW5nIGRpdiBvZiB0aGUKKyAgICAgICAgLy8gZGF0YWdyaWQu CisgICAgICAgIHZhciBkcmFnUG9pbnQgPSBldmVudC5jbGllbnRYIC0gdGhpcy5lbGVtZW50LnRv dGFsT2Zmc2V0TGVmdDsKKyAgICAgICAgLy8gQ29uc3RyYWluIHRoZSBkcmFncG9pbnQgdG8gYmUg d2l0aGluIHRoZSBzcGFjZSBtYWRlIHVwIGJ5IHRoZQorICAgICAgICAvLyBjb2x1bW4gZGlyZWN0 bHkgdG8gdGhlIGxlZnQgYW5kIHRoZSBjb2x1bW4gZGlyZWN0bHkgdG8gdGhlIHJpZ2h0LgorICAg ICAgICB2YXIgbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uID0gMDsKKyAgICAgICAgdmFyIGZpcnN0 Um93Q2VsbHMgPSB0aGlzLmhlYWRlclRhYmxlQm9keS5yb3dzWzBdLmNlbGxzOworICAgICAgICBm b3IgKHZhciBpID0gMDsgaSA8IHJlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklEIC0gMTsg aSsrKQorICAgICAgICAgICAgbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uICs9IGZpcnN0Um93Q2Vs bHNbaV0ub2Zmc2V0V2lkdGg7CisgICAgICAgICAgICAKKyAgICAgICAgdmFyIHJpZ2h0RWRnZU9m TmV4dENvbHVtbiA9IGxlZnRFZGdlT2ZQcmV2aW91c0NvbHVtbiArIGZpcnN0Um93Q2VsbHNbcmVz aXplci5yaWdodE5laWdoYm9yaW5nQ29sdW1uSUQgLSAxXS5vZmZzZXRXaWR0aCArIGZpcnN0Um93 Q2VsbHNbcmVzaXplci5yaWdodE5laWdoYm9yaW5nQ29sdW1uSURdLm9mZnNldFdpZHRoOworICAg ICAgICAKKyAgICAgICAgLy8gR2l2ZSBlYWNoIGNvbHVtbiBzb21lIHBhZGRpbmcgc28gdGhhdCB0 aGV5IGRvbid0IGRpc2FwcGVhci4gICAgICAgICAgICAgICAKKyAgICAgICAgdmFyIGxlZnRNaW5p bXVtID0gbGVmdEVkZ2VPZlByZXZpb3VzQ29sdW1uICsgdGhpcy5Db2x1bW5SZXNpemVQYWRkaW5n OworICAgICAgICB2YXIgcmlnaHRNYXhpbXVtID0gcmlnaHRFZGdlT2ZOZXh0Q29sdW1uIC0gdGhp cy5Db2x1bW5SZXNpemVQYWRkaW5nOworICAgICAgICAKKyAgICAgICAgZHJhZ1BvaW50ID0gTnVt YmVyLmNvbnN0cmFpbihkcmFnUG9pbnQsIGxlZnRNaW5pbXVtLCByaWdodE1heGltdW0pOworICAg ICAgICAKKyAgICAgICAgcmVzaXplci5zdHlsZS5sZWZ0ID0gKGRyYWdQb2ludCAtIHRoaXMuQ2Vu dGVyUmVzaXplck92ZXJCb3JkZXJBZGp1c3RtZW50KSArICJweCI7CisgICAgICAgIAorICAgICAg ICB2YXIgcGVyY2VudExlZnRDb2x1bW4gPSAoKChkcmFnUG9pbnQgLSBsZWZ0RWRnZU9mUHJldmlv dXNDb2x1bW4pIC8gdGhpcy5fZGF0YVRhYmxlLm9mZnNldFdpZHRoKSAqIDEwMCkgKyAiJSI7Cisg ICAgICAgIHRoaXMuX2hlYWRlclRhYmxlQ29sdW1uR3JvdXAuY2hpbGRyZW5bcmVzaXplci5yaWdo dE5laWdoYm9yaW5nQ29sdW1uSUQgLSAxXS5zdHlsZS53aWR0aCA9IHBlcmNlbnRMZWZ0Q29sdW1u OworICAgICAgICB0aGlzLl9kYXRhVGFibGVDb2x1bW5Hcm91cC5jaGlsZHJlbltyZXNpemVyLnJp Z2h0TmVpZ2hib3JpbmdDb2x1bW5JRCAtIDFdLnN0eWxlLndpZHRoID0gcGVyY2VudExlZnRDb2x1 bW47CisgICAgICAgIAorICAgICAgICB2YXIgcGVyY2VudFJpZ2h0Q29sdW1uID0gKCgocmlnaHRF ZGdlT2ZOZXh0Q29sdW1uIC0gZHJhZ1BvaW50KSAvIHRoaXMuX2RhdGFUYWJsZS5vZmZzZXRXaWR0 aCkgKiAxMDApICsgIiUiOworICAgICAgICB0aGlzLl9oZWFkZXJUYWJsZUNvbHVtbkdyb3VwLmNo aWxkcmVuW3Jlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklEXS5zdHlsZS53aWR0aCA9ICBw ZXJjZW50UmlnaHRDb2x1bW47CisgICAgICAgIHRoaXMuX2RhdGFUYWJsZUNvbHVtbkdyb3VwLmNo aWxkcmVuW3Jlc2l6ZXIucmlnaHROZWlnaGJvcmluZ0NvbHVtbklEXS5zdHlsZS53aWR0aCA9IHBl cmNlbnRSaWdodENvbHVtbjsKKyAgICAgICAgCisgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0 KCk7CisgICAgfSwKKyAgICAKKyAgICBfZW5kUmVzaXplckRyYWdnaW5nOiBmdW5jdGlvbihldmVu dCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ0VuZChldmVudCk7Cisg ICAgICAgIHRoaXMuY3VycmVudFJlc2l6ZXIgPSBudWxsOworICAgIH0sCisgICAgCisgICAgQ29s dW1uUmVzaXplUGFkZGluZzogMTAsCisgICAgCisgICAgQ2VudGVyUmVzaXplck92ZXJCb3JkZXJB ZGp1c3RtZW50OiAzLAogfQogCiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9fcHJv dG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOwpJbmRleDogV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlc1BhbmVsLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZXNQYW5lbC5qcwkocmV2aXNpb24gNDY4NDMpCisr KyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VzUGFuZWwuanMJKHdvcmtpbmcg Y29weSkKQEAgLTQwMCw2ICs0MDAsMTMgQEAgV2ViSW5zcGVjdG9yLkRhdGFiYXNlc1BhbmVsLnBy b3RvdHlwZSA9IAogICAgICAgICAgICAgbm9kZXNbMF0uc2VsZWN0ZWQgPSB0cnVlOwogICAgICAg ICByZXR1cm4gZGF0YUdyaWQ7CiAgICAgfSwKKyAgICAKKyAgICByZXNpemU6IGZ1bmN0aW9uKCkK KyAgICB7CisgICAgICAgIHZhciB2aXNpYmxlVmlldyA9IHRoaXMudmlzaWJsZVZpZXc7CisgICAg ICAgIGlmICh2aXNpYmxlVmlldyAmJiAicmVzaXplIiBpbiB2aXNpYmxlVmlldykKKyAgICAgICAg ICAgIHZpc2libGVWaWV3LnJlc2l6ZSgpOworICAgIH0sCiAKICAgICBfcmVnaXN0ZXJTdG9yYWdl RXZlbnRMaXN0ZW5lcjogZnVuY3Rpb24oKQogICAgIHsKQEAgLTQ4MCw2ICs0ODcsMTAgQEAgV2Vi SW5zcGVjdG9yLkRhdGFiYXNlc1BhbmVsLnByb3RvdHlwZSA9IAogICAgICAgICB0aGlzLnN0b3Jh Z2VWaWV3cy5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOwogICAgICAgICB0aGlzLnN0b3JhZ2VW aWV3U3RhdHVzQmFySXRlbXNDb250YWluZXIuc3R5bGUubGVmdCA9IHdpZHRoICsgInB4IjsKICAg ICAgICAgdGhpcy5zaWRlYmFyUmVzaXplRWxlbWVudC5zdHlsZS5sZWZ0ID0gKHdpZHRoIC0gMykg KyAicHgiOworICAgICAgICAKKyAgICAgICAgdmFyIHZpc2libGVWaWV3ID0gdGhpcy52aXNpYmxl VmlldzsKKyAgICAgICAgaWYgKHZpc2libGVWaWV3ICYmICJyZXNpemUiIGluIHZpc2libGVWaWV3 KQorICAgICAgICAgICAgdmlzaWJsZVZpZXcucmVzaXplKCk7CiAgICAgfQogfQogCkluZGV4OiBX ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCShyZXZpc2lvbiA0Njg0 MykKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMTQ4LDExICsxNDgsMjMgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2JvdHRvbVVwVHJlZTsKICAgICB9LAog CisgICAgc2hvdzogZnVuY3Rpb24ocGFyZW50RWxlbWVudCkKKyAgICB7CisgICAgICAgIFdlYklu c3BlY3Rvci5WaWV3LnByb3RvdHlwZS5zaG93LmNhbGwodGhpcywgcGFyZW50RWxlbWVudCk7Cisg ICAgICAgIHRoaXMuZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7CisgICAgfSwKKwogICAgIGhpZGU6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZS5o aWRlLmNhbGwodGhpcyk7CiAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hSZXN1bHRJbmRleCA9 IC0xOwogICAgIH0sCisgICAgCisgICAgcmVzaXplOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICBpZiAodGhpcy5kYXRhR3JpZCkKKyAgICAgICAgICAgIHRoaXMuZGF0YUdyaWQudXBkYXRlV2lk dGhzKCk7CisgICAgfSwKIAogICAgIHJlZnJlc2g6IGZ1bmN0aW9uKCkKICAgICB7CkluZGV4OiBX ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwkocmV2aXNpb24g NDY4NDMpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwko d29ya2luZyBjb3B5KQpAQCAtMzI0LDYgKzMyNCwxMyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLnJlY29yZEJ1dHRvbi50aXRsZSA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQgcHJvZmlsaW5nLiIpOwogICAgICAgICB9CiAg ICAgfSwKKyAgICAKKyAgICByZXNpemU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciB2 aXNpYmxlVmlldyA9IHRoaXMudmlzaWJsZVZpZXc7CisgICAgICAgIGlmICh2aXNpYmxlVmlldyAm JiAicmVzaXplIiBpbiB2aXNpYmxlVmlldykKKyAgICAgICAgICAgIHZpc2libGVWaWV3LnJlc2l6 ZSgpOworICAgIH0sCiAKICAgICBfdXBkYXRlSW50ZXJmYWNlOiBmdW5jdGlvbigpCiAgICAgewpA QCAtNDI0LDYgKzQzMSwxMCBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZXNQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMucHJvZmlsZVZpZXdzLnN0eWxlLmxlZnQgPSB3aWR0aCArICJweCI7 CiAgICAgICAgIHRoaXMucHJvZmlsZVZpZXdTdGF0dXNCYXJJdGVtc0NvbnRhaW5lci5zdHlsZS5s ZWZ0ID0gd2lkdGggKyAicHgiOwogICAgICAgICB0aGlzLnNpZGViYXJSZXNpemVFbGVtZW50LnN0 eWxlLmxlZnQgPSAod2lkdGggLSAzKSArICJweCI7CisgICAgICAgIAorICAgICAgICB2YXIgdmlz aWJsZVZpZXcgPSB0aGlzLnZpc2libGVWaWV3OworICAgICAgICBpZiAodmlzaWJsZVZpZXcgJiYg InJlc2l6ZSIgaW4gdmlzaWJsZVZpZXcpCisgICAgICAgICAgICB2aXNpYmxlVmlldy5yZXNpemUo KTsKICAgICB9CiB9CiAKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuY3NzCShyZXZpc2lvbiA0Njg0MykKKysrIFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC0xODgxLDYgKzE4ODEsMTUgQEAgYm9keS5p bmFjdGl2ZSAuZGF0YS1ncmlkIHRoLnNvcnQtYXNjZW5kaQogICAgIHRleHQtaW5kZW50OiAxMHB4 OwogfQogCisuZGF0YS1ncmlkLXJlc2l6ZXIgeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAg ICB0b3A6IDA7CisgICAgYm90dG9tOiAwOworICAgIHdpZHRoOiA1cHg7CisgICAgei1pbmRleDog NTAwOworICAgIGN1cnNvcjogY29sLXJlc2l6ZTsKK30KKwogLnN0b3JhZ2Utdmlldy5xdWVyeSB7 CiAgICAgZm9udC1zaXplOiBpbml0aWFsOwogICAgIGZvbnQtZmFtaWx5OiBtb25vc3BhY2U7Cg==