107652 2013-01-23 02:10:38 -0800 [WK2] Replace some internal API usage in EwkView with C API 2013-01-23 14:54:44 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107657 1 kenneth kenneth benjamin d-r gyuyoung.kim mikhail.pozdnyakov rakuco tmpsantos webkit.review.bot oldest_to_newest 814027 0 kenneth 2013-01-23 02:10:38 -0800 SSIA 814029 1 184183 kenneth 2013-01-23 02:15:57 -0800 Created attachment 184183 Patch 814039 2 184183 cdumez 2013-01-23 02:28:53 -0800 Comment on attachment 184183 Patch LGTM. 814041 3 184183 gyuyoung.kim 2013-01-23 02:30:47 -0800 Comment on attachment 184183 Patch Looks fine. 814523 4 184183 benjamin 2013-01-23 12:43:46 -0800 Comment on attachment 184183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184183&action=review Really nice. Just one API thingy you might want to look into: > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:758 > - if (unreachableUrl && *unreachableUrl) > - impl->page()->loadAlternateHTMLString(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : "", String::fromUTF8(unreachableUrl)); > - else > - impl->page()->loadHTMLString(String::fromUTF8(html), baseUrl ? String::fromUTF8(baseUrl) : ""); > + WKRetainPtr<WKStringRef> wkHTMLString = adoptWK(WKStringCreateWithUTF8CString(html)); > + WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithUTF8CString(baseUrl)); > + > + if (unreachableUrl && *unreachableUrl) { > + WKRetainPtr<WKURLRef> wkUnreachableURL = adoptWK(WKURLCreateWithUTF8CString(unreachableUrl)); > + WKPageLoadAlternateHTMLString(impl->wkPage(), wkHTMLString.get(), wkBaseURL.get(), wkUnreachableURL.get()); > + } else > + WKPageLoadHTMLString(impl->wkPage(), wkHTMLString.get(), wkBaseURL.get()); The new code is nicer than the old one. 814623 5 184183 benjamin 2013-01-23 14:18:46 -0800 Comment on attachment 184183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184183&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:568 > - impl->page()->loadURL(url); > + WKRetainPtr<WKURLRef> wkUrl = adoptWK(WKURLCreateWithUTF8CString(url)); > + WKPageLoadURL(impl->wkPage(), wkUrl.get()); This change the behavior. You know supports UTF8 instead of Latin1. You may want to update the documentation and tests. 814655 6 kenneth 2013-01-23 14:39:14 -0800 Created #107739 to track the unit test and documentation update. 814683 7 184183 webkit.review.bot 2013-01-23 14:54:39 -0800 Comment on attachment 184183 Patch Clearing flags on attachment: 184183 Committed r140600: <http://trac.webkit.org/changeset/140600> 814685 8 webkit.review.bot 2013-01-23 14:54:44 -0800 All reviewed patches have been landed. Closing bug. 184183 2013-01-23 02:15:57 -0800 2013-01-23 14:54:39 -0800 Patch bug-107652-20130123111246.patch text/plain 8867 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTVlMzI1Y2U1Yzc0ZmM3 YzJjMDE3MWRlZWQyYzI1MTBhMDA4N2RkMS4uMjFjNjYwNmE0MzMwOThkZWNhNTM5ZDIyZDQyZmQ4 ZWNhOGVkZGVhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAxLTIzICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb V0syXSBSZXBsYWNlIHNvbWUgaW50ZXJuYWwgQVBJIHVzYWdlIGluIEV3a1ZpZXcgd2l0aCBDIEFQ SQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NjUy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld191cmxfc2V0KToK KyAgICAgICAgKGV3a192aWV3X3JlbG9hZCk6CisgICAgICAgIChld2tfdmlld19yZWxvYWRfYnlw YXNzX2NhY2hlKToKKyAgICAgICAgKGV3a192aWV3X3N0b3ApOgorICAgICAgICAoZXdrX3ZpZXdf bG9hZF9wcm9ncmVzc19nZXQpOgorICAgICAgICAoZXdrX3ZpZXdfc2NhbGVfc2V0KToKKyAgICAg ICAgKGV3a192aWV3X3NjYWxlX2dldCk6CisgICAgICAgIChld2tfdmlld19kZXZpY2VfcGl4ZWxf cmF0aW9fZ2V0KToKKyAgICAgICAgKGV3a192aWV3X2JhY2spOgorICAgICAgICAoZXdrX3ZpZXdf Zm9yd2FyZCk6CisgICAgICAgIChld2tfdmlld19iYWNrX3Bvc3NpYmxlKToKKyAgICAgICAgKGV3 a192aWV3X2ZvcndhcmRfcG9zc2libGUpOgorICAgICAgICAoZXdrX3ZpZXdfaHRtbF9zdHJpbmdf bG9hZCk6CisgICAgICAgIChld2tfdmlld190ZXh0X2ZpbmQpOgorICAgICAgICAoZXdrX3ZpZXdf dGV4dF9maW5kX2hpZ2hsaWdodF9jbGVhcik6CisgICAgICAgIChld2tfdmlld190ZXh0X21hdGNo ZXNfY291bnQpOgorICAgICAgICAoZXdrX3ZpZXdfaW5zcGVjdG9yX3Nob3cpOgorICAgICAgICAo ZXdrX3ZpZXdfaW5zcGVjdG9yX2Nsb3NlKToKKwogMjAxMy0wMS0yMiAgVGltIEhvcnRvbiAgPHRp bW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBQREZQbHVnaW46IEJ1aWxkIFBERlBs dWdpbiBldmVyeXdoZXJlLCBlbmFibGUgYXQgcnVudGltZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDk3ODI1MDYxYWJkMDk5YmUzYzYyMTAy ZTM3MDc2ZDAyNTVkMWE0ZjYuLjRiYmU0ZTc2OTcxZDEzZDk0ZGU0ZWE5NDE5ZDRhMjM4ZGM1ZTk1 NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAK QEAgLTM1LDggKzM1LDEwIEBACiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSAiV0tF aW5hU2hhcmVkU3RyaW5nLmgiCiAjaW5jbHVkZSAiV0tGaW5kT3B0aW9ucy5oIgorI2luY2x1ZGUg IldLSW5zcGVjdG9yLmgiCiAjaW5jbHVkZSAiV0tSZXRhaW5QdHIuaCIKICNpbmNsdWRlICJXS1N0 cmluZy5oIgorI2luY2x1ZGUgIldLVVJMLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2lu Y2x1ZGUgIldlYkRhdGEuaCIKICNpbmNsdWRlICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5Lmgi CkBAIC01NjIsNyArNTY0LDggQEAgRWluYV9Cb29sIGV3a192aWV3X3VybF9zZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHVybCkKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9S RVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVU VVJOX1ZBTCh1cmwsIGZhbHNlKTsKIAotICAgIGltcGwtPnBhZ2UoKS0+bG9hZFVSTCh1cmwpOwor ICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VybCA9IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRo VVRGOENTdHJpbmcodXJsKSk7CisgICAgV0tQYWdlTG9hZFVSTChpbXBsLT53a1BhZ2UoKSwgd2tV cmwuZ2V0KCkpOwogICAgIGltcGwtPmluZm9ybVVSTENoYW5nZSgpOwogCiAgICAgcmV0dXJuIHRy dWU7CkBAIC01ODYsNyArNTg5LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3JlbG9hZChFdmFzX09i amVjdCogZXdrVmlldykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgaW1wbCwgZmFsc2UpOwogCi0gICAgaW1wbC0+cGFnZSgpLT5yZWxvYWQoLypyZWxvYWRGcm9t T3JpZ2luKi8gZmFsc2UpOworICAgIFdLUGFnZVJlbG9hZChpbXBsLT53a1BhZ2UoKSk7CiAgICAg aW1wbC0+aW5mb3JtVVJMQ2hhbmdlKCk7CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTU5Niw3ICs1 OTksNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcmVsb2FkX2J5cGFzc19jYWNoZShFdmFzX09iamVj dCogZXdrVmlldykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg aW1wbCwgZmFsc2UpOwogCi0gICAgaW1wbC0+cGFnZSgpLT5yZWxvYWQoLypyZWxvYWRGcm9tT3Jp Z2luKi8gdHJ1ZSk7CisgICAgV0tQYWdlUmVsb2FkRnJvbU9yaWdpbihpbXBsLT53a1BhZ2UoKSk7 CiAgICAgaW1wbC0+aW5mb3JtVVJMQ2hhbmdlKCk7CiAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTYw Niw3ICs2MDksNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc3RvcChFdmFzX09iamVjdCogZXdrVmll dykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFs c2UpOwogCi0gICAgaW1wbC0+cGFnZSgpLT5zdG9wTG9hZGluZygpOworICAgIFdLUGFnZVN0b3BM b2FkaW5nKGltcGwtPndrUGFnZSgpKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtNjI5LDE0 ICs2MzIsMTQgQEAgZG91YmxlIGV3a192aWV3X2xvYWRfcHJvZ3Jlc3NfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0KiBld2tWaWV3KQogewogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tW aWV3LCBpbXBsLCAtMS4wKTsKIAotICAgIHJldHVybiBpbXBsLT5wYWdlKCktPmVzdGltYXRlZFBy b2dyZXNzKCk7CisgICAgcmV0dXJuIFdLUGFnZUdldEVzdGltYXRlZFByb2dyZXNzKGltcGwtPndr UGFnZSgpKTsKIH0KIAogRWluYV9Cb29sIGV3a192aWV3X3NjYWxlX3NldChFdmFzX09iamVjdCog ZXdrVmlldywgZG91YmxlIHNjYWxlRmFjdG9yLCBpbnQgeCwgaW50IHkpCiB7CiAgICAgRVdLX1ZJ RVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNlKTsKIAotICAgIGltcGwt PnBhZ2UoKS0+c2NhbGVQYWdlKHNjYWxlRmFjdG9yLCBJbnRQb2ludCh4LCB5KSk7CisgICAgV0tQ YWdlU2V0U2NhbGVGYWN0b3IoaW1wbC0+d2tQYWdlKCksIHNjYWxlRmFjdG9yLCBXS1BvaW50TWFr ZSh4LCB5KSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTY0NCw3ICs2NDcsNyBAQCBkb3Vi bGUgZXdrX3ZpZXdfc2NhbGVfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogewogICAg IEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCAtMSk7CiAKLSAgICBy ZXR1cm4gaW1wbC0+cGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKTsKKyAgICByZXR1cm4gV0tQYWdl R2V0U2NhbGVGYWN0b3IoaW1wbC0+d2tQYWdlKCkpOwogfQogCiBFaW5hX0Jvb2wgZXdrX3ZpZXdf ZGV2aWNlX3BpeGVsX3JhdGlvX3NldChFdmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgcmF0aW8p CkBAIC02NjAsNyArNjYzLDcgQEAgZmxvYXQgZXdrX3ZpZXdfZGV2aWNlX3BpeGVsX3JhdGlvX2dl dChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgaW1wbCwgLTEuMCk7CiAKLSAgICByZXR1cm4gaW1wbC0+cGFnZSgp LT5kZXZpY2VTY2FsZUZhY3RvcigpOworICAgIHJldHVybiBXS1BhZ2VHZXRCYWNraW5nU2NhbGVG YWN0b3IoaW1wbC0+d2tQYWdlKCkpOwogfQogCiB2b2lkIGV3a192aWV3X3RoZW1lX3NldChFdmFz X09iamVjdCogZXdrVmlldywgY29uc3QgY2hhciogcGF0aCkKQEAgLTY4MSw5ICs2ODQsOSBAQCBF aW5hX0Jvb2wgZXdrX3ZpZXdfYmFjayhFdmFzX09iamVjdCogZXdrVmlldykKIHsKICAgICBFV0tf VklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOwogCi0gICAgV2Vi UGFnZVByb3h5KiBwYWdlID0gaW1wbC0+cGFnZSgpOwotICAgIGlmIChwYWdlLT5jYW5Hb0JhY2so KSkgewotICAgICAgICBwYWdlLT5nb0JhY2soKTsKKyAgICBXS1BhZ2VSZWYgcGFnZSA9IGltcGwt PndrUGFnZSgpOworICAgIGlmIChXS1BhZ2VDYW5Hb0JhY2socGFnZSkpIHsKKyAgICAgICAgV0tQ YWdlR29CYWNrKHBhZ2UpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTY5NCw5 ICs2OTcsOSBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfZm9yd2FyZChFdmFzX09iamVjdCogZXdrVmll dykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFs c2UpOwogCi0gICAgV2ViUGFnZVByb3h5KiBwYWdlID0gaW1wbC0+cGFnZSgpOwotICAgIGlmIChw YWdlLT5jYW5Hb0ZvcndhcmQoKSkgewotICAgICAgICBwYWdlLT5nb0ZvcndhcmQoKTsKKyAgICBX S1BhZ2VSZWYgcGFnZSA9IGltcGwtPndrUGFnZSgpOworICAgIGlmIChXS1BhZ2VDYW5Hb0Zvcndh cmQocGFnZSkpIHsKKyAgICAgICAgV0tQYWdlR29Gb3J3YXJkKHBhZ2UpOwogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTcyNCwxNSArNzI3LDEzIEBAIEVpbmFfQm9vbCBld2tfdmll d19pbnRlbnRfZGVsaXZlcihFdmFzX09iamVjdCogZXdrVmlldywgRXdrX0ludGVudCogaW50ZW50 KQogRWluYV9Cb29sIGV3a192aWV3X2JhY2tfcG9zc2libGUoRXZhc19PYmplY3QqIGV3a1ZpZXcp CiB7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNl KTsKLQotICAgIHJldHVybiBpbXBsLT5wYWdlKCktPmNhbkdvQmFjaygpOworICAgIHJldHVybiBX S1BhZ2VDYW5Hb0JhY2soaW1wbC0+d2tQYWdlKCkpOwogfQogCiBFaW5hX0Jvb2wgZXdrX3ZpZXdf Zm9yd2FyZF9wb3NzaWJsZShFdmFzX09iamVjdCogZXdrVmlldykKIHsKICAgICBFV0tfVklFV19J TVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOwotCi0gICAgcmV0dXJuIGlt cGwtPnBhZ2UoKS0+Y2FuR29Gb3J3YXJkKCk7CisgICAgcmV0dXJuIFdLUGFnZUNhbkdvRm9yd2Fy ZChpbXBsLT53a1BhZ2UoKSk7CiB9CiAKIEV3a19CYWNrX0ZvcndhcmRfTGlzdCogZXdrX3ZpZXdf YmFja19mb3J3YXJkX2xpc3RfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQpAQCAtNzQ3 LDEwICs3NDgsMTQgQEAgRWluYV9Cb29sIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQoRXZhc19P YmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIGh0bWwsIGNvbnMKICAgICBFV0tfVklFV19JTVBM X0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOwogICAgIEVJTkFfU0FGRVRZX09O X05VTExfUkVUVVJOX1ZBTChodG1sLCBmYWxzZSk7CiAKLSAgICBpZiAodW5yZWFjaGFibGVVcmwg JiYgKnVucmVhY2hhYmxlVXJsKQotICAgICAgICBpbXBsLT5wYWdlKCktPmxvYWRBbHRlcm5hdGVI VE1MU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgoaHRtbCksIGJhc2VVcmwgPyBTdHJpbmc6OmZyb21V VEY4KGJhc2VVcmwpIDogIiIsIFN0cmluZzo6ZnJvbVVURjgodW5yZWFjaGFibGVVcmwpKTsKLSAg ICBlbHNlCi0gICAgICAgIGltcGwtPnBhZ2UoKS0+bG9hZEhUTUxTdHJpbmcoU3RyaW5nOjpmcm9t VVRGOChodG1sKSwgYmFzZVVybCA/IFN0cmluZzo6ZnJvbVVURjgoYmFzZVVybCkgOiAiIik7Cisg ICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrSFRNTFN0cmluZyA9IGFkb3B0V0soV0tTdHJp bmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoaHRtbCkpOworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVm PiB3a0Jhc2VVUkwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGJhc2VVcmwp KTsKKworICAgIGlmICh1bnJlYWNoYWJsZVVybCAmJiAqdW5yZWFjaGFibGVVcmwpIHsKKyAgICAg ICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrVW5yZWFjaGFibGVVUkwgPSBhZG9wdFdLKFdLVVJM Q3JlYXRlV2l0aFVURjhDU3RyaW5nKHVucmVhY2hhYmxlVXJsKSk7CisgICAgICAgIFdLUGFnZUxv YWRBbHRlcm5hdGVIVE1MU3RyaW5nKGltcGwtPndrUGFnZSgpLCB3a0hUTUxTdHJpbmcuZ2V0KCks IHdrQmFzZVVSTC5nZXQoKSwgd2tVbnJlYWNoYWJsZVVSTC5nZXQoKSk7CisgICAgfSBlbHNlCisg ICAgICAgIFdLUGFnZUxvYWRIVE1MU3RyaW5nKGltcGwtPndrUGFnZSgpLCB3a0hUTUxTdHJpbmcu Z2V0KCksIHdrQmFzZVVSTC5nZXQoKSk7CiAKICAgICBpbXBsLT5pbmZvcm1VUkxDaGFuZ2UoKTsK IApAQCAtNzg4LDcgKzc5Myw4IEBAIEVpbmFfQm9vbCBld2tfdmlld190ZXh0X2ZpbmQoRXZhc19P YmplY3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRleHQsIEV3a19GaW5kX09wCiAgICAgRVdLX1ZJ RVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNlKTsKICAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwodGV4dCwgZmFsc2UpOwogCi0gICAgaW1wbC0+cGFnZSgp LT5maW5kU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgodGV4dCksIHN0YXRpY19jYXN0PFdlYktpdDo6 RmluZE9wdGlvbnM+KG9wdGlvbnMpLCBtYXhNYXRjaENvdW50KTsKKyAgICBXS1JldGFpblB0cjxX S1N0cmluZ1JlZj4gd2tUZXh0ID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmlu Zyh0ZXh0KSk7CisgICAgV0tQYWdlRmluZFN0cmluZyhpbXBsLT53a1BhZ2UoKSwgd2tUZXh0Lmdl dCgpLCBzdGF0aWNfY2FzdDxXZWJLaXQ6OkZpbmRPcHRpb25zPihvcHRpb25zKSwgbWF4TWF0Y2hD b3VudCk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTc5Nyw3ICs4MDMsNyBAQCBFaW5hX0Jv b2wgZXdrX3ZpZXdfdGV4dF9maW5kX2hpZ2hsaWdodF9jbGVhcihFdmFzX09iamVjdCogZXdrVmll dykKIHsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFs c2UpOwogCi0gICAgaW1wbC0+cGFnZSgpLT5oaWRlRmluZFVJKCk7CisgICAgV0tQYWdlSGlkZUZp bmRVSShpbXBsLT53a1BhZ2UoKSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTgwNyw3ICs4 MTMsOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KEV2YXNfT2JqZWN0 KiBld2tWaWV3LCBjb25zdCBjaGFyKiB0ZXh0LCBFdwogICAgIEVXS19WSUVXX0lNUExfR0VUX09S X1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9S RVRVUk5fVkFMKHRleHQsIGZhbHNlKTsKIAotICAgIGltcGwtPnBhZ2UoKS0+Y291bnRTdHJpbmdN YXRjaGVzKFN0cmluZzo6ZnJvbVVURjgodGV4dCksIHN0YXRpY19jYXN0PFdlYktpdDo6RmluZE9w dGlvbnM+KG9wdGlvbnMpLCBtYXhNYXRjaENvdW50KTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmlu Z1JlZj4gd2tUZXh0ID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyh0ZXh0 KSk7CisgICAgV0tQYWdlQ291bnRTdHJpbmdNYXRjaGVzKGltcGwtPndrUGFnZSgpLCB3a1RleHQu Z2V0KCksIHN0YXRpY19jYXN0PFdlYktpdDo6RmluZE9wdGlvbnM+KG9wdGlvbnMpLCBtYXhNYXRj aENvdW50KTsKIAogICAgIHJldHVybiB0cnVlOwogfQpAQCAtODc5LDkgKzg4Niw5IEBAIEVpbmFf Qm9vbCBld2tfdmlld19pbnNwZWN0b3Jfc2hvdyhFdmFzX09iamVjdCogZXdrVmlldykKICNpZiBF TkFCTEUoSU5TUEVDVE9SKQogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBpbXBsLCBmYWxzZSk7CiAKLSAgICBXZWJJbnNwZWN0b3JQcm94eSogaW5zcGVjdG9yID0gaW1w bC0+cGFnZSgpLT5pbnNwZWN0b3IoKTsKLSAgICBpZiAoaW5zcGVjdG9yKQotICAgICAgICBpbnNw ZWN0b3ItPnNob3coKTsKKyAgICBXS0luc3BlY3RvclJlZiB3a0luc3BlY3RvciA9IFdLUGFnZUdl dEluc3BlY3RvcihpbXBsLT53a1BhZ2UoKSk7CisgICAgaWYgKHdrSW5zcGVjdG9yKQorICAgICAg ICBXS0luc3BlY3RvclNob3cod2tJbnNwZWN0b3IpOwogCiAgICAgcmV0dXJuIHRydWU7CiAjZWxz ZQpAQCAtODk1LDkgKzkwMiw5IEBAIEVpbmFfQm9vbCBld2tfdmlld19pbnNwZWN0b3JfY2xvc2Uo RXZhc19PYmplY3QqIGV3a1ZpZXcpCiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKICAgICBFV0tfVklF V19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOwogCi0gICAgV2ViSW5z cGVjdG9yUHJveHkqIGluc3BlY3RvciA9IGltcGwtPnBhZ2UoKS0+aW5zcGVjdG9yKCk7Ci0gICAg aWYgKGluc3BlY3RvcikKLSAgICAgICAgaW5zcGVjdG9yLT5jbG9zZSgpOworICAgIFdLSW5zcGVj dG9yUmVmIHdrSW5zcGVjdG9yID0gV0tQYWdlR2V0SW5zcGVjdG9yKGltcGwtPndrUGFnZSgpKTsK KyAgICBpZiAod2tJbnNwZWN0b3IpCisgICAgICAgIFdLSW5zcGVjdG9yQ2xvc2Uod2tJbnNwZWN0 b3IpOwogCiAgICAgcmV0dXJuIHRydWU7CiAjZWxzZQo=