102955 2012-11-21 09:47:23 -0800 Web Inspector: Allow sorting in NMI snapshot grid view 2012-11-29 14:17:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 alph alph apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 773042 0 alph 2012-11-21 09:47:23 -0800 EOM 773045 1 175468 alph 2012-11-21 09:50:19 -0800 Created attachment 175468 Patch 775253 2 175468 yurys 2012-11-26 01:42:28 -0800 Comment on attachment 175468 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175468&action=review > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:66 > + this._totalNode = totalNode; You will need to rebase. > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:73 > + this._storedState = {}; _storedState -> _expandedNodes ? also you can pass the map as a parameter to _storeState/_restoreState > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:134 > + get data() Please use function instead of getter. > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:141 > + if (!this.expanded) return; style nit: return on the next line > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:149 > + if (!this.dataGrid._storedState[this.uid]) return; style nit: return on the next line > Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:158 > + get uid() We recently decided to prefer function to getters/setters. Please use uid: function() here. 778152 3 175468 alph 2012-11-28 12:02:45 -0800 Comment on attachment 175468 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175468&action=review >> Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:66 >> + this._totalNode = totalNode; > > You will need to rebase. ok >> Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:73 >> + this._storedState = {}; > > _storedState -> _expandedNodes ? also you can pass the map as a parameter to _storeState/_restoreState ok >> Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:134 >> + get data() > > Please use function instead of getter. ok >> Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:141 >> + if (!this.expanded) return; > > style nit: return on the next line ok >> Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js:158 >> + get uid() > > We recently decided to prefer function to getters/setters. Please use uid: function() here. ok 778163 4 176539 alph 2012-11-28 12:09:07 -0800 Created attachment 176539 Patch 779428 5 176539 webkit.review.bot 2012-11-29 14:17:15 -0800 Comment on attachment 176539 Patch Clearing flags on attachment: 176539 Committed r136163: <http://trac.webkit.org/changeset/136163> 779429 6 webkit.review.bot 2012-11-29 14:17:19 -0800 All reviewed patches have been landed. Closing bug. 175468 2012-11-21 09:50:19 -0800 2012-11-28 12:09:01 -0800 Patch bug-102955-20121121214805.patch text/plain 6821 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFjZWI3NmM5N2Q3YmRl MDllMjk1ZmQ5ZmU2MTczZDQ4NWZiMmFiYS4uNzgxNTFlNzkwMjk4NmQ2Mjk3ZDUxOGNmMTdjM2Q0 N2JmNThmNjg2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTIxICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBBbGxvdyBzb3J0aW5nIGluIE5NSSBzbmFwc2hvdCBncmlkIHZpZXcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjk1NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5 U25hcHNob3RWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90RGF0 YUdyaWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90RGF0YUdyaWQucHJv dG90eXBlLnNvcnRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVTbmFw c2hvdERhdGFHcmlkLnByb3RvdHlwZS5fc29ydGluZ0Z1bmN0aW9uKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OYXRpdmVTbmFwc2hvdE5vZGUucHJvdG90eXBlLmdldCBkYXRhKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OYXRpdmVTbmFwc2hvdE5vZGUucHJvdG90eXBlLl9zdG9yZVN0YXRlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVTbmFwc2hvdE5vZGUucHJvdG90eXBlLl9yZXN0 b3JlU3RhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90Tm9kZS5wcm90 b3R5cGUuZ2V0IHVpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlU25hcHNob3ROb2Rl LnByb3RvdHlwZS5fY3JlYXRlU2l6ZUNlbGwpOgorCiAyMDEyLTExLTIxICBLYWkgS29laG5lICA8 a2FpLmtvZWhuZUBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSBNaW5HVzogRXhwbGljaXRseSBh ZGQgT3BlbkdMIGxpYnJhcnkgZGVwZW5kZW5jaWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9Fbmds aXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggNjU5ZGFjNDFkMzU3NzU1NGJjZmVl M2ZiZTQzZGFkN2M3MmRlMzFlZS4uNzQ2MzFjZmRlMjY2N2UyN2MwZDhlZGM0ZDVkNjYzYTY5NDFk YjA3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcwpAQCAtMjI5LDYgKzIyOSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkluc3BlY3RlZCB3 b3JrZXIgdGVybWluYXRlZCJdID0gIkluc3BlY3RlZCB3b3JrZXIgdGVybWluYXRlZCI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJJbnNwZWN0ZWQgd29ya2VyIGhhcyB0ZXJtaW5hdGVkLiBPbmNlIGl0IHJl c3RhcnRzIHdlIHdpbGwgYXR0YWNoIHRvIGl0IGF1dG9tYXRpY2FsbHkuIl0gPSAiSW5zcGVjdGVk IHdvcmtlciBoYXMgdGVybWluYXRlZC4gT25jZSBpdCByZXN0YXJ0cyB3ZSB3aWxsIGF0dGFjaCB0 byBpdCBhdXRvbWF0aWNhbGx5LiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbnN0YWxsIFRpbWVyIl0g PSAiSW5zdGFsbCBUaW1lciI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbnZhbGlkIHByb3BlcnR5IHZh bHVlLiJdID0gIkludmFsaWQgcHJvcGVydHkgdmFsdWUuIjsKK2xvY2FsaXplZFN0cmluZ3NbIktC Il0gPSAiS0IiOwogbG9jYWxpemVkU3RyaW5nc1siS2V5Il0gPSAiS2V5IjsKIGxvY2FsaXplZFN0 cmluZ3NbIlNob3J0Y3V0cyJdID0gIlNob3J0Y3V0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMYXlv dXQiXSA9ICJMYXlvdXQiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwppbmRleCBkZTQ5MjQ1 ZTAxZTQ5NjVmZGE3MDY0NTExOTU4MDBiOTRkODAwZmRlLi4xYTA1NDY1MGQ4ZTJhMmY3NGMxMzdk YWM1NDQyYzVmNGZiNWNhMDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwpAQCAtNTUs MTcgKzU1LDQ1IEBAIFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcucHJvdG90 eXBlID0gewogV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90RGF0YUdyaWQgPSBmdW5jdGlvbihw cm9maWxlKQogewogICAgIHZhciBjb2x1bW5zID0gewotICAgICAgICBvYmplY3Q6IHsgdGl0bGU6 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiT2JqZWN0IiksIHdpZHRoOiAiMjAwcHgiLCBkaXNjbG9z dXJlOiB0cnVlLCBzb3J0YWJsZTogZmFsc2UgfSwKLSAgICAgICAgc2l6ZTogeyB0aXRsZTogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIiksIHNvcnRhYmxlOiBmYWxzZSB9LAorICAgICAgICBu YW1lOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9iamVjdCIpLCB3aWR0aDogIjIw MHB4IiwgZGlzY2xvc3VyZTogdHJ1ZSwgc29ydGFibGU6IHRydWUgfSwKKyAgICAgICAgc2l6ZTog eyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIiksIHNvcnRhYmxlOiB0cnVlLCBz b3J0OiAiZGVzY2VuZGluZyIgfSwKICAgICB9OwogICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5j YWxsKHRoaXMsIGNvbHVtbnMpOwogICAgIHRoaXMuc2V0Um9vdE5vZGUobmV3IFdlYkluc3BlY3Rv ci5EYXRhR3JpZE5vZGUobnVsbCwgdHJ1ZSkpOwogICAgIHZhciB0b3RhbE5vZGUgPSBuZXcgV2Vi SW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90Tm9kZShwcm9maWxlLCBwcm9maWxlKTsKICAgICB0aGlz LnJvb3ROb2RlKCkuYXBwZW5kQ2hpbGQodG90YWxOb2RlKTsKICAgICB0b3RhbE5vZGUuZXhwYW5k KCk7CisgICAgdGhpcy5fdG90YWxOb2RlID0gdG90YWxOb2RlOworICAgIHRoaXMuYWRkRXZlbnRM aXN0ZW5lcigic29ydGluZyBjaGFuZ2VkIiwgdGhpcy5zb3J0aW5nQ2hhbmdlZC5iaW5kKHRoaXMp LCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90RGF0YUdyaWQucHJvdG90 eXBlID0geworICAgIHNvcnRpbmdDaGFuZ2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0 aGlzLl9zdG9yZWRTdGF0ZSA9IHt9OworICAgICAgICB0aGlzLl90b3RhbE5vZGUuX3N0b3JlU3Rh dGUoKTsKKyAgICAgICAgdGhpcy5fdG90YWxOb2RlLnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAg IHRoaXMuX3RvdGFsTm9kZS5fcG9wdWxhdGUoKTsKKyAgICAgICAgdGhpcy5fdG90YWxOb2RlLl9y ZXN0b3JlU3RhdGUoKTsKKyAgICAgICAgdGhpcy5fc3RvcmVkU3RhdGUgPSB7fTsKKyAgICB9LAor CisgICAgLyoqCisgICAgICogQHBhcmFtIHtNZW1vcnlBZ2VudC5NZW1vcnlCbG9ja30gbm9kZUEK KyAgICAgKiBAcGFyYW0ge01lbW9yeUFnZW50Lk1lbW9yeUJsb2NrfSBub2RlQgorICAgICAqLwor ICAgIF9zb3J0aW5nRnVuY3Rpb246IGZ1bmN0aW9uKG5vZGVBLCBub2RlQikKKyAgICB7CisgICAg ICAgIHZhciBzb3J0Q29sdW1uSWRlbnRpZmllciA9IHRoaXMuc29ydENvbHVtbklkZW50aWZpZXI7 CisgICAgICAgIHZhciBzb3J0QXNjZW5kaW5nID0gdGhpcy5zb3J0T3JkZXIgPT09ICJhc2NlbmRp bmciOworICAgICAgICB2YXIgZmllbGQxID0gbm9kZUFbc29ydENvbHVtbklkZW50aWZpZXJdOwor ICAgICAgICB2YXIgZmllbGQyID0gbm9kZUJbc29ydENvbHVtbklkZW50aWZpZXJdOworICAgICAg ICB2YXIgcmVzdWx0ID0gZmllbGQxIDwgZmllbGQyID8gLTEgOiAoZmllbGQxID4gZmllbGQyID8g MSA6IDApOworICAgICAgICBpZiAoIXNvcnRBc2NlbmRpbmcpCisgICAgICAgICAgICByZXN1bHQg PSAtcmVzdWx0OworICAgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0sCisKICAgICBfX3Byb3Rv X186IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUKIH0KIApAQCAtMTAxLDYgKzEyOSw0 MCBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlU25hcHNob3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICB9 LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7TWVtb3J5QWdlbnQuTWVtb3J5QmxvY2t9Cisg ICAgICovCisgICAgZ2V0IGRhdGEoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX25vZGVE YXRhOworICAgIH0sCisKKyAgICBfc3RvcmVTdGF0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgaWYgKCF0aGlzLmV4cGFuZGVkKSByZXR1cm47CisgICAgICAgIHRoaXMuZGF0YUdyaWQuX3N0 b3JlZFN0YXRlW3RoaXMudWlkXSA9IHRydWU7CisgICAgICAgIGZvciAodmFyIGkgaW4gdGhpcy5j aGlsZHJlbikKKyAgICAgICAgICAgIHRoaXMuY2hpbGRyZW5baV0uX3N0b3JlU3RhdGUoKTsKKyAg ICB9LAorCisgICAgX3Jlc3RvcmVTdGF0ZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYg KCF0aGlzLmRhdGFHcmlkLl9zdG9yZWRTdGF0ZVt0aGlzLnVpZF0pIHJldHVybjsKKyAgICAgICAg dGhpcy5leHBhbmQoKTsKKyAgICAgICAgZm9yICh2YXIgaSBpbiB0aGlzLmNoaWxkcmVuKQorICAg ICAgICAgICAgdGhpcy5jaGlsZHJlbltpXS5fcmVzdG9yZVN0YXRlKCk7CisgICAgfSwKKworICAg IC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICBnZXQgdWlkKCkKKyAg ICB7CisgICAgICAgIGlmICghdGhpcy5fdWlkKQorICAgICAgICAgICAgdGhpcy5fdWlkID0gKCF0 aGlzLnBhcmVudCA/ICIiIDogdGhpcy5wYXJlbnQudWlkIHx8ICIiKSArICIvIiArIHRoaXMuX25v ZGVEYXRhLm5hbWU7CisgICAgICAgIHJldHVybiB0aGlzLl91aWQ7CisgICAgfSwKKworICAgIC8q KgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjb2x1bW5JZGVudGlmaWVyCiAgICAgICogQHJldHVy biB7RWxlbWVudH0KICAgICAgKi8KQEAgLTExNiw3ICsxNzgsNyBAQCBXZWJJbnNwZWN0b3IuTmF0 aXZlU25hcHNob3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIG5vZGUgPSBub2RlLnBh cmVudDsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBzaXplS2lCID0gdGhpcy5fbm9kZURhdGEu c2l6ZSAvIDEwMjQ7CisgICAgICAgIHZhciBzaXplS0IgPSB0aGlzLl9ub2RlRGF0YS5zaXplIC8g MTAyNDsKICAgICAgICAgdmFyIHRvdGFsU2l6ZSA9IHRoaXMuX3Byb2ZpbGUuc2l6ZTsKICAgICAg ICAgdmFyIHBlcmNlbnRhZ2UgPSB0aGlzLl9ub2RlRGF0YS5zaXplIC8gdG90YWxTaXplICAqIDEw MDsKIApAQCAtMTI0LDcgKzE4Niw3IEBAIFdlYkluc3BlY3Rvci5OYXRpdmVTbmFwc2hvdE5vZGUu cHJvdG90eXBlID0gewogICAgICAgICBjZWxsLmNsYXNzTmFtZSA9IGNvbHVtbklkZW50aWZpZXIg KyAiLWNvbHVtbiI7CiAKICAgICAgICAgdmFyIHRleHREaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKLSAgICAgICAgdGV4dERpdi50ZXh0Q29udGVudCA9IE51bWJlci53aXRoVGhv dXNhbmRzU2VwYXJhdG9yKHNpemVLaUIudG9GaXhlZCgwKSkgKyAiXHUyMDA5IiArIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiS2lCIik7CisgICAgICAgIHRleHREaXYudGV4dENvbnRlbnQgPSBOdW1i ZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcihzaXplS0IudG9GaXhlZCgwKSkgKyAiXHUyMDA5IiAr IFdlYkluc3BlY3Rvci5VSVN0cmluZygiS0IiKTsKICAgICAgICAgdGV4dERpdi5jbGFzc05hbWUg PSAic2l6ZS10ZXh0IjsKICAgICAgICAgY2VsbC5hcHBlbmRDaGlsZCh0ZXh0RGl2KTsKIApAQCAt MTUyLDExICsyMTQsNyBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlU25hcHNob3ROb2RlLnByb3RvdHlw ZSA9IHsKIAogICAgIF9wb3B1bGF0ZTogZnVuY3Rpb24oKSB7CiAgICAgICAgIHRoaXMucmVtb3Zl RXZlbnRMaXN0ZW5lcigicG9wdWxhdGUiLCB0aGlzLl9wb3B1bGF0ZSwgdGhpcyk7Ci0gICAgICAg IGZ1bmN0aW9uIGNvbXBhcmF0b3IoYSwgYikgewotICAgICAgICAgICAgcmV0dXJuIGIuc2l6ZSAt IGEuc2l6ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAodGhpcy5fbm9kZURhdGEgIT09IHRoaXMu X3Byb2ZpbGUpCi0gICAgICAgICAgICB0aGlzLl9ub2RlRGF0YS5jaGlsZHJlbi5zb3J0KGNvbXBh cmF0b3IpOworICAgICAgICB0aGlzLl9ub2RlRGF0YS5jaGlsZHJlbi5zb3J0KHRoaXMuZGF0YUdy aWQuX3NvcnRpbmdGdW5jdGlvbi5iaW5kKHRoaXMuZGF0YUdyaWQpKTsKICAgICAgICAgZm9yICh2 YXIgbm9kZSBpbiB0aGlzLl9ub2RlRGF0YS5jaGlsZHJlbikgewogICAgICAgICAgICAgdmFyIG5v ZGVEYXRhID0gdGhpcy5fbm9kZURhdGEuY2hpbGRyZW5bbm9kZV07CiAgICAgICAgICAgICBpZiAo V2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dOYXRpdmVTbmFwc2hvdFVuaW5zdHJ1bWVudGVkU2l6 ZS5nZXQoKSB8fCBub2RlRGF0YS5uYW1lICE9PSAiT3RoZXIiKQo= 176539 2012-11-28 12:09:07 -0800 2012-11-29 14:17:15 -0800 Patch bug-102955-20121129000641.patch text/plain 7860 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYwMjA4MDU0MDAyZDdi MmUzNmQ3MWQwMDM5ZjZlNWVkZjk3OTFhMy4uZTI5Yjk2ZjBkOWUyMWY5ZDY4YjFiNmJiODQwYmM0 MmQyNjYzOGU3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTI4ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbHBoQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBBbGxvdyBzb3J0aW5nIGluIE5NSSBzbmFwc2hvdCBncmlkIHZpZXcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjk1NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmF0aXZlTWVtb3J5 U25hcHNob3RWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90RGF0 YUdyaWQucHJvdG90eXBlLnNvcnRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O YXRpdmVTbmFwc2hvdERhdGFHcmlkLnByb3RvdHlwZS5fc29ydGluZ0Z1bmN0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5OYXRpdmVTbmFwc2hvdE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5hdGl2ZVNuYXBzaG90Tm9kZS5wcm90b3R5cGUuX3N0b3JlU3RhdGUpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90Tm9kZS5wcm90b3R5cGUuX3Jlc3RvcmVTdGF0ZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlU25hcHNob3ROb2RlLnByb3RvdHlwZS51aWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90Tm9kZS5wcm90b3R5cGUuX2Ny ZWF0ZVNpemVDZWxsKToKKwogMjAxMi0xMS0yNyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9u QGFwcGxlLmNvbT4KIAogICAgICAgICBQREZQbHVnaW46IFNjcm9sbCBiYXJzIGRvIG5vdCBncm93 IG9uIGhvdmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanMKaW5kZXggZTQyMGZhNTBhNWI1ZTFlODI4OGRkZDQ1OGNmYjg1ZDEyZDYwOGVhYy4u ZjcyMWY5ZTIzY2M2NWYwYWRmMjgyMDNjYTFkMDBmNmUwMmU2YTI2ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtMjMxLDYgKzIz MSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkluc3BlY3RlZCB3b3JrZXIgdGVybWluYXRlZCJdID0g Ikluc3BlY3RlZCB3b3JrZXIgdGVybWluYXRlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbnNwZWN0 ZWQgd29ya2VyIGhhcyB0ZXJtaW5hdGVkLiBPbmNlIGl0IHJlc3RhcnRzIHdlIHdpbGwgYXR0YWNo IHRvIGl0IGF1dG9tYXRpY2FsbHkuIl0gPSAiSW5zcGVjdGVkIHdvcmtlciBoYXMgdGVybWluYXRl ZC4gT25jZSBpdCByZXN0YXJ0cyB3ZSB3aWxsIGF0dGFjaCB0byBpdCBhdXRvbWF0aWNhbGx5LiI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJJbnN0YWxsIFRpbWVyIl0gPSAiSW5zdGFsbCBUaW1lciI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJJbnZhbGlkIHByb3BlcnR5IHZhbHVlLiJdID0gIkludmFsaWQgcHJv cGVydHkgdmFsdWUuIjsKK2xvY2FsaXplZFN0cmluZ3NbIktCIl0gPSAiS0IiOwogbG9jYWxpemVk U3RyaW5nc1siS2V5Il0gPSAiS2V5IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNob3J0Y3V0cyJdID0g IlNob3J0Y3V0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMYXlvdXQiXSA9ICJMYXlvdXQiOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlT bmFwc2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdGl2 ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwppbmRleCBhOWQwNDZjM2Y4ODgxY2I0MjU2YzZlYzQxMWI0 OGQ0OTQ0ZTQ4OTAxLi5kNDMwOTljOTc1ZGJlNzRmMmRjNmYxMTkzNzY2YzUwODhiZWQ0NzI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9y eVNuYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwpAQCAtNTUsMjIgKzU1LDQ5IEBAIFdlYkluc3Bl Y3Rvci5OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcucHJvdG90eXBlID0gewogV2ViSW5zcGVjdG9y Lk5hdGl2ZVNuYXBzaG90RGF0YUdyaWQgPSBmdW5jdGlvbihwcm9maWxlKQogewogICAgIHZhciBj b2x1bW5zID0gewotICAgICAgICBvYmplY3Q6IHsgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiT2JqZWN0IiksIHdpZHRoOiAiMjAwcHgiLCBkaXNjbG9zdXJlOiB0cnVlLCBzb3J0YWJsZTog ZmFsc2UgfSwKLSAgICAgICAgc2l6ZTogeyB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT aXplIiksIHNvcnRhYmxlOiBmYWxzZSB9LAorICAgICAgICBuYW1lOiB7IHRpdGxlOiBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIk9iamVjdCIpLCB3aWR0aDogIjIwMHB4IiwgZGlzY2xvc3VyZTogdHJ1 ZSwgc29ydGFibGU6IHRydWUgfSwKKyAgICAgICAgc2l6ZTogeyB0aXRsZTogV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTaXplIiksIHNvcnRhYmxlOiB0cnVlLCBzb3J0OiAiZGVzY2VuZGluZyIgfSwK ICAgICB9OwogICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5jYWxsKHRoaXMsIGNvbHVtbnMpOwot ICAgIHZhciB0b3RhbE5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90Tm9kZShw cm9maWxlLCBwcm9maWxlKTsKKyAgICB0aGlzLl90b3RhbE5vZGUgPSBuZXcgV2ViSW5zcGVjdG9y Lk5hdGl2ZVNuYXBzaG90Tm9kZShwcm9maWxlLCBwcm9maWxlKTsKICAgICBpZiAoV2ViSW5zcGVj dG9yLnNldHRpbmdzLnNob3dOYXRpdmVTbmFwc2hvdFVuaW5zdHJ1bWVudGVkU2l6ZS5nZXQoKSkg ewogICAgICAgICB0aGlzLnNldFJvb3ROb2RlKG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2Rl KG51bGwsIHRydWUpKTsKLSAgICAgICAgdGhpcy5yb290Tm9kZSgpLmFwcGVuZENoaWxkKHRvdGFs Tm9kZSkKLSAgICAgICAgdG90YWxOb2RlLmV4cGFuZCgpOworICAgICAgICB0aGlzLnJvb3ROb2Rl KCkuYXBwZW5kQ2hpbGQodGhpcy5fdG90YWxOb2RlKQorICAgICAgICB0aGlzLl90b3RhbE5vZGUu ZXhwYW5kKCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgdGhpcy5zZXRSb290Tm9kZSh0b3RhbE5v ZGUpOwotICAgICAgICB0b3RhbE5vZGUuX3BvcHVsYXRlKCk7CisgICAgICAgIHRoaXMuc2V0Um9v dE5vZGUodGhpcy5fdG90YWxOb2RlKTsKKyAgICAgICAgdGhpcy5fdG90YWxOb2RlLl9wb3B1bGF0 ZSgpOwogICAgIH0KKyAgICB0aGlzLmFkZEV2ZW50TGlzdGVuZXIoInNvcnRpbmcgY2hhbmdlZCIs IHRoaXMuc29ydGluZ0NoYW5nZWQuYmluZCh0aGlzKSwgdGhpcyk7CiB9CiAKIFdlYkluc3BlY3Rv ci5OYXRpdmVTbmFwc2hvdERhdGFHcmlkLnByb3RvdHlwZSA9IHsKKyAgICBzb3J0aW5nQ2hhbmdl ZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIGV4cGFuZGVkTm9kZXMgPSB7fTsKKyAg ICAgICAgdGhpcy5fdG90YWxOb2RlLl9zdG9yZVN0YXRlKGV4cGFuZGVkTm9kZXMpOworICAgICAg ICB0aGlzLl90b3RhbE5vZGUucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5fdG90YWxO b2RlLl9wb3B1bGF0ZSgpOworICAgICAgICB0aGlzLl90b3RhbE5vZGUuX3Nob3VsZFJlZnJlc2hD aGlsZHJlbiA9IHRydWU7CisgICAgICAgIHRoaXMuX3RvdGFsTm9kZS5fcmVzdG9yZVN0YXRlKGV4 cGFuZGVkTm9kZXMpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge01lbW9yeUFn ZW50Lk1lbW9yeUJsb2NrfSBub2RlQQorICAgICAqIEBwYXJhbSB7TWVtb3J5QWdlbnQuTWVtb3J5 QmxvY2t9IG5vZGVCCisgICAgICovCisgICAgX3NvcnRpbmdGdW5jdGlvbjogZnVuY3Rpb24obm9k ZUEsIG5vZGVCKQorICAgIHsKKyAgICAgICAgdmFyIHNvcnRDb2x1bW5JZGVudGlmaWVyID0gdGhp cy5zb3J0Q29sdW1uSWRlbnRpZmllcjsKKyAgICAgICAgdmFyIHNvcnRBc2NlbmRpbmcgPSB0aGlz LnNvcnRPcmRlciA9PT0gImFzY2VuZGluZyI7CisgICAgICAgIHZhciBmaWVsZDEgPSBub2RlQVtz b3J0Q29sdW1uSWRlbnRpZmllcl07CisgICAgICAgIHZhciBmaWVsZDIgPSBub2RlQltzb3J0Q29s dW1uSWRlbnRpZmllcl07CisgICAgICAgIHZhciByZXN1bHQgPSBmaWVsZDEgPCBmaWVsZDIgPyAt MSA6IChmaWVsZDEgPiBmaWVsZDIgPyAxIDogMCk7CisgICAgICAgIGlmICghc29ydEFzY2VuZGlu ZykKKyAgICAgICAgICAgIHJlc3VsdCA9IC1yZXN1bHQ7CisgICAgICAgIHJldHVybiByZXN1bHQ7 CisgICAgfSwKKwogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlw ZQogfQogCkBAIC04NSw3ICsxMTIsNyBAQCBXZWJJbnNwZWN0b3IuTmF0aXZlU25hcHNob3ROb2Rl ID0gZnVuY3Rpb24obm9kZURhdGEsIHByb2ZpbGUpCiAgICAgdGhpcy5fbm9kZURhdGEgPSBub2Rl RGF0YTsKICAgICB0aGlzLl9wcm9maWxlID0gcHJvZmlsZTsKICAgICB2YXIgdmlld1Byb3BlcnRp ZXMgPSBXZWJJbnNwZWN0b3IuTWVtb3J5QmxvY2tWaWV3UHJvcGVydGllcy5fZm9yTWVtb3J5Qmxv Y2sobm9kZURhdGEpOwotICAgIHZhciBkYXRhID0geyBvYmplY3Q6IHZpZXdQcm9wZXJ0aWVzLl9k ZXNjcmlwdGlvbiwgc2l6ZTogdGhpcy5fbm9kZURhdGEuc2l6ZSB9OworICAgIHZhciBkYXRhID0g eyBuYW1lOiB2aWV3UHJvcGVydGllcy5fZGVzY3JpcHRpb24sIHNpemU6IHRoaXMuX25vZGVEYXRh LnNpemUgfTsKICAgICB2YXIgaGFzQ2hpbGRyZW4gPSAhIW5vZGVEYXRhLmNoaWxkcmVuICYmIG5v ZGVEYXRhLmNoaWxkcmVuLmxlbmd0aCAhPT0gMDsKICAgICBXZWJJbnNwZWN0b3IuRGF0YUdyaWRO b2RlLmNhbGwodGhpcywgZGF0YSwgaGFzQ2hpbGRyZW4pOwogICAgIHRoaXMuYWRkRXZlbnRMaXN0 ZW5lcigicG9wdWxhdGUiLCB0aGlzLl9wb3B1bGF0ZSwgdGhpcyk7CkBAIC0xMDYsNiArMTMzLDQw IEBAIFdlYkluc3BlY3Rvci5OYXRpdmVTbmFwc2hvdE5vZGUucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICAvKioKKyAgICAgKiBAcGFyYW0ge09iamVjdH0gZXhwYW5kZWROb2RlcworICAgICAq LworICAgIF9zdG9yZVN0YXRlOiBmdW5jdGlvbihleHBhbmRlZE5vZGVzKQorICAgIHsKKyAgICAg ICAgaWYgKCF0aGlzLmV4cGFuZGVkKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBleHBh bmRlZE5vZGVzW3RoaXMudWlkKCldID0gdHJ1ZTsKKyAgICAgICAgZm9yICh2YXIgaSBpbiB0aGlz LmNoaWxkcmVuKQorICAgICAgICAgICAgdGhpcy5jaGlsZHJlbltpXS5fc3RvcmVTdGF0ZShleHBh bmRlZE5vZGVzKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtPYmplY3R9IGV4 cGFuZGVkTm9kZXMKKyAgICAgKi8KKyAgICBfcmVzdG9yZVN0YXRlOiBmdW5jdGlvbihleHBhbmRl ZE5vZGVzKQorICAgIHsKKyAgICAgICAgaWYgKCFleHBhbmRlZE5vZGVzW3RoaXMudWlkKCldKQor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLmV4cGFuZCgpOworICAgICAgICBmb3Ig KHZhciBpIGluIHRoaXMuY2hpbGRyZW4pCisgICAgICAgICAgICB0aGlzLmNoaWxkcmVuW2ldLl9y ZXN0b3JlU3RhdGUoZXhwYW5kZWROb2Rlcyk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBy ZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICB1aWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIGlmICghdGhpcy5fdWlkKQorICAgICAgICAgICAgdGhpcy5fdWlkID0gKCF0aGlzLnBhcmVu dCB8fCAhdGhpcy5wYXJlbnQudWlkID8gIiIgOiB0aGlzLnBhcmVudC51aWQoKSB8fCAiIikgKyAi LyIgKyB0aGlzLl9ub2RlRGF0YS5uYW1lOworICAgICAgICByZXR1cm4gdGhpcy5fdWlkOworICAg IH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gY29sdW1uSWRlbnRpZmllcgog ICAgICAqIEByZXR1cm4ge0VsZW1lbnR9CiAgICAgICovCkBAIC0xMjEsNyArMTgyLDcgQEAgV2Vi SW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90Tm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBu b2RlID0gbm9kZS5wYXJlbnQ7CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgc2l6ZUtpQiA9IHRo aXMuX25vZGVEYXRhLnNpemUgLyAxMDI0OworICAgICAgICB2YXIgc2l6ZUtCID0gdGhpcy5fbm9k ZURhdGEuc2l6ZSAvIDEwMjQ7CiAgICAgICAgIHZhciB0b3RhbFNpemUgPSB0aGlzLl9wcm9maWxl LnNpemU7CiAgICAgICAgIHZhciBwZXJjZW50YWdlID0gdGhpcy5fbm9kZURhdGEuc2l6ZSAvIHRv dGFsU2l6ZSAgKiAxMDA7CiAKQEAgLTEyOSw3ICsxOTAsNyBAQCBXZWJJbnNwZWN0b3IuTmF0aXZl U25hcHNob3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgY2VsbC5jbGFzc05hbWUgPSBjb2x1 bW5JZGVudGlmaWVyICsgIi1jb2x1bW4iOwogCiAgICAgICAgIHZhciB0ZXh0RGl2ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIHRleHREaXYudGV4dENvbnRlbnQgPSBO dW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcihzaXplS2lCLnRvRml4ZWQoMCkpICsgIlx1MjAw OSIgKyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIktpQiIpOworICAgICAgICB0ZXh0RGl2LnRleHRD b250ZW50ID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0b3Ioc2l6ZUtCLnRvRml4ZWQoMCkp ICsgIlx1MjAwOSIgKyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIktCIik7CiAgICAgICAgIHRleHRE aXYuY2xhc3NOYW1lID0gInNpemUtdGV4dCI7CiAgICAgICAgIGNlbGwuYXBwZW5kQ2hpbGQodGV4 dERpdik7CiAKQEAgLTE1NywxMSArMjE4LDcgQEAgV2ViSW5zcGVjdG9yLk5hdGl2ZVNuYXBzaG90 Tm9kZS5wcm90b3R5cGUgPSB7CiAKICAgICBfcG9wdWxhdGU6IGZ1bmN0aW9uKCkgewogICAgICAg ICB0aGlzLnJlbW92ZUV2ZW50TGlzdGVuZXIoInBvcHVsYXRlIiwgdGhpcy5fcG9wdWxhdGUsIHRo aXMpOwotICAgICAgICBmdW5jdGlvbiBjb21wYXJhdG9yKGEsIGIpIHsKLSAgICAgICAgICAgIHJl dHVybiBiLnNpemUgLSBhLnNpemU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKHRoaXMuX25vZGVE YXRhICE9PSB0aGlzLl9wcm9maWxlKQotICAgICAgICAgICAgdGhpcy5fbm9kZURhdGEuY2hpbGRy ZW4uc29ydChjb21wYXJhdG9yKTsKKyAgICAgICAgdGhpcy5fbm9kZURhdGEuY2hpbGRyZW4uc29y dCh0aGlzLmRhdGFHcmlkLl9zb3J0aW5nRnVuY3Rpb24uYmluZCh0aGlzLmRhdGFHcmlkKSk7CiAg ICAgICAgIGZvciAodmFyIG5vZGUgaW4gdGhpcy5fbm9kZURhdGEuY2hpbGRyZW4pIHsKICAgICAg ICAgICAgIHZhciBub2RlRGF0YSA9IHRoaXMuX25vZGVEYXRhLmNoaWxkcmVuW25vZGVdOwogICAg ICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93TmF0aXZlU25hcHNob3RVbmlu c3RydW1lbnRlZFNpemUuZ2V0KCkgfHwgbm9kZURhdGEubmFtZSAhPT0gIk90aGVyIikK