49597 2010-11-16 08:25:15 -0800 Introduce GeoNotifierVector typedef for increased readability 2010-11-17 09:28:56 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 39908 0 jknotten webkit-unassigned bulach commit-queue jorlow oldest_to_newest 309734 0 jknotten 2010-11-16 08:25:15 -0800 WebCore/dom/page/Geolocation.cpp and WebCore/dom/page/Geolocation.h use repeated references to Vector<RefPtr<GeoNotifier> >&. Introduce GeoNotifierVector typedef to increase readability, which will also help with the readability of forthcoming patch to fix https://bugs.webkit.org/show_bug.cgi?id=39908 309744 1 73998 jknotten 2010-11-16 08:47:29 -0800 Created attachment 73998 Patch 310242 2 73998 jorlow 2010-11-17 06:30:11 -0800 Comment on attachment 73998 Patch r=me 310335 3 73998 commit-queue 2010-11-17 09:28:51 -0800 Comment on attachment 73998 Patch Clearing flags on attachment: 73998 Committed r72213: <http://trac.webkit.org/changeset/72213> 310336 4 commit-queue 2010-11-17 09:28:56 -0800 All reviewed patches have been landed. Closing bug. 73998 2010-11-16 08:47:29 -0800 2010-11-17 09:28:51 -0800 Patch bug-49597-20101116164726.patch text/plain 8155 jknotten ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTYwOTU2MDQyMDhiY2JmNjY3N2RjNTMxNjUxMTk3NTViZWM0YTIyMC4uZjkzMWE5OWQ2ZjVhODc0 MTM2YjU1NWEwZWEwOTc2OWVkNDEzNzUyNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0xMS0xNiAgSm9o biBLbm90dGVuYmVsdCAgPGprbm90dGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBKZXJlbXkgT3Jsb3cuCisKKyAgICAgICAgSW50cm9kdWNlIEdlb05vdGlmaWVyVmVjdG9y IHR5cGVkZWYgZm9yIGluY3JlYXNlZCByZWFkYWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk1OTcKKworICAgICAgICAqIHBhZ2UvR2VvbG9j YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OldhdGNoZXJzOjpnZXRO b3RpZmllcnNWZWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnNlbmRFcnJv cik6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6c2VuZFBvc2l0aW9uKToKKyAgICAg ICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpzdG9wVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6 R2VvbG9jYXRpb246OnN0b3BUaW1lcnNGb3JPbmVTaG90cyk6CisgICAgICAgIChXZWJDb3JlOjpH ZW9sb2NhdGlvbjo6c3RvcFRpbWVyc0ZvcldhdGNoZXJzKToKKyAgICAgICAgKFdlYkNvcmU6Okdl b2xvY2F0aW9uOjpjYW5jZWxSZXF1ZXN0cyk6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlv bjo6Y2FuY2VsQWxsUmVxdWVzdHMpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246Omhh bmRsZUVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjptYWtlU3VjY2Vzc0Nh bGxiYWNrcyk6CisgICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5oOgorCiAyMDEwLTExLTE1ICBB bGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlv bi5jcHAgYi9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCmluZGV4IGJlZDhmYjRjY2FlNDhi YzZhZmRhMjQ5OTIyODY3MGZjMjhiYTIwNTQuLjE4NWMwNGYzZjJhNzlmYWU3NWY5ZDkwZThlMTIx YmFmNzRjM2EzOWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKKysr IGIvV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcApAQCAtMjA4LDcgKzIwOCw3IEBAIGJvb2wg R2VvbG9jYXRpb246OldhdGNoZXJzOjppc0VtcHR5KCkgY29uc3QKICAgICByZXR1cm4gbV9pZFRv Tm90aWZpZXJNYXAuaXNFbXB0eSgpOwogfQogCi12b2lkIEdlb2xvY2F0aW9uOjpXYXRjaGVyczo6 Z2V0Tm90aWZpZXJzVmVjdG9yKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4mIGNvcHkpIGNv bnN0Cit2b2lkIEdlb2xvY2F0aW9uOjpXYXRjaGVyczo6Z2V0Tm90aWZpZXJzVmVjdG9yKEdlb05v dGlmaWVyVmVjdG9yJiBjb3B5KSBjb25zdAogewogICAgIGNvcHlWYWx1ZXNUb1ZlY3RvcihtX2lk VG9Ob3RpZmllck1hcCwgY29weSk7CiB9CkBAIC00NTMsMTAgKzQ1MywxMCBAQCB2b2lkIEdlb2xv Y2F0aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCBhbGxvd2VkKQogICAgICAgICBtYWtlQ2FjaGVkUG9z aXRpb25DYWxsYmFja3MoKTsKIH0KIAotdm9pZCBHZW9sb2NhdGlvbjo6c2VuZEVycm9yKFZlY3Rv cjxSZWZQdHI8R2VvTm90aWZpZXI+ID4mIG5vdGlmaWVycywgUG9zaXRpb25FcnJvciogZXJyb3Ip Cit2b2lkIEdlb2xvY2F0aW9uOjpzZW5kRXJyb3IoR2VvTm90aWZpZXJWZWN0b3ImIG5vdGlmaWVy cywgUG9zaXRpb25FcnJvciogZXJyb3IpCiB7Ci0gICAgIFZlY3RvcjxSZWZQdHI8R2VvTm90aWZp ZXI+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG5vdGlmaWVycy5lbmQoKTsKLSAgICAgZm9yIChW ZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG5vdGlmaWVy cy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgR2VvTm90aWZpZXJWZWN0b3I6OmNv bnN0X2l0ZXJhdG9yIGVuZCA9IG5vdGlmaWVycy5lbmQoKTsKKyAgICAgZm9yIChHZW9Ob3RpZmll clZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBub3RpZmllcnMuYmVnaW4oKTsgaXQgIT0gZW5k OyArK2l0KSB7CiAgICAgICAgICBSZWZQdHI8R2VvTm90aWZpZXI+IG5vdGlmaWVyID0gKml0Owog ICAgICAgICAgCiAgICAgICAgICBpZiAobm90aWZpZXItPm1fZXJyb3JDYWxsYmFjaykKQEAgLTQ2 NCwxMCArNDY0LDEwIEBAIHZvaWQgR2VvbG9jYXRpb246OnNlbmRFcnJvcihWZWN0b3I8UmVmUHRy PEdlb05vdGlmaWVyPiA+JiBub3RpZmllcnMsIFBvc2l0aW9uRXJyCiAgICAgIH0KIH0KIAotdm9p ZCBHZW9sb2NhdGlvbjo6c2VuZFBvc2l0aW9uKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4m IG5vdGlmaWVycywgR2VvcG9zaXRpb24qIHBvc2l0aW9uKQordm9pZCBHZW9sb2NhdGlvbjo6c2Vu ZFBvc2l0aW9uKEdlb05vdGlmaWVyVmVjdG9yJiBub3RpZmllcnMsIEdlb3Bvc2l0aW9uKiBwb3Np dGlvbikKIHsKLSAgICBWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+Ojpjb25zdF9pdGVyYXRv ciBlbmQgPSBub3RpZmllcnMuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8UmVmUHRyPEdlb05vdGlm aWVyPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG5vdGlmaWVycy5iZWdpbigpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKKyAgICBHZW9Ob3RpZmllclZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbm90 aWZpZXJzLmVuZCgpOworICAgIGZvciAoR2VvTm90aWZpZXJWZWN0b3I6OmNvbnN0X2l0ZXJhdG9y IGl0ID0gbm90aWZpZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICBSZWZQ dHI8R2VvTm90aWZpZXI+IG5vdGlmaWVyID0gKml0OwogICAgICAgICBBU1NFUlQobm90aWZpZXIt Pm1fc3VjY2Vzc0NhbGxiYWNrKTsKICAgICAgICAgCkBAIC00NzUsMTAgKzQ3NSwxMCBAQCB2b2lk IEdlb2xvY2F0aW9uOjpzZW5kUG9zaXRpb24oVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPiYg bm90aWZpZXJzLCBHZW9wb3NpdAogICAgIH0KIH0KIAotdm9pZCBHZW9sb2NhdGlvbjo6c3RvcFRp bWVyKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4mIG5vdGlmaWVycykKK3ZvaWQgR2VvbG9j YXRpb246OnN0b3BUaW1lcihHZW9Ob3RpZmllclZlY3RvciYgbm90aWZpZXJzKQogewotICAgIFZl Y3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG5vdGlmaWVy cy5lbmQoKTsKLSAgICBmb3IgKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID46OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gbm90aWZpZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgIEdl b05vdGlmaWVyVmVjdG9yOjpjb25zdF9pdGVyYXRvciBlbmQgPSBub3RpZmllcnMuZW5kKCk7Cisg ICAgZm9yIChHZW9Ob3RpZmllclZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBub3RpZmllcnMu YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIFJlZlB0cjxHZW9Ob3RpZmllcj4g bm90aWZpZXIgPSAqaXQ7CiAgICAgICAgIG5vdGlmaWVyLT5tX3RpbWVyLnN0b3AoKTsKICAgICB9 CkBAIC00ODYsNyArNDg2LDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6c3RvcFRpbWVyKFZlY3RvcjxS ZWZQdHI8R2VvTm90aWZpZXI+ID4mIG5vdGlmaWVycykKIAogdm9pZCBHZW9sb2NhdGlvbjo6c3Rv cFRpbWVyc0Zvck9uZVNob3RzKCkKIHsKLSAgICBWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+ IGNvcHk7CisgICAgR2VvTm90aWZpZXJWZWN0b3IgY29weTsKICAgICBjb3B5VG9WZWN0b3IobV9v bmVTaG90cywgY29weSk7CiAgICAgCiAgICAgc3RvcFRpbWVyKGNvcHkpOwpAQCAtNDk0LDcgKzQ5 NCw3IEBAIHZvaWQgR2VvbG9jYXRpb246OnN0b3BUaW1lcnNGb3JPbmVTaG90cygpCiAKIHZvaWQg R2VvbG9jYXRpb246OnN0b3BUaW1lcnNGb3JXYXRjaGVycygpCiB7Ci0gICAgVmVjdG9yPFJlZlB0 cjxHZW9Ob3RpZmllcj4gPiBjb3B5OworICAgIEdlb05vdGlmaWVyVmVjdG9yIGNvcHk7CiAgICAg bV93YXRjaGVycy5nZXROb3RpZmllcnNWZWN0b3IoY29weSk7CiAgICAgCiAgICAgc3RvcFRpbWVy KGNvcHkpOwpAQCAtNTA2LDE2ICs1MDYsMTYgQEAgdm9pZCBHZW9sb2NhdGlvbjo6c3RvcFRpbWVy cygpCiAgICAgc3RvcFRpbWVyc0ZvcldhdGNoZXJzKCk7CiB9CiAKLXZvaWQgR2VvbG9jYXRpb246 OmNhbmNlbFJlcXVlc3RzKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4mIG5vdGlmaWVycykK K3ZvaWQgR2VvbG9jYXRpb246OmNhbmNlbFJlcXVlc3RzKEdlb05vdGlmaWVyVmVjdG9yJiBub3Rp ZmllcnMpCiB7Ci0gICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPjo6Y29uc3RfaXRlcmF0 b3IgZW5kID0gbm90aWZpZXJzLmVuZCgpOwotICAgIGZvciAoVmVjdG9yPFJlZlB0cjxHZW9Ob3Rp Zmllcj4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBub3RpZmllcnMuYmVnaW4oKTsgaXQgIT0gZW5k OyArK2l0KQorICAgIEdlb05vdGlmaWVyVmVjdG9yOjpjb25zdF9pdGVyYXRvciBlbmQgPSBub3Rp ZmllcnMuZW5kKCk7CisgICAgZm9yIChHZW9Ob3RpZmllclZlY3Rvcjo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBub3RpZmllcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQogICAgICAgICAoKml0KS0+ c2V0RmF0YWxFcnJvcihQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9zaXRpb25FcnJvcjo6UE9TSVRJ T05fVU5BVkFJTEFCTEUsIGZyYW1lbGVzc0RvY3VtZW50RXJyb3JNZXNzYWdlKSk7CiB9CiAKIHZv aWQgR2VvbG9jYXRpb246OmNhbmNlbEFsbFJlcXVlc3RzKCkKIHsKLSAgICBWZWN0b3I8UmVmUHRy PEdlb05vdGlmaWVyPiA+IGNvcHk7CisgICAgR2VvTm90aWZpZXJWZWN0b3IgY29weTsKICAgICBj b3B5VG9WZWN0b3IobV9vbmVTaG90cywgY29weSk7CiAgICAgY2FuY2VsUmVxdWVzdHMoY29weSk7 CiAgICAgbV93YXRjaGVycy5nZXROb3RpZmllcnNWZWN0b3IoY29weSk7CkBAIC01MjYsMTAgKzUy NiwxMCBAQCB2b2lkIEdlb2xvY2F0aW9uOjpoYW5kbGVFcnJvcihQb3NpdGlvbkVycm9yKiBlcnJv cikKIHsKICAgICBBU1NFUlQoZXJyb3IpOwogICAgIAotICAgIFZlY3RvcjxSZWZQdHI8R2VvTm90 aWZpZXI+ID4gb25lU2hvdHNDb3B5OworICAgIEdlb05vdGlmaWVyVmVjdG9yIG9uZVNob3RzQ29w eTsKICAgICBjb3B5VG9WZWN0b3IobV9vbmVTaG90cywgb25lU2hvdHNDb3B5KTsKIAotICAgIFZl Y3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4gd2F0Y2hlcnNDb3B5OworICAgIEdlb05vdGlmaWVy VmVjdG9yIHdhdGNoZXJzQ29weTsKICAgICBtX3dhdGNoZXJzLmdldE5vdGlmaWVyc1ZlY3Rvcih3 YXRjaGVyc0NvcHkpOwogCiAgICAgLy8gQ2xlYXIgdGhlIGxpc3RzIGJlZm9yZSB3ZSBtYWtlIHRo ZSBjYWxsYmFja3MsIHRvIGF2b2lkIGNsZWFyaW5nIG5vdGlmaWVycwpAQCAtNTg4LDEwICs1ODgs MTAgQEAgdm9pZCBHZW9sb2NhdGlvbjo6bWFrZVN1Y2Nlc3NDYWxsYmFja3MoKQogICAgIEFTU0VS VChsYXN0UG9zaXRpb24oKSk7CiAgICAgQVNTRVJUKGlzQWxsb3dlZCgpKTsKICAgICAKLSAgICBW ZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+IG9uZVNob3RzQ29weTsKKyAgICBHZW9Ob3RpZmll clZlY3RvciBvbmVTaG90c0NvcHk7CiAgICAgY29weVRvVmVjdG9yKG1fb25lU2hvdHMsIG9uZVNo b3RzQ29weSk7CiAgICAgCi0gICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPiB3YXRjaGVy c0NvcHk7CisgICAgR2VvTm90aWZpZXJWZWN0b3Igd2F0Y2hlcnNDb3B5OwogICAgIG1fd2F0Y2hl cnMuZ2V0Tm90aWZpZXJzVmVjdG9yKHdhdGNoZXJzQ29weSk7CiAgICAgCiAgICAgLy8gQ2xlYXIg dGhlIGxpc3RzIGJlZm9yZSB3ZSBtYWtlIHRoZSBjYWxsYmFja3MsIHRvIGF2b2lkIGNsZWFyaW5n IG5vdGlmaWVycwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmggYi9XZWJD b3JlL3BhZ2UvR2VvbG9jYXRpb24uaAppbmRleCAyYjYwOTIyYmZlOGY0ZGE2ZDhlMzAwMTY1ZjBk MjY5MWUzOGZkYWFlLi5hM2E3OWY5ZDgxNTg0MTk2NGIwOGE1ZmIzMTBiMWVlOThlNzFjMjhhIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uaAorKysgYi9XZWJDb3JlL3BhZ2Uv R2VvbG9jYXRpb24uaApAQCAtMTA5LDYgKzEwOSw5IEBAIHByaXZhdGU6CiAgICAgICAgIEdlb05v dGlmaWVyKEdlb2xvY2F0aW9uKiwgUGFzc1JlZlB0cjxQb3NpdGlvbkNhbGxiYWNrPiwgUGFzc1Jl ZlB0cjxQb3NpdGlvbkVycm9yQ2FsbGJhY2s+LCBQYXNzUmVmUHRyPFBvc2l0aW9uT3B0aW9ucz4p OwogICAgIH07CiAKKyAgICB0eXBlZGVmIFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4gR2Vv Tm90aWZpZXJWZWN0b3I7CisgICAgdHlwZWRlZiBIYXNoU2V0PFJlZlB0cjxHZW9Ob3RpZmllcj4g PiBHZW9Ob3RpZmllclNldDsKKwogICAgIGNsYXNzIFdhdGNoZXJzIHsKICAgICBwdWJsaWM6CiAg ICAgICAgIHZvaWQgc2V0KGludCBpZCwgUGFzc1JlZlB0cjxHZW9Ob3RpZmllcj4pOwpAQCAtMTE3 LDcgKzEyMCw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgY29udGFpbnMoR2VvTm90aWZpZXIq KSBjb25zdDsKICAgICAgICAgdm9pZCBjbGVhcigpOwogICAgICAgICBib29sIGlzRW1wdHkoKSBj b25zdDsKLSAgICAgICAgdm9pZCBnZXROb3RpZmllcnNWZWN0b3IoVmVjdG9yPFJlZlB0cjxHZW9O b3RpZmllcj4gPiYpIGNvbnN0OworICAgICAgICB2b2lkIGdldE5vdGlmaWVyc1ZlY3RvcihHZW9O b3RpZmllclZlY3RvciYpIGNvbnN0OwogICAgIHByaXZhdGU6CiAgICAgICAgIHR5cGVkZWYgSGFz aE1hcDxpbnQsIFJlZlB0cjxHZW9Ob3RpZmllcj4gPiBJZFRvTm90aWZpZXJNYXA7CiAgICAgICAg IHR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8R2VvTm90aWZpZXI+LCBpbnQ+IE5vdGlmaWVyVG9JZE1h cDsKQEAgLTEyNywxNSArMTMwLDE1IEBAIHByaXZhdGU6CiAKICAgICBib29sIGhhc0xpc3RlbmVy cygpIGNvbnN0IHsgcmV0dXJuICFtX29uZVNob3RzLmlzRW1wdHkoKSB8fCAhbV93YXRjaGVycy5p c0VtcHR5KCk7IH0KIAotICAgIHZvaWQgc2VuZEVycm9yKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZp ZXI+ID4mLCBQb3NpdGlvbkVycm9yKik7Ci0gICAgdm9pZCBzZW5kUG9zaXRpb24oVmVjdG9yPFJl ZlB0cjxHZW9Ob3RpZmllcj4gPiYsIEdlb3Bvc2l0aW9uKik7CisgICAgdm9pZCBzZW5kRXJyb3Io R2VvTm90aWZpZXJWZWN0b3ImLCBQb3NpdGlvbkVycm9yKik7CisgICAgdm9pZCBzZW5kUG9zaXRp b24oR2VvTm90aWZpZXJWZWN0b3ImLCBHZW9wb3NpdGlvbiopOwogCi0gICAgc3RhdGljIHZvaWQg c3RvcFRpbWVyKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4mKTsKKyAgICBzdGF0aWMgdm9p ZCBzdG9wVGltZXIoR2VvTm90aWZpZXJWZWN0b3ImKTsKICAgICB2b2lkIHN0b3BUaW1lcnNGb3JP bmVTaG90cygpOwogICAgIHZvaWQgc3RvcFRpbWVyc0ZvcldhdGNoZXJzKCk7CiAgICAgdm9pZCBz dG9wVGltZXJzKCk7CiAKLSAgICB2b2lkIGNhbmNlbFJlcXVlc3RzKFZlY3RvcjxSZWZQdHI8R2Vv Tm90aWZpZXI+ID4mKTsKKyAgICB2b2lkIGNhbmNlbFJlcXVlc3RzKEdlb05vdGlmaWVyVmVjdG9y Jik7CiAgICAgdm9pZCBjYW5jZWxBbGxSZXF1ZXN0cygpOwogCiAgICAgdm9pZCBwb3NpdGlvbkNo YW5nZWRJbnRlcm5hbCgpOwpAQCAtMTY1LDggKzE2OCw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBo YXZlU3VpdGFibGVDYWNoZWRQb3NpdGlvbihQb3NpdGlvbk9wdGlvbnMqKTsKICAgICB2b2lkIG1h a2VDYWNoZWRQb3NpdGlvbkNhbGxiYWNrcygpOwogCi0gICAgdHlwZWRlZiBIYXNoU2V0PFJlZlB0 cjxHZW9Ob3RpZmllcj4gPiBHZW9Ob3RpZmllclNldDsKLSAgICAKICAgICBHZW9Ob3RpZmllclNl dCBtX29uZVNob3RzOwogICAgIFdhdGNoZXJzIG1fd2F0Y2hlcnM7CiAgICAgRnJhbWUqIG1fZnJh bWU7Cg==