107666 2013-01-23 04:56:26 -0800 [EFL][WK2] EwkContext should be based on C WK2 API 2013-02-01 05:09:55 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107661 107680 107685 107657 107662 1 mikhail.pozdnyakov mikhail.pozdnyakov ap benjamin cdumez gyuyoung.kim kenneth lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 814105 0 mikhail.pozdnyakov 2013-01-23 04:56:26 -0800 SSIA 821403 1 185753 mikhail.pozdnyakov 2013-01-31 04:59:12 -0800 Created attachment 185753 patch 821447 2 185753 kenneth 2013-01-31 05:49:32 -0800 Comment on attachment 185753 patch LGTM 822649 3 185753 webkit.review.bot 2013-02-01 05:09:50 -0800 Comment on attachment 185753 patch Clearing flags on attachment: 185753 Committed r141583: <http://trac.webkit.org/changeset/141583> 822650 4 webkit.review.bot 2013-02-01 05:09:55 -0800 All reviewed patches have been landed. Closing bug. 185753 2013-01-31 04:59:12 -0800 2013-02-01 05:09:50 -0800 patch bug107666 text/plain 13260 mikhail.pozdnyakov Y29tbWl0IDRmNTg1NDM0MmQ3NzRkNzc3MmJlNzlmYTUwMTBjYWQ3NjA4ZjkzMzIKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IEphbiAzMSAxMzoxNjo1MCAyMDEzICswMjAwCgogICAgYnVnMTA3NjY2CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IGQ4MzEwY2IuLmJiNmYxMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMiBAQAogMjAxMy0w MS0zMSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K IAorICAgICAgICBbRUZMXVtXSzJdIEV3a0NvbnRleHQgc2hvdWxkIGJlIGJhc2VkIG9uIEMgV0sy IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3 NjY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXdr Q29udGV4dCBzaG91bGQgYmUgYmFzZWQgb24gQyBXSzIgQVBJIHNvIHRoYXQgQVBJIGxheWVyaW5n IGlzIG5vdCB2aW9sYXRlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwOgorICAgICAgICAoRXdrVmlldzo6RXdrVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6RXdrQ29udGV4dCk6 CisgICAgICAgIChFd2tDb250ZXh0OjpjcmVhdGUpOgorICAgICAgICAoRXdrQ29udGV4dDo6Y29v a2llTWFuYWdlcik6CisgICAgICAgIChFd2tDb250ZXh0OjplbnN1cmVGYXZpY29uRGF0YWJhc2Up OgorICAgICAgICAoRXdrQ29udGV4dDo6c2V0RmF2aWNvbkRhdGFiYXNlRGlyZWN0b3J5UGF0aCk6 CisgICAgICAgIChFd2tDb250ZXh0OjphZGRWaXNpdGVkTGluayk6CisgICAgICAgIChFd2tDb250 ZXh0OjpzZXRDYWNoZU1vZGVsKToKKyAgICAgICAgKEV3a0NvbnRleHQ6OmNhY2hlTW9kZWwpOgor ICAgICAgICAoRXdrQ29udGV4dDo6c2V0QWRkaXRpb25hbFBsdWdpblBhdGgpOgorICAgICAgICAo RXdrQ29udGV4dDo6Y2xlYXJSZXNvdXJjZUNhY2hlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250ZXh0KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19i YXNlX2FkZCk6CisKKzIwMTMtMDEtMzEgIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96 ZG55YWtvdkBpbnRlbC5jb20+CisKICAgICAgICAgW0VGTF1bV0syXSBSZXF1ZXN0TWFuYWdlckNs aWVudEVmbCwgRG93bmxvYWRNYW5hZ2VyRWZsIGFuZCBDb250ZXh0SGlzdG9yeUNsaWVudEVmbCBz aG91bGQgYmUgYmFzZWQgb24gQyBBUEkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwNzY4NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXcuY3BwCmluZGV4IDViYjQ0NjQuLjQ1YzkyZjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBAIC0xMTcsNyArMTE3LDcgQEAgRXdr Vmlldzo6RXdrVmlldyhFdmFzX09iamVjdCogZXZhc09iamVjdCwgUGFzc1JlZlB0cjxFd2tDb250 ZXh0PiBjb250ZXh0LCBQYXNzUmUKICAgICAsIG1fcGVuZGluZ1N1cmZhY2VSZXNpemUoZmFsc2Up CiAjZW5kaWYKICAgICAsIG1fcGFnZUNsaWVudChiZWhhdmlvciA9PSBEZWZhdWx0QmVoYXZpb3Ig PyBQYWdlQ2xpZW50RGVmYXVsdEltcGw6OmNyZWF0ZSh0aGlzKSA6IFBhZ2VDbGllbnRMZWdhY3lJ bXBsOjpjcmVhdGUodGhpcykpCi0gICAgLCBtX3BhZ2VQcm94eShtX2NvbnRleHQtPndlYkNvbnRl eHQoKS0+Y3JlYXRlV2ViUGFnZShtX3BhZ2VDbGllbnQuZ2V0KCksIHBhZ2VHcm91cC5nZXQoKSkp CisgICAgLCBtX3BhZ2VQcm94eSh0b0ltcGwobV9jb250ZXh0LT53a0NvbnRleHQoKSktPmNyZWF0 ZVdlYlBhZ2UobV9wYWdlQ2xpZW50LmdldCgpLCBwYWdlR3JvdXAuZ2V0KCkpKQogICAgICwgbV9w YWdlTG9hZENsaWVudChQYWdlTG9hZENsaWVudEVmbDo6Y3JlYXRlKHRoaXMpKQogICAgICwgbV9w YWdlUG9saWN5Q2xpZW50KFBhZ2VQb2xpY3lDbGllbnRFZmw6OmNyZWF0ZSh0aGlzKSkKICAgICAs IG1fcGFnZVVJQ2xpZW50KFBhZ2VVSUNsaWVudEVmbDo6Y3JlYXRlKHRoaXMpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCmluZGV4IGM4Nzg1 ZDguLjMxYjY1ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29udGV4dC5jcHAKQEAgLTIzLDE5ICsyMywxNCBAQAogCiAjaW5jbHVkZSAiQmF0dGVyeVBy b3ZpZGVyLmgiCiAjaW5jbHVkZSAiQ29udGV4dEhpc3RvcnlDbGllbnRFZmwuaCIKKyNpbmNsdWRl ICJEb3dubG9hZE1hbmFnZXJFZmwuaCIKICNpbmNsdWRlICJOZXR3b3JrSW5mb1Byb3ZpZGVyLmgi CiAjaW5jbHVkZSAiUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuaCIKICNpbmNsdWRlICJXS0FQSUNh c3QuaCIKLSNpbmNsdWRlICJXS0NvbnRleHQuaCIKICNpbmNsdWRlICJXS0NvbnRleHRTb3VwLmgi CiAjaW5jbHVkZSAiV0tOdW1iZXIuaCIKLSNpbmNsdWRlICJXS1JldGFpblB0ci5oIgogI2luY2x1 ZGUgIldLU3RyaW5nLmgiCi0jaW5jbHVkZSAiV2ViQ29udGV4dC5oIgotI2luY2x1ZGUgIldlYkNv b2tpZU1hbmFnZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYkljb25EYXRhYmFzZS5oIgotI2luY2x1 ZGUgIldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHkuaCIKLSNpbmNsdWRlICJXZWJTb3VwUmVx dWVzdE1hbmFnZXJQcm94eS5oIgogI2luY2x1ZGUgImV3a19jb250ZXh0X3ByaXZhdGUuaCIKICNp bmNsdWRlICJld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a19kYXRh YmFzZV9tYW5hZ2VyX3ByaXZhdGUuaCIKQEAgLTU2LDcgKzUxLDcgQEAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotdHlwZWRlZiBIYXNoTWFwPFdl YkNvbnRleHQqLCBFd2tDb250ZXh0Kj4gQ29udGV4dE1hcDsKK3R5cGVkZWYgSGFzaE1hcDxXS0Nv bnRleHRSZWYsIEV3a0NvbnRleHQqPiBDb250ZXh0TWFwOwogCiBzdGF0aWMgaW5saW5lIENvbnRl eHRNYXAmIGNvbnRleHRNYXAoKQogewpAQCAtNjQsMjEgKzU5LDIxIEBAIHN0YXRpYyBpbmxpbmUg Q29udGV4dE1hcCYgY29udGV4dE1hcCgpCiAgICAgcmV0dXJuIG1hcDsKIH0KIAotRXdrQ29udGV4 dDo6RXdrQ29udGV4dChQYXNzUmVmUHRyPFdlYkNvbnRleHQ+IGNvbnRleHQpCitFd2tDb250ZXh0 OjpFd2tDb250ZXh0KFdLQ29udGV4dFJlZiBjb250ZXh0KQogICAgIDogbV9jb250ZXh0KGNvbnRl eHQpCi0gICAgLCBtX2RhdGFiYXNlTWFuYWdlcihFd2tEYXRhYmFzZU1hbmFnZXI6OmNyZWF0ZShX S0NvbnRleHRHZXREYXRhYmFzZU1hbmFnZXIodG9BUEkobV9jb250ZXh0LmdldCgpKSkpKQotICAg ICwgbV9zdG9yYWdlTWFuYWdlcihFd2tTdG9yYWdlTWFuYWdlcjo6Y3JlYXRlKFdLQ29udGV4dEdl dEtleVZhbHVlU3RvcmFnZU1hbmFnZXIodG9BUEkobV9jb250ZXh0LmdldCgpKSkpKQorICAgICwg bV9kYXRhYmFzZU1hbmFnZXIoRXdrRGF0YWJhc2VNYW5hZ2VyOjpjcmVhdGUoV0tDb250ZXh0R2V0 RGF0YWJhc2VNYW5hZ2VyKGNvbnRleHQpKSkKKyAgICAsIG1fc3RvcmFnZU1hbmFnZXIoRXdrU3Rv cmFnZU1hbmFnZXI6OmNyZWF0ZShXS0NvbnRleHRHZXRLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyKGNv bnRleHQpKSkKICNpZiBFTkFCTEUoQkFUVEVSWV9TVEFUVVMpCi0gICAgLCBtX2JhdHRlcnlQcm92 aWRlcihCYXR0ZXJ5UHJvdmlkZXI6OmNyZWF0ZShtX2NvbnRleHQpKQorICAgICwgbV9iYXR0ZXJ5 UHJvdmlkZXIoQmF0dGVyeVByb3ZpZGVyOjpjcmVhdGUodG9JbXBsKGNvbnRleHQpKSkKICNlbmRp ZgogI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCi0gICAgLCBtX25ldHdvcmtJbmZvUHJvdmlkZXIo TmV0d29ya0luZm9Qcm92aWRlcjo6Y3JlYXRlKG1fY29udGV4dCkpCisgICAgLCBtX25ldHdvcmtJ bmZvUHJvdmlkZXIoTmV0d29ya0luZm9Qcm92aWRlcjo6Y3JlYXRlKHRvSW1wbChjb250ZXh0KSkp CiAjZW5kaWYKLSAgICAsIG1fZG93bmxvYWRNYW5hZ2VyKERvd25sb2FkTWFuYWdlckVmbDo6Y3Jl YXRlKHRvQVBJKG1fY29udGV4dC5nZXQoKSkpKQotICAgICwgbV9yZXF1ZXN0TWFuYWdlckNsaWVu dChSZXF1ZXN0TWFuYWdlckNsaWVudEVmbDo6Y3JlYXRlKHRvQVBJKG1fY29udGV4dC5nZXQoKSkp KQotICAgICwgbV9oaXN0b3J5Q2xpZW50KENvbnRleHRIaXN0b3J5Q2xpZW50RWZsOjpjcmVhdGUo dG9BUEkobV9jb250ZXh0LmdldCgpKSkpCisgICAgLCBtX2Rvd25sb2FkTWFuYWdlcihEb3dubG9h ZE1hbmFnZXJFZmw6OmNyZWF0ZShjb250ZXh0KSkKKyAgICAsIG1fcmVxdWVzdE1hbmFnZXJDbGll bnQoUmVxdWVzdE1hbmFnZXJDbGllbnRFZmw6OmNyZWF0ZShjb250ZXh0KSkKKyAgICAsIG1faGlz dG9yeUNsaWVudChDb250ZXh0SGlzdG9yeUNsaWVudEVmbDo6Y3JlYXRlKGNvbnRleHQpKQogewot ICAgIENvbnRleHRNYXA6OkFkZFJlc3VsdCByZXN1bHQgPSBjb250ZXh0TWFwKCkuYWRkKG1fY29u dGV4dC5nZXQoKSwgdGhpcyk7CisgICAgQ29udGV4dE1hcDo6QWRkUmVzdWx0IHJlc3VsdCA9IGNv bnRleHRNYXAoKS5hZGQoY29udGV4dCwgdGhpcyk7CiAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQs IHJlc3VsdC5pc05ld0VudHJ5KTsKIAogI2lmIEVOQUJMRShNRU1PUllfU0FNUExFUikKQEAgLTg2 LDcgKzgxLDcgQEAgRXdrQ29udGV4dDo6RXdrQ29udGV4dChQYXNzUmVmUHRyPFdlYkNvbnRleHQ+ IGNvbnRleHQpCiAgICAgc3RhdGljIGNvbnN0IGNoYXIgZW52aXJvbm1lbnRWYXJpYWJsZVtdID0g IlNBTVBMRV9NRU1PUlkiOwogCiAgICAgaWYgKCFpbml0aWFsaXplTWVtb3J5U2FtcGxlciAmJiBn ZXRlbnYoZW52aXJvbm1lbnRWYXJpYWJsZSkpIHsKLSAgICAgICAgbV9jb250ZXh0LT5zdGFydE1l bW9yeVNhbXBsZXIoMC4wKTsKKyAgICAgICAgV0tDb250ZXh0U3RhcnRNZW1vcnlTYW1wbGVyKGNv bnRleHQsIGFkb3B0V0soV0tEb3VibGVDcmVhdGUoMC4wKSkuZ2V0KCkpOwogICAgICAgICBpbml0 aWFsaXplTWVtb3J5U2FtcGxlciA9IHRydWU7CiAgICAgfQogI2VuZGlmCkBAIC0xMDYsMTcgKzEw MSwxNyBAQCBFd2tDb250ZXh0Ojp+RXdrQ29udGV4dCgpCiAgICAgY29udGV4dE1hcCgpLnJlbW92 ZShtX2NvbnRleHQuZ2V0KCkpOwogfQogCi1QYXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0NvbnRl eHQ6OmNyZWF0ZShQYXNzUmVmUHRyPFdlYkNvbnRleHQ+IGNvbnRleHQpCitQYXNzUmVmUHRyPEV3 a0NvbnRleHQ+IEV3a0NvbnRleHQ6OmNyZWF0ZShXS0NvbnRleHRSZWYgY29udGV4dCkKIHsKLSAg ICBpZiAoY29udGV4dE1hcCgpLmNvbnRhaW5zKGNvbnRleHQuZ2V0KCkpKQotICAgICAgICByZXR1 cm4gY29udGV4dE1hcCgpLmdldChjb250ZXh0LmdldCgpKTsgLy8gV2lsbCBiZSByZWYtZWQgYXV0 b21hdGljYWxseS4KKyAgICBpZiAoY29udGV4dE1hcCgpLmNvbnRhaW5zKGNvbnRleHQpKQorICAg ICAgICByZXR1cm4gY29udGV4dE1hcCgpLmdldChjb250ZXh0KTsgLy8gV2lsbCBiZSByZWYtZWQg YXV0b21hdGljYWxseS4KIAogICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXdrQ29udGV4dChjb250 ZXh0KSk7CiB9CiAKIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gRXdrQ29udGV4dDo6Y3JlYXRlKCkK IHsKLSAgICByZXR1cm4gY3JlYXRlKFdlYkNvbnRleHQ6OmNyZWF0ZShTdHJpbmcoKSkpOworICAg IHJldHVybiBjcmVhdGUoYWRvcHRXSyhXS0NvbnRleHRDcmVhdGUoKSkuZ2V0KCkpOwogfQogCiBQ YXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0NvbnRleHQ6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGlu amVjdGVkQnVuZGxlUGF0aCkKQEAgLTEyNCw3ICsxMTksOSBAQCBQYXNzUmVmUHRyPEV3a0NvbnRl eHQ+IEV3a0NvbnRleHQ6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGluamVjdGVkQnVuZGxlUGF0aCkK ICAgICBpZiAoIWZpbGVFeGlzdHMoaW5qZWN0ZWRCdW5kbGVQYXRoKSkKICAgICAgICAgcmV0dXJu IDA7CiAKLSAgICByZXR1cm4gY3JlYXRlKFdlYkNvbnRleHQ6OmNyZWF0ZShpbmplY3RlZEJ1bmRs ZVBhdGgpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gcGF0aCA9IGFkb3B0V0sodG9D b3BpZWRBUEkoaW5qZWN0ZWRCdW5kbGVQYXRoKSk7CisKKyAgICByZXR1cm4gY3JlYXRlKGFkb3B0 V0soV0tDb250ZXh0Q3JlYXRlV2l0aEluamVjdGVkQnVuZGxlUGF0aChwYXRoLmdldCgpKSkuZ2V0 KCkpOwogfQogCiBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0NvbnRleHQ6OmRlZmF1bHRDb250 ZXh0KCkKQEAgLTEzNyw3ICsxMzQsNyBAQCBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0NvbnRl eHQ6OmRlZmF1bHRDb250ZXh0KCkKIEV3a0Nvb2tpZU1hbmFnZXIqIEV3a0NvbnRleHQ6OmNvb2tp ZU1hbmFnZXIoKQogewogICAgIGlmICghbV9jb29raWVNYW5hZ2VyKQotICAgICAgICBtX2Nvb2tp ZU1hbmFnZXIgPSBFd2tDb29raWVNYW5hZ2VyOjpjcmVhdGUoV0tDb250ZXh0R2V0Q29va2llTWFu YWdlcih0b0FQSShtX2NvbnRleHQuZ2V0KCkpKSk7CisgICAgICAgIG1fY29va2llTWFuYWdlciA9 IEV3a0Nvb2tpZU1hbmFnZXI6OmNyZWF0ZShXS0NvbnRleHRHZXRDb29raWVNYW5hZ2VyKG1fY29u dGV4dC5nZXQoKSkpOwogCiAgICAgcmV0dXJuIG1fY29va2llTWFuYWdlci5nZXQoKTsKIH0KQEAg LTE1MiwyMSArMTQ5LDIzIEBAIHZvaWQgRXdrQ29udGV4dDo6ZW5zdXJlRmF2aWNvbkRhdGFiYXNl KCkKICAgICBpZiAobV9mYXZpY29uRGF0YWJhc2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1f ZmF2aWNvbkRhdGFiYXNlID0gRXdrRmF2aWNvbkRhdGFiYXNlOjpjcmVhdGUoV0tDb250ZXh0R2V0 SWNvbkRhdGFiYXNlKHRvQVBJKG1fY29udGV4dC5nZXQoKSkpKTsKKyAgICBtX2Zhdmljb25EYXRh YmFzZSA9IEV3a0Zhdmljb25EYXRhYmFzZTo6Y3JlYXRlKFdLQ29udGV4dEdldEljb25EYXRhYmFz ZShtX2NvbnRleHQuZ2V0KCkpKTsKIH0KIAogYm9vbCBFd2tDb250ZXh0OjpzZXRGYXZpY29uRGF0 YWJhc2VEaXJlY3RvcnlQYXRoKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VEaXJlY3RvcnkpCiB7CiAg ICAgZW5zdXJlRmF2aWNvbkRhdGFiYXNlKCk7CisgICAgLy8gRklYTUU6IEhvbGUgaW4gV0syIEFQ SSBsYXllcmluZyBtdXN0IGJlIGZpeGVkIHdoZW4gQyBBUEkgaXMgYXZhaWxhYmxlLgorICAgIFdl Ykljb25EYXRhYmFzZSogaWNvbkRhdGFiYXNlID0gdG9JbXBsKFdLQ29udGV4dEdldEljb25EYXRh YmFzZShtX2NvbnRleHQuZ2V0KCkpKTsKIAogICAgIC8vIFRoZSBkYXRhYmFzZSBwYXRoIGlzIGFs cmVhZHkgb3BlbiBzbyBpdHMgcGF0aCB3YXMKICAgICAvLyBhbHJlYWR5IHNldC4KLSAgICBpZiAo bV9jb250ZXh0LT5pY29uRGF0YWJhc2UoKS0+aXNPcGVuKCkpCisgICAgaWYgKGljb25EYXRhYmFz ZS0+aXNPcGVuKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIElmIGRhdGFiYXNl RGlyZWN0b3J5IGlzIGVtcHR5LCB3ZSB1c2UgdGhlIGRlZmF1bHQgZGF0YWJhc2UgcGF0aCBmb3Ig dGhlIHBsYXRmb3JtLgotICAgIFN0cmluZyBkYXRhYmFzZVBhdGggPSBkYXRhYmFzZURpcmVjdG9y eS5pc0VtcHR5KCkgPyBtX2NvbnRleHQtPmljb25EYXRhYmFzZVBhdGgoKSA6IHBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudChkYXRhYmFzZURpcmVjdG9yeSwgV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpk ZWZhdWx0RGF0YWJhc2VGaWxlbmFtZSgpKTsKLSAgICBtX2NvbnRleHQtPnNldEljb25EYXRhYmFz ZVBhdGgoZGF0YWJhc2VQYXRoKTsKKyAgICBTdHJpbmcgZGF0YWJhc2VQYXRoID0gZGF0YWJhc2VE aXJlY3RvcnkuaXNFbXB0eSgpID8gdG9JbXBsKG1fY29udGV4dC5nZXQoKSktPmljb25EYXRhYmFz ZVBhdGgoKSA6IHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChkYXRhYmFzZURpcmVjdG9yeSwgV2Vi Q29yZTo6SWNvbkRhdGFiYXNlOjpkZWZhdWx0RGF0YWJhc2VGaWxlbmFtZSgpKTsKKyAgICB0b0lt cGwobV9jb250ZXh0LmdldCgpKS0+c2V0SWNvbkRhdGFiYXNlUGF0aChkYXRhYmFzZVBhdGgpOwog CiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC0xOTEsMjkgKzE5MCwzMCBAQCBSZXF1ZXN0TWFuYWdl ckNsaWVudEVmbCogRXdrQ29udGV4dDo6cmVxdWVzdE1hbmFnZXIoKQogCiB2b2lkIEV3a0NvbnRl eHQ6OmFkZFZpc2l0ZWRMaW5rKGNvbnN0IFN0cmluZyYgdmlzaXRlZFVSTCkKIHsKLSAgICBtX2Nv bnRleHQtPmFkZFZpc2l0ZWRMaW5rKHZpc2l0ZWRVUkwpOworICAgIFdLQ29udGV4dEFkZFZpc2l0 ZWRMaW5rKG1fY29udGV4dC5nZXQoKSwgYWRvcHRXSyh0b0NvcGllZEFQSSh2aXNpdGVkVVJMKSku Z2V0KCkpOwogfQogCiB2b2lkIEV3a0NvbnRleHQ6OnNldENhY2hlTW9kZWwoRXdrX0NhY2hlX01v ZGVsIGNhY2hlTW9kZWwpCiB7Ci0gICAgbV9jb250ZXh0LT5zZXRDYWNoZU1vZGVsKHN0YXRpY19j YXN0PFdlYktpdDo6Q2FjaGVNb2RlbD4oY2FjaGVNb2RlbCkpOworICAgIFdLQ29udGV4dFNldENh Y2hlTW9kZWwobV9jb250ZXh0LmdldCgpLCBzdGF0aWNfY2FzdDxXZWJLaXQ6OkNhY2hlTW9kZWw+ KGNhY2hlTW9kZWwpKTsKIH0KIAogRXdrX0NhY2hlX01vZGVsIEV3a0NvbnRleHQ6OmNhY2hlTW9k ZWwoKSBjb25zdAogewotICAgIHJldHVybiBzdGF0aWNfY2FzdDxFd2tfQ2FjaGVfTW9kZWw+KG1f Y29udGV4dC0+Y2FjaGVNb2RlbCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RXdrX0NhY2hl X01vZGVsPihXS0NvbnRleHRHZXRDYWNoZU1vZGVsKG1fY29udGV4dC5nZXQoKSkpOwogfQogCiAj aWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiB2b2lkIEV3a0NvbnRleHQ6OnNldEFkZGl0 aW9uYWxQbHVnaW5QYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAgICBtX2NvbnRleHQtPnNl dEFkZGl0aW9uYWxQbHVnaW5zRGlyZWN0b3J5KHBhdGgpOworICAgIC8vIEZJWE1FOiBIb2xlIGlu IFdLMiBBUEkgbGF5ZXJpbmcgbXVzdCBiZSBmaXhlZCB3aGVuIEMgQVBJIGlzIGF2YWlsYWJsZS4K KyAgICB0b0ltcGwobV9jb250ZXh0LmdldCgpKS0+c2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rv cnkocGF0aCk7CiB9CiAjZW5kaWYKIAogdm9pZCBFd2tDb250ZXh0OjpjbGVhclJlc291cmNlQ2Fj aGUoKQogewotICAgIG1fY29udGV4dC0+c3VwcGxlbWVudDxXZWJSZXNvdXJjZUNhY2hlTWFuYWdl clByb3h5PigpLT5jbGVhckNhY2hlRm9yQWxsT3JpZ2lucyhBbGxSZXNvdXJjZUNhY2hlcyk7Cisg ICAgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKFdLQ29udGV4 dEdldFJlc291cmNlQ2FjaGVNYW5hZ2VyKG1fY29udGV4dC5nZXQoKSksIFdLUmVzb3VyY2VDYWNo ZXNUb0NsZWFyQWxsKTsKIH0KIAogRXdrX0Nvb2tpZV9NYW5hZ2VyKiBld2tfY29udGV4dF9jb29r aWVfbWFuYWdlcl9nZXQoY29uc3QgRXdrX0NvbnRleHQqIGV3a0NvbnRleHQpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgK aW5kZXggYzZjYjZhMi4uMWM4YzU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaApAQCAtMjAsMTIgKzIwLDEzIEBA CiAjaWZuZGVmIGV3a19jb250ZXh0X3ByaXZhdGVfaAogI2RlZmluZSBld2tfY29udGV4dF9wcml2 YXRlX2gKIAotI2luY2x1ZGUgIkRvd25sb2FkTWFuYWdlckVmbC5oIgotI2luY2x1ZGUgIldLQVBJ Q2FzdC5oIgotI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCi0jaW5jbHVkZSAiV2ViQ29udGV4dC5o IgogI2luY2x1ZGUgImV3a19jb250ZXh0LmgiCiAjaW5jbHVkZSAiZXdrX29iamVjdF9wcml2YXRl LmgiCisjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KKyNpbmNsdWRlIDxXZWJLaXQyL1dLUmV0 YWluUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVm UHRyLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiAKQEAgLTM0LDYgKzM1LDcgQEAgY2xhc3MgRXdrRmF2aWNvbkRhdGFiYXNlOwog CiBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIENvbnRleHRIaXN0b3J5Q2xpZW50RWZsOworY2xh c3MgRG93bmxvYWRNYW5hZ2VyRWZsOwogY2xhc3MgUmVxdWVzdE1hbmFnZXJDbGllbnRFZmw7CiAj aWYgRU5BQkxFKEJBVFRFUllfU1RBVFVTKQogY2xhc3MgQmF0dGVyeVByb3ZpZGVyOwpAQCAtNDcs NyArNDksNyBAQCBjbGFzcyBFd2tDb250ZXh0IDogcHVibGljIEV3a09iamVjdCB7CiBwdWJsaWM6 CiAgICAgRVdLX09CSkVDVF9ERUNMQVJFKEV3a0NvbnRleHQpCiAKLSAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxFd2tDb250ZXh0PiBjcmVhdGUoUGFzc1JlZlB0cjxXZWJDb250ZXh0PiBjb250ZXh0KTsK KyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBjcmVhdGUoV0tDb250ZXh0UmVmIGNv bnRleHQpOwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGNyZWF0ZSgpOwogICAg IHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGluamVj dGVkQnVuZGxlUGF0aCk7CiAKQEAgLTcyLDcgKzc0LDcgQEAgcHVibGljOgogCiAgICAgRXdrX0Nh Y2hlX01vZGVsIGNhY2hlTW9kZWwoKSBjb25zdDsKIAotICAgIFBhc3NSZWZQdHI8V2ViQ29udGV4 dD4gd2ViQ29udGV4dCgpIHsgcmV0dXJuIG1fY29udGV4dDsgfQorICAgIFdLQ29udGV4dFJlZiB3 a0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRleHQuZ2V0KCk7IH0KIAogICAgIFdlYktp dDo6RG93bmxvYWRNYW5hZ2VyRWZsKiBkb3dubG9hZE1hbmFnZXIoKSBjb25zdDsKIApAQCAtODUs MTEgKzg3LDExIEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyUmVzb3VyY2VDYWNoZSgpOwogCiBw cml2YXRlOgotICAgIGV4cGxpY2l0IEV3a0NvbnRleHQoUGFzc1JlZlB0cjxXZWJDb250ZXh0Pik7 CisgICAgZXhwbGljaXQgRXdrQ29udGV4dChXS0NvbnRleHRSZWYpOwogCiAgICAgdm9pZCBlbnN1 cmVGYXZpY29uRGF0YWJhc2UoKTsKIAotICAgIFJlZlB0cjxXZWJDb250ZXh0PiBtX2NvbnRleHQ7 CisgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBtX2NvbnRleHQ7CiAKICAgICBPd25QdHI8 RXdrQ29va2llTWFuYWdlcj4gbV9jb29raWVNYW5hZ2VyOwogICAgIE93blB0cjxFd2tEYXRhYmFz ZU1hbmFnZXI+IG1fZGF0YWJhc2VNYW5hZ2VyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDcyYTZhZmEuLjdkYmRjM2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTUzNCw3ICs1MzQs NyBAQCBzdGF0aWMgaW5saW5lIEV2YXNfT2JqZWN0KiBjcmVhdGVFd2tWaWV3KEV2YXMqIGNhbnZh cywgRXZhc19TbWFydCogc21hcnQsIFBhc3NSZQogICovCiBFdmFzX09iamVjdCogZXdrX3ZpZXdf YmFzZV9hZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3Jv dXBSZWYgcGFnZUdyb3VwUmVmLCBFd2tWaWV3OjpWaWV3QmVoYXZpb3IgYmVoYXZpb3IpCiB7Ci0g ICAgcmV0dXJuIGNyZWF0ZUV3a1ZpZXcoY2FudmFzLCBjcmVhdGVFd2tWaWV3U21hcnRDbGFzcygp LCBjb250ZXh0UmVmID8gRXdrQ29udGV4dDo6Y3JlYXRlKHRvSW1wbChjb250ZXh0UmVmKSkgOiBF d2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpLCBwYWdlR3JvdXBSZWYsIGJlaGF2aW9yKTsKKyAg ICByZXR1cm4gY3JlYXRlRXdrVmlldyhjYW52YXMsIGNyZWF0ZUV3a1ZpZXdTbWFydENsYXNzKCks IGNvbnRleHRSZWYgPyBFd2tDb250ZXh0OjpjcmVhdGUoY29udGV4dFJlZikgOiBFd2tDb250ZXh0 OjpkZWZhdWx0Q29udGV4dCgpLCBwYWdlR3JvdXBSZWYsIGJlaGF2aW9yKTsKIH0KIAogRXZhc19P YmplY3QqIGV3a192aWV3X3NtYXJ0X2FkZChFdmFzKiBjYW52YXMsIEV2YXNfU21hcnQqIHNtYXJ0 LCBFd2tfQ29udGV4dCogY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvUGFnZUNsaWVudEJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9QYWdlQ2xpZW50QmFzZS5jcHAKaW5kZXggMmVmZGJkMC4uMGYwNjYxZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlQ2xpZW50QmFzZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlQ2xpZW50QmFzZS5jcHAKQEAgLTI3LDYgKzI3 LDcgQEAKICNpbmNsdWRlICJQYWdlQ2xpZW50QmFzZS5oIgogCiAjaW5jbHVkZSAiQ29vcmRpbmF0 ZWRMYXllclRyZWVIb3N0UHJveHkuaCIKKyNpbmNsdWRlICJEb3dubG9hZE1hbmFnZXJFZmwuaCIK ICNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5SW1wbC5oIgogI2luY2x1ZGUgIkV3a1ZpZXcuaCIK ICNpbmNsdWRlICJJbnB1dE1ldGhvZENvbnRleHRFZmwuaCIK