108334 2013-01-30 05:47:27 -0800 [chromium] move remaining resource load related methods to TestRunner library 2013-01-31 00:02:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jochen jochen abarth dglazkov fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 820127 0 jochen 2013-01-30 05:47:27 -0800 [chromium] move remaining resource load related methods to TestRunner library 820128 1 185477 jochen 2013-01-30 05:47:51 -0800 Created attachment 185477 Patch 820130 2 webkit.review.bot 2013-01-30 05:53:17 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 820386 3 185477 abarth 2013-01-30 11:59:45 -0800 Comment on attachment 185477 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185477&action=review > Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:410 > + return WebTestProxyBase::cannotHandleRequestError(frame, request); There's no call to Base here? > Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:772 > + return !url.SchemeIs("spaceballs"); I probably would have combined this line with 769. 820388 4 185477 jochen 2013-01-30 12:04:23 -0800 Comment on attachment 185477 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185477&action=review >> Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:410 >> + return WebTestProxyBase::cannotHandleRequestError(frame, request); > > There's no call to Base here? RenderViewImpl has NOTREACHED() in cannotHandleRequestError because it claims to be able to handle all requests. >> Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:772 >> + return !url.SchemeIs("spaceballs"); > > I probably would have combined this line with 769. done 820400 5 185477 jochen 2013-01-30 12:13:29 -0800 Comment on attachment 185477 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185477&action=review >>> Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:772 >>> + return !url.SchemeIs("spaceballs"); >> >> I probably would have combined this line with 769. > > done Actually, we need to cast the WebURL to GURL to get access to SchemeIs 820444 6 abarth 2013-01-30 12:57:31 -0800 (In reply to comment #4) > (From update of attachment 185477 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=185477&action=review > > >> Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:410 > >> + return WebTestProxyBase::cannotHandleRequestError(frame, request); > > > > There's no call to Base here? > > RenderViewImpl has NOTREACHED() in cannotHandleRequestError because it claims to be able to handle all requests. It seems odd for this code to know that detail about RenderViewImpl. Perhaps we should ASSERT that we're in some sort of testing mode? > >>> Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:772 > >>> + return !url.SchemeIs("spaceballs"); > >> > >> I probably would have combined this line with 769. > > > > done > > Actually, we need to cast the WebURL to GURL to get access to SchemeIs Ok. 820542 7 185477 jochen 2013-01-30 14:14:43 -0800 Comment on attachment 185477 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185477&action=review >>>> Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:410 >>>> + return WebTestProxyBase::cannotHandleRequestError(frame, request); >>> >>> There's no call to Base here? >> >> RenderViewImpl has NOTREACHED() in cannotHandleRequestError because it claims to be able to handle all requests. > > It seems odd for this code to know that detail about RenderViewImpl. Perhaps we should ASSERT that we're in some sort of testing mode? there are already a bunch of places that don't call Base, e.g. createView doesn't call base if the proxy decides not to create a view. Other places don't call Base because the API guarantees certain conditions which we violate during tests, e.g. combinations smart insert/delete and selecting trailing whitespace. I think this falls into both categories: the API guarantees that cannotHandleRequestError is not invoked unless canHandleRequest returns false. And since it's the Proxy that returned false, it would violate the API if we forwarded this call to the embedder. Also, I can only return one header, so even if I called out to Base, I had to discard the result. 820986 8 185477 buildbot 2013-01-30 19:24:51 -0800 Comment on attachment 185477 Patch Attachment 185477 did not pass win-ews (win): Output: http://queues.webkit.org/results/16252080 821019 9 abarth 2013-01-30 20:17:57 -0800 ok 821155 10 185477 webkit.review.bot 2013-01-31 00:02:27 -0800 Comment on attachment 185477 Patch Clearing flags on attachment: 185477 Committed r141381: <http://trac.webkit.org/changeset/141381> 821156 11 webkit.review.bot 2013-01-31 00:02:32 -0800 All reviewed patches have been landed. Closing bug. 185477 2013-01-30 05:47:51 -0800 2013-01-31 00:02:27 -0800 Patch bug-108334-20130130144436.patch text/plain 14194 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTJmZWJhMjE4MWI5YWMzYTkxNjJlOWVmOGFkMmZiMzdl ZWQwZTQ5Zi4uMTU0ZWFiNzYxNTJlZjU0NTc2M2Q1YmYwZTllMGYyMTBiYjU3MGFkNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDEzLTAxLTMwICBKb2NoZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgog CisgICAgICAgIFtjaHJvbWl1bV0gbW92ZSByZW1haW5pbmcgcmVzb3VyY2UgbG9hZCByZWxhdGVk IG1ldGhvZHMgdG8gVGVzdFJ1bm5lciBsaWJyYXJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgzMzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5u ZXIvcHVibGljL1dlYlRlc3REZWxlZ2F0ZS5oOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcjo6V2Vi VGVzdERlbGVnYXRlOjphbGxvd0V4dGVybmFsUGFnZXMpOgorICAgICAgICAqIER1bXBSZW5kZXJU cmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvcHVibGljL1dlYlRlc3RQcm94eS5oOgorICAgICAgICAo V2ViS2l0KToKKyAgICAgICAgKFdlYlRlc3RQcm94eUJhc2UpOgorICAgICAgICAoV2ViVGVzdFJ1 bm5lcjo6V2ViVGVzdFByb3h5OjpjYW5IYW5kbGVSZXF1ZXN0KToKKyAgICAgICAgKFdlYlRlc3RS dW5uZXI6OldlYlRlc3RQcm94eTo6Y2Fubm90SGFuZGxlUmVxdWVzdEVycm9yKToKKyAgICAgICAg KFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eTo6ZGlkQ3JlYXRlRGF0YVNvdXJjZSk6CisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9zcmMvV2ViVGVzdFByb3h5 LmNwcDoKKyAgICAgICAgKFdlYlRlc3RSdW5uZXI6OldlYlRlc3RQcm94eUJhc2U6OmNhbkhhbmRs ZVJlcXVlc3QpOgorICAgICAgICAoV2ViVGVzdFJ1bm5lcik6CisgICAgICAgIChXZWJUZXN0UnVu bmVyOjpXZWJUZXN0UHJveHlCYXNlOjpjYW5ub3RIYW5kbGVSZXF1ZXN0RXJyb3IpOgorICAgICAg ICAoV2ViVGVzdFJ1bm5lcjo6V2ViVGVzdFByb3h5QmFzZTo6ZGlkQ3JlYXRlRGF0YVNvdXJjZSk6 CisgICAgICAgIChXZWJUZXN0UnVubmVyOjpXZWJUZXN0UHJveHlCYXNlOjp3aWxsU2VuZFJlcXVl c3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcDoK KyAgICAgICAgKFdlYlZpZXdIb3N0OjpjYW5IYW5kbGVSZXF1ZXN0KToKKyAgICAgICAgKFdlYlZp ZXdIb3N0OjpkaWRDcmVhdGVEYXRhU291cmNlKToKKyAgICAgICAgKFdlYlZpZXdIb3N0Ojp3aWxs U2VuZFJlcXVlc3QpOgorICAgICAgICAoV2ViVmlld0hvc3Q6OmFsbG93RXh0ZXJuYWxQYWdlcyk6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaDoKKworMjAx My0wMS0zMCAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KKwogICAgICAg ICBbY2hyb21pdW1dIG1vdmUgbWV0aG9kcyBmcm9tIFdlYlRlc3REZWxlZ2F0ZSB0byBXZWJUZXN0 UnVubmVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDgzMDkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1 bm5lci9wdWJsaWMvV2ViVGVzdERlbGVnYXRlLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0RGVsZWdhdGUuaAppbmRleCBmNzkzN2E1ZWI5 MDUzZWFiMTA5M2I5NTQ0Y2Y1MmVmYTA1ZWJhMzZmLi5mYTkzZDQ1YjJkNWU1ODUwMDczZTdmMjJl YzllNTVhMTRkMGY1NDJhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0RGVsZWdhdGUuaAorKysgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3B1YmxpYy9XZWJUZXN0RGVsZWdhdGUuaApAQCAt MTIyLDYgKzEyMiw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZ29Ub09mZnNldChpbnQp IHsgfQogICAgIHZpcnR1YWwgdm9pZCByZWxvYWQoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbG9h ZFVSTEZvckZyYW1lKGNvbnN0IFdlYktpdDo6V2ViVVJMJiwgY29uc3Qgc3RkOjpzdHJpbmcmKSB7 IH0KKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dFeHRlcm5hbFBhZ2VzKCkgeyByZXR1cm4gZmFsc2U7 IH0KIH07CiAKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RSdW5uZXIvcHVibGljL1dlYlRlc3RQcm94eS5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vVGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVzdFByb3h5LmgKaW5kZXggNjBiNWRlNGMzMWEx NmRiNmNkNTg5NmNhYzliZjQ0M2IwMWU1ZTE4ZS4uZjA2NTMzMjIyZTQ3NWRhZTc1YzMzNGEzMGFk MmMyNmFjODIyMWQxMSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v VGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVzdFByb3h5LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9wdWJsaWMvV2ViVGVzdFByb3h5LmgKQEAgLTMyLDYgKzMy LDcgQEAKICNkZWZpbmUgV2ViVGVzdFByb3h5X2gKIAogI2luY2x1ZGUgIlBsYXRmb3JtL2Nocm9t aXVtL3B1YmxpYy9XZWJSZWN0LmgiCisjaW5jbHVkZSAiUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYlVSTEVycm9yLmgiCiAjaW5jbHVkZSAiV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJBY2Nl c3NpYmlsaXR5Tm90aWZpY2F0aW9uLmgiCiAjaW5jbHVkZSAiV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJEcmFnT3BlcmF0aW9uLmgiCiAjaW5jbHVkZSAiV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJFZGl0aW5nQWN0aW9uLmgiCkBAIC00NCw2ICs0NSw3IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsK IGNsYXNzIFdlYkFjY2Vzc2liaWxpdHlPYmplY3Q7CiBjbGFzcyBXZWJDYWNoZWRVUkxSZXF1ZXN0 OworY2xhc3MgV2ViRGF0YVNvdXJjZTsKIGNsYXNzIFdlYkRyYWdEYXRhOwogY2xhc3MgV2ViRnJh bWU7CiBjbGFzcyBXZWJJbWFnZTsKQEAgLTYyLDcgKzY0LDYgQEAgY2xhc3MgV2ViVmlldzsKIHN0 cnVjdCBXZWJDb25zb2xlTWVzc2FnZTsKIHN0cnVjdCBXZWJQb2ludDsKIHN0cnVjdCBXZWJTaXpl Owotc3RydWN0IFdlYlVSTEVycm9yOwogc3RydWN0IFdlYldpbmRvd0ZlYXR1cmVzOwogfQogCkBA IC0xMzYsNiArMTM3LDkgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgZGlkRGV0ZWN0WFNTKFdlYktp dDo6V2ViRnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTCYgaW5zZWN1cmVVUkwsIGJvb2wgZGlk QmxvY2tFbnRpcmVQYWdlKTsKICAgICB2b2lkIGFzc2lnbklkZW50aWZpZXJUb1JlcXVlc3QoV2Vi S2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYktpdDo6V2ViVVJM UmVxdWVzdCYpOwogICAgIHZvaWQgd2lsbFJlcXVlc3RSZXNvdXJjZShXZWJLaXQ6OldlYkZyYW1l KiwgY29uc3QgV2ViS2l0OjpXZWJDYWNoZWRVUkxSZXF1ZXN0Jik7CisgICAgYm9vbCBjYW5IYW5k bGVSZXF1ZXN0KFdlYktpdDo6V2ViRnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVlc3Qm KTsKKyAgICBXZWJLaXQ6OldlYlVSTEVycm9yIGNhbm5vdEhhbmRsZVJlcXVlc3RFcnJvcihXZWJL aXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJVUkxSZXF1ZXN0Jik7CisgICAgdm9pZCBk aWRDcmVhdGVEYXRhU291cmNlKFdlYktpdDo6V2ViRnJhbWUqLCBXZWJLaXQ6OldlYkRhdGFTb3Vy Y2UqKTsKICAgICB2b2lkIHdpbGxTZW5kUmVxdWVzdChXZWJLaXQ6OldlYkZyYW1lKiwgdW5zaWdu ZWQgaWRlbnRpZmllciwgV2ViS2l0OjpXZWJVUkxSZXF1ZXN0JiwgY29uc3QgV2ViS2l0OjpXZWJV UkxSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSk7CiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9u c2UoV2ViS2l0OjpXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYktpdDo6 V2ViVVJMUmVzcG9uc2UmKTsKICAgICB2b2lkIGRpZEZpbmlzaFJlc291cmNlTG9hZChXZWJLaXQ6 OldlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRpZmllcik7CkBAIC0zOTUsNiArMzk5LDIxIEBAIHB1 YmxpYzoKICAgICAgICAgV2ViVGVzdFByb3h5QmFzZTo6d2lsbFJlcXVlc3RSZXNvdXJjZShmcmFt ZSwgcmVxdWVzdCk7CiAgICAgICAgIEJhc2U6OndpbGxSZXF1ZXN0UmVzb3VyY2UoZnJhbWUsIHJl cXVlc3QpOwogICAgIH0KKyAgICB2aXJ0dWFsIGJvb2wgY2FuSGFuZGxlUmVxdWVzdChXZWJLaXQ6 OldlYkZyYW1lKiBmcmFtZSwgY29uc3QgV2ViS2l0OjpXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0KQor ICAgIHsKKyAgICAgICAgaWYgKCFXZWJUZXN0UHJveHlCYXNlOjpjYW5IYW5kbGVSZXF1ZXN0KGZy YW1lLCByZXF1ZXN0KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJu IEJhc2U6OmNhbkhhbmRsZVJlcXVlc3QoZnJhbWUsIHJlcXVlc3QpOworICAgIH0KKyAgICB2aXJ0 dWFsIFdlYktpdDo6V2ViVVJMRXJyb3IgY2Fubm90SGFuZGxlUmVxdWVzdEVycm9yKFdlYktpdDo6 V2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmIHJlcXVlc3QpCisg ICAgeworICAgICAgICByZXR1cm4gV2ViVGVzdFByb3h5QmFzZTo6Y2Fubm90SGFuZGxlUmVxdWVz dEVycm9yKGZyYW1lLCByZXF1ZXN0KTsKKyAgICB9CisgICAgdmlydHVhbCB2b2lkIGRpZENyZWF0 ZURhdGFTb3VyY2UoV2ViS2l0OjpXZWJGcmFtZSogZnJhbWUsIFdlYktpdDo6V2ViRGF0YVNvdXJj ZSogZHMpCisgICAgeworICAgICAgICBXZWJUZXN0UHJveHlCYXNlOjpkaWRDcmVhdGVEYXRhU291 cmNlKGZyYW1lLCBkcyk7CisgICAgICAgIEJhc2U6OmRpZENyZWF0ZURhdGFTb3VyY2UoZnJhbWUs IGRzKTsKKyAgICB9CiAgICAgdmlydHVhbCB2b2lkIHdpbGxTZW5kUmVxdWVzdChXZWJLaXQ6Oldl YkZyYW1lKiBmcmFtZSwgdW5zaWduZWQgaWRlbnRpZmllciwgV2ViS2l0OjpXZWJVUkxSZXF1ZXN0 JiByZXF1ZXN0LCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNl KQogICAgIHsKICAgICAgICAgV2ViVGVzdFByb3h5QmFzZTo6d2lsbFNlbmRSZXF1ZXN0KGZyYW1l LCBpZGVudGlmaWVyLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKTsKZGlmZiAtLWdpdCBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dlYlRlc3RQcm94eS5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVubmVyL3NyYy9XZWJUZXN0 UHJveHkuY3BwCmluZGV4IDZjMzY2YmFhNGRlNWVkNDRiNDE5NTBiMjRiMzY5MTZhMTM3Y2I5MzIu LjQ4MjhhMDVjYzdhNzU1NzJhZGEwNjEwOGU0NTk5ZGE0YzI0ZDkzYTYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvc3JjL1dlYlRlc3RQcm94eS5j cHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9zcmMvV2Vi VGVzdFByb3h5LmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIldlYkFjY2Vzc2liaWxp dHlPYmplY3QuaCIKICNpbmNsdWRlICJXZWJDYWNoZWRVUkxSZXF1ZXN0LmgiCiAjaW5jbHVkZSAi V2ViQ29uc29sZU1lc3NhZ2UuaCIKKyNpbmNsdWRlICJXZWJEYXRhU291cmNlLmgiCiAjaW5jbHVk ZSAiV2ViRWxlbWVudC5oIgogI2luY2x1ZGUgIldlYkV2ZW50U2VuZGVyLmgiCiAjaW5jbHVkZSAi V2ViRnJhbWUuaCIKQEAgLTE4OCw2ICsxODksMTYgQEAgdm9pZCBibG9ja1JlcXVlc3QoV2ViVVJM UmVxdWVzdCYgcmVxdWVzdCkKICAgICByZXF1ZXN0LnNldFVSTChXZWJVUkwoKSk7CiB9CiAKK2Jv b2wgaXNMb2NhbGhvc3QoY29uc3Qgc3RyaW5nJiBob3N0KQoreworICAgIHJldHVybiBob3N0ID09 ICIxMjcuMC4wLjEiIHx8IGhvc3QgPT0gImxvY2FsaG9zdCI7Cit9CisKK2Jvb2wgaG9zdElzVXNl ZEJ5U29tZVRlc3RzVG9HZW5lcmF0ZUVycm9yKGNvbnN0IHN0cmluZyYgaG9zdCkKK3sKKyAgICBy ZXR1cm4gaG9zdCA9PSAiMjU1LjI1NS4yNTUuMjU1IjsKK30KKwogLy8gVXNlZCB0byB3cml0ZSBh IHBsYXRmb3JtIG5ldXRyYWwgZmlsZTovLy8gVVJMIGJ5IG9ubHkgdGFraW5nIHRoZSBmaWxlbmFt ZQogLy8gKGUuZy4sIGNvbnZlcnRzICJmaWxlOi8vL3RtcC9mb28udHh0IiB0byBqdXN0ICJmb28u dHh0IikuCiBzdHJpbmcgdXJsU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNvbnN0IHN0cmluZyYgdXJs KQpAQCAtNzUzLDYgKzc2NCwzMSBAQCB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OndpbGxSZXF1ZXN0 UmVzb3VyY2UoV2ViRnJhbWUqIGZyYW1lLCBjb25zdCBXZWJLaXQ6OldlYkNhYwogICAgIH0KIH0K IAorYm9vbCBXZWJUZXN0UHJveHlCYXNlOjpjYW5IYW5kbGVSZXF1ZXN0KFdlYkZyYW1lKiwgY29u c3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCkKK3sKKyAgICBHVVJMIHVybCA9IHJlcXVlc3QudXJs KCk7CisgICAgLy8gSnVzdCByZWplY3QgdGhlIHNjaGVtZSB1c2VkIGluCisgICAgLy8gTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9taXNjL3JlZGlyZWN0LXRvLWV4dGVybmFsLXVybC5odG1sCisgICAg cmV0dXJuICF1cmwuU2NoZW1lSXMoInNwYWNlYmFsbHMiKTsKK30KKworV2ViVVJMRXJyb3IgV2Vi VGVzdFByb3h5QmFzZTo6Y2Fubm90SGFuZGxlUmVxdWVzdEVycm9yKFdlYkZyYW1lKiwgY29uc3Qg V2ViVVJMUmVxdWVzdCYgcmVxdWVzdCkKK3sKKyAgICBXZWJVUkxFcnJvciBlcnJvcjsKKyAgICAv LyBBIFdlYktpdCBsYXlvdXQgdGVzdCBleHBlY3RzIHRoZSBmb2xsb3dpbmcgdmFsdWVzLgorICAg IC8vIHVuYWJsZVRvSW1wbGVtZW50UG9saWN5V2l0aEVycm9yKCkgYmVsb3cgcHJpbnRzIHRoZW0u CisgICAgZXJyb3IuZG9tYWluID0gV2ViU3RyaW5nOjpmcm9tVVRGOCgiV2ViS2l0RXJyb3JEb21h aW4iKTsKKyAgICBlcnJvci5yZWFzb24gPSAxMDE7CisgICAgZXJyb3IudW5yZWFjaGFibGVVUkwg PSByZXF1ZXN0LnVybCgpOworICAgIHJldHVybiBlcnJvcjsKK30KKwordm9pZCBXZWJUZXN0UHJv eHlCYXNlOjpkaWRDcmVhdGVEYXRhU291cmNlKFdlYkZyYW1lKiwgV2ViRGF0YVNvdXJjZSogZHMp Cit7CisgICAgaWYgKG1fdGVzdEludGVyZmFjZXMtPnRlc3RSdW5uZXIoKSAmJiAhbV90ZXN0SW50 ZXJmYWNlcy0+dGVzdFJ1bm5lcigpLT5kZWZlck1haW5SZXNvdXJjZURhdGFMb2FkKCkpCisgICAg ICAgIGRzLT5zZXREZWZlck1haW5SZXNvdXJjZURhdGFMb2FkKGZhbHNlKTsKK30KKwogdm9pZCBX ZWJUZXN0UHJveHlCYXNlOjp3aWxsU2VuZFJlcXVlc3QoV2ViRnJhbWUqLCB1bnNpZ25lZCBpZGVu dGlmaWVyLCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFdlYktpdDo6V2Vi VVJMUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCiB7CiAgICAgLy8gTmVlZCB0byB1c2UgR1VS TCBmb3IgaG9zdCgpIGFuZCBTY2hlbWVJcygpCkBAIC03OTMsNiArODI5LDIwIEBAIHZvaWQgV2Vi VGVzdFByb3h5QmFzZTo6d2lsbFNlbmRSZXF1ZXN0KFdlYkZyYW1lKiwgdW5zaWduZWQgaWRlbnRp ZmllciwgV2ViS2l0OjpXCiAgICAgICAgIGZvciAoc2V0PHN0cmluZz46OmNvbnN0X2l0ZXJhdG9y IGhlYWRlciA9IGNsZWFySGVhZGVycy0+YmVnaW4oKTsgaGVhZGVyICE9IGNsZWFySGVhZGVycy0+ ZW5kKCk7ICsraGVhZGVyKQogICAgICAgICAgICAgcmVxdWVzdC5jbGVhckhUVFBIZWFkZXJGaWVs ZChXZWJTdHJpbmc6OmZyb21VVEY4KCpoZWFkZXIpKTsKICAgICB9CisKKyAgICBzdHJpbmcgaG9z dCA9IHVybC5ob3N0KCk7CisgICAgaWYgKCFob3N0LmVtcHR5KCkgJiYgKHVybC5TY2hlbWVJcygi aHR0cCIpIHx8IHVybC5TY2hlbWVJcygiaHR0cHMiKSkpIHsKKyAgICAgICAgaWYgKCFpc0xvY2Fs aG9zdChob3N0KSAmJiAhaG9zdElzVXNlZEJ5U29tZVRlc3RzVG9HZW5lcmF0ZUVycm9yKGhvc3Qp CisgICAgICAgICAgICAmJiAoKCFtYWluRG9jdW1lbnRVUkwuU2NoZW1lSXMoImh0dHAiKSAmJiAh bWFpbkRvY3VtZW50VVJMLlNjaGVtZUlzKCJodHRwcyIpKSB8fCBpc0xvY2FsaG9zdChtYWluRG9j dW1lbnRVUkwuaG9zdCgpKSkKKyAgICAgICAgICAgICYmICFtX2RlbGVnYXRlLT5hbGxvd0V4dGVy bmFsUGFnZXMoKSkgeworICAgICAgICAgICAgbV9kZWxlZ2F0ZS0+cHJpbnRNZXNzYWdlKHN0cmlu ZygiQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMICIpICsgcmVxdWVzdFVSTCArICJcbiIp OworICAgICAgICAgICAgYmxvY2tSZXF1ZXN0KHJlcXVlc3QpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisgICAgfQorCisgICAgLy8gU2V0IHRoZSBuZXcgc3Vic3RpdHV0ZWQgVVJM LgorICAgIHJlcXVlc3Quc2V0VVJMKG1fZGVsZWdhdGUtPnJld3JpdGVMYXlvdXRUZXN0c1VSTChy ZXF1ZXN0LnVybCgpLnNwZWMoKSkpOwogfQogCiB2b2lkIFdlYlRlc3RQcm94eUJhc2U6OmRpZFJl Y2VpdmVSZXNwb25zZShXZWJGcmFtZSosIHVuc2lnbmVkIGlkZW50aWZpZXIsIGNvbnN0IFdlYktp dDo6V2ViVVJMUmVzcG9uc2UmIHJlc3BvbnNlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vV2ViVmlld0hvc3QuY3BwCmluZGV4IDA2ZGZlZmFhYTk4MTRjYTUxNTczNzVhYTUwNDcy MGUyOTdkZjAwYzkuLjNhYjE3MDk2NjVhNTIwOTQ0ZGY4Y2JhZWI0NTcxYzc0NjRkNTZhNWMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKQEAgLTY1 NCwyMSArNjU0LDcgQEAgV2ViTmF2aWdhdGlvblBvbGljeSBXZWJWaWV3SG9zdDo6ZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbigKIAogYm9vbCBXZWJWaWV3SG9zdDo6Y2FuSGFuZGxlUmVxdWVzdChX ZWJGcmFtZSosIGNvbnN0IFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgR1VSTCB1cmwg PSByZXF1ZXN0LnVybCgpOwotICAgIC8vIEp1c3QgcmVqZWN0IHRoZSBzY2hlbWUgdXNlZCBpbgot ICAgIC8vIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWlzYy9yZWRpcmVjdC10by1leHRlcm5hbC11 cmwuaHRtbAotICAgIHJldHVybiAhdXJsLlNjaGVtZUlzKCJzcGFjZWJhbGxzIik7Ci19Ci0KLVdl YlVSTEVycm9yIFdlYlZpZXdIb3N0OjpjYW5ub3RIYW5kbGVSZXF1ZXN0RXJyb3IoV2ViRnJhbWUq LCBjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0KQotewotICAgIFdlYlVSTEVycm9yIGVycm9y OwotICAgIC8vIEEgV2ViS2l0IGxheW91dCB0ZXN0IGV4cGVjdHMgdGhlIGZvbGxvd2luZyB2YWx1 ZXMuCi0gICAgLy8gdW5hYmxlVG9JbXBsZW1lbnRQb2xpY3lXaXRoRXJyb3IoKSBiZWxvdyBwcmlu dHMgdGhlbS4KLSAgICBlcnJvci5kb21haW4gPSBXZWJTdHJpbmc6OmZyb21VVEY4KCJXZWJLaXRF cnJvckRvbWFpbiIpOwotICAgIGVycm9yLnJlYXNvbiA9IDEwMTsKLSAgICBlcnJvci51bnJlYWNo YWJsZVVSTCA9IHJlcXVlc3QudXJsKCk7Ci0gICAgcmV0dXJuIGVycm9yOworICAgIHJldHVybiB0 cnVlOwogfQogCiBXZWJVUkxFcnJvciBXZWJWaWV3SG9zdDo6Y2FuY2VsbGVkRXJyb3IoV2ViRnJh bWUqLCBjb25zdCBXZWJVUkxSZXF1ZXN0JiByZXF1ZXN0KQpAQCAtNjgzLDggKzY2OSw2IEBAIHZv aWQgV2ViVmlld0hvc3Q6OnVuYWJsZVRvSW1wbGVtZW50UG9saWN5V2l0aEVycm9yKFdlYkZyYW1l KiBmcmFtZSwgY29uc3QgV2ViVVJMCiB2b2lkIFdlYlZpZXdIb3N0OjpkaWRDcmVhdGVEYXRhU291 cmNlKFdlYkZyYW1lKiwgV2ViRGF0YVNvdXJjZSogZHMpCiB7CiAgICAgZHMtPnNldEV4dHJhRGF0 YShtX3BlbmRpbmdFeHRyYURhdGEubGVha1B0cigpKTsKLSAgICBpZiAoIXRlc3RSdW5uZXIoKS0+ ZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCgpKQotICAgICAgICBkcy0+c2V0RGVmZXJNYWluUmVz b3VyY2VEYXRhTG9hZChmYWxzZSk7CiB9CiAKIHZvaWQgV2ViVmlld0hvc3Q6OmRpZENvbW1pdFBy b3Zpc2lvbmFsTG9hZChXZWJGcmFtZSogZnJhbWUsIGJvb2wgaXNOZXdOYXZpZ2F0aW9uKQpAQCAt NzA5LDQ3ICs2OTMsMTIgQEAgdm9pZCBXZWJWaWV3SG9zdDo6ZGlkTmF2aWdhdGVXaXRoaW5QYWdl KFdlYkZyYW1lKiBmcmFtZSwgYm9vbCBpc05ld05hdmlnYXRpb24pCiAgICAgdXBkYXRlRm9yQ29t bWl0dGVkTG9hZChmcmFtZSwgaXNOZXdOYXZpZ2F0aW9uKTsKIH0KIAotc3RhdGljIHZvaWQgYmxv Y2tSZXF1ZXN0KFdlYlVSTFJlcXVlc3QmIHJlcXVlc3QpCi17Ci0gICAgcmVxdWVzdC5zZXRVUkwo V2ViVVJMKCkpOwotfQotCi1zdGF0aWMgYm9vbCBpc0xvY2FsaG9zdChjb25zdCBzdHJpbmcmIGhv c3QpCi17Ci0gICAgcmV0dXJuIGhvc3QgPT0gIjEyNy4wLjAuMSIgfHwgaG9zdCA9PSAibG9jYWxo b3N0IjsKLX0KLQotc3RhdGljIGJvb2wgaG9zdElzVXNlZEJ5U29tZVRlc3RzVG9HZW5lcmF0ZUVy cm9yKGNvbnN0IHN0cmluZyYgaG9zdCkKLXsKLSAgICByZXR1cm4gaG9zdCA9PSAiMjU1LjI1NS4y NTUuMjU1IjsKLX0KLQotdm9pZCBXZWJWaWV3SG9zdDo6d2lsbFNlbmRSZXF1ZXN0KFdlYkZyYW1l KiBmcmFtZSwgdW5zaWduZWQgaWRlbnRpZmllciwgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCwgY29u c3QgV2ViVVJMUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCit2b2lkIFdlYlZpZXdIb3N0Ojp3 aWxsU2VuZFJlcXVlc3QoV2ViRnJhbWUqIGZyYW1lLCB1bnNpZ25lZCwgV2ViVVJMUmVxdWVzdCYg cmVxdWVzdCwgY29uc3QgV2ViVVJMUmVzcG9uc2UmKQogewogICAgIGlmIChyZXF1ZXN0LnVybCgp LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gTmVlZCB0byB1c2UgR1VSTCBm b3IgaG9zdCgpIGFuZCBTY2hlbWVJcygpCi0gICAgR1VSTCB1cmwgPSByZXF1ZXN0LnVybCgpOwot ICAgIHN0cmluZyByZXF1ZXN0VVJMID0gdXJsLnBvc3NpYmx5X2ludmFsaWRfc3BlYygpOwotCi0g ICAgR1VSTCBtYWluRG9jdW1lbnRVUkwgPSByZXF1ZXN0LmZpcnN0UGFydHlGb3JDb29raWVzKCk7 Ci0KICAgICByZXF1ZXN0LnNldEV4dHJhRGF0YSh3ZWJraXRfc3VwcG9ydDo6Q3JlYXRlV2ViVVJM UmVxdWVzdEV4dHJhRGF0YShmcmFtZS0+ZG9jdW1lbnQoKS5yZWZlcnJlclBvbGljeSgpKSk7Ci0K LSAgICBzdHJpbmcgaG9zdCA9IHVybC5ob3N0KCk7Ci0gICAgaWYgKCFob3N0LmVtcHR5KCkgJiYg KHVybC5TY2hlbWVJcygiaHR0cCIpIHx8IHVybC5TY2hlbWVJcygiaHR0cHMiKSkpIHsKLSAgICAg ICAgaWYgKCFpc0xvY2FsaG9zdChob3N0KSAmJiAhaG9zdElzVXNlZEJ5U29tZVRlc3RzVG9HZW5l cmF0ZUVycm9yKGhvc3QpCi0gICAgICAgICAgICAmJiAoKCFtYWluRG9jdW1lbnRVUkwuU2NoZW1l SXMoImh0dHAiKSAmJiAhbWFpbkRvY3VtZW50VVJMLlNjaGVtZUlzKCJodHRwcyIpKSB8fCBpc0xv Y2FsaG9zdChtYWluRG9jdW1lbnRVUkwuaG9zdCgpKSkKLSAgICAgICAgICAgICYmICFtX3NoZWxs LT5hbGxvd0V4dGVybmFsUGFnZXMoKSkgewotICAgICAgICAgICAgcHJpbnRmKCJCbG9ja2VkIGFj Y2VzcyB0byBleHRlcm5hbCBVUkwgJXNcbiIsIHJlcXVlc3RVUkwuY19zdHIoKSk7Ci0gICAgICAg ICAgICBibG9ja1JlcXVlc3QocmVxdWVzdCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IH0KLSAgICB9Ci0KLSAgICAvLyBTZXQgdGhlIG5ldyBzdWJzdGl0dXRlZCBVUkwuCi0gICAgcmVx dWVzdC5zZXRVUkwod2Via2l0X3N1cHBvcnQ6OlJld3JpdGVMYXlvdXRUZXN0c1VSTChyZXF1ZXN0 LnVybCgpLnNwZWMoKSkpOwogfQogCiB2b2lkIFdlYlZpZXdIb3N0OjpvcGVuRmlsZVN5c3RlbShX ZWJGcmFtZSogZnJhbWUsIFdlYkZpbGVTeXN0ZW06OlR5cGUgdHlwZSwgbG9uZyBsb25nIHNpemUs IGJvb2wgY3JlYXRlLCBXZWJGaWxlU3lzdGVtQ2FsbGJhY2tzKiBjYWxsYmFja3MpCkBAIC0xMTA3 LDYgKzEwNTYsMTEgQEAgdm9pZCBXZWJWaWV3SG9zdDo6bG9hZFVSTEZvckZyYW1lKGNvbnN0IFdl YlVSTCYgdXJsLCBjb25zdCBzdHJpbmcmIGZyYW1lTmFtZSkKICAgICBuYXZpZ2F0aW9uQ29udHJv bGxlcigpLT5sb2FkRW50cnkoVGVzdE5hdmlnYXRpb25FbnRyeTo6Y3JlYXRlKC0xLCB1cmwsIFdl YlN0cmluZygpLCBXZWJTdHJpbmc6OmZyb21VVEY4KGZyYW1lTmFtZSkpLmdldCgpKTsKIH0KIAor Ym9vbCBXZWJWaWV3SG9zdDo6YWxsb3dFeHRlcm5hbFBhZ2VzKCkKK3sKKyAgICByZXR1cm4gbV9z aGVsbC0+YWxsb3dFeHRlcm5hbFBhZ2VzKCk7Cit9CisKIC8vIFB1YmxpYyBmdW5jdGlvbnMgLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IAogV2ViVmlld0hvc3Q6OldlYlZpZXdIb3N0KFRlc3RTaGVsbCogc2hlbGwpCmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5oIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuaAppbmRleCA0OTdjZTQ3OGI0MzliZWY3 OTUxMzA2OTZmY2UwMGEyOGYxNmJmYWY2Li41ODFiZGRkYzhlMTc2MTM3MGNhNTNiOWQ3YTc3OGM0 NTM2MWYyZThmIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJW aWV3SG9zdC5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0 LmgKQEAgLTE3OCw3ICsxNzgsOCBAQCBjbGFzcyBXZWJWaWV3SG9zdCA6IHB1YmxpYyBXZWJLaXQ6 OldlYlZpZXdDbGllbnQsIHB1YmxpYyBXZWJLaXQ6OldlYkZyYW1lQ2xpZW50LAogICAgIHZpcnR1 YWwgdm9pZCB3YWl0Rm9yUG9saWN5RGVsZWdhdGUoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZv aWQgZ29Ub09mZnNldChpbnQpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCByZWxvYWQoKSBP VkVSUklERTsKLSAgICB2b2lkIGxvYWRVUkxGb3JGcmFtZShjb25zdCBXZWJLaXQ6OldlYlVSTCYs IGNvbnN0IHN0ZDo6c3RyaW5nJiBmcmFtZU5hbWUpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9p ZCBsb2FkVVJMRm9yRnJhbWUoY29uc3QgV2ViS2l0OjpXZWJVUkwmLCBjb25zdCBzdGQ6OnN0cmlu ZyYgZnJhbWVOYW1lKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgYWxsb3dFeHRlcm5hbFBh Z2VzKCkgT1ZFUlJJREU7CiAKICAgICAvLyBOYXZpZ2F0aW9uSG9zdAogICAgIHZpcnR1YWwgYm9v bCBuYXZpZ2F0ZShjb25zdCBUZXN0TmF2aWdhdGlvbkVudHJ5JiwgYm9vbCByZWxvYWQpOwpAQCAt MjY1LDcgKzI2Niw2IEBAIGNsYXNzIFdlYlZpZXdIb3N0IDogcHVibGljIFdlYktpdDo6V2ViVmll d0NsaWVudCwgcHVibGljIFdlYktpdDo6V2ViRnJhbWVDbGllbnQsCiAgICAgICAgIFdlYktpdDo6 V2ViTmF2aWdhdGlvblR5cGUsIGNvbnN0IFdlYktpdDo6V2ViTm9kZSYsCiAgICAgICAgIFdlYktp dDo6V2ViTmF2aWdhdGlvblBvbGljeSwgYm9vbCBpc1JlZGlyZWN0KTsKICAgICB2aXJ0dWFsIGJv b2wgY2FuSGFuZGxlUmVxdWVzdChXZWJLaXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJV UkxSZXF1ZXN0Jik7Ci0gICAgdmlydHVhbCBXZWJLaXQ6OldlYlVSTEVycm9yIGNhbm5vdEhhbmRs ZVJlcXVlc3RFcnJvcihXZWJLaXQ6OldlYkZyYW1lKiwgY29uc3QgV2ViS2l0OjpXZWJVUkxSZXF1 ZXN0Jik7CiAgICAgdmlydHVhbCBXZWJLaXQ6OldlYlVSTEVycm9yIGNhbmNlbGxlZEVycm9yKFdl YktpdDo6V2ViRnJhbWUqLCBjb25zdCBXZWJLaXQ6OldlYlVSTFJlcXVlc3QmKTsKICAgICB2aXJ0 dWFsIHZvaWQgdW5hYmxlVG9JbXBsZW1lbnRQb2xpY3lXaXRoRXJyb3IoV2ViS2l0OjpXZWJGcmFt ZSosIGNvbnN0IFdlYktpdDo6V2ViVVJMRXJyb3ImKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ3Jl YXRlRGF0YVNvdXJjZShXZWJLaXQ6OldlYkZyYW1lKiwgV2ViS2l0OjpXZWJEYXRhU291cmNlKik7 Cg==