77801 2012-02-03 20:19:26 -0800 Web Inspector: get rid of cycles in retaining tree 2012-02-11 01:26:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 78411 0 loislo loislo apavlov bweinstein dglazkov joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 549345 0 loislo 2012-02-03 20:19:26 -0800 %subj% 549346 1 125473 loislo 2012-02-03 20:22:01 -0800 Created attachment 125473 Patch 549356 2 125473 webkit.review.bot 2012-02-03 20:55:45 -0800 Comment on attachment 125473 Patch Attachment 125473 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11418649 New failing tests: inspector/profiler/detailed-heapshots-summary-expansion-preserved-when-sorting.html inspector/profiler/detailed-heapshots-comparison-expansion-preserved-when-sorting.html 549377 3 125473 yurys 2012-02-03 22:31:30 -0800 Comment on attachment 125473 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125473&action=review > Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js:380 > + while (ancestor) { We may stop if the parentGridNode already has _cycledWithAncestorGridNode set. > Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js:388 > + WebInspector.HeapSnapshotGenericObjectNode.prototype._updateHasChildren.call(this); Please remvoe leading underscore from _updateHasChildren method name since you override it, by the convention only private methods should start with _. > Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js:-444 > - prefixSpan.textContent = WebInspector.UIString("retained by "); Please mention this UI change in the changelog. > Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js:458 > + if (this._cycledWithAncestorGridNode) { We need some UI for navigating to the first occurrence of the node in the ancesors chain but this can be done in a separate patch. 549415 4 loislo 2012-02-04 02:20:24 -0800 Committed r106738: <http://trac.webkit.org/changeset/106738> 549428 5 125492 loislo 2012-02-04 04:47:58 -0800 Created attachment 125492 the patch that was actually landed 125473 2012-02-03 20:22:01 -0800 2012-02-03 22:31:29 -0800 Patch bug-77801-20120204082159.patch text/plain 4291 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQ2MzllMmYxNzU1Mzc1 YzU3M2NkMmJhZGU4YjA4MDBjMjg2ZGUzNi4uYjJiM2FlYjFlMTAyOTg3NTlmODY2ZjY1ODIxMWNj NmZiY2VlZjFhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAyLTAzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBnZXQgcmVlZCBvZiBjeWNsZXMgaW4gcmV0YWluaW5nIHRyZWUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3ODAxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rl dGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90T2JqZWN0Tm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2Jq ZWN0Tm9kZS5wcm90b3R5cGUuX3VwZGF0ZUhhc0NoaWxkcmVuKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2RlLnByb3RvdHlwZS5fY3JlYXRlQ2hpbGROb2RlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2RlLnByb3RvdHlwZS5f cHJlZml4T2JqZWN0Q2VsbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9wcm9maWxl c1BhbmVsLmNzczoKKyAgICAgICAgKC5jeWNsZWQtYW5jZXNzb3Itbm9kZSk6CisKIDIwMTItMDIt MDMgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFNwZWN1 bGF0aXZlIHVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBRdC1XaW5kb3dzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9k ZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNo b3RHcmlkTm9kZXMuanMKaW5kZXggOTMzMzM1NjhlOWI3MzUwMDg1MzBlZjEwMjVmNzFjZTgyZDMz Mzg1MS4uY2Q0ZDA5ZDMzYjI3NjE4YjJhNjZkMGNhMjBkNDJjNDQ5NzZmNTIwMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3Jp ZE5vZGVzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWls ZWRIZWFwc2hvdEdyaWROb2Rlcy5qcwpAQCAtMzU5LDcgKzM1OSw3IEBAIFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3RvdHlwZTsKIAotV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdE9iamVjdE5vZGUgPSBmdW5jdGlvbih0cmVlLCBpc0Zyb21CYXNlU25hcHNo b3QsIGVkZ2UpCitXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZSA9IGZ1bmN0aW9u KHBhcmVudEdyaWROb2RlLCB0cmVlLCBpc0Zyb21CYXNlU25hcHNob3QsIGVkZ2UpCiB7CiAgICAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLmNhbGwodGhpcywgdHJl ZSwgZWRnZS5ub2RlKTsKICAgICB0aGlzLl9yZWZlcmVuY2VOYW1lID0gZWRnZS5uYW1lOwpAQCAt MzY4LDEzICszNjgsMjkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUgPSBm dW5jdGlvbih0cmVlLCBpc0Zyb21CYXNlU25hcHNob3QsIGVkZ2UpCiAgICAgdGhpcy5fcmV0YWlu ZXJOb2RlID0gdHJlZS5zaG93UmV0YWluaW5nRWRnZXM7CiAgICAgdGhpcy5faXNGcm9tQmFzZVNu YXBzaG90ID0gaXNGcm9tQmFzZVNuYXBzaG90OwogICAgIHRoaXMuX3Byb3ZpZGVyID0gdGhpcy5f Y3JlYXRlUHJvdmlkZXIoIWlzRnJvbUJhc2VTbmFwc2hvdCA/IHRyZWUuc25hcHNob3QgOiB0cmVl LmJhc2VTbmFwc2hvdCwgZWRnZS5ub2RlSW5kZXgsIHRyZWUpOwotICAgIHRoaXMuX3VwZGF0ZUhh c0NoaWxkcmVuKCk7CisgICAgdGhpcy5fdXBkYXRlSGFzQ2hpbGRyZW4ocGFyZW50R3JpZE5vZGUp OwogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZS5wcm90b3R5cGUgPSB7 CisgICAgX3VwZGF0ZUhhc0NoaWxkcmVuOiBmdW5jdGlvbihwYXJlbnRHcmlkTm9kZSkKKyAgICB7 CisgICAgICAgIGlmICh0aGlzLl9yZXRhaW5lck5vZGUpIHsKKyAgICAgICAgICAgIHRoaXMuX3Bh cmVudEdyaWROb2RlID0gcGFyZW50R3JpZE5vZGU7CisgICAgICAgICAgICB2YXIgYW5jZXN0b3Ig PSBwYXJlbnRHcmlkTm9kZTsKKyAgICAgICAgICAgIHdoaWxlIChhbmNlc3RvcikgeworICAgICAg ICAgICAgICAgIGlmIChhbmNlc3Rvci5zbmFwc2hvdE5vZGVJZCA9PT0gdGhpcy5zbmFwc2hvdE5v ZGVJZCkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9jeWNsZWRXaXRoQW5jZXN0b3JHcmlk Tm9kZSA9IGFuY2VzdG9yOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGFuY2VzdG9yID0gYW5jZXN0b3IuX3BhcmVudEdyaWRO b2RlOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5cGUuX3VwZGF0ZUhhc0NoaWxkcmVuLmNh bGwodGhpcyk7CisgICAgfSwKKwogICAgIF9jcmVhdGVDaGlsZE5vZGU6IGZ1bmN0aW9uKGl0ZW0p CiAgICAgewotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmpl Y3ROb2RlKHRoaXMuZGF0YUdyaWQsIHRoaXMuX2lzRnJvbUJhc2VTbmFwc2hvdCwgaXRlbSk7Cisg ICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUodGhp cywgdGhpcy5kYXRhR3JpZCwgdGhpcy5faXNGcm9tQmFzZVNuYXBzaG90LCBpdGVtKTsKICAgICB9 LAogCiAgICAgX2NyZWF0ZVByb3ZpZGVyOiBmdW5jdGlvbihzbmFwc2hvdCwgbm9kZUluZGV4LCB0 cmVlKQpAQCAtNDM5LDEwICs0NTUsOCBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0 Tm9kZS5wcm90b3R5cGUgPSB7CiAKICAgICBfcHJlZml4T2JqZWN0Q2VsbDogZnVuY3Rpb24oZGl2 LCBkYXRhKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3JldGFpbmVyTm9kZSkgewotICAgICAg ICAgICAgdmFyIHByZWZpeFNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0g ICAgICAgICAgICBwcmVmaXhTcGFuLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJyZXRhaW5lZCBieSAiKTsKLSAgICAgICAgICAgIGRpdi5hcHBlbmRDaGlsZChwcmVmaXhTcGFu KTsKKyAgICAgICAgaWYgKHRoaXMuX2N5Y2xlZFdpdGhBbmNlc3RvckdyaWROb2RlKSB7CisgICAg ICAgICAgICBkaXYuY2xhc3NOYW1lICs9ICIgY3ljbGVkLWFuY2Vzc29yLW5vZGUiOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvcHJvZmlsZXNQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL3Byb2ZpbGVzUGFuZWwuY3NzCmluZGV4IDEwZjZiNDlmZWRmMzdiNWQ3 NTg1ZWE5ZmZhM2NhZTgxYzdhMjNiZGQuLjdmYWVjM2IyZDIzMjIxZTA1MGZiNTU3YTA1NzA0ZDQ5 ZjdlYzcwOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv cHJvZmlsZXNQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9wcm9maWxlc1BhbmVsLmNzcwpAQCAtMTc0LDYgKzE3NCwxMCBAQAogICAgIG1hcmdpbi1sZWZ0 OiAyMnB4OwogfQogCisuY3ljbGVkLWFuY2Vzc29yLW5vZGUgeworICAgIGNvbG9yOiBsaWdodGdy YXk7Cit9CisKIC5wYW5lbC1lbmFibGVyLXZpZXcucHJvZmlsZS1sYXVuY2hlci12aWV3IGJ1dHRv bjpub3QoLnN0YXR1cy1iYXItaXRlbSkgewogICAgIGNvbG9yOiByZ2IoNiwgNiwgNik7CiAgICAg bWFyZ2luOiAxNnB4IDA7Cg== 125492 2012-02-04 04:47:58 -0800 2012-02-04 04:47:58 -0800 the patch that was actually landed patch text/plain 5588 loislo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NTYxYmRmLi4xMWVkNzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDItMDMgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGdldCByaWQgb2YgY3ljbGVzIGluIHJldGFpbmluZyB0 cmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Nzgw MQorCisgICAgICAgIERyaXZlIGJ5IGZpeDogJ3JldGFpbmVkIGJ5JyBwcmVmaXggd2FzIHJlbW92 ZWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KKworICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2RlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2RlLnByb3RvdHlwZS5fdXBkYXRlSGFzQ2hpbGRy ZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUucHJvdG90 eXBlLl9jcmVhdGVDaGlsZE5vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dE9iamVjdE5vZGUucHJvdG90eXBlLl9wcmVmaXhPYmplY3RDZWxsKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL3Byb2ZpbGVzUGFuZWwuY3NzOgorICAgICAgICAoLmN5Y2xlZC1hbmNl c3Nvci1ub2RlKToKKwogMjAxMi0wMi0wNCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgQWRkIHRoZSAiSlMiIHByZWZpeCB0byBKU0Mgc3BlY2lmaWMgSURM IGF0dHJpYnV0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwppbmRleCBjZGFlMjcwYzkzOTUyYTFlOTQ2MzE5ZTBiNTc2N2QwYzJiYTEzNmE2 Li4yYWJkZjg2OTQ2YmQ3ZjkwNzg2NzExNGVlMDhlMzViMDNkOGU1MzMzIDEwMDY0NApHSVQgYmlu YXJ5IHBhdGNoCmRlbHRhIDIwCmNjbVg/Z2s+JHcrbVdDfmlfOE9ELW5zN3tDdEhDRz4wQXB6ZzNJ RzVBCgpkZWx0YSA3OQp6Y21hRUlmI3VYaW1XQ35pXzhPSyY0NTx0eTQyY1l4NDAlOVMzV0VZZTU8 P31CUkFQdClsRDEkTFJ5RVRQQ0B8X3kKSng3VDEpMXBwYSY1eUFpZgoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rl cy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hv dEdyaWROb2Rlcy5qcwppbmRleCA5MzMzMzU2Li40N2E3MTgwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90 R3JpZE5vZGVzLmpzCkBAIC0zMjgsNyArMzI4LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3No YWxsb3dTaXplIC8gdGhpcy5kYXRhR3JpZC5zbmFwc2hvdC50b3RhbFNpemUgKiAxMDAuMDsKICAg ICB9LAogCi0gICAgX3VwZGF0ZUhhc0NoaWxkcmVuOiBmdW5jdGlvbigpCisgICAgdXBkYXRlSGFz Q2hpbGRyZW46IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGZ1bmN0aW9uIGlzRW1wdHlDYWxs YmFjayhpc0VtcHR5KQogICAgICAgICB7CkBAIC0zNTksNyArMzU5LDcgQEAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKIAogV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlOwogCi1XZWJJbnNwZWN0 b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZSA9IGZ1bmN0aW9uKHRyZWUsIGlzRnJvbUJhc2VTbmFw c2hvdCwgZWRnZSkKK1dlYkluc3BlY3Rvci5IZWFwU25hcHNob3RPYmplY3ROb2RlID0gZnVuY3Rp b24odHJlZSwgaXNGcm9tQmFzZVNuYXBzaG90LCBlZGdlLCBwYXJlbnRHcmlkTm9kZSkKIHsKICAg ICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R2VuZXJpY09iamVjdE5vZGUuY2FsbCh0aGlzLCB0 cmVlLCBlZGdlLm5vZGUpOwogICAgIHRoaXMuX3JlZmVyZW5jZU5hbWUgPSBlZGdlLm5hbWU7CkBA IC0zNjgsMTMgKzM2OCwyOSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZSA9 IGZ1bmN0aW9uKHRyZWUsIGlzRnJvbUJhc2VTbmFwc2hvdCwgZWRnZSkKICAgICB0aGlzLl9yZXRh aW5lck5vZGUgPSB0cmVlLnNob3dSZXRhaW5pbmdFZGdlczsKICAgICB0aGlzLl9pc0Zyb21CYXNl U25hcHNob3QgPSBpc0Zyb21CYXNlU25hcHNob3Q7CiAgICAgdGhpcy5fcHJvdmlkZXIgPSB0aGlz Ll9jcmVhdGVQcm92aWRlcighaXNGcm9tQmFzZVNuYXBzaG90ID8gdHJlZS5zbmFwc2hvdCA6IHRy ZWUuYmFzZVNuYXBzaG90LCBlZGdlLm5vZGVJbmRleCwgdHJlZSk7Ci0gICAgdGhpcy5fdXBkYXRl SGFzQ2hpbGRyZW4oKTsKKyAgICB0aGlzLnVwZGF0ZUhhc0NoaWxkcmVuKHBhcmVudEdyaWROb2Rl KTsKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5vZGUucHJvdG90eXBlID0g eworICAgIHVwZGF0ZUhhc0NoaWxkcmVuOiBmdW5jdGlvbihwYXJlbnRHcmlkTm9kZSkKKyAgICB7 CisgICAgICAgIGlmICh0aGlzLl9yZXRhaW5lck5vZGUpIHsKKyAgICAgICAgICAgIHRoaXMuX3Bh cmVudEdyaWROb2RlID0gcGFyZW50R3JpZE5vZGU7CisgICAgICAgICAgICB2YXIgYW5jZXN0b3Ig PSBwYXJlbnRHcmlkTm9kZTsKKyAgICAgICAgICAgIHdoaWxlIChhbmNlc3RvcikgeworICAgICAg ICAgICAgICAgIGlmIChhbmNlc3Rvci5zbmFwc2hvdE5vZGVJZCA9PT0gdGhpcy5zbmFwc2hvdE5v ZGVJZCkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9jeWNsZWRXaXRoQW5jZXN0b3JHcmlk Tm9kZSA9IGFuY2VzdG9yOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGFuY2VzdG9yID0gYW5jZXN0b3IuX3BhcmVudEdyaWRO b2RlOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5cGUudXBkYXRlSGFzQ2hpbGRyZW4uY2Fs bCh0aGlzKTsKKyAgICB9LAorCiAgICAgX2NyZWF0ZUNoaWxkTm9kZTogZnVuY3Rpb24oaXRlbSkK ICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVj dE5vZGUodGhpcy5kYXRhR3JpZCwgdGhpcy5faXNGcm9tQmFzZVNuYXBzaG90LCBpdGVtKTsKKyAg ICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90T2JqZWN0Tm9kZSh0aGlz LmRhdGFHcmlkLCB0aGlzLl9pc0Zyb21CYXNlU25hcHNob3QsIGl0ZW0sIHRoaXMpOwogICAgIH0s CiAKICAgICBfY3JlYXRlUHJvdmlkZXI6IGZ1bmN0aW9uKHNuYXBzaG90LCBub2RlSW5kZXgsIHRy ZWUpCkBAIC00NDAsOSArNDU2LDggQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE9iamVjdE5v ZGUucHJvdG90eXBlID0gewogICAgIF9wcmVmaXhPYmplY3RDZWxsOiBmdW5jdGlvbihkaXYsIGRh dGEpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fcmV0YWluZXJOb2RlKSB7Ci0gICAgICAgICAg ICB2YXIgcHJlZml4U3BhbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAg ICAgICAgIHByZWZpeFNwYW4udGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInJl dGFpbmVkIGJ5ICIpOwotICAgICAgICAgICAgZGl2LmFwcGVuZENoaWxkKHByZWZpeFNwYW4pOwor ICAgICAgICAgICAgaWYgKHRoaXMuX2N5Y2xlZFdpdGhBbmNlc3RvckdyaWROb2RlKQorICAgICAg ICAgICAgICAgIGRpdi5jbGFzc05hbWUgKz0gIiBjeWNsZWQtYW5jZXNzb3Itbm9kZSI7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtNDc1LDcgKzQ5MCw3IEBAIFdlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3RJbnN0YW5jZU5vZGUgPSBmdW5jdGlvbih0cmVlLCBiYXNlU25hcHNo b3QsIHNuYXBzaG90LCBuCiAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmpl Y3ROb2RlLmNhbGwodGhpcywgdHJlZSwgbm9kZSk7CiAgICAgdGhpcy5faXNEZWxldGVkTm9kZSA9 ICEhYmFzZVNuYXBzaG90OwogICAgIHRoaXMuX3Byb3ZpZGVyID0gdGhpcy5fY3JlYXRlUHJvdmlk ZXIoYmFzZVNuYXBzaG90IHx8IHNuYXBzaG90LCBub2RlLm5vZGVJbmRleCk7Ci0gICAgdGhpcy5f dXBkYXRlSGFzQ2hpbGRyZW4oKTsKKyAgICB0aGlzLnVwZGF0ZUhhc0NoaWxkcmVuKCk7CiB9Owog CiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90SW5zdGFuY2VOb2RlLnByb3RvdHlwZSA9IHsKQEAg LTgwNSw3ICs4MjAsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RG9taW5hdG9yT2JqZWN0 Tm9kZSA9IGZ1bmN0aW9uKHRyZWUsIG5vZGUpCiB7CiAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdEdlbmVyaWNPYmplY3ROb2RlLmNhbGwodGhpcywgdHJlZSwgbm9kZSk7CiAgICAgdGhpcy5f cHJvdmlkZXIgPSB0aGlzLl9jcmVhdGVQcm92aWRlcih0cmVlLnNuYXBzaG90LCBub2RlLm5vZGVJ bmRleCk7Ci0gICAgdGhpcy5fdXBkYXRlSGFzQ2hpbGRyZW4oKTsKKyAgICB0aGlzLnVwZGF0ZUhh c0NoaWxkcmVuKCk7CiB9OwogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RG9taW5hdG9yT2Jq ZWN0Tm9kZS5wcm90b3R5cGUgPSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL3Byb2ZpbGVzUGFuZWwuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9wcm9maWxlc1BhbmVsLmNzcwppbmRleCAxMGY2YjQ5Li43ZmFlYzNiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3Byb2ZpbGVzUGFuZWwu Y3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvcHJvZmlsZXNQYW5l bC5jc3MKQEAgLTE3NCw2ICsxNzQsMTAgQEAKICAgICBtYXJnaW4tbGVmdDogMjJweDsKIH0KIAor LmN5Y2xlZC1hbmNlc3Nvci1ub2RlIHsKKyAgICBjb2xvcjogbGlnaHRncmF5OworfQorCiAucGFu ZWwtZW5hYmxlci12aWV3LnByb2ZpbGUtbGF1bmNoZXItdmlldyBidXR0b246bm90KC5zdGF0dXMt YmFyLWl0ZW0pIHsKICAgICBjb2xvcjogcmdiKDYsIDYsIDYpOwogICAgIG1hcmdpbjogMTZweCAw Owo=