157619 2016-05-12 02:35:27 -0700 [TexMap] Handle TextureMapperShaderProgram objects through references 2016-05-12 22:47:43 -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 oldest_to_newest 1192291 0 zan 2016-05-12 02:35:27 -0700 [TexMap] Handle TextureMapperShaderProgram objects through references 1192294 1 278722 zan 2016-05-12 02:39:28 -0700 Created attachment 278722 Patch 1192659 2 278722 zan 2016-05-12 22:47:34 -0700 Comment on attachment 278722 Patch Clearing flags on attachment: 278722 Committed r200812: <http://trac.webkit.org/changeset/200812> 1192660 3 zan 2016-05-12 22:47:43 -0700 All reviewed patches have been landed. Closing bug. 278722 2016-05-12 02:39:28 -0700 2016-05-12 22:47:34 -0700 Patch bug-157619-20160512024012.patch text/plain 15566 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTRlNjgyM2VjNzZkZDNh ODMzZjgzNGZlOThhMjFiNWJkY2JiOWNjNy4uYTFlZWFiOTg5NDUxZWYxNDg2ODRhMzkwMDFmOTdh N2VmYWNhNDJlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA1LTEyICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbVGV4TWFwXSBIYW5k bGUgVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0gb2JqZWN0cyB0aHJvdWdoIHJlZmVyZW5jZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzYxOQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHR1cmVN YXBwZXIgY29kZSBhbHdheXMgZXhwZWN0cyB2YWxpZCBUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3Jh bQorICAgICAgICBvYmplY3RzIHRvIGJlIGNyZWF0ZWQsIHNvIGl0IGRvZXNuJ3QgbWFrZSBzZW5z ZSB0byBhY2Nlc3MgdGhlc2UKKyAgICAgICAgb2JqZWN0cyB0aHJvdWdoIHJhdyBwb2ludGVycyBv ciBSZWZQdHI8PnMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6ZHJhd0Jv cmRlcik6CisgICAgICAgIChXZWJDb3JlOjpwcmVwYXJlRmlsdGVyUHJvZ3JhbSk6CisgICAgICAg IChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmRyYXdUZXh0dXJlKToKKyAgICAgICAgKFdlYkNv cmU6OlRleHR1cmVNYXBwZXJHTDo6ZHJhd1NvbGlkQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6 VGV4dHVyZU1hcHBlckdMOjpkcmF3RWRnZVRyaWFuZ2xlcyk6CisgICAgICAgIChXZWJDb3JlOjpU ZXh0dXJlTWFwcGVyR0w6OmRyYXdVbml0UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJl TWFwcGVyR0w6OmRyYXcpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpkcmF3 VGV4dHVyZWRRdWFkV2l0aFByb2dyYW0pOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBl ckdMOjpkcmF3RmlsdGVyZWQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpi ZWdpbkNsaXApOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuaDoKKwogMjAxNi0wNS0xMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIEtpbGwgTm9kZTo6YW5jZXN0b3JFbGVtZW50KCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5j cHAKaW5kZXggNjQzOTkxNmU0M2E5OTlmMjY2NWZhNzAxNDFmODhhMTQ3NTk3MmI3NS4uNTBiN2Jm YTMyOWM3MmE3N2EyZDE5NmJkYmYzNDY0MjA3ODQ3MTg4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5j cHAKQEAgLTIyMSw3ICsyMjEsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd0JvcmRlcihj b25zdCBDb2xvciYgY29sb3IsIGZsb2F0IHdpZHRoLCBjb25zdCBGbG9hdFJlYwogICAgIGlmIChj bGlwU3RhY2soKS5pc0N1cnJlbnRTY2lzc29yQm94RW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgUmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiBwcm9ncmFtID0gZGF0YSgp LmdldFNoYWRlclByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW06OlNvbGlkQ29sb3Ip OworICAgIFJlZjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbSA9IGRhdGEoKS5n ZXRTaGFkZXJQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtOjpTb2xpZENvbG9yKTsK ICAgICBtX2NvbnRleHQzRC0+dXNlUHJvZ3JhbShwcm9ncmFtLT5wcm9ncmFtSUQoKSk7CiAKICAg ICBmbG9hdCByLCBnLCBiLCBhOwpAQCAtMzQzLDIzICszNDMsMjMgQEAgc3RhdGljIGZsb2F0KiBn YXVzc2lhbktlcm5lbCgpCiAgICAgcmV0dXJuIGtlcm5lbDsKIH0KIAotc3RhdGljIHZvaWQgcHJl cGFyZUZpbHRlclByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0qIHByb2dyYW0sIGNv bnN0IEZpbHRlck9wZXJhdGlvbiYgb3BlcmF0aW9uLCB1bnNpZ25lZCBwYXNzLCBjb25zdCBJbnRT aXplJiBzaXplLCBHQzNEdWludCBjb250ZW50VGV4dHVyZSkKK3N0YXRpYyB2b2lkIHByZXBhcmVG aWx0ZXJQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtJiBwcm9ncmFtLCBjb25zdCBG aWx0ZXJPcGVyYXRpb24mIG9wZXJhdGlvbiwgdW5zaWduZWQgcGFzcywgY29uc3QgSW50U2l6ZSYg c2l6ZSwgR0MzRHVpbnQgY29udGVudFRleHR1cmUpCiB7Ci0gICAgUmVmPEdyYXBoaWNzQ29udGV4 dDNEPiBjb250ZXh0ID0gcHJvZ3JhbS0+Y29udGV4dCgpOwotICAgIGNvbnRleHQtPnVzZVByb2dy YW0ocHJvZ3JhbS0+cHJvZ3JhbUlEKCkpOworICAgIFJlZjxHcmFwaGljc0NvbnRleHQzRD4gY29u dGV4dCA9IHByb2dyYW0uY29udGV4dCgpOworICAgIGNvbnRleHQtPnVzZVByb2dyYW0ocHJvZ3Jh bS5wcm9ncmFtSUQoKSk7CiAKICAgICBzd2l0Y2ggKG9wZXJhdGlvbi50eXBlKCkpIHsKICAgICBj YXNlIEZpbHRlck9wZXJhdGlvbjo6R1JBWVNDQUxFOgogICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9u OjpTRVBJQToKICAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6U0FUVVJBVEU6CiAgICAgY2FzZSBG aWx0ZXJPcGVyYXRpb246OkhVRV9ST1RBVEU6Ci0gICAgICAgIGNvbnRleHQtPnVuaWZvcm0xZihw cm9ncmFtLT5maWx0ZXJBbW91bnRMb2NhdGlvbigpLCBzdGF0aWNfY2FzdDxjb25zdCBCYXNpY0Nv bG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uJj4ob3BlcmF0aW9uKS5hbW91bnQoKSk7CisgICAgICAg IGNvbnRleHQtPnVuaWZvcm0xZihwcm9ncmFtLmZpbHRlckFtb3VudExvY2F0aW9uKCksIHN0YXRp Y19jYXN0PGNvbnN0IEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24mPihvcGVyYXRpb24p LmFtb3VudCgpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OklO VkVSVDoKICAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6QlJJR0hUTkVTUzoKICAgICBjYXNlIEZp bHRlck9wZXJhdGlvbjo6Q09OVFJBU1Q6CiAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246Ok9QQUNJ VFk6Ci0gICAgICAgIGNvbnRleHQtPnVuaWZvcm0xZihwcm9ncmFtLT5maWx0ZXJBbW91bnRMb2Nh dGlvbigpLCBzdGF0aWNfY2FzdDxjb25zdCBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyT3Bl cmF0aW9uJj4ob3BlcmF0aW9uKS5hbW91bnQoKSk7CisgICAgICAgIGNvbnRleHQtPnVuaWZvcm0x Zihwcm9ncmFtLmZpbHRlckFtb3VudExvY2F0aW9uKCksIHN0YXRpY19jYXN0PGNvbnN0IEJhc2lj Q29tcG9uZW50VHJhbnNmZXJGaWx0ZXJPcGVyYXRpb24mPihvcGVyYXRpb24pLmFtb3VudCgpKTsK ICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OkJMVVI6IHsKICAgICAg ICAgY29uc3QgQmx1ckZpbHRlck9wZXJhdGlvbiYgYmx1ciA9IHN0YXRpY19jYXN0PGNvbnN0IEJs dXJGaWx0ZXJPcGVyYXRpb24mPihvcGVyYXRpb24pOwpAQCAtMzcxLDI5ICszNzEsMjkgQEAgc3Rh dGljIHZvaWQgcHJlcGFyZUZpbHRlclByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0q IHByb2dyYW0sIGNvbnN0IEZpbHQKICAgICAgICAgZWxzZQogICAgICAgICAgICAgcmFkaXVzLnNl dFdpZHRoKGZsb2F0VmFsdWVGb3JMZW5ndGgoYmx1ci5zdGREZXZpYXRpb24oKSwgc2l6ZS53aWR0 aCgpKSAvIHNpemUud2lkdGgoKSk7CiAKLSAgICAgICAgY29udGV4dC0+dW5pZm9ybTJmKHByb2dy YW0tPmJsdXJSYWRpdXNMb2NhdGlvbigpLCByYWRpdXMud2lkdGgoKSwgcmFkaXVzLmhlaWdodCgp KTsKLSAgICAgICAgY29udGV4dC0+dW5pZm9ybTFmdihwcm9ncmFtLT5nYXVzc2lhbktlcm5lbExv Y2F0aW9uKCksIEdhdXNzaWFuS2VybmVsSGFsZldpZHRoLCBnYXVzc2lhbktlcm5lbCgpKTsKKyAg ICAgICAgY29udGV4dC0+dW5pZm9ybTJmKHByb2dyYW0uYmx1clJhZGl1c0xvY2F0aW9uKCksIHJh ZGl1cy53aWR0aCgpLCByYWRpdXMuaGVpZ2h0KCkpOworICAgICAgICBjb250ZXh0LT51bmlmb3Jt MWZ2KHByb2dyYW0uZ2F1c3NpYW5LZXJuZWxMb2NhdGlvbigpLCBHYXVzc2lhbktlcm5lbEhhbGZX aWR0aCwgZ2F1c3NpYW5LZXJuZWwoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNl IEZpbHRlck9wZXJhdGlvbjo6RFJPUF9TSEFET1c6IHsKICAgICAgICAgY29uc3QgRHJvcFNoYWRv d0ZpbHRlck9wZXJhdGlvbiYgc2hhZG93ID0gc3RhdGljX2Nhc3Q8Y29uc3QgRHJvcFNoYWRvd0Zp bHRlck9wZXJhdGlvbiY+KG9wZXJhdGlvbik7Ci0gICAgICAgIGNvbnRleHQtPnVuaWZvcm0xZnYo cHJvZ3JhbS0+Z2F1c3NpYW5LZXJuZWxMb2NhdGlvbigpLCBHYXVzc2lhbktlcm5lbEhhbGZXaWR0 aCwgZ2F1c3NpYW5LZXJuZWwoKSk7CisgICAgICAgIGNvbnRleHQtPnVuaWZvcm0xZnYocHJvZ3Jh bS5nYXVzc2lhbktlcm5lbExvY2F0aW9uKCksIEdhdXNzaWFuS2VybmVsSGFsZldpZHRoLCBnYXVz c2lhbktlcm5lbCgpKTsKICAgICAgICAgc3dpdGNoIChwYXNzKSB7CiAgICAgICAgIGNhc2UgMDoK ICAgICAgICAgICAgIC8vIEZpcnN0IHBhc3M6IGhvcml6b250YWwgYWxwaGEgYmx1ci4KLSAgICAg ICAgICAgIGNvbnRleHQtPnVuaWZvcm0yZihwcm9ncmFtLT5ibHVyUmFkaXVzTG9jYXRpb24oKSwg c2hhZG93LnN0ZERldmlhdGlvbigpIC8gZmxvYXQoc2l6ZS53aWR0aCgpKSwgMCk7Ci0gICAgICAg ICAgICBjb250ZXh0LT51bmlmb3JtMmYocHJvZ3JhbS0+c2hhZG93T2Zmc2V0TG9jYXRpb24oKSwg ZmxvYXQoc2hhZG93LmxvY2F0aW9uKCkueCgpKSAvIGZsb2F0KHNpemUud2lkdGgoKSksIGZsb2F0 KHNoYWRvdy5sb2NhdGlvbigpLnkoKSkgLyBmbG9hdChzaXplLmhlaWdodCgpKSk7CisgICAgICAg ICAgICBjb250ZXh0LT51bmlmb3JtMmYocHJvZ3JhbS5ibHVyUmFkaXVzTG9jYXRpb24oKSwgc2hh ZG93LnN0ZERldmlhdGlvbigpIC8gZmxvYXQoc2l6ZS53aWR0aCgpKSwgMCk7CisgICAgICAgICAg ICBjb250ZXh0LT51bmlmb3JtMmYocHJvZ3JhbS5zaGFkb3dPZmZzZXRMb2NhdGlvbigpLCBmbG9h dChzaGFkb3cubG9jYXRpb24oKS54KCkpIC8gZmxvYXQoc2l6ZS53aWR0aCgpKSwgZmxvYXQoc2hh ZG93LmxvY2F0aW9uKCkueSgpKSAvIGZsb2F0KHNpemUuaGVpZ2h0KCkpKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIDE6CiAgICAgICAgICAgICAvLyBTZWNvbmQgcGFzczogd2Ug bmVlZCB0aGUgc2hhZG93IGNvbG9yIGFuZCB0aGUgY29udGVudCB0ZXh0dXJlIGZvciBjb21wb3Np dGluZy4KICAgICAgICAgICAgIGZsb2F0IHIsIGcsIGIsIGE7CiAgICAgICAgICAgICBDb2xvcihw cmVtdWx0aXBsaWVkQVJHQkZyb21Db2xvcihzaGFkb3cuY29sb3IoKSkpLmdldFJHQkEociwgZywg YiwgYSk7Ci0gICAgICAgICAgICBjb250ZXh0LT51bmlmb3JtNGYocHJvZ3JhbS0+Y29sb3JMb2Nh dGlvbigpLCByLCBnLCBiLCBhKTsKLSAgICAgICAgICAgIGNvbnRleHQtPnVuaWZvcm0yZihwcm9n cmFtLT5ibHVyUmFkaXVzTG9jYXRpb24oKSwgMCwgc2hhZG93LnN0ZERldmlhdGlvbigpIC8gZmxv YXQoc2l6ZS5oZWlnaHQoKSkpOwotICAgICAgICAgICAgY29udGV4dC0+dW5pZm9ybTJmKHByb2dy YW0tPnNoYWRvd09mZnNldExvY2F0aW9uKCksIDAsIDApOworICAgICAgICAgICAgY29udGV4dC0+ dW5pZm9ybTRmKHByb2dyYW0uY29sb3JMb2NhdGlvbigpLCByLCBnLCBiLCBhKTsKKyAgICAgICAg ICAgIGNvbnRleHQtPnVuaWZvcm0yZihwcm9ncmFtLmJsdXJSYWRpdXNMb2NhdGlvbigpLCAwLCBz aGFkb3cuc3RkRGV2aWF0aW9uKCkgLyBmbG9hdChzaXplLmhlaWdodCgpKSk7CisgICAgICAgICAg ICBjb250ZXh0LT51bmlmb3JtMmYocHJvZ3JhbS5zaGFkb3dPZmZzZXRMb2NhdGlvbigpLCAwLCAw KTsKICAgICAgICAgICAgIGNvbnRleHQtPmFjdGl2ZVRleHR1cmUoR3JhcGhpY3NDb250ZXh0M0Q6 OlRFWFRVUkUxKTsKICAgICAgICAgICAgIGNvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29u dGV4dDNEOjpURVhUVVJFXzJELCBjb250ZW50VGV4dHVyZSk7Ci0gICAgICAgICAgICBjb250ZXh0 LT51bmlmb3JtMWkocHJvZ3JhbS0+Y29udGVudFRleHR1cmVMb2NhdGlvbigpLCAxKTsKKyAgICAg ICAgICAgIGNvbnRleHQtPnVuaWZvcm0xaShwcm9ncmFtLmNvbnRlbnRUZXh0dXJlTG9jYXRpb24o KSwgMSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBicmVhazsKQEAg LTQ0OCw3ICs0NDgsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmUoUGxhdGZv cm0zRE9iamVjdCB0ZXh0dXJlLCBGbGFncyBmbGFncywgY29uc3QgSQogICAgIGlmICh1c2VBbnRp YWxpYXNpbmcgfHwgb3BhY2l0eSA8IDEpCiAgICAgICAgIGZsYWdzIHw9IFNob3VsZEJsZW5kOwog Ci0gICAgUmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiBwcm9ncmFtID0gZGF0YSgp LmdldFNoYWRlclByb2dyYW0ob3B0aW9ucyk7CisgICAgUmVmPFRleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtPiBwcm9ncmFtID0gZGF0YSgpLmdldFNoYWRlclByb2dyYW0ob3B0aW9ucyk7CiAKICAg ICBpZiAoZmlsdGVyKQogICAgICAgICBwcmVwYXJlRmlsdGVyUHJvZ3JhbShwcm9ncmFtLmdldCgp LCAqZmlsdGVyLmdldCgpLCBkYXRhKCkuZmlsdGVySW5mby0+cGFzcywgdGV4dHVyZVNpemUsIGZp bHRlckNvbnRlbnRUZXh0dXJlSUQpOwpAQCAtNDY1LDcgKzQ2NSw3IEBAIHZvaWQgVGV4dHVyZU1h cHBlckdMOjpkcmF3U29saWRDb2xvcihjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IFRyYW5z Zm9ybWF0aW9uCiAgICAgICAgIGZsYWdzIHw9IFNob3VsZEJsZW5kIHwgU2hvdWxkQW50aWFsaWFz OwogICAgIH0KIAotICAgIFJlZlB0cjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3Jh bSA9IGRhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlvbnMpOworICAgIFJlZjxUZXh0dXJlTWFw cGVyU2hhZGVyUHJvZ3JhbT4gcHJvZ3JhbSA9IGRhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlv bnMpOwogICAgIG1fY29udGV4dDNELT51c2VQcm9ncmFtKHByb2dyYW0tPnByb2dyYW1JRCgpKTsK IAogICAgIGZsb2F0IHIsIGcsIGIsIGE7CkBAIC00NzcsNyArNDc3LDcgQEAgdm9pZCBUZXh0dXJl TWFwcGVyR0w6OmRyYXdTb2xpZENvbG9yKGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3QgVHJh bnNmb3JtYXRpb24KICAgICBkcmF3KHJlY3QsIG1hdHJpeCwgcHJvZ3JhbS5nZXQoKSwgR3JhcGhp Y3NDb250ZXh0M0Q6OlRSSUFOR0xFX0ZBTiwgZmxhZ3MpOwogfQogCi12b2lkIFRleHR1cmVNYXBw ZXJHTDo6ZHJhd0VkZ2VUcmlhbmdsZXMoVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0qIHByb2dy YW0pCit2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd0VkZ2VUcmlhbmdsZXMoVGV4dHVyZU1hcHBl clNoYWRlclByb2dyYW0mIHByb2dyYW0pCiB7CiAgICAgY29uc3QgR0MzRGZsb2F0IGxlZnQgPSAw OwogICAgIGNvbnN0IEdDM0RmbG9hdCB0b3AgPSAwOwpAQCAtNTAyLDI5ICs1MDIsMjkgQEAgdm9p ZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdFZGdlVHJpYW5nbGVzKFRleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtKiBwcm9ncmFtKQogCiAgICAgUGxhdGZvcm0zRE9iamVjdCB2Ym8gPSBkYXRhKCkuZ2V0 U3RhdGljVkJPKEdyYXBoaWNzQ29udGV4dDNEOjpBUlJBWV9CVUZGRVIsIHNpemVvZihHQzNEZmxv YXQpICogNDgsIHVuaXRSZWN0U2lkZVRyaWFuZ2xlcyk7CiAgICAgbV9jb250ZXh0M0QtPmJpbmRC dWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkFSUkFZX0JVRkZFUiwgdmJvKTsKLSAgICBtX2NvbnRl eHQzRC0+dmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLT52ZXJ0ZXhMb2NhdGlvbigpLCA0LCBH cmFwaGljc0NvbnRleHQzRDo6RkxPQVQsIGZhbHNlLCAwLCAwKTsKKyAgICBtX2NvbnRleHQzRC0+ dmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLnZlcnRleExvY2F0aW9uKCksIDQsIEdyYXBoaWNz Q29udGV4dDNEOjpGTE9BVCwgZmFsc2UsIDAsIDApOwogICAgIG1fY29udGV4dDNELT5kcmF3QXJy YXlzKEdyYXBoaWNzQ29udGV4dDNEOjpUUklBTkdMRVMsIDAsIDEyKTsKICAgICBtX2NvbnRleHQz RC0+YmluZEJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6QVJSQVlfQlVGRkVSLCAwKTsKIH0KIAot dm9pZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdVbml0UmVjdChUZXh0dXJlTWFwcGVyU2hhZGVyUHJv Z3JhbSogcHJvZ3JhbSwgR0MzRGVudW0gZHJhd2luZ01vZGUpCit2b2lkIFRleHR1cmVNYXBwZXJH TDo6ZHJhd1VuaXRSZWN0KFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtJiBwcm9ncmFtLCBHQzNE ZW51bSBkcmF3aW5nTW9kZSkKIHsKICAgICBzdGF0aWMgY29uc3QgR0MzRGZsb2F0IHVuaXRSZWN0 W10gPSB7IDAsIDAsIDEsIDAsIDEsIDEsIDAsIDEgfTsKICAgICBQbGF0Zm9ybTNET2JqZWN0IHZi byA9IGRhdGEoKS5nZXRTdGF0aWNWQk8oR3JhcGhpY3NDb250ZXh0M0Q6OkFSUkFZX0JVRkZFUiwg c2l6ZW9mKEdDM0RmbG9hdCkgKiA4LCB1bml0UmVjdCk7CiAgICAgbV9jb250ZXh0M0QtPmJpbmRC dWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkFSUkFZX0JVRkZFUiwgdmJvKTsKLSAgICBtX2NvbnRl eHQzRC0+dmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLT52ZXJ0ZXhMb2NhdGlvbigpLCAyLCBH cmFwaGljc0NvbnRleHQzRDo6RkxPQVQsIGZhbHNlLCAwLCAwKTsKKyAgICBtX2NvbnRleHQzRC0+ dmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLnZlcnRleExvY2F0aW9uKCksIDIsIEdyYXBoaWNz Q29udGV4dDNEOjpGTE9BVCwgZmFsc2UsIDAsIDApOwogICAgIG1fY29udGV4dDNELT5kcmF3QXJy YXlzKGRyYXdpbmdNb2RlLCAwLCA0KTsKICAgICBtX2NvbnRleHQzRC0+YmluZEJ1ZmZlcihHcmFw aGljc0NvbnRleHQzRDo6QVJSQVlfQlVGRkVSLCAwKTsKIH0KIAotdm9pZCBUZXh0dXJlTWFwcGVy R0w6OmRyYXcoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJp eCYgbW9kZWxWaWV3TWF0cml4LCBUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbSogc2hhZGVyUHJv Z3JhbSwgR0MzRGVudW0gZHJhd2luZ01vZGUsIEZsYWdzIGZsYWdzKQordm9pZCBUZXh0dXJlTWFw cGVyR0w6OmRyYXcoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBUcmFuc2Zvcm1hdGlvbk1h dHJpeCYgbW9kZWxWaWV3TWF0cml4LCBUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbSYgcHJvZ3Jh bSwgR0MzRGVudW0gZHJhd2luZ01vZGUsIEZsYWdzIGZsYWdzKQogewogICAgIFRyYW5zZm9ybWF0 aW9uTWF0cml4IG1hdHJpeChtb2RlbFZpZXdNYXRyaXgpOwogICAgIG1hdHJpeC5tdWx0aXBseShU cmFuc2Zvcm1hdGlvbk1hdHJpeDo6cmVjdFRvUmVjdChGbG9hdFJlY3QoMCwgMCwgMSwgMSksIHJl Y3QpKTsKIAotICAgIG1fY29udGV4dDNELT5lbmFibGVWZXJ0ZXhBdHRyaWJBcnJheShzaGFkZXJQ cm9ncmFtLT52ZXJ0ZXhMb2NhdGlvbigpKTsKLSAgICBzaGFkZXJQcm9ncmFtLT5zZXRNYXRyaXgo c2hhZGVyUHJvZ3JhbS0+bW9kZWxWaWV3TWF0cml4TG9jYXRpb24oKSwgbWF0cml4KTsKLSAgICBz aGFkZXJQcm9ncmFtLT5zZXRNYXRyaXgoc2hhZGVyUHJvZ3JhbS0+cHJvamVjdGlvbk1hdHJpeExv Y2F0aW9uKCksIGRhdGEoKS5wcm9qZWN0aW9uTWF0cml4KTsKKyAgICBtX2NvbnRleHQzRC0+ZW5h YmxlVmVydGV4QXR0cmliQXJyYXkocHJvZ3JhbS52ZXJ0ZXhMb2NhdGlvbigpKTsKKyAgICBwcm9n cmFtLnNldE1hdHJpeChwcm9ncmFtLm1vZGVsVmlld01hdHJpeExvY2F0aW9uKCksIG1hdHJpeCk7 CisgICAgcHJvZ3JhbS5zZXRNYXRyaXgocHJvZ3JhbS5wcm9qZWN0aW9uTWF0cml4TG9jYXRpb24o KSwgZGF0YSgpLnByb2plY3Rpb25NYXRyaXgpOwogCiAgICAgaWYgKGlzSW5NYXNrTW9kZSgpKSB7 CiAgICAgICAgIG1fY29udGV4dDNELT5ibGVuZEZ1bmMoR3JhcGhpY3NDb250ZXh0M0Q6OlpFUk8s IEdyYXBoaWNzQ29udGV4dDNEOjpTUkNfQUxQSEEpOwpAQCAtNTM4LDIyICs1MzgsMjIgQEAgdm9p ZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXcoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBUcmFu c2Zvcm1hdGlvbk1hdHJpeCYgbW8KICAgICB9CiAKICAgICBpZiAoZmxhZ3MgJiBTaG91bGRBbnRp YWxpYXMpCi0gICAgICAgIGRyYXdFZGdlVHJpYW5nbGVzKHNoYWRlclByb2dyYW0pOworICAgICAg ICBkcmF3RWRnZVRyaWFuZ2xlcyhwcm9ncmFtKTsKICAgICBlbHNlCi0gICAgICAgIGRyYXdVbml0 UmVjdChzaGFkZXJQcm9ncmFtLCBkcmF3aW5nTW9kZSk7CisgICAgICAgIGRyYXdVbml0UmVjdChw cm9ncmFtLCBkcmF3aW5nTW9kZSk7CiAKLSAgICBtX2NvbnRleHQzRC0+ZGlzYWJsZVZlcnRleEF0 dHJpYkFycmF5KHNoYWRlclByb2dyYW0tPnZlcnRleExvY2F0aW9uKCkpOworICAgIG1fY29udGV4 dDNELT5kaXNhYmxlVmVydGV4QXR0cmliQXJyYXkocHJvZ3JhbS52ZXJ0ZXhMb2NhdGlvbigpKTsK ICAgICBtX2NvbnRleHQzRC0+YmxlbmRGdW5jKEdyYXBoaWNzQ29udGV4dDNEOjpPTkUsIEdyYXBo aWNzQ29udGV4dDNEOjpPTkVfTUlOVVNfU1JDX0FMUEhBKTsKICAgICBtX2NvbnRleHQzRC0+ZW5h YmxlKEdyYXBoaWNzQ29udGV4dDNEOjpCTEVORCk7CiB9CiAKLXZvaWQgVGV4dHVyZU1hcHBlckdM OjpkcmF3VGV4dHVyZWRRdWFkV2l0aFByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0q IHByb2dyYW0sIHVpbnQzMl90IHRleHR1cmUsIEZsYWdzIGZsYWdzLCBjb25zdCBJbnRTaXplJiBz aXplLCBjb25zdCBGbG9hdFJlY3QmIHJlY3QsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBt b2RlbFZpZXdNYXRyaXgsIGZsb2F0IG9wYWNpdHkpCit2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJh d1RleHR1cmVkUXVhZFdpdGhQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtJiBwcm9n cmFtLCB1aW50MzJfdCB0ZXh0dXJlLCBGbGFncyBmbGFncywgY29uc3QgSW50U2l6ZSYgc2l6ZSwg Y29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgbW9kZWxW aWV3TWF0cml4LCBmbG9hdCBvcGFjaXR5KQogewotICAgIG1fY29udGV4dDNELT51c2VQcm9ncmFt KHByb2dyYW0tPnByb2dyYW1JRCgpKTsKKyAgICBtX2NvbnRleHQzRC0+dXNlUHJvZ3JhbShwcm9n cmFtLnByb2dyYW1JRCgpKTsKICAgICBtX2NvbnRleHQzRC0+YWN0aXZlVGV4dHVyZShHcmFwaGlj c0NvbnRleHQzRDo6VEVYVFVSRTApOwogICAgIEdDM0RlbnVtIHRhcmdldCA9IGZsYWdzICYgU2hv dWxkVXNlQVJCVGV4dHVyZVJlY3QgPyBHQzNEZW51bShFeHRlbnNpb25zM0Q6OlRFWFRVUkVfUkVD VEFOR0xFX0FSQikgOiBHQzNEZW51bShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCk7CiAg ICAgbV9jb250ZXh0M0QtPmJpbmRUZXh0dXJlKHRhcmdldCwgdGV4dHVyZSk7Ci0gICAgbV9jb250 ZXh0M0QtPnVuaWZvcm0xaShwcm9ncmFtLT5zYW1wbGVyTG9jYXRpb24oKSwgMCk7CisgICAgbV9j b250ZXh0M0QtPnVuaWZvcm0xaShwcm9ncmFtLnNhbXBsZXJMb2NhdGlvbigpLCAwKTsKICAgICBp ZiAod3JhcE1vZGUoKSA9PSBSZXBlYXRXcmFwKSB7CiAgICAgICAgIG1fY29udGV4dDNELT50ZXhQ YXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQz RDo6VEVYVFVSRV9XUkFQX1MsIEdyYXBoaWNzQ29udGV4dDNEOjpSRVBFQVQpOwogICAgICAgICBt X2NvbnRleHQzRC0+dGV4UGFyYW1ldGVyaShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfV1JBUF9ULCBHcmFwaGljc0NvbnRleHQzRDo6UkVQ RUFUKTsKQEAgLTU2Nyw4ICs1NjcsOCBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1 cmVkUXVhZFdpdGhQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtKiBwcgogICAgIGlm IChmbGFncyAmIFNob3VsZEZsaXBUZXh0dXJlKQogICAgICAgICBwYXR0ZXJuVHJhbnNmb3JtLnRy YW5zbGF0ZSgwLCAtMSk7CiAKLSAgICBwcm9ncmFtLT5zZXRNYXRyaXgocHJvZ3JhbS0+dGV4dHVy ZVNwYWNlTWF0cml4TG9jYXRpb24oKSwgcGF0dGVyblRyYW5zZm9ybSk7Ci0gICAgbV9jb250ZXh0 M0QtPnVuaWZvcm0xZihwcm9ncmFtLT5vcGFjaXR5TG9jYXRpb24oKSwgb3BhY2l0eSk7CisgICAg cHJvZ3JhbS5zZXRNYXRyaXgocHJvZ3JhbS50ZXh0dXJlU3BhY2VNYXRyaXhMb2NhdGlvbigpLCBw YXR0ZXJuVHJhbnNmb3JtKTsKKyAgICBtX2NvbnRleHQzRC0+dW5pZm9ybTFmKHByb2dyYW0ub3Bh Y2l0eUxvY2F0aW9uKCksIG9wYWNpdHkpOwogCiAgICAgaWYgKG9wYWNpdHkgPCAxKQogICAgICAg ICBmbGFncyB8PSBTaG91bGRCbGVuZDsKQEAgLTU4Miw4ICs1ODIsNyBAQCB2b2lkIFRleHR1cmVN YXBwZXJHTDo6ZHJhd0ZpbHRlcmVkKGNvbnN0IEJpdG1hcFRleHR1cmUmIHNhbXBsZXIsIGNvbnN0 IEJpdG1hcFRleAogewogICAgIC8vIEZvciBzdGFuZGFyZCBmaWx0ZXJzLCB3ZSBhbHdheXMgZHJh dyB0aGUgd2hvbGUgdGV4dHVyZSB3aXRob3V0IHRyYW5zZm9ybWF0aW9ucy4KICAgICBUZXh0dXJl TWFwcGVyU2hhZGVyUHJvZ3JhbTo6T3B0aW9ucyBvcHRpb25zID0gb3B0aW9uc0ZvckZpbHRlclR5 cGUoZmlsdGVyLnR5cGUoKSwgcGFzcyk7Ci0gICAgUmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtPiBwcm9ncmFtID0gZGF0YSgpLmdldFNoYWRlclByb2dyYW0ob3B0aW9ucyk7Ci0gICAg QVNTRVJUKHByb2dyYW0pOworICAgIFJlZjxUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbT4gcHJv Z3JhbSA9IGRhdGEoKS5nZXRTaGFkZXJQcm9ncmFtKG9wdGlvbnMpOwogCiAgICAgcHJlcGFyZUZp bHRlclByb2dyYW0ocHJvZ3JhbS5nZXQoKSwgZmlsdGVyLCBwYXNzLCBzYW1wbGVyLmNvbnRlbnRT aXplKCksIGNvbnRlbnRUZXh0dXJlID8gc3RhdGljX2Nhc3Q8Y29uc3QgQml0bWFwVGV4dHVyZUdM Kj4oY29udGVudFRleHR1cmUpLT5pZCgpIDogMCk7CiAgICAgRmxvYXRSZWN0IHRhcmdldFJlY3Qo SW50UG9pbnQ6Onplcm8oKSwgc2FtcGxlci5jb250ZW50U2l6ZSgpKTsKQEAgLTY2MCw3ICs2NTks NyBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6YmVnaW5DbGlwKGNvbnN0IFRyYW5zZm9ybWF0aW9u TWF0cml4JiBtb2RlbFZpZXdNYXRyaXgsIGNvbgogCiAgICAgZGF0YSgpLmluaXRpYWxpemVTdGVu Y2lsKCk7CiAKLSAgICBSZWZQdHI8VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0+IHByb2dyYW0g PSBkYXRhKCkuZ2V0U2hhZGVyUHJvZ3JhbShUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbTo6U29s aWRDb2xvcik7CisgICAgUmVmPFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtPiBwcm9ncmFtID0g ZGF0YSgpLmdldFNoYWRlclByb2dyYW0oVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW06OlNvbGlk Q29sb3IpOwogCiAgICAgbV9jb250ZXh0M0QtPnVzZVByb2dyYW0ocHJvZ3JhbS0+cHJvZ3JhbUlE KCkpOwogICAgIG1fY29udGV4dDNELT5lbmFibGVWZXJ0ZXhBdHRyaWJBcnJheShwcm9ncmFtLT52 ZXJ0ZXhMb2NhdGlvbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuaAppbmRleCAwZDdhMTMxMzNiNDhmYjkz NTc1ZWRkYmNlMjUyZWYwNjA4NzYyNWEyLi4zODM4MGE2NTQ4YTQ2ZWRmYTg4OTY3NGEwMzA3MmMz YmQ2OWI1MDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5oCkBAIC03NSwxMSArNzUsMTEgQEAgcHVibGlj OgogICAgIHZvaWQgc2V0RW5hYmxlRWRnZURpc3RhbmNlQW50aWFsaWFzaW5nKGJvb2wgZW5hYmxl ZCkgeyBtX2VuYWJsZUVkZ2VEaXN0YW5jZUFudGlhbGlhc2luZyA9IGVuYWJsZWQ7IH0KIAogcHJp dmF0ZToKLSAgICB2b2lkIGRyYXdUZXh0dXJlZFF1YWRXaXRoUHJvZ3JhbShUZXh0dXJlTWFwcGVy U2hhZGVyUHJvZ3JhbSosIHVpbnQzMl90IHRleHR1cmUsIEZsYWdzLCBjb25zdCBJbnRTaXplJiwg Y29uc3QgRmxvYXRSZWN0JiwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01h dHJpeCwgZmxvYXQgb3BhY2l0eSk7Ci0gICAgdm9pZCBkcmF3KGNvbnN0IEZsb2F0UmVjdCYsIGNv bnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBtb2RlbFZpZXdNYXRyaXgsIFRleHR1cmVNYXBwZXJT aGFkZXJQcm9ncmFtKiwgR0MzRGVudW0gZHJhd2luZ01vZGUsIEZsYWdzKTsKKyAgICB2b2lkIGRy YXdUZXh0dXJlZFF1YWRXaXRoUHJvZ3JhbShUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbSYsIHVp bnQzMl90IHRleHR1cmUsIEZsYWdzLCBjb25zdCBJbnRTaXplJiwgY29uc3QgRmxvYXRSZWN0Jiwg Y29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHJpeCwgZmxvYXQgb3BhY2l0 eSk7CisgICAgdm9pZCBkcmF3KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IFRyYW5zZm9ybWF0aW9u TWF0cml4JiBtb2RlbFZpZXdNYXRyaXgsIFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtJiwgR0Mz RGVudW0gZHJhd2luZ01vZGUsIEZsYWdzKTsKIAotICAgIHZvaWQgZHJhd1VuaXRSZWN0KFRleHR1 cmVNYXBwZXJTaGFkZXJQcm9ncmFtKiwgR0MzRGVudW0gZHJhd2luZ01vZGUpOwotICAgIHZvaWQg ZHJhd0VkZ2VUcmlhbmdsZXMoVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0qKTsKKyAgICB2b2lk IGRyYXdVbml0UmVjdChUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbSYsIEdDM0RlbnVtIGRyYXdp bmdNb2RlKTsKKyAgICB2b2lkIGRyYXdFZGdlVHJpYW5nbGVzKFRleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtJik7CiAKICAgICBib29sIGJlZ2luU2Npc3NvckNsaXAoY29uc3QgVHJhbnNmb3JtYXRp b25NYXRyaXgmLCBjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2b2lkIGJpbmREZWZhdWx0U3VyZmFj ZSgpOwo=