112364 2013-03-14 10:45:31 -0700 [WK2][EFL] Fix code wrapping WKPageGroupRef 2013-03-18 10:04:27 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111543 111591 1 mikhail.pozdnyakov mikhail.pozdnyakov ap benjamin gyuyoung.kim jinwoo7.song kenneth kling lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 855315 0 mikhail.pozdnyakov 2013-03-14 10:45:31 -0700 SSIA. EwkPageGroup is just a wrapper around WKPageGroupRef, hence there is no reason in keeping several different EwkPageGroup instances for the same WKPageGroupRef. Secondly EwkPageGroup should take after EwkContext::createOrFindWrapper API to keep consistency. 855484 1 193183 mikhail.pozdnyakov 2013-03-14 14:14:18 -0700 Created attachment 193183 patch 855532 2 193183 kenneth 2013-03-14 15:49:38 -0700 Comment on attachment 193183 patch LGTM 855726 3 jinwoo7.song 2013-03-14 23:18:11 -0700 Looks fine to me, too. 855926 4 193183 mikhail.pozdnyakov 2013-03-15 06:00:36 -0700 Comment on attachment 193183 patch View in context: https://bugs.webkit.org/attachment.cgi?id=193183&action=review > Source/WebKit2/UIProcess/API/C/efl/WKView.cpp:35 > + RefPtr<EwkPageGroup> pageGroup = pageGroupRef ? EwkPageGroup::findOrCreateWrapper(pageGroupRef) : EwkPageGroup::create(); argh! here is a mistake: We should let page group to be null (at the moment we have the same mistake inside EwkPageGroup::create() :( ). 855997 5 193311 mikhail.pozdnyakov 2013-03-15 08:09:27 -0700 Created attachment 193311 patch v2 Fixes also default page group usage problem. 856487 6 jinwoo7.song 2013-03-15 20:12:36 -0700 (In reply to comment #5) > Created an attachment (id=193311) [details] > patch v2 > > Fixes also default page group usage problem. LGTM. This is more correct way to use the default page group created by WebContext when we pass page group as '0'. My first though was to create the default page group with the 'defaultPageGroupIdentifier' in EwkPageGroup but it may lead to create two WebPageGroup in this case. (one is by WebContext, and the other is by EwkPageGroup::create().) 856934 7 193311 kenneth 2013-03-18 02:59:39 -0700 Comment on attachment 193311 patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=193311&action=review LGTM > Source/WebKit2/UIProcess/API/efl/EwkView.h:259 > RefPtr<EwkContext> m_context; > + RefPtr<WebKit::WebView> m_webView; > RefPtr<EwkPageGroup> m_pageGroup; > OwnPtr<Evas_GL> m_evasGL; Why is this move not explained in the changelog? 857234 8 mikhail.pozdnyakov 2013-03-18 10:04:27 -0700 Committed r146075: <http://trac.webkit.org/changeset/146075> 193183 2013-03-14 14:14:18 -0700 2013-03-15 08:09:27 -0700 patch bug112364 text/plain 6730 mikhail.pozdnyakov Y29tbWl0IGEwYmYxN2IxZWQ3YTA1MTk2YTVjNjZiYzRlMWJkY2FlOTY0MDE5OTQKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IE1hciAxNCAyMzowODoyMiAyMDEzICswMjAwCgogICAgYnVnMTEyMzY0CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDIyMTQwZTkuLjhjMmE5MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMy0w My0xNCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIFRoZXJlIHNob3VsZCBiZSBvbmx5IG9uZSBFd2tQYWdlR3Jv dXAgaW5zdGFuY2UgcGVyIFdLUGFnZUdyb3VwUmVmCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIzNjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBFd2tQYWdlR3JvdXA6OmZpbmRPckNyZWF0ZVdy YXBwZXIoKSBtZXRob2Qgd2hpY2ggaXMgY29uc2lzdGVudAorICAgICAgICB3aXRoIEV3a0NvbnRl eHQgY2xhc3MuCisgICAgICAgIEFzIGEgcmVzdWx0IHRoZXJlIGNhbiBiZSBvbmx5IG9uZSBFd2tQ YWdlR3JvdXAgaW5zdGFuY2UgcGVyIFdLUGFnZUdyb3VwCisgICAgICAgIGluc3RhbmNlICh3aGlj aCBpcyByaWdodCBhcyBFd2tQYWdlR3JvdXAgaXMganVzdCBhIHdyYXBwZXIgYXJvdW5kCisgICAg ICAgIFdLUGFnZUdyb3VwKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3 LmNwcDoKKyAgICAgICAgKGNyZWF0ZVdLVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3BhZ2VfZ3JvdXAuY3BwOgorICAgICAgICAocGFnZUdyb3VwTWFwKToKKyAgICAgICAg KEV3a1BhZ2VHcm91cDo6ZmluZE9yQ3JlYXRlV3JhcHBlcik6CisgICAgICAgIChFd2tQYWdlR3Jv dXA6OmNyZWF0ZSk6CisgICAgICAgIChFd2tQYWdlR3JvdXA6OkV3a1BhZ2VHcm91cCk6CisgICAg ICAgIChFd2tQYWdlR3JvdXA6On5Fd2tQYWdlR3JvdXApOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19wYWdlX2dyb3VwX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a1BhZ2VHcm91cCk6 CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBh Z2UpOgorCiAyMDEzLTAzLTE0ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmVwbGFjZSBzdGF0aWNfY2FzdHMgd2l0aCB0byogaGVscGVyIGZ1bmN0aW9u cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmNwcAppbmRl eCBkY2QzZTJjLi40NDM0ZGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvZWZsL1dLVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L2VmbC9XS1ZpZXcuY3BwCkBAIC0zMiw3ICszMiw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7 CiBzdGF0aWMgaW5saW5lIFdLVmlld1JlZiBjcmVhdGVXS1ZpZXcoRXZhcyogY2FudmFzLCBXS0Nv bnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmLCBFd2tWaWV3 OjpWaWV3QmVoYXZpb3IgYmVoYXZpb3IpCiB7CiAgICAgUmVmUHRyPEV3a0NvbnRleHQ+IGNvbnRl eHQgPSBjb250ZXh0UmVmID8gRXdrQ29udGV4dDo6ZmluZE9yQ3JlYXRlV3JhcHBlcihjb250ZXh0 UmVmKSA6IEV3a0NvbnRleHQ6OmRlZmF1bHRDb250ZXh0KCk7Ci0gICAgUmVmUHRyPEV3a1BhZ2VH cm91cD4gcGFnZUdyb3VwID0gRXdrUGFnZUdyb3VwOjpjcmVhdGUocGFnZUdyb3VwUmVmKTsKKyAg ICBSZWZQdHI8RXdrUGFnZUdyb3VwPiBwYWdlR3JvdXAgPSBwYWdlR3JvdXBSZWYgPyBFd2tQYWdl R3JvdXA6OmZpbmRPckNyZWF0ZVdyYXBwZXIocGFnZUdyb3VwUmVmKSA6IEV3a1BhZ2VHcm91cDo6 Y3JlYXRlKCk7CisKICAgICBFdmFzX09iamVjdCogZXZhc09iamVjdCA9IEV3a1ZpZXc6OmNyZWF0 ZUV2YXNPYmplY3QoY2FudmFzLCBjb250ZXh0LCBwYWdlR3JvdXAsIGJlaGF2aW9yKTsKICAgICBp ZiAoIWV2YXNPYmplY3QpCiAgICAgICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXAuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXAuY3BwCmluZGV4IGJhMjM4ZTQuLjg0 Y2Q1NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19w YWdlX2dyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf cGFnZV9ncm91cC5jcHAKQEAgLTM3LDE5ICszNyw0NiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OwogCiBjb25zdCBjaGFyIEV3a1BhZ2VHcm91cDo6ZGVmYXVsdElkZW50aWZpZXJbXSA9ICJkZWZh dWx0UGFnZUdyb3VwSWRlbnRpZmllciI7CiAKK3R5cGVkZWYgSGFzaE1hcDxXS1BhZ2VHcm91cFJl ZiwgRXdrUGFnZUdyb3VwKj4gUGFnZUdyb3VwTWFwOworCitzdGF0aWMgaW5saW5lIFBhZ2VHcm91 cE1hcCYgcGFnZUdyb3VwTWFwKCkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFBhZ2VHcm91 cE1hcCwgbWFwLCAoKSk7CisgICAgcmV0dXJuIG1hcDsKK30KKwogc3RhdGljIFdLVHlwZVJlZiBj b252ZXJ0RnJvbUNoYXJUb1dLU3RyaW5nKHZvaWQqIGRhdGEpCiB7CiAgICAgcmV0dXJuIFdLU3Ry aW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHN0YXRpY19jYXN0PGNoYXIqPihkYXRhKSk7CiB9CiAK K1Bhc3NSZWZQdHI8RXdrUGFnZUdyb3VwPiBFd2tQYWdlR3JvdXA6OmZpbmRPckNyZWF0ZVdyYXBw ZXIoV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKQoreworICAgIGlmIChwYWdlR3JvdXBNYXAo KS5jb250YWlucyhwYWdlR3JvdXBSZWYpKQorICAgICAgICByZXR1cm4gcGFnZUdyb3VwTWFwKCku Z2V0KHBhZ2VHcm91cFJlZik7CisKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEV3a1BhZ2VHcm91 cChwYWdlR3JvdXBSZWYpKTsKK30KKworUGFzc1JlZlB0cjxFd2tQYWdlR3JvdXA+IEV3a1BhZ2VH cm91cDo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcikKK3sKKyAgICBXS1JldGFpblB0 cjxXS1N0cmluZ1JlZj4gaWRlbnRpZmllclJlZiA9IGFkb3B0V0sodG9Db3BpZWRBUEkoaWRlbnRp Zmllci5pc0VtcHR5KCkgPyBkZWZhdWx0SWRlbnRpZmllciA6IGlkZW50aWZpZXIpKTsKKyAgICBX S1JldGFpblB0cjxXS1BhZ2VHcm91cFJlZj4gcGFnZUdyb3VwUmVmID0gYWRvcHRXSyhXS1BhZ2VH cm91cENyZWF0ZVdpdGhJZGVudGlmaWVyKGlkZW50aWZpZXJSZWYuZ2V0KCkpKTsKKworICAgIHJl dHVybiBhZG9wdFJlZihuZXcgRXdrUGFnZUdyb3VwKHBhZ2VHcm91cFJlZi5nZXQoKSkpOworfQor CiBFd2tQYWdlR3JvdXA6OkV3a1BhZ2VHcm91cChXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYp CiAgICAgOiBtX3BhZ2VHcm91cFJlZihwYWdlR3JvdXBSZWYpCiB7CisgICAgUGFnZUdyb3VwTWFw OjpBZGRSZXN1bHQgcmVzdWx0ID0gcGFnZUdyb3VwTWFwKCkuYWRkKHBhZ2VHcm91cFJlZiwgdGhp cyk7CisgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAot RXdrUGFnZUdyb3VwOjpFd2tQYWdlR3JvdXAoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKQorRXdr UGFnZUdyb3VwOjp+RXdrUGFnZUdyb3VwKCkKIHsKLSAgICBtX3BhZ2VHcm91cFJlZiA9IGFkb3B0 V0soV0tQYWdlR3JvdXBDcmVhdGVXaXRoSWRlbnRpZmllcihhZG9wdFdLKHRvQ29waWVkQVBJKGlk ZW50aWZpZXIpKS5nZXQoKSkpOworICAgIEFTU0VSVChwYWdlR3JvdXBNYXAoKS5nZXQobV9wYWdl R3JvdXBSZWYuZ2V0KCkpID09IHRoaXMpOworICAgIHBhZ2VHcm91cE1hcCgpLnJlbW92ZShtX3Bh Z2VHcm91cFJlZi5nZXQoKSk7CiB9CiAKIHZvaWQgRXdrUGFnZUdyb3VwOjphZGRVc2VyU3R5bGVT aGVldChjb25zdCBTdHJpbmcmIHNvdXJjZSwgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBFaW5hX0xp c3QqIHdoaXRlTGlzdCwgRWluYV9MaXN0KiBibGFja0xpc3QsIGJvb2wgbWFpbkZyYW1lT25seSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19wYWdlX2dy b3VwX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19wYWdl X2dyb3VwX3ByaXZhdGUuaAppbmRleCAxZTJlMmI2Li4zZjkyMjAxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcGFnZV9ncm91cF9wcml2YXRlLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXBfcHJpdmF0 ZS5oCkBAIC00MCwxOCArNDAsMTAgQEAgY2xhc3MgRXdrUGFnZUdyb3VwIDogcHVibGljIEV3a09i amVjdCB7CiBwdWJsaWM6CiAgICAgRVdLX09CSkVDVF9ERUNMQVJFKEV3a1BhZ2VHcm91cCkKIAot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV3a1BhZ2VHcm91cD4gY3JlYXRlKFdLUGFnZUdyb3VwUmVm IHBhZ2VHcm91cFJlZikKLSAgICB7Ci0gICAgICAgIGlmICghcGFnZUdyb3VwUmVmKQotICAgICAg ICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tQYWdlR3JvdXAoZGVmYXVsdElkZW50aWZpZXIp KTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tQYWdlR3JvdXA+IGZpbmRPckNyZWF0ZVdyYXBw ZXIoV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxF d2tQYWdlR3JvdXA+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIgPSBTdHJpbmcoKSk7 CiAKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tQYWdlR3JvdXAocGFnZUdyb3VwUmVm KSk7Ci0gICAgfQotCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrUGFnZUdyb3VwPiBjcmVhdGUo Y29uc3QgU3RyaW5nJiBpZGVudGlmaWVyID0gU3RyaW5nKCkpCi0gICAgewotICAgICAgICByZXR1 cm4gYWRvcHRSZWYobmV3IEV3a1BhZ2VHcm91cChpZGVudGlmaWVyLmlzRW1wdHkoKSA/IGRlZmF1 bHRJZGVudGlmaWVyIDogaWRlbnRpZmllcikpOwotICAgIH0KKyAgICB+RXdrUGFnZUdyb3VwKCk7 CiAKICAgICBXS1BhZ2VHcm91cFJlZiB3a1BhZ2VHcm91cCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFn ZUdyb3VwUmVmLmdldCgpOyB9CiAKQEAgLTU5LDggKzUxLDcgQEAgcHVibGljOgogICAgIHZvaWQg cmVtb3ZlQWxsVXNlclN0eWxlU2hlZXRzKCk7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgRXdr UGFnZUdyb3VwKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZik7Ci0gICAgZXhwbGljaXQgRXdr UGFnZUdyb3VwKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcik7CisgICAgZXhwbGljaXQgRXdrUGFn ZUdyb3VwKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZik7ICAgIAogCiAgICAgc3RhdGljIGNv bnN0IGNoYXIgZGVmYXVsdElkZW50aWZpZXJbXTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcAppbmRleCAyNDBjYmIzLi42 ZDEyZGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3Bl Y3RvclByb3h5RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYklu c3BlY3RvclByb3h5RWZsLmNwcApAQCAtMTAxLDcgKzEwMSw3IEBAIFdlYlBhZ2VQcm94eSogV2Vi SW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAKICAgICAvLyBG SVhNRTogUmVmYWN0b3IgdG8gdXNlIFdLVmlld1JlZi4KICAgICBXS0NvbnRleHRSZWYgY29udGV4 dFJlZiA9IHRvQVBJKHBhZ2UoKS0+cHJvY2VzcygpLT5jb250ZXh0KCkpOwotICAgIG1faW5zcGVj dG9yVmlldyA9IEV3a1ZpZXc6OmNyZWF0ZUV2YXNPYmplY3QoZWNvcmVfZXZhc19nZXQobV9pbnNw ZWN0b3JXaW5kb3cpLCBFd2tDb250ZXh0OjpmaW5kT3JDcmVhdGVXcmFwcGVyKGNvbnRleHRSZWYp LCBFd2tQYWdlR3JvdXA6OmNyZWF0ZSh0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAoKSkpLCBFd2tW aWV3OjpMZWdhY3lCZWhhdmlvcik7CisgICAgbV9pbnNwZWN0b3JWaWV3ID0gRXdrVmlldzo6Y3Jl YXRlRXZhc09iamVjdChlY29yZV9ldmFzX2dldChtX2luc3BlY3RvcldpbmRvdyksIEV3a0NvbnRl eHQ6OmZpbmRPckNyZWF0ZVdyYXBwZXIoY29udGV4dFJlZiksIEV3a1BhZ2VHcm91cDo6ZmluZE9y Q3JlYXRlV3JhcHBlcih0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAoKSkpLCBFd2tWaWV3OjpMZWdh Y3lCZWhhdmlvcik7CiAgICAgaWYgKCFtX2luc3BlY3RvclZpZXcpCiAgICAgICAgIHJldHVybiAw OwogCg== 193311 2013-03-15 08:09:27 -0700 2013-03-18 09:51:59 -0700 patch v2 bug112364_v2 text/plain 9742 mikhail.pozdnyakov Y29tbWl0IDViMjAxYjE1YTE1ZTc4ZTYxYTM5OWU2MjIyM2U2NDRjN2Q3ZjMwM2EKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg RnJpIE1hciAxNSAxNzowMzoyMyAyMDEzICswMjAwCgogICAgYnVnMTEyMzY0CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDc4N2JjNTQuLjk0YzZkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1MSBAQAogMjAxMy0w My0xNSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K IAorICAgICAgICBbV0syXVtFRkxdIEZpeCBjb2RlIHdyYXBwaW5nIFdLUGFnZUdyb3VwUmVmCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIzNjQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcGF0Y2gg Zml4ZXMgZm9sbG93aW5nIHByb2JsZW1zIGluIEVXSzIgV0tQYWdlR3JvdXBSZWYgd3JhcHBpbmcK KyAgICAgICAgY29kZTogZmlyc3RseSBpdCBtYWtlcyBzdXJlIHRoYXQgdGhlcmUgaXMgb25seSBv bmUgRXdrUGFnZUdyb3VwCisgICAgICAgIGluc3RhbmNlIHBlciBXS1BhZ2VHcm91cCBpbnN0YW5j ZSwgc2Vjb25kbHkgaXQgYWxsb3dzIHdlYiBwYWdlIHRvCisgICAgICAgIHRvIHVzZSB0aGUgZGVm YXVsdCBwYWdlIGdyb3VwICh3aGljaCBpcyBpbXBsaWNpdGx5IGNyZWF0ZWQgaW5zaWRlCisgICAg ICAgIHdlYiBjb250ZXh0KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3 LmNwcDoKKyAgICAgICAgKGNyZWF0ZVdLVmlldyk6CisKKyAgICAgICAgICAgIE5vdyBtYXkgcGFz cyAnMCcgcGFnZSBncm91cCBhcyBhIFdlYlZpZXcgY3JlYXRpb24gYXJndW1lbnQgc28KKyAgICAg ICAgICAgIHRoYXQgdGhlIGRlZmF1bHQgcGFnZSBncm91cCBpcyB1c2VkLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpFd2tWaWV3 KToKKyAgICAgICAgKEV3a1ZpZXc6OmNyZWF0ZUV2YXNPYmplY3QpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaDoKKyAgICAgICAgKEV3a1ZpZXcpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZWZsL2V3a19wYWdlX2dyb3VwLmNwcDoKKyAgICAgICAgKHBhZ2VHcm91cE1h cCk6CisKKyAgICAgICAgICAgIEEgbWFwIHRvIHRyYWNrIGNvcnJlc3BvbmRpbmcgRXdrUGFnZUdy b3VwIGFuZCBXS1BhZ2VHcm91cAorICAgICAgICAgICAgaW5zdGFuY2VzLgorCisgICAgICAgIChF d2tQYWdlR3JvdXA6OmZpbmRPckNyZWF0ZVdyYXBwZXIpOgorCisgICAgICAgICAgICBSZXR1cm5z IHRoZSBzYW1lIEV3a1BhZ2VHcm91cCBpbnN0YW5jZSBmb3IgdGhlIHNhbWUgV0tQYWdlR3JvdXAK KyAgICAgICAgICAgIGluc3RhbmNlLgorCisgICAgICAgIChFd2tQYWdlR3JvdXA6OmNyZWF0ZSk6 CisgICAgICAgIChFd2tQYWdlR3JvdXA6OkV3a1BhZ2VHcm91cCk6CisKKyAgICAgICAgICAgIE5v dyB0aGVyZSBpcyBvbmx5IG9uZSBjb25zdHJ1Y3RvciBhY2NlcHRpbmcgV0tQYWdlR3JvdXBSZWYu CisKKyAgICAgICAgKEV3a1BhZ2VHcm91cDo6fkV3a1BhZ2VHcm91cCk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXBfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrUGFn ZUdyb3VwKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5z cGVjdG9yUGFnZSk6CisKKzIwMTMtMDMtMTUgIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwu cG96ZG55YWtvdkBpbnRlbC5jb20+CisKICAgICAgICAgW1dLMl1bRUZMXSBHZXQgcmlkIG9mIFdl YlBhZ2VQcm94eTo6dmlld1dpZGdldCgpIG1ldGhvZAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMjg5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9lZmwvV0tWaWV3LmNwcAppbmRleCBkY2QzZTJjLi42OTkwMTVhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZWZsL1dLVmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2VmbC9XS1ZpZXcuY3BwCkBAIC0zMiw3ICsz Miw4IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiBzdGF0aWMgaW5saW5lIFdLVmlld1JlZiBj cmVhdGVXS1ZpZXcoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdl R3JvdXBSZWYgcGFnZUdyb3VwUmVmLCBFd2tWaWV3OjpWaWV3QmVoYXZpb3IgYmVoYXZpb3IpCiB7 CiAgICAgUmVmUHRyPEV3a0NvbnRleHQ+IGNvbnRleHQgPSBjb250ZXh0UmVmID8gRXdrQ29udGV4 dDo6ZmluZE9yQ3JlYXRlV3JhcHBlcihjb250ZXh0UmVmKSA6IEV3a0NvbnRleHQ6OmRlZmF1bHRD b250ZXh0KCk7Ci0gICAgUmVmUHRyPEV3a1BhZ2VHcm91cD4gcGFnZUdyb3VwID0gRXdrUGFnZUdy b3VwOjpjcmVhdGUocGFnZUdyb3VwUmVmKTsKKyAgICBSZWZQdHI8RXdrUGFnZUdyb3VwPiBwYWdl R3JvdXAgPSBwYWdlR3JvdXBSZWYgPyBFd2tQYWdlR3JvdXA6OmZpbmRPckNyZWF0ZVdyYXBwZXIo cGFnZUdyb3VwUmVmKSA6IDA7CisKICAgICBFdmFzX09iamVjdCogZXZhc09iamVjdCA9IEV3a1Zp ZXc6OmNyZWF0ZUV2YXNPYmplY3QoY2FudmFzLCBjb250ZXh0LCBwYWdlR3JvdXAsIGJlaGF2aW9y KTsKICAgICBpZiAoIWV2YXNPYmplY3QpCiAgICAgICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAppbmRleCAxN2RjYjY0Li44MWViMTE1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcApAQCAt MjQwLDkgKzI0MCw5IEBAIHN0YXRpYyBpbmxpbmUgV0tQYWdlVG9FdmFzT2JqZWN0TWFwJiB3a1Bh Z2VUb0V2YXNPYmplY3RNYXAoKQogRXdrVmlldzo6RXdrVmlldyhFdmFzX09iamVjdCogZXZhc09i amVjdCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBjb250ZXh0LCBQYXNzUmVmUHRyPEV3a1BhZ2VH cm91cD4gcGFnZUdyb3VwLCBWaWV3QmVoYXZpb3IgYmVoYXZpb3IpCiAgICAgOiBtX2V2YXNPYmpl Y3QoZXZhc09iamVjdCkKICAgICAsIG1fY29udGV4dChjb250ZXh0KQotICAgICwgbV9wYWdlR3Jv dXAocGFnZUdyb3VwKQotICAgICwgbV9wZW5kaW5nU3VyZmFjZVJlc2l6ZShmYWxzZSkKLSAgICAs IG1fd2ViVmlldyhhZG9wdFJlZihuZXcgV2ViVmlldyh0b0ltcGwobV9jb250ZXh0LT53a0NvbnRl eHQoKSksIHRvSW1wbChtX3BhZ2VHcm91cC0+d2tQYWdlR3JvdXAoKSksIHRoaXMpKSkKKyAgICAs IG1fd2ViVmlldyhhZG9wdFJlZihuZXcgV2ViVmlldyh0b0ltcGwobV9jb250ZXh0LT53a0NvbnRl eHQoKSksIHBhZ2VHcm91cCA/IHRvSW1wbChwYWdlR3JvdXAtPndrUGFnZUdyb3VwKCkpIDogMCwg dGhpcykpKQorICAgICwgbV9wYWdlR3JvdXAoRXdrUGFnZUdyb3VwOjpmaW5kT3JDcmVhdGVXcmFw cGVyKFdLUGFnZUdldFBhZ2VHcm91cCh3a1BhZ2UoKSkpKQorICAgICwgbV9wZW5kaW5nU3VyZmFj ZVJlc2l6ZShmYWxzZSkgICAgCiAgICAgLCBtX3BhZ2VMb2FkQ2xpZW50KFBhZ2VMb2FkQ2xpZW50 RWZsOjpjcmVhdGUodGhpcykpCiAgICAgLCBtX3BhZ2VQb2xpY3lDbGllbnQoUGFnZVBvbGljeUNs aWVudEVmbDo6Y3JlYXRlKHRoaXMpKQogICAgICwgbV9wYWdlVUlDbGllbnQoUGFnZVVJQ2xpZW50 RWZsOjpjcmVhdGUodGhpcykpCkBAIC0zMzcsNyArMzM3LDcgQEAgRXZhc19PYmplY3QqIEV3a1Zp ZXc6OmNyZWF0ZUV2YXNPYmplY3QoRXZhcyogY2FudmFzLCBFdmFzX1NtYXJ0KiBzbWFydCwgUGFz c1JlZlAKIAogICAgIEFTU0VSVCghc21hcnREYXRhLT5wcml2KTsKIAotICAgIHNtYXJ0RGF0YS0+ cHJpdiA9IG5ldyBFd2tWaWV3KGV2YXNPYmplY3QsIGNvbnRleHQsIChwYWdlR3JvdXAgPyBwYWdl R3JvdXAgOiBFd2tQYWdlR3JvdXA6OmNyZWF0ZSgpKSwgYmVoYXZpb3IpOworICAgIHNtYXJ0RGF0 YS0+cHJpdiA9IG5ldyBFd2tWaWV3KGV2YXNPYmplY3QsIGNvbnRleHQsIHBhZ2VHcm91cCwgYmVo YXZpb3IpOwogCiAgICAgcmV0dXJuIGV2YXNPYmplY3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKaW5kZXggYWY3OWY1OC4uNjYyNjE5NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaApAQCAtMjU0LDYgKzI1NCw3IEBA IHByaXZhdGU6CiAgICAgLy8gTm90ZSwgaW5pdGlhbGl6YXRpb24gb3JkZXIgbWF0dGVycy4KICAg ICBFdmFzX09iamVjdCogbV9ldmFzT2JqZWN0OwogICAgIFJlZlB0cjxFd2tDb250ZXh0PiBtX2Nv bnRleHQ7CisgICAgUmVmUHRyPFdlYktpdDo6V2ViVmlldz4gbV93ZWJWaWV3OwogICAgIFJlZlB0 cjxFd2tQYWdlR3JvdXA+IG1fcGFnZUdyb3VwOwogICAgIE93blB0cjxFdmFzX0dMPiBtX2V2YXNH TDsKICAgICBPd25QdHI8V2ViS2l0OjpFdmFzR0xDb250ZXh0PiBtX2V2YXNHTENvbnRleHQ7CkBA IC0yNjEsNyArMjYyLDYgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fZGV2aWNl U2l6ZTsKICAgICBXZWJDb3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCBtX3VzZXJWaWV3cG9ydFRy YW5zZm9ybTsKICAgICBib29sIG1fcGVuZGluZ1N1cmZhY2VSZXNpemU7Ci0gICAgUmVmUHRyPFdl YktpdDo6V2ViVmlldz4gbV93ZWJWaWV3OwogICAgIE93blB0cjxXZWJLaXQ6OlBhZ2VMb2FkQ2xp ZW50RWZsPiBtX3BhZ2VMb2FkQ2xpZW50OwogICAgIE93blB0cjxXZWJLaXQ6OlBhZ2VQb2xpY3lD bGllbnRFZmw+IG1fcGFnZVBvbGljeUNsaWVudDsKICAgICBPd25QdHI8V2ViS2l0OjpQYWdlVUlD bGllbnRFZmw+IG1fcGFnZVVJQ2xpZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXAuY3BwCmluZGV4IGJhMjM4ZTQuLjg0Y2Q1NjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19wYWdlX2dyb3Vw LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcGFnZV9ncm91 cC5jcHAKQEAgLTM3LDE5ICszNyw0NiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCiBjb25z dCBjaGFyIEV3a1BhZ2VHcm91cDo6ZGVmYXVsdElkZW50aWZpZXJbXSA9ICJkZWZhdWx0UGFnZUdy b3VwSWRlbnRpZmllciI7CiAKK3R5cGVkZWYgSGFzaE1hcDxXS1BhZ2VHcm91cFJlZiwgRXdrUGFn ZUdyb3VwKj4gUGFnZUdyb3VwTWFwOworCitzdGF0aWMgaW5saW5lIFBhZ2VHcm91cE1hcCYgcGFn ZUdyb3VwTWFwKCkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFBhZ2VHcm91cE1hcCwgbWFw LCAoKSk7CisgICAgcmV0dXJuIG1hcDsKK30KKwogc3RhdGljIFdLVHlwZVJlZiBjb252ZXJ0RnJv bUNoYXJUb1dLU3RyaW5nKHZvaWQqIGRhdGEpCiB7CiAgICAgcmV0dXJuIFdLU3RyaW5nQ3JlYXRl V2l0aFVURjhDU3RyaW5nKHN0YXRpY19jYXN0PGNoYXIqPihkYXRhKSk7CiB9CiAKK1Bhc3NSZWZQ dHI8RXdrUGFnZUdyb3VwPiBFd2tQYWdlR3JvdXA6OmZpbmRPckNyZWF0ZVdyYXBwZXIoV0tQYWdl R3JvdXBSZWYgcGFnZUdyb3VwUmVmKQoreworICAgIGlmIChwYWdlR3JvdXBNYXAoKS5jb250YWlu cyhwYWdlR3JvdXBSZWYpKQorICAgICAgICByZXR1cm4gcGFnZUdyb3VwTWFwKCkuZ2V0KHBhZ2VH cm91cFJlZik7CisKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEV3a1BhZ2VHcm91cChwYWdlR3Jv dXBSZWYpKTsKK30KKworUGFzc1JlZlB0cjxFd2tQYWdlR3JvdXA+IEV3a1BhZ2VHcm91cDo6Y3Jl YXRlKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcikKK3sKKyAgICBXS1JldGFpblB0cjxXS1N0cmlu Z1JlZj4gaWRlbnRpZmllclJlZiA9IGFkb3B0V0sodG9Db3BpZWRBUEkoaWRlbnRpZmllci5pc0Vt cHR5KCkgPyBkZWZhdWx0SWRlbnRpZmllciA6IGlkZW50aWZpZXIpKTsKKyAgICBXS1JldGFpblB0 cjxXS1BhZ2VHcm91cFJlZj4gcGFnZUdyb3VwUmVmID0gYWRvcHRXSyhXS1BhZ2VHcm91cENyZWF0 ZVdpdGhJZGVudGlmaWVyKGlkZW50aWZpZXJSZWYuZ2V0KCkpKTsKKworICAgIHJldHVybiBhZG9w dFJlZihuZXcgRXdrUGFnZUdyb3VwKHBhZ2VHcm91cFJlZi5nZXQoKSkpOworfQorCiBFd2tQYWdl R3JvdXA6OkV3a1BhZ2VHcm91cChXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYpCiAgICAgOiBt X3BhZ2VHcm91cFJlZihwYWdlR3JvdXBSZWYpCiB7CisgICAgUGFnZUdyb3VwTWFwOjpBZGRSZXN1 bHQgcmVzdWx0ID0gcGFnZUdyb3VwTWFwKCkuYWRkKHBhZ2VHcm91cFJlZiwgdGhpcyk7CisgICAg QVNTRVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAotRXdrUGFnZUdy b3VwOjpFd2tQYWdlR3JvdXAoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKQorRXdrUGFnZUdyb3Vw Ojp+RXdrUGFnZUdyb3VwKCkKIHsKLSAgICBtX3BhZ2VHcm91cFJlZiA9IGFkb3B0V0soV0tQYWdl R3JvdXBDcmVhdGVXaXRoSWRlbnRpZmllcihhZG9wdFdLKHRvQ29waWVkQVBJKGlkZW50aWZpZXIp KS5nZXQoKSkpOworICAgIEFTU0VSVChwYWdlR3JvdXBNYXAoKS5nZXQobV9wYWdlR3JvdXBSZWYu Z2V0KCkpID09IHRoaXMpOworICAgIHBhZ2VHcm91cE1hcCgpLnJlbW92ZShtX3BhZ2VHcm91cFJl Zi5nZXQoKSk7CiB9CiAKIHZvaWQgRXdrUGFnZUdyb3VwOjphZGRVc2VyU3R5bGVTaGVldChjb25z dCBTdHJpbmcmIHNvdXJjZSwgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBFaW5hX0xpc3QqIHdoaXRl TGlzdCwgRWluYV9MaXN0KiBibGFja0xpc3QsIGJvb2wgbWFpbkZyYW1lT25seSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19wYWdlX2dyb3VwX3ByaXZh dGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19wYWdlX2dyb3VwX3By aXZhdGUuaAppbmRleCAxZTJlMmI2Li4zZjkyMjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcGFnZV9ncm91cF9wcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3BhZ2VfZ3JvdXBfcHJpdmF0ZS5oCkBAIC00 MCwxOCArNDAsMTAgQEAgY2xhc3MgRXdrUGFnZUdyb3VwIDogcHVibGljIEV3a09iamVjdCB7CiBw dWJsaWM6CiAgICAgRVdLX09CSkVDVF9ERUNMQVJFKEV3a1BhZ2VHcm91cCkKIAotICAgIHN0YXRp YyBQYXNzUmVmUHRyPEV3a1BhZ2VHcm91cD4gY3JlYXRlKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91 cFJlZikKLSAgICB7Ci0gICAgICAgIGlmICghcGFnZUdyb3VwUmVmKQotICAgICAgICAgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBFd2tQYWdlR3JvdXAoZGVmYXVsdElkZW50aWZpZXIpKTsKKyAgICBz dGF0aWMgUGFzc1JlZlB0cjxFd2tQYWdlR3JvdXA+IGZpbmRPckNyZWF0ZVdyYXBwZXIoV0tQYWdl R3JvdXBSZWYgcGFnZUdyb3VwUmVmKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tQYWdlR3Jv dXA+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIgPSBTdHJpbmcoKSk7CiAKLSAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tQYWdlR3JvdXAocGFnZUdyb3VwUmVmKSk7Ci0gICAg fQotCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrUGFnZUdyb3VwPiBjcmVhdGUoY29uc3QgU3Ry aW5nJiBpZGVudGlmaWVyID0gU3RyaW5nKCkpCi0gICAgewotICAgICAgICByZXR1cm4gYWRvcHRS ZWYobmV3IEV3a1BhZ2VHcm91cChpZGVudGlmaWVyLmlzRW1wdHkoKSA/IGRlZmF1bHRJZGVudGlm aWVyIDogaWRlbnRpZmllcikpOwotICAgIH0KKyAgICB+RXdrUGFnZUdyb3VwKCk7CiAKICAgICBX S1BhZ2VHcm91cFJlZiB3a1BhZ2VHcm91cCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUdyb3VwUmVm LmdldCgpOyB9CiAKQEAgLTU5LDggKzUxLDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQWxs VXNlclN0eWxlU2hlZXRzKCk7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgRXdrUGFnZUdyb3Vw KFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZik7Ci0gICAgZXhwbGljaXQgRXdrUGFnZUdyb3Vw KGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcik7CisgICAgZXhwbGljaXQgRXdrUGFnZUdyb3VwKFdL UGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZik7ICAgIAogCiAgICAgc3RhdGljIGNvbnN0IGNoYXIg ZGVmYXVsdElkZW50aWZpZXJbXTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZWZsL1dlYkluc3BlY3RvclByb3h5RWZsLmNwcAppbmRleCAyNDBjYmIzLi42ZDEyZGZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclByb3h5 RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkluc3BlY3RvclBy b3h5RWZsLmNwcApAQCAtMTAxLDcgKzEwMSw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVjdG9y UHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAKICAgICAvLyBGSVhNRTogUmVm YWN0b3IgdG8gdXNlIFdLVmlld1JlZi4KICAgICBXS0NvbnRleHRSZWYgY29udGV4dFJlZiA9IHRv QVBJKHBhZ2UoKS0+cHJvY2VzcygpLT5jb250ZXh0KCkpOwotICAgIG1faW5zcGVjdG9yVmlldyA9 IEV3a1ZpZXc6OmNyZWF0ZUV2YXNPYmplY3QoZWNvcmVfZXZhc19nZXQobV9pbnNwZWN0b3JXaW5k b3cpLCBFd2tDb250ZXh0OjpmaW5kT3JDcmVhdGVXcmFwcGVyKGNvbnRleHRSZWYpLCBFd2tQYWdl R3JvdXA6OmNyZWF0ZSh0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAoKSkpLCBFd2tWaWV3OjpMZWdh Y3lCZWhhdmlvcik7CisgICAgbV9pbnNwZWN0b3JWaWV3ID0gRXdrVmlldzo6Y3JlYXRlRXZhc09i amVjdChlY29yZV9ldmFzX2dldChtX2luc3BlY3RvcldpbmRvdyksIEV3a0NvbnRleHQ6OmZpbmRP ckNyZWF0ZVdyYXBwZXIoY29udGV4dFJlZiksIEV3a1BhZ2VHcm91cDo6ZmluZE9yQ3JlYXRlV3Jh cHBlcih0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAoKSkpLCBFd2tWaWV3OjpMZWdhY3lCZWhhdmlv cik7CiAgICAgaWYgKCFtX2luc3BlY3RvclZpZXcpCiAgICAgICAgIHJldHVybiAwOwogCg==