203625 2019-10-30 13:56:31 -0700 [GTK] Web Inspector: inspector/timeline/timeline-event-*.html are failing 2019-10-31 10:36:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 yurys yurys commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1585492 0 yurys 2019-10-30 13:56:31 -0700 --- /home/yurys/WebKit/WebKitBuild/Release/layout-test-results/inspector/timeline/timeline-event-CancelAnimationFrame-expected.txt +++ /home/yurys/WebKit/WebKitBuild/Release/layout-test-results/inspector/timeline/timeline-event-CancelAnimationFrame-actual.txt @@ -6,7 +6,11 @@ Starting Capture... Evaluating... Stopping Capture... -PASS: Should be 1 AnimationFrameCanceled record. -DETAILS: number -PASS: ScriptTimelineRecord details should be the requestAnimationFrame identifier. +ASSERT: savePageData should have been called in the page before capturing was stopped. +!! EXCEPTION: null is not an object (evaluating 'pageRecordingData.requestAnimationFrameIdentifier') +Stack Trace: #0: (anonymous) (unknown) +#1: asyncFunctionResume [native code] +#2: (anonymous) [native code] +#3: promiseReactionJobWithoutPromise [native code] +#4: promiseReactionJob [native code] 1585494 1 yurys 2019-10-30 14:03:38 -0700 Actually all tests using the same utility resource suffer from the same race: LayoutTests/inspector/timeline/timeline-event-TimerFire.html LayoutTests/inspector/timeline/timeline-event-TimerRemove.html LayoutTests/inspector/timeline/timeline-event-FireAnimationFrame.html LayoutTests/inspector/timeline/timeline-event-EventDispatch.html LayoutTests/inspector/timeline/timeline-event-RequestAnimationFrame.html LayoutTests/inspector/timeline/timeline-event-CancelAnimationFrame.html LayoutTests/inspector/timeline/timeline-event-TimerInstall.html 1585509 2 382354 yurys 2019-10-30 14:23:18 -0700 Created attachment 382354 Patch 1585695 3 382400 yurys 2019-10-30 17:58:02 -0700 Created attachment 382400 Patch 1585754 4 382400 hi 2019-10-30 21:07:26 -0700 Comment on attachment 382400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382400&action=review rs=me > LayoutTests/inspector/timeline/resources/timeline-event-utilities.js:9 > + let pageRecordingData = InspectorTest.awaitEvent("SavePageData").then((event) => { NIT: we should call this `savePageDataPromise` since it doesn't actually hold the data anymore. > LayoutTests/inspector/timeline/resources/timeline-event-utilities.js:35 > - .catch(promise.reject); > + .catch((error) => { > + promise.reject(error); > + }); Why was this changed? > LayoutTests/inspector/timeline/resources/timeline-event-utilities.js:43 > + pageRecordingData.then((r) => { > + promise.resolve(r); Once we change the name to `savePageDataPromise`, I'd expect `r` to be renamed to `data`. 1585942 5 382400 yurys 2019-10-31 09:40:40 -0700 Comment on attachment 382400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382400&action=review >> LayoutTests/inspector/timeline/resources/timeline-event-utilities.js:9 >> + let pageRecordingData = InspectorTest.awaitEvent("SavePageData").then((event) => { > > NIT: we should call this `savePageDataPromise` since it doesn't actually hold the data anymore. Done. >> LayoutTests/inspector/timeline/resources/timeline-event-utilities.js:35 >> + }); > > Why was this changed? As I noted in the changelog there was a bug. It wouldn't work before because 'promise.reject' doesn't preserve a pointer to 'promise' and 'reject' would be called with undefined 'this'. So we either have to 'bind' this or use a closure. >> LayoutTests/inspector/timeline/resources/timeline-event-utilities.js:43 >> + promise.resolve(r); > > Once we change the name to `savePageDataPromise`, I'd expect `r` to be renamed to `data`. Done. 1585943 6 382469 yurys 2019-10-31 09:41:46 -0700 Created attachment 382469 Patch for landing 1585969 7 382469 commit-queue 2019-10-31 10:35:13 -0700 Comment on attachment 382469 Patch for landing Clearing flags on attachment: 382469 Committed r251856: <https://trac.webkit.org/changeset/251856> 1585970 8 commit-queue 2019-10-31 10:35:15 -0700 All reviewed patches have been landed. Closing bug. 1585972 9 webkit-bug-importer 2019-10-31 10:36:17 -0700 <rdar://problem/56786459> 382354 2019-10-30 14:23:18 -0700 2019-10-30 17:58:01 -0700 Patch bug-203625-20191030142317.patch text/plain 3870 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNzg0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzU2NWI4NDIxYmIzYWQ1MWZkMzA5 OTBmZWFiNjc4YWFlM2IwMjI2Yi4uOTgyZTQyNjc4N2Y0OTg0ZDRkOTAzYWNiZWU2MTc5YjM0ZGM2 N2JkNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTEwLTMwICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtHVEtdIFdlYiBJbnNwZWN0b3I6IGlu c3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1ldmVudC0qLmh0bWwgYXJlIGZhaWxpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzYyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZmxha2UgaW5zcGVj dG9yL3RpbWVsaW5lL3RpbWVsaW5lLWV2ZW50LSouaHRtbCB0ZXN0cyBvbiBHVEsuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvdGltZWxpbmUvcmVzb3VyY2VzL3RpbWVsaW5lLWV2ZW50LXV0aWxpdGll cy5qczogVGhlcmUgaXMgYSByYWNlIGJldHdlZW4gQ2FwdHVyaW5nU3RhdGUuSW5hY3RpdmUKKyAg ICAgICAgYW5kIFNhdmVQYWdlRGF0YSBldmVudHMsIHNvIHRoZSB0ZXN0IGhhcyB0byB3YWl0IGZv ciBib3RoLgorICAgICAgICBEcml2ZS1ieTogd3JhcCBwcm9taXMucmVqZWN0IGluIGEgbGFtYmRh LCBvdGhlcndpc2UgcmVqZWN0IHdvdWxkIGJlIGNhbGxlZCBvbiBhbiB1bmRlZmluZWQgJ3RoaXMn IG9iamVjdC4KKyAgICAgICAgYXJyaXZlIGJlZm9yZSByZXNvbHZpbmcgdGhlIHByb21pc2UuCisg ICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxOS0xMC0zMCAgQW50dGkgS29pdmlzdG8gIDxh bnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgOjpiZWZvcmUvOjphZnRlciBlbGVtZW50cyBub3Qg ZmlsbGluZyB0aGVpciBncmlkIGNlbGwgd2hlbiBjb250YWluZXIgaGFzIGRpc3BsYXk6IGNvbnRl bnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvcmVzb3VyY2Vz L3RpbWVsaW5lLWV2ZW50LXV0aWxpdGllcy5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1l bGluZS9yZXNvdXJjZXMvdGltZWxpbmUtZXZlbnQtdXRpbGl0aWVzLmpzCmluZGV4IGI3Y2ZmZWZm NjU1Yzg0M2ZiMTUwOTNlZDJhZGJiNmE2YTVkM2NhYzUuLjAzM2RjNWViNTA2NTVmMjBlZjk4NDRi OTM0ZWJkNzM1NGRlOWM2OTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1l bGluZS9yZXNvdXJjZXMvdGltZWxpbmUtZXZlbnQtdXRpbGl0aWVzLmpzCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci90aW1lbGluZS9yZXNvdXJjZXMvdGltZWxpbmUtZXZlbnQtdXRpbGl0aWVz LmpzCkBAIC02LDcgKzYsOSBAQCBUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKCgpID0+IHsK ICAgICBJbnNwZWN0b3JUZXN0LlRpbWVsaW5lRXZlbnQgPSB7fTsKIAogICAgIEluc3BlY3RvclRl c3QuVGltZWxpbmVFdmVudC5jYXB0dXJlVGltZWxpbmVXaXRoU2NyaXB0ID0gZnVuY3Rpb24oe2V4 cHJlc3Npb24sIGV2ZW50VHlwZX0pIHsKLSAgICAgICAgbGV0IHBhZ2VSZWNvcmRpbmdEYXRhID0g bnVsbDsKKyAgICAgICAgbGV0IHBhZ2VSZWNvcmRpbmdEYXRhID0gSW5zcGVjdG9yVGVzdC5hd2Fp dEV2ZW50KCJTYXZlUGFnZURhdGEiKS50aGVuKChldmVudCkgPT4geworICAgICAgICAgICAgcmV0 dXJuIGV2ZW50LmRhdGE7CisgICAgICAgIH0pOwogCiAgICAgICAgIGxldCBwcm9taXNlID0gbmV3 IFdJLldyYXBwZWRQcm9taXNlOwogCkBAIC0yOCwyMiArMzAsMjIgQEAgVGVzdFBhZ2UucmVnaXN0 ZXJJbml0aWFsaXplcigoKSA9PiB7CiAKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0Lmxv ZygiRXZhbHVhdGluZy4uLiIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVh dGVJblBhZ2UoZXhwcmVzc2lvbikKLSAgICAgICAgICAgICAgICAuY2F0Y2gocHJvbWlzZS5yZWpl Y3QpOworICAgICAgICAgICAgICAgIC5jYXRjaCgoZXJyb3IpID0+IHsKKyAgICAgICAgICAgICAg ICAgICAgcHJvbWlzZS5yZWplY3QoZXJyb3IpOworICAgICAgICAgICAgICAgIH0pOwogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKFdJLnRp bWVsaW5lTWFuYWdlci5jYXB0dXJpbmdTdGF0ZSA9PT0gV0kuVGltZWxpbmVNYW5hZ2VyLkNhcHR1 cmluZ1N0YXRlLkluYWN0aXZlKSB7CiAgICAgICAgICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2Vy LnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LkNhcHR1cmluZ1N0 YXRlQ2hhbmdlZCwgbGlzdGVuZXIpOwogICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0KHBhZ2VSZWNvcmRpbmdEYXRhLCAic2F2ZVBhZ2VEYXRhIHNob3VsZCBoYXZlIGJlZW4gY2Fs bGVkIGluIHRoZSBwYWdlIGJlZm9yZSBjYXB0dXJpbmcgd2FzIHN0b3BwZWQuIik7Ci0gICAgICAg ICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKHBhZ2VSZWNvcmRpbmdEYXRhKTsKKyAgICAgICAgICAg ICAgICBwYWdlUmVjb3JkaW5nRGF0YS50aGVuKChyKSA9PiB7CisgICAgICAgICAgICAgICAgICAg IHByb21pc2UucmVzb2x2ZShyKTsKKyAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0pOwogCi0gICAgICAgIEluc3BlY3Rv clRlc3QuYXdhaXRFdmVudCgiU2F2ZVBhZ2VEYXRhIikudGhlbigoZXZlbnQpID0+IHsKLSAgICAg ICAgICAgIHBhZ2VSZWNvcmRpbmdEYXRhID0gZXZlbnQuZGF0YTsKLSAgICAgICAgfSk7Ci0KICAg ICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIlN0YXJ0aW5nIENhcHR1cmUuLi4iKTsKICAgICAgICAg Y29uc3QgbmV3UmVjb3JkaW5nID0gdHJ1ZTsKICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLnN0 YXJ0Q2FwdHVyaW5nKG5ld1JlY29yZGluZyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0 RXhwZWN0YXRpb25zCmluZGV4IGZjYTliOGNjNmQzZTYwOTFiYzhlZDRmNGFlMDkyYWZhODJmMjg3 ODEuLjYzODAxM2NmNWI5NDU5ZTVlOTM4ZmMzMmQ4MWE0MTdmMDU3NTY2MTkgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCkBAIC0yMzgxLDcgKzIzODEsNiBAQCB3 ZWJraXQub3JnL2IvMTM2Njc0IG1lZGlhL3RyYWNrL3RyYWNrLWN1ZS1yZW5kZXJpbmctd2l0aC1w YWRkaW5nLmh0bWwgWyBUaW1lb3V0CiB3ZWJraXQub3JnL2IvMTM3Njk4IG1lZGlhL3ZpZGVvLWNv bnRyb2xzLWRyYWcuaHRtbCBbIFRpbWVvdXQgXQogCiB3ZWJraXQub3JnL2IvMTQ3NTE4IGluc3Bl Y3Rvci9kb20gWyBTa2lwIF0KLXdlYmtpdC5vcmcvYi8xNDc1MTggaW5zcGVjdG9yL3RpbWVsaW5l IFsgU2tpcCBdCiAKIHdlYmtpdC5vcmcvYi8xMzkzNjIgaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxl bWVudC1tYXRjaGVzLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xMzkzNjIgaW5zcGVj dG9yL2Nzcy9zZWxlY3Rvci1zcGVjaWZpY2l0eS5odG1sIFsgVGltZW91dCBQYXNzIF0K 382400 2019-10-30 17:58:02 -0700 2019-10-31 09:41:44 -0700 Patch bug-203625-20191030175801.patch text/plain 4492 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODI1CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2QyODcyMDNiYmUxMTFlZmFjYzU2 NTY1YjU2ZWI1OTBlYWRmOTg2NC4uZjhhNjBlZjMwYjM4YTQ0NDIyNzJhMjdlMTEwZTRlMmM3NjBm ZDIzOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTEwLTMwICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtHVEtdIFdlYiBJbnNwZWN0b3I6IGlu c3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1ldmVudC0qLmh0bWwgYXJlIGZhaWxpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzYyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZmxha2UgaW5zcGVj dG9yL3RpbWVsaW5lL3RpbWVsaW5lLWV2ZW50LSouaHRtbCB0ZXN0cyBvbiBHVEsuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvdGltZWxpbmUvcmVzb3VyY2VzL3RpbWVsaW5lLWV2ZW50LXV0aWxpdGll cy5qczogVGhlcmUgaXMgYSByYWNlIGJldHdlZW4gQ2FwdHVyaW5nU3RhdGUuSW5hY3RpdmUKKyAg ICAgICAgYW5kIFNhdmVQYWdlRGF0YSBldmVudHMsIHNvIHRoZSB0ZXN0IGhhcyB0byB3YWl0IGZv ciBib3RoLgorICAgICAgICBEcml2ZS1ieTogd3JhcCBwcm9taXMucmVqZWN0IGluIGEgbGFtYmRh LCBvdGhlcndpc2UgcmVqZWN0IHdvdWxkIGJlIGNhbGxlZCBvbiBhbiB1bmRlZmluZWQgJ3RoaXMn IG9iamVjdC4KKyAgICAgICAgYXJyaXZlIGJlZm9yZSByZXNvbHZpbmcgdGhlIHByb21pc2UuCisg ICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxOS0xMC0zMCAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEdQVUNhbnZhc0NvbnRleHQgc2hvdWxkIG5vdCBwcmV2 ZW50IGVudGVyaW5nIHRoZSBiYWNrL2ZvcndhcmQgY2FjaGUKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2luc3BlY3Rvci90aW1lbGluZS9yZXNvdXJjZXMvdGltZWxpbmUtZXZlbnQtdXRpbGl0aWVz LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3Jlc291cmNlcy90aW1lbGluZS1l dmVudC11dGlsaXRpZXMuanMKaW5kZXggYjdjZmZlZmY2NTVjODQzZmIxNTA5M2VkMmFkYmI2YTZh NWQzY2FjNS4uMDMzZGM1ZWI1MDY1NWYyMGVmOTg0NGI5MzRlYmQ3MzU0ZGU5YzY5MyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3Jlc291cmNlcy90aW1lbGluZS1l dmVudC11dGlsaXRpZXMuanMKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL3Jl c291cmNlcy90aW1lbGluZS1ldmVudC11dGlsaXRpZXMuanMKQEAgLTYsNyArNiw5IEBAIFRlc3RQ YWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIoKCkgPT4gewogICAgIEluc3BlY3RvclRlc3QuVGltZWxp bmVFdmVudCA9IHt9OwogCiAgICAgSW5zcGVjdG9yVGVzdC5UaW1lbGluZUV2ZW50LmNhcHR1cmVU aW1lbGluZVdpdGhTY3JpcHQgPSBmdW5jdGlvbih7ZXhwcmVzc2lvbiwgZXZlbnRUeXBlfSkgewot ICAgICAgICBsZXQgcGFnZVJlY29yZGluZ0RhdGEgPSBudWxsOworICAgICAgICBsZXQgcGFnZVJl Y29yZGluZ0RhdGEgPSBJbnNwZWN0b3JUZXN0LmF3YWl0RXZlbnQoIlNhdmVQYWdlRGF0YSIpLnRo ZW4oKGV2ZW50KSA9PiB7CisgICAgICAgICAgICByZXR1cm4gZXZlbnQuZGF0YTsKKyAgICAgICAg fSk7CiAKICAgICAgICAgbGV0IHByb21pc2UgPSBuZXcgV0kuV3JhcHBlZFByb21pc2U7CiAKQEAg LTI4LDIyICszMCwyMiBAQCBUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKCgpID0+IHsKIAog ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKCJFdmFsdWF0aW5nLi4uIik7CiAgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShleHByZXNzaW9uKQotICAg ICAgICAgICAgICAgIC5jYXRjaChwcm9taXNlLnJlamVjdCk7CisgICAgICAgICAgICAgICAgLmNh dGNoKChlcnJvcikgPT4geworICAgICAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChlcnJv cik7CisgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICBpZiAoV0kudGltZWxpbmVNYW5hZ2VyLmNhcHR1cmluZ1N0 YXRlID09PSBXSS5UaW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5nU3RhdGUuSW5hY3RpdmUpIHsKICAg ICAgICAgICAgICAgICBXSS50aW1lbGluZU1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5U aW1lbGluZU1hbmFnZXIuRXZlbnQuQ2FwdHVyaW5nU3RhdGVDaGFuZ2VkLCBsaXN0ZW5lcik7CiAg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQocGFnZVJlY29yZGluZ0RhdGEsICJz YXZlUGFnZURhdGEgc2hvdWxkIGhhdmUgYmVlbiBjYWxsZWQgaW4gdGhlIHBhZ2UgYmVmb3JlIGNh cHR1cmluZyB3YXMgc3RvcHBlZC4iKTsKLSAgICAgICAgICAgICAgICBwcm9taXNlLnJlc29sdmUo cGFnZVJlY29yZGluZ0RhdGEpOworICAgICAgICAgICAgICAgIHBhZ2VSZWNvcmRpbmdEYXRhLnRo ZW4oKHIpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKHIpOworICAg ICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0K ICAgICAgICAgfSk7CiAKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hd2FpdEV2ZW50KCJTYXZlUGFn ZURhdGEiKS50aGVuKChldmVudCkgPT4gewotICAgICAgICAgICAgcGFnZVJlY29yZGluZ0RhdGEg PSBldmVudC5kYXRhOwotICAgICAgICB9KTsKLQogICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygi U3RhcnRpbmcgQ2FwdHVyZS4uLiIpOwogICAgICAgICBjb25zdCBuZXdSZWNvcmRpbmcgPSB0cnVl OwogICAgICAgICBXSS50aW1lbGluZU1hbmFnZXIuc3RhcnRDYXB0dXJpbmcobmV3UmVjb3JkaW5n KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25z IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMTgzZDNj NmJjZTcxODA3ZmJlYzQxZmJmM2JkMTBhZWYyMWIxY2U3Zi4uZTlkYTMxODg5MWVjMmY3Zjg3Njli YjcyNmMxYTU3NzM4MzQ3OTFjYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBl Y3RhdGlvbnMKQEAgLTIzNzYsMTQgKzIzNzYsNiBAQCB3ZWJraXQub3JnL2IvMTM2Njc0IG1lZGlh L3RyYWNrL3RyYWNrLWN1ZS1yZW5kZXJpbmctd2l0aC1wYWRkaW5nLmh0bWwgWyBUaW1lb3V0CiAK IHdlYmtpdC5vcmcvYi8xMzc2OTggbWVkaWEvdmlkZW8tY29udHJvbHMtZHJhZy5odG1sIFsgVGlt ZW91dCBdCiAKLXdlYmtpdC5vcmcvYi8yMDM2MjUgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5l LWV2ZW50LUNhbmNlbEFuaW1hdGlvbkZyYW1lLmh0bWwgIFsgUGFzcyBGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMDM2MjUgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWV2ZW50LUV2ZW50RGlz cGF0Y2guaHRtbCAgWyBQYXNzIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwMzYyNSBpbnNwZWN0 b3IvdGltZWxpbmUvdGltZWxpbmUtZXZlbnQtRmlyZUFuaW1hdGlvbkZyYW1lLmh0bWwgIFsgUGFz cyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMDM2MjUgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVs aW5lLWV2ZW50LVJlcXVlc3RBbmltYXRpb25GcmFtZS5odG1sICBbIFBhc3MgRmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjAzNjI1IGluc3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1ldmVudC1UaW1l ckZpcmUuaHRtbCAgWyBQYXNzIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwMzYyNSBpbnNwZWN0 b3IvdGltZWxpbmUvdGltZWxpbmUtZXZlbnQtVGltZXJJbnN0YWxsLmh0bWwgIFsgUGFzcyBGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMDM2MjUgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWV2 ZW50LVRpbWVyUmVtb3ZlLmh0bWwgIFsgUGFzcyBGYWlsdXJlIF0KLQogd2Via2l0Lm9yZy9iLzEz OTM2MiBpbnNwZWN0b3IvY3NzL3BzZXVkby1lbGVtZW50LW1hdGNoZXMuaHRtbCBbIEZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzEzOTM2MiBpbnNwZWN0b3IvY3NzL3NlbGVjdG9yLXNwZWNpZmljaXR5 Lmh0bWwgWyBUaW1lb3V0IFBhc3MgXQogd2Via2l0Lm9yZy9iLzE0NzIyOSBpbnNwZWN0b3IvY3Nz L21vZGlmeS1ydWxlLXNlbGVjdG9yLmh0bWwgWyBTa2lwIF0gIyBUaW1lb3V0Cg== 382469 2019-10-31 09:41:46 -0700 2019-10-31 10:35:13 -0700 Patch for landing bug-203625-20191031094145.patch text/plain 4625 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxODUxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzZjZTIyMWY5NTVmMmE3NWFkZGRh OTkxNmNiODNhNDIyZGUzMTNiNy4uNzE1YzJhYmYzZjgwZDkwZjEwNGRiMjllMmFjZjVkMDlkNjI2 MTJiNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTEwLTMwICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtHVEtdIFdlYiBJbnNwZWN0b3I6IGlu c3BlY3Rvci90aW1lbGluZS90aW1lbGluZS1ldmVudC0qLmh0bWwgYXJlIGZhaWxpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzYyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICBVbmZsYWtlIGluc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1ldmVudC0qLmh0bWwgdGVzdHMgb24gR1RLLgorCisgICAgICAg ICogaW5zcGVjdG9yL3RpbWVsaW5lL3Jlc291cmNlcy90aW1lbGluZS1ldmVudC11dGlsaXRpZXMu anM6IFRoZXJlIGlzIGEgcmFjZSBiZXR3ZWVuIENhcHR1cmluZ1N0YXRlLkluYWN0aXZlCisgICAg ICAgIGFuZCBTYXZlUGFnZURhdGEgZXZlbnRzLCBzbyB0aGUgdGVzdCBoYXMgdG8gd2FpdCBmb3Ig Ym90aC4KKyAgICAgICAgRHJpdmUtYnk6IHdyYXAgcHJvbWlzLnJlamVjdCBpbiBhIGxhbWJkYSwg b3RoZXJ3aXNlIHJlamVjdCB3b3VsZCBiZSBjYWxsZWQgb24gYW4gdW5kZWZpbmVkICd0aGlzJyBv YmplY3QuCisgICAgICAgIGFycml2ZSBiZWZvcmUgcmVzb2x2aW5nIHRoZSBwcm9taXNlLgorICAg ICAgICAoVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplcik6CisgICAgICAgICogcGxhdGZvcm0v Z3RrL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTktMTAtMzEgIE1pZ3VlbCBHb21leiAgPG1hZ29t ZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIEdUSyBhbmQgV1BFIGdhcmRlbmlu ZyBhZnRlciByMjUxODM3LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVs aW5lL3Jlc291cmNlcy90aW1lbGluZS1ldmVudC11dGlsaXRpZXMuanMgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvdGltZWxpbmUvcmVzb3VyY2VzL3RpbWVsaW5lLWV2ZW50LXV0aWxpdGllcy5qcwpp bmRleCBiN2NmZmVmZjY1NWM4NDNmYjE1MDkzZWQyYWRiYjZhNmE1ZDNjYWM1Li42NmI2NGI5Y2Qx NDdiMzM0OWU2MWIyOWE0MzI1NDMyODc3YTgzNmRiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvdGltZWxpbmUvcmVzb3VyY2VzL3RpbWVsaW5lLWV2ZW50LXV0aWxpdGllcy5qcwor KysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvcmVzb3VyY2VzL3RpbWVsaW5lLWV2 ZW50LXV0aWxpdGllcy5qcwpAQCAtNiw3ICs2LDkgQEAgVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFs aXplcigoKSA9PiB7CiAgICAgSW5zcGVjdG9yVGVzdC5UaW1lbGluZUV2ZW50ID0ge307CiAKICAg ICBJbnNwZWN0b3JUZXN0LlRpbWVsaW5lRXZlbnQuY2FwdHVyZVRpbWVsaW5lV2l0aFNjcmlwdCA9 IGZ1bmN0aW9uKHtleHByZXNzaW9uLCBldmVudFR5cGV9KSB7Ci0gICAgICAgIGxldCBwYWdlUmVj b3JkaW5nRGF0YSA9IG51bGw7CisgICAgICAgIGxldCBzYXZlUGFnZURhdGFQcm9taXNlID0gSW5z cGVjdG9yVGVzdC5hd2FpdEV2ZW50KCJTYXZlUGFnZURhdGEiKS50aGVuKChldmVudCkgPT4gewor ICAgICAgICAgICAgcmV0dXJuIGV2ZW50LmRhdGE7CisgICAgICAgIH0pOwogCiAgICAgICAgIGxl dCBwcm9taXNlID0gbmV3IFdJLldyYXBwZWRQcm9taXNlOwogCkBAIC0yOCwyMiArMzAsMjIgQEAg VGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplcigoKSA9PiB7CiAKICAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmxvZygiRXZhbHVhdGluZy4uLiIpOwogICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoZXhwcmVzc2lvbikKLSAgICAgICAgICAgICAgICAuY2F0 Y2gocHJvbWlzZS5yZWplY3QpOworICAgICAgICAgICAgICAgIC5jYXRjaCgoZXJyb3IpID0+IHsK KyAgICAgICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoZXJyb3IpOworICAgICAgICAgICAg ICAgIH0pOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAg ICAgICAgaWYgKFdJLnRpbWVsaW5lTWFuYWdlci5jYXB0dXJpbmdTdGF0ZSA9PT0gV0kuVGltZWxp bmVNYW5hZ2VyLkNhcHR1cmluZ1N0YXRlLkluYWN0aXZlKSB7CiAgICAgICAgICAgICAgICAgV0ku dGltZWxpbmVNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIoV0kuVGltZWxpbmVNYW5hZ2VyLkV2 ZW50LkNhcHR1cmluZ1N0YXRlQ2hhbmdlZCwgbGlzdGVuZXIpOwotICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYXNzZXJ0KHBhZ2VSZWNvcmRpbmdEYXRhLCAic2F2ZVBhZ2VEYXRhIHNob3Vs ZCBoYXZlIGJlZW4gY2FsbGVkIGluIHRoZSBwYWdlIGJlZm9yZSBjYXB0dXJpbmcgd2FzIHN0b3Bw ZWQuIik7Ci0gICAgICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKHBhZ2VSZWNvcmRpbmdEYXRh KTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChzYXZlUGFnZURhdGFQcm9t aXNlLCAic2F2ZVBhZ2VEYXRhIHNob3VsZCBoYXZlIGJlZW4gY2FsbGVkIGluIHRoZSBwYWdlIGJl Zm9yZSBjYXB0dXJpbmcgd2FzIHN0b3BwZWQuIik7CisgICAgICAgICAgICAgICAgc2F2ZVBhZ2VE YXRhUHJvbWlzZS50aGVuKChkYXRhKSA9PiB7CisgICAgICAgICAgICAgICAgICAgIHByb21pc2Uu cmVzb2x2ZShkYXRhKTsKKyAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0pOwogCi0gICAgICAgIEluc3BlY3RvclRlc3Qu YXdhaXRFdmVudCgiU2F2ZVBhZ2VEYXRhIikudGhlbigoZXZlbnQpID0+IHsKLSAgICAgICAgICAg IHBhZ2VSZWNvcmRpbmdEYXRhID0gZXZlbnQuZGF0YTsKLSAgICAgICAgfSk7Ci0KICAgICAgICAg SW5zcGVjdG9yVGVzdC5sb2coIlN0YXJ0aW5nIENhcHR1cmUuLi4iKTsKICAgICAgICAgY29uc3Qg bmV3UmVjb3JkaW5nID0gdHJ1ZTsKICAgICAgICAgV0kudGltZWxpbmVNYW5hZ2VyLnN0YXJ0Q2Fw dHVyaW5nKG5ld1JlY29yZGluZyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0 YXRpb25zCmluZGV4IDNmMzkxOWM2NGRkOWE4NTYyZmNkYmYyMzYwMDMxOTFlMDI2NzRlYTAuLjMz OGU2NGRmYWM2Y2IwOTQ4YmNiOTcyNzA2NDkwN2QxMjFlYmVmZDAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCkBAIC0yMzc1LDE0ICsyMzc1LDYgQEAgd2Via2l0 Lm9yZy9iLzEzNjY3NCBtZWRpYS90cmFjay90cmFjay1jdWUtcmVuZGVyaW5nLXdpdGgtcGFkZGlu Zy5odG1sIFsgVGltZW91dAogCiB3ZWJraXQub3JnL2IvMTM3Njk4IG1lZGlhL3ZpZGVvLWNvbnRy b2xzLWRyYWcuaHRtbCBbIFRpbWVvdXQgXQogCi13ZWJraXQub3JnL2IvMjAzNjI1IGluc3BlY3Rv ci90aW1lbGluZS90aW1lbGluZS1ldmVudC1DYW5jZWxBbmltYXRpb25GcmFtZS5odG1sICBbIFBh c3MgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjAzNjI1IGluc3BlY3Rvci90aW1lbGluZS90aW1l bGluZS1ldmVudC1FdmVudERpc3BhdGNoLmh0bWwgIFsgUGFzcyBGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMDM2MjUgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWV2ZW50LUZpcmVBbmltYXRp b25GcmFtZS5odG1sICBbIFBhc3MgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjAzNjI1IGluc3Bl Y3Rvci90aW1lbGluZS90aW1lbGluZS1ldmVudC1SZXF1ZXN0QW5pbWF0aW9uRnJhbWUuaHRtbCAg WyBQYXNzIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIwMzYyNSBpbnNwZWN0b3IvdGltZWxpbmUv dGltZWxpbmUtZXZlbnQtVGltZXJGaXJlLmh0bWwgIFsgUGFzcyBGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMDM2MjUgaW5zcGVjdG9yL3RpbWVsaW5lL3RpbWVsaW5lLWV2ZW50LVRpbWVySW5zdGFs bC5odG1sICBbIFBhc3MgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjAzNjI1IGluc3BlY3Rvci90 aW1lbGluZS90aW1lbGluZS1ldmVudC1UaW1lclJlbW92ZS5odG1sICBbIFBhc3MgRmFpbHVyZSBd Ci0KIHdlYmtpdC5vcmcvYi8xMzkzNjIgaW5zcGVjdG9yL2Nzcy9wc2V1ZG8tZWxlbWVudC1tYXRj aGVzLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xMzkzNjIgaW5zcGVjdG9yL2Nzcy9z ZWxlY3Rvci1zcGVjaWZpY2l0eS5odG1sIFsgVGltZW91dCBQYXNzIF0KIHdlYmtpdC5vcmcvYi8x NDcyMjkgaW5zcGVjdG9yL2Nzcy9tb2RpZnktcnVsZS1zZWxlY3Rvci5odG1sIFsgU2tpcCBdICMg VGltZW91dAo=