96787 2012-09-14 07:38:33 -0700 [GTK] Don't use the C API internally in WebKitURISchemeRequest 2012-10-17 08:37:45 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96786 96766 1 cgarcia webkit-unassigned gustavo mario mrobinson webkit.review.bot oldest_to_newest 720759 0 cgarcia 2012-09-14 07:38:33 -0700 Use the C++ classes instead. 720761 1 164153 cgarcia 2012-09-14 07:39:50 -0700 Created attachment 164153 Patch This is the last one. 720763 2 webkit.review.bot 2012-09-14 07:43:46 -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 733456 3 164153 mario 2012-10-03 01:53:06 -0700 Comment on attachment 164153 Patch Looks good to me 742967 4 168892 cgarcia 2012-10-16 01:48:16 -0700 Created attachment 168892 Updated patch to build on current git master Updated after the initiating page patch. 744265 5 cgarcia 2012-10-17 08:37:45 -0700 Committed r131603: <http://trac.webkit.org/changeset/131603> 164153 2012-09-14 07:39:50 -0700 2012-10-16 01:48:16 -0700 Patch wk2-no-c-api-uri-scheme.diff text/plain 6585 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi4wZTYzZjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRVUklTY2hlbWVSZXF1ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05Njc4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRoZSBD IEFQSSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkgY2Fz dHMsIHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBjb2Rl IGlzIGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXF1ZXN0TWFuYWdlckNsaWVudC5jcHA6CisgICAgICAg IChkaWRSZWNlaXZlVVJJUmVxdWVzdCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6CisgICAgICAgIChfV2ViS2l0VVJJU2NoZW1lUmVxdWVz dFByaXZhdGUpOgorICAgICAgICAod2Via2l0VVJJU2NoZW1lUmVxdWVzdENyZWF0ZSk6CisgICAg ICAgICh3ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNrKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0UHJpdmF0ZS5oOgorCiAyMDEyLTA5 LTEyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTI3ODc2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVxdWVzdE1hbmFnZXJDbGllbnQuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UmVxdWVzdE1hbmFnZXJDbGll bnQuY3BwCmluZGV4IGRlOTRkYjQuLjkxNGVkMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFJlcXVlc3RNYW5hZ2VyQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXF1ZXN0TWFuYWdlckNsaWVu dC5jcHAKQEAgLTI5LDcgKzI5LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIHN0YXRpYyB2 b2lkIGRpZFJlY2VpdmVVUklSZXF1ZXN0KFdLU291cFJlcXVlc3RNYW5hZ2VyUmVmIHNvdXBSZXF1 ZXN0TWFuYWdlclJlZiwgV0tVUkxSZWYgdXJsUmVmLCB1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0 IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgV2ViS2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCA9 IFdFQktJVF9XRUJfQ09OVEVYVChjbGllbnRJbmZvKTsKLSAgICBHUmVmUHRyPFdlYktpdFVSSVNj aGVtZVJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0VVJJU2NoZW1lUmVxdWVzdENy ZWF0ZSh3ZWJDb250ZXh0LCBzb3VwUmVxdWVzdE1hbmFnZXJSZWYsIHVybFJlZiwgcmVxdWVzdElE KSk7CisgICAgR1JlZlB0cjxXZWJLaXRVUklTY2hlbWVSZXF1ZXN0PiByZXF1ZXN0ID0gYWRvcHRH UmVmKHdlYmtpdFVSSVNjaGVtZVJlcXVlc3RDcmVhdGUod2ViQ29udGV4dCwgdG9JbXBsKHNvdXBS ZXF1ZXN0TWFuYWdlclJlZiksIHRvSW1wbCh1cmxSZWYpLCByZXF1ZXN0SUQpKTsKICAgICB3ZWJr aXRXZWJDb250ZXh0UmVjZWl2ZWRVUklSZXF1ZXN0KHdlYkNvbnRleHQsIHJlcXVlc3QuZ2V0KCkp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRVUklTY2hlbWVSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFVSSVNjaGVtZVJlcXVlc3QuY3BwCmluZGV4IGU2MmMxZmEuLjg4MmU3YTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJl cXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVS SVNjaGVtZVJlcXVlc3QuY3BwCkBAIC0yMCwyMiArMjAsMjIgQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJXZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmgiCiAKKyNpbmNsdWRlICJXZWJE YXRhLmgiCiAjaW5jbHVkZSAiV2ViS2l0VVJJU2NoZW1lUmVxdWVzdFByaXZhdGUuaCIKICNpbmNs dWRlICJXZWJLaXRXZWJDb250ZXh0UHJpdmF0ZS5oIgorI2luY2x1ZGUgIldlYlNvdXBSZXF1ZXN0 TWFuYWdlclByb3h5LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9HT3duUHRyU291cC5oPgogI2luY2x1 ZGUgPGxpYnNvdXAvc291cC5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dSZWZQdHIuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7Ci0K IHN0YXRpYyBjb25zdCB1bnNpZ25lZCBpbnQgZ1JlYWRCdWZmZXJTaXplID0gODE5MjsKIAogR19E RUZJTkVfVFlQRShXZWJLaXRVUklTY2hlbWVSZXF1ZXN0LCB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1 ZXN0LCBHX1RZUEVfT0JKRUNUKQogCiBzdHJ1Y3QgX1dlYktpdFVSSVNjaGVtZVJlcXVlc3RQcml2 YXRlIHsKICAgICBXZWJLaXRXZWJDb250ZXh0KiB3ZWJDb250ZXh0OwotICAgIFdLUmV0YWluUHRy PFdLU291cFJlcXVlc3RNYW5hZ2VyUmVmPiB3a1JlcXVlc3RNYW5hZ2VyOworICAgIFJlZlB0cjxX ZWJTb3VwUmVxdWVzdE1hbmFnZXJQcm94eT4gd2ViUmVxdWVzdE1hbmFnZXI7CiAgICAgdWludDY0 X3QgcmVxdWVzdElEOwogICAgIENTdHJpbmcgdXJpOwogICAgIEdPd25QdHI8U291cFVSST4gc291 cFVSSTsKQEAgLTY4LDEyICs2OCwxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfdXJpX3NjaGVtZV9y ZXF1ZXN0X2NsYXNzX2luaXQoV2ViS2l0VVJJU2NoZW1lUmVxdWVzdENsYXNzKiByZQogICAgIGdf dHlwZV9jbGFzc19hZGRfcHJpdmF0ZShyZXF1ZXN0Q2xhc3MsIHNpemVvZihXZWJLaXRVUklTY2hl bWVSZXF1ZXN0UHJpdmF0ZSkpOwogfQogCi1XZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiB3ZWJraXRV UklTY2hlbWVSZXF1ZXN0Q3JlYXRlKFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRleHQsIFdLU291 cFJlcXVlc3RNYW5hZ2VyUmVmIHdrUmVxdWVzdE1hbmFnZXIsIFdLVVJMUmVmIHdrVVJMLCB1aW50 NjRfdCByZXF1ZXN0SUQpCitXZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiB3ZWJraXRVUklTY2hlbWVS ZXF1ZXN0Q3JlYXRlKFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRleHQsIFdlYlNvdXBSZXF1ZXN0 TWFuYWdlclByb3h5KiB3ZWJSZXF1ZXN0TWFuYWdlciwgV2ViVVJMKiB3ZWJVUkwsIHVpbnQ2NF90 IHJlcXVlc3RJRCkKIHsKICAgICBXZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiByZXF1ZXN0ID0gV0VC S0lUX1VSSV9TQ0hFTUVfUkVRVUVTVChnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfVVJJX1NDSEVN RV9SRVFVRVNULCBOVUxMKSk7CiAgICAgcmVxdWVzdC0+cHJpdi0+d2ViQ29udGV4dCA9IHdlYkNv bnRleHQ7Ci0gICAgcmVxdWVzdC0+cHJpdi0+d2tSZXF1ZXN0TWFuYWdlciA9IHdrUmVxdWVzdE1h bmFnZXI7Ci0gICAgcmVxdWVzdC0+cHJpdi0+dXJpID0gdG9JbXBsKHdrVVJMKS0+c3RyaW5nKCku dXRmOCgpOworICAgIHJlcXVlc3QtPnByaXYtPndlYlJlcXVlc3RNYW5hZ2VyID0gd2ViUmVxdWVz dE1hbmFnZXI7CisgICAgcmVxdWVzdC0+cHJpdi0+dXJpID0gd2ViVVJMLT5zdHJpbmcoKS51dGY4 KCk7CiAgICAgcmVxdWVzdC0+cHJpdi0+cmVxdWVzdElEID0gcmVxdWVzdElEOwogICAgIHJldHVy biByZXF1ZXN0OwogfQpAQCAtMTQ5LDE0ICsxNDksMTMgQEAgc3RhdGljIHZvaWQgd2Via2l0VVJJ U2NoZW1lUmVxdWVzdFJlYWRDYWxsYmFjayhHSW5wdXRTdHJlYW0qIGlucHV0U3RyZWFtLCBHQXN5 bmMKICAgICB9CiAKICAgICBXZWJLaXRVUklTY2hlbWVSZXF1ZXN0UHJpdmF0ZSogcHJpdiA9IHJl cXVlc3QtPnByaXY7Ci0gICAgV0tSZXRhaW5QdHI8V0tEYXRhUmVmPiB3a0RhdGEoQWRvcHRXSywg V0tEYXRhQ3JlYXRlKGJ5dGVzUmVhZCA/IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdW5zaWduZWQg Y2hhcio+KHByaXYtPnJlYWRCdWZmZXIpIDogMCwgYnl0ZXNSZWFkKSk7CisgICAgUmVmUHRyPFdl YkRhdGE+IHdlYkRhdGEgPSBXZWJEYXRhOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1 bnNpZ25lZCBjaGFyKj4ocHJpdi0+cmVhZEJ1ZmZlciksIGJ5dGVzUmVhZCk7CiAgICAgaWYgKCFw cml2LT5ieXRlc1JlYWQpIHsKLSAgICAgICAgLy8gRmlyc3QgY2h1bmsgcmVhZC4gSW4gY2FzZSBv ZiBlbXB0eSByZXBseSBhbiBlbXB0eSBXS0RhdGFSZWYgaXMgc2VudCB0byB0aGUgV2ViUHJvY2Vz cy4KLSAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrTWltZVR5cGUgPSAhcHJpdi0+ bWltZVR5cGUuaXNOdWxsKCkgPyBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5n KHByaXYtPm1pbWVUeXBlLmRhdGEoKSkpIDogMDsKLSAgICAgICAgV0tTb3VwUmVxdWVzdE1hbmFn ZXJEaWRIYW5kbGVVUklSZXF1ZXN0KHByaXYtPndrUmVxdWVzdE1hbmFnZXIuZ2V0KCksIHdrRGF0 YS5nZXQoKSwgcHJpdi0+c3RyZWFtTGVuZ3RoLCB3a01pbWVUeXBlLmdldCgpLCBwcml2LT5yZXF1 ZXN0SUQpOworICAgICAgICAvLyBGaXJzdCBjaHVuayByZWFkLiBJbiBjYXNlIG9mIGVtcHR5IHJl cGx5IGFuIGVtcHR5IFdlYkRhdGEgaXMgc2VudCB0byB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAg cHJpdi0+d2ViUmVxdWVzdE1hbmFnZXItPmRpZEhhbmRsZVVSSVJlcXVlc3Qod2ViRGF0YS5nZXQo KSwgcHJpdi0+c3RyZWFtTGVuZ3RoLCBTdHJpbmc6OmZyb21VVEY4KHByaXYtPm1pbWVUeXBlLmRh dGEoKSksIHByaXYtPnJlcXVlc3RJRCk7CiAgICAgfSBlbHNlIGlmIChieXRlc1JlYWQgfHwgKCFi eXRlc1JlYWQgJiYgIXByaXYtPnN0cmVhbUxlbmd0aCkpIHsKLSAgICAgICAgLy8gU3Vic2VxdWVu dCBjaHVuayByZWFkLiBXZSBvbmx5IHNlbmQgYW4gZW1wdHkgV0tEYXRhUmVmIHRvIHRoZSBXZWJQ cm9jZXNzIHdoZW4gc3RyZWFtIGxlbmd0aCBpcyB1bmtub3duLgotICAgICAgICBXS1NvdXBSZXF1 ZXN0TWFuYWdlckRpZFJlY2VpdmVVUklSZXF1ZXN0RGF0YShwcml2LT53a1JlcXVlc3RNYW5hZ2Vy LmdldCgpLCB3a0RhdGEuZ2V0KCksIHByaXYtPnJlcXVlc3RJRCk7CisgICAgICAgIC8vIFN1YnNl cXVlbnQgY2h1bmsgcmVhZC4gV2Ugb25seSBzZW5kIGFuIGVtcHR5IFdlYkRhdGEgdG8gdGhlIFdl YlByb2Nlc3Mgd2hlbiBzdHJlYW0gbGVuZ3RoIGlzIHVua25vd24uCisgICAgICAgIHByaXYtPndl YlJlcXVlc3RNYW5hZ2VyLT5kaWRSZWNlaXZlVVJJUmVxdWVzdERhdGEod2ViRGF0YS5nZXQoKSwg cHJpdi0+cmVxdWVzdElEKTsKICAgICB9CiAKICAgICBpZiAoIWJ5dGVzUmVhZCkgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVx dWVzdFByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVS SVNjaGVtZVJlcXVlc3RQcml2YXRlLmgKaW5kZXggMTQ5ODEzZC4uMjNlYmZmZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVxdWVz dFByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRV UklTY2hlbWVSZXF1ZXN0UHJpdmF0ZS5oCkBAIC0yMyw5ICsyMywxMCBAQAogI2luY2x1ZGUgIldl YktpdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmgiCiAjaW5j bHVkZSAiV2ViS2l0V2ViQ29udGV4dC5oIgotI2luY2x1ZGUgPFdlYktpdDIvV0tTb3VwUmVxdWVz dE1hbmFnZXIuaD4KIAotV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogd2Via2l0VVJJU2NoZW1lUmVx dWVzdENyZWF0ZShXZWJLaXRXZWJDb250ZXh0KiwgV0tTb3VwUmVxdWVzdE1hbmFnZXJSZWYsIFdL VVJMUmVmLCB1aW50NjRfdCByZXF1ZXN0SUQpOwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKwor V2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogd2Via2l0VVJJU2NoZW1lUmVxdWVzdENyZWF0ZShXZWJL aXRXZWJDb250ZXh0KiwgV2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHkqLCBXZWJVUkwqLCB1aW50 NjRfdCByZXF1ZXN0SUQpOwogdWludDY0X3Qgd2Via2l0VVJJU2NoZW1lUmVxdWVzdEdldElEKFdl YktpdFVSSVNjaGVtZVJlcXVlc3QqKTsKIHZvaWQgd2Via2l0VVJJU2NoZW1lUmVxdWVzdENhbmNl bChXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Kik7CiAK 168892 2012-10-16 01:48:16 -0700 2012-10-17 05:27:14 -0700 Updated patch to build on current git master wk2-c-api-custom-uri-request.diff text/plain 7568 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlYzFlMjk3Li5hYzRkY2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMTAtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRVUklTY2hlbWVSZXF1ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05Njc4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFVzaW5nIHRoZSBDKysgY2xhc3NlcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRoZSBD IEFQSSB3cmFwcGVycyB3ZQorICAgICAgICBhdm9pZCBhIGxvdCBvZiB0b0ltcGwvdG9BUEkgY2Fz dHMsIHN0cmluZyBjb252ZXJzaW9ucyBhbmQKKyAgICAgICAgYWxsb2NhdGlvbnMuIFRoZSBjb2Rl IGlzIGFsc28gYSBsb3Qgc2ltcGxlciBhbmQgZWFzaWVyIHRvIHJlYWQuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRSZXF1ZXN0TWFuYWdlckNsaWVudC5jcHA6CisgICAgICAg IChkaWRSZWNlaXZlVVJJUmVxdWVzdCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdC5jcHA6CisgICAgICAgIChfV2ViS2l0VVJJU2NoZW1lUmVxdWVz dFByaXZhdGUpOgorICAgICAgICAod2Via2l0VVJJU2NoZW1lUmVxdWVzdENyZWF0ZSk6CisgICAg ICAgICh3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2dldF93ZWJfdmlldyk6CisgICAgICAgICh3 ZWJraXRVUklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNrKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0UHJpdmF0ZS5oOgorCiAyMDEyLTEwLTE1ICBD aHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAgICAgICAg W0VGTF1bV0syXSBSZWdyZXNzaW9uKHIxMzEzMzcpOiBNYWRlIDMgQ29va2llIE1hbmFnZXIgQVBJ IHRlc3RzIGZhaWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFJlcXVlc3RNYW5hZ2VyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFJlcXVlc3RNYW5hZ2VyQ2xpZW50LmNwcAppbmRleCBiYWJhZmU2Li4z YmIyNDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRSZXF1ZXN0TWFuYWdlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0UmVxdWVzdE1hbmFnZXJDbGllbnQuY3BwCkBAIC0yOSw3ICsyOSw3IEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlVVJJUmVxdWVz dChXS1NvdXBSZXF1ZXN0TWFuYWdlclJlZiBzb3VwUmVxdWVzdE1hbmFnZXJSZWYsIFdLVVJMUmVm IHVybFJlZiwgV0tQYWdlUmVmIGluaXRpYXRpbmdQYWdlUmVmLCB1aW50NjRfdCByZXF1ZXN0SUQs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgV2ViS2l0V2ViQ29udGV4dCogd2ViQ29u dGV4dCA9IFdFQktJVF9XRUJfQ09OVEVYVChjbGllbnRJbmZvKTsKLSAgICBHUmVmUHRyPFdlYktp dFVSSVNjaGVtZVJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0VVJJU2NoZW1lUmVx dWVzdENyZWF0ZSh3ZWJDb250ZXh0LCBzb3VwUmVxdWVzdE1hbmFnZXJSZWYsIHVybFJlZiwgaW5p dGlhdGluZ1BhZ2VSZWYsIHJlcXVlc3RJRCkpOworICAgIEdSZWZQdHI8V2ViS2l0VVJJU2NoZW1l UmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZih3ZWJraXRVUklTY2hlbWVSZXF1ZXN0Q3JlYXRl KHdlYkNvbnRleHQsIHRvSW1wbChzb3VwUmVxdWVzdE1hbmFnZXJSZWYpLCB0b0ltcGwodXJsUmVm KSwgdG9JbXBsKGluaXRpYXRpbmdQYWdlUmVmKSwgcmVxdWVzdElEKSk7CiAgICAgd2Via2l0V2Vi Q29udGV4dFJlY2VpdmVkVVJJUmVxdWVzdCh3ZWJDb250ZXh0LCByZXF1ZXN0LmdldCgpKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJ U2NoZW1lUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRVUklTY2hlbWVSZXF1ZXN0LmNwcAppbmRleCBlNjk4MzFmLi42ZjQ2ZGJlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklTY2hlbWVSZXF1ZXN0 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklTY2hl bWVSZXF1ZXN0LmNwcApAQCAtMjAsMjUgKzIwLDI1IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiV2ViS2l0VVJJU2NoZW1lUmVxdWVzdC5oIgogCisjaW5jbHVkZSAiV2ViRGF0YS5o IgogI2luY2x1ZGUgIldlYktpdFVSSVNjaGVtZVJlcXVlc3RQcml2YXRlLmgiCiAjaW5jbHVkZSAi V2ViS2l0V2ViQ29udGV4dFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJWaWV3LmgiCiAj aW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAiV2ViU291cFJlcXVlc3RNYW5hZ2Vy UHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0dPd25QdHJTb3VwLmg+CiAjaW5jbHVkZSA8bGli c291cC9zb3VwLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgogI2luY2x1ZGUg PHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAotdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKLQogc3RhdGlj IGNvbnN0IHVuc2lnbmVkIGludCBnUmVhZEJ1ZmZlclNpemUgPSA4MTkyOwogCiBHX0RFRklORV9U WVBFKFdlYktpdFVSSVNjaGVtZVJlcXVlc3QsIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3QsIEdf VFlQRV9PQkpFQ1QpCiAKIHN0cnVjdCBfV2ViS2l0VVJJU2NoZW1lUmVxdWVzdFByaXZhdGUgewog ICAgIFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRleHQ7Ci0gICAgV0tSZXRhaW5QdHI8V0tTb3Vw UmVxdWVzdE1hbmFnZXJSZWY+IHdrUmVxdWVzdE1hbmFnZXI7Ci0gICAgV0tSZXRhaW5QdHI8V0tQ YWdlUmVmPiB3a0luaXRpYXRpbmdQYWdlOworICAgIFJlZlB0cjxXZWJTb3VwUmVxdWVzdE1hbmFn ZXJQcm94eT4gd2ViUmVxdWVzdE1hbmFnZXI7CisgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gaW5p dGlhdGluZ1BhZ2U7CiAgICAgdWludDY0X3QgcmVxdWVzdElEOwogICAgIENTdHJpbmcgdXJpOwog ICAgIEdPd25QdHI8U291cFVSST4gc291cFVSSTsKQEAgLTcxLDEzICs3MSwxMyBAQCBzdGF0aWMg dm9pZCB3ZWJraXRfdXJpX3NjaGVtZV9yZXF1ZXN0X2NsYXNzX2luaXQoV2ViS2l0VVJJU2NoZW1l UmVxdWVzdENsYXNzKiByZQogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZShyZXF1ZXN0Q2xh c3MsIHNpemVvZihXZWJLaXRVUklTY2hlbWVSZXF1ZXN0UHJpdmF0ZSkpOwogfQogCi1XZWJLaXRV UklTY2hlbWVSZXF1ZXN0KiB3ZWJraXRVUklTY2hlbWVSZXF1ZXN0Q3JlYXRlKFdlYktpdFdlYkNv bnRleHQqIHdlYkNvbnRleHQsIFdLU291cFJlcXVlc3RNYW5hZ2VyUmVmIHdrUmVxdWVzdE1hbmFn ZXIsIFdLVVJMUmVmIHdrVVJMLCBXS1BhZ2VSZWYgd2tJbml0aWF0aW5nUGFnZSwgdWludDY0X3Qg cmVxdWVzdElEKQorV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogd2Via2l0VVJJU2NoZW1lUmVxdWVz dENyZWF0ZShXZWJLaXRXZWJDb250ZXh0KiB3ZWJDb250ZXh0LCBXZWJTb3VwUmVxdWVzdE1hbmFn ZXJQcm94eSogd2ViUmVxdWVzdE1hbmFnZXIsIFdlYlVSTCogd2ViVVJMLCBXZWJQYWdlUHJveHkq IGluaXRpYXRpbmdQYWdlLCB1aW50NjRfdCByZXF1ZXN0SUQpCiB7CiAgICAgV2ViS2l0VVJJU2No ZW1lUmVxdWVzdCogcmVxdWVzdCA9IFdFQktJVF9VUklfU0NIRU1FX1JFUVVFU1QoZ19vYmplY3Rf bmV3KFdFQktJVF9UWVBFX1VSSV9TQ0hFTUVfUkVRVUVTVCwgTlVMTCkpOwogICAgIHJlcXVlc3Qt PnByaXYtPndlYkNvbnRleHQgPSB3ZWJDb250ZXh0OwotICAgIHJlcXVlc3QtPnByaXYtPndrUmVx dWVzdE1hbmFnZXIgPSB3a1JlcXVlc3RNYW5hZ2VyOwotICAgIHJlcXVlc3QtPnByaXYtPnVyaSA9 IHRvSW1wbCh3a1VSTCktPnN0cmluZygpLnV0ZjgoKTsKLSAgICByZXF1ZXN0LT5wcml2LT53a0lu aXRpYXRpbmdQYWdlID0gd2tJbml0aWF0aW5nUGFnZTsKKyAgICByZXF1ZXN0LT5wcml2LT53ZWJS ZXF1ZXN0TWFuYWdlciA9IHdlYlJlcXVlc3RNYW5hZ2VyOworICAgIHJlcXVlc3QtPnByaXYtPnVy aSA9IHdlYlVSTC0+c3RyaW5nKCkudXRmOCgpOworICAgIHJlcXVlc3QtPnByaXYtPmluaXRpYXRp bmdQYWdlID0gaW5pdGlhdGluZ1BhZ2U7CiAgICAgcmVxdWVzdC0+cHJpdi0+cmVxdWVzdElEID0g cmVxdWVzdElEOwogICAgIHJldHVybiByZXF1ZXN0OwogfQpAQCAtMTU0LDcgKzE1NCw3IEBAIFdl YktpdFdlYlZpZXcqIHdlYmtpdF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3dlYl92aWV3KFdlYktp dFVSSVNjaGVtZVJlcXVlc3QqIHJlCiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lU X0lTX1VSSV9TQ0hFTUVfUkVRVUVTVChyZXF1ZXN0KSwgMCk7CiAKLSAgICByZXR1cm4gV0VCS0lU X1dFQl9WSUVXKHRvSW1wbChyZXF1ZXN0LT5wcml2LT53a0luaXRpYXRpbmdQYWdlLmdldCgpKS0+ dmlld1dpZGdldCgpKTsKKyAgICByZXR1cm4gV0VCS0lUX1dFQl9WSUVXKHJlcXVlc3QtPnByaXYt PmluaXRpYXRpbmdQYWdlLT52aWV3V2lkZ2V0KCkpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRV UklTY2hlbWVSZXF1ZXN0UmVhZENhbGxiYWNrKEdJbnB1dFN0cmVhbSogaW5wdXRTdHJlYW0sIEdB c3luY1Jlc3VsdCogcmVzdWx0LCBXZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiBzY2hlbWVSZXF1ZXN0 KQpAQCAtMTY4LDE0ICsxNjgsMTMgQEAgc3RhdGljIHZvaWQgd2Via2l0VVJJU2NoZW1lUmVxdWVz dFJlYWRDYWxsYmFjayhHSW5wdXRTdHJlYW0qIGlucHV0U3RyZWFtLCBHQXN5bmMKICAgICB9CiAK ICAgICBXZWJLaXRVUklTY2hlbWVSZXF1ZXN0UHJpdmF0ZSogcHJpdiA9IHJlcXVlc3QtPnByaXY7 Ci0gICAgV0tSZXRhaW5QdHI8V0tEYXRhUmVmPiB3a0RhdGEoQWRvcHRXSywgV0tEYXRhQ3JlYXRl KGJ5dGVzUmVhZCA/IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdW5zaWduZWQgY2hhcio+KHByaXYt PnJlYWRCdWZmZXIpIDogMCwgYnl0ZXNSZWFkKSk7CisgICAgUmVmUHRyPFdlYkRhdGE+IHdlYkRh dGEgPSBXZWJEYXRhOjpjcmVhdGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1bnNpZ25lZCBjaGFy Kj4ocHJpdi0+cmVhZEJ1ZmZlciksIGJ5dGVzUmVhZCk7CiAgICAgaWYgKCFwcml2LT5ieXRlc1Jl YWQpIHsKLSAgICAgICAgLy8gRmlyc3QgY2h1bmsgcmVhZC4gSW4gY2FzZSBvZiBlbXB0eSByZXBs eSBhbiBlbXB0eSBXS0RhdGFSZWYgaXMgc2VudCB0byB0aGUgV2ViUHJvY2Vzcy4KLSAgICAgICAg V0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrTWltZVR5cGUgPSAhcHJpdi0+bWltZVR5cGUuaXNO dWxsKCkgPyBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHByaXYtPm1pbWVU eXBlLmRhdGEoKSkpIDogMDsKLSAgICAgICAgV0tTb3VwUmVxdWVzdE1hbmFnZXJEaWRIYW5kbGVV UklSZXF1ZXN0KHByaXYtPndrUmVxdWVzdE1hbmFnZXIuZ2V0KCksIHdrRGF0YS5nZXQoKSwgcHJp di0+c3RyZWFtTGVuZ3RoLCB3a01pbWVUeXBlLmdldCgpLCBwcml2LT5yZXF1ZXN0SUQpOworICAg ICAgICAvLyBGaXJzdCBjaHVuayByZWFkLiBJbiBjYXNlIG9mIGVtcHR5IHJlcGx5IGFuIGVtcHR5 IFdlYkRhdGEgaXMgc2VudCB0byB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgcHJpdi0+d2ViUmVx dWVzdE1hbmFnZXItPmRpZEhhbmRsZVVSSVJlcXVlc3Qod2ViRGF0YS5nZXQoKSwgcHJpdi0+c3Ry ZWFtTGVuZ3RoLCBTdHJpbmc6OmZyb21VVEY4KHByaXYtPm1pbWVUeXBlLmRhdGEoKSksIHByaXYt PnJlcXVlc3RJRCk7CiAgICAgfSBlbHNlIGlmIChieXRlc1JlYWQgfHwgKCFieXRlc1JlYWQgJiYg IXByaXYtPnN0cmVhbUxlbmd0aCkpIHsKLSAgICAgICAgLy8gU3Vic2VxdWVudCBjaHVuayByZWFk LiBXZSBvbmx5IHNlbmQgYW4gZW1wdHkgV0tEYXRhUmVmIHRvIHRoZSBXZWJQcm9jZXNzIHdoZW4g c3RyZWFtIGxlbmd0aCBpcyB1bmtub3duLgotICAgICAgICBXS1NvdXBSZXF1ZXN0TWFuYWdlckRp ZFJlY2VpdmVVUklSZXF1ZXN0RGF0YShwcml2LT53a1JlcXVlc3RNYW5hZ2VyLmdldCgpLCB3a0Rh dGEuZ2V0KCksIHByaXYtPnJlcXVlc3RJRCk7CisgICAgICAgIC8vIFN1YnNlcXVlbnQgY2h1bmsg cmVhZC4gV2Ugb25seSBzZW5kIGFuIGVtcHR5IFdlYkRhdGEgdG8gdGhlIFdlYlByb2Nlc3Mgd2hl biBzdHJlYW0gbGVuZ3RoIGlzIHVua25vd24uCisgICAgICAgIHByaXYtPndlYlJlcXVlc3RNYW5h Z2VyLT5kaWRSZWNlaXZlVVJJUmVxdWVzdERhdGEod2ViRGF0YS5nZXQoKSwgcHJpdi0+cmVxdWVz dElEKTsKICAgICB9CiAKICAgICBpZiAoIWJ5dGVzUmVhZCkgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVxdWVzdFByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVSSVNjaGVtZVJlcXVl c3RQcml2YXRlLmgKaW5kZXggYjdjMDExZi4uZWYzZGQ1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VVJJU2NoZW1lUmVxdWVzdFByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVUklTY2hlbWVSZXF1 ZXN0UHJpdmF0ZS5oCkBAIC0yMyw5ICsyMywxMCBAQAogI2luY2x1ZGUgIldlYktpdFByaXZhdGUu aCIKICNpbmNsdWRlICJXZWJLaXRVUklTY2hlbWVSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiV2ViS2l0 V2ViQ29udGV4dC5oIgotI2luY2x1ZGUgPFdlYktpdDIvV0tTb3VwUmVxdWVzdE1hbmFnZXIuaD4K IAotV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCogd2Via2l0VVJJU2NoZW1lUmVxdWVzdENyZWF0ZShX ZWJLaXRXZWJDb250ZXh0KiwgV0tTb3VwUmVxdWVzdE1hbmFnZXJSZWYsIFdLVVJMUmVmLCBXS1Bh Z2VSZWYsIHVpbnQ2NF90IHJlcXVlc3RJRCk7Cit1c2luZyBuYW1lc3BhY2UgV2ViS2l0OworCitX ZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiB3ZWJraXRVUklTY2hlbWVSZXF1ZXN0Q3JlYXRlKFdlYktp dFdlYkNvbnRleHQqLCBXZWJTb3VwUmVxdWVzdE1hbmFnZXJQcm94eSosIFdlYlVSTCosIFdlYlBh Z2VQcm94eSosIHVpbnQ2NF90IHJlcXVlc3RJRCk7CiB1aW50NjRfdCB3ZWJraXRVUklTY2hlbWVS ZXF1ZXN0R2V0SUQoV2ViS2l0VVJJU2NoZW1lUmVxdWVzdCopOwogdm9pZCB3ZWJraXRVUklTY2hl bWVSZXF1ZXN0Q2FuY2VsKFdlYktpdFVSSVNjaGVtZVJlcXVlc3QqKTsKIAo=