139996 2014-12-29 13:17:23 -0800 Get rid of some PageGroup storage functions 2015-01-04 11:10:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ap sam oldest_to_newest 1058132 0 andersca 2014-12-29 13:17:23 -0800 Get rid of some PageGroup storage functions 1058133 1 243809 andersca 2014-12-29 13:18:33 -0800 Created attachment 243809 Patch 1058135 2 andersca 2014-12-29 13:26:15 -0800 Committed r177814: <http://trac.webkit.org/changeset/177814> 1058205 3 ap 2014-12-30 13:26:08 -0800 This changed some test results: https://build.webkit.org/results/Apple%20Mavericks%20Release%20WK1%20(Tests)/r177825%20(10978)/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create-diff.txt https://build.webkit.org/results/Apple%20Mavericks%20Release%20WK1%20(Tests)/r177825%20(10978)/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create-diff.txt The tests used to be flaky timeouts, but this doesn't seem expected. 1058227 4 ap 2014-12-31 00:38:09 -0800 Updated test expectations in r177830. Anders, do you know what these tests are flaky in the first place? Each DumpRenderTree instance has its own local storage on disk, so what is the source of flakiness? And why did this patch change the tests to fail instead of time out? There is nothing in ChangeLog that explains behavior change. Should this be rolled out instead? 1058430 5 andersca 2015-01-02 09:42:02 -0800 I'm taking a look at this now. 1058463 6 andersca 2015-01-02 11:46:57 -0800 OK, I've looked at the tests and they're pretty badly written. They expect to be run in order, and will randomly fail if they're not. I tried merging the tests into a single file, but due to the way the storage tracker SPI works, there's no way to make the tests not be flaky. Then I tried rewriting them into an API test, but for the same API "design" reasons, there's no easy way to write a non-flaky test. Given this, and given that this is a test for a legacy SPI that nobody is using anymore I think it's fine to just remove the tests and the associated DumpRenderTree code. 1058476 7 ap 2015-01-02 13:54:37 -0800 It's fine with me to remove the tests, however they do always run sequentially and in order (unless one forces a non-default order, which bots don't do). Is it still expected that they are flaky, given that? 1058544 8 andersca 2015-01-04 10:07:27 -0800 (In reply to comment #7) > It's fine with me to remove the tests, however they do always run > sequentially and in order (unless one forces a non-default order, which bots > don't do). > > Is it still expected that they are flaky, given that? If multiple tests were running at the same time and they were touching storage, then yes - they could be flaky. 1058548 9 ap 2015-01-04 11:10:01 -0800 > If multiple tests were running at the same time and they were touching storage, then yes - they could be flaky. That would be horrible. What is the mechanism that shares state across DumpRenderTree/WebKitTestRunner instances? Can anything else be shared (e.g. the actual records)? Disk storage at least is supposed to be in unique directories for each process. 243809 2014-12-29 13:18:33 -0800 2014-12-29 13:23:07 -0800 Patch bug-139996-20141229131839.patch text/plain 9316 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3ODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzRiNmI1MzgzNzdhY2Q2 MDVkZjZhZjA3YTUzMjI3N2U2NWU3NmVmOC4uM2M1NzUyZDE2MjNlZWNmYTkzNThkYjUwYzJlYTBj ZWY4NjFhYmE3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTEyLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgR2V0IHJpZCBvZiBz b21lIFBhZ2VHcm91cCBzdG9yYWdlIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5OTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdl L1BhZ2VHcm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OmNsb3NlTG9jYWxT dG9yYWdlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6Y2xlYXJMb2Nh bFN0b3JhZ2VGb3JBbGxPcmlnaW5zKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VH cm91cDo6Y2xlYXJMb2NhbFN0b3JhZ2VGb3JPcmlnaW4pOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6UGFnZUdyb3VwOjpjbG9zZUlkbGVMb2NhbFN0b3JhZ2VEYXRhYmFzZXMpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjpzeW5jTG9jYWxTdG9yYWdlKTogRGVsZXRl ZC4KKyAgICAgICAgKiBwYWdlL1BhZ2VHcm91cC5oOgorCisyMDE0LTEyLTI5ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTW92ZSBzdG9yYWdlIGNvZGUg ZnJvbSBXZWJDb3JlIHRvIFdlYktpdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM5NTU4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNjBlNDY2YzMxYzUxYzAyNTdkYzgz MDU0MDliMTI2NTljODkyMGZjMC4uNjk5MTZkZmYwNzA4MjUyOTAxNzgxMjdmZDRmZjdkOTkxZDhm M2FjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxNC0xMi0yOSAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIEdldCByaWQgb2Ygc29tZSBQYWdl R3JvdXAgc3RvcmFnZSBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzOTk5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENhbGwgV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyIGRpcmVjdGx5 IGluc3RlYWQuCisKKyAgICAgICAgKiBTdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpkZWxldGVBbGxPcmlnaW5zKToKKyAgICAgICAg KFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpkZWxldGVPcmlnaW4pOgorCisyMDE0LTEyLTI5ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTW92ZSBzdG9y YWdlIGNvZGUgZnJvbSBXZWJDb3JlIHRvIFdlYktpdAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NTU4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAyMDc3 NTNlNWYzNTZmMjAyYzA0NGQzZWE3Yzc1YTQyYjcwZDQ1ZDlhLi4yMmE1ZmY0ODdkM2UwYWRiNzA3 OWVmODA3NTJjODM3OTYyYjUwOTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAK IDIwMTQtMTItMjkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAg ICAgICBHZXQgcmlkIG9mIHNvbWUgUGFnZUdyb3VwIHN0b3JhZ2UgZnVuY3Rpb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk5OTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIFdlYlN0b3JhZ2VO YW1lc3BhY2VQcm92aWRlciBkaXJlY3RseSBpbnN0ZWFkLgorCisgICAgICAgICogU3RvcmFnZS9X ZWJTdG9yYWdlTWFuYWdlci5tbToKKyAgICAgICAgKC1bV2ViU3RvcmFnZU1hbmFnZXIgc3luY0xv Y2FsU3RvcmFnZV0pOgorICAgICAgICAoK1tXZWJTdG9yYWdlTWFuYWdlciBjbG9zZUlkbGVMb2Nh bFN0b3JhZ2VEYXRhYmFzZXNdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAg ICAgICgrW1dlYlZpZXcgX2FwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZV0pOgorCisyMDE0LTEyLTI5 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTW92ZSBz dG9yYWdlIGNvZGUgZnJvbSBXZWJDb3JlIHRvIFdlYktpdAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NTU4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5k ZXggODhlZTEyNTU5NDBmOTMyZGU2ODFjZThiNTA1YmJjMzlhZjBhZjZlMi4uYTc5ZDFiOTQ3ZThh MDBhNjY2OGNhNDljYzFmNWM5NTNlMGRhZDE4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTE1 NTgsMTEgKzE1NTgsNiBAQCBfX1pON1dlYkNvcmU5UGFnZUNhY2hlMTFzZXRDYXBhY2l0eUVpCiBf X1pON1dlYkNvcmU5UGFnZUNhY2hlMThwcnVuZVRvQ2FwYWNpdHlOb3dFaU5TXzEzUHJ1bmluZ1Jl YXNvbkUKIF9fWk43V2ViQ29yZTlQYWdlQ2FjaGUzM21hcmtQYWdlc0ZvclZpc3RlZExpbmtTdHls ZVJlY2FsY0V2CiBfX1pON1dlYkNvcmU5UGFnZUNhY2hlNnJlbW92ZUVQTlNfMTFIaXN0b3J5SXRl bUUKLV9fWk43V2ViQ29yZTlQYWdlR3JvdXAxNnN5bmNMb2NhbFN0b3JhZ2VFdgotX19aTjdXZWJD b3JlOVBhZ2VHcm91cDE3Y2xvc2VMb2NhbFN0b3JhZ2VFdgotX19aTjdXZWJDb3JlOVBhZ2VHcm91 cDI2Y2xlYXJMb2NhbFN0b3JhZ2VGb3JPcmlnaW5FUE5TXzE0U2VjdXJpdHlPcmlnaW5FCi1fX1pO N1dlYkNvcmU5UGFnZUdyb3VwMzBjbGVhckxvY2FsU3RvcmFnZUZvckFsbE9yaWdpbnNFdgotX19a TjdXZWJDb3JlOVBhZ2VHcm91cDMwY2xvc2VJZGxlTG9jYWxTdG9yYWdlRGF0YWJhc2VzRXYKIF9f Wk43V2ViQ29yZTlQYWdlR3JvdXA5cGFnZUdyb3VwRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJD b3JlOVNjcm9sbGJhcjExbW91c2VFeGl0ZWRFdgogX19aTjdXZWJDb3JlOVNjcm9sbGJhcjEybW91 c2VFbnRlcmVkRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcAppbmRleCAwODZiNDBlNjUyZDAy YTIzMGEwYjFmOTVlYTIxZDNlM2YxNjFhNzIxLi5mYzkxOWVkYTQ0MTIxYjQ0MGRkZGVjYjllZjFm N2Q1MGZlMTYxZGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCkBAIC05Nyw2MSArOTcs NiBAQCBQYWdlR3JvdXAqIFBhZ2VHcm91cDo6cGFnZUdyb3VwKGNvbnN0IFN0cmluZyYgZ3JvdXBO YW1lKQogICAgIHJldHVybiByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwogfQogCi12b2lkIFBhZ2VH cm91cDo6Y2xvc2VMb2NhbFN0b3JhZ2UoKQotewotICAgIGlmICghcGFnZUdyb3VwcykKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgZm9yIChhdXRvIGl0ID0gcGFnZUdyb3Vwcy0+YmVnaW4oKSwgZW5k ID0gcGFnZUdyb3Vwcy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBpZiAoaXQt PnZhbHVlLT5oYXNMb2NhbFN0b3JhZ2UoKSkKLSAgICAgICAgICAgIGl0LT52YWx1ZS0+bG9jYWxT dG9yYWdlKCktPmNsb3NlKCk7Ci0gICAgfQotfQotCi12b2lkIFBhZ2VHcm91cDo6Y2xlYXJMb2Nh bFN0b3JhZ2VGb3JBbGxPcmlnaW5zKCkKLXsKLSAgICBpZiAoIXBhZ2VHcm91cHMpCi0gICAgICAg IHJldHVybjsKLQotICAgIGZvciAoYXV0byBpdCA9IHBhZ2VHcm91cHMtPmJlZ2luKCksIGVuZCA9 IHBhZ2VHcm91cHMtPmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgaWYgKGl0LT52 YWx1ZS0+aGFzTG9jYWxTdG9yYWdlKCkpCi0gICAgICAgICAgICBpdC0+dmFsdWUtPmxvY2FsU3Rv cmFnZSgpLT5jbGVhckFsbE9yaWdpbnNGb3JEZWxldGlvbigpOwotICAgIH0KLX0KLQotdm9pZCBQ YWdlR3JvdXA6OmNsZWFyTG9jYWxTdG9yYWdlRm9yT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBvcmln aW4pCi17Ci0gICAgaWYgKCFwYWdlR3JvdXBzKQotICAgICAgICByZXR1cm47Ci0KLSAgICBmb3Ig KGF1dG8gaXQgPSBwYWdlR3JvdXBzLT5iZWdpbigpLCBlbmQgPSBwYWdlR3JvdXBzLT5lbmQoKTsg aXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGlmIChpdC0+dmFsdWUtPmhhc0xvY2FsU3RvcmFn ZSgpKQotICAgICAgICAgICAgaXQtPnZhbHVlLT5sb2NhbFN0b3JhZ2UoKS0+Y2xlYXJPcmlnaW5G b3JEZWxldGlvbihvcmlnaW4pOwotICAgIH0KLX0KLQotdm9pZCBQYWdlR3JvdXA6OmNsb3NlSWRs ZUxvY2FsU3RvcmFnZURhdGFiYXNlcygpCi17Ci0gICAgaWYgKCFwYWdlR3JvdXBzKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBmb3IgKGF1dG8gaXQgPSBwYWdlR3JvdXBzLT5iZWdpbigpLCBlbmQg PSBwYWdlR3JvdXBzLT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIGlmIChpdC0+ dmFsdWUtPmhhc0xvY2FsU3RvcmFnZSgpKQotICAgICAgICAgICAgaXQtPnZhbHVlLT5sb2NhbFN0 b3JhZ2UoKS0+Y2xvc2VJZGxlTG9jYWxTdG9yYWdlRGF0YWJhc2VzKCk7Ci0gICAgfQotfQotCi12 b2lkIFBhZ2VHcm91cDo6c3luY0xvY2FsU3RvcmFnZSgpCi17Ci0gICAgaWYgKCFwYWdlR3JvdXBz KQotICAgICAgICByZXR1cm47Ci0KLSAgICBmb3IgKGF1dG8gaXQgPSBwYWdlR3JvdXBzLT5iZWdp bigpLCBlbmQgPSBwYWdlR3JvdXBzLT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAg IGlmIChpdC0+dmFsdWUtPmhhc0xvY2FsU3RvcmFnZSgpKQotICAgICAgICAgICAgaXQtPnZhbHVl LT5sb2NhbFN0b3JhZ2UoKS0+c3luYygpOwotICAgIH0KLX0KLQogdm9pZCBQYWdlR3JvdXA6OmFk ZFBhZ2UoUGFnZSYgcGFnZSkKIHsKICAgICBBU1NFUlQoIW1fcGFnZXMuY29udGFpbnMoJnBhZ2Up KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5oCmluZGV4IDNmNjIyM2I4ZDM1YTQ5M2VmNzkxODUyYWJl NWMxYTNjODc3YWZiYzAuLmNkZTkzYjZmMDVjYjU3MzFlZDA5OTFjMGYwMjliMDFlZWI3MDQwZGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuaApAQCAtNTYsMTQgKzU2LDYgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBQYWdlR3JvdXAqIHBhZ2VH cm91cChjb25zdCBTdHJpbmcmIGdyb3VwTmFtZSk7CiAKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQg c3RhdGljIHZvaWQgY2xvc2VMb2NhbFN0b3JhZ2UoKTsKLQotICAgICAgICBzdGF0aWMgdm9pZCBj bGVhckxvY2FsU3RvcmFnZUZvckFsbE9yaWdpbnMoKTsKLSAgICAgICAgc3RhdGljIHZvaWQgY2xl YXJMb2NhbFN0b3JhZ2VGb3JPcmlnaW4oU2VjdXJpdHlPcmlnaW4qKTsKLSAgICAgICAgV0VCQ09S RV9FWFBPUlQgc3RhdGljIHZvaWQgY2xvc2VJZGxlTG9jYWxTdG9yYWdlRGF0YWJhc2VzKCk7Ci0g ICAgICAgIC8vIER1bXBSZW5kZXJUcmVlIGhlbHBlciB0aGF0IHRyaWdnZXJzIGEgU3RvcmFnZUFy ZWEgc3luYy4KLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQgc3luY0xvY2FsU3Rv cmFnZSgpOwotCiAgICAgICAgIGNvbnN0IEhhc2hTZXQ8UGFnZSo+JiBwYWdlcygpIGNvbnN0IHsg cmV0dXJuIG1fcGFnZXM7IH0KIAogICAgICAgICB2b2lkIGFkZFBhZ2UoUGFnZSYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcCBiL1NvdXJjZS9X ZWJLaXQvU3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAKaW5kZXggMjU4M2QxNzRiNzNiMGE3M2Qz OWRkM2VlNDE4MGM5OTc2ZGY0MWE1ZC4uM2M0ZTYxM2E0MWQxZWRlMzI3N2Q2ZTlkZGM3OTA3YTJk YzIxZTBmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TdG9yYWdlL1N0b3JhZ2VUcmFja2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwCkBAIC0y Nyw2ICsyNyw3IEBACiAKICNpbmNsdWRlICJTdG9yYWdlVGhyZWFkLmgiCiAjaW5jbHVkZSAiU3Rv cmFnZVRyYWNrZXJDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlk ZXIuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxXZWJDb3Jl L1BhZ2VHcm91cC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU1FMaXRlRGF0YWJhc2VUcmFja2VyLmg+ CkBAIC0zOTYsNyArMzk3LDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZGVsZXRlQWxsT3JpZ2lu cygpCiAgICAgICAgIG1fb3JpZ2luU2V0LmNsZWFyKCk7CiAgICAgfQogCi0gICAgUGFnZUdyb3Vw OjpjbGVhckxvY2FsU3RvcmFnZUZvckFsbE9yaWdpbnMoKTsKKyAgICBXZWJTdG9yYWdlTmFtZXNw YWNlUHJvdmlkZXI6OmNsZWFyTG9jYWxTdG9yYWdlRm9yQWxsT3JpZ2lucygpOwogCiAgICAgbV90 aHJlYWQtPmRpc3BhdGNoKFt0aGlzXSB7CiAgICAgICAgIHN5bmNEZWxldGVBbGxPcmlnaW5zKCk7 CkBAIC00OTMsNyArNDk0LDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZGVsZXRlT3JpZ2luKFNl Y3VyaXR5T3JpZ2luKiBvcmlnaW4pCiAgICAgLy8gdG8gcmVvcGVuIHRoZSBkYiBiZWZvcmUgdGhl IGRiIGlzIGRlbGV0ZWQgYnkgYSBTdG9yYWdlVHJhY2tlciB0aHJlYWQuCiAgICAgLy8gSW4gdGhp cyBjYXNlLCByZW9wZW5pbmcgdGhlIGRiIGluIFN0b3JhZ2VBcmVhU3luYyB3aWxsIGNhbmNlbCBh IHBlbmRpbmcKICAgICAvLyBTdG9yYWdlVHJhY2tlciBkYiBkZWxldGlvbi4KLSAgICBQYWdlR3Jv dXA6OmNsZWFyTG9jYWxTdG9yYWdlRm9yT3JpZ2luKG9yaWdpbik7CisgICAgV2ViU3RvcmFnZU5h bWVzcGFjZVByb3ZpZGVyOjpjbGVhckxvY2FsU3RvcmFnZUZvck9yaWdpbihvcmlnaW4pOwogCiAg ICAgU3RyaW5nIG9yaWdpbklkID0gb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKTsKICAgICAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1N0b3JhZ2UvV2ViU3RvcmFnZU1hbmFnZXIu bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9TdG9yYWdlL1dlYlN0b3JhZ2VNYW5hZ2VyLm1tCmluZGV4 IGFmOTJkNzZiODc0OThiZjQ2NTI4MWQ0YjZhMDVhNzdjYjQ4OGY1YWIuLmZiNDBlNTQ5Yjk1N2Fh NDhkMDgxNTViN2Q0Mzg1MDgxNWVlN2U4YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L1N0b3JhZ2UvV2ViU3RvcmFnZU1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvU3Rv cmFnZS9XZWJTdG9yYWdlTWFuYWdlci5tbQpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW1wb3J0ICJT dG9yYWdlVHJhY2tlci5oIgogI2ltcG9ydCAiV2ViU2VjdXJpdHlPcmlnaW5JbnRlcm5hbC5oIgor I2ltcG9ydCAiV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmgiCiAjaW1wb3J0ICJXZWJTdG9y YWdlVHJhY2tlckNsaWVudC5oIgogI2ltcG9ydCA8V2ViQ29yZS9QYWdlR3JvdXAuaD4KICNpbXBv cnQgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KQEAgLTEwMCw3ICsxMDEsNyBAQCBzdGF0aWMg cHRocmVhZF9vbmNlX3QgcmVnaXN0ZXJMb2NhbFN0b3JhZ2VQYXRoID0gUFRIUkVBRF9PTkNFX0lO SVQ7CiAKIC0gKHZvaWQpc3luY0xvY2FsU3RvcmFnZQogewotICAgIFBhZ2VHcm91cDo6c3luY0xv Y2FsU3RvcmFnZSgpOworICAgIFdlYlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcjo6c3luY0xvY2Fs U3RvcmFnZSgpOwogfQogCiAtICh2b2lkKXN5bmNGaWxlU3lzdGVtQW5kVHJhY2tlckRhdGFiYXNl CkBAIC0xMjEsNyArMTIyLDcgQEAgc3RhdGljIHB0aHJlYWRfb25jZV90IHJlZ2lzdGVyTG9jYWxT dG9yYWdlUGF0aCA9IFBUSFJFQURfT05DRV9JTklUOwogCiArICh2b2lkKWNsb3NlSWRsZUxvY2Fs U3RvcmFnZURhdGFiYXNlcwogewotICAgIFBhZ2VHcm91cDo6Y2xvc2VJZGxlTG9jYWxTdG9yYWdl RGF0YWJhc2VzKCk7CisgICAgV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjbG9zZUlkbGVM b2NhbFN0b3JhZ2VEYXRhYmFzZXMoKTsKIH0KIAogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUxvY2Fs U3RvcmFnZVBhdGgoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IGNhODI5 ZjA5YzkyYTk5Mjg2NWZlZmFmZjIyMmU3OTYzM2U0YTRiOTEuLjJjNDJiZWRiYmM3YjQ3YzNiMGEw MmVkZjdiNmVjOGM5MmE2MzJjZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0K QEAgLTQ4MDMsNyArNDgwMyw2IEBAIHN0YXRpYyBWZWN0b3I8U3RyaW5nPiB0b1N0cmluZ1ZlY3Rv cihOU0FycmF5KiBwYXR0ZXJucykKICAgICAgICAgW1dlYlBsdWdpbkRhdGFiYXNlIGNsb3NlU2hh cmVkRGF0YWJhc2VdOwogCiAgICAgV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjbG9zZUxv Y2FsU3RvcmFnZSgpOwotICAgIFBhZ2VHcm91cDo6Y2xvc2VMb2NhbFN0b3JhZ2UoKTsKIH0KICNl bmRpZiAvLyAhUExBVEZPUk0oSU9TKQogCg==