138987 2014-11-21 15:26:41 -0800 Add cancelable version of willSendRequest 2014-12-01 20:28:02 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 138675 1 jeffrey+webkit jeffrey+webkit commit-queue japhet psolanki oldest_to_newest 1050594 0 jeffrey+webkit 2014-11-21 15:26:41 -0800 In some cases, we need a way to asynchronously cancel pending loads. Patch incoming. 1050602 1 242083 jeffrey+webkit 2014-11-21 15:31:04 -0800 Created attachment 242083 Patch 1050605 2 242083 andersca 2014-11-21 15:37:40 -0800 Comment on attachment 242083 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242083&action=review > Source/WebCore/loader/ResourceLoader.cpp:289 > +void ResourceLoader::maybeSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse, std::function<void(ResourceRequest&, bool)> callback) Weren't you going to make ResourceRequest be null instead of having a boolean flag? 1050609 3 jeffrey+webkit 2014-11-21 15:39:11 -0800 (In reply to comment #2) > Comment on attachment 242083 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=242083&action=review > > > Source/WebCore/loader/ResourceLoader.cpp:289 > > +void ResourceLoader::maybeSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse, std::function<void(ResourceRequest&, bool)> callback) > > Weren't you going to make ResourceRequest be null instead of having a > boolean flag? Yes...I think that version of the patch must have gotten lost on my other computer. Will fix now. 1050634 4 242092 jeffrey+webkit 2014-11-21 16:27:01 -0800 Created attachment 242092 Patch 1051685 5 242092 andersca 2014-12-01 17:25:12 -0800 Comment on attachment 242092 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242092&action=review > Source/WebCore/loader/ResourceLoader.h:96 > + virtual void maybeSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse, std::function<void(ResourceRequest&)> callback); I think you should either call this willSendRequest or willSendRequestAsync. It should also take a ResourceRequest&&. 1051688 6 jeffrey+webkit 2014-12-01 17:37:12 -0800 (In reply to comment #5) > Comment on attachment 242092 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=242092&action=review > > > Source/WebCore/loader/ResourceLoader.h:96 > > + virtual void maybeSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse, std::function<void(ResourceRequest&)> callback); > > I think you should either call this willSendRequest or willSendRequestAsync. > It should also take a ResourceRequest&&. I wanted to call it willSendRequestAsync, but due to C++ overloading rules and the fact that there's already a function called that that's protected, with a different signature, it didn't let me. I'll change the signature though. 1051714 7 jeffrey+webkit 2014-12-01 18:54:08 -0800 <rdar://problem/19110616> 1051723 8 jeffrey+webkit 2014-12-01 20:28:02 -0800 Committed r176626: <http://trac.webkit.org/changeset/176626> 242083 2014-11-21 15:31:04 -0800 2014-11-21 16:26:58 -0800 Patch bug-138987-20141121153120.patch text/plain 4796 jeffrey+webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MWMxZDQzNjk5YzNm NmIwNGFmMjA3NWIwZTAwZGQ4OTNhMTZhZS4uYjllNTE3NmVlODJhY2FiYzcwYmVlZjYxMWRkYTEx MzIwZjQ3YTYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTExLTIwICBKZWZm cmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGNhbmNlbGFibGUgdmVy c2lvbiBvZiB3aWxsU2VuZFJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODk4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBs b2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2Fk ZXI6Om1heWJlU2VuZFJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5o OgorCiAyMDE0LTExLTE4ICBBZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFRha2UgV2ViIEF1ZGlvIGludG8gYWNjb3VudCBmb3IgdGhlIFBhZ2U6OmlzUGxheWluZ0F1ZGlv KCkgQVBJLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IGMxNzViN2YxNWYzNmViMzNhM2Q2OTY0NGI4ZDg2ZjQzZTZm ZjFhZGQuLjM0MTkwZjM4M2YyMjdlNjc5MTM2Yjk2YmVmNWIyMDhmZGM0ZTY5MDIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0xMS0yMCAgSmVmZnJleSBQZmF1ICA8anBmYXVAYXBw bGUuY29tPgorCisgICAgICAgIEFkZCBjYW5jZWxhYmxlIHZlcnNpb24gb2Ygd2lsbFNlbmRSZXF1 ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5 ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QpOgorCiAyMDE0LTExLTE5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIHR3byBD b2NvYS1vbmx5IC5jcHAgZmlsZXMgdG8gLm1tLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWRlci5jcHAKaW5kZXggZTUyMmQzY2FmZDg3MDg1Y2Y5YTc3YjczMTE2ZjcyMjhlNmM5ZDZl Ny4uYzhiODk0ODlhZDg4OGMzNTQwNWI5OWU5NzJiYTYzNTI4ZDkyZDFhYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0yODYsNiArMjg2LDEyIEBAIHZvaWQg UmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFJlc291cmNlUmVzCiAgICAgICAgIGZyYW1lTG9hZGVyKCktPmNsaWVudCgpLmRpc3Bh dGNoRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCk7CiB9CiAKK3Zv aWQgUmVzb3VyY2VMb2FkZXI6Om1heWJlU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoUmVzb3VyY2VSZXF1ZXN0JiwgYm9vbCk+IGNhbGxiYWNrKQoreworICAgIHdpbGxT ZW5kUmVxdWVzdChyZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKTsKKyAgICBjYWxsYmFjayhyZXF1 ZXN0LCB0cnVlKTsKK30KKwogdm9pZCBSZXNvdXJjZUxvYWRlcjo6ZGlkU2VuZERhdGEodW5zaWdu ZWQgbG9uZyBsb25nLCB1bnNpZ25lZCBsb25nIGxvbmcpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWRlci5oCmluZGV4IDE2MTVmNmQ5YmY4ZGMzNGE0ZTliY2Y0NmJiNjNiNjhm NmNmZGEwMWEuLmFmODc1ODVkYzQxZDI1YjFjNDIyNzdhY2Y4MzVhZmM5NDJiNWI3NzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCkBAIC05MSw4ICs5MSw5IEBAIHB1Ymxp YzoKICAgICB2b2lkIGNsZWFyUmVzb3VyY2VEYXRhKCk7CiAgICAgCiAgICAgdmlydHVhbCBib29s IGlzU3VicmVzb3VyY2VMb2FkZXIoKTsKLSAgICAKKwogICAgIHZpcnR1YWwgdm9pZCB3aWxsU2Vu ZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJl Y3RSZXNwb25zZSk7CisgICAgdmlydHVhbCB2b2lkIG1heWJlU2VuZFJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSwgc3RkOjpm dW5jdGlvbjx2b2lkKFJlc291cmNlUmVxdWVzdCYsIGJvb2wgZG9TZW5kKT4gY2FsbGJhY2spOwog ICAgIHZpcnR1YWwgdm9pZCBkaWRTZW5kRGF0YSh1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50 LCB1bnNpZ25lZCBsb25nIGxvbmcgdG90YWxCeXRlc1RvQmVTZW50KTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICB2aXJ0 dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoY29uc3QgY2hhciosIHVuc2lnbmVkLCBsb25nIGxvbmcg ZW5jb2RlZERhdGFMZW5ndGgsIERhdGFQYXlsb2FkVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcAppbmRleCBj NWViNDIzY2IwMmYwNTczNTBkMzZlZGM1NTQwOWI4Y2RkZWQ4OTJhLi5lZGNmNDdkMDVmZTM3Yjk0 M2M2NDljYTJkZjY3ODc4NWI4ZDliODBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTgzLDE4ICs4Mywy MSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiBwcm9wb3NlZFJlcXVlc3QsCiB7CiAgICAgTE9HKE5ldHdvcmssICIoV2ViUHJv Y2VzcykgV2ViUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdCB0byAnJXMnIiwgcHJvcG9z ZWRSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogCi0gICAgUmVmPFdlYlJl c291cmNlTG9hZGVyPiBwcm90ZWN0KCp0aGlzKTsKKyAgICBSZWZQdHI8V2ViUmVzb3VyY2VMb2Fk ZXI+IHByb3RlY3QodGhpcyk7CiAKICAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdCA9IHBy b3Bvc2VkUmVxdWVzdDsKICAgICBpZiAobV9jb3JlTG9hZGVyLT5kb2N1bWVudExvYWRlcigpLT5h cHBsaWNhdGlvbkNhY2hlSG9zdCgpLT5tYXliZUxvYWRGYWxsYmFja0ZvclJlZGlyZWN0KG1fY29y ZUxvYWRlci5nZXQoKSwgbmV3UmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSkpCiAgICAgICAgIHJl dHVybjsKICAgICAvLyBGSVhNRTogRG8gd2UgbmVlZCB0byB1cGRhdGUgTmV0d29ya1Jlc291cmNl TG9hZGVyIGNsaWVudENyZWRlbnRpYWxQb2xpY3kgaW4gY2FzZSBsb2FkZXIgcG9saWN5IGlzIERv Tm90QXNrQ2xpZW50Rm9yQ3Jvc3NPcmlnaW5DcmVkZW50aWFscz8KLSAgICBtX2NvcmVMb2FkZXIt PndpbGxTZW5kUmVxdWVzdChuZXdSZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKTsKLSAgICAKLSAg ICBpZiAoIW1fY29yZUxvYWRlcikKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIHNlbmQoTWVz c2FnZXM6Ok5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Q29udGludWVXaWxsU2VuZFJlcXVlc3QobmV3 UmVxdWVzdCkpOworICAgIG1fY29yZUxvYWRlci0+bWF5YmVTZW5kUmVxdWVzdChuZXdSZXF1ZXN0 LCByZWRpcmVjdFJlc3BvbnNlLCBbcHJvdGVjdF0oUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBi b29sIGRvU2VuZCkgeworICAgICAgICBpZiAoIXByb3RlY3QtPm1fY29yZUxvYWRlcikKKyAgICAg ICAgICAgIHJldHVybjsKKworICAgICAgICBpZiAoZG9TZW5kKQorICAgICAgICAgICAgcHJvdGVj dC0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpDb250aW51ZVdpbGxTZW5k UmVxdWVzdChyZXF1ZXN0KSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHByb3RlY3QtPm1f Y29yZUxvYWRlci0+Y2FuY2VsKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2Fk ZXI6OmRpZFNlbmREYXRhKHVpbnQ2NF90IGJ5dGVzU2VudCwgdWludDY0X3QgdG90YWxCeXRlc1Rv QmVTZW50KQo= 242092 2014-11-21 16:27:01 -0800 2014-12-01 17:25:12 -0800 Patch bug-138987-20141121162718.patch text/plain 4769 jeffrey+webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ1MWMxZDQzNjk5YzNm NmIwNGFmMjA3NWIwZTAwZGQ4OTNhMTZhZS4uYjllNTE3NmVlODJhY2FiYzcwYmVlZjYxMWRkYTEx MzIwZjQ3YTYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTExLTIwICBKZWZm cmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGNhbmNlbGFibGUgdmVy c2lvbiBvZiB3aWxsU2VuZFJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzODk4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBs b2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2Fk ZXI6Om1heWJlU2VuZFJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlci5o OgorCiAyMDE0LTExLTE4ICBBZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFRha2UgV2ViIEF1ZGlvIGludG8gYWNjb3VudCBmb3IgdGhlIFBhZ2U6OmlzUGxheWluZ0F1ZGlv KCkgQVBJLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IGMxNzViN2YxNWYzNmViMzNhM2Q2OTY0NGI4ZDg2ZjQzZTZm ZjFhZGQuLjM0MTkwZjM4M2YyMjdlNjc5MTM2Yjk2YmVmNWIyMDhmZGM0ZTY5MDIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNC0xMS0yMCAgSmVmZnJleSBQZmF1ICA8anBmYXVAYXBw bGUuY29tPgorCisgICAgICAgIEFkZCBjYW5jZWxhYmxlIHZlcnNpb24gb2Ygd2lsbFNlbmRSZXF1 ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5 ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QpOgorCiAyMDE0LTExLTE5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIHR3byBD b2NvYS1vbmx5IC5jcHAgZmlsZXMgdG8gLm1tLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWRlci5jcHAKaW5kZXggZTUyMmQzY2FmZDg3MDg1Y2Y5YTc3YjczMTE2ZjcyMjhlNmM5ZDZl Ny4uZDQ4YmJhYWViNzRkZTI0MDg2ZjE3ZGQ5ZTFiZjNlOTRjZmM4ODRjYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0yODYsNiArMjg2LDEyIEBAIHZvaWQg UmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFJlc291cmNlUmVzCiAgICAgICAgIGZyYW1lTG9hZGVyKCktPmNsaWVudCgpLmRpc3Bh dGNoRGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkKCk7CiB9CiAKK3Zv aWQgUmVzb3VyY2VMb2FkZXI6Om1heWJlU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlLCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoUmVzb3VyY2VSZXF1ZXN0Jik+IGNhbGxiYWNrKQoreworICAgIHdpbGxTZW5kUmVx dWVzdChyZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKTsKKyAgICBjYWxsYmFjayhyZXF1ZXN0KTsK K30KKwogdm9pZCBSZXNvdXJjZUxvYWRlcjo6ZGlkU2VuZERhdGEodW5zaWduZWQgbG9uZyBsb25n LCB1bnNpZ25lZCBsb25nIGxvbmcpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv YWRlci5oCmluZGV4IDE2MTVmNmQ5YmY4ZGMzNGE0ZTliY2Y0NmJiNjNiNjhmNmNmZGEwMWEuLmU3 MzA2MGM0MTM1YWVkZWM4N2YzMzIyMGIzMTA4NmExNjViNjA5MDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRlci5oCkBAIC05MSw4ICs5MSw5IEBAIHB1YmxpYzoKICAgICB2b2lk IGNsZWFyUmVzb3VyY2VEYXRhKCk7CiAgICAgCiAgICAgdmlydHVhbCBib29sIGlzU3VicmVzb3Vy Y2VMb2FkZXIoKTsKLSAgICAKKwogICAgIHZpcnR1YWwgdm9pZCB3aWxsU2VuZFJlcXVlc3QoUmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSk7 CisgICAgdmlydHVhbCB2b2lkIG1heWJlU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSwgc3RkOjpmdW5jdGlvbjx2b2lk KFJlc291cmNlUmVxdWVzdCYpPiBjYWxsYmFjayk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFNlbmRE YXRhKHVuc2lnbmVkIGxvbmcgbG9uZyBieXRlc1NlbnQsIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3Rh bEJ5dGVzVG9CZVNlbnQpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoY29u c3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlRGF0YShj b25zdCBjaGFyKiwgdW5zaWduZWQsIGxvbmcgbG9uZyBlbmNvZGVkRGF0YUxlbmd0aCwgRGF0YVBh eWxvYWRUeXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29y ay9XZWJSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdv cmsvV2ViUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGM1ZWI0MjNjYjAyZjA1NzM1MGQzNmVkYzU1 NDA5YjhjZGRlZDg5MmEuLjE4ODk0ODczNzZlMmFlZjExZTdmM2Q2YzFhOWMwYzk1ZjQ3YmJjYWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJl c291cmNlTG9hZGVyLmNwcApAQCAtODMsMTggKzgzLDIxIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2Fk ZXI6OndpbGxTZW5kUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHByb3Bvc2VkUmVxdWVz dCwKIHsKICAgICBMT0coTmV0d29yaywgIihXZWJQcm9jZXNzKSBXZWJSZXNvdXJjZUxvYWRlcjo6 d2lsbFNlbmRSZXF1ZXN0IHRvICclcyciLCBwcm9wb3NlZFJlcXVlc3QudXJsKCkuc3RyaW5nKCku dXRmOCgpLmRhdGEoKSk7CiAKLSAgICBSZWY8V2ViUmVzb3VyY2VMb2FkZXI+IHByb3RlY3QoKnRo aXMpOworICAgIFJlZlB0cjxXZWJSZXNvdXJjZUxvYWRlcj4gcHJvdGVjdCh0aGlzKTsKIAogICAg IFJlc291cmNlUmVxdWVzdCBuZXdSZXF1ZXN0ID0gcHJvcG9zZWRSZXF1ZXN0OwogICAgIGlmICht X2NvcmVMb2FkZXItPmRvY3VtZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCktPm1h eWJlTG9hZEZhbGxiYWNrRm9yUmVkaXJlY3QobV9jb3JlTG9hZGVyLmdldCgpLCBuZXdSZXF1ZXN0 LCByZWRpcmVjdFJlc3BvbnNlKSkKICAgICAgICAgcmV0dXJuOwogICAgIC8vIEZJWE1FOiBEbyB3 ZSBuZWVkIHRvIHVwZGF0ZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXIgY2xpZW50Q3JlZGVudGlhbFBv bGljeSBpbiBjYXNlIGxvYWRlciBwb2xpY3kgaXMgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09yaWdp bkNyZWRlbnRpYWxzPwotICAgIG1fY29yZUxvYWRlci0+d2lsbFNlbmRSZXF1ZXN0KG5ld1JlcXVl c3QsIHJlZGlyZWN0UmVzcG9uc2UpOwotICAgIAotICAgIGlmICghbV9jb3JlTG9hZGVyKQotICAg ICAgICByZXR1cm47Ci0gICAgCi0gICAgc2VuZChNZXNzYWdlczo6TmV0d29ya1Jlc291cmNlTG9h ZGVyOjpDb250aW51ZVdpbGxTZW5kUmVxdWVzdChuZXdSZXF1ZXN0KSk7CisgICAgbV9jb3JlTG9h ZGVyLT5tYXliZVNlbmRSZXF1ZXN0KG5ld1JlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UsIFtwcm90 ZWN0XShSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpIHsKKyAgICAgICAgaWYgKCFwcm90ZWN0LT5t X2NvcmVMb2FkZXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKCFyZXF1ZXN0 LmlzTnVsbCgpKQorICAgICAgICAgICAgcHJvdGVjdC0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Jl c291cmNlTG9hZGVyOjpDb250aW51ZVdpbGxTZW5kUmVxdWVzdChyZXF1ZXN0KSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIHByb3RlY3QtPm1fY29yZUxvYWRlci0+Y2FuY2VsKCk7CisgICAg fSk7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFNlbmREYXRhKHVpbnQ2NF90IGJ5 dGVzU2VudCwgdWludDY0X3QgdG90YWxCeXRlc1RvQmVTZW50KQo=