121443 2013-09-16 11:45:21 -0700 Remove some uses of PassOwnPtr in WebKit2 2013-09-16 11:57:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 929838 0 andersca 2013-09-16 11:45:21 -0700 Remove some uses of PassOwnPtr in WebKit2 929841 1 211813 andersca 2013-09-16 11:48:40 -0700 Created attachment 211813 Patch 929843 2 211813 kling 2013-09-16 11:54:33 -0700 Comment on attachment 211813 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211813&action=review > Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:41 > + : m_client() wat 929847 3 andersca 2013-09-16 11:57:33 -0700 Committed r155888: <http://trac.webkit.org/changeset/155888> 211813 2013-09-16 11:48:40 -0700 2013-09-16 11:54:33 -0700 Patch bug-121443-20130916114839.patch text/plain 17959 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1ODgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWYyYzBiN2NmMmRhOTBk OTlhMmFiMmVkMWJjYThjOTc5ZDkwOGIwMS4uZDk0NTJiY2YxYjM3Nzc4MTY4MzVkNDFkMWEzZTIy NTMyOTZlMjZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTA5LTE2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNvbWUg dXNlcyBvZiBQYXNzT3duUHRyIGluIFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTQ0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5OgorICAg ICAgICAobWVzc2FnZV90b19zdHJ1Y3RfZGVjbGFyYXRpb24pOgorICAgICAgICAoZ2VuZXJhdGVf bWVzc2FnZV9oYW5kbGVyKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5p dHRlc3QucHk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvRmluZEluZGljYXRvcldpbmRv dy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL0ZpbmRJbmRpY2F0b3JXaW5kb3cubW06 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6 UGFnZUNsaWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IFdlYktpdDo6XSk6Cisg ICAgICAgICgtW1dLVmlldyBfc2V0RmluZEluZGljYXRvcjpmYWRlT3V0OmFuaW1hdGU6XSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVBy b3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYVByb3h5Lm1tOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv V0tCdW5kbGVQYWdlT3ZlcmxheS5jcHA6CisgICAgICAgIChQYWdlT3ZlcmxheUNsaWVudEltcGw6 OlBhZ2VPdmVybGF5Q2xpZW50SW1wbCk6CisgICAgICAgIChXS0J1bmRsZVBhZ2VPdmVybGF5Q3Jl YXRlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAg ICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OmNyZWF0ZVdlYkV2ZW50KToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oOgorCiAyMDEzLTA5LTE2ICBBbmRyZSBNb3JlaXJh IE1hZ2FsaGFlcyAgIDxhbmRyZS5tYWdhbGhhZXNAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IERvIG5vdCB0cnkgdG8gcGFyc2UgaW5jb21wbGV0ZSBIVFRQIHJlcXVl c3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMu cHkgYi9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKaW5kZXggMDc2 NzZkZTU3YWM1ZWE2OWNiOWQxNTZkZGFmODE4MTk5MjJhNTA4OS4uNzk3MGMwOWU3NjcyNWJiNmFm ZDI2OTBjMWRmODNhODE3NGEyNzMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2NyaXB0 cy93ZWJraXQyL21lc3NhZ2VzLnB5CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0 Mi9tZXNzYWdlcy5weQpAQCAtMTMwLDcgKzEzMCw3IEBAIGRlZiBtZXNzYWdlX3RvX3N0cnVjdF9k ZWNsYXJhdGlvbihtZXNzYWdlKToKICAgICAgICAgaWYgbWVzc2FnZS5oYXNfYXR0cmlidXRlKERF TEFZRURfQVRUUklCVVRFKToKICAgICAgICAgICAgIHNlbmRfcGFyYW1ldGVycyA9IFsoZnVuY3Rp b25fcGFyYW1ldGVyX3R5cGUoeC50eXBlKSwgeC5uYW1lKSBmb3IgeCBpbiBtZXNzYWdlLnJlcGx5 X3BhcmFtZXRlcnNdCiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCcgICAgc3RydWN0IERlbGF5 ZWRSZXBseSA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxEZWxheWVkUmVwbHk+IHtcbicp Ci0gICAgICAgICAgICByZXN1bHQuYXBwZW5kKCcgICAgICAgIERlbGF5ZWRSZXBseShQYXNzUmVm UHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCBQYXNzT3duUHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNv ZGVyPik7XG4nKQorICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnICAgICAgICBEZWxheWVkUmVw bHkoUGFzc1JlZlB0cjxDb3JlSVBDOjpDb25uZWN0aW9uPiwgT3duUHRyPENvcmVJUEM6Ok1lc3Nh Z2VFbmNvZGVyPik7XG4nKQogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnICAgICAgICB+RGVs YXllZFJlcGx5KCk7XG4nKQogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnXG4nKQogICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZCgnICAgICAgICBib29sIHNlbmQoJXMpO1xuJyAlICcsICcuam9p bihbJyAnLmpvaW4oeCkgZm9yIHggaW4gc2VuZF9wYXJhbWV0ZXJzXSkpCkBAIC01MjEsOSArNTIx LDkgQEAgZGVmIGdlbmVyYXRlX21lc3NhZ2VfaGFuZGxlcihmaWxlKToKICAgICAgICAgICAgIGlm IG1lc3NhZ2UuY29uZGl0aW9uOgogICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJyNpZiAl c1xuXG4nICUgbWVzc2FnZS5jb25kaXRpb24pCiAgICAgICAgICAgICAKLSAgICAgICAgICAgIHJl c3VsdC5hcHBlbmQoJyVzOjpEZWxheWVkUmVwbHk6OkRlbGF5ZWRSZXBseShQYXNzUmVmUHRyPENv cmVJUEM6OkNvbm5lY3Rpb24+IGNvbm5lY3Rpb24sIFBhc3NPd25QdHI8Q29yZUlQQzo6TWVzc2Fn ZUVuY29kZXI+IGVuY29kZXIpXG4nICUgbWVzc2FnZS5uYW1lKQorICAgICAgICAgICAgcmVzdWx0 LmFwcGVuZCgnJXM6OkRlbGF5ZWRSZXBseTo6RGVsYXllZFJlcGx5KFBhc3NSZWZQdHI8Q29yZUlQ Qzo6Q29ubmVjdGlvbj4gY29ubmVjdGlvbiwgT3duUHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNvZGVy PiBlbmNvZGVyKVxuJyAlIG1lc3NhZ2UubmFtZSkKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQo JyAgICA6IG1fY29ubmVjdGlvbihjb25uZWN0aW9uKVxuJykKLSAgICAgICAgICAgIHJlc3VsdC5h cHBlbmQoJyAgICAsIG1fZW5jb2RlcihlbmNvZGVyKVxuJykKKyAgICAgICAgICAgIHJlc3VsdC5h cHBlbmQoJyAgICAsIG1fZW5jb2RlcihzdGQ6Om1vdmUoZW5jb2RlcikpXG4nKQogICAgICAgICAg ICAgcmVzdWx0LmFwcGVuZCgne1xuJykKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJ31cbicp CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCdcbicpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRlc3QucHkgYi9Tb3VyY2UvV2ViS2l0 Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRlc3QucHkKaW5kZXggYTdhNDAzY2E2Yzgz N2ViYWQ1MTgwOGQ4MzFjZDdjNjRmYTFmY2UzNC4uZDExZTI3ODdkZTg2ZmI2YjM0OWIzYWNlOTU4 NjJmZGY5YWM5ZDJiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQy L21lc3NhZ2VzX3VuaXR0ZXN0LnB5CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0 Mi9tZXNzYWdlc191bml0dGVzdC5weQpAQCAtNDc2LDcgKzQ3Niw3IEBAIHN0cnVjdCBHZXRQbHVn aW5Qcm9jZXNzQ29ubmVjdGlvbiA6IENvcmVJUEM6OkFyZ3VtZW50czE8Y29uc3QgV1RGOjpTdHJp bmcmPiB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaXNTeW5jID0gdHJ1ZTsKIAogICAgIHN0cnVj dCBEZWxheWVkUmVwbHkgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8RGVsYXllZFJlcGx5 PiB7Ci0gICAgICAgIERlbGF5ZWRSZXBseShQYXNzUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+ LCBQYXNzT3duUHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNvZGVyPik7CisgICAgICAgIERlbGF5ZWRS ZXBseShQYXNzUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCBPd25QdHI8Q29yZUlQQzo6TWVz c2FnZUVuY29kZXI+KTsKICAgICAgICAgfkRlbGF5ZWRSZXBseSgpOwogCiAgICAgICAgIGJvb2wg c2VuZChjb25zdCBDb3JlSVBDOjpDb25uZWN0aW9uOjpIYW5kbGUmIGNvbm5lY3Rpb25IYW5kbGUp OwpAQCAtNTAwLDcgKzUwMCw3IEBAIHN0cnVjdCBUZXN0TXVsdGlwbGVBdHRyaWJ1dGVzIDogQ29y ZUlQQzo6QXJndW1lbnRzMCB7CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaXNTeW5jID0gdHJ1ZTsK IAogICAgIHN0cnVjdCBEZWxheWVkUmVwbHkgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8 RGVsYXllZFJlcGx5PiB7Ci0gICAgICAgIERlbGF5ZWRSZXBseShQYXNzUmVmUHRyPENvcmVJUEM6 OkNvbm5lY3Rpb24+LCBQYXNzT3duUHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNvZGVyPik7CisgICAg ICAgIERlbGF5ZWRSZXBseShQYXNzUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCBPd25QdHI8 Q29yZUlQQzo6TWVzc2FnZUVuY29kZXI+KTsKICAgICAgICAgfkRlbGF5ZWRSZXBseSgpOwogCiAg ICAgICAgIGJvb2wgc2VuZCgpOwpAQCAtNjYzLDkgKzY2Myw5IEBAIG5hbWVzcGFjZSBNZXNzYWdl cyB7CiAKIG5hbWVzcGFjZSBXZWJQYWdlIHsKIAotR2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb246 OkRlbGF5ZWRSZXBseTo6RGVsYXllZFJlcGx5KFBhc3NSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlv bj4gY29ubmVjdGlvbiwgUGFzc093blB0cjxDb3JlSVBDOjpNZXNzYWdlRW5jb2Rlcj4gZW5jb2Rl cikKK0dldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uOjpEZWxheWVkUmVwbHk6OkRlbGF5ZWRSZXBs eShQYXNzUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IGNvbm5lY3Rpb24sIE93blB0cjxDb3Jl SVBDOjpNZXNzYWdlRW5jb2Rlcj4gZW5jb2RlcikKICAgICA6IG1fY29ubmVjdGlvbihjb25uZWN0 aW9uKQotICAgICwgbV9lbmNvZGVyKGVuY29kZXIpCisgICAgLCBtX2VuY29kZXIoc3RkOjptb3Zl KGVuY29kZXIpKQogewogfQogCkBAIC02ODMsOSArNjgzLDkgQEAgYm9vbCBHZXRQbHVnaW5Qcm9j ZXNzQ29ubmVjdGlvbjo6RGVsYXllZFJlcGx5OjpzZW5kKGNvbnN0IENvcmVJUEM6OkNvbm5lY3Rp b246OkgKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1UZXN0TXVsdGlwbGVBdHRyaWJ1dGVzOjpE ZWxheWVkUmVwbHk6OkRlbGF5ZWRSZXBseShQYXNzUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+ IGNvbm5lY3Rpb24sIFBhc3NPd25QdHI8Q29yZUlQQzo6TWVzc2FnZUVuY29kZXI+IGVuY29kZXIp CitUZXN0TXVsdGlwbGVBdHRyaWJ1dGVzOjpEZWxheWVkUmVwbHk6OkRlbGF5ZWRSZXBseShQYXNz UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IGNvbm5lY3Rpb24sIE93blB0cjxDb3JlSVBDOjpN ZXNzYWdlRW5jb2Rlcj4gZW5jb2RlcikKICAgICA6IG1fY29ubmVjdGlvbihjb25uZWN0aW9uKQot ICAgICwgbV9lbmNvZGVyKGVuY29kZXIpCisgICAgLCBtX2VuY29kZXIoc3RkOjptb3ZlKGVuY29k ZXIpKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9GaW5kSW5kaWNhdG9yV2luZG93LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9GaW5kSW5kaWNhdG9yV2luZG93LmgKaW5kZXggY2JlMzRhMWE5MGZiOWJhOWE1YmY3OTM2NWJi MTdkMjM0YTlkOGE0My4uMTYzMTQ5MzNkMGMzZWNlMDI3OTA1YTEyMGY4OGUwNjFkY2QyZDY4MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvRmluZEluZGljYXRv cldpbmRvdy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL0ZpbmRJbmRp Y2F0b3JXaW5kb3cuaApAQCAtNDQsMTMgKzQ0LDEyIEBAIGNsYXNzIEZpbmRJbmRpY2F0b3JXaW5k b3cgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEZpbmRJbmRpY2F0b3JXaW5kb3cpOwogCiBw dWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RmluZEluZGljYXRvcldpbmRvdz4gY3JlYXRl KFdLVmlldyAqKTsKKyAgICBleHBsaWNpdCBGaW5kSW5kaWNhdG9yV2luZG93KFdLVmlldyAqKTsK ICAgICB+RmluZEluZGljYXRvcldpbmRvdygpOwogCiAgICAgdm9pZCBzZXRGaW5kSW5kaWNhdG9y KFBhc3NSZWZQdHI8RmluZEluZGljYXRvcj4sIGJvb2wgZmFkZU91dCwgYm9vbCBhbmltYXRlKTsK IAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBGaW5kSW5kaWNhdG9yV2luZG93KFdLVmlldyAqKTsK ICAgICB2b2lkIGNsb3NlV2luZG93KCk7CiAKICAgICB2b2lkIHN0YXJ0RmFkZU91dFRpbWVyRmly ZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL0ZpbmRJ bmRpY2F0b3JXaW5kb3cubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9GaW5k SW5kaWNhdG9yV2luZG93Lm1tCmluZGV4IDE5ZDY5NjY3MDcxMjhhOTMzMDI5NGVmN2MzOWMwY2Qw YTRmYjJhNTEuLjhhYTk0YmQ5OWFhYTk4NjYyZWJmM2Y1ZmVkYmJhN2I1NTVhZmYyOTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL0ZpbmRJbmRpY2F0b3JXaW5k b3cubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvRmluZEluZGljYXRv cldpbmRvdy5tbQpAQCAtMTEyLDExICsxMTIsNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK IAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBhc3NPd25QdHI8RmluZEluZGljYXRvcldpbmRvdz4g RmluZEluZGljYXRvcldpbmRvdzo6Y3JlYXRlKFdLVmlldyAqd2tWaWV3KQotewotICAgIHJldHVy biBhZG9wdFB0cihuZXcgRmluZEluZGljYXRvcldpbmRvdyh3a1ZpZXcpKTsKLX0KLQogRmluZElu ZGljYXRvcldpbmRvdzo6RmluZEluZGljYXRvcldpbmRvdyhXS1ZpZXcgKndrVmlldykKICAgICA6 IG1fd2tWaWV3KHdrVmlldykKICAgICAsIG1fYm91bmNlQW5pbWF0aW9uQ29udGV4dCgwKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKaW5k ZXggNWY3NDdjMGM1NTg0YWMxYzA5MDczODg0MjljMzJkMGM4MzgzNTUxOC4uOTMyYzc0YmU3ZWQz NDBhZGZiMjRiZDFiYjU2MGQ5MDM5NzJmOGQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCkBAIC01MCw3ICs1MCw3IEBAIHB1Ymxp YzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgUGFnZUNsaWVudEltcGwoV0tWaWV3Kik7CiAKLSAg ICB2aXJ0dWFsIFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQ cm94eSgpOworICAgIHZpcnR1YWwgT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdp bmdBcmVhUHJveHkoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxheShjb25z dCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lkIGRpc3BsYXlWaWV3KCk7CiAg ICAgdmlydHVhbCBib29sIGNhblNjcm9sbFZpZXcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW0KaW5kZXggZjgwZWY3ZGQ1YWFlYTNi MDI2ODU1Y2MyNDY1MWI5M2U4ZTdiODJkMy4uNmU3MWQxMTlkZmY3MjU5ZDBjODc2MmQ2ZGQ4NWZh ZDg0MjBlZDM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv UGFnZUNsaWVudEltcGwubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv UGFnZUNsaWVudEltcGwubW0KQEAgLTEzOCw3ICsxMzgsNyBAQCBQYWdlQ2xpZW50SW1wbDo6flBh Z2VDbGllbnRJbXBsKCkKIHsKIH0KIAotUGFzc093blB0cjxEcmF3aW5nQXJlYVByb3h5PiBQYWdl Q2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCitPd25QdHI8RHJhd2luZ0FyZWFQ cm94eT4gUGFnZUNsaWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQogewogICAgIHJl dHVybiBbbV93a1ZpZXcgX2NyZWF0ZURyYXdpbmdBcmVhUHJveHldOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4IDc3ZWQ3MGM2ZjljYjllOTdkNDVj ZTliMmY2YTFhNWRhMzM3NWQ5Y2YuLjM5OTlhMDEzZmU4NjRmZjQ0Nzk3NTFjZjUyOTRlOTlmYTIw ZmQyM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAg LTIzNjUsMTggKzIzNjUsMTggQEAgc3RhdGljIHZvaWQgZHJhd1BhZ2VCYWNrZ3JvdW5kKENHQ29u dGV4dFJlZiBjb250ZXh0LCBXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IEkKIAogQGltcGxlbWVu dGF0aW9uIFdLVmlldyAoSW50ZXJuYWwpCiAKLS0gKFBhc3NPd25QdHI8V2ViS2l0OjpEcmF3aW5n QXJlYVByb3h5PilfY3JlYXRlRHJhd2luZ0FyZWFQcm94eQorLSAoT3duUHRyPFdlYktpdDo6RHJh d2luZ0FyZWFQcm94eT4pX2NyZWF0ZURyYXdpbmdBcmVhUHJveHkKIHsKICNpZiBFTkFCTEUoVEhS RUFERURfU0NST0xMSU5HKQogICAgIGlmIChbc2VsZiBfc2hvdWxkVXNlVGlsZWREcmF3aW5nQXJl YV0pIHsKICAgICAgICAgaWYgKGdldGVudigiV0tfVVNFX1JFTU9URV9MQVlFUl9UUkVFX0RSQVdJ TkdfQVJFQSIpKQogICAgICAgICAgICAgcmV0dXJuIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVh UHJveHk6OmNyZWF0ZShfZGF0YS0+X3BhZ2UuZ2V0KCkpOwogCi0gICAgICAgIHJldHVybiBUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpjcmVhdGUoX2RhdGEtPl9wYWdlLmdldCgp KTsKKyAgICAgICAgcmV0dXJuIGNyZWF0ZU93bmVkPFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhUHJveHk+KF9kYXRhLT5fcGFnZS5nZXQoKSk7CiAgICAgfQogI2VuZGlmCiAKLSAgICByZXR1 cm4gRHJhd2luZ0FyZWFQcm94eUltcGw6OmNyZWF0ZShfZGF0YS0+X3BhZ2UuZ2V0KCkpOworICAg IHJldHVybiBjcmVhdGVPd25lZDxEcmF3aW5nQXJlYVByb3h5SW1wbD4oX2RhdGEtPl9wYWdlLmdl dCgpKTsKIH0KIAogLSAoQk9PTClfaXNGb2N1c2VkCkBAIC0yNjU5LDcgKzI2NTksNyBAQCBzdGF0 aWMgdm9pZCBkcmF3UGFnZUJhY2tncm91bmQoQ0dDb250ZXh0UmVmIGNvbnRleHQsIFdlYlBhZ2VQ cm94eSogcGFnZSwgY29uc3QgSQogICAgIH0KIAogICAgIGlmICghX2RhdGEtPl9maW5kSW5kaWNh dG9yV2luZG93KQotICAgICAgICBfZGF0YS0+X2ZpbmRJbmRpY2F0b3JXaW5kb3cgPSBGaW5kSW5k aWNhdG9yV2luZG93OjpjcmVhdGUoc2VsZik7CisgICAgICAgIF9kYXRhLT5fZmluZEluZGljYXRv cldpbmRvdyA9IGNyZWF0ZU93bmVkPEZpbmRJbmRpY2F0b3JXaW5kb3c+KHNlbGYpOwogCiAgICAg X2RhdGEtPl9maW5kSW5kaWNhdG9yV2luZG93LT5zZXRGaW5kSW5kaWNhdG9yKGZpbmRJbmRpY2F0 b3IsIGZhZGVPdXQsIGFuaW1hdGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKaW5kZXggOGU2MmM1NzZhZjJmOGE2MTkxYjc5Y2Yy YzAzMmU0ZGU5OGI4MTc4NC4uNjdhZWUxY2UyZjU4NDE5NmVhNmNjZmVjYzQ0YTQyYzU4YzRjZjhl YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50 ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJbnRl cm5hbC5oCkBAIC01MCw3ICs1MCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogQGNsYXNzIFdLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXI7CiAKIEBpbnRlcmZhY2UgV0tWaWV3IChJbnRlcm5hbCkK LS0gKFBhc3NPd25QdHI8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5PilfY3JlYXRlRHJhd2luZ0Fy ZWFQcm94eTsKKy0gKE93blB0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+KV9jcmVhdGVEcmF3 aW5nQXJlYVByb3h5OwogLSAoQk9PTClfaXNGb2N1c2VkOwogLSAodm9pZClfcHJvY2Vzc0RpZENy YXNoOwogLSAodm9pZClfcGFnZUNsb3NlZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCmluZGV4IDc5MGM4YTkzOTczYjc4ZTFmOTMyNDIy ZDAzOWVhNGE3MjFiMmU0YzYuLjFjN2FiNDAzMjllMjEwZGYwMDlmNTk1ZGMxYmIzMzc5MTQ3NGQ2 NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5 SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJ bXBsLmNwcApAQCAtNDQsMTEgKzQ0LDYgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCi1QYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHlJbXBsPiBEcmF3 aW5nQXJlYVByb3h5SW1wbDo6Y3JlYXRlKFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQotewot ICAgIHJldHVybiBhZG9wdFB0cihuZXcgRHJhd2luZ0FyZWFQcm94eUltcGwod2ViUGFnZVByb3h5 KSk7Ci19Ci0KIERyYXdpbmdBcmVhUHJveHlJbXBsOjpEcmF3aW5nQXJlYVByb3h5SW1wbChXZWJQ YWdlUHJveHkqIHdlYlBhZ2VQcm94eSkKICAgICA6IERyYXdpbmdBcmVhUHJveHkoRHJhd2luZ0Fy ZWFUeXBlSW1wbCwgd2ViUGFnZVByb3h5KQogICAgICwgbV9jdXJyZW50QmFja2luZ1N0b3JlU3Rh dGVJRCgwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVh UHJveHlJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUlt cGwuaAppbmRleCAyN2JjMTQzMDc0Y2U0ZTAxODA2ZjhhMzE0OWI2ZTc5MTBjNTIwNDhjLi5iOTFh MmJjOWMwYTgzNDIzOGY4YWE4YmUzZjQzNTViNzA1NGNhNjBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaApAQCAtNDMsNyArNDMsNyBAQCBj bGFzcyBDb29yZGluYXRlZExheWVyVHJlZUhvc3RQcm94eTsKIAogY2xhc3MgRHJhd2luZ0FyZWFQ cm94eUltcGwgOiBwdWJsaWMgRHJhd2luZ0FyZWFQcm94eSB7CiBwdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NPd25QdHI8RHJhd2luZ0FyZWFQcm94eUltcGw+IGNyZWF0ZShXZWJQYWdlUHJveHkqKTsK KyAgICBleHBsaWNpdCBEcmF3aW5nQXJlYVByb3h5SW1wbChXZWJQYWdlUHJveHkqKTsKICAgICB2 aXJ0dWFsIH5EcmF3aW5nQXJlYVByb3h5SW1wbCgpOwogCiAgICAgdm9pZCBwYWludChCYWNraW5n U3RvcmU6OlBsYXRmb3JtR3JhcGhpY3NDb250ZXh0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jiwg V2ViQ29yZTo6UmVnaW9uJiB1bnBhaW50ZWRSZWdpb24pOwpAQCAtNTUsOCArNTUsNiBAQCBwdWJs aWM6CiAgICAgYm9vbCBoYXNSZWNlaXZlZEZpcnN0VXBkYXRlKCkgY29uc3QgeyByZXR1cm4gbV9o YXNSZWNlaXZlZEZpcnN0VXBkYXRlOyB9CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgRHJhd2lu Z0FyZWFQcm94eUltcGwoV2ViUGFnZVByb3h5Kik7Ci0KICAgICAvLyBEcmF3aW5nQXJlYVByb3h5 CiAgICAgdmlydHVhbCB2b2lkIHNpemVEaWRDaGFuZ2UoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGV2 aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9QYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCmluZGV4IDNiN2VjYjgzNmVkYzE2NTFjNzAwYmE3ZTk4ZjE5ZDUxZTk0M2FlNTAuLmVlYWQx NDY4OWUyYmMyY2Q3Yzg5ZjQ1ODAzOTIyMDM4MmU4NTczOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BhZ2VDbGllbnQuaApAQCAtNzcsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+ UGFnZUNsaWVudCgpIHsgfQogCiAgICAgLy8gQ3JlYXRlIGEgbmV3IGRyYXdpbmcgYXJlYSBwcm94 eSBmb3IgdGhlIGdpdmVuIHBhZ2UuCi0gICAgdmlydHVhbCBQYXNzT3duUHRyPERyYXdpbmdBcmVh UHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKSA9IDA7CisgICAgdmlydHVhbCBPd25QdHI8 RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpID0gMDsKIAogICAgIC8v IFRlbGwgdGhlIHZpZXcgdG8gaW52YWxpZGF0ZSB0aGUgZ2l2ZW4gcmVjdC4gVGhlIHJlY3QgaXMg aW4gdmlldyBjb29yZGluYXRlcy4KICAgICB2aXJ0dWFsIHZvaWQgc2V0Vmlld05lZWRzRGlzcGxh eShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHkuaAppbmRleCBhZDEwNDNiNGIyOWFhNjJjNjMwMDc3MWJjNGNhMWRiMTZjYjQ1NWFlLi42 ZTBjYTI4MGQxZTBkNmI5MTRkMzdiNzhlOTkxZDNkZTM0ZWM0ZDZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHkuaApAQCAtMzUsMTIgKzM1LDEwIEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogCiBjbGFzcyBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5IDogcHVibGljIERy YXdpbmdBcmVhUHJveHkgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZShXZWJQYWdlUHJveHkqKTsKKyAgICBl eHBsaWNpdCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5KFdlYlBhZ2VQcm94eSop OwogICAgIHZpcnR1YWwgflRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoKTsKIAog cHJpdmF0ZToKLSAgICBleHBsaWNpdCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5 KFdlYlBhZ2VQcm94eSopOwotCiAgICAgLy8gRHJhd2luZ0FyZWFQcm94eQogICAgIHZpcnR1YWwg dm9pZCBkZXZpY2VTY2FsZUZhY3RvckRpZENoYW5nZSgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwg dm9pZCBsYXllckhvc3RpbmdNb2RlRGlkQ2hhbmdlKCkgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh UHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHkubW0KaW5kZXggOTczNzY4ZGY5NWU5MjhlZDZmNzY0NDk5MGRjNTA4 N2ZkYjlkMTkxMC4uZDAzMzhlYjQ1ZWNmZDBhOTNhNmYyZDYyNGQ0ODI5OTA3MDVlMTZjYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYVByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbQpAQCAtMzksMTEgKzM5LDYgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1QYXNzT3duUHRy PFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk+IFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhUHJveHk6OmNyZWF0ZShXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSkKLXsKLSAg ICByZXR1cm4gYWRvcHRQdHIobmV3IFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHko d2ViUGFnZVByb3h5KSk7Ci19Ci0KIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6 OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkoV2ViUGFnZVByb3h5KiB3ZWJQYWdl UHJveHkpCiAgICAgOiBEcmF3aW5nQXJlYVByb3h5KERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFu aW1hdGlvbiwgd2ViUGFnZVByb3h5KQogICAgICwgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9t ZXRyeShmYWxzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwCmlu ZGV4IGU5NjNiODE5YWM1NzBlYjE3NDA1MzRlZWU0MjUwMWJiZWM4MGI4OWUuLmRlNDgxMDAzYTZh YWRhNzEzOTgyMmI4YjkyOGFkNWRlMWUxMmQ1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1 bmRsZVBhZ2VPdmVybGF5LmNwcApAQCAtMzcsOSArMzcsMTIgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YktpdDsKIAogY2xhc3MgUGFnZU92ZXJsYXlDbGllbnRJbXBsIDogcHVibGljIFBhZ2VPdmVybGF5 OjpDbGllbnQgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFBhZ2VPdmVybGF5Q2xp ZW50SW1wbD4gY3JlYXRlKFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnQqIGNsaWVudCkKKyAgICBl eHBsaWNpdCBQYWdlT3ZlcmxheUNsaWVudEltcGwoV0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudCog Y2xpZW50KQorICAgICAgICA6IG1fY2xpZW50KCkKKyAgICAgICAgLCBtX2FjY2Vzc2liaWxpdHlD bGllbnQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBQYWdlT3ZlcmxheUNs aWVudEltcGwoY2xpZW50KSk7CisgICAgICAgIGlmIChjbGllbnQpCisgICAgICAgICAgICBtX2Ns aWVudCA9ICpjbGllbnQ7CiAgICAgfQogCiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2Vzc2liaWxp dHlDbGllbnQoV0tCdW5kbGVQYWdlT3ZlcmxheUFjY2Vzc2liaWxpdHlDbGllbnQqIGNsaWVudCkK QEAgLTQ5LDE0ICs1Miw2IEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZhdGU6Ci0gICAgZXhwbGlj aXQgUGFnZU92ZXJsYXlDbGllbnRJbXBsKFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnQqIGNsaWVu dCkKLSAgICAgICAgOiBtX2NsaWVudCgpCi0gICAgICAgICwgbV9hY2Nlc3NpYmlsaXR5Q2xpZW50 KCkKLSAgICB7Ci0gICAgICAgIGlmIChjbGllbnQpCi0gICAgICAgICAgICBtX2NsaWVudCA9ICpj bGllbnQ7Ci0gICAgfQotCiAgICAgLy8gUGFnZU92ZXJsYXk6OkNsaWVudC4KICAgICB2aXJ0dWFs IHZvaWQgcGFnZU92ZXJsYXlEZXN0cm95ZWQoUGFnZU92ZXJsYXkqKQogICAgIHsKQEAgLTE1MCw4 ICsxNDUsOSBAQCBXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIFdLQnVuZGxlUGFnZU92ZXJsYXlDcmVh dGUoV0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudCogd2tDbAogICAgIGlmICh3a0NsaWVudCAmJiB3 a0NsaWVudC0+dmVyc2lvbikKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBPd25QdHI8UGFnZU92 ZXJsYXlDbGllbnRJbXBsPiBjbGllbnRJbXBsID0gUGFnZU92ZXJsYXlDbGllbnRJbXBsOjpjcmVh dGUod2tDbGllbnQpOworICAgIGF1dG8gY2xpZW50SW1wbCA9IGNyZWF0ZU93bmVkPFBhZ2VPdmVy bGF5Q2xpZW50SW1wbD4od2tDbGllbnQpOwogCisgICAgLy8gRklYTUU6IExvb2tzIGxpa2UgdGhp cyBsZWFrcyB0aGUgY2xpZW50SW1wbC4KICAgICByZXR1cm4gdG9BUEkoUGFnZU92ZXJsYXk6OmNy ZWF0ZShjbGllbnRJbXBsLmxlYWtQdHIoKSkubGVha1JlZigpKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IGFmZTE0NzNh OGMyNDA3YWFjNTk1MGVkMTUwNDZlYjFlOWViODAxMzAuLmQzNjgzZTc0MTNiZDE1M2Y5ZDU2NmZh ZDgyNjBlNDllNGE5NDdhNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTgxNiw3ICs4MTYsNyBAQCBTdHJpbmcgUGx1Z2luVmll dzo6Z2V0U2VsZWN0aW9uU3RyaW5nKCkgY29uc3QKICAgICByZXR1cm4gbV9wbHVnaW4tPmdldFNl bGVjdGlvblN0cmluZygpOwogfQogCi1QYXNzT3duUHRyPFdlYkV2ZW50PiBQbHVnaW5WaWV3Ojpj cmVhdGVXZWJFdmVudChNb3VzZUV2ZW50KiBldmVudCkgY29uc3QKK093blB0cjxXZWJFdmVudD4g UGx1Z2luVmlldzo6Y3JlYXRlV2ViRXZlbnQoTW91c2VFdmVudCogZXZlbnQpIGNvbnN0CiB7CiAg ICAgV2ViRXZlbnQ6OlR5cGUgdHlwZSA9IFdlYkV2ZW50OjpOb1R5cGU7CiAgICAgdW5zaWduZWQg Y2xpY2tDb3VudCA9IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblZpZXcuaAppbmRleCAzNTI0YzlhMWY1OGQzNDc0ZmIxNDE0MDdjYzA1Y2JmNGQzNTUxOTY5 Li4yZDA0MzNkNTgzOTZkMTBlZDI4YjU3YjViOGNlOTk1MmYyZTE2Njk3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKQEAgLTIxOSw3ICsyMTks NyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkKFdlYkZyYW1lKik7 CiAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWxMb2FkKFdlYkZyYW1lKiwgYm9vbCB3YXNDYW5jZWxs ZWQpOwogCi0gICAgUGFzc093blB0cjxXZWJFdmVudD4gY3JlYXRlV2ViRXZlbnQoV2ViQ29yZTo6 TW91c2VFdmVudCopIGNvbnN0OworICAgIE93blB0cjxXZWJFdmVudD4gY3JlYXRlV2ViRXZlbnQo V2ViQ29yZTo6TW91c2VFdmVudCopIGNvbnN0OwogCiAgICAgUmVmUHRyPFdlYkNvcmU6OkhUTUxQ bHVnSW5FbGVtZW50PiBtX3BsdWdpbkVsZW1lbnQ7CiAgICAgUmVmUHRyPFBsdWdpbj4gbV9wbHVn aW47Cg==