99529 2012-10-16 18:04:58 -0700 GraphicsLayer visible rect computation needs to use the current animating transform 2012-10-17 11:40:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin danakj dino enne epenner eric simon.fraser thorton vollick webkit.review.bot oldest_to_newest 743757 0 simon.fraser 2012-10-16 18:04:58 -0700 GraphicsLayer visible rect computation needs to use the current animating transform 743758 1 169067 simon.fraser 2012-10-16 18:08:16 -0700 Created attachment 169067 Patch 744410 2 169067 dino 2012-10-17 10:59:07 -0700 Comment on attachment 169067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169067&action=review > Source/WebCore/platform/graphics/GraphicsLayerClient.h:75 > + virtual void currentTransform(const GraphicsLayer*, TransformationMatrix&) const { } It's a bit strange that this method is called currentTransform like the existing method on RenderLayer, but modifies its parameter rather than providing a return value. > Source/WebCore/rendering/RenderLayer.h:598 > - TransformationMatrix currentTransform() const; > + TransformationMatrix currentTransform(RenderStyle::ApplyTransformOrigin = RenderStyle::IncludeTransformOrigin) const; This is the existing one (in another class) > Source/WebCore/rendering/RenderLayerBacking.h:151 > + virtual void currentTransform(const GraphicsLayer*, TransformationMatrix&) const; This is the new one. > LayoutTests/compositing/visible-rect/animated.html:26 > + @-webkit-keyframes move { > + from { -webkit-transform: translateX(-100px); } > + to { -webkit-transform: translateX(300px); } > + } I'm not sure how this test is exercising the new code. You don't have anything here that setting transform origin. 744441 3 simon.fraser 2012-10-17 11:21:11 -0700 http://trac.webkit.org/changeset/131626 169067 2012-10-16 18:08:16 -0700 2012-10-17 10:59:07 -0700 Patch bug-99529-20121016180708.patch text/plain 12737 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGYxODNhZTk4OTlmNzAw ZTRjYWRkN2I3Yzc1NDgyMDFkOTk3MGE1Zi4uOGJiNTgzNDQxMzk5MTJhYTQ2NWUzZDQxNTkxMTQ3 MzM0YTVmYzI1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDEyLTEwLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEdyYXBoaWNzTGF5 ZXIgdmlzaWJsZSByZWN0IGNvbXB1dGF0aW9uIG5lZWRzIHRvIHVzZSB0aGUgY3VycmVudCBhbmlt YXRpbmcgdHJhbnNmb3JtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05OTUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIElmIHdlJ3JlIHJ1bm5pbmcgYW4gYWNjZWxlcmF0ZWQgYW5pbWF0aW9uIG9mIHRyYW5z Zm9ybQorICAgICAgICBvbiBhIEdyYXBoaWNzTGF5ZXJDQSwgdGhlIGN1cnJlbnQgdmFsdWUgb2Yg dGhlIHRyYW5zZm9ybSB3b24ndAorICAgICAgICBiZSByZWZsZWN0ZWQgaW4gdGhlIEdyYXBoaWNz TGF5ZXIncyBtX3RyYW5zZm9ybS4gSG93ZXZlciwKKyAgICAgICAgd2UgbmVlZCB0aGUgY3VycmVu dCB2YWx1ZSBvZiB0aGUgdHJhbnNmb3JtIGluIG9yZGVyIHRvIGNvcnJlY3RseQorICAgICAgICBj b21wdXRlIHRoZSB2aXNpYmxlIHJlY3Qgb2YgdGhpcyBsYXllciBhbmQgZGVzY2VuZGFudHMuCisg ICAgICAgIAorICAgICAgICBBZGQgYSBmdW5jdGlvbiB0byBHcmFwaGljc0xheWVyQ2xpZW50IHRv IHJldHJpZXZlIHRoZSBjdXJyZW50CisgICAgICAgIHZhbHVlIG9mIHRoZSB0cmFuc2Zvcm0gZnJv bSB0aGUgY2xpZW50LgorICAgICAgICAKKyAgICAgICAgUmVuZGVyTGF5ZXIncyBjdXJyZW50VHJh bnNmb3JtKCkgdXNlZCB0byByZXR1cm4gYSB0cmFuc2Zvcm0KKyAgICAgICAgd2l0aCB0cmFuc2Zv cm0tb3JpZ2luIGJha2VkIGluOyBHcmFwaGljc0xheWVyQ2xpZW50IG5lZWRzIG9uZQorICAgICAg ICB0aGF0IGV4Y2x1ZGVzIHRyYW5zZm9ybS1vcmlnaW4sIHNvIGVuaGFuY2UgUmVuZGVyTGF5ZXI6 OmN1cnJlbnRUcmFuc2Zvcm0oKQorICAgICAgICB0byBiZSBhYmxlIHRvIHByb2R1Y2UgZWl0aGVy LgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL3Zpc2libGUtcmVjdC9hbmltYXRlZC5odG1s CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQ2xpZW50Lmg6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXJDbGllbnQpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNsaWVudDo6Y3VycmVudFRyYW5zZm9ybSk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y29tcHV0ZVZpc2libGVSZWN0KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OmN1cnJlbnRUcmFuc2Zvcm0pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpjdXJyZW50VHJhbnNmb3JtKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmg6CisgICAgICAgIChSZW5kZXJMYXllckJh Y2tpbmcpOgorCisyMDEyLTEwLTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCiAgICAgICAgIFNvbWUgI2luY2x1ZGUgaHlnaWVuZQogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk1MDAKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckNsaWVudC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllckNsaWVudC5oCmluZGV4IDdl ZmVlMGU2NWM3OWViMTU2NWRhYThmZmNjNDIwMjA3OWYzZjAyZjAuLjUwN2FlNjc3MDc3MTg4NGNl MzE3YjRkNzZlNGJlMTNhYjBkODVjZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyQ2xpZW50LmgKQEAgLTMwLDExICszMCwxMiBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZsb2F0UG9pbnQ7CiBjbGFzcyBHcmFw aGljc0NvbnRleHQ7CiBjbGFzcyBHcmFwaGljc0xheWVyOwogY2xhc3MgSW50UG9pbnQ7CiBjbGFz cyBJbnRSZWN0OwotY2xhc3MgRmxvYXRQb2ludDsKK2NsYXNzIFRyYW5zZm9ybWF0aW9uTWF0cml4 OwogCiBlbnVtIEdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlRmxhZ3MgewogICAgIEdyYXBoaWNz TGF5ZXJQYWludEJhY2tncm91bmQgPSAoMSA8PCAwKSwKQEAgLTY5LDYgKzcwLDEwIEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhjb25zdCBHcmFwaGljc0xheWVyKiwg R3JhcGhpY3NDb250ZXh0JiwgR3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2UsIGNvbnN0IEludFJl Y3QmIGluQ2xpcCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRDaGFuZ2VzRm9yTGF5 ZXIoY29uc3QgR3JhcGhpY3NMYXllciopIGNvbnN0IHsgfQogCisgICAgLy8gUmV0dXJuIHRoZSBj dXJyZW50IHRyYW5zZm9ybSAodGFraW5nIHRyYW5zZm9ybS1vcmlnaW4gYW5kIGFuaW1hdGlvbnMg aW50byBhY2NvdW50KS4gSW5wdXQgbWF0cml4IGhhcyBiZWVuCisgICAgLy8gaW5pdGlhbGl6ZWQg dG8gaWRlbnRpdHkgYWxyZWFkeS4KKyAgICB2aXJ0dWFsIHZvaWQgY3VycmVudFRyYW5zZm9ybShj b25zdCBHcmFwaGljc0xheWVyKiwgVHJhbnNmb3JtYXRpb25NYXRyaXgmKSBjb25zdCB7IH0KKwog ICAgIC8vIE11bHRpcGxpZXIgZm9yIGJhY2tpbmcgc3RvcmUgc2l6ZSwgcmVsYXRlZCB0byBoaWdo IERQSS4KICAgICB2aXJ0dWFsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1 cm4gMTsgfQogICAgIC8vIFBhZ2Ugc2NhbGUgZmFjdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggM2Vj ODM0M2E5ODhiZjUzNzhmNjBhMjRhNmE4NzRhNmM4NmFmZjk2NS4uZDUzNGM4OWFlZDU4MzU5ZjNl MTQ0NmY5YzRhOGJlNTQ0YTkxMWE3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCkBAIC05MjEsMTIgKzkyMSwx NSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6Y29tcHV0ZVZpc2libGVSZWN0KFRyYW5zZm9ybVN0 YXRlJiBzdGF0ZSkKIAogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IGxheWVyVHJhbnNmb3JtOwog ICAgIGxheWVyVHJhbnNmb3JtLnRyYW5zbGF0ZShtX3Bvc2l0aW9uLngoKSwgbV9wb3NpdGlvbi55 KCkpOwotICAgIAotICAgIGlmICghdHJhbnNmb3JtKCkuaXNJZGVudGl0eSgpKSB7CisKKyAgICBU cmFuc2Zvcm1hdGlvbk1hdHJpeCBjdXJyZW50VHJhbnNmb3JtOworICAgIGlmIChjbGllbnQoKSkK KyAgICAgICAgY2xpZW50KCktPmN1cnJlbnRUcmFuc2Zvcm0odGhpcywgY3VycmVudFRyYW5zZm9y bSk7CisgICAgaWYgKCFjdXJyZW50VHJhbnNmb3JtLmlzSWRlbnRpdHkoKSkgewogICAgICAgICBG bG9hdFBvaW50M0QgYWJzb2x1dGVBbmNob3JQb2ludChhbmNob3JQb2ludCgpKTsKICAgICAgICAg YWJzb2x1dGVBbmNob3JQb2ludC5zY2FsZShzaXplKCkud2lkdGgoKSwgc2l6ZSgpLmhlaWdodCgp LCAxKTsKICAgICAgICAgbGF5ZXJUcmFuc2Zvcm0udHJhbnNsYXRlM2QoYWJzb2x1dGVBbmNob3JQ b2ludC54KCksIGFic29sdXRlQW5jaG9yUG9pbnQueSgpLCBhYnNvbHV0ZUFuY2hvclBvaW50Lnoo KSk7Ci0gICAgICAgIGxheWVyVHJhbnNmb3JtLm11bHRpcGx5KHRyYW5zZm9ybSgpKTsKKyAgICAg ICAgbGF5ZXJUcmFuc2Zvcm0ubXVsdGlwbHkoY3VycmVudFRyYW5zZm9ybSk7CiAgICAgICAgIGxh eWVyVHJhbnNmb3JtLnRyYW5zbGF0ZTNkKC1hYnNvbHV0ZUFuY2hvclBvaW50LngoKSwgLWFic29s dXRlQW5jaG9yUG9pbnQueSgpLCAtYWJzb2x1dGVBbmNob3JQb2ludC56KCkpOwogICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMWU2YTM3OTk1NTc1 YWI3MWQxYTAwM2QyYzk1MTg4Mjk1YjkwNmIzNi4uYTMwNjcyZjRhY2VhMGNkYmRkMTJlMTlkY2Q5 ZGI1ZjE5NmNiZGM1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw CkBAIC01OTcsNyArNTk3LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlVHJhbnNmb3JtKCkK ICAgICAgICAgZGlydHkzRFRyYW5zZm9ybWVkRGVzY2VuZGFudFN0YXR1cygpOwogfQogCi1UcmFu c2Zvcm1hdGlvbk1hdHJpeCBSZW5kZXJMYXllcjo6Y3VycmVudFRyYW5zZm9ybSgpIGNvbnN0CitU cmFuc2Zvcm1hdGlvbk1hdHJpeCBSZW5kZXJMYXllcjo6Y3VycmVudFRyYW5zZm9ybShSZW5kZXJT dHlsZTo6QXBwbHlUcmFuc2Zvcm1PcmlnaW4gYXBwbHlPcmlnaW4pIGNvbnN0CiB7CiAgICAgaWYg KCFtX3RyYW5zZm9ybSkKICAgICAgICAgcmV0dXJuIFRyYW5zZm9ybWF0aW9uTWF0cml4KCk7CkBA IC02MDYsNyArNjA2LDE2IEBAIFRyYW5zZm9ybWF0aW9uTWF0cml4IFJlbmRlckxheWVyOjpjdXJy ZW50VHJhbnNmb3JtKCkgY29uc3QKICAgICBpZiAocmVuZGVyZXIoKS0+c3R5bGUoKS0+aXNSdW5u aW5nQWNjZWxlcmF0ZWRBbmltYXRpb24oKSkgewogICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJp eCBjdXJyVHJhbnNmb3JtOwogICAgICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlID0gcmVu ZGVyZXIoKS0+YW5pbWF0aW9uKCktPmdldEFuaW1hdGVkU3R5bGVGb3JSZW5kZXJlcihyZW5kZXJl cigpKTsKLSAgICAgICAgc3R5bGUtPmFwcGx5VHJhbnNmb3JtKGN1cnJUcmFuc2Zvcm0sIHJlbmRl ckJveCgpLT5waXhlbFNuYXBwZWRCb3JkZXJCb3hSZWN0KCkuc2l6ZSgpLCBSZW5kZXJTdHlsZTo6 SW5jbHVkZVRyYW5zZm9ybU9yaWdpbik7CisgICAgICAgIHN0eWxlLT5hcHBseVRyYW5zZm9ybShj dXJyVHJhbnNmb3JtLCByZW5kZXJCb3goKS0+cGl4ZWxTbmFwcGVkQm9yZGVyQm94UmVjdCgpLnNp emUoKSwgYXBwbHlPcmlnaW4pOworICAgICAgICBtYWtlTWF0cml4UmVuZGVyYWJsZShjdXJyVHJh bnNmb3JtLCBjYW5SZW5kZXIzRFRyYW5zZm9ybXMoKSk7CisgICAgICAgIHJldHVybiBjdXJyVHJh bnNmb3JtOworICAgIH0KKworICAgIC8vIG1fdHJhbnNmb3JtIGluY2x1ZGVzIHRyYW5zZm9ybS1v cmlnaW4sIHNvIHdlIG5lZWQgdG8gcmVjb21wdXRlIHRoZSB0cmFuc2Zvcm0gaGVyZS4KKyAgICBp ZiAoYXBwbHlPcmlnaW4gPT0gUmVuZGVyU3R5bGU6OkV4Y2x1ZGVUcmFuc2Zvcm1PcmlnaW4pIHsK KyAgICAgICAgUmVuZGVyQm94KiBib3ggPSByZW5kZXJCb3goKTsKKyAgICAgICAgVHJhbnNmb3Jt YXRpb25NYXRyaXggY3VyclRyYW5zZm9ybTsKKyAgICAgICAgYm94LT5zdHlsZSgpLT5hcHBseVRy YW5zZm9ybShjdXJyVHJhbnNmb3JtLCBib3gtPnBpeGVsU25hcHBlZEJvcmRlckJveFJlY3QoKS5z aXplKCksIFJlbmRlclN0eWxlOjpFeGNsdWRlVHJhbnNmb3JtT3JpZ2luKTsKICAgICAgICAgbWFr ZU1hdHJpeFJlbmRlcmFibGUoY3VyclRyYW5zZm9ybSwgY2FuUmVuZGVyM0RUcmFuc2Zvcm1zKCkp OwogICAgICAgICByZXR1cm4gY3VyclRyYW5zZm9ybTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5oCmluZGV4IGMzZGI5NmQxZGVkNjU2MGY5ZWE0MWU2M2Q4MDU3Yjgx Yzg5ZThiM2IuLjE4MTEwMzY0M2QzZmNmMjA2NzM5Nzg1OTc4YzkxOWQyZTU2MjZlZDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC01OTUsNyArNTk1LDcgQEAgcHVi bGljOgogICAgIC8vIGN1cnJlbnRUcmFuc2Zvcm0gY29tcHV0ZXMgYSB0cmFuc2Zvcm0gd2hpY2gg dGFrZXMgYWNjZWxlcmF0ZWQgYW5pbWF0aW9ucyBpbnRvIGFjY291bnQuIFRoZQogICAgIC8vIHJl c3VsdGluZyB0cmFuc2Zvcm0gaGFzIHRyYW5zZm9ybS1vcmlnaW4gYmFrZWQgaW4uIElmIHRoZSBs YXllciBkb2VzIG5vdCBoYXZlIGEgdHJhbnNmb3JtLAogICAgIC8vIHJldHVybnMgdGhlIGlkZW50 aXR5IG1hdHJpeC4KLSAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBjdXJyZW50VHJhbnNmb3JtKCkg Y29uc3Q7CisgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggY3VycmVudFRyYW5zZm9ybShSZW5kZXJT dHlsZTo6QXBwbHlUcmFuc2Zvcm1PcmlnaW4gPSBSZW5kZXJTdHlsZTo6SW5jbHVkZVRyYW5zZm9y bU9yaWdpbikgY29uc3Q7CiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggcmVuZGVyYWJsZVRyYW5z Zm9ybShQYWludEJlaGF2aW9yKSBjb25zdDsKICAgICAKICAgICAvLyBHZXQgdGhlIHBlcnNwZWN0 aXZlIHRyYW5zZm9ybSwgd2hpY2ggaXMgYXBwbGllZCB0byB0cmFuc2Zvcm1lZCBzdWJsYXllcnMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmlu ZGV4IDFlZjc1ZTdiMjk4MmZlNTZjOTcwNWJiZTNiM2NlN2E2ZjdhMGFmNzEuLmNiZjU4ZmNlNzZm OWY2MjExY2UxNjk3YzYzZDFkYzZiOWJhOThjMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xNTM5LDYgKzE1MzksMTUgQEAgdm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OmRpZENvbW1pdENoYW5nZXNGb3JMYXllcihjb25zdCBHcmFw aGljc0xheWVyKikgY29uc3QKICAgICBjb21wb3NpdG9yKCktPmRpZEZsdXNoQ2hhbmdlc0Zvckxh eWVyKG1fb3duaW5nTGF5ZXIpOwogfQogCit2b2lkIFJlbmRlckxheWVyQmFja2luZzo6Y3VycmVu dFRyYW5zZm9ybShjb25zdCBHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVyLCBUcmFuc2Zvcm1h dGlvbk1hdHJpeCYgdHJhbnNmb3JtKSBjb25zdAoreworICAgIGlmIChncmFwaGljc0xheWVyICE9 IG1fZ3JhcGhpY3NMYXllcikKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKG1fb3duaW5nTGF5 ZXItPmhhc1RyYW5zZm9ybSgpKQorICAgICAgICB0cmFuc2Zvcm0gPSBtX293bmluZ0xheWVyLT5j dXJyZW50VHJhbnNmb3JtKFJlbmRlclN0eWxlOjpFeGNsdWRlVHJhbnNmb3JtT3JpZ2luKTsKK30K KwogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnNob3dEZWJ1Z0JvcmRlcnMoY29uc3QgR3JhcGhp Y3NMYXllciopIGNvbnN0CiB7CiAgICAgcmV0dXJuIGNvbXBvc2l0b3IoKSA/IGNvbXBvc2l0b3Io KS0+Y29tcG9zaXRvclNob3dEZWJ1Z0JvcmRlcnMoKSA6IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IGMwNDE0NjU1MWUwYWUxOTg4 ZmY0MzM1NDYxOTBiNTQ4ODM1YzYxN2MuLmFjNjk2M2Q4NzU0YzhiZmZjZjdiYzVkMWM5OTk2NGEw NTFhYzZjNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmgKQEAgLTE0OCw2ICsxNDgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBmbG9hdCBkZXZp Y2VTY2FsZUZhY3RvcigpIGNvbnN0OwogICAgIHZpcnR1YWwgZmxvYXQgcGFnZVNjYWxlRmFjdG9y KCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbW1pdENoYW5nZXNGb3JMYXllcihjb25z dCBHcmFwaGljc0xheWVyKikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGN1cnJlbnRUcmFuc2Zv cm0oY29uc3QgR3JhcGhpY3NMYXllciosIFRyYW5zZm9ybWF0aW9uTWF0cml4JikgY29uc3Q7CiAK ICAgICB2aXJ0dWFsIGJvb2wgc2hvd0RlYnVnQm9yZGVycyhjb25zdCBHcmFwaGljc0xheWVyKikg Y29uc3Q7CiAgICAgdmlydHVhbCBib29sIHNob3dSZXBhaW50Q291bnRlcihjb25zdCBHcmFwaGlj c0xheWVyKikgY29uc3Q7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2M5ZWM5M2EzOTAxNTM2MGE2NmE5ZWY0YjEzODA1ODcy YWU1OTBhYS4uMTAwMzljOGNmZWQ4MzEyM2ZiNmUyM2Q0NzRkMDNhNGE1YmZlZWFmOSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDEyLTEwLTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgorCisgICAgICAgIEdyYXBoaWNzTGF5ZXIgdmlzaWJsZSByZWN0IGNvbXB1dGF0 aW9uIG5lZWRzIHRvIHVzZSB0aGUgY3VycmVudCBhbmltYXRpbmcgdHJhbnNmb3JtCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTUyOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCBleGVyY2lz ZXMgdmlzaWJsZS1yZWN0IGNvbXB1dGF0aW9uIG9uIGFuIGFuaW1hdGluZyBsYXllci4KKworICAg ICAgICAqIGNvbXBvc2l0aW5nL3Zpc2libGUtcmVjdC9hbmltYXRlZC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL3Zpc2libGUtcmVjdC9hbmltYXRlZC5odG1sOiBB ZGRlZC4KKwogMjAxMi0xMC0xNiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAg ICAgICAgIEdldFNjb3BlZFZhciBDU0UgbWF0Y2hlcyBkZWFkIEdldFNjb3BlZFZhcidzIGxlYWRp bmcgdG8gSVIgY29ycnVwdGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv dmlzaWJsZS1yZWN0L2FuaW1hdGVkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL3Zpc2libGUtcmVjdC9hbmltYXRlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTIyYmVi YTc2ZDE3MjkyNzZiNTc4OTg5OTE4NTMyZWNmOTQwNTJmNAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2NvbXBvc2l0aW5nL3Zpc2libGUtcmVjdC9hbmltYXRlZC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwzMyBAQAorKEdyYXBoaWNzTGF5ZXIKKyAgKGJvdW5kcyA4MDAuMDAgNjAwLjAw KQorICAodmlzaWJsZSByZWN0IDAuMDAsIDAuMDAgODAwLjAwIHggNjAwLjAwKQorICAoY2hpbGRy ZW4gMQorICAgIChHcmFwaGljc0xheWVyCisgICAgICAoYm91bmRzIDgwMC4wMCA2MDAuMDApCisg ICAgICAodmlzaWJsZSByZWN0IDAuMDAsIDAuMDAgODAwLjAwIHggNjAwLjAwKQorICAgICAgKGNo aWxkcmVuIDEKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAocG9zaXRpb24gOC4w MCA4LjAwKQorICAgICAgICAgIChib3VuZHMgNTAyLjAwIDIwMi4wMCkKKyAgICAgICAgICAodmlz aWJsZSByZWN0IDAuMDAsIDAuMDAgNTAyLjAwIHggMjAyLjAwKQorICAgICAgICAgIChjaGlsZHJl biAxCisgICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAgICAgICAocG9zaXRpb24g MS4wMCAxLjAwKQorICAgICAgICAgICAgICAoYm91bmRzIDUwMC4wMCAyMDAuMDApCisgICAgICAg ICAgICAgICh2aXNpYmxlIHJlY3QgMC4wMCwgMC4wMCA1MDAuMDAgeCAyMDAuMDApCisgICAgICAg ICAgICAgIChjaGlsZHJlbiAxCisgICAgICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAg ICAgICAgICAgICAgIChib3VuZHMgMjAwLjAwIDIwMC4wMCkKKyAgICAgICAgICAgICAgICAgIChk cmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAgICAgICAgICh0cmFuc2Zvcm0gWzEuMDAgMC4wMCAw LjAwIDAuMDBdIFswLjAwIDEuMDAgMC4wMCAwLjAwXSBbMC4wMCAwLjAwIDEuMDAgMC4wMF0gWy0x MDAuMDAgMC4wMCAwLjAwIDEuMDBdKQorICAgICAgICAgICAgICAgICAgKHZpc2libGUgcmVjdCAx MDAuMDAsIDAuMDAgMTAwLjAwIHggMjAwLjAwKQorICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICAgKQorICAgICAgICAgICAgKQorICAgICAgICAgICkKKyAgICAgICAgKQorICAgICAgKQor ICAgICkKKyAgKQorKQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy92aXNp YmxlLXJlY3QvYW5pbWF0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL3Zpc2libGUt cmVjdC9hbmltYXRlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJmYmUzMmI2NzBjNzkzNmM4NjUwZWQ0ODQx N2JkMmFiMWZhNjBlNjUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGlu Zy92aXNpYmxlLXJlY3QvYW5pbWF0ZWQuaHRtbApAQCAtMCwwICsxLDU1IEBACis8IURPQ1RZUEUg aHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIC5jb250YWluZXIg eworICAgICAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgICAgICAgICAgaGVpZ2h0OiAy MDBweDsKKyAgICAgICAgICAgIHdpZHRoOiA1MDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMXB4 IHNvbGlkIGJsYWNrOworICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICAgICAgICAg IHotaW5kZXg6IDA7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC5ib3ggeworICAgICAg ICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAgICAgd2lkdGg6IDIwMHB4OworICAg ICAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGJs dWU7CisgICAgICAgICAgICAtd2Via2l0LWFuaW1hdGlvbjogbW92ZSAyMDAwMDAwMHMgbGluZWFy OworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgbW92ZSB7 CisgICAgICAgICAgICBmcm9tIHsgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVgoLTEwMHB4 KTsgfQorICAgICAgICAgICAgdG8gICB7IC13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVYKDMw MHB4KTsgfQorICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0PgorICAgICAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4 dCgpOworICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgIH0K KworICAgICAgICBmdW5jdGlvbiBkb1Rlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnYW5pbWF0ZWQnKS5hZGRFdmVudExpc3RlbmVyKCd3ZWJraXRB bmltYXRpb25TdGFydCcsIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIGlmICh3aW5kb3cu aW50ZXJuYWxzKQorICAgICAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn bGF5ZXJzJykuaW5uZXJUZXh0ID0gaW50ZXJuYWxzLmxheWVyVHJlZUFzVGV4dChkb2N1bWVudCwg aW50ZXJuYWxzLkxBWUVSX1RSRUVfSU5DTFVERVNfVklTSUJMRV9SRUNUUykKKworICAgICAgICAg ICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICAgICAgdGVzdFJ1 bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICB9LCBmYWxzZSk7CisgICAgICAgIH0KKyAg ICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBkb1Rlc3QsIGZhbHNlKTsKKyAg ICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorCisgICAgPGRpdiBjbGFzcz0iY29udGFpbmVy Ij4KKyAgICAgICAgPGRpdiBpZD0iYW5pbWF0ZWQiIGNsYXNzPSJib3giPjwvZGl2PgorICAgIDwv ZGl2PgorCis8cHJlIGlkPSJsYXllcnMiPkxheWVyIHRyZWUgZ29lcyBoZXJlIHdoZW4gdGVzdGlu ZzwvcHJlPgorPC9ib2R5PgorPC9odG1sPgo=