158504 2016-06-07 17:33:13 -0700 Web Inspector: reduce redundant attribute modification updates in DOMTreeUpdater and DOMTreeElement 2016-06-08 14:16:27 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 156250 1 bburg bburg bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1200253 0 bburg 2016-06-07 17:33:13 -0700 We are super naive in TOT. 1200254 1 bburg 2016-06-07 17:33:31 -0700 <rdar://problem/25561452> 1200295 2 280762 bburg 2016-06-07 19:32:08 -0700 Created attachment 280762 Proposed Fix 1200590 3 bburg 2016-06-08 14:16:27 -0700 Committed r201833: <http://trac.webkit.org/changeset/201833> 280762 2016-06-07 19:32:08 -0700 2016-06-08 13:04:31 -0700 Proposed Fix bug-158504-20160607193334.patch text/plain 14068 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl YmU5ZDVkYjA5NTlkMTFiZjc3NjBlMjMwNjMyYzE5M2U4ZWMxYTNkLi5jMzZmMWE3MDc1NGZjODYy OTQzYWI3NDg2YjJlMTkyZDlmNjM1MzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw1NSBAQAogMjAxNi0wNi0wNyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiByZWR1Y2UgcmVkdW5kYW50IGF0dHJpYnV0ZSBtb2RpZmlj YXRpb24gdXBkYXRlcyBpbiBET01UcmVlVXBkYXRlciBhbmQgRE9NVHJlZUVsZW1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODUwNAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMjU1NjE0NTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2hlbiB0aGUgZnJvbnRlbmQgZ2V0cyBsb3RzIG9mIERPTS5h dHRyaWJ1dGVNb2RpZmllZCBldmVudHMsIGl0IGZvcndhcmRzIHRoZXNlIG9uIHRvCisgICAgICAg IERPTVRyZWVVcGRhdGVyLCB3aGljaCBwdXNoZXMgYSByZWNvcmQgZm9yIGV2ZXJ5IHNpbmdsZSBt b2RpZmljYXRpb24uIEl0IHRoZW4gdXBkYXRlcworICAgICAgICB0aGUgRE9NIGVsZW1lbnRzIHdp dGggdGhlIGF0dGlidXRlIGNoYW5nZXMgb24gYW4gYW5pbWF0aW9uIGZyYW1lLiBIb3dldmVyLCBz aW5jZSBpdAorICAgICAgICBkb2Vzbid0IGRvIGFueSBkZWR1cGxpY2F0aW9uIG9mIHRoZSBtb2Rp ZmljYXRpb24gcmVjb3JkcywgYSBsb3Qgb2YgdGltZSBpcyB3YXN0ZWQKKyAgICAgICAgb24gdXBk YXRpbmcgRE9NVHJlZUVsZW1lbnRzIHdpdGggaW50ZXJtZWRpYXRlIChub24tZmluYWwpIGF0dHJp YnV0ZSB2YWx1ZXMuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZXdyaXRlcyBET01UcmVlVXBkYXRl ciB0byBwcmVjaXNlbHkgdHJhY2sgd2hpY2ggbm9kZXMgYW5kIGF0dHJpYnV0ZXMKKyAgICAgICAg b2YgZWFjaCBub2RlIG5lZWQgdG8gYmUgdXBkYXRlZCBvbiB0aGUgbmV4dCBhbmltYXRpb24gZnJh bWUuIFRoaXMgaXMgZG9uZSB1c2luZworICAgICAgICBTZXRzIGFuZCBNYXBzIHRoYXQgb25seSBo b2xkIG9udG8gdGhlIG1vc3QgcmVjZW50IGF0dHJpYnV0ZSB2YWx1ZXMgcmF0aGVyIHRoYW4KKyAg ICAgICAgcHVzaGluZyBhIHJlY29yZCBvYmplY3QgZm9yIGV2ZXJ5IHNpbmdsZSBtdXRhdGlvbi4K KworICAgICAgICBUaGlzIGltcHJvdmVzIHRoZSBwZXJmb3JtYW5jZSBvZiB0aGUgRWxlbWVudHMg dGFiIG9uIGFuIFNWRyBwYXJ0aWNsZSBzaW11bGF0b3IKKyAgICAgICAgZHJhbWF0aWNhbGx5IHNv IHRoYXQgdGhlIEluc3BlY3RvciB3aWxsIG5vdCBpbW1lZGlhdGVseSBoYW5nLiBJdCBzdGlsbCBv bmx5IGFjaGlldmVzCisgICAgICAgIGEgZmV3IHVwZGF0ZXMgcGVyIHNlY29uZCBpbiB0aGlzIGNh c2UsIHNvIHRoZXJlIGlzIHN0aWxsIG9wdGltaXphdGlvbiB0byBiZSBkb25lIG9uCisgICAgICAg IHRoZSBmcm9udGVuZCBhbmQgdGhyb3R0bGluZyB0byBiZSBkb25lIG9uIHRoZSBiYWNrZW5kLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLmF0dHJpYnV0ZURpZENoYW5nZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9idWlsZEF0dHJpYnV0ZURPTSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLl9tYXJrTm9k ZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlw ZS5fbm9kZUNoYW5nZWRBbmltYXRpb25FbmQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRy ZWVFbGVtZW50LnByb3RvdHlwZS5fZmlyZURpZENoYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLm5vZGVTdGF0ZUNoYW5nZWQpOiBEZWxldGVkLgor ICAgICAgICBTaW1wbGlmeSB0aGUgbGlzdCBvZiBtb2RpZmllZCBhdHRyaWJ1dGVzIGEgbGl0dGxl IGJpdC4gVGhpcyBzdGlsbCB1c2VzIGEgd29ya2xpc3QKKyAgICAgICAgYXBwcm9hY2gsIHNvIGl0 J3MgcG9zc2libGUgdGhhdCBkdXBsaWNhdGUgdXBkYXRlcyBmb3IgdGhlIHNhbWUgYXR0cmlidXRl IGNvdWxkIGFjY3VtdWxhdGUKKyAgICAgICAgaWYgRE9NVHJlZVVwZGF0ZXIgcHVzaGVzIHVwZGF0 ZXMgZmFzdGVyIHRoYW4gRE9NVHJlZUVsZW1lbnQgY2FuIHJlbmRlciB0aGVtLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlVXBkYXRlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5ET01UcmVlVXBkYXRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZVVw ZGF0ZXIucHJvdG90eXBlLl9hdHRyaWJ1dGVzVXBkYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NVHJlZVVwZGF0ZXIucHJvdG90eXBlLl9jaGFyYWN0ZXJEYXRhTW9kaWZpZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVVcGRhdGVyLnByb3RvdHlwZS5fbm9kZUF0dHJpYnV0 ZU1vZGlmaWVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlVXBkYXRlci5wcm90b3R5 cGUuX25vZGVJbnNlcnRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZVVwZGF0ZXIu cHJvdG90eXBlLl9ub2RlUmVtb3ZlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZVVw ZGF0ZXIucHJvdG90eXBlLl9jaGlsZE5vZGVDb3VudFVwZGF0ZWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkRPTVRyZWVVcGRhdGVyLnByb3RvdHlwZS5fdXBkYXRlTW9kaWZpZWROb2Rlcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZVVwZGF0ZXIucHJvdG90eXBlLl9yZXNldCk6Cisg ICAgICAgIFJld3JpdGUgdGhpcyBjbGFzcyB0byBzZXBhcmF0ZWx5IHRyYWNrIGluc2VydGlvbnMs IGRlbGV0aW9ucywgYW5kIG1vZGlmaWNhdGlvbnMuIFVzZQorICAgICAgICBTZXRzIGFuZCBNYXBz IHNvIHJlZHVuZGFudCBlbnRyaWVzIGFyZSBub3Qga2VwdCBhcm91bmQuIFNwbGl0IHRoZSBtYWlu IHdvcmsgbG9vcAorICAgICAgICBhbmQgdXNlIGZld2VyIGVudW0tbGlrZSBwcm9wZXJ0aWVzIHRv IGNvbnRyb2wgaG93IGVhY2ggRE9NIGVsZW1lbnQgY2hhbmdlIGlzIGhhbmRsZWQuCisKKzIwMTYt MDYtMDcgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVkdWNlIHRpbWVyIGNodXJuIHdoZW4gcHJvY2Vzc2luZyBtYW55IERPTS5hdHRyaWJ1 dGVNb2RpZmllZCBtZXNzYWdlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTU4NDkxCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTU2MTQ1Mj4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRy ZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUVsZW1lbnQuanMKaW5kZXggNzQ0YWJiMjY2Y2FkNzZlM2Y2ZjBhZmRiMGNiYTRmODQ0 ZTU0MjBhZS4uMzY1OTllOGM2YzhlMTBmOTBkMjdkY2RiM2Q5NzJmZTA1ZDEyNWIzYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVs ZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUVsZW1lbnQuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAy MDA3LCAyMDA4LCAyMDEzLCAyMDE1IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIwMTMsIDIwMTUsIDIwMTYgQXBwbGUgSW5jLiAg QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBNYXR0IExpbGVrIDx3 ZWJraXRAbWF0dGxpbGVrLmNvbT4KICAqIENvcHlyaWdodCAoQykgMjAwOSBKb3NlcGggUGVjb3Jh cm8KICAqCkBAIC00Miw3ICs0Miw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNs YXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAgICAgICAg IHRoaXMuX3NlYXJjaFF1ZXJ5ID0gbnVsbDsKICAgICAgICAgdGhpcy5fZXhwYW5kZWRDaGlsZHJl bkxpbWl0ID0gV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LkluaXRpYWxDaGlsZHJlbkxpbWl0 OwogCi0gICAgICAgIHRoaXMuX25vZGVTdGF0ZUNoYW5nZXMgPSBbXTsKKyAgICAgICAgdGhpcy5f cmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMgPSBbXTsKICAgICAgICAgdGhpcy5fYm91bmROb2Rl Q2hhbmdlZEFuaW1hdGlvbkVuZCA9IHRoaXMuX25vZGVDaGFuZ2VkQW5pbWF0aW9uRW5kLmJpbmQo dGhpcyk7CiAKICAgICAgICAgbm9kZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01O b2RlLkV2ZW50LkVuYWJsZWRQc2V1ZG9DbGFzc2VzQ2hhbmdlZCwgdGhpcy5fbm9kZVBzZXVkb0Ns YXNzZXNEaWRDaGFuZ2UsIHRoaXMpOwpAQCAtMTk3LDEyICsxOTcsOSBAQCBXZWJJbnNwZWN0b3Iu RE9NVHJlZUVsZW1lbnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rv ci5UcmVlRWxlbQogICAgICAgICByZXR1cm4gY291bnQ7CiAgICAgfQogCi0gICAgbm9kZVN0YXRl Q2hhbmdlZChjaGFuZ2UpCisgICAgYXR0cmlidXRlRGlkQ2hhbmdlKG5hbWUpCiAgICAgewotICAg ICAgICBpZiAoIWNoYW5nZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLl9u b2RlU3RhdGVDaGFuZ2VzLnB1c2goY2hhbmdlKTsKKyAgICAgICAgdGhpcy5fcmVjZW50bHlNb2Rp ZmllZEF0dHJpYnV0ZXMucHVzaCh7bmFtZX0pOwogICAgIH0KIAogICAgIHNob3dDaGlsZE5vZGUo bm9kZSkKQEAgLTExNDgsOSArMTE0NSw5IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9 IGNsYXNzIERPTVRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAgICAg ICAgIGlmIChoYXNUZXh0KQogICAgICAgICAgICAgYXR0clNwYW5FbGVtZW50LmFwcGVuZCgiXCIi KTsKIAotICAgICAgICBmb3IgKGxldCBjaGFuZ2Ugb2YgdGhpcy5fbm9kZVN0YXRlQ2hhbmdlcykg ewotICAgICAgICAgICAgaWYgKGNoYW5nZS50eXBlID09PSBXZWJJbnNwZWN0b3IuRE9NVHJlZUVs ZW1lbnQuQ2hhbmdlVHlwZS5BdHRyaWJ1dGUgJiYgY2hhbmdlLmF0dHJpYnV0ZSA9PT0gbmFtZSkK LSAgICAgICAgICAgICAgICBjaGFuZ2UuZWxlbWVudCA9IGhhc1RleHQgPyBhdHRyVmFsdWVFbGVt ZW50IDogYXR0ck5hbWVFbGVtZW50OworICAgICAgICBmb3IgKGxldCBhdHRyaWJ1dGUgb2YgdGhp cy5fcmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMpIHsKKyAgICAgICAgICAgIGlmIChhdHRyaWJ1 dGUubmFtZSA9PT0gbmFtZSkKKyAgICAgICAgICAgICAgICBhdHRyaWJ1dGUuZWxlbWVudCA9IGhh c1RleHQgPyBhdHRyVmFsdWVFbGVtZW50IDogYXR0ck5hbWVFbGVtZW50OwogICAgICAgICB9CiAg ICAgfQogCkBAIC0xNDk4LDggKzE0OTUsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQg PSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQogCiAg ICAgX21hcmtOb2RlQ2hhbmdlZCgpCiAgICAgewotICAgICAgICBmb3IgKGxldCBjaGFuZ2Ugb2Yg dGhpcy5fbm9kZVN0YXRlQ2hhbmdlcykgewotICAgICAgICAgICAgbGV0IGVsZW1lbnQgPSBjaGFu Z2UuZWxlbWVudDsKKyAgICAgICAgZm9yIChsZXQgYXR0cmlidXRlIG9mIHRoaXMuX3JlY2VudGx5 TW9kaWZpZWRBdHRyaWJ1dGVzKSB7CisgICAgICAgICAgICBsZXQgZWxlbWVudCA9IGF0dHJpYnV0 ZS5lbGVtZW50OwogICAgICAgICAgICAgaWYgKCFlbGVtZW50KQogICAgICAgICAgICAgICAgIGNv bnRpbnVlOwogCkBAIC0xNTE1LDkgKzE1MTIsOSBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1l bnQgPSBjbGFzcyBET01UcmVlRWxlbWVudCBleHRlbmRzIFdlYkluc3BlY3Rvci5UcmVlRWxlbQog ICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoIm5vZGUtc3RhdGUtY2hhbmdlZCIpOwog ICAgICAgICBlbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoImFuaW1hdGlvbmVuZCIsIHRoaXMu X2JvdW5kTm9kZUNoYW5nZWRBbmltYXRpb25FbmQpOwogCi0gICAgICAgIGZvciAobGV0IGkgPSB0 aGlzLl9ub2RlU3RhdGVDaGFuZ2VzLmxlbmd0aCAtIDE7IGkgPj0gMDsgLS1pKSB7Ci0gICAgICAg ICAgICBpZiAodGhpcy5fbm9kZVN0YXRlQ2hhbmdlc1tpXS5lbGVtZW50ID09PSBlbGVtZW50KQot ICAgICAgICAgICAgICAgIHRoaXMuX25vZGVTdGF0ZUNoYW5nZXMuc3BsaWNlKGksIDEpOworICAg ICAgICBmb3IgKGxldCBpID0gdGhpcy5fcmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMubGVuZ3Ro IC0gMTsgaSA+PSAwOyAtLWkpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLl9yZWNlbnRseU1vZGlm aWVkQXR0cmlidXRlc1tpXS5lbGVtZW50ID09PSBlbGVtZW50KQorICAgICAgICAgICAgICAgIHRo aXMuX3JlY2VudGx5TW9kaWZpZWRBdHRyaWJ1dGVzLnNwbGljZShpLCAxKTsKICAgICAgICAgfQog ICAgIH0KIApAQCAtMTUzMyw3ICsxNTMwLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50 ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KICAg ICB7CiAgICAgICAgIHN1cGVyLl9maXJlRGlkQ2hhbmdlKCk7CiAKLSAgICAgICAgaWYgKHRoaXMu X25vZGVTdGF0ZUNoYW5nZXMpCisgICAgICAgIGlmICh0aGlzLl9yZWNlbnRseU1vZGlmaWVkQXR0 cmlidXRlcy5sZW5ndGgpCiAgICAgICAgICAgICB0aGlzLl9tYXJrTm9kZUNoYW5nZWQoKTsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVVcGRhdGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZVVwZGF0ZXIuanMKaW5kZXggNjZmY2IwZmIxOGM1MGZmOGNmODAyZmNj MzljY2YyODE1Y2FkOGRiNi4uMTYwMmZiZTVjYjMzNjQxZGFkYzZhY2M4YmRlNTVhM2UyMzc1Yjg1 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZVVwZGF0ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZVVwZGF0ZXIuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDA3LCAyMDA4LCAyMDEzIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIwMTMsIDIwMTYgQXBwbGUgSW5jLiAgQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBNYXR0IExpbGVrIDx3ZWJr aXRAbWF0dGxpbGVrLmNvbT4KICAqIENvcHlyaWdodCAoQykgMjAwOSBKb3NlcGggUGVjb3Jhcm8K ICAqCkBAIC0zOSw3ICszOSwxNSBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZVVwZGF0ZXIgPSBmdW5j dGlvbih0cmVlT3V0bGluZSkKICAgICBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuQ2hpbGROb2RlQ291 bnRVcGRhdGVkLCB0aGlzLl9jaGlsZE5vZGVDb3VudFVwZGF0ZWQsIHRoaXMpOwogCiAgICAgdGhp cy5fdHJlZU91dGxpbmUgPSB0cmVlT3V0bGluZTsKLSAgICB0aGlzLl9yZWNlbnRseU1vZGlmaWVk Tm9kZXMgPSBbXTsKKworICAgIHRoaXMuX3JlY2VudGx5SW5zZXJ0ZWROb2RlcyA9IG5ldyBNYXA7 CisgICAgdGhpcy5fcmVjZW50bHlEZWxldGVkTm9kZXMgPSBuZXcgTWFwOworICAgIHRoaXMuX3Jl Y2VudGx5TW9kaWZpZWROb2RlcyA9IG5ldyBTZXQ7CisgICAgLy8gTWFwIGZyb20gYXR0cmlidXRl IG5hbWVzIHRvIG5vZGVzIHRoYXQgaGFkIHRoZSBhdHRyaWJ1dGVzLgorICAgIHRoaXMuX3JlY2Vu dGx5TW9kaWZpZWRBdHRyaWJ1dGVzID0gbmV3IE1hcDsKKworICAgIC8vIER1bW15ICJhdHRyaWJ1 dGUiIHRoYXQgaXMgdXNlZCB0byB0cmFjayB0ZXh0Q29udGVudCBjaGFuZ2VzLgorICAgIHRoaXMu X3RleHRDb250ZW50QXR0cmlidXRlU3ltYm9sID0gU3ltYm9sKCJ0ZXh0LWNvbnRlbnQtYXR0cmli dXRlIik7CiB9OwogCiBXZWJJbnNwZWN0b3IuRE9NVHJlZVVwZGF0ZXIucHJvdG90eXBlID0gewpA QCAtNTUsODMgKzYzLDk2IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlVXBkYXRlci5wcm90b3R5cGUg PSB7CiAKICAgICBfYXR0cmlidXRlc1VwZGF0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAg ICAgICAgdGhpcy5fcmVjZW50bHlNb2RpZmllZE5vZGVzLnB1c2goe25vZGU6IGV2ZW50LmRhdGEu bm9kZSwgdXBkYXRlZDogdHJ1ZSwgYXR0cmlidXRlOiBldmVudC5kYXRhLm5hbWV9KTsKLSAgICAg ICAgaWYgKHRoaXMuX3RyZWVPdXRsaW5lLl92aXNpYmxlKQotICAgICAgICAgICAgdGhpcy5vbk5l eHRGcmFtZS5fdXBkYXRlTW9kaWZpZWROb2RlcygpOworICAgICAgICBsZXQge25vZGUsIG5hbWV9 ID0gZXZlbnQuZGF0YTsKKyAgICAgICAgdGhpcy5fbm9kZUF0dHJpYnV0ZU1vZGlmaWVkKG5vZGUs IG5hbWUpOwogICAgIH0sCiAKICAgICBfY2hhcmFjdGVyRGF0YU1vZGlmaWVkOiBmdW5jdGlvbihl dmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3JlY2VudGx5TW9kaWZpZWROb2Rlcy5wdXNoKHtu b2RlOiBldmVudC5kYXRhLm5vZGUsIHVwZGF0ZWQ6IHRydWV9KTsKKyAgICAgICAgbGV0IHtub2Rl fSA9IGV2ZW50LmRhdGE7CisgICAgICAgIHRoaXMuX25vZGVBdHRyaWJ1dGVNb2RpZmllZChub2Rl LCB0aGlzLl90ZXh0Q29udGVudEF0dHJpYnV0ZVN5bWJvbCk7CisgICAgfSwKKworICAgIF9ub2Rl QXR0cmlidXRlTW9kaWZpZWQ6IGZ1bmN0aW9uKG5vZGUsIGF0dHJpYnV0ZSkKKyAgICB7CisgICAg ICAgIGlmICghdGhpcy5fcmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMuaGFzKGF0dHJpYnV0ZSkp CisgICAgICAgICAgICB0aGlzLl9yZWNlbnRseU1vZGlmaWVkQXR0cmlidXRlcy5zZXQoYXR0cmli dXRlLCBuZXcgU2V0KTsKKyAgICAgICAgdGhpcy5fcmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMu Z2V0KGF0dHJpYnV0ZSkuYWRkKG5vZGUpOworICAgICAgICB0aGlzLl9yZWNlbnRseU1vZGlmaWVk Tm9kZXMuYWRkKG5vZGUpOworCiAgICAgICAgIGlmICh0aGlzLl90cmVlT3V0bGluZS5fdmlzaWJs ZSkKICAgICAgICAgICAgIHRoaXMub25OZXh0RnJhbWUuX3VwZGF0ZU1vZGlmaWVkTm9kZXMoKTsK ICAgICB9LAogCiAgICAgX25vZGVJbnNlcnRlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAg ICAgICB0aGlzLl9yZWNlbnRseU1vZGlmaWVkTm9kZXMucHVzaCh7bm9kZTogZXZlbnQuZGF0YS5u b2RlLCBwYXJlbnQ6IGV2ZW50LmRhdGEucGFyZW50LCBpbnNlcnRlZDogdHJ1ZX0pOworICAgICAg ICB0aGlzLl9yZWNlbnRseUluc2VydGVkTm9kZXMuc2V0KGV2ZW50LmRhdGEubm9kZSwge3BhcmVu dDogZXZlbnQuZGF0YS5wYXJlbnR9KTsKICAgICAgICAgaWYgKHRoaXMuX3RyZWVPdXRsaW5lLl92 aXNpYmxlKQogICAgICAgICAgICAgdGhpcy5vbk5leHRGcmFtZS5fdXBkYXRlTW9kaWZpZWROb2Rl cygpOwogICAgIH0sCiAKICAgICBfbm9kZVJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsK LSAgICAgICAgdGhpcy5fcmVjZW50bHlNb2RpZmllZE5vZGVzLnB1c2goe25vZGU6IGV2ZW50LmRh dGEubm9kZSwgcGFyZW50OiBldmVudC5kYXRhLnBhcmVudCwgcmVtb3ZlZDogdHJ1ZX0pOworICAg ICAgICB0aGlzLl9yZWNlbnRseURlbGV0ZWROb2Rlcy5zZXQoZXZlbnQuZGF0YS5ub2RlLCB7cGFy ZW50OiBldmVudC5kYXRhLnBhcmVudH0pOwogICAgICAgICBpZiAodGhpcy5fdHJlZU91dGxpbmUu X3Zpc2libGUpCiAgICAgICAgICAgICB0aGlzLm9uTmV4dEZyYW1lLl91cGRhdGVNb2RpZmllZE5v ZGVzKCk7CiAgICAgfSwKIAogICAgIF9jaGlsZE5vZGVDb3VudFVwZGF0ZWQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5fdHJlZU91dGxpbmUu ZmluZFRyZWVFbGVtZW50KGV2ZW50LmRhdGEpOworICAgICAgICBsZXQgdHJlZUVsZW1lbnQgPSB0 aGlzLl90cmVlT3V0bGluZS5maW5kVHJlZUVsZW1lbnQoZXZlbnQuZGF0YSk7CiAgICAgICAgIGlm ICh0cmVlRWxlbWVudCkKICAgICAgICAgICAgIHRyZWVFbGVtZW50Lmhhc0NoaWxkcmVuID0gZXZl bnQuZGF0YS5oYXNDaGlsZE5vZGVzKCk7CiAgICAgfSwKIAogICAgIF91cGRhdGVNb2RpZmllZE5v ZGVzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl91cGRhdGVNb2RpZmllZE5vZGVz LmNhbmNlbERlYm91bmNlKCk7Ci0KLSAgICAgICAgbGV0IHVwZGF0ZWRQYXJlbnRUcmVlRWxlbWVu dHMgPSBbXTsKLSAgICAgICAgZm9yIChsZXQgcmVjZW50bHlNb2RpZmllZE5vZGUgb2YgdGhpcy5f cmVjZW50bHlNb2RpZmllZE5vZGVzKSB7Ci0gICAgICAgICAgICBsZXQgcGFyZW50ID0gcmVjZW50 bHlNb2RpZmllZE5vZGUucGFyZW50OwotICAgICAgICAgICAgbGV0IG5vZGUgPSByZWNlbnRseU1v ZGlmaWVkTm9kZS5ub2RlOwotICAgICAgICAgICAgbGV0IGNoYW5nZUluZm8gPSBudWxsOwotICAg ICAgICAgICAgaWYgKHJlY2VudGx5TW9kaWZpZWROb2RlLmF0dHJpYnV0ZSkKLSAgICAgICAgICAg ICAgICBjaGFuZ2VJbmZvID0ge3R5cGU6IFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5DaGFu Z2VUeXBlLkF0dHJpYnV0ZSwgYXR0cmlidXRlOiByZWNlbnRseU1vZGlmaWVkTm9kZS5hdHRyaWJ1 dGV9OwotCi0gICAgICAgICAgICBpZiAocmVjZW50bHlNb2RpZmllZE5vZGUudXBkYXRlZCkgewot ICAgICAgICAgICAgICAgIGxldCBub2RlVHJlZUVsZW1lbnQgPSB0aGlzLl90cmVlT3V0bGluZS5m aW5kVHJlZUVsZW1lbnQobm9kZSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFub2RlVHJlZUVsZW1l bnQpCisgICAgICAgIGZvciAobGV0IG5vZGUgb2YgdGhpcy5fcmVjZW50bHlNb2RpZmllZE5vZGVz LnZhbHVlcygpKSB7CisgICAgICAgICAgICBsZXQgbm9kZVRyZWVFbGVtZW50ID0gdGhpcy5fdHJl ZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KG5vZGUpOworICAgICAgICAgICAgaWYgKCFub2RlVHJl ZUVsZW1lbnQpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBmb3IgKGxl dCBbYXR0cmlidXRlLCBub2Rlc10gb2YgdGhpcy5fcmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMu ZW50cmllcygpKSB7CisgICAgICAgICAgICAgICAgLy8gRG9uJ3QgcmVwb3J0IHRleHRDb250ZW50 IGNoYW5nZXMgYXMgYXR0cmlidXRlIG1vZGlmaWNhdGlvbnMuCisgICAgICAgICAgICAgICAgaWYg KGF0dHJpYnV0ZSA9PT0gdGhpcy5fdGV4dENvbnRlbnRBdHRyaWJ1dGVTeW1ib2wpCiAgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICAgICAgaWYgKGNoYW5nZUluZm8p Ci0gICAgICAgICAgICAgICAgICAgIG5vZGVUcmVlRWxlbWVudC5ub2RlU3RhdGVDaGFuZ2VkKGNo YW5nZUluZm8pOwotCi0gICAgICAgICAgICAgICAgbm9kZVRyZWVFbGVtZW50LnVwZGF0ZVRpdGxl KCk7CisgICAgICAgICAgICAgICAgaWYgKG5vZGVzLmhhcyhub2RlKSkKKyAgICAgICAgICAgICAg ICAgICAgbm9kZVRyZWVFbGVtZW50LmF0dHJpYnV0ZURpZENoYW5nZShhdHRyaWJ1dGUpOwogICAg ICAgICAgICAgfQogCi0gICAgICAgICAgICBpZiAoIXBhcmVudCkKLSAgICAgICAgICAgICAgICBj b250aW51ZTsKLQotICAgICAgICAgICAgbGV0IHBhcmVudE5vZGVJdGVtID0gdGhpcy5fdHJlZU91 dGxpbmUuZmluZFRyZWVFbGVtZW50KHBhcmVudCk7Ci0gICAgICAgICAgICBpZiAocGFyZW50Tm9k ZUl0ZW0gJiYgIXBhcmVudE5vZGVJdGVtLmFscmVhZHlVcGRhdGVkQ2hpbGRyZW4pIHsKLSAgICAg ICAgICAgICAgICBwYXJlbnROb2RlSXRlbS51cGRhdGVUaXRsZSgpOwotICAgICAgICAgICAgICAg IHBhcmVudE5vZGVJdGVtLnVwZGF0ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAgICAgICAgcGFyZW50 Tm9kZUl0ZW0uYWxyZWFkeVVwZGF0ZWRDaGlsZHJlbiA9IHRydWU7Ci0gICAgICAgICAgICAgICAg dXBkYXRlZFBhcmVudFRyZWVFbGVtZW50cy5wdXNoKHBhcmVudE5vZGVJdGVtKTsKLSAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIG5vZGVUcmVlRWxlbWVudC51cGRhdGVUaXRsZSgpOwogICAgICAg ICB9CiAKLSAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCB1cGRhdGVkUGFyZW50VHJlZUVsZW1l bnRzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgdXBkYXRlZFBhcmVudFRyZWVFbGVtZW50c1tp XS5hbHJlYWR5VXBkYXRlZENoaWxkcmVuID0gbnVsbDsKKyAgICAgICAgbGV0IHBhcmVudEVsZW1l bnRzVG9VcGRhdGUgPSBuZXcgU2V0KCk7CisgICAgICAgIGxldCBtYXJrTm9kZVBhcmVudEZvclVw ZGF0ZSA9ICh2YWx1ZSwga2V5LCBtYXApID0+IHsKKyAgICAgICAgICAgIGxldCBwYXJlbnROb2Rl ID0gdmFsdWUucGFyZW50OworICAgICAgICAgICAgbGV0IHBhcmVudFRyZWVFbGVtZW50ID0gdGhp cy5fdHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KHBhcmVudE5vZGUpOworICAgICAgICAgICAg aWYgKHBhcmVudFRyZWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHBhcmVudEVsZW1lbnRzVG9V cGRhdGUuYWRkKHBhcmVudFRyZWVFbGVtZW50KTsKKyAgICAgICAgfTsKKyAgICAgICAgdGhpcy5f cmVjZW50bHlJbnNlcnRlZE5vZGVzLmZvckVhY2gobWFya05vZGVQYXJlbnRGb3JVcGRhdGUpOwor ICAgICAgICB0aGlzLl9yZWNlbnRseURlbGV0ZWROb2Rlcy5mb3JFYWNoKG1hcmtOb2RlUGFyZW50 Rm9yVXBkYXRlKTsKKworICAgICAgICBmb3IgKGxldCBwYXJlbnRUcmVlRWxlbWVudCBvZiBwYXJl bnRFbGVtZW50c1RvVXBkYXRlKSB7CisgICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudC51cGRh dGVUaXRsZSgpOworICAgICAgICAgICAgLy8gRklYTUU6IGlzIHRoaXMgYWN0dWFsbHkgbmVlZGVk IGlmIHRoZSBjaGlsZCBlbGVtZW50IGlzIHJlbW92ZWQ/CisgICAgICAgICAgICBwYXJlbnRUcmVl RWxlbWVudC51cGRhdGVDaGlsZHJlbigpOworICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fcmVj ZW50bHlNb2RpZmllZE5vZGVzID0gW107CisgICAgICAgIHRoaXMuX3JlY2VudGx5SW5zZXJ0ZWRO b2Rlcy5jbGVhcigpOworICAgICAgICB0aGlzLl9yZWNlbnRseURlbGV0ZWROb2Rlcy5jbGVhcigp OworICAgICAgICB0aGlzLl9yZWNlbnRseU1vZGlmaWVkTm9kZXMuY2xlYXIoKTsKKyAgICAgICAg dGhpcy5fcmVjZW50bHlNb2RpZmllZEF0dHJpYnV0ZXMuY2xlYXIoKTsKICAgICB9LAogCiAgICAg X3Jlc2V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuZG9tVHJlZU1h bmFnZXIuaGlkZURPTU5vZGVIaWdobGlnaHQoKTsKLSAgICAgICAgdGhpcy5fcmVjZW50bHlNb2Rp ZmllZE5vZGVzID0gW107CisKKyAgICAgICAgdGhpcy5fcmVjZW50bHlJbnNlcnRlZE5vZGVzLmNs ZWFyKCk7CisgICAgICAgIHRoaXMuX3JlY2VudGx5RGVsZXRlZE5vZGVzLmNsZWFyKCk7CisgICAg ICAgIHRoaXMuX3JlY2VudGx5TW9kaWZpZWROb2Rlcy5jbGVhcigpOworICAgICAgICB0aGlzLl9y ZWNlbnRseU1vZGlmaWVkQXR0cmlidXRlcy5jbGVhcigpOwogICAgIH0KIH07Cg==