154767 2016-02-26 17:42:57 -0800 RefCounter<T>::Event -> RefCounterEvent 2016-03-08 14:05:39 -0800 1 1 1 Unclassified WebKit Web Template Framework Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough achristensen benjamin cdumez cmarcelo commit-queue ossy peavo oldest_to_newest 1168769 0 barraclough 2016-02-26 17:42:57 -0800 Some final cleanup after my recent RefCounter changes. RefCounter<T>::Event is kinda verbose to use, and there is no need for this to be specific to a particular typeof RefCounter. Move the enum class up to the top level & rename to RefCounterEvent. Also remove UserObservablePageToken - this is vestigial & not really offering anything over just using UserObservablePageCounter::Token directly. 1168770 1 272388 barraclough 2016-02-26 17:45:12 -0800 Created attachment 272388 Fix 1168771 2 commit-queue 2016-02-26 17:47:39 -0800 Attachment 272388 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/WebProcessPool.cpp:162: Code inside a namespace should not be indented. [whitespace/indent] [4] ERROR: Source/WebKit2/UIProcess/ProcessThrottler.cpp:39: Code inside a namespace should not be indented. [whitespace/indent] [4] ERROR: Source/WTF/wtf/RefCounter.h:62: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/VNodeTracker.cpp:42: More than one command on the same line in if [whitespace/parens] [4] Total errors found: 4 in 15 files If any of these errors are false positives, please file a bug against check-webkit-style. 1169208 3 barraclough 2016-02-29 10:55:25 -0800 Transmitting file data ................ Committed revision 197360. 1169231 4 ossy 2016-02-29 12:12:39 -0800 (In reply to comment #3) > Transmitting file data ................ > Committed revision 197360. It broke the WinCairo build: https://build.webkit.org/builders/WinCairo%2064-Bit%20Release/builds/54409 cc-ing port maintainers 1169232 5 achristensen 2016-02-29 12:16:18 -0800 When using ninja on Windows (which is what that bot does) it copies the WTF forwarding headers just before linking, which is too late for compiling WTF. It prefers to use the forwarding headers for WTF instead of the headers in Source/WTF. I need to fix this, but I'm working on other things right now. I just deleted the forwarding headers on the bot. 1171986 6 ossy 2016-03-08 01:22:51 -0800 (In reply to comment #5) > When using ninja on Windows (which is what that bot does) it copies the WTF > forwarding headers just before linking, which is too late for compiling WTF. > It prefers to use the forwarding headers for WTF instead of the headers in > Source/WTF. I need to fix this, but I'm working on other things right now. > I just deleted the forwarding headers on the bot. Could you file a bug report not to forget to fix it properly in the future? It isn't good at all, if the incremental build is fragile on a platform. 1172216 7 achristensen 2016-03-08 14:05:39 -0800 (In reply to comment #6) > (In reply to comment #5) > > When using ninja on Windows (which is what that bot does) it copies the WTF > > forwarding headers just before linking, which is too late for compiling WTF. > > It prefers to use the forwarding headers for WTF instead of the headers in > > Source/WTF. I need to fix this, but I'm working on other things right now. > > I just deleted the forwarding headers on the bot. > > Could you file a bug report not to forget to fix it properly in the future? > It isn't good at all, if the incremental build is fragile on a platform. I agree. This should have actually been fixed by https://bugs.webkit.org/show_bug.cgi?id=154651 which changed the PRE_BUILD command to a custom target that the library is dependent on. 272388 2016-02-26 17:45:12 -0800 2016-02-27 16:05:50 -0800 Fix 154767.1.patch text/plain 16024 barraclough SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxOTcyMTYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE2LTAyLTI2ICBHYXZpbiBCYXJyYWNsb3VnaCAg PGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZDb3VudGVyPFQ+OjpFdmVudCAt PiBSZWZDb3VudGVyRXZlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1NDc2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlZkNvdW50ZXI8VD46OkV2ZW50IGlzIGtpbmRhIHZlcmJvc2UgdG8gdXNlLCBh bmQgdGhlcmUgaXMgbm8gbmVlZCBmb3IgdGhpcworICAgICAgICB0byBiZSBzcGVjaWZpYyB0byBh IHBhcnRpY3VsYXIgdHlwZW9mIFJlZkNvdW50ZXIuIE1vdmUgdGhlIGVudW0gY2xhc3MgdXAgdG8K KyAgICAgICAgdGhlIHRvcCBsZXZlbCAmIHJlbmFtZSB0byBSZWZDb3VudGVyRXZlbnQuCisKKyAg ICAgICAgKiB3dGYvUmVmQ291bnRlci5oOgorICAgICAgICAoV1RGOjpSZWZDb3VudGVyPFQ+OjpD b3VudDo6cmVmKToKKyAgICAgICAgKFdURjo6UmVmQ291bnRlcjxUPjo6Q291bnQ6OmRlcmVmKToK KwogMjAxNi0wMi0yNiAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgRW5oYW5jZSBsb2dnaW5nOiBBZGQgImFsd2F5cyBvbiIgbWFjcm9zCkluZGV4OiBTb3VyY2Uv V1RGL3d0Zi9SZWZDb3VudGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUmVmQ291 bnRlci5oCShyZXZpc2lvbiAxOTcyMTYpCisrKyBTb3VyY2UvV1RGL3d0Zi9SZWZDb3VudGVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDggQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKK2Vu dW0gY2xhc3MgUmVmQ291bnRlckV2ZW50IHsgRGVjcmVtZW50LCBJbmNyZW1lbnQgfTsKKwogdGVt cGxhdGU8dHlwZW5hbWUgVD4KIGNsYXNzIFJlZkNvdW50ZXIgewogICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKFJlZkNvdW50ZXIpOwpAQCAtNTcsOCArNTksNyBAQCBjbGFzcyBSZWZDb3VudGVyIHsK IAogcHVibGljOgogICAgIHVzaW5nIFRva2VuID0gUmVmUHRyPENvdW50PjsKLSAgICBlbnVtIGNs YXNzIEV2ZW50IHsgRGVjcmVtZW50LCBJbmNyZW1lbnQgfTsKLSAgICB1c2luZyBWYWx1ZUNoYW5n ZUZ1bmN0aW9uID0gc3RkOjpmdW5jdGlvbjx2b2lkIChFdmVudCk+OworICAgIHVzaW5nIFZhbHVl Q2hhbmdlRnVuY3Rpb24gPSBzdGQ6OmZ1bmN0aW9uPHZvaWQgKFJlZkNvdW50ZXJFdmVudCk+Owog CiAgICAgUmVmQ291bnRlcihWYWx1ZUNoYW5nZUZ1bmN0aW9uID0gbnVsbHB0cik7CiAgICAgflJl ZkNvdW50ZXIoKTsKQEAgLTgzLDcgKzg0LDcgQEAgaW5saW5lIHZvaWQgUmVmQ291bnRlcjxUPjo6 Q291bnQ6OnJlZigpCiB7CiAgICAgKyttX3ZhbHVlOwogICAgIGlmIChtX3JlZkNvdW50ZXIgJiYg bV9yZWZDb3VudGVyLT5tX3ZhbHVlRGlkQ2hhbmdlKQotICAgICAgICBtX3JlZkNvdW50ZXItPm1f dmFsdWVEaWRDaGFuZ2UoRXZlbnQ6OkluY3JlbWVudCk7CisgICAgICAgIG1fcmVmQ291bnRlci0+ bV92YWx1ZURpZENoYW5nZShSZWZDb3VudGVyRXZlbnQ6OkluY3JlbWVudCk7CiB9CiAKIHRlbXBs YXRlPHR5cGVuYW1lIFQ+CkBAIC05Myw3ICs5NCw3IEBAIGlubGluZSB2b2lkIFJlZkNvdW50ZXI8 VD46OkNvdW50OjpkZXJlZigKIAogICAgIC0tbV92YWx1ZTsKICAgICBpZiAobV9yZWZDb3VudGVy ICYmIG1fcmVmQ291bnRlci0+bV92YWx1ZURpZENoYW5nZSkKLSAgICAgICAgbV9yZWZDb3VudGVy LT5tX3ZhbHVlRGlkQ2hhbmdlKEV2ZW50OjpEZWNyZW1lbnQpOworICAgICAgICBtX3JlZkNvdW50 ZXItPm1fdmFsdWVEaWRDaGFuZ2UoUmVmQ291bnRlckV2ZW50OjpEZWNyZW1lbnQpOwogCiAgICAg Ly8gVGhlIENvdW50IG9iamVjdCBpcyBrZXB0IGFsaXZlIHNvIGxvbmcgYXMgZWl0aGVyIHRoZSBS ZWZDb3VudGVyIHRoYXQgY3JlYXRlZCBpdCByZW1haW5zCiAgICAgLy8gYWxsb2NhdGVkLCBvciBz byBsb25nIGFzIGl0cyByZWZlcmVuY2UgY291bnQgaXMgbm9uLXplcm8uCkBAIC0xMjYsNSArMTI3 LDYgQEAgaW5saW5lIFJlZkNvdW50ZXI8VD46On5SZWZDb3VudGVyKCkKIH0gLy8gbmFtZXNwYWNl IFdURgogCiB1c2luZyBXVEY6OlJlZkNvdW50ZXI7Cit1c2luZyBXVEY6OlJlZkNvdW50ZXJFdmVu dDsKIAogI2VuZGlmIC8vIFJlZkNvdW50ZXJfaApJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3 MjE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjQgQEAKKzIwMTYtMDItMjYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBw bGUuY29tPgorCisgICAgICAgIFJlZkNvdW50ZXI8VD46OkV2ZW50IC0+IFJlZkNvdW50ZXJFdmVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0NzY3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmQ291 bnRlcjxUPjo6RXZlbnQgaXMga2luZGEgdmVyYm9zZSB0byB1c2UsIGFuZCB0aGVyZSBpcyBubyBu ZWVkIGZvciB0aGlzCisgICAgICAgIHRvIGJlIHNwZWNpZmljIHRvIGEgcGFydGljdWxhciB0eXBl b2YgUmVmQ291bnRlci4gTW92ZSB0aGUgZW51bSBjbGFzcyB1cCB0bworICAgICAgICB0aGUgdG9w IGxldmVsICYgcmVuYW1lIHRvIFJlZkNvdW50ZXJFdmVudC4KKworICAgICAgICAqIHBhZ2UvUGFn ZVRocm90dGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjpQYWdlVGhy b3R0bGVyKToKKyAgICAgICAgKFdlYkNvcmU6Om1fYXVkaWJsZVBsdWdpbkh5c3RlcmVzaXMpOgor ICAgICAgICAoV2ViQ29yZTo6bV9tZWRpYUFjdGl2aXR5Q291bnRlcik6CisgICAgICAgIChXZWJD b3JlOjptX3BhZ2VMb2FkQWN0aXZpdHlDb3VudGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9WTm9k ZVRyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Vk5vZGVUcmFja2VyOjpzaW5nbGV0b24p OgorICAgICAgICAoV2ViQ29yZTo6Vk5vZGVUcmFja2VyOjpWTm9kZVRyYWNrZXIpOgorICAgICAg ICAoV2ViQ29yZTo6bV9sYXN0V2FybmluZ1RpbWUpOgorCiAyMDE2LTAyLTI2ICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTk3MTYwLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIuY3Bw CShyZXZpc2lvbiAxOTcyMTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw4ICszNCw4IEBAIFBhZ2VUaHJvdHRsZXI6OlBhZ2VU aHJvdHRsZXIoUGFnZSYgcGFnZSkKICAgICA6IG1fcGFnZShwYWdlKQogICAgICwgbV91c2VySW5w dXRIeXN0ZXJlc2lzKFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUgc3RhdGUpIHsgc2V0QWN0aXZpdHlG bGFnKFBhZ2VBY3Rpdml0eVN0YXRlOjpVc2VySW5wdXRBY3Rpdml0eSwgc3RhdGUgPT0gSHlzdGVy ZXNpc1N0YXRlOjpTdGFydGVkKTsgfSkKICAgICAsIG1fYXVkaWJsZVBsdWdpbkh5c3RlcmVzaXMo W3RoaXNdKEh5c3RlcmVzaXNTdGF0ZSBzdGF0ZSkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2 aXR5U3RhdGU6OkF1ZGlibGVQbHVnaW4sIHN0YXRlID09IEh5c3RlcmVzaXNTdGF0ZTo6U3RhcnRl ZCk7IH0pCi0gICAgLCBtX21lZGlhQWN0aXZpdHlDb3VudGVyKFt0aGlzXShQYWdlQWN0aXZpdHlD b3VudGVyOjpFdmVudCkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2aXR5U3RhdGU6Ok1lZGlh QWN0aXZpdHksIG1fbWVkaWFBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSk7IH0pCi0gICAgLCBtX3Bh Z2VMb2FkQWN0aXZpdHlDb3VudGVyKFt0aGlzXShQYWdlQWN0aXZpdHlDb3VudGVyOjpFdmVudCkg eyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2aXR5U3RhdGU6OlBhZ2VMb2FkQWN0aXZpdHksIG1f cGFnZUxvYWRBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSk7IH0pCisgICAgLCBtX21lZGlhQWN0aXZp dHlDb3VudGVyKFt0aGlzXShSZWZDb3VudGVyRXZlbnQpIHsgc2V0QWN0aXZpdHlGbGFnKFBhZ2VB Y3Rpdml0eVN0YXRlOjpNZWRpYUFjdGl2aXR5LCBtX21lZGlhQWN0aXZpdHlDb3VudGVyLnZhbHVl KCkpOyB9KQorICAgICwgbV9wYWdlTG9hZEFjdGl2aXR5Q291bnRlcihbdGhpc10oUmVmQ291bnRl ckV2ZW50KSB7IHNldEFjdGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6UGFnZUxvYWRBY3Rp dml0eSwgbV9wYWdlTG9hZEFjdGl2aXR5Q291bnRlci52YWx1ZSgpKTsgfSkKIHsKIH0KIApJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVk5vZGVUcmFja2VyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9WTm9kZVRyYWNrZXIuY3BwCShyZXZpc2lvbiAxOTcy MTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9WTm9kZVRyYWNrZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIFZOb2RlVHJhY2tlciYgVk5vZGVUcmFja2VyOjpzaW5n bGV0b24oKQogfQogCiBWTm9kZVRyYWNrZXI6OlZOb2RlVHJhY2tlcigpCi0gICAgOiBtX3Zub2Rl Q291bnRlcihbdGhpc10oVk5vZGVDb3VudGVyOjpFdmVudCBldmVudCkgeyBpZiAoZXZlbnQgPT0g Vk5vZGVDb3VudGVyOjpFdmVudDo6SW5jcmVtZW50KSBjaGVja1ByZXNzdXJlU3RhdGUoKTsgfSkK KyAgICA6IG1fdm5vZGVDb3VudGVyKFt0aGlzXShSZWZDb3VudGVyRXZlbnQgZXZlbnQpIHsgaWYg KGV2ZW50ID09IFJlZkNvdW50ZXJFdmVudDo6SW5jcmVtZW50KSBjaGVja1ByZXNzdXJlU3RhdGUo KTsgfSkKICAgICAsIG1fcHJlc3N1cmVXYXJuaW5nVGltZXIoKnRoaXMsICZWTm9kZVRyYWNrZXI6 OnByZXNzdXJlV2FybmluZ1RpbWVyRmlyZWQpCiAgICAgLCBtX2xhc3RXYXJuaW5nVGltZShzdGQ6 OmNocm9ubzo6c3RlYWR5X2Nsb2NrOjpub3coKSkKIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9u IDE5NzIyMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDM0IEBACisyMDE2LTAyLTI2ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdo QGFwcGxlLmNvbT4KKworICAgICAgICBSZWZDb3VudGVyPFQ+OjpFdmVudCAtPiBSZWZDb3VudGVy RXZlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NDc2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl ZkNvdW50ZXI8VD46OkV2ZW50IGlzIGtpbmRhIHZlcmJvc2UgdG8gdXNlLCBhbmQgdGhlcmUgaXMg bm8gbmVlZCBmb3IgdGhpcworICAgICAgICB0byBiZSBzcGVjaWZpYyB0byBhIHBhcnRpY3VsYXIg dHlwZW9mIFJlZkNvdW50ZXIuIE1vdmUgdGhlIGVudW0gY2xhc3MgdXAgdG8KKyAgICAgICAgdGhl IHRvcCBsZXZlbCAmIHJlbmFtZSB0byBSZWZDb3VudGVyRXZlbnQuCisKKyAgICAgICAgQWxzbyBy ZW1vdmUgVXNlck9ic2VydmFibGVQYWdlVG9rZW4gLSB0aGlzIGlzIHZlc3RpZ2lhbCAmIG5vdCBy ZWFsbHkgb2ZmZXJpbmcKKyAgICAgICAgYW55dGhpbmcgb3ZlciBqdXN0IHVzaW5nIFVzZXJPYnNl cnZhYmxlUGFnZUNvdW50ZXI6OlRva2VuIGRpcmVjdGx5LgorCisgICAgICAgICogVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVn aW5Qcm9jZXNzTWFuYWdlcjo6UGx1Z2luUHJvY2Vzc01hbmFnZXIpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmg6CisgICAgICAgICogVUlQcm9jZXNz L1BsdWdpbnMvbWFjL1BsdWdpblByb2Nlc3NNYW5hZ2VyTWFjLm1tOgorICAgICAgICAoV2ViS2l0 OjpQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6dXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6UHJvY2Vzc1Rocm90dGxlcik6CisgICAgICAgIChXZWJL aXQ6Om1fYmFja2dyb3VuZENvdW50ZXIpOgorICAgICAgICAoV2ViS2l0OjptX3N1c3BlbmRNZXNz YWdlQ291bnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpXZWJQcm9j ZXNzUG9vbCk6CisgICAgICAgIChXZWJLaXQ6Om1fcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRG b3JQYWdlQ291bnRlcik6CisgICAgICAgIChXZWJLaXQ6Om1faGlkZGVuUGFnZVRocm90dGxpbmdB dXRvSW5jcmVhc2VzQ291bnRlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s Lmg6CisKIDIwMTYtMDItMjYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUu Y29tPgogCiAgICAgICAgIFBhZ2UgVGltZXJBbGlnbm1lbnRJbnRlcnZhbEluY3JlYXNlIG1lY2hh bmlzbSBzaG91bGQgaGF2ZSB1cHBlciBsaW1pdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAkocmV2aXNpb24gMTk3MjE2KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zNSw4ICszNSw4IEBAIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBwcm9jZXNzU3VzcGVuc2lvblQK IFByb2Nlc3NUaHJvdHRsZXI6OlByb2Nlc3NUaHJvdHRsZXIoUHJvY2Vzc1Rocm90dGxlckNsaWVu dCYgcHJvY2VzcykKICAgICA6IG1fcHJvY2Vzcyhwcm9jZXNzKQogICAgICwgbV9zdXNwZW5kVGlt ZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUHJvY2Vzc1Rocm90dGxlcjo6c3VzcGVuZFRpbWVy RmlyZWQpCi0gICAgLCBtX2ZvcmVncm91bmRDb3VudGVyKFt0aGlzXShGb3JlZ3JvdW5kQWN0aXZp dHlDb3VudGVyOjpFdmVudCkgeyB1cGRhdGVBc3NlcnRpb24oKTsgfSkKLSAgICAsIG1fYmFja2dy b3VuZENvdW50ZXIoW3RoaXNdKEJhY2tncm91bmRBY3Rpdml0eUNvdW50ZXI6OkV2ZW50KSB7IHVw ZGF0ZUFzc2VydGlvbigpOyB9KQorICAgICwgbV9mb3JlZ3JvdW5kQ291bnRlcihbdGhpc10oUmVm Q291bnRlckV2ZW50KSB7IHVwZGF0ZUFzc2VydGlvbigpOyB9KQorICAgICwgbV9iYWNrZ3JvdW5k Q291bnRlcihbdGhpc10oUmVmQ291bnRlckV2ZW50KSB7IHVwZGF0ZUFzc2VydGlvbigpOyB9KQog ICAgICwgbV9zdXNwZW5kTWVzc2FnZUNvdW50KDApCiB7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgJKHJldmlzaW9uIDE5NzIxNikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTM2LDcgKzM2LDYgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgCiBlbnVtIFVzZXJPYnNl cnZhYmxlUGFnZUNvdW50ZXJUeXBlIHsgfTsKIHR5cGVkZWYgUmVmQ291bnRlcjxVc2VyT2JzZXJ2 YWJsZVBhZ2VDb3VudGVyVHlwZT4gVXNlck9ic2VydmFibGVQYWdlQ291bnRlcjsKLXR5cGVkZWYg VXNlck9ic2VydmFibGVQYWdlQ291bnRlcjo6VG9rZW4gVXNlck9ic2VydmFibGVQYWdlVG9rZW47 CiBlbnVtIFByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnRlclR5cGUgeyB9OwogdHlwZWRl ZiBSZWZDb3VudGVyPFByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnRlclR5cGU+IFByb2Nl c3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnRlcjsKIHR5cGVkZWYgUHJvY2Vzc1N1cHByZXNzaW9u RGlzYWJsZWRDb3VudGVyOjpUb2tlbiBQcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZFRva2VuOwpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTk3 MjE2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNzY2LDcgKzE3NjYsNyBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGE+IG1fc2Nyb2xsaW5nUGVy Zm9ybWFuY2VEYXRhOwogICAgIGJvb2wgbV9zY3JvbGxQZXJmb3JtYW5jZURhdGFDb2xsZWN0aW9u RW5hYmxlZDsKICNlbmRpZgotICAgIFVzZXJPYnNlcnZhYmxlUGFnZVRva2VuIG1fcGFnZUlzVXNl ck9ic2VydmFibGVDb3VudDsKKyAgICBVc2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyOjpUb2tlbiBt X3BhZ2VJc1VzZXJPYnNlcnZhYmxlQ291bnQ7CiAgICAgUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJs ZWRUb2tlbiBtX3ByZXZlbnRQcm9jZXNzU3VwcHJlc3Npb25Db3VudDsKICAgICBIaWRkZW5QYWdl VGhyb3R0bGluZ0F1dG9JbmNyZWFzZXNDb3VudGVyOjpUb2tlbiBtX2hpZGRlblBhZ2VET01UaW1l clRocm90dGxpbmdBdXRvSW5jcmVhc2VzQ291bnQ7CiAgICAgICAgIApJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCShyZXZpc2lvbiAxOTcyMTYpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNTgsOSArMTU4LDkgQEAgV2ViUHJvY2Vzc1Bvb2w6OldlYlByb2Nlc3NQb29sKEFQ STo6UHJvYwogICAgICwgbV9jYW5IYW5kbGVIVFRQU1NlcnZlclRydXN0RXZhbHVhdGlvbih0cnVl KQogICAgICwgbV9kaWROZXR3b3JrUHJvY2Vzc0NyYXNoKGZhbHNlKQogICAgICwgbV9tZW1vcnlD YWNoZURpc2FibGVkKGZhbHNlKQotICAgICwgbV91c2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyKFt0 aGlzXShVc2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyOjpFdmVudCkgeyB1cGRhdGVQcm9jZXNzU3Vw cHJlc3Npb25TdGF0ZSgpOyB9KQotICAgICwgbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEZv clBhZ2VDb3VudGVyKFt0aGlzXShQcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZENvdW50ZXI6OkV2 ZW50KSB7IHVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKCk7IH0pCi0gICAgLCBtX2hpZGRl blBhZ2VUaHJvdHRsaW5nQXV0b0luY3JlYXNlc0NvdW50ZXIoW3RoaXNdKEhpZGRlblBhZ2VUaHJv dHRsaW5nQXV0b0luY3JlYXNlc0NvdW50ZXI6OkV2ZW50KSB7IHVwZGF0ZUhpZGRlblBhZ2VUaHJv dHRsaW5nQXV0b0luY3JlYXNlTGltaXQoKTsgfSkKKyAgICAsIG1fdXNlck9ic2VydmFibGVQYWdl Q291bnRlcihbdGhpc10oUmVmQ291bnRlckV2ZW50KSB7IHVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lv blN0YXRlKCk7IH0pCisgICAgLCBtX3Byb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkRm9yUGFnZUNv dW50ZXIoW3RoaXNdKFJlZkNvdW50ZXJFdmVudCkgeyB1cGRhdGVQcm9jZXNzU3VwcHJlc3Npb25T dGF0ZSgpOyB9KQorICAgICwgbV9oaWRkZW5QYWdlVGhyb3R0bGluZ0F1dG9JbmNyZWFzZXNDb3Vu dGVyKFt0aGlzXShSZWZDb3VudGVyRXZlbnQpIHsgdXBkYXRlSGlkZGVuUGFnZVRocm90dGxpbmdB dXRvSW5jcmVhc2VMaW1pdCgpOyB9KQogewogICAgIGZvciAoYXV0byYgc2NoZW1lIDogbV9jb25m aWd1cmF0aW9uLT5hbHdheXNSZXZhbGlkYXRlZFVSTFNjaGVtZXMoKSkKICAgICAgICAgbV9zY2hl bWVzVG9SZWdpc3RlckFzQWx3YXlzUmV2YWxpZGF0ZWQuYWRkKHNjaGVtZSk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAkocmV2aXNpb24gMTk3MjE2KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgJKHdvcmtpbmcgY29w eSkKQEAgLTMzOCw3ICszMzgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRNZW1vcnlDYWNoZURp c2FibGVkKGJvb2wpOwogICAgIHZvaWQgc2V0Rm9udFdoaXRlbGlzdChBUEk6OkFycmF5Kik7CiAK LSAgICBVc2VyT2JzZXJ2YWJsZVBhZ2VUb2tlbiB1c2VyT2JzZXJ2YWJsZVBhZ2VDb3VudCgpCisg ICAgVXNlck9ic2VydmFibGVQYWdlQ291bnRlcjo6VG9rZW4gdXNlck9ic2VydmFibGVQYWdlQ291 bnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIG1fdXNlck9ic2VydmFibGVQYWdlQ291bnRlci5j b3VudCgpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblByb2Nlc3NNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAJKHJldmlzaW9uIDE5NzIxNikK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2Vy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBQbHVnaW5Qcm9jZXNzTWFuYWdl ciYgUGx1Z2luUHJvY2Vzc01hbmFnCiAKIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpQbHVnaW5Qcm9j ZXNzTWFuYWdlcigpCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgOiBtX3Byb2Nlc3NTdXBwcmVz c2lvbkRpc2FibGVkRm9yUGFnZUNvdW50ZXIoW3RoaXNdKFByb2Nlc3NTdXBwcmVzc2lvbkRpc2Fi bGVkQ291bnRlcjo6RXZlbnQgZXZlbnQpIHsgdXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJs ZWQoZXZlbnQpOyB9KQorICAgIDogbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEZvclBhZ2VD b3VudGVyKFt0aGlzXShSZWZDb3VudGVyRXZlbnQgZXZlbnQpIHsgdXBkYXRlUHJvY2Vzc1N1cHBy ZXNzaW9uRGlzYWJsZWQoZXZlbnQpOyB9KQogI2VuZGlmCiB7CiB9CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2Vy LmgJKHJldmlzaW9uIDE5NzIxNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblByb2Nlc3NNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4LDcgKzY4LDcgQEAg cHVibGljOgogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGlubGluZSBQcm9jZXNzU3VwcHJlc3Np b25EaXNhYmxlZFRva2VuIHByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkVG9rZW4oKTsKICAgICBp bmxpbmUgYm9vbCBwcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZCgpIGNvbnN0OwotICAgIHZvaWQg dXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWQoUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJs ZWRDb3VudGVyOjpFdmVudCk7CisgICAgdm9pZCB1cGRhdGVQcm9jZXNzU3VwcHJlc3Npb25EaXNh YmxlZChSZWZDb3VudGVyRXZlbnQpOwogI2VuZGlmCiAKIHByaXZhdGU6CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc01hbmFnZXJNYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdp blByb2Nlc3NNYW5hZ2VyTWFjLm1tCShyZXZpc2lvbiAxOTcyMTYpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc01hbmFnZXJNYWMubW0JKHdvcmtp bmcgY29weSkKQEAgLTMyLDE1ICszMiwxNSBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9p ZCBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6dXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWQo UHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRDb3VudGVyOjpFdmVudCBldmVudCkKK3ZvaWQgUGx1 Z2luUHJvY2Vzc01hbmFnZXI6OnVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkKFJlZkNv dW50ZXJFdmVudCBldmVudCkKIHsKICAgICBzaXplX3QgZGlzYWJsZUNvdW50ID0gbV9wcm9jZXNz U3VwcHJlc3Npb25EaXNhYmxlZEZvclBhZ2VDb3VudGVyLnZhbHVlKCk7CiAKICAgICAvLyBXZSBv bmx5IGNhcmUgYWJvdXQgemVyby9ub24temVybyBlZGdlIGNoYW5nZXM7IGlnbm9yZSBjYXNlcyB3 aGVyZSB0aGUgY291bnQgd2FzIHByZXZpb3VzbHkgbm9uLXplcm8sIGFuZCBzdGlsbCBpcy4KLSAg ICBpZiAoZGlzYWJsZUNvdW50ID49IDIgfHwgKGRpc2FibGVDb3VudCA9PSAxICYmIGV2ZW50ID09 IFByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnRlcjo6RXZlbnQ6OkRlY3JlbWVudCkpCisg ICAgaWYgKGRpc2FibGVDb3VudCA+PSAyIHx8IChkaXNhYmxlQ291bnQgPT0gMSAmJiBldmVudCA9 PSBSZWZDb3VudGVyRXZlbnQ6OkRlY3JlbWVudCkpCiAgICAgICAgIHJldHVybjsKLSAgICBBU1NF UlQoKGV2ZW50ID09IFByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnRlcjo6RXZlbnQ6Oklu Y3JlbWVudCAmJiBkaXNhYmxlQ291bnQgPT0gMSkKLSAgICAgICAgfHwgKGV2ZW50ID09IFByb2Nl c3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnRlcjo6RXZlbnQ6OkRlY3JlbWVudCAmJiAhZGlzYWJs ZUNvdW50KSk7CisgICAgQVNTRVJUKChldmVudCA9PSBSZWZDb3VudGVyRXZlbnQ6OkluY3JlbWVu dCAmJiBkaXNhYmxlQ291bnQgPT0gMSkKKyAgICAgICAgfHwgKGV2ZW50ID09IFJlZkNvdW50ZXJF dmVudDo6RGVjcmVtZW50ICYmICFkaXNhYmxlQ291bnQpKTsKIAogICAgIGJvb2wgZW5hYmxlZCA9 ICFkaXNhYmxlQ291bnQ7CiAgICAgZm9yIChhdXRvJiBwbHVnaW5Qcm9jZXNzIDogbV9wbHVnaW5Q cm9jZXNzZXMpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hh bmdlTG9nCShyZXZpc2lvbiAxOTcyMjMpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNyBAQAorMjAxNi0wMi0yNiAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJy YWNsb3VnaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmQ291bnRlcjxUPjo6RXZlbnQgLT4gUmVm Q291bnRlckV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTQ3NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZWZDb3VudGVyPFQ+OjpFdmVudCBpcyBraW5kYSB2ZXJib3NlIHRvIHVzZSwgYW5kIHRo ZXJlIGlzIG5vIG5lZWQgZm9yIHRoaXMKKyAgICAgICAgdG8gYmUgc3BlY2lmaWMgdG8gYSBwYXJ0 aWN1bGFyIHR5cGVvZiBSZWZDb3VudGVyLiBNb3ZlIHRoZSBlbnVtIGNsYXNzIHVwIHRvCisgICAg ICAgIHRoZSB0b3AgbGV2ZWwgJiByZW5hbWUgdG8gUmVmQ291bnRlckV2ZW50LgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvUmVmQ291bnRlci5jcHA6CisgICAgICAgIChUZXN0 V2ViS2l0QVBJOjpURVNUKToKKwogMjAxNi0wMi0yNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1 ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE5NzE1 OC4KSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL1JlZkNvdW50ZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL1JlZkNvdW50ZXIuY3Bw CShyZXZpc2lvbiAxOTcyMTYpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9SZWZD b3VudGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODAsMTEgKzgwLDExIEBAIFRFU1QoV1RGLCBS ZWZDb3VudGVyKQogICAgIHsKICAgICAgICAgLy8gVGVzdGluZyAoMWEpIC0gQ29uc3RydWN0aW9u IHdpdGggYSBjYWxsYmFjay4KICAgICAgICAgVGVzdENvdW50ZXIqIGNvdW50ZXJQdHIgPSBudWxs cHRyOwotICAgICAgICBUZXN0Q291bnRlciBjb3VudGVyKFsmXShUZXN0Q291bnRlcjo6RXZlbnQg ZXZlbnQpIHsKKyAgICAgICAgVGVzdENvdW50ZXIgY291bnRlcihbJl0oUmVmQ291bnRlckV2ZW50 IGV2ZW50KSB7CiAgICAgICAgICAgICAvLyBDaGVjayB0aGF0IHRoZSBjYWxsYmFjayBpcyBjYWxs ZWQgYXQgdGhlIGV4cGVjdGVkIHRpbWVzLCBhbmQgdGhlIGNvcnJlY3QgbnVtYmVyIG9mIHRpbWVz LgotICAgICAgICAgICAgaWYgKFRlc3RDb3VudGVyOjpFdmVudDo6SW5jcmVtZW50ID09IGV2ZW50 KQorICAgICAgICAgICAgaWYgKFJlZkNvdW50ZXJFdmVudDo6SW5jcmVtZW50ID09IGV2ZW50KQog ICAgICAgICAgICAgICAgIEVYUEVDVF9FUShjYWxsYmFja1ZhbHVlLCBJbmNyZW1lbnRFeHBlY3Rl ZCk7Ci0gICAgICAgICAgICBpZiAoVGVzdENvdW50ZXI6OkV2ZW50OjpEZWNyZW1lbnQgPT0gZXZl bnQpCisgICAgICAgICAgICBpZiAoUmVmQ291bnRlckV2ZW50OjpEZWNyZW1lbnQgPT0gZXZlbnQp CiAgICAgICAgICAgICAgICAgRVhQRUNUX0VRKGNhbGxiYWNrVmFsdWUsIERlY3JlbWVudEV4cGVj dGVkKTsKICAgICAgICAgICAgIC8vIHJldHVybiB0aGUgdmFsdWUgb2YgdGhlIGNvdW50ZXIgaW4g dGhlIGNhbGxiYWNrLgogICAgICAgICAgICAgY2FsbGJhY2tWYWx1ZSA9IGNvdW50ZXJQdHItPnZh bHVlKCk7Cg==