157303 2016-05-03 00:07:30 -0700 [TexMap] Clean up TextureMapperGLData, TextureMapperGLData::SharedGLData 2016-05-04 03:29:52 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cmarcelo commit-queue kondapallykalyan luiz noam ossy oldest_to_newest 1189693 0 zan 2016-05-03 00:07:30 -0700 [TexMap] Clean up TextureMapperGL, TextureMapperGL::SharedGLData 1189694 1 277984 zan 2016-05-03 00:18:42 -0700 Created attachment 277984 Patch 1189913 2 commit-queue 2016-05-03 17:27:20 -0700 Attachment 277984 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:161: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1189995 3 277984 zan 2016-05-04 00:35:39 -0700 Comment on attachment 277984 Patch Clearing flags on attachment: 277984 Committed r200407: <http://trac.webkit.org/changeset/200407> 1189996 4 zan 2016-05-04 00:35:48 -0700 All reviewed patches have been landed. Closing bug. 1190019 5 ossy 2016-05-04 03:03:36 -0700 (In reply to comment #3) > Comment on attachment 277984 [details] > Patch > > Clearing flags on attachment: 277984 > > Committed r200407: <http://trac.webkit.org/changeset/200407> It made 50+ tests crash on EFL and made the bot early exit: https://build.webkit.org/builders/EFL%20Linux%2064-bit%20Release%20WK2/builds/27849 (note: I'm not interested in EFL port at all, I just noticed and reported this bug, and cc-ed EFL port maintainers.) 1190023 6 zan 2016-05-04 03:29:52 -0700 (In reply to comment #5) > (In reply to comment #3) > > Comment on attachment 277984 [details] > > Patch > > > > Clearing flags on attachment: 277984 > > > > Committed r200407: <http://trac.webkit.org/changeset/200407> > > It made 50+ tests crash on EFL and made the bot early exit: > https://build.webkit.org/builders/EFL%20Linux%2064-bit%20Release%20WK2/ > builds/27849 > > (note: I'm not interested in EFL port at all, I just noticed > and reported this bug, and cc-ed EFL port maintainers.) Should be fixed with r200413. https://trac.webkit.org/r200413 277984 2016-05-03 00:18:42 -0700 2016-05-04 00:35:39 -0700 Patch bug-157303-20160503001918.patch text/plain 14207 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M5NDhiYTJiMGFjYTUz Y2FhZGViMDlmZDE5NjkxOGNiMTg1NjA0Zi4uYjk1MmU2NWQ4MzAyOGFjYjhhMTkyNDc2YzMzZTBh YzU5ZTIwNzIxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE2LTA1LTAzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4TWFwXSBDbGVh biB1cCBUZXh0dXJlTWFwcGVyR0xEYXRhLCBUZXh0dXJlTWFwcGVyR0xEYXRhOjpTaGFyZWRHTERh dGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzMw MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvcmNo IHRoZSBUZXh0dXJlTWFwcGVyR0xEYXRhIGFuZCBUZXh0dXJlTWFwcGVyR0xEYXRhOjpTaGFyZWRH TERhdGEKKyAgICAgICAgY2xhc3NlcyBpbnRvIGEgYmV0dGVyIGZvcm0uCisKKyAgICAgICAgU2hh cmVkR0xEYXRhIGlzIG5vdyBwcml2YXRlIHRvIHRoZSBUZXh0dXJlTWFwcGVyR0xEYXRhIGNsYXNz LCBidXQKKyAgICAgICAgbGlzdHMgdGhhdCBjbGFzcyBhcyBhIGZyaWVuZC4gVGhpcyBlbmFibGVz IG1vdmluZyB0aGUgZ2V0U2hhZGVyUHJvZ3JhbSgpCisgICAgICAgIG1ldGhvZCB0byBUZXh0dXJl TWFwcGVyR0xEYXRhIGFuZCByZW1vdmVzIHRoZSBuZWVkIHRvIGV4cG9zZSB0aGUKKyAgICAgICAg U2hhcmVkR0xEYXRhIHB1YmxpY2x5LiBTaGFyZWRHTERhdGEgYWxzbyBkb2Vzbid0IGhhdmUgdG8g a2VlcCBhCisgICAgICAgIHJlZmVyZW5jZSB0byB0aGUgR3JhcGhpY3NDb250ZXh0M0Qgb2JqZWN0 LgorCisgICAgICAgIFRleHR1cmVNYXBwZXJHTERhdGEgbm93IGRlZmF1bHQtaW5pdGlhbGl6ZXMg dGhlIHB1YmxpY2x5IGFjY2Vzc2libGUKKyAgICAgICAgbWVtYmVyIHZhcmlhYmxlcyB3aGlsZSBt YWtpbmcgc29tZSBvdGhlciBtZW1iZXJzIHByaXZhdGUsIG5vdCBleHBvc2luZworICAgICAgICBh bnl0aGluZyB0aGF0IGlzbid0IG5lY2Vzc2FyeS4KKworICAgICAgICBVc3VhbCB3aGl0ZXNwYWNl IGNsZWFudXAgaW5jbHVkZWQuIE1vcmUgZWxlZ2FudCBIYXNoTWFwOjplbnN1cmUoKQorICAgICAg ICBpbnNlcnRpb25zIGFyZSB1c2VkIHdoZXJlIHRoZXkgZG9uJ3Qgb2JmdXNjYXRlIG9iamVjdCBj cmVhdGlvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMgLS0gbm8gY2hhbmdlIGluIGJlaGF2aW9y LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0xEYXRhOjpTaGFyZWRHTERhdGE6 OmN1cnJlbnRTaGFyZWRHTERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdM RGF0YTo6U2hhcmVkR0xEYXRhOjp+U2hhcmVkR0xEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlRl eHR1cmVNYXBwZXJHTERhdGE6OlNoYXJlZEdMRGF0YTo6Y29udGV4dERhdGFNYXApOgorICAgICAg ICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMRGF0YTo6U2hhcmVkR0xEYXRhOjpTaGFyZWRHTERh dGEpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMRGF0YTo6VGV4dHVyZU1hcHBl ckdMRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0xEYXRhOjp+VGV4dHVy ZU1hcHBlckdMRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0xEYXRhOjpp bml0aWFsaXplU3RlbmNpbCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0xEYXRh OjpnZXRTdGF0aWNWQk8pOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMRGF0YTo6 Z2V0U2hhZGVyUHJvZ3JhbSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OlRl eHR1cmVNYXBwZXJHTCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmRyYXdC b3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpkcmF3VGV4dHVyZSk6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmRyYXdTb2xpZENvbG9yKToKKyAg ICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6ZHJhd0ZpbHRlcmVkKToKKyAgICAgICAg KFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6YmVnaW5DbGlwKToKKyAgICAgICAgKFdlYkNvcmU6 OlRleHR1cmVNYXBwZXJHTERhdGE6OlNoYXJlZEdMRGF0YTo6Z2xDb250ZXh0RGF0YU1hcCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0xEYXRhOjpTaGFyZWRHTERh dGE6OmdldFNoYWRlclByb2dyYW0pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVy ZU1hcHBlckdMRGF0YTo6c2hhcmVkR0xEYXRhKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmg6CisKIDIwMTYtMDUtMDIgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRG9uJ3QgcnVuIHRy YW5zaXRpb25zIHRvL2Zyb20gJ2F1dG8nIHZhbHVlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRl eCBmMmU2OTQ5NTM0NmQ5NjhkMDhhZGNmNTgxNDJiOTFhMTU4ZTRlNTFiLi4xM2JiODhiYjAzY2I0 MTRiMmQwNDViZjdmOGIzMjYxMDBkZjVhZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcApAQCAt MzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIlRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmgiCiAj aW5jbHVkZSAiVGltZXIuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUgPHd0 Zi9OZXZlckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVk ZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvVGVtcG9yYXJ5Q2hhbmdlLmg+CkBA IC00NywxMTMgKzQ4LDg0IEBACiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewotc3RydWN0 IFRleHR1cmVNYXBwZXJHTERhdGEgeworCitjbGFzcyBUZXh0dXJlTWFwcGVyR0xEYXRhIHsKICAg ICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBzdHJ1Y3QgU2hhcmVkR0xE YXRhIDogcHVibGljIFJlZkNvdW50ZWQ8U2hhcmVkR0xEYXRhPiB7CisgICAgZXhwbGljaXQgVGV4 dHVyZU1hcHBlckdMRGF0YShHcmFwaGljc0NvbnRleHQzRCYpOworICAgIH5UZXh0dXJlTWFwcGVy R0xEYXRhKCk7CiAKLSAgICAgICAgdHlwZWRlZiBIYXNoTWFwPFBsYXRmb3JtR3JhcGhpY3NDb250 ZXh0M0QsIFNoYXJlZEdMRGF0YSo+IEdMQ29udGV4dERhdGFNYXA7Ci0gICAgICAgIHN0YXRpYyBH TENvbnRleHREYXRhTWFwJiBnbENvbnRleHREYXRhTWFwKCkKLSAgICAgICAgewotICAgICAgICAg ICAgc3RhdGljIEdMQ29udGV4dERhdGFNYXAgbWFwOwotICAgICAgICAgICAgcmV0dXJuIG1hcDsK LSAgICAgICAgfQorICAgIHZvaWQgaW5pdGlhbGl6ZVN0ZW5jaWwoKTsKKyAgICBQbGF0Zm9ybTNE T2JqZWN0IGdldFN0YXRpY1ZCTyhHQzNEZW51bSB0YXJnZXQsIEdDM0RzaXplaXB0ciwgY29uc3Qg dm9pZCogZGF0YSk7CisgICAgUmVmPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiBnZXRTaGFk ZXJQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtOjpPcHRpb25zKTsKIAotICAgICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxTaGFyZWRHTERhdGE+IGN1cnJlbnRTaGFyZWRHTERhdGEoR3Jh cGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCi0gICAgICAgIHsKLSAgICAgICAgICAgIEdMQ29udGV4 dERhdGFNYXA6Oml0ZXJhdG9yIGl0ID0gZ2xDb250ZXh0RGF0YU1hcCgpLmZpbmQoY29udGV4dC0+ cGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRCgpKTsKLSAgICAgICAgICAgIGlmIChpdCAhPSBnbENv bnRleHREYXRhTWFwKCkuZW5kKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGl0LT52YWx1ZTsK KyAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBwcm9qZWN0aW9uTWF0cml4OworICAgIFRleHR1cmVN YXBwZXI6OlBhaW50RmxhZ3MgUGFpbnRGbGFncyB7IDAgfTsKKyAgICBHQzNEaW50IHByZXZpb3Vz UHJvZ3JhbSB7IDAgfTsKKyAgICBHQzNEaW50IHRhcmdldEZyYW1lQnVmZmVyIHsgMCB9OworICAg IGJvb2wgZGlkTW9kaWZ5U3RlbmNpbCB7IGZhbHNlIH07CisgICAgR0MzRGludCBwcmV2aW91c1Nj aXNzb3JTdGF0ZSB7IDAgfTsKKyAgICBHQzNEaW50IHByZXZpb3VzRGVwdGhTdGF0ZSB7IDAgfTsK KyAgICBHQzNEaW50IHZpZXdwb3J0WzRdIHsgMCwgfTsKKyAgICBHQzNEaW50IHByZXZpb3VzU2Np c3Nvcls0XSB7IDAsIH07CisgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IGN1cnJlbnRTdXJmYWNl OworICAgIGNvbnN0IEJpdG1hcFRleHR1cmVHTDo6RmlsdGVySW5mbyogZmlsdGVySW5mbyB7IG51 bGxwdHIgfTsKIAotICAgICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTaGFyZWRHTERhdGEo Y29udGV4dCkpOworcHJpdmF0ZToKKyAgICBjbGFzcyBTaGFyZWRHTERhdGEgOiBwdWJsaWMgUmVm Q291bnRlZDxTaGFyZWRHTERhdGE+IHsKKyAgICBwdWJsaWM6CisgICAgICAgIHN0YXRpYyBSZWY8 U2hhcmVkR0xEYXRhPiBjdXJyZW50U2hhcmVkR0xEYXRhKEdyYXBoaWNzQ29udGV4dDNEJiBjb250 ZXh0KQorICAgICAgICB7CisgICAgICAgICAgICBSZWZQdHI8U2hhcmVkR0xEYXRhPiBkYXRhOwor ICAgICAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBjb250ZXh0RGF0YU1hcCgpLmFkZChjb250ZXh0 LnBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QoKSwgbnVsbHB0cik7CisgICAgICAgICAgICBpZiAo YWRkUmVzdWx0LmlzTmV3RW50cnkpIHsKKyAgICAgICAgICAgICAgICBkYXRhID0gYWRvcHRSZWYo bmV3IFNoYXJlZEdMRGF0YShjb250ZXh0KSk7CisgICAgICAgICAgICAgICAgYWRkUmVzdWx0Lml0 ZXJhdG9yLT52YWx1ZSA9IGRhdGEuZ2V0KCk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgICAgICBkYXRhID0gYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZTsKKworICAgICAgICAgICAg cmV0dXJuICpkYXRhOwogICAgICAgICB9CiAKLSAgICAgICAgUGFzc1JlZlB0cjxUZXh0dXJlTWFw cGVyU2hhZGVyUHJvZ3JhbT4gZ2V0U2hhZGVyUHJvZ3JhbShUZXh0dXJlTWFwcGVyU2hhZGVyUHJv Z3JhbTo6T3B0aW9ucyBvcHRpb25zKQorICAgICAgICB+U2hhcmVkR0xEYXRhKCkKICAgICAgICAg ewotICAgICAgICAgICAgSGFzaE1hcDxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbTo6T3B0aW9u cywgUmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiA+OjpBZGRSZXN1bHQgcmVzdWx0 ID0gbV9wcm9ncmFtcy5hZGQob3B0aW9ucywgbnVsbHB0cik7Ci0gICAgICAgICAgICBpZiAocmVz dWx0LmlzTmV3RW50cnkpCi0gICAgICAgICAgICAgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9 IFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtOjpjcmVhdGUobV9jb250ZXh0LCBvcHRpb25zKTsK LQotICAgICAgICAgICAgcmV0dXJuIHJlc3VsdC5pdGVyYXRvci0+dmFsdWU7CisgICAgICAgICAg ICBSRUxFQVNFX0FTU0VSVChjb250ZXh0RGF0YU1hcCgpLmNvbnRhaW5zKHRoaXMpKTsKKyAgICAg ICAgICAgIGNvbnRleHREYXRhTWFwKCkucmVtb3ZlSWYoW3RoaXNdIChHTENvbnRleHREYXRhTWFw OjpLZXlWYWx1ZVBhaXJUeXBlJiBlbnRyeSkgeyByZXR1cm4gZW50cnkudmFsdWUgPT0gdGhpczsg fSk7CiAgICAgICAgIH0KIAotICAgICAgICBIYXNoTWFwPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9n cmFtOjpPcHRpb25zLCBSZWZQdHI8VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0+ID4gbV9wcm9n cmFtczsKLSAgICAgICAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBtX2NvbnRleHQ7CisgICAg cHJpdmF0ZToKKyAgICAgICAgZnJpZW5kIGNsYXNzIFRleHR1cmVNYXBwZXJHTERhdGE7CiAKLSAg ICAgICAgZXhwbGljaXQgU2hhcmVkR0xEYXRhKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQot ICAgICAgICAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKKyAgICAgICAgdXNpbmcgR0xDb250ZXh0 RGF0YU1hcCA9IEhhc2hNYXA8UGxhdGZvcm1HcmFwaGljc0NvbnRleHQzRCwgU2hhcmVkR0xEYXRh Kj47CisgICAgICAgIHN0YXRpYyBHTENvbnRleHREYXRhTWFwJiBjb250ZXh0RGF0YU1hcCgpCiAg ICAgICAgIHsKLSAgICAgICAgICAgIGdsQ29udGV4dERhdGFNYXAoKS5hZGQoY29udGV4dC0+cGxh dGZvcm1HcmFwaGljc0NvbnRleHQzRCgpLCB0aGlzKTsKKyAgICAgICAgICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxHTENvbnRleHREYXRhTWFwPiBtYXA7CisgICAgICAgICAgICByZXR1cm4gbWFw OwogICAgICAgICB9CiAKLSAgICAgICAgflNoYXJlZEdMRGF0YSgpCisgICAgICAgIGV4cGxpY2l0 IFNoYXJlZEdMRGF0YShHcmFwaGljc0NvbnRleHQzRCYgY29udGV4dCkKICAgICAgICAgewotICAg ICAgICAgICAgZm9yIChhdXRvIGl0ID0gZ2xDb250ZXh0RGF0YU1hcCgpLmJlZ2luKCksIGVuZCA9 IGdsQ29udGV4dERhdGFNYXAoKS5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgICAg ICAgICAgaWYgKGl0LT52YWx1ZSA9PSB0aGlzKSB7Ci0gICAgICAgICAgICAgICAgICAgIGdsQ29u dGV4dERhdGFNYXAoKS5yZW1vdmUoaXQpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKKyAgICAgICAgICAgIGNvbnRleHREYXRhTWFwKCkuYWRkKGNvbnRleHQucGxh dGZvcm1HcmFwaGljc0NvbnRleHQzRCgpLCB0aGlzKTsKICAgICAgICAgfQotICAgIH07Ci0KLSAg ICBTaGFyZWRHTERhdGEmIHNoYXJlZEdMRGF0YSgpIGNvbnN0Ci0gICAgewotICAgICAgICByZXR1 cm4gKnNoYXJlZERhdGE7Ci0gICAgfQogCi0gICAgdm9pZCBpbml0aWFsaXplU3RlbmNpbCgpOwot Ci0gICAgZXhwbGljaXQgVGV4dHVyZU1hcHBlckdMRGF0YShHcmFwaGljc0NvbnRleHQzRCogY29u dGV4dCkKLSAgICAgICAgOiBjb250ZXh0KGNvbnRleHQpCi0gICAgICAgICwgUGFpbnRGbGFncygw KQotICAgICAgICAsIHByZXZpb3VzUHJvZ3JhbSgwKQotICAgICAgICAsIHRhcmdldEZyYW1lQnVm ZmVyKDApCi0gICAgICAgICwgZGlkTW9kaWZ5U3RlbmNpbChmYWxzZSkKLSAgICAgICAgLCBwcmV2 aW91c1NjaXNzb3JTdGF0ZSgwKQotICAgICAgICAsIHByZXZpb3VzRGVwdGhTdGF0ZSgwKQotICAg ICAgICAsIHNoYXJlZERhdGEoVGV4dHVyZU1hcHBlckdMRGF0YTo6U2hhcmVkR0xEYXRhOjpjdXJy ZW50U2hhcmVkR0xEYXRhKHRoaXMtPmNvbnRleHQpKQotICAgICAgICAsIGZpbHRlckluZm8oMCkK LSAgICB7IH0KLQotICAgIH5UZXh0dXJlTWFwcGVyR0xEYXRhKCk7Ci0gICAgUGxhdGZvcm0zRE9i amVjdCBnZXRTdGF0aWNWQk8oR0MzRGVudW0gdGFyZ2V0LCBHQzNEc2l6ZWlwdHIsIGNvbnN0IHZv aWQqIGRhdGEpOworICAgICAgICBIYXNoTWFwPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtOjpP cHRpb25zLCBSZWZQdHI8VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0+PiBtX3Byb2dyYW1zOwor ICAgIH07CiAKLSAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dDsKLSAgICBUcmFuc2Zvcm1h dGlvbk1hdHJpeCBwcm9qZWN0aW9uTWF0cml4OwotICAgIFRleHR1cmVNYXBwZXI6OlBhaW50Rmxh Z3MgUGFpbnRGbGFnczsKLSAgICBHQzNEaW50IHByZXZpb3VzUHJvZ3JhbTsKLSAgICBHQzNEaW50 IHRhcmdldEZyYW1lQnVmZmVyOwotICAgIGJvb2wgZGlkTW9kaWZ5U3RlbmNpbDsKLSAgICBHQzNE aW50IHByZXZpb3VzU2Npc3NvclN0YXRlOwotICAgIEdDM0RpbnQgcHJldmlvdXNEZXB0aFN0YXRl OwotICAgIEdDM0RpbnQgdmlld3BvcnRbNF07Ci0gICAgR0MzRGludCBwcmV2aW91c1NjaXNzb3Jb NF07Ci0gICAgUmVmUHRyPFNoYXJlZEdMRGF0YT4gc2hhcmVkRGF0YTsKLSAgICBSZWZQdHI8Qml0 bWFwVGV4dHVyZT4gY3VycmVudFN1cmZhY2U7Ci0gICAgSGFzaE1hcDxjb25zdCB2b2lkKiwgUGxh dGZvcm0zRE9iamVjdD4gdmJvczsKLSAgICBjb25zdCBCaXRtYXBUZXh0dXJlR0w6OkZpbHRlcklu Zm8qIGZpbHRlckluZm87CisgICAgR3JhcGhpY3NDb250ZXh0M0QmIG1fY29udGV4dDsKKyAgICBS ZWY8U2hhcmVkR0xEYXRhPiBtX3NoYXJlZEdMRGF0YTsKKyAgICBIYXNoTWFwPGNvbnN0IHZvaWQq LCBQbGF0Zm9ybTNET2JqZWN0PiBtX3Zib3M7CiB9OwogCi1QbGF0Zm9ybTNET2JqZWN0IFRleHR1 cmVNYXBwZXJHTERhdGE6OmdldFN0YXRpY1ZCTyhHQzNEZW51bSB0YXJnZXQsIEdDM0RzaXplaXB0 ciBzaXplLCBjb25zdCB2b2lkKiBkYXRhKQorVGV4dHVyZU1hcHBlckdMRGF0YTo6VGV4dHVyZU1h cHBlckdMRGF0YShHcmFwaGljc0NvbnRleHQzRCYgY29udGV4dCkKKyAgICA6IG1fY29udGV4dChj b250ZXh0KQorICAgICwgbV9zaGFyZWRHTERhdGEoU2hhcmVkR0xEYXRhOjpjdXJyZW50U2hhcmVk R0xEYXRhKG1fY29udGV4dCkpCiB7Ci0gICAgSGFzaE1hcDxjb25zdCB2b2lkKiwgUGxhdGZvcm0z RE9iamVjdD46OkFkZFJlc3VsdCByZXN1bHQgPSB2Ym9zLmFkZChkYXRhLCAwKTsKLSAgICBpZiAo cmVzdWx0LmlzTmV3RW50cnkpIHsKLSAgICAgICAgUGxhdGZvcm0zRE9iamVjdCB2Ym8gPSBjb250 ZXh0LT5jcmVhdGVCdWZmZXIoKTsKLSAgICAgICAgY29udGV4dC0+YmluZEJ1ZmZlcih0YXJnZXQs IHZibyk7Ci0gICAgICAgIGNvbnRleHQtPmJ1ZmZlckRhdGEodGFyZ2V0LCBzaXplLCBkYXRhLCBH cmFwaGljc0NvbnRleHQzRDo6U1RBVElDX0RSQVcpOwotICAgICAgICByZXN1bHQuaXRlcmF0b3It PnZhbHVlID0gdmJvOwotICAgIH0KLQotICAgIHJldHVybiByZXN1bHQuaXRlcmF0b3ItPnZhbHVl OwogfQogCiBUZXh0dXJlTWFwcGVyR0xEYXRhOjp+VGV4dHVyZU1hcHBlckdMRGF0YSgpCiB7Ci0g ICAgZm9yIChhdXRvJiBlbnRyeSA6IHZib3MpCi0gICAgICAgIGNvbnRleHQtPmRlbGV0ZUJ1ZmZl cihlbnRyeS52YWx1ZSk7CisgICAgZm9yIChhdXRvJiBlbnRyeSA6IG1fdmJvcykKKyAgICAgICAg bV9jb250ZXh0LmRlbGV0ZUJ1ZmZlcihlbnRyeS52YWx1ZSk7CiB9CiAKIHZvaWQgVGV4dHVyZU1h cHBlckdMRGF0YTo6aW5pdGlhbGl6ZVN0ZW5jaWwoKQpAQCAtMTY2LDE2ICsxMzgsMzcgQEAgdm9p ZCBUZXh0dXJlTWFwcGVyR0xEYXRhOjppbml0aWFsaXplU3RlbmNpbCgpCiAgICAgaWYgKGRpZE1v ZGlmeVN0ZW5jaWwpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnRleHQtPmNsZWFyU3RlbmNp bCgwKTsKLSAgICBjb250ZXh0LT5jbGVhcihHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9CVUZG RVJfQklUKTsKKyAgICBtX2NvbnRleHQuY2xlYXJTdGVuY2lsKDApOworICAgIG1fY29udGV4dC5j bGVhcihHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9CVUZGRVJfQklUKTsKICAgICBkaWRNb2Rp ZnlTdGVuY2lsID0gdHJ1ZTsKIH0KIAorUGxhdGZvcm0zRE9iamVjdCBUZXh0dXJlTWFwcGVyR0xE YXRhOjpnZXRTdGF0aWNWQk8oR0MzRGVudW0gdGFyZ2V0LCBHQzNEc2l6ZWlwdHIgc2l6ZSwgY29u c3Qgdm9pZCogZGF0YSkKK3sKKyAgICBhdXRvIGFkZFJlc3VsdCA9IG1fdmJvcy5lbnN1cmUoZGF0 YSwKKyAgICAgICAgW3RoaXMsIHRhcmdldCwgc2l6ZSwgZGF0YV0geworICAgICAgICAgICAgUGxh dGZvcm0zRE9iamVjdCB2Ym8gPSBtX2NvbnRleHQuY3JlYXRlQnVmZmVyKCk7CisgICAgICAgICAg ICBtX2NvbnRleHQuYmluZEJ1ZmZlcih0YXJnZXQsIHZibyk7CisgICAgICAgICAgICBtX2NvbnRl eHQuYnVmZmVyRGF0YSh0YXJnZXQsIHNpemUsIGRhdGEsIEdyYXBoaWNzQ29udGV4dDNEOjpTVEFU SUNfRFJBVyk7CisgICAgICAgICAgICByZXR1cm4gdmJvOworICAgICAgICB9KTsKKyAgICByZXR1 cm4gYWRkUmVzdWx0Lml0ZXJhdG9yLT52YWx1ZTsKK30KKworUmVmPFRleHR1cmVNYXBwZXJTaGFk ZXJQcm9ncmFtPiBUZXh0dXJlTWFwcGVyR0xEYXRhOjpnZXRTaGFkZXJQcm9ncmFtKFRleHR1cmVN YXBwZXJTaGFkZXJQcm9ncmFtOjpPcHRpb25zIG9wdGlvbnMpCit7CisgICAgYXV0byBhZGRSZXN1 bHQgPSBtX3NoYXJlZEdMRGF0YS0+bV9wcm9ncmFtcy5lbnN1cmUob3B0aW9ucywKKyAgICAgICAg W3RoaXMsIG9wdGlvbnNdIHsgcmV0dXJuIFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtOjpjcmVh dGUoUmVmPEdyYXBoaWNzQ29udGV4dDNEPihtX2NvbnRleHQpLCBvcHRpb25zKTsgfSk7CisgICAg cmV0dXJuICphZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlOworfQorCiBUZXh0dXJlTWFwcGVyR0w6 OlRleHR1cmVNYXBwZXJHTCgpCiAgICAgOiBtX2VuYWJsZUVkZ2VEaXN0YW5jZUFudGlhbGlhc2lu ZyhmYWxzZSkKIHsKICAgICBtX2NvbnRleHQzRCA9IEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGVG b3JDdXJyZW50R0xDb250ZXh0KCk7Ci0gICAgbV9kYXRhID0gbmV3IFRleHR1cmVNYXBwZXJHTERh dGEobV9jb250ZXh0M0QuZ2V0KCkpOworICAgIEFTU0VSVChtX2NvbnRleHQzRCk7CisKKyAgICBt X2RhdGEgPSBuZXcgVGV4dHVyZU1hcHBlckdMRGF0YSgqbV9jb250ZXh0M0QpOwogI2lmIFVTRShU RVhUVVJFX01BUFBFUl9HTCkKICAgICBtX3RleHR1cmVQb29sID0gc3RkOjptYWtlX3VuaXF1ZTxC aXRtYXBUZXh0dXJlUG9vbD4obV9jb250ZXh0M0QuY29weVJlZigpKTsKICNlbmRpZgpAQCAtMjI5 LDcgKzIyMiw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpkcmF3Qm9yZGVyKGNvbnN0IENvbG9y JiBjb2xvciwgZmxvYXQgd2lkdGgsIGNvbnN0IEZsb2F0UmVjCiAgICAgaWYgKGNsaXBTdGFjaygp LmlzQ3VycmVudFNjaXNzb3JCb3hFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQ dHI8VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0+IHByb2dyYW0gPSBkYXRhKCkuc2hhcmVkR0xE YXRhKCkuZ2V0U2hhZGVyUHJvZ3JhbShUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbTo6U29saWRD b2xvcik7CisgICAgUmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiBwcm9ncmFtID0g ZGF0YSgpLmdldFNoYWRlclByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW06OlNvbGlk Q29sb3IpOwogICAgIG1fY29udGV4dDNELT51c2VQcm9ncmFtKHByb2dyYW0tPnByb2dyYW1JRCgp KTsKIAogICAgIGZsb2F0IHIsIGcsIGIsIGE7CkBAIC00NTYsOCArNDQ5LDcgQEAgdm9pZCBUZXh0 dXJlTWFwcGVyR0w6OmRyYXdUZXh0dXJlKFBsYXRmb3JtM0RPYmplY3QgdGV4dHVyZSwgRmxhZ3Mg ZmxhZ3MsIGNvbnN0IEkKICAgICBpZiAodXNlQW50aWFsaWFzaW5nIHx8IG9wYWNpdHkgPCAxKQog ICAgICAgICBmbGFncyB8PSBTaG91bGRCbGVuZDsKIAotICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVy U2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbTsKLSAgICBwcm9ncmFtID0gZGF0YSgpLnNoYXJlZEdMRGF0 YSgpLmdldFNoYWRlclByb2dyYW0ob3B0aW9ucyk7CisgICAgUmVmUHRyPFRleHR1cmVNYXBwZXJT aGFkZXJQcm9ncmFtPiBwcm9ncmFtID0gZGF0YSgpLmdldFNoYWRlclByb2dyYW0ob3B0aW9ucyk7 CiAKICAgICBpZiAoZmlsdGVyKQogICAgICAgICBwcmVwYXJlRmlsdGVyUHJvZ3JhbShwcm9ncmFt LmdldCgpLCAqZmlsdGVyLmdldCgpLCBkYXRhKCkuZmlsdGVySW5mby0+cGFzcywgdGV4dHVyZVNp emUsIGZpbHRlckNvbnRlbnRUZXh0dXJlSUQpOwpAQCAtNDc0LDcgKzQ2Niw3IEBAIHZvaWQgVGV4 dHVyZU1hcHBlckdMOjpkcmF3U29saWRDb2xvcihjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0 IFRyYW5zZm9ybWF0aW9uCiAgICAgICAgIGZsYWdzIHw9IFNob3VsZEJsZW5kIHwgU2hvdWxkQW50 aWFsaWFzOwogICAgIH0KIAotICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4g cHJvZ3JhbSA9IGRhdGEoKS5zaGFyZWRHTERhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlvbnMp OworICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbSA9IGRhdGEo KS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlvbnMpOwogICAgIG1fY29udGV4dDNELT51c2VQcm9ncmFt KHByb2dyYW0tPnByb2dyYW1JRCgpKTsKIAogICAgIGZsb2F0IHIsIGcsIGIsIGE7CkBAIC01OTEs NyArNTgzLDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdGaWx0ZXJlZChjb25zdCBCaXRt YXBUZXh0dXJlJiBzYW1wbGVyLCBjb25zdCBCaXRtYXBUZXgKIHsKICAgICAvLyBGb3Igc3RhbmRh cmQgZmlsdGVycywgd2UgYWx3YXlzIGRyYXcgdGhlIHdob2xlIHRleHR1cmUgd2l0aG91dCB0cmFu c2Zvcm1hdGlvbnMuCiAgICAgVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW06Ok9wdGlvbnMgb3B0 aW9ucyA9IG9wdGlvbnNGb3JGaWx0ZXJUeXBlKGZpbHRlci50eXBlKCksIHBhc3MpOwotICAgIFJl ZlB0cjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbSA9IGRhdGEoKS5zaGFyZWRH TERhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlvbnMpOworICAgIFJlZlB0cjxUZXh0dXJlTWFw cGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbSA9IGRhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlv bnMpOwogICAgIEFTU0VSVChwcm9ncmFtKTsKIAogICAgIHByZXBhcmVGaWx0ZXJQcm9ncmFtKHBy b2dyYW0uZ2V0KCksIGZpbHRlciwgcGFzcywgc2FtcGxlci5jb250ZW50U2l6ZSgpLCBjb250ZW50 VGV4dHVyZSA/IHN0YXRpY19jYXN0PGNvbnN0IEJpdG1hcFRleHR1cmVHTCo+KGNvbnRlbnRUZXh0 dXJlKS0+aWQoKSA6IDApOwpAQCAtNjY5LDcgKzY2MSw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckdM OjpiZWdpbkNsaXAoY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHJpeCwg Y29uCiAKICAgICBkYXRhKCkuaW5pdGlhbGl6ZVN0ZW5jaWwoKTsKIAotICAgIFJlZlB0cjxUZXh0 dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbSA9IGRhdGEoKS5zaGFyZWRHTERhdGEoKS5n ZXRTaGFkZXJQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtOjpTb2xpZENvbG9yKTsK KyAgICBSZWZQdHI8VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0+IHByb2dyYW0gPSBkYXRhKCku Z2V0U2hhZGVyUHJvZ3JhbShUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbTo6U29saWRDb2xvcik7 CiAKICAgICBtX2NvbnRleHQzRC0+dXNlUHJvZ3JhbShwcm9ncmFtLT5wcm9ncmFtSUQoKSk7CiAg ICAgbV9jb250ZXh0M0QtPmVuYWJsZVZlcnRleEF0dHJpYkFycmF5KHByb2dyYW0tPnZlcnRleExv Y2F0aW9uKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJHTC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5oCmluZGV4IDJmNDc3OTk4NzgxYjBiNmNlYThkMjVl YTNkYjU2MDkxOTkxNjE5OWUuLjBkN2ExMzEzM2I0OGZiOTM1NzVlZGRiY2UyNTJlZjA2MDg3NjI1 YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyR0wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmgKQEAgLTMzLDcgKzMzLDcgQEAKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi1zdHJ1Y3QgVGV4dHVyZU1hcHBlckdMRGF0YTsKK2NsYXNzIFRleHR1cmVNYXBw ZXJHTERhdGE7CiBjbGFzcyBUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbTsKIGNsYXNzIEZpbHRl ck9wZXJhdGlvbjsKIAo=