116576 2013-05-21 14:10:49 -0700 Remove ScopeContentDistribution 2013-05-21 14:38:09 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc kling oldest_to_newest 892003 0 koivisto 2013-05-21 14:10:49 -0700 With maximum one ShadowRoot per Element this can be smashed into ContentDistributor. 892006 1 202468 koivisto 2013-05-21 14:13:28 -0700 Created attachment 202468 patch 892009 2 202468 kling 2013-05-21 14:20:01 -0700 Comment on attachment 202468 patch r=me 892020 3 koivisto 2013-05-21 14:38:09 -0700 http://trac.webkit.org/changeset/150480 202468 2013-05-21 14:13:28 -0700 2013-05-21 14:20:01 -0700 patch remove-scopecontentdistribution.patch text/plain 11112 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDQ3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA1LTIxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgU2NvcGVDb250ZW50 RGlzdHJpYnV0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTY1NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXaXRoIG1heGltdW0gb25lIFNoYWRvd1Jvb3QgcGVyIEVsZW1lbnQgdGhpcyBjYW4gYmUg c21hc2hlZCBpbnRvIENvbnRlbnREaXN0cmlidXRvci4KKworICAgICAgICAqIGRvbS9TaGFkb3dS b290LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGRvbS9TaGFkb3dSb290Lmg6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9Db250ZW50RGlzdHJp YnV0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudERpc3RyaWJ1dG9yOjpDb250ZW50 RGlzdHJpYnV0b3IpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50RGlzdHJpYnV0b3I6On5Db250ZW50RGlzdHJpYnV0b3IpOgorICAgICAgICAoV2ViQ29yZTo6 Q29udGVudERpc3RyaWJ1dG9yOjppbnZhbGlkYXRlSW5zZXJ0aW9uUG9pbnRMaXN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnREaXN0cmlidXRvcjo6ZW5zdXJlSW5zZXJ0aW9uUG9pbnRMaXN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnREaXN0cmlidXRvcjo6ZGlzdHJpYnV0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50RGlzdHJpYnV0b3I6OmludmFsaWRhdGUpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L0NvbnRlbnREaXN0cmlidXRvci5oOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChDb250ZW50RGlzdHJpYnV0b3IpOgorICAgICAgICAqIGh0bWwvc2hhZG93L0lu c2VydGlvblBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc2VydGlvblBvaW50OjpJbnNl cnRpb25Qb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNlcnRpb25Qb2ludDo6aW5zZXJ0ZWRJ bnRvKToKKyAgICAgICAgKFdlYkNvcmU6Okluc2VydGlvblBvaW50OjpyZW1vdmVkRnJvbSk6Cisg ICAgICAgIAorICAgICAgICAgICAgU2ltcGxpZnkgaW5zZXJ0aW9uIHBvaW50IGxpc3QgaW52YWxp ZGF0aW9uLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuaDoKKwogMjAx My0wNS0yMSAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBb Q1NTIFJlZ2lvbnNdW0NTUyBFeGNsdXNpb25zXSBNdWx0aXBsZSByZWdpb25zIHdpdGggc2hhcGUt aW5zaWRlcyBzaG91bGQgcmVzcGVjdCBwb3NpdGlvbmVkIHNoYXBlcyBhbmQgb3ZlcmZsb3cKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dSb290LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5jcHAJKHJldmlzaW9uIDE1MDQyOSkKKysrIFNvdXJj ZS9XZWJDb3JlL2RvbS9TaGFkb3dSb290LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzks NiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdHJ1Y3QgU2FtZVNpemVBc1NoYWRvd1Jvb3Qg OiBwdWJsaWMgRG9jdW1lbnRGcmFnbWVudCwgcHVibGljIFRyZWVTY29wZSB7Ci0gICAgdm9pZCog cG9pbnRlcnNbMV07CiAgICAgdW5zaWduZWQgY291bnRlcnNBbmRGbGFnc1sxXTsKIH07CiAKQEAg LTE5NiwxMyArMTk1LDQgQEAgdm9pZCBTaGFkb3dSb290Ojp1bnJlZ2lzdGVyU2NvcGVkSFRNTFN0 eQogICAgIHNldEhhc1Njb3BlZEhUTUxTdHlsZUNoaWxkKG1fbnVtYmVyT2ZTdHlsZXMgPiAwKTsK IH0KIAotU2NvcGVDb250ZW50RGlzdHJpYnV0aW9uKiBTaGFkb3dSb290OjplbnN1cmVTY29wZURp c3RyaWJ1dGlvbigpCi17Ci0gICAgaWYgKG1fc2NvcGVEaXN0cmlidXRpb24pCi0gICAgICAgIHJl dHVybiBtX3Njb3BlRGlzdHJpYnV0aW9uLmdldCgpOwotCi0gICAgbV9zY29wZURpc3RyaWJ1dGlv biA9IGFkb3B0UHRyKG5ldyBTY29wZUNvbnRlbnREaXN0cmlidXRpb24pOwotICAgIHJldHVybiBt X3Njb3BlRGlzdHJpYnV0aW9uLmdldCgpOwotfSAgIAotCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vU2hhZG93Um9vdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9TaGFk b3dSb290LmgJKHJldmlzaW9uIDE1MDQyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dS b290LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDYgQEAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogY2xhc3MgRWxlbWVudFNoYWRvdzsKLWNsYXNzIFNjb3BlQ29udGVudERpc3RyaWJ1dGlv bjsKIAogY2xhc3MgU2hhZG93Um9vdCBGSU5BTCA6IHB1YmxpYyBEb2N1bWVudEZyYWdtZW50LCBw dWJsaWMgVHJlZVNjb3BlIHsKIHB1YmxpYzoKQEAgLTc3LDEwICs3Niw2IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJTY29wZWRIVE1MU3R5bGVDaGlsZCgpIE9WRVJSSURFOwog ICAgIHZpcnR1YWwgdm9pZCB1bnJlZ2lzdGVyU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKSBPVkVSUklE RTsKIAotICAgIFNjb3BlQ29udGVudERpc3RyaWJ1dGlvbiogc2NvcGVEaXN0cmlidXRpb24oKSB7 IHJldHVybiBtX3Njb3BlRGlzdHJpYnV0aW9uLmdldCgpOyB9Ci0gICAgY29uc3QgU2NvcGVDb250 ZW50RGlzdHJpYnV0aW9uKiBzY29wZURpc3RyaWJ1dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nv cGVEaXN0cmlidXRpb24uZ2V0KCk7IH0KLSAgICBTY29wZUNvbnRlbnREaXN0cmlidXRpb24qIGVu c3VyZVNjb3BlRGlzdHJpYnV0aW9uKCk7Ci0KICAgICBTaGFkb3dSb290VHlwZSB0eXBlKCkgY29u c3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8U2hhZG93Um9vdFR5cGU+KG1fdHlwZSk7IH0KIAogICAg IFBhc3NSZWZQdHI8Tm9kZT4gY2xvbmVOb2RlKGJvb2wsIEV4Y2VwdGlvbkNvZGUmKTsKQEAgLTk4 LDcgKzkzLDYgQEAgcHJpdmF0ZToKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGRuJ3QgaGFwcGVu LiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg4MzQKICAgICBib29s IGlzT3JwaGFuKCkgY29uc3QgeyByZXR1cm4gIWhvc3QoKTsgfQogCi0gICAgT3duUHRyPFNjb3Bl Q29udGVudERpc3RyaWJ1dGlvbj4gbV9zY29wZURpc3RyaWJ1dGlvbjsKICAgICB1bnNpZ25lZCBt X251bWJlck9mU3R5bGVzIDogMjg7CiAgICAgdW5zaWduZWQgbV9hcHBseUF1dGhvclN0eWxlcyA6 IDE7CiAgICAgdW5zaWduZWQgbV9yZXNldFN0eWxlSW5oZXJpdGFuY2UgOiAxOwpJbmRleDogU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudERpc3RyaWJ1dG9yLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3IuY3BwCShy ZXZpc2lvbiAxNTA0NjQpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlz dHJpYnV0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxOCArMzUsMjMgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1TY29wZUNvbnRlbnREaXN0cmlidXRpb246OlNjb3BlQ29udGVudERp c3RyaWJ1dGlvbigpCitDb250ZW50RGlzdHJpYnV0b3I6OkNvbnRlbnREaXN0cmlidXRvcigpCiAg ICAgOiBtX2luc2VydGlvblBvaW50TGlzdElzVmFsaWQodHJ1ZSkKKyAgICAsIG1fdmFsaWRpdHko VW5kZXRlcm1pbmVkKQoreworfQorCitDb250ZW50RGlzdHJpYnV0b3I6On5Db250ZW50RGlzdHJp YnV0b3IoKQogewogfQogCi12b2lkIFNjb3BlQ29udGVudERpc3RyaWJ1dGlvbjo6aW52YWxpZGF0 ZUluc2VydGlvblBvaW50TGlzdCgpCit2b2lkIENvbnRlbnREaXN0cmlidXRvcjo6aW52YWxpZGF0 ZUluc2VydGlvblBvaW50TGlzdCgpCiB7CiAgICAgbV9pbnNlcnRpb25Qb2ludExpc3RJc1ZhbGlk ID0gZmFsc2U7CiAgICAgbV9pbnNlcnRpb25Qb2ludExpc3QuY2xlYXIoKTsKIH0KIAotY29uc3Qg VmVjdG9yPFJlZlB0cjxJbnNlcnRpb25Qb2ludD4gPiYgU2NvcGVDb250ZW50RGlzdHJpYnV0aW9u OjplbnN1cmVJbnNlcnRpb25Qb2ludExpc3QoU2hhZG93Um9vdCogc2hhZG93Um9vdCkKK2NvbnN0 IFZlY3RvcjxSZWZQdHI8SW5zZXJ0aW9uUG9pbnQ+ID4mIENvbnRlbnREaXN0cmlidXRvcjo6ZW5z dXJlSW5zZXJ0aW9uUG9pbnRMaXN0KFNoYWRvd1Jvb3QqIHNoYWRvd1Jvb3QpCiB7CiAgICAgaWYg KG1faW5zZXJ0aW9uUG9pbnRMaXN0SXNWYWxpZCkKICAgICAgICAgcmV0dXJuIG1faW5zZXJ0aW9u UG9pbnRMaXN0OwpAQCAtNjIsMjUgKzY3LDYgQEAgY29uc3QgVmVjdG9yPFJlZlB0cjxJbnNlcnRp b25Qb2ludD4gPiYgUwogICAgIHJldHVybiBtX2luc2VydGlvblBvaW50TGlzdDsKIH0KIAotdm9p ZCBTY29wZUNvbnRlbnREaXN0cmlidXRpb246OnJlZ2lzdGVySW5zZXJ0aW9uUG9pbnQoSW5zZXJ0 aW9uUG9pbnQqKQotewotICAgIGludmFsaWRhdGVJbnNlcnRpb25Qb2ludExpc3QoKTsKLX0KLQot dm9pZCBTY29wZUNvbnRlbnREaXN0cmlidXRpb246OnVucmVnaXN0ZXJJbnNlcnRpb25Qb2ludChJ bnNlcnRpb25Qb2ludCopCi17Ci0gICAgaW52YWxpZGF0ZUluc2VydGlvblBvaW50TGlzdCgpOwot fQotCi1Db250ZW50RGlzdHJpYnV0b3I6OkNvbnRlbnREaXN0cmlidXRvcigpCi0gICAgOiBtX3Zh bGlkaXR5KFVuZGV0ZXJtaW5lZCkKLXsKLX0KLQotQ29udGVudERpc3RyaWJ1dG9yOjp+Q29udGVu dERpc3RyaWJ1dG9yKCkKLXsKLX0KLQogSW5zZXJ0aW9uUG9pbnQqIENvbnRlbnREaXN0cmlidXRv cjo6ZmluZEluc2VydGlvblBvaW50Rm9yKGNvbnN0IE5vZGUqIGtleSkgY29uc3QKIHsKICAgICBy ZXR1cm4gbV9ub2RlVG9JbnNlcnRpb25Qb2ludC5nZXQoa2V5KTsKQEAgLTk1LDE1ICs4MSwxMyBA QCB2b2lkIENvbnRlbnREaXN0cmlidXRvcjo6ZGlzdHJpYnV0ZShFbGVtCiAgICAgbV92YWxpZGl0 eSA9IFZhbGlkOwogCiAgICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBob3N0LT5zaGFkb3dSb290 KCkpIHsKLSAgICAgICAgaWYgKFNjb3BlQ29udGVudERpc3RyaWJ1dGlvbiogc2NvcGUgPSByb290 LT5zY29wZURpc3RyaWJ1dGlvbigpKSB7Ci0gICAgICAgICAgICBjb25zdCBWZWN0b3I8UmVmUHRy PEluc2VydGlvblBvaW50PiA+JiBpbnNlcnRpb25Qb2ludHMgPSBzY29wZS0+ZW5zdXJlSW5zZXJ0 aW9uUG9pbnRMaXN0KHJvb3QpOwotICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBp bnNlcnRpb25Qb2ludHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgICAgICAgICBJbnNlcnRpb25Q b2ludCogcG9pbnQgPSBpbnNlcnRpb25Qb2ludHNbaV0uZ2V0KCk7Ci0gICAgICAgICAgICAgICAg aWYgKCFwb2ludC0+aXNBY3RpdmUoKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8SW5zZXJ0aW9uUG9pbnQ+ID4mIGluc2VydGlvblBv aW50cyA9IGVuc3VyZUluc2VydGlvblBvaW50TGlzdChyb290KTsKKyAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBpbnNlcnRpb25Qb2ludHMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAg IEluc2VydGlvblBvaW50KiBwb2ludCA9IGluc2VydGlvblBvaW50c1tpXS5nZXQoKTsKKyAgICAg ICAgICAgIGlmICghcG9pbnQtPmlzQWN0aXZlKCkpCisgICAgICAgICAgICAgICAgY29udGludWU7 CiAKLSAgICAgICAgICAgICAgICBkaXN0cmlidXRlU2VsZWN0aW9uc1RvKHBvaW50LCBob3N0KTsK LSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGRpc3RyaWJ1dGVTZWxlY3Rpb25zVG8ocG9pbnQs IGhvc3QpOwogICAgICAgICB9CiAgICAgfQogfQpAQCAtMTE0LDEyICs5OCwxMCBAQCBib29sIENv bnRlbnREaXN0cmlidXRvcjo6aW52YWxpZGF0ZShFbGVtCiAgICAgYm9vbCBuZWVkc1JlYXR0YWNo ID0gKG1fdmFsaWRpdHkgPT0gVW5kZXRlcm1pbmVkKSB8fCAhbV9ub2RlVG9JbnNlcnRpb25Qb2lu dC5pc0VtcHR5KCk7CiAKICAgICBpZiAoU2hhZG93Um9vdCogcm9vdCA9IGhvc3QtPnNoYWRvd1Jv b3QoKSkgewotICAgICAgICBpZiAoU2NvcGVDb250ZW50RGlzdHJpYnV0aW9uKiBzY29wZSA9IHJv b3QtPnNjb3BlRGlzdHJpYnV0aW9uKCkpIHsKLSAgICAgICAgICAgIGNvbnN0IFZlY3RvcjxSZWZQ dHI8SW5zZXJ0aW9uUG9pbnQ+ID4mIGluc2VydGlvblBvaW50cyA9IHNjb3BlLT5lbnN1cmVJbnNl cnRpb25Qb2ludExpc3Qocm9vdCk7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IGluc2VydGlvblBvaW50cy5zaXplKCk7ICsraSkgewotICAgICAgICAgICAgICAgIG5lZWRzUmVh dHRhY2ggPSBuZWVkc1JlYXR0YWNoIHx8IHRydWU7Ci0gICAgICAgICAgICAgICAgaW5zZXJ0aW9u UG9pbnRzW2ldLT5jbGVhckRpc3RyaWJ1dGlvbigpOwotICAgICAgICAgICAgfQorICAgICAgICBj b25zdCBWZWN0b3I8UmVmUHRyPEluc2VydGlvblBvaW50PiA+JiBpbnNlcnRpb25Qb2ludHMgPSBl bnN1cmVJbnNlcnRpb25Qb2ludExpc3Qocm9vdCk7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgaW5zZXJ0aW9uUG9pbnRzLnNpemUoKTsgKytpKSB7CisgICAgICAgICAgICBuZWVkc1Jl YXR0YWNoID0gbmVlZHNSZWF0dGFjaCB8fCB0cnVlOworICAgICAgICAgICAgaW5zZXJ0aW9uUG9p bnRzW2ldLT5jbGVhckRpc3RyaWJ1dGlvbigpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3IuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3IuaAkocmV2 aXNpb24gMTUwNDY0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudERpc3Ry aWJ1dG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDIxICs0NCw2IEBAIGNsYXNzIEluc2VydGlv blBvaW50OwogY2xhc3MgTm9kZTsKIGNsYXNzIFNoYWRvd1Jvb3Q7CiAKLWNsYXNzIFNjb3BlQ29u dGVudERpc3RyaWJ1dGlvbiB7Ci1wdWJsaWM6Ci0gICAgU2NvcGVDb250ZW50RGlzdHJpYnV0aW9u KCk7Ci0KLSAgICB2b2lkIHJlZ2lzdGVySW5zZXJ0aW9uUG9pbnQoSW5zZXJ0aW9uUG9pbnQqKTsK LSAgICB2b2lkIHVucmVnaXN0ZXJJbnNlcnRpb25Qb2ludChJbnNlcnRpb25Qb2ludCopOwotCi0g ICAgdm9pZCBpbnZhbGlkYXRlSW5zZXJ0aW9uUG9pbnRMaXN0KCk7Ci0gICAgY29uc3QgVmVjdG9y PFJlZlB0cjxJbnNlcnRpb25Qb2ludD4gPiYgZW5zdXJlSW5zZXJ0aW9uUG9pbnRMaXN0KFNoYWRv d1Jvb3QqKTsKLQotcHJpdmF0ZToKLSAgICBib29sIG1faW5zZXJ0aW9uUG9pbnRMaXN0SXNWYWxp ZDsKLSAgICBWZWN0b3I8UmVmUHRyPEluc2VydGlvblBvaW50PiA+IG1faW5zZXJ0aW9uUG9pbnRM aXN0OwotfTsKLQogY2xhc3MgQ29udGVudERpc3RyaWJ1dG9yIHsKICAgICBXVEZfTUFLRV9OT05D T1BZQUJMRShDb250ZW50RGlzdHJpYnV0b3IpOwogcHVibGljOgpAQCAtNzIsNiArNTcsOCBAQCBw dWJsaWM6CiAgICAgQ29udGVudERpc3RyaWJ1dG9yKCk7CiAgICAgfkNvbnRlbnREaXN0cmlidXRv cigpOwogCisgICAgdm9pZCBpbnZhbGlkYXRlSW5zZXJ0aW9uUG9pbnRMaXN0KCk7CisgICAgCiAg ICAgSW5zZXJ0aW9uUG9pbnQqIGZpbmRJbnNlcnRpb25Qb2ludEZvcihjb25zdCBOb2RlKiBrZXkp IGNvbnN0OwogCiAgICAgdm9pZCBkaXN0cmlidXRlU2VsZWN0aW9uc1RvKEluc2VydGlvblBvaW50 KiwgRWxlbWVudCogaG9zdCk7CkBAIC04Miw2ICs2OSw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg dm9pZCBlbnN1cmVEaXN0cmlidXRpb24oU2hhZG93Um9vdCopOwogCiBwcml2YXRlOgorICAgIGNv bnN0IFZlY3RvcjxSZWZQdHI8SW5zZXJ0aW9uUG9pbnQ+ID4mIGVuc3VyZUluc2VydGlvblBvaW50 TGlzdChTaGFkb3dSb290Kik7CisKICAgICB2b2lkIGRpc3RyaWJ1dGUoRWxlbWVudCogaG9zdCk7 CiAgICAgYm9vbCBpbnZhbGlkYXRlKEVsZW1lbnQqIGhvc3QpOwogCkBAIC05MCw3ICs3OSw5IEBA IHByaXZhdGU6CiAgICAgYm9vbCBuZWVkc0Rpc3RyaWJ1dGlvbigpIGNvbnN0OwogICAgIGJvb2wg bmVlZHNJbnZhbGlkYXRpb24oKSBjb25zdCB7IHJldHVybiBtX3ZhbGlkaXR5ICE9IEludmFsaWRh dGVkOyB9CiAKKyAgICBWZWN0b3I8UmVmUHRyPEluc2VydGlvblBvaW50PiA+IG1faW5zZXJ0aW9u UG9pbnRMaXN0OwogICAgIEhhc2hNYXA8Y29uc3QgTm9kZSosIFJlZlB0cjxJbnNlcnRpb25Qb2lu dD4gPiBtX25vZGVUb0luc2VydGlvblBvaW50OworICAgIGJvb2wgbV9pbnNlcnRpb25Qb2ludExp c3RJc1ZhbGlkOwogICAgIHVuc2lnbmVkIG1fdmFsaWRpdHkgOiAyOwogfTsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmNwcAkocmV2aXNpb24g MTUwNDY0KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw2IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFt ZXM7CiAKIEluc2VydGlvblBvaW50OjpJbnNlcnRpb25Qb2ludChjb25zdCBRdWFsaWZpZWROYW1l JiB0YWdOYW1lLCBEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgOiBIVE1MRWxlbWVudCh0YWdOYW1l LCBkb2N1bWVudCwgQ3JlYXRlSW5zZXJ0aW9uUG9pbnQpCi0gICAgLCBtX3JlZ2lzdGVyZWRXaXRo U2hhZG93Um9vdChmYWxzZSkKICAgICAsIG1faGFzRGlzdHJpYnV0aW9uKGZhbHNlKQogewogfQpA QCAtMTE5LDEwICsxMTgsNyBAQCBOb2RlOjpJbnNlcnRpb25Ob3RpZmljYXRpb25SZXF1ZXN0IElu c2VyCiAgICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBjb250YWluaW5nU2hhZG93Um9vdCgpKSB7 CiAgICAgICAgIGlmIChFbGVtZW50U2hhZG93KiByb290T3duZXIgPSByb290LT5vd25lcigpKSB7 CiAgICAgICAgICAgICByb290T3duZXItPmRpc3RyaWJ1dG9yKCkuZGlkU2hhZG93Qm91bmRhcnlD aGFuZ2Uocm9vdC0+aG9zdCgpKTsKLSAgICAgICAgICAgIGlmIChpc0FjdGl2ZSgpICYmICFtX3Jl Z2lzdGVyZWRXaXRoU2hhZG93Um9vdCAmJiBpbnNlcnRpb25Qb2ludC0+dHJlZVNjb3BlKCktPnJv b3ROb2RlKCkgPT0gcm9vdCkgewotICAgICAgICAgICAgICAgIG1fcmVnaXN0ZXJlZFdpdGhTaGFk b3dSb290ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICByb290LT5lbnN1cmVTY29wZURpc3RyaWJ1 dGlvbigpLT5yZWdpc3Rlckluc2VydGlvblBvaW50KHRoaXMpOwotICAgICAgICAgICAgfQorICAg ICAgICAgICAgcm9vdE93bmVyLT5kaXN0cmlidXRvcigpLmludmFsaWRhdGVJbnNlcnRpb25Qb2lu dExpc3QoKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTM3LDE4ICsxMzMsMTQgQEAgdm9pZCBJ bnNlcnRpb25Qb2ludDo6cmVtb3ZlZEZyb20oQ29udGFpbgogCiAgICAgLy8gaG9zdCBjYW4gYmUg bnVsbCB3aGVuIHJlbW92ZWRGcm9tKCkgaXMgY2FsbGVkIGZyb20gRWxlbWVudFNoYWRvdyBkZXN0 cnVjdG9yLgogICAgIEVsZW1lbnRTaGFkb3cqIHJvb3RPd25lciA9IHJvb3QgPyByb290LT5vd25l cigpIDogMDsKLSAgICBpZiAocm9vdE93bmVyKQorICAgIGlmIChyb290T3duZXIpIHsKICAgICAg ICAgcm9vdE93bmVyLT5pbnZhbGlkYXRlRGlzdHJpYnV0aW9uKCk7CisgICAgICAgIHJvb3RPd25l ci0+ZGlzdHJpYnV0b3IoKS5pbnZhbGlkYXRlSW5zZXJ0aW9uUG9pbnRMaXN0KCk7CisgICAgfQog CiAgICAgLy8gU2luY2UgdGhpcyBpbnNlcnRpb24gcG9pbnQgaXMgbm8gbG9uZ2VyIHZpc2libGUg ZnJvbSB0aGUgc2hhZG93IHN1YnRyZWUsIGl0IG5lZWQgdG8gY2xlYW4gaXRzZWxmIHVwLgogICAg IGNsZWFyRGlzdHJpYnV0aW9uKCk7CiAKLSAgICBpZiAobV9yZWdpc3RlcmVkV2l0aFNoYWRvd1Jv b3QgJiYgaW5zZXJ0aW9uUG9pbnQtPnRyZWVTY29wZSgpLT5yb290Tm9kZSgpID09IHJvb3QpIHsK LSAgICAgICAgQVNTRVJUKHJvb3QpOwotICAgICAgICBtX3JlZ2lzdGVyZWRXaXRoU2hhZG93Um9v dCA9IGZhbHNlOwotICAgICAgICByb290LT5lbnN1cmVTY29wZURpc3RyaWJ1dGlvbigpLT51bnJl Z2lzdGVySW5zZXJ0aW9uUG9pbnQodGhpcyk7Ci0gICAgfQotCiAgICAgSFRNTEVsZW1lbnQ6OnJl bW92ZWRGcm9tKGluc2VydGlvblBvaW50KTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5oCShyZXZpc2lvbiAxNTA0NjQpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5oCSh3b3JraW5nIGNvcHkpCkBAIC05 MCw3ICs5MCw2IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKIAotICAgIGJvb2wgbV9yZWdpc3Rl cmVkV2l0aFNoYWRvd1Jvb3Q7CiAgICAgYm9vbCBtX2hhc0Rpc3RyaWJ1dGlvbjsKIH07CiAK