111706 2013-03-07 03:30:29 -0800 [WK2][EFL] Fix EwkContext class API 2013-03-12 05:34:55 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111543 1 mikhail.pozdnyakov mikhail.pozdnyakov benjamin cdumez gyuyoung.kim kenneth kling lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 849933 0 mikhail.pozdnyakov 2013-03-07 03:30:29 -0800 EwkContext class has couple of problems to be fixed: 1) EwkContext::create() should be called getOrCreate actually, as it returns the same instance of EwkContext for the given WKContextRef if present. 2) EwkContext::defaultContext() should return raw pointer rather than PassRefPtr<EwkContext> as ownership is not transferred there. 849944 1 191964 mikhail.pozdnyakov 2013-03-07 04:02:57 -0800 Created attachment 191964 patch 849946 2 191964 kenneth 2013-03-07 04:04:37 -0800 Comment on attachment 191964 patch View in context: https://bugs.webkit.org/attachment.cgi?id=191964&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:105 > +PassRefPtr<EwkContext> EwkContext::getOrCreate(WKContextRef context) I really dislike the name! Ain't there examples of similar things in WebCore 849977 3 191974 mikhail.pozdnyakov 2013-03-07 05:07:11 -0800 Created attachment 191974 patch v2 renamed getOrCreate(). Default context is created after main() entrance :) 851055 4 191974 kenneth 2013-03-08 03:32:27 -0800 Comment on attachment 191974 patch v2 LGTM 852471 5 191974 ap 2013-03-11 10:59:15 -0700 Comment on attachment 191974 patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=191974&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:132 > + static EwkContext* defaultInstance = 0; > + if (!defaultInstance) > + defaultInstance = create().leakRef(); A better way to write this would be: static EwkContext* defaultInstance = create().leakRef(); 853353 6 192713 mikhail.pozdnyakov 2013-03-12 05:05:18 -0700 Created attachment 192713 to be landed 853383 7 192713 webkit.review.bot 2013-03-12 05:34:50 -0700 Comment on attachment 192713 to be landed Clearing flags on attachment: 192713 Committed r145535: <http://trac.webkit.org/changeset/145535> 853384 8 webkit.review.bot 2013-03-12 05:34:55 -0700 All reviewed patches have been landed. Closing bug. 191964 2013-03-07 04:02:57 -0800 2013-03-07 05:07:11 -0800 patch bug111706 text/plain 5658 mikhail.pozdnyakov Y29tbWl0IGYyZDAzYWJhNGVlYjU4YzJkMGM3YzgxMDk2YTMwYjRjNzMwNjI3MTIKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IE1hciA3IDEzOjU2OjIyIDIwMTMgKzAyMDAKCiAgICBidWcxMTE3MDYKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggMDYyZTcyNi4uNTEzZDcyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAz LTA3ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgor CisgICAgICAgIFtXSzJdW0VGTF0gRml4IEV3a0NvbnRleHQgY2xhc3MgQVBJCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE3MDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9l ZmwvV0tWaWV3LmNwcDoKKyAgICAgICAgKGNyZWF0ZVdLVmlldyk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6Z2V0T3JD cmVhdGUpOgorCisgICAgICAgICAgICBSZW5hbWVkIGZyb20gY3JlYXRlKCkgYXMgaXQgcmV0dXJu cyB0aGUgc2FtZSBpbnN0YW5jZSBvZiBFd2tDb250ZXh0CisgICAgICAgICAgICBmb3IgdGhlIGdp dmVuIFdLQ29udGV4dFJlZiBpZiBwcmVzZW50LgorCisgICAgICAgIChFd2tDb250ZXh0OjpjcmVh dGUpOgorICAgICAgICAoRXdrQ29udGV4dDo6ZGVmYXVsdENvbnRleHQpOgorCisgICAgICAgICAg ICBSZXR1cm5zIHJhdyBwb2ludGVyIHJhdGhlciB0aGFuIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4g YXMgb3duZXJzaGlwCisgICAgICAgICAgICBpcyBub3QgdHJhbnNmZXJyZWQuCisKKyAgICAgICAg KGV3a19jb250ZXh0X2RlZmF1bHRfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29udGV4dF9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250ZXh0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSk6CisKIDIwMTMt MDMtMDYgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgU2Fu ZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlIHJhaXNlcyBhbiB1bmNhdWdodCBPYmplY3RpdmUt QyBleGNlcHRpb24gaWYgcGF0aCBpcyBlbXB0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL2VmbC9XS1ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL2VmbC9XS1ZpZXcuY3BwCmluZGV4IGEyNDk4MjAuLmRjOTYzYzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5jcHAKQEAgLTMwLDcgKzMwLDcg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogc3RhdGljIGlubGluZSBXS1ZpZXdSZWYgY3Jl YXRlV0tWaWV3KEV2YXMqIGNhbnZhcywgV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdy b3VwUmVmIHBhZ2VHcm91cFJlZiwgRXdrVmlldzo6Vmlld0JlaGF2aW9yIGJlaGF2aW9yKQogewot ICAgIFJlZlB0cjxFd2tDb250ZXh0PiBjb250ZXh0ID0gY29udGV4dFJlZiA/IEV3a0NvbnRleHQ6 OmNyZWF0ZShjb250ZXh0UmVmKSA6IEV3a0NvbnRleHQ6OmRlZmF1bHRDb250ZXh0KCk7CisgICAg UmVmUHRyPEV3a0NvbnRleHQ+IGNvbnRleHQgPSBjb250ZXh0UmVmID8gRXdrQ29udGV4dDo6Z2V0 T3JDcmVhdGUoY29udGV4dFJlZikgOiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpOwogICAg IEV2YXNfT2JqZWN0KiBldmFzT2JqZWN0ID0gRXdrVmlldzo6Y3JlYXRlRXZhc09iamVjdChjYW52 YXMsIGNvbnRleHQsIHBhZ2VHcm91cFJlZiwgYmVoYXZpb3IpOwogICAgIGlmICghZXZhc09iamVj dCkKICAgICAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dC5jcHAKaW5kZXggYWJmOTZiNC4uODVhZTMyYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcApAQCAtMTAyLDE3 ICsxMDIsMTcgQEAgRXdrQ29udGV4dDo6fkV3a0NvbnRleHQoKQogICAgIGNvbnRleHRNYXAoKS5y ZW1vdmUobV9jb250ZXh0LmdldCgpKTsKIH0KIAotUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBFd2tD b250ZXh0OjpjcmVhdGUoV0tDb250ZXh0UmVmIGNvbnRleHQpCitQYXNzUmVmUHRyPEV3a0NvbnRl eHQ+IEV3a0NvbnRleHQ6OmdldE9yQ3JlYXRlKFdLQ29udGV4dFJlZiBjb250ZXh0KQogewogICAg IGlmIChjb250ZXh0TWFwKCkuY29udGFpbnMoY29udGV4dCkpCi0gICAgICAgIHJldHVybiBjb250 ZXh0TWFwKCkuZ2V0KGNvbnRleHQpOyAvLyBXaWxsIGJlIHJlZi1lZCBhdXRvbWF0aWNhbGx5Lgor ICAgICAgICByZXR1cm4gY29udGV4dE1hcCgpLmdldChjb250ZXh0KTsKIAogICAgIHJldHVybiBh ZG9wdFJlZihuZXcgRXdrQ29udGV4dChjb250ZXh0KSk7CiB9CiAKIFBhc3NSZWZQdHI8RXdrQ29u dGV4dD4gRXdrQ29udGV4dDo6Y3JlYXRlKCkKIHsKLSAgICByZXR1cm4gY3JlYXRlKGFkb3B0V0so V0tDb250ZXh0Q3JlYXRlKCkpLmdldCgpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEV3a0Nv bnRleHQoYWRvcHRXSyhXS0NvbnRleHRDcmVhdGUoKSkuZ2V0KCkpKTsKIH0KIAogUGFzc1JlZlB0 cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpjcmVhdGUoY29uc3QgU3RyaW5nJiBpbmplY3RlZEJ1 bmRsZVBhdGgpCkBAIC0xMjIsMTIgKzEyMiwxMiBAQCBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3 a0NvbnRleHQ6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGluamVjdGVkQnVuZGxlUGF0aCkKIAogICAg IFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwYXRoID0gYWRvcHRXSyh0b0NvcGllZEFQSShpbmpl Y3RlZEJ1bmRsZVBhdGgpKTsKIAotICAgIHJldHVybiBjcmVhdGUoYWRvcHRXSyhXS0NvbnRleHRD cmVhdGVXaXRoSW5qZWN0ZWRCdW5kbGVQYXRoKHBhdGguZ2V0KCkpKS5nZXQoKSk7CisgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBFd2tDb250ZXh0KGFkb3B0V0soV0tDb250ZXh0Q3JlYXRlV2l0aElu amVjdGVkQnVuZGxlUGF0aChwYXRoLmdldCgpKSkuZ2V0KCkpKTsKIH0KIAotUGFzc1JlZlB0cjxF d2tDb250ZXh0PiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpCitFd2tDb250ZXh0KiBFd2tD b250ZXh0OjpkZWZhdWx0Q29udGV4dCgpCiB7Ci0gICAgc3RhdGljIFJlZlB0cjxFd2tDb250ZXh0 PiBkZWZhdWx0SW5zdGFuY2UgPSBjcmVhdGUoKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEV3 a0NvbnRleHQqLCBkZWZhdWx0SW5zdGFuY2UsIChjcmVhdGUoKS5sZWFrUmVmKCkpKTsKIAogICAg IHJldHVybiBkZWZhdWx0SW5zdGFuY2U7CiB9CkBAIC0yNjQsNyArMjY0LDcgQEAgQ29udGV4dEhp c3RvcnlDbGllbnRFZmwqIEV3a0NvbnRleHQ6Omhpc3RvcnlDbGllbnQoKQogCiBFd2tfQ29udGV4 dCogZXdrX2NvbnRleHRfZGVmYXVsdF9nZXQoKQogewotICAgIHJldHVybiBFd2tDb250ZXh0Ojpk ZWZhdWx0Q29udGV4dCgpLmdldCgpOworICAgIHJldHVybiBFd2tDb250ZXh0OjpkZWZhdWx0Q29u dGV4dCgpOwogfQogCiBFd2tfQ29udGV4dCogZXdrX2NvbnRleHRfbmV3KCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaApp bmRleCAxYzhjNTc3Li42OGVjYjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oCkBAIC00OSwxMSArNDksMTEgQEAg Y2xhc3MgRXdrQ29udGV4dCA6IHB1YmxpYyBFd2tPYmplY3QgewogcHVibGljOgogICAgIEVXS19P QkpFQ1RfREVDTEFSRShFd2tDb250ZXh0KQogCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrQ29u dGV4dD4gY3JlYXRlKFdLQ29udGV4dFJlZiBjb250ZXh0KTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0 cjxFd2tDb250ZXh0PiBnZXRPckNyZWF0ZShXS0NvbnRleHRSZWYgY29udGV4dCk7CiAgICAgc3Rh dGljIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gY3JlYXRlKCk7CiAgICAgc3RhdGljIFBhc3NSZWZQ dHI8RXdrQ29udGV4dD4gY3JlYXRlKGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKTsK IAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGRlZmF1bHRDb250ZXh0KCk7Cisg ICAgc3RhdGljIEV3a0NvbnRleHQqIGRlZmF1bHRDb250ZXh0KCk7CiAKICAgICB+RXdrQ29udGV4 dCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3Bl Y3RvclByb3h5RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVj dG9yUHJveHlFZmwuY3BwCmluZGV4IGZhMmUwOGQuLjI3NWIzMmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwCkBAIC0x MDAsNyArMTAwLDcgQEAgV2ViUGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1D cmVhdGVJbnNwZWN0b3JQYWdlKCkKIAogICAgIC8vIEZJWE1FOiBSZWZhY3RvciB0byB1c2UgV0tW aWV3UmVmLgogICAgIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmID0gdG9BUEkocGFnZSgpLT5wcm9j ZXNzKCktPmNvbnRleHQoKSk7Ci0gICAgbV9pbnNwZWN0b3JWaWV3ID0gRXdrVmlldzo6Y3JlYXRl RXZhc09iamVjdChlY29yZV9ldmFzX2dldChtX2luc3BlY3RvcldpbmRvdyksIEV3a0NvbnRleHQ6 OmNyZWF0ZShjb250ZXh0UmVmKSwgdG9BUEkoaW5zcGVjdG9yUGFnZUdyb3VwKCkpLCBFd2tWaWV3 OjpMZWdhY3lCZWhhdmlvcik7CisgICAgbV9pbnNwZWN0b3JWaWV3ID0gRXdrVmlldzo6Y3JlYXRl RXZhc09iamVjdChlY29yZV9ldmFzX2dldChtX2luc3BlY3RvcldpbmRvdyksIEV3a0NvbnRleHQ6 OmdldE9yQ3JlYXRlKGNvbnRleHRSZWYpLCB0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAoKSksIEV3 a1ZpZXc6OkxlZ2FjeUJlaGF2aW9yKTsKICAgICBpZiAoIW1faW5zcGVjdG9yVmlldykKICAgICAg ICAgcmV0dXJuIDA7CiAK 191974 2013-03-07 05:07:11 -0800 2013-03-12 05:05:18 -0700 patch v2 bug111706_V2 text/plain 5739 mikhail.pozdnyakov Y29tbWl0IDNjMzI0MGQ4N2IxYjAxYmU0ZTcxZjM0NzY4YWE5ZWJiYTIwM2U5YjkKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IE1hciA3IDEzOjU2OjIyIDIwMTMgKzAyMDAKCiAgICBidWcxMTE3MDYKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggMDYyZTcyNi4uOGI4MmM0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAz LTA3ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgor CisgICAgICAgIFtXSzJdW0VGTF0gRml4IEV3a0NvbnRleHQgY2xhc3MgQVBJCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE3MDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9l ZmwvV0tWaWV3LmNwcDoKKyAgICAgICAgKGNyZWF0ZVdLVmlldyk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6ZmluZE9y Q3JlYXRlV3JhcHBlcik6CisKKyAgICAgICAgICAgIFJlbmFtZWQgZnJvbSBjcmVhdGUoKSBhcyBp dCByZXR1cm5zIHRoZSBzYW1lIGluc3RhbmNlIG9mIEV3a0NvbnRleHQKKyAgICAgICAgICAgIGZv ciB0aGUgZ2l2ZW4gV0tDb250ZXh0UmVmIGlmIHByZXNlbnQuCisKKyAgICAgICAgKEV3a0NvbnRl eHQ6OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCk6CisKKyAg ICAgICAgICAgIFJldHVybnMgcmF3IHBvaW50ZXIgcmF0aGVyIHRoYW4gUGFzc1JlZlB0cjxFd2tD b250ZXh0PiBhcyBvd25lcnNoaXAKKyAgICAgICAgICAgIGlzIG5vdCB0cmFuc2ZlcnJlZC4KKwor ICAgICAgICAoZXdrX2NvbnRleHRfZGVmYXVsdF9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHQpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKToK KwogMjAxMy0wMy0wNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAg ICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGUgcmFpc2VzIGFuIHVuY2F1Z2h0IE9i amVjdGl2ZS1DIGV4Y2VwdGlvbiBpZiBwYXRoIGlzIGVtcHR5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5jcHAKaW5kZXggYTI0OTgyMC4uOWRkNjkxMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2VmbC9XS1ZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmNwcApAQCAtMzAs NyArMzAsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBzdGF0aWMgaW5saW5lIFdLVmll d1JlZiBjcmVhdGVXS1ZpZXcoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwg V0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmLCBFd2tWaWV3OjpWaWV3QmVoYXZpb3IgYmVoYXZp b3IpCiB7Ci0gICAgUmVmUHRyPEV3a0NvbnRleHQ+IGNvbnRleHQgPSBjb250ZXh0UmVmID8gRXdr Q29udGV4dDo6Y3JlYXRlKGNvbnRleHRSZWYpIDogRXdrQ29udGV4dDo6ZGVmYXVsdENvbnRleHQo KTsKKyAgICBSZWZQdHI8RXdrQ29udGV4dD4gY29udGV4dCA9IGNvbnRleHRSZWYgPyBFd2tDb250 ZXh0OjpmaW5kT3JDcmVhdGVXcmFwcGVyKGNvbnRleHRSZWYpIDogRXdrQ29udGV4dDo6ZGVmYXVs dENvbnRleHQoKTsKICAgICBFdmFzX09iamVjdCogZXZhc09iamVjdCA9IEV3a1ZpZXc6OmNyZWF0 ZUV2YXNPYmplY3QoY2FudmFzLCBjb250ZXh0LCBwYWdlR3JvdXBSZWYsIGJlaGF2aW9yKTsKICAg ICBpZiAoIWV2YXNPYmplY3QpCiAgICAgICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCmluZGV4IGFiZjk2YjQuLjU3ZGYx YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dC5jcHAKQEAgLTEwMiwxNyArMTAyLDE3IEBAIEV3a0NvbnRleHQ6On5Fd2tDb250ZXh0KCkKICAg ICBjb250ZXh0TWFwKCkucmVtb3ZlKG1fY29udGV4dC5nZXQoKSk7CiB9CiAKLVBhc3NSZWZQdHI8 RXdrQ29udGV4dD4gRXdrQ29udGV4dDo6Y3JlYXRlKFdLQ29udGV4dFJlZiBjb250ZXh0KQorUGFz c1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpmaW5kT3JDcmVhdGVXcmFwcGVyKFdLQ29u dGV4dFJlZiBjb250ZXh0KQogewogICAgIGlmIChjb250ZXh0TWFwKCkuY29udGFpbnMoY29udGV4 dCkpCi0gICAgICAgIHJldHVybiBjb250ZXh0TWFwKCkuZ2V0KGNvbnRleHQpOyAvLyBXaWxsIGJl IHJlZi1lZCBhdXRvbWF0aWNhbGx5LgorICAgICAgICByZXR1cm4gY29udGV4dE1hcCgpLmdldChj b250ZXh0KTsKIAogICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXdrQ29udGV4dChjb250ZXh0KSk7 CiB9CiAKIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gRXdrQ29udGV4dDo6Y3JlYXRlKCkKIHsKLSAg ICByZXR1cm4gY3JlYXRlKGFkb3B0V0soV0tDb250ZXh0Q3JlYXRlKCkpLmdldCgpKTsKKyAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IEV3a0NvbnRleHQoYWRvcHRXSyhXS0NvbnRleHRDcmVhdGUoKSku Z2V0KCkpKTsKIH0KIAogUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpjcmVhdGUo Y29uc3QgU3RyaW5nJiBpbmplY3RlZEJ1bmRsZVBhdGgpCkBAIC0xMjIsMTIgKzEyMiwxNCBAQCBQ YXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0NvbnRleHQ6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGlu amVjdGVkQnVuZGxlUGF0aCkKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwYXRoID0g YWRvcHRXSyh0b0NvcGllZEFQSShpbmplY3RlZEJ1bmRsZVBhdGgpKTsKIAotICAgIHJldHVybiBj cmVhdGUoYWRvcHRXSyhXS0NvbnRleHRDcmVhdGVXaXRoSW5qZWN0ZWRCdW5kbGVQYXRoKHBhdGgu Z2V0KCkpKS5nZXQoKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tDb250ZXh0KGFkb3B0 V0soV0tDb250ZXh0Q3JlYXRlV2l0aEluamVjdGVkQnVuZGxlUGF0aChwYXRoLmdldCgpKSkuZ2V0 KCkpKTsKIH0KIAotUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpkZWZhdWx0Q29u dGV4dCgpCitFd2tDb250ZXh0KiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpCiB7Ci0gICAg c3RhdGljIFJlZlB0cjxFd2tDb250ZXh0PiBkZWZhdWx0SW5zdGFuY2UgPSBjcmVhdGUoKTsKKyAg ICBzdGF0aWMgRXdrQ29udGV4dCogZGVmYXVsdEluc3RhbmNlID0gMDsKKyAgICBpZiAoIWRlZmF1 bHRJbnN0YW5jZSkKKyAgICAgICAgZGVmYXVsdEluc3RhbmNlID0gY3JlYXRlKCkubGVha1JlZigp OwogCiAgICAgcmV0dXJuIGRlZmF1bHRJbnN0YW5jZTsKIH0KQEAgLTI2NCw3ICsyNjYsNyBAQCBD b250ZXh0SGlzdG9yeUNsaWVudEVmbCogRXdrQ29udGV4dDo6aGlzdG9yeUNsaWVudCgpCiAKIEV3 a19Db250ZXh0KiBld2tfY29udGV4dF9kZWZhdWx0X2dldCgpCiB7Ci0gICAgcmV0dXJuIEV3a0Nv bnRleHQ6OmRlZmF1bHRDb250ZXh0KCkuZ2V0KCk7CisgICAgcmV0dXJuIEV3a0NvbnRleHQ6OmRl ZmF1bHRDb250ZXh0KCk7CiB9CiAKIEV3a19Db250ZXh0KiBld2tfY29udGV4dF9uZXcoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJp dmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfcHJp dmF0ZS5oCmluZGV4IDFjOGM1NzcuLmRiMTk4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKQEAgLTQ5LDExICs0 OSwxMSBAQCBjbGFzcyBFd2tDb250ZXh0IDogcHVibGljIEV3a09iamVjdCB7CiBwdWJsaWM6CiAg ICAgRVdLX09CSkVDVF9ERUNMQVJFKEV3a0NvbnRleHQpCiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0 cjxFd2tDb250ZXh0PiBjcmVhdGUoV0tDb250ZXh0UmVmIGNvbnRleHQpOworICAgIHN0YXRpYyBQ YXNzUmVmUHRyPEV3a0NvbnRleHQ+IGZpbmRPckNyZWF0ZVdyYXBwZXIoV0tDb250ZXh0UmVmIGNv bnRleHQpOwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGNyZWF0ZSgpOwogICAg IHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGluamVj dGVkQnVuZGxlUGF0aCk7CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBkZWZh dWx0Q29udGV4dCgpOworICAgIHN0YXRpYyBFd2tDb250ZXh0KiBkZWZhdWx0Q29udGV4dCgpOwog CiAgICAgfkV3a0NvbnRleHQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcAppbmRleCBmYTJlMDhkLi5hY2FjM2NmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5 RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclBy b3h5RWZsLmNwcApAQCAtMTAwLDcgKzEwMCw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVjdG9y UHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAKICAgICAvLyBGSVhNRTogUmVm YWN0b3IgdG8gdXNlIFdLVmlld1JlZi4KICAgICBXS0NvbnRleHRSZWYgY29udGV4dFJlZiA9IHRv QVBJKHBhZ2UoKS0+cHJvY2VzcygpLT5jb250ZXh0KCkpOwotICAgIG1faW5zcGVjdG9yVmlldyA9 IEV3a1ZpZXc6OmNyZWF0ZUV2YXNPYmplY3QoZWNvcmVfZXZhc19nZXQobV9pbnNwZWN0b3JXaW5k b3cpLCBFd2tDb250ZXh0OjpjcmVhdGUoY29udGV4dFJlZiksIHRvQVBJKGluc3BlY3RvclBhZ2VH cm91cCgpKSwgRXdrVmlldzo6TGVnYWN5QmVoYXZpb3IpOworICAgIG1faW5zcGVjdG9yVmlldyA9 IEV3a1ZpZXc6OmNyZWF0ZUV2YXNPYmplY3QoZWNvcmVfZXZhc19nZXQobV9pbnNwZWN0b3JXaW5k b3cpLCBFd2tDb250ZXh0OjpmaW5kT3JDcmVhdGVXcmFwcGVyKGNvbnRleHRSZWYpLCB0b0FQSShp bnNwZWN0b3JQYWdlR3JvdXAoKSksIEV3a1ZpZXc6OkxlZ2FjeUJlaGF2aW9yKTsKICAgICBpZiAo IW1faW5zcGVjdG9yVmlldykKICAgICAgICAgcmV0dXJuIDA7CiAK 192713 2013-03-12 05:05:18 -0700 2013-03-12 05:34:50 -0700 to be landed bug111706_to_be_landed text/plain 5657 mikhail.pozdnyakov Y29tbWl0IDZkYWU5OWEyYzVlOWVmOTBiYjY1OTJmMDFlOTJiODExNTc0NTBiYzEKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VHVlIE1hciAxMiAxMzo1OTozMCAyMDEzICswMjAwCgogICAgYnVnMTExNzA2CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDAyOGYxOGMuLjdlNWExMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMy0w My0xMiAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIEZpeCBFd2tDb250ZXh0IGNsYXNzIEFQSQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzA2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQy9lZmwvV0tWaWV3LmNwcDoKKyAgICAgICAgKGNyZWF0ZVdLVmlldyk6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrQ29udGV4dDo6 ZmluZE9yQ3JlYXRlV3JhcHBlcik6CisKKyAgICAgICAgICAgIFJlbmFtZWQgZnJvbSBjcmVhdGUo KSBhcyBpdCByZXR1cm5zIHRoZSBzYW1lIGluc3RhbmNlIG9mIEV3a0NvbnRleHQKKyAgICAgICAg ICAgIGZvciB0aGUgZ2l2ZW4gV0tDb250ZXh0UmVmIGlmIHByZXNlbnQuCisKKyAgICAgICAgKEV3 a0NvbnRleHQ6OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCk6 CisKKyAgICAgICAgICAgIFJldHVybnMgcmF3IHBvaW50ZXIgcmF0aGVyIHRoYW4gUGFzc1JlZlB0 cjxFd2tDb250ZXh0PiBhcyBvd25lcnNoaXAKKyAgICAgICAgICAgIGlzIG5vdCB0cmFuc2ZlcnJl ZC4KKworICAgICAgICAoZXdrX2NvbnRleHRfZGVmYXVsdF9nZXQpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQ YWdlKToKKwogMjAxMy0wMy0xMSAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVA ZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBMYXllciBRdERvd25sb2FkTWFuYWdlciBv biB0aGUgQyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9l ZmwvV0tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3 LmNwcAppbmRleCBhMjQ5ODIwLi45ZGQ2OTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL2VmbC9XS1ZpZXcuY3BwCkBAIC0zMCw3ICszMCw3IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiAKIHN0YXRpYyBpbmxpbmUgV0tWaWV3UmVmIGNyZWF0ZVdLVmlldyhFdmFzKiBj YW52YXMsIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBS ZWYsIEV3a1ZpZXc6OlZpZXdCZWhhdmlvciBiZWhhdmlvcikKIHsKLSAgICBSZWZQdHI8RXdrQ29u dGV4dD4gY29udGV4dCA9IGNvbnRleHRSZWYgPyBFd2tDb250ZXh0OjpjcmVhdGUoY29udGV4dFJl ZikgOiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpOworICAgIFJlZlB0cjxFd2tDb250ZXh0 PiBjb250ZXh0ID0gY29udGV4dFJlZiA/IEV3a0NvbnRleHQ6OmZpbmRPckNyZWF0ZVdyYXBwZXIo Y29udGV4dFJlZikgOiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpOwogICAgIEV2YXNfT2Jq ZWN0KiBldmFzT2JqZWN0ID0gRXdrVmlldzo6Y3JlYXRlRXZhc09iamVjdChjYW52YXMsIGNvbnRl eHQsIHBhZ2VHcm91cFJlZiwgYmVoYXZpb3IpOwogICAgIGlmICghZXZhc09iamVjdCkKICAgICAg ICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf Y29udGV4dC5jcHAKaW5kZXggYWJmOTZiNC4uNTcwZDRiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcApAQCAtMTAyLDE3ICsxMDIsMTcg QEAgRXdrQ29udGV4dDo6fkV3a0NvbnRleHQoKQogICAgIGNvbnRleHRNYXAoKS5yZW1vdmUobV9j b250ZXh0LmdldCgpKTsKIH0KIAotUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0Ojpj cmVhdGUoV0tDb250ZXh0UmVmIGNvbnRleHQpCitQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IEV3a0Nv bnRleHQ6OmZpbmRPckNyZWF0ZVdyYXBwZXIoV0tDb250ZXh0UmVmIGNvbnRleHQpCiB7CiAgICAg aWYgKGNvbnRleHRNYXAoKS5jb250YWlucyhjb250ZXh0KSkKLSAgICAgICAgcmV0dXJuIGNvbnRl eHRNYXAoKS5nZXQoY29udGV4dCk7IC8vIFdpbGwgYmUgcmVmLWVkIGF1dG9tYXRpY2FsbHkuCisg ICAgICAgIHJldHVybiBjb250ZXh0TWFwKCkuZ2V0KGNvbnRleHQpOwogCiAgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBFd2tDb250ZXh0KGNvbnRleHQpKTsKIH0KIAogUGFzc1JlZlB0cjxFd2tDb250 ZXh0PiBFd2tDb250ZXh0OjpjcmVhdGUoKQogewotICAgIHJldHVybiBjcmVhdGUoYWRvcHRXSyhX S0NvbnRleHRDcmVhdGUoKSkuZ2V0KCkpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXdrQ29u dGV4dChhZG9wdFdLKFdLQ29udGV4dENyZWF0ZSgpKS5nZXQoKSkpOwogfQogCiBQYXNzUmVmUHRy PEV3a0NvbnRleHQ+IEV3a0NvbnRleHQ6OmNyZWF0ZShjb25zdCBTdHJpbmcmIGluamVjdGVkQnVu ZGxlUGF0aCkKQEAgLTEyMiwxMiArMTIyLDEyIEBAIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gRXdr Q29udGV4dDo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKQogCiAgICAg V0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHBhdGggPSBhZG9wdFdLKHRvQ29waWVkQVBJKGluamVj dGVkQnVuZGxlUGF0aCkpOwogCi0gICAgcmV0dXJuIGNyZWF0ZShhZG9wdFdLKFdLQ29udGV4dENy ZWF0ZVdpdGhJbmplY3RlZEJ1bmRsZVBhdGgocGF0aC5nZXQoKSkpLmdldCgpKTsKKyAgICByZXR1 cm4gYWRvcHRSZWYobmV3IEV3a0NvbnRleHQoYWRvcHRXSyhXS0NvbnRleHRDcmVhdGVXaXRoSW5q ZWN0ZWRCdW5kbGVQYXRoKHBhdGguZ2V0KCkpKS5nZXQoKSkpOwogfQogCi1QYXNzUmVmUHRyPEV3 a0NvbnRleHQ+IEV3a0NvbnRleHQ6OmRlZmF1bHRDb250ZXh0KCkKK0V3a0NvbnRleHQqIEV3a0Nv bnRleHQ6OmRlZmF1bHRDb250ZXh0KCkKIHsKLSAgICBzdGF0aWMgUmVmUHRyPEV3a0NvbnRleHQ+ IGRlZmF1bHRJbnN0YW5jZSA9IGNyZWF0ZSgpOworICAgIHN0YXRpYyBFd2tDb250ZXh0KiBkZWZh dWx0SW5zdGFuY2UgPSBjcmVhdGUoKS5sZWFrUmVmKCk7CiAKICAgICByZXR1cm4gZGVmYXVsdElu c3RhbmNlOwogfQpAQCAtMjY0LDcgKzI2NCw3IEBAIENvbnRleHRIaXN0b3J5Q2xpZW50RWZsKiBF d2tDb250ZXh0OjpoaXN0b3J5Q2xpZW50KCkKIAogRXdrX0NvbnRleHQqIGV3a19jb250ZXh0X2Rl ZmF1bHRfZ2V0KCkKIHsKLSAgICByZXR1cm4gRXdrQ29udGV4dDo6ZGVmYXVsdENvbnRleHQoKS5n ZXQoKTsKKyAgICByZXR1cm4gRXdrQ29udGV4dDo6ZGVmYXVsdENvbnRleHQoKTsKIH0KIAogRXdr X0NvbnRleHQqIGV3a19jb250ZXh0X25ldygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKaW5kZXggMWM4YzU3Ny4uZGIx OTgwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nv bnRleHRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X3ByaXZhdGUuaApAQCAtNDksMTEgKzQ5LDExIEBAIGNsYXNzIEV3a0NvbnRleHQg OiBwdWJsaWMgRXdrT2JqZWN0IHsKIHB1YmxpYzoKICAgICBFV0tfT0JKRUNUX0RFQ0xBUkUoRXdr Q29udGV4dCkKIAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGNyZWF0ZShXS0Nv bnRleHRSZWYgY29udGV4dCk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gZmlu ZE9yQ3JlYXRlV3JhcHBlcihXS0NvbnRleHRSZWYgY29udGV4dCk7CiAgICAgc3RhdGljIFBhc3NS ZWZQdHI8RXdrQ29udGV4dD4gY3JlYXRlKCk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrQ29u dGV4dD4gY3JlYXRlKGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYXRoKTsKIAotICAgIHN0 YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGRlZmF1bHRDb250ZXh0KCk7CisgICAgc3RhdGlj IEV3a0NvbnRleHQqIGRlZmF1bHRDb250ZXh0KCk7CiAKICAgICB+RXdrQ29udGV4dCgpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5 RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlF ZmwuY3BwCmluZGV4IGZhMmUwOGQuLmFjYWMzY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwCkBAIC0xMDAsNyArMTAw LDcgQEAgV2ViUGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNw ZWN0b3JQYWdlKCkKIAogICAgIC8vIEZJWE1FOiBSZWZhY3RvciB0byB1c2UgV0tWaWV3UmVmLgog ICAgIFdLQ29udGV4dFJlZiBjb250ZXh0UmVmID0gdG9BUEkocGFnZSgpLT5wcm9jZXNzKCktPmNv bnRleHQoKSk7Ci0gICAgbV9pbnNwZWN0b3JWaWV3ID0gRXdrVmlldzo6Y3JlYXRlRXZhc09iamVj dChlY29yZV9ldmFzX2dldChtX2luc3BlY3RvcldpbmRvdyksIEV3a0NvbnRleHQ6OmNyZWF0ZShj b250ZXh0UmVmKSwgdG9BUEkoaW5zcGVjdG9yUGFnZUdyb3VwKCkpLCBFd2tWaWV3OjpMZWdhY3lC ZWhhdmlvcik7CisgICAgbV9pbnNwZWN0b3JWaWV3ID0gRXdrVmlldzo6Y3JlYXRlRXZhc09iamVj dChlY29yZV9ldmFzX2dldChtX2luc3BlY3RvcldpbmRvdyksIEV3a0NvbnRleHQ6OmZpbmRPckNy ZWF0ZVdyYXBwZXIoY29udGV4dFJlZiksIHRvQVBJKGluc3BlY3RvclBhZ2VHcm91cCgpKSwgRXdr Vmlldzo6TGVnYWN5QmVoYXZpb3IpOwogICAgIGlmICghbV9pbnNwZWN0b3JWaWV3KQogICAgICAg ICByZXR1cm4gMDsKIAo=