97729 2012-09-26 14:08:20 -0700 Rename Page::frameCount() to subframeCount(), and related 2012-09-26 14:13:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser ap beidson simon.fraser oldest_to_newest 728959 0 simon.fraser 2012-09-26 14:08:20 -0700 Rename Page::frameCount() to subframeCount(), and related 728960 1 165874 simon.fraser 2012-09-26 14:09:16 -0700 Created attachment 165874 Patch 728967 2 simon.fraser 2012-09-26 14:13:32 -0700 http://trac.webkit.org/changeset/129707 165874 2012-09-26 14:09:16 -0700 2012-09-26 14:10:20 -0700 Patch bug-97729-20120926140837.patch text/plain 8868 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ3ZDJiYWQ4MDkwZTYz ZmNiNGIwYzMzMmQ1MDc2ZTI0Y2RhZGRjYi4uODIxMGExYWU4YWRmZWJmNGFlZTViNjJkYWVhZDE4 MzVhYjFlYzY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA5LTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBQYWdl OjpmcmFtZUNvdW50KCkgdG8gc3ViZnJhbWVDb3VudCgpLCBhbmQgcmVsYXRlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc3MjkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgbWVtYmVyIGZ1bmN0 aW9ucyBhbmQgdmFyaWFibGVzIG9uIFBhZ2UgdGhhdCByZWZlciB0bworICAgICAgICAiZnJhbWUg Y291bnQiIHRvIHVzZSAic3ViZnJhbWUgY291bnQiLCBzaW5jZSB0aGUgbWFpbiBmcmFtZSBpcwor ICAgICAgICBub3QgaW5jbHVkZWQgaW4gdGhlIGNvdW50LgorCisgICAgICAgICogaGlzdG9yeS9D YWNoZWRGcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRGcmFtZTo6Q2FjaGVkRnJh bWUpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkRnJhbWU6Om9wZW4pOgorICAgICAgICAqIGhp c3RvcnkvQ2FjaGVkUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRQYWdlOjpyZXN0 b3JlKToKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxGcmFtZUVsZW1lbnRCYXNlOjppc1VSTEFsbG93ZWQpOgorICAgICAgICAq IGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M UGx1Z0luSW1hZ2VFbGVtZW50OjphbGxvd2VkVG9Mb2FkRnJhbWVVUkwpOgorICAgICAgICAqIGxv YWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2xv c2VBbmRSZW1vdmVDaGlsZCk6CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZTo6RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OmRpc2Nvbm5l Y3RPd25lckVsZW1lbnQpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlOjpQYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmNoZWNrU3ViZnJhbWVD b3VudENvbnNpc3RlbmN5KToKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAgICAgKFdlYkNv cmU6OlBhZ2U6OmluY3JlbWVudFN1YmZyYW1lQ291bnQpOgorICAgICAgICAoV2ViQ29yZTo6UGFn ZTo6ZGVjcmVtZW50U3ViZnJhbWVDb3VudCk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpzdWJm cmFtZUNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OmNoZWNrU3ViZnJhbWVDb3VudENv bnNpc3RlbmN5KToKKwogMjAxMi0wOS0yNSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29t PgogCiAgICAgICAgIEpTQyBiaW5kaW5ncyBhcHBlYXIgdG8gc29tZXRpbWVzIGlnbm9yZSB0aGUg cG9zc2liaWxpdHkgb2YgYXJyYXlzIGJlaW5nIGluIHNwYXJzZSBtb2RlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZEZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2hp c3RvcnkvQ2FjaGVkRnJhbWUuY3BwCmluZGV4IDkyNmRiYzhjZmYyNWM5NTdkMzM3ZWNhMTU1Yzk5 NDdmMTRmNDMzYWYuLjEyMTJmZDlmZWUwZDQ5MGEyNmJhZTk0YjVkNWNhZGM4YjIxYTM2YmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkRnJhbWUuY3BwCkBAIC0xOTEsNyArMTkxLDcgQEAg Q2FjaGVkRnJhbWU6OkNhY2hlZEZyYW1lKEZyYW1lKiBmcmFtZSkKICAgICAgICAgZnJhbWUtPnRy ZWUoKS0+cmVtb3ZlQ2hpbGQobV9jaGlsZEZyYW1lc1tpXS0+dmlldygpLT5mcmFtZSgpKTsKIAog ICAgIGlmICghbV9pc01haW5GcmFtZSkKLSAgICAgICAgZnJhbWUtPnBhZ2UoKS0+ZGVjcmVtZW50 RnJhbWVDb3VudCgpOworICAgICAgICBmcmFtZS0+cGFnZSgpLT5kZWNyZW1lbnRTdWJmcmFtZUNv dW50KCk7CiAKICAgICBmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5kaWRTYXZlVG9QYWdlQ2Fj aGUoKTsKIApAQCAtMjEwLDcgKzIxMCw3IEBAIHZvaWQgQ2FjaGVkRnJhbWU6Om9wZW4oKQogICAg IG1fdmlldy0+ZnJhbWUoKS0+bG9hZGVyKCktPm9wZW4oKnRoaXMpOwogCiAgICAgaWYgKCFtX2lz TWFpbkZyYW1lKQotICAgICAgICBtX3ZpZXctPmZyYW1lKCktPnBhZ2UoKS0+aW5jcmVtZW50RnJh bWVDb3VudCgpOworICAgICAgICBtX3ZpZXctPmZyYW1lKCktPnBhZ2UoKS0+aW5jcmVtZW50U3Vi ZnJhbWVDb3VudCgpOwogfQogCiB2b2lkIENhY2hlZEZyYW1lOjpjbGVhcigpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9DYWNoZWRQYWdlLmNwcAppbmRleCAxMTYzNmY2NzQ2M2Q4OWVhNTIyMjU5OTE0ODVh MDgwYzUwYTEwZWYxLi5hODE2OTAyZTBiNjUzMGRlYmVmYTE0OTBiNTQzZjIxMjRmYWYwYzlhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0NhY2hlZFBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvQ2FjaGVkUGFnZS5jcHAKQEAgLTc0LDcgKzc0LDcgQEAgdm9p ZCBDYWNoZWRQYWdlOjpyZXN0b3JlKFBhZ2UqIHBhZ2UpCiB7CiAgICAgQVNTRVJUKG1fY2FjaGVk TWFpbkZyYW1lKTsKICAgICBBU1NFUlQocGFnZSAmJiBwYWdlLT5tYWluRnJhbWUoKSAmJiBwYWdl LT5tYWluRnJhbWUoKSA9PSBtX2NhY2hlZE1haW5GcmFtZS0+dmlldygpLT5mcmFtZSgpKTsKLSAg ICBBU1NFUlQoIXBhZ2UtPmZyYW1lQ291bnQoKSk7CisgICAgQVNTRVJUKCFwYWdlLT5zdWJmcmFt ZUNvdW50KCkpOwogCiAgICAgbV9jYWNoZWRNYWluRnJhbWUtPm9wZW4oKTsKICAgICAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5jcHAKaW5kZXggZWFhMzU0OTk0 YTlmZTc2NjM1MzY1YzhjM2Q1NTY0NDFlMzZlZDY5Ny4uZDc4ODJmMzdjM2NmMjBjNWYwYjc5OTdk ZjU1ZTg1MWQ3MGQxMTdiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJh bWVFbGVtZW50QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVt ZW50QmFzZS5jcHAKQEAgLTY3LDcgKzY3LDcgQEAgYm9vbCBIVE1MRnJhbWVFbGVtZW50QmFzZTo6 aXNVUkxBbGxvd2VkKCkgY29uc3QKICAgICB9CiAKICAgICBpZiAoRnJhbWUqIHBhcmVudEZyYW1l ID0gZG9jdW1lbnQoKS0+ZnJhbWUoKSkgewotICAgICAgICBpZiAocGFyZW50RnJhbWUtPnBhZ2Uo KS0+ZnJhbWVDb3VudCgpID49IFBhZ2U6Om1heE51bWJlck9mRnJhbWVzKQorICAgICAgICBpZiAo cGFyZW50RnJhbWUtPnBhZ2UoKS0+c3ViZnJhbWVDb3VudCgpID49IFBhZ2U6Om1heE51bWJlck9m RnJhbWVzKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKaW5kZXggNDk1NGUzNmQ1MjRi MTdlZjNjMDEwY2Y5MmY4NzdlNWZhYjUyZDA3OC4uNDkxMTY2ZTNlOGM5ZDgwYjk3MmYwODFkNmZi ODk3OTBhNDhkNDllMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0lu SW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFn ZUVsZW1lbnQuY3BwCkBAIC04Myw3ICs4Myw3IEBAIGJvb2wgSFRNTFBsdWdJbkltYWdlRWxlbWVu dDo6YWxsb3dlZFRvTG9hZEZyYW1lVVJMKGNvbnN0IFN0cmluZyYgdXJsKQogewogICAgIEFTU0VS VChkb2N1bWVudCgpKTsKICAgICBBU1NFUlQoZG9jdW1lbnQoKS0+ZnJhbWUoKSk7Ci0gICAgaWYg KGRvY3VtZW50KCktPmZyYW1lKCktPnBhZ2UoKS0+ZnJhbWVDb3VudCgpID49IFBhZ2U6Om1heE51 bWJlck9mRnJhbWVzKQorICAgIGlmIChkb2N1bWVudCgpLT5mcmFtZSgpLT5wYWdlKCktPnN1YmZy YW1lQ291bnQoKSA+PSBQYWdlOjptYXhOdW1iZXJPZkZyYW1lcykKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgS1VSTCBjb21wbGV0ZVVSTCA9IGRvY3VtZW50KCktPmNvbXBsZXRlVVJMKHVy bCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBiNTc1MDk0YzA1YzVk NWIwYjU4MDgxODk2NjA1MTU4ZTYwN2Q0NDg4Li44NmViODUyMDZiNDhlMTg1NDU1MDJjNDFiNjNl OWI3NjdkMjQ4MGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTIz MzEsNyArMjMzMSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNsb3NlQW5kUmVtb3ZlQ2hpbGQoRnJh bWUqIGNoaWxkKQogCiAgICAgY2hpbGQtPnNldFZpZXcoMCk7CiAgICAgaWYgKGNoaWxkLT5vd25l ckVsZW1lbnQoKSAmJiBjaGlsZC0+cGFnZSgpKQotICAgICAgICBjaGlsZC0+cGFnZSgpLT5kZWNy ZW1lbnRGcmFtZUNvdW50KCk7CisgICAgICAgIGNoaWxkLT5wYWdlKCktPmRlY3JlbWVudFN1YmZy YW1lQ291bnQoKTsKICAgICBjaGlsZC0+d2lsbERldGFjaFBhZ2UoKTsKICAgICBjaGlsZC0+ZGV0 YWNoRnJvbVBhZ2UoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCBhN2FhZjk1NGJmNGY3MTIz NzY3MDRlMjcxZmQ0NjNmMWUzNjYyMTNlLi4zZmFiNjIwOWFkZDc0Y2M4ZTZmOWUwYWMwZjA3MTY4 ZjBiMjU0MTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTg0LDcgKzE4NCw3IEBAIGlubGlu ZSBGcmFtZTo6RnJhbWUoUGFnZSogcGFnZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVs ZW1lbnQsIEZyYW1lTG9hZGVyCiAgICAgICAgIHNldFRpbGVkQmFja2luZ1N0b3JlRW5hYmxlZChw YWdlLT5zZXR0aW5ncygpLT50aWxlZEJhY2tpbmdTdG9yZUVuYWJsZWQoKSk7CiAjZW5kaWYKICAg ICB9IGVsc2UgewotICAgICAgICBwYWdlLT5pbmNyZW1lbnRGcmFtZUNvdW50KCk7CisgICAgICAg IHBhZ2UtPmluY3JlbWVudFN1YmZyYW1lQ291bnQoKTsKIAogICAgICAgICAvLyBNYWtlIHN1cmUg d2Ugd2lsbCBub3QgZW5kIHVwIHdpdGggdHdvIGZyYW1lcyByZWZlcmVuY2luZyB0aGUgc2FtZSBv d25lciBlbGVtZW50LgogICAgICAgICBGcmFtZSomIGNvbnRlbnRGcmFtZVNsb3QgPSBvd25lckVs ZW1lbnQtPm1fY29udGVudEZyYW1lOwpAQCAtNzA0LDcgKzcwNCw3IEBAIHZvaWQgRnJhbWU6OmRp c2Nvbm5lY3RPd25lckVsZW1lbnQoKQogICAgICAgICAgICAgZG9jLT5jbGVhckFYT2JqZWN0Q2Fj aGUoKTsKICAgICAgICAgbV9vd25lckVsZW1lbnQtPm1fY29udGVudEZyYW1lID0gMDsKICAgICAg ICAgaWYgKG1fcGFnZSkKLSAgICAgICAgICAgIG1fcGFnZS0+ZGVjcmVtZW50RnJhbWVDb3VudCgp OworICAgICAgICAgICAgbV9wYWdlLT5kZWNyZW1lbnRTdWJmcmFtZUNvdW50KCk7CiAgICAgfQog ICAgIG1fb3duZXJFbGVtZW50ID0gMDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDE3OTNkZjE1 ZTQ5YTE2NTZlNTcwODQ5OWIwMDg1YWNhNGM0MjM4M2IuLmI4Nzk5ZmI3MGMzY2IxM2ExOTBhMmEw NTBlMjM3MzBhNTgzYTRmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApAQCAtMTM0LDcgKzEzNCw3IEBA IFBhZ2U6OlBhZ2UoUGFnZUNsaWVudHMmIHBhZ2VDbGllbnRzKQogICAgICwgbV90aGVtZShSZW5k ZXJUaGVtZTo6dGhlbWVGb3JQYWdlKHRoaXMpKQogICAgICwgbV9lZGl0b3JDbGllbnQocGFnZUNs aWVudHMuZWRpdG9yQ2xpZW50KQogICAgICwgbV92YWxpZGF0aW9uTWVzc2FnZUNsaWVudChwYWdl Q2xpZW50cy52YWxpZGF0aW9uTWVzc2FnZUNsaWVudCkKLSAgICAsIG1fZnJhbWVDb3VudCgwKQor ICAgICwgbV9zdWJmcmFtZUNvdW50KDApCiAgICAgLCBtX29wZW5lZEJ5RE9NKGZhbHNlKQogICAg ICwgbV90YWJLZXlDeWNsZXNUaHJvdWdoRWxlbWVudHModHJ1ZSkKICAgICAsIG1fZGVmZXJzTG9h ZGluZyhmYWxzZSkKQEAgLTEwODEsMTUgKzEwODEsMTUgQEAgdm9pZCBQYWdlOjpwcml2YXRlQnJv d3NpbmdTdGF0ZUNoYW5nZWQoKQogfQogCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAotdm9pZCBQYWdl OjpjaGVja0ZyYW1lQ291bnRDb25zaXN0ZW5jeSgpIGNvbnN0Cit2b2lkIFBhZ2U6OmNoZWNrU3Vi ZnJhbWVDb3VudENvbnNpc3RlbmN5KCkgY29uc3QKIHsKLSAgICBBU1NFUlQobV9mcmFtZUNvdW50 ID49IDApOworICAgIEFTU0VSVChtX3N1YmZyYW1lQ291bnQgPj0gMCk7CiAKLSAgICBpbnQgZnJh bWVDb3VudCA9IDA7CisgICAgaW50IHN1YmZyYW1lQ291bnQgPSAwOwogICAgIGZvciAoRnJhbWUq IGZyYW1lID0gbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZl cnNlTmV4dCgpKQotICAgICAgICArK2ZyYW1lQ291bnQ7CisgICAgICAgICsrc3ViZnJhbWVDb3Vu dDsKIAotICAgIEFTU0VSVChtX2ZyYW1lQ291bnQgKyAxID09IGZyYW1lQ291bnQpOworICAgIEFT U0VSVChtX3N1YmZyYW1lQ291bnQgKyAxID09IHN1YmZyYW1lQ291bnQpOwogfQogI2VuZGlmCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlLmgKaW5kZXggY2Q2YzY2NWI0ZWE3MTliYjZjYTNmNmFlMzZmOTNjY2QyMWIzYjhk ZS4uNzQ2NjE2MjAyYWU5N2JlNjkzYzE1MDUyMjk3NzdkYTQ4ODFlMjIxMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmgKQEAgLTE3Miw5ICsxNzIsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFBhZ2VH cm91cCYgZ3JvdXAoKSB7IGlmICghbV9ncm91cCkgaW5pdEdyb3VwKCk7IHJldHVybiAqbV9ncm91 cDsgfQogICAgICAgICBQYWdlR3JvdXAqIGdyb3VwUHRyKCkgeyByZXR1cm4gbV9ncm91cDsgfSAv LyBjYW4gcmV0dXJuIDAKIAotICAgICAgICB2b2lkIGluY3JlbWVudEZyYW1lQ291bnQoKSB7ICsr bV9mcmFtZUNvdW50OyB9Ci0gICAgICAgIHZvaWQgZGVjcmVtZW50RnJhbWVDb3VudCgpIHsgQVNT RVJUKG1fZnJhbWVDb3VudCk7IC0tbV9mcmFtZUNvdW50OyB9Ci0gICAgICAgIGludCBmcmFtZUNv dW50KCkgY29uc3QgeyBjaGVja0ZyYW1lQ291bnRDb25zaXN0ZW5jeSgpOyByZXR1cm4gbV9mcmFt ZUNvdW50OyB9CisgICAgICAgIHZvaWQgaW5jcmVtZW50U3ViZnJhbWVDb3VudCgpIHsgKyttX3N1 YmZyYW1lQ291bnQ7IH0KKyAgICAgICAgdm9pZCBkZWNyZW1lbnRTdWJmcmFtZUNvdW50KCkgeyBB U1NFUlQobV9zdWJmcmFtZUNvdW50KTsgLS1tX3N1YmZyYW1lQ291bnQ7IH0KKyAgICAgICAgaW50 IHN1YmZyYW1lQ291bnQoKSBjb25zdCB7IGNoZWNrU3ViZnJhbWVDb3VudENvbnNpc3RlbmN5KCk7 IHJldHVybiBtX3N1YmZyYW1lQ291bnQ7IH0KIAogICAgICAgICBDaHJvbWUqIGNocm9tZSgpIGNv bnN0IHsgcmV0dXJuIG1fY2hyb21lLmdldCgpOyB9CiAgICAgICAgIERyYWdDYXJldENvbnRyb2xs ZXIqIGRyYWdDYXJldENvbnRyb2xsZXIoKSBjb25zdCB7IHJldHVybiBtX2RyYWdDYXJldENvbnRy b2xsZXIuZ2V0KCk7IH0KQEAgLTM1NCw5ICszNTQsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIHZvaWQgaW5pdEdyb3VwKCk7CiAKICNpZiBBU1NFUlRfRElTQUJMRUQKLSAgICAgICAg dm9pZCBjaGVja0ZyYW1lQ291bnRDb25zaXN0ZW5jeSgpIGNvbnN0IHsgfQorICAgICAgICB2b2lk IGNoZWNrU3ViZnJhbWVDb3VudENvbnNpc3RlbmN5KCkgY29uc3QgeyB9CiAjZWxzZQotICAgICAg ICB2b2lkIGNoZWNrRnJhbWVDb3VudENvbnNpc3RlbmN5KCkgY29uc3Q7CisgICAgICAgIHZvaWQg Y2hlY2tTdWJmcmFtZUNvdW50Q29uc2lzdGVuY3koKSBjb25zdDsKICNlbmRpZgogCiAgICAgICAg IE1lZGlhQ2FuU3RhcnRMaXN0ZW5lciogdGFrZUFueU1lZGlhQ2FuU3RhcnRMaXN0ZW5lcigpOwpA QCAtMzk5LDcgKzM5OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBGZWF0dXJl T2JzZXJ2ZXIgbV9mZWF0dXJlT2JzZXJ2ZXI7CiAKLSAgICAgICAgaW50IG1fZnJhbWVDb3VudDsK KyAgICAgICAgaW50IG1fc3ViZnJhbWVDb3VudDsKICAgICAgICAgU3RyaW5nIG1fZ3JvdXBOYW1l OwogICAgICAgICBib29sIG1fb3BlbmVkQnlET007CiAK