32449 2009-12-11 14:07:06 -0800 Child elements disappear, then get doubled, when changing -webkit-transform-style 2010-03-18 16:03:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows 7 RESOLVED FIXED http://webkit.org/blog-files/3d-transforms/transform-style.html InRadar, PlatformOnly P2 Normal --- 1 aroben cmarrin cmarrin oldest_to_newest 170915 0 aroben 2009-12-11 14:07:06 -0800 To reproduce: 1. Go to http://webkit.org/blog-files/3d-transforms/transform-style.html 2. Hover over the box with the blue border 3. Move your mouse out of the box with the blue border After step 2, the yellow and green rectangles disappear, but should instead be rendered flattened into the purple rectangle. After step 3, the yellow and green rectangles appear *both* flattened and unflattened, but should only appear unflattened. 170921 1 mitz 2009-12-11 14:09:46 -0800 <rdar://problem/7465615> 201047 2 50972 cmarrin 2010-03-17 16:58:59 -0700 Created attachment 50972 Patch 201571 3 51097 cmarrin 2010-03-18 14:46:06 -0700 Created attachment 51097 replacement patch This separates the removeFromSuperLayer loop from the insertSublayer loop in the setSublayers method. This is safer to avoid mutating the array while traversing it. 201576 4 51097 simon.fraser 2010-03-18 14:49:53 -0700 Comment on attachment 51097 replacement patch r=me but this needs a layout test (written to assume that pixel and/or layer dumping is available in future). 201621 5 cmarrin 2010-03-18 16:01:40 -0700 Landed in http://trac.webkit.org/changeset/56200 201625 6 cmarrin 2010-03-18 16:03:47 -0700 I am working on printing the layer tree from DRT. When I land that, I will land a test for this bug as a proof of concept 50972 2010-03-17 16:58:59 -0700 2010-03-18 14:46:06 -0700 Patch 32449.patch text/plain 6003 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjEzNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDMtMTcgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIHBhcmVudGluZyBpc3N1ZXMgd2l0aCBIVyBsYXllcnMgb24gV2luZG93cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI0NDkKKyAgICAgICAgCisg ICAgICAgIENBQ0YgY2FuJ3QgcHJvcGVybHkgZml4IHN1cGVybGF5ZXIgY2hhbmdlcywgc28gYSBs YXllciBhZGRlZAorICAgICAgICBhcyBhIHN1YmxheWVyIG11c3QgaGF2ZSBhIG51bGwgc3VwZXJs YXllci4gSSBjaGFuZ2VkIGEgY291cGxlIG9mCisgICAgICAgIHBsYWNlcyB0aGF0IGNoYW5nZSBz dWJsYXllcnMgdG8gcmVtb3ZlRnJvbVN1cGVybGF5ZXIgd2hpbGUgYWRkaW5nCisgICAgICAgIHRv IGEgbmV3IGxheWVyLiBUaGlzIGZpeGVzIGJvdGggdGhlIHByb2JsZW0gb2YgZGlzYXBwZWFyaW5n IGNoaWxkcmVuCisgICAgICAgIGFuZCBjaGlsZHJlbiBnZXR0aW5nIGRvdWJsZWQuIEFsc28gZ290 IHJpZCBvZiByZW1vdmVTdWJsYXllcigpLiBMYXllcnMKKyAgICAgICAgc2hvdWxkIGFsd2F5cyBi ZSByZW1vdmVkIGZyb20gdGhlaXIgcGFyZW50IHdpdGggcmVtb3ZlRnJvbVN1cGVybGF5ZXIoKS4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5jcHA6 Q2hhbmdlZCBzZXROYW1lIHRvIGJlIGxpa2UgTWFjLCB0byBnaXZlIG1vcmUgZGVidWdnaW5nIGlu Zm8gKHRvIGZpeCBwcm9ibGVtcyBsaWtlIHRoZXNlKQorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllckNBQ0Y6OnNldE5hbWUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9X S0NBQ0ZMYXllci5jcHA6TWFrZSBzdXJlIHN1cGVybGF5ZXIgaXMgbnVsbCBiZWZvcmUgYWRkaW5n CisgICAgICAgIChXZWJDb3JlOjpXS0NBQ0ZMYXllcjo6aW5zZXJ0U3VibGF5ZXIpOgorICAgICAg ICAoV2ViQ29yZTo6V0tDQUNGTGF5ZXI6OnJlcGxhY2VTdWJsYXllcik6CisgICAgICAgIChXZWJD b3JlOjpXS0NBQ0ZMYXllcjo6cmVtb3ZlRnJvbVN1cGVybGF5ZXIpOgorICAgICAgICAoV2ViQ29y ZTo6V0tDQUNGTGF5ZXI6OnNldFN1YmxheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpXS0NBQ0ZM YXllcjo6cHJpbnRMYXllcik6cHJpbnQgdGhlIHN1cGVybGF5ZXIgZm9yIGJldHRlciBkZWJ1Z2dp bmcKKwogMjAxMC0wMy0xNyAgRG1pdHJ5IFRpdG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuY3BwCShyZXZpc2lv biA1NjEzMikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5ZXJD QUNGLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjMxLDEyICsyMzEsMTIgQEAgR3JhcGhpY3NMYXll ckNBQ0Y6On5HcmFwaGljc0xheWVyQ0FDRigpCiAgICAgICAgIG1fdHJhbnNmb3JtTGF5ZXItPnJl bW92ZUZyb21TdXBlcmxheWVyKCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllckNBQ0Y6OnNldE5h bWUoY29uc3QgU3RyaW5nJiBpbk5hbWUpCit2b2lkIEdyYXBoaWNzTGF5ZXJDQUNGOjpzZXROYW1l KGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKLSAgICBTdHJpbmcgbmFtZSA9IFN0cmluZzo6Zm9ybWF0 KCJDQUxheWVyKCVwKSBHcmFwaGljc0xheWVyKCVwKSAiLCBtX2xheWVyLmdldCgpLCB0aGlzKSAr IGluTmFtZTsKLSAgICBHcmFwaGljc0xheWVyOjpzZXROYW1lKG5hbWUpOworICAgIFN0cmluZyBs b25nTmFtZSA9IFN0cmluZzo6Zm9ybWF0KCJDQUxheWVyKCVwKSBHcmFwaGljc0xheWVyKCVwKSAi LCBtX2xheWVyLmdldCgpLCB0aGlzKSArIG5hbWU7CisgICAgR3JhcGhpY3NMYXllcjo6c2V0TmFt ZShsb25nTmFtZSk7CiAgICAgCi0gICAgbV9sYXllci0+c2V0TmFtZShpbk5hbWUpOworICAgIG1f bGF5ZXItPnNldE5hbWUobG9uZ05hbWUpOwogfQogCiBOYXRpdmVMYXllciBHcmFwaGljc0xheWVy Q0FDRjo6bmF0aXZlTGF5ZXIoKSBjb25zdApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW4vV0tDQUNGTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL1dLQ0FDRkxheWVyLmNwcAkocmV2aXNpb24gNTYxMzIpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9XS0NBQ0ZMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0 MSw2ICsyNDEsNyBAQCB2b2lkIFdLQ0FDRkxheWVyOjphZGRTdWJsYXllcihQYXNzUmVmUHRyCiB2 b2lkIFdLQ0FDRkxheWVyOjppbnNlcnRTdWJsYXllcihQYXNzUmVmUHRyPFdLQ0FDRkxheWVyPiBz dWJsYXllciwgc2l6ZV90IGluZGV4KQogewogICAgIGluZGV4ID0gbWluKGluZGV4LCBudW1TdWJs YXllcnMoKSk7CisgICAgc3VibGF5ZXItPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7CiAgICAgQ0FD RkxheWVySW5zZXJ0U3VibGF5ZXIobGF5ZXIoKSwgc3VibGF5ZXItPmxheWVyKCksIGluZGV4KTsK ICAgICBzZXROZWVkc0NvbW1pdCgpOwogfQpAQCAtMjg1LDIxICsyODYsMTcgQEAgdm9pZCBXS0NB Q0ZMYXllcjo6cmVwbGFjZVN1YmxheWVyKFdLQ0FDRgogICAgIGlmIChyZWZlcmVuY2UgPT0gbmV3 TGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghbmV3TGF5ZXIpIHsKLSAgICAgICAg cmVtb3ZlU3VibGF5ZXIocmVmZXJlbmNlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAg IG5ld0xheWVyLT5yZW1vdmVGcm9tU3VwZXJsYXllcigpOwotCiAgICAgaW50IHJlZmVyZW5jZUlu ZGV4ID0gaW5kZXhPZlN1YmxheWVyKHJlZmVyZW5jZSk7CiAgICAgQVNTRVJUKHJlZmVyZW5jZUlu ZGV4ICE9IC0xKTsKICAgICBpZiAocmVmZXJlbmNlSW5kZXggPT0gLTEpCiAgICAgICAgIHJldHVy bjsKIAotICAgIC8vIEZJWE1FOiBDYW4gd2UgbWFrZSB0aGlzIG1vcmUgZWZmaWNpZW50PyBUaGUg Y3VycmVudCBDQUNGIEFQSSBkb2Vzbid0IHNlZW0gdG8gZ2l2ZSB1cyBhIHdheSB0byBkbyBzby4K ICAgICByZWZlcmVuY2UtPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7Ci0gICAgaW5zZXJ0U3VibGF5 ZXIobmV3TGF5ZXIsIHJlZmVyZW5jZUluZGV4KTsKKworICAgIGlmIChuZXdMYXllcikgeworICAg ICAgICBuZXdMYXllci0+cmVtb3ZlRnJvbVN1cGVybGF5ZXIoKTsKKyAgICAgICAgaW5zZXJ0U3Vi bGF5ZXIobmV3TGF5ZXIsIHJlZmVyZW5jZUluZGV4KTsKKyAgICB9CiB9CiAKIHZvaWQgV0tDQUNG TGF5ZXI6OnJlbW92ZUZyb21TdXBlcmxheWVyKCkKQEAgLTMwOCwyMSArMzA1LDEwIEBAIHZvaWQg V0tDQUNGTGF5ZXI6OnJlbW92ZUZyb21TdXBlcmxheWVyKCkKICAgICBpZiAoIXN1cGVybGF5ZXIp CiAgICAgICAgIHJldHVybjsKIAotICAgIHN1cGVybGF5ZXItPnJlbW92ZVN1YmxheWVyKHRoaXMp OwogICAgIENBQ0ZMYXllclJlbW92ZUZyb21TdXBlcmxheWVyKGxheWVyKCkpOwogICAgIHN1cGVy bGF5ZXItPnNldE5lZWRzQ29tbWl0KCk7CiB9CiAKLXZvaWQgV0tDQUNGTGF5ZXI6OnJlbW92ZVN1 YmxheWVyKGNvbnN0IFdLQ0FDRkxheWVyKiBzdWJsYXllcikKLXsKLSAgICBpbnQgZm91bmRJbmRl eCA9IGluZGV4T2ZTdWJsYXllcihzdWJsYXllcik7Ci0gICAgaWYgKGZvdW5kSW5kZXggPT0gLTEp Ci0gICAgICAgIHJldHVybjsKLQotICAgIENBQ0ZMYXllclJlbW92ZUZyb21TdXBlcmxheWVyKHN1 YmxheWVyLT5sYXllcigpKTsKLSAgICBzZXROZWVkc0NvbW1pdCgpOwotfQotCiBjb25zdCBXS0NB Q0ZMYXllciogV0tDQUNGTGF5ZXI6OnN1YmxheWVyQXRJbmRleChpbnQgaW5kZXgpIGNvbnN0CiB7 CiAgICAgQ0ZBcnJheVJlZiBzdWJsYXllcnMgPSBDQUNGTGF5ZXJHZXRTdWJsYXllcnMobGF5ZXIo KSk7CkBAIC00MzEsMTggKzQxNywxMyBAQCB2b2lkIFdLQ0FDRkxheWVyOjpyZW1vdmVBbGxTdWJs YXllcnMoKQogCiB2b2lkIFdLQ0FDRkxheWVyOjpzZXRTdWJsYXllcnMoY29uc3QgVmVjdG9yPFJl ZlB0cjxXS0NBQ0ZMYXllcj4gPiYgc3VibGF5ZXJzKQogewotICAgIGlmIChzdWJsYXllcnMuaXNF bXB0eSgpKQotICAgICAgICBDQUNGTGF5ZXJTZXRTdWJsYXllcnMobGF5ZXIoKSwgMCk7Ci0gICAg ZWxzZSB7Ci0gICAgICAgIC8vIENyZWF0ZSBhIHZlY3RvciBvZiBDQUNGTGF5ZXJzLgotICAgICAg ICBWZWN0b3I8Y29uc3Qgdm9pZCo+IGxheWVyczsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBzdWJsYXllcnMuc2l6ZSgpOyBpKyspCi0gICAgICAgICAgICBsYXllcnMuYXBwZW5kKHN1 YmxheWVyc1tpXS0+bGF5ZXIoKSk7Ci0gICAgCi0gICAgICAgIFJldGFpblB0cjxDRkFycmF5UmVm PiBsYXllcnNBcnJheShBZG9wdENGLCBDRkFycmF5Q3JlYXRlKDAsIGxheWVycy5kYXRhKCksIGxh eWVycy5zaXplKCksIDApKTsKLSAgICAgICAgQ0FDRkxheWVyU2V0U3VibGF5ZXJzKGxheWVyKCks IGxheWVyc0FycmF5LmdldCgpKTsKKyAgICAvLyBSZW1vdmUgYWxsIHRoZSBjdXJyZW50IHN1Ymxh eWVycyBhbmQgYWRkIHRoZSBwYXNzZWQgbGF5ZXJzCisgICAgQ0FDRkxheWVyU2V0U3VibGF5ZXJz KGxheWVyKCksIDApOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3VibGF5ZXJzLnNpemUo KTsgaSsrKSB7CisgICAgICAgIENBQ0ZMYXllclJlbW92ZUZyb21TdXBlcmxheWVyKHN1YmxheWVy c1tpXS0+bGF5ZXIoKSk7CisgICAgICAgIENBQ0ZMYXllckluc2VydFN1YmxheWVyKGxheWVyKCks IHN1YmxheWVyc1tpXS0+bGF5ZXIoKSwgaSk7CiAgICAgfQotICAgIAorCiAgICAgc2V0TmVlZHND b21taXQoKTsKIH0KIApAQCAtNTA4LDExICs0ODksMTEgQEAgdm9pZCBXS0NBQ0ZMYXllcjo6cHJp bnRMYXllcihpbnQgaW5kZW50KQogICAgIENHUG9pbnQgbGF5ZXJBbmNob3JQb2ludCA9IGFuY2hv clBvaW50KCk7CiAgICAgQ0dSZWN0IGxheWVyQm91bmRzID0gYm91bmRzKCk7CiAgICAgcHJpbnRJ bmRlbnQoaW5kZW50KTsKLSAgICBmcHJpbnRmKHN0ZGVyciwgIiglcyBbJWcgJWcgJWddIFslZyAl ZyAlZyAlZ10gWyVnICVnICVnXVxuIiwKKyAgICBmcHJpbnRmKHN0ZGVyciwgIiglcyBbJWcgJWcg JWddIFslZyAlZyAlZyAlZ10gWyVnICVnICVnXSBzdXBlcmxheWVyPSVwXG4iLAogICAgICAgICBp c1RyYW5zZm9ybUxheWVyKCkgPyAidHJhbnNmb3JtLWxheWVyIiA6ICJsYXllciIsCiAgICAgICAg IGxheWVyUG9zaXRpb24ueCwgbGF5ZXJQb3NpdGlvbi55LCB6UG9zaXRpb24oKSwgCiAgICAgICAg IGxheWVyQm91bmRzLm9yaWdpbi54LCBsYXllckJvdW5kcy5vcmlnaW4ueSwgbGF5ZXJCb3VuZHMu c2l6ZS53aWR0aCwgbGF5ZXJCb3VuZHMuc2l6ZS5oZWlnaHQsCi0gICAgICAgIGxheWVyQW5jaG9y UG9pbnQueCwgbGF5ZXJBbmNob3JQb2ludC55LCBhbmNob3JQb2ludFooKSk7CisgICAgICAgIGxh eWVyQW5jaG9yUG9pbnQueCwgbGF5ZXJBbmNob3JQb2ludC55LCBhbmNob3JQb2ludFooKSwgc3Vw ZXJsYXllcigpKTsKIAogICAgIC8vIFByaW50IG5hbWUgaWYgbmVlZGVkCiAgICAgU3RyaW5nIGxh eWVyTmFtZSA9IG5hbWUoKTsK 51097 2010-03-18 14:46:06 -0700 2010-03-18 14:49:53 -0700 replacement patch 32449.patch text/plain 7351 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjE5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTAtMDMtMTggIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIHBhcmVudGluZyBpc3N1ZXMgd2l0aCBIVyBsYXllcnMgb24gV2luZG93cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI0NDkKKyAgICAgICAgCisg ICAgICAgIENBQ0YgY2FuJ3QgcHJvcGVybHkgZml4IHN1cGVybGF5ZXIgY2hhbmdlcywgc28gYSBs YXllciBhZGRlZAorICAgICAgICBhcyBhIHN1YmxheWVyIG11c3QgaGF2ZSBhIG51bGwgc3VwZXJs YXllci4gSSBjaGFuZ2VkIGEgY291cGxlIG9mCisgICAgICAgIHBsYWNlcyB0aGF0IGNoYW5nZSBz dWJsYXllcnMgdG8gcmVtb3ZlRnJvbVN1cGVybGF5ZXIgd2hpbGUgYWRkaW5nCisgICAgICAgIHRv IGEgbmV3IGxheWVyLiBUaGlzIGZpeGVzIGJvdGggdGhlIHByb2JsZW0gb2YgZGlzYXBwZWFyaW5n IGNoaWxkcmVuCisgICAgICAgIGFuZCBjaGlsZHJlbiBnZXR0aW5nIGRvdWJsZWQuIEFsc28gZ290 IHJpZCBvZiByZW1vdmVTdWJsYXllcigpLiBMYXllcnMKKyAgICAgICAgc2hvdWxkIGFsd2F5cyBi ZSByZW1vdmVkIGZyb20gdGhlaXIgcGFyZW50IHdpdGggcmVtb3ZlRnJvbVN1cGVybGF5ZXIoKS4K KyAgICAgICAgCisgICAgICAgIFRoaXMgYWxzbyByZW1vdmVkIG1vdmVMYXllcigpLCB3aGljaCBp cyBub3QgdXNlZCBhbmQgbWF5IG5vdCBiZSBzYWZlIGluIGhvdworICAgICAgICBpdCBjb3BpZXMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuY3Bw OkNoYW5nZWQgc2V0TmFtZSB0byBiZSBsaWtlIE1hYywgdG8gZ2l2ZSBtb3JlIGRlYnVnZ2luZyBp bmZvICh0byBmaXggcHJvYmxlbXMgbGlrZSB0aGVzZSkKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJDQUNGOjpzZXROYW1lKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4v V0tDQUNGTGF5ZXIuY3BwOk1ha2Ugc3VyZSBzdXBlcmxheWVyIGlzIG51bGwgYmVmb3JlIGFkZGlu ZworICAgICAgICAoV2ViQ29yZTo6V0tDQUNGTGF5ZXI6Omluc2VydFN1YmxheWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OldLQ0FDRkxheWVyOjpyZXBsYWNlU3VibGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6V0tDQUNGTGF5ZXI6OnJlbW92ZUZyb21TdXBlcmxheWVyKToKKyAgICAgICAgKFdlYkNv cmU6OldLQ0FDRkxheWVyOjpzZXRTdWJsYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6V0tDQUNG TGF5ZXI6OnByaW50TGF5ZXIpOnByaW50IHRoZSBzdXBlcmxheWVyIGZvciBiZXR0ZXIgZGVidWdn aW5nCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dLQ0FDRkxheWVyLmg6CisKIDIw MTAtMDMtMTggIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkLCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuY3BwCShyZXZpc2lvbiA1NjE5NCkK KysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5ZXJDQUNGLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjU0LDEyICsyNTQsMTIgQEAgR3JhcGhpY3NMYXllckNBQ0Y6On5H cmFwaGljc0xheWVyQ0FDRigpCiAgICAgICAgIG1fdHJhbnNmb3JtTGF5ZXItPnJlbW92ZUZyb21T dXBlcmxheWVyKCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllckNBQ0Y6OnNldE5hbWUoY29uc3Qg U3RyaW5nJiBpbk5hbWUpCit2b2lkIEdyYXBoaWNzTGF5ZXJDQUNGOjpzZXROYW1lKGNvbnN0IFN0 cmluZyYgbmFtZSkKIHsKLSAgICBTdHJpbmcgbmFtZSA9IFN0cmluZzo6Zm9ybWF0KCJDQUxheWVy KCVwKSBHcmFwaGljc0xheWVyKCVwKSAiLCBtX2xheWVyLmdldCgpLCB0aGlzKSArIGluTmFtZTsK LSAgICBHcmFwaGljc0xheWVyOjpzZXROYW1lKG5hbWUpOworICAgIFN0cmluZyBsb25nTmFtZSA9 IFN0cmluZzo6Zm9ybWF0KCJDQUxheWVyKCVwKSBHcmFwaGljc0xheWVyKCVwKSAiLCBtX2xheWVy LmdldCgpLCB0aGlzKSArIG5hbWU7CisgICAgR3JhcGhpY3NMYXllcjo6c2V0TmFtZShsb25nTmFt ZSk7CiAgICAgCi0gICAgbV9sYXllci0+c2V0TmFtZShpbk5hbWUpOworICAgIG1fbGF5ZXItPnNl dE5hbWUobG9uZ05hbWUpOwogfQogCiBOYXRpdmVMYXllciBHcmFwaGljc0xheWVyQ0FDRjo6bmF0 aXZlTGF5ZXIoKSBjb25zdApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vV0tD QUNGTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L1dLQ0FDRkxheWVyLmNwcAkocmV2aXNpb24gNTYxOTQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9XS0NBQ0ZMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0MSw2ICsyNDEs NyBAQCB2b2lkIFdLQ0FDRkxheWVyOjphZGRTdWJsYXllcihQYXNzUmVmUHRyCiB2b2lkIFdLQ0FD RkxheWVyOjppbnNlcnRTdWJsYXllcihQYXNzUmVmUHRyPFdLQ0FDRkxheWVyPiBzdWJsYXllciwg c2l6ZV90IGluZGV4KQogewogICAgIGluZGV4ID0gbWluKGluZGV4LCBudW1TdWJsYXllcnMoKSk7 CisgICAgc3VibGF5ZXItPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7CiAgICAgQ0FDRkxheWVySW5z ZXJ0U3VibGF5ZXIobGF5ZXIoKSwgc3VibGF5ZXItPmxheWVyKCksIGluZGV4KTsKICAgICBzZXRO ZWVkc0NvbW1pdCgpOwogfQpAQCAtMjg1LDIxICsyODYsMTcgQEAgdm9pZCBXS0NBQ0ZMYXllcjo6 cmVwbGFjZVN1YmxheWVyKFdLQ0FDRgogICAgIGlmIChyZWZlcmVuY2UgPT0gbmV3TGF5ZXIpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmICghbmV3TGF5ZXIpIHsKLSAgICAgICAgcmVtb3ZlU3Vi bGF5ZXIocmVmZXJlbmNlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIG5ld0xheWVy LT5yZW1vdmVGcm9tU3VwZXJsYXllcigpOwotCiAgICAgaW50IHJlZmVyZW5jZUluZGV4ID0gaW5k ZXhPZlN1YmxheWVyKHJlZmVyZW5jZSk7CiAgICAgQVNTRVJUKHJlZmVyZW5jZUluZGV4ICE9IC0x KTsKICAgICBpZiAocmVmZXJlbmNlSW5kZXggPT0gLTEpCiAgICAgICAgIHJldHVybjsKIAotICAg IC8vIEZJWE1FOiBDYW4gd2UgbWFrZSB0aGlzIG1vcmUgZWZmaWNpZW50PyBUaGUgY3VycmVudCBD QUNGIEFQSSBkb2Vzbid0IHNlZW0gdG8gZ2l2ZSB1cyBhIHdheSB0byBkbyBzby4KICAgICByZWZl cmVuY2UtPnJlbW92ZUZyb21TdXBlcmxheWVyKCk7Ci0gICAgaW5zZXJ0U3VibGF5ZXIobmV3TGF5 ZXIsIHJlZmVyZW5jZUluZGV4KTsKKworICAgIGlmIChuZXdMYXllcikgeworICAgICAgICBuZXdM YXllci0+cmVtb3ZlRnJvbVN1cGVybGF5ZXIoKTsKKyAgICAgICAgaW5zZXJ0U3VibGF5ZXIobmV3 TGF5ZXIsIHJlZmVyZW5jZUluZGV4KTsKKyAgICB9CiB9CiAKIHZvaWQgV0tDQUNGTGF5ZXI6OnJl bW92ZUZyb21TdXBlcmxheWVyKCkKQEAgLTMwOCwyMSArMzA1LDEwIEBAIHZvaWQgV0tDQUNGTGF5 ZXI6OnJlbW92ZUZyb21TdXBlcmxheWVyKCkKICAgICBpZiAoIXN1cGVybGF5ZXIpCiAgICAgICAg IHJldHVybjsKIAotICAgIHN1cGVybGF5ZXItPnJlbW92ZVN1YmxheWVyKHRoaXMpOwogICAgIENB Q0ZMYXllclJlbW92ZUZyb21TdXBlcmxheWVyKGxheWVyKCkpOwogICAgIHN1cGVybGF5ZXItPnNl dE5lZWRzQ29tbWl0KCk7CiB9CiAKLXZvaWQgV0tDQUNGTGF5ZXI6OnJlbW92ZVN1YmxheWVyKGNv bnN0IFdLQ0FDRkxheWVyKiBzdWJsYXllcikKLXsKLSAgICBpbnQgZm91bmRJbmRleCA9IGluZGV4 T2ZTdWJsYXllcihzdWJsYXllcik7Ci0gICAgaWYgKGZvdW5kSW5kZXggPT0gLTEpCi0gICAgICAg IHJldHVybjsKLQotICAgIENBQ0ZMYXllclJlbW92ZUZyb21TdXBlcmxheWVyKHN1YmxheWVyLT5s YXllcigpKTsKLSAgICBzZXROZWVkc0NvbW1pdCgpOwotfQotCiBjb25zdCBXS0NBQ0ZMYXllciog V0tDQUNGTGF5ZXI6OnN1YmxheWVyQXRJbmRleChpbnQgaW5kZXgpIGNvbnN0CiB7CiAgICAgQ0ZB cnJheVJlZiBzdWJsYXllcnMgPSBDQUNGTGF5ZXJHZXRTdWJsYXllcnMobGF5ZXIoKSk7CkBAIC00 MzEsMjkgKzQxNywxOCBAQCB2b2lkIFdLQ0FDRkxheWVyOjpyZW1vdmVBbGxTdWJsYXllcnMoKQog CiB2b2lkIFdLQ0FDRkxheWVyOjpzZXRTdWJsYXllcnMoY29uc3QgVmVjdG9yPFJlZlB0cjxXS0NB Q0ZMYXllcj4gPiYgc3VibGF5ZXJzKQogewotICAgIGlmIChzdWJsYXllcnMuaXNFbXB0eSgpKQot ICAgICAgICBDQUNGTGF5ZXJTZXRTdWJsYXllcnMobGF5ZXIoKSwgMCk7Ci0gICAgZWxzZSB7Ci0g ICAgICAgIC8vIENyZWF0ZSBhIHZlY3RvciBvZiBDQUNGTGF5ZXJzLgotICAgICAgICBWZWN0b3I8 Y29uc3Qgdm9pZCo+IGxheWVyczsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzdWJs YXllcnMuc2l6ZSgpOyBpKyspCi0gICAgICAgICAgICBsYXllcnMuYXBwZW5kKHN1YmxheWVyc1tp XS0+bGF5ZXIoKSk7Ci0gICAgCi0gICAgICAgIFJldGFpblB0cjxDRkFycmF5UmVmPiBsYXllcnNB cnJheShBZG9wdENGLCBDRkFycmF5Q3JlYXRlKDAsIGxheWVycy5kYXRhKCksIGxheWVycy5zaXpl KCksIDApKTsKLSAgICAgICAgQ0FDRkxheWVyU2V0U3VibGF5ZXJzKGxheWVyKCksIGxheWVyc0Fy cmF5LmdldCgpKTsKLSAgICB9Ci0gICAgCi0gICAgc2V0TmVlZHNDb21taXQoKTsKLX0KKyAgICAv LyBSZW1vdmUgYWxsIHRoZSBjdXJyZW50IHN1YmxheWVycyBhbmQgYWRkIHRoZSBwYXNzZWQgbGF5 ZXJzCisgICAgQ0FDRkxheWVyU2V0U3VibGF5ZXJzKGxheWVyKCksIDApOwogCi12b2lkIFdLQ0FD RkxheWVyOjptb3ZlU3VibGF5ZXJzKFdLQ0FDRkxheWVyKiBmcm9tTGF5ZXIsIFdLQ0FDRkxheWVy KiB0b0xheWVyKQotewotICAgIGlmICghZnJvbUxheWVyIHx8ICF0b0xheWVyKQotICAgICAgICBy ZXR1cm47CisgICAgLy8gUGVyZm9ybSByZW1vdmVGcm9tU3VwZXJMYXllciBpbiBhIHNlcGFyYXRl IHBhc3MuIENBQ0YgcmVxdWlyZXMgc3VwZXJsYXllciB0bworICAgIC8vIGJlIG51bGwgb3IgQ0FD RkxheWVySW5zZXJ0U3VibGF5ZXIgc2lsZW50bHkgZmFpbHMuCisgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBzdWJsYXllcnMuc2l6ZSgpOyBpKyspCisgICAgICAgIENBQ0ZMYXllclJlbW92ZUZy b21TdXBlcmxheWVyKHN1YmxheWVyc1tpXS0+bGF5ZXIoKSk7CiAKLSAgICBDQUNGTGF5ZXJTZXRT dWJsYXllcnModG9MYXllci0+bGF5ZXIoKSwgQ0FDRkxheWVyR2V0U3VibGF5ZXJzKGZyb21MYXll ci0+bGF5ZXIoKSkpOwotICAgIGZyb21MYXllci0+c2V0TmVlZHNDb21taXQoKTsKLSAgICB0b0xh eWVyLT5zZXROZWVkc0NvbW1pdCgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3VibGF5 ZXJzLnNpemUoKTsgaSsrKQorICAgICAgICBDQUNGTGF5ZXJJbnNlcnRTdWJsYXllcihsYXllcigp LCBzdWJsYXllcnNbaV0tPmxheWVyKCksIGkpOworCisgICAgc2V0TmVlZHNDb21taXQoKTsKIH0K IAogV0tDQUNGTGF5ZXIqIFdLQ0FDRkxheWVyOjpzdXBlcmxheWVyKCkgY29uc3QKQEAgLTUwOCwx MSArNDgzLDExIEBAIHZvaWQgV0tDQUNGTGF5ZXI6OnByaW50TGF5ZXIoaW50IGluZGVudCkKICAg ICBDR1BvaW50IGxheWVyQW5jaG9yUG9pbnQgPSBhbmNob3JQb2ludCgpOwogICAgIENHUmVjdCBs YXllckJvdW5kcyA9IGJvdW5kcygpOwogICAgIHByaW50SW5kZW50KGluZGVudCk7Ci0gICAgZnBy aW50ZihzdGRlcnIsICIoJXMgWyVnICVnICVnXSBbJWcgJWcgJWcgJWddIFslZyAlZyAlZ11cbiIs CisgICAgZnByaW50ZihzdGRlcnIsICIoJXMgWyVnICVnICVnXSBbJWcgJWcgJWcgJWddIFslZyAl ZyAlZ10gc3VwZXJsYXllcj0lcFxuIiwKICAgICAgICAgaXNUcmFuc2Zvcm1MYXllcigpID8gInRy YW5zZm9ybS1sYXllciIgOiAibGF5ZXIiLAogICAgICAgICBsYXllclBvc2l0aW9uLngsIGxheWVy UG9zaXRpb24ueSwgelBvc2l0aW9uKCksIAogICAgICAgICBsYXllckJvdW5kcy5vcmlnaW4ueCwg bGF5ZXJCb3VuZHMub3JpZ2luLnksIGxheWVyQm91bmRzLnNpemUud2lkdGgsIGxheWVyQm91bmRz LnNpemUuaGVpZ2h0LAotICAgICAgICBsYXllckFuY2hvclBvaW50LngsIGxheWVyQW5jaG9yUG9p bnQueSwgYW5jaG9yUG9pbnRaKCkpOworICAgICAgICBsYXllckFuY2hvclBvaW50LngsIGxheWVy QW5jaG9yUG9pbnQueSwgYW5jaG9yUG9pbnRaKCksIHN1cGVybGF5ZXIoKSk7CiAKICAgICAvLyBQ cmludCBuYW1lIGlmIG5lZWRlZAogICAgIFN0cmluZyBsYXllck5hbWUgPSBuYW1lKCk7CkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9XS0NBQ0ZMYXllci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dLQ0FDRkxheWVyLmgJKHJldmlzaW9u IDU2MTk0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vV0tDQUNGTGF5ZXIuaAko d29ya2luZyBjb3B5KQpAQCAtMTE4LDcgKzExOCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGluc2Vy dFN1YmxheWVyQmVsb3dMYXllcihQYXNzUmVmUHRyPFdLQ0FDRkxheWVyPiwgY29uc3QgV0tDQUNG TGF5ZXIqIHJlZmVyZW5jZSk7CiAgICAgdm9pZCByZXBsYWNlU3VibGF5ZXIoV0tDQUNGTGF5ZXIq IHJlZmVyZW5jZSwgUGFzc1JlZlB0cjxXS0NBQ0ZMYXllcj4pOwogICAgIHZvaWQgcmVtb3ZlRnJv bVN1cGVybGF5ZXIoKTsKLSAgICBzdGF0aWMgdm9pZCBtb3ZlU3VibGF5ZXJzKFdLQ0FDRkxheWVy KiBmcm9tTGF5ZXIsIFdLQ0FDRkxheWVyKiB0b0xheWVyKTsKIAogICAgIFdLQ0FDRkxheWVyKiBh bmNlc3Rvck9yU2VsZldpdGhTdXBlcmxheWVyKFdLQ0FDRkxheWVyKikgY29uc3Q7CiAgICAgCg==