155318 2016-03-10 12:44:49 -0800 Web Inspector: TreeOutlineDataGridSynchronizer should be optional in TimelineDataGrid 2016-03-10 14:58:22 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 153036 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1173258 0 mattbaker 2016-03-10 12:44:49 -0800 * SUMMARY TreeOutlineDataGridSynchronizer should be optional in TimelineDataGrid. TimelineViews no longer use tree outlines, but the synchronizer still needs to be supported since the Network tab uses a TimelineDataGrid. For clients of TimelineDataGrid, the only change is to TimelineDataGrid.addRowInSortOrder: TimelineDataGrid.prototype.addRowInSortOrder(treeElement, dataGridNode, parentTreeElementOrDataGridNode) - treeElement: optional, TimelineView's will pass null. - parentTreeElementOrDataGridNode: overloaded parameter. TimelineViews will pass a DataGridNode instead of a tree element. 1173259 1 webkit-bug-importer 2016-03-10 12:45:05 -0800 <rdar://problem/25091949> 1173269 2 273603 mattbaker 2016-03-10 12:54:22 -0800 Created attachment 273603 [Patch] Proposed Fix 1173369 3 273603 commit-queue 2016-03-10 14:58:18 -0800 Comment on attachment 273603 [Patch] Proposed Fix Clearing flags on attachment: 273603 Committed r197958: <http://trac.webkit.org/changeset/197958> 1173370 4 commit-queue 2016-03-10 14:58:22 -0800 All reviewed patches have been landed. Closing bug. 273603 2016-03-10 12:54:22 -0800 2016-03-10 14:58:18 -0800 [Patch] Proposed Fix bug-155318-20160310125409.patch text/plain 10125 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh YTczYWMwYmU0ZTAwMjMxNjY1NDBlOTAxNThhMDcwODgyYzc5ZTgwLi4yNTEyZWE4NTA1ZDVhNTQ2 MzYwNmEyNmJjZGQyNzYxMmI3YTAzODI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxNi0wMy0xMCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXpl ciBzaG91bGQgYmUgb3B0aW9uYWwgaW4gVGltZWxpbmVEYXRhR3JpZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MzE4CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8yNTA5MTk0OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkKToKKyAgICAgICAgVHJlZU91dGxp bmUgaXMgb3B0aW9uYWwsIGFuZCBpZiBub24tbnVsbCBhIHRyZWUgb3V0bGluZSBzeW5jaHJvbml6 ZXIgaXMgY3JlYXRlZC4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQu cHJvdG90eXBlLnNob3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlk LnByb3RvdHlwZS50cmVlRWxlbWVudEZvckRhdGFHcmlkTm9kZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUuZGF0YUdyaWROb2RlRm9yVHJlZUVsZW1l bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQucHJvdG90eXBlLnRy ZWVFbGVtZW50TWF0Y2hlc0FjdGl2ZVNjb3BlRmlsdGVycyk6CisgICAgICAgIFNhZmV0eSBjaGVj a3MgZm9yIHRoZSBzeW5jaHJvbml6ZXIuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZURhdGFHcmlkLnByb3RvdHlwZS5hZGRSb3dJblNvcnRPcmRlcik6CisgICAgICAgIHRyZWVFbGVt ZW50IGlzIG5vdyBhbiBvcHRpb25hbCBwYXJhbWV0ZXIuIElmIG5vbi1udWxsLCBhIHRyZWUgc3lu Y2hyb25pemVyCisgICAgICAgIHNob3VsZCBleGlzdC4gVGhlIHRoaXJkIHBhcmFtZXRlciBoYXMg YmVlbiBvdmVybG9hZGVkLCB0byBhbGxvdyBwYXNzaW5nCisgICAgICAgIGEgcGFyZW50IHRyZWUg ZWxlbWVudCBvciBkYXRhIGdyaWQgbm9kZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lRGF0YUdyaWQucHJvdG90eXBlLl9yZWZyZXNoRGlydHlEYXRhR3JpZE5vZGVzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkLnByb3RvdHlwZS5fc29ydCk6CisgICAg ICAgIFNhZmV0eSBjaGVja3MgZm9yIHRoZSBzeW5jaHJvbml6ZXIuCisKIDIwMTYtMDMtMDkgIE1h dHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IExheW91dFRpbWVsaW5lVmlldyBwYXRoIGNvbXBvbmVudHMgc2hvdWxkIHJlZmxlY3QgZ3JpZCBy b3cgbmVzdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMKaW5kZXggZTMyYzBlZDVjNzc5NDUz OGQ4ZmJkNzZiNWZhM2NmMWI3YTJiZGZlNS4uODIxOTE3ZGQyNjA0MzE4N2JlYjE4ZTQ0ODgzNzU1 ZGI0ZGYyZTE1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmpzCkBAIC0yOSw3ICsyOSw4IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZCBl eHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAgICAgewogICAgICAgICBzdXBlcihjb2x1bW5zLCBl ZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrKTsKIAotICAgICAgICB0aGlzLl90cmVlT3V0bGlu ZURhdGFHcmlkU3luY2hyb25pemVyID0gbmV3IFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZURhdGFH cmlkU3luY2hyb25pemVyKHRyZWVPdXRsaW5lLCB0aGlzLCBkZWxlZ2F0ZSk7CisgICAgICAgIGlm ICh0cmVlT3V0bGluZSkKKyAgICAgICAgICAgIHRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5j aHJvbml6ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6 ZXIodHJlZU91dGxpbmUsIHRoaXMsIGRlbGVnYXRlKTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgidGltZWxpbmUiKTsKIApAQCAtODksNyArOTAsOCBAQCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVEYXRhR3JpZCA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWQgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuRGF0YQogICAgIHsKICAgICAgICAgLy8gTWF5IGJlIG92ZXJyaWRkZW4gYnkgc3Vi Y2xhc3Nlcy4gSWYgc28sIHRoZXkgc2hvdWxkIGNhbGwgdGhlIHN1cGVyY2xhc3MuCiAKLSAgICAg ICAgdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5zeW5jaHJvbml6ZSgpOwor ICAgICAgICBpZiAodGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplcikKKyAgICAg ICAgICAgIHRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6ZXIuc3luY2hyb25pemUo KTsKICAgICB9CiAKICAgICBoaWRkZW4oKQpAQCAtMTA2LDExICsxMDgsMTcgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLkRhdGEKIAogICAgIHRyZWVFbGVtZW50Rm9yRGF0YUdyaWROb2RlKGRhdGFHcmlk Tm9kZSkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNo cm9uaXplcikKKyAgICAgICAgICAgIHJldHVybiBudWxsOworCiAgICAgICAgIHJldHVybiB0aGlz Ll90cmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyLnRyZWVFbGVtZW50Rm9yRGF0YUdyaWRO b2RlKGRhdGFHcmlkTm9kZSk7CiAgICAgfQogCiAgICAgZGF0YUdyaWROb2RlRm9yVHJlZUVsZW1l bnQodHJlZUVsZW1lbnQpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX3RyZWVPdXRsaW5lRGF0 YUdyaWRTeW5jaHJvbml6ZXIpCisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKwogICAgICAgICBy ZXR1cm4gdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5kYXRhR3JpZE5vZGVG b3JUcmVlRWxlbWVudCh0cmVlRWxlbWVudCk7CiAgICAgfQogCkBAIC0xMjIsNiArMTMwLDkgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4 dGVuZHMgV2ViSW5zcGVjdG9yLkRhdGEKIAogICAgIHRyZWVFbGVtZW50TWF0Y2hlc0FjdGl2ZVNj b3BlRmlsdGVycyh0cmVlRWxlbWVudCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fdHJlZU91 dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplcikKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKwog ICAgICAgICB2YXIgZGF0YUdyaWROb2RlID0gdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNo cm9uaXplci5kYXRhR3JpZE5vZGVGb3JUcmVlRWxlbWVudCh0cmVlRWxlbWVudCk7CiAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KGRhdGFHcmlkTm9kZSk7CiAKQEAgLTE2Miw2ICsxNzMsMzggQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVu ZHMgV2ViSW5zcGVjdG9yLkRhdGEKICAgICAgICAgfQogICAgIH0KIAorICAgIGFkZFJvd0luU29y dE9yZGVyKHRyZWVFbGVtZW50LCBkYXRhR3JpZE5vZGUsIHBhcmVudFRyZWVFbGVtZW50T3JEYXRh R3JpZE5vZGUpCisgICAgeworICAgICAgICBsZXQgcGFyZW50RGF0YUdyaWROb2RlID0gcGFyZW50 VHJlZUVsZW1lbnRPckRhdGFHcmlkTm9kZSB8fCB0aGlzOworICAgICAgICBsZXQgY2hpbGRFbGVt ZW50ID0gZGF0YUdyaWROb2RlOworCisgICAgICAgIGlmICh0cmVlRWxlbWVudCkgeworICAgICAg ICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXpl cik7CisgICAgICAgICAgICBpZiAoIXRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6 ZXIpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICB0aGlzLl90cmVlT3V0 bGluZURhdGFHcmlkU3luY2hyb25pemVyLmFzc29jaWF0ZSh0cmVlRWxlbWVudCwgZGF0YUdyaWRO b2RlKTsKKworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIXBhcmVudFRyZWVFbGVtZW50T3JE YXRhR3JpZE5vZGUgfHwgcGFyZW50VHJlZUVsZW1lbnRPckRhdGFHcmlkTm9kZSBpbnN0YW5jZW9m IFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudCk7CisKKyAgICAgICAgICAgIGxldCBwYXJlbnRUcmVl RWxlbWVudCA9IHBhcmVudFRyZWVFbGVtZW50T3JEYXRhR3JpZE5vZGUgfHwgdGhpcy5fdHJlZU91 dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci50cmVlT3V0bGluZTsKKyAgICAgICAgICAgIHBhcmVu dERhdGFHcmlkTm9kZSA9IHBhcmVudFRyZWVFbGVtZW50LnJvb3QgPyB0aGlzIDogdGhpcy5fdHJl ZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5kYXRhR3JpZE5vZGVGb3JUcmVlRWxlbWVudChw YXJlbnRUcmVlRWxlbWVudCk7CisKKyAgICAgICAgICAgIHBhcmVudFRyZWVFbGVtZW50T3JEYXRh R3JpZE5vZGUgPSBwYXJlbnRUcmVlRWxlbWVudDsKKyAgICAgICAgICAgIGNoaWxkRWxlbWVudCA9 IHRyZWVFbGVtZW50OworICAgICAgICB9CisKKyAgICAgICAgaWYgKHRoaXMuc29ydENvbHVtbklk ZW50aWZpZXIpIHsKKyAgICAgICAgICAgIGxldCBpbnNlcnRpb25JbmRleCA9IGluc2VydGlvbklu ZGV4Rm9yT2JqZWN0SW5MaXN0U29ydGVkQnlGdW5jdGlvbihkYXRhR3JpZE5vZGUsIHBhcmVudERh dGFHcmlkTm9kZS5jaGlsZHJlbiwgdGhpcy5fc29ydENvbXBhcmF0b3IuYmluZCh0aGlzKSk7CisK KyAgICAgICAgICAgIC8vIElmIHBhcmVudCBpcyBhIHRyZWUgZWxlbWVudCwgdGhlIHN5bmNocm9u aXplciB3aWxsIGluc2VydCBpbnRvIHRoZSBkYXRhIGdyaWQuCisgICAgICAgICAgICBwYXJlbnRU cmVlRWxlbWVudE9yRGF0YUdyaWROb2RlLmluc2VydENoaWxkKGNoaWxkRWxlbWVudCwgaW5zZXJ0 aW9uSW5kZXgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gSWYgcGFyZW50IGlz IGEgdHJlZSBlbGVtZW50LCB0aGUgc3luY2hyb25pemVyIHdpbGwgYXBwZW5kIHRvIHRoZSBkYXRh IGdyaWQuCisgICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudE9yRGF0YUdyaWROb2RlLmFwcGVu ZENoaWxkKGNoaWxkRWxlbWVudCk7CisgICAgICAgIH0KKyAgICB9CisKICAgICBzaG91bGRJZ25v cmVTZWxlY3Rpb25FdmVudCgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5faWdub3JlU2Vs ZWN0aW9uRXZlbnQgfHwgZmFsc2U7CkBAIC0xOTcsNyArMjQwLDcgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVj dG9yLkRhdGEKICAgICAgICAgICAgIHRoaXMuX3NjaGVkdWxlZERhdGFHcmlkTm9kZVJlZnJlc2hJ ZGVudGlmaWVyID0gdW5kZWZpbmVkOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCF0aGlzLl9k aXJ0eURhdGFHcmlkTm9kZXMpCisgICAgICAgIGlmICghdGhpcy5fZGlydHlEYXRhR3JpZE5vZGVz IHx8ICF0aGlzLl90cmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyKQogICAgICAgICAgICAg cmV0dXJuOwogCiAgICAgICAgIHZhciBzZWxlY3RlZE5vZGUgPSB0aGlzLnNlbGVjdGVkTm9kZTsK QEAgLTI0NywyMyArMjkwLDI2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gY2xh c3MgVGltZWxpbmVEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAKICAgICBfc29y dCgpCiAgICAgewotICAgICAgICB2YXIgc29ydENvbHVtbklkZW50aWZpZXIgPSB0aGlzLnNvcnRD b2x1bW5JZGVudGlmaWVyOworICAgICAgICBsZXQgc29ydENvbHVtbklkZW50aWZpZXIgPSB0aGlz LnNvcnRDb2x1bW5JZGVudGlmaWVyOwogICAgICAgICBpZiAoIXNvcnRDb2x1bW5JZGVudGlmaWVy KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBzZWxlY3RlZE5vZGUgPSB0aGlz LnNlbGVjdGVkTm9kZTsKKyAgICAgICAgbGV0IHNlbGVjdGVkTm9kZSA9IHRoaXMuc2VsZWN0ZWRO b2RlOwogICAgICAgICB0aGlzLl9pZ25vcmVTZWxlY3Rpb25FdmVudCA9IHRydWU7CiAKLSAgICAg ICAgdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5lbmFibGVkID0gZmFsc2U7 CisgICAgICAgIGxldCB0cmVlT3V0bGluZTsKKyAgICAgICAgaWYgKHRoaXMuX3RyZWVPdXRsaW5l RGF0YUdyaWRTeW5jaHJvbml6ZXIpIHsKKyAgICAgICAgICAgIHRoaXMuX3RyZWVPdXRsaW5lRGF0 YUdyaWRTeW5jaHJvbml6ZXIuZW5hYmxlZCA9IGZhbHNlOwogCi0gICAgICAgIHZhciB0cmVlT3V0 bGluZSA9IHRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6ZXIudHJlZU91dGxpbmU7 Ci0gICAgICAgIGlmICh0cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50KQotICAgICAgICAg ICAgdHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCh0cnVlKTsKKyAgICAg ICAgICAgIHRyZWVPdXRsaW5lID0gdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXpl ci50cmVlT3V0bGluZTsKKyAgICAgICAgICAgIGlmICh0cmVlT3V0bGluZS5zZWxlY3RlZFRyZWVF bGVtZW50KQorICAgICAgICAgICAgICAgIHRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQu ZGVzZWxlY3QodHJ1ZSk7CisgICAgICAgIH0KIAogICAgICAgICAvLyBDb2xsZWN0IHBhcmVudCBu b2RlcyB0aGF0IG5lZWQgdGhlaXIgY2hpbGRyZW4gc29ydGVkLiBTbyB0aGlzIGluIHR3byBwaGFz ZXMgc2luY2UKICAgICAgICAgLy8gdHJhdmVyc2VOZXh0Tm9kZSB3b3VsZCBnZXQgY29uZnVzZWQg aWYgd2Ugc29ydCB0aGUgdHJlZSB3aGlsZSB0cmF2ZXJzaW5nIGl0LgotICAgICAgICB2YXIgcGFy ZW50RGF0YUdyaWROb2RlcyA9IFt0aGlzXTsKLSAgICAgICAgdmFyIGN1cnJlbnREYXRhR3JpZE5v ZGUgPSB0aGlzLmNoaWxkcmVuWzBdOworICAgICAgICBsZXQgcGFyZW50RGF0YUdyaWROb2RlcyA9 IFt0aGlzXTsKKyAgICAgICAgbGV0IGN1cnJlbnREYXRhR3JpZE5vZGUgPSB0aGlzLmNoaWxkcmVu WzBdOwogICAgICAgICB3aGlsZSAoY3VycmVudERhdGFHcmlkTm9kZSkgewogICAgICAgICAgICAg aWYgKGN1cnJlbnREYXRhR3JpZE5vZGUuY2hpbGRyZW4ubGVuZ3RoKQogICAgICAgICAgICAgICAg IHBhcmVudERhdGFHcmlkTm9kZXMucHVzaChjdXJyZW50RGF0YUdyaWROb2RlKTsKQEAgLTI3MSwy MiArMzE3LDI3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gY2xhc3MgVGltZWxp bmVEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAgICAgICAgIH0KIAogICAgICAg ICAvLyBTb3J0IHRoZSBjaGlsZHJlbiBvZiBjb2xsZWN0ZWQgcGFyZW50IG5vZGVzLgotICAgICAg ICBmb3IgKHZhciBwYXJlbnREYXRhR3JpZE5vZGUgb2YgcGFyZW50RGF0YUdyaWROb2Rlcykgewot ICAgICAgICAgICAgdmFyIHBhcmVudFRyZWVFbGVtZW50ID0gcGFyZW50RGF0YUdyaWROb2RlID09 PSB0aGlzID8gdHJlZU91dGxpbmUgOiB0aGlzLl90cmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25p emVyLnRyZWVFbGVtZW50Rm9yRGF0YUdyaWROb2RlKHBhcmVudERhdGFHcmlkTm9kZSk7Ci0gICAg ICAgICAgICBjb25zb2xlLmFzc2VydChwYXJlbnRUcmVlRWxlbWVudCk7CisgICAgICAgIGZvciAo bGV0IHBhcmVudERhdGFHcmlkTm9kZSBvZiBwYXJlbnREYXRhR3JpZE5vZGVzKSB7CisgICAgICAg ICAgICBsZXQgY2hpbGREYXRhR3JpZE5vZGVzID0gcGFyZW50RGF0YUdyaWROb2RlLmNoaWxkcmVu LnNsaWNlKCk7CisgICAgICAgICAgICBwYXJlbnREYXRhR3JpZE5vZGUucmVtb3ZlQ2hpbGRyZW4o KTsKIAotICAgICAgICAgICAgdmFyIGNoaWxkRGF0YUdyaWROb2RlcyA9IHBhcmVudERhdGFHcmlk Tm9kZS5jaGlsZHJlbi5zbGljZSgpOworICAgICAgICAgICAgbGV0IHBhcmVudFRyZWVFbGVtZW50 OworICAgICAgICAgICAgaWYgKHRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6ZXIp IHsKKyAgICAgICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudCA9IHBhcmVudERhdGFHcmlkTm9k ZSA9PT0gdGhpcyA/IHRyZWVPdXRsaW5lIDogdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNo cm9uaXplci50cmVlRWxlbWVudEZvckRhdGFHcmlkTm9kZShwYXJlbnREYXRhR3JpZE5vZGUpOwor ICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHBhcmVudFRyZWVFbGVtZW50KTsKIAotICAg ICAgICAgICAgcGFyZW50RGF0YUdyaWROb2RlLnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAg ICBwYXJlbnRUcmVlRWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICAgICAgICAgIHBh cmVudFRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgIGNoaWxkRGF0YUdyaWROb2Rlcy5zb3J0KHRoaXMuX3NvcnRDb21wYXJhdG9yLmJpbmQo dGhpcykpOwogCi0gICAgICAgICAgICBmb3IgKHZhciBkYXRhR3JpZE5vZGUgb2YgY2hpbGREYXRh R3JpZE5vZGVzKSB7Ci0gICAgICAgICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5fdHJl ZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci50cmVlRWxlbWVudEZvckRhdGFHcmlkTm9kZShk YXRhR3JpZE5vZGUpOworICAgICAgICAgICAgZm9yIChsZXQgZGF0YUdyaWROb2RlIG9mIGNoaWxk RGF0YUdyaWROb2RlcykgeworICAgICAgICAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9IHRoaXMu X3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6ZXIudHJlZUVsZW1lbnRGb3JEYXRhR3JpZE5v ZGUoZGF0YUdyaWROb2RlKTsKICAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0cmVlRWxl bWVudCk7CiAKLSAgICAgICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudC5hcHBlbmRDaGlsZCh0 cmVlRWxlbWVudCk7CisgICAgICAgICAgICAgICAgaWYgKHBhcmVudFRyZWVFbGVtZW50KQorICAg ICAgICAgICAgICAgICAgICBwYXJlbnRUcmVlRWxlbWVudC5hcHBlbmRDaGlsZCh0cmVlRWxlbWVu dCk7CisKICAgICAgICAgICAgICAgICBwYXJlbnREYXRhR3JpZE5vZGUuYXBwZW5kQ2hpbGQoZGF0 YUdyaWROb2RlKTsKIAogICAgICAgICAgICAgICAgIC8vIEFkZGluZyB0aGUgdHJlZSBlbGVtZW50 IGJhY2sgdG8gdGhlIHRyZWUgb3V0bGluZSBzdWJqZWN0cyBpdCB0byBmaWx0ZXJzLgpAQCAtMjk1 LDcgKzM0Niw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURhdGFHcmlkID0gY2xhc3MgVGltZWxp bmVEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KIAotICAgICAgICB0aGlzLl90cmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyLmVu YWJsZWQgPSB0cnVlOworICAgICAgICBpZiAodGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5bmNo cm9uaXplcikKKyAgICAgICAgICAgIHRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6 ZXIuZW5hYmxlZCA9IHRydWU7CiAKICAgICAgICAgaWYgKHNlbGVjdGVkTm9kZSkKICAgICAgICAg ICAgIHNlbGVjdGVkTm9kZS5yZXZlYWxBbmRTZWxlY3QoKTsK