126129 2013-12-22 03:05:16 -0800 Implement NetworkResourceLoader::receivedCancellation 2014-01-10 01:07:08 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108832 1 cgarcia webkit-unassigned andersca beidson sam oldest_to_newest 962308 0 cgarcia 2013-12-22 03:05:16 -0800 $ Programs/WebKit2APITests/TestWebKitWebView -p /webkit2/WebKitWebView/authentication-cancel /webkit2/WebKitWebView/authentication-cancel: OK $ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestWebKitWebView -p /webkit2/WebKitWebView/authentication-cancel /webkit2/WebKitWebView/authentication-cancel: ** ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp:1331:void testWebViewAuthenticationCancel(AuthenticationTest*, gconstpointer): assertion failed (test->m_loadEvents[1] == LoadTrackingTest::ProvisionalLoadFailed): (3 == 2) 963302 1 cgarcia 2013-12-30 02:23:53 -0800 The problem is that NetworkResourceLoader doesn't implement ResourceHandleClient::receivedCancellation() and the load finished normally instead of failing with cancel error like the web process does. 963303 2 220104 cgarcia 2013-12-30 02:27:07 -0800 Created attachment 220104 Patch $ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestAuthentication /webkit2/WebKitWebView/authentication-request: OK /webkit2/WebKitWebView/authentication-cancel: OK /webkit2/WebKitWebView/authentication-load-cancelled: OK /webkit2/WebKitWebView/authentication-failure: OK /webkit2/WebKitWebView/authentication-no-credential: OK /webkit2/WebKitWebView/authentication-storage: OK /webkit2/WebKitWebView/authentication-success: OK 963493 3 220153 cgarcia 2013-12-31 00:39:11 -0800 Created attachment 220153 Updated patch Just rebased to apply on current git master 965454 4 220153 brian.holt 2014-01-08 07:01:53 -0800 Comment on attachment 220153 Updated patch Informal review: looks good to me, hope to see it landed soon. 965961 5 220153 ap 2014-01-09 10:15:21 -0800 Comment on attachment 220153 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=220153&action=review > Source/WebKit2/ChangeLog:3 > + [GTK] Test /webkit2/WebKitWebView/authentication-cancel fails with network process enabled This patch is cross-platform, please remove "[GTK]" here and from the bug title. > Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp:174 > +void NetworkResourceLoader::cancel() I'm not a fan of this function. It looks like someone tells NetworkResourceLoader to cancel, but this is not what it is - it implements what needs to be done in two places where NetworkResourceLoader decides to cancel the load on its own, based on indirect hints. In other future places where NetworkResourceLoader decides to cancel, it may need to do something else. I would have just put the code inline, not factoring it out into a cancel() function. But at the very least, the function should be private, not public. 966278 6 cgarcia 2014-01-10 01:07:08 -0800 Committed r161625: <http://trac.webkit.org/changeset/161625> 220104 2013-12-30 02:27:07 -0800 2013-12-31 00:39:11 -0800 Patch wk2-network-process-cancel.diff text/plain 3804 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkMTVlNTQ0Li43Y2QxZWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMTItMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFRlc3QgL3dlYmtpdDIvV2ViS2l0V2ViVmlldy9hdXRoZW50aWNh dGlvbi1jYW5jZWwgZmFpbHMgd2l0aCBuZXR3b3JrIHByb2Nlc3MgZW5hYmxlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MTI5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IFJlc291cmNl SGFuZGxlQ2xpZW50OjpyZWNlaXZlZENhbmNlbGxhdGlvbigpIGluIHRoZQorICAgICAgICBuZXR3 b3JrIHByb2Nlc3MgdG8gY2FuY2VsIHRoZSBsb2FkIHdoZW4gY2FuY2VsbGF0aW9uIGlzIHJlY2Vp dmVkCisgICAgICAgIGZyb20gdGhlIGF1dGhlbnRpY2F0aW9uIG1hbmFnZXIgbGlrZSB0aGUgd2Vi IHByb2Nlc3MgZG9lcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y2Fu Y2VsKTogSGVscGVyIGZ1bmN0aW9uIHRvIGNhbmNlbAorICAgICAgICB0aGUgbG9hZC4KKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb250aW51ZVdpbGxTZW5kUmVxdWVz dCk6IENhbGwgY2FuY2VsKCkuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6cmVjZWl2ZWRDYW5jZWxsYXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwogMjAxMy0xMi0yNyAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgQ3Jhc2ggd2hlbiBzdGFydGlu ZyBhIGRvd25sb2FkIGJlZm9yZSB0aGUgbmV0d29yayBwcm9jZXNzIGhhcyBiZWVuIGxhdW5jaGVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmNwcAppbmRleCA5NjM3OWI5Li5lNDFhNzA4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKQEAg LTE3MSw2ICsxNzEsMTMgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmFib3J0KCkKICAg ICBjbGVhbnVwKCk7CiB9CiAKK3ZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjYW5jZWwoKQor eworICAgIEFTU0VSVChtX2hhbmRsZSk7CisgICAgbV9oYW5kbGUtPmNhbmNlbCgpOworICAgIGRp ZEZhaWwobV9oYW5kbGUuZ2V0KCksIGNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCkpOworfQorCiB2 b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlQXN5bmMoUmVzb3Vy Y2VIYW5kbGUqIGhhbmRsZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAg ICAgQVNTRVJUX1VOVVNFRChoYW5kbGUsIGhhbmRsZSA9PSBtX2hhbmRsZSk7CkBAIC0yNTcsMTAg KzI2NCw4IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb250aW51ZVdpbGxTZW5kUmVx dWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIG5ld1JlCiAKICAgICBtX2hhbmRsZS0+Y29udGlu dWVXaWxsU2VuZFJlcXVlc3QobV9yZXF1ZXN0KTsKIAotICAgIGlmIChtX3JlcXVlc3QuaXNOdWxs KCkpIHsKLSAgICAgICAgbV9oYW5kbGUtPmNhbmNlbCgpOwotICAgICAgICBkaWRGYWlsKG1faGFu ZGxlLmdldCgpLCBjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpKTsKLSAgICB9CisgICAgaWYgKG1f cmVxdWVzdC5pc051bGwoKSkKKyAgICAgICAgY2FuY2VsKCk7CiB9CiAKIHZvaWQgTmV0d29ya1Jl c291cmNlTG9hZGVyOjpjb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSgpCkBAIC0zMzYsNiArMzQx LDEzIEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRDYW5jZWxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZShSZXNvdXJjZUhhbmRsZSogaGFuCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0K IAordm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJlY2VpdmVkQ2FuY2VsbGF0aW9uKFJlc291 cmNlSGFuZGxlKiBoYW5kbGUsIGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBjaGFsbGVu Z2UpCit7CisgICAgQVNTRVJUX1VOVVNFRChoYW5kbGUsIGhhbmRsZSA9PSBtX2hhbmRsZSk7CisK KyAgICBjYW5jZWwoKTsKK30KKwogQ29yZUlQQzo6Q29ubmVjdGlvbiogTmV0d29ya1Jlc291cmNl TG9hZGVyOjptZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpCiB7CiAgICAgcmV0dXJuIGNvbm5lY3Rp b25Ub1dlYlByb2Nlc3MoKS0+Y29ubmVjdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRleCAxODk2OThkLi41 YTYyNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkZXIuaApAQCAtNzcsNiArNzcsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lk IHN0YXJ0KCk7CiAgICAgdm9pZCBhYm9ydCgpOworICAgIHZvaWQgY2FuY2VsKCk7CiAKICAgICAv LyBSZXNvdXJjZUhhbmRsZUNsaWVudCBtZXRob2RzCiAgICAgdmlydHVhbCB2b2lkIHdpbGxTZW5k UmVxdWVzdEFzeW5jKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RS ZXNwb25zZSkgT1ZFUlJJREU7CkBAIC05Miw2ICs5Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgc2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2VBc3luYyhXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZSopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlQXV0aGVudGljYXRp b25DaGFsbGVuZ2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBXZWJDb3JlOjpBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSYpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDYW5j ZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0 IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikgT1ZFUlJJREU7CisgICAgdmlydHVh bCB2b2lkIHJlY2VpdmVkQ2FuY2VsbGF0aW9uKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29u c3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIGJvb2wgdXNlc0FzeW5jQ2FsbGJhY2tzKCkgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQog CiAjaWYgVVNFKFBST1RFQ1RJT05fU1BBQ0VfQVVUSF9DQUxMQkFDSykK 220153 2013-12-31 00:39:11 -0800 2014-01-09 10:15:21 -0800 Updated patch wk-auth-cancel-network-process.diff text/plain 3798 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxMzY3MGIyLi5jYTdlMTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMTItMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFRlc3QgL3dlYmtpdDIvV2ViS2l0V2ViVmlldy9hdXRoZW50aWNh dGlvbi1jYW5jZWwgZmFpbHMgd2l0aCBuZXR3b3JrIHByb2Nlc3MgZW5hYmxlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MTI5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IFJlc291cmNl SGFuZGxlQ2xpZW50OjpyZWNlaXZlZENhbmNlbGxhdGlvbigpIGluIHRoZQorICAgICAgICBuZXR3 b3JrIHByb2Nlc3MgdG8gY2FuY2VsIHRoZSBsb2FkIHdoZW4gY2FuY2VsbGF0aW9uIGlzIHJlY2Vp dmVkCisgICAgICAgIGZyb20gdGhlIGF1dGhlbnRpY2F0aW9uIG1hbmFnZXIgbGlrZSB0aGUgd2Vi IHByb2Nlc3MgZG9lcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y2Fu Y2VsKTogSGVscGVyIGZ1bmN0aW9uIHRvIGNhbmNlbAorICAgICAgICB0aGUgbG9hZC4KKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb250aW51ZVdpbGxTZW5kUmVxdWVz dCk6IENhbGwgY2FuY2VsKCkuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRl cjo6cmVjZWl2ZWRDYW5jZWxsYXRpb24pOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwogMjAxMy0xMi0yNyAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgQ3Jhc2ggd2hlbiBzdGFydGlu ZyBhIGRvd25sb2FkIGJlZm9yZSB0aGUgbmV0d29yayBwcm9jZXNzIGhhcyBiZWVuIGxhdW5jaGVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmNwcAppbmRleCAwNzM4OTI5Li44ODlmMWMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKQEAg LTE3MSw2ICsxNzEsMTMgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmFib3J0KCkKICAg ICBjbGVhbnVwKCk7CiB9CiAKK3ZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjYW5jZWwoKQor eworICAgIEFTU0VSVChtX2hhbmRsZSk7CisgICAgbV9oYW5kbGUtPmNhbmNlbCgpOworICAgIGRp ZEZhaWwobV9oYW5kbGUuZ2V0KCksIGNhbmNlbGxlZEVycm9yKG1fcmVxdWVzdCkpOworfQorCiB2 b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlQXN5bmMoUmVzb3Vy Y2VIYW5kbGUqIGhhbmRsZSwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAg ICAgQVNTRVJUX1VOVVNFRChoYW5kbGUsIGhhbmRsZSA9PSBtX2hhbmRsZSk7CkBAIC0yNTcsMTAg KzI2NCw4IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb250aW51ZVdpbGxTZW5kUmVx dWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIG5ld1JlCiAKICAgICBtX2hhbmRsZS0+Y29udGlu dWVXaWxsU2VuZFJlcXVlc3QobV9yZXF1ZXN0KTsKIAotICAgIGlmIChtX3JlcXVlc3QuaXNOdWxs KCkpIHsKLSAgICAgICAgbV9oYW5kbGUtPmNhbmNlbCgpOwotICAgICAgICBkaWRGYWlsKG1faGFu ZGxlLmdldCgpLCBjYW5jZWxsZWRFcnJvcihtX3JlcXVlc3QpKTsKLSAgICB9CisgICAgaWYgKG1f cmVxdWVzdC5pc051bGwoKSkKKyAgICAgICAgY2FuY2VsKCk7CiB9CiAKIHZvaWQgTmV0d29ya1Jl c291cmNlTG9hZGVyOjpjb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSgpCkBAIC0zMzYsNiArMzQx LDEyIEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRDYW5jZWxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZShSZXNvdXJjZUhhbmRsZSogaGFuCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0K IAordm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnJlY2VpdmVkQ2FuY2VsbGF0aW9uKFJlc291 cmNlSGFuZGxlKiBoYW5kbGUsIGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBjaGFsbGVu Z2UpCit7CisgICAgQVNTRVJUX1VOVVNFRChoYW5kbGUsIGhhbmRsZSA9PSBtX2hhbmRsZSk7Cisg ICAgY2FuY2VsKCk7Cit9CisKIElQQzo6Q29ubmVjdGlvbiogTmV0d29ya1Jlc291cmNlTG9hZGVy OjptZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpCiB7CiAgICAgcmV0dXJuIGNvbm5lY3Rpb25Ub1dl YlByb2Nlc3MoKS0+Y29ubmVjdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRleCA5ZDIzMDMyLi5lYmQwZDBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuaApAQCAtNzcsNiArNzcsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHN0YXJ0 KCk7CiAgICAgdm9pZCBhYm9ydCgpOworICAgIHZvaWQgY2FuY2VsKCk7CiAKICAgICAvLyBSZXNv dXJjZUhhbmRsZUNsaWVudCBtZXRob2RzCiAgICAgdmlydHVhbCB2b2lkIHdpbGxTZW5kUmVxdWVz dEFzeW5jKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25z ZSkgT1ZFUlJJREU7CkBAIC05Miw2ICs5Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg c2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2VBc3luYyhXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSop IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFs bGVuZ2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNh dGlvbkNoYWxsZW5nZSYpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDYW5jZWxBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdlYkNv cmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lk IHJlY2VpdmVkQ2FuY2VsbGF0aW9uKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2Vi Q29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJv b2wgdXNlc0FzeW5jQ2FsbGJhY2tzKCkgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCiAjaWYg VVNFKFBST1RFQ1RJT05fU1BBQ0VfQVVUSF9DQUxMQkFDSykK