174237 2017-07-06 20:45:59 -0700 Fix bad usage of static variables in ResourceLoadStatisticsStore 2017-07-06 22:19:18 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez bfulgham commit-queue wilander oldest_to_newest 1326350 0 cdumez 2017-07-06 20:45:59 -0700 Fix bad usage of static variables in ResourceLoadStatisticsStore. Those can be set via member functions on ResourceLoadStatisticsStore so they should be data members. The API to set them is associated to a particular store and there can in theory be several stores. 1326352 1 314806 cdumez 2017-07-06 20:47:44 -0700 Created attachment 314806 Patch 1326354 2 314808 cdumez 2017-07-06 20:48:25 -0700 Created attachment 314808 Patch 1326355 3 314809 cdumez 2017-07-06 20:50:31 -0700 Created attachment 314809 Patch 1326372 4 314809 bfulgham 2017-07-06 21:36:07 -0700 Comment on attachment 314809 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314809&action=review > Source/WebKit2/UIProcess/Storage/ResourceLoadStatisticsStore.cpp:263 > + m_timeToLiveUserInteraction = seconds; These are all fine, but I would have preferred an early return for < 0 in the original version. 1326373 5 314813 cdumez 2017-07-06 21:41:39 -0700 Created attachment 314813 Patch 1326390 6 314813 commit-queue 2017-07-06 22:19:16 -0700 Comment on attachment 314813 Patch Clearing flags on attachment: 314813 Committed r219242: <http://trac.webkit.org/changeset/219242> 1326391 7 commit-queue 2017-07-06 22:19:18 -0700 All reviewed patches have been landed. Closing bug. 314806 2017-07-06 20:47:44 -0700 2017-07-06 20:48:23 -0700 Patch bug-174237-20170706204742.patch text/plain 7136 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IxZGM5Y2E2NWE0ZjMz MWE3MDZmMWExMTg2MDU1NTNjNjFhMDA5ZS4uODgxZjYyOTE5ZjYyZmZlNGUyNWNmZWViZWIwOTlm OTU3YzQxNWUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS4gVGhvc2UgY2Fu IGJlIHNldCB2aWEKKyAgICAgICAgbWVtYmVyIGZ1bmN0aW9ucyBvbiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUgc28gdGhleSBzaG91bGQgYmUgZGF0YSBtZW1iZXJzLiBUaGUKKyAgICAgICAg QVBJIHRvIHNldCB0aGVtIGlzIGFzc29jaWF0ZWQgdG8gYSBwYXJ0aWN1bGFyIHN0b3JlIGFuZCB0 aGVyZSBjYW4gaW4gdGhlb3J5IGJlIHNldmVyYWwKKyAgICAgICAgc3RvcmVzLgorCisgICAgICAg ICogVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRQYXJ0aXRp b25Db29raWVzKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSk6 CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0TWluaW11 bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRHcmFuZGZhdGhlcmluZ1RpbWUpOgorICAgICAgICAo V2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc0hhZFJlY2VudFVzZXJJbnRl cmFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 aGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0eU9yTm9TdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxkUmVtb3ZlRGF0YVJlY29yZHMpOgorICAg ICAgICAoV2ViS2l0OjpzaG91bGRQYXJ0aXRpb25Db29raWVzKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKworMjAx Ny0wNy0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIERyb3Ag dW51c2VkIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgbWVtYmVycwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjI2CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwCmluZGV4IGJmNDFhNTA3ZGI3ZjA0MWYxYzRlMjQzNmEwZTIyZjllNWY2Mjhm NjIuLjQ2ZTlhMjExYTJlYWE4ZmU4ZTJjMzA3NmFjY2QxM2YyNDJjNDNhOTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtMzksMTEgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYktp dCB7CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1zdGF0aWMgY29uc3QgYXV0byBzdGF0 aXN0aWNzTW9kZWxWZXJzaW9uID0gNTsKLXN0YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVVc2VySW50 ZXJhY3Rpb24geyAyNF9oICogMzAuIH07Ci1zdGF0aWMgU2Vjb25kcyB0aW1lVG9MaXZlQ29va2ll UGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKLXN0YXRpYyBTZWNvbmRzIGdyYW5kZmF0aGVyaW5nVGlt ZSB7IDFfaCB9Owotc3RhdGljIFNlY29uZHMgbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNS ZW1vdmFsIHsgMV9oIH07CitzdGF0aWMgY29uc3QgdW5zaWduZWQgc3RhdGlzdGljc01vZGVsVmVy c2lvbiB7IDUgfTsKIAogUmVmPFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZT4gUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpjcmVhdGUoKQogewpAQCAtMjA3LDkgKzIwMyw5IEBAIHZvaWQg UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpmaXJlVGVsZW1ldHJ5SGFuZGxlcigpCiAgICAg ICAgIG1fZmlyZVRlbGVtZXRyeUhhbmRsZXIoKTsKIH0KICAgICAKLXN0YXRpYyBpbmxpbmUgYm9v bCBzaG91bGRQYXJ0aXRpb25Db29raWVzKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0 YXRpc3RpYykKK2lubGluZSBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxk UGFydGl0aW9uQ29va2llcyhjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBzdGF0aXN0aWMp CiB7Ci0gICAgcmV0dXJuIHN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlICYmICghc3RhdGlz dGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBXYWxsVGltZTo6bm93KCkgPiBzdGF0aXN0aWMubW9z dFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUgKyB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJl ZSk7CisgICAgcmV0dXJuIHN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlICYmICghc3RhdGlz dGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBXYWxsVGltZTo6bm93KCkgPiBzdGF0aXN0aWMubW9z dFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUgKyBtX3RpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25G cmVlKTsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZpcmVTaG91bGRQ YXJ0aXRpb25Db29raWVzSGFuZGxlcigpCkBAIC0yNjQsMjUgKzI2MCwyNSBAQCB2b2lkIFJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVNob3VsZFBhcnRpdGlvbkNvb2tpZXNIYW5kbGVy KGNvbnN0IFZlY3Rvcgogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVU b0xpdmVVc2VySW50ZXJhY3Rpb24oU2Vjb25kcyBzZWNvbmRzKQogewogICAgIGlmIChzZWNvbmRz ID49IDBfcykKLSAgICAgICAgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IHNlY29uZHM7Cisg ICAgICAgIG1fdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IHNlY29uZHM7CiB9CiAKIHZvaWQg UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9u RnJlZShTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgaWYgKHNlY29uZHMgPj0gMF9zKQotICAgICAg ICB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSA9IHNlY29uZHM7CisgICAgICAgIG1fdGlt ZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUgPSBzZWNvbmRzOwogfQogCiB2b2lkIFJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0TWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1v dmFsKFNlY29uZHMgc2Vjb25kcykKIHsKICAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCi0gICAgICAg IG1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCA9IHNlY29uZHM7CisgICAgICAg IG1fbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsID0gc2Vjb25kczsKIH0KIAog dm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldEdyYW5kZmF0aGVyaW5nVGltZShT ZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgaWYgKHNlY29uZHMgPj0gMF9zKQotICAgICAgICBncmFu ZGZhdGhlcmluZ1RpbWUgPSBzZWNvbmRzOworICAgICAgICBtX2dyYW5kZmF0aGVyaW5nVGltZSA9 IHNlY29uZHM7CiB9CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpwcm9jZXNz U3RhdGlzdGljcyhXVEY6OkZ1bmN0aW9uPHZvaWQoUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYpPiYm IHByb2Nlc3NGdW5jdGlvbikKQEAgLTI5Nyw3ICsyOTMsNyBAQCBib29sIFJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9uKFJlc291cmNlTG9hZFN0 YXRpcwogICAgIGlmICghcmVzb3VyY2VTdGF0aXN0aWMuaGFkVXNlckludGVyYWN0aW9uKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoV2FsbFRpbWU6Om5vdygpID4gcmVzb3VyY2VT dGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUgKyB0aW1lVG9MaXZlVXNlcklu dGVyYWN0aW9uKSB7CisgICAgaWYgKFdhbGxUaW1lOjpub3coKSA+IHJlc291cmNlU3RhdGlzdGlj Lm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lICsgbV90aW1lVG9MaXZlVXNlckludGVyYWN0 aW9uKSB7CiAgICAgICAgIC8vIERyb3AgcHJpdmFjeSBzZW5zaXRpdmUgZGF0YSBiZWNhdXNlIHdl IG5vIGxvbmdlciBuZWVkIGl0LgogICAgICAgICAvLyBTZXQgdGltZXN0YW1wIHRvIDAgc28gdGhh dCBzdGF0aXN0aWNzIG1lcmdlIHdpbGwga25vdwogICAgICAgICAvLyBpdCBoYXMgYmVlbiByZXNl dCBhcyBvcHBvc2VkIHRvIGl0cyBkZWZhdWx0IC0xLgpAQCAtMzgwLDcgKzM3Niw3IEBAIHZvaWQg UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYW5kbGVGcmVzaFN0YXJ0V2l0aEVtcHR5T3JO b1N0b3JlKEhhc2hTZXQ8U3RyCiAgICAgICAgIFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRp c3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4odG9wUHJpdmF0 ZWx5Q29udHJvbGxlZERvbWFpbik7CiAgICAgICAgIHN0YXRpc3RpYy5ncmFuZGZhdGhlcmVkID0g dHJ1ZTsKICAgICB9Ci0gICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wID0gV2FsbFRp bWU6Om5vdygpICsgZ3JhbmRmYXRoZXJpbmdUaW1lOworICAgIG1fZW5kT2ZHcmFuZGZhdGhlcmlu Z1RpbWVzdGFtcCA9IFdhbGxUaW1lOjpub3coKSArIG1fZ3JhbmRmYXRoZXJpbmdUaW1lOwogfQog CiBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxkUmVtb3ZlRGF0YVJlY29y ZHMoKSBjb25zdApAQCAtMzg5LDcgKzM4NSw3IEBAIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzaG91bGRSZW1vdmVEYXRhUmVjb3JkcygpIGNvbnN0CiAgICAgaWYgKG1fZGF0YVJl Y29yZHNSZW1vdmFsUGVuZGluZykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKG1f bGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkICYmIE1vbm90b25pY1RpbWU6Om5vdygpIDwg KG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkICsgbWluaW11bVRpbWVCZXR3ZWVuRGF0 YVJlY29yZHNSZW1vdmFsKSkKKyAgICBpZiAobV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92 ZWQgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgPCAobV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJl bW92ZWQgKyBtX21pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuaAppbmRleCA3Y2U2NDE5NTlmMDVkZDgyOTNjMWVkOWMyMDc0YjFkODc4ZDI2NDAzLi43MzFh NTRmZDliNTdhNGZmNGJkODNjYzEwMDEyZGI0ODE0MGQ4ZjYwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuaApAQCAtMTAyLDYgKzEwMiw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlKCkgPSBkZWZhdWx0OwogCisgICAgYm9vbCBzaG91bGRQ YXJ0aXRpb25Db29raWVzKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3MmKTsK KwogICAgIEhhc2hNYXA8U3RyaW5nLCBXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiBt X3Jlc291cmNlU3RhdGlzdGljc01hcDsKIAogICAgIFdURjo6RnVuY3Rpb248dm9pZCgpPiBtX2Rh dGFBZGRlZEhhbmRsZXI7CkBAIC0xMTAsNiArMTEyLDExIEBAIHByaXZhdGU6CiAgICAgV1RGOjpG dW5jdGlvbjx2b2lkKCk+IG1fZGVsZXRlUGVyc2lzdGVudFN0b3JlSGFuZGxlcjsKICAgICBXVEY6 OkZ1bmN0aW9uPHZvaWQoKT4gbV9maXJlVGVsZW1ldHJ5SGFuZGxlcjsKIAorICAgIFNlY29uZHMg bV90aW1lVG9MaXZlVXNlckludGVyYWN0aW9uIHsgMjRfaCAqIDMwLiB9OworICAgIFNlY29uZHMg bV90aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKKyAgICBTZWNvbmRzIG1f Z3JhbmRmYXRoZXJpbmdUaW1lIHsgMV9oIH07CisgICAgU2Vjb25kcyBtX21pbmltdW1UaW1lQmV0 d2VlbkRhdGFSZWNvcmRzUmVtb3ZhbCB7IDFfaCB9OworCiAgICAgV2FsbFRpbWUgbV9lbmRPZkdy YW5kZmF0aGVyaW5nVGltZXN0YW1wOwogICAgIE1vbm90b25pY1RpbWUgbV9sYXN0VGltZURhdGFS ZWNvcmRzV2VyZVJlbW92ZWQ7CiAgICAgYm9vbCBtX2RhdGFSZWNvcmRzUmVtb3ZhbFBlbmRpbmcg eyBmYWxzZSB9Owo= 314808 2017-07-06 20:48:25 -0700 2017-07-06 20:50:30 -0700 Patch bug-174237-20170706204824.patch text/plain 7129 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IxZGM5Y2E2NWE0ZjMz MWE3MDZmMWExMTg2MDU1NTNjNjFhMDA5ZS4uODgxZjYyOTE5ZjYyZmZlNGUyNWNmZWViZWIwOTlm OTU3YzQxNWUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS4gVGhvc2UgY2Fu IGJlIHNldCB2aWEKKyAgICAgICAgbWVtYmVyIGZ1bmN0aW9ucyBvbiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUgc28gdGhleSBzaG91bGQgYmUgZGF0YSBtZW1iZXJzLiBUaGUKKyAgICAgICAg QVBJIHRvIHNldCB0aGVtIGlzIGFzc29jaWF0ZWQgdG8gYSBwYXJ0aWN1bGFyIHN0b3JlIGFuZCB0 aGVyZSBjYW4gaW4gdGhlb3J5IGJlIHNldmVyYWwKKyAgICAgICAgc3RvcmVzLgorCisgICAgICAg ICogVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRQYXJ0aXRp b25Db29raWVzKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSk6 CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0TWluaW11 bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRHcmFuZGZhdGhlcmluZ1RpbWUpOgorICAgICAgICAo V2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc0hhZFJlY2VudFVzZXJJbnRl cmFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 aGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0eU9yTm9TdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxkUmVtb3ZlRGF0YVJlY29yZHMpOgorICAg ICAgICAoV2ViS2l0OjpzaG91bGRQYXJ0aXRpb25Db29raWVzKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKworMjAx Ny0wNy0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIERyb3Ag dW51c2VkIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgbWVtYmVycwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjI2CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwCmluZGV4IGJmNDFhNTA3ZGI3ZjA0MWYxYzRlMjQzNmEwZTIyZjllNWY2Mjhm NjIuLmNkZmQ2YjYwMDhjNTNjNGNkYWQ5YzFmMmZmZjQwNzE1MjBhZGVlMzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtMzksMTEgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYktp dCB7CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1zdGF0aWMgY29uc3QgYXV0byBzdGF0 aXN0aWNzTW9kZWxWZXJzaW9uID0gNTsKLXN0YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVVc2VySW50 ZXJhY3Rpb24geyAyNF9oICogMzAuIH07Ci1zdGF0aWMgU2Vjb25kcyB0aW1lVG9MaXZlQ29va2ll UGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKLXN0YXRpYyBTZWNvbmRzIGdyYW5kZmF0aGVyaW5nVGlt ZSB7IDFfaCB9Owotc3RhdGljIFNlY29uZHMgbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNS ZW1vdmFsIHsgMV9oIH07Citjb25zdCB1bnNpZ25lZCBzdGF0aXN0aWNzTW9kZWxWZXJzaW9uIHsg NSB9OwogCiBSZWY8UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OmNyZWF0ZSgpCiB7CkBAIC0yMDcsOSArMjAzLDkgQEAgdm9pZCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZpcmVUZWxlbWV0cnlIYW5kbGVyKCkKICAgICAgICAgbV9m aXJlVGVsZW1ldHJ5SGFuZGxlcigpOwogfQogICAgIAotc3RhdGljIGlubGluZSBib29sIHNob3Vs ZFBhcnRpdGlvbkNvb2tpZXMoY29uc3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYgc3RhdGlzdGlj KQoraW5saW5lIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRQYXJ0aXRp b25Db29raWVzKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpYykKIHsKLSAg ICByZXR1cm4gc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgJiYgKCFzdGF0aXN0aWMuaGFk VXNlckludGVyYWN0aW9uIHx8IFdhbGxUaW1lOjpub3coKSA+IHN0YXRpc3RpYy5tb3N0UmVjZW50 VXNlckludGVyYWN0aW9uVGltZSArIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKTsKKyAg ICByZXR1cm4gc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgJiYgKCFzdGF0aXN0aWMuaGFk VXNlckludGVyYWN0aW9uIHx8IFdhbGxUaW1lOjpub3coKSA+IHN0YXRpc3RpYy5tb3N0UmVjZW50 VXNlckludGVyYWN0aW9uVGltZSArIG1fdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUpOwog fQogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVNob3VsZFBhcnRpdGlv bkNvb2tpZXNIYW5kbGVyKCkKQEAgLTI2NCwyNSArMjYwLDI1IEBAIHZvaWQgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpmaXJlU2hvdWxkUGFydGl0aW9uQ29va2llc0hhbmRsZXIoY29uc3Qg VmVjdG9yCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0VGltZVRvTGl2ZVVz ZXJJbnRlcmFjdGlvbihTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgaWYgKHNlY29uZHMgPj0gMF9z KQotICAgICAgICB0aW1lVG9MaXZlVXNlckludGVyYWN0aW9uID0gc2Vjb25kczsKKyAgICAgICAg bV90aW1lVG9MaXZlVXNlckludGVyYWN0aW9uID0gc2Vjb25kczsKIH0KIAogdm9pZCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKFNl Y29uZHMgc2Vjb25kcykKIHsKICAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCi0gICAgICAgIHRpbWVU b0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0gc2Vjb25kczsKKyAgICAgICAgbV90aW1lVG9MaXZl Q29va2llUGFydGl0aW9uRnJlZSA9IHNlY29uZHM7CiB9CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzZXRNaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwoU2Vj b25kcyBzZWNvbmRzKQogewogICAgIGlmIChzZWNvbmRzID49IDBfcykKLSAgICAgICAgbWluaW11 bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsID0gc2Vjb25kczsKKyAgICAgICAgbV9taW5p bXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwgPSBzZWNvbmRzOwogfQogCiB2b2lkIFJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKFNlY29uZHMg c2Vjb25kcykKIHsKICAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCi0gICAgICAgIGdyYW5kZmF0aGVy aW5nVGltZSA9IHNlY29uZHM7CisgICAgICAgIG1fZ3JhbmRmYXRoZXJpbmdUaW1lID0gc2Vjb25k czsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NTdGF0aXN0 aWNzKFdURjo6RnVuY3Rpb248dm9pZChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJik+JiYgcHJvY2Vz c0Z1bmN0aW9uKQpAQCAtMjk3LDcgKzI5Myw3IEBAIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpoYXNIYWRSZWNlbnRVc2VySW50ZXJhY3Rpb24oUmVzb3VyY2VMb2FkU3RhdGlzCiAg ICAgaWYgKCFyZXNvdXJjZVN0YXRpc3RpYy5oYWRVc2VySW50ZXJhY3Rpb24pCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIGlmIChXYWxsVGltZTo6bm93KCkgPiByZXNvdXJjZVN0YXRpc3Rp Yy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSArIHRpbWVUb0xpdmVVc2VySW50ZXJhY3Rp b24pIHsKKyAgICBpZiAoV2FsbFRpbWU6Om5vdygpID4gcmVzb3VyY2VTdGF0aXN0aWMubW9zdFJl Y2VudFVzZXJJbnRlcmFjdGlvblRpbWUgKyBtX3RpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pIHsK ICAgICAgICAgLy8gRHJvcCBwcml2YWN5IHNlbnNpdGl2ZSBkYXRhIGJlY2F1c2Ugd2Ugbm8gbG9u Z2VyIG5lZWQgaXQuCiAgICAgICAgIC8vIFNldCB0aW1lc3RhbXAgdG8gMCBzbyB0aGF0IHN0YXRp c3RpY3MgbWVyZ2Ugd2lsbCBrbm93CiAgICAgICAgIC8vIGl0IGhhcyBiZWVuIHJlc2V0IGFzIG9w cG9zZWQgdG8gaXRzIGRlZmF1bHQgLTEuCkBAIC0zODAsNyArMzc2LDcgQEAgdm9pZCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmhhbmRsZUZyZXNoU3RhcnRXaXRoRW1wdHlPck5vU3RvcmUo SGFzaFNldDxTdHIKICAgICAgICAgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYgc3RhdGlzdGljID0g ZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0b3BQcml2YXRlbHlDb250 cm9sbGVkRG9tYWluKTsKICAgICAgICAgc3RhdGlzdGljLmdyYW5kZmF0aGVyZWQgPSB0cnVlOwog ICAgIH0KLSAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBXYWxsVGltZTo6bm93 KCkgKyBncmFuZGZhdGhlcmluZ1RpbWU7CisgICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0 YW1wID0gV2FsbFRpbWU6Om5vdygpICsgbV9ncmFuZGZhdGhlcmluZ1RpbWU7CiB9CiAKIGJvb2wg UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRSZW1vdmVEYXRhUmVjb3JkcygpIGNv bnN0CkBAIC0zODksNyArMzg1LDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnNob3VsZFJlbW92ZURhdGFSZWNvcmRzKCkgY29uc3QKICAgICBpZiAobV9kYXRhUmVjb3Jkc1Jl bW92YWxQZW5kaW5nKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9sYXN0VGlt ZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgPCAobV9sYXN0 VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgKyBtaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jk c1JlbW92YWwpKQorICAgIGlmIChtX2xhc3RUaW1lRGF0YVJlY29yZHNXZXJlUmVtb3ZlZCAmJiBN b25vdG9uaWNUaW1lOjpub3coKSA8IChtX2xhc3RUaW1lRGF0YVJlY29yZHNXZXJlUmVtb3ZlZCAr IG1fbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCmlu ZGV4IDdjZTY0MTk1OWYwNWRkODI5M2MxZWQ5YzIwNzRiMWQ4NzhkMjY0MDMuLjczMWE1NGZkOWI1 N2E0ZmY0YmQ4M2NjMTAwMTJkYjQ4MTQwZDhmNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZS5oCkBAIC0xMDIsNiArMTAyLDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBSZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUoKSA9IGRlZmF1bHQ7CiAKKyAgICBib29sIHNob3VsZFBhcnRpdGlv bkNvb2tpZXMoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcyYpOworCiAgICAg SGFzaE1hcDxTdHJpbmcsIFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M+IG1fcmVzb3Vy Y2VTdGF0aXN0aWNzTWFwOwogCiAgICAgV1RGOjpGdW5jdGlvbjx2b2lkKCk+IG1fZGF0YUFkZGVk SGFuZGxlcjsKQEAgLTExMCw2ICsxMTIsMTEgQEAgcHJpdmF0ZToKICAgICBXVEY6OkZ1bmN0aW9u PHZvaWQoKT4gbV9kZWxldGVQZXJzaXN0ZW50U3RvcmVIYW5kbGVyOwogICAgIFdURjo6RnVuY3Rp b248dm9pZCgpPiBtX2ZpcmVUZWxlbWV0cnlIYW5kbGVyOwogCisgICAgU2Vjb25kcyBtX3RpbWVU b0xpdmVVc2VySW50ZXJhY3Rpb24geyAyNF9oICogMzAuIH07CisgICAgU2Vjb25kcyBtX3RpbWVU b0xpdmVDb29raWVQYXJ0aXRpb25GcmVlIHsgMjRfaCB9OworICAgIFNlY29uZHMgbV9ncmFuZGZh dGhlcmluZ1RpbWUgeyAxX2ggfTsKKyAgICBTZWNvbmRzIG1fbWluaW11bVRpbWVCZXR3ZWVuRGF0 YVJlY29yZHNSZW1vdmFsIHsgMV9oIH07CisKICAgICBXYWxsVGltZSBtX2VuZE9mR3JhbmRmYXRo ZXJpbmdUaW1lc3RhbXA7CiAgICAgTW9ub3RvbmljVGltZSBtX2xhc3RUaW1lRGF0YVJlY29yZHNX ZXJlUmVtb3ZlZDsKICAgICBib29sIG1fZGF0YVJlY29yZHNSZW1vdmFsUGVuZGluZyB7IGZhbHNl IH07Cg== 314809 2017-07-06 20:50:31 -0700 2017-07-06 21:41:38 -0700 Patch bug-174237-20170706205030.patch text/plain 7141 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IxZGM5Y2E2NWE0ZjMz MWE3MDZmMWExMTg2MDU1NTNjNjFhMDA5ZS4uODgxZjYyOTE5ZjYyZmZlNGUyNWNmZWViZWIwOTlm OTU3YzQxNWUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS4gVGhvc2UgY2Fu IGJlIHNldCB2aWEKKyAgICAgICAgbWVtYmVyIGZ1bmN0aW9ucyBvbiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmUgc28gdGhleSBzaG91bGQgYmUgZGF0YSBtZW1iZXJzLiBUaGUKKyAgICAgICAg QVBJIHRvIHNldCB0aGVtIGlzIGFzc29jaWF0ZWQgdG8gYSBwYXJ0aWN1bGFyIHN0b3JlIGFuZCB0 aGVyZSBjYW4gaW4gdGhlb3J5IGJlIHNldmVyYWwKKyAgICAgICAgc3RvcmVzLgorCisgICAgICAg ICogVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRQYXJ0aXRp b25Db29raWVzKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSk6 CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0TWluaW11 bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRHcmFuZGZhdGhlcmluZ1RpbWUpOgorICAgICAgICAo V2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6Omhhc0hhZFJlY2VudFVzZXJJbnRl cmFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 aGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0eU9yTm9TdG9yZSk6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxkUmVtb3ZlRGF0YVJlY29yZHMpOgorICAg ICAgICAoV2ViS2l0OjpzaG91bGRQYXJ0aXRpb25Db29raWVzKTogRGVsZXRlZC4KKyAgICAgICAg KiBVSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKworMjAx Ny0wNy0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIERyb3Ag dW51c2VkIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgbWVtYmVycwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjI2CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwCmluZGV4IGJmNDFhNTA3ZGI3ZjA0MWYxYzRlMjQzNmEwZTIyZjllNWY2Mjhm NjIuLmFmYWY4YWEyMjY2N2M2NjgzMTFlM2MyMDdkZjdjMTA1ZWUzZmU2M2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmNwcApAQCAtMzksMTEgKzM5LDcgQEAgbmFtZXNwYWNlIFdlYktp dCB7CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCi1zdGF0aWMgY29uc3QgYXV0byBzdGF0 aXN0aWNzTW9kZWxWZXJzaW9uID0gNTsKLXN0YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVVc2VySW50 ZXJhY3Rpb24geyAyNF9oICogMzAuIH07Ci1zdGF0aWMgU2Vjb25kcyB0aW1lVG9MaXZlQ29va2ll UGFydGl0aW9uRnJlZSB7IDI0X2ggfTsKLXN0YXRpYyBTZWNvbmRzIGdyYW5kZmF0aGVyaW5nVGlt ZSB7IDFfaCB9Owotc3RhdGljIFNlY29uZHMgbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNS ZW1vdmFsIHsgMV9oIH07Citjb25zdCB1bnNpZ25lZCBzdGF0aXN0aWNzTW9kZWxWZXJzaW9uIHsg NSB9OwogCiBSZWY8UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OmNyZWF0ZSgpCiB7CkBAIC0yMDcsOSArMjAzLDkgQEAgdm9pZCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZpcmVUZWxlbWV0cnlIYW5kbGVyKCkKICAgICAgICAgbV9m aXJlVGVsZW1ldHJ5SGFuZGxlcigpOwogfQogICAgIAotc3RhdGljIGlubGluZSBib29sIHNob3Vs ZFBhcnRpdGlvbkNvb2tpZXMoY29uc3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYgc3RhdGlzdGlj KQoraW5saW5lIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRQYXJ0aXRp b25Db29raWVzKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpYykgY29uc3QK IHsKLSAgICByZXR1cm4gc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgJiYgKCFzdGF0aXN0 aWMuaGFkVXNlckludGVyYWN0aW9uIHx8IFdhbGxUaW1lOjpub3coKSA+IHN0YXRpc3RpYy5tb3N0 UmVjZW50VXNlckludGVyYWN0aW9uVGltZSArIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVl KTsKKyAgICByZXR1cm4gc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UgJiYgKCFzdGF0aXN0 aWMuaGFkVXNlckludGVyYWN0aW9uIHx8IFdhbGxUaW1lOjpub3coKSA+IHN0YXRpc3RpYy5tb3N0 UmVjZW50VXNlckludGVyYWN0aW9uVGltZSArIG1fdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZy ZWUpOwogfQogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVNob3VsZFBh cnRpdGlvbkNvb2tpZXNIYW5kbGVyKCkKQEAgLTI2NCwyNSArMjYwLDI1IEBAIHZvaWQgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpmaXJlU2hvdWxkUGFydGl0aW9uQ29va2llc0hhbmRsZXIo Y29uc3QgVmVjdG9yCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0VGltZVRv TGl2ZVVzZXJJbnRlcmFjdGlvbihTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgaWYgKHNlY29uZHMg Pj0gMF9zKQotICAgICAgICB0aW1lVG9MaXZlVXNlckludGVyYWN0aW9uID0gc2Vjb25kczsKKyAg ICAgICAgbV90aW1lVG9MaXZlVXNlckludGVyYWN0aW9uID0gc2Vjb25kczsKIH0KIAogdm9pZCBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25G cmVlKFNlY29uZHMgc2Vjb25kcykKIHsKICAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCi0gICAgICAg IHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0gc2Vjb25kczsKKyAgICAgICAgbV90aW1l VG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSA9IHNlY29uZHM7CiB9CiAKIHZvaWQgUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlOjpzZXRNaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92 YWwoU2Vjb25kcyBzZWNvbmRzKQogewogICAgIGlmIChzZWNvbmRzID49IDBfcykKLSAgICAgICAg bWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsID0gc2Vjb25kczsKKyAgICAgICAg bV9taW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwgPSBzZWNvbmRzOwogfQogCiB2 b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKFNl Y29uZHMgc2Vjb25kcykKIHsKICAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCi0gICAgICAgIGdyYW5k ZmF0aGVyaW5nVGltZSA9IHNlY29uZHM7CisgICAgICAgIG1fZ3JhbmRmYXRoZXJpbmdUaW1lID0g c2Vjb25kczsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnByb2Nlc3NT dGF0aXN0aWNzKFdURjo6RnVuY3Rpb248dm9pZChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJik+JiYg cHJvY2Vzc0Z1bmN0aW9uKQpAQCAtMjk3LDcgKzI5Myw3IEBAIGJvb2wgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpoYXNIYWRSZWNlbnRVc2VySW50ZXJhY3Rpb24oUmVzb3VyY2VMb2FkU3Rh dGlzCiAgICAgaWYgKCFyZXNvdXJjZVN0YXRpc3RpYy5oYWRVc2VySW50ZXJhY3Rpb24pCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChXYWxsVGltZTo6bm93KCkgPiByZXNvdXJjZVN0 YXRpc3RpYy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSArIHRpbWVUb0xpdmVVc2VySW50 ZXJhY3Rpb24pIHsKKyAgICBpZiAoV2FsbFRpbWU6Om5vdygpID4gcmVzb3VyY2VTdGF0aXN0aWMu bW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUgKyBtX3RpbWVUb0xpdmVVc2VySW50ZXJhY3Rp b24pIHsKICAgICAgICAgLy8gRHJvcCBwcml2YWN5IHNlbnNpdGl2ZSBkYXRhIGJlY2F1c2Ugd2Ug bm8gbG9uZ2VyIG5lZWQgaXQuCiAgICAgICAgIC8vIFNldCB0aW1lc3RhbXAgdG8gMCBzbyB0aGF0 IHN0YXRpc3RpY3MgbWVyZ2Ugd2lsbCBrbm93CiAgICAgICAgIC8vIGl0IGhhcyBiZWVuIHJlc2V0 IGFzIG9wcG9zZWQgdG8gaXRzIGRlZmF1bHQgLTEuCkBAIC0zODAsNyArMzc2LDcgQEAgdm9pZCBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmhhbmRsZUZyZXNoU3RhcnRXaXRoRW1wdHlPck5v U3RvcmUoSGFzaFNldDxTdHIKICAgICAgICAgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYgc3RhdGlz dGljID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbih0b3BQcml2YXRl bHlDb250cm9sbGVkRG9tYWluKTsKICAgICAgICAgc3RhdGlzdGljLmdyYW5kZmF0aGVyZWQgPSB0 cnVlOwogICAgIH0KLSAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBXYWxsVGlt ZTo6bm93KCkgKyBncmFuZGZhdGhlcmluZ1RpbWU7CisgICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5n VGltZXN0YW1wID0gV2FsbFRpbWU6Om5vdygpICsgbV9ncmFuZGZhdGhlcmluZ1RpbWU7CiB9CiAK IGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRSZW1vdmVEYXRhUmVjb3Jk cygpIGNvbnN0CkBAIC0zODksNyArMzg1LDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnNob3VsZFJlbW92ZURhdGFSZWNvcmRzKCkgY29uc3QKICAgICBpZiAobV9kYXRhUmVj b3Jkc1JlbW92YWxQZW5kaW5nKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9s YXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgPCAo bV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgKyBtaW5pbXVtVGltZUJldHdlZW5EYXRh UmVjb3Jkc1JlbW92YWwpKQorICAgIGlmIChtX2xhc3RUaW1lRGF0YVJlY29yZHNXZXJlUmVtb3Zl ZCAmJiBNb25vdG9uaWNUaW1lOjpub3coKSA8IChtX2xhc3RUaW1lRGF0YVJlY29yZHNXZXJlUmVt b3ZlZCArIG1fbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZS5oCmluZGV4IDdjZTY0MTk1OWYwNWRkODI5M2MxZWQ5YzIwNzRiMWQ4NzhkMjY0MDMuLjIzYmI3 NDJiYjA5MTc4MTJlMWVlZjMxYzIwMzU5MjNhZDU2MmRkMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oCkBAIC0xMDIsNiArMTAyLDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUoKSA9IGRlZmF1bHQ7CiAKKyAgICBib29sIHNob3VsZFBh cnRpdGlvbkNvb2tpZXMoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcyYpIGNv bnN0OworCiAgICAgSGFzaE1hcDxTdHJpbmcsIFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3M+IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFwOwogCiAgICAgV1RGOjpGdW5jdGlvbjx2b2lkKCk+ IG1fZGF0YUFkZGVkSGFuZGxlcjsKQEAgLTExMCw2ICsxMTIsMTEgQEAgcHJpdmF0ZToKICAgICBX VEY6OkZ1bmN0aW9uPHZvaWQoKT4gbV9kZWxldGVQZXJzaXN0ZW50U3RvcmVIYW5kbGVyOwogICAg IFdURjo6RnVuY3Rpb248dm9pZCgpPiBtX2ZpcmVUZWxlbWV0cnlIYW5kbGVyOwogCisgICAgU2Vj b25kcyBtX3RpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24geyAyNF9oICogMzAuIH07CisgICAgU2Vj b25kcyBtX3RpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlIHsgMjRfaCB9OworICAgIFNlY29u ZHMgbV9ncmFuZGZhdGhlcmluZ1RpbWUgeyAxX2ggfTsKKyAgICBTZWNvbmRzIG1fbWluaW11bVRp bWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsIHsgMV9oIH07CisKICAgICBXYWxsVGltZSBtX2Vu ZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXA7CiAgICAgTW9ub3RvbmljVGltZSBtX2xhc3RUaW1l RGF0YVJlY29yZHNXZXJlUmVtb3ZlZDsKICAgICBib29sIG1fZGF0YVJlY29yZHNSZW1vdmFsUGVu ZGluZyB7IGZhbHNlIH07Cg== 314813 2017-07-06 21:41:39 -0700 2017-07-06 22:19:16 -0700 Patch bug-174237-20170706214138.patch text/plain 7242 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2IxZGM5Y2E2NWE0ZjMz MWE3MDZmMWExMTg2MDU1NTNjNjFhMDA5ZS4uNzZlMDFjYWIxYTU3NzY3MDMyNDAwMmMyZTk4YTYx YmZmZTZiM2E1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTA3LTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRml4IGJhZCB1c2FnZSBvZiBz dGF0aWMgdmFyaWFibGVzIGluIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBGaXggYmFkIHVzYWdlIG9mIHN0 YXRpYyB2YXJpYWJsZXMgaW4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLiBUaG9zZSBjYW4g YmUgc2V0IHZpYQorICAgICAgICBtZW1iZXIgZnVuY3Rpb25zIG9uIFJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZSBzbyB0aGV5IHNob3VsZCBiZSBkYXRhIG1lbWJlcnMuIFRoZQorICAgICAgICBB UEkgdG8gc2V0IHRoZW0gaXMgYXNzb2NpYXRlZCB0byBhIHBhcnRpY3VsYXIgc3RvcmUgYW5kIHRo ZXJlIGNhbiBpbiB0aGVvcnkgYmUgc2V2ZXJhbAorICAgICAgICBzdG9yZXMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZFBhcnRpdGlv bkNvb2tpZXMpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKToK KyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRNaW5pbXVt VGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldEdyYW5kZmF0aGVyaW5nVGltZSk6CisgICAgICAgIChX ZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVy YWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpo YW5kbGVGcmVzaFN0YXJ0V2l0aEVtcHR5T3JOb1N0b3JlKToKKyAgICAgICAgKFdlYktpdDo6UmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzaG91bGRSZW1vdmVEYXRhUmVjb3Jkcyk6CisgICAg ICAgIChXZWJLaXQ6OnNob3VsZFBhcnRpdGlvbkNvb2tpZXMpOiBEZWxldGVkLgorICAgICAgICAq IFVJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oOgorCisyMDE3 LTA3LTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKICAgICAgICAgRHJvcCB1 bnVzZWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBtZW1iZXJzCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQyMjYKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5jcHAKaW5kZXggYmY0MWE1MDdkYjdmMDQxZjFjNGUyNDM2YTBlMjJmOWU1ZjYyOGY2 Mi4uM2E1NzA2MjAxNGQ0M2Q3ZDBlYzJkNjc2MWY5MTFiZjZhY2UyMmMzMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9SZXNvdXJjZUxv YWRTdGF0aXN0aWNzU3RvcmUuY3BwCkBAIC0zOSwxMSArMzksNyBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLXN0YXRpYyBjb25zdCBhdXRvIHN0YXRp c3RpY3NNb2RlbFZlcnNpb24gPSA1Owotc3RhdGljIFNlY29uZHMgdGltZVRvTGl2ZVVzZXJJbnRl cmFjdGlvbiB7IDI0X2ggKiAzMC4gfTsKLXN0YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVDb29raWVQ YXJ0aXRpb25GcmVlIHsgMjRfaCB9Owotc3RhdGljIFNlY29uZHMgZ3JhbmRmYXRoZXJpbmdUaW1l IHsgMV9oIH07Ci1zdGF0aWMgU2Vjb25kcyBtaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1Jl bW92YWwgeyAxX2ggfTsKK2NvbnN0IHVuc2lnbmVkIHN0YXRpc3RpY3NNb2RlbFZlcnNpb24geyA1 IH07CiAKIFJlZjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IFJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6Y3JlYXRlKCkKIHsKQEAgLTIwNyw5ICsyMDMsOSBAQCB2b2lkIFJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVRlbGVtZXRyeUhhbmRsZXIoKQogICAgICAgICBtX2Zp cmVUZWxlbWV0cnlIYW5kbGVyKCk7CiB9CiAgICAgCi1zdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxk UGFydGl0aW9uQ29va2llcyhjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBzdGF0aXN0aWMp CitpbmxpbmUgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZFBhcnRpdGlv bkNvb2tpZXMoY29uc3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYgc3RhdGlzdGljKSBjb25zdAog ewotICAgIHJldHVybiBzdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSAmJiAoIXN0YXRpc3Rp Yy5oYWRVc2VySW50ZXJhY3Rpb24gfHwgV2FsbFRpbWU6Om5vdygpID4gc3RhdGlzdGljLm1vc3RS ZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lICsgdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUp OworICAgIHJldHVybiBzdGF0aXN0aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSAmJiAoIXN0YXRpc3Rp Yy5oYWRVc2VySW50ZXJhY3Rpb24gfHwgV2FsbFRpbWU6Om5vdygpID4gc3RhdGlzdGljLm1vc3RS ZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lICsgbV90aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJl ZSk7CiB9CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpmaXJlU2hvdWxkUGFy dGl0aW9uQ29va2llc0hhbmRsZXIoKQpAQCAtMjYzLDI2ICsyNTksMjYgQEAgdm9pZCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmZpcmVTaG91bGRQYXJ0aXRpb25Db29raWVzSGFuZGxlcihj b25zdCBWZWN0b3IKIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFRpbWVU b0xpdmVVc2VySW50ZXJhY3Rpb24oU2Vjb25kcyBzZWNvbmRzKQogewotICAgIGlmIChzZWNvbmRz ID49IDBfcykKLSAgICAgICAgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IHNlY29uZHM7Cisg ICAgQVNTRVJUKHNlY29uZHMgPj0gMF9zKTsKKyAgICBtX3RpbWVUb0xpdmVVc2VySW50ZXJhY3Rp b24gPSBzZWNvbmRzOwogfQogCiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0 VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoU2Vjb25kcyBzZWNvbmRzKQogewotICAgIGlm IChzZWNvbmRzID49IDBfcykKLSAgICAgICAgdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUg PSBzZWNvbmRzOworICAgIEFTU0VSVChzZWNvbmRzID49IDBfcyk7CisgICAgbV90aW1lVG9MaXZl Q29va2llUGFydGl0aW9uRnJlZSA9IHNlY29uZHM7CiB9CiAKIHZvaWQgUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzZXRNaW5pbXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwoU2Vj b25kcyBzZWNvbmRzKQogewotICAgIGlmIChzZWNvbmRzID49IDBfcykKLSAgICAgICAgbWluaW11 bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFsID0gc2Vjb25kczsKKyAgICBBU1NFUlQoc2Vj b25kcyA+PSAwX3MpOworICAgIG1fbWluaW11bVRpbWVCZXR3ZWVuRGF0YVJlY29yZHNSZW1vdmFs ID0gc2Vjb25kczsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldEdy YW5kZmF0aGVyaW5nVGltZShTZWNvbmRzIHNlY29uZHMpCiB7Ci0gICAgaWYgKHNlY29uZHMgPj0g MF9zKQotICAgICAgICBncmFuZGZhdGhlcmluZ1RpbWUgPSBzZWNvbmRzOworICAgIEFTU0VSVChz ZWNvbmRzID49IDBfcyk7CisgICAgbV9ncmFuZGZhdGhlcmluZ1RpbWUgPSBzZWNvbmRzOwogfQog CiB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cHJvY2Vzc1N0YXRpc3RpY3MoV1RG OjpGdW5jdGlvbjx2b2lkKFJlc291cmNlTG9hZFN0YXRpc3RpY3MmKT4mJiBwcm9jZXNzRnVuY3Rp b24pCkBAIC0yOTcsNyArMjkzLDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 Omhhc0hhZFJlY2VudFVzZXJJbnRlcmFjdGlvbihSZXNvdXJjZUxvYWRTdGF0aXMKICAgICBpZiAo IXJlc291cmNlU3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbikKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgaWYgKFdhbGxUaW1lOjpub3coKSA+IHJlc291cmNlU3RhdGlzdGljLm1vc3RS ZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lICsgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbikgewor ICAgIGlmIChXYWxsVGltZTo6bm93KCkgPiByZXNvdXJjZVN0YXRpc3RpYy5tb3N0UmVjZW50VXNl ckludGVyYWN0aW9uVGltZSArIG1fdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbikgewogICAgICAg ICAvLyBEcm9wIHByaXZhY3kgc2Vuc2l0aXZlIGRhdGEgYmVjYXVzZSB3ZSBubyBsb25nZXIgbmVl ZCBpdC4KICAgICAgICAgLy8gU2V0IHRpbWVzdGFtcCB0byAwIHNvIHRoYXQgc3RhdGlzdGljcyBt ZXJnZSB3aWxsIGtub3cKICAgICAgICAgLy8gaXQgaGFzIGJlZW4gcmVzZXQgYXMgb3Bwb3NlZCB0 byBpdHMgZGVmYXVsdCAtMS4KQEAgLTM4MCw3ICszNzYsNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZTo6aGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0eU9yTm9TdG9yZShIYXNoU2V0 PFN0cgogICAgICAgICBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBzdGF0aXN0aWMgPSBlbnN1cmVS ZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRvcFByaXZhdGVseUNvbnRyb2xsZWRE b21haW4pOwogICAgICAgICBzdGF0aXN0aWMuZ3JhbmRmYXRoZXJlZCA9IHRydWU7CiAgICAgfQot ICAgIG1fZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCA9IFdhbGxUaW1lOjpub3coKSArIGdy YW5kZmF0aGVyaW5nVGltZTsKKyAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBX YWxsVGltZTo6bm93KCkgKyBtX2dyYW5kZmF0aGVyaW5nVGltZTsKIH0KIAogYm9vbCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZFJlbW92ZURhdGFSZWNvcmRzKCkgY29uc3QKQEAg LTM4OSw3ICszODUsNyBAQCBib29sIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2hvdWxk UmVtb3ZlRGF0YVJlY29yZHMoKSBjb25zdAogICAgIGlmIChtX2RhdGFSZWNvcmRzUmVtb3ZhbFBl bmRpbmcpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChtX2xhc3RUaW1lRGF0YVJl Y29yZHNXZXJlUmVtb3ZlZCAmJiBNb25vdG9uaWNUaW1lOjpub3coKSA8IChtX2xhc3RUaW1lRGF0 YVJlY29yZHNXZXJlUmVtb3ZlZCArIG1pbmltdW1UaW1lQmV0d2VlbkRhdGFSZWNvcmRzUmVtb3Zh bCkpCisgICAgaWYgKG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkICYmIE1vbm90b25p Y1RpbWU6Om5vdygpIDwgKG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkICsgbV9taW5p bXVtVGltZUJldHdlZW5EYXRhUmVjb3Jkc1JlbW92YWwpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9TdG9yYWdlL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKaW5kZXggN2Nl NjQxOTU5ZjA1ZGQ4MjkzYzFlZDljMjA3NGIxZDg3OGQyNjQwMy4uMjNiYjc0MmJiMDkxNzgxMmUx ZWVmMzFjMjAzNTkyM2FkNTYyZGQwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAg LTEwMiw2ICsxMDIsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZSgpID0gZGVmYXVsdDsKIAorICAgIGJvb2wgc2hvdWxkUGFydGl0aW9uQ29va2ll cyhjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJikgY29uc3Q7CisKICAgICBI YXNoTWFwPFN0cmluZywgV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljcz4gbV9yZXNvdXJj ZVN0YXRpc3RpY3NNYXA7CiAKICAgICBXVEY6OkZ1bmN0aW9uPHZvaWQoKT4gbV9kYXRhQWRkZWRI YW5kbGVyOwpAQCAtMTEwLDYgKzExMiwxMSBAQCBwcml2YXRlOgogICAgIFdURjo6RnVuY3Rpb248 dm9pZCgpPiBtX2RlbGV0ZVBlcnNpc3RlbnRTdG9yZUhhbmRsZXI7CiAgICAgV1RGOjpGdW5jdGlv bjx2b2lkKCk+IG1fZmlyZVRlbGVtZXRyeUhhbmRsZXI7CiAKKyAgICBTZWNvbmRzIG1fdGltZVRv TGl2ZVVzZXJJbnRlcmFjdGlvbiB7IDI0X2ggKiAzMC4gfTsKKyAgICBTZWNvbmRzIG1fdGltZVRv TGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUgeyAyNF9oIH07CisgICAgU2Vjb25kcyBtX2dyYW5kZmF0 aGVyaW5nVGltZSB7IDFfaCB9OworICAgIFNlY29uZHMgbV9taW5pbXVtVGltZUJldHdlZW5EYXRh UmVjb3Jkc1JlbW92YWwgeyAxX2ggfTsKKwogICAgIFdhbGxUaW1lIG1fZW5kT2ZHcmFuZGZhdGhl cmluZ1RpbWVzdGFtcDsKICAgICBNb25vdG9uaWNUaW1lIG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dl cmVSZW1vdmVkOwogICAgIGJvb2wgbV9kYXRhUmVjb3Jkc1JlbW92YWxQZW5kaW5nIHsgZmFsc2Ug fTsK