119278 2013-07-30 14:42:15 -0700 Remove generator/yield terminology in RenderInline's GeneratorContext 2014-09-18 18:01:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser thorton oldest_to_newest 913029 0 simon.fraser 2013-07-30 14:42:15 -0700 generator/yield doesn't make any sense in WebCore. We can use better terminology here. 913032 1 simon.fraser 2013-07-30 14:44:01 -0700 AbsoluteRectsGeneratorContext isn't necessarily absolute either. 1036026 2 238339 simon.fraser 2014-09-18 17:09:59 -0700 Created attachment 238339 Patch 1036036 3 238339 commit-queue 2014-09-18 18:01:53 -0700 Comment on attachment 238339 Patch Clearing flags on attachment: 238339 Committed r173743: <http://trac.webkit.org/changeset/173743> 1036037 4 commit-queue 2014-09-18 18:01:56 -0700 All reviewed patches have been landed. Closing bug. 238339 2014-09-18 17:09:59 -0700 2014-09-18 18:01:52 -0700 Patch bug-119278-20140918170956.patch text/plain 13226 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNhMjJlMTkzYWIxN2Qy MGU2YzhmMDk0ZjYwYmQ1MDVkZDQ1NWNkNS4uN2FlMmYyMTQ5MGUwM2Y3ZmU2NjhmOWJjY2NmNmM1 MDI3NWEyZTFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA5LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBnZW5l cmF0b3IveWllbGQgdGVybWlub2xvZ3kgaW4gUmVuZGVySW5saW5lJ3MgR2VuZXJhdG9yQ29udGV4 dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5Mjc4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAg ICBHZXQgcmlkIG9mIHRoZSBpY2t5IEdlbmVyYXRvci95aWVsZCBzeW50YXggdXNlZCBmb3IgY29s bGVjdGluZyByZWN0cyBpbiBSZW5kZXJJbmxpbmUuCisgICAgICAgIEp1c3QgcmVwbGFjZSB0aGUg b3BlcmF0b3IoKSB3aXRoIGFuIGV4cGxpY2l0IGFkZFJlY3QoKS4KKyAgICAgICAgCisgICAgICAg IEFsc28gc29tZSBkcml2ZS1ieSBudWxscHRyIGNsZWFudXAsIGFuZCByZW1vdmluZyBkZWZhdWx0 IGFyZ3VtZW50cyBmcm9tCisgICAgICAgIGFkZENoaWxkSWdub3JpbmdDb250aW51YXRpb24oKSBj YWxscy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVySW5saW5lOjp3aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVySW5saW5lOjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJJbmxpbmU6OnNwbGl0SW5saW5lcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6 OmFkZENoaWxkVG9Db250aW51YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5l OjpnZW5lcmF0ZUxpbmVCb3hSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6 OmdlbmVyYXRlQ3VsbGVkTGluZUJveFJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy SW5saW5lLmg6CisKIDIwMTQtMDktMTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIHJvbGxvdXQgcjE3MzczMS4gQnJva2UgbXVsdGlw bGUgYnVpbGRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklu bGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRl eCA5MzcwZjUyMTUzNDc0NzQ5MzJmYjJjMGY0MGU4NTMwNWNkNzIzYmY2Li5kMWExZGIzYjFhMjlh MDk2NTJjZmViZDY4ODc1Mjc2YmZhNDAyYjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW5saW5lLmNwcApAQCAtODcsNyArODcsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6d2ls bEJlRGVzdHJveWVkKCkKICAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCogY29udGludWF0aW9uID0g dGhpcy0+Y29udGludWF0aW9uKCk7CiAgICAgaWYgKGNvbnRpbnVhdGlvbikgewogICAgICAgICBj b250aW51YXRpb24tPmRlc3Ryb3koKTsKLSAgICAgICAgc2V0Q29udGludWF0aW9uKDApOworICAg ICAgICBzZXRDb250aW51YXRpb24obnVsbHB0cik7CiAgICAgfQogICAgIAogICAgIGlmICghZG9j dW1lbnRCZWluZ0Rlc3Ryb3llZCgpKSB7CkBAIC0xODQsNyArMTg0LDcgQEAgdm9pZCBSZW5kZXJJ bmxpbmU6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJT dHlsZSogb2xkU3QKICAgICBSZW5kZXJJbmxpbmUqIGNvbnRpbnVhdGlvbiA9IGlubGluZUVsZW1l bnRDb250aW51YXRpb24oKTsKICAgICBmb3IgKFJlbmRlcklubGluZSogY3VyckNvbnQgPSBjb250 aW51YXRpb247IGN1cnJDb250OyBjdXJyQ29udCA9IGN1cnJDb250LT5pbmxpbmVFbGVtZW50Q29u dGludWF0aW9uKCkpIHsKICAgICAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIG5leHRDb250ID0g Y3VyckNvbnQtPmNvbnRpbnVhdGlvbigpOwotICAgICAgICBjdXJyQ29udC0+c2V0Q29udGludWF0 aW9uKDApOworICAgICAgICBjdXJyQ29udC0+c2V0Q29udGludWF0aW9uKG51bGxwdHIpOwogICAg ICAgICBjdXJyQ29udC0+c2V0U3R5bGUobmV3U3R5bGUpOwogICAgICAgICBjdXJyQ29udC0+c2V0 Q29udGludWF0aW9uKG5leHRDb250KTsKICAgICB9CkBAIC0zNzMsNyArMzczLDcgQEAgdm9pZCBS ZW5kZXJJbmxpbmU6OnNwbGl0SW5saW5lcyhSZW5kZXJCbG9jayogZnJvbUJsb2NrLCBSZW5kZXJC bG9jayogdG9CbG9jaywKICAgICAgICAgUmVuZGVyT2JqZWN0KiB0bXAgPSBvOwogICAgICAgICBv ID0gdG1wLT5uZXh0U2libGluZygpOwogICAgICAgICByZW1vdmVDaGlsZEludGVybmFsKCp0bXAs IE5vdGlmeUNoaWxkcmVuKTsKLSAgICAgICAgY2xvbmVJbmxpbmUtPmFkZENoaWxkSWdub3JpbmdD b250aW51YXRpb24odG1wLCAwKTsKKyAgICAgICAgY2xvbmVJbmxpbmUtPmFkZENoaWxkSWdub3Jp bmdDb250aW51YXRpb24odG1wKTsKICAgICAgICAgdG1wLT5zZXROZWVkc0xheW91dEFuZFByZWZX aWR0aHNSZWNhbGMoKTsKICAgICB9CiAKQEAgLTQwMCw3ICs0MDAsNyBAQCB2b2lkIFJlbmRlcklu bGluZTo6c3BsaXRJbmxpbmVzKFJlbmRlckJsb2NrKiBmcm9tQmxvY2ssIFJlbmRlckJsb2NrKiB0 b0Jsb2NrLAogICAgICAgICAgICAgY2xvbmVJbmxpbmUgPSB0b1JlbmRlcklubGluZShjdXJyKS0+ Y2xvbmUoKTsKIAogICAgICAgICAgICAgLy8gSW5zZXJ0IG91ciBjaGlsZCBjbG9uZSBhcyB0aGUg Zmlyc3QgY2hpbGQuCi0gICAgICAgICAgICBjbG9uZUlubGluZS0+YWRkQ2hpbGRJZ25vcmluZ0Nv bnRpbnVhdGlvbihjbG9uZUNoaWxkLmxlYWtQdHIoKSwgMCk7CisgICAgICAgICAgICBjbG9uZUlu bGluZS0+YWRkQ2hpbGRJZ25vcmluZ0NvbnRpbnVhdGlvbihjbG9uZUNoaWxkLmxlYWtQdHIoKSk7 CiAKICAgICAgICAgICAgIC8vIEhvb2sgdGhlIGNsb25lIHVwIGFzIGEgY29udGludWF0aW9uIG9m IHxjdXJyfC4KICAgICAgICAgICAgIFJlbmRlcklubGluZSogaW5saW5lQ3VyciA9IHRvUmVuZGVy SW5saW5lKGN1cnIpOwpAQCAtNDE1LDcgKzQxNSw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjpzcGxp dElubGluZXMoUmVuZGVyQmxvY2sqIGZyb21CbG9jaywgUmVuZGVyQmxvY2sqIHRvQmxvY2ssCiAg ICAgICAgICAgICAgICAgUmVuZGVyT2JqZWN0KiB0bXAgPSBvOwogICAgICAgICAgICAgICAgIG8g PSB0bXAtPm5leHRTaWJsaW5nKCk7CiAgICAgICAgICAgICAgICAgaW5saW5lQ3Vyci0+cmVtb3Zl Q2hpbGRJbnRlcm5hbCgqdG1wLCBOb3RpZnlDaGlsZHJlbik7Ci0gICAgICAgICAgICAgICAgY2xv bmVJbmxpbmUtPmFkZENoaWxkSWdub3JpbmdDb250aW51YXRpb24odG1wLCAwKTsKKyAgICAgICAg ICAgICAgICBjbG9uZUlubGluZS0+YWRkQ2hpbGRJZ25vcmluZ0NvbnRpbnVhdGlvbih0bXApOwog ICAgICAgICAgICAgICAgIHRtcC0+c2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lkdGhzUmVjYWxjKCk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTUzNyw3ICs1MzcsNyBAQCB2b2lkIFJlbmRl cklubGluZTo6YWRkQ2hpbGRUb0NvbnRpbnVhdGlvbihSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBS ZW5kZXJPYmplY3QqCiAgICAgICAgIGlmIChjaGlsZElubGluZSA9PSBiY3BJbmxpbmUpCiAgICAg ICAgICAgICByZXR1cm4gYmVmb3JlQ2hpbGRQYXJlbnQtPmFkZENoaWxkSWdub3JpbmdDb250aW51 YXRpb24obmV3Q2hpbGQsIGJlZm9yZUNoaWxkKTsKICAgICAgICAgZWxzZSBpZiAoZmxvd0lubGlu ZSA9PSBjaGlsZElubGluZSkKLSAgICAgICAgICAgIHJldHVybiBmbG93LT5hZGRDaGlsZElnbm9y aW5nQ29udGludWF0aW9uKG5ld0NoaWxkLCAwKTsgLy8gSnVzdCB0cmVhdCBsaWtlIGFuIGFwcGVu ZC4KKyAgICAgICAgICAgIHJldHVybiBmbG93LT5hZGRDaGlsZElnbm9yaW5nQ29udGludWF0aW9u KG5ld0NoaWxkKTsgLy8gSnVzdCB0cmVhdCBsaWtlIGFuIGFwcGVuZC4KICAgICAgICAgZWxzZQog ICAgICAgICAgICAgcmV0dXJuIGJlZm9yZUNoaWxkUGFyZW50LT5hZGRDaGlsZElnbm9yaW5nQ29u dGludWF0aW9uKG5ld0NoaWxkLCBiZWZvcmVDaGlsZCk7CiAgICAgfQpAQCAtNTQ5LDIyICs1NDks MjIgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25z dCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpCiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEdlbmVy YXRvckNvbnRleHQ+Ci12b2lkIFJlbmRlcklubGluZTo6Z2VuZXJhdGVMaW5lQm94UmVjdHMoR2Vu ZXJhdG9yQ29udGV4dCYgeWllbGQpIGNvbnN0Cit2b2lkIFJlbmRlcklubGluZTo6Z2VuZXJhdGVM aW5lQm94UmVjdHMoR2VuZXJhdG9yQ29udGV4dCYgY29udGV4dCkgY29uc3QKIHsKICAgICBpZiAo IWFsd2F5c0NyZWF0ZUxpbmVCb3hlcygpKQotICAgICAgICBnZW5lcmF0ZUN1bGxlZExpbmVCb3hS ZWN0cyh5aWVsZCwgdGhpcyk7CisgICAgICAgIGdlbmVyYXRlQ3VsbGVkTGluZUJveFJlY3RzKGNv bnRleHQsIHRoaXMpOwogICAgIGVsc2UgaWYgKElubGluZUZsb3dCb3gqIGN1cnIgPSBmaXJzdExp bmVCb3goKSkgewogICAgICAgICBmb3IgKDsgY3VycjsgY3VyciA9IGN1cnItPm5leHRMaW5lQm94 KCkpCi0gICAgICAgICAgICB5aWVsZChGbG9hdFJlY3QoY3Vyci0+dG9wTGVmdCgpLCBjdXJyLT5z aXplKCkpKTsKKyAgICAgICAgICAgIGNvbnRleHQuYWRkUmVjdChGbG9hdFJlY3QoY3Vyci0+dG9w TGVmdCgpLCBjdXJyLT5zaXplKCkpKTsKICAgICB9IGVsc2UKLSAgICAgICAgeWllbGQoRmxvYXRS ZWN0KCkpOworICAgICAgICBjb250ZXh0LmFkZFJlY3QoRmxvYXRSZWN0KCkpOwogfQogCiB0ZW1w bGF0ZTx0eXBlbmFtZSBHZW5lcmF0b3JDb250ZXh0Pgotdm9pZCBSZW5kZXJJbmxpbmU6OmdlbmVy YXRlQ3VsbGVkTGluZUJveFJlY3RzKEdlbmVyYXRvckNvbnRleHQmIHlpZWxkLCBjb25zdCBSZW5k ZXJJbmxpbmUqIGNvbnRhaW5lcikgY29uc3QKK3ZvaWQgUmVuZGVySW5saW5lOjpnZW5lcmF0ZUN1 bGxlZExpbmVCb3hSZWN0cyhHZW5lcmF0b3JDb250ZXh0JiBjb250ZXh0LCBjb25zdCBSZW5kZXJJ bmxpbmUqIGNvbnRhaW5lcikgY29uc3QKIHsKICAgICBpZiAoIWN1bGxlZElubGluZUZpcnN0TGlu ZUJveCgpKSB7Ci0gICAgICAgIHlpZWxkKEZsb2F0UmVjdCgpKTsKKyAgICAgICAgY29udGV4dC5h ZGRSZWN0KEZsb2F0UmVjdCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTg0LDMx ICs1ODQsMzIgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OmdlbmVyYXRlQ3VsbGVkTGluZUJveFJlY3Rz KEdlbmVyYXRvckNvbnRleHQmIHlpZWxkLCBjb25zdCBSZW4KICAgICAgICAgICAgICAgICBpbnQg bG9naWNhbFRvcCA9IHJvb3RCb3gubG9naWNhbFRvcCgpICsgKHJvb3RCb3gubGluZVN0eWxlKCku Zm9udCgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkgLSBjb250YWluZXJTdHlsZS5mb250KCkuZm9u dE1ldHJpY3MoKS5hc2NlbnQoKSk7CiAgICAgICAgICAgICAgICAgaW50IGxvZ2ljYWxIZWlnaHQg PSBjb250YWluZXJTdHlsZS5mb250KCkuZm9udE1ldHJpY3MoKS5oZWlnaHQoKTsKICAgICAgICAg ICAgICAgICBpZiAoaXNIb3Jpem9udGFsKQotICAgICAgICAgICAgICAgICAgICB5aWVsZChGbG9h dFJlY3QoY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT54KCkgLSBjdXJyQm94LT5tYXJnaW5M ZWZ0KCksIGxvZ2ljYWxUb3AsIGN1cnJCb3gtPndpZHRoKCkgKyBjdXJyQm94LT5ob3Jpem9udGFs TWFyZ2luRXh0ZW50KCksIGxvZ2ljYWxIZWlnaHQpKTsKKyAgICAgICAgICAgICAgICAgICAgY29u dGV4dC5hZGRSZWN0KEZsb2F0UmVjdChjdXJyQm94LT5pbmxpbmVCb3hXcmFwcGVyKCktPngoKSAt IGN1cnJCb3gtPm1hcmdpbkxlZnQoKSwgbG9naWNhbFRvcCwgY3VyckJveC0+d2lkdGgoKSArIGN1 cnJCb3gtPmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSwgbG9naWNhbEhlaWdodCkpOwogICAgICAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgeWllbGQoRmxvYXRSZWN0KGxvZ2lj YWxUb3AsIGN1cnJCb3gtPmlubGluZUJveFdyYXBwZXIoKS0+eSgpIC0gY3VyckJveC0+bWFyZ2lu VG9wKCksIGxvZ2ljYWxIZWlnaHQsIGN1cnJCb3gtPmhlaWdodCgpICsgY3VyckJveC0+dmVydGlj YWxNYXJnaW5FeHRlbnQoKSkpOworICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmFkZFJlY3Qo RmxvYXRSZWN0KGxvZ2ljYWxUb3AsIGN1cnJCb3gtPmlubGluZUJveFdyYXBwZXIoKS0+eSgpIC0g Y3VyckJveC0+bWFyZ2luVG9wKCksIGxvZ2ljYWxIZWlnaHQsIGN1cnJCb3gtPmhlaWdodCgpICsg Y3VyckJveC0+dmVydGljYWxNYXJnaW5FeHRlbnQoKSkpOwogICAgICAgICAgICAgfQogICAgICAg ICB9IGVsc2UgaWYgKGN1cnItPmlzUmVuZGVySW5saW5lKCkpIHsKICAgICAgICAgICAgIC8vIElm IHRoZSBjaGlsZCBkb2Vzbid0IG5lZWQgbGluZSBib3hlcyBlaXRoZXIsIHRoZW4gd2UgY2FuIHJl Y3VyLgogICAgICAgICAgICAgUmVuZGVySW5saW5lKiBjdXJySW5saW5lID0gdG9SZW5kZXJJbmxp bmUoY3Vycik7CiAgICAgICAgICAgICBpZiAoIWN1cnJJbmxpbmUtPmFsd2F5c0NyZWF0ZUxpbmVC b3hlcygpKQotICAgICAgICAgICAgICAgIGN1cnJJbmxpbmUtPmdlbmVyYXRlQ3VsbGVkTGluZUJv eFJlY3RzKHlpZWxkLCBjb250YWluZXIpOworICAgICAgICAgICAgICAgIGN1cnJJbmxpbmUtPmdl bmVyYXRlQ3VsbGVkTGluZUJveFJlY3RzKGNvbnRleHQsIGNvbnRhaW5lcik7CiAgICAgICAgICAg ICBlbHNlIHsKICAgICAgICAgICAgICAgICBmb3IgKElubGluZUZsb3dCb3gqIGNoaWxkTGluZSA9 IGN1cnJJbmxpbmUtPmZpcnN0TGluZUJveCgpOyBjaGlsZExpbmU7IGNoaWxkTGluZSA9IGNoaWxk TGluZS0+bmV4dExpbmVCb3goKSkgewogICAgICAgICAgICAgICAgICAgICBjb25zdCBSb290SW5s aW5lQm94JiByb290Qm94ID0gY2hpbGRMaW5lLT5yb290KCk7CiAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFJlbmRlclN0eWxlJiBjb250YWluZXJTdHlsZSA9IHJvb3RCb3guaXNGaXJzdExpbmUo KSA/IGNvbnRhaW5lci0+Zmlyc3RMaW5lU3R5bGUoKSA6IGNvbnRhaW5lci0+c3R5bGUoKTsKICAg ICAgICAgICAgICAgICAgICAgaW50IGxvZ2ljYWxUb3AgPSByb290Qm94LmxvZ2ljYWxUb3AoKSAr IChyb290Qm94LmxpbmVTdHlsZSgpLmZvbnQoKS5mb250TWV0cmljcygpLmFzY2VudCgpIC0gY29u dGFpbmVyU3R5bGUuZm9udCgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkpOwogICAgICAgICAgICAg ICAgICAgICBpbnQgbG9naWNhbEhlaWdodCA9IGNvbnRhaW5lclN0eWxlLmZvbnRNZXRyaWNzKCku aGVpZ2h0KCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChpc0hvcml6b250YWwpCi0gICAgICAg ICAgICAgICAgICAgICAgICB5aWVsZChGbG9hdFJlY3QoY2hpbGRMaW5lLT54KCkgLSBjaGlsZExp bmUtPm1hcmdpbkxvZ2ljYWxMZWZ0KCksCisgICAgICAgICAgICAgICAgICAgIGlmIChpc0hvcml6 b250YWwpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuYWRkUmVjdChGbG9hdFJl Y3QoY2hpbGRMaW5lLT54KCkgLSBjaGlsZExpbmUtPm1hcmdpbkxvZ2ljYWxMZWZ0KCksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbG9naWNhbFRvcCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjaGlsZExpbmUtPmxvZ2ljYWxXaWR0aCgpICsgY2hpbGRMaW5lLT5tYXJnaW5Mb2dp Y2FsTGVmdCgpICsgY2hpbGRMaW5lLT5tYXJnaW5Mb2dpY2FsUmlnaHQoKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsb2dpY2FsSGVpZ2h0KSk7Ci0gICAgICAgICAgICAgICAgICAgIGVs c2UKLSAgICAgICAgICAgICAgICAgICAgICAgIHlpZWxkKEZsb2F0UmVjdChsb2dpY2FsVG9wLAor ICAgICAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgICAgY29u dGV4dC5hZGRSZWN0KEZsb2F0UmVjdChsb2dpY2FsVG9wLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNoaWxkTGluZS0+eSgpIC0gY2hpbGRMaW5lLT5tYXJnaW5Mb2dpY2FsTGVmdCgpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY2hpbGRMaW5lLT5sb2dpY2FsV2lkdGgoKSArIGNoaWxkTGluZS0+bWFy Z2luTG9naWNhbExlZnQoKSArIGNoaWxkTGluZS0+bWFyZ2luTG9naWNhbFJpZ2h0KCkpKTsKKyAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAg ICAgICAgfSBlbHNlIGlmIChjdXJyLT5pc1RleHQoKSkgewpAQCAtNjE5LDkgKzYyMCw5IEBAIHZv aWQgUmVuZGVySW5saW5lOjpnZW5lcmF0ZUN1bGxlZExpbmVCb3hSZWN0cyhHZW5lcmF0b3JDb250 ZXh0JiB5aWVsZCwgY29uc3QgUmVuCiAgICAgICAgICAgICAgICAgaW50IGxvZ2ljYWxUb3AgPSBy b290Qm94LmxvZ2ljYWxUb3AoKSArIChyb290Qm94LmxpbmVTdHlsZSgpLmZvbnQoKS5mb250TWV0 cmljcygpLmFzY2VudCgpIC0gY29udGFpbmVyU3R5bGUuZm9udCgpLmZvbnRNZXRyaWNzKCkuYXNj ZW50KCkpOwogICAgICAgICAgICAgICAgIGludCBsb2dpY2FsSGVpZ2h0ID0gY29udGFpbmVyU3R5 bGUuZm9udCgpLmZvbnRNZXRyaWNzKCkuaGVpZ2h0KCk7CiAgICAgICAgICAgICAgICAgaWYgKGlz SG9yaXpvbnRhbCkKLSAgICAgICAgICAgICAgICAgICAgeWllbGQoRmxvYXRSZWN0KGNoaWxkVGV4 dC0+eCgpLCBsb2dpY2FsVG9wLCBjaGlsZFRleHQtPmxvZ2ljYWxXaWR0aCgpLCBsb2dpY2FsSGVp Z2h0KSk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuYWRkUmVjdChGbG9hdFJlY3QoY2hp bGRUZXh0LT54KCksIGxvZ2ljYWxUb3AsIGNoaWxkVGV4dC0+bG9naWNhbFdpZHRoKCksIGxvZ2lj YWxIZWlnaHQpKTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHlp ZWxkKEZsb2F0UmVjdChsb2dpY2FsVG9wLCBjaGlsZFRleHQtPnkoKSwgbG9naWNhbEhlaWdodCwg Y2hpbGRUZXh0LT5sb2dpY2FsV2lkdGgoKSkpOworICAgICAgICAgICAgICAgICAgICBjb250ZXh0 LmFkZFJlY3QoRmxvYXRSZWN0KGxvZ2ljYWxUb3AsIGNoaWxkVGV4dC0+eSgpLCBsb2dpY2FsSGVp Z2h0LCBjaGlsZFRleHQtPmxvZ2ljYWxXaWR0aCgpKSk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0gZWxzZSBpZiAoY3Vyci0+aXNMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAgaWYgKElubGlu ZUJveCogaW5saW5lQm94ID0gdG9SZW5kZXJMaW5lQnJlYWsoY3VyciktPmlubGluZUJveFdyYXBw ZXIoKSkgewpAQCAtNjMxLDkgKzYzMiw5IEBAIHZvaWQgUmVuZGVySW5saW5lOjpnZW5lcmF0ZUN1 bGxlZExpbmVCb3hSZWN0cyhHZW5lcmF0b3JDb250ZXh0JiB5aWVsZCwgY29uc3QgUmVuCiAgICAg ICAgICAgICAgICAgaW50IGxvZ2ljYWxUb3AgPSByb290Qm94LmxvZ2ljYWxUb3AoKSArIChyb290 Qm94LmxpbmVTdHlsZSgpLmZvbnQoKS5mb250TWV0cmljcygpLmFzY2VudCgpIC0gY29udGFpbmVy U3R5bGUuZm9udCgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkpOwogICAgICAgICAgICAgICAgIGlu dCBsb2dpY2FsSGVpZ2h0ID0gY29udGFpbmVyU3R5bGUuZm9udE1ldHJpY3MoKS5oZWlnaHQoKTsK ICAgICAgICAgICAgICAgICBpZiAoaXNIb3Jpem9udGFsKQotICAgICAgICAgICAgICAgICAgICB5 aWVsZChGbG9hdFJlY3QoaW5saW5lQm94LT54KCksIGxvZ2ljYWxUb3AsIGlubGluZUJveC0+bG9n aWNhbFdpZHRoKCksIGxvZ2ljYWxIZWlnaHQpKTsKKyAgICAgICAgICAgICAgICAgICAgY29udGV4 dC5hZGRSZWN0KEZsb2F0UmVjdChpbmxpbmVCb3gtPngoKSwgbG9naWNhbFRvcCwgaW5saW5lQm94 LT5sb2dpY2FsV2lkdGgoKSwgbG9naWNhbEhlaWdodCkpOwogICAgICAgICAgICAgICAgIGVsc2UK LSAgICAgICAgICAgICAgICAgICAgeWllbGQoRmxvYXRSZWN0KGxvZ2ljYWxUb3AsIGlubGluZUJv eC0+eSgpLCBsb2dpY2FsSGVpZ2h0LCBpbmxpbmVCb3gtPmxvZ2ljYWxXaWR0aCgpKSk7CisgICAg ICAgICAgICAgICAgICAgIGNvbnRleHQuYWRkUmVjdChGbG9hdFJlY3QobG9naWNhbFRvcCwgaW5s aW5lQm94LT55KCksIGxvZ2ljYWxIZWlnaHQsIGlubGluZUJveC0+bG9naWNhbFdpZHRoKCkpKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAgLTY0Nyw3ICs2NDgsNyBAQCBwdWJs aWM6CiAgICAgICAgIDogbV9yZWN0cyhyZWN0cykKICAgICAgICAgLCBtX2FjY3VtdWxhdGVkT2Zm c2V0KGFjY3VtdWxhdGVkT2Zmc2V0KSB7IH0KIAotICAgIHZvaWQgb3BlcmF0b3IoKShjb25zdCBG bG9hdFJlY3QmIHJlY3QpCisgICAgdm9pZCBhZGRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkK ICAgICB7CiAgICAgICAgIEludFJlY3QgaW50UmVjdCA9IGVuY2xvc2luZ0ludFJlY3QocmVjdCk7 CiAgICAgICAgIGludFJlY3QubW92ZShtX2FjY3VtdWxhdGVkT2Zmc2V0LngoKSwgbV9hY2N1bXVs YXRlZE9mZnNldC55KCkpOwpAQCAtNjgzLDEwICs2ODQsMTAgQEAgcHVibGljOgogICAgICAgICA6 IG1fcXVhZHMocXVhZHMpCiAgICAgICAgICwgbV9nZW9tZXRyeU1hcCgpCiAgICAgewotICAgICAg ICBtX2dlb21ldHJ5TWFwLnB1c2hNYXBwaW5nc1RvQW5jZXN0b3IocmVuZGVyZXIsIDApOworICAg ICAgICBtX2dlb21ldHJ5TWFwLnB1c2hNYXBwaW5nc1RvQW5jZXN0b3IocmVuZGVyZXIsIG51bGxw dHIpOwogICAgIH0KIAotICAgIHZvaWQgb3BlcmF0b3IoKShjb25zdCBGbG9hdFJlY3QmIHJlY3Qp CisgICAgdm9pZCBhZGRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICB7CiAgICAgICAg IG1fcXVhZHMuYXBwZW5kKG1fZ2VvbWV0cnlNYXAuYWJzb2x1dGVSZWN0KHJlY3QpKTsKICAgICB9 CkBAIC04MDUsMTMgKzgwNiwyMCBAQCBuYW1lc3BhY2UgewogCiBjbGFzcyBIaXRUZXN0Q3VsbGVk SW5saW5lc0dlbmVyYXRvckNvbnRleHQgewogcHVibGljOgotICAgIEhpdFRlc3RDdWxsZWRJbmxp bmVzR2VuZXJhdG9yQ29udGV4dChSZWdpb24mIHJlZ2lvbiwgY29uc3QgSGl0VGVzdExvY2F0aW9u JiBsb2NhdGlvbikgOiBtX2ludGVyc2VjdGVkKGZhbHNlKSwgbV9yZWdpb24ocmVnaW9uKSwgbV9s b2NhdGlvbihsb2NhdGlvbikgeyB9Ci0gICAgdm9pZCBvcGVyYXRvcigpKGNvbnN0IEZsb2F0UmVj dCYgcmVjdCkKKyAgICBIaXRUZXN0Q3VsbGVkSW5saW5lc0dlbmVyYXRvckNvbnRleHQoUmVnaW9u JiByZWdpb24sIGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgbG9jYXRpb24pCisgICAgICAgIDogbV9p bnRlcnNlY3RlZChmYWxzZSkKKyAgICAgICAgLCBtX3JlZ2lvbihyZWdpb24pCisgICAgICAgICwg bV9sb2NhdGlvbihsb2NhdGlvbikKKyAgICB7IH0KKworICAgIHZvaWQgYWRkUmVjdChjb25zdCBG bG9hdFJlY3QmIHJlY3QpCiAgICAgewogICAgICAgICBtX2ludGVyc2VjdGVkID0gbV9pbnRlcnNl Y3RlZCB8fCBtX2xvY2F0aW9uLmludGVyc2VjdHMocmVjdCk7CiAgICAgICAgIG1fcmVnaW9uLnVu aXRlKGVuY2xvc2luZ0ludFJlY3QocmVjdCkpOwogICAgIH0KKwogICAgIGJvb2wgaW50ZXJzZWN0 ZWQoKSBjb25zdCB7IHJldHVybiBtX2ludGVyc2VjdGVkOyB9CisKIHByaXZhdGU6CiAgICAgYm9v bCBtX2ludGVyc2VjdGVkOwogICAgIFJlZ2lvbiYgbV9yZWdpb247CkBAIC04NzAsNyArODc4LDgg QEAgbmFtZXNwYWNlIHsKIGNsYXNzIExpbmVzQm91bmRpbmdCb3hHZW5lcmF0b3JDb250ZXh0IHsK IHB1YmxpYzoKICAgICBMaW5lc0JvdW5kaW5nQm94R2VuZXJhdG9yQ29udGV4dChGbG9hdFJlY3Qm IHJlY3QpIDogbV9yZWN0KHJlY3QpIHsgfQotICAgIHZvaWQgb3BlcmF0b3IoKShjb25zdCBGbG9h dFJlY3QmIHJlY3QpCisKKyAgICB2b2lkIGFkZFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQog ICAgIHsKICAgICAgICAgbV9yZWN0LnVuaXRlSWZOb25aZXJvKHJlY3QpOwogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaAppbmRleCA1YzZlZGQ4OTc4M2RiZmQ4NThj ZDJlZGM5NTE5YjYwZDhjMjRiMGJlLi40OWFlMGNmOTllN2E0YmFjNjc3ZDdjMzk5ZDdlYjU5ZmY4 ZmJjMWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5oCkBAIC0xMTcs NyArMTE3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGdlbmVyYXRlQ3VsbGVkTGluZUJveFJlY3Rz KEdlbmVyYXRvckNvbnRleHQmIHlpZWxkLCBjb25zdCBSZW5kZXJJbmxpbmUqIGNvbnRhaW5lcikg Y29uc3Q7CiAKICAgICB2b2lkIGFkZENoaWxkVG9Db250aW51YXRpb24oUmVuZGVyT2JqZWN0KiBu ZXdDaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7Ci0gICAgdmlydHVhbCB2b2lkIGFk ZENoaWxkSWdub3JpbmdDb250aW51YXRpb24oUmVuZGVyT2JqZWN0KiBuZXdDaGlsZCwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApIG92ZXJyaWRlIGZpbmFsOworICAgIHZpcnR1YWwgdm9p ZCBhZGRDaGlsZElnbm9yaW5nQ29udGludWF0aW9uKFJlbmRlck9iamVjdCogbmV3Q2hpbGQsIFJl bmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKSBvdmVycmlkZSBmaW5hbDsKIAogICAg IHZvaWQgc3BsaXRJbmxpbmVzKFJlbmRlckJsb2NrKiBmcm9tQmxvY2ssIFJlbmRlckJsb2NrKiB0 b0Jsb2NrLCBSZW5kZXJCbG9jayogbWlkZGxlQmxvY2ssCiAgICAgICAgICAgICAgICAgICAgICAg UmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCwgUmVuZGVyQm94TW9kZWxPYmplY3QqIG9sZENvbnQp Owo=