93734 2012-08-10 11:47:05 -0700 [chromium] Remove targetSurface pointer from CCRenderPass 2012-08-10 13:41:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj aelias cc-bugs enne jamesr piman webkit.review.bot wjmaclean zlieber oldest_to_newest 692760 0 danakj 2012-08-10 11:47:05 -0700 [chromium] Remove targetSurface pointer from CCRenderPass 692763 1 157782 danakj 2012-08-10 11:49:25 -0700 Created attachment 157782 Patch 692772 2 157782 enne 2012-08-10 11:56:09 -0700 Comment on attachment 157782 Patch I suspect that this changed once the HUD became a layer, but are the debug rects now one frame behind? 692777 3 danakj 2012-08-10 11:57:27 -0700 (In reply to comment #2) > (From update of attachment 157782 [details]) > I suspect that this changed once the HUD became a layer, but are the debug rects now one frame behind? Are you referring to the ordering change here? It seems that they would just never have any rects for surface damage, since it was being cleared just before it was being saved. Or are you referring to behaviour you're seeing in the HUD? 692784 4 enne 2012-08-10 12:04:01 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 157782 [details] [details]) > > I suspect that this changed once the HUD became a layer, but are the debug rects now one frame behind? > > Are you referring to the ordering change here? It seems that they would just never have any rects for surface damage, since it was being cleared just before it was being saved. Or are you referring to behaviour you're seeing in the HUD? Just trying to understand. It's a good thing the hud is so well-tested, sad trombone noise. This is what I understand from reading the code: Pre-HUD layer: debug rects saved, damage cleared, hud drawn Post-HUD layer: hud layer drawn, damage cleared, debug rects saved This patch: hud layer drawn, debug rects saved, damage cleared Or: Pre-HUD layer: debug rects for current frame drawn on current frame Post-HUD layer: debug rects for previous frame drawn on current frame, damage never drawn This patch: debug rects for previous frame drawn on current frame 692790 5 danakj 2012-08-10 12:11:24 -0700 Oh I see. Here's what I see pre-HUD-layer: drawFrame drawHud clearDamage saveRects So, busted, and showing rects from the previous frame. Before this patch, I see: drawFrame (including Hud) clearDamage saveRects After this patch, I see: drawFrame (including Hud) saveRects clearDamage Maybe we should be saving rects before drawFrame, I'll open a bug and we can discuss with shawn. 692793 6 157782 enne 2012-08-10 12:13:36 -0700 Comment on attachment 157782 Patch R=me. With respect to the HUD bug, this patch is still a strict improvement, so no reason not to land it. 692855 7 157782 webkit.review.bot 2012-08-10 13:40:56 -0700 Comment on attachment 157782 Patch Clearing flags on attachment: 157782 Committed r125325: <http://trac.webkit.org/changeset/125325> 692856 8 webkit.review.bot 2012-08-10 13:41:00 -0700 All reviewed patches have been landed. Closing bug. 157782 2012-08-10 11:49:25 -0700 2012-08-10 13:40:56 -0700 Patch bug-93734-20120810144857.patch text/plain 13971 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1Mjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTkxZGRjZTgwN2ViZWVj NmNkYzEwMWE0ZjBhYjQwYWZiOWVhY2NlMC4uZTcyMGEwZTdhNGZiNGRlM2EyNTgzZDJjNjllYmU3 ZjA5ZjE2ZmQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTEwICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVt b3ZlIHRhcmdldFN1cmZhY2UgcG9pbnRlciBmcm9tIENDUmVuZGVyUGFzcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM3MzQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHJlbW92ZXMgdGhlIENDUmVu ZGVyU3VyZmFjZSBwb2ludGVyIGZyb20gdGhlIENDUmVuZGVyUGFzcworICAgICAgICBzdHJ1Y3R1 cmUsIGFsbG93aW5nIGl0IHRvIGJlIHNlcmlhbGl6ZWQgYW5kIHVzZWQgYWNyb3NzIHByb2Nlc3Nl cworICAgICAgICBmcmVlbHkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzOyBubyBpbnRlbmRlZCBj aGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVy VHJlZUhvc3RJbXBsOjpkcmF3TGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ1JlbmRlclBhc3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NSZW5kZXJQ YXNzOjpDQ1JlbmRlclBhc3MpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDUmVuZGVyUGFzcy5oOgorICAgICAgICAoQ0NSZW5kZXJQYXNzKToKKwogMjAxMi0wOC0x MCAgRXJpayBBcnZpZHNzb24gIDxhcnZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gRW5h YmxlIGVzNV9yZWFkb25seQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA5YTE3ZjI3NTU5 ZmRhNjM4OTMyZmVhM2I1Y2JlMDQwMGIzMWZmNjc4Li41ZTE1ZjQyMTllMjcwMDM1Y2JhYWQ1ZWFl OGNjNGRmMjA4YWY2Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4 IEBACiAyMDEyLTA4LTEwICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIHRhcmdldFN1cmZhY2UgcG9pbnRlciBmcm9tIENDUmVu ZGVyUGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTM3MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgdGhlIFJlbmRlclBhc3MncyBkYW1hZ2VSZWN0IGluc3RlYWQgb2YgdGhlIHN1cmZhY2UncyBk YW1hZ2VSZWN0CisgICAgICAgIGRpcmVjdGx5IHRvIHRlc3QgdGhlIHNhbWUgdGhpbmdzIHdpdGhv dXQgcmVxdWlyaW5nIGEgcG9pbnRlciB0bworICAgICAgICB0aGUgc3VyZmFjZSB0aGF0IGdlbmVy YXRlZCB0aGUgUmVuZGVyUGFzcy4KKworICAgICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVlSG9zdElt cGxUZXN0LmNwcDoKKworMjAxMi0wOC0xMCAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVt Lm9yZz4KKwogICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBzY2lzc29yIGZyb20gdGhlIG5hbWlu Z3MgaW4gQ0NPY2NsdXNpb25UcmFja2VyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05MzYzMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGwuY3BwCmluZGV4IDdiNzZiOTk2YjVkY2VkNDhkZDFhMjNjODAyZTM4OGJhMGQxNWNmMWMuLmI0 ZjgwOGUxNTBlNzQzMDhjNmMyMjU1OTgwMDgyZThlNjZiOTZlYTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdEltcGwuY3BwCkBAIC01NDUsMTggKzU0NSwxNyBAQCB2b2lkIENDTGF5 ZXJUcmVlSG9zdEltcGw6OmRyYXdMYXllcnMoY29uc3QgRnJhbWVEYXRhJiBmcmFtZSkKIAogICAg IG1fbGF5ZXJSZW5kZXJlci0+ZHJhd0ZyYW1lKGZyYW1lLnJlbmRlclBhc3NlcywgZnJhbWUucmVu ZGVyUGFzc2VzQnlJZCk7CiAKLSAgICBmb3IgKHVuc2lnbmVkIGludCBpID0gMDsgaSA8IGZyYW1l LnJlbmRlclBhc3Nlcy5zaXplKCk7IGkrKykgewotICAgICAgICBmcmFtZS5yZW5kZXJQYXNzZXNb aV0tPnRhcmdldFN1cmZhY2UoKS0+ZGFtYWdlVHJhY2tlcigpLT5kaWREcmF3RGFtYWdlZEFyZWEo KTsKLQotICAgICAgICAvLyBPbmNlIGEgUmVuZGVyUGFzcyBoYXMgYmVlbiBkcmF3biwgaXRzIGRh bWFnZSBzaG91bGQgYmUgY2xlYXJlZCBpbgotICAgICAgICAvLyBjYXNlIHRoZSBSZW5kZXJQYXNz IHdpbGwgYmUgcmV1c2VkIG5leHQgZnJhbWUuCi0gICAgICAgIGZyYW1lLnJlbmRlclBhc3Nlc1tp XS0+c2V0RGFtYWdlUmVjdChGbG9hdFJlY3QoKSk7Ci0gICAgfQotCiAgICAgaWYgKG1fc2V0dGlu Z3Muc2hvd0RlYnVnUmVjdHMoKSkKICAgICAgICAgbV9kZWJ1Z1JlY3RIaXN0b3J5LT5zYXZlRGVi dWdSZWN0c0ZvckN1cnJlbnRGcmFtZShtX3Jvb3RMYXllckltcGwuZ2V0KCksICpmcmFtZS5yZW5k ZXJTdXJmYWNlTGF5ZXJMaXN0LCBmcmFtZS5vY2NsdWRpbmdTY3JlZW5TcGFjZVJlY3RzLCBzZXR0 aW5ncygpKTsKIAorICAgIC8vIE9uY2UgYSBSZW5kZXJQYXNzIGhhcyBiZWVuIGRyYXduLCBpdHMg ZGFtYWdlIHNob3VsZCBiZSBjbGVhcmVkIGluCisgICAgLy8gY2FzZSB0aGUgUmVuZGVyUGFzcyB3 aWxsIGJlIHJldXNlZCBuZXh0IGZyYW1lLgorICAgIGZvciAodW5zaWduZWQgaW50IGkgPSAwOyBp IDwgZnJhbWUucmVuZGVyUGFzc2VzLnNpemUoKTsgaSsrKQorICAgICAgICBmcmFtZS5yZW5kZXJQ YXNzZXNbaV0tPnNldERhbWFnZVJlY3QoRmxvYXRSZWN0KCkpOworCiAgICAgLy8gVGhlIG5leHQg ZnJhbWUgc2hvdWxkIHN0YXJ0IGJ5IGFzc3VtaW5nIG5vdGhpbmcgaGFzIGNoYW5nZWQsIGFuZCBj aGFuZ2VzIGFyZSBub3RlZCBhcyB0aGV5IG9jY3VyLgorICAgIGZvciAodW5zaWduZWQgaW50IGkg PSAwOyBpIDwgZnJhbWUucmVuZGVyU3VyZmFjZUxheWVyTGlzdC0+c2l6ZSgpOyBpKyspCisgICAg ICAgICgqZnJhbWUucmVuZGVyU3VyZmFjZUxheWVyTGlzdClbaV0tPnJlbmRlclN1cmZhY2UoKS0+ ZGFtYWdlVHJhY2tlcigpLT5kaWREcmF3RGFtYWdlZEFyZWEoKTsKICAgICBtX3Jvb3RMYXllcklt cGwtPnJlc2V0QWxsQ2hhbmdlVHJhY2tpbmdGb3JTdWJ0cmVlKCk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyUGFz cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Jl bmRlclBhc3MuY3BwCmluZGV4IGU0Mzg0NjM2ZmQwMzk1M2MzODY1Njg4ZGEwMmIyMzU1MWI5OGFl YjQuLjQ5ZGM5MDI1MmVmNzhmMWVkOTU5Y2I4ZWMxOTNiYmExYzMwZGFiYTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyUGFz cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NSZW5kZXJQYXNzLmNwcApAQCAtNDUsNyArNDUsNiBAQCBQYXNzT3duUHRyPENDUmVuZGVyUGFz cz4gQ0NSZW5kZXJQYXNzOjpjcmVhdGUoQ0NSZW5kZXJTdXJmYWNlKiB0YXJnZXRTdXJmYWNlLCBp bgogCiBDQ1JlbmRlclBhc3M6OkNDUmVuZGVyUGFzcyhDQ1JlbmRlclN1cmZhY2UqIHRhcmdldFN1 cmZhY2UsIGludCBpZCkKICAgICA6IG1faWQoaWQpCi0gICAgLCBtX3RhcmdldFN1cmZhY2UodGFy Z2V0U3VyZmFjZSkKICAgICAsIG1fdHJhbnNmb3JtVG9Sb290VGFyZ2V0KHRhcmdldFN1cmZhY2Ut PnNjcmVlblNwYWNlVHJhbnNmb3JtKCkpCiAgICAgLCBtX291dHB1dFJlY3QodGFyZ2V0U3VyZmFj ZS0+Y29udGVudFJlY3QoKSkKICAgICAsIG1faGFzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKHRydWUp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ1JlbmRlclBhc3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDUmVuZGVyUGFzcy5oCmluZGV4IGYxMjMxMWJmMGM5YjMxMGY2MzdjODk3Nzc2NmQ2 ZjNhNzllOTFiZmEuLmUyYTQ4MGUwOWM3MTJkYjQyZDA5NmYxOTEwZGJkNDYwNjlmYmFiZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND UmVuZGVyUGFzcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDUmVuZGVyUGFzcy5oCkBAIC02NSw3ICs2NSw2IEBAIHB1YmxpYzoKICAgICBjb25z dCBDQ1F1YWRMaXN0JiBxdWFkTGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1fcXVhZExpc3Q7IH0KIAog ICAgIGludCBpZCgpIGNvbnN0IHsgcmV0dXJuIG1faWQ7IH0KLSAgICBDQ1JlbmRlclN1cmZhY2Uq IHRhcmdldFN1cmZhY2UoKSBjb25zdCB7IHJldHVybiBtX3RhcmdldFN1cmZhY2U7IH0KIAogICAg IC8vIEZJWE1FOiBNb2RpZnkgdGhpcyB0cmFuc2Zvcm0gd2hlbiBtZXJnaW5nIHRoZSBSZW5kZXJQ YXNzIGludG8gYSBwYXJlbnQgY29tcG9zaXRvci4KICAgICAvLyBUcmFuc2Zvcm1zIGZyb20gcXVh ZCdzIG9yaWdpbmFsIGNvbnRlbnQgc3BhY2UgdG8gdGhlIHJvb3QgdGFyZ2V0J3MgY29udGVudCBz cGFjZS4KQEAgLTkyLDcgKzkxLDYgQEAgcHJvdGVjdGVkOgogICAgIENDUmVuZGVyUGFzcyhDQ1Jl bmRlclN1cmZhY2UqLCBpbnQgaWQpOwogCiAgICAgaW50IG1faWQ7Ci0gICAgQ0NSZW5kZXJTdXJm YWNlKiBtX3RhcmdldFN1cmZhY2U7CiAgICAgQ0NRdWFkTGlzdCBtX3F1YWRMaXN0OwogICAgIFdl YktpdDo6V2ViVHJhbnNmb3JtYXRpb25NYXRyaXggbV90cmFuc2Zvcm1Ub1Jvb3RUYXJnZXQ7CiAg ICAgSW50UmVjdCBtX291dHB1dFJlY3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCmluZGV4IGM1MWIyNTYyZjBl Mzg2NTUzNjRhNTJhODQyNDBlOTM5ZWM5OGI2YjguLjJjMTRhMWNjMzRiN2NmMGY0NGRmNTQyMjU3 NThmZWI3YmM0Y2Q5Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwCkBAIC0zMzIyLDcgKzMzMjIsNyBAQCBU RVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VUZXh0dXJlQ2FjaGluZykKICAg ICAgICAgRVhQRUNUX0VRKENDRHJhd1F1YWQ6OlJlbmRlclBhc3MsIGZyYW1lLnJlbmRlclBhc3Nl c1sxXS0+cXVhZExpc3QoKVswXS0+bWF0ZXJpYWwoKSk7CiAgICAgICAgIENDUmVuZGVyUGFzc0Ry YXdRdWFkKiBxdWFkID0gc3RhdGljX2Nhc3Q8Q0NSZW5kZXJQYXNzRHJhd1F1YWQqPihmcmFtZS5y ZW5kZXJQYXNzZXNbMV0tPnF1YWRMaXN0KClbMF0uZ2V0KCkpOwogICAgICAgICBDQ1JlbmRlclBh c3MqIHRhcmdldFBhc3MgPSBmcmFtZS5yZW5kZXJQYXNzZXNCeUlkLmdldChxdWFkLT5yZW5kZXJQ YXNzSWQoKSk7Ci0gICAgICAgIEVYUEVDVF9UUlVFKHRhcmdldFBhc3MtPnRhcmdldFN1cmZhY2Uo KS0+Y29udGVudHNDaGFuZ2VkKCkpOworICAgICAgICBFWFBFQ1RfRkFMU0UodGFyZ2V0UGFzcy0+ ZGFtYWdlUmVjdCgpLmlzRW1wdHkoKSk7CiAKICAgICAgICAgbXlIb3N0SW1wbC0+ZHJhd0xheWVy cyhmcmFtZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdBbGxMYXllcnMoZnJhbWUpOwpA QCAtMzM0MCw3ICszMzQwLDcgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzdXJm YWNlVGV4dHVyZUNhY2hpbmcpCiAgICAgICAgIEVYUEVDVF9FUShDQ0RyYXdRdWFkOjpSZW5kZXJQ YXNzLCBmcmFtZS5yZW5kZXJQYXNzZXNbMF0tPnF1YWRMaXN0KClbMF0tPm1hdGVyaWFsKCkpOwog ICAgICAgICBDQ1JlbmRlclBhc3NEcmF3UXVhZCogcXVhZCA9IHN0YXRpY19jYXN0PENDUmVuZGVy UGFzc0RyYXdRdWFkKj4oZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlzdCgpWzBdLmdldCgp KTsKICAgICAgICAgQ0NSZW5kZXJQYXNzKiB0YXJnZXRQYXNzID0gZnJhbWUucmVuZGVyUGFzc2Vz QnlJZC5nZXQocXVhZC0+cmVuZGVyUGFzc0lkKCkpOwotICAgICAgICBFWFBFQ1RfRkFMU0UodGFy Z2V0UGFzcy0+dGFyZ2V0U3VyZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7CisgICAgICAgIEVY UEVDVF9UUlVFKHRhcmdldFBhc3MtPmRhbWFnZVJlY3QoKS5pc0VtcHR5KCkpOwogCiAgICAgICAg IG15SG9zdEltcGwtPmRyYXdMYXllcnMoZnJhbWUpOwogICAgICAgICBteUhvc3RJbXBsLT5kaWRE cmF3QWxsTGF5ZXJzKGZyYW1lKTsKQEAgLTMzNTksNyArMzM1OSw3IEBAIFRFU1RfRihDQ0xheWVy VHJlZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNoaW5nKQogICAgICAgICBFWFBFQ1Rf RVEoQ0NEcmF3UXVhZDo6UmVuZGVyUGFzcywgZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlz dCgpWzBdLT5tYXRlcmlhbCgpKTsKICAgICAgICAgQ0NSZW5kZXJQYXNzRHJhd1F1YWQqIHF1YWQg PSBzdGF0aWNfY2FzdDxDQ1JlbmRlclBhc3NEcmF3UXVhZCo+KGZyYW1lLnJlbmRlclBhc3Nlc1sw XS0+cXVhZExpc3QoKVswXS5nZXQoKSk7CiAgICAgICAgIENDUmVuZGVyUGFzcyogdGFyZ2V0UGFz cyA9IGZyYW1lLnJlbmRlclBhc3Nlc0J5SWQuZ2V0KHF1YWQtPnJlbmRlclBhc3NJZCgpKTsKLSAg ICAgICAgRVhQRUNUX0ZBTFNFKHRhcmdldFBhc3MtPnRhcmdldFN1cmZhY2UoKS0+Y29udGVudHND aGFuZ2VkKCkpOworICAgICAgICBFWFBFQ1RfVFJVRSh0YXJnZXRQYXNzLT5kYW1hZ2VSZWN0KCku aXNFbXB0eSgpKTsKIAogICAgICAgICBteUhvc3RJbXBsLT5kcmF3TGF5ZXJzKGZyYW1lKTsKICAg ICAgICAgbXlIb3N0SW1wbC0+ZGlkRHJhd0FsbExheWVycyhmcmFtZSk7CkBAIC0zMzgwLDcgKzMz ODAsNyBAQCBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VUZXh0dXJlQ2Fj aGluZykKICAgICAgICAgRVhQRUNUX0VRKENDRHJhd1F1YWQ6OlJlbmRlclBhc3MsIGZyYW1lLnJl bmRlclBhc3Nlc1sxXS0+cXVhZExpc3QoKVswXS0+bWF0ZXJpYWwoKSk7CiAgICAgICAgIENDUmVu ZGVyUGFzc0RyYXdRdWFkKiBxdWFkID0gc3RhdGljX2Nhc3Q8Q0NSZW5kZXJQYXNzRHJhd1F1YWQq PihmcmFtZS5yZW5kZXJQYXNzZXNbMV0tPnF1YWRMaXN0KClbMF0uZ2V0KCkpOwogICAgICAgICBD Q1JlbmRlclBhc3MqIHRhcmdldFBhc3MgPSBmcmFtZS5yZW5kZXJQYXNzZXNCeUlkLmdldChxdWFk LT5yZW5kZXJQYXNzSWQoKSk7Ci0gICAgICAgIEVYUEVDVF9UUlVFKHRhcmdldFBhc3MtPnRhcmdl dFN1cmZhY2UoKS0+Y29udGVudHNDaGFuZ2VkKCkpOworICAgICAgICBFWFBFQ1RfRkFMU0UodGFy Z2V0UGFzcy0+ZGFtYWdlUmVjdCgpLmlzRW1wdHkoKSk7CiAKICAgICAgICAgbXlIb3N0SW1wbC0+ ZHJhd0xheWVycyhmcmFtZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdBbGxMYXllcnMo ZnJhbWUpOwpAQCAtMzQwNyw3ICszNDA3LDcgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxU ZXN0LCBzdXJmYWNlVGV4dHVyZUNhY2hpbmcpCiAgICAgICAgIEVYUEVDVF9FUShDQ0RyYXdRdWFk OjpSZW5kZXJQYXNzLCBmcmFtZS5yZW5kZXJQYXNzZXNbMV0tPnF1YWRMaXN0KClbMF0tPm1hdGVy aWFsKCkpOwogICAgICAgICBDQ1JlbmRlclBhc3NEcmF3UXVhZCogcXVhZCA9IHN0YXRpY19jYXN0 PENDUmVuZGVyUGFzc0RyYXdRdWFkKj4oZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgp WzBdLmdldCgpKTsKICAgICAgICAgQ0NSZW5kZXJQYXNzKiB0YXJnZXRQYXNzID0gZnJhbWUucmVu ZGVyUGFzc2VzQnlJZC5nZXQocXVhZC0+cmVuZGVyUGFzc0lkKCkpOwotICAgICAgICBFWFBFQ1Rf RkFMU0UodGFyZ2V0UGFzcy0+dGFyZ2V0U3VyZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7Cisg ICAgICAgIEVYUEVDVF9UUlVFKHRhcmdldFBhc3MtPmRhbWFnZVJlY3QoKS5pc0VtcHR5KCkpOwog CiAgICAgICAgIC8vIFdhcyBvdXIgc3VyZmFjZSBldmljdGVkPwogICAgICAgICBFWFBFQ1RfRkFM U0UobXlIb3N0SW1wbC0+bGF5ZXJSZW5kZXJlcigpLT5oYXZlQ2FjaGVkUmVzb3VyY2VzRm9yUmVu ZGVyUGFzc0lkKHRhcmdldFBhc3MtPmlkKCkpKTsKQEAgLTM0MjgsNyArMzQyOCw3IEBAIFRFU1Rf RihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNoaW5nKQogICAgICAg ICBFWFBFQ1RfRVEoQ0NEcmF3UXVhZDo6UmVuZGVyUGFzcywgZnJhbWUucmVuZGVyUGFzc2VzWzBd LT5xdWFkTGlzdCgpWzBdLT5tYXRlcmlhbCgpKTsKICAgICAgICAgQ0NSZW5kZXJQYXNzRHJhd1F1 YWQqIHF1YWQgPSBzdGF0aWNfY2FzdDxDQ1JlbmRlclBhc3NEcmF3UXVhZCo+KGZyYW1lLnJlbmRl clBhc3Nlc1swXS0+cXVhZExpc3QoKVswXS5nZXQoKSk7CiAgICAgICAgIENDUmVuZGVyUGFzcyog dGFyZ2V0UGFzcyA9IGZyYW1lLnJlbmRlclBhc3Nlc0J5SWQuZ2V0KHF1YWQtPnJlbmRlclBhc3NJ ZCgpKTsKLSAgICAgICAgRVhQRUNUX0ZBTFNFKHRhcmdldFBhc3MtPnRhcmdldFN1cmZhY2UoKS0+ Y29udGVudHNDaGFuZ2VkKCkpOworICAgICAgICBFWFBFQ1RfVFJVRSh0YXJnZXRQYXNzLT5kYW1h Z2VSZWN0KCkuaXNFbXB0eSgpKTsKIAogICAgICAgICBteUhvc3RJbXBsLT5kcmF3TGF5ZXJzKGZy YW1lKTsKICAgICAgICAgbXlIb3N0SW1wbC0+ZGlkRHJhd0FsbExheWVycyhmcmFtZSk7CkBAIC0z NDQ5LDcgKzM0NDksNyBAQCBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VU ZXh0dXJlQ2FjaGluZykKICAgICAgICAgRVhQRUNUX0VRKENDRHJhd1F1YWQ6OlJlbmRlclBhc3Ms IGZyYW1lLnJlbmRlclBhc3Nlc1swXS0+cXVhZExpc3QoKVswXS0+bWF0ZXJpYWwoKSk7CiAgICAg ICAgIENDUmVuZGVyUGFzc0RyYXdRdWFkKiBxdWFkID0gc3RhdGljX2Nhc3Q8Q0NSZW5kZXJQYXNz RHJhd1F1YWQqPihmcmFtZS5yZW5kZXJQYXNzZXNbMF0tPnF1YWRMaXN0KClbMF0uZ2V0KCkpOwog ICAgICAgICBDQ1JlbmRlclBhc3MqIHRhcmdldFBhc3MgPSBmcmFtZS5yZW5kZXJQYXNzZXNCeUlk LmdldChxdWFkLT5yZW5kZXJQYXNzSWQoKSk7Ci0gICAgICAgIEVYUEVDVF9GQUxTRSh0YXJnZXRQ YXNzLT50YXJnZXRTdXJmYWNlKCktPmNvbnRlbnRzQ2hhbmdlZCgpKTsKKyAgICAgICAgRVhQRUNU X1RSVUUodGFyZ2V0UGFzcy0+ZGFtYWdlUmVjdCgpLmlzRW1wdHkoKSk7CiAKICAgICAgICAgbXlI b3N0SW1wbC0+ZHJhd0xheWVycyhmcmFtZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdB bGxMYXllcnMoZnJhbWUpOwpAQCAtMzQ4MywxMCArMzQ4MywxMCBAQCBURVNUX0YoQ0NMYXllclRy ZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VUZXh0dXJlQ2FjaGluZ05vUGFydGlhbFN3YXApCiAgICAg ICAgIEVYUEVDVF9FUShDQ0RyYXdRdWFkOjpSZW5kZXJQYXNzLCBmcmFtZS5yZW5kZXJQYXNzZXNb MV0tPnF1YWRMaXN0KClbMF0tPm1hdGVyaWFsKCkpOwogICAgICAgICBDQ1JlbmRlclBhc3NEcmF3 UXVhZCogcXVhZCA9IHN0YXRpY19jYXN0PENDUmVuZGVyUGFzc0RyYXdRdWFkKj4oZnJhbWUucmVu ZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpWzBdLmdldCgpKTsKICAgICAgICAgQ0NSZW5kZXJQYXNz KiB0YXJnZXRQYXNzID0gZnJhbWUucmVuZGVyUGFzc2VzQnlJZC5nZXQocXVhZC0+cmVuZGVyUGFz c0lkKCkpOwotICAgICAgICBFWFBFQ1RfVFJVRSh0YXJnZXRQYXNzLT50YXJnZXRTdXJmYWNlKCkt PmNvbnRlbnRzQ2hhbmdlZCgpKTsKKyAgICAgICAgRVhQRUNUX0ZBTFNFKHRhcmdldFBhc3MtPmRh bWFnZVJlY3QoKS5pc0VtcHR5KCkpOwogCi0gICAgICAgIEVYUEVDVF9UUlVFKGZyYW1lLnJlbmRl clBhc3Nlc1swXS0+dGFyZ2V0U3VyZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7Ci0gICAgICAg IEVYUEVDVF9UUlVFKGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+dGFyZ2V0U3VyZmFjZSgpLT5jb250 ZW50c0NoYW5nZWQoKSk7CisgICAgICAgIEVYUEVDVF9GQUxTRShmcmFtZS5yZW5kZXJQYXNzZXNb MF0tPmRhbWFnZVJlY3QoKS5pc0VtcHR5KCkpOworICAgICAgICBFWFBFQ1RfRkFMU0UoZnJhbWUu cmVuZGVyUGFzc2VzWzFdLT5kYW1hZ2VSZWN0KCkuaXNFbXB0eSgpKTsKIAogICAgICAgICBFWFBF Q1RfRkFMU0UoZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5oYXNPY2NsdXNpb25Gcm9tT3V0c2lkZVRh cmdldFN1cmZhY2UoKSk7CiAgICAgICAgIEVYUEVDVF9GQUxTRShmcmFtZS5yZW5kZXJQYXNzZXNb MV0tPmhhc09jY2x1c2lvbkZyb21PdXRzaWRlVGFyZ2V0U3VyZmFjZSgpKTsKQEAgLTM1MDYsNyAr MzUwNiw3IEBAIFRFU1RfRihDQ0xheWVyVHJlZUhvc3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVD YWNoaW5nTm9QYXJ0aWFsU3dhcCkKICAgICAgICAgQVNTRVJUX0VRKDFVLCBmcmFtZS5yZW5kZXJQ YXNzZXMuc2l6ZSgpKTsKICAgICAgICAgRVhQRUNUX0VRKDFVLCBmcmFtZS5yZW5kZXJQYXNzZXNb MF0tPnF1YWRMaXN0KCkuc2l6ZSgpKTsKIAotICAgICAgICBFWFBFQ1RfRkFMU0UoZnJhbWUucmVu ZGVyUGFzc2VzWzBdLT50YXJnZXRTdXJmYWNlKCktPmNvbnRlbnRzQ2hhbmdlZCgpKTsKKyAgICAg ICAgRVhQRUNUX1RSVUUoZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5kYW1hZ2VSZWN0KCkuaXNFbXB0 eSgpKTsKIAogICAgICAgICBteUhvc3RJbXBsLT5kcmF3TGF5ZXJzKGZyYW1lKTsKICAgICAgICAg bXlIb3N0SW1wbC0+ZGlkRHJhd0FsbExheWVycyhmcmFtZSk7CkBAIC0zNTI1LDcgKzM1MjUsNyBA QCBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VUZXh0dXJlQ2FjaGluZ05v UGFydGlhbFN3YXApCiAgICAgICAgIEVYUEVDVF9FUShDQ0RyYXdRdWFkOjpSZW5kZXJQYXNzLCBm cmFtZS5yZW5kZXJQYXNzZXNbMF0tPnF1YWRMaXN0KClbMF0tPm1hdGVyaWFsKCkpOwogICAgICAg ICBDQ1JlbmRlclBhc3NEcmF3UXVhZCogcXVhZCA9IHN0YXRpY19jYXN0PENDUmVuZGVyUGFzc0Ry YXdRdWFkKj4oZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlzdCgpWzBdLmdldCgpKTsKICAg ICAgICAgQ0NSZW5kZXJQYXNzKiB0YXJnZXRQYXNzID0gZnJhbWUucmVuZGVyUGFzc2VzQnlJZC5n ZXQocXVhZC0+cmVuZGVyUGFzc0lkKCkpOwotICAgICAgICBFWFBFQ1RfRkFMU0UodGFyZ2V0UGFz cy0+dGFyZ2V0U3VyZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7CisgICAgICAgIEVYUEVDVF9U UlVFKHRhcmdldFBhc3MtPmRhbWFnZVJlY3QoKS5pc0VtcHR5KCkpOwogCiAgICAgICAgIG15SG9z dEltcGwtPmRyYXdMYXllcnMoZnJhbWUpOwogICAgICAgICBteUhvc3RJbXBsLT5kaWREcmF3QWxs TGF5ZXJzKGZyYW1lKTsKQEAgLTM1NDYsNyArMzU0Niw3IEBAIFRFU1RfRihDQ0xheWVyVHJlZUhv c3RJbXBsVGVzdCwgc3VyZmFjZVRleHR1cmVDYWNoaW5nTm9QYXJ0aWFsU3dhcCkKICAgICAgICAg RVhQRUNUX0VRKENDRHJhd1F1YWQ6OlJlbmRlclBhc3MsIGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+ cXVhZExpc3QoKVswXS0+bWF0ZXJpYWwoKSk7CiAgICAgICAgIENDUmVuZGVyUGFzc0RyYXdRdWFk KiBxdWFkID0gc3RhdGljX2Nhc3Q8Q0NSZW5kZXJQYXNzRHJhd1F1YWQqPihmcmFtZS5yZW5kZXJQ YXNzZXNbMV0tPnF1YWRMaXN0KClbMF0uZ2V0KCkpOwogICAgICAgICBDQ1JlbmRlclBhc3MqIHRh cmdldFBhc3MgPSBmcmFtZS5yZW5kZXJQYXNzZXNCeUlkLmdldChxdWFkLT5yZW5kZXJQYXNzSWQo KSk7Ci0gICAgICAgIEVYUEVDVF9UUlVFKHRhcmdldFBhc3MtPnRhcmdldFN1cmZhY2UoKS0+Y29u dGVudHNDaGFuZ2VkKCkpOworICAgICAgICBFWFBFQ1RfRkFMU0UodGFyZ2V0UGFzcy0+ZGFtYWdl UmVjdCgpLmlzRW1wdHkoKSk7CiAKICAgICAgICAgbXlIb3N0SW1wbC0+ZHJhd0xheWVycyhmcmFt ZSk7CiAgICAgICAgIG15SG9zdEltcGwtPmRpZERyYXdBbGxMYXllcnMoZnJhbWUpOwpAQCAtMzU3 Myw3ICszNTczLDcgQEAgVEVTVF9GKENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LCBzdXJmYWNlVGV4 dHVyZUNhY2hpbmdOb1BhcnRpYWxTd2FwKQogICAgICAgICBFWFBFQ1RfRVEoQ0NEcmF3UXVhZDo6 UmVuZGVyUGFzcywgZnJhbWUucmVuZGVyUGFzc2VzWzFdLT5xdWFkTGlzdCgpWzBdLT5tYXRlcmlh bCgpKTsKICAgICAgICAgQ0NSZW5kZXJQYXNzRHJhd1F1YWQqIHF1YWQgPSBzdGF0aWNfY2FzdDxD Q1JlbmRlclBhc3NEcmF3UXVhZCo+KGZyYW1lLnJlbmRlclBhc3Nlc1sxXS0+cXVhZExpc3QoKVsw XS5nZXQoKSk7CiAgICAgICAgIENDUmVuZGVyUGFzcyogdGFyZ2V0UGFzcyA9IGZyYW1lLnJlbmRl clBhc3Nlc0J5SWQuZ2V0KHF1YWQtPnJlbmRlclBhc3NJZCgpKTsKLSAgICAgICAgRVhQRUNUX0ZB TFNFKHRhcmdldFBhc3MtPnRhcmdldFN1cmZhY2UoKS0+Y29udGVudHNDaGFuZ2VkKCkpOworICAg ICAgICBFWFBFQ1RfVFJVRSh0YXJnZXRQYXNzLT5kYW1hZ2VSZWN0KCkuaXNFbXB0eSgpKTsKIAog ICAgICAgICAvLyBXYXMgb3VyIHN1cmZhY2UgZXZpY3RlZD8KICAgICAgICAgRVhQRUNUX0ZBTFNF KG15SG9zdEltcGwtPmxheWVyUmVuZGVyZXIoKS0+aGF2ZUNhY2hlZFJlc291cmNlc0ZvclJlbmRl clBhc3NJZCh0YXJnZXRQYXNzLT5pZCgpKSk7CkBAIC0zNjEyLDcgKzM2MTIsNyBAQCBURVNUX0Yo Q0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIHN1cmZhY2VUZXh0dXJlQ2FjaGluZ05vUGFydGlhbFN3 YXApCiAgICAgICAgIEVYUEVDVF9FUShDQ0RyYXdRdWFkOjpSZW5kZXJQYXNzLCBmcmFtZS5yZW5k ZXJQYXNzZXNbMF0tPnF1YWRMaXN0KClbMF0tPm1hdGVyaWFsKCkpOwogICAgICAgICBDQ1JlbmRl clBhc3NEcmF3UXVhZCogcXVhZCA9IHN0YXRpY19jYXN0PENDUmVuZGVyUGFzc0RyYXdRdWFkKj4o ZnJhbWUucmVuZGVyUGFzc2VzWzBdLT5xdWFkTGlzdCgpWzBdLmdldCgpKTsKICAgICAgICAgQ0NS ZW5kZXJQYXNzKiB0YXJnZXRQYXNzID0gZnJhbWUucmVuZGVyUGFzc2VzQnlJZC5nZXQocXVhZC0+ cmVuZGVyUGFzc0lkKCkpOwotICAgICAgICBFWFBFQ1RfRkFMU0UodGFyZ2V0UGFzcy0+dGFyZ2V0 U3VyZmFjZSgpLT5jb250ZW50c0NoYW5nZWQoKSk7CisgICAgICAgIEVYUEVDVF9UUlVFKHRhcmdl dFBhc3MtPmRhbWFnZVJlY3QoKS5pc0VtcHR5KCkpOwogCiAgICAgICAgIG15SG9zdEltcGwtPmRy YXdMYXllcnMoZnJhbWUpOwogICAgICAgICBteUhvc3RJbXBsLT5kaWREcmF3QWxsTGF5ZXJzKGZy YW1lKTsK