179970 2017-11-23 02:21:07 -0800 [CoordGraphics] Remove relay CoordinatedBuffer::Client implementations 2017-11-23 03:05:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply cgarcia webkit-bug-importer oldest_to_newest 1374364 0 zan 2017-11-23 02:21:07 -0800 [CoordGraphics] Remove relay CoordinatedBuffer::Client implementations 1374369 1 327490 zan 2017-11-23 02:36:07 -0800 Created attachment 327490 Patch 1374377 2 327490 cgarcia 2017-11-23 02:54:30 -0800 Comment on attachment 327490 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327490&action=review Yes! > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:114 > + { > + GraphicsContext& context = m_buffer->context(); > + context.save(); > + context.clip(rect); > + context.drawImage(*m_image, rect, rect); > + context.restore(); > + } Why do we need another scope? > Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp:92 > + } Ditto. 1374378 3 327490 zan 2017-11-23 02:59:09 -0800 Comment on attachment 327490 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327490&action=review >> Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:114 >> + } > > Why do we need another scope? Just for clarity, to limit the GraphicsContext reference and operations on it to a single block. 1374387 4 327490 zan 2017-11-23 03:04:08 -0800 Comment on attachment 327490 Patch Clearing flags on attachment: 327490 Committed r225113: <https://trac.webkit.org/changeset/225113> 1374388 5 zan 2017-11-23 03:04:12 -0800 All reviewed patches have been landed. Closing bug. 1374389 6 webkit-bug-importer 2017-11-23 03:05:20 -0800 <rdar://problem/35674932> 327490 2017-11-23 02:36:07 -0800 2017-11-23 03:04:08 -0800 Patch bug-179970-20171123113606.patch text/plain 8860 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzJjODJiM2FkZWZkYmMw ZDRkYTliNDg2ZjllOWYwNzhiMmYwNzYxYi4uNDAwMGY1YTU4YWJhNThhYmQ0ZTdiZTI1YjFiODNk MTEzNDY1M2U4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE3LTExLTIzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ29vcmRHcmFwaGlj c10gUmVtb3ZlIHJlbGF5IENvb3JkaW5hdGVkQnVmZmVyOjpDbGllbnQgaW1wbGVtZW50YXRpb25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk5NzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIENv b3JkaW5hdGVkQnVmZmVyOjpwYWluVG9TdXJmYWNlKCkgaW4gZmF2b3Igb2YgYSBzaW1wbGVyCisg ICAgICAgIEdyYXBoaWNzQ29udGV4dCByZWZlcmVuY2UgZ2V0dGVyIHRoYXQgcmV0dXJucyBhIHJl ZmVyZW5jZSB0byB0aGUKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0IG9iamVjdCBvZiB0aGUgaW50 ZXJuYWwgSW1hZ2VCdWZmZXIuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBJbWFnZUJhY2tpbmdTdXJm YWNlQ2xpZW50IGNsYXNzIHRoYXQgb25seSBhY3RlZCBhcyBhIHJlbGF5CisgICAgICAgIHRoYXQg ZW5hYmxlZCBhIENvb3JkaW5hdGVkQnVmZmVyIHRvIGRyYXcgYW4gaW1hZ2UgdGhyb3VnaCBpdHMg Y29udGV4dC4KKyAgICAgICAgSW5zdGVhZCwgd2UgdXNlIHRoZSBHcmFwaGljc0NvbnRleHQgb2Yg dGhlIGFsbG9jYXRlZCBDb29yZGluYXRlZEJ1ZmZlcgorICAgICAgICB0byBkcmF3IHRoZSBpbWFn ZSBkaXJlY3RseS4gV2Ugc3RpbGwgdXNlIGEgcmVjdGFuZ2xlIHdob3NlIHNpemUKKyAgICAgICAg bWF0Y2hlcyB0aGUgc2l6ZSBvZiB0aGUgZ2l2ZW4gSW1hZ2UgYXMgdGhlIGNsaXBwaW5nIGFyZWEg YW5kIGFzIHRoZQorICAgICAgICBzb3VyY2UgYW5kIGRlc3RpbmF0aW9uIHJlY3RhbmdsZSBmb3Ig dGhlIGltYWdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtLSBubyBjaGFuZ2UgaW4gYmVoYXZp b3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29v cmRpbmF0ZWRCdWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRCdWZmZXI6 OmNvbnRleHQpOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRCdWZmZXI6OnBhaW50VG9T dXJmYWNlKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRCdWZmZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRJbWFnZUJhY2tpbmc6OnVwZGF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUJhY2tpbmdTdXJmYWNlQ2xpZW50OjpJbWFnZUJhY2tpbmdTdXJmYWNlQ2xp ZW50KTogRGVsZXRlZC4KKworMjAxNy0xMS0yMyAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGln YWxpYS5jb20+CisKICAgICAgICAgW0Nvb3JkR3JhcGhpY3NdIFJlcGxhY2UgQ29vcmRpbmF0ZWRT dXJmYWNlLCBUaHJlYWRTYWZlQ29vcmRpbmF0ZWRTdXJmYWNlIHdpdGggQ29vcmRpbmF0ZWRCdWZm ZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTk2 NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCmluZGV4IDNiNGY0ODU1YjlmYTlmNTU3NDI2ZTJhZmNlNzlmNjk5MDJlNjc1ZTcu LmRjZmFmNzIwMDY3YzUyMTYyMzQ5MTY4NTgxYzRmOGY2MzVlZDEwNzQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjMgQEAKIDIwMTctMTEtMjMgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEu Y29tPgogCisgICAgICAgIFtDb29yZEdyYXBoaWNzXSBSZW1vdmUgcmVsYXkgQ29vcmRpbmF0ZWRC dWZmZXI6OkNsaWVudCBpbXBsZW1lbnRhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTk3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIERyb3AgdGhlIGhlbHBlciBVcGRhdGVBdGxhc1N1cmZhY2VD bGllbnQgY2xhc3MgYW5kIGluc3RlYWQgZGlyZWN0bHkgdXNlCisgICAgICAgIHRoZSBDb29yZGlu YXRlZEJ1ZmZlcidzIEdyYXBoaWNzQ29udGV4dCB0byBwZXJmb3JtIGNsaXAgYW5kIHRyYW5zbGF0 aW9uCisgICAgICAgIG9wZXJhdGlvbnMgYmFzZWQgb24gdGhlIGFsbG9jYXRlZCByZWN0YW5nbGUs IHRvIHByZS1maWxsIHRoZSB0YXJnZXQgcmVjdAorICAgICAgICB3aXRoIHRyYW5zcGFyZW50IGNv bG9yIGluIGNhc2UgdGhlIGFscGhhIGNoYW5uZWwgaXMgc3VwcG9ydGVkLCBhbmQgdG8KKyAgICAg ICAgdGhlbiBpbnZva2UgQ29vcmRpbmF0ZWRCdWZmZXI6OkNsaWVudDo6cGFpbnRUb1N1cmZhY2VD b250ZXh0KCkgbWV0aG9kLAorICAgICAgICBwYXNzaW5nIHRoZSBHcmFwaGljc0NvbnRleHQgYXMg dGhlIGFyZ3VtZW50LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVk R3JhcGhpY3MvVXBkYXRlQXRsYXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpVcGRhdGVBdGxhczo6 cGFpbnRPbkF2YWlsYWJsZUJ1ZmZlcik6CisgICAgICAgICgpOiBEZWxldGVkLgorCisyMDE3LTEx LTIzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwogICAgICAgICBbQ29v cmRHcmFwaGljc10gUmVwbGFjZSBDb29yZGluYXRlZFN1cmZhY2UsIFRocmVhZFNhZmVDb29yZGlu YXRlZFN1cmZhY2Ugd2l0aCBDb29yZGluYXRlZEJ1ZmZlcgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5OTY3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEJ1 ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRCdWZmZXIuY3BwCmluZGV4IGI4NzkxNGQ3Yjc0NzZjYTdlNjQ5MGY4 YzM2MTIzZmMwYzRkMmJhYjguLmQxZDE1NWYxY2MxZGM5NDk3YTcyNmY0NmZhYzE1ZDI5OGZhMmI2 MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db29yZGluYXRlZEJ1ZmZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkQnVmZmVyLmNwcApA QCAtNTAsMTQgKzUwLDkgQEAgQ29vcmRpbmF0ZWRCdWZmZXI6OkNvb3JkaW5hdGVkQnVmZmVyKGNv bnN0IEludFNpemUmIHNpemUsIEZsYWdzIGZsYWdzKQogCiBDb29yZGluYXRlZEJ1ZmZlcjo6fkNv b3JkaW5hdGVkQnVmZmVyKCkgPSBkZWZhdWx0OwogCi12b2lkIENvb3JkaW5hdGVkQnVmZmVyOjpw YWludFRvU3VyZmFjZShjb25zdCBJbnRSZWN0JiByZWN0LCBDbGllbnQmIGNsaWVudCkKK0dyYXBo aWNzQ29udGV4dCYgQ29vcmRpbmF0ZWRCdWZmZXI6OmNvbnRleHQoKQogewotICAgIEdyYXBoaWNz Q29udGV4dCYgY29udGV4dCA9IG1faW1hZ2VCdWZmZXItPmNvbnRleHQoKTsKLSAgICBjb250ZXh0 LnNhdmUoKTsKLSAgICBjb250ZXh0LmNsaXAocmVjdCk7Ci0gICAgY29udGV4dC50cmFuc2xhdGUo cmVjdC54KCksIHJlY3QueSgpKTsKLSAgICBjbGllbnQucGFpbnRUb1N1cmZhY2VDb250ZXh0KGNv bnRleHQpOwotICAgIGNvbnRleHQucmVzdG9yZSgpOworICAgIHJldHVybiBtX2ltYWdlQnVmZmVy LT5jb250ZXh0KCk7CiB9CiAKIFJlZlB0cjxJbWFnZT4gQ29vcmRpbmF0ZWRCdWZmZXI6OnVwbG9h ZEltYWdlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkQnVmZmVyLmgKaW5k ZXggMjk0YmQxNWIwYTBmYWI1MzI1MTk5M2MxMmRmOTU5YjFhNzk0ZDQ0Yy4uNGM2M2E1NWNiZTdk NzA2MDk0ZDEyZTNiM2JmNjQzMjBmYjQ3OWUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkQnVmZmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVk L0Nvb3JkaW5hdGVkQnVmZmVyLmgKQEAgLTYxLDcgKzYxLDcgQEAgcHVibGljOgogICAgIGJvb2wg c3VwcG9ydHNBbHBoYSgpIGNvbnN0IHsgcmV0dXJuIG1fZmxhZ3MgJiBTdXBwb3J0c0FscGhhOyB9 CiAgICAgY29uc3QgSW50U2l6ZSYgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQogCi0g ICAgdm9pZCBwYWludFRvU3VyZmFjZShjb25zdCBJbnRSZWN0JiwgQ2xpZW50Jik7CisgICAgR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0KCk7CiAgICAgUmVmUHRyPEltYWdlPiB1cGxvYWRJbWFnZSgp OwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkSW1hZ2VCYWNraW5nLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEltYWdlQmFja2luZy5jcHAKaW5kZXggYTIyMWQ4OGJmMDc1YTIxMTYxMzhlYjkwZWUwYWFiOTdm ZjlhNWU4Yy4uYjZhOWZmYTRkODJiZDY3NGVkYjkzOWE0NmUwY2RkYWUzYjliOWExYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVk L0Nvb3JkaW5hdGVkSW1hZ2VCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmcuY3Bw CkBAIC0zMywyNCArMzMsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIEltYWdl QmFja2luZ1N1cmZhY2VDbGllbnQgOiBwdWJsaWMgQ29vcmRpbmF0ZWRCdWZmZXI6OkNsaWVudCB7 Ci1wdWJsaWM6Ci0gICAgSW1hZ2VCYWNraW5nU3VyZmFjZUNsaWVudChJbWFnZSYgaW1hZ2UsIGNv bnN0IEludFJlY3QmIHJlY3QpCi0gICAgICAgIDogbV9pbWFnZShpbWFnZSkKLSAgICAgICAgLCBt X3JlY3QocmVjdCkKLSAgICB7Ci0gICAgfQotCi0gICAgdm9pZCBwYWludFRvU3VyZmFjZUNvbnRl eHQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KSBvdmVycmlkZQotICAgIHsKLSAgICAgICAgY29u dGV4dC5kcmF3SW1hZ2UobV9pbWFnZSwgbV9yZWN0LCBtX3JlY3QpOwotICAgIH0KLQotcHJpdmF0 ZToKLSAgICBJbWFnZSYgbV9pbWFnZTsKLSAgICBJbnRSZWN0IG1fcmVjdDsKLX07Ci0KIENvb3Jk aW5hdGVkSW1hZ2VCYWNraW5nSUQgQ29vcmRpbmF0ZWRJbWFnZUJhY2tpbmc6OmdldENvb3JkaW5h dGVkSW1hZ2VCYWNraW5nSUQoSW1hZ2UqIGltYWdlKQogewogICAgIC8vIENvb3JkaW5hdGVkSW1h Z2VCYWNraW5nIGtlZXBzIGEgUmVmUHRyPEltYWdlPiBtZW1iZXIsIHNvIHRoZSBzYW1lIEltYWdl IHBvaW50ZXIgY2FuIG5vdCByZWZlciB0d28gZGlmZmVyZW50IGluc3RhbmNlcyB1bnRpbCBDb29y ZGluYXRlZEltYWdlQmFja2luZyByZWxlYXNlcyB0aGUgbWVtYmVyLgpAQCAtMTIzLDggKzEwNSwx MyBAQCB2b2lkIENvb3JkaW5hdGVkSW1hZ2VCYWNraW5nOjp1cGRhdGUoKQogCiAgICAgSW50UmVj dCByZWN0KEludFBvaW50Ojp6ZXJvKCksIEludFNpemUobV9pbWFnZS0+c2l6ZSgpKSk7CiAKLSAg ICBJbWFnZUJhY2tpbmdTdXJmYWNlQ2xpZW50IHN1cmZhY2VDbGllbnQoKm1faW1hZ2UsIHJlY3Qp OwotICAgIG1fYnVmZmVyLT5wYWludFRvU3VyZmFjZShyZWN0LCBzdXJmYWNlQ2xpZW50KTsKKyAg ICB7CisgICAgICAgIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCA9IG1fYnVmZmVyLT5jb250ZXh0 KCk7CisgICAgICAgIGNvbnRleHQuc2F2ZSgpOworICAgICAgICBjb250ZXh0LmNsaXAocmVjdCk7 CisgICAgICAgIGNvbnRleHQuZHJhd0ltYWdlKCptX2ltYWdlLCByZWN0LCByZWN0KTsKKyAgICAg ICAgY29udGV4dC5yZXN0b3JlKCk7CisgICAgfQogCiAgICAgbV9uYXRpdmVJbWFnZVB0ciA9IG1f aW1hZ2UtPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvVXBkYXRlQXRs YXMuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFw aGljcy9VcGRhdGVBdGxhcy5jcHAKaW5kZXggMGJjNmVmNGYxM2NlMzY3NWI1MmMxZjFmNTVmNjlk MTBkM2Y2MGUzOC4uNWQwZWJjNWI0Y2ExYTAwNmViYjU2ODI1NTFmYThlYWM0NTE5NjQ2ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFw aGljcy9VcGRhdGVBdGxhcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9VcGRhdGVBdGxhcy5jcHAKQEAgLTMyLDMyICszMiw2IEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotY2xhc3Mg VXBkYXRlQXRsYXNTdXJmYWNlQ2xpZW50IGZpbmFsIDogcHVibGljIENvb3JkaW5hdGVkQnVmZmVy OjpDbGllbnQgewotcHVibGljOgotICAgIFVwZGF0ZUF0bGFzU3VyZmFjZUNsaWVudChDb29yZGlu YXRlZEJ1ZmZlcjo6Q2xpZW50JiBjbGllbnQsIGNvbnN0IEludFNpemUmIHNpemUsIGJvb2wgc3Vw cG9ydHNBbHBoYSkKLSAgICAgICAgOiBtX2NsaWVudChjbGllbnQpCi0gICAgICAgICwgbV9zaXpl KHNpemUpCi0gICAgICAgICwgbV9zdXBwb3J0c0FscGhhKHN1cHBvcnRzQWxwaGEpCi0gICAgewot ICAgIH0KLQotICAgIHZvaWQgcGFpbnRUb1N1cmZhY2VDb250ZXh0KEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCkgb3ZlcnJpZGUKLSAgICB7Ci0gICAgICAgIGlmIChtX3N1cHBvcnRzQWxwaGEpIHsK LSAgICAgICAgICAgIGNvbnRleHQuc2V0Q29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZUNvcHkp OwotICAgICAgICAgICAgY29udGV4dC5maWxsUmVjdChJbnRSZWN0KEludFBvaW50Ojp6ZXJvKCks IG1fc2l6ZSksIENvbG9yOjp0cmFuc3BhcmVudCk7Ci0gICAgICAgICAgICBjb250ZXh0LnNldENv bXBvc2l0ZU9wZXJhdGlvbihDb21wb3NpdGVTb3VyY2VPdmVyKTsKLSAgICAgICAgfQotCi0gICAg ICAgIG1fY2xpZW50LnBhaW50VG9TdXJmYWNlQ29udGV4dChjb250ZXh0KTsKLSAgICB9Ci0KLXBy aXZhdGU6Ci0gICAgQ29vcmRpbmF0ZWRCdWZmZXI6OkNsaWVudCYgbV9jbGllbnQ7Ci0gICAgSW50 U2l6ZSBtX3NpemU7Ci0gICAgYm9vbCBtX3N1cHBvcnRzQWxwaGE7Ci19OwotCiBVcGRhdGVBdGxh czo6VXBkYXRlQXRsYXMoQ2xpZW50JiBjbGllbnQsIGludCBkaW1lbnNpb24sIENvb3JkaW5hdGVk QnVmZmVyOjpGbGFncyBmbGFncykKICAgICA6IG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fYnVm ZmVyKENvb3JkaW5hdGVkQnVmZmVyOjpjcmVhdGUobmV4dFBvd2VyT2ZUd28oSW50U2l6ZShkaW1l bnNpb24sIGRpbWVuc2lvbikpLCBmbGFncykpCkBAIC0xMDEsOCArNzUsMjEgQEAgYm9vbCBVcGRh dGVBdGxhczo6cGFpbnRPbkF2YWlsYWJsZUJ1ZmZlcihjb25zdCBJbnRTaXplJiBzaXplLCB1aW50 MzJfdCYgYXRsYXNJRCwKICAgICAvLyBGSVhNRTogVXNlIHRyaS1zdGF0ZSBidWZmZXJzLCB0byBh bGxvdyBmYXN0ZXIgdXBkYXRlcy4KICAgICBvZmZzZXQgPSByZWN0LmxvY2F0aW9uKCk7CiAKLSAg ICBVcGRhdGVBdGxhc1N1cmZhY2VDbGllbnQgc3VyZmFjZUNsaWVudChjbGllbnQsIHNpemUsIHN1 cHBvcnRzQWxwaGEoKSk7Ci0gICAgbV9idWZmZXItPnBhaW50VG9TdXJmYWNlKHJlY3QsIHN1cmZh Y2VDbGllbnQpOworICAgIHsKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0ID0gbV9i dWZmZXItPmNvbnRleHQoKTsKKyAgICAgICAgY29udGV4dC5zYXZlKCk7CisgICAgICAgIGNvbnRl eHQuY2xpcChyZWN0KTsKKyAgICAgICAgY29udGV4dC50cmFuc2xhdGUocmVjdC54KCksIHJlY3Qu eSgpKTsKKworICAgICAgICBpZiAoc3VwcG9ydHNBbHBoYSgpKSB7CisgICAgICAgICAgICBjb250 ZXh0LnNldENvbXBvc2l0ZU9wZXJhdGlvbihDb21wb3NpdGVDb3B5KTsKKyAgICAgICAgICAgIGNv bnRleHQuZmlsbFJlY3QoSW50UmVjdChJbnRQb2ludDo6emVybygpLCBzaXplKSwgQ29sb3I6OnRy YW5zcGFyZW50KTsKKyAgICAgICAgICAgIGNvbnRleHQuc2V0Q29tcG9zaXRlT3BlcmF0aW9uKENv bXBvc2l0ZVNvdXJjZU92ZXIpOworICAgICAgICB9CisKKyAgICAgICAgY2xpZW50LnBhaW50VG9T dXJmYWNlQ29udGV4dChjb250ZXh0KTsKKyAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7CisgICAg fQogCiAgICAgcmV0dXJuIHRydWU7CiB9Cg==