19584 2008-06-16 09:48:41 -0700 Remember the expanded state of objects in the Scope Variables pane when stepping 2008-06-17 15:34:49 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 timothy timothy oldest_to_newest 83476 0 timothy 2008-06-16 09:48:41 -0700 We should remember objects that are expanded in the Scope Variables pane when stepping in the debugger. 83477 1 timothy 2008-06-16 09:48:52 -0700 I have a fix for this. 83503 2 21736 timothy 2008-06-16 11:33:58 -0700 Created attachment 21736 Proposed patch 83609 3 21736 aroben 2008-06-17 13:43:44 -0700 Comment on attachment 21736 Proposed patch Can we just use an incrementing integer for propertyIdentifier? r=me 83648 4 timothy 2008-06-17 15:34:49 -0700 Landed in r34633. 21736 2008-06-16 11:33:58 -0700 2008-06-17 13:43:44 -0700 Proposed patch 0003-Remember-the-expanded-state-of-objects-in-th.patch text/plain 10426 timothy RnJvbSBlYWU4NDFhM2U0ZDI0MjhhZmMyMDI1ZDViZjgxM2RhMGMzOTUwNzQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBNb24sIDE2IEp1biAyMDA4IDEwOjU4OjI0IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gICAg ICAgICBSZW1lbWJlciB0aGUgZXhwYW5kZWQgc3RhdGUgb2Ygb2JqZWN0cyBpbiB0aGUgU2NvcGUg VmFyaWFibGVzIHBhbmUgd2hlbiBzdGVwcGluZy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTg0CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgoKICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL09iamVjdFByb3BlcnRpZXNTZWN0aW9u LmpzOgogICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24pOiBBZGQg YW4gb3B0aW9uYWwgYXJndW1lbnQKICAgICAgICB0aGF0IGlzIHRoZSB0cmVlRWxlbWVudENvbnN0 cnVjdG9yIHRvIHVzZSB3aGVuIG1ha2luZyBUcmVlRWxlbWVudHMuCiAgICAgICAgKFdlYkluc3Bl Y3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUub25wb3B1bGF0ZSk6IFVzZQog ICAgICAgIHRoZSB0cmVlRWxlbWVudENvbnN0cnVjdG9yIHRvIGNyZWF0ZSBUcmVlRWxlbWVudHMu CiAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlw ZS5vbnBvcHVsYXRlKTogVXNlCiAgICAgICAgdGhlIHRyZWVFbGVtZW50Q29uc3RydWN0b3IgdG8g Y3JlYXRlIFRyZWVFbGVtZW50cy4KICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL1Njb3BlQ2hhaW5T aWRlYmFyUGFuZS5qczoKICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3BlQ2hhaW5TaWRlYmFyUGFu ZS5wcm90b3R5cGUudXBkYXRlKTogQ3JlYXRlIGFuCiAgICAgICAgX2V4cGFuZGVkUHJvcGVydGll cyBvYmplY3Qgb24gdGhlIGNhbGxmcmFtZSBpZiBvbmUgZG9lc24ndCBleGlzdCB5ZXQuCiAgICAg ICAgUGFzcyBXZWJJbnNwZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVFbGVtZW50IHRvIHRoZSBPYmpl Y3RQcm9wZXJ0aWVzU2VjdGlvbgogICAgICAgIGFzIHRoZSBUcmVlRWxlbWVudCBjb25zdHJ1Y3Rv ciB3ZSB3YW50IHRvIHVzZS4KICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3BlVmFyaWFibGVUcmVl RWxlbWVudCk6IEFkZGVkLgogICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVF bGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6IEV4cGFuZCBpZiB0aGUKICAgICAgICBwcm9wZXJ0 eUlkZW50aWZpZXIgaXMgaW4gdGhlIHBhbmUncyBfZXhwYW5kZWRQcm9wZXJ0aWVzLgogICAgICAg IChXZWJJbnNwZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmV4cGFu ZCk6IEFkZCB0aGUKICAgICAgICBwcm9wZXJ0eUlkZW50aWZpZXIgdG8gdGhlIHBhbmUncyBfZXhw YW5kZWRQcm9wZXJ0aWVzLgogICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVF bGVtZW50LnByb3RvdHlwZS5vbmNvbGxhcHNlKTogUmVtb3ZlIHRoZQogICAgICAgIHByb3BlcnR5 SWRlbnRpZmllciBmcm9tIHRoZSBwYW5lJ3MgX2V4cGFuZGVkUHJvcGVydGllcy4KICAgICAgICAo V2ViSW5zcGVjdG9yLlNjb3BlVmFyaWFibGVUcmVlRWxlbWVudC5wcm90b3R5cGUuZ2V0IHByb3Bl cnR5SWRlbnRpZmllcik6CiAgICAgICAgUmV0dXJuIGFuIGlkZW50aWZpZXIgdGhhdCBoYXMgdGhl IHNlY3Rpb24gdGl0bGUsIHN1YnRpbGUgYW5kIHByb3BlcnR5UGF0aCBjb25jYXRlbmF0ZWQuCiAg ICAgICAgKFdlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxlVHJlZUVsZW1lbnQucHJvdG90eXBlLmdl dCBwcm9wZXJ0eVBhdGgpOiBSZXR1cm4gYSBzdHJpbmcKICAgICAgICB0aGF0IGhhcyB0aGUgcHJv cGVydHlOYW1lcyB1cCB0byB0aGUgcm9vdCBhbmNlc3RvciBjb25jYXRlbmF0ZWQgd2l0aCBhIHBl cmlvZC4KLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAzMSArKysrKysrKysKIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvT2JqZWN0UHJvcGVy dGllc1NlY3Rpb24uanMgfCAgICA3ICstCiBXZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Njb3BlQ2hh aW5TaWRlYmFyUGFuZS5qcyAgIHwgICA2OCArKysrKysrKysrKysrKysrKysrKy0KIDMgZmlsZXMg Y2hhbmdlZCwgMTAyIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YzJkNjRkLi4wMTM5 NGM5IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSw1ICsxLDM2IEBACiAyMDA4LTA2LTE2ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAorICAgICAgICBSZW1lbWJlciB0aGUgZXhwYW5kZWQgc3RhdGUgb2Ygb2Jq ZWN0cyBpbiB0aGUgU2NvcGUgVmFyaWFibGVzIHBhbmUgd2hlbiBzdGVwcGluZy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTg0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9P YmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQ cm9wZXJ0aWVzU2VjdGlvbik6IEFkZCBhbiBvcHRpb25hbCBhcmd1bWVudAorICAgICAgICB0aGF0 IGlzIHRoZSB0cmVlRWxlbWVudENvbnN0cnVjdG9yIHRvIHVzZSB3aGVuIG1ha2luZyBUcmVlRWxl bWVudHMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24ucHJv dG90eXBlLm9ucG9wdWxhdGUpOiBVc2UKKyAgICAgICAgdGhlIHRyZWVFbGVtZW50Q29uc3RydWN0 b3IgdG8gY3JlYXRlIFRyZWVFbGVtZW50cy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQ cm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnBvcHVsYXRlKTogVXNlCisgICAgICAgIHRo ZSB0cmVlRWxlbWVudENvbnN0cnVjdG9yIHRvIGNyZWF0ZSBUcmVlRWxlbWVudHMuCisgICAgICAg ICogcGFnZS9pbnNwZWN0b3IvU2NvcGVDaGFpblNpZGViYXJQYW5lLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjb3BlQ2hhaW5TaWRlYmFyUGFuZS5wcm90b3R5cGUudXBkYXRlKTogQ3JlYXRl IGFuCisgICAgICAgIF9leHBhbmRlZFByb3BlcnRpZXMgb2JqZWN0IG9uIHRoZSBjYWxsZnJhbWUg aWYgb25lIGRvZXNuJ3QgZXhpc3QgeWV0LgorICAgICAgICBQYXNzIFdlYkluc3BlY3Rvci5TY29w ZVZhcmlhYmxlVHJlZUVsZW1lbnQgdG8gdGhlIE9iamVjdFByb3BlcnRpZXNTZWN0aW9uCisgICAg ICAgIGFzIHRoZSBUcmVlRWxlbWVudCBjb25zdHJ1Y3RvciB3ZSB3YW50IHRvIHVzZS4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxlVHJlZUVsZW1lbnQpOiBBZGRlZC4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0 YWNoKTogRXhwYW5kIGlmIHRoZQorICAgICAgICBwcm9wZXJ0eUlkZW50aWZpZXIgaXMgaW4gdGhl IHBhbmUncyBfZXhwYW5kZWRQcm9wZXJ0aWVzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjb3Bl VmFyaWFibGVUcmVlRWxlbWVudC5wcm90b3R5cGUub25leHBhbmQpOiBBZGQgdGhlCisgICAgICAg IHByb3BlcnR5SWRlbnRpZmllciB0byB0aGUgcGFuZSdzIF9leHBhbmRlZFByb3BlcnRpZXMuCisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVFbGVtZW50LnByb3RvdHlwZS5v bmNvbGxhcHNlKTogUmVtb3ZlIHRoZQorICAgICAgICBwcm9wZXJ0eUlkZW50aWZpZXIgZnJvbSB0 aGUgcGFuZSdzIF9leHBhbmRlZFByb3BlcnRpZXMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Nv cGVWYXJpYWJsZVRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgcHJvcGVydHlJZGVudGlmaWVyKToK KyAgICAgICAgUmV0dXJuIGFuIGlkZW50aWZpZXIgdGhhdCBoYXMgdGhlIHNlY3Rpb24gdGl0bGUs IHN1YnRpbGUgYW5kIHByb3BlcnR5UGF0aCBjb25jYXRlbmF0ZWQuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NvcGVWYXJpYWJsZVRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgcHJvcGVydHlQYXRo KTogUmV0dXJuIGEgc3RyaW5nCisgICAgICAgIHRoYXQgaGFzIHRoZSBwcm9wZXJ0eU5hbWVzIHVw IHRvIHRoZSByb290IGFuY2VzdG9yIGNvbmNhdGVuYXRlZCB3aXRoIGEgcGVyaW9kLgorCisyMDA4 LTA2LTE2ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwogICAgICAgICBG b2N1cyB0aGUgbWFpblBhbmVsc0VsZW1lbnQgaW4gYSB0aW1lb3V0IHNvIGl0IGhhcHBlbnMgYWZ0 ZXIgdGhlCiAgICAgICAgIGluaXRpYWwgZm9jdXMsIHNvIGl0IGRvZXNuJ3QgZ2V0IHJlc2V0IHRv IHRoZSBmaXJzdCB0b29sYmFyIGJ1dHRvbi4KICAgICAgICAgVGhpcyBpbml0aWFsIGZvY3VzIGhh cHBlbnMgb24gTWFjIHdoZW4gdGhlIHdpbmRvdyBpcyBtYWRlIGtleSBhbmQKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMgYi9XZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCmluZGV4IDU3MzYx MjYuLjdmMmNlY2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvT2JqZWN0UHJv cGVydGllc1NlY3Rpb24uanMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5qcwpAQCAtMjMsNyArMjMsNyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci1XZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24gPSBmdW5jdGlvbihvYmplY3Qs IHRpdGxlLCBzdWJ0aXRsZSwgZW1wdHlQbGFjZWhvbGRlciwgaWdub3JlSGFzT3duUHJvcGVydHks IGV4dHJhUHJvcGVydGllcykKK1dlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbiA9 IGZ1bmN0aW9uKG9iamVjdCwgdGl0bGUsIHN1YnRpdGxlLCBlbXB0eVBsYWNlaG9sZGVyLCBpZ25v cmVIYXNPd25Qcm9wZXJ0eSwgZXh0cmFQcm9wZXJ0aWVzLCB0cmVlRWxlbWVudENvbnN0cnVjdG9y KQogewogICAgIGlmICghdGl0bGUpIHsKICAgICAgICAgdGl0bGUgPSBPYmplY3QuZGVzY3JpYmUo b2JqZWN0KTsKQEAgLTM4LDYgKzM4LDcgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNT ZWN0aW9uID0gZnVuY3Rpb24ob2JqZWN0LCB0aXRsZSwgc3VidGl0bGUsIGVtcHR5UGwKICAgICB0 aGlzLm9iamVjdCA9IG9iamVjdDsKICAgICB0aGlzLmlnbm9yZUhhc093blByb3BlcnR5ID0gaWdu b3JlSGFzT3duUHJvcGVydHk7CiAgICAgdGhpcy5leHRyYVByb3BlcnRpZXMgPSBleHRyYVByb3Bl cnRpZXM7CisgICAgdGhpcy50cmVlRWxlbWVudENvbnN0cnVjdG9yID0gdHJlZUVsZW1lbnRDb25z dHJ1Y3RvciB8fCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudDsKIAogICAg IFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMsIHRpdGxlLCBzdWJ0aXRs ZSk7CiB9CkBAIC02Miw3ICs2Myw3IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2Vj dGlvbi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICBpZiAoIXRoaXMuaWdub3JlSGFzT3duUHJvcGVydHkgJiYgImhhc093blByb3BlcnR5IiBpbiBv YmplY3QgJiYgIW9iamVjdC5oYXNPd25Qcm9wZXJ0eShwcm9wZXJ0eU5hbWUpKQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgdGhpcy5wcm9wZXJ0aWVzVHJlZU91dGxpbmUu YXBwZW5kQ2hpbGQobmV3IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50KG9i amVjdCwgcHJvcGVydHlOYW1lKSk7CisgICAgICAgICAgICB0aGlzLnByb3BlcnRpZXNUcmVlT3V0 bGluZS5hcHBlbmRDaGlsZChuZXcgdGhpcy50cmVlRWxlbWVudENvbnN0cnVjdG9yKG9iamVjdCwg cHJvcGVydHlOYW1lKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXRoaXMucHJvcGVydGll c1RyZWVPdXRsaW5lLmNoaWxkcmVuLmxlbmd0aCkgewpAQCAtMTIzLDcgKzEyNCw3IEBAIFdlYklu c3BlY3Rvci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIHZhciBwcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0aWVzW2ldOwogICAgICAgICAgICAgaWYgKHBy b3BlcnR5TmFtZSA9PT0gIl9fdHJlZUVsZW1lbnRJZGVudGlmaWVyIikKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQobmV3IFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50KGNoaWxkT2JqZWN0LCBwcm9wZXJ0eU5hbWUpKTsK KyAgICAgICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQobmV3IHRoaXMudHJlZU91dGxpbmUuc2VjdGlv bi50cmVlRWxlbWVudENvbnN0cnVjdG9yKGNoaWxkT2JqZWN0LCBwcm9wZXJ0eU5hbWUpKTsKICAg ICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3IvU2Nv cGVDaGFpblNpZGViYXJQYW5lLmpzIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9TY29wZUNoYWlu U2lkZWJhclBhbmUuanMKaW5kZXggZDdhNGMxYS4uZjJjNGNjYiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wYWdlL2luc3BlY3Rvci9TY29wZUNoYWluU2lkZWJhclBhbmUuanMKKysrIGIvV2ViQ29yZS9w YWdlL2luc3BlY3Rvci9TY29wZUNoYWluU2lkZWJhclBhbmUuanMKQEAgLTM0LDYgKzM0LDcgQEAg V2ViSW5zcGVjdG9yLlNjb3BlQ2hhaW5TaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuYm9keUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKIAogICAgICAgICB0aGlzLnNlY3Rp b25zID0gW107CisgICAgICAgIHRoaXMuY2FsbEZyYW1lID0gY2FsbEZyYW1lOwogCiAgICAgICAg IGlmICghY2FsbEZyYW1lKSB7CiAgICAgICAgICAgICB2YXIgaW5mb0VsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKQEAgLTQzLDYgKzQ0LDE1IEBAIFdlYkluc3BlY3Rvci5T Y29wZUNoYWluU2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgaWYgKCFjYWxsRnJhbWUuX2V4cGFuZGVkUHJvcGVydGllcykg eworICAgICAgICAgICAgLy8gRklYTUU6IGZpeCB0aGlzIHdoZW4gaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDEwIGlzIGZpeGVkLgorICAgICAgICAgICAgLy8gVGhl IGNhbGxGcmFtZSBpcyBhIEpTSW5zcGVjdGVkT2JqZWN0V3JhcHBlciwgc28gd2UgYXJlIG5vdCBh bGxvd2VkIHRvIGFzc2lnbgorICAgICAgICAgICAgLy8gYW4gb2JqZWN0IGNyZWF0ZWQgaW4gdGhl IEluc3BlY3RvcidzIGNvbnRleHQgdG8gdGhhdCBvYmplY3QuIFNvIGNyZWF0ZSBhbgorICAgICAg ICAgICAgLy8gT2JqZWN0IGZyb20gdGhlIGluc3BlY3RlZFdpbmRvdy4KKyAgICAgICAgICAgIHZh ciBpbnNwZWN0ZWRXaW5kb3cgPSBJbnNwZWN0b3JDb250cm9sbGVyLmluc3BlY3RlZFdpbmRvdygp OworICAgICAgICAgICAgY2FsbEZyYW1lLl9leHBhbmRlZFByb3BlcnRpZXMgPSBuZXcgaW5zcGVj dGVkV2luZG93Lk9iamVjdDsKKyAgICAgICAgfQorCiAgICAgICAgIHZhciBmb3VuZExvY2FsU2Nv cGUgPSBmYWxzZTsKICAgICAgICAgdmFyIHNjb3BlQ2hhaW4gPSBjYWxsRnJhbWUuc2NvcGVDaGFp bjsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY29wZUNoYWluLmxlbmd0aDsgKytpKSB7 CkBAIC03NSw3ICs4NSw5IEBAIFdlYkluc3BlY3Rvci5TY29wZUNoYWluU2lkZWJhclBhbmUucHJv dG90eXBlID0gewogICAgICAgICAgICAgaWYgKCF0aXRsZSB8fCB0aXRsZSA9PT0gc3VidGl0bGUp CiAgICAgICAgICAgICAgICAgc3VidGl0bGUgPSBudWxsOwogCi0gICAgICAgICAgICB2YXIgc2Vj dGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGllc1NlY3Rpb24oc2NvcGVPYmpl Y3QsIHRpdGxlLCBzdWJ0aXRsZSwgZW1wdHlQbGFjZWhvbGRlciwgdHJ1ZSwgZXh0cmFQcm9wZXJ0 aWVzKTsKKyAgICAgICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5PYmplY3RQ cm9wZXJ0aWVzU2VjdGlvbihzY29wZU9iamVjdCwgdGl0bGUsIHN1YnRpdGxlLCBlbXB0eVBsYWNl aG9sZGVyLCB0cnVlLCBleHRyYVByb3BlcnRpZXMsIFdlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxl VHJlZUVsZW1lbnQpOworICAgICAgICAgICAgc2VjdGlvbi5wYW5lID0gdGhpczsKKwogICAgICAg ICAgICAgaWYgKCFmb3VuZExvY2FsU2NvcGUgfHwgbG9jYWxTY29wZSkKICAgICAgICAgICAgICAg ICBzZWN0aW9uLmV4cGFuZGVkID0gdHJ1ZTsKIApAQCAtODYsMyArOTgsNTcgQEAgV2ViSW5zcGVj dG9yLlNjb3BlQ2hhaW5TaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rv ci5TY29wZUNoYWluU2lkZWJhclBhbmUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5TaWRlYmFyUGFuZS5wcm90b3R5cGU7CisKK1dlYkluc3BlY3Rvci5TY29wZVZhcmlhYmxlVHJl ZUVsZW1lbnQgPSBmdW5jdGlvbihwYXJlbnRPYmplY3QsIHByb3BlcnR5TmFtZSkKK3sKKyAgICBX ZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydHlUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHBhcmVudE9i amVjdCwgcHJvcGVydHlOYW1lKTsKK30KKworV2ViSW5zcGVjdG9yLlNjb3BlVmFyaWFibGVUcmVl RWxlbWVudC5wcm90b3R5cGUgPSB7CisgICAgb25hdHRhY2g6IGZ1bmN0aW9uKCkKKyAgICB7Cisg ICAgICAgIGlmICh0aGlzLmhhc0NoaWxkcmVuICYmIHRoaXMucHJvcGVydHlJZGVudGlmaWVyIGlu IHRoaXMudHJlZU91dGxpbmUuc2VjdGlvbi5wYW5lLmNhbGxGcmFtZS5fZXhwYW5kZWRQcm9wZXJ0 aWVzKQorICAgICAgICAgICAgdGhpcy5leHBhbmQoKTsKKyAgICB9LAorCisgICAgb25leHBhbmQ6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMudHJlZU91dGxpbmUuc2VjdGlvbi5wYW5l LmNhbGxGcmFtZS5fZXhwYW5kZWRQcm9wZXJ0aWVzW3RoaXMucHJvcGVydHlJZGVudGlmaWVyXSA9 IHRydWU7CisgICAgfSwKKworICAgIG9uY29sbGFwc2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIGRlbGV0ZSB0aGlzLnRyZWVPdXRsaW5lLnNlY3Rpb24ucGFuZS5jYWxsRnJhbWUuX2V4cGFu ZGVkUHJvcGVydGllc1t0aGlzLnByb3BlcnR5SWRlbnRpZmllcl07CisgICAgfSwKKworICAgIGdl dCBwcm9wZXJ0eUlkZW50aWZpZXIoKQorICAgIHsKKyAgICAgICAgaWYgKCJfcHJvcGVydHlJZGVu dGlmaWVyIiBpbiB0aGlzKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3Byb3BlcnR5SWRlbnRp ZmllcjsKKyAgICAgICAgdmFyIHNlY3Rpb24gPSB0aGlzLnRyZWVPdXRsaW5lLnNlY3Rpb247Cisg ICAgICAgIHRoaXMuX3Byb3BlcnR5SWRlbnRpZmllciA9IHNlY3Rpb24udGl0bGUgKyAiOiIgKyAo c2VjdGlvbi5zdWJ0aXRsZSA/IHNlY3Rpb24uc3VidGl0bGUgKyAiOiIgOiAiIikgKyB0aGlzLnBy b3BlcnR5UGF0aDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Byb3BlcnR5SWRlbnRpZmllcjsKKyAg ICB9LAorCisgICAgZ2V0IHByb3BlcnR5UGF0aCgpCisgICAgeworICAgICAgICBpZiAoIl9wcm9w ZXJ0eVBhdGgiIGluIHRoaXMpCisgICAgICAgICAgICByZXR1cm4gdGhpcy5fcHJvcGVydHlQYXRo OworCisgICAgICAgIHZhciBjdXJyZW50ID0gdGhpczsKKyAgICAgICAgdmFyIHJlc3VsdDsKKwor ICAgICAgICBkbyB7CisgICAgICAgICAgICBpZiAocmVzdWx0KQorICAgICAgICAgICAgICAgIHJl c3VsdCA9IGN1cnJlbnQucHJvcGVydHlOYW1lICsgIi4iICsgcmVzdWx0OworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIHJlc3VsdCA9IGN1cnJlbnQucHJvcGVydHlOYW1lOworICAg ICAgICAgICAgY3VycmVudCA9IGN1cnJlbnQucGFyZW50OworICAgICAgICB9IHdoaWxlIChjdXJy ZW50ICYmICFjdXJyZW50LnJvb3QpOworCisgICAgICAgIHRoaXMuX3Byb3BlcnR5UGF0aCA9IHJl c3VsdDsKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5T Y29wZVZhcmlhYmxlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5PYmplY3RQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZTsKLS0gCjEuNS40LjQKCg==