37340 2010-04-09 09:10:17 -0700 Web Inspector: Fixes "wrong parent" for GCEvents that come at the end of a timeline record node. 2010-04-09 17:41:49 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 jaimeyap webkit-unassigned commit-queue knorton loislo pfeldman timothy oldest_to_newest 210753 0 jaimeyap 2010-04-09 09:10:17 -0700 This patch fixes "wrong parent" for GCEvents that come at the end of a timeline record node. The problem was as follows: InspectorTimelineAgent::didCompleteRecord() pops the record stack and then calls addRecordToTimeline() addRecordToTimeline() pushes the GCEvents. This then attributes the GCEvents to whatever is currently last on the record stack. Too bad the real parent has already been popped :). This means that the only time GCEvents are correctly parented are when they happen to get pushed by some other peer node closing BEFORE their parent tries to pop. The solution: Add a call to pushGCEventRecords() to didCompleteCurrentRecord(). Simply remove the call to pushGCEventRecords() from addRecordToTimeline() and just ensure that callers of addRecordToTimeline() push the GCEvents if they need to. 210754 1 52959 jaimeyap 2010-04-09 09:13:02 -0700 Created attachment 52959 patch 210800 2 loislo 2010-04-09 10:39:11 -0700 > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 57339) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,22 @@ > +2010-04-09 Jaime Yap <jaimeyap@google.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Web Inspector: Fixes "wrong parent" for GCEvents that come at the end of a > + timeline record node. > + https://bugs.webkit.org/show_bug.cgi?id=37340 > + > + No new tests. (OOPS!) Please remove this line. The other changes looks good to me. 210805 3 52968 jaimeyap 2010-04-09 10:44:11 -0700 Created attachment 52968 removes extra line from Changelog 211051 4 52968 commit-queue 2010-04-09 17:41:44 -0700 Comment on attachment 52968 removes extra line from Changelog Clearing flags on attachment: 52968 Committed r57387: <http://trac.webkit.org/changeset/57387> 211052 5 commit-queue 2010-04-09 17:41:49 -0700 All reviewed patches have been landed. Closing bug. 52959 2010-04-09 09:13:02 -0700 2010-04-09 10:44:11 -0700 patch gc-fix.patch text/plain 3923 jaimeyap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzMzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMDkgIEphaW1lIFlhcCAgPGphaW1leWFwQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogRml4ZXMgIndyb25nIHBhcmVudCIgZm9yIEdDRXZlbnRzIHRoYXQgY29tZSBh dCB0aGUgZW5kIG9mIGEKKyAgICAgICAgdGltZWxpbmUgcmVjb3JkIG5vZGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzM0MAorICAgICAgICAKKyAg ICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVj dG9yVGltZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpkaWRJbnN0YWxsVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6ZGlkUmVtb3ZlVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtET01Db250ZW50RXZlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya0xvYWRFdmVudCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUb1RpbWVsaW5lKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3Vy cmVudFJlY29yZCk6CisKIDIwMTAtMDQtMDkgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEd1c3Rhdm8gTm9yb25oYS4KSW5kZXg6IFdlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCShyZXZpc2lvbiA1NzI4NikK KysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNDQsNiArMTQ0LDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRXcml0ZUhUTQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEluc3RhbGxUaW1l cihpbnQgdGltZXJJZCwgaW50IHRpbWVvdXQsIGJvb2wgc2luZ2xlU2hvdCkKIHsKKyAgICBwdXNo R0NFdmVudFJlY29yZHMoKTsKICAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gVGltZWxpbmVSZWNv cmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKG1fZnJvbnRlbmQsIFdURjo6Y3VycmVudFRp bWVNUygpKTsKICAgICByZWNvcmQuc2V0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0b3J5Ojpj cmVhdGVUaW1lckluc3RhbGxEYXRhKG1fZnJvbnRlbmQsIHRpbWVySWQsIHRpbWVvdXQsIHNpbmds ZVNob3QpKTsKICAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCwgVGltZXJJbnN0YWxsVGlt ZWxpbmVSZWNvcmRUeXBlKTsKQEAgLTE1MSw2ICsxNTIsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmRpZEluc3RhbGxUCiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlk UmVtb3ZlVGltZXIoaW50IHRpbWVySWQpCiB7CisgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAg ICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2Vu ZXJpY1JlY29yZChtX2Zyb250ZW5kLCBXVEY6OmN1cnJlbnRUaW1lTVMoKSk7CiAgICAgcmVjb3Jk LnNldCgiZGF0YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1RpbWVyRGF0 YShtX2Zyb250ZW5kLCB0aW1lcklkKSk7CiAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQs IFRpbWVyUmVtb3ZlVGltZWxpbmVSZWNvcmRUeXBlKTsKQEAgLTIzOSw2ICsyNDEsNyBAQCB2b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZEZpbmlzaExvCiAKIHZvaWQgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudDo6ZGlkTWFya1RpbWVsaW5lKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKKyAg ICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAgICBTY3JpcHRPYmplY3QgcmVjb3JkID0gVGltZWxp bmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmljUmVjb3JkKG1fZnJvbnRlbmQsIFdURjo6Y3Vy cmVudFRpbWVNUygpKTsKICAgICByZWNvcmQuc2V0KCJkYXRhIiwgVGltZWxpbmVSZWNvcmRGYWN0 b3J5OjpjcmVhdGVNYXJrVGltZWxpbmVEYXRhKG1fZnJvbnRlbmQsIG1lc3NhZ2UpKTsKICAgICBh ZGRSZWNvcmRUb1RpbWVsaW5lKHJlY29yZCwgTWFya1RpbWVsaW5lUmVjb3JkVHlwZSk7CkBAIC0y NDYsMTIgKzI0OSwxNCBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtUaW1l CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya0RPTUNvbnRlbnRFdmVudCgp CiB7CisgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9 IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChtX2Zyb250ZW5kLCBX VEY6OmN1cnJlbnRUaW1lTVMoKSk7CiAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQsIE1h cmtET01Db250ZW50RXZlbnRUeXBlKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpkaWRNYXJrTG9hZEV2ZW50KCkKIHsKKyAgICBwdXNoR0NFdmVudFJlY29yZHMoKTsKICAgICBT Y3JpcHRPYmplY3QgcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVHZW5lcmlj UmVjb3JkKG1fZnJvbnRlbmQsIFdURjo6Y3VycmVudFRpbWVNUygpKTsKICAgICBhZGRSZWNvcmRU b1RpbWVsaW5lKHJlY29yZCwgTWFya0xvYWRFdmVudFR5cGUpOwogfQpAQCAtMjY5LDkgKzI3NCw3 IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6cmVzZXRGcm9udGUKIH0KIAogdm9pZCBJ bnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUb1RpbWVsaW5lKFNjcmlwdE9iamVjdCBy ZWNvcmQsIFRpbWVsaW5lUmVjb3JkVHlwZSB0eXBlKQoteyAgCi0gICAgaWYgKHR5cGUgIT0gR0NF dmVudFRpbWVsaW5lUmVjb3JkVHlwZSkKLSAgICAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7Cit7 CiAgICAgcmVjb3JkLnNldCgidHlwZSIsIHR5cGUpOwogICAgIHNldEhlYXBTaXplU3RhdGlzdGlj KHJlY29yZCk7CiAgICAgaWYgKG1fcmVjb3JkU3RhY2suaXNFbXB0eSgpKQpAQCAtMjk2LDYgKzI5 OSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGUKICAgICAvLyBB biBlbXB0eSBzdGFjayBjb3VsZCBtZXJlbHkgbWVhbiB0aGF0IHRoZSB0aW1lbGluZSBhZ2VudCB3 YXMgdHVybmVkIG9uIGluIHRoZSBtaWRkbGUgb2YKICAgICAvLyBhbiBldmVudC4gIERvbid0IHRy ZWF0IGFzIGFuIGVycm9yLgogICAgIGlmICghbV9yZWNvcmRTdGFjay5pc0VtcHR5KCkpIHsKKyAg ICAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnkg ZW50cnkgPSBtX3JlY29yZFN0YWNrLmxhc3QoKTsKICAgICAgICAgbV9yZWNvcmRTdGFjay5yZW1v dmVMYXN0KCk7CiAgICAgICAgIEFTU0VSVChlbnRyeS50eXBlID09IHR5cGUpOwo= 52968 2010-04-09 10:44:11 -0700 2010-04-09 17:41:44 -0700 removes extra line from Changelog gc-fix-v2.patch text/plain 3882 jaimeyap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzMzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDQtMDkgIEphaW1lIFlhcCAgPGphaW1leWFwQGdvb2dsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogRml4ZXMgIndyb25nIHBhcmVudCIgZm9yIEdDRXZlbnRzIHRoYXQgY29tZSBh dCB0aGUgZW5kIG9mIGEKKyAgICAgICAgdGltZWxpbmUgcmVjb3JkIG5vZGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzM0MAorCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkSW5zdGFsbFRpbWVyKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFJlbW92ZVRpbWVyKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtUaW1lbGluZSk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRNYXJrRE9NQ29udGVudEV2ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtMb2Fk RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVj b3JkVG9UaW1lbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQpOgorCiAyMDEwLTA0LTA5ICBYYW4gTG9wZXogIDx4 bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEu CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAko cmV2aXNpb24gNTcyODYpCisrKyBXZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCw3IEBAIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6ZGlkV3JpdGVIVE0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpkaWRJbnN0YWxsVGltZXIoaW50IHRpbWVySWQsIGludCB0aW1lb3V0LCBib29sIHNpbmdsZVNo b3QpCiB7CisgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgU2NyaXB0T2JqZWN0IHJlY29y ZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChtX2Zyb250ZW5k LCBXVEY6OmN1cnJlbnRUaW1lTVMoKSk7CiAgICAgcmVjb3JkLnNldCgiZGF0YSIsIFRpbWVsaW5l UmVjb3JkRmFjdG9yeTo6Y3JlYXRlVGltZXJJbnN0YWxsRGF0YShtX2Zyb250ZW5kLCB0aW1lcklk LCB0aW1lb3V0LCBzaW5nbGVTaG90KSk7CiAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQs IFRpbWVySW5zdGFsbFRpbWVsaW5lUmVjb3JkVHlwZSk7CkBAIC0xNTEsNiArMTUyLDcgQEAgdm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRJbnN0YWxsVAogCiB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZFJlbW92ZVRpbWVyKGludCB0aW1lcklkKQogeworICAgIHB1c2hHQ0V2 ZW50UmVjb3JkcygpOwogICAgIFNjcmlwdE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQobV9mcm9udGVuZCwgV1RGOjpjdXJyZW50VGltZU1T KCkpOwogICAgIHJlY29yZC5zZXQoImRhdGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0 ZUdlbmVyaWNUaW1lckRhdGEobV9mcm9udGVuZCwgdGltZXJJZCkpOwogICAgIGFkZFJlY29yZFRv VGltZWxpbmUocmVjb3JkLCBUaW1lclJlbW92ZVRpbWVsaW5lUmVjb3JkVHlwZSk7CkBAIC0yMzks NiArMjQxLDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRGaW5pc2hMbwogCiB2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtUaW1lbGluZShjb25zdCBTdHJpbmcm IG1lc3NhZ2UpCiB7CisgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgU2NyaXB0T2JqZWN0 IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZChtX2Zy b250ZW5kLCBXVEY6OmN1cnJlbnRUaW1lTVMoKSk7CiAgICAgcmVjb3JkLnNldCgiZGF0YSIsIFRp bWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlTWFya1RpbWVsaW5lRGF0YShtX2Zyb250ZW5kLCBt ZXNzYWdlKSk7CiAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQsIE1hcmtUaW1lbGluZVJl Y29yZFR5cGUpOwpAQCAtMjQ2LDEyICsyNDksMTQgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpkaWRNYXJrVGltZQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZE1hcmtE T01Db250ZW50RXZlbnQoKQogeworICAgIHB1c2hHQ0V2ZW50UmVjb3JkcygpOwogICAgIFNjcmlw dE9iamVjdCByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNv cmQobV9mcm9udGVuZCwgV1RGOjpjdXJyZW50VGltZU1TKCkpOwogICAgIGFkZFJlY29yZFRvVGlt ZWxpbmUocmVjb3JkLCBNYXJrRE9NQ29udGVudEV2ZW50VHlwZSk7CiB9CiAKIHZvaWQgSW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6ZGlkTWFya0xvYWRFdmVudCgpCiB7CisgICAgcHVzaEdDRXZlbnRS ZWNvcmRzKCk7CiAgICAgU2NyaXB0T2JqZWN0IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9y eTo6Y3JlYXRlR2VuZXJpY1JlY29yZChtX2Zyb250ZW5kLCBXVEY6OmN1cnJlbnRUaW1lTVMoKSk7 CiAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQsIE1hcmtMb2FkRXZlbnRUeXBlKTsKIH0K QEAgLTI2OSw5ICsyNzQsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnJlc2V0RnJv bnRlCiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1lbGlu ZShTY3JpcHRPYmplY3QgcmVjb3JkLCBUaW1lbGluZVJlY29yZFR5cGUgdHlwZSkKLXsgIAotICAg IGlmICh0eXBlICE9IEdDRXZlbnRUaW1lbGluZVJlY29yZFR5cGUpCi0gICAgICAgIHB1c2hHQ0V2 ZW50UmVjb3JkcygpOworewogICAgIHJlY29yZC5zZXQoInR5cGUiLCB0eXBlKTsKICAgICBzZXRI ZWFwU2l6ZVN0YXRpc3RpYyhyZWNvcmQpOwogICAgIGlmIChtX3JlY29yZFN0YWNrLmlzRW1wdHko KSkKQEAgLTI5Niw2ICsyOTksNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZENv bXBsZXRlCiAgICAgLy8gQW4gZW1wdHkgc3RhY2sgY291bGQgbWVyZWx5IG1lYW4gdGhhdCB0aGUg dGltZWxpbmUgYWdlbnQgd2FzIHR1cm5lZCBvbiBpbiB0aGUgbWlkZGxlIG9mCiAgICAgLy8gYW4g ZXZlbnQuICBEb24ndCB0cmVhdCBhcyBhbiBlcnJvci4KICAgICBpZiAoIW1fcmVjb3JkU3RhY2su aXNFbXB0eSgpKSB7CisgICAgICAgIHB1c2hHQ0V2ZW50UmVjb3JkcygpOwogICAgICAgICBUaW1l bGluZVJlY29yZEVudHJ5IGVudHJ5ID0gbV9yZWNvcmRTdGFjay5sYXN0KCk7CiAgICAgICAgIG1f cmVjb3JkU3RhY2sucmVtb3ZlTGFzdCgpOwogICAgICAgICBBU1NFUlQoZW50cnkudHlwZSA9PSB0 eXBlKTsK