219705 2020-12-09 13:22:57 -0800 [GPU Process]: Recording an in-process ImageBuffer drawing has to convert it to a NativeImage first 2021-03-05 10:27:53 -0800 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218871 InRadar P2 Normal --- 1 sabouhallawa sabouhallawa dino simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1713289 0 sabouhallawa 2020-12-09 13:22:57 -0800 We should not send the ImageBuffer to GPUP if it's created in-process. We should let ImageBuffer::draw() extract a NativeImage of it first. Then GraphicsContext::drawNativeImage() sends this NativeImage to GPUP. 1713294 1 415795 sabouhallawa 2020-12-09 13:41:33 -0800 Created attachment 415795 Patch 1713296 2 sabouhallawa 2020-12-09 13:46:17 -0800 This patch allows drawing the test case in bug 218871. The drawing of the PDF still happens in WebP. We draw the PDF to an ImageBuffer first and then draw this ImageBuffer to the canvas. 1713299 3 415795 wenson_hsieh 2020-12-09 13:51:03 -0800 Comment on attachment 415795 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415795&action=review > Source/WebCore/platform/graphics/GraphicsContextImpl.h:42 > + virtual bool canRecordDrawImageBuffer(const ImageBuffer&) const { return true; } It seems like this should just be `canDrawImageBuffer` instead, since it's on the GraphicsContextImpl (of which DisplayList::Recorder is one particular implementation). 1713300 4 415796 sabouhallawa 2020-12-09 14:00:15 -0800 Created attachment 415796 Patch 1713323 5 ews-feeder 2020-12-09 15:01:34 -0800 Committed r270605: <https://trac.webkit.org/changeset/270605> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415796. 1713326 6 webkit-bug-importer 2020-12-09 15:03:34 -0800 <rdar://problem/72155021> 1736408 7 sabouhallawa 2021-03-05 10:27:53 -0800 *** Bug 218871 has been marked as a duplicate of this bug. *** 415795 2020-12-09 13:41:33 -0800 2020-12-09 13:51:03 -0800 Patch bug-219705-20201209134132.patch text/plain 6829 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc3OTcwNzkwNzJmMzMz YzdjY2ViNjUwY2FmOGY2MmI5YzM0N2JmYi4uMjdmZWRmOWQ4Y2M1NDBiNDdhNWVlYjU1M2NkMWY2 NDM4ZmJmZDY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTEyLTA5ICBTYWlk IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc106 IFJlY29yZGluZyBhbiBpbi1wcm9jZXNzIEltYWdlQnVmZmVyIGRyYXdpbmcgaGFzIHRvIGNvbnZl cnQgaXQgdG8gYSBOYXRpdmVJbWFnZSBmaXJzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2Ugd2lsbCBhbGxvdyBHcmFwaGljc0NvbnRleHQ6OmRyYXdJ bWFnZUJ1ZmZlcigpIHRvIHByb2NlZWQgd2l0aCB0aGUgCisgICAgICAgIHBhaW50aW5nIGNvZGUg cGF0aCBpZiB0aGUgSW1hZ2VCdWZmZXIgaXMgbm90IGEgUmVtb3RlSW1hZ2VCdWZmZXIuIEluIHRo aXMKKyAgICAgICAgY2FzZSBJbWFnZUJ1ZmZlcjo6ZHJhdygpIGV4dHJhY3RzIGEgTmF0aXZlSW1h Z2UgZnJvbSB0aGUgSW1hZ2VCdWZmZXIgYW5kCisgICAgICAgIGNhbGxzIEdyYXBoaWNzQ29udGV4 dDo6ZHJhd05hdGl2ZUltYWdlKCkgd2hpY2ggd2lsbCBzZW5kIHRoZSBOYXRpdmVJbWFnZQorICAg ICAgICB0byBHUFVQLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVm ZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHRJbXBsLmg6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRJbXBsOjpjYW5SZWNvcmREcmF3SW1h Z2VCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0 cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0 OjpSZWNvcmRlcjo6Y2FuUmVjb3JkRHJhd0ltYWdlQnVmZmVyIGNvbnN0KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5oOgorICAg ICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OlJlY29yZGVyOjpEZWxlZ2F0ZTo6aXNDYWNoZWRJ bWFnZUJ1ZmZlciBjb25zdCk6CisKIDIwMjAtMTItMDkgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRz QHdlYmtpdC5vcmc+CiAKICAgICAgICAgdGV4dC1kZWNvcmF0aW9uLWNvbG9yIGFuaW1hdGlvbiBz aG91bGQgbm90IGJlIGRpc2NyZXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ3YWQxYzA1YTMzY2I0NDViYzQzZjU0 MGFiN2QyNzExMzQ3NDYyZmQuLmQ5NDMzNjJmMmQ2ODg0YjBiNDFmYzY4YzZlODdmNWRjZGIwODk2 OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMTItMDkgIFNhaWQgQWJvdS1IYWxs YXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXTogUmVjb3JkaW5n IGFuIGluLXByb2Nlc3MgSW1hZ2VCdWZmZXIgZHJhd2luZyBoYXMgdG8gY29udmVydCBpdCB0byBh IE5hdGl2ZUltYWdlIGZpcnN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTk3MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBPdmVycmlkZSB0aGUgdmlydHVhbCBtZXRob2QgaXNDYWNoZWRJbWFnZUJ1ZmZl cigpIHdoaWNoIGluIHRoaXMgY2FzZQorICAgICAgICBhbnN3ZXJzIHRoZSBxdWVzdGlvbjogaXMg dGhpcyBhIHJlbW90ZSBJbWFnZUJ1ZmZlciBvciBub3Q/CisKKyAgICAgICAgKiBXZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5Lmg6CisKIDIwMjAtMTItMDkgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXgg Y2xpY2tpbmcgb24gbGlua3MgaW4gUERGcyBvbiBCaWcgU3VyIGFmdGVyIHIyNjY2NTQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3Bw CmluZGV4IDVjYWNhODU0NTJjMWE2OThiOTVlNGRmNDQwMDg1OGM5NjM0NWVjZTUuLjIxMmE4Njg0 MjVlZWZiZjllMTdlMWM0NmUyZmI3ODc4OGRkZjVhYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtODAzLDcgKzgw Myw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIoSW1hZ2VCdWZmZXIm IGltYWdlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RpCiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQo KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1faW1wbCkgeworICAgIGlmIChtX2ltcGwg JiYgbV9pbXBsLT5jYW5SZWNvcmREcmF3SW1hZ2VCdWZmZXIoaW1hZ2UpKSB7CiAgICAgICAgIG1f aW1wbC0+ZHJhd0ltYWdlQnVmZmVyKGltYWdlLCBkZXN0aW5hdGlvbiwgc291cmNlLCBvcHRpb25z KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dEltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dEltcGwuaAppbmRleCA1YzgyNWY3ZDQxYjk4 NjE2ZDE3ZmRiOGViZTdjZmZkN2QyYmZjYzhjLi5mNTJiNjZjM2EzNDk2ZjAxNTljN2I2YTM3YzAy ZThiMzZmNzVkYjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHRJbXBsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0SW1wbC5oCkBAIC0zOSw2ICszOSw3IEBAIHB1YmxpYzoKICAg ICBHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fZ3Jh cGhpY3NDb250ZXh0OyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFzUGxhdGZvcm1Db250ZXh0KCkg Y29uc3QgPSAwOworICAgIHZpcnR1YWwgYm9vbCBjYW5SZWNvcmREcmF3SW1hZ2VCdWZmZXIoY29u c3QgSW1hZ2VCdWZmZXImKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBQbGF0 Zm9ybUdyYXBoaWNzQ29udGV4dCogcGxhdGZvcm1Db250ZXh0KCkgY29uc3QgPSAwOwogCiAgICAg dmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlKGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiwgR3Jh cGhpY3NDb250ZXh0U3RhdGU6OlN0YXRlQ2hhbmdlRmxhZ3MpID0gMDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJl Y29yZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0 cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcAppbmRleCBmNTAwMDVhNDU0YjM5ZjQ1Y2QwZmY3MWFk N2QxOWNhMWNkN2M3MGVlLi5lZjkyYTRkNzllZDdmNjkxMDMzZDhhNmZkMWQwZjU5YzE2ZTc5NDAx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlz dHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuY3BwCkBAIC0xMzcsNiAr MTM3LDExIEBAIHZvaWQgUmVjb3JkZXI6OnVwZGF0ZVN0YXRlKGNvbnN0IEdyYXBoaWNzQ29udGV4 dFN0YXRlJiBzdGF0ZSwgR3JhcGhpY3NDb250ZXh0U3RhCiAgICAgY3VycmVudFN0YXRlKCkuc3Rh dGVDaGFuZ2UuYWNjdW11bGF0ZShzdGF0ZSwgZmxhZ3MpOwogfQogCitib29sIFJlY29yZGVyOjpj YW5SZWNvcmREcmF3SW1hZ2VCdWZmZXIoY29uc3QgSW1hZ2VCdWZmZXImIGltYWdlQnVmZmVyKSBj b25zdAoreworICAgIHJldHVybiAhbV9kZWxlZ2F0ZSB8fCBtX2RlbGVnYXRlLT5pc0NhY2hlZElt YWdlQnVmZmVyKGltYWdlQnVmZmVyKTsKK30KKwogdm9pZCBSZWNvcmRlcjo6Y2xlYXJTaGFkb3co KQogewogICAgIGFwcGVuZDxDbGVhclNoYWRvdz4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxp c3RSZWNvcmRlci5oCmluZGV4IGEzOWQ3MmJjMThjYzg2ZWE2NDBmMTQ1YmVjNmVjMTNhYmQ0ODZj MzkuLjU0MjdmMjMyNDVmNWNkMzk5MTRjNTAwNjE0NTRiODAxZjFkMTE0OTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlz dFJlY29yZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxh eWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaApAQCAtNjcsNiArNjcsNyBAQCBwdWJsaWM6CiAg ICAgICAgIHZpcnR1YWwgdm9pZCB3aWxsQXBwZW5kSXRlbU9mVHlwZShJdGVtVHlwZSkgeyB9CiAg ICAgICAgIHZpcnR1YWwgdm9pZCBkaWRBcHBlbmRJdGVtT2ZUeXBlKEl0ZW1UeXBlKSB7IH0KICAg ICAgICAgdmlydHVhbCB2b2lkIGNhY2hlTmF0aXZlSW1hZ2UoTmF0aXZlSW1hZ2UmKSB7IH0KKyAg ICAgICAgdmlydHVhbCBib29sIGlzQ2FjaGVkSW1hZ2VCdWZmZXIoY29uc3QgSW1hZ2VCdWZmZXIm KSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIH07CiAKICAgICB2b2lkIGZsdXNoQ29udGV4 dChGbHVzaElkZW50aWZpZXIgaWRlbnRpZmllcikgeyBhcHBlbmQ8Rmx1c2hDb250ZXh0PihpZGVu dGlmaWVyKTsgfQpAQCAtNzQsNiArNzUsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGZyaWVu ZCBjbGFzcyBEcmF3R2x5cGhzUmVjb3JkZXI7CiAgICAgYm9vbCBoYXNQbGF0Zm9ybUNvbnRleHQo KSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQorICAgIGJvb2wgY2FuUmVjb3JkRHJh d0ltYWdlQnVmZmVyKGNvbnN0IEltYWdlQnVmZmVyJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgUGxh dGZvcm1HcmFwaGljc0NvbnRleHQqIHBsYXRmb3JtQ29udGV4dCgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIG51bGxwdHI7IH0KIAogICAgIHZvaWQgdXBkYXRlU3RhdGUoY29uc3QgR3JhcGhpY3ND b250ZXh0U3RhdGUmLCBHcmFwaGljc0NvbnRleHRTdGF0ZTo6U3RhdGVDaGFuZ2VGbGFncykgb3Zl cnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNz L1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv Z3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCmluZGV4IDYwZTY0MzBiODk5MWYzYTFl ZWZjZDJjZDc0ZGMyYzcwMjdmODk5ZTguLjExYjE0YjljMWE0N2UyMzRmNWI5MGJlOWI0NzMyYzY0 ZmFjNTNmNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhp Y3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCkBAIC0xODksNiArMTg5LDE1 IEBAIHByb3RlY3RlZDoKICAgICAgICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5 LT5yZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkoKS5jYWNoZU5hdGl2ZUltYWdlKGltYWdlKTsKICAg ICB9CiAKKyAgICBib29sIGlzQ2FjaGVkSW1hZ2VCdWZmZXIoY29uc3QgV2ViQ29yZTo6SW1hZ2VC dWZmZXImIGltYWdlQnVmZmVyKSBjb25zdCBvdmVycmlkZQorICAgIHsKKyAgICAgICAgaWYgKCFt X3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgYXV0byBjYWNoZWRJbWFnZUJ1ZmZlciA9IG1fcmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFByb3h5LT5yZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkoKS5jYWNoZWRJbWFnZUJ1ZmZlcihpbWFn ZUJ1ZmZlci5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSk7CisgICAgICAgIEFTU0VSVCgh Y2FjaGVkSW1hZ2VCdWZmZXIgfHwgY2FjaGVkSW1hZ2VCdWZmZXIgPT0gJmltYWdlQnVmZmVyKTsK KyAgICAgICAgcmV0dXJuIGNhY2hlZEltYWdlQnVmZmVyOworICAgIH0KKwogICAgIHZvaWQgY2hh bmdlRGVzdGluYXRpb25JbWFnZUJ1ZmZlcihXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXIgbmV4dEltYWdlQnVmZmVyKSBmaW5hbAogICAgIHsKICAgICAgICAgYm9vbCB3YXNFbXB0 eSA9IG1fZHJhd2luZ0NvbnRleHQuZGlzcGxheUxpc3QoKS5pc0VtcHR5KCk7Cg== 415796 2020-12-09 14:00:15 -0800 2020-12-09 15:01:34 -0800 Patch bug-219705-20201209140014.patch text/plain 6789 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc3OTcwNzkwNzJmMzMz YzdjY2ViNjUwY2FmOGY2MmI5YzM0N2JmYi4uOTg4NzdkMWMxY2RhMzQwZjkzYzUwZjYwOTBiYzZi MGJiOTQ3YjJmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTEyLTA5ICBTYWlk IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc106 IFJlY29yZGluZyBhbiBpbi1wcm9jZXNzIEltYWdlQnVmZmVyIGRyYXdpbmcgaGFzIHRvIGNvbnZl cnQgaXQgdG8gYSBOYXRpdmVJbWFnZSBmaXJzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29u IEhzaWVoLgorCisgICAgICAgIFdlIHdpbGwgYWxsb3cgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1h Z2VCdWZmZXIoKSB0byBwcm9jZWVkIHdpdGggdGhlIAorICAgICAgICBwYWludGluZyBjb2RlIHBh dGggaWYgdGhlIEltYWdlQnVmZmVyIGlzIG5vdCBhIFJlbW90ZUltYWdlQnVmZmVyLiBJbiB0aGlz CisgICAgICAgIGNhc2UgSW1hZ2VCdWZmZXI6OmRyYXcoKSBleHRyYWN0cyBhIE5hdGl2ZUltYWdl IGZyb20gdGhlIEltYWdlQnVmZmVyIGFuZAorICAgICAgICBjYWxscyBHcmFwaGljc0NvbnRleHQ6 OmRyYXdOYXRpdmVJbWFnZSgpIHdoaWNoIHdpbGwgc2VuZCB0aGUgTmF0aXZlSW1hZ2UKKyAgICAg ICAgdG8gR1BVUC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZUJ1ZmZl cik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0SW1wbC5oOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0SW1wbDo6Y2FuRHJhd0ltYWdlQnVmZmVy IGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxh eUxpc3RSZWNvcmRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6UmVjb3Jk ZXI6OmNhbkRyYXdJbWFnZUJ1ZmZlciBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkRpc3BsYXlMaXN0OjpSZWNvcmRlcjo6RGVsZWdhdGU6OmlzQ2FjaGVkSW1hZ2VCdWZmZXIgY29u c3QpOgorCiAyMDIwLTEyLTA5ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgog CiAgICAgICAgIHRleHQtZGVjb3JhdGlvbi1jb2xvciBhbmltYXRpb24gc2hvdWxkIG5vdCBiZSBk aXNjcmV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCBkN2FkMWMwNWEzM2NiNDQ1YmM0M2Y1NDBhYjdkMjcxMTM0NzQ2 MmZkLi4yOTQ1YjE2NDJjM2FjYjZmMjYwOGU1MDY1MmQ5YmU2YWI4ZjQxZDExIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDIwLTEyLTA5ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBw bGUuY29tPgorCisgICAgICAgIFtHUFUgUHJvY2Vzc106IFJlY29yZGluZyBhbiBpbi1wcm9jZXNz IEltYWdlQnVmZmVyIGRyYXdpbmcgaGFzIHRvIGNvbnZlcnQgaXQgdG8gYSBOYXRpdmVJbWFnZSBm aXJzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5 NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgIE92ZXJy aWRlIHRoZSB2aXJ0dWFsIG1ldGhvZCBpc0NhY2hlZEltYWdlQnVmZmVyKCkgd2hpY2ggaW4gdGhp cyBjYXNlCisgICAgICAgIGFuc3dlcnMgdGhlIHF1ZXN0aW9uOiBpcyB0aGlzIGEgcmVtb3RlIElt YWdlQnVmZmVyIG9yIG5vdD8KKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl bW90ZUltYWdlQnVmZmVyUHJveHkuaDoKKwogMjAyMC0xMi0wOSAgQWxleCBDaHJpc3RlbnNlbiAg PGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBjbGlja2luZyBvbiBsaW5r cyBpbiBQREZzIG9uIEJpZyBTdXIgYWZ0ZXIgcjI2NjY1NApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXggNWNhY2E4NTQ1 MmMxYTY5OGI5NWU0ZGY0NDAwODU4Yzk2MzQ1ZWNlNS4uNzg0NDc3YTJlZmFhNjIzOTFhNmY4MGMw ZDk0MWQyODg0ODZhNTNmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCkBAIC04MDMsNyArODAzLDcgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQ6OmRyYXdJbWFnZUJ1ZmZlcihJbWFnZUJ1ZmZlciYgaW1hZ2UsIGNvbnN0IEZs b2F0UmVjdCYgZGVzdGkKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBpZiAobV9pbXBsKSB7CisgICAgaWYgKG1faW1wbCAmJiBtX2ltcGwtPmNhbkRy YXdJbWFnZUJ1ZmZlcihpbWFnZSkpIHsKICAgICAgICAgbV9pbXBsLT5kcmF3SW1hZ2VCdWZmZXIo aW1hZ2UsIGRlc3RpbmF0aW9uLCBzb3VyY2UsIG9wdGlvbnMpOwogICAgICAgICByZXR1cm47CiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0SW1wbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0SW1wbC5oCmluZGV4IDVjODI1ZjdkNDFiOTg2MTZkMTdmZGI4ZWJlN2NmZmQ3ZDJi ZmNjOGMuLmI0ODJiOGI4N2I5MWIwNjgwNWJjNzQ5YjQ2MTRjZTJjODY3NmZhMTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dEltcGwu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHRJ bXBsLmgKQEAgLTM5LDYgKzM5LDcgQEAgcHVibGljOgogICAgIEdyYXBoaWNzQ29udGV4dCYgZ3Jh cGhpY3NDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9ncmFwaGljc0NvbnRleHQ7IH0KIAogICAg IHZpcnR1YWwgYm9vbCBoYXNQbGF0Zm9ybUNvbnRleHQoKSBjb25zdCA9IDA7CisgICAgdmlydHVh bCBib29sIGNhbkRyYXdJbWFnZUJ1ZmZlcihjb25zdCBJbWFnZUJ1ZmZlciYpIGNvbnN0IHsgcmV0 dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0KiBwbGF0Zm9y bUNvbnRleHQoKSBjb25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGUoY29u c3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmLCBHcmFwaGljc0NvbnRleHRTdGF0ZTo6U3RhdGVDaGFu Z2VGbGFncykgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuY3BwCmlu ZGV4IGY1MDAwNWE0NTRiMzlmNDVjZDBmZjcxYWQ3ZDE5Y2ExY2Q3YzcwZWUuLjY0ZDRhNWFjZmEy YzAwNTU2N2FiZTU5YWFjMWYwYmU3MzY5YmFlNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxh eUxpc3RSZWNvcmRlci5jcHAKQEAgLTEzNyw2ICsxMzcsMTEgQEAgdm9pZCBSZWNvcmRlcjo6dXBk YXRlU3RhdGUoY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmIHN0YXRlLCBHcmFwaGljc0NvbnRl eHRTdGEKICAgICBjdXJyZW50U3RhdGUoKS5zdGF0ZUNoYW5nZS5hY2N1bXVsYXRlKHN0YXRlLCBm bGFncyk7CiB9CiAKK2Jvb2wgUmVjb3JkZXI6OmNhbkRyYXdJbWFnZUJ1ZmZlcihjb25zdCBJbWFn ZUJ1ZmZlciYgaW1hZ2VCdWZmZXIpIGNvbnN0Cit7CisgICAgcmV0dXJuICFtX2RlbGVnYXRlIHx8 IG1fZGVsZWdhdGUtPmlzQ2FjaGVkSW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXIpOworfQorCiB2b2lk IFJlY29yZGVyOjpjbGVhclNoYWRvdygpCiB7CiAgICAgYXBwZW5kPENsZWFyU2hhZG93PigpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3Rz L0Rpc3BsYXlMaXN0UmVjb3JkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmgKaW5kZXggYTM5ZDcyYmMxOGNjODZl YTY0MGYxNDViZWM2ZWMxM2FiZDQ4NmMzOS4uM2VjNjdkMzRjMWJjZmZjYzliNDg5MWNiOTNkODBi ZjRmMDQxOTc2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5oCkBAIC02 Nyw2ICs2Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIHdpbGxBcHBlbmRJdGVt T2ZUeXBlKEl0ZW1UeXBlKSB7IH0KICAgICAgICAgdmlydHVhbCB2b2lkIGRpZEFwcGVuZEl0ZW1P ZlR5cGUoSXRlbVR5cGUpIHsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgY2FjaGVOYXRpdmVJbWFn ZShOYXRpdmVJbWFnZSYpIHsgfQorICAgICAgICB2aXJ0dWFsIGJvb2wgaXNDYWNoZWRJbWFnZUJ1 ZmZlcihjb25zdCBJbWFnZUJ1ZmZlciYpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgfTsK IAogICAgIHZvaWQgZmx1c2hDb250ZXh0KEZsdXNoSWRlbnRpZmllciBpZGVudGlmaWVyKSB7IGFw cGVuZDxGbHVzaENvbnRleHQ+KGlkZW50aWZpZXIpOyB9CkBAIC03NCw2ICs3NSw3IEBAIHB1Ymxp YzoKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIERyYXdHbHlwaHNSZWNvcmRlcjsKICAgICBi b29sIGhhc1BsYXRmb3JtQ29udGV4dCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9 CisgICAgYm9vbCBjYW5EcmF3SW1hZ2VCdWZmZXIoY29uc3QgSW1hZ2VCdWZmZXImKSBjb25zdCBv dmVycmlkZTsKICAgICBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCogcGxhdGZvcm1Db250ZXh0KCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbnVsbHB0cjsgfQogCiAgICAgdm9pZCB1cGRhdGVTdGF0 ZShjb25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYsIEdyYXBoaWNzQ29udGV4dFN0YXRlOjpTdGF0 ZUNoYW5nZUZsYWdzKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmgKaW5kZXgg NjBlNjQzMGI4OTkxZjNhMWVlZmNkMmNkNzRkYzJjNzAyN2Y4OTllOC4uMTFiMTRiOWMxYTQ3ZTIz NGY1YjkwYmU5YjQ3MzJjNjRmYWM1M2Y3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmgK QEAgLTE4OSw2ICsxODksMTUgQEAgcHJvdGVjdGVkOgogICAgICAgICAgICAgbV9yZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHktPnJlbW90ZVJlc291cmNlQ2FjaGVQcm94eSgpLmNhY2hlTmF0aXZl SW1hZ2UoaW1hZ2UpOwogICAgIH0KIAorICAgIGJvb2wgaXNDYWNoZWRJbWFnZUJ1ZmZlcihjb25z dCBXZWJDb3JlOjpJbWFnZUJ1ZmZlciYgaW1hZ2VCdWZmZXIpIGNvbnN0IG92ZXJyaWRlCisgICAg eworICAgICAgICBpZiAoIW1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICBhdXRvIGNhY2hlZEltYWdlQnVmZmVyID0gbV9yZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHktPnJlbW90ZVJlc291cmNlQ2FjaGVQcm94eSgpLmNhY2hl ZEltYWdlQnVmZmVyKGltYWdlQnVmZmVyLnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKTsK KyAgICAgICAgQVNTRVJUKCFjYWNoZWRJbWFnZUJ1ZmZlciB8fCBjYWNoZWRJbWFnZUJ1ZmZlciA9 PSAmaW1hZ2VCdWZmZXIpOworICAgICAgICByZXR1cm4gY2FjaGVkSW1hZ2VCdWZmZXI7CisgICAg fQorCiAgICAgdm9pZCBjaGFuZ2VEZXN0aW5hdGlvbkltYWdlQnVmZmVyKFdlYkNvcmU6OlJlbmRl cmluZ1Jlc291cmNlSWRlbnRpZmllciBuZXh0SW1hZ2VCdWZmZXIpIGZpbmFsCiAgICAgewogICAg ICAgICBib29sIHdhc0VtcHR5ID0gbV9kcmF3aW5nQ29udGV4dC5kaXNwbGF5TGlzdCgpLmlzRW1w dHkoKTsK