75882 2012-01-09 12:22:13 -0800 [Qt][WK2] Directly-composited images sometimes appear with a wrong geometry 2012-01-11 16:26:32 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P2 Normal --- 75918 1 noam webkit-unassigned hausmann kenneth webkit.review.bot zoltan oldest_to_newest 532419 0 noam 2012-01-09 12:22:13 -0800 See LayoutTests/compositing/images/direct-image-compositing.html. Some of the images appear too large. 532423 1 121711 noam 2012-01-09 12:26:46 -0800 Created attachment 121711 Patch 533852 2 121711 hausmann 2012-01-11 06:30:03 -0800 Comment on attachment 121711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121711&action=review r=me but I think you should also remove the comment before landing. > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:421 > - m_layerInfo.drawsContent = drawsContent() || m_image; > + m_layerInfo.drawsContent = drawsContent(); Ahah, now I see why you removed the comment in the other patch. It seems that the comment removal should be taken from the other patch and moved over here ;) 533856 3 noam 2012-01-11 06:35:08 -0800 (In reply to comment #2) > (From update of attachment 121711 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121711&action=review > > r=me but I think you should also remove the comment before landing. > > > Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:421 > > - m_layerInfo.drawsContent = drawsContent() || m_image; > > + m_layerInfo.drawsContent = drawsContent(); > > Ahah, now I see why you removed the comment in the other patch. It seems that the comment removal should be taken from the other patch and moved over here ;) Yes, exactly. I kind-of applied them on top of each other :) I'll put the comment removal here. 533950 4 122039 noam 2012-01-11 09:21:16 -0800 Created attachment 122039 Patch 533981 5 122039 webkit.review.bot 2012-01-11 10:07:13 -0800 Comment on attachment 122039 Patch Clearing flags on attachment: 122039 Committed r104720: <http://trac.webkit.org/changeset/104720> 533982 6 webkit.review.bot 2012-01-11 10:07:19 -0800 All reviewed patches have been landed. Closing bug. 534377 7 122121 noam 2012-01-11 16:20:28 -0800 Created attachment 122121 Patch 1: minor improvements to TextureMapperNode 534379 8 122122 noam 2012-01-11 16:22:22 -0800 Created attachment 122122 Patch 1: minor improvements to TextureMapperNode 534382 9 122122 noam 2012-01-11 16:26:32 -0800 Comment on attachment 122122 Patch 1: minor improvements to TextureMapperNode Submitted patch in wrong bug... 121711 2012-01-09 12:26:46 -0800 2012-01-11 09:21:16 -0800 Patch patch.diff text/plain 3212 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2YjFiYzE0Li40NDFmZDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKworMjAxMi0wMS0wOSAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEu Y29tPgorCisgICAgICAgIFtRdF1bV0syXSBEaXJlY3RseS1jb21wb3NpdGVkIGltYWdlcyBzb21l dGltZXMgYXBwZWFyIHdpdGggYSB3cm9uZyBnZW9tZXRyeQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU4ODIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGFzc2lnbmluZyBhIGRpcmVjdGx5IGNvbXBv c2l0ZWQgaW1hZ2UgdG8gYSBUZXh0dXJlTWFwcGVyTm9kZSBpbiBXZWJLaXQyLCB3ZSB0YWtlCisg ICAgICAgIGNvbnRlbnRzUmVjdCgpIG9udG8gYWNjb3VudC4gSG93ZXZlciwgY29udGVudHNSZWN0 KCkgbWlnaHQgYmUgY2hhbmdlZCBhZnRlciB0aGUgaW1hZ2UKKyAgICAgICAgaXMgYWxyZWFkeSBh c3NpZ25lZC4KKyAgICAgICAgV2UgaGF2ZSB0byByZWFzc2lnbiB0aGUgaW1hZ2Ugd2hlbiBjb250 ZW50c1JlY3QoKSBjaGFuZ2VzLiBUaGlzIGlzIGEgcHJldHR5IGNoZWFwCisgICAgICAgIG9wZXJh dGlvbiwgc2luY2UgdGhlIGltYWdlIGlzIGFscmVhZHkgY29udmVydGVkIHRvIGEgdGV4dHVyZSBh bmQgd2Ugc2ltcGx5IGNoYW5nZSB0aGUKKyAgICAgICAgZ2VvbWV0cmljIHZhbHVlcy4KKworICAg ICAgICBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9kaXJlY3QtaW1hZ2UtY29tcG9zaXRpbmcuaHRt bCBub3cgcmVuZGVycyBjb3JyZWN0bHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvTGF5ZXJU cmVlSG9zdFByb3h5UXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0UHJveHk6 OnN5bmNMYXllclBhcmFtZXRlcnMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xh eWVyOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkpOgorCiAyMDEyLTAxLTA5 ICBBbmRyYXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1b V0syXSBQaW5jaCB6b29tIHNob3VsZCBhZmZlY3QgdGhlIHBhZ2Ugc2l6ZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0xheWVyVHJlZUhvc3RQcm94eVF0LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9MYXllclRyZWVIb3N0UHJveHlRdC5jcHAKaW5kZXgg YTFkZDI3Mi4uNmIxZTRjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L0xheWVyVHJlZUhvc3RQcm94eVF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvTGF5ZXJUcmVlSG9zdFByb3h5UXQuY3BwCkBAIC0yNDUsNiArMjQ1LDcgQEAgdm9pZCBMYXll clRyZWVIb3N0UHJveHk6OnN5bmNMYXllclBhcmFtZXRlcnMoY29uc3QgV2ViTGF5ZXJJbmZvJiBs YXllckluZm8pCiAgICAgZW5zdXJlTGF5ZXIoaWQpOwogICAgIExheWVyTWFwOjppdGVyYXRvciBp dCA9IG1fbGF5ZXJzLmZpbmQoaWQpOwogICAgIEdyYXBoaWNzTGF5ZXIqIGxheWVyID0gaXQtPnNl Y29uZDsKKyAgICBib29sIG5lZWRzVG9VcGRhdGVJbWFnZVRpbGVzID0gbGF5ZXJJbmZvLmltYWdl SXNVcGRhdGVkIHx8IGxheWVySW5mby5jb250ZW50c1JlY3QgIT0gbGF5ZXItPmNvbnRlbnRzUmVj dCgpOwogCiAgICAgbGF5ZXItPnNldE5hbWUobGF5ZXJJbmZvLm5hbWUpOwogCkBAIC0yNjEsNyAr MjYyLDcgQEAgdm9pZCBMYXllclRyZWVIb3N0UHJveHk6OnN5bmNMYXllclBhcmFtZXRlcnMoY29u c3QgV2ViTGF5ZXJJbmZvJiBsYXllckluZm8pCiAgICAgbGF5ZXItPnNldENvbnRlbnRzUmVjdChs YXllckluZm8uY29udGVudHNSZWN0KTsKICAgICBsYXllci0+c2V0RHJhd3NDb250ZW50KGxheWVy SW5mby5kcmF3c0NvbnRlbnQpOwogCi0gICAgaWYgKGxheWVySW5mby5pbWFnZUlzVXBkYXRlZCkK KyAgICBpZiAobmVlZHNUb1VwZGF0ZUltYWdlVGlsZXMpCiAgICAgICAgIGFzc2lnbkltYWdlVG9M YXllcihsYXllciwgbGF5ZXJJbmZvLmltYWdlQmFja2luZ1N0b3JlSUQpOwogCiAgICAgLy8gTmV2 ZXIgbWFrZSB0aGUgcm9vdCBsYXllciBjbGlwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHAKaW5k ZXggOTA3ZDIwYy4uMDNlNTU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwCkBAIC00MTgs NyArNDE4LDcgQEAgdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZv clRoaXNMYXllck9ubHkoKQogCiAgICAgLy8gSW4gdGhlIHNoYWRvdyBsYXllciB0cmVlIHdlIGNy ZWF0ZSBpbiB0aGUgVUkgcHJvY2VzcywgbGF5ZXJzIHdpdGggZGlyZWN0bHkgY29tcG9zaXRlZCBp bWFnZXMgYXJlIGFsd2F5cyBjb25zaWRlcmVkIHRvIGRyYXcgY29udGVudC4KICAgICAvLyBPdGhl cndpc2UsIHdlJ2QgaGF2ZSB0byBjaGVjayB3aGV0aGVyIGFuIGxheWVyIHdpdGggZHJhd3NDb250 ZW50PT1mYWxzZSBoYXMgYSBkaXJlY3RseSBjb21wb3NpdGVkIGltYWdlIG11bHRpcGxlIHRpbWVz LgotICAgIG1fbGF5ZXJJbmZvLmRyYXdzQ29udGVudCA9IGRyYXdzQ29udGVudCgpIHx8IG1faW1h Z2U7CisgICAgbV9sYXllckluZm8uZHJhd3NDb250ZW50ID0gZHJhd3NDb250ZW50KCk7CiAgICAg bV9sYXllckluZm8ubWFzayA9IHRvV2ViTGF5ZXJJRChtYXNrTGF5ZXIoKSk7CiAgICAgbV9sYXll ckluZm8ubWFza3NUb0JvdW5kcyA9IG1hc2tzVG9Cb3VuZHMoKTsKICAgICBtX2xheWVySW5mby5v cGFjaXR5ID0gb3BhY2l0eSgpOwo= 122039 2012-01-11 09:21:16 -0800 2012-01-11 16:20:28 -0800 Patch patch.diff text/plain 3286 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2ZTFjZTAyLi5mZGQ3Yzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMDEtMTEgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdW1dLMl0gRGlyZWN0bHktY29tcG9zaXRlZCBpbWFnZXMgc29tZXRp bWVzIGFwcGVhciB3aXRoIGEgd3JvbmcgZ2VvbWV0cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1ODgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lt b24gSGF1c21hbm4uCisKKyAgICAgICAgV2hlbiBhc3NpZ25pbmcgYSBkaXJlY3RseSBjb21wb3Np dGVkIGltYWdlIHRvIGEgVGV4dHVyZU1hcHBlck5vZGUgaW4gV2ViS2l0Miwgd2UgdGFrZQorICAg ICAgICBjb250ZW50c1JlY3QoKSBvbnRvIGFjY291bnQuIEhvd2V2ZXIsIGNvbnRlbnRzUmVjdCgp IG1pZ2h0IGJlIGNoYW5nZWQgYWZ0ZXIgdGhlIGltYWdlCisgICAgICAgIGlzIGFscmVhZHkgYXNz aWduZWQuCisgICAgICAgIFdlIGhhdmUgdG8gcmVhc3NpZ24gdGhlIGltYWdlIHdoZW4gY29udGVu dHNSZWN0KCkgY2hhbmdlcy4gVGhpcyBpcyBhIHByZXR0eSBjaGVhcAorICAgICAgICBvcGVyYXRp b24sIHNpbmNlIHRoZSBpbWFnZSBpcyBhbHJlYWR5IGNvbnZlcnRlZCB0byBhIHRleHR1cmUgYW5k IHdlIHNpbXBseSBjaGFuZ2UgdGhlCisgICAgICAgIGdlb21ldHJpYyB2YWx1ZXMuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvcXQvTGF5ZXJUcmVlSG9zdFByb3h5UXQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpMYXllclRyZWVIb3N0UHJveHk6OnN5bmNMYXllclBhcmFtZXRlcnMpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNM YXllck9ubHkpOgorCiAyMDEyLTAxLTExICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtl bm5ldGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIEFkZCB0aGUgZWRpdG9yIHJlY3QgdG8g dGhlIEVkaXRvclN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv TGF5ZXJUcmVlSG9zdFByb3h5UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0xh eWVyVHJlZUhvc3RQcm94eVF0LmNwcAppbmRleCA2MDczNmIxLi5kYmVmZWE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvTGF5ZXJUcmVlSG9zdFByb3h5UXQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9MYXllclRyZWVIb3N0UHJveHlRdC5jcHAK QEAgLTI0NSw2ICsyNDUsNyBAQCB2b2lkIExheWVyVHJlZUhvc3RQcm94eTo6c3luY0xheWVyUGFy YW1ldGVycyhjb25zdCBXZWJMYXllckluZm8mIGxheWVySW5mbykKICAgICBlbnN1cmVMYXllcihp ZCk7CiAgICAgTGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9sYXllcnMuZmluZChpZCk7CiAgICAg R3JhcGhpY3NMYXllciogbGF5ZXIgPSBpdC0+c2Vjb25kOworICAgIGJvb2wgbmVlZHNUb1VwZGF0 ZUltYWdlVGlsZXMgPSBsYXllckluZm8uaW1hZ2VJc1VwZGF0ZWQgfHwgbGF5ZXJJbmZvLmNvbnRl bnRzUmVjdCAhPSBsYXllci0+Y29udGVudHNSZWN0KCk7CiAKICAgICBsYXllci0+c2V0TmFtZShs YXllckluZm8ubmFtZSk7CiAKQEAgLTI2MSw3ICsyNjIsNyBAQCB2b2lkIExheWVyVHJlZUhvc3RQ cm94eTo6c3luY0xheWVyUGFyYW1ldGVycyhjb25zdCBXZWJMYXllckluZm8mIGxheWVySW5mbykK ICAgICBsYXllci0+c2V0Q29udGVudHNSZWN0KGxheWVySW5mby5jb250ZW50c1JlY3QpOwogICAg IGxheWVyLT5zZXREcmF3c0NvbnRlbnQobGF5ZXJJbmZvLmRyYXdzQ29udGVudCk7CiAKLSAgICBp ZiAobGF5ZXJJbmZvLmltYWdlSXNVcGRhdGVkKQorICAgIGlmIChuZWVkc1RvVXBkYXRlSW1hZ2VU aWxlcykKICAgICAgICAgYXNzaWduSW1hZ2VUb0xheWVyKGxheWVyLCBsYXllckluZm8uaW1hZ2VC YWNraW5nU3RvcmVJRCk7CiAKICAgICAvLyBOZXZlciBtYWtlIHRoZSByb290IGxheWVyIGNsaXAu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJHcmFwaGljc0xheWVyLmNwcAppbmRleCA5MDdkMjBjLi5iYWZlMmFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNz TGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViR3JhcGhpY3NMYXllci5jcHAKQEAgLTQxNSwxMCArNDE1LDcgQEAgdm9pZCBXZWJHcmFwaGlj c0xheWVyOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogICAgIG1fbGF5 ZXJJbmZvLmNoaWxkcmVuVHJhbnNmb3JtID0gY2hpbGRyZW5UcmFuc2Zvcm0oKTsKICAgICBtX2xh eWVySW5mby5jb250ZW50c09wYXF1ZSA9IGNvbnRlbnRzT3BhcXVlKCk7CiAgICAgbV9sYXllcklu Zm8uY29udGVudHNSZWN0ID0gY29udGVudHNSZWN0KCk7Ci0KLSAgICAvLyBJbiB0aGUgc2hhZG93 IGxheWVyIHRyZWUgd2UgY3JlYXRlIGluIHRoZSBVSSBwcm9jZXNzLCBsYXllcnMgd2l0aCBkaXJl Y3RseSBjb21wb3NpdGVkIGltYWdlcyBhcmUgYWx3YXlzIGNvbnNpZGVyZWQgdG8gZHJhdyBjb250 ZW50LgotICAgIC8vIE90aGVyd2lzZSwgd2UnZCBoYXZlIHRvIGNoZWNrIHdoZXRoZXIgYW4gbGF5 ZXIgd2l0aCBkcmF3c0NvbnRlbnQ9PWZhbHNlIGhhcyBhIGRpcmVjdGx5IGNvbXBvc2l0ZWQgaW1h Z2UgbXVsdGlwbGUgdGltZXMuCi0gICAgbV9sYXllckluZm8uZHJhd3NDb250ZW50ID0gZHJhd3ND b250ZW50KCkgfHwgbV9pbWFnZTsKKyAgICBtX2xheWVySW5mby5kcmF3c0NvbnRlbnQgPSBkcmF3 c0NvbnRlbnQoKTsKICAgICBtX2xheWVySW5mby5tYXNrID0gdG9XZWJMYXllcklEKG1hc2tMYXll cigpKTsKICAgICBtX2xheWVySW5mby5tYXNrc1RvQm91bmRzID0gbWFza3NUb0JvdW5kcygpOwog ICAgIG1fbGF5ZXJJbmZvLm9wYWNpdHkgPSBvcGFjaXR5KCk7Cg== 122121 2012-01-11 16:20:28 -0800 2012-01-11 16:22:22 -0800 Patch 1: minor improvements to TextureMapperNode patch.diff text/plain 11857 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMGJlZWFhLi41ZDYzNWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTItMDEtMTEgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdW1dLMl0gV2ViUHJvY2Vzc2VzIGNyYXNoZXMgd2hlbiBjb21wb3Np dGVkIHJlZmxlY3Rpb25zL21hc2tzIGFyZSBwcmVzZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTg4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZG9lcyBub3QgZml4IHRoZSBidWcg eWV0LCBidXQgcHJlcGFyZXMgVGV4dHVyZU1hcHBlciBmb3IgdGhlIHJlcXVpcmVkIGZpeC4KKwor ICAgICAgICBTaW1wbGlmeSByZWZsZWN0aW9uLCBtYXNrIGFuZCBpbnRlcm1lZGlhdGUgc3VyZmFj ZSBjb2RlIGluIFdlYkNvcmUuCisgICAgICAgIDEuIEluc3RlYWQgb2YgZXhwbGljaXRseSByZWxl YXNpbmcgaW50ZXJtZWRpYXRlIHN1cmZhY2VzIHRvIHRoZSBwb29sLCB0aGV5IGJlY29tZSByZWxl YXNlZAorICAgICAgICAgICB3aGVuIHRoZXkncmUgZGVyZWZlcmVuY2VkLiBXZSBkbyB0aGF0IGJ5 IGNoZWNraW5nIHRoZSByZWZDb3VudCBvZiB0aGUgdGV4dHVyZSB3aGVuIHJlcXVlc3RlZC4KKyAg ICAgICAgMi4gUmVuYW1lIFRleHR1cmVNYXBwZXJOb2RlOjp0ZXh0dXJlKCkgdG8gZ2V0Rmlyc3RD b250ZW50VGV4dHVyZUZvck1hc2soKSwgYW5kIGFsbG93IHRoZQorICAgICAgICAgICB0ZXh0dXJl IHRvIGNvbWUgZnJvbSB0aGUgZXh0ZXJuYWxseS1tYW5hZ2VkIHRpbGVzLgorICAgICAgICAzLiBS ZXR1cm4gYSB2aXNpYmxlIHJlY3QgZm9yIGEgbWFzayBsYXllciBiYXNlZCBvbiBpdHMgcGFyZW50 LCBzaW5jZSBhIG1hc2sgbGF5ZXIgZG9lc24ndAorICAgICAgICAgICBoYXZlIGdlb21ldHJ5LiBU aGVyZSdzIG5vIG5lZWQgdG8gcmV0dXJuIGEgdmlzaWJsZSByZWN0IGZvciByZXBsaWNhIGxheWVy cywgc2luY2UgdGhleQorICAgICAgICAgICBkb24ndCBoYXZlIHRoZWlyIG93biBjb250ZW50Lgor CisgICAgICAgIGNvbXBvc2l0aW5nL3JlZmxlY3Rpb25zIGFuZCBjb21wb3NpdGluZy9tYXNrcyB0 ZXN0IHRoaXMgY29kZSBwYXRoLiBUaGV5IHN0aWxsIGNyYXNoIGluIFdlYktpdDIsCisgICAgICAg IGJ1dCB3b3JrIGZpbmUgd2l0aCBXZWJLaXQxIGFmdGVyIHRoaXMgY2hhbmdlLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlcjo6YWNxdWlyZVRleHR1cmVGcm9tUG9vbCk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OmNvbGxlY3RWaXNpYmxlQ29udGVudHNSZWN0cyk6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6Z2V0Rmlyc3RDb250ZW50VGV4 dHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToK KyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpwYWludFJlZmxlY3Rpb24pOgor ICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnBhaW50UmVjdXJzaXZlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaDoKKwog MjAxMi0wMS0xMSAgQWRhbSBUcmVhdCAgPGF0cmVhdEByaW0uY29tPgogCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjA4OApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3Bw CmluZGV4IDI2MjJkMjEuLjc5NTE2NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5jcHAKQEAgLTI2LDE5ICsy NiwyMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8Qml0bWFwVGV4dHVyZT4g VGV4dHVyZU1hcHBlcjo6YWNxdWlyZVRleHR1cmVGcm9tUG9vbChjb25zdCBJbnRTaXplJiBzaXpl KQogewotICAgIGlmIChtX3RleHR1cmVQb29sLmlzRW1wdHkoKSkgewotICAgICAgICBSZWZQdHI8 Qml0bWFwVGV4dHVyZT4gc2VsZWN0ZWRUZXh0dXJlID0gY3JlYXRlVGV4dHVyZSgpOwotICAgICAg ICBzZWxlY3RlZFRleHR1cmUtPnJlc2V0KHNpemUsIGZhbHNlKTsKLSAgICAgICAgc2VsZWN0ZWRU ZXh0dXJlLT5sb2NrKCk7Ci0gICAgICAgIHJldHVybiBzZWxlY3RlZFRleHR1cmU7Ci0gICAgfQot Ci0gICAgc2l6ZV90IGluZGV4ID0gMDsKLSAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gc2VsZWN0 ZWRUZXh0dXJlID0gbV90ZXh0dXJlUG9vbFswXTsKKyAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4g c2VsZWN0ZWRUZXh0dXJlOwogCi0gICAgZm9yIChzaXplX3QgaSA9IDE7IGkgPCBtX3RleHR1cmVQ b29sLnNpemUoKTsgKytpKSB7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3RleHR1cmVQ b29sLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiB0ZXh0dXJl ID0gbV90ZXh0dXJlUG9vbFtpXTsKIAorICAgICAgICAvLyBBIHRleHR1cmUgdGhhdCdzIG5vdCB1 c2VkIHdvdWxkIGhhdmUgdG8gcmVmZXJlbmNlcyAtIHRoZSByZWZlcmVuY2UgaW5zaWRlIHRoZSB2 ZWN0b3IsIGFuZCB0aGUgInRleHR1cmUiIGxvY2FsIHZhcmlhYmxlLgorICAgICAgICBpZiAodGV4 dHVyZS0+cmVmQ291bnQoKSA+IDIpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBp ZiAoIXNlbGVjdGVkVGV4dHVyZSkgeworICAgICAgICAgICAgc2VsZWN0ZWRUZXh0dXJlID0gdGV4 dHVyZTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKICAgICAgICAgSW50U2l6 ZSB0ZXh0dXJlU2l6ZSA9IHRleHR1cmUtPnNpemUoKTsKICAgICAgICAgSW50U2l6ZSBzZWxlY3Rl ZFRleHR1cmVTaXplID0gc2VsZWN0ZWRUZXh0dXJlLT5zaXplKCk7CiAKQEAgLTU4LDIyICs1OSwx NiBAQCBQYXNzUmVmUHRyPEJpdG1hcFRleHR1cmU+IFRleHR1cmVNYXBwZXI6OmFjcXVpcmVUZXh0 dXJlRnJvbVBvb2woY29uc3QgSW50U2l6ZSYgcwogICAgICAgICAgICAgY29udGludWU7CiAKICAg ICAgICAgc2VsZWN0ZWRUZXh0dXJlID0gdGV4dHVyZTsKLSAgICAgICAgaW5kZXggPSBpOwogICAg IH0KIAotICAgIG1fdGV4dHVyZVBvb2wucmVtb3ZlKGluZGV4KTsKKyAgICBpZiAoIXNlbGVjdGVk VGV4dHVyZSkgeworICAgICAgICBzZWxlY3RlZFRleHR1cmUgPSBjcmVhdGVUZXh0dXJlKCk7Cisg ICAgICAgIG1fdGV4dHVyZVBvb2wuYXBwZW5kKHNlbGVjdGVkVGV4dHVyZSk7CisgICAgfQorCiAg ICAgc2VsZWN0ZWRUZXh0dXJlLT5yZXNldChzaXplLCBmYWxzZSk7Ci0gICAgc2VsZWN0ZWRUZXh0 dXJlLT5sb2NrKCk7CiAgICAgcmV0dXJuIHNlbGVjdGVkVGV4dHVyZTsKIH0KIAotdm9pZCBUZXh0 dXJlTWFwcGVyOjpyZWxlYXNlVGV4dHVyZVRvUG9vbChCaXRtYXBUZXh0dXJlKiB0ZXh0dXJlKQot ewotICAgIGlmICghdGV4dHVyZSkKLSAgICAgICAgcmV0dXJuOwotICAgIG1fdGV4dHVyZVBvb2wu YXBwZW5kKHRleHR1cmUpOwotICAgIHRleHR1cmUtPnVubG9jaygpOwotfQotCiB9CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlci5oCmluZGV4IGQ4MTMzM2QuLjBjZjNhNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuaApAQCAt MTI2LDEwICsxMjYsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGJlZ2luUGFpbnRpbmco KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZW5kUGFpbnRpbmcoKSB7IH0KIAotICAgIHZpcnR1YWwg dm9pZCByZWxlYXNlVGV4dHVyZVRvUG9vbChCaXRtYXBUZXh0dXJlKiBzdXJmYWNlKTsKICAgICB2 aXJ0dWFsIFBhc3NSZWZQdHI8Qml0bWFwVGV4dHVyZT4gYWNxdWlyZVRleHR1cmVGcm9tUG9vbChj b25zdCBJbnRTaXplJik7CiAKLQogcHJvdGVjdGVkOgogICAgIFRleHR1cmVNYXBwZXIoKQogICAg ICAgICA6IG1faW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbkRlZmF1bHQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJOb2RlLmNwcAppbmRleCA2MjMxNGFkLi43NTZjZmIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyTm9kZS5jcHAKQEAgLTIyMCwxMCArMjIwLDYgQEAgYm9vbCBUZXh0dXJlTWFwcGVyTm9k ZTo6Y29sbGVjdFZpc2libGVDb250ZW50c1JlY3RzKE5vZGVSZWN0TWFwJiByZWN0TWFwLCBjb25z dAogCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtX2NoaWxkcmVuLnNpemUoKTsgKytpKQogICAg ICAgICBleGlzdHMgPSBtX2NoaWxkcmVuW2ldLT5jb2xsZWN0VmlzaWJsZUNvbnRlbnRzUmVjdHMo cmVjdE1hcCwgcm9vdFZpc2libGVSZWN0KSB8fCBleGlzdHM7Ci0gICAgaWYgKG1fc3RhdGUubWFz a0xheWVyKQotICAgICAgICBleGlzdHMgPSBtX3N0YXRlLm1hc2tMYXllci0+Y29sbGVjdFZpc2li bGVDb250ZW50c1JlY3RzKHJlY3RNYXAsIHJvb3RWaXNpYmxlUmVjdCkgfHwgZXhpc3RzOwotICAg IGlmIChtX3N0YXRlLnJlcGxpY2FMYXllcikKLSAgICAgICAgZXhpc3RzID0gbV9zdGF0ZS5yZXBs aWNhTGF5ZXItPmNvbGxlY3RWaXNpYmxlQ29udGVudHNSZWN0cyhyZWN0TWFwLCByb290VmlzaWJs ZVJlY3QpIHx8IGV4aXN0czsKIAogICAgIC8vIE5vbi1pbnZlcnRpYmxlIGxheWVycyBhcmUgbm90 IHZpc2libGUuCiAgICAgaWYgKCFtX3RyYW5zZm9ybXMudGFyZ2V0LmlzSW52ZXJ0aWJsZSgpKQpA QCAtMjM5LDYgKzIzNSwxMCBAQCBib29sIFRleHR1cmVNYXBwZXJOb2RlOjpjb2xsZWN0VmlzaWJs ZUNvbnRlbnRzUmVjdHMoTm9kZVJlY3RNYXAmIHJlY3RNYXAsIGNvbnN0CiAgICAgICAgIHZpc2li bGVDb250ZW50c1JlY3QuaW50ZXJzZWN0KHZpc2libGVSZWN0SW5Mb2NhbENvb3JkaW5hdGVzKTsK ICAgICB9CiAKKyAgICAvLyBUaGUgdmlzaWJsZSByZWN0IGZvciBhIG1hc2sgbGF5ZXIgaXMgYWx3 YXlzIGVxdWFsIHRvIHRoZSB2aXNpYmxlIHJlY3Qgb2YgdGhlIG1hc2tlZCBsYXllci4KKyAgICBp ZiAobV9zdGF0ZS5tYXNrTGF5ZXIpCisgICAgICAgIHJlY3RNYXAuYWRkKG1fc3RhdGUubWFza0xh eWVyLCBtX3N0YXRlLnZpc2libGVSZWN0KTsKKwogICAgIGlmICh2aXNpYmxlQ29udGVudHNSZWN0 LmlzRW1wdHkoKSB8fCB2aXNpYmxlQ29udGVudHNSZWN0ID09IG1fc3RhdGUudmlzaWJsZVJlY3Qp CiAgICAgICAgIHJldHVybiBleGlzdHM7CiAKQEAgLTM1Nyw2ICszNTcsMjMgQEAgRmxvYXRSZWN0 IFRleHR1cmVNYXBwZXJOb2RlOjp0YXJnZXRSZWN0Rm9yVGlsZVJlY3QoY29uc3QgRmxvYXRSZWN0 JiB0YXJnZXRSZWN0LAogICAgICAgICAgICAgICAgIHRpbGVSZWN0LmhlaWdodCgpKTsKIH0KIAor Qml0bWFwVGV4dHVyZSogVGV4dHVyZU1hcHBlck5vZGU6OmdldEZpcnN0Q29udGVudFRleHR1cmVG b3JNYXNrKCkKK3sKKyNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKKyAgICBpZiAobV9zdGF0 ZS50aWxlT3duZXJzaGlwID09IEV4dGVybmFsbHlNYW5hZ2VkVGlsZXMpIHsKKyAgICAgICAgSGFz aE1hcDxpbnQsIEV4dGVybmFsbHlNYW5hZ2VkVGlsZT46Oml0ZXJhdG9yIGVuZCA9IG1fZXh0ZXJu YWxseU1hbmFnZWRUaWxlcy5lbmQoKTsKKyAgICAgICAgZm9yIChIYXNoTWFwPGludCwgRXh0ZXJu YWxseU1hbmFnZWRUaWxlPjo6aXRlcmF0b3IgbWFwSXRlcmF0b3IgPSBtX2V4dGVybmFsbHlNYW5h Z2VkVGlsZXMuYmVnaW4oKTsgbWFwSXRlcmF0b3IgIT0gZW5kOyArK21hcEl0ZXJhdG9yKSB7Cisg ICAgICAgICAgICBpZiAoQml0bWFwVGV4dHVyZSogdGV4dHVyZSA9IG1hcEl0ZXJhdG9yLT5zZWNv bmQuZnJvbnRCdWZmZXIudGV4dHVyZS5nZXQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdGV4 dHVyZTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiAwOworICAgIH0KKyNlbmRpZgorICAg IHJldHVybiBtX293bmVkVGlsZXMuaXNFbXB0eSgpID8gMCA6IG1fb3duZWRUaWxlc1swXS50ZXh0 dXJlLmdldCgpOworfQorCisKIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZihjb25z dCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogewogICAgIGlmIChtX3NpemUu aXNFbXB0eSgpIHx8ICghbV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9jdXJyZW50Q29udGVudC5j b250ZW50VHlwZSA9PSBIVE1MQ29udGVudFR5cGUpKQpAQCAtMzY2LDkgKzM4Myw5IEBAIHZvaWQg VGV4dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRp b25zJiBvcHRpb25zKQogICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiByZXBsaWNhTWFza1RleHR1 cmU7CiAKICAgICBpZiAobV9zdGF0ZS5tYXNrTGF5ZXIpCi0gICAgICAgIG1hc2tUZXh0dXJlID0g bV9zdGF0ZS5tYXNrTGF5ZXItPnRleHR1cmUoKTsKKyAgICAgICAgbWFza1RleHR1cmUgPSBtX3N0 YXRlLm1hc2tMYXllci0+Z2V0Rmlyc3RDb250ZW50VGV4dHVyZUZvck1hc2soKTsKICAgICBpZiAo bV9zdGF0ZS5yZXBsaWNhTGF5ZXIgJiYgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3RhdGUubWFz a0xheWVyKQotICAgICAgICByZXBsaWNhTWFza1RleHR1cmUgPSBtX3N0YXRlLnJlcGxpY2FMYXll ci0+bV9zdGF0ZS5tYXNrTGF5ZXItPnRleHR1cmUoKTsKKyAgICAgICAgcmVwbGljYU1hc2tUZXh0 dXJlID0gbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3RhdGUubWFza0xheWVyLT5nZXRGaXJzdENv bnRlbnRUZXh0dXJlRm9yTWFzaygpOwogCiAgICAgZmxvYXQgb3BhY2l0eSA9IG9wdGlvbnMuaXNT dXJmYWNlID8gMSA6IG9wdGlvbnMub3BhY2l0eTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0UmVjdCA9 IHRoaXMtPnRhcmdldFJlY3QoKTsKQEAgLTQ3MCwxNiArNDg3LDEzIEBAIGJvb2wgVGV4dHVyZU1h cHBlck5vZGU6OnBhaW50UmVmbGVjdGlvbihjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25z JiBvcHRpb25zCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIFJlZlB0cjxCaXRtYXBUZXh0 dXJlPiBzdXJmYWNlKGNvbnRlbnRTdXJmYWNlKTsKKyAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4g bWFza1RleHR1cmUgPSBtX3N0YXRlLm1hc2tMYXllciA/IG1fc3RhdGUubWFza0xheWVyLT5nZXRG aXJzdENvbnRlbnRUZXh0dXJlRm9yTWFzaygpIDogMDsKICAgICBSZWZQdHI8Qml0bWFwVGV4dHVy ZT4gbWFza1N1cmZhY2U7CiAgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IHJlcGxpY2FNYXNrU3Vy ZmFjZTsKICAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gcmVwbGljYU1hc2tUZXh0dXJlOwogCiAg ICAgaWYgKFRleHR1cmVNYXBwZXJOb2RlKiByZXBsaWNhTWFzayA9IG1fc3RhdGUucmVwbGljYUxh eWVyLT5tX3N0YXRlLm1hc2tMYXllcikKLSAgICAgICAgcmVwbGljYU1hc2tUZXh0dXJlID0gcmVw bGljYU1hc2stPnRleHR1cmUoKTsKLQotICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiBtYXNrVGV4 dHVyZTsKLSAgICBpZiAoVGV4dHVyZU1hcHBlck5vZGUqIG1hc2sgPSBtX3N0YXRlLm1hc2tMYXll cikKLSAgICAgICAgbWFza1RleHR1cmUgPSBtYXNrLT50ZXh0dXJlKCk7CisgICAgICAgIHJlcGxp Y2FNYXNrVGV4dHVyZSA9IHJlcGxpY2FNYXNrLT5nZXRGaXJzdENvbnRlbnRUZXh0dXJlRm9yTWFz aygpOwogCiAgICAgY29uc3QgSW50U2l6ZSB2aWV3cG9ydFNpemUgPSBvcHRpb25zLnRleHR1cmVN YXBwZXItPnZpZXdwb3J0U2l6ZSgpOwogICAgIGNvbnN0IGJvb2wgdXNlSW50ZXJtZWRpYXRlQnVm ZmVyRm9yUmVwbGljYSA9IG1fc3RhdGUucmVwbGljYUxheWVyICYmIG9wdGlvbnMub3BhY2l0eSA8 IDAuOTk7CkBAIC01MDcsNyArNTIxLDYgQEAgYm9vbCBUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRS ZWZsZWN0aW9uKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMKICAgICAg ICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IG1hc2tTdXJmYWNlID0gb3B0aW9ucy50ZXh0dXJlTWFw cGVyLT5hY3F1aXJlVGV4dHVyZUZyb21Qb29sKG9wdGlvbnMudGV4dHVyZU1hcHBlci0+dmlld3Bv cnRTaXplKCkpOwogICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmJpbmRTdXJmYWNlKG1h c2tTdXJmYWNlLmdldCgpKTsKICAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3VGV4 dHVyZSgqc3VyZmFjZS5nZXQoKSwgdmlld3BvcnRSZWN0LCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCgp LCAxLCBtYXNrVGV4dHVyZS5nZXQoKSk7Ci0gICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ cmVsZWFzZVRleHR1cmVUb1Bvb2woc3VyZmFjZS5nZXQoKSk7CiAgICAgICAgIHN1cmZhY2UgPSBt YXNrU3VyZmFjZTsKICAgICAgICAgbWFza1RleHR1cmUuY2xlYXIoKTsKICAgICB9CkBAIC01MTgs NyArNTMxLDYgQEAgYm9vbCBUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRSZWZsZWN0aW9uKGNvbnN0 IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMKICAgICAgICAgb3B0aW9ucy50ZXh0 dXJlTWFwcGVyLT5iaW5kU3VyZmFjZShyZXBsaWNhU3VyZmFjZS5nZXQoKSk7CiAgICAgICAgIG9w dGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1RleHR1cmUoKnN1cmZhY2UuZ2V0KCksIHZpZXdwb3J0 UmVjdCwgbV90cmFuc2Zvcm1zLnJlcGxpY2EsIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX29wYWNp dHksIHJlcGxpY2FNYXNrVGV4dHVyZS5nZXQoKSk7CiAgICAgICAgIG9wdGlvbnMudGV4dHVyZU1h cHBlci0+ZHJhd1RleHR1cmUoKnN1cmZhY2UuZ2V0KCksIHZpZXdwb3J0UmVjdCwgVHJhbnNmb3Jt YXRpb25NYXRyaXgoKSwgMSwgbWFza1RleHR1cmUuZ2V0KCkpOwotICAgICAgICBvcHRpb25zLnRl eHR1cmVNYXBwZXItPnJlbGVhc2VUZXh0dXJlVG9Qb29sKHN1cmZhY2UuZ2V0KCkpOwogICAgICAg ICBzdXJmYWNlID0gcmVwbGljYVN1cmZhY2U7CiAgICAgfQogCkBAIC01MzAsMTAgKzU0Miw2IEBA IGJvb2wgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50UmVmbGVjdGlvbihjb25zdCBUZXh0dXJlTWFw cGVyUGFpbnRPcHRpb25zJiBvcHRpb25zCiAKICAgICAvLyBEcmF3IHRoZSBvcmlnaW5hbC4KICAg ICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmRyYXdUZXh0dXJlKCpzdXJmYWNlLmdldCgpLCB2aWV3 cG9ydFJlY3QsIFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIG9wdGlvbnMub3BhY2l0eSwgbWFza1Rl eHR1cmUuZ2V0KCkpOwotCi0gICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5yZWxlYXNlVGV4dHVy ZVRvUG9vbChtYXNrU3VyZmFjZS5nZXQoKSk7Ci0gICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5y ZWxlYXNlVGV4dHVyZVRvUG9vbChyZXBsaWNhTWFza1N1cmZhY2UuZ2V0KCkpOwotCiAgICAgcmV0 dXJuIHRydWU7CiB9CiAKQEAgLTU4MiwxMyArNTkwLDExIEBAIHZvaWQgVGV4dHVyZU1hcHBlck5v ZGU6OnBhaW50UmVjdXJzaXZlKFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMgb3B0aW9ucykKIAog ICAgIHBhaW50U2VsZkFuZENoaWxkcmVuKG9wdGlvbnMsIG9wdGlvbnNGb3JEZXNjZW5kYW50cyk7 CiAKLSAgICBpZiAoIXBhaW50UmVmbGVjdGlvbihvcHRpb25zLCBzdXJmYWNlLmdldCgpKSkgewot ICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmJpbmRTdXJmYWNlKG9wdGlvbnMuc3VyZmFj ZSk7Ci0gICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1RleHR1cmUoKnN1cmZhY2Uu Z2V0KCksIHZpZXdwb3J0UmVjdCwgVHJhbnNmb3JtYXRpb25NYXRyaXgoKSwgb3B0aW9ucy5vcGFj aXR5LCBtYXNrU3VyZmFjZS5nZXQoKSk7Ci0gICAgfQorICAgIGlmIChwYWludFJlZmxlY3Rpb24o b3B0aW9ucywgc3VyZmFjZS5nZXQoKSkpCisgICAgICAgIHJldHVybjsKIAotICAgIG9wdGlvbnMu dGV4dHVyZU1hcHBlci0+cmVsZWFzZVRleHR1cmVUb1Bvb2woc3VyZmFjZS5nZXQoKSk7Ci0gICAg b3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5yZWxlYXNlVGV4dHVyZVRvUG9vbChtYXNrU3VyZmFjZS5n ZXQoKSk7CisgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5iaW5kU3VyZmFjZShvcHRpb25zLnN1 cmZhY2UpOworICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1RleHR1cmUoKnN1cmZhY2Uu Z2V0KCksIHZpZXdwb3J0UmVjdCwgVHJhbnNmb3JtYXRpb25NYXRyaXgoKSwgb3B0aW9ucy5vcGFj aXR5LCBtYXNrU3VyZmFjZS5nZXQoKSk7CiB9CiAKIFRleHR1cmVNYXBwZXJOb2RlOjp+VGV4dHVy ZU1hcHBlck5vZGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaAppbmRleCA0ZWUzNzU3Li5lZDNiNzZi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlck5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaApAQCAtMTkxLDcgKzE5MSw3IEBAIHByaXZhdGU6CiAg ICAgc3RhdGljIGludCBjb21wYXJlR3JhcGhpY3NMYXllcnNaVmFsdWUoY29uc3Qgdm9pZCogYSwg Y29uc3Qgdm9pZCogYik7CiAgICAgc3RhdGljIHZvaWQgc29ydEJ5Wk9yZGVyKFZlY3RvcjxUZXh0 dXJlTWFwcGVyTm9kZSogPiYgYXJyYXksIGludCBmaXJzdCwgaW50IGxhc3QpOwogCi0gICAgQml0 bWFwVGV4dHVyZSogdGV4dHVyZSgpIHsgcmV0dXJuIG1fb3duZWRUaWxlcy5pc0VtcHR5KCkgPyAw IDogbV9vd25lZFRpbGVzWzBdLnRleHR1cmUuZ2V0KCk7IH0KKyAgICBCaXRtYXBUZXh0dXJlKiBn ZXRGaXJzdENvbnRlbnRUZXh0dXJlRm9yTWFzaygpOwogCiAgICAgdm9pZCBwYWludFJlY3Vyc2l2 ZShUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zKTsKICAgICBib29sIHBhaW50UmVmbGVjdGlvbihj b25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiwgQml0bWFwVGV4dHVyZSogc3VyZmFjZSk7 Cg== 122122 2012-01-11 16:22:22 -0800 2012-01-11 16:26:32 -0800 Patch 1: minor improvements to TextureMapperNode patch.diff text/plain 11858 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMGJlZWFhLi41ZDYzNWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTItMDEtMTEgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdW1dLMl0gV2ViUHJvY2Vzc2VzIGNyYXNoZXMgd2hlbiBjb21wb3Np dGVkIHJlZmxlY3Rpb25zL21hc2tzIGFyZSBwcmVzZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTg4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZG9lcyBub3QgZml4IHRoZSBidWcg eWV0LCBidXQgcHJlcGFyZXMgVGV4dHVyZU1hcHBlciBmb3IgdGhlIHJlcXVpcmVkIGZpeC4KKwor ICAgICAgICBTaW1wbGlmeSByZWZsZWN0aW9uLCBtYXNrIGFuZCBpbnRlcm1lZGlhdGUgc3VyZmFj ZSBjb2RlIGluIFdlYkNvcmUuCisgICAgICAgIDEuIEluc3RlYWQgb2YgZXhwbGljaXRseSByZWxl YXNpbmcgaW50ZXJtZWRpYXRlIHN1cmZhY2VzIHRvIHRoZSBwb29sLCB0aGV5IGJlY29tZSByZWxl YXNlZAorICAgICAgICAgICB3aGVuIHRoZXkncmUgZGVyZWZlcmVuY2VkLiBXZSBkbyB0aGF0IGJ5 IGNoZWNraW5nIHRoZSByZWZDb3VudCBvZiB0aGUgdGV4dHVyZSB3aGVuIHJlcXVlc3RlZC4KKyAg ICAgICAgMi4gUmVuYW1lIFRleHR1cmVNYXBwZXJOb2RlOjp0ZXh0dXJlKCkgdG8gZ2V0Rmlyc3RD b250ZW50VGV4dHVyZUZvck1hc2soKSwgYW5kIGFsbG93IHRoZQorICAgICAgICAgICB0ZXh0dXJl IHRvIGNvbWUgZnJvbSB0aGUgZXh0ZXJuYWxseS1tYW5hZ2VkIHRpbGVzLgorICAgICAgICAzLiBS ZXR1cm4gYSB2aXNpYmxlIHJlY3QgZm9yIGEgbWFzayBsYXllciBiYXNlZCBvbiBpdHMgcGFyZW50 LCBzaW5jZSBhIG1hc2sgbGF5ZXIgZG9lc24ndAorICAgICAgICAgICBoYXZlIGdlb21ldHJ5LiBU aGVyZSdzIG5vIG5lZWQgdG8gcmV0dXJuIGEgdmlzaWJsZSByZWN0IGZvciByZXBsaWNhIGxheWVy cywgc2luY2UgdGhleQorICAgICAgICAgICBkb24ndCBoYXZlIHRoZWlyIG93biBjb250ZW50Lgor CisgICAgICAgIGNvbXBvc2l0aW5nL3JlZmxlY3Rpb25zIGFuZCBjb21wb3NpdGluZy9tYXNrcyB0 ZXN0IHRoaXMgY29kZSBwYXRoLiBUaGV5IHN0aWxsIGNyYXNoIGluIFdlYktpdDIsCisgICAgICAg IGJ1dCB3b3JrIGZpbmUgd2l0aCBXZWJLaXQxIGFmdGVyIHRoaXMgY2hhbmdlLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlcjo6YWNxdWlyZVRleHR1cmVGcm9tUG9vbCk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OmNvbGxlY3RWaXNpYmxlQ29udGVudHNSZWN0cyk6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6Z2V0Rmlyc3RDb250ZW50VGV4 dHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToK KyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpwYWludFJlZmxlY3Rpb24pOgor ICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnBhaW50UmVjdXJzaXZlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaDoKKwog MjAxMi0wMS0xMSAgQWRhbSBUcmVhdCAgPGF0cmVhdEByaW0uY29tPgogCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjA4OApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXIuY3Bw CmluZGV4IDI2MjJkMjEuLjM0NmVjN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5jcHAKQEAgLTI2LDE5ICsy NiwyMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8Qml0bWFwVGV4dHVyZT4g VGV4dHVyZU1hcHBlcjo6YWNxdWlyZVRleHR1cmVGcm9tUG9vbChjb25zdCBJbnRTaXplJiBzaXpl KQogewotICAgIGlmIChtX3RleHR1cmVQb29sLmlzRW1wdHkoKSkgewotICAgICAgICBSZWZQdHI8 Qml0bWFwVGV4dHVyZT4gc2VsZWN0ZWRUZXh0dXJlID0gY3JlYXRlVGV4dHVyZSgpOwotICAgICAg ICBzZWxlY3RlZFRleHR1cmUtPnJlc2V0KHNpemUsIGZhbHNlKTsKLSAgICAgICAgc2VsZWN0ZWRU ZXh0dXJlLT5sb2NrKCk7Ci0gICAgICAgIHJldHVybiBzZWxlY3RlZFRleHR1cmU7Ci0gICAgfQot Ci0gICAgc2l6ZV90IGluZGV4ID0gMDsKLSAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gc2VsZWN0 ZWRUZXh0dXJlID0gbV90ZXh0dXJlUG9vbFswXTsKKyAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4g c2VsZWN0ZWRUZXh0dXJlOwogCi0gICAgZm9yIChzaXplX3QgaSA9IDE7IGkgPCBtX3RleHR1cmVQ b29sLnNpemUoKTsgKytpKSB7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3RleHR1cmVQ b29sLnNpemUoKTsgKytpKSB7CiAgICAgICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiB0ZXh0dXJl ID0gbV90ZXh0dXJlUG9vbFtpXTsKIAorICAgICAgICAvLyBBIHRleHR1cmUgdGhhdCdzIG5vdCB1 c2VkIHdvdWxkIGhhdmUgdHdvIHJlZmVyZW5jZXMgLSB0aGUgcmVmZXJlbmNlIGluc2lkZSB0aGUg dmVjdG9yLCBhbmQgdGhlICJ0ZXh0dXJlIiBsb2NhbCB2YXJpYWJsZS4KKyAgICAgICAgaWYgKHRl eHR1cmUtPnJlZkNvdW50KCkgPiAyKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAg aWYgKCFzZWxlY3RlZFRleHR1cmUpIHsKKyAgICAgICAgICAgIHNlbGVjdGVkVGV4dHVyZSA9IHRl eHR1cmU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCiAgICAgICAgIEludFNp emUgdGV4dHVyZVNpemUgPSB0ZXh0dXJlLT5zaXplKCk7CiAgICAgICAgIEludFNpemUgc2VsZWN0 ZWRUZXh0dXJlU2l6ZSA9IHNlbGVjdGVkVGV4dHVyZS0+c2l6ZSgpOwogCkBAIC01OCwyMiArNTks MTYgQEAgUGFzc1JlZlB0cjxCaXRtYXBUZXh0dXJlPiBUZXh0dXJlTWFwcGVyOjphY3F1aXJlVGV4 dHVyZUZyb21Qb29sKGNvbnN0IEludFNpemUmIHMKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAg ICAgICAgIHNlbGVjdGVkVGV4dHVyZSA9IHRleHR1cmU7Ci0gICAgICAgIGluZGV4ID0gaTsKICAg ICB9CiAKLSAgICBtX3RleHR1cmVQb29sLnJlbW92ZShpbmRleCk7CisgICAgaWYgKCFzZWxlY3Rl ZFRleHR1cmUpIHsKKyAgICAgICAgc2VsZWN0ZWRUZXh0dXJlID0gY3JlYXRlVGV4dHVyZSgpOwor ICAgICAgICBtX3RleHR1cmVQb29sLmFwcGVuZChzZWxlY3RlZFRleHR1cmUpOworICAgIH0KKwog ICAgIHNlbGVjdGVkVGV4dHVyZS0+cmVzZXQoc2l6ZSwgZmFsc2UpOwotICAgIHNlbGVjdGVkVGV4 dHVyZS0+bG9jaygpOwogICAgIHJldHVybiBzZWxlY3RlZFRleHR1cmU7CiB9CiAKLXZvaWQgVGV4 dHVyZU1hcHBlcjo6cmVsZWFzZVRleHR1cmVUb1Bvb2woQml0bWFwVGV4dHVyZSogdGV4dHVyZSkK LXsKLSAgICBpZiAoIXRleHR1cmUpCi0gICAgICAgIHJldHVybjsKLSAgICBtX3RleHR1cmVQb29s LmFwcGVuZCh0ZXh0dXJlKTsKLSAgICB0ZXh0dXJlLT51bmxvY2soKTsKLX0KLQogfQogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXIuaAppbmRleCBkODEzMzNkLi4wY2YzYTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyLmgKQEAg LTEyNiwxMCArMTI2LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBiZWdpblBhaW50aW5n KCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGVuZFBhaW50aW5nKCkgeyB9CiAKLSAgICB2aXJ0dWFs IHZvaWQgcmVsZWFzZVRleHR1cmVUb1Bvb2woQml0bWFwVGV4dHVyZSogc3VyZmFjZSk7CiAgICAg dmlydHVhbCBQYXNzUmVmUHRyPEJpdG1hcFRleHR1cmU+IGFjcXVpcmVUZXh0dXJlRnJvbVBvb2wo Y29uc3QgSW50U2l6ZSYpOwogCi0KIHByb3RlY3RlZDoKICAgICBUZXh0dXJlTWFwcGVyKCkKICAg ICAgICAgOiBtX2ludGVycG9sYXRpb25RdWFsaXR5KEludGVycG9sYXRpb25EZWZhdWx0KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyTm9kZS5jcHAKaW5kZXggNjIzMTRhZC4uNzU2Y2ZiMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2Rl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlck5vZGUuY3BwCkBAIC0yMjAsMTAgKzIyMCw2IEBAIGJvb2wgVGV4dHVyZU1hcHBlck5v ZGU6OmNvbGxlY3RWaXNpYmxlQ29udGVudHNSZWN0cyhOb2RlUmVjdE1hcCYgcmVjdE1hcCwgY29u c3QKIAogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbV9jaGlsZHJlbi5zaXplKCk7ICsraSkKICAg ICAgICAgZXhpc3RzID0gbV9jaGlsZHJlbltpXS0+Y29sbGVjdFZpc2libGVDb250ZW50c1JlY3Rz KHJlY3RNYXAsIHJvb3RWaXNpYmxlUmVjdCkgfHwgZXhpc3RzOwotICAgIGlmIChtX3N0YXRlLm1h c2tMYXllcikKLSAgICAgICAgZXhpc3RzID0gbV9zdGF0ZS5tYXNrTGF5ZXItPmNvbGxlY3RWaXNp YmxlQ29udGVudHNSZWN0cyhyZWN0TWFwLCByb290VmlzaWJsZVJlY3QpIHx8IGV4aXN0czsKLSAg ICBpZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIpCi0gICAgICAgIGV4aXN0cyA9IG1fc3RhdGUucmVw bGljYUxheWVyLT5jb2xsZWN0VmlzaWJsZUNvbnRlbnRzUmVjdHMocmVjdE1hcCwgcm9vdFZpc2li bGVSZWN0KSB8fCBleGlzdHM7CiAKICAgICAvLyBOb24taW52ZXJ0aWJsZSBsYXllcnMgYXJlIG5v dCB2aXNpYmxlLgogICAgIGlmICghbV90cmFuc2Zvcm1zLnRhcmdldC5pc0ludmVydGlibGUoKSkK QEAgLTIzOSw2ICsyMzUsMTAgQEAgYm9vbCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29sbGVjdFZpc2li bGVDb250ZW50c1JlY3RzKE5vZGVSZWN0TWFwJiByZWN0TWFwLCBjb25zdAogICAgICAgICB2aXNp YmxlQ29udGVudHNSZWN0LmludGVyc2VjdCh2aXNpYmxlUmVjdEluTG9jYWxDb29yZGluYXRlcyk7 CiAgICAgfQogCisgICAgLy8gVGhlIHZpc2libGUgcmVjdCBmb3IgYSBtYXNrIGxheWVyIGlzIGFs d2F5cyBlcXVhbCB0byB0aGUgdmlzaWJsZSByZWN0IG9mIHRoZSBtYXNrZWQgbGF5ZXIuCisgICAg aWYgKG1fc3RhdGUubWFza0xheWVyKQorICAgICAgICByZWN0TWFwLmFkZChtX3N0YXRlLm1hc2tM YXllciwgbV9zdGF0ZS52aXNpYmxlUmVjdCk7CisKICAgICBpZiAodmlzaWJsZUNvbnRlbnRzUmVj dC5pc0VtcHR5KCkgfHwgdmlzaWJsZUNvbnRlbnRzUmVjdCA9PSBtX3N0YXRlLnZpc2libGVSZWN0 KQogICAgICAgICByZXR1cm4gZXhpc3RzOwogCkBAIC0zNTcsNiArMzU3LDIzIEBAIEZsb2F0UmVj dCBUZXh0dXJlTWFwcGVyTm9kZTo6dGFyZ2V0UmVjdEZvclRpbGVSZWN0KGNvbnN0IEZsb2F0UmVj dCYgdGFyZ2V0UmVjdCwKICAgICAgICAgICAgICAgICB0aWxlUmVjdC5oZWlnaHQoKSk7CiB9CiAK K0JpdG1hcFRleHR1cmUqIFRleHR1cmVNYXBwZXJOb2RlOjpnZXRGaXJzdENvbnRlbnRUZXh0dXJl Rm9yTWFzaygpCit7CisjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCisgICAgaWYgKG1fc3Rh dGUudGlsZU93bmVyc2hpcCA9PSBFeHRlcm5hbGx5TWFuYWdlZFRpbGVzKSB7CisgICAgICAgIEhh c2hNYXA8aW50LCBFeHRlcm5hbGx5TWFuYWdlZFRpbGU+OjppdGVyYXRvciBlbmQgPSBtX2V4dGVy bmFsbHlNYW5hZ2VkVGlsZXMuZW5kKCk7CisgICAgICAgIGZvciAoSGFzaE1hcDxpbnQsIEV4dGVy bmFsbHlNYW5hZ2VkVGlsZT46Oml0ZXJhdG9yIG1hcEl0ZXJhdG9yID0gbV9leHRlcm5hbGx5TWFu YWdlZFRpbGVzLmJlZ2luKCk7IG1hcEl0ZXJhdG9yICE9IGVuZDsgKyttYXBJdGVyYXRvcikgewor ICAgICAgICAgICAgaWYgKEJpdG1hcFRleHR1cmUqIHRleHR1cmUgPSBtYXBJdGVyYXRvci0+c2Vj b25kLmZyb250QnVmZmVyLnRleHR1cmUuZ2V0KCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRl eHR1cmU7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisjZW5kaWYKKyAg ICByZXR1cm4gbV9vd25lZFRpbGVzLmlzRW1wdHkoKSA/IDAgOiBtX293bmVkVGlsZXNbMF0udGV4 dHVyZS5nZXQoKTsKK30KKworCiB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNlbGYoY29u c3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucykKIHsKICAgICBpZiAobV9zaXpl LmlzRW1wdHkoKSB8fCAoIW1fc3RhdGUuZHJhd3NDb250ZW50ICYmIG1fY3VycmVudENvbnRlbnQu Y29udGVudFR5cGUgPT0gSFRNTENvbnRlbnRUeXBlKSkKQEAgLTM2Niw5ICszODMsOSBAQCB2b2lk IFRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNlbGYoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0 aW9ucyYgb3B0aW9ucykKICAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gcmVwbGljYU1hc2tUZXh0 dXJlOwogCiAgICAgaWYgKG1fc3RhdGUubWFza0xheWVyKQotICAgICAgICBtYXNrVGV4dHVyZSA9 IG1fc3RhdGUubWFza0xheWVyLT50ZXh0dXJlKCk7CisgICAgICAgIG1hc2tUZXh0dXJlID0gbV9z dGF0ZS5tYXNrTGF5ZXItPmdldEZpcnN0Q29udGVudFRleHR1cmVGb3JNYXNrKCk7CiAgICAgaWYg KG1fc3RhdGUucmVwbGljYUxheWVyICYmIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0YXRlLm1h c2tMYXllcikKLSAgICAgICAgcmVwbGljYU1hc2tUZXh0dXJlID0gbV9zdGF0ZS5yZXBsaWNhTGF5 ZXItPm1fc3RhdGUubWFza0xheWVyLT50ZXh0dXJlKCk7CisgICAgICAgIHJlcGxpY2FNYXNrVGV4 dHVyZSA9IG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0YXRlLm1hc2tMYXllci0+Z2V0Rmlyc3RD b250ZW50VGV4dHVyZUZvck1hc2soKTsKIAogICAgIGZsb2F0IG9wYWNpdHkgPSBvcHRpb25zLmlz U3VyZmFjZSA/IDEgOiBvcHRpb25zLm9wYWNpdHk7CiAgICAgRmxvYXRSZWN0IHRhcmdldFJlY3Qg PSB0aGlzLT50YXJnZXRSZWN0KCk7CkBAIC00NzAsMTYgKzQ4NywxMyBAQCBib29sIFRleHR1cmVN YXBwZXJOb2RlOjpwYWludFJlZmxlY3Rpb24oY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9u cyYgb3B0aW9ucwogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBSZWZQdHI8Qml0bWFwVGV4 dHVyZT4gc3VyZmFjZShjb250ZW50U3VyZmFjZSk7CisgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+ IG1hc2tUZXh0dXJlID0gbV9zdGF0ZS5tYXNrTGF5ZXIgPyBtX3N0YXRlLm1hc2tMYXllci0+Z2V0 Rmlyc3RDb250ZW50VGV4dHVyZUZvck1hc2soKSA6IDA7CiAgICAgUmVmUHRyPEJpdG1hcFRleHR1 cmU+IG1hc2tTdXJmYWNlOwogICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiByZXBsaWNhTWFza1N1 cmZhY2U7CiAgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IHJlcGxpY2FNYXNrVGV4dHVyZTsKIAog ICAgIGlmIChUZXh0dXJlTWFwcGVyTm9kZSogcmVwbGljYU1hc2sgPSBtX3N0YXRlLnJlcGxpY2FM YXllci0+bV9zdGF0ZS5tYXNrTGF5ZXIpCi0gICAgICAgIHJlcGxpY2FNYXNrVGV4dHVyZSA9IHJl cGxpY2FNYXNrLT50ZXh0dXJlKCk7Ci0KLSAgICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gbWFza1Rl eHR1cmU7Ci0gICAgaWYgKFRleHR1cmVNYXBwZXJOb2RlKiBtYXNrID0gbV9zdGF0ZS5tYXNrTGF5 ZXIpCi0gICAgICAgIG1hc2tUZXh0dXJlID0gbWFzay0+dGV4dHVyZSgpOworICAgICAgICByZXBs aWNhTWFza1RleHR1cmUgPSByZXBsaWNhTWFzay0+Z2V0Rmlyc3RDb250ZW50VGV4dHVyZUZvck1h c2soKTsKIAogICAgIGNvbnN0IEludFNpemUgdmlld3BvcnRTaXplID0gb3B0aW9ucy50ZXh0dXJl TWFwcGVyLT52aWV3cG9ydFNpemUoKTsKICAgICBjb25zdCBib29sIHVzZUludGVybWVkaWF0ZUJ1 ZmZlckZvclJlcGxpY2EgPSBtX3N0YXRlLnJlcGxpY2FMYXllciAmJiBvcHRpb25zLm9wYWNpdHkg PCAwLjk5OwpAQCAtNTA3LDcgKzUyMSw2IEBAIGJvb2wgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50 UmVmbGVjdGlvbihjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zCiAgICAg ICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiBtYXNrU3VyZmFjZSA9IG9wdGlvbnMudGV4dHVyZU1h cHBlci0+YWNxdWlyZVRleHR1cmVGcm9tUG9vbChvcHRpb25zLnRleHR1cmVNYXBwZXItPnZpZXdw b3J0U2l6ZSgpKTsKICAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5iaW5kU3VyZmFjZSht YXNrU3VyZmFjZS5nZXQoKSk7CiAgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1Rl eHR1cmUoKnN1cmZhY2UuZ2V0KCksIHZpZXdwb3J0UmVjdCwgVHJhbnNmb3JtYXRpb25NYXRyaXgo KSwgMSwgbWFza1RleHR1cmUuZ2V0KCkpOwotICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXIt PnJlbGVhc2VUZXh0dXJlVG9Qb29sKHN1cmZhY2UuZ2V0KCkpOwogICAgICAgICBzdXJmYWNlID0g bWFza1N1cmZhY2U7CiAgICAgICAgIG1hc2tUZXh0dXJlLmNsZWFyKCk7CiAgICAgfQpAQCAtNTE4 LDcgKzUzMSw2IEBAIGJvb2wgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50UmVmbGVjdGlvbihjb25z dCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zCiAgICAgICAgIG9wdGlvbnMudGV4 dHVyZU1hcHBlci0+YmluZFN1cmZhY2UocmVwbGljYVN1cmZhY2UuZ2V0KCkpOwogICAgICAgICBv cHRpb25zLnRleHR1cmVNYXBwZXItPmRyYXdUZXh0dXJlKCpzdXJmYWNlLmdldCgpLCB2aWV3cG9y dFJlY3QsIG1fdHJhbnNmb3Jtcy5yZXBsaWNhLCBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9vcGFj aXR5LCByZXBsaWNhTWFza1RleHR1cmUuZ2V0KCkpOwogICAgICAgICBvcHRpb25zLnRleHR1cmVN YXBwZXItPmRyYXdUZXh0dXJlKCpzdXJmYWNlLmdldCgpLCB2aWV3cG9ydFJlY3QsIFRyYW5zZm9y bWF0aW9uTWF0cml4KCksIDEsIG1hc2tUZXh0dXJlLmdldCgpKTsKLSAgICAgICAgb3B0aW9ucy50 ZXh0dXJlTWFwcGVyLT5yZWxlYXNlVGV4dHVyZVRvUG9vbChzdXJmYWNlLmdldCgpKTsKICAgICAg ICAgc3VyZmFjZSA9IHJlcGxpY2FTdXJmYWNlOwogICAgIH0KIApAQCAtNTMwLDEwICs1NDIsNiBA QCBib29sIFRleHR1cmVNYXBwZXJOb2RlOjpwYWludFJlZmxlY3Rpb24oY29uc3QgVGV4dHVyZU1h cHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucwogCiAgICAgLy8gRHJhdyB0aGUgb3JpZ2luYWwuCiAg ICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3VGV4dHVyZSgqc3VyZmFjZS5nZXQoKSwgdmll d3BvcnRSZWN0LCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpLCBvcHRpb25zLm9wYWNpdHksIG1hc2tU ZXh0dXJlLmdldCgpKTsKLQotICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+cmVsZWFzZVRleHR1 cmVUb1Bvb2wobWFza1N1cmZhY2UuZ2V0KCkpOwotICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ cmVsZWFzZVRleHR1cmVUb1Bvb2wocmVwbGljYU1hc2tTdXJmYWNlLmdldCgpKTsKLQogICAgIHJl dHVybiB0cnVlOwogfQogCkBAIC01ODIsMTMgKzU5MCwxMSBAQCB2b2lkIFRleHR1cmVNYXBwZXJO b2RlOjpwYWludFJlY3Vyc2l2ZShUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zIG9wdGlvbnMpCiAK ICAgICBwYWludFNlbGZBbmRDaGlsZHJlbihvcHRpb25zLCBvcHRpb25zRm9yRGVzY2VuZGFudHMp OwogCi0gICAgaWYgKCFwYWludFJlZmxlY3Rpb24ob3B0aW9ucywgc3VyZmFjZS5nZXQoKSkpIHsK LSAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5iaW5kU3VyZmFjZShvcHRpb25zLnN1cmZh Y2UpOwotICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmRyYXdUZXh0dXJlKCpzdXJmYWNl LmdldCgpLCB2aWV3cG9ydFJlY3QsIFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIG9wdGlvbnMub3Bh Y2l0eSwgbWFza1N1cmZhY2UuZ2V0KCkpOwotICAgIH0KKyAgICBpZiAocGFpbnRSZWZsZWN0aW9u KG9wdGlvbnMsIHN1cmZhY2UuZ2V0KCkpKQorICAgICAgICByZXR1cm47CiAKLSAgICBvcHRpb25z LnRleHR1cmVNYXBwZXItPnJlbGVhc2VUZXh0dXJlVG9Qb29sKHN1cmZhY2UuZ2V0KCkpOwotICAg IG9wdGlvbnMudGV4dHVyZU1hcHBlci0+cmVsZWFzZVRleHR1cmVUb1Bvb2wobWFza1N1cmZhY2Uu Z2V0KCkpOworICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+YmluZFN1cmZhY2Uob3B0aW9ucy5z dXJmYWNlKTsKKyAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmRyYXdUZXh0dXJlKCpzdXJmYWNl LmdldCgpLCB2aWV3cG9ydFJlY3QsIFRyYW5zZm9ybWF0aW9uTWF0cml4KCksIG9wdGlvbnMub3Bh Y2l0eSwgbWFza1N1cmZhY2UuZ2V0KCkpOwogfQogCiBUZXh0dXJlTWFwcGVyTm9kZTo6flRleHR1 cmVNYXBwZXJOb2RlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmgKaW5kZXggNGVlMzc1Ny4uZWQzYjc2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmgKQEAgLTE5MSw3ICsxOTEsNyBAQCBwcml2YXRlOgog ICAgIHN0YXRpYyBpbnQgY29tcGFyZUdyYXBoaWNzTGF5ZXJzWlZhbHVlKGNvbnN0IHZvaWQqIGEs IGNvbnN0IHZvaWQqIGIpOwogICAgIHN0YXRpYyB2b2lkIHNvcnRCeVpPcmRlcihWZWN0b3I8VGV4 dHVyZU1hcHBlck5vZGUqID4mIGFycmF5LCBpbnQgZmlyc3QsIGludCBsYXN0KTsKIAotICAgIEJp dG1hcFRleHR1cmUqIHRleHR1cmUoKSB7IHJldHVybiBtX293bmVkVGlsZXMuaXNFbXB0eSgpID8g MCA6IG1fb3duZWRUaWxlc1swXS50ZXh0dXJlLmdldCgpOyB9CisgICAgQml0bWFwVGV4dHVyZSog Z2V0Rmlyc3RDb250ZW50VGV4dHVyZUZvck1hc2soKTsKIAogICAgIHZvaWQgcGFpbnRSZWN1cnNp dmUoVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyk7CiAgICAgYm9vbCBwYWludFJlZmxlY3Rpb24o Y29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYsIEJpdG1hcFRleHR1cmUqIHN1cmZhY2Up Owo=