58266 2011-04-11 14:12:19 -0700 First step towards simplifying WebPageProxy/WebProcessProxy/WebContext ownership 2011-04-11 14:26:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 383504 0 andersca 2011-04-11 14:12:19 -0700 First step towards simplifying WebPageProxy/WebProcessProxy/WebContext ownership 383514 1 89087 andersca 2011-04-11 14:19:21 -0700 Created attachment 89087 Patch 383518 2 andersca 2011-04-11 14:26:37 -0700 Committed r83499: <http://trac.webkit.org/changeset/83499> 89087 2011-04-11 14:19:21 -0700 2011-04-11 14:22:03 -0700 Patch bug-58266-20110411141920.patch text/plain 10799 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNDk1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTYgQEAKKzIwMTEtMDQtMTEgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXJzdCBzdGVwIHRvd2FyZHMgc2ltcGxpZnlpbmcgV2Vi UGFnZVByb3h5L1dlYlByb2Nlc3NQcm94eS9XZWJDb250ZXh0IG93bmVyc2hpcAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgyNjYKKworICAgICAgICBX aXRoIHRoaXMgcGF0Y2gsIHRoZSBXS1ZpZXcgaG9sZHMgYSBzdHJvbmcgcmVmZXJlbmNlIHRvIGEg V2ViUGFnZVByb3h5LiBUaGUgCisgICAgICAgIFdlYlBhZ2VQcm94eSBpbiB0dXJuIGhvbGRzIGEg c3Ryb25nIHJlZmVyZW5jZSB0byBpdHMgV2ViUHJvY2Vzc1Byb3h5LiBGaW5hbGx5LAorICAgICAg ICBUaGUgV2ViUHJvY2Vzc1Byb3h5IGhvbGRzIGEgc3Ryb25nIHJlZmVyZW5jZSB0byBpdHMgV2Vi Q29udGV4dC4KKworICAgICAgICBUaGUgV2ViQ29udGV4dCBob2xkcyBhIHN0cm9uZyByZWZlcmVu Y2UgdG8gdGhlIHJ1bm5pbmcgV2ViUHJvY2Vzc1Byb3h5IHdoaWNoIHJlc3VsdHMKKyAgICAgICAg aW4gYSByZWZlcmVuY2UgY3ljbGUgdGhhdCdzIGJyb2tlbiB3aGVuIHRoZSB3ZWIgcHJvY2VzcyBl eGl0cy4KKworICAgICAgICBUaGUgcmVhc29uIGZvciBpcyB0byBhdm9pZCBjcmFzaGVzIHdoZXJl IFdlYlBhZ2VQcm94eTo6cHJvY2VzcygpIHJldHVybnMgbnVsbCBpZiB0aGUgd2ViIHByb2Nlc3MK KyAgICAgICAgaGFzIGNyYXNoZWQgYnV0IGhhcyBub3QgeWV0IGJlZW4gcmVsYXVuY2hlZC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MpOgorICAgICAgICBBZGQgY29tbWVudC4KKworICAg ICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpjcmVhdGVXZWJQYWdlKToKKyAgICAgICAgUmV0dXJu IGEgUGFzc1JlZlB0ci4KKworICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpyZWxhdW5jaFBy b2Nlc3NJZk5lY2Vzc2FyeSk6CisgICAgICAgIENoYW5nZSB0aGlzIHRvIHJldHVybiBhIFdlYlBh Z2VQcm94eS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNyZWF0ZSk6CisgICAgICAgIFRoaXMgbm93IHRha2Vz IGEgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+LgorCisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6V2ViUGFnZVByb3h5KToKKyAgICAgICAgRGl0dG8uCisKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5Ojp+V2ViUGFnZVByb3h5KToKKyAgICAgICAgQ2FsbCBjbG9zZSgpIGlm IG5lY2Vzc2FyeS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9X ZWJQcm9jZXNzKToKKyAgICAgICAgUmVwbGFjZSB0aGUgY3VycmVudCBwcm9jZXNzIHdpdGggdGhl IG5ldyBwcm9jZXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y3JlYXRlKToKKyAgICAgICAgVGFr ZSBhIFBhc3NSZWZQdHI8V2ViQ29udGV4dD4uCisgICAgICAgIAorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUHJveHk6OldlYlByb2Nlc3NQcm94eSk6CisgICAgICAgIERpdHRvLgorCisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6d2ViUGFnZSk6CisgICAgICAgIFJlbW92ZSAu Z2V0KCkgbm93IHRoYXQgdGhlIHBhZ2UgbWFwIHVzZXMgd2VhayByZWZlcmVuY2VzLgorCisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFnZSk6CisgICAgICAgIFRo aXMgbm93IHJldHVybnMgdGhlIGNyZWF0ZWQgd2ViIHBhZ2UgcHJveHkuCisKIDIwMTEtMDQtMTEg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRl eHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0 LmNwcAkocmV2aXNpb24gODM0ODEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzNSwxMCArMzM1LDExIEBAIHZvaWQgV2ViQ29u dGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MoV2ViUHIKICAgICBtX3BsdWdpblNpdGVEYXRhTWFuYWdl ci0+aW52YWxpZGF0ZSgpOwogI2VuZGlmCiAKKyAgICAvLyBUaGlzIGNhbiBjYXVzZSB0aGUgd2Vi IGNvbnRleHQgdG8gYmUgZGVzdHJveWVkLgogICAgIG1fcHJvY2VzcyA9IDA7CiB9CiAKLVdlYlBh Z2VQcm94eSogV2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50KiBwYWdlQ2xpZW50 LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCkKK1Bhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJD b250ZXh0OjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQqIHBhZ2VDbGllbnQsIFdlYlBhZ2VHcm91 cCogcGFnZUdyb3VwKQogewogICAgIGVuc3VyZVdlYlByb2Nlc3MoKTsKIApAQCAtMzQ4LDkgKzM0 OSwxMiBAQCBXZWJQYWdlUHJveHkqIFdlYkNvbnRleHQ6OmNyZWF0ZVdlYlBhZ2UoCiAgICAgcmV0 dXJuIG1fcHJvY2Vzcy0+Y3JlYXRlV2ViUGFnZShwYWdlQ2xpZW50LCB0aGlzLCBwYWdlR3JvdXAp OwogfQogCi12b2lkIFdlYkNvbnRleHQ6OnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCkKK1dl YlByb2Nlc3NQcm94eSogV2ViQ29udGV4dDo6cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKQog ewogICAgIGVuc3VyZVdlYlByb2Nlc3MoKTsKKworICAgIEFTU0VSVChtX3Byb2Nlc3MpOworICAg IHJldHVybiBtX3Byb2Nlc3MuZ2V0KCk7CiB9CiAKIHZvaWQgV2ViQ29udGV4dDo6ZG93bmxvYWQo V2ViUGFnZVByb3h5KiBpbml0aWF0aW5nUGFnZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0KQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCShyZXZpc2lvbiA4 MzQ4MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTg0LDkgKzg0LDkgQEAgcHVibGljOgogICAgIC8vIERpc2Nvbm5lY3QgdGhlIHBy b2Nlc3MgZnJvbSB0aGUgY29udGV4dC4KICAgICB2b2lkIGRpc2Nvbm5lY3RQcm9jZXNzKFdlYlBy b2Nlc3NQcm94eSopOwogCi0gICAgV2ViUGFnZVByb3h5KiBjcmVhdGVXZWJQYWdlKFBhZ2VDbGll bnQqLCBXZWJQYWdlR3JvdXAqKTsKKyAgICBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRl V2ViUGFnZShQYWdlQ2xpZW50KiwgV2ViUGFnZUdyb3VwKik7CiAKLSAgICB2b2lkIHJlbGF1bmNo UHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CisgICAgV2ViUHJvY2Vzc1Byb3h5KiByZWxhdW5jaFByb2Nl c3NJZk5lY2Vzc2FyeSgpOwogCiAgICAgY29uc3QgU3RyaW5nJiBpbmplY3RlZEJ1bmRsZVBhdGgo KSBjb25zdCB7IHJldHVybiBtX2luamVjdGVkQnVuZGxlUGF0aDsgfQogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gODM0ODEpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTAwLDEzICsxMDAsMTQgQEAgV0tQYWdlRGVidWdQYWludEZsYWdzIFdlYlBhZ2VQcm94eTo6 c19kZQogc3RhdGljIFdURjo6UmVmQ291bnRlZExlYWtDb3VudGVyIHdlYlBhZ2VQcm94eUNvdW50 ZXIoIldlYlBhZ2VQcm94eSIpOwogI2VuZGlmCiAKLVBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBX ZWJQYWdlUHJveHk6OmNyZWF0ZShQYWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBXZWJDb250ZXh0KiBj b250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCwgdWludDY0X3QgcGFnZUlEKQorUGFzc1Jl ZlB0cjxXZWJQYWdlUHJveHk+IFdlYlBhZ2VQcm94eTo6Y3JlYXRlKFBhZ2VDbGllbnQqIHBhZ2VD bGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNzLCBXZWJDb250ZXh0KiBj b250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCwgdWludDY0X3QgcGFnZUlEKQogewotICAg IHJldHVybiBhZG9wdFJlZihuZXcgV2ViUGFnZVByb3h5KHBhZ2VDbGllbnQsIGNvbnRleHQsIHBh Z2VHcm91cCwgcGFnZUlEKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQYWdlUHJveHko cGFnZUNsaWVudCwgcHJvY2VzcywgY29udGV4dCwgcGFnZUdyb3VwLCBwYWdlSUQpKTsKIH0KIAot V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNsaWVudCogcGFnZUNsaWVudCwgV2ViQ29u dGV4dCogY29udGV4dCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIHVpbnQ2NF90IHBhZ2VJRCkK K1dlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQqIHBhZ2VDbGllbnQsIFBhc3NS ZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNzLCBXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJQ YWdlR3JvdXAqIHBhZ2VHcm91cCwgdWludDY0X3QgcGFnZUlEKQogICAgIDogbV9wYWdlQ2xpZW50 KHBhZ2VDbGllbnQpCisgICAgLCBtX3Byb2Nlc3MocHJvY2VzcykKICAgICAsIG1fY29udGV4dChj b250ZXh0KQogICAgICwgbV9wYWdlR3JvdXAocGFnZUdyb3VwKQogICAgICwgbV9tYWluRnJhbWUo MCkKQEAgLTE2Miw2ICsxNjMsOSBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xp ZW50KiBwCiAKIFdlYlBhZ2VQcm94eTo6fldlYlBhZ2VQcm94eSgpCiB7CisgICAgaWYgKCFtX2lz Q2xvc2VkKQorICAgICAgICBjbG9zZSgpOworCiAgICAgV2ViQ29udGV4dDo6c3RhdGlzdGljcygp LndrUGFnZUNvdW50LS07CiAKICAgICBpZiAobV9oYXNTcGVsbERvY3VtZW50VGFnKQpAQCAtMjM5 LDkgKzI0MywxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZUNvbnRleHRNZW51CiAK IHZvaWQgV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygpCiB7CisgICAgQVNTRVJU KCFpc1ZhbGlkKCkpOworCiAgICAgbV9pc1ZhbGlkID0gdHJ1ZTsKIAotICAgIGNvbnRleHQoKS0+ cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKKyAgICBtX3Byb2Nlc3MgPSBjb250ZXh0KCkt PnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgcHJvY2VzcygpLT5hZGRFeGlzdGlu Z1dlYlBhZ2UodGhpcywgbV9wYWdlSUQpOwogCiAgICAgaW5pdGlhbGl6ZVdlYlBhZ2UoKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDgzNDgx KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNTgsNyArMTU4LDcgQEAgY2xhc3MgV2ViUGFnZVByb3h5IDogcHVibGljIEFQSU9i amVjdCwgcAogcHVibGljOgogICAgIHN0YXRpYyBjb25zdCBUeXBlIEFQSVR5cGUgPSBUeXBlUGFn ZTsKIAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRlKFBhZ2VDbGll bnQqLCBXZWJDb250ZXh0KiwgV2ViUGFnZUdyb3VwKiwgdWludDY0X3QgcGFnZUlEKTsKKyAgICBz dGF0aWMgUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IGNyZWF0ZShQYWdlQ2xpZW50KiwgUGFzc1Jl ZlB0cjxXZWJQcm9jZXNzUHJveHk+LCBXZWJDb250ZXh0KiwgV2ViUGFnZUdyb3VwKiwgdWludDY0 X3QgcGFnZUlEKTsKICAgICB2aXJ0dWFsIH5XZWJQYWdlUHJveHkoKTsKIAogICAgIHVpbnQ2NF90 IHBhZ2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUlEOyB9CkBAIC00OTUsNyArNDk1LDcgQEAg cHVibGljOgogICAgIHZvaWQgbGlua0NsaWNrZWQoY29uc3QgU3RyaW5nJiwgY29uc3QgV2ViTW91 c2VFdmVudCYpOwogIAogcHJpdmF0ZToKLSAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCosIFdl YkNvbnRleHQqLCBXZWJQYWdlR3JvdXAqLCB1aW50NjRfdCBwYWdlSUQpOworICAgIFdlYlBhZ2VQ cm94eShQYWdlQ2xpZW50KiwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+LCBXZWJDb250ZXh0 KiwgV2ViUGFnZUdyb3VwKiwgdWludDY0X3QgcGFnZUlEKTsKIAogICAgIHZpcnR1YWwgVHlwZSB0 eXBlKCkgY29uc3QgeyByZXR1cm4gQVBJVHlwZTsgfQogCkBAIC03MTIsNiArNzEyLDcgQEAgcHJp dmF0ZToKICAgICBXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQgbV9jb250ZXh0TWVudUNsaWVudDsK IAogICAgIE93blB0cjxEcmF3aW5nQXJlYVByb3h5PiBtX2RyYXdpbmdBcmVhOworICAgIFJlZlB0 cjxXZWJQcm9jZXNzUHJveHk+IG1fcHJvY2VzczsKICAgICBSZWZQdHI8V2ViQ29udGV4dD4gbV9j b250ZXh0OwogICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IG1fcGFnZUdyb3VwOwogICAgIFJlZlB0 cjxXZWJGcmFtZVByb3h5PiBtX21haW5GcmFtZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiA4MzQ4NikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 OSwxMiArNTksMTIgQEAgc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRlUGFnZUlEKCkKICAgICByZXR1 cm4gdW5pcXVlUGFnZUlEKys7CiB9CiAKLVBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQ cm9jZXNzUHJveHk6OmNyZWF0ZShXZWJDb250ZXh0KiBjb250ZXh0KQorUGFzc1JlZlB0cjxXZWJQ cm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlKFBhc3NSZWZQdHI8V2ViQ29udGV4 dD4gY29udGV4dCkKIHsKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlByb2Nlc3NQcm94eShj b250ZXh0KSk7CiB9CiAKLVdlYlByb2Nlc3NQcm94eTo6V2ViUHJvY2Vzc1Byb3h5KFdlYkNvbnRl eHQqIGNvbnRleHQpCitXZWJQcm9jZXNzUHJveHk6OldlYlByb2Nlc3NQcm94eShQYXNzUmVmUHRy PFdlYkNvbnRleHQ+IGNvbnRleHQpCiAgICAgOiBtX3Jlc3BvbnNpdmVuZXNzVGltZXIodGhpcykK ICAgICAsIG1fY29udGV4dChjb250ZXh0KQogewpAQCAtMTYzLDE3ICsxNjMsMTcgQEAgdm9pZCBX ZWJQcm9jZXNzUHJveHk6OnRlcm1pbmF0ZSgpCiAKIFdlYlBhZ2VQcm94eSogV2ViUHJvY2Vzc1By b3h5Ojp3ZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9wYWdl TWFwLmdldChwYWdlSUQpLmdldCgpOworICAgIHJldHVybiBtX3BhZ2VNYXAuZ2V0KHBhZ2VJRCk7 CiB9CiAKLVdlYlBhZ2VQcm94eSogV2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGVXZWJQYWdlKFBhZ2VD bGllbnQqIHBhZ2VDbGllbnQsIFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYlBhZ2VHcm91cCogcGFn ZUdyb3VwKQorUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRl V2ViUGFnZShQYWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJQ YWdlR3JvdXAqIHBhZ2VHcm91cCkKIHsKICAgICBBU1NFUlQoY29udGV4dC0+cHJvY2VzcygpID09 IHRoaXMpOwogCiAgICAgdW5zaWduZWQgcGFnZUlEID0gZ2VuZXJhdGVQYWdlSUQoKTsKLSAgICBS ZWZQdHI8V2ViUGFnZVByb3h5PiB3ZWJQYWdlID0gV2ViUGFnZVByb3h5OjpjcmVhdGUocGFnZUNs aWVudCwgY29udGV4dCwgcGFnZUdyb3VwLCBwYWdlSUQpOwotICAgIG1fcGFnZU1hcC5zZXQocGFn ZUlELCB3ZWJQYWdlKTsKLSAgICByZXR1cm4gd2ViUGFnZS5nZXQoKTsKKyAgICBSZWZQdHI8V2Vi UGFnZVByb3h5PiB3ZWJQYWdlID0gV2ViUGFnZVByb3h5OjpjcmVhdGUocGFnZUNsaWVudCwgdGhp cywgY29udGV4dCwgcGFnZUdyb3VwLCBwYWdlSUQpOworICAgIG1fcGFnZU1hcC5zZXQocGFnZUlE LCB3ZWJQYWdlLmdldCgpKTsKKyAgICByZXR1cm4gd2ViUGFnZS5yZWxlYXNlKCk7CiB9CiAKIHZv aWQgV2ViUHJvY2Vzc1Byb3h5OjphZGRFeGlzdGluZ1dlYlBhZ2UoV2ViUGFnZVByb3h5KiB3ZWJQ YWdlLCB1aW50NjRfdCBwYWdlSUQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5oCShyZXZpc2lvbiA4MzQ4NikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsNyBAQCBw dWJsaWM6CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8V2ViRnJhbWVQcm94 eT4gPiBXZWJGcmFtZVByb3h5TWFwOwogICAgIHR5cGVkZWYgSGFzaE1hcDx1aW50NjRfdCwgUmVm UHRyPFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0+ID4gV2ViQmFja0ZvcndhcmRMaXN0SXRlbU1hcDsK IAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gY3JlYXRlKFdlYkNvbnRl eHQqKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+IGNyZWF0ZShQYXNz UmVmUHRyPFdlYkNvbnRleHQ+KTsKICAgICB+V2ViUHJvY2Vzc1Byb3h5KCk7CiAKICAgICB2b2lk IHRlcm1pbmF0ZSgpOwpAQCAtNzEsMTIgKzcxLDEyIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu IG1fY29ubmVjdGlvbi5nZXQoKTsgCiAgICAgfQogCi0gICAgV2ViQ29udGV4dCogY29udGV4dCgp IGNvbnN0IHsgcmV0dXJuIG1fY29udGV4dDsgfQorICAgIFdlYkNvbnRleHQqIGNvbnRleHQoKSBj b25zdCB7IHJldHVybiBtX2NvbnRleHQuZ2V0KCk7IH0KIAogICAgIFBsYXRmb3JtUHJvY2Vzc0lk ZW50aWZpZXIgcHJvY2Vzc0lkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX3Byb2Nlc3NMYXVu Y2hlci0+cHJvY2Vzc0lkZW50aWZpZXIoKTsgfQogCiAgICAgV2ViUGFnZVByb3h5KiB3ZWJQYWdl KHVpbnQ2NF90IHBhZ2VJRCkgY29uc3Q7Ci0gICAgV2ViUGFnZVByb3h5KiBjcmVhdGVXZWJQYWdl KFBhZ2VDbGllbnQqLCBXZWJDb250ZXh0KiwgV2ViUGFnZUdyb3VwKik7CisgICAgUGFzc1JlZlB0 cjxXZWJQYWdlUHJveHk+IGNyZWF0ZVdlYlBhZ2UoUGFnZUNsaWVudCosIFdlYkNvbnRleHQqLCBX ZWJQYWdlR3JvdXAqKTsKICAgICB2b2lkIGFkZEV4aXN0aW5nV2ViUGFnZShXZWJQYWdlUHJveHkq LCB1aW50NjRfdCBwYWdlSUQpOwogICAgIHZvaWQgcmVtb3ZlV2ViUGFnZSh1aW50NjRfdCBwYWdl SUQpOwogCkBAIC0xMDIsNyArMTAyLDcgQEAgcHVibGljOgogICAgIHRlbXBsYXRlPHR5cGVuYW1l IEUsIHR5cGVuYW1lIFQ+IGJvb2wgZGVwcmVjYXRlZFNlbmQoRSBtZXNzYWdlSUQsIHVpbnQ2NF90 IGRlc3RpbmF0aW9uSUQsIGNvbnN0IFQmIGFyZ3VtZW50cyk7CiAKIHByaXZhdGU6Ci0gICAgZXhw bGljaXQgV2ViUHJvY2Vzc1Byb3h5KFdlYkNvbnRleHQqKTsKKyAgICBleHBsaWNpdCBXZWJQcm9j ZXNzUHJveHkoUGFzc1JlZlB0cjxXZWJDb250ZXh0Pik7CiAKICAgICAvLyBJbml0aWFsaXplcyB0 aGUgcHJvY2VzcyBvciB0aHJlYWQgbGF1bmNoZXIgd2hpY2ggd2lsbCBiZWdpbiBsYXVuY2hpbmcg dGhlIHByb2Nlc3MuCiAgICAgdm9pZCBjb25uZWN0KCk7CkBAIC0xNTIsOSArMTUyLDkgQEAgcHJp dmF0ZToKICAgICBSZWZQdHI8UHJvY2Vzc0xhdW5jaGVyPiBtX3Byb2Nlc3NMYXVuY2hlcjsKICAg ICBSZWZQdHI8VGhyZWFkTGF1bmNoZXI+IG1fdGhyZWFkTGF1bmNoZXI7CiAKLSAgICBXZWJDb250 ZXh0KiBtX2NvbnRleHQ7CisgICAgUmVmUHRyPFdlYkNvbnRleHQ+IG1fY29udGV4dDsKIAotICAg IEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxXZWJQYWdlUHJveHk+ID4gbV9wYWdlTWFwOworICAg IEhhc2hNYXA8dWludDY0X3QsIFdlYlBhZ2VQcm94eSo+IG1fcGFnZU1hcDsKICAgICBXZWJGcmFt ZVByb3h5TWFwIG1fZnJhbWVNYXA7CiAgICAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbU1hcCBtX2Jh Y2tGb3J3YXJkTGlzdEl0ZW1NYXA7CiB9Owo=