197210 2019-04-23 13:55:03 -0700 Web Inspector: Debugger: remove ASSERT_NOT_REACHED where it's possible to reach 2019-04-23 15:30:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1529743 0 hi 2019-04-23 13:55:03 -0700 It is possible for PageDebuggerAgent::didAddEventListener and PageDebuggerAgent::didPostMessage to both re-use the same object when being called, so don't assert that we haven't already seen the object. 1529744 1 hi 2019-04-23 13:56:00 -0700 <rdar://problem/48462912> 1529746 2 368060 hi 2019-04-23 13:57:44 -0700 Created attachment 368060 Patch 1529748 3 368060 joepeck 2019-04-23 14:01:17 -0700 Comment on attachment 368060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368060&action=review > Source/WebCore/inspector/InspectorInstrumentation.cpp:1188 > + FAST_RETURN_IF_NO_FRONTENDS(nullptr); Is there ever a case where we would not already have fast returned if there was no frontend? This line seems unnecessary. 1529749 4 368060 joepeck 2019-04-23 14:01:42 -0700 Comment on attachment 368060 Patch r=me 1529750 5 368060 hi 2019-04-23 14:04:33 -0700 Comment on attachment 368060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368060&action=review >> Source/WebCore/inspector/InspectorInstrumentation.cpp:1188 >> + FAST_RETURN_IF_NO_FRONTENDS(nullptr); > > Is there ever a case where we would not already have fast returned if there was no frontend? This line seems unnecessary. Yeah, this one doesn't need it. 1529752 6 368061 hi 2019-04-23 14:06:13 -0700 Created attachment 368061 Patch 1529787 7 368061 commit-queue 2019-04-23 15:30:12 -0700 Comment on attachment 368061 Patch Clearing flags on attachment: 368061 Committed r244569: <https://trac.webkit.org/changeset/244569> 1529788 8 commit-queue 2019-04-23 15:30:14 -0700 All reviewed patches have been landed. Closing bug. 368060 2019-04-23 13:57:44 -0700 2019-04-23 14:06:11 -0700 Patch bug-197210-20190423135743.patch text/plain 4531 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ODlmZmZlMjA2MTFhMmQ3ZWFlN2E3NTJkMWY1MDU0MGZlODY1MTZlLi42 MWU0ZTQ5ODg2NmQxY2MxY2FmNTFmODIxNTQ2Mjk4MTc3NDQ2Y2VmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTktMDQtMjMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnZ2VyOiByZW1vdmUgQVNTRVJUX05PVF9S RUFDSEVEIHdoZXJlIGl0J3MgcG9zc2libGUgdG8gcmVhY2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzIxMAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDg0NjI5MTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL3BhZ2UvUGFnZURlYnVnZ2VyQWdlbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UGFnZURlYnVnZ2VyQWdlbnQ6OmRpZEFkZEV2ZW50TGlzdGVuZXIpOgor ICAgICAgICAoV2ViQ29yZTo6UGFnZURlYnVnZ2VyQWdlbnQ6OmRpZFBvc3RNZXNzYWdlKToKKwor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb25zb2xlQWdlbnRFbmFibGVk KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6dGltZWxpbmVB Z2VudEVuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpyZXRyaWV2ZVRpbWVsaW5lQWdlbnQpOgorICAgICAgICBEcml2ZS1ieTogYWRkIGFkZGl0aW9u YWwgYEZBU1RfUkVUVVJOX0lGX05PX0ZST05URU5EU2AuCisKIDIwMTktMDQtMjMgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW2lPU10gZWxlbWVudC5mb2N1cygp IHNvbWV0aW1lcyBmYWlscyB0byByZXZlYWwgdGhlIGZvY3VzZWQgZWxlbWVudCB3aGVuIGl0IGJl Y29tZXMgZWRpdGFibGUgZHluYW1pY2FsbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKaW5kZXggM2Y0NzJjNWQyOGFiZTI0 YWY1YjI4Mzg0ODJjZjQ1ZmY2Yzg4N2Y1Mi4uYmY4ZGVjMzkzNzA3YTE3N2E0YmJjN2FmNzNlNTc1 ZWQxOWUyNzE1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTEwOTEsMTUgKzEwOTEsMjAgQEAgdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OnVwZGF0ZUFwcGxpY2F0aW9uQ2FjaGVTdGF0dXNJbXBsKElu c3RydW1lbnRpbmdBZ2UKIAogYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNvbnNvbGVB Z2VudEVuYWJsZWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCkKIHsKLSAgICBJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5z dHJ1bWVudGluZ0FnZW50c0ZvckNvbnRleHQoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7Ci0gICAg SW5zcGVjdG9yQ29uc29sZUFnZW50KiBjb25zb2xlQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdlbnRz ID8gaW5zdHJ1bWVudGluZ0FnZW50cy0+d2ViQ29uc29sZUFnZW50KCkgOiBudWxscHRyOwotICAg IHJldHVybiBjb25zb2xlQWdlbnQgJiYgY29uc29sZUFnZW50LT5lbmFibGVkKCk7CisgICAgRkFT VF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKGZhbHNlKTsKKyAgICBpZiAoYXV0byogaW5zdHJ1bWVu dGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JDb250ZXh0KHNjcmlwdEV4ZWN1dGlv bkNvbnRleHQpKSB7CisgICAgICAgIGlmIChhdXRvKiB3ZWJDb25zb2xlQWdlbnQgPSBpbnN0cnVt ZW50aW5nQWdlbnRzLT53ZWJDb25zb2xlQWdlbnQoKSkKKyAgICAgICAgICAgIHJldHVybiB3ZWJD b25zb2xlQWdlbnQtPmVuYWJsZWQoKTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOwogfQogCiBi b29sIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6dGltZWxpbmVBZ2VudEVuYWJsZWQoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkKIHsKLSAgICBJbnN0cnVt ZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0Zv ckNvbnRleHQoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7Ci0gICAgcmV0dXJuIGluc3RydW1lbnRp bmdBZ2VudHMgJiYgaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgp OworICAgIEZBU1RfUkVUVVJOX0lGX05PX0ZST05URU5EUyhmYWxzZSk7CisgICAgaWYgKGF1dG8q IGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yQ29udGV4dChzY3Jp cHRFeGVjdXRpb25Db250ZXh0KSkKKyAgICAgICAgcmV0dXJuIGluc3RydW1lbnRpbmdBZ2VudHMt Pmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKTsKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIHZvaWQg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZXF1ZXN0QW5pbWF0aW9uRnJhbWVJbXBsKElu c3RydW1lbnRpbmdBZ2VudHMmIGluc3RydW1lbnRpbmdBZ2VudHMsIGludCBjYWxsYmFja0lkLCBE b2N1bWVudCYgZG9jdW1lbnQpCkBAIC0xMTgwLDYgKzExODUsOCBAQCB2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6dW5yZWdpc3Rlckluc3RydW1lbnRpbmdBZ2VudHMoSW5zdHJ1bWVudGlu Z0FnZW50cwogCiBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OnJldHJpZXZlVGltZWxpbmVBZ2VudChjb25zdCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUmIGNvb2tpZSkKIHsKKyAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFMobnVsbHB0 cik7CisKICAgICBpZiAoIWNvb2tpZS5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybiBudWxscHRy OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL3BhZ2UvUGFn ZURlYnVnZ2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9wYWdl L1BhZ2VEZWJ1Z2dlckFnZW50LmNwcAppbmRleCBjZmYzZDIzYzdlMmIzM2QxNjEwZjJlODJhZmM1 YTFhMTdjZWI3ZjFmLi5lOGNmNDhmZDZkMDQ0ZjcyZTY3OTc1NzE3ZGQzNGMxMTBmYWMxYWFmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL3BhZ2UvUGFnZURlYnVn Z2VyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvcGFnZS9Q YWdlRGVidWdnZXJBZ2VudC5jcHAKQEAgLTE2OSwxMCArMTY5LDggQEAgdm9pZCBQYWdlRGVidWdn ZXJBZ2VudDo6ZGlkQWRkRXZlbnRMaXN0ZW5lcihFdmVudFRhcmdldCYgdGFyZ2V0LCBjb25zdCBB dG9taWNTdHIKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byYgcmVnaXN0ZXJlZExpc3RlbmVy ID0gZXZlbnRMaXN0ZW5lcnMuYXQocG9zaXRpb24pOwotICAgIGlmIChtX3JlZ2lzdGVyZWRFdmVu dExpc3RlbmVycy5jb250YWlucyhyZWdpc3RlcmVkTGlzdGVuZXIuZ2V0KCkpKSB7Ci0gICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIGlmIChtX3JlZ2lzdGVyZWRFdmVudExpc3RlbmVy cy5jb250YWlucyhyZWdpc3RlcmVkTGlzdGVuZXIuZ2V0KCkpKQogICAgICAgICByZXR1cm47Ci0g ICAgfQogCiAgICAgSlNDOjpFeGVjU3RhdGUqIHNjcmlwdFN0YXRlID0gdGFyZ2V0LnNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQoKS0+ZXhlY1N0YXRlKCk7CiAgICAgaWYgKCFzY3JpcHRTdGF0ZSkKQEAg LTIzNCwxMCArMjMyLDggQEAgdm9pZCBQYWdlRGVidWdnZXJBZ2VudDo6ZGlkUG9zdE1lc3NhZ2Uo Y29uc3QgVGltZXJCYXNlJiB0aW1lciwgSlNDOjpFeGVjU3RhdGUmIHMKICAgICBpZiAoIWJyZWFr cG9pbnRzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX3Bvc3RNZXNzYWdl VGltZXJzLmNvbnRhaW5zKCZ0aW1lcikpIHsKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgaWYgKG1fcG9zdE1lc3NhZ2VUaW1lcnMuY29udGFpbnMoJnRpbWVyKSkKICAgICAgICAg cmV0dXJuOwotICAgIH0KIAogICAgIGludCBwb3N0TWVzc2FnZUlkZW50aWZpZXIgPSBtX25leHRQ b3N0TWVzc2FnZUlkZW50aWZpZXIrKzsKICAgICBtX3Bvc3RNZXNzYWdlVGltZXJzLnNldCgmdGlt ZXIsIHBvc3RNZXNzYWdlSWRlbnRpZmllcik7Cg== 368061 2019-04-23 14:06:13 -0700 2019-04-23 15:30:12 -0700 Patch bug-197210-20190423140612.patch text/plain 4122 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzYWMyNWU4NTUyZDlkNTFkMDcwNjRiOWRkZWQyMDJjMWNjOThkMDRkLi41 NTU4NDA1MjBiNWIyYWFiMjE1NTg4MWFmNTBmNGYwMjE3Yzg5ZTM0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTktMDQtMjMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnZ2VyOiByZW1vdmUgQVNTRVJUX05PVF9S RUFDSEVEIHdoZXJlIGl0J3MgcG9zc2libGUgdG8gcmVhY2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzIxMAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDg0NjI5MTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisg ICAgICAgICogaW5zcGVjdG9yL2FnZW50cy9wYWdlL1BhZ2VEZWJ1Z2dlckFnZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2VEZWJ1Z2dlckFnZW50OjpkaWRBZGRFdmVudExpc3RlbmVyKToK KyAgICAgICAgKFdlYkNvcmU6OlBhZ2VEZWJ1Z2dlckFnZW50OjpkaWRQb3N0TWVzc2FnZSk6CisK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29uc29sZUFnZW50RW5hYmxl ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnRpbWVsaW5l QWdlbnRFbmFibGVkKToKKyAgICAgICAgRHJpdmUtYnk6IGFkZCBhZGRpdGlvbmFsIGBGQVNUX1JF VFVSTl9JRl9OT19GUk9OVEVORFNgLgorCiAyMDE5LTA0LTIzICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmxvZ1RvQ29u c29sZSBzaG91bGQgaW5jbHVkZSBsaW5lL2NvbHVtbiBudW1iZXIgYW5kIHNvdXJjZSBsb2NhdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1l bnRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uLmNwcAppbmRleCAzZjQ3MmM1ZDI4YWJlMjRhZjViMjgzODQ4MmNmNDVmZjZjODg3ZjUy Li5hMjUwOTQ4Yzk4ZTBmNjIyMTBmODQwMzg3NDFmM2ZiNmY0OTEyNjdmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApA QCAtMTA5MSwxNSArMTA5MSwyMCBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6dXBk YXRlQXBwbGljYXRpb25DYWNoZVN0YXR1c0ltcGwoSW5zdHJ1bWVudGluZ0FnZQogCiBib29sIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6Y29uc29sZUFnZW50RW5hYmxlZChTY3JpcHRFeGVjdXRp b25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0KQogewotICAgIEluc3RydW1lbnRpbmdB Z2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yQ29udGV4 dChzY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKLSAgICBJbnNwZWN0b3JDb25zb2xlQWdlbnQqIGNv bnNvbGVBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMgPyBpbnN0cnVtZW50aW5nQWdlbnRzLT53 ZWJDb25zb2xlQWdlbnQoKSA6IG51bGxwdHI7Ci0gICAgcmV0dXJuIGNvbnNvbGVBZ2VudCAmJiBj b25zb2xlQWdlbnQtPmVuYWJsZWQoKTsKKyAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFMo ZmFsc2UpOworICAgIGlmIChhdXRvKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGlu Z0FnZW50c0ZvckNvbnRleHQoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCkpIHsKKyAgICAgICAgaWYg KGF1dG8qIHdlYkNvbnNvbGVBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMtPndlYkNvbnNvbGVB Z2VudCgpKQorICAgICAgICAgICAgcmV0dXJuIHdlYkNvbnNvbGVBZ2VudC0+ZW5hYmxlZCgpOwor ICAgIH0KKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp0aW1lbGluZUFnZW50RW5hYmxlZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRF eGVjdXRpb25Db250ZXh0KQogewotICAgIEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRp bmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yQ29udGV4dChzY3JpcHRFeGVjdXRpb25D b250ZXh0KTsKLSAgICByZXR1cm4gaW5zdHJ1bWVudGluZ0FnZW50cyAmJiBpbnN0cnVtZW50aW5n QWdlbnRzLT5pbnNwZWN0b3JUaW1lbGluZUFnZW50KCk7CisgICAgRkFTVF9SRVRVUk5fSUZfTk9f RlJPTlRFTkRTKGZhbHNlKTsKKyAgICBpZiAoYXV0byogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGlu c3RydW1lbnRpbmdBZ2VudHNGb3JDb250ZXh0KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQpKQorICAg ICAgICByZXR1cm4gaW5zdHJ1bWVudGluZ0FnZW50cy0+aW5zcGVjdG9yVGltZWxpbmVBZ2VudCgp OworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OmRpZFJlcXVlc3RBbmltYXRpb25GcmFtZUltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1 bWVudGluZ0FnZW50cywgaW50IGNhbGxiYWNrSWQsIERvY3VtZW50JiBkb2N1bWVudCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvcGFnZS9QYWdlRGVidWdnZXJB Z2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL3BhZ2UvUGFnZURlYnVn Z2VyQWdlbnQuY3BwCmluZGV4IGNmZjNkMjNjN2UyYjMzZDE2MTBmMmU4MmFmYzVhMWExN2NlYjdm MWYuLmU4Y2Y0OGZkNmQwNDRmNzJlNjc5NzU3MTdkZDM0YzExMGZhYzFhYWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvcGFnZS9QYWdlRGVidWdnZXJBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9wYWdlL1BhZ2VEZWJ1Z2dl ckFnZW50LmNwcApAQCAtMTY5LDEwICsxNjksOCBAQCB2b2lkIFBhZ2VEZWJ1Z2dlckFnZW50Ojpk aWRBZGRFdmVudExpc3RlbmVyKEV2ZW50VGFyZ2V0JiB0YXJnZXQsIGNvbnN0IEF0b21pY1N0cgog ICAgICAgICByZXR1cm47CiAKICAgICBhdXRvJiByZWdpc3RlcmVkTGlzdGVuZXIgPSBldmVudExp c3RlbmVycy5hdChwb3NpdGlvbik7Ci0gICAgaWYgKG1fcmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXJz LmNvbnRhaW5zKHJlZ2lzdGVyZWRMaXN0ZW5lci5nZXQoKSkpIHsKLSAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgaWYgKG1fcmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXJzLmNvbnRhaW5z KHJlZ2lzdGVyZWRMaXN0ZW5lci5nZXQoKSkpCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAg ICBKU0M6OkV4ZWNTdGF0ZSogc2NyaXB0U3RhdGUgPSB0YXJnZXQuc2NyaXB0RXhlY3V0aW9uQ29u dGV4dCgpLT5leGVjU3RhdGUoKTsKICAgICBpZiAoIXNjcmlwdFN0YXRlKQpAQCAtMjM0LDEwICsy MzIsOCBAQCB2b2lkIFBhZ2VEZWJ1Z2dlckFnZW50OjpkaWRQb3N0TWVzc2FnZShjb25zdCBUaW1l ckJhc2UmIHRpbWVyLCBKU0M6OkV4ZWNTdGF0ZSYgcwogICAgIGlmICghYnJlYWtwb2ludHNBY3Rp dmUoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fcG9zdE1lc3NhZ2VUaW1lcnMuY29u dGFpbnMoJnRpbWVyKSkgewotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBpZiAo bV9wb3N0TWVzc2FnZVRpbWVycy5jb250YWlucygmdGltZXIpKQogICAgICAgICByZXR1cm47Ci0g ICAgfQogCiAgICAgaW50IHBvc3RNZXNzYWdlSWRlbnRpZmllciA9IG1fbmV4dFBvc3RNZXNzYWdl SWRlbnRpZmllcisrOwogICAgIG1fcG9zdE1lc3NhZ2VUaW1lcnMuc2V0KCZ0aW1lciwgcG9zdE1l c3NhZ2VJZGVudGlmaWVyKTsK