101565 2012-11-08 02:01:36 -0800 [EFL][WK2] Use smart pointers in EwkContext more actively 2012-11-08 03:37:15 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101564 1 mikhail.pozdnyakov mikhail.pozdnyakov gyuyoung.kim jinwoo7.song kenneth lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 761492 0 mikhail.pozdnyakov 2012-11-08 02:01:36 -0800 Since we're using WebContext instead of WKContext <http://trac.webkit.org/changeset/133844> we should use smart pointers accordingly including PassRefPtr. 761495 1 172965 mikhail.pozdnyakov 2012-11-08 02:08:19 -0800 Created attachment 172965 patch 761520 2 172965 gyuyoung.kim 2012-11-08 02:40:59 -0800 Comment on attachment 172965 patch As a step of r133844, looks fine. 761533 3 jinwoo7.song 2012-11-08 02:51:05 -0800 Thanks, mikhail! 761593 4 172965 webkit.review.bot 2012-11-08 03:37:11 -0800 Comment on attachment 172965 patch Clearing flags on attachment: 172965 Committed r133878: <http://trac.webkit.org/changeset/133878> 761594 5 webkit.review.bot 2012-11-08 03:37:15 -0800 All reviewed patches have been landed. Closing bug. 172965 2012-11-08 02:08:19 -0800 2012-11-08 03:37:11 -0800 patch bug101565 text/plain 11512 mikhail.pozdnyakov Y29tbWl0IGM5NDUxMWQxNDJkYjk5NmRjMWMwNmVjZGEyOGYyMWUzMzVkYjIzYmEKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IE5vdiA4IDEyOjA0OjE0IDIwMTIgKzAyMDAKCiAgICAxMDE1NjUKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MDk1MWVmYi4uYzdlYTViZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTExLTA4 ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gVXNlIHNtYXJ0IHBvaW50ZXJzIGluIEV3a0NvbnRleHQgbW9yZSBh Y3RpdmVseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAxNTY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2luY2Ugd2UncmUgdXNpbmcgV2ViQ29udGV4dCBpbnN0ZWFkIG9mIFdLQ29udGV4dCBzdGFydGlu ZyByMTMzODQ0IHdlIHNob3VsZAorICAgICAgICB1c2Ugc21hcnQgcG9pbnRlcnMgYWNjb3JkaW5n bHkgaW5jbHVkaW5nIFBhc3NSZWZQdHIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29udGV4dC5jcHA6CisgICAgICAgIChFd2tDb250ZXh0OjpFd2tDb250ZXh0KToKKyAgICAg ICAgKEV3a0NvbnRleHQ6On5Fd2tDb250ZXh0KToKKyAgICAgICAgKEV3a0NvbnRleHQ6OmNyZWF0 ZSk6CisgICAgICAgIChFd2tDb250ZXh0Ojpjb29raWVNYW5hZ2VyKToKKyAgICAgICAgKEV3a0Nv bnRleHQ6OmVuc3VyZUZhdmljb25EYXRhYmFzZSk6CisgICAgICAgIChFd2tDb250ZXh0OjpzZXRG YXZpY29uRGF0YWJhc2VEaXJlY3RvcnlQYXRoKToKKyAgICAgICAgKEV3a0NvbnRleHQ6OmFkZFZp c2l0ZWRMaW5rKToKKyAgICAgICAgKEV3a0NvbnRleHQ6OnNldENhY2hlTW9kZWwpOgorICAgICAg ICAoRXdrQ29udGV4dDo6Y2FjaGVNb2RlbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29udGV4dCk6CisgICAgICAgIChF d2tDb250ZXh0Ojp3ZWJDb250ZXh0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tf ZGF0YWJhc2VfbWFuYWdlcl9wcml2YXRlLmg6CisgICAgICAgIChFd2tfRGF0YWJhc2VfTWFuYWdl cjo6Y3JlYXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5h Z2VyX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a19TdG9yYWdlX01hbmFnZXI6OmNyZWF0ZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL2VmbC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwOgorICAgICAgICAo V2ViS2l0OjpEb3dubG9hZE1hbmFnZXJFZmw6OkRvd25sb2FkTWFuYWdlckVmbCk6CisgICAgICAg ICogVUlQcm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNsaWVudEVmbC5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlJlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsOjpSZXF1ZXN0TWFuYWdlckNsaWVudEVmbCk6 CisKIDIwMTItMTEtMDcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzM4NDEuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKaW5kZXggOTFhMGNl Yy4uOGExZWFkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0LmNwcApAQCAtNjEsMjEgKzYxLDIxIEBAIHN0YXRpYyBpbmxpbmUgQ29udGV4dE1h cCYgY29udGV4dE1hcCgpCiAgICAgcmV0dXJuIG1hcDsKIH0KIAotRXdrQ29udGV4dDo6RXdrQ29u dGV4dChXZWJDb250ZXh0KiBjb250ZXh0KQotICAgIDogbV93ZWJDb250ZXh0KGNvbnRleHQpCi0g ICAgLCBtX2RhdGFiYXNlTWFuYWdlcihFd2tfRGF0YWJhc2VfTWFuYWdlcjo6Y3JlYXRlKGNvbnRl eHQpKQotICAgICwgbV9zdG9yYWdlTWFuYWdlcihFd2tfU3RvcmFnZV9NYW5hZ2VyOjpjcmVhdGUo Y29udGV4dCkpCitFd2tDb250ZXh0OjpFd2tDb250ZXh0KFBhc3NSZWZQdHI8V2ViQ29udGV4dD4g Y29udGV4dCkKKyAgICA6IG1fY29udGV4dChjb250ZXh0KQorICAgICwgbV9kYXRhYmFzZU1hbmFn ZXIoRXdrX0RhdGFiYXNlX01hbmFnZXI6OmNyZWF0ZShtX2NvbnRleHQpKQorICAgICwgbV9zdG9y YWdlTWFuYWdlcihFd2tfU3RvcmFnZV9NYW5hZ2VyOjpjcmVhdGUobV9jb250ZXh0KSkKICNpZiBF TkFCTEUoQkFUVEVSWV9TVEFUVVMpCi0gICAgLCBtX2JhdHRlcnlQcm92aWRlcihCYXR0ZXJ5UHJv dmlkZXI6OmNyZWF0ZSh0b0FQSShjb250ZXh0KSkpCisgICAgLCBtX2JhdHRlcnlQcm92aWRlcihC YXR0ZXJ5UHJvdmlkZXI6OmNyZWF0ZSh0b0FQSShtX2NvbnRleHQuZ2V0KCkpKSkgLy8gRklYTUU6 IEFsbCBiZWxvdyBzaG91bGQgYmUgaW5pdGlhbGl6ZWQgY29uc2lzdGVudGx5LgogI2VuZGlmCiAj aWYgRU5BQkxFKE5FVFdPUktfSU5GTykKLSAgICAsIG1fbmV0d29ya0luZm9Qcm92aWRlcihOZXR3 b3JrSW5mb1Byb3ZpZGVyOjpjcmVhdGUodG9BUEkoY29udGV4dCkpKQorICAgICwgbV9uZXR3b3Jr SW5mb1Byb3ZpZGVyKE5ldHdvcmtJbmZvUHJvdmlkZXI6OmNyZWF0ZSh0b0FQSShtX2NvbnRleHQu Z2V0KCkpKSkKICNlbmRpZgogICAgICwgbV9kb3dubG9hZE1hbmFnZXIoRG93bmxvYWRNYW5hZ2Vy RWZsOjpjcmVhdGUodGhpcykpCiAgICAgLCBtX3JlcXVlc3RNYW5hZ2VyQ2xpZW50KFJlcXVlc3RN YW5hZ2VyQ2xpZW50RWZsOjpjcmVhdGUodGhpcykpCi0gICAgLCBtX2hpc3RvcnlDbGllbnQoQ29u dGV4dEhpc3RvcnlDbGllbnRFZmw6OmNyZWF0ZSh0b0FQSShjb250ZXh0KSkpCisgICAgLCBtX2hp c3RvcnlDbGllbnQoQ29udGV4dEhpc3RvcnlDbGllbnRFZmw6OmNyZWF0ZSh0b0FQSShtX2NvbnRl eHQuZ2V0KCkpKSkKIHsKLSAgICBDb250ZXh0TWFwOjpBZGRSZXN1bHQgcmVzdWx0ID0gY29udGV4 dE1hcCgpLmFkZChjb250ZXh0LCB0aGlzKTsKKyAgICBDb250ZXh0TWFwOjpBZGRSZXN1bHQgcmVz dWx0ID0gY29udGV4dE1hcCgpLmFkZChtX2NvbnRleHQuZ2V0KCksIHRoaXMpOwogICAgIEFTU0VS VF9VTlVTRUQocmVzdWx0LCByZXN1bHQuaXNOZXdFbnRyeSk7CiAKICNpZiBFTkFCTEUoTUVNT1JZ X1NBTVBMRVIpCkBAIC04Myw3ICs4Myw3IEBAIEV3a0NvbnRleHQ6OkV3a0NvbnRleHQoV2ViQ29u dGV4dCogY29udGV4dCkKICAgICBzdGF0aWMgY29uc3QgY2hhciBlbnZpcm9ubWVudFZhcmlhYmxl W10gPSAiU0FNUExFX01FTU9SWSI7CiAKICAgICBpZiAoIWluaXRpYWxpemVNZW1vcnlTYW1wbGVy ICYmIGdldGVudihlbnZpcm9ubWVudFZhcmlhYmxlKSkgewotICAgICAgICBjb250ZXh0LT5zdGFy dE1lbW9yeVNhbXBsZXIoMC4wKTsKKyAgICAgICAgbV9jb250ZXh0LT5zdGFydE1lbW9yeVNhbXBs ZXIoMC4wKTsKICAgICAgICAgaW5pdGlhbGl6ZU1lbW9yeVNhbXBsZXIgPSB0cnVlOwogICAgIH0K ICNlbmRpZgpAQCAtOTksMjEgKzk5LDIxIEBAIEV3a0NvbnRleHQ6OkV3a0NvbnRleHQoV2ViQ29u dGV4dCogY29udGV4dCkKIAogRXdrQ29udGV4dDo6fkV3a0NvbnRleHQoKQogewotICAgIEFTU0VS VChjb250ZXh0TWFwKCkuZ2V0KG1fd2ViQ29udGV4dC5nZXQoKSkgPT0gdGhpcyk7Ci0gICAgY29u dGV4dE1hcCgpLnJlbW92ZShtX3dlYkNvbnRleHQuZ2V0KCkpOworICAgIEFTU0VSVChjb250ZXh0 TWFwKCkuZ2V0KG1fY29udGV4dC5nZXQoKSkgPT0gdGhpcyk7CisgICAgY29udGV4dE1hcCgpLnJl bW92ZShtX2NvbnRleHQuZ2V0KCkpOwogfQogCi1QYXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0Nv bnRleHQ6OmNyZWF0ZShXZWJDb250ZXh0KiBjb250ZXh0KQorUGFzc1JlZlB0cjxFd2tDb250ZXh0 PiBFd2tDb250ZXh0OjpjcmVhdGUoUGFzc1JlZlB0cjxXZWJDb250ZXh0PiBjb250ZXh0KQogewot ICAgIGlmIChjb250ZXh0TWFwKCkuY29udGFpbnMoY29udGV4dCkpCi0gICAgICAgIHJldHVybiBj b250ZXh0TWFwKCkuZ2V0KGNvbnRleHQpOyAvLyBXaWxsIGJlIHJlZi1lZCBhdXRvbWF0aWNhbGx5 LgorICAgIGlmIChjb250ZXh0TWFwKCkuY29udGFpbnMoY29udGV4dC5nZXQoKSkpCisgICAgICAg IHJldHVybiBjb250ZXh0TWFwKCkuZ2V0KGNvbnRleHQuZ2V0KCkpOyAvLyBXaWxsIGJlIHJlZi1l ZCBhdXRvbWF0aWNhbGx5LgogCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tDb250ZXh0KGNv bnRleHQpKTsKIH0KIAogUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpjcmVhdGUo KQogewotICAgIHJldHVybiBjcmVhdGUoV2ViQ29udGV4dDo6Y3JlYXRlKFN0cmluZygpKS5nZXQo KSk7CisgICAgcmV0dXJuIGNyZWF0ZShXZWJDb250ZXh0OjpjcmVhdGUoU3RyaW5nKCkpKTsKIH0K IAogUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpjcmVhdGUoY29uc3QgU3RyaW5n JiBpbmplY3RlZEJ1bmRsZVBhdGgpCkBAIC0xMjEsNyArMTIxLDcgQEAgUGFzc1JlZlB0cjxFd2tD b250ZXh0PiBFd2tDb250ZXh0OjpjcmVhdGUoY29uc3QgU3RyaW5nJiBpbmplY3RlZEJ1bmRsZVBh dGgpCiAgICAgaWYgKCFmaWxlRXhpc3RzKGluamVjdGVkQnVuZGxlUGF0aCkpCiAgICAgICAgIHJl dHVybiAwOwogCi0gICAgcmV0dXJuIGNyZWF0ZShXZWJDb250ZXh0OjpjcmVhdGUoaW5qZWN0ZWRC dW5kbGVQYXRoKS5nZXQoKSk7CisgICAgcmV0dXJuIGNyZWF0ZShXZWJDb250ZXh0OjpjcmVhdGUo aW5qZWN0ZWRCdW5kbGVQYXRoKSk7CiB9CiAKIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gRXdrQ29u dGV4dDo6ZGVmYXVsdENvbnRleHQoKQpAQCAtMTM0LDcgKzEzNCw3IEBAIFBhc3NSZWZQdHI8RXdr Q29udGV4dD4gRXdrQ29udGV4dDo6ZGVmYXVsdENvbnRleHQoKQogRXdrX0Nvb2tpZV9NYW5hZ2Vy KiBFd2tDb250ZXh0Ojpjb29raWVNYW5hZ2VyKCkKIHsKICAgICBpZiAoIW1fY29va2llTWFuYWdl cikKLSAgICAgICAgbV9jb29raWVNYW5hZ2VyID0gRXdrX0Nvb2tpZV9NYW5hZ2VyOjpjcmVhdGUo V0tDb250ZXh0R2V0Q29va2llTWFuYWdlcih0b0FQSShtX3dlYkNvbnRleHQuZ2V0KCkpKSk7Cisg ICAgICAgIG1fY29va2llTWFuYWdlciA9IEV3a19Db29raWVfTWFuYWdlcjo6Y3JlYXRlKFdLQ29u dGV4dEdldENvb2tpZU1hbmFnZXIodG9BUEkobV9jb250ZXh0LmdldCgpKSkpOwogCiAgICAgcmV0 dXJuIG1fY29va2llTWFuYWdlci5nZXQoKTsKIH0KQEAgLTE0OSw3ICsxNDksNyBAQCB2b2lkIEV3 a0NvbnRleHQ6OmVuc3VyZUZhdmljb25EYXRhYmFzZSgpCiAgICAgaWYgKG1fZmF2aWNvbkRhdGFi YXNlKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2Zhdmljb25EYXRhYmFzZSA9IEV3a19GYXZp Y29uX0RhdGFiYXNlOjpjcmVhdGUobV93ZWJDb250ZXh0LmdldCgpLT5pY29uRGF0YWJhc2UoKSk7 CisgICAgbV9mYXZpY29uRGF0YWJhc2UgPSBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Y3JlYXRlKG1f Y29udGV4dC5nZXQoKS0+aWNvbkRhdGFiYXNlKCkpOwogfQogCiBib29sIEV3a0NvbnRleHQ6OnNl dEZhdmljb25EYXRhYmFzZURpcmVjdG9yeVBhdGgoY29uc3QgU3RyaW5nJiBkYXRhYmFzZURpcmVj dG9yeSkKQEAgLTE1OCwxMiArMTU4LDEyIEBAIGJvb2wgRXdrQ29udGV4dDo6c2V0RmF2aWNvbkRh dGFiYXNlRGlyZWN0b3J5UGF0aChjb25zdCBTdHJpbmcmIGRhdGFiYXNlRGlyZWN0b3J5CiAKICAg ICAvLyBUaGUgZGF0YWJhc2UgcGF0aCBpcyBhbHJlYWR5IG9wZW4gc28gaXRzIHBhdGggd2FzCiAg ICAgLy8gYWxyZWFkeSBzZXQuCi0gICAgaWYgKG1fd2ViQ29udGV4dC0+aWNvbkRhdGFiYXNlKCkt PmlzT3BlbigpKQorICAgIGlmIChtX2NvbnRleHQtPmljb25EYXRhYmFzZSgpLT5pc09wZW4oKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gSWYgZGF0YWJhc2VEaXJlY3RvcnkgaXMg ZW1wdHksIHdlIHVzZSB0aGUgZGVmYXVsdCBkYXRhYmFzZSBwYXRoIGZvciB0aGUgcGxhdGZvcm0u Ci0gICAgU3RyaW5nIGRhdGFiYXNlUGF0aCA9IGRhdGFiYXNlRGlyZWN0b3J5LmlzRW1wdHkoKSA/ IG1fd2ViQ29udGV4dC0+aWNvbkRhdGFiYXNlUGF0aCgpIDogcGF0aEJ5QXBwZW5kaW5nQ29tcG9u ZW50KGRhdGFiYXNlRGlyZWN0b3J5LCBXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRlZmF1bHREYXRh YmFzZUZpbGVuYW1lKCkpOwotICAgIG1fd2ViQ29udGV4dC0+c2V0SWNvbkRhdGFiYXNlUGF0aChk YXRhYmFzZVBhdGgpOworICAgIFN0cmluZyBkYXRhYmFzZVBhdGggPSBkYXRhYmFzZURpcmVjdG9y eS5pc0VtcHR5KCkgPyBtX2NvbnRleHQtPmljb25EYXRhYmFzZVBhdGgoKSA6IHBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudChkYXRhYmFzZURpcmVjdG9yeSwgV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpk ZWZhdWx0RGF0YWJhc2VGaWxlbmFtZSgpKTsKKyAgICBtX2NvbnRleHQtPnNldEljb25EYXRhYmFz ZVBhdGgoZGF0YWJhc2VQYXRoKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTg4LDE3ICsx ODgsMTcgQEAgUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwqIEV3a0NvbnRleHQ6OnJlcXVlc3RNYW5h Z2VyKCkKIAogdm9pZCBFd2tDb250ZXh0OjphZGRWaXNpdGVkTGluayhjb25zdCBTdHJpbmcmIHZp c2l0ZWRVUkwpCiB7Ci0gICAgbV93ZWJDb250ZXh0LT5hZGRWaXNpdGVkTGluayh2aXNpdGVkVVJM KTsKKyAgICBtX2NvbnRleHQtPmFkZFZpc2l0ZWRMaW5rKHZpc2l0ZWRVUkwpOwogfQogCiB2b2lk IEV3a0NvbnRleHQ6OnNldENhY2hlTW9kZWwoRXdrX0NhY2hlX01vZGVsIGNhY2hlTW9kZWwpCiB7 Ci0gICAgV0tDb250ZXh0U2V0Q2FjaGVNb2RlbCh0b0FQSShtX3dlYkNvbnRleHQuZ2V0KCkpLCBz dGF0aWNfY2FzdDxFd2tfQ2FjaGVfTW9kZWw+KGNhY2hlTW9kZWwpKTsKKyAgICBtX2NvbnRleHQt PnNldENhY2hlTW9kZWwoc3RhdGljX2Nhc3Q8V2ViS2l0OjpDYWNoZU1vZGVsPihjYWNoZU1vZGVs KSk7CiB9CiAKIEV3a19DYWNoZV9Nb2RlbCBFd2tDb250ZXh0OjpjYWNoZU1vZGVsKCkgY29uc3QK IHsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RXdrX0NhY2hlX01vZGVsPihtX3dlYkNvbnRleHQt PmNhY2hlTW9kZWwoKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEV3a19DYWNoZV9Nb2RlbD4o bV9jb250ZXh0LT5jYWNoZU1vZGVsKCkpOwogfQogCiBFd2tfQ29va2llX01hbmFnZXIqIGV3a19j b250ZXh0X2Nvb2tpZV9tYW5hZ2VyX2dldChjb25zdCBFd2tfQ29udGV4dCogZXdrQ29udGV4dCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X3ByaXZhdGUuaAppbmRleCBkZDNhZmEyLi44ZjJhNjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oCkBAIC00Nyw3 ICs0Nyw3IEBAIGNsYXNzIEV3a0NvbnRleHQgOiBwdWJsaWMgRXdrX09iamVjdCB7CiBwdWJsaWM6 CiAgICAgRVdLX09CSkVDVF9ERUNMQVJFKEV3a0NvbnRleHQpCiAKLSAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxFd2tDb250ZXh0PiBjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCk7CisgICAgc3RhdGlj IFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gY3JlYXRlKFBhc3NSZWZQdHI8V2ViQ29udGV4dD4gY29u dGV4dCk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gY3JlYXRlKCk7CiAgICAg c3RhdGljIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gY3JlYXRlKGNvbnN0IFN0cmluZyYgaW5qZWN0 ZWRCdW5kbGVQYXRoKTsKIApAQCAtNzIsMTggKzcyLDE4IEBAIHB1YmxpYzoKIAogICAgIEV3a19D YWNoZV9Nb2RlbCBjYWNoZU1vZGVsKCkgY29uc3Q7CiAKLSAgICBXZWJDb250ZXh0KiB3ZWJDb250 ZXh0KCkgeyByZXR1cm4gbV93ZWJDb250ZXh0LmdldCgpOyB9CisgICAgUGFzc1JlZlB0cjxXZWJD b250ZXh0PiB3ZWJDb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0OyB9CiAKICAgICBXZWJLaXQ6 OkRvd25sb2FkTWFuYWdlckVmbCogZG93bmxvYWRNYW5hZ2VyKCkgY29uc3Q7CiAKICAgICBXZWJL aXQ6OkNvbnRleHRIaXN0b3J5Q2xpZW50RWZsKiBoaXN0b3J5Q2xpZW50KCk7CiAKIHByaXZhdGU6 Ci0gICAgZXhwbGljaXQgRXdrQ29udGV4dChXZWJDb250ZXh0Kik7CisgICAgZXhwbGljaXQgRXdr Q29udGV4dChQYXNzUmVmUHRyPFdlYkNvbnRleHQ+KTsKIAogICAgIHZvaWQgZW5zdXJlRmF2aWNv bkRhdGFiYXNlKCk7CiAKLSAgICBSZWZQdHI8V2ViQ29udGV4dD4gbV93ZWJDb250ZXh0OworICAg IFJlZlB0cjxXZWJDb250ZXh0PiBtX2NvbnRleHQ7CiAKICAgICBPd25QdHI8RXdrX0Nvb2tpZV9N YW5hZ2VyPiBtX2Nvb2tpZU1hbmFnZXI7CiAgICAgT3duUHRyPEV3a19EYXRhYmFzZV9NYW5hZ2Vy PiBtX2RhdGFiYXNlTWFuYWdlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5hZ2VyX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5hZ2VyX3ByaXZhdGUuaAppbmRleCA1 ZDY0OTk2Li4zNDI0NjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfZGF0YWJhc2VfbWFuYWdlcl9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNlX21hbmFnZXJfcHJpdmF0ZS5oCkBAIC0zNyw3 ICszNyw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIGNsYXNzIEV3a19EYXRhYmFzZV9N YW5hZ2VyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc093blB0cjxFd2tfRGF0YWJhc2VfTWFu YWdlcj4gY3JlYXRlKFdlYkNvbnRleHQqIGNvbnRleHQpCisgICAgc3RhdGljIFBhc3NPd25QdHI8 RXdrX0RhdGFiYXNlX01hbmFnZXI+IGNyZWF0ZShQYXNzUmVmUHRyPFdlYkNvbnRleHQ+IGNvbnRl eHQpCiAgICAgewogICAgICAgICBBU1NFUlQoY29udGV4dCk7CiAgICAgICAgIHJldHVybiBhZG9w dFB0cihuZXcgRXdrX0RhdGFiYXNlX01hbmFnZXIoY29udGV4dC0+ZGF0YWJhc2VNYW5hZ2VyUHJv eHkoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3N0b3JhZ2VfbWFuYWdlcl9wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyX3ByaXZhdGUuaAppbmRleCA2NDJhYjc0Li45NGJhNzJk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFn ZV9tYW5hZ2VyX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfc3RvcmFnZV9tYW5hZ2VyX3ByaXZhdGUuaApAQCAtMzcsNyArMzcsNyBAQCB1c2luZyBu YW1lc3BhY2UgV2ViS2l0OwogCiBjbGFzcyBFd2tfU3RvcmFnZV9NYW5hZ2VyIHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUGFzc093blB0cjxFd2tfU3RvcmFnZV9NYW5hZ2VyPiBjcmVhdGUoV2ViQ29u dGV4dCogY29udGV4dCkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tfU3RvcmFnZV9NYW5hZ2Vy PiBjcmVhdGUoUGFzc1JlZlB0cjxXZWJDb250ZXh0PiBjb250ZXh0KQogICAgIHsKICAgICAgICAg QVNTRVJUKGNvbnRleHQpOwogICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3a19TdG9yYWdl X01hbmFnZXIoY29udGV4dC0+a2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5KCkpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2VyRWZsLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2VyRWZsLmNwcApp bmRleCAzZmRlYjljLi41ZTkyZTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZWZsL0Rvd25sb2FkTWFuYWdlckVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwCkBAIC0xMzYsNyArMTM2LDcgQEAgRG93bmxv YWRNYW5hZ2VyRWZsOjpEb3dubG9hZE1hbmFnZXJFZmwoRXdrQ29udGV4dCogY29udGV4dCkKICAg ICB3a0Rvd25sb2FkQ2xpZW50LmRpZEZhaWwgPSBkaWRGYWlsOwogICAgIHdrRG93bmxvYWRDbGll bnQuZGlkRmluaXNoID0gZGlkRmluaXNoOwogCi0gICAgV0tDb250ZXh0U2V0RG93bmxvYWRDbGll bnQodG9BUEkoY29udGV4dC0+d2ViQ29udGV4dCgpKSwgJndrRG93bmxvYWRDbGllbnQpOworICAg IFdLQ29udGV4dFNldERvd25sb2FkQ2xpZW50KHRvQVBJKGNvbnRleHQtPndlYkNvbnRleHQoKS5n ZXQoKSksICZ3a0Rvd25sb2FkQ2xpZW50KTsKIH0KIAogdm9pZCBEb3dubG9hZE1hbmFnZXJFZmw6 OnJlZ2lzdGVyRG93bmxvYWQoRG93bmxvYWRQcm94eSogZG93bmxvYWQsIEV3a1ZpZXdJbXBsKiB2 aWV3SW1wbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUmVxdWVz dE1hbmFnZXJDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9SZXF1 ZXN0TWFuYWdlckNsaWVudEVmbC5jcHAKaW5kZXggMTc4MDAzMy4uNzY3YTZjMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNsaWVudEVmbC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNsaWVu dEVmbC5jcHAKQEAgLTY3LDcgKzY3LDcgQEAgdm9pZCBSZXF1ZXN0TWFuYWdlckNsaWVudEVmbDo6 ZGlkUmVjZWl2ZVVSSVJlcXVlc3QoV0tTb3VwUmVxdWVzdE1hbmFnZXJSZWYgc291cFIKIH0KIAog UmVxdWVzdE1hbmFnZXJDbGllbnRFZmw6OlJlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsKEV3a0NvbnRl eHQqIGNvbnRleHQpCi0gICAgOiBtX3NvdXBSZXF1ZXN0TWFuYWdlcihXS0NvbnRleHRHZXRTb3Vw UmVxdWVzdE1hbmFnZXIodG9BUEkoY29udGV4dC0+d2ViQ29udGV4dCgpKSkpCisgICAgOiBtX3Nv dXBSZXF1ZXN0TWFuYWdlcihXS0NvbnRleHRHZXRTb3VwUmVxdWVzdE1hbmFnZXIodG9BUEkoY29u dGV4dC0+d2ViQ29udGV4dCgpLmdldCgpKSkpCiB7CiAgICAgQVNTRVJUKGNvbnRleHQpOwogCg==