86303 2012-05-12 13:50:27 -0700 [Texmap] TextureMapperAnimations does not support keyframe with multiple animations 2012-05-13 10:00:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 igor.oliveira igor.oliveira mrobinson noam webkit.review.bot oldest_to_newest 622407 0 igor.oliveira 2012-05-12 13:50:27 -0700 TextureMapperAnimations uses HashMap<String, TextureMapperAnimation> to store the keyframes animation info, however one keyframe can have more than one animation. 622409 1 141584 igor.oliveira 2012-05-12 13:57:14 -0700 Created attachment 141584 Patch Proposed patch. 622436 2 141584 noam 2012-05-12 18:08:50 -0700 Comment on attachment 141584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141584&action=review > Source/WebCore/ChangeLog:18 > + [Texmap] TextureMapperAnimations does not support keyframe with multiple animations > + https://bugs.webkit.org/show_bug.cgi?id=86303 > + > + Reviewed by NOBODY (OOPS!). > + > + * platform/graphics/texmap/TextureMapperAnimation.cpp: > + (WebCore::TextureMapperAnimations::hasActiveAnimationsOfType): > + (WebCore::TextureMapperAnimations::hasRunningAnimations): > + (WebCore::TextureMapperAnimations::add): > + (WebCore): > + (WebCore::TextureMapperAnimations::pause): > + (WebCore::TextureMapperAnimations::apply): > + * platform/graphics/texmap/TextureMapperAnimation.h: > + (TextureMapperAnimations): Use HashMap<String, Vector<TextureMapperAnimation> >, > + so we can support an keyframe with multiple animations. > + Insufficient changelog. 622459 3 141595 igor.oliveira 2012-05-12 20:54:17 -0700 Created attachment 141595 Patch Patch V2. Changelog improved. 622466 4 141595 noam 2012-05-12 21:19:22 -0700 Comment on attachment 141595 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141595&action=review LGTM, except for some renames > Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp:185 > + const Vector<TextureMapperAnimation>& animation = it->second; animation -> animations > Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp:198 > + const Vector<TextureMapperAnimation>& animation = it->second; ditto 622503 5 141607 igor.oliveira 2012-05-13 09:19:16 -0700 Created attachment 141607 Final patch 622507 6 141607 webkit.review.bot 2012-05-13 10:00:08 -0700 Comment on attachment 141607 Final patch Clearing flags on attachment: 141607 Committed r116899: <http://trac.webkit.org/changeset/116899> 622508 7 webkit.review.bot 2012-05-13 10:00:13 -0700 All reviewed patches have been landed. Closing bug. 141584 2012-05-12 13:57:14 -0700 2012-05-12 20:54:17 -0700 Patch 0001-Texmap-TextureMapperAnimations-does-not-support-keyf.patch text/plain 6501 igor.oliveira RnJvbSBhM2Y2ZTU5NTc2ZWQ5NDgzM2YwMTk2ZWQxNDQ3NzEyNTNmZmQzM2UyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogU2F0LCAxMiBNYXkgMjAxMiAxMzo1MTo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hd ICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyBkb2VzIG5vdCBzdXBwb3J0IGtleWZy YW1lCiB3aXRoIG11bHRpcGxlIGFuaW1hdGlvbnMKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysKIC4uLi9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAgICAgIHwgICA1MSArKysrKysrKysr KysrKy0tLS0tLQogLi4uL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmgg ICAgICAgfCAgICA0ICstCiAzIGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDE3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxN2JhMDgxLi5kNmVkMmU5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTItMDUtMTIgIElnb3IgT2xpdmVpcmEgIDxpZ29yLm9Ac2lzYS5z YW1zdW5nLmNvbT4KKworICAgICAgICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyBk b2VzIG5vdCBzdXBwb3J0IGtleWZyYW1lIHdpdGggbXVsdGlwbGUgYW5pbWF0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYzMDMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNBY3RpdmVBbmltYXRpb25zT2ZUeXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNSdW5uaW5nQW5pbWF0 aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyQW5pbWF0aW9uczo6YWRkKToK KyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckFuaW1h dGlvbnM6OnBhdXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJBbmltYXRpb25z OjphcHBseSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJBbmltYXRpb24uaDoKKyAgICAgICAgKFRleHR1cmVNYXBwZXJBbmltYXRpb25zKTogVXNlIEhh c2hNYXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPiwKKyAgICAgICAg c28gd2UgY2FuIHN1cHBvcnQgYW4ga2V5ZnJhbWUgd2l0aCBtdWx0aXBsZSBhbmltYXRpb25zLgor CiAyMDEyLTA1LTEwICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcmViYXNlbGluZWQgcnVuLWJpbmRpbmdzLXRlc3RzIHJlc3VsdHMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlckFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAKaW5kZXggNGM5MmM1OS4uNjRlNmNjYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmNwcApAQCAtMTgwLDIyICsxODAsMjYg QEAgYm9vbCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uOjppc0FjdGl2ZSgpIGNvbnN0CiAKIGJvb2wg VGV4dHVyZU1hcHBlckFuaW1hdGlvbnM6Omhhc0FjdGl2ZUFuaW1hdGlvbnNPZlR5cGUoQW5pbWF0 ZWRQcm9wZXJ0eUlEIHR5cGUpIGNvbnN0CiB7Ci0gICAgSGFzaE1hcDxTdHJpbmcsIFRleHR1cmVN YXBwZXJBbmltYXRpb24+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2FuaW1hdGlvbnMuZW5kKCk7 Ci0gICAgZm9yIChIYXNoTWFwPFN0cmluZywgVGV4dHVyZU1hcHBlckFuaW1hdGlvbj46OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewot ICAgICAgICBjb25zdCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uJiBhbmltYXRpb24gPSBpdC0+c2Vj b25kOwotICAgICAgICBpZiAoYW5pbWF0aW9uLmlzQWN0aXZlKCkgJiYgYW5pbWF0aW9uLnByb3Bl cnR5KCkgPT0gdHlwZSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIEhhc2hNYXA8U3Ry aW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPjo6Y29uc3RfaXRlcmF0b3IgZW5k ID0gbV9hbmltYXRpb25zLmVuZCgpOworICAgIGZvciAoSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxU ZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9u cy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgY29uc3QgVmVjdG9yPFRleHR1 cmVNYXBwZXJBbmltYXRpb24+JiBhbmltYXRpb24gPSBpdC0+c2Vjb25kOworICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGFuaW1hdGlvbi5zaXplKCk7ICsraSkgeworICAgICAgICAgICAg aWYgKGFuaW1hdGlvbltpXS5pc0FjdGl2ZSgpICYmIGFuaW1hdGlvbltpXS5wcm9wZXJ0eSgpID09 IHR5cGUpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KICAgICB9CiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIFRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNS dW5uaW5nQW5pbWF0aW9ucygpIGNvbnN0CiB7Ci0gICAgSGFzaE1hcDxTdHJpbmcsIFRleHR1cmVN YXBwZXJBbmltYXRpb24+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2FuaW1hdGlvbnMuZW5kKCk7 Ci0gICAgZm9yIChIYXNoTWFwPFN0cmluZywgVGV4dHVyZU1hcHBlckFuaW1hdGlvbj46OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewot ICAgICAgICBjb25zdCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uJiBhbmltYXRpb24gPSBpdC0+c2Vj b25kOwotICAgICAgICBpZiAoYW5pbWF0aW9uLnN0YXRlKCkgPT0gVGV4dHVyZU1hcHBlckFuaW1h dGlvbjo6UGxheWluZ1N0YXRlKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgSGFzaE1h cDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+Ojpjb25zdF9pdGVyYXRv ciBlbmQgPSBtX2FuaW1hdGlvbnMuZW5kKCk7CisgICAgZm9yIChIYXNoTWFwPFN0cmluZywgVmVj dG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9hbmlt YXRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBjb25zdCBWZWN0b3I8 VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4mIGFuaW1hdGlvbiA9IGl0LT5zZWNvbmQ7CisgICAgICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYW5pbWF0aW9uLnNpemUoKTsgKytpKSB7CisgICAgICAg ICAgICBpZiAoYW5pbWF0aW9uW2ldLnN0YXRlKCkgPT0gVGV4dHVyZU1hcHBlckFuaW1hdGlvbjo6 UGxheWluZ1N0YXRlKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CiAg ICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjQ3LDE5ICsyNTEsMzYgQEAgdm9pZCBUZXh0 dXJlTWFwcGVyQW5pbWF0aW9uOjpwYXVzZShkb3VibGUgb2Zmc2V0KQogICAgIG1fcGF1c2VUaW1l ID0gV1RGOjpjdXJyZW50VGltZSgpIC0gb2Zmc2V0OwogfQogCit2b2lkIFRleHR1cmVNYXBwZXJB bmltYXRpb25zOjphZGQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBUZXh0dXJlTWFwcGVyQW5p bWF0aW9uJiBhbmltYXRpb24pCit7CisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJl TWFwcGVyQW5pbWF0aW9uPiA+OjppdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5maW5kKG5hbWUp OworICAgIGlmIChpdCAhPSBtX2FuaW1hdGlvbnMuZW5kKCkpIHsKKyAgICAgICAgaXQtPnNlY29u ZC5hcHBlbmQoYW5pbWF0aW9uKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFZlY3Rv cjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiBhbmltYXRpb25zOworICAgIGFuaW1hdGlvbnMuYXBw ZW5kKGFuaW1hdGlvbik7CisgICAgbV9hbmltYXRpb25zLmFkZChuYW1lLCBhbmltYXRpb25zKTsK K30KKwogdm9pZCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uczo6cGF1c2UoY29uc3QgU3RyaW5nJiBu YW1lLCBkb3VibGUgb2Zmc2V0KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBUZXh0dXJlTWFwcGVy QW5pbWF0aW9uPjo6aXRlcmF0b3IgaXQgPSBtX2FuaW1hdGlvbnMuZmluZChuYW1lKTsKKyAgICBI YXNoTWFwPFN0cmluZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ID46Oml0ZXJhdG9y IGl0ID0gbV9hbmltYXRpb25zLmZpbmQobmFtZSk7CiAgICAgaWYgKGl0ID09IG1fYW5pbWF0aW9u cy5lbmQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIGl0LT5zZWNvbmQucGF1c2Uob2Zmc2V0KTsK KworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgaXQtPnNlY29uZC5zaXplKCk7IGkrKykgCisg ICAgICAgIGl0LT5zZWNvbmRbaV0ucGF1c2Uob2Zmc2V0KTsKIH0KIAogdm9pZCBUZXh0dXJlTWFw cGVyQW5pbWF0aW9uczo6YXBwbHkoVGV4dHVyZU1hcHBlckFuaW1hdGlvbkNsaWVudCogY2xpZW50 KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPjo6aXRlcmF0 b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOwotICAgIGZvciAoSGFzaE1hcDxTdHJpbmcsIFRl eHR1cmVNYXBwZXJBbmltYXRpb24+OjppdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigp OyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGl0LT5zZWNvbmQuYXBwbHkoY2xpZW50KTsKKyAg ICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ID46Oml0ZXJh dG9yIGVuZCA9IG1fYW5pbWF0aW9ucy5lbmQoKTsKKyAgICBmb3IgKEhhc2hNYXA8U3RyaW5nLCBW ZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQgPSBtX2FuaW1hdGlv bnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgaXQtPnNlY29uZC5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIGl0LT5zZWNvbmRbaV0u YXBwbHkoY2xpZW50KTsKKyAgICB9CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlv bi5oCmluZGV4IDdjYjhhN2MuLmQwZTkwYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJBbmltYXRp b24uaApAQCAtNjYsNyArNjYsNyBAQCBjbGFzcyBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyB7CiBw dWJsaWM6CiAgICAgVGV4dHVyZU1hcHBlckFuaW1hdGlvbnMoKSB7IH0KIAotICAgIHZvaWQgYWRk KGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgVGV4dHVyZU1hcHBlckFuaW1hdGlvbiYgYW5pbWF0 aW9uKSB7IG1fYW5pbWF0aW9ucy5hZGQobmFtZSwgYW5pbWF0aW9uKTsgfQorICAgIHZvaWQgYWRk KGNvbnN0IFN0cmluZyYsIGNvbnN0IFRleHR1cmVNYXBwZXJBbmltYXRpb24mKTsKICAgICB2b2lk IHJlbW92ZShjb25zdCBTdHJpbmcmIG5hbWUpIHsgbV9hbmltYXRpb25zLnJlbW92ZShuYW1lKTsg fQogICAgIHZvaWQgcGF1c2UoY29uc3QgU3RyaW5nJiwgZG91YmxlKTsKICAgICB2b2lkIGFwcGx5 KFRleHR1cmVNYXBwZXJBbmltYXRpb25DbGllbnQqKTsKQEAgLTc2LDcgKzc2LDcgQEAgcHVibGlj OgogICAgIGJvb2wgaGFzQWN0aXZlQW5pbWF0aW9uc09mVHlwZShBbmltYXRlZFByb3BlcnR5SUQg dHlwZSkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgSGFzaE1hcDxTdHJpbmcsIFRleHR1cmVNYXBw ZXJBbmltYXRpb24+IG1fYW5pbWF0aW9uczsKKyAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFRl eHR1cmVNYXBwZXJBbmltYXRpb24+ID4gbV9hbmltYXRpb25zOwogfTsKIAogfQotLSAKMS43LjUu NAoK 141595 2012-05-12 20:54:17 -0700 2012-05-13 09:19:16 -0700 Patch 0001-Texmap-TextureMapperAnimations-does-not-support-keyf.patch text/plain 7083 igor.oliveira RnJvbSAzMWNhNTY3NTlkMTZmMTdmNTFjYzM3NDYyZjMzNmExM2UxODZkNzk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogU2F0LCAxMiBNYXkgMjAxMiAxMzo1MTo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hd ICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyBkb2VzIG5vdCBzdXBwb3J0IGtleWZy YW1lCiB3aXRoIG11bHRpcGxlIGFuaW1hdGlvbnMKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI2ICsrKysrKysrKysKIC4uLi9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAgICAgIHwgICA1MSArKysrKysr KysrKysrKy0tLS0tLQogLi4uL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9u LmggICAgICAgfCAgICA0ICstCiAzIGZpbGVzIGNoYW5nZWQsIDY0IGluc2VydGlvbnMoKyksIDE3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxN2JhMDgxLi4yYjBmN2I4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjkgQEAKKzIwMTItMDUtMTIgIElnb3IgT2xpdmVpcmEgIDxpZ29yLm9Ac2lz YS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyQW5pbWF0aW9u cyBkb2VzIG5vdCBzdXBwb3J0IGtleWZyYW1lIHdpdGggbXVsdGlwbGUgYW5pbWF0aW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYzMDMKKworICAg ICAgICBRdCBhbmQgR1RLLCBpbiBXZWJLaXQxLCB1c2UgVGV4dHVyZU1hcHBlciB0byBzdG9yZSBB QyBhbmltYXRpb25zIHVzaW5nCisgICAgICAgIFRleHR1cmVNYXBwZXJBbmltYXRpb25zOjphZGQo a2V5ZnJhbWVOYW1lLCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uKS4gQW5kIHdoZW4gYSAKKyAgICAg ICAgQ1NTIGFuaW1hdGlvbiBhbmltYXRlcyBzZXZlcmFsIENTUyBwcm9wZXJ0aWVzLCBUZXh0dXJl TWFwcGVyQW5pbWF0aW9uczo6YWRkIGlzCisgICAgICAgIGNhbGxlZCBtb3JlIHRoYW4gb25jZSB3 aXRoIHRoZSBzYW1lIGtleWZyYW1lTmFtZSB2YWx1ZS4gSG93ZXZlciwgY3VycmVudGx5LAorICAg ICAgICBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyBjYW4gbm90IHN0b3JlIG1vcmUgdGhhbiBvbmUg YW5pbWF0ZWQgcHJvcGVydHkgaW4gdGhlIGtleWZyYW1lCisgICAgICAgIGJlY2F1c2UgaXQgaXMg dXNpbmcgSGFzaE1hcDxTdHJpbmcsIFRleHR1cmVNYXBwZXJBbmltYXRpb24+LCBhbmQgV2ViS2l0 IEhhc2hNYXAgCisgICAgICAgIGRvZXMgbm90IHN1cHBvcnQgYWRkIHRoZSBzYW1lIGtleSB0d2lj ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNBY3RpdmVBbmltYXRpb25z T2ZUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNS dW5uaW5nQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyQW5pbWF0 aW9uczo6YWRkKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVy ZU1hcHBlckFuaW1hdGlvbnM6OnBhdXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJBbmltYXRpb25zOjphcHBseSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJBbmltYXRpb24uaDoKKyAgICAgICAgKFRleHR1cmVNYXBwZXJBbmltYXRp b25zKTogVXNlIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4g PiwKKyAgICAgICAgc28gd2UgY2FuIHN1cHBvcnQgYW4ga2V5ZnJhbWUgd2l0aCBtdWx0aXBsZSBh bmltYXRpb25zLgorCiAyMDEyLTA1LTEwICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmViYXNlbGluZWQgcnVuLWJpbmRpbmdzLXRlc3Rz IHJlc3VsdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAKaW5kZXggNGM5MmM1 OS4uNjRlNmNjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmNwcApAQCAtMTgw LDIyICsxODAsMjYgQEAgYm9vbCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uOjppc0FjdGl2ZSgpIGNv bnN0CiAKIGJvb2wgVGV4dHVyZU1hcHBlckFuaW1hdGlvbnM6Omhhc0FjdGl2ZUFuaW1hdGlvbnNP ZlR5cGUoQW5pbWF0ZWRQcm9wZXJ0eUlEIHR5cGUpIGNvbnN0CiB7Ci0gICAgSGFzaE1hcDxTdHJp bmcsIFRleHR1cmVNYXBwZXJBbmltYXRpb24+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2FuaW1h dGlvbnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPFN0cmluZywgVGV4dHVyZU1hcHBlckFuaW1h dGlvbj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVu ZDsgKytpdCkgewotICAgICAgICBjb25zdCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uJiBhbmltYXRp b24gPSBpdC0+c2Vjb25kOwotICAgICAgICBpZiAoYW5pbWF0aW9uLmlzQWN0aXZlKCkgJiYgYW5p bWF0aW9uLnByb3BlcnR5KCkgPT0gdHlwZSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg IEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPjo6Y29uc3Rf aXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOworICAgIGZvciAoSGFzaE1hcDxTdHJp bmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9 IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgY29uc3Qg VmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+JiBhbmltYXRpb24gPSBpdC0+c2Vjb25kOwor ICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFuaW1hdGlvbi5zaXplKCk7ICsraSkgewor ICAgICAgICAgICAgaWYgKGFuaW1hdGlvbltpXS5pc0FjdGl2ZSgpICYmIGFuaW1hdGlvbltpXS5w cm9wZXJ0eSgpID09IHR5cGUpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAg IH0KICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIFRleHR1cmVNYXBwZXJBbmlt YXRpb25zOjpoYXNSdW5uaW5nQW5pbWF0aW9ucygpIGNvbnN0CiB7Ci0gICAgSGFzaE1hcDxTdHJp bmcsIFRleHR1cmVNYXBwZXJBbmltYXRpb24+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2FuaW1h dGlvbnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPFN0cmluZywgVGV4dHVyZU1hcHBlckFuaW1h dGlvbj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVu ZDsgKytpdCkgewotICAgICAgICBjb25zdCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uJiBhbmltYXRp b24gPSBpdC0+c2Vjb25kOwotICAgICAgICBpZiAoYW5pbWF0aW9uLnN0YXRlKCkgPT0gVGV4dHVy ZU1hcHBlckFuaW1hdGlvbjo6UGxheWluZ1N0YXRlKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+Ojpj b25zdF9pdGVyYXRvciBlbmQgPSBtX2FuaW1hdGlvbnMuZW5kKCk7CisgICAgZm9yIChIYXNoTWFw PFN0cmluZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ID46OmNvbnN0X2l0ZXJhdG9y IGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBj b25zdCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4mIGFuaW1hdGlvbiA9IGl0LT5zZWNv bmQ7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYW5pbWF0aW9uLnNpemUoKTsgKytp KSB7CisgICAgICAgICAgICBpZiAoYW5pbWF0aW9uW2ldLnN0YXRlKCkgPT0gVGV4dHVyZU1hcHBl ckFuaW1hdGlvbjo6UGxheWluZ1N0YXRlKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwor ICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjQ3LDE5ICsyNTEsMzYg QEAgdm9pZCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uOjpwYXVzZShkb3VibGUgb2Zmc2V0KQogICAg IG1fcGF1c2VUaW1lID0gV1RGOjpjdXJyZW50VGltZSgpIC0gb2Zmc2V0OwogfQogCit2b2lkIFRl eHR1cmVNYXBwZXJBbmltYXRpb25zOjphZGQoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBUZXh0 dXJlTWFwcGVyQW5pbWF0aW9uJiBhbmltYXRpb24pCit7CisgICAgSGFzaE1hcDxTdHJpbmcsIFZl Y3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+OjppdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9u cy5maW5kKG5hbWUpOworICAgIGlmIChpdCAhPSBtX2FuaW1hdGlvbnMuZW5kKCkpIHsKKyAgICAg ICAgaXQtPnNlY29uZC5hcHBlbmQoYW5pbWF0aW9uKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiBhbmltYXRpb25zOworICAgIGFu aW1hdGlvbnMuYXBwZW5kKGFuaW1hdGlvbik7CisgICAgbV9hbmltYXRpb25zLmFkZChuYW1lLCBh bmltYXRpb25zKTsKK30KKwogdm9pZCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uczo6cGF1c2UoY29u c3QgU3RyaW5nJiBuYW1lLCBkb3VibGUgb2Zmc2V0KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBU ZXh0dXJlTWFwcGVyQW5pbWF0aW9uPjo6aXRlcmF0b3IgaXQgPSBtX2FuaW1hdGlvbnMuZmluZChu YW1lKTsKKyAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ ID46Oml0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmZpbmQobmFtZSk7CiAgICAgaWYgKGl0ID09 IG1fYW5pbWF0aW9ucy5lbmQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIGl0LT5zZWNvbmQucGF1 c2Uob2Zmc2V0KTsKKworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgaXQtPnNlY29uZC5zaXpl KCk7IGkrKykgCisgICAgICAgIGl0LT5zZWNvbmRbaV0ucGF1c2Uob2Zmc2V0KTsKIH0KIAogdm9p ZCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uczo6YXBwbHkoVGV4dHVyZU1hcHBlckFuaW1hdGlvbkNs aWVudCogY2xpZW50KQogewotICAgIEhhc2hNYXA8U3RyaW5nLCBUZXh0dXJlTWFwcGVyQW5pbWF0 aW9uPjo6aXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOwotICAgIGZvciAoSGFzaE1h cDxTdHJpbmcsIFRleHR1cmVNYXBwZXJBbmltYXRpb24+OjppdGVyYXRvciBpdCA9IG1fYW5pbWF0 aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCi0gICAgICAgIGl0LT5zZWNvbmQuYXBwbHko Y2xpZW50KTsKKyAgICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRp b24+ID46Oml0ZXJhdG9yIGVuZCA9IG1fYW5pbWF0aW9ucy5lbmQoKTsKKyAgICBmb3IgKEhhc2hN YXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQg PSBtX2FuaW1hdGlvbnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgaXQtPnNlY29uZC5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIGl0 LT5zZWNvbmRbaV0uYXBwbHkoY2xpZW50KTsKKyAgICB9CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0 aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckFuaW1hdGlvbi5oCmluZGV4IDdjYjhhN2MuLmQwZTkwYjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9u LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJBbmltYXRpb24uaApAQCAtNjYsNyArNjYsNyBAQCBjbGFzcyBUZXh0dXJlTWFwcGVyQW5p bWF0aW9ucyB7CiBwdWJsaWM6CiAgICAgVGV4dHVyZU1hcHBlckFuaW1hdGlvbnMoKSB7IH0KIAot ICAgIHZvaWQgYWRkKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgVGV4dHVyZU1hcHBlckFuaW1h dGlvbiYgYW5pbWF0aW9uKSB7IG1fYW5pbWF0aW9ucy5hZGQobmFtZSwgYW5pbWF0aW9uKTsgfQor ICAgIHZvaWQgYWRkKGNvbnN0IFN0cmluZyYsIGNvbnN0IFRleHR1cmVNYXBwZXJBbmltYXRpb24m KTsKICAgICB2b2lkIHJlbW92ZShjb25zdCBTdHJpbmcmIG5hbWUpIHsgbV9hbmltYXRpb25zLnJl bW92ZShuYW1lKTsgfQogICAgIHZvaWQgcGF1c2UoY29uc3QgU3RyaW5nJiwgZG91YmxlKTsKICAg ICB2b2lkIGFwcGx5KFRleHR1cmVNYXBwZXJBbmltYXRpb25DbGllbnQqKTsKQEAgLTc2LDcgKzc2 LDcgQEAgcHVibGljOgogICAgIGJvb2wgaGFzQWN0aXZlQW5pbWF0aW9uc09mVHlwZShBbmltYXRl ZFByb3BlcnR5SUQgdHlwZSkgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAgSGFzaE1hcDxTdHJpbmcs IFRleHR1cmVNYXBwZXJBbmltYXRpb24+IG1fYW5pbWF0aW9uczsKKyAgICBIYXNoTWFwPFN0cmlu ZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ID4gbV9hbmltYXRpb25zOwogfTsKIAog fQotLSAKMS43LjUuNAoK 141607 2012-05-13 09:19:16 -0700 2012-05-13 10:00:08 -0700 Final patch 0001-Texmap-TextureMapperAnimations-does-not-support-keyf.patch text/plain 7090 igor.oliveira RnJvbSBiZTYyOTM4MjI1MmVhYmM2ODNiZDI2OTRiZmIxMjhkYWMwMjY5NGIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogU2F0LCAxMiBNYXkgMjAxMiAxMzo1MTo1MSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hd ICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyBkb2VzIG5vdCBzdXBwb3J0IGtleWZy YW1lCiB3aXRoIG11bHRpcGxlIGFuaW1hdGlvbnMKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI2ICsrKysrKysrKysKIC4uLi9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAgICAgIHwgICA1MSArKysrKysr KysrKysrKy0tLS0tLQogLi4uL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9u LmggICAgICAgfCAgICA0ICstCiAzIGZpbGVzIGNoYW5nZWQsIDY0IGluc2VydGlvbnMoKyksIDE3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxN2JhMDgxLi5mMjg0ZTc3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjkgQEAKKzIwMTItMDUtMTIgIElnb3IgT2xpdmVpcmEgIDxpZ29yLm9Ac2lz YS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyQW5pbWF0aW9u cyBkb2VzIG5vdCBzdXBwb3J0IGtleWZyYW1lIHdpdGggbXVsdGlwbGUgYW5pbWF0aW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYzMDMKKworICAg ICAgICBRdCBhbmQgR1RLLCBpbiBXZWJLaXQxLCB1c2UgVGV4dHVyZU1hcHBlciB0byBzdG9yZSBB QyBhbmltYXRpb25zIHVzaW5nCisgICAgICAgIFRleHR1cmVNYXBwZXJBbmltYXRpb25zOjphZGQo a2V5ZnJhbWVOYW1lLCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uKS4gQW5kIHdoZW4gYSAKKyAgICAg ICAgQ1NTIGFuaW1hdGlvbiBhbmltYXRlcyBzZXZlcmFsIENTUyBwcm9wZXJ0aWVzLCBUZXh0dXJl TWFwcGVyQW5pbWF0aW9uczo6YWRkIGlzCisgICAgICAgIGNhbGxlZCBtb3JlIHRoYW4gb25jZSB3 aXRoIHRoZSBzYW1lIGtleWZyYW1lTmFtZSB2YWx1ZS4gSG93ZXZlciwgY3VycmVudGx5LAorICAg ICAgICBUZXh0dXJlTWFwcGVyQW5pbWF0aW9ucyBjYW4gbm90IHN0b3JlIG1vcmUgdGhhbiBvbmUg YW5pbWF0ZWQgcHJvcGVydHkgaW4gdGhlIGtleWZyYW1lCisgICAgICAgIGJlY2F1c2UgaXQgaXMg dXNpbmcgSGFzaE1hcDxTdHJpbmcsIFRleHR1cmVNYXBwZXJBbmltYXRpb24+LCBhbmQgV2ViS2l0 IEhhc2hNYXAgCisgICAgICAgIGRvZXMgbm90IHN1cHBvcnQgYWRkIHRoZSBzYW1lIGtleSB0d2lj ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOb2FtIFJvc2VudGhhbC4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNBY3RpdmVBbmltYXRpb25z T2ZUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJBbmltYXRpb25zOjpoYXNS dW5uaW5nQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyQW5pbWF0 aW9uczo6YWRkKToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVy ZU1hcHBlckFuaW1hdGlvbnM6OnBhdXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBw ZXJBbmltYXRpb25zOjphcHBseSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJBbmltYXRpb24uaDoKKyAgICAgICAgKFRleHR1cmVNYXBwZXJBbmltYXRp b25zKTogVXNlIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4g PiwKKyAgICAgICAgc28gd2UgY2FuIHN1cHBvcnQgYW4ga2V5ZnJhbWUgd2l0aCBtdWx0aXBsZSBh bmltYXRpb25zLgorCiAyMDEyLTA1LTEwICBFcmlrIEFydmlkc3NvbiAgPGFydkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmViYXNlbGluZWQgcnVuLWJpbmRpbmdzLXRlc3Rz IHJlc3VsdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckFuaW1hdGlvbi5jcHAKaW5kZXggNGM5MmM1 OS4uYWEwMjJhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmNwcApAQCAtMTgw LDIyICsxODAsMjYgQEAgYm9vbCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uOjppc0FjdGl2ZSgpIGNv bnN0CiAKIGJvb2wgVGV4dHVyZU1hcHBlckFuaW1hdGlvbnM6Omhhc0FjdGl2ZUFuaW1hdGlvbnNP ZlR5cGUoQW5pbWF0ZWRQcm9wZXJ0eUlEIHR5cGUpIGNvbnN0CiB7Ci0gICAgSGFzaE1hcDxTdHJp bmcsIFRleHR1cmVNYXBwZXJBbmltYXRpb24+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2FuaW1h dGlvbnMuZW5kKCk7Ci0gICAgZm9yIChIYXNoTWFwPFN0cmluZywgVGV4dHVyZU1hcHBlckFuaW1h dGlvbj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVu ZDsgKytpdCkgewotICAgICAgICBjb25zdCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uJiBhbmltYXRp b24gPSBpdC0+c2Vjb25kOwotICAgICAgICBpZiAoYW5pbWF0aW9uLmlzQWN0aXZlKCkgJiYgYW5p bWF0aW9uLnByb3BlcnR5KCkgPT0gdHlwZSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg IEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPjo6Y29uc3Rf aXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOworICAgIGZvciAoSGFzaE1hcDxTdHJp bmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9 IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgY29uc3Qg VmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+JiBhbmltYXRpb25zID0gaXQtPnNlY29uZDsK KyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhbmltYXRpb25zLnNpemUoKTsgKytpKSB7 CisgICAgICAgICAgICBpZiAoYW5pbWF0aW9uc1tpXS5pc0FjdGl2ZSgpICYmIGFuaW1hdGlvbnNb aV0ucHJvcGVydHkoKSA9PSB0eXBlKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICB9CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBUZXh0dXJlTWFwcGVy QW5pbWF0aW9uczo6aGFzUnVubmluZ0FuaW1hdGlvbnMoKSBjb25zdAogewotICAgIEhhc2hNYXA8 U3RyaW5nLCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9h bmltYXRpb25zLmVuZCgpOwotICAgIGZvciAoSGFzaE1hcDxTdHJpbmcsIFRleHR1cmVNYXBwZXJB bmltYXRpb24+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpIHsKLSAgICAgICAgY29uc3QgVGV4dHVyZU1hcHBlckFuaW1hdGlvbiYgYW5p bWF0aW9uID0gaXQtPnNlY29uZDsKLSAgICAgICAgaWYgKGFuaW1hdGlvbi5zdGF0ZSgpID09IFRl eHR1cmVNYXBwZXJBbmltYXRpb246OlBsYXlpbmdTdGF0ZSkKLSAgICAgICAgICAgIHJldHVybiB0 cnVlOworICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4g Pjo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9hbmltYXRpb25zLmVuZCgpOworICAgIGZvciAoSGFz aE1hcDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+Ojpjb25zdF9pdGVy YXRvciBpdCA9IG1fYW5pbWF0aW9ucy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAg ICAgY29uc3QgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+JiBhbmltYXRpb25zID0gaXQt PnNlY29uZDsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhbmltYXRpb25zLnNpemUo KTsgKytpKSB7CisgICAgICAgICAgICBpZiAoYW5pbWF0aW9uc1tpXS5zdGF0ZSgpID09IFRleHR1 cmVNYXBwZXJBbmltYXRpb246OlBsYXlpbmdTdGF0ZSkKKyAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIHJldHVybiBmYWxzZTsKQEAgLTI0NywxOSAr MjUxLDM2IEBAIHZvaWQgVGV4dHVyZU1hcHBlckFuaW1hdGlvbjo6cGF1c2UoZG91YmxlIG9mZnNl dCkKICAgICBtX3BhdXNlVGltZSA9IFdURjo6Y3VycmVudFRpbWUoKSAtIG9mZnNldDsKIH0KIAor dm9pZCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uczo6YWRkKGNvbnN0IFN0cmluZyYgbmFtZSwgY29u c3QgVGV4dHVyZU1hcHBlckFuaW1hdGlvbiYgYW5pbWF0aW9uKQoreworICAgIEhhc2hNYXA8U3Ry aW5nLCBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gPjo6aXRlcmF0b3IgaXQgPSBtX2Fu aW1hdGlvbnMuZmluZChuYW1lKTsKKyAgICBpZiAoaXQgIT0gbV9hbmltYXRpb25zLmVuZCgpKSB7 CisgICAgICAgIGl0LT5zZWNvbmQuYXBwZW5kKGFuaW1hdGlvbik7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKKyAgICBWZWN0b3I8VGV4dHVyZU1hcHBlckFuaW1hdGlvbj4gYW5pbWF0aW9uczsK KyAgICBhbmltYXRpb25zLmFwcGVuZChhbmltYXRpb24pOworICAgIG1fYW5pbWF0aW9ucy5hZGQo bmFtZSwgYW5pbWF0aW9ucyk7Cit9CisKIHZvaWQgVGV4dHVyZU1hcHBlckFuaW1hdGlvbnM6OnBh dXNlKGNvbnN0IFN0cmluZyYgbmFtZSwgZG91YmxlIG9mZnNldCkKIHsKLSAgICBIYXNoTWFwPFN0 cmluZywgVGV4dHVyZU1hcHBlckFuaW1hdGlvbj46Oml0ZXJhdG9yIGl0ID0gbV9hbmltYXRpb25z LmZpbmQobmFtZSk7CisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5p bWF0aW9uPiA+OjppdGVyYXRvciBpdCA9IG1fYW5pbWF0aW9ucy5maW5kKG5hbWUpOwogICAgIGlm IChpdCA9PSBtX2FuaW1hdGlvbnMuZW5kKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpdC0+c2Vj b25kLnBhdXNlKG9mZnNldCk7CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGl0LT5zZWNv bmQuc2l6ZSgpOyBpKyspIAorICAgICAgICBpdC0+c2Vjb25kW2ldLnBhdXNlKG9mZnNldCk7CiB9 CiAKIHZvaWQgVGV4dHVyZU1hcHBlckFuaW1hdGlvbnM6OmFwcGx5KFRleHR1cmVNYXBwZXJBbmlt YXRpb25DbGllbnQqIGNsaWVudCkKIHsKLSAgICBIYXNoTWFwPFN0cmluZywgVGV4dHVyZU1hcHBl ckFuaW1hdGlvbj46Oml0ZXJhdG9yIGVuZCA9IG1fYW5pbWF0aW9ucy5lbmQoKTsKLSAgICBmb3Ig KEhhc2hNYXA8U3RyaW5nLCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPjo6aXRlcmF0b3IgaXQgPSBt X2FuaW1hdGlvbnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICBpdC0+c2Vjb25k LmFwcGx5KGNsaWVudCk7CisgICAgSGFzaE1hcDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVy QW5pbWF0aW9uPiA+OjppdGVyYXRvciBlbmQgPSBtX2FuaW1hdGlvbnMuZW5kKCk7CisgICAgZm9y IChIYXNoTWFwPFN0cmluZywgVmVjdG9yPFRleHR1cmVNYXBwZXJBbmltYXRpb24+ID46Oml0ZXJh dG9yIGl0ID0gbV9hbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGl0LT5zZWNvbmQuc2l6ZSgpOyArK2kpCisgICAgICAg ICAgICBpdC0+c2Vjb25kW2ldLmFwcGx5KGNsaWVudCk7CisgICAgfQogfQogCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl ckFuaW1hdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJBbmltYXRpb24uaAppbmRleCA3Y2I4YTdjLi5kMGU5MGI1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckFu aW1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmgKQEAgLTY2LDcgKzY2LDcgQEAgY2xhc3MgVGV4dHVyZU1h cHBlckFuaW1hdGlvbnMgewogcHVibGljOgogICAgIFRleHR1cmVNYXBwZXJBbmltYXRpb25zKCkg eyB9CiAKLSAgICB2b2lkIGFkZChjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFRleHR1cmVNYXBw ZXJBbmltYXRpb24mIGFuaW1hdGlvbikgeyBtX2FuaW1hdGlvbnMuYWRkKG5hbWUsIGFuaW1hdGlv bik7IH0KKyAgICB2b2lkIGFkZChjb25zdCBTdHJpbmcmLCBjb25zdCBUZXh0dXJlTWFwcGVyQW5p bWF0aW9uJik7CiAgICAgdm9pZCByZW1vdmUoY29uc3QgU3RyaW5nJiBuYW1lKSB7IG1fYW5pbWF0 aW9ucy5yZW1vdmUobmFtZSk7IH0KICAgICB2b2lkIHBhdXNlKGNvbnN0IFN0cmluZyYsIGRvdWJs ZSk7CiAgICAgdm9pZCBhcHBseShUZXh0dXJlTWFwcGVyQW5pbWF0aW9uQ2xpZW50Kik7CkBAIC03 Niw3ICs3Niw3IEBAIHB1YmxpYzoKICAgICBib29sIGhhc0FjdGl2ZUFuaW1hdGlvbnNPZlR5cGUo QW5pbWF0ZWRQcm9wZXJ0eUlEIHR5cGUpIGNvbnN0OwogCiBwcml2YXRlOgotICAgIEhhc2hNYXA8 U3RyaW5nLCBUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiBtX2FuaW1hdGlvbnM7CisgICAgSGFzaE1h cDxTdHJpbmcsIFZlY3RvcjxUZXh0dXJlTWFwcGVyQW5pbWF0aW9uPiA+IG1fYW5pbWF0aW9uczsK IH07CiAKIH0KLS0gCjEuNy41LjQKCg==