89933 2012-06-25 18:29:27 -0700 [chromium] Remove dead compositor-related API from GraphicsContext3DPrivate / Extensions3DChromium 2012-06-26 11:10:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs enne kbr webkit.review.bot oldest_to_newest 657128 0 jamesr 2012-06-25 18:29:27 -0700 [chromium] Remove dead compositor-related API from GraphicsContext3DPrivate / Extensions3DChromium 657132 1 149419 jamesr 2012-06-25 18:30:42 -0700 Created attachment 149419 Patch 657146 2 149419 kbr 2012-06-25 18:53:16 -0700 Comment on attachment 149419 Patch Excellent. r=me Can we get rid of any of this stuff from the underlying command buffer implementation? If so, could you file a Chromium-side bug about that? Thanks. 657318 3 jamesr 2012-06-25 23:31:23 -0700 No, the compositor is still using it via wgc3d. I expect the compositor will keep using it through one API or another for the foreseeable future. 657753 4 149419 webkit.review.bot 2012-06-26 11:09:52 -0700 Comment on attachment 149419 Patch Clearing flags on attachment: 149419 Committed r121268: <http://trac.webkit.org/changeset/121268> 657754 5 webkit.review.bot 2012-06-26 11:10:11 -0700 All reviewed patches have been landed. Closing bug. 149419 2012-06-25 18:30:42 -0700 2012-06-26 11:09:52 -0700 Patch bug-89933-20120625183041.patch text/plain 20585 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE4Y2MzMjM3NzQ3NjJl ZGEzZDA5YmU1YzQwOGI2YTNiZmM1ZTcyZi4uZTMzOGVhZjNhZGUwODRkMjg1ODU2YzE0YmMyY2Uy ODI3ODBiMjFmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTA2LTI1ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBS ZW1vdmUgZGVhZCBjb21wb3NpdG9yLXJlbGF0ZWQgQVBJIGZyb20gR3JhcGhpY3NDb250ZXh0M0RQ cml2YXRlIC8gRXh0ZW5zaW9uczNEQ2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg5OTMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlIGFuZCBFeHRlbnNp b25zM0RDaHJvbWl1bSBoYWQgYSBmYWlyIGFtb3VudCBvZiBwbHVtYmluZyBhbmQgYm9pbGVycGxh dGUgdG8gc3VwcG9ydCB0aGUKKyAgICAgICAgY29tcG9zaXRvcidzIHVzZSBvZiBHcmFwaGljc0Nv bnRleHQzRC4gQSBudW1iZXIgb2YgZXh0ZW5zaW9ucywgZXRjLCBvbmx5IG1ha2Ugc2Vuc2UgZm9y IGEgY29tcG9zaXRvciBjb250ZXh0LgorICAgICAgICBTaW5jZSB0aGUgY29tcG9zaXRvciBkb2Vz bid0IHVzZSBHQzNEIGFueSBtb3JlLCB0aGVzZSBhcmUgbm8gbG9uZ2VyIG5lZWRlZC4KKworICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvRXh0ZW5zaW9uczNEQ2hyb21pdW0uY3Bw OgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250ZXh0M0RD aHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6fkdyYXBo aWNzQ29udGV4dDNEKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpjcmVh dGUpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0 ZTo6fkdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRFByaXZhdGU6OmNyZWF0ZUdyYXBoaWNzQ29udGV4dEZyb21XZWJDb250ZXh0KToK KyAgICAgICAgKFdlYkNvcmU6OkdyTWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0FkYXB0 ZXI6OkdyTWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0FkYXB0ZXIpOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpnckNvbnRleHQpOgorICAgICAgICAq IHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmg6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRXh0ZW5zaW9uczNEQ2hyb21pdW0u aDoKKworMjAxMi0wNi0yNSAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgor CiAgICAgICAgIFtjaHJvbWl1bV0gVXNlIFdlYkdyYXBoaWNzQ29udGV4dDNEIGluIGNvbXBvc2l0 b3IgaW1wbGVtZW50YXRpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg5NzAwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMTk2M2Y4MTc2 M2IzZmI0OWUwMTUxODBlYTNlMzM3ZDIxYWE1YjE3Ni4uYzA2M2YwMTFlMjdmMjJjYmQ4NTZjMTUy MjQ1NjkyM2U1YzA1ODc0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwx NSBAQAogMjAxMi0wNi0yNSAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgog CisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIGRlYWQgY29tcG9zaXRvci1yZWxhdGVkIEFQSSBm cm9tIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZSAvIEV4dGVuc2lvbnMzRENocm9taXVtCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTkzMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ2FudmFz MkRMYXllckJyaWRnZVRlc3QuY3BwOgorICAgICAgICAoQ2FudmFzMkRMYXllckJyaWRnZVRlc3Q6 OmZ1bGxMaWZlY3ljbGVUZXN0KToKKworMjAxMi0wNi0yNSAgSmFtZXMgUm9iaW5zb24gIDxqYW1l c3JAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFtjaHJvbWl1bV0gVXNlIFdlYkdyYXBoaWNzQ29u dGV4dDNEIGluIGNvbXBvc2l0b3IgaW1wbGVtZW50YXRpb24KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NzAwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvRXh0ZW5zaW9uczNEQ2hyb21pdW0uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9FeHRlbnNpb25zM0RD aHJvbWl1bS5jcHAKaW5kZXggNWNkZDRiYTZiZjA4ZWM4ZDNhMmM4OTRjNDQyNzUxMTVmOGIzOTNl Zi4uNzVhNzY4OWUzYjJlNDRkYmZlMzFkOWE1YWRhNTkyODY3MWY5MjYzNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9FeHRlbnNpb25zM0RDaHJv bWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9F eHRlbnNpb25zM0RDaHJvbWl1bS5jcHAKQEAgLTczLDExICs3Myw2IEBAIHZvaWQgRXh0ZW5zaW9u czNEQ2hyb21pdW06OnJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZSh1bnNpZ25lZCBsb25n IHRhcmdldCwKICAgICBtX3ByaXZhdGUtPndlYkNvbnRleHQoKS0+cmVuZGVyYnVmZmVyU3RvcmFn ZU11bHRpc2FtcGxlQ0hST01JVU0odGFyZ2V0LCBzYW1wbGVzLCBpbnRlcm5hbGZvcm1hdCwgd2lk dGgsIGhlaWdodCk7CiB9CiAKLXZvaWQgRXh0ZW5zaW9uczNEQ2hyb21pdW06OnBvc3RTdWJCdWZm ZXJDSFJPTUlVTShpbnQgeCwgaW50IHksIGludCB3aWR0aCwgaW50IGhlaWdodCkKLXsKLSAgICBt X3ByaXZhdGUtPndlYkNvbnRleHQoKS0+cG9zdFN1YkJ1ZmZlckNIUk9NSVVNKHgsIHksIHdpZHRo LCBoZWlnaHQpOwotfQotCiB2b2lkKiBFeHRlbnNpb25zM0RDaHJvbWl1bTo6bWFwQnVmZmVyU3Vi RGF0YUNIUk9NSVVNKHVuc2lnbmVkIHRhcmdldCwgaW50IG9mZnNldCwgaW50IHNpemUsIHVuc2ln bmVkIGFjY2VzcykKIHsKICAgICByZXR1cm4gbV9wcml2YXRlLT53ZWJDb250ZXh0KCktPm1hcEJ1 ZmZlclN1YkRhdGFDSFJPTUlVTSh0YXJnZXQsIG9mZnNldCwgc2l6ZSwgYWNjZXNzKTsKQEAgLTk4 LDI2ICs5Myw2IEBAIHZvaWQgRXh0ZW5zaW9uczNEQ2hyb21pdW06OnVubWFwVGV4U3ViSW1hZ2Uy RENIUk9NSVVNKGNvbnN0IHZvaWQqIGRhdGEpCiAgICAgbV9wcml2YXRlLT53ZWJDb250ZXh0KCkt PnVubWFwVGV4U3ViSW1hZ2UyRENIUk9NSVVNKGRhdGEpOwogfQogCi12b2lkIEV4dGVuc2lvbnMz RENocm9taXVtOjpzZXRWaXNpYmlsaXR5Q0hST01JVU0oYm9vbCB2aXNpYmlsaXR5KQotewotICAg IG1fcHJpdmF0ZS0+d2ViQ29udGV4dCgpLT5zZXRWaXNpYmlsaXR5Q0hST01JVU0odmlzaWJpbGl0 eSk7Ci19Ci0KLXZvaWQgRXh0ZW5zaW9uczNEQ2hyb21pdW06OmRpc2NhcmRGcmFtZWJ1ZmZlckVY VChHQzNEZW51bSB0YXJnZXQsIEdDM0RzaXplaSBudW1BdHRhY2htZW50cywgY29uc3QgR0MzRGVu dW0qIGF0dGFjaG1lbnRzKQotewotICAgIG1fcHJpdmF0ZS0+d2ViQ29udGV4dCgpLT5kaXNjYXJk RnJhbWVidWZmZXJFWFQodGFyZ2V0LCBudW1BdHRhY2htZW50cywgYXR0YWNobWVudHMpOwotfQot Ci12b2lkIEV4dGVuc2lvbnMzRENocm9taXVtOjplbnN1cmVGcmFtZWJ1ZmZlckNIUk9NSVVNKCkK LXsKLSAgICBtX3ByaXZhdGUtPndlYkNvbnRleHQoKS0+ZW5zdXJlRnJhbWVidWZmZXJDSFJPTUlV TSgpOwotfQotCi12b2lkIEV4dGVuc2lvbnMzRENocm9taXVtOjpzZXRHcHVNZW1vcnlBbGxvY2F0 aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01JVU0oUGFzc093blB0cjxHcHVNZW1vcnlBbGxvY2F0aW9u Q2hhbmdlZENhbGxiYWNrQ0hST01JVU0+IGNhbGxiYWNrKQotewotICAgIG1fcHJpdmF0ZS0+c2V0 R3B1TWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVNKGNhbGxiYWNrKTsKLX0K LQogUGxhdGZvcm0zRE9iamVjdCBFeHRlbnNpb25zM0RDaHJvbWl1bTo6Y3JlYXRlVmVydGV4QXJy YXlPRVMoKQogewogICAgIHJldHVybiAwOwpAQCAtMTQxLDExICsxMTYsNiBAQCBTdHJpbmcgRXh0 ZW5zaW9uczNEQ2hyb21pdW06OmdldFRyYW5zbGF0ZWRTaGFkZXJTb3VyY2VBTkdMRShQbGF0Zm9y bTNET2JqZWN0IHNoYQogICAgIHJldHVybiBtX3ByaXZhdGUtPndlYkNvbnRleHQoKS0+Z2V0VHJh bnNsYXRlZFNoYWRlclNvdXJjZUFOR0xFKHNoYWRlcik7CiB9CiAKLXZvaWQgRXh0ZW5zaW9uczNE Q2hyb21pdW06OnNldFN3YXBCdWZmZXJzQ29tcGxldGVDYWxsYmFja0NIUk9NSVVNKFBhc3NPd25Q dHI8U3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQ0hST01JVU0+IGNhbGxiYWNrKQotewotICAg IG1fcHJpdmF0ZS0+c2V0U3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQ0hST01JVU0oY2FsbGJh Y2spOwotfQotCiB2b2lkIEV4dGVuc2lvbnMzRENocm9taXVtOjpyYXRlTGltaXRPZmZzY3JlZW5D b250ZXh0Q0hST01JVU0oKQogewogICAgIG1fcHJpdmF0ZS0+d2ViQ29udGV4dCgpLT5yYXRlTGlt aXRPZmZzY3JlZW5Db250ZXh0Q0hST01JVU0oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L0dyYXBoaWNzQ29udGV4 dDNEQ2hyb21pdW0uY3BwCmluZGV4IGQwMjBhY2MzODFkNzJjZmIxNTIzNDhhODRhYjgxYWU0ZmYw ODk2YTcuLjEyN2ZjZmEwOTI5YTc2ZWNjOWNmNWM1ZTRlNGQxZWNlMDAyOTAzYTMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250 ZXh0M0RDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0v c3VwcG9ydC9HcmFwaGljc0NvbnRleHQzRENocm9taXVtLmNwcApAQCAtNTEsOCArNTEsNiBAQCBH cmFwaGljc0NvbnRleHQzRDo6fkdyYXBoaWNzQ29udGV4dDNEKCkKIHsKICAgICBtX3ByaXZhdGUt PnNldENvbnRleHRMb3N0Q2FsbGJhY2sobnVsbHB0cik7CiAgICAgbV9wcml2YXRlLT5zZXRFcnJv ck1lc3NhZ2VDYWxsYmFjayhudWxscHRyKTsKLSAgICBtX3ByaXZhdGUtPnNldFN3YXBCdWZmZXJz Q29tcGxldGVDYWxsYmFja0NIUk9NSVVNKG51bGxwdHIpOwotICAgIG1fcHJpdmF0ZS0+c2V0R3B1 TWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVNKG51bGxwdHIpOwogfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpzZXRDb250ZXh0TG9zdENhbGxiYWNrKFBhc3NPd25QdHI8 R3JhcGhpY3NDb250ZXh0M0Q6OkNvbnRleHRMb3N0Q2FsbGJhY2s+IGNhbGxiYWNrKQpAQCAtODMs NyArODEsNyBAQCBQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBHcmFwaGljc0NvbnRleHQz RDo6Y3JlYXRlKEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaQogICAgIGlmICghd2ViQ29udGV4dCkK ICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0M0RQcml2YXRl OjpjcmVhdGVHcmFwaGljc0NvbnRleHRGcm9tV2ViQ29udGV4dCh3ZWJDb250ZXh0LnJlbGVhc2Uo KSwgcmVuZGVyU3R5bGUsIGF0dHJzLnByZXNlcnZlRHJhd2luZ0J1ZmZlcik7CisgICAgcmV0dXJu IEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6Y3JlYXRlR3JhcGhpY3NDb250ZXh0RnJvbVdlYkNv bnRleHQod2ViQ29udGV4dC5yZWxlYXNlKCksIGF0dHJzLnByZXNlcnZlRHJhd2luZ0J1ZmZlcik7 CiB9CiAKIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0M0QgR3JhcGhpY3NDb250ZXh0M0Q6OnBsYXRm b3JtR3JhcGhpY3NDb250ZXh0M0QoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9HcmFwaGljc0NvbnRleHQz RFByaXZhdGUuY3BwCmluZGV4IDFjZjZmNWNkNWRhOThkOGM5NWMyY2EwOTBhNjA0OTgyMThhMjkw YmEuLmY2YjczMGRkZmZhYWI3OGFiNmFhYTAyNzEyODBhMDQ4NWJmOGNkOWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBw b3J0L0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNs dWRlICJHckdMSW50ZXJmYWNlLmgiCiAjaW5jbHVkZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRl IDxwdWJsaWMvV2ViR3JhcGhpY3NDb250ZXh0M0QuaD4KKyNpbmNsdWRlIDxwdWJsaWMvV2ViR3Jh cGhpY3NNZW1vcnlBbGxvY2F0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hhc2guaD4KIApAQCAtNjgsMTYgKzY5LDE1IEBAIEdy YXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlKFBhc3NPd25Q dHI8V2ViS2l0OjpXZWJHcmFwaGljCiBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6On5HcmFwaGlj c0NvbnRleHQzRFByaXZhdGUoKQogewogICAgIGlmIChtX2dyQ29udGV4dCkgeworICAgICAgICBt X2ltcGwtPnNldE1lbW9yeUFsbG9jYXRpb25DaGFuZ2VkQ2FsbGJhY2tDSFJPTUlVTSgwKTsKICAg ICAgICAgbV9nckNvbnRleHQtPmNvbnRleHREZXN0cm95ZWQoKTsKICAgICAgICAgR3JTYWZlVW5y ZWYobV9nckNvbnRleHQpOwogICAgIH0KIH0KIAotUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQz RD4gR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpjcmVhdGVHcmFwaGljc0NvbnRleHRGcm9tV2Vi Q29udGV4dChQYXNzT3duUHRyPFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0Q+IHdlYkNvbnRl eHQsIEdyYXBoaWNzQ29udGV4dDNEOjpSZW5kZXJTdHlsZSByZW5kZXJTdHlsZSwgYm9vbCBwcmVz ZXJ2ZURyYXdpbmdCdWZmZXIpCitQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBHcmFwaGlj c0NvbnRleHQzRFByaXZhdGU6OmNyZWF0ZUdyYXBoaWNzQ29udGV4dEZyb21XZWJDb250ZXh0KFBh c3NPd25QdHI8V2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRD4gd2ViQ29udGV4dCwgYm9vbCBw cmVzZXJ2ZURyYXdpbmdCdWZmZXIpCiB7Ci0gICAgYm9vbCByZW5kZXJEaXJlY3RseVRvSG9zdFdp bmRvdyA9IHJlbmRlclN0eWxlID09IEdyYXBoaWNzQ29udGV4dDNEOjpSZW5kZXJEaXJlY3RseVRv SG9zdFdpbmRvdzsKLQotICAgIFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29udGV4dCA9IGFk b3B0UmVmKG5ldyBHcmFwaGljc0NvbnRleHQzRChHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRl cygpLCAwLCByZW5kZXJEaXJlY3RseVRvSG9zdFdpbmRvdykpOworICAgIFJlZlB0cjxHcmFwaGlj c0NvbnRleHQzRD4gY29udGV4dCA9IGFkb3B0UmVmKG5ldyBHcmFwaGljc0NvbnRleHQzRChHcmFw aGljc0NvbnRleHQzRDo6QXR0cmlidXRlcygpLCAwLCBmYWxzZSAvKiBvbnNjcmVlbiAqLykpOwog CiAgICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZT4gcHJpdiA9IGFkb3B0UHRyKG5l dyBHcmFwaGljc0NvbnRleHQzRFByaXZhdGUod2ViQ29udGV4dCwgcHJlc2VydmVEcmF3aW5nQnVm ZmVyKSk7CiAgICAgY29udGV4dC0+bV9wcml2YXRlID0gcHJpdi5yZWxlYXNlKCk7CkBAIC05MSwy OCArOTEsMjcgQEAgV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRCogR3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlOjpleHRyYWN0V2ViR3JhcGhpY3NDb250ZXgKICAgICByZXR1cm4gY29udGV4dC0+ bV9wcml2YXRlLT53ZWJDb250ZXh0KCk7CiB9CiAKLWNsYXNzIEdyTWVtb3J5QWxsb2NhdGlvbkNo YW5nZWRDYWxsYmFjayA6IHB1YmxpYyBFeHRlbnNpb25zM0RDaHJvbWl1bTo6R3B1TWVtb3J5QWxs b2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVNIHsKK2NsYXNzIEdyTWVtb3J5QWxsb2NhdGlv bkNoYW5nZWRDYWxsYmFja0FkYXB0ZXIgOiBwdWJsaWMgV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRl eHQzRDo6V2ViR3JhcGhpY3NNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01JVU0g ewogcHVibGljOgotICAgIEdyTWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFjayhHcmFwaGlj c0NvbnRleHQzRFByaXZhdGUqIGNvbnRleHQpCisgICAgR3JNZW1vcnlBbGxvY2F0aW9uQ2hhbmdl ZENhbGxiYWNrQWRhcHRlcihHckNvbnRleHQqIGNvbnRleHQpCiAgICAgICAgIDogbV9jb250ZXh0 KGNvbnRleHQpCiAgICAgewogICAgIH0KIAotICAgIHZpcnR1YWwgdm9pZCBvbkdwdU1lbW9yeUFs bG9jYXRpb25DaGFuZ2VkKEV4dGVuc2lvbnMzRENocm9taXVtOjpHcHVNZW1vcnlBbGxvY2F0aW9u Q0hST01JVU0gYWxsb2NhdGlvbikKKyAgICB2aXJ0dWFsIHZvaWQgb25NZW1vcnlBbGxvY2F0aW9u Q2hhbmdlZChXZWJLaXQ6OldlYkdyYXBoaWNzTWVtb3J5QWxsb2NhdGlvbiBhbGxvY2F0aW9uKSBP VkVSUklERQogICAgIHsKLSAgICAgICAgR3JDb250ZXh0KiBjb250ZXh0ID0gbV9jb250ZXh0LT5n ckNvbnRleHQoKTsKLSAgICAgICAgaWYgKCFjb250ZXh0KQorICAgICAgICBpZiAoIW1fY29udGV4 dCkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoIWFsbG9jYXRpb24uZ3B1UmVz b3VyY2VTaXplSW5CeXRlcykgewotICAgICAgICAgICAgY29udGV4dC0+ZnJlZUdwdVJlc291cmNl cygpOwotICAgICAgICAgICAgY29udGV4dC0+c2V0VGV4dHVyZUNhY2hlTGltaXRzKDAsIDApOwor ICAgICAgICAgICAgbV9jb250ZXh0LT5mcmVlR3B1UmVzb3VyY2VzKCk7CisgICAgICAgICAgICBt X2NvbnRleHQtPnNldFRleHR1cmVDYWNoZUxpbWl0cygwLCAwKTsKICAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICBjb250ZXh0LT5zZXRUZXh0dXJlQ2FjaGVMaW1pdHMobWF4R2FuZXNoVGV4dHVy ZUNhY2hlQ291bnQsIG1heEdhbmVzaFRleHR1cmVDYWNoZUJ5dGVzKTsKKyAgICAgICAgICAgIG1f Y29udGV4dC0+c2V0VGV4dHVyZUNhY2hlTGltaXRzKG1heEdhbmVzaFRleHR1cmVDYWNoZUNvdW50 LCBtYXhHYW5lc2hUZXh0dXJlQ2FjaGVCeXRlcyk7CiAgICAgfQogCiBwcml2YXRlOgotICAgIEdy YXBoaWNzQ29udGV4dDNEUHJpdmF0ZSogbV9jb250ZXh0OworICAgIEdyQ29udGV4dCogbV9jb250 ZXh0OwogfTsKIAogR3JDb250ZXh0KiBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmdyQ29udGV4 dCgpCkBAIC0xMjIsOSArMTIxLDggQEAgR3JDb250ZXh0KiBHcmFwaGljc0NvbnRleHQzRFByaXZh dGU6OmdyQ29udGV4dCgpCiAgICAgICAgIG1fZ3JDb250ZXh0ID0gR3JDb250ZXh0OjpDcmVhdGUo a09wZW5HTF9TaGFkZXJzX0dyRW5naW5lLCByZWludGVycHJldF9jYXN0PEdyUGxhdGZvcm0zRENv bnRleHQ+KGludGVyZmFjZS5nZXQoKSkpOwogICAgICAgICBpZiAobV9nckNvbnRleHQpIHsKICAg ICAgICAgICAgIG1fZ3JDb250ZXh0LT5zZXRUZXh0dXJlQ2FjaGVMaW1pdHMobWF4R2FuZXNoVGV4 dHVyZUNhY2hlQ291bnQsIG1heEdhbmVzaFRleHR1cmVDYWNoZUJ5dGVzKTsKLSAgICAgICAgICAg IEV4dGVuc2lvbnMzRENocm9taXVtKiBleHRlbnNpb25zM0RDaHJvbWl1bSA9IHN0YXRpY19jYXN0 PEV4dGVuc2lvbnMzRENocm9taXVtKj4oZ2V0RXh0ZW5zaW9ucygpKTsKLSAgICAgICAgICAgIGlm IChleHRlbnNpb25zM0RDaHJvbWl1bS0+c3VwcG9ydHMoIkdMX0NIUk9NSVVNX2dwdV9tZW1vcnlf bWFuYWdlciIpKQotICAgICAgICAgICAgICAgIGV4dGVuc2lvbnMzRENocm9taXVtLT5zZXRHcHVN ZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01JVU0oYWRvcHRQdHIobmV3IEdyTWVt b3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFjayh0aGlzKSkpOworICAgICAgICAgICAgbV9nckNv bnRleHRNZW1vcnlBbGxvY2F0aW9uQ2FsbGJhY2tBZGFwdGVyID0gYWRvcHRQdHIobmV3IEdyTWVt b3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0FkYXB0ZXIobV9nckNvbnRleHQpKTsKKyAgICAg ICAgICAgIG1faW1wbC0+c2V0TWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVN KG1fZ3JDb250ZXh0TWVtb3J5QWxsb2NhdGlvbkNhbGxiYWNrQWRhcHRlci5nZXQoKSk7CiAgICAg ICAgIH0KICAgICB9CiAgICAgcmV0dXJuIG1fZ3JDb250ZXh0OwpAQCAtMzI1LDU1ICszMjMsNCBA QCBib29sIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6aXNSZXNvdXJjZVNhZmUoKQogICAgIHJl dHVybiBtX3Jlc291cmNlU2FmZXR5ID09IFJlc291cmNlU2FmZTsKIH0KIAotY2xhc3MgR3JhcGhp Y3NDb250ZXh0M0RNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQWRhcHRlciA6IHB1Ymxp YyBXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNEOjpXZWJHcmFwaGljc01lbW9yeUFsbG9jYXRp b25DaGFuZ2VkQ2FsbGJhY2tDSFJPTUlVTSB7Ci1wdWJsaWM6Ci0gICAgR3JhcGhpY3NDb250ZXh0 M0RNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQWRhcHRlcihQYXNzT3duUHRyPEV4dGVu c2lvbnMzRENocm9taXVtOjpHcHVNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01J VU0+IGNhbGxiYWNrKQotICAgICAgICA6IG1fbWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFj ayhjYWxsYmFjaykgeyB9Ci0KLSAgICB2aXJ0dWFsIH5HcmFwaGljc0NvbnRleHQzRE1lbW9yeUFs bG9jYXRpb25DaGFuZ2VkQ2FsbGJhY2tBZGFwdGVyKCkgeyB9Ci0KLSAgICB2aXJ0dWFsIHZvaWQg b25NZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZChzaXplX3QgZ3B1UmVzb3VyY2VTaXplSW5CeXRlcykK LSAgICB7Ci0gICAgICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBvbmNlIGNsaWVudHMgc3RhcnQg dXNpbmcgV2ViR3JhcGhpY3NNZW1vcnlBbGxvY2F0aW9uIGV4Y2x1c2l2ZWx5LgotICAgICAgICBv bk1lbW9yeUFsbG9jYXRpb25DaGFuZ2VkKFdlYktpdDo6V2ViR3JhcGhpY3NNZW1vcnlBbGxvY2F0 aW9uKGdwdVJlc291cmNlU2l6ZUluQnl0ZXMsIHRydWUpKTsKLSAgICB9Ci0KLSAgICB2aXJ0dWFs IHZvaWQgb25NZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZChXZWJLaXQ6OldlYkdyYXBoaWNzTWVtb3J5 QWxsb2NhdGlvbiBhbGxvY2F0aW9uKQotICAgIHsKLSAgICAgICAgaWYgKG1fbWVtb3J5QWxsb2Nh dGlvbkNoYW5nZWRDYWxsYmFjaykKLSAgICAgICAgICAgIG1fbWVtb3J5QWxsb2NhdGlvbkNoYW5n ZWRDYWxsYmFjay0+b25HcHVNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZChFeHRlbnNpb25zM0RDaHJv bWl1bTo6R3B1TWVtb3J5QWxsb2NhdGlvbkNIUk9NSVVNKGFsbG9jYXRpb24uZ3B1UmVzb3VyY2VT aXplSW5CeXRlcywgYWxsb2NhdGlvbi5zdWdnZXN0SGF2ZUJhY2tidWZmZXIpKTsKLSAgICB9Ci0K LXByaXZhdGU6Ci0gICAgT3duUHRyPEV4dGVuc2lvbnMzRENocm9taXVtOjpHcHVNZW1vcnlBbGxv Y2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01JVU0+IG1fbWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRD YWxsYmFjazsKLX07Ci0KLXZvaWQgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpzZXRHcHVNZW1v cnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01JVU0oUGFzc093blB0cjxFeHRlbnNpb25z M0RDaHJvbWl1bTo6R3B1TWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVNPiBj YWxsYmFjaykKLXsKLSAgICBtX21lbW9yeUFsbG9jYXRpb25DaGFuZ2VkQ2FsbGJhY2tBZGFwdGVy ID0gYWRvcHRQdHIobmV3IEdyYXBoaWNzQ29udGV4dDNETWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRD YWxsYmFja0FkYXB0ZXIoY2FsbGJhY2spKTsKLSAgICBtX2ltcGwtPnNldE1lbW9yeUFsbG9jYXRp b25DaGFuZ2VkQ2FsbGJhY2tDSFJPTUlVTShtX21lbW9yeUFsbG9jYXRpb25DaGFuZ2VkQ2FsbGJh Y2tBZGFwdGVyLmdldCgpKTsKLX0KLQotY2xhc3MgR3JhcGhpY3NDb250ZXh0M0RTd2FwQnVmZmVy c0NvbXBsZXRlQ2FsbGJhY2tBZGFwdGVyIDogcHVibGljIFdlYktpdDo6V2ViR3JhcGhpY3NDb250 ZXh0M0Q6OldlYkdyYXBoaWNzU3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQ0hST01JVU0gewot cHVibGljOgotICAgIEdyYXBoaWNzQ29udGV4dDNEU3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNr QWRhcHRlcihQYXNzT3duUHRyPEV4dGVuc2lvbnMzRENocm9taXVtOjpTd2FwQnVmZmVyc0NvbXBs ZXRlQ2FsbGJhY2tDSFJPTUlVTT4gY2FsbGJhY2spCi0gICAgICAgIDogbV9zd2FwQnVmZmVyc0Nv bXBsZXRlQ2FsbGJhY2soY2FsbGJhY2spIHsgfQotICAgIHZpcnR1YWwgfkdyYXBoaWNzQ29udGV4 dDNEU3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQWRhcHRlcigpIHsgfQotCi0gICAgdmlydHVh bCB2b2lkIG9uU3dhcEJ1ZmZlcnNDb21wbGV0ZSgpCi0gICAgewotICAgICAgICBpZiAobV9zd2Fw QnVmZmVyc0NvbXBsZXRlQ2FsbGJhY2spCi0gICAgICAgICAgICBtX3N3YXBCdWZmZXJzQ29tcGxl dGVDYWxsYmFjay0+b25Td2FwQnVmZmVyc0NvbXBsZXRlKCk7Ci0gICAgfQotCi1wcml2YXRlOgot ICAgIE93blB0cjxFeHRlbnNpb25zM0RDaHJvbWl1bTo6U3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxi YWNrQ0hST01JVU0+IG1fc3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrOwotfTsKLQotdm9pZCBH cmFwaGljc0NvbnRleHQzRFByaXZhdGU6OnNldFN3YXBCdWZmZXJzQ29tcGxldGVDYWxsYmFja0NI Uk9NSVVNKFBhc3NPd25QdHI8RXh0ZW5zaW9uczNEQ2hyb21pdW06OlN3YXBCdWZmZXJzQ29tcGxl dGVDYWxsYmFja0NIUk9NSVVNPiBjYWxsYmFjaykKLXsKLSAgICBtX3N3YXBCdWZmZXJzQ29tcGxl dGVDYWxsYmFja0FkYXB0ZXIgPSBhZG9wdFB0cihuZXcgR3JhcGhpY3NDb250ZXh0M0RTd2FwQnVm ZmVyc0NvbXBsZXRlQ2FsbGJhY2tBZGFwdGVyKGNhbGxiYWNrKSk7Ci0gICAgbV9pbXBsLT5zZXRT d2FwQnVmZmVyc0NvbXBsZXRlQ2FsbGJhY2tDSFJPTUlVTShtX3N3YXBCdWZmZXJzQ29tcGxldGVD YWxsYmFja0FkYXB0ZXIuZ2V0KCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L0dyYXBoaWNz Q29udGV4dDNEUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3Vw cG9ydC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaAppbmRleCA0MmZhNzA5MmY2ZTc2MTMyYjMy NmM3M2JiYjY4Mzk0ODZiMjU0ZDM2Li41YmJiODVhMjJmY2FiMWQ1MDVjNDBjZjVmZWY2OWUzNzQw MjdkNmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBw b3J0L0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL3N1cHBvcnQvR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmgKQEAgLTQ1LDE1 ICs0NSwxNCBAQCBjbGFzcyBEcmF3aW5nQnVmZmVyOwogY2xhc3MgRXh0ZW5zaW9uczNEQ2hyb21p dW07CiBjbGFzcyBHcmFwaGljc0NvbnRleHQzRENvbnRleHRMb3N0Q2FsbGJhY2tBZGFwdGVyOwog Y2xhc3MgR3JhcGhpY3NDb250ZXh0M0RFcnJvck1lc3NhZ2VDYWxsYmFja0FkYXB0ZXI7Ci1jbGFz cyBHcmFwaGljc0NvbnRleHQzRE1lbW9yeUFsbG9jYXRpb25DaGFuZ2VkQ2FsbGJhY2tBZGFwdGVy OwotY2xhc3MgR3JhcGhpY3NDb250ZXh0M0RTd2FwQnVmZmVyc0NvbXBsZXRlQ2FsbGJhY2tBZGFw dGVyOworY2xhc3MgR3JNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQWRhcHRlcjsKIAog Y2xhc3MgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlIHsKIHB1YmxpYzoKICAgICAvLyBDYWxsZXJz IG11c3QgbWFrZSB0aGUgY29udGV4dCBjdXJyZW50IGJlZm9yZSB1c2luZyBpdCBBTkQgY2hlY2sg dGhhdCB0aGUgY29udGV4dCB3YXMgY3JlYXRlZCBzdWNjZXNzZnVsbHkKICAgICAvLyB2aWEgQ29u dGV4dExvc3QgYmVmb3JlIHVzaW5nIHRoZSBjb250ZXh0IGluIGFueSB3YXkuIE9uY2UgbWFkZSBj dXJyZW50IG9uIGEgdGhyZWFkLCB0aGUgY29udGV4dCBjYW5ub3QKICAgICAvLyBiZSB1c2VkIG9u IGFueSBvdGhlciB0aHJlYWQuCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0 M0Q+IGNyZWF0ZUdyYXBoaWNzQ29udGV4dEZyb21XZWJDb250ZXh0KFBhc3NPd25QdHI8V2ViS2l0 OjpXZWJHcmFwaGljc0NvbnRleHQzRD4sIEdyYXBoaWNzQ29udGV4dDNEOjpSZW5kZXJTdHlsZSwg Ym9vbCBwcmVzZXJ2ZURyYXdpbmdCdWZmZXIgPSBmYWxzZSk7CisgICAgc3RhdGljIFBhc3NSZWZQ dHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNyZWF0ZUdyYXBoaWNzQ29udGV4dEZyb21XZWJDb250ZXh0 KFBhc3NPd25QdHI8V2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRD4sIGJvb2wgcHJlc2VydmVE cmF3aW5nQnVmZmVyID0gZmFsc2UpOwogCiAgICAgLy8gSGVscGVyIGZ1bmN0aW9uIHRvIHByb3Zp ZGUgYWNjZXNzIHRvIHRoZSBsb3dlci1sZXZlbCBXZWJHcmFwaGljc0NvbnRleHQzRCwKICAgICAv LyB3aGljaCBpcyBuZWVkZWQgZm9yIHN1Ym9yZGluYXRlIGNvbnRleHRzIGxpa2UgV2ViR0wncyB0 byBzaGFyZSByZXNvdXJjZXMKQEAgLTgzLDEyICs4Miw2IEBAIHB1YmxpYzoKIAogICAgIGJvb2wg aXNSZXNvdXJjZVNhZmUoKTsKIAotICAgIC8vIEdMX0NIUk9NSVVNX2dwdV9tZW1vcnlfbWFuYWdl cgotICAgIHZvaWQgc2V0R3B1TWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVN KFBhc3NPd25QdHI8RXh0ZW5zaW9uczNEQ2hyb21pdW06OkdwdU1lbW9yeUFsbG9jYXRpb25DaGFu Z2VkQ2FsbGJhY2tDSFJPTUlVTT4pOwotCi0gICAgLy8gR0xfQ0hST01JVU1fc3dhcGJ1ZmZlcnNf Y29tcGxldGVfY2FsbGJhY2sKLSAgICB2b2lkIHNldFN3YXBCdWZmZXJzQ29tcGxldGVDYWxsYmFj a0NIUk9NSVVNKFBhc3NPd25QdHI8RXh0ZW5zaW9uczNEQ2hyb21pdW06OlN3YXBCdWZmZXJzQ29t cGxldGVDYWxsYmFja0NIUk9NSVVNPik7Ci0KICAgICBib29sIHByZXNlcnZlRHJhd2luZ0J1ZmZl cigpIGNvbnN0IHsgcmV0dXJuIG1fcHJlc2VydmVEcmF3aW5nQnVmZmVyOyB9CiAKIHByaXZhdGU6 CkBAIC0xMDAsOCArOTMsNyBAQCBwcml2YXRlOgogICAgIE93blB0cjxFeHRlbnNpb25zM0RDaHJv bWl1bT4gbV9leHRlbnNpb25zOwogICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQzRENvbnRleHRM b3N0Q2FsbGJhY2tBZGFwdGVyPiBtX2NvbnRleHRMb3N0Q2FsbGJhY2tBZGFwdGVyOwogICAgIE93 blB0cjxHcmFwaGljc0NvbnRleHQzREVycm9yTWVzc2FnZUNhbGxiYWNrQWRhcHRlcj4gbV9lcnJv ck1lc3NhZ2VDYWxsYmFja0FkYXB0ZXI7Ci0gICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dDNETWVt b3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0FkYXB0ZXI+IG1fbWVtb3J5QWxsb2NhdGlvbkNo YW5nZWRDYWxsYmFja0FkYXB0ZXI7Ci0gICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dDNEU3dhcEJ1 ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQWRhcHRlcj4gbV9zd2FwQnVmZmVyc0NvbXBsZXRlQ2FsbGJh Y2tBZGFwdGVyOworICAgIE93blB0cjxHck1lbW9yeUFsbG9jYXRpb25DaGFuZ2VkQ2FsbGJhY2tB ZGFwdGVyPiBtX2dyQ29udGV4dE1lbW9yeUFsbG9jYXRpb25DYWxsYmFja0FkYXB0ZXI7CiAgICAg Ym9vbCBtX2luaXRpYWxpemVkQXZhaWxhYmxlRXh0ZW5zaW9uczsKICAgICBIYXNoU2V0PFN0cmlu Zz4gbV9lbmFibGVkRXh0ZW5zaW9uczsKICAgICBIYXNoU2V0PFN0cmluZz4gbV9yZXF1ZXN0YWJs ZUV4dGVuc2lvbnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9FeHRlbnNpb25zM0RDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vRXh0ZW5zaW9uczNEQ2hyb21pdW0uaAppbmRleCA4Mjc4N2Y0 MDA1M2I4MGZmZTc1ZmIzMWM3ZGI5OThhYmJjOTM0YjRkLi5mZjdlZDdlMjlmYTllNDBiMGE0NzM5 YjVmMWRkMjg0M2ExZDA1NjlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9FeHRlbnNpb25zM0RDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0V4dGVuc2lvbnMzRENocm9taXVtLmgKQEAg LTkwLDQ5ICs5MCwxMiBAQCBwdWJsaWM6CiAgICAgICAgIENPTU1BTkRTX0lTU1VFRF9DSFJPTUlV TSA9IDB4ODRGMgogICAgIH07CiAKLSAgICAvLyBHTF9DSFJPTUlVTV9wb3N0X3N1Yl9idWZmZXIK LSAgICB2b2lkIHBvc3RTdWJCdWZmZXJDSFJPTUlVTShpbnQgeCwgaW50IHksIGludCB3aWR0aCwg aW50IGhlaWdodCk7Ci0KICAgICAvLyBHTF9DSFJPTUlVTV9tYXBfc3ViCiAgICAgdm9pZCogbWFw QnVmZmVyU3ViRGF0YUNIUk9NSVVNKHVuc2lnbmVkIHRhcmdldCwgaW50IG9mZnNldCwgaW50IHNp emUsIHVuc2lnbmVkIGFjY2Vzcyk7CiAgICAgdm9pZCB1bm1hcEJ1ZmZlclN1YkRhdGFDSFJPTUlV TShjb25zdCB2b2lkKik7CiAgICAgdm9pZCogbWFwVGV4U3ViSW1hZ2UyRENIUk9NSVVNKHVuc2ln bmVkIHRhcmdldCwgaW50IGxldmVsLCBpbnQgeG9mZnNldCwgaW50IHlvZmZzZXQsIGludCB3aWR0 aCwgaW50IGhlaWdodCwgdW5zaWduZWQgZm9ybWF0LCB1bnNpZ25lZCB0eXBlLCB1bnNpZ25lZCBh Y2Nlc3MpOwogICAgIHZvaWQgdW5tYXBUZXhTdWJJbWFnZTJEQ0hST01JVU0oY29uc3Qgdm9pZCop OwogCi0gICAgLy8gR0xfQ0hST01JVU1fc2V0X3Zpc2liaWxpdHkKLSAgICB2b2lkIHNldFZpc2li aWxpdHlDSFJPTUlVTShib29sKTsKLQotICAgIC8vIEdMX0VYVF9kaXNjYXJkX2ZyYW1lYnVmZmVy Ci0gICAgdmlydHVhbCB2b2lkIGRpc2NhcmRGcmFtZWJ1ZmZlckVYVChHQzNEZW51bSB0YXJnZXQs IEdDM0RzaXplaSBudW1BdHRhY2htZW50cywgY29uc3QgR0MzRGVudW0qIGF0dGFjaG1lbnRzKTsK LSAgICB2aXJ0dWFsIHZvaWQgZW5zdXJlRnJhbWVidWZmZXJDSFJPTUlVTSgpOwotCi0gICAgLy8g R0xfQ0hST01JVU1fZ3B1X21lbW9yeV9tYW5hZ2VyCi0gICAgc3RydWN0IEdwdU1lbW9yeUFsbG9j YXRpb25DSFJPTUlVTSB7Ci0gICAgICAgIHNpemVfdCBncHVSZXNvdXJjZVNpemVJbkJ5dGVzOwot ICAgICAgICBib29sIHN1Z2dlc3RIYXZlQmFja2J1ZmZlcjsKLQotICAgICAgICBHcHVNZW1vcnlB bGxvY2F0aW9uQ0hST01JVU0oc2l6ZV90IGdwdVJlc291cmNlU2l6ZUluQnl0ZXMsIGJvb2wgc3Vn Z2VzdEhhdmVCYWNrYnVmZmVyKQotICAgICAgICAgICAgOiBncHVSZXNvdXJjZVNpemVJbkJ5dGVz KGdwdVJlc291cmNlU2l6ZUluQnl0ZXMpCi0gICAgICAgICAgICAsIHN1Z2dlc3RIYXZlQmFja2J1 ZmZlcihzdWdnZXN0SGF2ZUJhY2tidWZmZXIpCi0gICAgICAgIHsKLSAgICAgICAgfQotICAgIH07 Ci0gICAgY2xhc3MgR3B1TWVtb3J5QWxsb2NhdGlvbkNoYW5nZWRDYWxsYmFja0NIUk9NSVVNIHsK LSAgICBwdWJsaWM6Ci0KLSAgICAgICAgdmlydHVhbCB2b2lkIG9uR3B1TWVtb3J5QWxsb2NhdGlv bkNoYW5nZWQoR3B1TWVtb3J5QWxsb2NhdGlvbkNIUk9NSVVNKSA9IDA7Ci0gICAgICAgIHZpcnR1 YWwgfkdwdU1lbW9yeUFsbG9jYXRpb25DaGFuZ2VkQ2FsbGJhY2tDSFJPTUlVTSgpIHsgfQotICAg IH07Ci0gICAgdm9pZCBzZXRHcHVNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01J VU0oUGFzc093blB0cjxHcHVNZW1vcnlBbGxvY2F0aW9uQ2hhbmdlZENhbGxiYWNrQ0hST01JVU0+ KTsKLQotICAgIC8vIEdMX0NIUk9NSVVNX3N3YXBidWZmZXJzX2NvbXBsZXRlX2NhbGxiYWNrCi0g ICAgY2xhc3MgU3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQ0hST01JVU0gewotICAgIHB1Ymxp YzoKLSAgICAgICAgdmlydHVhbCB2b2lkIG9uU3dhcEJ1ZmZlcnNDb21wbGV0ZSgpID0gMDsKLSAg ICAgICAgdmlydHVhbCB+U3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQ0hST01JVU0oKSB7IH0K LSAgICB9OwotICAgIHZvaWQgc2V0U3dhcEJ1ZmZlcnNDb21wbGV0ZUNhbGxiYWNrQ0hST01JVU0o UGFzc093blB0cjxTd2FwQnVmZmVyc0NvbXBsZXRlQ2FsbGJhY2tDSFJPTUlVTT4pOwotCiAgICAg Ly8gR0xfQ0hST01JVU1fcmF0ZV9saW1pdF9vZmZzY3JlZW5fY29udGV4dAogICAgIHZvaWQgcmF0 ZUxpbWl0T2Zmc2NyZWVuQ29udGV4dENIUk9NSVVNKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ2FudmFzMkRMYXllckJyaWRnZVRlc3QuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DYW52YXMyRExheWVyQnJpZGdlVGVzdC5jcHAKaW5kZXgg MzA0NTBkYmM0OWJmZTZkZTE2OGEwNTY2NjM3Mjc5ZGRkMzJmY2NlZC4uNDM1OTA3Yzk0Mzc4YWJi Y2RjYjkwOTQzMGVkN2MwMmRjNzkxODg5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9DYW52YXMyRExheWVyQnJpZGdlVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9DYW52YXMyRExheWVyQnJpZGdlVGVzdC5jcHAKQEAgLTc0LDcgKzc0 LDcgQEAgY2xhc3MgQ2FudmFzMkRMYXllckJyaWRnZVRlc3QgOiBwdWJsaWMgVGVzdCB7CiBwcm90 ZWN0ZWQ6CiAgICAgdm9pZCBmdWxsTGlmZWN5Y2xlVGVzdChUaHJlYWRNb2RlIHRocmVhZE1vZGUs IERlZmVycmFsTW9kZSBkZWZlcnJhbE1vZGUpCiAgICAgewotICAgICAgICBSZWZQdHI8R3JhcGhp Y3NDb250ZXh0M0Q+IG1haW5Db250ZXh0ID0gR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpjcmVh dGVHcmFwaGljc0NvbnRleHRGcm9tV2ViQ29udGV4dChhZG9wdFB0cihuZXcgTW9ja0NhbnZhc0Nv bnRleHQpLCBHcmFwaGljc0NvbnRleHQzRDo6UmVuZGVyT2Zmc2NyZWVuKTsKKyAgICAgICAgUmVm UHRyPEdyYXBoaWNzQ29udGV4dDNEPiBtYWluQ29udGV4dCA9IEdyYXBoaWNzQ29udGV4dDNEUHJp dmF0ZTo6Y3JlYXRlR3JhcGhpY3NDb250ZXh0RnJvbVdlYkNvbnRleHQoYWRvcHRQdHIobmV3IE1v Y2tDYW52YXNDb250ZXh0KSk7CiAgICAgICAgIE93blB0cjxDQ0dyYXBoaWNzQ29udGV4dD4gY2NJ bXBsQ29udGV4dCA9IENDR3JhcGhpY3NDb250ZXh0OjpjcmVhdGUzRChhZG9wdFB0cihuZXcgTW9j a0NhbnZhc0NvbnRleHQpKTsKIAogICAgICAgICBNb2NrQ2FudmFzQ29udGV4dCYgbWFpbk1vY2sg PSAqc3RhdGljX2Nhc3Q8TW9ja0NhbnZhc0NvbnRleHQqPihHcmFwaGljc0NvbnRleHQzRFByaXZh dGU6OmV4dHJhY3RXZWJHcmFwaGljc0NvbnRleHQzRChtYWluQ29udGV4dC5nZXQoKSkpOwpAQCAt MTQ3LDcgKzE0Nyw3IEBAIFRFU1QoQ2FudmFzMkRMYXllckJyaWRnZVRlc3QyLCB0ZXN0Q2xlYXJD bGllbnQpCiB7CiAgICAgR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cnM7CiAKLSAg ICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1haW5Db250ZXh0ID0gR3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlOjpjcmVhdGVHcmFwaGljc0NvbnRleHRGcm9tV2ViQ29udGV4dChhZG9wdFB0cihu ZXcgTW9ja0NhbnZhc0NvbnRleHQpLCBHcmFwaGljc0NvbnRleHQzRDo6UmVuZGVyRGlyZWN0bHlU b0hvc3RXaW5kb3cpOworICAgIFJlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gbWFpbkNvbnRleHQg PSBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OmNyZWF0ZUdyYXBoaWNzQ29udGV4dEZyb21XZWJD b250ZXh0KGFkb3B0UHRyKG5ldyBNb2NrQ2FudmFzQ29udGV4dCkpOwogICAgIE93blB0cjxDYW52 YXMyRExheWVyQnJpZGdlPiBicmlkZ2UgPSBDYW52YXMyRExheWVyQnJpZGdlOjpjcmVhdGUobWFp bkNvbnRleHQuZ2V0KCksIEludFNpemUoMTAwLCAxMDApLCBEZWZlcnJlZCwgMSk7CiAgICAgUmVm UHRyPExheWVyQ2hyb21pdW0+IGxheWVyID0gYnJpZGdlLT5sYXllcigpOwogICAgIGJyaWRnZS5j bGVhcigpOwo=