217578 2020-10-11 04:47:28 -0700 Webcam video from navigator.mediaDevices.getUserMedia() to 2D canvas fails on Safari on iPhone 2020-10-16 01:38:16 -0700 1 1 1 Unclassified WebKit New Bugs Safari 14 iPhone / iPad iOS 13 RESOLVED FIXED InRadar P2 Normal --- 1 jujjyl youennf cdumez changseok eric.carlson esprehn+autocc ews-watchlist ggaren glenn gyuyoung.kim jer.noble philipj sergio simon.fraser webkit-bug-importer youennf oldest_to_newest 1696623 0 jujjyl 2020-10-11 04:47:28 -0700 STR: <html><head></head><body><canvas></canvas><script> navigator.mediaDevices.getUserMedia({ audio: false, video: true }).then((stream) => { var video = document.createElement('video'); video.srcObject = stream; video.play(); var canvas = document.querySelector('canvas'); var c2d = canvas.getContext('2d'); function draw() { canvas.width = video.videoWidth; canvas.height = video.videoHeight; c2d.drawImage(video, 0, 0, video.videoWidth, video.videoHeight); requestAnimationFrame(draw); } requestAnimationFrame(draw); }); </script></body></html> Works on desktop Firefox, Chrome and Edge, and on mobile Android Firefox and Chrome, but produces a black canvas on Safari. 1696646 1 webkit-bug-importer 2020-10-11 10:50:40 -0700 <rdar://problem/70183875> 1696816 2 youennf 2020-10-12 03:51:15 -0700 I reproed the issue. This does not repro if the video element is rendering. 1697193 3 youennf 2020-10-13 00:40:10 -0700 Here is a fiddle that reproduces the issue: https://jsfiddle.net/kw8fbcma/4/ Capture probably fails as the samples are queued in the local sample buffer display layer which is not actually rendering. 1697220 4 411209 youennf 2020-10-13 03:56:29 -0700 Created attachment 411209 Patch 1697263 5 411209 eric.carlson 2020-10-13 08:11:52 -0700 Comment on attachment 411209 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411209&action=review > Source/WebCore/platform/graphics/MediaPlayer.cpp:968 > +void MediaPlayer::setVisibleForCanvas(bool b) > +{ > + m_visible = b; > + m_private->setVisibleForCanvas(b); s/b/visible/ > Source/WebCore/platform/graphics/MediaPlayerPrivate.h:99 > + virtual void setVisibleForCanvas(bool b) { setVisible(b); } Ditto 1697274 6 411223 youennf 2020-10-13 09:12:52 -0700 Created attachment 411223 Patch for landing 1697292 7 ews-feeder 2020-10-13 10:06:21 -0700 Committed r268398: <https://trac.webkit.org/changeset/268398> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411223. 1697312 8 simon.fraser 2020-10-13 11:30:28 -0700 Why no layout test? 1697320 9 youennf 2020-10-13 11:47:57 -0700 (In reply to Simon Fraser (smfr) from comment #8) > Why no layout test? It would be nice but I found it hard to test. Ideas welcome. We would basically need to verify that AVSampleBufferDisplayLayer is not keeping references too much video samples in its queue but I do not see APIs to get that info. Ideally, we would want to validate that the mock device CVPixelBufferPool is able to recycle its pixel buffers at some reasonable point in time. That would make the mock very close to the real camera. Not sure how we can do that though. Maybe we can observe the CVPixelBuffer pointers. 1698221 10 ggaren 2020-10-15 12:23:10 -0700 What happens if you do this: setVisibleForCanvas(true); setVisible(true); ? I think you do not become visible, because of the early return in MediaPlayerPrivateMediaStreamAVFObjC::setVisible. And maybe there are other early returns like this? 1698227 11 youennf 2020-10-15 12:39:50 -0700 (In reply to Geoffrey Garen from comment #10) > What happens if you do this: > setVisibleForCanvas(true); > setVisible(true); > ? > > I think you do not become visible, because of the early return in > MediaPlayerPrivateMediaStreamAVFObjC::setVisible. And maybe there are other > early returns like this? For MediaPlayerPrivateMediaStreamAVFObjC, the MediaPlayer::setVisibleForCanvas(true) call is a no-op: - MediaPlayerPrivateMediaStreamAVFObjC::setVisibleForCanvas is a no-op. - MediaPlayer::m_visible is not used by MediaPlayerPrivateMediaStreamAVFObjC. The MediaPlayer::setVisible(true) call would end up setting MediaPlayerPrivateMediaStreamAVFObjC::m_visible to true. For other MediaPlayerPrivateXX, this patch is hopefully a no-op as MediaPlayer::setVisibleForCanvas is the same as MediaPlayer::setVisible. I'll double check this tomorrow but I think we can remove MediaPlayer::m_visible. 1698502 12 youennf 2020-10-16 01:38:16 -0700 > I'll double check this tomorrow but I think we can remove > MediaPlayer::m_visible. Filed https://bugs.webkit.org/show_bug.cgi?id=217810 411209 2020-10-13 03:56:29 -0700 2020-10-13 09:12:47 -0700 Patch bug-217578-20201013125628.patch text/plain 6620 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjljYTNkZTZjNWI3Mzkx MjA3ODExNDJhNWE4M2ViODAxMTBmODAwYi4uOTFkNGM5ZmRhMWM4ZmRlMTJiMzU0NjEyZTRiYTlj YTJhNGYyZjUyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTEwLTEzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJjYW0gdmlkZW8gZnJv bSBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSgpIHRvIDJEIGNhbnZhcyBmYWls cyBvbiBTYWZhcmkgb24gaVBob25lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTc1NzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMTgzODc1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIHVu bmVlZGVkIGZvciBNZWRpYVN0cmVhbSB2aWRlbyBiYWNrZW5kcyB0byBlbnF1ZXVlIHNhbXBsZXMg dG8gdGhlIGRpc3BsYXkgbGF5ZXIgaWYgdGhlIHZpZGVvIGVsZW1lbnQgaXMgaGlkZGVuLgorICAg ICAgICBJbiBpT1MsIHRoZSBzYW1wbGVzIG1heSBuZXZlciBiZSBmbHVzaGVkIHdoaWNoIG1pZ2h0 IGNhdXNlIGNhcHR1cmUgZmFpbGluZyBhZnRlciBlbnF1ZXVpbmcgdG9vIG1hbnkgY2FtZXJhIHNh bXBsZXMuCisgICAgICAgIFRvIGF2b2lkIHRoYXQsIHdlIG5vIGxvbmdlciBlbnF1ZXVlIHNhbXBs ZXMgdG8gdGhlIGRpc3BsYXkgbGF5ZXIgd2hlbiB0aGUgcGxheWVyIGlzIG5vdCB2aXNpYmxlLgor ICAgICAgICBJbiBjYXNlIG9mIGNhbnZhcyBwYWludGluZywgb3RoZXIgYmFja2VuZHMgbmVlZCB0 byBiZSBtYWRlIHZpc2libGUgZm9yIGNhbnZhcyBwYWludGluZyB0byB3b3JrLgorICAgICAgICBG b3IgTWVkaWFTdHJlYW0gYmFja2VuZCwgd2UgZG8gbm90IG5lZWQgdGhhdCBzaW5jZSB3ZSBhbHdh eXMga2VlcCB0aGUgbGFzdCBzYW1wbGUuCisgICAgICAgIEZvciB0aGF0IHJlYXNvbiwgd2Uga2Vl cCB0aGUgYmFja2VuZCBhcyBub3QgdmlzaWJsZSBldmVuIGlmIGNhbnZhcyBoYXBwZW5zLgorICAg ICAgICBXZSBkbyBzbyBieSBpbnRyb2R1Y2luZyBhIHNldFZpc2libGVGb3JDYW52YXMgdGhhdCBp cyBhIG5vLW9wIGZvciBNZWRpYVN0cmVhbSBiYWNrZW5kIGFuZCBzaW1pbGFyIHRvIHNldFZpc2li bGUgZm9yIG90aGVyIGJhY2tlbmRzLgorICAgICAgICBGb3IgZ29vZCBtZWFzdXJlLCB3ZSBub3cg Zmx1c2ggdGhlIE1lZGlhU3RyZWFtIGRpc3BsYXkgbGF5ZXIgd2hlbmV2ZXIgdmlzaWJpbGl0eSBj aGFuZ2VkLgorIAorICAgICAgICBNYW51YWxseSB0ZXN0ZWQuCisKKyAgICAgICAgKiBodG1sL0hU TUxWaWRlb0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudDo6 cGFpbnRDdXJyZW50RnJhbWVJbkNvbnRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpzZXRWaXNp YmxlRm9yQ2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlOjpzZXRWaXNpYmxlRm9y Q2FudmFzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakM6OmVucXVldWVWaWRlb1NhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNldFZpc2libGUpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaXNpYmxl Rm9yQ2FudmFzKToKKwogMjAyMC0xMC0xMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgSW1wcm92ZSBjb21wdXRhdGlvbiBvZiBkZWZhdWx0IGF1ZGlvIGlucHV0 IGFuZCBvdXRwdXQgZGV2aWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VmlkZW9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5j cHAKaW5kZXggNTZmZTUxNzJkOWI2NDE1YWJmZjk4OTQ0MmVhMWNjZWRhZTY2Y2Y4NC4uOGFiMmQw Y2I5NjVhNjI1ZWY0ZDAyY2UyODk5MDI5ZWI0MzI1MDE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MVmlkZW9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxWaWRlb0VsZW1lbnQuY3BwCkBAIC0zMDQsNyArMzA0LDcgQEAgdm9pZCBIVE1MVmlkZW9F bGVtZW50OjpwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRl eHQsIGNvbnMKICAgICBpZiAoIXBsYXllcikKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIHBs YXllci0+c2V0VmlzaWJsZSh0cnVlKTsgLy8gTWFrZSBwbGF5ZXIgdmlzaWJsZSBvciBpdCB3b24n dCBkcmF3LgorICAgIHBsYXllci0+c2V0VmlzaWJsZUZvckNhbnZhcyh0cnVlKTsgLy8gTWFrZSBw bGF5ZXIgdmlzaWJsZSBvciBpdCB3b24ndCBkcmF3LgogICAgIGNvbnRleHQucGFpbnRGcmFtZUZv ck1lZGlhKCpwbGF5ZXIsIGRlc3RSZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IDBhNTM1MjM3NzQ5M2E2ODZiOTU4 NTk1MGNiYWUwMWU0NTdhODQxODAuLjcxN2RkZDlhMDZhNzJlNzQyYTU4OWZlMzU3ZTNiM2ZiMjU2 OWE4MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlh UGxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAKQEAgLTk2Miw2ICs5NjIsMTIgQEAgdm9pZCBNZWRpYVBsYXllcjo6c2V0VmlzaWJs ZShib29sIGIpCiAgICAgbV9wcml2YXRlLT5zZXRWaXNpYmxlKGIpOwogfQogCit2b2lkIE1lZGlh UGxheWVyOjpzZXRWaXNpYmxlRm9yQ2FudmFzKGJvb2wgYikKK3sKKyAgICBtX3Zpc2libGUgPSBi OworICAgIG1fcHJpdmF0ZS0+c2V0VmlzaWJsZUZvckNhbnZhcyhiKTsKK30KKwogTWVkaWFQbGF5 ZXI6OlByZWxvYWQgTWVkaWFQbGF5ZXI6OnByZWxvYWQoKSBjb25zdAogewogICAgIHJldHVybiBt X3ByZWxvYWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5 ZXIuaAppbmRleCA3Y2I3ZWUxOTJmMDlhMzcwNWYwODNhYzA5N2IwOGZjODZhMGVjOTBkLi4yZjkw ODlhOTM3OTczODFkZjNkZjVkZDNiMmFkNGE3OThhZmZhZDdmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKQEAgLTM0OCw2ICszNDgsNyBAQCBw dWJsaWM6CiAKICAgICBib29sIHZpc2libGUoKSBjb25zdDsKICAgICB2b2lkIHNldFZpc2libGUo Ym9vbCk7CisgICAgdm9pZCBzZXRWaXNpYmxlRm9yQ2FudmFzKGJvb2wpOwogCiAgICAgdm9pZCBw cmVwYXJlVG9QbGF5KCk7CiAgICAgdm9pZCBwbGF5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCmluZGV4IDI4NmI4MGRm YTA5MjVlYjI5YTM3NzM0N2EzMGZmMzRjMzcwYzg0NDQuLjAyMDFkMzA3ZjBjYjI4ZTkwYWNlMmM4 YjM3MTlhYTE5ZDE0ZWMwN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCkBAIC05Niw2ICs5Niw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIGJvb2wgaGFzQXVkaW8oKSBjb25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHZv aWQgc2V0VmlzaWJsZShib29sKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVGb3JD YW52YXMoYm9vbCBiKSB7IHNldFZpc2libGUoYik7IH0KIAogICAgIHZpcnR1YWwgZmxvYXQgZHVy YXRpb24oKSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBkb3VibGUgZHVyYXRpb25E b3VibGUoKSBjb25zdCB7IHJldHVybiBkdXJhdGlvbigpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2Jq Qy5oCmluZGV4IDYzMWYzMDMxZWE0MzgwZWEzOGQxZDQ1YWY2YjM0MjkwMDAyNTBlOWUuLjA4OGYx ZDkyYzk3ZjM5MjViZjlhOWJjMGIyMzc5ZDM1MGJkYmJjYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZG T2JqQy5oCkBAIC0xMjQsNiArMTI0LDcgQEAgcHJpdmF0ZToKICAgICBib29sIGhhc0F1ZGlvKCkg Y29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2b2lkIHNldFZpc2libGUoYm9vbCkgZmluYWw7CisgICAg dm9pZCBzZXRWaXNpYmxlRm9yQ2FudmFzKGJvb2wpIGZpbmFsOwogCiAgICAgTWVkaWFUaW1lIGR1 cmF0aW9uTWVkaWFUaW1lKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgTWVkaWFUaW1lIGN1cnJlbnRN ZWRpYVRpbWUoKSBjb25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQppbmRl eCAzYThjMzhjNzY4NGQ0MTU4YTU2MzY5YzQ3MGQxMDRhMDc0YzllZThjLi45ODlmYjg5ZGEyYWIz OGQxZjFjMTdkNWFmZDFjYTgyMjYwMjI3Y2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1t CkBAIC0yNTIsNiArMjUyLDkgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFW Rk9iakM6OnZpZGVvU2FtcGxlQXZhaWxhYmxlKE1lZGlhU2FtcGxlJiBzYW0KIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmVucXVldWVWaWRlb1NhbXBsZShNZWRp YVNhbXBsZSYgc2FtcGxlKQogeworICAgIGlmICghbV92aXNpYmxlKQorICAgICAgICByZXR1cm47 CisKICAgICBhdXRvIGxvY2tlciA9IHRyeUhvbGRMb2NrKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxh eWVyTG9jayk7CiAgICAgaWYgKCFsb2NrZXIpCiAgICAgICAgIHJldHVybjsKQEAgLTU5Myw4ICs1 OTYsMTEgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNldFZp c2libGUoYm9vbCB2aXNpYmxlKQogICAgICAgICByZXR1cm47CiAKICAgICBtX3Zpc2libGUgPSB2 aXNpYmxlOwotICAgIGlmIChtX3Zpc2libGUpCi0gICAgICAgIGZsdXNoUmVuZGVyZXJzKCk7Cisg ICAgZmx1c2hSZW5kZXJlcnMoKTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakM6OnNldFZpc2libGVGb3JDYW52YXMoYm9vbCkKK3sKIH0KIAogTWVkaWFUaW1l IE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6ZHVyYXRpb25NZWRpYVRpbWUo KSBjb25zdAo= 411223 2020-10-13 09:12:52 -0700 2020-10-13 10:06:22 -0700 Patch for landing bug-217578-20201013181251.patch text/plain 6648 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjljYTNkZTZjNWI3Mzkx MjA3ODExNDJhNWE4M2ViODAxMTBmODAwYi4uOWYwYTE0OGEwNTQ2NjBjNGQ0NzUwMDMyZTNiYmQ4 NGYxOGYyNjY1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTEwLTEzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJjYW0gdmlkZW8gZnJv bSBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSgpIHRvIDJEIGNhbnZhcyBmYWls cyBvbiBTYWZhcmkgb24gaVBob25lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTc1NzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwMTgzODc1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBJdCBpcyB1bm5l ZWRlZCBmb3IgTWVkaWFTdHJlYW0gdmlkZW8gYmFja2VuZHMgdG8gZW5xdWV1ZSBzYW1wbGVzIHRv IHRoZSBkaXNwbGF5IGxheWVyIGlmIHRoZSB2aWRlbyBlbGVtZW50IGlzIGhpZGRlbi4KKyAgICAg ICAgSW4gaU9TLCB0aGUgc2FtcGxlcyBtYXkgbmV2ZXIgYmUgZmx1c2hlZCB3aGljaCBtaWdodCBj YXVzZSBjYXB0dXJlIGZhaWxpbmcgYWZ0ZXIgZW5xdWV1aW5nIHRvbyBtYW55IGNhbWVyYSBzYW1w bGVzLgorICAgICAgICBUbyBhdm9pZCB0aGF0LCB3ZSBubyBsb25nZXIgZW5xdWV1ZSBzYW1wbGVz IHRvIHRoZSBkaXNwbGF5IGxheWVyIHdoZW4gdGhlIHBsYXllciBpcyBub3QgdmlzaWJsZS4KKyAg ICAgICAgSW4gY2FzZSBvZiBjYW52YXMgcGFpbnRpbmcsIG90aGVyIGJhY2tlbmRzIG5lZWQgdG8g YmUgbWFkZSB2aXNpYmxlIGZvciBjYW52YXMgcGFpbnRpbmcgdG8gd29yay4KKyAgICAgICAgRm9y IE1lZGlhU3RyZWFtIGJhY2tlbmQsIHdlIGRvIG5vdCBuZWVkIHRoYXQgc2luY2Ugd2UgYWx3YXlz IGtlZXAgdGhlIGxhc3Qgc2FtcGxlLgorICAgICAgICBGb3IgdGhhdCByZWFzb24sIHdlIGtlZXAg dGhlIGJhY2tlbmQgYXMgbm90IHZpc2libGUgZXZlbiBpZiBjYW52YXMgaGFwcGVucy4KKyAgICAg ICAgV2UgZG8gc28gYnkgaW50cm9kdWNpbmcgYSBzZXRWaXNpYmxlRm9yQ2FudmFzIHRoYXQgaXMg YSBuby1vcCBmb3IgTWVkaWFTdHJlYW0gYmFja2VuZCBhbmQgc2ltaWxhciB0byBzZXRWaXNpYmxl IGZvciBvdGhlciBiYWNrZW5kcy4KKyAgICAgICAgRm9yIGdvb2QgbWVhc3VyZSwgd2Ugbm93IGZs dXNoIHRoZSBNZWRpYVN0cmVhbSBkaXNwbGF5IGxheWVyIHdoZW5ldmVyIHZpc2liaWxpdHkgY2hh bmdlZC4KKyAKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgorCisgICAgICAgICogaHRtbC9IVE1M VmlkZW9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6OnBh aW50Q3VycmVudEZyYW1lSW5Db250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6c2V0VmlzaWJs ZUZvckNhbnZhcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZTo6c2V0VmlzaWJsZUZvckNh bnZhcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1B VkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDOjplbnF1ZXVlVmlkZW9TYW1wbGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaXNpYmxlKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6c2V0VmlzaWJsZUZv ckNhbnZhcyk6CisKIDIwMjAtMTAtMTMgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIEltcHJvdmUgY29tcHV0YXRpb24gb2YgZGVmYXVsdCBhdWRpbyBpbnB1dCBh bmQgb3V0cHV0IGRldmljZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZp ZGVvRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0VsZW1lbnQuY3Bw CmluZGV4IDU2ZmU1MTcyZDliNjQxNWFiZmY5ODk0NDJlYTFjY2VkYWU2NmNmODQuLjhhYjJkMGNi OTY1YTYyNWVmNGQwMmNlMjg5OTAyOWViNDMyNTAxNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFZpZGVvRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MVmlkZW9FbGVtZW50LmNwcApAQCAtMzA0LDcgKzMwNCw3IEBAIHZvaWQgSFRNTFZpZGVvRWxl bWVudDo6cGFpbnRDdXJyZW50RnJhbWVJbkNvbnRleHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBjb25zCiAgICAgaWYgKCFwbGF5ZXIpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBwbGF5 ZXItPnNldFZpc2libGUodHJ1ZSk7IC8vIE1ha2UgcGxheWVyIHZpc2libGUgb3IgaXQgd29uJ3Qg ZHJhdy4KKyAgICBwbGF5ZXItPnNldFZpc2libGVGb3JDYW52YXModHJ1ZSk7IC8vIE1ha2UgcGxh eWVyIHZpc2libGUgb3IgaXQgd29uJ3QgZHJhdy4KICAgICBjb250ZXh0LnBhaW50RnJhbWVGb3JN ZWRpYSgqcGxheWVyLCBkZXN0UmVjdCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAppbmRleCAwYTUzNTIzNzc0OTNhNjg2Yjk1ODU5 NTBjYmFlMDFlNDU3YTg0MTgwLi5lMDM2MjVhMWVlZDRmNWNkN2E2ZjQ4NTM2YTg5MmQyZjJiNWRm ZjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5 ZXIuY3BwCkBAIC05NjIsNiArOTYyLDEyIEBAIHZvaWQgTWVkaWFQbGF5ZXI6OnNldFZpc2libGUo Ym9vbCBiKQogICAgIG1fcHJpdmF0ZS0+c2V0VmlzaWJsZShiKTsKIH0KIAordm9pZCBNZWRpYVBs YXllcjo6c2V0VmlzaWJsZUZvckNhbnZhcyhib29sIHZpc2libGUpCit7CisgICAgbV92aXNpYmxl ID0gdmlzaWJsZTsKKyAgICBtX3ByaXZhdGUtPnNldFZpc2libGVGb3JDYW52YXModmlzaWJsZSk7 Cit9CisKIE1lZGlhUGxheWVyOjpQcmVsb2FkIE1lZGlhUGxheWVyOjpwcmVsb2FkKCkgY29uc3QK IHsKICAgICByZXR1cm4gbV9wcmVsb2FkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL01lZGlhUGxheWVyLmgKaW5kZXggN2NiN2VlMTkyZjA5YTM3MDVmMDgzYWMwOTdiMDhm Yzg2YTBlYzkwZC4uMmY5MDg5YTkzNzk3MzgxZGYzZGY1ZGQzYjJhZDRhNzk4YWZmYWQ3ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCkBAIC0z NDgsNiArMzQ4LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCB2aXNpYmxlKCkgY29uc3Q7CiAgICAg dm9pZCBzZXRWaXNpYmxlKGJvb2wpOworICAgIHZvaWQgc2V0VmlzaWJsZUZvckNhbnZhcyhib29s KTsKIAogICAgIHZvaWQgcHJlcGFyZVRvUGxheSgpOwogICAgIHZvaWQgcGxheSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRl LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUu aAppbmRleCAyODZiODBkZmEwOTI1ZWIyOWEzNzczNDdhMzBmZjM0YzM3MGM4NDQ0Li5jMzZjMmY1 NTU1OGE2ZjczYzZlNzU0Mzc5YTM0MzExNDAzOGIwYjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaApAQCAtOTYsNiAr OTYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGhhc0F1ZGlvKCkgY29uc3QgPSAwOwog CiAgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGUoYm9vbCkgPSAwOworICAgIHZpcnR1YWwgdm9p ZCBzZXRWaXNpYmxlRm9yQ2FudmFzKGJvb2wgdmlzaWJsZSkgeyBzZXRWaXNpYmxlKHZpc2libGUp OyB9CiAKICAgICB2aXJ0dWFsIGZsb2F0IGR1cmF0aW9uKCkgY29uc3QgeyByZXR1cm4gMDsgfQog ICAgIHZpcnR1YWwgZG91YmxlIGR1cmF0aW9uRG91YmxlKCkgY29uc3QgeyByZXR1cm4gZHVyYXRp b24oKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaAppbmRleCA2MzFmMzAzMWVhNDM4MGVhMzhk MWQ0NWFmNmIzNDI5MDAwMjUwZTllLi4wODhmMWQ5MmM5N2YzOTI1YmY5YTliYzBiMjM3OWQzNTBi ZGJiY2E5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaApAQCAtMTI0LDYgKzEyNCw3IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBoYXNBdWRpbygpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdm9pZCBz ZXRWaXNpYmxlKGJvb2wpIGZpbmFsOworICAgIHZvaWQgc2V0VmlzaWJsZUZvckNhbnZhcyhib29s KSBmaW5hbDsKIAogICAgIE1lZGlhVGltZSBkdXJhdGlvbk1lZGlhVGltZSgpIGNvbnN0IG92ZXJy aWRlOwogICAgIE1lZGlhVGltZSBjdXJyZW50TWVkaWFUaW1lKCkgY29uc3Qgb3ZlcnJpZGU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVNZWRpYVN0cmVhbUFWRk9iakMubW0KaW5kZXggM2E4YzM4Yzc2ODRkNDE1OGE1NjM2OWM0NzBk MTA0YTA3NGM5ZWU4Yy4uOTg5ZmI4OWRhMmFiMzhkMWYxYzE3ZDVhZmQxY2E4MjI2MDIyN2NiNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQpAQCAtMjUyLDYgKzI1Miw5IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjp2aWRlb1NhbXBsZUF2YWlsYWJsZShN ZWRpYVNhbXBsZSYgc2FtCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZP YmpDOjplbnF1ZXVlVmlkZW9TYW1wbGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKIHsKKyAgICBpZiAo IW1fdmlzaWJsZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgYXV0byBsb2NrZXIgPSB0cnlIb2xk TG9jayhtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllckxvY2spOwogICAgIGlmICghbG9ja2VyKQog ICAgICAgICByZXR1cm47CkBAIC01OTMsOCArNTk2LDExIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaXNpYmxlKGJvb2wgdmlzaWJsZSkKICAgICAgICAg cmV0dXJuOwogCiAgICAgbV92aXNpYmxlID0gdmlzaWJsZTsKLSAgICBpZiAobV92aXNpYmxlKQot ICAgICAgICBmbHVzaFJlbmRlcmVycygpOworICAgIGZsdXNoUmVuZGVyZXJzKCk7Cit9CisKK3Zv aWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaXNpYmxlRm9yQ2Fu dmFzKGJvb2wpCit7CiB9CiAKIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakM6OmR1cmF0aW9uTWVkaWFUaW1lKCkgY29uc3QK