96778 2012-09-14 07:09:00 -0700 [GTK] Don't use the C API internally in WebKitGeolocation classes 2012-10-17 08:24:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96777 96766 96779 1 cgarcia webkit-unassigned cabanier gustavo mario mrobinson oldest_to_newest 720721 0 cgarcia 2012-09-14 07:09:00 -0700 Use the C++ classes instead. 720722 1 164139 cgarcia 2012-09-14 07:10:26 -0700 Created attachment 164139 Patch 733447 2 164139 mario 2012-10-03 01:44:15 -0700 Comment on attachment 164139 Patch Looks good to me 742954 3 168890 cgarcia 2012-10-16 01:38:39 -0700 Created attachment 168890 Updated patch to build on current git master Updated after WebGeolocationPosition::create() API change 743178 4 cabanier 2012-10-16 08:46:27 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 744256 5 cgarcia 2012-10-17 08:24:31 -0700 Committed r131598: <http://trac.webkit.org/changeset/131598> 164139 2012-09-14 07:10:26 -0700 2012-10-16 01:38:39 -0700 Patch wk2-no-c-api-geolocation.diff text/plain 11244 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi4yNzZiNWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRHZW9sb2NhdGlvbiBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05Njc3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRo ZSBDIEFQSSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkg Y2FzdHMsIHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBj b2RlIGlzIGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0LmNw cDoKKyAgICAgICAgKF9XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJpdmF0ZSk6 CisgICAgICAgICh3ZWJraXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0QWxsb3cpOgorICAg ICAgICAod2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdERlbnkpOgorICAgICAgICAo d2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdEZpbmFsaXplKToKKyAgICAgICAgKHdl YmtpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RDcmVhdGUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2YXRlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlci5j cHA6CisgICAgICAgIChXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpjcmVhdGUpOgorICAgICAg ICAoV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6V2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcik6 CisgICAgICAgIChXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpub3RpZnlQb3NpdGlvbkNoYW5n ZWQpOgorICAgICAgICAoV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6bm90aWZ5RXJyb3JPY2N1 cnJlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Qcm92 aWRlci5oOgorICAgICAgICAoV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcik6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQuY3BwOgorICAgICAgICAoZGVjaWRlUG9s aWN5Rm9yR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAgIChjcmVhdGVEZWZhdWx0V2Vi Q29udGV4dCk6CisKIDIwMTItMDktMTIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RA Z21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjc4NzYuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2Nh dGlvblBlcm1pc3Npb25SZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QuY3BwCmluZGV4IDUxZjE4Njgu LjEwNzlhZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QuY3Bw CkBAIC0yMCw2ICsyMCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViS2l0 R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdC5oIgogCisjaW5jbHVkZSAiR2VvbG9jYXRpb25Q ZXJtaXNzaW9uUmVxdWVzdFByb3h5LmgiCiAjaW5jbHVkZSAiV2ViS2l0R2VvbG9jYXRpb25QZXJt aXNzaW9uUmVxdWVzdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRQZXJtaXNzaW9uUmVxdWVz dC5oIgogCkBAIC0zOSw3ICs0MCw3IEBAIEdfREVGSU5FX1RZUEVfV0lUSF9DT0RFKFdlYktpdEdl b2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QsIHdlYmtpdF9nZW9sb2NhdGlvbl9wCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2Via2l0X3Blcm1pc3Npb25f cmVxdWVzdF9pbnRlcmZhY2VfaW5pdCkpCiAKIHN0cnVjdCBfV2ViS2l0R2VvbG9jYXRpb25QZXJt aXNzaW9uUmVxdWVzdFByaXZhdGUgewotICAgIFdLUmV0YWluUHRyPFdLR2VvbG9jYXRpb25QZXJt aXNzaW9uUmVxdWVzdFJlZj4gd2tSZXF1ZXN0OworICAgIFJlZlB0cjxHZW9sb2NhdGlvblBlcm1p c3Npb25SZXF1ZXN0UHJveHk+IHJlcXVlc3Q7CiAgICAgYm9vbCBtYWRlRGVjaXNpb247CiB9Owog CkBAIC01Myw3ICs1NCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEdlb2xvY2F0aW9uUGVybWlzc2lv blJlcXVlc3RBbGxvdyhXZWJLaXRQZXJtaXNzaW9uUmVxdWVzdCogcmVxCiAgICAgaWYgKHByaXYt Pm1hZGVEZWNpc2lvbikKICAgICAgICAgcmV0dXJuOwogCi0gICAgV0tHZW9sb2NhdGlvblBlcm1p c3Npb25SZXF1ZXN0QWxsb3cocHJpdi0+d2tSZXF1ZXN0LmdldCgpKTsKKyAgICBwcml2LT5yZXF1 ZXN0LT5hbGxvdygpOwogICAgIHByaXYtPm1hZGVEZWNpc2lvbiA9IHRydWU7CiB9CiAKQEAgLTY3 LDcgKzY4LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVz dERlbnkoV2ViS2l0UGVybWlzc2lvblJlcXVlc3QqIHJlcXUKICAgICBpZiAocHJpdi0+bWFkZURl Y2lzaW9uKQogICAgICAgICByZXR1cm47CiAKLSAgICBXS0dlb2xvY2F0aW9uUGVybWlzc2lvblJl cXVlc3REZW55KHByaXYtPndrUmVxdWVzdC5nZXQoKSk7CisgICAgcHJpdi0+cmVxdWVzdC0+ZGVu eSgpOwogICAgIHByaXYtPm1hZGVEZWNpc2lvbiA9IHRydWU7CiB9CiAKQEAgLTg5LDcgKzkwLDcg QEAgc3RhdGljIHZvaWQgd2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdEZpbmFsaXpl KEdPYmplY3QqIG9iamVjdCkKIAogICAgIC8vIERlZmF1bHQgYmVoYXZpb3VyIHdoZW4gbm8gZGVj aXNpb24gaGFzIGJlZW4gbWFkZSBpcyBkZW55aW5nIHRoZSByZXF1ZXN0LgogICAgIGlmICghcHJp di0+bWFkZURlY2lzaW9uKQotICAgICAgICBXS0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RE ZW55KHByaXYtPndrUmVxdWVzdC5nZXQoKSk7CisgICAgICAgIHByaXYtPnJlcXVlc3QtPmRlbnko KTsKIAogICAgIHByaXYtPn5XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJpdmF0 ZSgpOwogICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtpdF9nZW9sb2NhdGlvbl9wZXJtaXNzaW9uX3Jl cXVlc3RfcGFyZW50X2NsYXNzKS0+ZmluYWxpemUob2JqZWN0KTsKQEAgLTEwMiw5ICsxMDMsOSBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfZ2VvbG9jYXRpb25fcGVybWlzc2lvbl9yZXF1ZXN0X2NsYXNz X2luaXQoV2ViS2l0R2VvbG9jYXRpb25QZQogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZShr bGFzcywgc2l6ZW9mKFdlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2YXRlKSk7 CiB9CiAKLVdlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QqIHdlYmtpdEdlb2xvY2F0 aW9uUGVybWlzc2lvblJlcXVlc3RDcmVhdGUoV0tHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0 UmVmIHdrUmVxdWVzdCkKK1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QqIHdlYmtp dEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RDcmVhdGUoR2VvbG9jYXRpb25QZXJtaXNzaW9u UmVxdWVzdFByb3h5KiByZXF1ZXN0KQogewogICAgIFdlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lv blJlcXVlc3QqIGdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QgPSBXRUJLSVRfR0VPTE9DQVRJ T05fUEVSTUlTU0lPTl9SRVFVRVNUKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9HRU9MT0NBVElP Tl9QRVJNSVNTSU9OX1JFUVVFU1QsIE5VTEwpKTsKLSAgICBnZW9sb2NhdGlvblBlcm1pc3Npb25S ZXF1ZXN0LT5wcml2LT53a1JlcXVlc3QgPSB3a1JlcXVlc3Q7CisgICAgZ2VvbG9jYXRpb25QZXJt aXNzaW9uUmVxdWVzdC0+cHJpdi0+cmVxdWVzdCA9IHJlcXVlc3Q7CiAgICAgcmV0dXJuIGdlb2xv Y2F0aW9uUGVybWlzc2lvblJlcXVlc3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Q ZXJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaAppbmRleCBlNmRlNjg3Li45NGY1Y2JhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblBl cm1pc3Npb25SZXF1ZXN0UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2YXRlLmgKQEAgLTIz LDYgKzIzLDggQEAKICNpbmNsdWRlICJXZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0 LmgiCiAjaW5jbHVkZSAiV2ViS2l0UHJpdmF0ZS5oIgogCi1XZWJLaXRHZW9sb2NhdGlvblBlcm1p c3Npb25SZXF1ZXN0KiB3ZWJraXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0Q3JlYXRlKFdL R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFJlZik7Cit1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OworCitXZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KiB3ZWJraXRHZW9sb2NhdGlv blBlcm1pc3Npb25SZXF1ZXN0Q3JlYXRlKEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94 eSopOwogCiAjZW5kaWYgLy8gV2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByaXZh dGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 R2VvbG9jYXRpb25Qcm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyLmNwcAppbmRleCA2NDhjODA5Li5lMDI3N2ZhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2Nh dGlvblByb3ZpZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyLmNwcApAQCAtMjYsNiArMjYsOSBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIuaCIKIAorI2lu Y2x1ZGUgIldlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5LmgiCisjaW5jbHVkZSAiV2ViR2VvbG9j YXRpb25Qb3NpdGlvbi5oIgorCiAjaWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQogCiBzdGF0aWMgaW5s aW5lIFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIqIHRvR2VvbG9jYXRpb25Qcm92aWRlcihjb25z dCB2b2lkKiBjbGllbnRJbmZvKQpAQCAtNDgsMTYgKzUxLDE2IEBAIFdlYktpdEdlb2xvY2F0aW9u UHJvdmlkZXI6On5XZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyKCkKICAgICBtX3Byb3ZpZGVyLnN0 b3BVcGRhdGluZygpOwogfQogCi1QYXNzUmVmUHRyPFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI+ IFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI6OmNyZWF0ZShXS0dlb2xvY2F0aW9uTWFuYWdlclJl ZiB3a0dlb2xvY2F0aW9uTWFuYWdlcikKK1Bhc3NSZWZQdHI8V2ViS2l0R2VvbG9jYXRpb25Qcm92 aWRlcj4gV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6Y3JlYXRlKFdlYkdlb2xvY2F0aW9uTWFu YWdlclByb3h5KiBnZW9sb2NhdGlvbk1hbmFnZXIpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyKHdrR2VvbG9jYXRpb25NYW5hZ2VyKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyKGdlb2xvY2F0aW9u TWFuYWdlcikpOwogfQogCi1XZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpXZWJLaXRHZW9sb2Nh dGlvblByb3ZpZGVyKFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmIHdrR2VvbG9jYXRpb25NYW5hZ2Vy KQotICAgIDogbV93a0dlb2xvY2F0aW9uTWFuYWdlcih3a0dlb2xvY2F0aW9uTWFuYWdlcikKK1dl YktpdEdlb2xvY2F0aW9uUHJvdmlkZXI6OldlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIoV2ViR2Vv bG9jYXRpb25NYW5hZ2VyUHJveHkqIGdlb2xvY2F0aW9uTWFuYWdlcikKKyAgICA6IG1fZ2VvbG9j YXRpb25NYW5hZ2VyKGdlb2xvY2F0aW9uTWFuYWdlcikKICAgICAsIG1fcHJvdmlkZXIodGhpcykK IHsKLSAgICBBU1NFUlQod2tHZW9sb2NhdGlvbk1hbmFnZXIpOworICAgIEFTU0VSVChnZW9sb2Nh dGlvbk1hbmFnZXIpOwogCiAgICAgV0tHZW9sb2NhdGlvblByb3ZpZGVyIHdrR2VvbG9jYXRpb25Q cm92aWRlciA9IHsKICAgICAgICAga1dLR2VvbG9jYXRpb25Qcm92aWRlckN1cnJlbnRWZXJzaW9u LApAQCAtNjUsNyArNjgsNyBAQCBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpXZWJLaXRHZW9s b2NhdGlvblByb3ZpZGVyKFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmIHdrRwogICAgICAgICBzdGFy dFVwZGF0aW5nQ2FsbGJhY2ssCiAgICAgICAgIHN0b3BVcGRhdGluZ0NhbGxiYWNrCiAgICAgfTsK LSAgICBXS0dlb2xvY2F0aW9uTWFuYWdlclNldFByb3ZpZGVyKG1fd2tHZW9sb2NhdGlvbk1hbmFn ZXIuZ2V0KCksICZ3a0dlb2xvY2F0aW9uUHJvdmlkZXIpOworICAgIFdLR2VvbG9jYXRpb25NYW5h Z2VyU2V0UHJvdmlkZXIodG9BUEkoZ2VvbG9jYXRpb25NYW5hZ2VyKSwgJndrR2VvbG9jYXRpb25Q cm92aWRlcik7CiB9CiAKIHZvaWQgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6c3RhcnRVcGRh dGluZygpCkBAIC04MCwxMyArODMsMTMgQEAgdm9pZCBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVy OjpzdG9wVXBkYXRpbmcoKQogCiB2b2lkIFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI6Om5vdGlm eVBvc2l0aW9uQ2hhbmdlZChpbnQgdGltZXN0YW1wLCBkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBs b25naXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwgZG91YmxlIGFjY3VyYWN5LCBkb3VibGUgYWx0aXR1 ZGVBY2N1cmFjeSkKIHsKLSAgICBXS1JldGFpblB0cjxXS0dlb2xvY2F0aW9uUG9zaXRpb25SZWY+ IHdrR2VvbG9jYXRpb25Qb3NpdGlvbihBZG9wdFdLLCBXS0dlb2xvY2F0aW9uUG9zaXRpb25DcmVh dGUodGltZXN0YW1wLCBsYXRpdHVkZSwgbG9uZ2l0dWRlLCBhY2N1cmFjeSkpOwotICAgIFdLR2Vv bG9jYXRpb25NYW5hZ2VyUHJvdmlkZXJEaWRDaGFuZ2VQb3NpdGlvbihtX3drR2VvbG9jYXRpb25N YW5hZ2VyLmdldCgpLCB3a0dlb2xvY2F0aW9uUG9zaXRpb24uZ2V0KCkpOworICAgIFJlZlB0cjxX ZWJHZW9sb2NhdGlvblBvc2l0aW9uPiBwb3NpdGlvbiA9IFdlYkdlb2xvY2F0aW9uUG9zaXRpb246 OmNyZWF0ZSh0aW1lc3RhbXAsIGxhdGl0dWRlLCBsb25naXR1ZGUsIGFjY3VyYWN5KTsKKyAgICBt X2dlb2xvY2F0aW9uTWFuYWdlci0+cHJvdmlkZXJEaWRDaGFuZ2VQb3NpdGlvbihwb3NpdGlvbi5n ZXQoKSk7CiB9CiAKIHZvaWQgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6bm90aWZ5RXJyb3JP Y2N1cnJlZChjb25zdCBjaGFyKiBtZXNzYWdlKQogewotICAgIFdLR2VvbG9jYXRpb25NYW5hZ2Vy UHJvdmlkZXJEaWRGYWlsVG9EZXRlcm1pbmVQb3NpdGlvbihtX3drR2VvbG9jYXRpb25NYW5hZ2Vy LmdldCgpKTsKKyAgICBtX2dlb2xvY2F0aW9uTWFuYWdlci0+cHJvdmlkZXJEaWRGYWlsVG9EZXRl cm1pbmVQb3NpdGlvbigpOwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKEdFT0xPQ0FUSU9OKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRp b25Qcm92aWRlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2Vv bG9jYXRpb25Qcm92aWRlci5oCmluZGV4IGEwMmJmY2IuLjExYzdjMWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlv blByb3ZpZGVyLmgKQEAgLTI4LDIyICsyOCwyNCBAQAogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIAordXNpbmcgbmFtZXNwYWNlIFdlYktp dDsKKwogY2xhc3MgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlciA6IHB1YmxpYyBSZWZDb3VudGVk PFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI+LCBwdWJsaWMgV2ViQ29yZTo6R2VvbG9jYXRpb25Q cm92aWRlckdlb2NsdWVDbGllbnQgewogcHVibGljOgogICAgIHZpcnR1YWwgfldlYktpdEdlb2xv Y2F0aW9uUHJvdmlkZXIoKTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJLaXRHZW9sb2NhdGlv blByb3ZpZGVyPiBjcmVhdGUoV0tHZW9sb2NhdGlvbk1hbmFnZXJSZWYpOworICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI+IGNyZWF0ZShXZWJHZW9sb2NhdGlv bk1hbmFnZXJQcm94eSopOwogCiAgICAgdm9pZCBzdGFydFVwZGF0aW5nKCk7CiAgICAgdm9pZCBz dG9wVXBkYXRpbmcoKTsKIAogcHJpdmF0ZToKLSAgICBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVy KFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmKTsKKyAgICBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVy KFdlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5Kik7CiAKICAgICAvLyBHZW9sb2NhdGlvblByb3Zp ZGVyR2VvY2x1ZUNsaWVudCBpbnRlcmZhY2UuCiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeVBvc2l0 aW9uQ2hhbmdlZChpbnQsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUsIGRvdWJsZSwgZG91YmxlKTsK ICAgICB2aXJ0dWFsIHZvaWQgbm90aWZ5RXJyb3JPY2N1cnJlZChjb25zdCBjaGFyKik7CiAKLSAg ICBXS1JldGFpblB0cjxXS0dlb2xvY2F0aW9uTWFuYWdlclJlZj4gbV93a0dlb2xvY2F0aW9uTWFu YWdlcjsKKyAgICBSZWZQdHI8V2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk+IG1fZ2VvbG9jYXRp b25NYW5hZ2VyOwogICAgIFdlYkNvcmU6Okdlb2xvY2F0aW9uUHJvdmlkZXJHZW9jbHVlIG1fcHJv dmlkZXI7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRVSUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRVSUNsaWVudC5jcHAKaW5kZXggZjZmNTNmNy4uMzU2MmZmYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcApAQCAtMTQ4 LDcgKzE0OCw3IEBAIHN0YXRpYyB2b2lkIHJ1bk9wZW5QYW5lbChXS1BhZ2VSZWYgcGFnZSwgV0tG cmFtZVJlZiBmcmFtZSwgV0tPcGVuUGFuZWxQYXJhbWV0ZXJzCiAKIHN0YXRpYyB2b2lkIGRlY2lk ZVBvbGljeUZvckdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QoV0tQYWdlUmVmLCBXS0ZyYW1l UmVmLCBXS1NlY3VyaXR5T3JpZ2luUmVmLCBXS0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RS ZWYgcmVxdWVzdCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBHUmVmUHRyPFdlYktp dEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3Q+IGdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVl c3QgPSBhZG9wdEdSZWYod2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdENyZWF0ZShy ZXF1ZXN0KSk7CisgICAgR1JlZlB0cjxXZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0 PiBnZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0ID0gYWRvcHRHUmVmKHdlYmtpdEdlb2xvY2F0 aW9uUGVybWlzc2lvblJlcXVlc3RDcmVhdGUodG9JbXBsKHJlcXVlc3QpKSk7CiAgICAgd2Via2l0 V2ViVmlld01ha2VQZXJtaXNzaW9uUmVxdWVzdChXRUJLSVRfV0VCX1ZJRVcoY2xpZW50SW5mbyks IFdFQktJVF9QRVJNSVNTSU9OX1JFUVVFU1QoZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdC5n ZXQoKSkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IDYzZTU5ZDMuLjRlOGJmOGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3Bw CkBAIC0xNTgsNyArMTU4LDcgQEAgc3RhdGljIGdwb2ludGVyIGNyZWF0ZURlZmF1bHRXZWJDb250 ZXh0KGdwb2ludGVyKQogICAgIGF0dGFjaFJlcXVlc3RNYW5hZ2VyQ2xpZW50VG9Db250ZXh0KHdl YkNvbnRleHQuZ2V0KCkpOwogCiAjaWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQotICAgIHByaXYtPmdl b2xvY2F0aW9uUHJvdmlkZXIgPSBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpjcmVhdGUodG9B UEkocHJpdi0+Y29udGV4dC0+Z2VvbG9jYXRpb25NYW5hZ2VyUHJveHkoKSkpOworICAgIHByaXYt Pmdlb2xvY2F0aW9uUHJvdmlkZXIgPSBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpjcmVhdGUo cHJpdi0+Y29udGV4dC0+Z2VvbG9jYXRpb25NYW5hZ2VyUHJveHkoKSk7CiAjZW5kaWYKICNpZiBF TkFCTEUoU1BFTExDSEVDSykKICAgICBwcml2LT50ZXh0Q2hlY2tlciA9IFdlYktpdFRleHRDaGVj a2VyOjpjcmVhdGUoKTsK 168890 2012-10-16 01:38:39 -0700 2012-10-17 05:23:31 -0700 Updated patch to build on current git master wk2-c-api-geolocation.diff text/plain 11344 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlYzFlMjk3Li42ODkzMjFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMTAtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRHZW9sb2NhdGlvbiBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05Njc3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRo ZSBDIEFQSSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkg Y2FzdHMsIHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBj b2RlIGlzIGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0LmNw cDoKKyAgICAgICAgKF9XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJpdmF0ZSk6 CisgICAgICAgICh3ZWJraXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0QWxsb3cpOgorICAg ICAgICAod2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdERlbnkpOgorICAgICAgICAo d2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdEZpbmFsaXplKToKKyAgICAgICAgKHdl YmtpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RDcmVhdGUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2YXRlLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlci5j cHA6CisgICAgICAgIChXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpjcmVhdGUpOgorICAgICAg ICAoV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6V2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcik6 CisgICAgICAgIChXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpub3RpZnlQb3NpdGlvbkNoYW5n ZWQpOgorICAgICAgICAoV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6bm90aWZ5RXJyb3JPY2N1 cnJlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Qcm92 aWRlci5oOgorICAgICAgICAoV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcik6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQuY3BwOgorICAgICAgICAoZGVjaWRlUG9s aWN5Rm9yR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAgIChjcmVhdGVEZWZhdWx0V2Vi Q29udGV4dCk6CisKIDIwMTItMTAtMTUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1 bWV6QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIFJlZ3Jlc3Npb24ocjEzMTMzNyk6 IE1hZGUgMyBDb29raWUgTWFuYWdlciBBUEkgdGVzdHMgZmFpbApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2Nh dGlvblBlcm1pc3Npb25SZXF1ZXN0LmNwcAppbmRleCA1MWYxODY4Li4xMDc5YWY3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblBl cm1pc3Npb25SZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0LmNwcApAQCAtMjAsNiArMjAsNyBA QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdEdlb2xvY2F0aW9uUGVybWlz c2lvblJlcXVlc3QuaCIKIAorI2luY2x1ZGUgIkdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQ cm94eS5oIgogI2luY2x1ZGUgIldlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2 YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0UGVybWlzc2lvblJlcXVlc3QuaCIKIApAQCAtMzksNyAr NDAsNyBAQCBHX0RFRklORV9UWVBFX1dJVEhfQ09ERShXZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Np b25SZXF1ZXN0LCB3ZWJraXRfZ2VvbG9jYXRpb25fcAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHdlYmtpdF9wZXJtaXNzaW9uX3JlcXVlc3RfaW50ZXJmYWNl X2luaXQpKQogCiBzdHJ1Y3QgX1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2 YXRlIHsKLSAgICBXS1JldGFpblB0cjxXS0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RSZWY+ IHdrUmVxdWVzdDsKKyAgICBSZWZQdHI8R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByb3h5 PiByZXF1ZXN0OwogICAgIGJvb2wgbWFkZURlY2lzaW9uOwogfTsKIApAQCAtNTMsNyArNTQsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0QWxsb3coV2Vi S2l0UGVybWlzc2lvblJlcXVlc3QqIHJlcQogICAgIGlmIChwcml2LT5tYWRlRGVjaXNpb24pCiAg ICAgICAgIHJldHVybjsKIAotICAgIFdLR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdEFsbG93 KHByaXYtPndrUmVxdWVzdC5nZXQoKSk7CisgICAgcHJpdi0+cmVxdWVzdC0+YWxsb3coKTsKICAg ICBwcml2LT5tYWRlRGVjaXNpb24gPSB0cnVlOwogfQogCkBAIC02Nyw3ICs2OCw3IEBAIHN0YXRp YyB2b2lkIHdlYmtpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3REZW55KFdlYktpdFBlcm1p c3Npb25SZXF1ZXN0KiByZXF1CiAgICAgaWYgKHByaXYtPm1hZGVEZWNpc2lvbikKICAgICAgICAg cmV0dXJuOwogCi0gICAgV0tHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0RGVueShwcml2LT53 a1JlcXVlc3QuZ2V0KCkpOworICAgIHByaXYtPnJlcXVlc3QtPmRlbnkoKTsKICAgICBwcml2LT5t YWRlRGVjaXNpb24gPSB0cnVlOwogfQogCkBAIC04OSw3ICs5MCw3IEBAIHN0YXRpYyB2b2lkIHdl YmtpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RGaW5hbGl6ZShHT2JqZWN0KiBvYmplY3Qp CiAKICAgICAvLyBEZWZhdWx0IGJlaGF2aW91ciB3aGVuIG5vIGRlY2lzaW9uIGhhcyBiZWVuIG1h ZGUgaXMgZGVueWluZyB0aGUgcmVxdWVzdC4KICAgICBpZiAoIXByaXYtPm1hZGVEZWNpc2lvbikK LSAgICAgICAgV0tHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0RGVueShwcml2LT53a1JlcXVl c3QuZ2V0KCkpOworICAgICAgICBwcml2LT5yZXF1ZXN0LT5kZW55KCk7CiAKICAgICBwcml2LT5+ V2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByaXZhdGUoKTsKICAgICBHX09CSkVD VF9DTEFTUyh3ZWJraXRfZ2VvbG9jYXRpb25fcGVybWlzc2lvbl9yZXF1ZXN0X3BhcmVudF9jbGFz cyktPmZpbmFsaXplKG9iamVjdCk7CkBAIC0xMDIsOSArMTAzLDkgQEAgc3RhdGljIHZvaWQgd2Vi a2l0X2dlb2xvY2F0aW9uX3Blcm1pc3Npb25fcmVxdWVzdF9jbGFzc19pbml0KFdlYktpdEdlb2xv Y2F0aW9uUGUKICAgICBnX3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUoa2xhc3MsIHNpemVvZihXZWJL aXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJpdmF0ZSkpOwogfQogCi1XZWJLaXRHZW9s b2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KiB3ZWJraXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1 ZXN0Q3JlYXRlKFdLR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFJlZiB3a1JlcXVlc3QpCitX ZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KiB3ZWJraXRHZW9sb2NhdGlvblBlcm1p c3Npb25SZXF1ZXN0Q3JlYXRlKEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcm94eSogcmVx dWVzdCkKIHsKICAgICBXZWJLaXRHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KiBnZW9sb2Nh dGlvblBlcm1pc3Npb25SZXF1ZXN0ID0gV0VCS0lUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT05fUkVR VUVTVChnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfR0VPTE9DQVRJT05fUEVSTUlTU0lPTl9SRVFV RVNULCBOVUxMKSk7Ci0gICAgZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdC0+cHJpdi0+d2tS ZXF1ZXN0ID0gd2tSZXF1ZXN0OworICAgIGdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QtPnBy aXYtPnJlcXVlc3QgPSByZXF1ZXN0OwogICAgIHJldHVybiBnZW9sb2NhdGlvblBlcm1pc3Npb25S ZXF1ZXN0OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQ cml2YXRlLmgKaW5kZXggZTZkZTY4Ny4uOTRmNWNiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdFBy aXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9s b2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJpdmF0ZS5oCkBAIC0yMyw2ICsyMyw4IEBACiAjaW5j bHVkZSAiV2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdC5oIgogI2luY2x1ZGUgIldl YktpdFByaXZhdGUuaCIKIAotV2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdCogd2Vi a2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdENyZWF0ZShXS0dlb2xvY2F0aW9uUGVybWlz c2lvblJlcXVlc3RSZWYpOwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworV2ViS2l0R2VvbG9j YXRpb25QZXJtaXNzaW9uUmVxdWVzdCogd2Via2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVz dENyZWF0ZShHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UHJveHkqKTsKIAogI2VuZGlmIC8v IFdlYktpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RQcml2YXRlX2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlk ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRp b25Qcm92aWRlci5jcHAKaW5kZXggNjQ4YzgwOS4uMzZmMGYyMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlci5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Q cm92aWRlci5jcHAKQEAgLTI2LDYgKzI2LDkgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyLmgiCiAKKyNpbmNsdWRlICJXZWJHZW9sb2Nh dGlvbk1hbmFnZXJQcm94eS5oIgorI2luY2x1ZGUgIldlYkdlb2xvY2F0aW9uUG9zaXRpb24uaCIK KwogI2lmIEVOQUJMRShHRU9MT0NBVElPTikKIAogc3RhdGljIGlubGluZSBXZWJLaXRHZW9sb2Nh dGlvblByb3ZpZGVyKiB0b0dlb2xvY2F0aW9uUHJvdmlkZXIoY29uc3Qgdm9pZCogY2xpZW50SW5m bykKQEAgLTQ4LDE2ICs1MSwxNiBAQCBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjp+V2ViS2l0 R2VvbG9jYXRpb25Qcm92aWRlcigpCiAgICAgbV9wcm92aWRlci5zdG9wVXBkYXRpbmcoKTsKIH0K IAotUGFzc1JlZlB0cjxXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyPiBXZWJLaXRHZW9sb2NhdGlv blByb3ZpZGVyOjpjcmVhdGUoV0tHZW9sb2NhdGlvbk1hbmFnZXJSZWYgd2tHZW9sb2NhdGlvbk1h bmFnZXIpCitQYXNzUmVmUHRyPFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI+IFdlYktpdEdlb2xv Y2F0aW9uUHJvdmlkZXI6OmNyZWF0ZShXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eSogZ2VvbG9j YXRpb25NYW5hZ2VyKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViS2l0R2VvbG9jYXRp b25Qcm92aWRlcih3a0dlb2xvY2F0aW9uTWFuYWdlcikpOworICAgIHJldHVybiBhZG9wdFJlZihu ZXcgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcihnZW9sb2NhdGlvbk1hbmFnZXIpKTsKIH0KIAot V2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6V2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcihXS0dl b2xvY2F0aW9uTWFuYWdlclJlZiB3a0dlb2xvY2F0aW9uTWFuYWdlcikKLSAgICA6IG1fd2tHZW9s b2NhdGlvbk1hbmFnZXIod2tHZW9sb2NhdGlvbk1hbmFnZXIpCitXZWJLaXRHZW9sb2NhdGlvblBy b3ZpZGVyOjpXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyKFdlYkdlb2xvY2F0aW9uTWFuYWdlclBy b3h5KiBnZW9sb2NhdGlvbk1hbmFnZXIpCisgICAgOiBtX2dlb2xvY2F0aW9uTWFuYWdlcihnZW9s b2NhdGlvbk1hbmFnZXIpCiAgICAgLCBtX3Byb3ZpZGVyKHRoaXMpCiB7Ci0gICAgQVNTRVJUKHdr R2VvbG9jYXRpb25NYW5hZ2VyKTsKKyAgICBBU1NFUlQoZ2VvbG9jYXRpb25NYW5hZ2VyKTsKIAog ICAgIFdLR2VvbG9jYXRpb25Qcm92aWRlciB3a0dlb2xvY2F0aW9uUHJvdmlkZXIgPSB7CiAgICAg ICAgIGtXS0dlb2xvY2F0aW9uUHJvdmlkZXJDdXJyZW50VmVyc2lvbiwKQEAgLTY1LDcgKzY4LDcg QEAgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6V2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcihX S0dlb2xvY2F0aW9uTWFuYWdlclJlZiB3a0cKICAgICAgICAgc3RhcnRVcGRhdGluZ0NhbGxiYWNr LAogICAgICAgICBzdG9wVXBkYXRpbmdDYWxsYmFjawogICAgIH07Ci0gICAgV0tHZW9sb2NhdGlv bk1hbmFnZXJTZXRQcm92aWRlcihtX3drR2VvbG9jYXRpb25NYW5hZ2VyLmdldCgpLCAmd2tHZW9s b2NhdGlvblByb3ZpZGVyKTsKKyAgICBXS0dlb2xvY2F0aW9uTWFuYWdlclNldFByb3ZpZGVyKHRv QVBJKGdlb2xvY2F0aW9uTWFuYWdlciksICZ3a0dlb2xvY2F0aW9uUHJvdmlkZXIpOwogfQogCiB2 b2lkIFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI6OnN0YXJ0VXBkYXRpbmcoKQpAQCAtODAsMTMg KzgzLDEzIEBAIHZvaWQgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6c3RvcFVwZGF0aW5nKCkK IAogdm9pZCBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpub3RpZnlQb3NpdGlvbkNoYW5nZWQo aW50IHRpbWVzdGFtcCwgZG91YmxlIGxhdGl0dWRlLCBkb3VibGUgbG9uZ2l0dWRlLCBkb3VibGUg YWx0aXR1ZGUsIGRvdWJsZSBhY2N1cmFjeSwgZG91YmxlIGFsdGl0dWRlQWNjdXJhY3kpCiB7Ci0g ICAgV0tSZXRhaW5QdHI8V0tHZW9sb2NhdGlvblBvc2l0aW9uUmVmPiB3a0dlb2xvY2F0aW9uUG9z aXRpb24oQWRvcHRXSywgV0tHZW9sb2NhdGlvblBvc2l0aW9uQ3JlYXRlKHRpbWVzdGFtcCwgbGF0 aXR1ZGUsIGxvbmdpdHVkZSwgYWNjdXJhY3kpKTsKLSAgICBXS0dlb2xvY2F0aW9uTWFuYWdlclBy b3ZpZGVyRGlkQ2hhbmdlUG9zaXRpb24obV93a0dlb2xvY2F0aW9uTWFuYWdlci5nZXQoKSwgd2tH ZW9sb2NhdGlvblBvc2l0aW9uLmdldCgpKTsKKyAgICBSZWZQdHI8V2ViR2VvbG9jYXRpb25Qb3Np dGlvbj4gcG9zaXRpb24gPSBXZWJHZW9sb2NhdGlvblBvc2l0aW9uOjpjcmVhdGUodGltZXN0YW1w LCBsYXRpdHVkZSwgbG9uZ2l0dWRlLCBhY2N1cmFjeSwgdHJ1ZSwgYWx0aXR1ZGUsIHRydWUsIGFs dGl0dWRlQWNjdXJhY3ksIGZhbHNlLCAwLCBmYWxzZSwgMCk7CisgICAgbV9nZW9sb2NhdGlvbk1h bmFnZXItPnByb3ZpZGVyRGlkQ2hhbmdlUG9zaXRpb24ocG9zaXRpb24uZ2V0KCkpOwogfQogCiB2 b2lkIFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI6Om5vdGlmeUVycm9yT2NjdXJyZWQoY29uc3Qg Y2hhciogbWVzc2FnZSkKIHsKLSAgICBXS0dlb2xvY2F0aW9uTWFuYWdlclByb3ZpZGVyRGlkRmFp bFRvRGV0ZXJtaW5lUG9zaXRpb24obV93a0dlb2xvY2F0aW9uTWFuYWdlci5nZXQoKSk7CisgICAg bV9nZW9sb2NhdGlvbk1hbmFnZXItPnByb3ZpZGVyRGlkRmFpbFRvRGV0ZXJtaW5lUG9zaXRpb24o KTsKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShHRU9MT0NBVElPTikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlk ZXIuaAppbmRleCBhMDJiZmNiLi4xMWM3YzFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlci5oCkBA IC0yOCwyMiArMjgsMjQgQEAKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUg PHd0Zi9SZWZDb3VudGVkLmg+CiAKK3VzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CisKIGNsYXNzIFdl YktpdEdlb2xvY2F0aW9uUHJvdmlkZXIgOiBwdWJsaWMgUmVmQ291bnRlZDxXZWJLaXRHZW9sb2Nh dGlvblByb3ZpZGVyPiwgcHVibGljIFdlYkNvcmU6Okdlb2xvY2F0aW9uUHJvdmlkZXJHZW9jbHVl Q2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVy KCk7Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcj4gY3Jl YXRlKFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJL aXRHZW9sb2NhdGlvblByb3ZpZGVyPiBjcmVhdGUoV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkq KTsKIAogICAgIHZvaWQgc3RhcnRVcGRhdGluZygpOwogICAgIHZvaWQgc3RvcFVwZGF0aW5nKCk7 CiAKIHByaXZhdGU6Ci0gICAgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcihXS0dlb2xvY2F0aW9u TWFuYWdlclJlZik7CisgICAgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcihXZWJHZW9sb2NhdGlv bk1hbmFnZXJQcm94eSopOwogCiAgICAgLy8gR2VvbG9jYXRpb25Qcm92aWRlckdlb2NsdWVDbGll bnQgaW50ZXJmYWNlLgogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlQb3NpdGlvbkNoYW5nZWQoaW50 LCBkb3VibGUsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUsIGRvdWJsZSk7CiAgICAgdmlydHVhbCB2 b2lkIG5vdGlmeUVycm9yT2NjdXJyZWQoY29uc3QgY2hhciopOwogCi0gICAgV0tSZXRhaW5QdHI8 V0tHZW9sb2NhdGlvbk1hbmFnZXJSZWY+IG1fd2tHZW9sb2NhdGlvbk1hbmFnZXI7CisgICAgUmVm UHRyPFdlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5PiBtX2dlb2xvY2F0aW9uTWFuYWdlcjsKICAg ICBXZWJDb3JlOjpHZW9sb2NhdGlvblByb3ZpZGVyR2VvY2x1ZSBtX3Byb3ZpZGVyOwogfTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQu Y3BwCmluZGV4IGRlY2JiMjcuLjAwZDY1ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAKQEAgLTE0OCw3ICsxNDgsNyBAQCBz dGF0aWMgdm9pZCBydW5PcGVuUGFuZWwoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUs IFdLT3BlblBhbmVsUGFyYW1ldGVycwogCiBzdGF0aWMgdm9pZCBkZWNpZGVQb2xpY3lGb3JHZW9s b2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0KFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tTZWN1cml0 eU9yaWdpblJlZiwgV0tHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0UmVmIHJlcXVlc3QsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0gICAgR1JlZlB0cjxXZWJLaXRHZW9sb2NhdGlvblBl cm1pc3Npb25SZXF1ZXN0PiBnZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0ID0gYWRvcHRHUmVm KHdlYmtpdEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RDcmVhdGUocmVxdWVzdCkpOworICAg IEdSZWZQdHI8V2ViS2l0R2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdD4gZ2VvbG9jYXRpb25Q ZXJtaXNzaW9uUmVxdWVzdCA9IGFkb3B0R1JlZih3ZWJraXRHZW9sb2NhdGlvblBlcm1pc3Npb25S ZXF1ZXN0Q3JlYXRlKHRvSW1wbChyZXF1ZXN0KSkpOwogICAgIHdlYmtpdFdlYlZpZXdNYWtlUGVy bWlzc2lvblJlcXVlc3QoV0VCS0lUX1dFQl9WSUVXKGNsaWVudEluZm8pLCBXRUJLSVRfUEVSTUlT U0lPTl9SRVFVRVNUKGdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3QuZ2V0KCkpKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29u dGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250 ZXh0LmNwcAppbmRleCA1ZDc5NjY1Li4wYzI5YjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMTY0LDcgKzE2 NCw3IEBAIHN0YXRpYyBncG9pbnRlciBjcmVhdGVEZWZhdWx0V2ViQ29udGV4dChncG9pbnRlcikK ICAgICBhdHRhY2hSZXF1ZXN0TWFuYWdlckNsaWVudFRvQ29udGV4dCh3ZWJDb250ZXh0LmdldCgp KTsKIAogI2lmIEVOQUJMRShHRU9MT0NBVElPTikKLSAgICBwcml2LT5nZW9sb2NhdGlvblByb3Zp ZGVyID0gV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6Y3JlYXRlKHRvQVBJKHByaXYtPmNvbnRl eHQtPmdlb2xvY2F0aW9uTWFuYWdlclByb3h5KCkpKTsKKyAgICBwcml2LT5nZW9sb2NhdGlvblBy b3ZpZGVyID0gV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6Y3JlYXRlKHByaXYtPmNvbnRleHQt Pmdlb2xvY2F0aW9uTWFuYWdlclByb3h5KCkpOwogI2VuZGlmCiAjaWYgRU5BQkxFKFNQRUxMQ0hF Q0spCiAgICAgcHJpdi0+dGV4dENoZWNrZXIgPSBXZWJLaXRUZXh0Q2hlY2tlcjo6Y3JlYXRlKCk7 Cg==