20162 2008-07-24 11:07:10 -0700 Web Inspector does not update the DOM tree when attributes change 2010-01-13 19:49:51 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 8191 1 timothy knorton dieter emacemac7 farukates knorton rik timothy oldest_to_newest 86868 0 timothy 2008-07-24 11:07:10 -0700 With the fix for bug 6590 we now update the DOM tree for element insertion and removal. But attributes changes do not update in the inspector. This is blocked by bug 8191. 117241 1 timothy 2009-04-11 18:29:34 -0700 *** Bug 25103 has been marked as a duplicate of this bug. *** 180502 2 46534 knorton 2010-01-13 18:44:50 -0800 Created attachment 46534 Uses the new direct callbacks from WebCore I don't see any significant change in dromaeo runs with this change: With Change: http://dromaeo.com/?id=85714 http://dromaeo.com/?id=85717 Without Change: http://dromaeo.com/?id=85721 http://dromaeo.com/?id=85722 180515 3 46534 timothy 2010-01-13 19:26:57 -0800 Comment on attachment 46534 Uses the new direct callbacks from WebCore > + var event = { target : node }; This should be: {target: node} > + _attributesUpdated : function(event) There should be no space before the ":". 180523 4 knorton 2010-01-13 19:49:51 -0800 http://trac.webkit.org/changeset/53232 46534 2010-01-13 18:44:50 -0800 2010-01-13 19:26:57 -0800 Uses the new direct callbacks from WebCore Issue20162.diff text/plain 9300 knorton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDM3NTU2Yi4uNWJhMDM2MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMC0wMS0xMyAgS2VsbHkgTm9ydG9u ICA8a25vcnRvbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3IgZG9lcyBub3QgdXBkYXRlIHRoZSBET00gdHJl ZSB3aGVuIGF0dHJpYnV0ZXMgY2hhbmdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNjIKKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDogTW92 ZXMgY2FsbGJhY2tzIHRvIEluc3BlY3RvckNvbnRyb2xsZXIgZGlyZWN0bHkgaW50byBzZXRBdHRy aWJ1dGUKKyAgICAgICAgYW5kIHJlbW92ZUF0dHJpYnV0ZSBhbmQgcmVtb3ZlcyB0aGUgZXhpc3Rp bmcgY2FsbCBzaXRlcy4gVGhpcyBtYWtlcyBpdCBwb3NzaWJsZSB0bworICAgICAgICBzZWUgYXR0 cmlidXRlIG1vZGlmaWNhdGlvbnMuCisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzZXRBdHRy aWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6ZGlzcGF0Y2hBdHRyUmVtb3ZhbEV2 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmRpc3BhdGNoQXR0ckFkZGl0aW9uRXZl bnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6cmVtb3ZlQXR0cmlidXRlKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTU5vZGUucHJvdG90eXBlLl9zZXRBdHRyaWJ1dGVzUGF5bG9hZCk6IENsZWFyIGV4aXN0 aW5nIGF0dHJpYnV0ZXMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBl Ll9kaWRBcHBseURvbUNoYW5nZSk6IFVwZGF0ZWQgY2FsbCBzaXRlIGFuZCBmaXhlZCBzdHlsZS4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUuX2F0dHJpYnV0ZXNVcGRh dGVkKTogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLl9hdHRy aWJ1dGVzVXBkYXRlZCk6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFu ZWwucHJvdG90eXBlLnVwZGF0ZU1vZGlmaWVkTm9kZXMpOiBVcGRhdGVkIGNhbGwgc2l0ZS4KKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6IFJlbmFt ZWQgX3VwZGF0ZVRpdGxlIHRvIHVwZGF0ZVRpdGxlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoKTogVXBkYXRlZCB1cGRhdGVUaXRs ZSBjYWxsIHNpdGUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5w cm90b3R5cGUuX3RleHROb2RlRWRpdGluZ0NvbW1pdHRlZCk6IERpdHRvLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlLl9lZGl0aW5nQ2FuY2VsbGVk KTogRGl0dG8uCisKIDIwMTAtMDEtMTIgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxl LmNvbT4KIAogICAgICAgICBNU0FBOiBzZWxlY3RlZCwgc2VsZWN0YWJsZSwgZXh0ZW5kZWQgc2Vs ZWN0YWJsZSwgYW5kIG11bHRpcGxlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9FbGVtZW50LmNw cCBiL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IGMzYjE1ZjUuLjYyZjhkNGMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCkBAIC01MzUsNyArNTM1LDcgQEAgdm9pZCBFbGVtZW50OjpzZXRBdHRyaWJ1dGUoY29uc3Qg QXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlLAogCiAgICAgaWYg KGxvY2FsTmFtZSA9PSBpZEF0dHJpYnV0ZU5hbWUoKS5sb2NhbE5hbWUoKSkKICAgICAgICAgdXBk YXRlSWQob2xkID8gb2xkLT52YWx1ZSgpIDogbnVsbEF0b20sIHZhbHVlKTsKLSAgICAKKwogICAg IGlmIChvbGQgJiYgdmFsdWUuaXNOdWxsKCkpCiAgICAgICAgIG5hbWVkQXR0ck1hcC0+cmVtb3Zl QXR0cmlidXRlKG9sZC0+bmFtZSgpKTsKICAgICBlbHNlIGlmICghb2xkICYmICF2YWx1ZS5pc051 bGwoKSkKQEAgLTU0NCw2ICs1NDQsMTMgQEAgdm9pZCBFbGVtZW50OjpzZXRBdHRyaWJ1dGUoY29u c3QgQXRvbWljU3RyaW5nJiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlLAogICAgICAg ICBvbGQtPnNldFZhbHVlKHZhbHVlKTsKICAgICAgICAgYXR0cmlidXRlQ2hhbmdlZChvbGQpOwog ICAgIH0KKworI2lmIEVOQUJMRShJTlNQRUNUT1IpCisgICAgaWYgKFBhZ2UqIHBhZ2UgPSBkb2N1 bWVudCgpLT5wYWdlKCkpIHsKKyAgICAgICAgaWYgKEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3Bl Y3RvckNvbnRyb2xsZXIgPSBwYWdlLT5pbnNwZWN0b3JDb250cm9sbGVyKCkpCisgICAgICAgICAg ICBpbnNwZWN0b3JDb250cm9sbGVyLT5kaWRNb2RpZnlET01BdHRyKHRoaXMpOworICAgIH0KKyNl bmRpZgogfQogCiB2b2lkIEVsZW1lbnQ6OnNldEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1l JiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlLCBFeGNlcHRpb25Db2RlJikKQEAgLTU1 NSw3ICs1NjIsNyBAQCB2b2lkIEVsZW1lbnQ6OnNldEF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWRO YW1lJiBuYW1lLCBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlLAogCiAgICAgaWYgKG5hbWUgPT0g aWRBdHRyaWJ1dGVOYW1lKCkpCiAgICAgICAgIHVwZGF0ZUlkKG9sZCA/IG9sZC0+dmFsdWUoKSA6 IG51bGxBdG9tLCB2YWx1ZSk7Ci0gICAgCisKICAgICBpZiAob2xkICYmIHZhbHVlLmlzTnVsbCgp KQogICAgICAgICBuYW1lZEF0dHJNYXAtPnJlbW92ZUF0dHJpYnV0ZShuYW1lKTsKICAgICBlbHNl IGlmICghb2xkICYmICF2YWx1ZS5pc051bGwoKSkKQEAgLTU2NCw2ICs1NzEsMTMgQEAgdm9pZCBF bGVtZW50OjpzZXRBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgbmFtZSwgY29uc3QgQXRv bWljU3RyaW5nJiB2YWx1ZSwKICAgICAgICAgb2xkLT5zZXRWYWx1ZSh2YWx1ZSk7CiAgICAgICAg IGF0dHJpYnV0ZUNoYW5nZWQob2xkKTsKICAgICB9CisKKyNpZiBFTkFCTEUoSU5TUEVDVE9SKQor ICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQoKS0+cGFnZSgpKSB7CisgICAgICAgIGlmIChJ bnNwZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVyID0gcGFnZS0+aW5zcGVjdG9y Q29udHJvbGxlcigpKQorICAgICAgICAgICAgaW5zcGVjdG9yQ29udHJvbGxlci0+ZGlkTW9kaWZ5 RE9NQXR0cih0aGlzKTsKKyAgICB9CisjZW5kaWYKIH0KIAogUGFzc1JlZlB0cjxBdHRyaWJ1dGU+ IEVsZW1lbnQ6OmNyZWF0ZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25z dCBBdG9taWNTdHJpbmcmIHZhbHVlKQpAQCAtMTAwNywxMyArMTAyMSw2IEBAIHZvaWQgRWxlbWVu dDo6ZGlzcGF0Y2hBdHRyUmVtb3ZhbEV2ZW50KEF0dHJpYnV0ZSopCiB7CiAgICAgQVNTRVJUKCFl dmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOwogCi0jaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCktPnBhZ2UoKSkgewotICAgICAgaWYgKEluc3BlY3Rv ckNvbnRyb2xsZXIqIGluc3BlY3RvckNvbnRyb2xsZXIgPSBwYWdlLT5pbnNwZWN0b3JDb250cm9s bGVyKCkpCi0gICAgICAgICAgaW5zcGVjdG9yQ29udHJvbGxlci0+ZGlkTW9kaWZ5RE9NQXR0cih0 aGlzKTsKLSAgICB9Ci0jZW5kaWYKLQogI2lmIDAKICAgICBpZiAoIWRvY3VtZW50KCktPmhhc0xp c3RlbmVyVHlwZShEb2N1bWVudDo6RE9NQVRUUk1PRElGSUVEX0xJU1RFTkVSKSkKICAgICAgICAg cmV0dXJuOwpAQCAtMTAyNywxMyArMTAzNCw2IEBAIHZvaWQgRWxlbWVudDo6ZGlzcGF0Y2hBdHRy QWRkaXRpb25FdmVudChBdHRyaWJ1dGUqKQogewogICAgIEFTU0VSVCghZXZlbnREaXNwYXRjaEZv cmJpZGRlbigpKTsKIAotI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKFBhZ2UqIHBhZ2Ug PSBkb2N1bWVudCgpLT5wYWdlKCkpIHsKLSAgICAgIGlmIChJbnNwZWN0b3JDb250cm9sbGVyKiBp bnNwZWN0b3JDb250cm9sbGVyID0gcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpKQotICAgICAg ICAgIGluc3BlY3RvckNvbnRyb2xsZXItPmRpZE1vZGlmeURPTUF0dHIodGhpcyk7Ci0gICAgfQot I2VuZGlmCi0KICNpZiAwCiAgICAgaWYgKCFkb2N1bWVudCgpLT5oYXNMaXN0ZW5lclR5cGUoRG9j dW1lbnQ6OkRPTUFUVFJNT0RJRklFRF9MSVNURU5FUikpCiAgICAgICAgIHJldHVybjsKQEAgLTEx NzMsNiArMTE3MywxNCBAQCB2b2lkIEVsZW1lbnQ6OnJlbW92ZUF0dHJpYnV0ZShjb25zdCBTdHJp bmcmIG5hbWUsIEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgICAgICBpZiAoZWMgPT0gTk9UX0ZPVU5E X0VSUikKICAgICAgICAgICAgIGVjID0gMDsKICAgICB9CisgICAgCisjaWYgRU5BQkxFKElOU1BF Q1RPUikKKyAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCktPnBhZ2UoKSkgeworICAgICAg ICBpZiAoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxlciA9IHBhZ2UtPmlu c3BlY3RvckNvbnRyb2xsZXIoKSkKKyAgICAgICAgICAgIGluc3BlY3RvckNvbnRyb2xsZXItPmRp ZE1vZGlmeURPTUF0dHIodGhpcyk7CisgICAgfQorI2VuZGlmCisgICAgCiB9CiAKIHZvaWQgRWxl bWVudDo6cmVtb3ZlQXR0cmlidXRlTlMoY29uc3QgU3RyaW5nJiBuYW1lc3BhY2VVUkksIGNvbnN0 IFN0cmluZyYgbG9jYWxOYW1lLCBFeGNlcHRpb25Db2RlJiBlYykKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9ET01BZ2VudC5qcwppbmRleCA0ODBhNDNlLi43NGE5MDM2IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMKKysrIGIvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzCkBAIC0xNDAsNiArMTQwLDggQEAgV2ViSW5zcGVj dG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogCiAgICAgX3NldEF0dHJpYnV0ZXNQYXlsb2FkOiBm dW5jdGlvbihhdHRycykKICAgICB7CisgICAgICAgIHRoaXMuYXR0cmlidXRlcyA9IFtdOworICAg ICAgICB0aGlzLl9hdHRyaWJ1dGVzTWFwID0ge307CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgYXR0cnMubGVuZ3RoOyBpICs9IDIpCiAgICAgICAgICAgICB0aGlzLl9hZGRBdHRyaWJ1dGUo YXR0cnNbaV0sIGF0dHJzW2kgKyAxXSk7CiAgICAgfSwKQEAgLTM2MywxNSArMzY1LDE2IEBAIFdl Ykluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNhbGxiYWNrKCk7CiAg ICAgICAgIC8vIFRPRE8ocGZlbGRtYW4pOiBGaXggdGhpcyBoYWNrLgogICAgICAgICB2YXIgZWxl bSA9IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMudHJlZU91dGxpbmUuZmluZFRyZWVFbGVt ZW50KG5vZGUpOwotICAgICAgICBpZiAoZWxlbSkgewotICAgICAgICAgICAgZWxlbS5fdXBkYXRl VGl0bGUoKTsKLSAgICAgICAgfQorICAgICAgICBpZiAoZWxlbSkKKyAgICAgICAgICAgIGVsZW0u dXBkYXRlVGl0bGUoKTsKICAgICB9LAogCiAgICAgX2F0dHJpYnV0ZXNVcGRhdGVkOiBmdW5jdGlv bihub2RlSWQsIGF0dHJzQXJyYXkpCiAgICAgewogICAgICAgICB2YXIgbm9kZSA9IHRoaXMuX2lk VG9ET01Ob2RlW25vZGVJZF07CiAgICAgICAgIG5vZGUuX3NldEF0dHJpYnV0ZXNQYXlsb2FkKGF0 dHJzQXJyYXkpOworICAgICAgICB2YXIgZXZlbnQgPSB7IHRhcmdldCA6IG5vZGUgfTsKKyAgICAg ICAgdGhpcy5kb2N1bWVudC5fZmlyZURvbUV2ZW50KCJET01BdHRyTW9kaWZpZWQiLCBldmVudCk7 CiAgICAgfSwKIAogICAgIG5vZGVGb3JJZDogZnVuY3Rpb24obm9kZUlkKSB7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5qcyBiL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IGE4ZTcyY2EuLmQ4ZGQ3 NjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVs LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBA IC0yMDUsNiArMjA1LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0g ewogCiAgICAgICAgIGluc3BlY3RlZFJvb3REb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJET01O b2RlSW5zZXJ0ZWQiLCB0aGlzLl9ub2RlSW5zZXJ0ZWQuYmluZCh0aGlzKSk7CiAgICAgICAgIGlu c3BlY3RlZFJvb3REb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJET01Ob2RlUmVtb3ZlZCIsIHRo aXMuX25vZGVSZW1vdmVkLmJpbmQodGhpcykpOworICAgICAgICBpbnNwZWN0ZWRSb290RG9jdW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigiRE9NQXR0ck1vZGlmaWVkIiwgdGhpcy5fYXR0cmlidXRlc1Vw ZGF0ZWQuYmluZCh0aGlzKSk7CiAKICAgICAgICAgdGhpcy50cmVlT3V0bGluZS5zdXBwcmVzc1Nl bGVjdEhpZ2hsaWdodCA9IHRydWU7CiAgICAgICAgIHRoaXMucm9vdERPTU5vZGUgPSBpbnNwZWN0 ZWRSb290RG9jdW1lbnQ7CkBAIC00NzcsNiArNDc4LDEzIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50 c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy50cmVlT3V0bGluZS5mb2N1c2VkRE9N Tm9kZSA9IHg7CiAgICAgfSwKIAorICAgIF9hdHRyaWJ1dGVzVXBkYXRlZCA6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5yZWNlbnRseU1vZGlmaWVkTm9kZXMucHVzaCh7bm9k ZTogZXZlbnQudGFyZ2V0LCB1cGRhdGVkOiB0cnVlfSk7CisgICAgICAgIGlmICh0aGlzLnZpc2li bGUpCisgICAgICAgICAgICB0aGlzLl91cGRhdGVNb2RpZmllZE5vZGVzU29vbigpOworICAgIH0s CisKICAgICBfbm9kZUluc2VydGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHRo aXMucmVjZW50bHlNb2RpZmllZE5vZGVzLnB1c2goe25vZGU6IGV2ZW50LnRhcmdldCwgcGFyZW50 OiBldmVudC5yZWxhdGVkTm9kZSwgaW5zZXJ0ZWQ6IHRydWV9KTsKQEAgLTUxMSw2ICs1MTksMTQg QEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IHRoaXMucmVjZW50bHlNb2RpZmllZE5vZGVzLmxlbmd0aDsgKytpKSB7 CiAgICAgICAgICAgICB2YXIgcmVwbGFjZWQgPSB0aGlzLnJlY2VudGx5TW9kaWZpZWROb2Rlc1tp XS5yZXBsYWNlZDsKICAgICAgICAgICAgIHZhciBwYXJlbnQgPSB0aGlzLnJlY2VudGx5TW9kaWZp ZWROb2Rlc1tpXS5wYXJlbnQ7CisgICAgICAgICAgICB2YXIgbm9kZSA9IHRoaXMucmVjZW50bHlN b2RpZmllZE5vZGVzW2ldLm5vZGU7CisKKyAgICAgICAgICAgIGlmICh0aGlzLnJlY2VudGx5TW9k aWZpZWROb2Rlc1tpXS51cGRhdGVkKSB7CisgICAgICAgICAgICAgICAgdmFyIG5vZGVJdGVtID0g dGhpcy50cmVlT3V0bGluZS5maW5kVHJlZUVsZW1lbnQobm9kZSk7CisgICAgICAgICAgICAgICAg bm9kZUl0ZW0udXBkYXRlVGl0bGUoKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKCFwYXJlbnQpCiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggMTJjZDFhYS4uZGZlZDdmZiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKQEAg LTM5NCw3ICszOTQsNyBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJo b3ZlcmVkIik7CiAgICAgICAgIH0KIAotICAgICAgICB0aGlzLl91cGRhdGVUaXRsZSgpOworICAg ICAgICB0aGlzLnVwZGF0ZVRpdGxlKCk7CiAKICAgICAgICAgdGhpcy5fcHJldmVudEZvbGxvd2lu Z0xpbmtzT25Eb3VibGVDbGljaygpOwogICAgIH0sCkBAIC04NTgsNyArODU4LDcgQEAgV2ViSW5z cGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0ZXh0Tm9k ZS5ub2RlVmFsdWUgPSBuZXdUZXh0OwogCiAgICAgICAgIC8vIE5lZWQgdG8gcmVzdG9yZSBhdHRy aWJ1dGVzIC8gbm9kZSBzdHJ1Y3R1cmUuCi0gICAgICAgIHRoaXMuX3VwZGF0ZVRpdGxlKCk7Cisg ICAgICAgIHRoaXMudXBkYXRlVGl0bGUoKTsKICAgICB9LAogCiAgICAgX2VkaXRpbmdDYW5jZWxs ZWQ6IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbnRleHQpCkBAIC04NjYsMTMgKzg2NiwxMyBAQCBXZWJJ bnNwZWN0b3IuRWxlbWVudHNUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRlbGV0 ZSB0aGlzLl9lZGl0aW5nOwogCiAgICAgICAgIC8vIE5lZWQgdG8gcmVzdG9yZSBhdHRyaWJ1dGVz IHN0cnVjdHVyZS4KLSAgICAgICAgdGhpcy5fdXBkYXRlVGl0bGUoKTsKKyAgICAgICAgdGhpcy51 cGRhdGVUaXRsZSgpOwogICAgIH0sCiAKLSAgICBfdXBkYXRlVGl0bGU6IGZ1bmN0aW9uKCkKKyAg ICB1cGRhdGVUaXRsZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgLy8gSWYgd2UgYXJlIGVk aXRpbmcsIHJldHVybiBlYXJseSB0byBwcmV2ZW50IGNhbmNlbGluZyB0aGUgZWRpdC4KLSAgICAg ICAgLy8gQWZ0ZXIgZWRpdGluZyBpcyBjb21taXR0ZWQgX3VwZGF0ZVRpdGxlIHdpbGwgYmUgY2Fs bGVkLgorICAgICAgICAvLyBBZnRlciBlZGl0aW5nIGlzIGNvbW1pdHRlZCB1cGRhdGVUaXRsZSB3 aWxsIGJlIGNhbGxlZC4KICAgICAgICAgaWYgKHRoaXMuX2VkaXRpbmcpCiAgICAgICAgICAgICBy ZXR1cm47CiAK