179888 2017-11-20 08:53:41 -0800 [Cairo] drawNativeImage(), drawPattern() in CairoOperations should operate directly with cairo_surface_t objects 2017-11-21 05:39:19 -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 1373790 0 zan 2017-11-20 08:53:41 -0800 [Cairo] drawNativeImage(), drawPattern() in CairoOperations should operate directly with cairo_surface_t objects 1373791 1 327365 zan 2017-11-20 09:01:10 -0800 Created attachment 327365 Patch 1373949 2 327365 cgarcia 2017-11-21 01:26:09 -0800 Comment on attachment 327365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327365&action=review > Source/WebCore/platform/graphics/cairo/CairoOperations.h:96 > -void drawGlyphs(GraphicsContext&, const GraphicsContextState&, bool, const FloatPoint&, cairo_scaled_font_t*, double, const Vector<cairo_glyph_t>&, float, GraphicsContext&); > +void drawGlyphs(PlatformContextCairo&, const GraphicsContextState&, const FloatPoint&, cairo_scaled_font_t*, double, const Vector<cairo_glyph_t>&, float, GraphicsContext&); Is this related to this change? I'm surprised it builds. 1373989 3 327365 zan 2017-11-21 05:33:02 -0800 Comment on attachment 327365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327365&action=review >> Source/WebCore/platform/graphics/cairo/CairoOperations.h:96 >> +void drawGlyphs(PlatformContextCairo&, const GraphicsContextState&, const FloatPoint&, cairo_scaled_font_t*, double, const Vector<cairo_glyph_t>&, float, GraphicsContext&); > > Is this related to this change? I'm surprised it builds. It's not directly related, just an opportunistic fix. It still builds because of the unified sources build. As it stands, there are essentially two drawGlyphs() overloads, but this one isn't defined, which isn't a problem because it doesn't get used. But because the CairoOperations.cpp file is included in the single unified source .cpp file before GraphicsContextCairo.cpp, the correct drawGlyphs() function is properly defined, and the build doesn't break. 1373993 4 327365 zan 2017-11-21 05:37:10 -0800 Comment on attachment 327365 Patch Clearing flags on attachment: 327365 Committed r225077: <https://trac.webkit.org/changeset/225077> 1373994 5 zan 2017-11-21 05:37:15 -0800 All reviewed patches have been landed. Closing bug. 1373996 6 webkit-bug-importer 2017-11-21 05:39:19 -0800 <rdar://problem/35656656> 327365 2017-11-20 09:01:10 -0800 2017-11-21 05:37:10 -0800 Patch bug-179888-20171120180108.patch text/plain 9924 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmY2ZDQzMTQ1ZjNjZDIw NGE1ZTkyNTJhYWJkMjMzMzE1MWFhNDQ1OS4uOGIwYTAzODIzODI5ZjUzN2FjZDc2MDc0OGI4OGM1 MDAwNWU2OTBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE3LTExLTIwICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ2Fpcm9dIGRyYXdO YXRpdmVJbWFnZSgpLCBkcmF3UGF0dGVybigpIGluIENhaXJvT3BlcmF0aW9ucyBzaG91bGQgb3Bl cmF0ZSBkaXJlY3RseSB3aXRoIGNhaXJvX3N1cmZhY2VfdCBvYmplY3RzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk4ODgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWlybzo6ZHJhd05hdGl2ZUltYWdl KCkgc2hvdWxkIHJlY2VpdmUgYSB2YWxpZCBjYWlyb19zdXJmYWNlX3QgcG9pbnRlcgorICAgICAg ICBhbmQgd29yayB3aXRoIHRoYXQsIGluc3RlYWQgb2YgdXNpbmcgYSBOYXRpdmVJbWFnZVB0ci4g Q2FsbGVycyBhcmUgdGh1cworICAgICAgICBmb3JjZWQgdG8gcGFzcyB0aGUgcG9pbnRlciBpbnRv IHRoZSBkcmF3TmF0aXZlSW1hZ2UoKSBjYWxsLCBhbmQgdGhlCisgICAgICAgIENhaXJvT3BlcmF0 aW9ucyBpbXBsZW1lbnRhdGlvbiBmaWxlIGRyb3BzIHRoZSBuZWVkIHRvIGtub3cgYWJvdXQgdGhl CisgICAgICAgIE5hdGl2ZUltYWdlUHRyIHR5cGUgYWxpYXMuCisKKyAgICAgICAgQ2Fpcm86OmRy YXdQYXR0ZXJuKCkgbm93IGFjY2VwdHMgcG9pbnRlciB0byB0aGUgY2Fpcm9fc3VyZmFjZV90IG9i amVjdCwKKyAgICAgICAgYWxvbmcgd2l0aCBhbiBJbnRTaXplIG9iamVjdCB0aGF0IGRlc2NpYmVz IHRoZSBzdXJmYWNlJ3Mgc2l6ZS4gVGhpcyB3YXkKKyAgICAgICAgaXQncyB1cCB0byB0aGUgY2Fs bGVyIHRvIHJldHJpZXZlIGFueSB2YWxpZCBuYXRpdmUgaW1hZ2UgZm9yIHRoZSBjdXJyZW50Cisg ICAgICAgIGZyYW1lIGFuZCBwYXNzIHRoYXQgdG8gdGhlIGRyYXdQYXR0ZXJuKCkgY2FsbC4gVGhl IG5lZWQgdG8gdXNlIEludFNpemUKKyAgICAgICAgaGVyZSBpcyBzdHJhbmdlLCBidXQgd2Ugc2hv dWxkIGludmVzdGlnYXRlIHRoaXMgbGF0ZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0tIG5v IGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0NhaXJvT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWlybzo6ZHJhd05hdGl2 ZUltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhaXJvOjpkcmF3UGF0dGVybik6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmg6IEluY2x1ZGUgdGhl IENhaXJvIGhlYWRlci4KKyAgICAgICAgQWxzbyBmaXggZm9yd2FyZCBkZWNsYXJhdGlvbiBvZiBD YWlybzo6ZHJhd0dseXBocygpLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dy YXBoaWNzQ29udGV4dENhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDo6ZHJhd05hdGl2ZUltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6 ZHJhd1BhdHRlcm4pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL05hdGl2ZUlt YWdlQ2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZHJhd05hdGl2ZUltYWdlKTogRXhlY3V0 ZSBvcGVyYXRpb24gdGhyb3VnaCBHcmFwaGljc0NvbnRleHQsCisgICAgICAgIGtpY2tpbmcgaW50 byBlZmZlY3QgYW55IHJlY29yZGluZyB0aGF0IGNvdWxkIGJlIGRvbmUgdGhpcyB3YXkuCisKIDIw MTctMTEtMjAgIEVtaWxpbyBDb2JvcyDDgWx2YXJleiAgPGVtaWxpb0BjcmlzYWwuaW8+CiAKICAg ICAgICAgSW5jb3JyZWN0IGNvbXB1dGVkIHN0eWxlIGluIHBzZXVkby1lbGVtZW50cyB3aXRoIGRp c3BsYXk6IGNvbnRlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcAppbmRleCA1YjhhMzEwMTQ0OTY2YmVh MTYzMzYxMWFkNmFlOWNjZGI0NDdmZDVjLi40MzlhMzg5MGY0NDdmNzljOTBhNmRkMTA3N2JlNzI4 Njg1MjI3MDJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKQEAgLTY0NiwxOCArNjQ2LDE4IEBAIHZv aWQgZHJhd0dseXBocyhQbGF0Zm9ybUNvbnRleHRDYWlybyYgcGxhdGZvcm1Db250ZXh0LCBjb25z dCBHcmFwaGljc0NvbnRleHRTdGF0CiAgICAgY2Fpcm9fcmVzdG9yZShjcik7CiB9CiAKLXZvaWQg ZHJhd05hdGl2ZUltYWdlKFBsYXRmb3JtQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIGNv bnN0IE5hdGl2ZUltYWdlUHRyJiBpbWFnZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29u c3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciBjb21wb3NpdGVPcGVyYXRv ciwgQmxlbmRNb2RlIGJsZW5kTW9kZSwgSW1hZ2VPcmllbnRhdGlvbiBvcmllbnRhdGlvbiwgR3Jh cGhpY3NDb250ZXh0JiB0YXJnZXRDb250ZXh0KQordm9pZCBkcmF3TmF0aXZlSW1hZ2UoUGxhdGZv cm1Db250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNl LCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENv bXBvc2l0ZU9wZXJhdG9yIGNvbXBvc2l0ZU9wZXJhdG9yLCBCbGVuZE1vZGUgYmxlbmRNb2RlLCBJ bWFnZU9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBHcmFwaGljc0NvbnRleHQmIHRhcmdldENvbnRl eHQpCiB7CiAgICAgcGxhdGZvcm1Db250ZXh0LnNhdmUoKTsKIAogICAgIC8vIFNldCB0aGUgY29t cG9zaXRpbmcgb3BlcmF0aW9uLgotICAgIGlmIChjb21wb3NpdGVPcGVyYXRvciA9PSBDb21wb3Np dGVTb3VyY2VPdmVyICYmIGJsZW5kTW9kZSA9PSBCbGVuZE1vZGVOb3JtYWwgJiYgIWNhaXJvU3Vy ZmFjZUhhc0FscGhhKGltYWdlLmdldCgpKSkKKyAgICBpZiAoY29tcG9zaXRlT3BlcmF0b3IgPT0g Q29tcG9zaXRlU291cmNlT3ZlciAmJiBibGVuZE1vZGUgPT0gQmxlbmRNb2RlTm9ybWFsICYmICFj YWlyb1N1cmZhY2VIYXNBbHBoYShzdXJmYWNlKSkKICAgICAgICAgQ2Fpcm86OlN0YXRlOjpzZXRD b21wb3NpdGVPcGVyYXRpb24ocGxhdGZvcm1Db250ZXh0LCBDb21wb3NpdGVDb3B5LCBCbGVuZE1v ZGVOb3JtYWwpOwogICAgIGVsc2UKICAgICAgICAgQ2Fpcm86OlN0YXRlOjpzZXRDb21wb3NpdGVP cGVyYXRpb24ocGxhdGZvcm1Db250ZXh0LCBjb21wb3NpdGVPcGVyYXRvciwgYmxlbmRNb2RlKTsK IAogI2lmIEVOQUJMRShJTUFHRV9ERUNPREVSX0RPV05fU0FNUExJTkcpCi0gICAgSW50U2l6ZSBz Y2FsZWRTaXplID0gbmF0aXZlSW1hZ2VTaXplKGltYWdlKTsKKyAgICBJbnRTaXplIHNjYWxlZFNp emUgPSBuYXRpdmVJbWFnZVNpemUoc3VyZmFjZSk7CiAgICAgRmxvYXRSZWN0IHNyYyA9IGFkanVz dFNvdXJjZVJlY3RGb3JEb3duU2FtcGxpbmcoc3JjUmVjdCwgc2NhbGVkU2l6ZSk7CiAjZWxzZQog ICAgIEZsb2F0UmVjdCBzcmMoc3JjUmVjdCk7CkBAIC02NzcsMTQgKzY3NywxNCBAQCB2b2lkIGRy YXdOYXRpdmVJbWFnZShQbGF0Zm9ybUNvbnRleHRDYWlybyYgcGxhdGZvcm1Db250ZXh0LCBjb25z dCBOYXRpdmVJbWFnZVB0cgogICAgICAgICB9CiAgICAgfQogCi0gICAgcGxhdGZvcm1Db250ZXh0 LmRyYXdTdXJmYWNlVG9Db250ZXh0KGltYWdlLmdldCgpLCBkc3QsIHNyYywgdGFyZ2V0Q29udGV4 dCk7CisgICAgcGxhdGZvcm1Db250ZXh0LmRyYXdTdXJmYWNlVG9Db250ZXh0KHN1cmZhY2UsIGRz dCwgc3JjLCB0YXJnZXRDb250ZXh0KTsKICAgICBwbGF0Zm9ybUNvbnRleHQucmVzdG9yZSgpOwog fQogCi12b2lkIGRyYXdQYXR0ZXJuKFBsYXRmb3JtQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRl eHQsIEltYWdlJiBpbWFnZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRS ZWN0JiB0aWxlUmVjdCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBwYXR0ZXJuVHJhbnNmb3JtLCBj b25zdCBGbG9hdFBvaW50JiBwaGFzZSwgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRlT3BlcmF0 b3IsIEJsZW5kTW9kZSBibGVuZE1vZGUpCit2b2lkIGRyYXdQYXR0ZXJuKFBsYXRmb3JtQ29udGV4 dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSwgY29uc3Qg SW50U2l6ZSYgc2l6ZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0 JiB0aWxlUmVjdCwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiBwYXR0ZXJuVHJhbnNmb3JtLCBjb25z dCBGbG9hdFBvaW50JiBwaGFzZSwgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRlT3BlcmF0b3Is IEJsZW5kTW9kZSBibGVuZE1vZGUpCiB7Ci0gICAgaWYgKGF1dG8gc3VyZmFjZSA9IGltYWdlLm5h dGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCkpCi0gICAgICAgIGRyYXdQYXR0ZXJuVG9DYWlyb0Nv bnRleHQocGxhdGZvcm1Db250ZXh0LmNyKCksIHN1cmZhY2UuZ2V0KCksIEludFNpemUoaW1hZ2Uu c2l6ZSgpKSwgdGlsZVJlY3QsIHBhdHRlcm5UcmFuc2Zvcm0sIHBoYXNlLCB0b0NhaXJvT3BlcmF0 b3IoY29tcG9zaXRlT3BlcmF0b3IsIGJsZW5kTW9kZSksIGRlc3RSZWN0KTsKKyAgICAvLyBGSVhN RTogSW52ZXN0aWdhdGUgd2h5IHRoZSBzaXplIGhhcyB0byBiZSBwYXNzZWQgaW4gYXMgYW4gSW50 UmVjdC4KKyAgICBkcmF3UGF0dGVyblRvQ2Fpcm9Db250ZXh0KHBsYXRmb3JtQ29udGV4dC5jcigp LCBzdXJmYWNlLCBzaXplLCB0aWxlUmVjdCwgcGF0dGVyblRyYW5zZm9ybSwgcGhhc2UsIHRvQ2Fp cm9PcGVyYXRvcihjb21wb3NpdGVPcGVyYXRvciwgYmxlbmRNb2RlKSwgZGVzdFJlY3QpOwogfQog CiB2b2lkIGRyYXdSZWN0KFBsYXRmb3JtQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIGNv bnN0IEZsb2F0UmVjdCYgcmVjdCwgZmxvYXQgYm9yZGVyVGhpY2tuZXNzLCBjb25zdCBHcmFwaGlj c0NvbnRleHRTdGF0ZSYgc3RhdGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCmluZGV4IGE4NzdmNjMzNDAzYzdl YmFkOGYyZjcxNzEwYWE0NTE0N2MzMTUxZjUuLjNlMGU4ZWY4NjhlNjQ3YTU0MmM0NWJmMDUwYjEw OTJmYjVmNzc3MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCkBAIC0zNyw4ICszNyw3IEBACiAjaW5jbHVk ZSAiRGFzaEFycmF5LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAi R3JhcGhpY3NUeXBlcy5oIgotCi10eXBlZGVmIHN0cnVjdCBfY2Fpcm9fcGF0dGVybiBjYWlyb19w YXR0ZXJuX3Q7CisjaW5jbHVkZSA8Y2Fpcm8uaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC05NCwxMCArOTMsMTAgQEAgdm9pZCBzdHJva2VSZWN0KFBsYXRmb3JtQ29udGV4dENhaXJvJiwg Y29uc3QgRmxvYXRSZWN0JiwgZmxvYXQsIGNvbnN0IEdyYXBoaWNzQ28KIHZvaWQgc3Ryb2tlUGF0 aChQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IFBhdGgmLCBjb25zdCBHcmFwaGljc0NvbnRl eHRTdGF0ZSYsIEdyYXBoaWNzQ29udGV4dCYpOwogdm9pZCBjbGVhclJlY3QoUGxhdGZvcm1Db250 ZXh0Q2Fpcm8mLCBjb25zdCBGbG9hdFJlY3QmKTsKIAotdm9pZCBkcmF3R2x5cGhzKEdyYXBoaWNz Q29udGV4dCYsIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiwgYm9vbCwgY29uc3QgRmxvYXRQ b2ludCYsIGNhaXJvX3NjYWxlZF9mb250X3QqLCBkb3VibGUsIGNvbnN0IFZlY3RvcjxjYWlyb19n bHlwaF90PiYsIGZsb2F0LCBHcmFwaGljc0NvbnRleHQmKTsKK3ZvaWQgZHJhd0dseXBocyhQbGF0 Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiwgY29uc3QgRmxv YXRQb2ludCYsIGNhaXJvX3NjYWxlZF9mb250X3QqLCBkb3VibGUsIGNvbnN0IFZlY3RvcjxjYWly b19nbHlwaF90PiYsIGZsb2F0LCBHcmFwaGljc0NvbnRleHQmKTsKIAotdm9pZCBkcmF3TmF0aXZl SW1hZ2UoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mLCBjb25zdCBOYXRpdmVJbWFnZVB0ciYsIGNvbnN0 IEZsb2F0UmVjdCYsIGNvbnN0IEZsb2F0UmVjdCYsIENvbXBvc2l0ZU9wZXJhdG9yLCBCbGVuZE1v ZGUsIEltYWdlT3JpZW50YXRpb24sIEdyYXBoaWNzQ29udGV4dCYpOwotdm9pZCBkcmF3UGF0dGVy bihQbGF0Zm9ybUNvbnRleHRDYWlybyYsIEltYWdlJiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3Qg RmxvYXRSZWN0JiwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiwgY29uc3QgRmxvYXRQb2ludCYsIENv bXBvc2l0ZU9wZXJhdG9yLCBCbGVuZE1vZGUpOwordm9pZCBkcmF3TmF0aXZlSW1hZ2UoUGxhdGZv cm1Db250ZXh0Q2Fpcm8mLCBjYWlyb19zdXJmYWNlX3QqLCBjb25zdCBGbG9hdFJlY3QmLCBjb25z dCBGbG9hdFJlY3QmLCBDb21wb3NpdGVPcGVyYXRvciwgQmxlbmRNb2RlLCBJbWFnZU9yaWVudGF0 aW9uLCBHcmFwaGljc0NvbnRleHQmKTsKK3ZvaWQgZHJhd1BhdHRlcm4oUGxhdGZvcm1Db250ZXh0 Q2Fpcm8mLCBjYWlyb19zdXJmYWNlX3QqLCBjb25zdCBJbnRTaXplJiwgY29uc3QgRmxvYXRSZWN0 JiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiwgY29uc3QgRmxvYXRQ b2ludCYsIENvbXBvc2l0ZU9wZXJhdG9yLCBCbGVuZE1vZGUpOwogCiB2b2lkIGRyYXdSZWN0KFBs YXRmb3JtQ29udGV4dENhaXJvJiwgY29uc3QgRmxvYXRSZWN0JiwgZmxvYXQsIGNvbnN0IEdyYXBo aWNzQ29udGV4dFN0YXRlJik7CiB2b2lkIGRyYXdMaW5lKFBsYXRmb3JtQ29udGV4dENhaXJvJiwg Y29uc3QgRmxvYXRQb2ludCYsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBHcmFwaGljc0NvbnRl eHRTdGF0ZSYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IGU2MGYxM2FkNmYz YTYxZDVjYjA0MWE0ZjkyZGY3YjQxMWI4ZGUzNGMuLjAwZjU3NzcyMjI4NTFlY2RkZWQwNjNlMWNj MzhkZjhjMThlM2Q4OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKQEAgLTE0MSw3 ICsxNDEsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd05hdGl2ZUltYWdlKGNvbnN0IE5h dGl2ZUltYWdlUHRyJiBpbWFnZSwgY29uc3QgRmxvYXRTaQogICAgIH0KIAogICAgIEFTU0VSVCho YXNQbGF0Zm9ybUNvbnRleHQoKSk7Ci0gICAgQ2Fpcm86OmRyYXdOYXRpdmVJbWFnZSgqcGxhdGZv cm1Db250ZXh0KCksIGltYWdlLCBkZXN0UmVjdCwgc3JjUmVjdCwgY29tcG9zaXRlT3BlcmF0b3Is IGJsZW5kTW9kZSwgb3JpZW50YXRpb24sICp0aGlzKTsKKyAgICBDYWlybzo6ZHJhd05hdGl2ZUlt YWdlKCpwbGF0Zm9ybUNvbnRleHQoKSwgaW1hZ2UuZ2V0KCksIGRlc3RSZWN0LCBzcmNSZWN0LCBj b21wb3NpdGVPcGVyYXRvciwgYmxlbmRNb2RlLCBvcmllbnRhdGlvbiwgKnRoaXMpOwogfQogCiAv LyBUaGlzIGlzIG9ubHkgdXNlZCB0byBkcmF3IGJvcmRlcnMsIHNvIHdlIHNob3VsZCBub3QgZHJh dyBzaGFkb3dzLgpAQCAtNjg5LDcgKzY4OSw4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3 UGF0dGVybihJbWFnZSYgaW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0CiAg ICAgfQogCiAgICAgQVNTRVJUKGhhc1BsYXRmb3JtQ29udGV4dCgpKTsKLSAgICBDYWlybzo6ZHJh d1BhdHRlcm4oKnBsYXRmb3JtQ29udGV4dCgpLCBpbWFnZSwgZGVzdFJlY3QsIHRpbGVSZWN0LCBw YXR0ZXJuVHJhbnNmb3JtLCBwaGFzZSwgY29tcG9zaXRlT3BlcmF0b3IsIGJsZW5kTW9kZSk7Cisg ICAgaWYgKGF1dG8gc3VyZmFjZSA9IGltYWdlLm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCkp CisgICAgICAgIENhaXJvOjpkcmF3UGF0dGVybigqcGxhdGZvcm1Db250ZXh0KCksIHN1cmZhY2Uu Z2V0KCksIEludFNpemUoaW1hZ2Uuc2l6ZSgpKSwgZGVzdFJlY3QsIHRpbGVSZWN0LCBwYXR0ZXJu VHJhbnNmb3JtLCBwaGFzZSwgY29tcG9zaXRlT3BlcmF0b3IsIGJsZW5kTW9kZSk7CiB9CiAKIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZEFudGlhbGlhcyhib29sIGVuYWJs ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL05h dGl2ZUltYWdlQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vTmF0aXZlSW1hZ2VDYWlyby5jcHAKaW5kZXggOWYwMmIwZTlhZWE3Y2Q1MGE2N2UxNzcxNjNh YzU4ODUzMzdjNTA5Yi4uZWQwNGZmZmM4ZDlhOWExMzI3YjQ5NTBiODQzYTljZTlmMThkYjE1NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vTmF0aXZl SW1hZ2VDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vTmF0aXZlSW1hZ2VDYWlyby5jcHAKQEAgLTU5LDEwICs1OSw3IEBAIENvbG9yIG5hdGl2ZUlt YWdlU2luZ2xlUGl4ZWxTb2xpZENvbG9yKGNvbnN0IE5hdGl2ZUltYWdlUHRyJiBpbWFnZSkKIAog dm9pZCBkcmF3TmF0aXZlSW1hZ2UoY29uc3QgTmF0aXZlSW1hZ2VQdHImIGltYWdlLCBHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEZsb2F0 UmVjdCYgc3JjUmVjdCwgY29uc3QgSW50U2l6ZSYgaW1hZ2VTaXplLCBDb21wb3NpdGVPcGVyYXRv ciBjb21wb3NpdGVPcGVyYXRvciwgQmxlbmRNb2RlIGJsZW5kTW9kZSwgY29uc3QgSW1hZ2VPcmll bnRhdGlvbiYgb3JpZW50YXRpb24pCiB7Ci0gICAgVU5VU0VEX1BBUkFNKGltYWdlU2l6ZSk7Ci0K LSAgICBBU1NFUlQoY29udGV4dC5oYXNQbGF0Zm9ybUNvbnRleHQoKSk7Ci0gICAgQ2Fpcm86OmRy YXdOYXRpdmVJbWFnZSgqY29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKSwgaW1hZ2UsIGRlc3RSZWN0 LCBzcmNSZWN0LCBjb21wb3NpdGVPcGVyYXRvciwgYmxlbmRNb2RlLCBvcmllbnRhdGlvbiwgY29u dGV4dCk7CisgICAgY29udGV4dC5kcmF3TmF0aXZlSW1hZ2UoaW1hZ2UsIGltYWdlU2l6ZSwgZGVz dFJlY3QsIHNyY1JlY3QsIGNvbXBvc2l0ZU9wZXJhdG9yLCBibGVuZE1vZGUsIG9yaWVudGF0aW9u KTsKIH0KIAogdm9pZCBjbGVhck5hdGl2ZUltYWdlU3ViaW1hZ2VzKGNvbnN0IE5hdGl2ZUltYWdl UHRyJikK