148821 2015-09-04 13:47:01 -0700 Web Inspector: Clean up and modernize DOMTreeManager 2015-09-04 14:07:48 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1123591 0 joepeck 2015-09-04 13:47:01 -0700 Clean up and modernize DOMTreeManager. There are some ugly blocks. Clean it up a bit, update some loops, avoid delete, use default arguments in places where it makes sense, improve return values. 1123594 1 260612 joepeck 2015-09-04 13:47:58 -0700 Created attachment 260612 [PATCH] Proposed Fix 1123619 2 260612 commit-queue 2015-09-04 14:07:44 -0700 Comment on attachment 260612 [PATCH] Proposed Fix Clearing flags on attachment: 260612 Committed r189385: <http://trac.webkit.org/changeset/189385> 1123620 3 commit-queue 2015-09-04 14:07:48 -0700 All reviewed patches have been landed. Closing bug. 260612 2015-09-04 13:47:58 -0700 2015-09-04 14:07:44 -0700 [PATCH] Proposed Fix cleanup.patch text/plain 8292 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGUzMzA2MzcuLjFiNGVkNDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA5LTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ2xlYW4g dXAgYW5kIG1vZGVybml6ZSBET01UcmVlTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4ODIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRy ZWVNYW5hZ2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3Rv dHlwZS5yZXF1ZXN0RG9jdW1lbnQub25Eb2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLnJlcXVlc3REb2N1bWVudCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLnB1c2hOb2RlQnlQYXRo VG9Gcm9udGVuZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90 eXBlLl93cmFwQ2xpZW50Q2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVN YW5hZ2VyLnByb3RvdHlwZS5fYXR0cmlidXRlTW9kaWZpZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZS5fYXR0cmlidXRlUmVtb3ZlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLl9pbmxpbmVTdHlsZUludmFs aWRhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUu X2xvYWROb2RlQXR0cmlidXRlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFn ZXIucHJvdG90eXBlLmNhbmNlbFNlYXJjaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJl ZU1hbmFnZXIucHJvdG90eXBlLnF1ZXJ5U2VsZWN0b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZS5xdWVyeVNlbGVjdG9yQWxsKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUuaGlnaGxpZ2h0RE9NTm9kZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLl9idWlsZEhpZ2hs aWdodENvbmZpZyk6CisgICAgICAgIENsZWFudXAgYW5kIG1vZGVybml6ZSB3aGVyZSBhcHByb3By aWF0ZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoU2lkZWJhclBhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaFNpZGViYXJQYW5lbC5wcm90b3R5cGUu cGVyZm9ybVNlYXJjaCk6CisgICAgICAgIENhbGxiYWNrIGlzIG5vdyByZXF1aXJlZC4KKwogMjAx NS0wOS0wMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IEV4cGFuZCBDb25zb2xlIGRvbWFpbiB0ZXN0IGNvdmVyYWdlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9E T01UcmVlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4IDliNWZhZmYuLjYyMzFiZWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RP TVRyZWVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCkBAIC01OSw4ICs1OSw3IEBAIFdlYkluc3Bl Y3Rvci5ET01UcmVlTWFuYWdlciA9IGNsYXNzIERPTVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogICAgIHJlcXVlc3REb2N1bWVudChjYWxsYmFjaykKICAgICB7CiAgICAg ICAgIGlmICh0aGlzLl9kb2N1bWVudCkgewotICAgICAgICAgICAgaWYgKGNhbGxiYWNrKQotICAg ICAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX2RvY3VtZW50KTsKKyAgICAgICAgICAgIGNhbGxi YWNrKHRoaXMuX2RvY3VtZW50KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBA IC03NiwxMiArNzUsMTAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyID0gY2xhc3MgRE9N VHJlZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICBpZiAo IWVycm9yKQogICAgICAgICAgICAgICAgIHRoaXMuX3NldERvY3VtZW50KHJvb3QpOwogCi0gICAg ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3BlbmRpbmdEb2N1bWVudFJlcXVlc3RD YWxsYmFja3MubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgICAgICB2YXIgY2FsbGJhY2sgPSB0 aGlzLl9wZW5kaW5nRG9jdW1lbnRSZXF1ZXN0Q2FsbGJhY2tzW2ldOwotICAgICAgICAgICAgICAg IGlmIChjYWxsYmFjaykKLSAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fZG9jdW1l bnQpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3BlbmRpbmdEb2N1 bWVudFJlcXVlc3RDYWxsYmFja3M7CisgICAgICAgICAgICBmb3IgKGxldCBjYWxsYmFjayBvZiB0 aGlzLl9wZW5kaW5nRG9jdW1lbnRSZXF1ZXN0Q2FsbGJhY2tzKQorICAgICAgICAgICAgICAgIGNh bGxiYWNrKHRoaXMuX2RvY3VtZW50KTsKKworICAgICAgICAgICAgdGhpcy5fcGVuZGluZ0RvY3Vt ZW50UmVxdWVzdENhbGxiYWNrcyA9IG51bGw7CiAgICAgICAgIH0KIAogICAgICAgICBET01BZ2Vu dC5nZXREb2N1bWVudChvbkRvY3VtZW50QXZhaWxhYmxlLmJpbmQodGhpcykpOwpAQCAtOTQsOCAr OTEsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdl ciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgIHB1c2hOb2RlQnlQYXRoVG9Gcm9u dGVuZChwYXRoLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZhciBjYWxsYmFja0Nhc3QgPSBj YWxsYmFjazsKLSAgICAgICAgdGhpcy5fZGlzcGF0Y2hXaGVuRG9jdW1lbnRBdmFpbGFibGUoRE9N QWdlbnQucHVzaE5vZGVCeVBhdGhUb0Zyb250ZW5kLmJpbmQoRE9NQWdlbnQsIHBhdGgpLCBjYWxs YmFja0Nhc3QpOworICAgICAgICB0aGlzLl9kaXNwYXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJsZShE T01BZ2VudC5wdXNoTm9kZUJ5UGF0aFRvRnJvbnRlbmQuYmluZChET01BZ2VudCwgcGF0aCksIGNh bGxiYWNrKTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCkBAIC0xMDMsNyArOTksOCBAQCBXZWJJ bnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdlciBleHRlbmRzIFdl Ykluc3BlY3Rvci5PYmplY3QKICAgICBfd3JhcENsaWVudENhbGxiYWNrKGNhbGxiYWNrKQogICAg IHsKICAgICAgICAgaWYgKCFjYWxsYmFjaykKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAg ICAgIHJldHVybiBudWxsOworCiAgICAgICAgIHJldHVybiBmdW5jdGlvbihlcnJvciwgcmVzdWx0 KSB7CiAgICAgICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJv cigiRXJyb3IgZHVyaW5nIERPTUFnZW50IG9wZXJhdGlvbjogIiArIGVycm9yKTsKQEAgLTEzMiw2 ICsxMjksNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFu YWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdmFyIG5vZGUgPSB0aGlz Ll9pZFRvRE9NTm9kZVtub2RlSWRdOwogICAgICAgICBpZiAoIW5vZGUpCiAgICAgICAgICAgICBy ZXR1cm47CisKICAgICAgICAgbm9kZS5fc2V0QXR0cmlidXRlKG5hbWUsIHZhbHVlKTsKICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5h Z2VyLkV2ZW50LkF0dHJpYnV0ZU1vZGlmaWVkLCB7bm9kZSwgbmFtZX0pOwogICAgICAgICBub2Rl LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NTm9kZS5FdmVudC5BdHRy aWJ1dGVNb2RpZmllZCwge25hbWV9KTsKQEAgLTE0Miw2ICsxNDAsNyBAQCBXZWJJbnNwZWN0b3Iu RE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYmplY3QKICAgICAgICAgdmFyIG5vZGUgPSB0aGlzLl9pZFRvRE9NTm9kZVtub2RlSWRdOwog ICAgICAgICBpZiAoIW5vZGUpCiAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgbm9kZS5f cmVtb3ZlQXR0cmlidXRlKG5hbWUpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIuRXZlbnQuQXR0cmlidXRlUmVtb3ZlZCwg e25vZGUsIG5hbWV9KTsKICAgICAgICAgbm9kZS5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2Vi SW5zcGVjdG9yLkRPTU5vZGUuRXZlbnQuQXR0cmlidXRlUmVtb3ZlZCwge25hbWV9KTsKQEAgLTE0 OSw4ICsxNDgsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVl TWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKIAogICAgIF9pbmxpbmVTdHlsZUlu dmFsaWRhdGVkKG5vZGVJZHMpCiAgICAgewotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5v ZGVJZHMubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl9hdHRyaWJ1dGVMb2FkTm9kZUlk c1tub2RlSWRzW2ldXSA9IHRydWU7CisgICAgICAgIGZvciAodmFyIG5vZGVJZCBvZiBub2RlSWRz KQorICAgICAgICAgICAgdGhpcy5fYXR0cmlidXRlTG9hZE5vZGVJZHNbbm9kZUlkXSA9IHRydWU7 CiAgICAgICAgIGlmICgiX2xvYWROb2RlQXR0cmlidXRlc1RpbWVvdXQiIGluIHRoaXMpCiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIHRoaXMuX2xvYWROb2RlQXR0cmlidXRlc1RpbWVvdXQg PSBzZXRUaW1lb3V0KHRoaXMuX2xvYWROb2RlQXR0cmlidXRlcy5iaW5kKHRoaXMpLCAwKTsKQEAg LTE3MiwxMCArMTcxLDEwIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlciA9IGNsYXNzIERP TVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKLSAgICAgICAgZGVsZXRlIHRoaXMuX2xvYWROb2RlQXR0cmlidXRlc1RpbWVv dXQ7CisgICAgICAgIHRoaXMuX2xvYWROb2RlQXR0cmlidXRlc1RpbWVvdXQgPSB1bmRlZmluZWQ7 CiAKICAgICAgICAgZm9yICh2YXIgbm9kZUlkIGluIHRoaXMuX2F0dHJpYnV0ZUxvYWROb2RlSWRz KSB7Ci0gICAgICAgICAgICB2YXIgbm9kZUlkQXNOdW1iZXIgPSBwYXJzZUludChub2RlSWQsIDEw KTsKKyAgICAgICAgICAgIHZhciBub2RlSWRBc051bWJlciA9IHBhcnNlSW50KG5vZGVJZCk7CiAg ICAgICAgICAgICBET01BZ2VudC5nZXRBdHRyaWJ1dGVzKG5vZGVJZEFzTnVtYmVyLCBjYWxsYmFj ay5iaW5kKHRoaXMsIG5vZGVJZEFzTnVtYmVyKSk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5f YXR0cmlidXRlTG9hZE5vZGVJZHMgPSB7fTsKQEAgLTM3MSwyNyArMzcwLDI1IEBAIFdlYkluc3Bl Y3Rvci5ET01UcmVlTWFuYWdlciA9IGNsYXNzIERPTVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3NlYXJjaElkKSB7CiAgICAg ICAgICAgICBET01BZ2VudC5kaXNjYXJkU2VhcmNoUmVzdWx0cyh0aGlzLl9zZWFyY2hJZCk7Ci0g ICAgICAgICAgICBkZWxldGUgdGhpcy5fc2VhcmNoSWQ7CisgICAgICAgICAgICB0aGlzLl9zZWFy Y2hJZCA9IHVuZGVmaW5lZDsKICAgICAgICAgfQogICAgIH0KIAogICAgIHF1ZXJ5U2VsZWN0b3Io bm9kZUlkLCBzZWxlY3RvcnMsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdmFyIGNhbGxiYWNr Q2FzdCA9IGNhbGxiYWNrOwotICAgICAgICBET01BZ2VudC5xdWVyeVNlbGVjdG9yKG5vZGVJZCwg c2VsZWN0b3JzLCB0aGlzLl93cmFwQ2xpZW50Q2FsbGJhY2soY2FsbGJhY2tDYXN0KSk7CisgICAg ICAgIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3Iobm9kZUlkLCBzZWxlY3RvcnMsIHRoaXMuX3dyYXBD bGllbnRDYWxsYmFjayhjYWxsYmFjaykpOwogICAgIH0KIAogICAgIHF1ZXJ5U2VsZWN0b3JBbGwo bm9kZUlkLCBzZWxlY3RvcnMsIGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgdmFyIGNhbGxiYWNr Q2FzdCA9IGNhbGxiYWNrOwotICAgICAgICBET01BZ2VudC5xdWVyeVNlbGVjdG9yQWxsKG5vZGVJ ZCwgc2VsZWN0b3JzLCB0aGlzLl93cmFwQ2xpZW50Q2FsbGJhY2soY2FsbGJhY2tDYXN0KSk7Cisg ICAgICAgIERPTUFnZW50LnF1ZXJ5U2VsZWN0b3JBbGwobm9kZUlkLCBzZWxlY3RvcnMsIHRoaXMu X3dyYXBDbGllbnRDYWxsYmFjayhjYWxsYmFjaykpOwogICAgIH0KIAogICAgIGhpZ2hsaWdodERP TU5vZGUobm9kZUlkLCBtb2RlKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX2hpZGVET01Ob2Rl SGlnaGxpZ2h0VGltZW91dCkgewogICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMuX2hpZGVE T01Ob2RlSGlnaGxpZ2h0VGltZW91dCk7Ci0gICAgICAgICAgICBkZWxldGUgdGhpcy5faGlkZURP TU5vZGVIaWdobGlnaHRUaW1lb3V0OworICAgICAgICAgICAgdGhpcy5faGlkZURPTU5vZGVIaWdo bGlnaHRUaW1lb3V0ID0gdW5kZWZpbmVkOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5faGln aGxpZ2h0ZWRET01Ob2RlSWQgPSBub2RlSWQ7CkBAIC00NTAsMTAgKzQ0NywxMCBAQCBXZWJJbnNw ZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdlciBleHRlbmRzIFdlYklu c3BlY3Rvci5PYmplY3QKICAgICAgICAgRE9NQWdlbnQuc2V0SW5zcGVjdE1vZGVFbmFibGVkKGVu YWJsZWQsIHRoaXMuX2J1aWxkSGlnaGxpZ2h0Q29uZmlnKCksIGNhbGxiYWNrLmJpbmQodGhpcykp OwogICAgIH0KIAotICAgIF9idWlsZEhpZ2hsaWdodENvbmZpZyhtb2RlKQorICAgIF9idWlsZEhp Z2hsaWdodENvbmZpZyhtb2RlID0gImFsbCIpCiAgICAgewotICAgICAgICBtb2RlID0gbW9kZSB8 fCAiYWxsIjsKLSAgICAgICAgdmFyIGhpZ2hsaWdodENvbmZpZyA9IHsgc2hvd0luZm86IG1vZGUg PT09ICJhbGwiIH07CisgICAgICAgIGxldCBoaWdobGlnaHRDb25maWcgPSB7c2hvd0luZm86IG1v ZGUgPT09ICJhbGwifTsKKwogICAgICAgICBpZiAobW9kZSA9PT0gImFsbCIgfHwgbW9kZSA9PT0g ImNvbnRlbnQiKQogICAgICAgICAgICAgaGlnaGxpZ2h0Q29uZmlnLmNvbnRlbnRDb2xvciA9IHty OiAxMTEsIGc6IDE2OCwgYjogMjIwLCBhOiAwLjY2fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoU2lkZWJhclBhbmVsLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoU2lkZWJhclBh bmVsLmpzCmluZGV4IDQ2ZjZiNjAuLjFhMWIxNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFNpZGViYXJQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hTaWRlYmFyUGFu ZWwuanMKQEAgLTI2OCw3ICsyNjgsNyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoU2lkZWJhclBhbmVs ID0gY2xhc3MgU2VhcmNoU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjdG9yLgogICAgICAg ICB9CiAKICAgICAgICAgaWYgKHdpbmRvdy5ET01BZ2VudCkKLSAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5kb21UcmVlTWFuYWdlci5yZXF1ZXN0RG9jdW1lbnQoKTsKKyAgICAgICAgICAgIFdlYklu c3BlY3Rvci5kb21UcmVlTWFuYWdlci5yZXF1ZXN0RG9jdW1lbnQoZnVuY3Rpb24oKXt9KTsKIAog ICAgICAgICBpZiAod2luZG93LlBhZ2VBZ2VudCkKICAgICAgICAgICAgIFBhZ2VBZ2VudC5zZWFy Y2hJblJlc291cmNlcyhzZWFyY2hRdWVyeSwgaXNDYXNlU2Vuc2l0aXZlLCBpc1JlZ2V4LCByZXNv dXJjZXNDYWxsYmFjay5iaW5kKHRoaXMpKTsK