26652 2009-06-23 10:13:45 -0700 Fix reflections on elements with composited layers 2009-06-23 13:31:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED DUPLICATE 24863 P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 127642 0 simon.fraser 2009-06-23 10:13:45 -0700 Reflection painting (in software) on elements that get composited layers is currently broken. 127657 1 31727 simon.fraser 2009-06-23 12:42:23 -0700 Created attachment 31727 Some initial cleanup 127658 2 31727 hyatt 2009-06-23 12:43:05 -0700 Comment on attachment 31727 Some initial cleanup r=me 127661 3 31727 simon.fraser 2009-06-23 12:47:43 -0700 Comment on attachment 31727 Some initial cleanup http://trac.webkit.org/changeset/45001 127672 4 simon.fraser 2009-06-23 13:31:32 -0700 *** This bug has been marked as a duplicate of 24863 *** 31727 2009-06-23 12:42:23 -0700 2009-06-23 12:47:43 -0700 Some initial cleanup 26652_patch_part1.txt text/plain 15126 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Njk2N2UyMS4uZWU5ZGUzYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNyBAQAogMjAwOS0wNi0yMyAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGaXJzdCBwYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yNjY1MgorICAgICAgICAKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjopOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsaWNhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclJlcGxpY2E6OnBhaW50KToKKyAgICAgICAgUmVwbGFjZSB0aGUgMyBib29sZWFuIHBh cmFtcyB0byBSZW5kZXJMYXllcjo6cGFpbnRMYXllcigpIHdpdGggYSBiaXQgbWFzayBmb3IgcmVh ZGFiaWxpdHkuCisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludEludG9M YXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50Q29udGVu dHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKyAgICAgICAg UmVtb3ZlIHRoZSB1bnVzZWQgJ2hhdmVUcmFuc3BhcmVuY3knIHBhcmFtIHRvIHBhaW50SW50b0xh eWVyKCkuCisgICAgICAgIAorCisyMDA5LTA2LTIzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFz ZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgogCiAgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82OTk3OTI5PiBBc3NlcnRpb24gYXQgV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnVwZGF0ZUNsaXBSZWN0cyB3aXRoIGhhcmR3YXJlIGFjY2VsZXJhdGlvbgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDc2NTM4MjIuLmU5YTVhNTAgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKQEAgLTE4OTQsNyArMTg5NCw3IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnNj cm9sbChTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eSBncmFudWxh cml0CiB2b2lkIFJlbmRlckxheWVyOjpwYWludChHcmFwaGljc0NvbnRleHQqIHAsIGNvbnN0IElu dFJlY3QmIGRhbWFnZVJlY3QsIFBhaW50UmVzdHJpY3Rpb24gcGFpbnRSZXN0cmljdGlvbiwgUmVu ZGVyT2JqZWN0ICpwYWludGluZ1Jvb3QpCiB7CiAgICAgUmVuZGVyT2JqZWN0OjpPdmVybGFwVGVz dFJlcXVlc3RNYXAgb3ZlcmxhcFRlc3RSZXF1ZXN0czsKLSAgICBwYWludExheWVyKHRoaXMsIHAs IGRhbWFnZVJlY3QsIGZhbHNlLCBwYWludFJlc3RyaWN0aW9uLCBwYWludGluZ1Jvb3QsICZvdmVy bGFwVGVzdFJlcXVlc3RzKTsKKyAgICBwYWludExheWVyKHRoaXMsIHAsIGRhbWFnZVJlY3QsIHBh aW50UmVzdHJpY3Rpb24sIHBhaW50aW5nUm9vdCwgJm92ZXJsYXBUZXN0UmVxdWVzdHMpOwogICAg IFJlbmRlck9iamVjdDo6T3ZlcmxhcFRlc3RSZXF1ZXN0TWFwOjppdGVyYXRvciBlbmQgPSBvdmVy bGFwVGVzdFJlcXVlc3RzLmVuZCgpOwogICAgIGZvciAoUmVuZGVyT2JqZWN0OjpPdmVybGFwVGVz dFJlcXVlc3RNYXA6Oml0ZXJhdG9yIGl0ID0gb3ZlcmxhcFRlc3RSZXF1ZXN0cy5iZWdpbigpOyBp dCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIGl0LT5maXJzdC0+c2V0T3ZlcmxhcFRlc3RSZXN1bHQo ZmFsc2UpOwpAQCAtMTkzMSwxNiArMTkzMSwxNiBAQCBzdGF0aWMgdm9pZCBwZXJmb3JtT3Zlcmxh cFRlc3RzKFJlbmRlck9iamVjdDo6T3ZlcmxhcFRlc3RSZXF1ZXN0TWFwJiBvdmVybGFwVGVzdAog fQogCiB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyKFJlbmRlckxheWVyKiByb290TGF5ZXIs IEdyYXBoaWNzQ29udGV4dCogcCwKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEludFJl Y3QmIHBhaW50RGlydHlSZWN0LCBib29sIGhhdmVUcmFuc3BhcmVuY3ksIFBhaW50UmVzdHJpY3Rp b24gcGFpbnRSZXN0cmljdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEludFJl Y3QmIHBhaW50RGlydHlSZWN0LCBQYWludFJlc3RyaWN0aW9uIHBhaW50UmVzdHJpY3Rpb24sCiAg ICAgICAgICAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHBhaW50aW5nUm9vdCwgUmVuZGVy T2JqZWN0OjpPdmVybGFwVGVzdFJlcXVlc3RNYXAqIG92ZXJsYXBUZXN0UmVxdWVzdHMsCi0gICAg ICAgICAgICAgICAgICAgICAgICBib29sIGFwcGxpZWRUcmFuc2Zvcm0sIGJvb2wgdGVtcG9yYXJ5 Q2xpcFJlY3RzKQorICAgICAgICAgICAgICAgICAgICAgICAgUGFpbnRMYXllckZsYWdzIHBhaW50 RmxhZ3MpCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGlmIChpc0Nv bXBvc2l0ZWQoKSkgewogICAgICAgICAvLyBUaGUgdXBkYXRpbmdDb250cm9sVGludHMoKSBwYWlu dGluZyBwYXNzIGdvZXMgdGhyb3VnaCBjb21wb3NpdGluZyBsYXllcnMsCiAgICAgICAgIC8vIGJ1 dCB3ZSBuZWVkIHRvIGVuc3VyZSB0aGF0IHdlIGRvbid0IGNhY2hlIGNsaXAgcmVjdHMgY29tcHV0 ZWQgd2l0aCB0aGUgd3Jvbmcgcm9vdCBpbiB0aGlzIGNhc2UuCiAgICAgICAgIGlmIChwLT51cGRh dGluZ0NvbnRyb2xUaW50cygpKQotICAgICAgICAgICAgdGVtcG9yYXJ5Q2xpcFJlY3RzID0gdHJ1 ZTsKKyAgICAgICAgICAgIHBhaW50RmxhZ3MgfD0gUGFpbnRMYXllclRlbXBvcmFyeUNsaXBSZWN0 czsKICAgICAgICAgZWxzZSBpZiAoIWJhY2tpbmcoKS0+cGFpbnRpbmdHb2VzVG9XaW5kb3coKSkg ewogICAgICAgICAgICAgLy8gSWYgdGhpcyBSZW5kZXJMYXllciBzaG91bGQgcGFpbnQgaW50byBp dHMgYmFja2luZywgdGhhdCB3aWxsIGJlIGRvbmUgdmlhIFJlbmRlckxheWVyQmFja2luZzo6cGFp bnRJbnRvTGF5ZXIoKS4KICAgICAgICAgICAgIHJldHVybjsKQEAgLTE5NTksMjQgKzE5NTksMjQg QEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllcihSZW5kZXJMYXllciogcm9vdExheWVyLCBH cmFwaGljc0NvbnRleHQqIHAsCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChwYWludHNXaXRo VHJhbnNwYXJlbmN5KCkpCi0gICAgICAgIGhhdmVUcmFuc3BhcmVuY3kgPSB0cnVlOworICAgICAg ICBwYWludEZsYWdzIHw9IFBhaW50TGF5ZXJIYXZlVHJhbnNwYXJlbmN5OwogCiAgICAgLy8gQXBw bHkgYSB0cmFuc2Zvcm0gaWYgd2UgaGF2ZSBvbmUuICBBIHJlZmxlY3Rpb24gaXMgY29uc2lkZXJl ZCB0byBiZSBhIHRyYW5zZm9ybSwgc2luY2UgaXQgaXMgYSBmbGlwIGFuZCBhIHRyYW5zbGF0ZS4K LSAgICBpZiAocGFpbnRzV2l0aFRyYW5zZm9ybSgpICYmICFhcHBsaWVkVHJhbnNmb3JtKSB7Cisg ICAgaWYgKHBhaW50c1dpdGhUcmFuc2Zvcm0oKSAmJiAhKHBhaW50RmxhZ3MgJiBQYWludExheWVy QXBwbGllZFRyYW5zZm9ybSkpIHsKICAgICAgICAgLy8gSWYgdGhlIHRyYW5zZm9ybSBjYW4ndCBi ZSBpbnZlcnRlZCwgdGhlbiBkb24ndCBwYWludCBhbnl0aGluZy4KICAgICAgICAgaWYgKCFtX3Ry YW5zZm9ybS0+aXNJbnZlcnRpYmxlKCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAg Ly8gSWYgd2UgaGF2ZSBhIHRyYW5zcGFyZW5jeSBsYXllciBlbmNsb3NpbmcgdXMgYW5kIHdlIGFy ZSB0aGUgcm9vdCBvZiBhIHRyYW5zZm9ybSwgdGhlbiB3ZSBuZWVkIHRvIGVzdGFibGlzaCB0aGUg dHJhbnNwYXJlbmN5CiAgICAgICAgIC8vIGxheWVyIGZyb20gdGhlIHBhcmVudCBub3cuCi0gICAg ICAgIGlmIChoYXZlVHJhbnNwYXJlbmN5KQorICAgICAgICBpZiAocGFpbnRGbGFncyAmIFBhaW50 TGF5ZXJIYXZlVHJhbnNwYXJlbmN5KQogICAgICAgICAgICAgcGFyZW50KCktPmJlZ2luVHJhbnNw YXJlbmN5TGF5ZXJzKHAsIHJvb3RMYXllcik7CiAgIAogICAgICAgICAvLyBNYWtlIHN1cmUgdGhl IHBhcmVudCdzIGNsaXAgcmVjdHMgaGF2ZSBiZWVuIGNhbGN1bGF0ZWQuCiAgICAgICAgIEludFJl Y3QgY2xpcFJlY3QgPSBwYWludERpcnR5UmVjdDsKICAgICAgICAgaWYgKHBhcmVudCgpKSB7CiAg ICAgICAgICAgICBDbGlwUmVjdHMgcGFyZW50UmVjdHM7Ci0gICAgICAgICAgICBwYXJlbnRDbGlw UmVjdHMocm9vdExheWVyLCBwYXJlbnRSZWN0cywgdGVtcG9yYXJ5Q2xpcFJlY3RzKTsKKyAgICAg ICAgICAgIHBhcmVudENsaXBSZWN0cyhyb290TGF5ZXIsIHBhcmVudFJlY3RzLCBwYWludEZsYWdz ICYgUGFpbnRMYXllclRlbXBvcmFyeUNsaXBSZWN0cyk7CiAgICAgICAgICAgICBjbGlwUmVjdCA9 IHBhcmVudFJlY3RzLm92ZXJmbG93Q2xpcFJlY3QoKTsKICAgICAgICAgICAgIGNsaXBSZWN0Lmlu dGVyc2VjdChwYWludERpcnR5UmVjdCk7CiAgICAgICAgIH0KQEAgLTE5OTgsNyArMTk5OCw3IEBA IHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXIoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3Jh cGhpY3NDb250ZXh0KiBwLAogICAgICAgICBwLT5jb25jYXRDVE0odHJhbnNmb3JtKTsKIAogICAg ICAgICAvLyBOb3cgZG8gYSBwYWludCB3aXRoIHRoZSByb290IGxheWVyIHNoaWZ0ZWQgdG8gYmUg dXMuCi0gICAgICAgIHBhaW50TGF5ZXIodGhpcywgcCwgdHJhbnNmb3JtLmludmVyc2UoKS5tYXBS ZWN0KHBhaW50RGlydHlSZWN0KSwgaGF2ZVRyYW5zcGFyZW5jeSwgcGFpbnRSZXN0cmljdGlvbiwg cGFpbnRpbmdSb290LCBvdmVybGFwVGVzdFJlcXVlc3RzLCB0cnVlLCB0ZW1wb3JhcnlDbGlwUmVj dHMpOworICAgICAgICBwYWludExheWVyKHRoaXMsIHAsIHRyYW5zZm9ybS5pbnZlcnNlKCkubWFw UmVjdChwYWludERpcnR5UmVjdCksIHBhaW50UmVzdHJpY3Rpb24sIHBhaW50aW5nUm9vdCwgb3Zl cmxhcFRlc3RSZXF1ZXN0cywgcGFpbnRGbGFncyB8IFBhaW50TGF5ZXJBcHBsaWVkVHJhbnNmb3Jt KTsKIAogICAgICAgICBwLT5yZXN0b3JlKCk7CiAgICAgICAgIApAQCAtMjAwOCwxNyArMjAwOCwy MCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyKFJlbmRlckxheWVyKiByb290TGF5ZXIs IEdyYXBoaWNzQ29udGV4dCogcCwKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIFBhaW50 TGF5ZXJGbGFncyBsb2NhbFBhaW50RmxhZ3MgPSBwYWludEZsYWdzICYgflBhaW50TGF5ZXJBcHBs aWVkVHJhbnNmb3JtOworICAgIGJvb2wgaGF2ZVRyYW5zcGFyZW5jeSA9IGxvY2FsUGFpbnRGbGFn cyAmIFBhaW50TGF5ZXJIYXZlVHJhbnNwYXJlbmN5OworCiAgICAgLy8gUGFpbnQgdGhlIHJlZmxl Y3Rpb24gZmlyc3QgaWYgd2UgaGF2ZSBvbmUuCi0gICAgaWYgKG1fcmVmbGVjdGlvbiAmJiAhbV9w YWludGluZ0luc2lkZVJlZmxlY3Rpb24gJiYgKCFtX3RyYW5zZm9ybSB8fCBhcHBsaWVkVHJhbnNm b3JtKSkgeworICAgIGlmIChtX3JlZmxlY3Rpb24gJiYgIW1fcGFpbnRpbmdJbnNpZGVSZWZsZWN0 aW9uICYmICghbV90cmFuc2Zvcm0gfHwgKHBhaW50RmxhZ3MgJiBQYWludExheWVyQXBwbGllZFRy YW5zZm9ybSkpKSB7CiAgICAgICAgIC8vIE1hcmsgdGhhdCB3ZSBhcmUgbm93IGluc2lkZSByZXBs aWNhIHBhaW50aW5nLgogICAgICAgICBtX3BhaW50aW5nSW5zaWRlUmVmbGVjdGlvbiA9IHRydWU7 Ci0gICAgICAgIHJlZmxlY3Rpb25MYXllcigpLT5wYWludExheWVyKHJvb3RMYXllciwgcCwgcGFp bnREaXJ0eVJlY3QsIGhhdmVUcmFuc3BhcmVuY3ksIHBhaW50UmVzdHJpY3Rpb24sIHBhaW50aW5n Um9vdCwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgZmFsc2UsIHRlbXBvcmFyeUNsaXBSZWN0cyk7Cisg ICAgICAgIHJlZmxlY3Rpb25MYXllcigpLT5wYWludExheWVyKHJvb3RMYXllciwgcCwgcGFpbnRE aXJ0eVJlY3QsIHBhaW50UmVzdHJpY3Rpb24sIHBhaW50aW5nUm9vdCwgb3ZlcmxhcFRlc3RSZXF1 ZXN0cywgbG9jYWxQYWludEZsYWdzKTsKICAgICAgICAgbV9wYWludGluZ0luc2lkZVJlZmxlY3Rp b24gPSBmYWxzZTsKICAgICB9CiAKICAgICAvLyBDYWxjdWxhdGUgdGhlIGNsaXAgcmVjdHMgd2Ug c2hvdWxkIHVzZS4KICAgICBJbnRSZWN0IGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVj dFRvQXBwbHksIG91dGxpbmVSZWN0OwotICAgIGNhbGN1bGF0ZVJlY3RzKHJvb3RMYXllciwgcGFp bnREaXJ0eVJlY3QsIGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRvQXBwbHksIG91 dGxpbmVSZWN0LCB0ZW1wb3JhcnlDbGlwUmVjdHMpOworICAgIGNhbGN1bGF0ZVJlY3RzKHJvb3RM YXllciwgcGFpbnREaXJ0eVJlY3QsIGxheWVyQm91bmRzLCBkYW1hZ2VSZWN0LCBjbGlwUmVjdFRv QXBwbHksIG91dGxpbmVSZWN0LCBsb2NhbFBhaW50RmxhZ3MgJiBQYWludExheWVyVGVtcG9yYXJ5 Q2xpcFJlY3RzKTsKICAgICBpbnQgeCA9IGxheWVyQm91bmRzLngoKTsKICAgICBpbnQgeSA9IGxh eWVyQm91bmRzLnkoKTsKICAgICBpbnQgdHggPSB4IC0gcmVuZGVyQm94WCgpOwpAQCAtMjA2Myw3 ICsyMDY2LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllcihSZW5kZXJMYXllciogcm9v dExheWVyLCBHcmFwaGljc0NvbnRleHQqIHAsCiAgICAgLy8gTm93IHdhbGsgdGhlIHNvcnRlZCBs aXN0IG9mIGNoaWxkcmVuIHdpdGggbmVnYXRpdmUgei1pbmRpY2VzLgogICAgIGlmIChtX25lZ1pP cmRlckxpc3QpCiAgICAgICAgIGZvciAoVmVjdG9yPFJlbmRlckxheWVyKj46Oml0ZXJhdG9yIGl0 ID0gbV9uZWdaT3JkZXJMaXN0LT5iZWdpbigpOyBpdCAhPSBtX25lZ1pPcmRlckxpc3QtPmVuZCgp OyArK2l0KQotICAgICAgICAgICAgaXRbMF0tPnBhaW50TGF5ZXIocm9vdExheWVyLCBwLCBwYWlu dERpcnR5UmVjdCwgaGF2ZVRyYW5zcGFyZW5jeSwgcGFpbnRSZXN0cmljdGlvbiwgcGFpbnRpbmdS b290LCBvdmVybGFwVGVzdFJlcXVlc3RzLCBmYWxzZSwgdGVtcG9yYXJ5Q2xpcFJlY3RzKTsKKyAg ICAgICAgICAgIGl0WzBdLT5wYWludExheWVyKHJvb3RMYXllciwgcCwgcGFpbnREaXJ0eVJlY3Qs IHBhaW50UmVzdHJpY3Rpb24sIHBhaW50aW5nUm9vdCwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgbG9j YWxQYWludEZsYWdzKTsKICAgICAKICAgICAvLyBOb3cgZXN0YWJsaXNoIHRoZSBhcHByb3ByaWF0 ZSBjbGlwIGFuZCBwYWludCBvdXIgY2hpbGQgUmVuZGVyT2JqZWN0cy4KICAgICBpZiAoc2hvdWxk UGFpbnQgJiYgIWNsaXBSZWN0VG9BcHBseS5pc0VtcHR5KCkpIHsKQEAgLTIxMDIsMTIgKzIxMDUs MTIgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllcihSZW5kZXJMYXllciogcm9vdExheWVy LCBHcmFwaGljc0NvbnRleHQqIHAsCiAgICAgLy8gUGFpbnQgYW55IGNoaWxkIGxheWVycyB0aGF0 IGhhdmUgb3ZlcmZsb3cuCiAgICAgaWYgKG1fbm9ybWFsRmxvd0xpc3QpCiAgICAgICAgIGZvciAo VmVjdG9yPFJlbmRlckxheWVyKj46Oml0ZXJhdG9yIGl0ID0gbV9ub3JtYWxGbG93TGlzdC0+YmVn aW4oKTsgaXQgIT0gbV9ub3JtYWxGbG93TGlzdC0+ZW5kKCk7ICsraXQpCi0gICAgICAgICAgICBp dFswXS0+cGFpbnRMYXllcihyb290TGF5ZXIsIHAsIHBhaW50RGlydHlSZWN0LCBoYXZlVHJhbnNw YXJlbmN5LCBwYWludFJlc3RyaWN0aW9uLCBwYWludGluZ1Jvb3QsIG92ZXJsYXBUZXN0UmVxdWVz dHMsIGZhbHNlLCB0ZW1wb3JhcnlDbGlwUmVjdHMpOworICAgICAgICAgICAgaXRbMF0tPnBhaW50 TGF5ZXIocm9vdExheWVyLCBwLCBwYWludERpcnR5UmVjdCwgcGFpbnRSZXN0cmljdGlvbiwgcGFp bnRpbmdSb290LCBvdmVybGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBhaW50RmxhZ3MpOwogCiAgICAg Ly8gTm93IHdhbGsgdGhlIHNvcnRlZCBsaXN0IG9mIGNoaWxkcmVuIHdpdGggcG9zaXRpdmUgei1p bmRpY2VzLgogICAgIGlmIChtX3Bvc1pPcmRlckxpc3QpCiAgICAgICAgIGZvciAoVmVjdG9yPFJl bmRlckxheWVyKj46Oml0ZXJhdG9yIGl0ID0gbV9wb3NaT3JkZXJMaXN0LT5iZWdpbigpOyBpdCAh PSBtX3Bvc1pPcmRlckxpc3QtPmVuZCgpOyArK2l0KQotICAgICAgICAgICAgaXRbMF0tPnBhaW50 TGF5ZXIocm9vdExheWVyLCBwLCBwYWludERpcnR5UmVjdCwgaGF2ZVRyYW5zcGFyZW5jeSwgcGFp bnRSZXN0cmljdGlvbiwgcGFpbnRpbmdSb290LCBvdmVybGFwVGVzdFJlcXVlc3RzLCBmYWxzZSwg dGVtcG9yYXJ5Q2xpcFJlY3RzKTsKKyAgICAgICAgICAgIGl0WzBdLT5wYWludExheWVyKHJvb3RM YXllciwgcCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50UmVzdHJpY3Rpb24sIHBhaW50aW5nUm9vdCwg b3ZlcmxhcFRlc3RSZXF1ZXN0cywgbG9jYWxQYWludEZsYWdzKTsKICAgICAKICAgICBpZiAocmVu ZGVyZXIoKS0+aGFzTWFzaygpICYmIHNob3VsZFBhaW50ICYmICFzZWxlY3Rpb25Pbmx5ICYmICFk YW1hZ2VSZWN0LmlzRW1wdHkoKSkgewogICAgICAgICBzZXRDbGlwKHAsIHBhaW50RGlydHlSZWN0 LCBkYW1hZ2VSZWN0KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDljOGRlNWUuLjYyZTI4 YzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtNDM5LDEwICs0MzksMTcgQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgdXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVkKCk7CiAgICAgCisgICAgZW51 bSBQYWludExheWVyRmxhZyB7CisgICAgICAgIFBhaW50TGF5ZXJIYXZlVHJhbnNwYXJlbmN5ID0g MSwKKyAgICAgICAgUGFpbnRMYXllckFwcGxpZWRUcmFuc2Zvcm0gPSAxIDw8IDEsCisgICAgICAg IFBhaW50TGF5ZXJUZW1wb3JhcnlDbGlwUmVjdHMgPSAxIDw8IDIKKyAgICB9OworICAgIAorICAg IHR5cGVkZWYgdW5zaWduZWQgUGFpbnRMYXllckZsYWdzOworCiAgICAgdm9pZCBwYWludExheWVy KFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3Qm IHBhaW50RGlydHlSZWN0LAotICAgICAgICAgICAgICAgICAgICBib29sIGhhdmVUcmFuc3BhcmVu Y3ksIFBhaW50UmVzdHJpY3Rpb24sIFJlbmRlck9iamVjdCogcGFpbnRpbmdSb290LAotICAgICAg ICAgICAgICAgICAgICBSZW5kZXJPYmplY3Q6Ok92ZXJsYXBUZXN0UmVxdWVzdE1hcCogPSAwLAot ICAgICAgICAgICAgICAgICAgICBib29sIGFwcGxpZWRUcmFuc2Zvcm0gPSBmYWxzZSwgYm9vbCB0 ZW1wb3JhcnlDbGlwUmVjdHMgPSBmYWxzZSk7CisgICAgICAgICAgICAgICAgICAgIFBhaW50UmVz dHJpY3Rpb24sIFJlbmRlck9iamVjdCogcGFpbnRpbmdSb290LCBSZW5kZXJPYmplY3Q6Ok92ZXJs YXBUZXN0UmVxdWVzdE1hcCogPSAwLAorICAgICAgICAgICAgICAgICAgICBQYWludExheWVyRmxh Z3MgcGFpbnRGbGFncyA9IDApOwogCiAgICAgUmVuZGVyTGF5ZXIqIGhpdFRlc3RMYXllcihSZW5k ZXJMYXllciogcm9vdExheWVyLCBSZW5kZXJMYXllciogY29udGFpbmVyTGF5ZXIsIGNvbnN0IEhp dFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiByZXN1bHQsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgSW50UmVjdCYgaGl0VGVzdFJlY3QsIGNvbnN0IEludFBv aW50JiBoaXRUZXN0UG9pbnQsIGJvb2wgYXBwbGllZFRyYW5zZm9ybSwKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDNkNjExZDIuLmQ0MDg3NjQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtNzM5LDcgKzczOSw3IEBAIHN0 YXRpYyB2b2lkIHJlc3RvcmVDbGlwKEdyYXBoaWNzQ29udGV4dCogcCwgY29uc3QgSW50UmVjdCYg cGFpbnREaXJ0eVJlY3QsIGNvbnN0CiAvLyBTaGFyZSB0aGlzIHdpdGggUmVuZGVyTGF5ZXI6OnBh aW50TGF5ZXIsIHdoaWNoIHdvdWxkIGhhdmUgdG8gYmUgZWR1Y2F0ZWQgYWJvdXQgR3JhcGhpY3NM YXllclBhaW50aW5nUGhhc2U/CiB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6cGFpbnRJbnRvTGF5 ZXIoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LAogICAg ICAgICAgICAgICAgICAgICBjb25zdCBJbnRSZWN0JiBwYWludERpcnR5UmVjdCwgICAgICAvLyBp biB0aGUgY29vcmRzIG9mIHJvb3RMYXllcgotICAgICAgICAgICAgICAgICAgICBib29sIGhhdmVU cmFuc3BhcmVuY3ksIFBhaW50UmVzdHJpY3Rpb24gcGFpbnRSZXN0cmljdGlvbiwgR3JhcGhpY3NM YXllclBhaW50aW5nUGhhc2UgcGFpbnRpbmdQaGFzZSwKKyAgICAgICAgICAgICAgICAgICAgUGFp bnRSZXN0cmljdGlvbiBwYWludFJlc3RyaWN0aW9uLCBHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFz ZSBwYWludGluZ1BoYXNlLAogICAgICAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHBhaW50 aW5nUm9vdCkKIHsKICAgICBpZiAocGFpbnRpbmdHb2VzVG9XaW5kb3coKSkgewpAQCAtODE2LDcg KzgxNiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludEludG9MYXllcihSZW5kZXJM YXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqCiAgICAgICAgIFZlY3RvcjxSZW5kZXJM YXllcio+KiBuZWdaT3JkZXJMaXN0ID0gbV9vd25pbmdMYXllci0+bmVnWk9yZGVyTGlzdCgpOwog ICAgICAgICBpZiAobmVnWk9yZGVyTGlzdCkgewogICAgICAgICAgICAgZm9yIChWZWN0b3I8UmVu ZGVyTGF5ZXIqPjo6aXRlcmF0b3IgaXQgPSBuZWdaT3JkZXJMaXN0LT5iZWdpbigpOyBpdCAhPSBu ZWdaT3JkZXJMaXN0LT5lbmQoKTsgKytpdCkKLSAgICAgICAgICAgICAgICBpdFswXS0+cGFpbnRM YXllcihyb290TGF5ZXIsIGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBoYXZlVHJhbnNwYXJlbmN5 LCBwYWludFJlc3RyaWN0aW9uLCBwYWludGluZ1Jvb3QpOworICAgICAgICAgICAgICAgIGl0WzBd LT5wYWludExheWVyKHJvb3RMYXllciwgY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50UmVz dHJpY3Rpb24sIHBhaW50aW5nUm9vdCk7CiAgICAgICAgIH0KIAogICAgICAgICBib29sIGZvcmNl QmxhY2tUZXh0ID0gcGFpbnRSZXN0cmljdGlvbiA9PSBQYWludFJlc3RyaWN0aW9uU2VsZWN0aW9u T25seUJsYWNrVGV4dDsKQEAgLTg1NSwxNCArODU1LDE0IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNr aW5nOjpwYWludEludG9MYXllcihSZW5kZXJMYXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRl eHQqCiAgICAgICAgIFZlY3RvcjxSZW5kZXJMYXllcio+KiBub3JtYWxGbG93TGlzdCA9IG1fb3du aW5nTGF5ZXItPm5vcm1hbEZsb3dMaXN0KCk7CiAgICAgICAgIGlmIChub3JtYWxGbG93TGlzdCkg ewogICAgICAgICAgICAgZm9yIChWZWN0b3I8UmVuZGVyTGF5ZXIqPjo6aXRlcmF0b3IgaXQgPSBu b3JtYWxGbG93TGlzdC0+YmVnaW4oKTsgaXQgIT0gbm9ybWFsRmxvd0xpc3QtPmVuZCgpOyArK2l0 KQotICAgICAgICAgICAgICAgIGl0WzBdLT5wYWludExheWVyKHJvb3RMYXllciwgY29udGV4dCwg cGFpbnREaXJ0eVJlY3QsIGhhdmVUcmFuc3BhcmVuY3ksIHBhaW50UmVzdHJpY3Rpb24sIHBhaW50 aW5nUm9vdCk7CisgICAgICAgICAgICAgICAgaXRbMF0tPnBhaW50TGF5ZXIocm9vdExheWVyLCBj b250ZXh0LCBwYWludERpcnR5UmVjdCwgcGFpbnRSZXN0cmljdGlvbiwgcGFpbnRpbmdSb290KTsK ICAgICAgICAgfQogCiAgICAgICAgIC8vIE5vdyB3YWxrIHRoZSBzb3J0ZWQgbGlzdCBvZiBjaGls ZHJlbiB3aXRoIHBvc2l0aXZlIHotaW5kaWNlcy4KICAgICAgICAgVmVjdG9yPFJlbmRlckxheWVy Kj4qIHBvc1pPcmRlckxpc3QgPSBtX293bmluZ0xheWVyLT5wb3NaT3JkZXJMaXN0KCk7CiAgICAg ICAgIGlmIChwb3NaT3JkZXJMaXN0KSB7CiAgICAgICAgICAgICBmb3IgKFZlY3RvcjxSZW5kZXJM YXllcio+OjppdGVyYXRvciBpdCA9IHBvc1pPcmRlckxpc3QtPmJlZ2luKCk7IGl0ICE9IHBvc1pP cmRlckxpc3QtPmVuZCgpOyArK2l0KQotICAgICAgICAgICAgICAgIGl0WzBdLT5wYWludExheWVy KHJvb3RMYXllciwgY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIGhhdmVUcmFuc3BhcmVuY3ksIHBh aW50UmVzdHJpY3Rpb24sIHBhaW50aW5nUm9vdCk7CisgICAgICAgICAgICAgICAgaXRbMF0tPnBh aW50TGF5ZXIocm9vdExheWVyLCBjb250ZXh0LCBwYWludERpcnR5UmVjdCwgcGFpbnRSZXN0cmlj dGlvbiwgcGFpbnRpbmdSb290KTsKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYgKHJl bmRlcmVyKCktPmhhc01hc2soKSAmJiAhc2VsZWN0aW9uT25seSAmJiAhZGFtYWdlUmVjdC5pc0Vt cHR5KCkpIHsKQEAgLTg5OSw3ICs4OTksNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6cGFp bnRDb250ZW50cyhjb25zdCBHcmFwaGljc0xheWVyKiwgR3JhcGhpY3NDb250ZXh0JiBjbwogICAg IEludFJlY3QgZGlydHlSZWN0ID0gZW5jbG9zaW5nQkJveDsKICAgICBkaXJ0eVJlY3QuaW50ZXJz ZWN0KGNsaXBSZWN0KTsKIAotICAgIHBhaW50SW50b0xheWVyKG1fb3duaW5nTGF5ZXIsICZjb250 ZXh0LCBkaXJ0eVJlY3QsIGZhbHNlLCBQYWludFJlc3RyaWN0aW9uTm9uZSwgZHJhd2luZ1BoYXNl LCByZW5kZXJlcigpKTsKKyAgICBwYWludEludG9MYXllcihtX293bmluZ0xheWVyLCAmY29udGV4 dCwgZGlydHlSZWN0LCBQYWludFJlc3RyaWN0aW9uTm9uZSwgZHJhd2luZ1BoYXNlLCByZW5kZXJl cigpKTsKIH0KIAogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnN0YXJ0QW5pbWF0aW9uKGRvdWJs ZSBiZWdpblRpbWUsIGNvbnN0IEFuaW1hdGlvbiogYW5pbSwgY29uc3QgS2V5ZnJhbWVMaXN0JiBr ZXlmcmFtZXMpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tp bmcuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IDc3OWRj NmUuLjUwYTc3ZGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCkBAIC0x NTEsNyArMTUxLDcgQEAgcHJpdmF0ZToKICAgICBib29sIGhhc05vbkNvbXBvc2l0aW5nQ29udGVu dCgpIGNvbnN0OwogICAgIAogICAgIHZvaWQgcGFpbnRJbnRvTGF5ZXIoUmVuZGVyTGF5ZXIqIHJv b3RMYXllciwgR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYgcGFpbnREaXJ0eVJlY3Qs Ci0gICAgICAgICAgICAgICAgICAgIGJvb2wgaGF2ZVRyYW5zcGFyZW5jeSwgUGFpbnRSZXN0cmlj dGlvbiBwYWludFJlc3RyaWN0aW9uLCBHcmFwaGljc0xheWVyUGFpbnRpbmdQaGFzZSwgUmVuZGVy T2JqZWN0KiBwYWludGluZ1Jvb3QpOworICAgICAgICAgICAgICAgICAgICBQYWludFJlc3RyaWN0 aW9uIHBhaW50UmVzdHJpY3Rpb24sIEdyYXBoaWNzTGF5ZXJQYWludGluZ1BoYXNlLCBSZW5kZXJP YmplY3QqIHBhaW50aW5nUm9vdCk7CiAKICAgICBzdGF0aWMgaW50IGdyYXBoaWNzTGF5ZXJUb0NT U1Byb3BlcnR5KEFuaW1hdGVkUHJvcGVydHlJRCk7CiAgICAgc3RhdGljIEFuaW1hdGVkUHJvcGVy dHlJRCBjc3NUb0dyYXBoaWNzTGF5ZXJQcm9wZXJ0eShpbnQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGljYS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZXBsaWNhLmNwcAppbmRleCBlODA1Mjk4Li41NTgwOTQ1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSZXBsaWNhLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZXBsaWNhLmNwcApAQCAtNzIsOSArNzIsOCBAQCB2b2lkIFJlbmRlclJlcGxpY2E6OnBhaW50KFBh aW50SW5mbyYgcGFpbnRJbmZvLCBpbnQgdHgsIGludCB0eSkKICAgICAgICAgLy8gY29tcHV0aW5n IHVzaW5nIHRoZSB3cm9uZyByb290TGF5ZXIKICAgICAgICAgbGF5ZXIoKS0+cGFyZW50KCktPnBh aW50TGF5ZXIobGF5ZXIoKS0+dHJhbnNmb3JtKCkgPyBsYXllcigpLT5wYXJlbnQoKSA6IGxheWVy KCktPmVuY2xvc2luZ1RyYW5zZm9ybWVkQW5jZXN0b3IoKSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQsIHBhaW50SW5mby5yZWN0LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLCBQYWludFJlc3RyaWN0aW9u Tm9uZSwgMCwgMCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZSwg ICAgIC8vIGFwcGxpZWRUcmFuc2Zvcm0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdHJ1ZSk7ICAgIC8vIHRlbXBvcmFyeUNsaXBSZWN0cworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBQYWludFJlc3RyaWN0aW9uTm9uZSwgMCwgMCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJIYXZl VHJhbnNwYXJlbmN5IHwgUmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJBcHBsaWVkVHJhbnNmb3JtIHwg UmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJUZW1wb3JhcnlDbGlwUmVjdHMpOwogICAgIGVsc2UgaWYg KHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlTWFzaykKICAgICAgICAgcGFpbnRNYXNrKHBh aW50SW5mbywgdHgsIHR5KTsKIH0K