30109 2009-10-05 22:14:39 -0700 Move m_openedByDOM to Page 2009-10-06 11:20:45 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 29947 1 abarth webkit-unassigned commit-queue sam oldest_to_newest 152578 0 abarth 2009-10-05 22:14:39 -0700 We only need one instance of m_openedByDOM per page, we should move it to a page-scoped object. Notice that it's only ever touched for the main frame. 152580 1 40688 abarth 2009-10-05 22:15:48 -0700 Created attachment 40688 Patch v1 152592 2 40688 abarth 2009-10-05 22:53:13 -0700 Comment on attachment 40688 Patch v1 There are two typos I need to fix before landing. 152596 3 40693 abarth 2009-10-05 23:05:32 -0700 Created attachment 40693 patch with typos fixed. 152764 4 40693 eric 2009-10-06 09:50:39 -0700 Comment on attachment 40693 patch with typos fixed. LGTM. 152793 5 40693 commit-queue 2009-10-06 11:20:41 -0700 Comment on attachment 40693 patch with typos fixed. Clearing flags on attachment: 40693 Committed r49196: <http://trac.webkit.org/changeset/49196> 152794 6 commit-queue 2009-10-06 11:20:45 -0700 All reviewed patches have been landed. Closing bug. 40688 2009-10-05 22:15:48 -0700 2009-10-05 23:05:32 -0700 Patch v1 bug-30109-20091005221547.patch text/plain 5476 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWNjZGUxNS4uMzVlNzI4ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAwOS0xMC0wNSAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmUgbV9vcGVuZWRCeURPTSB0byBQYWdlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDEwOQorCisgICAgICAgIFdlIG9ubHkg bmVlZCBvbmUgaW5zdGFuY2Ugb2YgbV9vcGVuZWRCeURPTSBwZXIgcGFnZSwgd2Ugc2hvdWxkIG1v dmUgaXQKKyAgICAgICAgdG8gYSBwYWdlLXNjb3BlZCBvYmplY3QuICBOb3RpY2UgdGhhdCBpdCdz IG9ubHkgZXZlciB0b3VjaGVkIGZvciB0aGUKKyAgICAgICAgbWFpbiBmcmFtZS4KKworICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmNyZWF0ZVdpbmRvdyk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93 Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVdpbmRvdyk6CisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoK KyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5k b3c6OmNsb3NlKToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZTo6UGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpvcGVuZWRCeURPTSk6CisgICAg ICAgIChXZWJDb3JlOjpQYWdlOjpzZXRPcGVuZWRCeURPTSk6CisgICAgICAgICogcGFnZS9QYWdl Lmg6CisKIDIwMDktMTAtMDUgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT RE9NV2luZG93Q3VzdG9tLmNwcAppbmRleCA3ZGRjNWVkLi42YTY2YTRkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcApAQCAtNzcwLDcgKzc3MCw3IEBAIHN0YXRp YyBGcmFtZSogY3JlYXRlV2luZG93KEV4ZWNTdGF0ZSogZXhlYywgRnJhbWUqIGxleGljYWxGcmFt ZSwgRnJhbWUqIGR5bmFtaWNGCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgbmV3RnJhbWUtPmxv YWRlcigpLT5zZXRPcGVuZXIob3BlbmVyRnJhbWUpOwotICAgIG5ld0ZyYW1lLT5sb2FkZXIoKS0+ c2V0T3BlbmVkQnlET00oKTsKKyAgICBuZXdGcmFtZS0+cGFnZSgpLT5zZXRPcGVuZWRCeURPTSgp OwogCiAgICAgSlNET01XaW5kb3cqIG5ld1dpbmRvdyA9IHRvSlNET01XaW5kb3cobmV3RnJhbWUp OwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1 c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5j cHAKaW5kZXggOTE4NTM2ZC4uYWUzMWZhNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcApAQCAtNDk2LDcgKzQ5Niw3IEBAIHN0YXRpYyBG cmFtZSogY3JlYXRlV2luZG93KEZyYW1lKiBjYWxsaW5nRnJhbWUsCiAgICAgICAgIHJldHVybiAw OwogCiAgICAgbmV3RnJhbWUtPmxvYWRlcigpLT5zZXRPcGVuZXIob3BlbmVyRnJhbWUpOwotICAg IG5ld0ZyYW1lLT5sb2FkZXIoKS0+c2V0T3BlbmVkQnlET00oKTsKKyAgICBuZXdGcmFtZS0+cGFn ZSgpLT5zZXRPcGVuZWRCeURPTSgpOwogCiAgICAgLy8gU2V0IGRpYWxvZyBhcmd1bWVudHMgb24g dGhlIGdsb2JhbCBvYmplY3Qgb2YgdGhlIG5ldyBmcmFtZS4KICAgICBpZiAoIWRpYWxvZ0FyZ3Mu SXNFbXB0eSgpKSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAg Yi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggZDIxYzZhOS4uYjc2MmRjYSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTUzMywxNiArMTUzMyw2IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnNldE9wZW5lcihGcmFtZSogb3BlbmVyKQogICAgIH0KIH0KIAotYm9vbCBGcmFtZUxv YWRlcjo6b3BlbmVkQnlET00oKSBjb25zdAotewotICAgIHJldHVybiBtX29wZW5lZEJ5RE9NOwot fQotCi12b2lkIEZyYW1lTG9hZGVyOjpzZXRPcGVuZWRCeURPTSgpCi17Ci0gICAgbV9vcGVuZWRC eURPTSA9IHRydWU7Ci19Ci0KIHZvaWQgRnJhbWVMb2FkZXI6OmhhbmRsZUZhbGxiYWNrQ29udGVu dCgpCiB7CiAgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IG1fZnJhbWUtPm93bmVy RWxlbWVudCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggZTQ3NzNkMi4uNTc5M2I0YyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oCkBAIC0yNzIsOCArMjcyLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAg ICAgICAgIEZyYW1lKiBvcGVuZXIoKTsKICAgICAgICAgdm9pZCBzZXRPcGVuZXIoRnJhbWUqKTsK LSAgICAgICAgYm9vbCBvcGVuZWRCeURPTSgpIGNvbnN0OwotICAgICAgICB2b2lkIHNldE9wZW5l ZEJ5RE9NKCk7CiAKICAgICAgICAgYm9vbCBpc1Byb2Nlc3NpbmdVc2VyR2VzdHVyZSgpOwogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1dlYkNvcmUvcGFnZS9ET01X aW5kb3cuY3BwCmluZGV4IDQ5MjUyM2YuLmFhNjAxMmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFn ZS9ET01XaW5kb3cuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC03Mzks MTIgKzczOSw5IEBAIHZvaWQgRE9NV2luZG93OjpjbG9zZSgpCiAgICAgICAgIHJldHVybjsKIAog ICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgYm9vbCBh bGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cyA9Ci0gICAgICAgIHNldHRpbmdzICYmIHNldHRpbmdz LT5hbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cygpOworICAgIGJvb2wgYWxsb3dTY3JpcHRzVG9D bG9zZVdpbmRvd3MgPSBzZXR0aW5ncyAmJiBzZXR0aW5ncy0+YWxsb3dTY3JpcHRzVG9DbG9zZVdp bmRvd3MoKTsKIAotICAgIGlmIChtX2ZyYW1lLT5sb2FkZXIoKS0+b3BlbmVkQnlET00oKQotICAg ICAgICB8fCBwYWdlLT5nZXRIaXN0b3J5TGVuZ3RoKCkgPD0gMQotICAgICAgICB8fCBhbGxvd1Nj cmlwdHNUb0Nsb3NlV2luZG93cykKKyAgICBpZiAocGFnZS0+b3BlbmVkQnlET00oKSB8fCBwYWdl LT5nZXRIaXN0b3J5TGVuZ3RoKCkgPD0gMSB8fCBhbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cykK ICAgICAgICAgbV9mcmFtZS0+c2NoZWR1bGVDbG9zZSgpOwogfQogCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvUGFnZS5jcHAgYi9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggMTA1YmM0Ni4u OTMwODQzZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1dlYkNvcmUv cGFnZS9QYWdlLmNwcApAQCAtMTAzLDYgKzEwMyw3IEBAIHN0YXRpYyB2b2lkIG5ldHdvcmtTdGF0 ZUNoYW5nZWQoKQogUGFnZTo6UGFnZShDaHJvbWVDbGllbnQqIGNocm9tZUNsaWVudCwgQ29udGV4 dE1lbnVDbGllbnQqIGNvbnRleHRNZW51Q2xpZW50LCBFZGl0b3JDbGllbnQqIGVkaXRvckNsaWVu dCwgRHJhZ0NsaWVudCogZHJhZ0NsaWVudCwgSW5zcGVjdG9yQ2xpZW50KiBpbnNwZWN0b3JDbGll bnQsIFBsdWdpbkhhbHRlckNsaWVudCogcGx1Z2luSGFsdGVyQ2xpZW50KQogICAgIDogbV9jaHJv bWUobmV3IENocm9tZSh0aGlzLCBjaHJvbWVDbGllbnQpKQogICAgICwgbV9kcmFnQ2FyZXRDb250 cm9sbGVyKG5ldyBTZWxlY3Rpb25Db250cm9sbGVyKDAsIHRydWUpKQorICAgICwgbV9vcGVuZWRC eURPTShmYWxzZSkKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgICwgbV9kcmFnQ29udHJv bGxlcihuZXcgRHJhZ0NvbnRyb2xsZXIodGhpcywgZHJhZ0NsaWVudCkpCiAjZW5kaWYKQEAgLTIw MSw2ICsyMDIsMTYgQEAgdm9pZCBQYWdlOjpzZXRNYWluRnJhbWUoUGFzc1JlZlB0cjxGcmFtZT4g bWFpbkZyYW1lKQogICAgIG1fbWFpbkZyYW1lID0gbWFpbkZyYW1lOwogfQogCitib29sIFBhZ2U6 Om9wZW5lZEJ5RE9NKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9vcGVuZWRCeURPTTsKK30KKwor dm9pZCBQYWdlOjpzZXRPcGVuZWRCeURPTSgpCit7CisgICAgbV9vcGVuZWRCeURPTSA9IHRydWU7 Cit9CisKIEJhY2tGb3J3YXJkTGlzdCogUGFnZTo6YmFja0ZvcndhcmRMaXN0KCkKIHsKICAgICBy ZXR1cm4gbV9iYWNrRm9yd2FyZExpc3QuZ2V0KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2Uv UGFnZS5oIGIvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCA1MmFkMDViLi5jYWIwNzVlIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAg LTEwMyw2ICsxMDMsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0TWFp bkZyYW1lKFBhc3NSZWZQdHI8RnJhbWU+KTsKICAgICAgICAgRnJhbWUqIG1haW5GcmFtZSgpIGNv bnN0IHsgcmV0dXJuIG1fbWFpbkZyYW1lLmdldCgpOyB9CiAKKyAgICAgICAgYm9vbCBvcGVuZWRC eURPTSgpIGNvbnN0OworICAgICAgICB2b2lkIHNldE9wZW5lZEJ5RE9NKCk7CisKICAgICAgICAg QmFja0ZvcndhcmRMaXN0KiBiYWNrRm9yd2FyZExpc3QoKTsKIAogICAgICAgICAvLyBGSVhNRTog VGhlIGZvbGxvd2luZyB0aHJlZSBtZXRob2RzIGRvbid0IGZhbGwgdW5kZXIgdGhlIHJlc3BvbnNp YmlsaXRpZXMgb2YgdGhlIFBhZ2Ugb2JqZWN0CkBAIC0yNjQsNiArMjY3LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIGludCBtX2ZyYW1lQ291bnQ7CiAgICAgICAgIFN0cmluZyBt X2dyb3VwTmFtZTsKKyAgICAgICAgYm9vbCBtX29wZW5lZEJ5RE9NOwogCiAgICAgICAgIGJvb2wg bV90YWJLZXlDeWNsZXNUaHJvdWdoRWxlbWVudHM7CiAgICAgICAgIGJvb2wgbV9kZWZlcnNMb2Fk aW5nOw== 40693 2009-10-05 23:05:32 -0700 2009-10-06 11:20:41 -0700 patch with typos fixed. 0001-openedByDOM.patch text/plain 6601 abarth RnJvbSBjM2MxM2NiN2U2Mzg4ODUzNzgyYzRkMjljYWIyYTIwZDUzY2I4NTYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIEJhcnRoIDxhYmFydGhAd2Via2l0Lm9yZz4KRGF0ZTog TW9uLCA1IE9jdCAyMDA5IDIyOjE5OjMyIC0wNzAwClN1YmplY3Q6IFtQQVRDSCAxLzJdIG9wZW5l ZEJ5RE9NCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8ICAgMjUgKysrKysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RPTVdpbmRvd0N1c3RvbS5jcHAgICAgICAgIHwgICAgMiArLQogV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwIHwgICAgMiArLQogV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwICAgICAgICAgICAgICAgICAgIHwgICAxMiArLS0tLS0tLS0tCiBXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oICAgICAgICAgICAgICAgICAgICAgfCAgICAyIC0KIFdl YkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDcgKy0t LS0KIFdlYkNvcmUvcGFnZS9QYWdlLmNwcCAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTEgKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvUGFnZS5oICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgICA0ICsrKwogOCBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCAyMCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDljY2RlMTUuLjU0NTQ3OTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMDktMTAtMDQg IEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG1fb3BlbmVkQnlET00gdG8gUGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAxMDkKKworICAg ICAgICBXZSBvbmx5IG5lZWQgb25lIGluc3RhbmNlIG9mIG1fb3BlbmVkQnlET00gcGVyIHBhZ2Us IHdlIHNob3VsZCBtb3ZlIGl0CisgICAgICAgIHRvIGEgcGFnZS1zY29wZWQgb2JqZWN0LiAgTm90 aWNlIHRoYXQgaXQncyBvbmx5IGV2ZXIgdG91Y2hlZCBmb3IgdGhlCisgICAgICAgIG1haW4gZnJh bWUuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVXaW5kb3cpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOERPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVXaW5kb3cp OgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgICogbG9hZGVyL0Zy YW1lTG9hZGVyLmg6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RE9NV2luZG93OjpjbG9zZSk6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2U6OlBhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6b3BlbmVk QnlET00pOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6c2V0T3BlbmVkQnlET00pOgorICAgICAg ICAqIHBhZ2UvUGFnZS5oOgorCiAyMDA5LTEwLTA1ICBKb2huIEFiZC1FbC1NYWxlayAgPGphbUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwIGIvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKaW5kZXggN2RkYzVlZC4uNmE2NmE0ZCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKKysr IGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKQEAgLTc3MCw3ICs3 NzAsNyBAQCBzdGF0aWMgRnJhbWUqIGNyZWF0ZVdpbmRvdyhFeGVjU3RhdGUqIGV4ZWMsIEZyYW1l KiBsZXhpY2FsRnJhbWUsIEZyYW1lKiBkeW5hbWljRgogICAgICAgICByZXR1cm4gMDsKIAogICAg IG5ld0ZyYW1lLT5sb2FkZXIoKS0+c2V0T3BlbmVyKG9wZW5lckZyYW1lKTsKLSAgICBuZXdGcmFt ZS0+bG9hZGVyKCktPnNldE9wZW5lZEJ5RE9NKCk7CisgICAgbmV3RnJhbWUtPnBhZ2UoKS0+c2V0 T3BlbmVkQnlET00oKTsKIAogICAgIEpTRE9NV2luZG93KiBuZXdXaW5kb3cgPSB0b0pTRE9NV2lu ZG93KG5ld0ZyYW1lKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhET01XaW5kb3dDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhET01X aW5kb3dDdXN0b20uY3BwCmluZGV4IDkxODUzNmQuLmFlMzFmYTcgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAorKysgYi9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKQEAgLTQ5Niw3ICs0OTYs NyBAQCBzdGF0aWMgRnJhbWUqIGNyZWF0ZVdpbmRvdyhGcmFtZSogY2FsbGluZ0ZyYW1lLAogICAg ICAgICByZXR1cm4gMDsKIAogICAgIG5ld0ZyYW1lLT5sb2FkZXIoKS0+c2V0T3BlbmVyKG9wZW5l ckZyYW1lKTsKLSAgICBuZXdGcmFtZS0+bG9hZGVyKCktPnNldE9wZW5lZEJ5RE9NKCk7CisgICAg bmV3RnJhbWUtPnBhZ2UoKS0+c2V0T3BlbmVkQnlET00oKTsKIAogICAgIC8vIFNldCBkaWFsb2cg YXJndW1lbnRzIG9uIHRoZSBnbG9iYWwgb2JqZWN0IG9mIHRoZSBuZXcgZnJhbWUuCiAgICAgaWYg KCFkaWFsb2dBcmdzLklzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGQyMWM2 YTkuLmM4MDJmMmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAor KysgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE1MzMsMTYgKzE1MzMsNiBA QCB2b2lkIEZyYW1lTG9hZGVyOjpzZXRPcGVuZXIoRnJhbWUqIG9wZW5lcikKICAgICB9CiB9CiAK LWJvb2wgRnJhbWVMb2FkZXI6Om9wZW5lZEJ5RE9NKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9v cGVuZWRCeURPTTsKLX0KLQotdm9pZCBGcmFtZUxvYWRlcjo6c2V0T3BlbmVkQnlET00oKQotewot ICAgIG1fb3BlbmVkQnlET00gPSB0cnVlOwotfQotCiB2b2lkIEZyYW1lTG9hZGVyOjpoYW5kbGVG YWxsYmFja0NvbnRlbnQoKQogewogICAgIEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBt X2ZyYW1lLT5vd25lckVsZW1lbnQoKTsKQEAgLTM4MzAsNyArMzgyMCw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OmNvbnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9saWN5KGNvbnN0IFJlc291cmNlUmVx dWVzdCYgcmVxdWVzCiAgICAgaWYgKGZyYW1lTmFtZSAhPSAiX2JsYW5rIikKICAgICAgICAgbWFp bkZyYW1lLT50cmVlKCktPnNldE5hbWUoZnJhbWVOYW1lKTsKIAotICAgIG1haW5GcmFtZS0+bG9h ZGVyKCktPnNldE9wZW5lZEJ5RE9NKCk7CisgICAgbWFpbkZyYW1lLT5wYWdlKCktPnNldE9wZW5l ZEJ5RE9NKCk7CiAgICAgbWFpbkZyYW1lLT5sb2FkZXIoKS0+bV9jbGllbnQtPmRpc3BhdGNoU2hv dygpOwogICAgIG1haW5GcmFtZS0+bG9hZGVyKCktPnNldE9wZW5lcihmcmFtZS5nZXQoKSk7CiAg ICAgbWFpbkZyYW1lLT5sb2FkZXIoKS0+bG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uKHJlcXVlc3Qs IE5hdmlnYXRpb25BY3Rpb24oKSwgZmFsc2UsIEZyYW1lTG9hZFR5cGVTdGFuZGFyZCwgZm9ybVN0 YXRlKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmggYi9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IGU0NzczZDIuLjU3OTNiNGMgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuaApAQCAtMjcyLDggKzI3Miw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAg ICBGcmFtZSogb3BlbmVyKCk7CiAgICAgICAgIHZvaWQgc2V0T3BlbmVyKEZyYW1lKik7Ci0gICAg ICAgIGJvb2wgb3BlbmVkQnlET00oKSBjb25zdDsKLSAgICAgICAgdm9pZCBzZXRPcGVuZWRCeURP TSgpOwogCiAgICAgICAgIGJvb2wgaXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKTsKIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAgYi9XZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmNwcAppbmRleCA0OTI1MjNmLi5hYTYwMTJiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRE9N V2luZG93LmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcApAQCAtNzM5LDEyICs3 MzksOSBAQCB2b2lkIERPTVdpbmRvdzo6Y2xvc2UoKQogICAgICAgICByZXR1cm47CiAKICAgICBT ZXR0aW5ncyogc2V0dGluZ3MgPSBtX2ZyYW1lLT5zZXR0aW5ncygpOwotICAgIGJvb2wgYWxsb3dT Y3JpcHRzVG9DbG9zZVdpbmRvd3MgPQotICAgICAgICBzZXR0aW5ncyAmJiBzZXR0aW5ncy0+YWxs b3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MoKTsKKyAgICBib29sIGFsbG93U2NyaXB0c1RvQ2xvc2VX aW5kb3dzID0gc2V0dGluZ3MgJiYgc2V0dGluZ3MtPmFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dz KCk7CiAKLSAgICBpZiAobV9mcmFtZS0+bG9hZGVyKCktPm9wZW5lZEJ5RE9NKCkKLSAgICAgICAg fHwgcGFnZS0+Z2V0SGlzdG9yeUxlbmd0aCgpIDw9IDEKLSAgICAgICAgfHwgYWxsb3dTY3JpcHRz VG9DbG9zZVdpbmRvd3MpCisgICAgaWYgKHBhZ2UtPm9wZW5lZEJ5RE9NKCkgfHwgcGFnZS0+Z2V0 SGlzdG9yeUxlbmd0aCgpIDw9IDEgfHwgYWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MpCiAgICAg ICAgIG1fZnJhbWUtPnNjaGVkdWxlQ2xvc2UoKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w YWdlL1BhZ2UuY3BwIGIvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCmluZGV4IDEwNWJjNDYuLjM5N2Ni NzIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9XZWJDb3JlL3BhZ2Uv UGFnZS5jcHAKQEAgLTExOSw2ICsxMTksNyBAQCBQYWdlOjpQYWdlKENocm9tZUNsaWVudCogY2hy b21lQ2xpZW50LCBDb250ZXh0TWVudUNsaWVudCogY29udGV4dE1lbnVDbGllbnQsIEVkaQogICAg ICwgbV90aGVtZShSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdlKHRoaXMpKQogICAgICwgbV9lZGl0 b3JDbGllbnQoZWRpdG9yQ2xpZW50KQogICAgICwgbV9mcmFtZUNvdW50KDApCisgICAgLCBtX29w ZW5lZEJ5RE9NKGZhbHNlKQogICAgICwgbV90YWJLZXlDeWNsZXNUaHJvdWdoRWxlbWVudHModHJ1 ZSkKICAgICAsIG1fZGVmZXJzTG9hZGluZyhmYWxzZSkKICAgICAsIG1faW5Mb3dRdWFsaXR5SW50 ZXJwb2xhdGlvbk1vZGUoZmFsc2UpCkBAIC0yMDEsNiArMjAyLDE2IEBAIHZvaWQgUGFnZTo6c2V0 TWFpbkZyYW1lKFBhc3NSZWZQdHI8RnJhbWU+IG1haW5GcmFtZSkKICAgICBtX21haW5GcmFtZSA9 IG1haW5GcmFtZTsKIH0KIAorYm9vbCBQYWdlOjpvcGVuZWRCeURPTSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fb3BlbmVkQnlET007Cit9CisKK3ZvaWQgUGFnZTo6c2V0T3BlbmVkQnlET00oKQor eworICAgIG1fb3BlbmVkQnlET00gPSB0cnVlOworfQorCiBCYWNrRm9yd2FyZExpc3QqIFBhZ2U6 OmJhY2tGb3J3YXJkTGlzdCgpCiB7CiAgICAgcmV0dXJuIG1fYmFja0ZvcndhcmRMaXN0LmdldCgp OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1dlYkNvcmUvcGFnZS9QYWdlLmgK aW5kZXggNTJhZDA1Yi4uY2FiMDc1ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL1BhZ2UuaAor KysgYi9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0xMDMsNiArMTAzLDkgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2b2lkIHNldE1haW5GcmFtZShQYXNzUmVmUHRyPEZyYW1lPik7CiAg ICAgICAgIEZyYW1lKiBtYWluRnJhbWUoKSBjb25zdCB7IHJldHVybiBtX21haW5GcmFtZS5nZXQo KTsgfQogCisgICAgICAgIGJvb2wgb3BlbmVkQnlET00oKSBjb25zdDsKKyAgICAgICAgdm9pZCBz ZXRPcGVuZWRCeURPTSgpOworCiAgICAgICAgIEJhY2tGb3J3YXJkTGlzdCogYmFja0ZvcndhcmRM aXN0KCk7CiAKICAgICAgICAgLy8gRklYTUU6IFRoZSBmb2xsb3dpbmcgdGhyZWUgbWV0aG9kcyBk b24ndCBmYWxsIHVuZGVyIHRoZSByZXNwb25zaWJpbGl0aWVzIG9mIHRoZSBQYWdlIG9iamVjdApA QCAtMjY0LDYgKzI2Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBpbnQgbV9m cmFtZUNvdW50OwogICAgICAgICBTdHJpbmcgbV9ncm91cE5hbWU7CisgICAgICAgIGJvb2wgbV9v cGVuZWRCeURPTTsKIAogICAgICAgICBib29sIG1fdGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRz OwogICAgICAgICBib29sIG1fZGVmZXJzTG9hZGluZzsKLS0gCjEuNi40LjQKCg==