125759 2013-12-15 18:16:41 -0800 [GTK] can't build from trunk: WebKitCookieManager: 'WebString' was not declared in this scope 2013-12-16 03:12:50 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Major --- 1 adam svillar andersca cgarcia commit-queue gustavo mrobinson ossy pnormand svillar oldest_to_newest 959956 0 adam 2013-12-15 18:16:41 -0800 I'm attempting to build WebKit from svn trunk on Ubuntu 14.04. I configured with $ ./configure --enable-introspection --enable-debug The build fails with this: CXX Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitCookieManager.lo Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp: In function 'void webkitCookieManagerGetDomainsWithCookiesCallback(WKArrayRef, WKErrorRef, void*)': Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:9: error: 'WebString' was not declared in this scope WebString* domainString = static_cast<WebString*>(domains->at(i)); ^ Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:20: error: 'domainString' was not declared in this scope WebString* domainString = static_cast<WebString*>(domains->at(i)); ^ Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:47: error: expected type-specifier before 'WebString' WebString* domainString = static_cast<WebString*>(domains->at(i)); ^ Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:47: error: expected '>' before 'WebString' Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:47: error: expected '(' before 'WebString' Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:57: error: expected primary-expression before '>' token WebString* domainString = static_cast<WebString*>(domains->at(i)); ^ Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:208:74: error: expected ')' before ';' token WebString* domainString = static_cast<WebString*>(domains->at(i)); ^ make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitCookieManager.lo] Error 1 make[1]: Leaving directory `/home/adam/src/WebKit' make: *** [all] Error 2 960025 1 svillar 2013-12-16 02:51:20 -0800 WebString was renamed to API::String. Uploading a fix soon... 960027 2 219305 svillar 2013-12-16 03:08:25 -0800 Created attachment 219305 Patch 960028 3 commit-queue 2013-12-16 03:10:35 -0800 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 960029 4 svillar 2013-12-16 03:12:50 -0800 Committed r160632: <http://trac.webkit.org/changeset/160632> 219305 2013-12-16 03:08:25 -0800 2013-12-16 03:10:27 -0800 Patch bug-125759-20131216120823.patch text/plain 9770 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwNjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGQ4ZmNkZDg5MzYzZDI5 YTc3M2RlOGQ1ZWU5MDNmOTc1ODM0ZmRmMi4uNDUzOTc0YjA3NDIwMTVjMzBkZDlkOTM0NTNjODJm ZDJmYTc2MjQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTEyLTE2ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIGNh bid0IGJ1aWxkIGZyb20gdHJ1bms6IFdlYktpdENvb2tpZU1hbmFnZXI6ICdXZWJTdHJpbmcnIHdh cyBub3QgZGVjbGFyZWQgaW4gdGhpcyBzY29wZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lZCBXZWJTdHJpbmcgdG8gQVBJOjpTdHJpbmcgYWZ0 ZXIgcjE2MDYwOC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvb2tpZU1h bmFnZXIuY3BwOgorICAgICAgICAod2Via2l0Q29va2llTWFuYWdlckdldERvbWFpbnNXaXRoQ29v a2llc0NhbGxiYWNrKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaWxlQ2hv b3NlclJlcXVlc3QuY3BwOgorICAgICAgICAod2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0X2dl dF9taW1lX3R5cGVzKToKKyAgICAgICAgKHdlYmtpdF9maWxlX2Nob29zZXJfcmVxdWVzdF9nZXRf bWltZV90eXBlc19maWx0ZXIpOgorICAgICAgICAod2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0 X2dldF9zZWxlY3RlZF9maWxlcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0LmNwcDoKKyAgICAgICAgKHdlYmtpdF9mb3JtX3N1Ym1pc3Np b25fcmVxdWVzdF9nZXRfdGV4dF9maWVsZHMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X3NldF93 ZWJfZXh0ZW5zaW9uc19kaXJlY3RvcnkpOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X3By ZWZldGNoX2Rucyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0dy b3VwLmNwcDoKKyAgICAgICAgKHRvQVBJQXJyYXkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24uY3BwOgorICAgICAgICAod2Vi a2l0V2ViRXh0ZW5zaW9uRGlkUmVjZWl2ZU1lc3NhZ2UpOgorCiAyMDEzLTEyLTE1ICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdDIgVmlldyBH ZXN0dXJlczogQ2FuJ3QgcGluY2ggaW4gcGFzdCB0aGUgbWF4aW11bSBzY2FsZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29va2llTWFuYWdlci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2Vy LmNwcAppbmRleCAyOGUzMjg0ZDNkYTIxMWY2NjEyOTNhZDgxNmI4NzkxMmJhYTM3Y2VhLi4yYzFl ZjQ1NjhhYzc4NjFjZThmMmRjNTExZjM4MTkxOTM2ZjdlMmMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcApA QCAtMjAsNiArMjAsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdENv b2tpZU1hbmFnZXIuaCIKIAorI2luY2x1ZGUgIkFQSVN0cmluZy5oIgogI2luY2x1ZGUgIlNvdXBD b29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUuaCIKICNpbmNsdWRlICJXZWJDb29raWVNYW5hZ2Vy UHJveHkuaCIKICNpbmNsdWRlICJXZWJLaXRDb29raWVNYW5hZ2VyUHJpdmF0ZS5oIgpAQCAtMjA1 LDcgKzIwNiw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdENvb2tpZU1hbmFnZXJHZXREb21haW5zV2l0 aENvb2tpZXNDYWxsYmFjayhXS0FycmF5UmVmIHdrRG9tYWluCiAgICAgQVBJOjpBcnJheSogZG9t YWlucyA9IHRvSW1wbCh3a0RvbWFpbnMpOwogICAgIEdQdHJBcnJheSogcmV0dXJuVmFsdWUgPSBn X3B0cl9hcnJheV9zaXplZF9uZXcoZG9tYWlucy0+c2l6ZSgpKTsKICAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IGRvbWFpbnMtPnNpemUoKTsgKytpKSB7Ci0gICAgICAgIFdlYlN0cmluZyogZG9t YWluU3RyaW5nID0gc3RhdGljX2Nhc3Q8V2ViU3RyaW5nKj4oZG9tYWlucy0+YXQoaSkpOworICAg ICAgICBBUEk6OlN0cmluZyogZG9tYWluU3RyaW5nID0gc3RhdGljX2Nhc3Q8QVBJOjpTdHJpbmcq Pihkb21haW5zLT5hdChpKSk7CiAgICAgICAgIFN0cmluZyBkb21haW4gPSBkb21haW5TdHJpbmct PnN0cmluZygpOwogICAgICAgICBpZiAoZG9tYWluLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNv bnRpbnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0RmlsZUNob29zZXJSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEZpbGVDaG9vc2VyUmVxdWVzdC5jcHAKaW5kZXggMjUyNTYyNTY0Y2ZjYjFiODlk YzViODM0ZTRiMmY2Y2MwNDgxMzMxOC4uMTA5MWI3Njg1MWVjMGFiN2MwM2YyMTA4OTRiZTZiMTJk ZTBjYTc5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0RmlsZUNob29zZXJSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRGaWxlQ2hvb3NlclJlcXVlc3QuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAj aW5jbHVkZSAiV2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0LmgiCiAKICNpbmNsdWRlICJBUElBcnJh eS5oIgorI2luY2x1ZGUgIkFQSVN0cmluZy5oIgogI2luY2x1ZGUgIldlYktpdEZpbGVDaG9vc2Vy UmVxdWVzdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzLmgiCiAj aW5jbHVkZSAiV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eS5oIgpAQCAtMjEyLDcgKzIx Myw3IEBAIGNvbnN0IGdjaGFyKiBjb25zdCogd2Via2l0X2ZpbGVfY2hvb3Nlcl9yZXF1ZXN0X2dl dF9taW1lX3R5cGVzKFdlYktpdEZpbGVDaG9vc2VyCiAKICAgICByZXF1ZXN0LT5wcml2LT5taW1l VHlwZXMgPSBhZG9wdEdSZWYoZ19wdHJfYXJyYXlfbmV3X3dpdGhfZnJlZV9mdW5jKGdfZnJlZSkp OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbnVtT2ZNaW1lVHlwZXM7ICsraSkgewotICAg ICAgICBXZWJTdHJpbmcqIHdlYk1pbWVUeXBlID0gc3RhdGljX2Nhc3Q8V2ViU3RyaW5nKj4obWlt ZVR5cGVzLT5hdChpKSk7CisgICAgICAgIEFQSTo6U3RyaW5nKiB3ZWJNaW1lVHlwZSA9IHN0YXRp Y19jYXN0PEFQSTo6U3RyaW5nKj4obWltZVR5cGVzLT5hdChpKSk7CiAgICAgICAgIFN0cmluZyBt aW1lVHlwZVN0cmluZyA9IHdlYk1pbWVUeXBlLT5zdHJpbmcoKTsKICAgICAgICAgaWYgKG1pbWVU eXBlU3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMjU2LDcgKzI1 Nyw3IEBAIEd0a0ZpbGVGaWx0ZXIqIHdlYmtpdF9maWxlX2Nob29zZXJfcmVxdWVzdF9nZXRfbWlt ZV90eXBlc19maWx0ZXIoV2ViS2l0RmlsZUNob29zCiAgICAgLy8gc3VyZSB3ZSBrZWVwIHRoZSBv d25lcnNoaXAgZHVyaW5nIHRoZSBsaWZldGltZSBvZiB0aGUgcmVxdWVzdC4KICAgICByZXF1ZXN0 LT5wcml2LT5maWx0ZXIgPSBndGtfZmlsZV9maWx0ZXJfbmV3KCk7CiAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBudW1PZk1pbWVUeXBlczsgKytpKSB7Ci0gICAgICAgIFdlYlN0cmluZyogd2Vi TWltZVR5cGUgPSBzdGF0aWNfY2FzdDxXZWJTdHJpbmcqPihtaW1lVHlwZXMtPmF0KGkpKTsKKyAg ICAgICAgQVBJOjpTdHJpbmcqIHdlYk1pbWVUeXBlID0gc3RhdGljX2Nhc3Q8QVBJOjpTdHJpbmcq PihtaW1lVHlwZXMtPmF0KGkpKTsKICAgICAgICAgU3RyaW5nIG1pbWVUeXBlU3RyaW5nID0gd2Vi TWltZVR5cGUtPnN0cmluZygpOwogICAgICAgICBpZiAobWltZVR5cGVTdHJpbmcuaXNFbXB0eSgp KQogICAgICAgICAgICAgY29udGludWU7CkBAIC0zNTIsNyArMzUzLDcgQEAgY29uc3QgZ2NoYXIq IGNvbnN0KiB3ZWJraXRfZmlsZV9jaG9vc2VyX3JlcXVlc3RfZ2V0X3NlbGVjdGVkX2ZpbGVzKFdl YktpdEZpbGVDaG8KIAogICAgIHJlcXVlc3QtPnByaXYtPnNlbGVjdGVkRmlsZXMgPSBhZG9wdEdS ZWYoZ19wdHJfYXJyYXlfbmV3X3dpdGhfZnJlZV9mdW5jKGdfZnJlZSkpOwogICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgbnVtT2ZGaWxlczsgKytpKSB7Ci0gICAgICAgIFdlYlN0cmluZyogd2Vi RmlsZU5hbWUgPSBzdGF0aWNfY2FzdDxXZWJTdHJpbmcqPihzZWxlY3RlZEZpbGVOYW1lcy0+YXQo aSkpOworICAgICAgICBBUEk6OlN0cmluZyogd2ViRmlsZU5hbWUgPSBzdGF0aWNfY2FzdDxBUEk6 OlN0cmluZyo+KHNlbGVjdGVkRmlsZU5hbWVzLT5hdChpKSk7CiAgICAgICAgIGlmICh3ZWJGaWxl TmFtZS0+aXNFbXB0eSgpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIENTdHJpbmcg ZmlsZW5hbWUgPSBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24od2ViRmlsZU5hbWUtPnN0cmluZygp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZv cm1TdWJtaXNzaW9uUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QuY3BwCmluZGV4IDkyZWU0NTg2YzFmOGJkMTBl NmJkNmU4ZmUwNTA1NWIzZTk4YzE3ZTAuLjg1MTlhMmNiNmE2YThlMDJkZjVlNGRkMzIwNzQwYTdl NjdlMGIwMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0LmNwcApAQCAtMjAsNiArMjAs NyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdEZvcm1TdWJtaXNzaW9u UmVxdWVzdC5oIgogCisjaW5jbHVkZSAiQVBJU3RyaW5nLmgiCiAjaW5jbHVkZSAiSW1tdXRhYmxl RGljdGlvbmFyeS5oIgogI2luY2x1ZGUgIldlYkZvcm1TdWJtaXNzaW9uTGlzdGVuZXJQcm94eS5o IgogI2luY2x1ZGUgIldlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaCIKQEAgLTEw Miw3ICsxMDMsNyBAQCBHSGFzaFRhYmxlKiB3ZWJraXRfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3Rf Z2V0X3RleHRfZmllbGRzKFdlYktpdEZvcm1TdWJtaXNzaW9uUgogICAgIGNvbnN0IEltbXV0YWJs ZURpY3Rpb25hcnk6Ok1hcFR5cGUmIG1hcCA9IHJlcXVlc3QtPnByaXYtPndlYlZhbHVlcy0+bWFw KCk7CiAgICAgSW1tdXRhYmxlRGljdGlvbmFyeTo6TWFwVHlwZTo6Y29uc3RfaXRlcmF0b3IgZW5k ID0gbWFwLmVuZCgpOwogICAgIGZvciAoSW1tdXRhYmxlRGljdGlvbmFyeTo6TWFwVHlwZTo6Y29u c3RfaXRlcmF0b3IgaXQgPSBtYXAuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAg IFdlYlN0cmluZyogdmFsdWUgPSBzdGF0aWNfY2FzdDxXZWJTdHJpbmcqPihpdC0+dmFsdWUuZ2V0 KCkpOworICAgICAgICBBUEk6OlN0cmluZyogdmFsdWUgPSBzdGF0aWNfY2FzdDxBUEk6OlN0cmlu Zyo+KGl0LT52YWx1ZS5nZXQoKSk7CiAgICAgICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocmVxdWVz dC0+cHJpdi0+dmFsdWVzLmdldCgpLCBnX3N0cmR1cChpdC0+a2V5LnV0ZjgoKS5kYXRhKCkpLCBn X3N0cmR1cCh2YWx1ZS0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSkpOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNw cAppbmRleCA2NDk4MzY1OWNkNWE3ODZiZjI2ZWJjMzJiZWFhZDU4NTg2NThiMzEyLi5kZDdkZjU3 Y2M0MGU0ZTczNTE5NDhiMTJlZTYwNThlOWU3MGJlOGQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMjAsNiAr MjAsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdFdlYkNvbnRleHQu aCIKIAorI2luY2x1ZGUgIkFQSVN0cmluZy5oIgogI2luY2x1ZGUgIldlYkJhdHRlcnlNYW5hZ2Vy UHJveHkuaCIKICNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKICNpbmNsdWRlICJXZWJD b29raWVNYW5hZ2VyUHJveHkuaCIKQEAgLTc4Miw3ICs3ODMsNyBAQCB2b2lkIHdlYmtpdF93ZWJf Y29udGV4dF9zZXRfd2ViX2V4dGVuc2lvbnNfZGlyZWN0b3J5KFdlYktpdFdlYkNvbnRleHQqIGNv bnRleHQsCiAgICAgZ19yZXR1cm5faWZfZmFpbChkaXJlY3RvcnkpOwogCiAgICAgLy8gV2UgcGFz cyB0aGUgYWRkaXRpb25hbCB3ZWIgZXh0ZW5zaW9ucyBkaXJlY3RvcnkgdG8gdGhlIGluamVjdGVk IGJ1bmRsZSBhcyBpbml0aWFsaXphdGlvbiB1c2VyIGRhdGEuCi0gICAgY29udGV4dC0+cHJpdi0+ Y29udGV4dC0+c2V0SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhKFdlYlN0cmlu Zzo6Y3JlYXRlKFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZGlyZWN0b3J5KSkpOworICAgIGNv bnRleHQtPnByaXYtPmNvbnRleHQtPnNldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2Vy RGF0YShBUEk6OlN0cmluZzo6Y3JlYXRlKFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZGlyZWN0 b3J5KSkpOwogfQogCiAvKioKQEAgLTgxNiw3ICs4MTcsNyBAQCB2b2lkIHdlYmtpdF93ZWJfY29u dGV4dF9wcmVmZXRjaF9kbnMoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgY29uc3QgY2hhciog aG9zdAogICAgIGdfcmV0dXJuX2lmX2ZhaWwoaG9zdG5hbWUpOwogCiAgICAgSW1tdXRhYmxlRGlj dGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOwotICAgIG1lc3NhZ2Uuc2V0KFN0cmluZzo6ZnJvbVVU RjgoIkhvc3RuYW1lIiksIFdlYlN0cmluZzo6Y3JlYXRlKFN0cmluZzo6ZnJvbVVURjgoaG9zdG5h bWUpKSk7CisgICAgbWVzc2FnZS5zZXQoU3RyaW5nOjpmcm9tVVRGOCgiSG9zdG5hbWUiKSwgQVBJ OjpTdHJpbmc6OmNyZWF0ZShTdHJpbmc6OmZyb21VVEY4KGhvc3RuYW1lKSkpOwogICAgIGNvbnRl eHQtPnByaXYtPmNvbnRleHQtPnBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShTdHJpbmc6OmZy b21VVEY4KCJQcmVmZXRjaEROUyIpLCBJbW11dGFibGVEaWN0aW9uYXJ5OjpjcmVhdGUoc3RkOjpt b3ZlKG1lc3NhZ2UpKS5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHcm91cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3R3JvdXAuY3BwCmluZGV4IGVkZGFjZGNhMzJh YWY0NWM1ZGFhMTIyNDk2NmVmNmQ1M2NlYTg1ZDcuLjI4OWVjZGYwMzZiYWRkNmM2N2EyNWNkY2Nm YTNmYjI1N2ZmNjE0YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlZpZXdHcm91cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0dyb3VwLmNwcApAQCAtMjEsNiArMjEsNyBAQAogI2luY2x1 ZGUgIldlYktpdFdlYlZpZXdHcm91cC5oIgogCiAjaW5jbHVkZSAiQVBJQXJyYXkuaCIKKyNpbmNs dWRlICJBUElTdHJpbmcuaCIKICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCiAjaW5jbHVkZSAi V2ViS2l0U2V0dGluZ3NQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlld0dyb3VwUHJp dmF0ZS5oIgpAQCAtMjMzLDcgKzIzNCw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEFQSTo6QXJyYXk+ IHRvQVBJQXJyYXkoY29uc3QgY2hhciogY29uc3QqIGxpc3QpCiAKICAgICBWZWN0b3I8UmVmUHRy PEFQSTo6T2JqZWN0PiA+IGVudHJpZXM7CiAgICAgd2hpbGUgKCpsaXN0KSB7Ci0gICAgICAgIGVu dHJpZXMuYXBwZW5kKFdlYlN0cmluZzo6Y3JlYXRlRnJvbVVURjhTdHJpbmcoKmxpc3QpKTsKKyAg ICAgICAgZW50cmllcy5hcHBlbmQoQVBJOjpTdHJpbmc6OmNyZWF0ZUZyb21VVEY4U3RyaW5nKCps aXN0KSk7CiAgICAgICAgIGxpc3QrKzsKICAgICB9CiAgICAgcmV0dXJuIEFQSTo6QXJyYXk6OmNy ZWF0ZShzdGQ6Om1vdmUoZW50cmllcykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYkV4dGVuc2lvbi5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2Vi RXh0ZW5zaW9uLmNwcAppbmRleCA0MGQwNWJiMzEwZDNhZjFmYjcxMGIxMTA5Njc4YzRkNGVmZjBj Yjg5Li5hOGRiYjU1ZGMwM2U0MDRkMGY3YzdhOWQwYmYwZTg1MWFlNzI3ODBlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0 V2ViRXh0ZW5zaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0ZW5zaW9uLmNwcApAQCAtMjAsNiArMjAsNyBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktpdFdlYkV4dGVuc2lvbi5oIgogCisj aW5jbHVkZSAiQVBJU3RyaW5nLmgiCiAjaW5jbHVkZSAiSW1tdXRhYmxlRGljdGlvbmFyeS5oIgog I2luY2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgogI2luY2x1ZGUgIldLQnVuZGxlUGFnZS5oIgpA QCAtODMsNyArODQsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJFeHRlbnNpb25QYWdlRGVzdHJv eShXZWJLaXRXZWJFeHRlbnNpb24qIGV4dGVuc2lvbiwgV2ViUGFnZQogc3RhdGljIHZvaWQgd2Vi a2l0V2ViRXh0ZW5zaW9uRGlkUmVjZWl2ZU1lc3NhZ2UoV2ViS2l0V2ViRXh0ZW5zaW9uKiBleHRl bnNpb24sIGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEltbXV0YWJsZURpY3Rpb25hcnkmIG1l c3NhZ2UpCiB7CiAgICAgaWYgKG1lc3NhZ2VOYW1lID09IFN0cmluZzo6ZnJvbVVURjgoIlByZWZl dGNoRE5TIikpIHsKLSAgICAgICAgV2ViU3RyaW5nKiBob3N0bmFtZSA9IHN0YXRpY19jYXN0PFdl YlN0cmluZyo+KG1lc3NhZ2UuZ2V0KFN0cmluZzo6ZnJvbVVURjgoIkhvc3RuYW1lIikpKTsKKyAg ICAgICAgQVBJOjpTdHJpbmcqIGhvc3RuYW1lID0gc3RhdGljX2Nhc3Q8QVBJOjpTdHJpbmcqPiht ZXNzYWdlLmdldChTdHJpbmc6OmZyb21VVEY4KCJIb3N0bmFtZSIpKSk7CiAgICAgICAgIFdlYkNv cmU6OnByZWZldGNoRE5TKGhvc3RuYW1lLT5zdHJpbmcoKSk7CiAgICAgfSBlbHNlCiAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwo=