124999 2013-11-28 23:05:47 -0800 [Texmap] TextureMapperLayer unnecessary object copying 2022-02-27 23:32:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 137271 P2 Normal --- 1 p.szymanski3 webkit-unassigned cmarcelo commit-queue fujii kondapallykalyan luiz noam oldest_to_newest 954882 0 p.szymanski3 2013-11-28 23:05:47 -0800 In C++ it is not a good practice to make copy of objects. Mostly because object copying is not cheap operation for CPU especially if an object is large. 954901 1 218039 p.szymanski3 2013-11-29 00:58:25 -0800 Created attachment 218039 object copying 954907 2 218039 p.szymanski3 2013-11-29 01:47:40 -0800 Comment on attachment 218039 object copying wrong attachment format 954908 3 218041 p.szymanski3 2013-11-29 01:50:05 -0800 Created attachment 218041 patch 982500 4 218041 bfulgham 2014-02-19 12:25:18 -0800 Comment on attachment 218041 patch View in context: https://bugs.webkit.org/attachment.cgi?id=218041&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:348 > for (size_t i = 0; i < rects.size(); ++i) { Please make this a C++11 loop. > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:369 > + const IntRect& rect = rects[i]; Ditto. 982758 5 224737 p.szymanski3 2014-02-20 02:37:31 -0800 Created attachment 224737 patch 982762 6 p.szymanski3 2014-02-20 02:41:13 -0800 (In reply to comment #4) > (From update of attachment 218041 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=218041&action=review > > > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:348 > > for (size_t i = 0; i < rects.size(); ++i) { > > Please make this a C++11 loop. > > > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:369 > > + const IntRect& rect = rects[i]; > > Ditto. Thank you for review. Patch is updated. I hope you thought about range-for not std::foreach 1001322 7 224737 bfulgham 2014-04-16 14:09:15 -0700 Comment on attachment 224737 patch View in context: https://bugs.webkit.org/attachment.cgi?id=224737&action=review Looks very go! Pleaseo switch to 'auto&', but otherwise this looks good. > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:348 > + for (IntRect& rect : rects) { Please make this for (auto& rect : rects) { > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:367 > + for (IntRect& rect : rects) { Ditto. 1705623 8 fujii 2020-11-08 18:02:53 -0800 r174168 fixed this. *** This bug has been marked as a duplicate of bug 137271 *** 218039 2013-11-29 00:58:25 -0800 2013-11-29 01:47:39 -0800 object copying texMapLayer_obj_copy.patch text/plain 2785 p.szymanski3 Y29tbWl0IDMyMWNkNzY3YzVjMmZlN2U5MmFiYmFlNTc3NDYxMDJiOTJlYzhlNDUKQXV0aG9yOiBQ cnplbXlzbGF3IFN6eW1hbnNraSA8cC5zenltYW5za2kzQHNhbXN1bmcuY29tPgpEYXRlOiAgIEZy aSBOb3YgMjkgMDg6Mjc6MTkgMjAxMyArMDEwMAoKICAgIFtUZXhtYXBdIFRleHR1cnJNYXBwZXJM YXllciB1bm5lY2Vzc2FyeSBvYmplY3QgY29weWluZwogICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyNDk5OQogICAgCiAgICBDaGFuZ2UtSWQ6IEk0ZmFkYTZmOTAy OTc3MmZkOWE3ZGJlOTIyZGEwYTVmMjJkMzA2MzlhCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQwMzM0MjIuLjU1 ZWJlNDE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTExLTI4ICBQcnplbXlz bGF3IFN6eW1hbnNraSAgPHAuc3p5bWFuc2tpM0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbVGV4 bWFwXSBUZXh0dXJlTWFwcGVyTGF5ZXIgdW5uZWNlc3Nhcnkgb2JqZWN0IGNvcHlpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDk5OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIEMrKyB3ZSBzaG91 bGQgdG8gYXZvaWQgb2JqZWN0IGNvcHlpbmcgd2hlbiBpdCBpcyBwb3NzaWJsZS4KKyAgICAgICAg SW4gdGhpcyBjYXNlIHJlY3Qgb2JqZWN0cyBhcmUgdXNlZCBmb3IgcmVhZCBvbmx5IGFjY2Vzcy4K KyAgICAgICAgSW4gdGhpcyBjYXNlIG9iamVjdCBjb3B5aW5nIGNvdWxkIGNhdXNlIHBlcmZvcm1h bmNlIGlzc3Vlcy4KKyAgICAgICAgVGhpcyBwYXRjaCBkb2VzIG5vdCBjaGFuZ2UgYW55IGZ1bmN0 aW9uYWxpdHkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBDb3ZlcmVkIGJ5IGV4aXN0aW5nIG9u ZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxh eWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2lu Z092ZXJsYXBSZWdpb25zKToKKwogMjAxMy0xMS0yOCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcu a2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbmFtZSBJbmxpbmVJdGVyYXRvcjo6bV9vYmog YW5kIG1ha2UgaXQgcHJpdmF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcAppbmRleCA3ZTdi YWJiLi40MTgyMjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcApAQCAtMzQ2LDExICsz NDYsMTEgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9u cyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb24KICAgICBWZWN0b3I8SW50UmVjdD4gcmVj dHMgPSBub25PdmVybGFwUmVnaW9uLnJlY3RzKCk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IHJlY3RzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIEludFJlY3QgcmVjdCA9IHJlY3RzW2ld OworICAgICAgICBjb25zdCBJbnRSZWN0JiByZWN0ID0gcmVjdHNbaV07CiAgICAgICAgIGlmICgh cmVjdC5pbnRlcnNlY3RzKG9wdGlvbnMudGV4dHVyZU1hcHBlci0+Y2xpcEJvdW5kcygpKSkKICAg ICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+YmVn aW5DbGlwKFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIHJlY3RzW2ldKTsKKyAgICAgICAgb3B0aW9u cy50ZXh0dXJlTWFwcGVyLT5iZWdpbkNsaXAoVHJhbnNmb3JtYXRpb25NYXRyaXgoKSwgcmVjdCk7 CiAgICAgICAgIHBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxpY2Eob3B0aW9ucyk7CiAgICAg ICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZW5kQ2xpcCgpOwogICAgIH0KQEAgLTM2Niw3ICsz NjYsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25z KGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbgogICAgIEludFJlY3QgYWRqdXN0ZWRDbGlw Qm91bmRzKG9wdGlvbnMudGV4dHVyZU1hcHBlci0+Y2xpcEJvdW5kcygpKTsKICAgICBhZGp1c3Rl ZENsaXBCb3VuZHMubW92ZSgtb3B0aW9ucy5vZmZzZXQpOwogICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgcmVjdHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgSW50UmVjdCByZWN0ID0gcmVjdHNb aV07CisgICAgICAgIGNvbnN0IEludFJlY3QmIHJlY3QgPSByZWN0c1tpXTsKICAgICAgICAgZm9y IChpbnQgeCA9IHJlY3QueCgpOyB4IDwgcmVjdC5tYXhYKCk7IHggKz0gbWF4VGV4dHVyZVNpemUu d2lkdGgoKSkgewogICAgICAgICAgICAgZm9yIChpbnQgeSA9IHJlY3QueSgpOyB5IDwgcmVjdC5t YXhZKCk7IHkgKz0gbWF4VGV4dHVyZVNpemUuaGVpZ2h0KCkpIHsKICAgICAgICAgICAgICAgICBJ bnRSZWN0IHRpbGVSZWN0KEludFBvaW50KHgsIHkpLCBtYXhUZXh0dXJlU2l6ZSk7Cg== 218041 2013-11-29 01:50:05 -0800 2014-02-20 02:36:02 -0800 patch texMapLayer_obj_copy.patch text/plain 2468 p.szymanski3 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMDMzNDIyLi41NWViZTQxOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MCBAQAorMjAxMy0xMS0yOCAgUHJ6ZW15c2xhdyBTenltYW5za2kgIDxwLnN6eW1hbnNraTNAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW1RleG1hcF0gVGV4dHVyZU1hcHBlckxheWVyIHVubmVjZXNz YXJ5IG9iamVjdCBjb3B5aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjQ5OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiBDKysgd2Ugc2hvdWxkIHRvIGF2b2lkIG9iamVjdCBjb3B5aW5nIHdoZW4g aXQgaXMgcG9zc2libGUuCisgICAgICAgIEluIHRoaXMgY2FzZSByZWN0IG9iamVjdHMgYXJlIHVz ZWQgZm9yIHJlYWQgb25seSBhY2Nlc3MuCisgICAgICAgIEluIHRoaXMgY2FzZSBvYmplY3QgY29w eWluZyBjb3VsZCBjYXVzZSBwZXJmb3JtYW5jZSBpc3N1ZXMuCisgICAgICAgIFRoaXMgcGF0Y2gg ZG9lcyBub3QgY2hhbmdlIGFueSBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cy4gQ292ZXJlZCBieSBleGlzdGluZyBvbmVzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0 dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyk6CisKIDIwMTMtMTEtMjgg IEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZW5h bWUgSW5saW5lSXRlcmF0b3I6Om1fb2JqIGFuZCBtYWtlIGl0IHByaXZhdGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5 ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJMYXllci5jcHAKaW5kZXggN2U3YmFiYi4uNDE4MjI4MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJMYXllci5jcHAKQEAgLTM0NiwxMSArMzQ2LDExIEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVy OjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9u CiAgICAgVmVjdG9yPEludFJlY3Q+IHJlY3RzID0gbm9uT3ZlcmxhcFJlZ2lvbi5yZWN0cygpOwog CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCByZWN0cy5zaXplKCk7ICsraSkgewotICAgICAg ICBJbnRSZWN0IHJlY3QgPSByZWN0c1tpXTsKKyAgICAgICAgY29uc3QgSW50UmVjdCYgcmVjdCA9 IHJlY3RzW2ldOwogICAgICAgICBpZiAoIXJlY3QuaW50ZXJzZWN0cyhvcHRpb25zLnRleHR1cmVN YXBwZXItPmNsaXBCb3VuZHMoKSkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBv cHRpb25zLnRleHR1cmVNYXBwZXItPmJlZ2luQ2xpcChUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpLCBy ZWN0c1tpXSk7CisgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+YmVnaW5DbGlwKFRyYW5z Zm9ybWF0aW9uTWF0cml4KCksIHJlY3QpOwogICAgICAgICBwYWludFNlbGZBbmRDaGlsZHJlbldp dGhSZXBsaWNhKG9wdGlvbnMpOwogICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmVuZENs aXAoKTsKICAgICB9CkBAIC0zNjYsNyArMzY2LDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6 OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb24K ICAgICBJbnRSZWN0IGFkanVzdGVkQ2xpcEJvdW5kcyhvcHRpb25zLnRleHR1cmVNYXBwZXItPmNs aXBCb3VuZHMoKSk7CiAgICAgYWRqdXN0ZWRDbGlwQm91bmRzLm1vdmUoLW9wdGlvbnMub2Zmc2V0 KTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJlY3RzLnNpemUoKTsgKytpKSB7Ci0gICAg ICAgIEludFJlY3QgcmVjdCA9IHJlY3RzW2ldOworICAgICAgICBjb25zdCBJbnRSZWN0JiByZWN0 ID0gcmVjdHNbaV07CiAgICAgICAgIGZvciAoaW50IHggPSByZWN0LngoKTsgeCA8IHJlY3QubWF4 WCgpOyB4ICs9IG1heFRleHR1cmVTaXplLndpZHRoKCkpIHsKICAgICAgICAgICAgIGZvciAoaW50 IHkgPSByZWN0LnkoKTsgeSA8IHJlY3QubWF4WSgpOyB5ICs9IG1heFRleHR1cmVTaXplLmhlaWdo dCgpKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCB0aWxlUmVjdChJbnRQb2ludCh4LCB5KSwg bWF4VGV4dHVyZVNpemUpOwo= 224737 2014-02-20 02:37:31 -0800 2022-02-27 23:32:09 -0800 patch texmap.patch text/plain 2590 p.szymanski3 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOTkyMTU3Li41MTRlMmQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTQtMDItMjAgIFByemVteXNsYXcgU3p5bWFuc2tpICA8cC5zenltYW5za2kzQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtUZXhtYXBdIFRleHR1cmVNYXBwZXJMYXllciB1bm5lY2Vzc2Fy eSBvYmplY3QgY29weWluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI0OTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW4gQysrIHdlIHNob3VsZCB0byBhdm9pZCBvYmplY3QgY29weWluZyB3aGVuIGl0 IGlzIHBvc3NpYmxlLgorICAgICAgICBJbiB0aGlzIGNhc2UgcmVjdCBvYmplY3RzIGFyZSB1c2Vk IGZvciByZWFkIG9ubHkgYWNjZXNzLgorICAgICAgICBJbiB0aGlzIGNhc2Ugb2JqZWN0IGNvcHlp bmcgY291bGQgY2F1c2UgcGVyZm9ybWFuY2UgaXNzdWVzLgorICAgICAgICBUaGlzIHBhdGNoIGRv ZXMgbm90IGNoYW5nZSBhbnkgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICBObyBuZXcgdGVzdHMu IENvdmVyZWQgYnkgZXhpc3Rpbmcgb25lcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVy ZU1hcHBlckxheWVyOjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMpOgorCiAyMDE0LTAyLTIwICBB cnR1ciBNb3J5YyAgPGEubW9yeWNAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgQVg6IENoaWxkcmVu IE5vZGVzIGZvciBDYW52YXMgb2JqZWN0cyBhcmUgbm90IGVxdWFsIHRvIFJlbmRlciBPYmplY3Rz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcAppbmRleCA4NjU5MmM2Li4xYTVhYjA5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcApAQCAtMzQ1LDEyICszNDUsMTEgQEAgdm9pZCBUZXh0 dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFw cGVyUGFpbnRPcHRpb24KICAgICBub25PdmVybGFwUmVnaW9uLnRyYW5zbGF0ZShvcHRpb25zLm9m ZnNldCk7CiAgICAgVmVjdG9yPEludFJlY3Q+IHJlY3RzID0gbm9uT3ZlcmxhcFJlZ2lvbi5yZWN0 cygpOwogCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCByZWN0cy5zaXplKCk7ICsraSkgewot ICAgICAgICBJbnRSZWN0IHJlY3QgPSByZWN0c1tpXTsKKyAgICBmb3IgKEludFJlY3QmIHJlY3Qg OiByZWN0cykgewogICAgICAgICBpZiAoIXJlY3QuaW50ZXJzZWN0cyhvcHRpb25zLnRleHR1cmVN YXBwZXItPmNsaXBCb3VuZHMoKSkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBv cHRpb25zLnRleHR1cmVNYXBwZXItPmJlZ2luQ2xpcChUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpLCBy ZWN0c1tpXSk7CisgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+YmVnaW5DbGlwKFRyYW5z Zm9ybWF0aW9uTWF0cml4KCksIHJlY3QpOwogICAgICAgICBwYWludFNlbGZBbmRDaGlsZHJlbldp dGhSZXBsaWNhKG9wdGlvbnMpOwogICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmVuZENs aXAoKTsKICAgICB9CkBAIC0zNjUsOCArMzY0LDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6 OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb24K ICAgICBJbnRTaXplIG1heFRleHR1cmVTaXplID0gb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5tYXhU ZXh0dXJlU2l6ZSgpOwogICAgIEludFJlY3QgYWRqdXN0ZWRDbGlwQm91bmRzKG9wdGlvbnMudGV4 dHVyZU1hcHBlci0+Y2xpcEJvdW5kcygpKTsKICAgICBhZGp1c3RlZENsaXBCb3VuZHMubW92ZSgt b3B0aW9ucy5vZmZzZXQpOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcmVjdHMuc2l6ZSgp OyArK2kpIHsKLSAgICAgICAgSW50UmVjdCByZWN0ID0gcmVjdHNbaV07CisgICAgZm9yIChJbnRS ZWN0JiByZWN0IDogcmVjdHMpIHsKICAgICAgICAgZm9yIChpbnQgeCA9IHJlY3QueCgpOyB4IDwg cmVjdC5tYXhYKCk7IHggKz0gbWF4VGV4dHVyZVNpemUud2lkdGgoKSkgewogICAgICAgICAgICAg Zm9yIChpbnQgeSA9IHJlY3QueSgpOyB5IDwgcmVjdC5tYXhZKCk7IHkgKz0gbWF4VGV4dHVyZVNp emUuaGVpZ2h0KCkpIHsKICAgICAgICAgICAgICAgICBJbnRSZWN0IHRpbGVSZWN0KEludFBvaW50 KHgsIHkpLCBtYXhUZXh0dXJlU2l6ZSk7Cg==