111345 2013-03-04 10:22:24 -0800 Web Inspector: [refactoring] set frame identifiers in timeline records early, do not keep them in event stack 2013-03-05 04:27:20 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 111344 1 caseq caseq apavlov buildbot dglazkov keishi loislo peter+ews pfeldman pmuellr rego+ews rniwa vsevik web-inspector-bugs webkit-ews webkit.review.bot xan.lopez yurys oldest_to_newest 846608 0 caseq 2013-03-04 10:22:24 -0800 We normally have frame identifiers in begin events and can set them early, there's no need to keep them in event stack. 846612 1 191268 caseq 2013-03-04 10:25:59 -0800 Created attachment 191268 Patch 846618 2 191268 webkit-ews 2013-03-04 10:40:38 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/16953030 846619 3 191268 webkit-ews 2013-03-04 10:41:44 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/16970010 846623 4 191268 webkit.review.bot 2013-03-04 10:43:43 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16953034 846631 5 191268 webkit.review.bot 2013-03-04 10:52:41 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/16953038 846655 6 191268 buildbot 2013-03-04 11:12:43 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/16969027 846661 7 191268 buildbot 2013-03-04 11:21:33 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/16932036 847125 8 191268 eflews.bot 2013-03-04 17:56:45 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/16913463 847158 9 191268 peter+ews 2013-03-04 18:33:19 -0800 Comment on attachment 191268 Patch Attachment 191268 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/16984007 847505 10 191451 caseq 2013-03-05 03:03:18 -0800 Created attachment 191451 Patch 847556 11 caseq 2013-03-05 04:27:20 -0800 Committed r144749: <http://trac.webkit.org/changeset/144749> 191268 2013-03-04 10:25:59 -0800 2013-03-05 03:03:12 -0800 Patch bug-111345-20130304222206.patch text/plain 9270 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NjQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGExNmY2YWM3ZjIwNTQw MDllOWUzYzI1MzUxM2EyNmMwZjYyZTgzYi4uM2MzMmZhNTNjZTg4MTM4NzllM2I1MmMxZDZiNTJk YWNlMTQ3MjY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTAzLTA0ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgc2V0IGZyYW1lIGVh cmx5LCBkbyBub3Qga2VlcCBpdCBpbiBldmVudCBzdGFjaworCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtyZWZhY3RvcmluZ10gc2V0IGZyYW1lIGlkZW50aWZpZXJzIGluIHRpbWVsaW5lIHJlY29y ZHMgZWFybHksIGRvIG5vdCBrZWVwIHRoZW0gaW4gZXZlbnQgc3RhY2sKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTM0NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6cHVzaEdDRXZlbnRSZWNvcmRzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OmFkZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6aW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnNldEZyYW1lSWRlbnRpZmllcik6CisgICAg ICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50OjphcHBlbmRSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6cHVzaEN1cnJlbnRSZWNvcmQpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6Y29tbWl0RnJhbWVSZWNvcmQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjpUaW1lbGluZVJlY29yZEVudHJ5OjpUaW1lbGluZVJlY29yZEVudHJ5 KToKKyAgICAgICAgKFRpbWVsaW5lUmVjb3JkRW50cnkpOgorICAgICAgICAoSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCk6CisKKzIwMTMtMDMtMDQgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9t aXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiB1c2UgdGltZXN0YW1wcyBjb25zaXN0 ZW50IHdpdGggcmVzdCBvZiBUaW1lbGluZSBpbiBXZWJTb2NrZXQgZXZlbnRzLgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzQ0CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAppbmRl eCBkNTBiMTIzYTBjNzE4MTU3MDAxZDMxYzRjNGRhMTY2YTU2ODVhMWM5Li4wODJlOGZmZDE3MGVm NTMzMzAwZDkyNThlZjE2YTFhNWFhZmVmYzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCkBAIC0xMzMsNyArMTMzLDcgQEAg dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoR0NFdmVudFJlY29yZHMoKQogICAgICAg ICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6 OmNyZWF0ZUdlbmVyaWNSZWNvcmQodGltZXN0YW1wRnJvbU1pY3Jvc2Vjb25kcyhpLT5zdGFydFRp bWUpLCBtX21heENhbGxTdGFja0RlcHRoKTsKICAgICAgICAgcmVjb3JkLT5zZXRPYmplY3QoImRh dGEiLCBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNyZWF0ZUdDRXZlbnREYXRhKGktPmNvbGxlY3Rl ZEJ5dGVzKSk7CiAgICAgICAgIHJlY29yZC0+c2V0TnVtYmVyKCJlbmRUaW1lIiwgdGltZXN0YW1w RnJvbU1pY3Jvc2Vjb25kcyhpLT5lbmRUaW1lKSk7Ci0gICAgICAgIGFkZFJlY29yZFRvVGltZWxp bmUocmVjb3JkLnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpHQ0V2ZW50LCBTdHJpbmco KSk7CisgICAgICAgIGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgVGltZWxp bmVSZWNvcmRUeXBlOjpHQ0V2ZW50KTsKICAgICB9CiB9CiAKQEAgLTUzMiwxOCArNTMyLDE2IEBA IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkRGVzdHJveVdlYlNvY2tldCh1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIEZyYW1lCiB9CiAjZW5kaWYgLy8gRU5BQkxFKFdFQl9TT0NLRVRT KQogCi12b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFkZFJlY29yZFRvVGltZWxpbmUoUGFz c1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCwgY29uc3QgU3RyaW5nJiB0eXBlLCBjb25z dCBTdHJpbmcmIGZyYW1lSWQpCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFkZFJlY29y ZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCwgY29uc3QgU3Ry aW5nJiB0eXBlKQogewogICAgIGNvbW1pdEZyYW1lUmVjb3JkKCk7Ci0gICAgaW5uZXJBZGRSZWNv cmRUb1RpbWVsaW5lKHJlY29yZCwgdHlwZSwgZnJhbWVJZCk7CisgICAgaW5uZXJBZGRSZWNvcmRU b1RpbWVsaW5lKHJlY29yZCwgdHlwZSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6aW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBw cnBSZWNvcmQsIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBmcmFtZUlkKQordm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojppbm5lckFkZFJlY29yZFRvVGltZWxpbmUoUGFzc1Jl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHBycFJlY29yZCwgY29uc3QgU3RyaW5nJiB0eXBlKQogewog ICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZChwcnBSZWNvcmQpOwogICAgIHJlY29y ZC0+c2V0U3RyaW5nKCJ0eXBlIiwgdHlwZSk7Ci0gICAgaWYgKCFmcmFtZUlkLmlzRW1wdHkoKSkK LSAgICAgICAgcmVjb3JkLT5zZXRTdHJpbmcoImZyYW1lSWQiLCBmcmFtZUlkKTsKICAgICBpZiAo dHlwZSA9PSBUaW1lbGluZVJlY29yZFR5cGU6OlByb2dyYW0pCiAgICAgICAgIHNldE5hdGl2ZUhl YXBTdGF0aXN0aWNzKHJlY29yZC5nZXQoKSk7CiAgICAgZWxzZQpAQCAtNTk3LDYgKzU5NSwxNiBA QCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnNldE5hdGl2ZUhlYXBTdGF0aXN0aWNzKElu c3BlY3Rvck9iamVjdCogcmVjb3JkKQogICAgIHJlY29yZC0+c2V0T2JqZWN0KCJuYXRpdmVIZWFw U3RhdGlzdGljcyIsIHN0YXRzLnJlbGVhc2UoKSk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6c2V0RnJhbWVJZGVudGlmaWVyKEluc3BlY3Rvck9iamVjdCogcmVjb3JkLCBGcmFt ZSogZnJhbWUpCit7CisgICAgaWYgKCFmcmFtZSB8fCAhbV9wYWdlQWdlbnQpCisgICAgICAgIHJl dHVybjsKKyAgICBTdHJpbmcgZnJhbWVJZDsKKyAgICBpZiAoZnJhbWUgJiYgbV9wYWdlQWdlbnQp CisgICAgICAgIGZyYW1lSWQgPSBtX3BhZ2VBZ2VudC0+ZnJhbWVJZChmcmFtZSk7CisgICAgcmVj b3JkLT5zZXRTdHJpbmcoImZyYW1lSWQiLCBmcmFtZUlkKTsKK30KKwogdm9pZCBJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoY29uc3QgU3RyaW5nJiB0eXBl KQogewogICAgIC8vIEFuIGVtcHR5IHN0YWNrIGNvdWxkIG1lcmVseSBtZWFuIHRoYXQgdGhlIHRp bWVsaW5lIGFnZW50IHdhcyB0dXJuZWQgb24gaW4gdGhlIG1pZGRsZSBvZgpAQCAtNjE3LDcgKzYy NSw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVDdXJyZW50UmVj b3JkKGNvbnN0IFN0cmluZyYgdHlwZSkKICAgICAgICAgc2l6ZV90IHVzZWRIZWFwU2l6ZURlbHRh ID0gZ2V0VXNlZEhlYXBTaXplKCkgLSBlbnRyeS51c2VkSGVhcFNpemVBdFN0YXJ0OwogICAgICAg ICBpZiAodXNlZEhlYXBTaXplRGVsdGEpCiAgICAgICAgICAgICBlbnRyeS5yZWNvcmQtPnNldE51 bWJlcigidXNlZEhlYXBTaXplRGVsdGEiLCB1c2VkSGVhcFNpemVEZWx0YSk7Ci0gICAgICAgIGFk ZFJlY29yZFRvVGltZWxpbmUoZW50cnkucmVjb3JkLCB0eXBlLCBlbnRyeS5mcmFtZUlkKTsKKyAg ICAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQsIHR5cGUpOwogICAgIH0KIH0K IApAQCAtNjQyLDEwICs2NTAsOCBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFwcGVu ZFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgY29ucwogICAgIFJlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRl R2VuZXJpY1JlY29yZCh0aW1lc3RhbXAoKSwgY2FwdHVyZUNhbGxTdGFjayA/IG1fbWF4Q2FsbFN0 YWNrRGVwdGggOiAwKTsKICAgICByZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIGRhdGEpOwogICAg IHJlY29yZC0+c2V0U3RyaW5nKCJ0eXBlIiwgdHlwZSk7Ci0gICAgU3RyaW5nIGZyYW1lSWQ7Ci0g ICAgaWYgKGZyYW1lICYmIG1fcGFnZUFnZW50KQotICAgICAgICBmcmFtZUlkID0gbV9wYWdlQWdl bnQtPmZyYW1lSWQoZnJhbWUpOwotICAgIGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVh c2UoKSwgdHlwZSwgZnJhbWVJZCk7CisgICAgc2V0RnJhbWVJZGVudGlmaWVyKHJlY29yZC5nZXQo KSwgZnJhbWUpOworICAgIGFkZFJlY29yZFRvVGltZWxpbmUocmVjb3JkLnJlbGVhc2UoKSwgdHlw ZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YXBwZW5kQmFja2dyb3VuZFRo cmVhZFJlY29yZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgY29uc3QgU3RyaW5n JiB0eXBlLCBkb3VibGUgc3RhcnRUaW1lLCBkb3VibGUgZW5kVGltZSwgY29uc3QgU3RyaW5nJiB0 aHJlYWROYW1lKQpAQCAtNjY0LDEwICs2NzAsOCBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdl bnQ6OnB1c2hDdXJyZW50UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLAog ICAgIHB1c2hHQ0V2ZW50UmVjb3JkcygpOwogICAgIGNvbW1pdEZyYW1lUmVjb3JkKCk7CiAgICAg UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5Ojpj cmVhdGVHZW5lcmljUmVjb3JkKHRpbWVzdGFtcCgpLCBjYXB0dXJlQ2FsbFN0YWNrID8gbV9tYXhD YWxsU3RhY2tEZXB0aCA6IDApOwotICAgIFN0cmluZyBmcmFtZUlkOwotICAgIGlmIChmcmFtZSAm JiBtX3BhZ2VBZ2VudCkKLSAgICAgICAgZnJhbWVJZCA9IG1fcGFnZUFnZW50LT5mcmFtZUlkKGZy YW1lKTsKLSAgICBtX3JlY29yZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29yZEVudHJ5KHJlY29y ZC5yZWxlYXNlKCksIGRhdGEsIEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSwgdHlwZSwgZnJhbWVJ ZCwgZ2V0VXNlZEhlYXBTaXplKCkpKTsKKyAgICBzZXRGcmFtZUlkZW50aWZpZXIocmVjb3JkLmdl dCgpLCBmcmFtZSk7CisgICAgbV9yZWNvcmRTdGFjay5hcHBlbmQoVGltZWxpbmVSZWNvcmRFbnRy eShyZWNvcmQucmVsZWFzZSgpLCBkYXRhLCBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCksIHR5cGUs IGdldFVzZWRIZWFwU2l6ZSgpKSk7CiAgICAgaWYgKGhhc0xvd0xldmVsRGV0YWlscyAmJiAhbV9w bGF0Zm9ybUluc3RydW1lbnRhdGlvbkNsaWVudEluc3RhbGxlZEF0U3RhY2tEZXB0aCAmJiAhUGxh dGZvcm1JbnN0cnVtZW50YXRpb246Omhhc0NsaWVudCgpKSB7CiAgICAgICAgIG1fcGxhdGZvcm1J bnN0cnVtZW50YXRpb25DbGllbnRJbnN0YWxsZWRBdFN0YWNrRGVwdGggPSBtX3JlY29yZFN0YWNr LnNpemUoKTsKICAgICAgICAgUGxhdGZvcm1JbnN0cnVtZW50YXRpb246OnNldENsaWVudCh0aGlz KTsKQEAgLTY4MCw3ICs2ODQsNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNvbW1p dEZyYW1lUmVjb3JkKCkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIG1fcGVuZGluZ0ZyYW1l UmVjb3JkLT5zZXRPYmplY3QoImRhdGEiLCBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpKTsKLSAg ICBpbm5lckFkZFJlY29yZFRvVGltZWxpbmUobV9wZW5kaW5nRnJhbWVSZWNvcmQucmVsZWFzZSgp LCBUaW1lbGluZVJlY29yZFR5cGU6OkJlZ2luRnJhbWUsICIiKTsKKyAgICBpbm5lckFkZFJlY29y ZFRvVGltZWxpbmUobV9wZW5kaW5nRnJhbWVSZWNvcmQucmVsZWFzZSgpLCBUaW1lbGluZVJlY29y ZFR5cGU6OkJlZ2luRnJhbWUpOwogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNs ZWFyUmVjb3JkU3RhY2soKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JUaW1lbGluZUFnZW50LmgKaW5kZXggYTQxN2U0ZDAzNTI5MTBiZDlmYTIwOGM4ZTEwMmY2ZTBl YTg3YjVlYS4uYjhlMDg3NmM4MDkyNTc2NjdkNTIzMjMxZWEyNDQ3ODM0ZGVhOTlmYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCkBA IC0xODYsMTUgKzE4NiwxNCBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBUaW1lbGluZVRy YWNlRXZlbnRQcm9jZXNzb3I7CiAKICAgICBzdHJ1Y3QgVGltZWxpbmVSZWNvcmRFbnRyeSB7Ci0g ICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnkoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJl Y29yZCwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEsIFBhc3NSZWZQdHI8SW5zcGVj dG9yQXJyYXk+IGNoaWxkcmVuLCBjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgZnJh bWVJZCwgc2l6ZV90IHVzZWRIZWFwU2l6ZUF0U3RhcnQpCi0gICAgICAgICAgICA6IHJlY29yZChy ZWNvcmQpLCBkYXRhKGRhdGEpLCBjaGlsZHJlbihjaGlsZHJlbiksIHR5cGUodHlwZSksIGZyYW1l SWQoZnJhbWVJZCksIHVzZWRIZWFwU2l6ZUF0U3RhcnQodXNlZEhlYXBTaXplQXRTdGFydCkKKyAg ICAgICAgVGltZWxpbmVSZWNvcmRFbnRyeShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVj b3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgUGFzc1JlZlB0cjxJbnNwZWN0 b3JBcnJheT4gY2hpbGRyZW4sIGNvbnN0IFN0cmluZyYgdHlwZSwgc2l6ZV90IHVzZWRIZWFwU2l6 ZUF0U3RhcnQpCisgICAgICAgICAgICA6IHJlY29yZChyZWNvcmQpLCBkYXRhKGRhdGEpLCBjaGls ZHJlbihjaGlsZHJlbiksIHR5cGUodHlwZSksIHVzZWRIZWFwU2l6ZUF0U3RhcnQodXNlZEhlYXBT aXplQXRTdGFydCkKICAgICAgICAgewogICAgICAgICB9CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IHJlY29yZDsKICAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YTsK ICAgICAgICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjaGlsZHJlbjsKICAgICAgICAgU3RyaW5n IHR5cGU7Ci0gICAgICAgIFN0cmluZyBmcmFtZUlkOwogICAgICAgICBzaXplX3QgdXNlZEhlYXBT aXplQXRTdGFydDsKICAgICB9OwogICAgICAgICAKQEAgLTIwMywxNyArMjAyLDE5IEBAIHByaXZh dGU6CiAgICAgdm9pZCBhcHBlbmRCYWNrZ3JvdW5kVGhyZWFkUmVjb3JkKFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zdCBTdHJpbmcmIHR5cGUsIGRvdWJsZSBzdGFydFRpbWUs IGRvdWJsZSBlbmRUaW1lLCBjb25zdCBTdHJpbmcmIHRocmVhZE5hbWUpOwogICAgIHZvaWQgYXBw ZW5kUmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zdCBTdHJpbmcm IHR5cGUsIGJvb2wgY2FwdHVyZUNhbGxTdGFjaywgRnJhbWUqKTsKICAgICB2b2lkIHB1c2hDdXJy ZW50UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiwgY29uc3QgU3RyaW5nJiB0eXBl LCBib29sIGNhcHR1cmVDYWxsU3RhY2ssIEZyYW1lKiwgYm9vbCBoYXNMb3dMZXZlbERldGFpbHMg PSBmYWxzZSk7CisKICAgICB2b2lkIHNldERPTUNvdW50ZXJzKEluc3BlY3Rvck9iamVjdCogcmVj b3JkKTsKICAgICB2b2lkIHNldE5hdGl2ZUhlYXBTdGF0aXN0aWNzKEluc3BlY3Rvck9iamVjdCog cmVjb3JkKTsKKyAgICB2b2lkIHNldEZyYW1lSWRlbnRpZmllcihJbnNwZWN0b3JPYmplY3QqIHJl Y29yZCwgRnJhbWUqKTsKKyAgICB2b2lkIHB1c2hHQ0V2ZW50UmVjb3JkcygpOwogCiAgICAgdm9p ZCBkaWRDb21wbGV0ZUN1cnJlbnRSZWNvcmQoY29uc3QgU3RyaW5nJiB0eXBlKTsKIAogICAgIHZv aWQgc2V0SGVhcFNpemVTdGF0aXN0aWNzKEluc3BlY3Rvck9iamVjdCogcmVjb3JkKTsKLSAgICB2 b2lkIHB1c2hHQ0V2ZW50UmVjb3JkcygpOwogICAgIHZvaWQgY29tbWl0RnJhbWVSZWNvcmQoKTsK IAotICAgIHZvaWQgYWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVj dD4sIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBmcmFtZUlkKTsKLSAgICB2b2lk IGlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIGNv bnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBmcmFtZUlkKTsKKyAgICB2b2lkIGFkZFJl Y29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+LCBjb25zdCBTdHJpbmcm IHR5cGUpOworICAgIHZvaWQgaW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiwgY29uc3QgU3RyaW5nJiB0eXBlKTsKICAgICB2b2lkIGNsZWFyUmVjb3Jk U3RhY2soKTsKIAogICAgIGRvdWJsZSB0aW1lc3RhbXAoKTsK 191451 2013-03-05 03:03:18 -0800 2013-03-05 03:52:26 -0800 Patch bug-111345-20130305145925.patch text/plain 9212 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODRhYmRmMDMwOWVkYTcy MjExNzhjYTc4YTMyMTI0MzJiYjMxMGYyNC4uNGZlNTlhNDU0ZWJlNTFmMDgxMDBhYTkzMjRlZjNi ZWU0ZjA4MmExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTAzLTA0ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBzZXQgZnJhbWUgaWRlbnRpZmllcnMgaW4gdGltZWxpbmUgcmVjb3Jk cyBlYXJseSwgZG8gbm90IGtlZXAgdGhlbSBpbiBldmVudCBzdGFjaworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMzQ1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjpwdXNoR0NFdmVudFJlY29yZHMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxp bmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1lbGluZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JUaW1lbGluZUFnZW50Ojppbm5lckFkZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c2V0RnJhbWVJZGVudGlmaWVyKToKKyAgICAg ICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6 ZGlkQ29tcGxldGVDdXJyZW50UmVjb3JkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmFwcGVuZFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpwdXNoQ3VycmVudFJlY29yZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JUaW1lbGluZUFnZW50Ojpjb21taXRGcmFtZVJlY29yZCk6CisgICAgICAgICogaW5zcGVj dG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OlRpbWVsaW5lUmVjb3JkRW50cnk6OlRpbWVsaW5lUmVjb3JkRW50cnkp OgorICAgICAgICAoVGltZWxpbmVSZWNvcmRFbnRyeSk6CisgICAgICAgIChJbnNwZWN0b3JUaW1l bGluZUFnZW50KToKKworMjAxMy0wMy0wNCAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21p dW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHVzZSB0aW1lc3RhbXBzIGNvbnNpc3Rl bnQgd2l0aCByZXN0IG9mIFRpbWVsaW5lIGluIFdlYlNvY2tldCBldmVudHMuCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTEzNDQKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4 IGQ1MGIxMjNhMGM3MTgxNTcwMDFkMzFjNGM0ZGExNjZhNTY4NWExYzkuLjA4MmU4ZmZkMTcwZWY1 MzMzMDBkOTI1OGVmMTZhMWE1YWFmZWZjMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKQEAgLTEzMyw3ICsxMzMsNyBAQCB2 b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hHQ0V2ZW50UmVjb3JkcygpCiAgICAgICAg IFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6 Y3JlYXRlR2VuZXJpY1JlY29yZCh0aW1lc3RhbXBGcm9tTWljcm9zZWNvbmRzKGktPnN0YXJ0VGlt ZSksIG1fbWF4Q2FsbFN0YWNrRGVwdGgpOwogICAgICAgICByZWNvcmQtPnNldE9iamVjdCgiZGF0 YSIsIFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR0NFdmVudERhdGEoaS0+Y29sbGVjdGVk Qnl0ZXMpKTsKICAgICAgICAgcmVjb3JkLT5zZXROdW1iZXIoImVuZFRpbWUiLCB0aW1lc3RhbXBG cm9tTWljcm9zZWNvbmRzKGktPmVuZFRpbWUpKTsKLSAgICAgICAgYWRkUmVjb3JkVG9UaW1lbGlu ZShyZWNvcmQucmVsZWFzZSgpLCBUaW1lbGluZVJlY29yZFR5cGU6OkdDRXZlbnQsIFN0cmluZygp KTsKKyAgICAgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCBUaW1lbGlu ZVJlY29yZFR5cGU6OkdDRXZlbnQpOwogICAgIH0KIH0KIApAQCAtNTMyLDE4ICs1MzIsMTYgQEAg dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWREZXN0cm95V2ViU29ja2V0KHVuc2lnbmVk IGxvbmcgaWRlbnRpZmllciwgRnJhbWUKIH0KICNlbmRpZiAvLyBFTkFCTEUoV0VCX1NPQ0tFVFMp CiAKLXZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3JkVG9UaW1lbGluZShQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkLCBjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0 IFN0cmluZyYgZnJhbWVJZCkKK3ZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YWRkUmVjb3Jk VG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkLCBjb25zdCBTdHJp bmcmIHR5cGUpCiB7CiAgICAgY29tbWl0RnJhbWVSZWNvcmQoKTsKLSAgICBpbm5lckFkZFJlY29y ZFRvVGltZWxpbmUocmVjb3JkLCB0eXBlLCBmcmFtZUlkKTsKKyAgICBpbm5lckFkZFJlY29yZFRv VGltZWxpbmUocmVjb3JkLCB0eXBlKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50 Ojppbm5lckFkZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHBy cFJlY29yZCwgY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQpCit2b2lk IEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gcHJwUmVjb3JkLCBjb25zdCBTdHJpbmcmIHR5cGUpCiB7CiAg ICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVjb3JkKHBycFJlY29yZCk7CiAgICAgcmVjb3Jk LT5zZXRTdHJpbmcoInR5cGUiLCB0eXBlKTsKLSAgICBpZiAoIWZyYW1lSWQuaXNFbXB0eSgpKQot ICAgICAgICByZWNvcmQtPnNldFN0cmluZygiZnJhbWVJZCIsIGZyYW1lSWQpOwogICAgIGlmICh0 eXBlID09IFRpbWVsaW5lUmVjb3JkVHlwZTo6UHJvZ3JhbSkKICAgICAgICAgc2V0TmF0aXZlSGVh cFN0YXRpc3RpY3MocmVjb3JkLmdldCgpKTsKICAgICBlbHNlCkBAIC01OTcsNiArNTk1LDE2IEBA IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c2V0TmF0aXZlSGVhcFN0YXRpc3RpY3MoSW5z cGVjdG9yT2JqZWN0KiByZWNvcmQpCiAgICAgcmVjb3JkLT5zZXRPYmplY3QoIm5hdGl2ZUhlYXBT dGF0aXN0aWNzIiwgc3RhdHMucmVsZWFzZSgpKTsKIH0KIAordm9pZCBJbnNwZWN0b3JUaW1lbGlu ZUFnZW50OjpzZXRGcmFtZUlkZW50aWZpZXIoSW5zcGVjdG9yT2JqZWN0KiByZWNvcmQsIEZyYW1l KiBmcmFtZSkKK3sKKyAgICBpZiAoIWZyYW1lIHx8ICFtX3BhZ2VBZ2VudCkKKyAgICAgICAgcmV0 dXJuOworICAgIFN0cmluZyBmcmFtZUlkOworICAgIGlmIChmcmFtZSAmJiBtX3BhZ2VBZ2VudCkK KyAgICAgICAgZnJhbWVJZCA9IG1fcGFnZUFnZW50LT5mcmFtZUlkKGZyYW1lKTsKKyAgICByZWNv cmQtPnNldFN0cmluZygiZnJhbWVJZCIsIGZyYW1lSWQpOworfQorCiB2b2lkIEluc3BlY3RvclRp bWVsaW5lQWdlbnQ6OmRpZENvbXBsZXRlQ3VycmVudFJlY29yZChjb25zdCBTdHJpbmcmIHR5cGUp CiB7CiAgICAgLy8gQW4gZW1wdHkgc3RhY2sgY291bGQgbWVyZWx5IG1lYW4gdGhhdCB0aGUgdGlt ZWxpbmUgYWdlbnQgd2FzIHR1cm5lZCBvbiBpbiB0aGUgbWlkZGxlIG9mCkBAIC02MTcsNyArNjI1 LDcgQEAgdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpkaWRDb21wbGV0ZUN1cnJlbnRSZWNv cmQoY29uc3QgU3RyaW5nJiB0eXBlKQogICAgICAgICBzaXplX3QgdXNlZEhlYXBTaXplRGVsdGEg PSBnZXRVc2VkSGVhcFNpemUoKSAtIGVudHJ5LnVzZWRIZWFwU2l6ZUF0U3RhcnQ7CiAgICAgICAg IGlmICh1c2VkSGVhcFNpemVEZWx0YSkKICAgICAgICAgICAgIGVudHJ5LnJlY29yZC0+c2V0TnVt YmVyKCJ1c2VkSGVhcFNpemVEZWx0YSIsIHVzZWRIZWFwU2l6ZURlbHRhKTsKLSAgICAgICAgYWRk UmVjb3JkVG9UaW1lbGluZShlbnRyeS5yZWNvcmQsIHR5cGUsIGVudHJ5LmZyYW1lSWQpOworICAg ICAgICBhZGRSZWNvcmRUb1RpbWVsaW5lKGVudHJ5LnJlY29yZCwgdHlwZSk7CiAgICAgfQogfQog CkBAIC02NDIsMTAgKzY1MCw4IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6YXBwZW5k UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zCiAgICAgUmVmUHRy PEluc3BlY3Rvck9iamVjdD4gcmVjb3JkID0gVGltZWxpbmVSZWNvcmRGYWN0b3J5OjpjcmVhdGVH ZW5lcmljUmVjb3JkKHRpbWVzdGFtcCgpLCBjYXB0dXJlQ2FsbFN0YWNrID8gbV9tYXhDYWxsU3Rh Y2tEZXB0aCA6IDApOwogICAgIHJlY29yZC0+c2V0T2JqZWN0KCJkYXRhIiwgZGF0YSk7CiAgICAg cmVjb3JkLT5zZXRTdHJpbmcoInR5cGUiLCB0eXBlKTsKLSAgICBTdHJpbmcgZnJhbWVJZDsKLSAg ICBpZiAoZnJhbWUgJiYgbV9wYWdlQWdlbnQpCi0gICAgICAgIGZyYW1lSWQgPSBtX3BhZ2VBZ2Vu dC0+ZnJhbWVJZChmcmFtZSk7Ci0gICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFz ZSgpLCB0eXBlLCBmcmFtZUlkKTsKKyAgICBzZXRGcmFtZUlkZW50aWZpZXIocmVjb3JkLmdldCgp LCBmcmFtZSk7CisgICAgYWRkUmVjb3JkVG9UaW1lbGluZShyZWNvcmQucmVsZWFzZSgpLCB0eXBl KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphcHBlbmRCYWNrZ3JvdW5kVGhy ZWFkUmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zdCBTdHJpbmcm IHR5cGUsIGRvdWJsZSBzdGFydFRpbWUsIGRvdWJsZSBlbmRUaW1lLCBjb25zdCBTdHJpbmcmIHRo cmVhZE5hbWUpCkBAIC02NjQsMTAgKzY3MCw4IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6cHVzaEN1cnJlbnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEsCiAg ICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgY29tbWl0RnJhbWVSZWNvcmQoKTsKICAgICBS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZhY3Rvcnk6OmNy ZWF0ZUdlbmVyaWNSZWNvcmQodGltZXN0YW1wKCksIGNhcHR1cmVDYWxsU3RhY2sgPyBtX21heENh bGxTdGFja0RlcHRoIDogMCk7Ci0gICAgU3RyaW5nIGZyYW1lSWQ7Ci0gICAgaWYgKGZyYW1lICYm IG1fcGFnZUFnZW50KQotICAgICAgICBmcmFtZUlkID0gbV9wYWdlQWdlbnQtPmZyYW1lSWQoZnJh bWUpOwotICAgIG1fcmVjb3JkU3RhY2suYXBwZW5kKFRpbWVsaW5lUmVjb3JkRW50cnkocmVjb3Jk LnJlbGVhc2UoKSwgZGF0YSwgSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpLCB0eXBlLCBmcmFtZUlk LCBnZXRVc2VkSGVhcFNpemUoKSkpOworICAgIHNldEZyYW1lSWRlbnRpZmllcihyZWNvcmQuZ2V0 KCksIGZyYW1lKTsKKyAgICBtX3JlY29yZFN0YWNrLmFwcGVuZChUaW1lbGluZVJlY29yZEVudHJ5 KHJlY29yZC5yZWxlYXNlKCksIGRhdGEsIEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSwgdHlwZSwg Z2V0VXNlZEhlYXBTaXplKCkpKTsKICAgICBpZiAoaGFzTG93TGV2ZWxEZXRhaWxzICYmICFtX3Bs YXRmb3JtSW5zdHJ1bWVudGF0aW9uQ2xpZW50SW5zdGFsbGVkQXRTdGFja0RlcHRoICYmICFQbGF0 Zm9ybUluc3RydW1lbnRhdGlvbjo6aGFzQ2xpZW50KCkpIHsKICAgICAgICAgbV9wbGF0Zm9ybUlu c3RydW1lbnRhdGlvbkNsaWVudEluc3RhbGxlZEF0U3RhY2tEZXB0aCA9IG1fcmVjb3JkU3RhY2su c2l6ZSgpOwogICAgICAgICBQbGF0Zm9ybUluc3RydW1lbnRhdGlvbjo6c2V0Q2xpZW50KHRoaXMp OwpAQCAtNjgwLDcgKzY4NCw3IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y29tbWl0 RnJhbWVSZWNvcmQoKQogICAgICAgICByZXR1cm47CiAgICAgCiAgICAgbV9wZW5kaW5nRnJhbWVS ZWNvcmQtPnNldE9iamVjdCgiZGF0YSIsIEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCkpOwotICAg IGlubmVyQWRkUmVjb3JkVG9UaW1lbGluZShtX3BlbmRpbmdGcmFtZVJlY29yZC5yZWxlYXNlKCks IFRpbWVsaW5lUmVjb3JkVHlwZTo6QmVnaW5GcmFtZSwgIiIpOworICAgIGlubmVyQWRkUmVjb3Jk VG9UaW1lbGluZShtX3BlbmRpbmdGcmFtZVJlY29yZC5yZWxlYXNlKCksIFRpbWVsaW5lUmVjb3Jk VHlwZTo6QmVnaW5GcmFtZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y2xl YXJSZWNvcmRTdGFjaygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clRpbWVsaW5lQWdlbnQuaAppbmRleCBhNDE3ZTRkMDM1MjkxMGJkOWZhMjA4YzhlMTAyZjZlMGVh ODdiNWVhLi5iOGUwODc2YzgwOTI1NzY2N2Q1MjMyMzFlYTI0NDc4MzRkZWE5OWZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAg LTE4NiwxNSArMTg2LDE0IEBAIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFRpbWVsaW5lVHJh Y2VFdmVudFByb2Nlc3NvcjsKIAogICAgIHN0cnVjdCBUaW1lbGluZVJlY29yZEVudHJ5IHsKLSAg ICAgICAgVGltZWxpbmVSZWNvcmRFbnRyeShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gcmVj b3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgUGFzc1JlZlB0cjxJbnNwZWN0 b3JBcnJheT4gY2hpbGRyZW4sIGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBmcmFt ZUlkLCBzaXplX3QgdXNlZEhlYXBTaXplQXRTdGFydCkKLSAgICAgICAgICAgIDogcmVjb3JkKHJl Y29yZCksIGRhdGEoZGF0YSksIGNoaWxkcmVuKGNoaWxkcmVuKSwgdHlwZSh0eXBlKSwgZnJhbWVJ ZChmcmFtZUlkKSwgdXNlZEhlYXBTaXplQXRTdGFydCh1c2VkSGVhcFNpemVBdFN0YXJ0KQorICAg ICAgICBUaW1lbGluZVJlY29yZEVudHJ5KFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNv cmQsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBQYXNzUmVmUHRyPEluc3BlY3Rv ckFycmF5PiBjaGlsZHJlbiwgY29uc3QgU3RyaW5nJiB0eXBlLCBzaXplX3QgdXNlZEhlYXBTaXpl QXRTdGFydCkKKyAgICAgICAgICAgIDogcmVjb3JkKHJlY29yZCksIGRhdGEoZGF0YSksIGNoaWxk cmVuKGNoaWxkcmVuKSwgdHlwZSh0eXBlKSwgdXNlZEhlYXBTaXplQXRTdGFydCh1c2VkSGVhcFNp emVBdFN0YXJ0KQogICAgICAgICB7CiAgICAgICAgIH0KICAgICAgICAgUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4gcmVjb3JkOwogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhOwog ICAgICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGNoaWxkcmVuOwogICAgICAgICBTdHJpbmcg dHlwZTsKLSAgICAgICAgU3RyaW5nIGZyYW1lSWQ7CiAgICAgICAgIHNpemVfdCB1c2VkSGVhcFNp emVBdFN0YXJ0OwogICAgIH07CiAgICAgICAgIApAQCAtMjAzLDE3ICsyMDIsMTkgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGFwcGVuZEJhY2tncm91bmRUaHJlYWRSZWNvcmQoUGFzc1JlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGRhdGEsIGNvbnN0IFN0cmluZyYgdHlwZSwgZG91YmxlIHN0YXJ0VGltZSwg ZG91YmxlIGVuZFRpbWUsIGNvbnN0IFN0cmluZyYgdGhyZWFkTmFtZSk7CiAgICAgdm9pZCBhcHBl bmRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGRhdGEsIGNvbnN0IFN0cmluZyYg dHlwZSwgYm9vbCBjYXB0dXJlQ2FsbFN0YWNrLCBGcmFtZSopOwogICAgIHZvaWQgcHVzaEN1cnJl bnRSZWNvcmQoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+LCBjb25zdCBTdHJpbmcmIHR5cGUs IGJvb2wgY2FwdHVyZUNhbGxTdGFjaywgRnJhbWUqLCBib29sIGhhc0xvd0xldmVsRGV0YWlscyA9 IGZhbHNlKTsKKwogICAgIHZvaWQgc2V0RE9NQ291bnRlcnMoSW5zcGVjdG9yT2JqZWN0KiByZWNv cmQpOwogICAgIHZvaWQgc2V0TmF0aXZlSGVhcFN0YXRpc3RpY3MoSW5zcGVjdG9yT2JqZWN0KiBy ZWNvcmQpOworICAgIHZvaWQgc2V0RnJhbWVJZGVudGlmaWVyKEluc3BlY3Rvck9iamVjdCogcmVj b3JkLCBGcmFtZSopOworICAgIHZvaWQgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAKICAgICB2b2lk IGRpZENvbXBsZXRlQ3VycmVudFJlY29yZChjb25zdCBTdHJpbmcmIHR5cGUpOwogCiAgICAgdm9p ZCBzZXRIZWFwU2l6ZVN0YXRpc3RpY3MoSW5zcGVjdG9yT2JqZWN0KiByZWNvcmQpOwotICAgIHZv aWQgcHVzaEdDRXZlbnRSZWNvcmRzKCk7CiAgICAgdm9pZCBjb21taXRGcmFtZVJlY29yZCgpOwog Ci0gICAgdm9pZCBhZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0 PiwgY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQpOwotICAgIHZvaWQg aW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiwgY29u c3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQpOworICAgIHZvaWQgYWRkUmVj b3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0cmluZyYg dHlwZSk7CisgICAgdm9pZCBpbm5lckFkZFJlY29yZFRvVGltZWxpbmUoUGFzc1JlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+LCBjb25zdCBTdHJpbmcmIHR5cGUpOwogICAgIHZvaWQgY2xlYXJSZWNvcmRT dGFjaygpOwogCiAgICAgZG91YmxlIHRpbWVzdGFtcCgpOwo=