146234 2015-06-23 04:13:21 -0700 [GTK] WebSQL doesn't work because openDatabase always fails with DOM Exception 18 2015-07-02 06:01:43 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto commit-queue gustavo mcatanzaro mrobinson svillar oldest_to_newest 1104076 0 cgarcia 2015-06-23 04:13:21 -0700 This is because we don't provide any quota, and 0 is used by default, so there's never enough quota and openDatabase fails. 1104077 1 255405 cgarcia 2015-06-23 04:18:10 -0700 Created attachment 255405 Patch 1104078 2 commit-queue 2015-06-23 04:19:17 -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 1104079 3 commit-queue 2015-06-23 04:19:29 -0700 Attachment 255405 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp:149: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1106338 4 255997 cgarcia 2015-07-02 00:17:43 -0700 Created attachment 255997 Patch Rebased to current trunk and also enables the WebSQL directory unit test that is currently disabled because of this bug. 1106340 5 commit-queue 2015-07-02 00:20:33 -0700 Attachment 255997 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp:149: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1106341 6 cgarcia 2015-07-02 00:25:50 -0700 EWS failure is not because of this patch, but the internal jhbuild doing too much stuff for every patch and sometimes failing to do so. 1106354 7 255997 svillar 2015-07-02 03:10:03 -0700 Comment on attachment 255997 Patch So aren't we running WebSQL layout tests? 1106357 8 cgarcia 2015-07-02 03:27:47 -0700 (In reply to comment #7) > Comment on attachment 255997 [details] > Patch > > So aren't we running WebSQL layout tests? WTR implements this callback, returning also 5MB. 1106359 9 svillar 2015-07-02 03:58:46 -0700 (In reply to comment #8) > (In reply to comment #7) > > Comment on attachment 255997 [details] > > Patch > > > > So aren't we running WebSQL layout tests? > > WTR implements this callback, returning also 5MB. My point was, we either run them and all of them were failing, or we are skipping them and you aren't unskipping them. 1106363 10 cgarcia 2015-07-02 04:49:43 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > Comment on attachment 255997 [details] > > > Patch > > > > > > So aren't we running WebSQL layout tests? > > > > WTR implements this callback, returning also 5MB. > > My point was, we either run them and all of them were failing, or we are > skipping them and you aren't unskipping them. We run them and they don't fail because WTR implements that callback in its UI client. 1106375 11 cgarcia 2015-07-02 06:01:43 -0700 Committed r186225: <http://trac.webkit.org/changeset/186225> 255405 2015-06-23 04:18:10 -0700 2015-07-02 00:17:43 -0700 Patch wk2-database-quota.diff text/plain 5947 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxYjU2NGUwLi43ZmRiY2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTUtMDYtMjMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFdlYlNRTCBkb2Vzbid0IHdvcmsgYmVjYXVzZSBvcGVuRGF0YWJh c2UgYWx3YXlzIGZhaWxzIHdpdGggRE9NIEV4Y2VwdGlvbiAxOAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBiZWNhdXNlIHdlIGRvbid0IHBy b3ZpZGUgYW55IHF1b3RhLCBhbmQgMCBpcyB1c2VkIGJ5CisgICAgICAgIGRlZmF1bHQsIHNvIHRo ZXJlJ3MgbmV2ZXIgZW5vdWdoIHF1b3RhIGFuZCBvcGVuRGF0YWJhc2UgZmFpbHMuIFdlCisgICAg ICAgIHNob3VsZCBleHBvc2UgdGhpcyBpbiB0aGUgQVBJLCBidXQgZm9yIG5vdywgd2UgY291bGQg dXNlIGEgZGVmYXVsdAorICAgICAgICBxdW90YSBvZiA1TUIgbGlrZSBXVFIgZG9lcy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcDogT3ZlcnJpZGUKKyAg ICAgICAgZXhjZWVkZWREYXRhYmFzZVF1b3RhIGFuZCByZXR1cm4gYWx3YXlzIHRoZSBkZWZhdWx0 IHF1b3RhLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3Bw OgorICAgICAgICAoV2ViS2l0OjpleGNlZWRlZERhdGFiYXNlUXVvdGEpOiBSZXR1cm4gdGhlIHF1 b3RhIGJhc2VkIG9uIHRoZQorICAgICAgICBleHBlY3RlZCB1c2FnZSBhbmQgY3VycmVudCBkYXRh YmFzZSB1c2FiZSBsaWtlIG1hYyBkb2VzLgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQ cm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKTogQWRkCisgICAgICAgIGN1c3RvbSBV SSBjbGllbnQgdG8gaW1wbGVtZW50IGV4Y2VlZGVkRGF0YWJhc2VRdW90YS4KKwogMjAxNS0wNi0x OSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gQWRkIGluaXRpYWwgV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyIEFQSSBmb3IgcHJvY2Vz cyBjb25maWd1cmF0aW9uIG9wdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcAppbmRleCA1NWJjZGY0Li41YjE5NWRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQu Y3BwCkBAIC0xNDYsNiArMTQ2LDEzIEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBXZWJDb3Jl OjpGbG9hdFJlY3QoZ2VvbWV0cnkpOwogICAgIH0KIAorICAgIHZpcnR1YWwgdm9pZCBleGNlZWRl ZERhdGFiYXNlUXVvdGEoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIEFQSTo6U2VjdXJp dHlPcmlnaW4qLCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCB1bnNpZ25lZCBsb25nIGxv bmcgLypjdXJyZW50UXVvdGEqLywgdW5zaWduZWQgbG9uZyBsb25nIC8qY3VycmVudE9yaWdpblVz YWdlKi8sIHVuc2lnbmVkIGxvbmcgbG9uZyAvKmN1cnJlbnREYXRhYmFzZVVzYWdlKi8sIHVuc2ln bmVkIGxvbmcgbG9uZyAvKmV4cGVjdGVkVXNhZ2UqLywgc3RkOjpmdW5jdGlvbjx2b2lkICh1bnNp Z25lZCBsb25nIGxvbmcpPiBjb21wbGV0aW9uSGFuZGxlcikgb3ZlcnJpZGUKKyAgICB7CisgICAg ICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBsb25nIGxvbmcgZGVmYXVsdFF1b3RhID0gNSAqIDEw MjQgKiAxMjA0OyAvLyA1IE1CCisgICAgICAgIC8vIEZJWE1FOiBQcm92aWRlIEFQSSBmb3IgdGhp cy4KKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoZGVmYXVsdFF1b3RhKTsKKyAgICB9CisKICAg ICB2aXJ0dWFsIGJvb2wgcnVuT3BlblBhbmVsKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkq LCBXZWJPcGVuUGFuZWxQYXJhbWV0ZXJzKiBwYXJhbWV0ZXJzLCBXZWJPcGVuUGFuZWxSZXN1bHRM aXN0ZW5lclByb3h5KiBsaXN0ZW5lcikgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIEdSZWZQdHI8 V2ViS2l0RmlsZUNob29zZXJSZXF1ZXN0PiByZXF1ZXN0ID0gYWRvcHRHUmVmKHdlYmtpdEZpbGVD aG9vc2VyUmVxdWVzdENyZWF0ZShwYXJhbWV0ZXJzLCBsaXN0ZW5lcikpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJJbnNwZWN0b3JQcm94eUd0ay5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAppbmRl eCBlMDFhZDFiLi4wNWVjODcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcApAQCAtNTIsNiArNTIsMTEgQEAgc3RhdGlj IHZvaWQgaW5zcGVjdG9yVmlld0Rlc3Ryb3llZChHdGtXaWRnZXQqLCBncG9pbnRlciB1c2VyRGF0 YSkKICAgICBpbnNwZWN0b3JQcm94eS0+Y2xvc2UoKTsKIH0KIAorc3RhdGljIHVuc2lnbmVkIGxv bmcgbG9uZyBleGNlZWRlZERhdGFiYXNlUXVvdGEoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1Nl Y3VyaXR5T3JpZ2luUmVmLCBXS1N0cmluZ1JlZiwgV0tTdHJpbmdSZWYsIHVuc2lnbmVkIGxvbmcg bG9uZywgdW5zaWduZWQgbG9uZyBsb25nLCB1bnNpZ25lZCBsb25nIGxvbmcgY3VycmVudERhdGFi YXNlVXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBleHBlY3RlZFVzYWdlLCBjb25zdCB2b2lkKikK K3sKKyAgICByZXR1cm4gc3RkOjptYXg8dW5zaWduZWQgbG9uZyBsb25nPihleHBlY3RlZFVzYWdl LCBjdXJyZW50RGF0YWJhc2VVc2FnZSAqIDEuMjUpOworfQorCiB2b2lkIFdlYkluc3BlY3RvclBy b3h5Ojppbml0aWFsaXplSW5zcGVjdG9yQ2xpZW50R3RrKGNvbnN0IFdLSW5zcGVjdG9yQ2xpZW50 R3RrQmFzZSogaW5zcGVjdG9yQ2xpZW50KQogewogICAgIG1fY2xpZW50LmluaXRpYWxpemUoaW5z cGVjdG9yQ2xpZW50KTsKQEAgLTc1LDcgKzgwLDYxIEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVj dG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSgpCiAgICAgbV9pbnNwZWN0b3JW aWV3ID0gR1RLX1dJREdFVCh3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZSgmaW5zcGVjdG9yUHJvY2Vz c1Bvb2woKSwgcHJlZmVyZW5jZXMuZ2V0KCksIHBhZ2VHcm91cC5nZXQoKSwgbnVsbHB0ciwgbnVs bHB0cikpOwogICAgIGdfb2JqZWN0X2FkZF93ZWFrX3BvaW50ZXIoR19PQkpFQ1QobV9pbnNwZWN0 b3JWaWV3KSwgcmVpbnRlcnByZXRfY2FzdDx2b2lkKio+KCZtX2luc3BlY3RvclZpZXcpKTsKIAot ICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uo bV9pbnNwZWN0b3JWaWV3KSk7CisgICAgV0tQYWdlVUlDbGllbnRWMiB1aUNsaWVudCA9IHsKKyAg ICAgICAgeyAyLCB0aGlzIH0sCisgICAgICAgIG51bGxwdHIsIC8vIGNyZWF0ZU5ld1BhZ2VfZGVw cmVjYXRlZEZvclVzZVdpdGhWMAorICAgICAgICBudWxscHRyLCAvLyBzaG93UGFnZQorICAgICAg ICBudWxscHRyLCAvLyBjbG9zZVBhZ2UKKyAgICAgICAgbnVsbHB0ciwgLy8gdGFrZUZvY3VzCisg ICAgICAgIG51bGxwdHIsIC8vIGZvY3VzCisgICAgICAgIG51bGxwdHIsIC8vIHVuZm9jdXMKKyAg ICAgICAgbnVsbHB0ciwgLy8gcnVuSmF2YVNjcmlwdEFsZXJ0CisgICAgICAgIG51bGxwdHIsIC8v IHJ1bkphdmFTY3JpcHRDb25maXJtCisgICAgICAgIG51bGxwdHIsIC8vIHJ1bkphdmFTY3JpcHRQ cm9tcHQKKyAgICAgICAgbnVsbHB0ciwgLy8gc2V0U3RhdHVzVGV4dAorICAgICAgICBudWxscHRy LCAvLyBtb3VzZURpZE1vdmVPdmVyRWxlbWVudF9kZXByZWNhdGVkRm9yVXNlV2l0aFYwCisgICAg ICAgIG51bGxwdHIsIC8vIG1pc3NpbmdQbHVnaW5CdXR0b25DbGlja2VkX2RlcHJlY2F0ZWRGb3JV c2VXaXRoVjAKKyAgICAgICAgbnVsbHB0ciwgLy8gZGlkTm90SGFuZGxlS2V5RXZlbnQKKyAgICAg ICAgbnVsbHB0ciwgLy8gZGlkTm90SGFuZGxlV2hlZWxFdmVudAorICAgICAgICBudWxscHRyLCAv LyBhcmVUb29sYmFyc1Zpc2libGUKKyAgICAgICAgbnVsbHB0ciwgLy8gc2V0VG9vbGJhcnNWaXNp YmxlCisgICAgICAgIG51bGxwdHIsIC8vIGlzTWVudUJhclZpc2libGUKKyAgICAgICAgbnVsbHB0 ciwgLy8gc2V0TWVudUJhclZpc2libGUKKyAgICAgICAgbnVsbHB0ciwgLy8gaXNTdGF0dXNCYXJW aXNpYmxlCisgICAgICAgIG51bGxwdHIsIC8vIHNldFN0YXR1c0JhclZpc2libGUKKyAgICAgICAg bnVsbHB0ciwgLy8gaXNSZXNpemFibGUKKyAgICAgICAgbnVsbHB0ciwgLy8gc2V0UmVzaXphYmxl CisgICAgICAgIG51bGxwdHIsIC8vIGdldFdpbmRvd0ZyYW1lLAorICAgICAgICBudWxscHRyLCAv LyBzZXRXaW5kb3dGcmFtZSwKKyAgICAgICAgbnVsbHB0ciwgLy8gcnVuQmVmb3JlVW5sb2FkQ29u ZmlybVBhbmVsCisgICAgICAgIG51bGxwdHIsIC8vIGRpZERyYXcKKyAgICAgICAgbnVsbHB0ciwg Ly8gcGFnZURpZFNjcm9sbAorICAgICAgICBleGNlZWRlZERhdGFiYXNlUXVvdGEsCisgICAgICAg IG51bGxwdHIsIC8vIHJ1bk9wZW5QYW5lbCwKKyAgICAgICAgbnVsbHB0ciwgLy8gZGVjaWRlUG9s aWN5Rm9yR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdAorICAgICAgICBudWxscHRyLCAvLyBo ZWFkZXJIZWlnaHQKKyAgICAgICAgbnVsbHB0ciwgLy8gZm9vdGVySGVpZ2h0CisgICAgICAgIG51 bGxwdHIsIC8vIGRyYXdIZWFkZXIKKyAgICAgICAgbnVsbHB0ciwgLy8gZHJhd0Zvb3RlcgorICAg ICAgICBudWxscHRyLCAvLyBwcmludEZyYW1lCisgICAgICAgIG51bGxwdHIsIC8vIHJ1bk1vZGFs CisgICAgICAgIG51bGxwdHIsIC8vIHVudXNlZAorICAgICAgICBudWxscHRyLCAvLyBzYXZlRGF0 YVRvRmlsZUluRG93bmxvYWRzRm9sZGVyCisgICAgICAgIG51bGxwdHIsIC8vIHNob3VsZEludGVy cnVwdEphdmFTY3JpcHQKKyAgICAgICAgbnVsbHB0ciwgLy8gY3JlYXRlUGFnZQorICAgICAgICBu dWxscHRyLCAvLyBtb3VzZURpZE1vdmVPdmVyRWxlbWVudAorICAgICAgICBudWxscHRyLCAvLyBk ZWNpZGVQb2xpY3lGb3JOb3RpZmljYXRpb25QZXJtaXNzaW9uUmVxdWVzdAorICAgICAgICBudWxs cHRyLCAvLyB1bmF2YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZvclVzZVdp dGhWMQorICAgICAgICBudWxscHRyLCAvLyBzaG93Q29sb3JQaWNrZXIKKyAgICAgICAgbnVsbHB0 ciwgLy8gaGlkZUNvbG9yUGlja2VyCisgICAgICAgIG51bGxwdHIsIC8vIHVuYXZhaWxhYmxlUGx1 Z2luQnV0dG9uQ2xpY2tlZAorICAgIH07CisKKyAgICBXZWJQYWdlUHJveHkqIGluc3BlY3RvclBh Z2UgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV9pbnNw ZWN0b3JWaWV3KSk7CisgICAgQVNTRVJUKGluc3BlY3RvclBhZ2UpOworICAgIFdLUGFnZVNldFBh Z2VVSUNsaWVudCh0b0FQSShpbnNwZWN0b3JQYWdlKSwgJnVpQ2xpZW50LmJhc2UpOworCisgICAg cmV0dXJuIGluc3BlY3RvclBhZ2U7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmNyZWF0 ZUluc3BlY3RvcldpbmRvdygpCg== 255997 2015-07-02 00:17:43 -0700 2015-07-02 03:10:03 -0700 Patch wk2-websql.diff text/plain 7784 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzM2U2MjEzLi5iODAxN2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTUtMDctMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFdlYlNRTCBkb2Vzbid0IHdvcmsgYmVjYXVzZSBvcGVuRGF0YWJh c2UgYWx3YXlzIGZhaWxzIHdpdGggRE9NIEV4Y2VwdGlvbiAxOAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBiZWNhdXNlIHdlIGRvbid0IHBy b3ZpZGUgYW55IHF1b3RhLCBhbmQgMCBpcyB1c2VkIGJ5CisgICAgICAgIGRlZmF1bHQsIHNvIHRo ZXJlJ3MgbmV2ZXIgZW5vdWdoIHF1b3RhIGFuZCBvcGVuRGF0YWJhc2UgZmFpbHMuIFdlCisgICAg ICAgIHNob3VsZCBleHBvc2UgdGhpcyBpbiB0aGUgQVBJLCBidXQgZm9yIG5vdywgd2UgY291bGQg dXNlIGEgZGVmYXVsdAorICAgICAgICBxdW90YSBvZiA1TUIgbGlrZSBXVFIgZG9lcy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcDogT3ZlcnJpZGUKKyAg ICAgICAgZXhjZWVkZWREYXRhYmFzZVF1b3RhIGFuZCByZXR1cm4gYWx3YXlzIHRoZSBkZWZhdWx0 IHF1b3RhLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3Bw OgorICAgICAgICAoV2ViS2l0OjpleGNlZWRlZERhdGFiYXNlUXVvdGEpOiBSZXR1cm4gdGhlIHF1 b3RhIGJhc2VkIG9uIHRoZQorICAgICAgICBleHBlY3RlZCB1c2FnZSBhbmQgY3VycmVudCBkYXRh YmFzZSB1c2FiZSBsaWtlIG1hYyBkb2VzLgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQ cm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKTogQWRkCisgICAgICAgIGN1c3RvbSBV SSBjbGllbnQgdG8gaW1wbGVtZW50IGV4Y2VlZGVkRGF0YWJhc2VRdW90YS4KKworMjAxNS0wNy0w MiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAg W0dUS10gQWNjZWxlcmF0ZWQgQ29tcG9zaXRpbmcgc3RvcHMgd29ya2luZyBhZnRlciBhIHdlYiBw cm9jZXNzIGNyYXNoCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDY1MDgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0VUlDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0VUlDbGllbnQuY3BwCmluZGV4IDViMzFkY2QuLmZmMmNiNjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAKQEAgLTE0 Niw2ICsxNDYsMTMgQEAgcHJpdmF0ZToKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0UmVj dChnZW9tZXRyeSk7CiAgICAgfQogCisgICAgdmlydHVhbCB2b2lkIGV4Y2VlZGVkRGF0YWJhc2VR dW90YShXZWJQYWdlUHJveHkqLCBXZWJGcmFtZVByb3h5KiwgQVBJOjpTZWN1cml0eU9yaWdpbios IGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIHVuc2lnbmVkIGxvbmcgbG9uZyAvKmN1cnJl bnRRdW90YSovLCB1bnNpZ25lZCBsb25nIGxvbmcgLypjdXJyZW50T3JpZ2luVXNhZ2UqLywgdW5z aWduZWQgbG9uZyBsb25nIC8qY3VycmVudERhdGFiYXNlVXNhZ2UqLywgdW5zaWduZWQgbG9uZyBs b25nIC8qZXhwZWN0ZWRVc2FnZSovLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKHVuc2lnbmVkIGxvbmcg bG9uZyk+IGNvbXBsZXRpb25IYW5kbGVyKSBvdmVycmlkZQorICAgIHsKKyAgICAgICAgc3RhdGlj IGNvbnN0IHVuc2lnbmVkIGxvbmcgbG9uZyBkZWZhdWx0UXVvdGEgPSA1ICogMTAyNCAqIDEyMDQ7 IC8vIDUgTUIKKyAgICAgICAgLy8gRklYTUU6IFByb3ZpZGUgQVBJIGZvciB0aGlzLgorICAgICAg ICBjb21wbGV0aW9uSGFuZGxlcihkZWZhdWx0UXVvdGEpOworICAgIH0KKwogICAgIHZpcnR1YWwg Ym9vbCBydW5PcGVuUGFuZWwoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIFdlYk9wZW5Q YW5lbFBhcmFtZXRlcnMqIHBhcmFtZXRlcnMsIFdlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJv eHkqIGxpc3RlbmVyKSBvdmVycmlkZQogICAgIHsKICAgICAgICAgR1JlZlB0cjxXZWJLaXRGaWxl Q2hvb3NlclJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0RmlsZUNob29zZXJSZXF1 ZXN0Q3JlYXRlKHBhcmFtZXRlcnMsIGxpc3RlbmVyKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkluc3BlY3RvclByb3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5zcGVjdG9yUHJveHlHdGsuY3BwCmluZGV4IDAyMWNhZjQu LjM3NWZmMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViSW5z cGVjdG9yUHJveHlHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2Vi SW5zcGVjdG9yUHJveHlHdGsuY3BwCkBAIC01Miw2ICs1MiwxMSBAQCBzdGF0aWMgdm9pZCBpbnNw ZWN0b3JWaWV3RGVzdHJveWVkKEd0a1dpZGdldCosIGdwb2ludGVyIHVzZXJEYXRhKQogICAgIGlu c3BlY3RvclByb3h5LT5jbG9zZSgpOwogfQogCitzdGF0aWMgdW5zaWduZWQgbG9uZyBsb25nIGV4 Y2VlZGVkRGF0YWJhc2VRdW90YShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLU2VjdXJpdHlPcmln aW5SZWYsIFdLU3RyaW5nUmVmLCBXS1N0cmluZ1JlZiwgdW5zaWduZWQgbG9uZyBsb25nLCB1bnNp Z25lZCBsb25nIGxvbmcsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwg dW5zaWduZWQgbG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UsIGNvbnN0IHZvaWQqKQoreworICAgIHJl dHVybiBzdGQ6Om1heDx1bnNpZ25lZCBsb25nIGxvbmc+KGV4cGVjdGVkVXNhZ2UsIGN1cnJlbnRE YXRhYmFzZVVzYWdlICogMS4yNSk7Cit9CisKIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OmluaXRp YWxpemVJbnNwZWN0b3JDbGllbnRHdGsoY29uc3QgV0tJbnNwZWN0b3JDbGllbnRHdGtCYXNlKiBp bnNwZWN0b3JDbGllbnQpCiB7CiAgICAgbV9jbGllbnQuaW5pdGlhbGl6ZShpbnNwZWN0b3JDbGll bnQpOwpAQCAtNzUsNyArODAsNjEgQEAgV2ViUGFnZVByb3h5KiBXZWJJbnNwZWN0b3JQcm94eTo6 cGxhdGZvcm1DcmVhdGVJbnNwZWN0b3JQYWdlKCkKICAgICBtX2luc3BlY3RvclZpZXcgPSBHVEtf V0lER0VUKHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKCZpbnNwZWN0b3JQcm9jZXNzUG9vbCgpLCBw cmVmZXJlbmNlcy5nZXQoKSwgcGFnZUdyb3VwLmdldCgpLCBudWxscHRyLCBudWxscHRyKSk7CiAg ICAgZ19vYmplY3RfYWRkX3dlYWtfcG9pbnRlcihHX09CSkVDVChtX2luc3BlY3RvclZpZXcpLCBy ZWludGVycHJldF9jYXN0PHZvaWQqKj4oJm1faW5zcGVjdG9yVmlldykpOwogCi0gICAgcmV0dXJu IHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX2luc3BlY3Rv clZpZXcpKTsKKyAgICBXS1BhZ2VVSUNsaWVudFYyIHVpQ2xpZW50ID0geworICAgICAgICB7IDIs IHRoaXMgfSwKKyAgICAgICAgbnVsbHB0ciwgLy8gY3JlYXRlTmV3UGFnZV9kZXByZWNhdGVkRm9y VXNlV2l0aFYwCisgICAgICAgIG51bGxwdHIsIC8vIHNob3dQYWdlCisgICAgICAgIG51bGxwdHIs IC8vIGNsb3NlUGFnZQorICAgICAgICBudWxscHRyLCAvLyB0YWtlRm9jdXMKKyAgICAgICAgbnVs bHB0ciwgLy8gZm9jdXMKKyAgICAgICAgbnVsbHB0ciwgLy8gdW5mb2N1cworICAgICAgICBudWxs cHRyLCAvLyBydW5KYXZhU2NyaXB0QWxlcnQKKyAgICAgICAgbnVsbHB0ciwgLy8gcnVuSmF2YVNj cmlwdENvbmZpcm0KKyAgICAgICAgbnVsbHB0ciwgLy8gcnVuSmF2YVNjcmlwdFByb21wdAorICAg ICAgICBudWxscHRyLCAvLyBzZXRTdGF0dXNUZXh0CisgICAgICAgIG51bGxwdHIsIC8vIG1vdXNl RGlkTW92ZU92ZXJFbGVtZW50X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAKKyAgICAgICAgbnVsbHB0 ciwgLy8gbWlzc2luZ1BsdWdpbkJ1dHRvbkNsaWNrZWRfZGVwcmVjYXRlZEZvclVzZVdpdGhWMAor ICAgICAgICBudWxscHRyLCAvLyBkaWROb3RIYW5kbGVLZXlFdmVudAorICAgICAgICBudWxscHRy LCAvLyBkaWROb3RIYW5kbGVXaGVlbEV2ZW50CisgICAgICAgIG51bGxwdHIsIC8vIGFyZVRvb2xi YXJzVmlzaWJsZQorICAgICAgICBudWxscHRyLCAvLyBzZXRUb29sYmFyc1Zpc2libGUKKyAgICAg ICAgbnVsbHB0ciwgLy8gaXNNZW51QmFyVmlzaWJsZQorICAgICAgICBudWxscHRyLCAvLyBzZXRN ZW51QmFyVmlzaWJsZQorICAgICAgICBudWxscHRyLCAvLyBpc1N0YXR1c0JhclZpc2libGUKKyAg ICAgICAgbnVsbHB0ciwgLy8gc2V0U3RhdHVzQmFyVmlzaWJsZQorICAgICAgICBudWxscHRyLCAv LyBpc1Jlc2l6YWJsZQorICAgICAgICBudWxscHRyLCAvLyBzZXRSZXNpemFibGUKKyAgICAgICAg bnVsbHB0ciwgLy8gZ2V0V2luZG93RnJhbWUsCisgICAgICAgIG51bGxwdHIsIC8vIHNldFdpbmRv d0ZyYW1lLAorICAgICAgICBudWxscHRyLCAvLyBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwK KyAgICAgICAgbnVsbHB0ciwgLy8gZGlkRHJhdworICAgICAgICBudWxscHRyLCAvLyBwYWdlRGlk U2Nyb2xsCisgICAgICAgIGV4Y2VlZGVkRGF0YWJhc2VRdW90YSwKKyAgICAgICAgbnVsbHB0ciwg Ly8gcnVuT3BlblBhbmVsLAorICAgICAgICBudWxscHRyLCAvLyBkZWNpZGVQb2xpY3lGb3JHZW9s b2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0CisgICAgICAgIG51bGxwdHIsIC8vIGhlYWRlckhlaWdo dAorICAgICAgICBudWxscHRyLCAvLyBmb290ZXJIZWlnaHQKKyAgICAgICAgbnVsbHB0ciwgLy8g ZHJhd0hlYWRlcgorICAgICAgICBudWxscHRyLCAvLyBkcmF3Rm9vdGVyCisgICAgICAgIG51bGxw dHIsIC8vIHByaW50RnJhbWUKKyAgICAgICAgbnVsbHB0ciwgLy8gcnVuTW9kYWwKKyAgICAgICAg bnVsbHB0ciwgLy8gdW51c2VkCisgICAgICAgIG51bGxwdHIsIC8vIHNhdmVEYXRhVG9GaWxlSW5E b3dubG9hZHNGb2xkZXIKKyAgICAgICAgbnVsbHB0ciwgLy8gc2hvdWxkSW50ZXJydXB0SmF2YVNj cmlwdAorICAgICAgICBudWxscHRyLCAvLyBjcmVhdGVQYWdlCisgICAgICAgIG51bGxwdHIsIC8v IG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50CisgICAgICAgIG51bGxwdHIsIC8vIGRlY2lkZVBvbGlj eUZvck5vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0CisgICAgICAgIG51bGxwdHIsIC8vIHVu YXZhaWxhYmxlUGx1Z2luQnV0dG9uQ2xpY2tlZF9kZXByZWNhdGVkRm9yVXNlV2l0aFYxCisgICAg ICAgIG51bGxwdHIsIC8vIHNob3dDb2xvclBpY2tlcgorICAgICAgICBudWxscHRyLCAvLyBoaWRl Q29sb3JQaWNrZXIKKyAgICAgICAgbnVsbHB0ciwgLy8gdW5hdmFpbGFibGVQbHVnaW5CdXR0b25D bGlja2VkCisgICAgfTsKKworICAgIFdlYlBhZ2VQcm94eSogaW5zcGVjdG9yUGFnZSA9IHdlYmtp dFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRShtX2luc3BlY3RvclZpZXcp KTsKKyAgICBBU1NFUlQoaW5zcGVjdG9yUGFnZSk7CisgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50 KHRvQVBJKGluc3BlY3RvclBhZ2UpLCAmdWlDbGllbnQuYmFzZSk7CisKKyAgICByZXR1cm4gaW5z cGVjdG9yUGFnZTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6Y3JlYXRlSW5zcGVjdG9y V2luZG93KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCA0ZTJjNDYzLi4zOTRhNTM2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDctMDIgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYlNRTCBk b2Vzbid0IHdvcmsgYmVjYXVzZSBvcGVuRGF0YWJhc2UgYWx3YXlzIGZhaWxzIHdpdGggRE9NIEV4 Y2VwdGlvbiAxOAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRW5hYmxlIHRoZSBXZWJTUUwgZGlyZWN0b3J5IHRlc3QgdGhhdCB3YXMgZGlzYWJsZWQgYmVj YXVzZSBvZiB0aGlzIGJ1Zy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAgICh0ZXN0V2ViQ29udGV4dENv bmZpZ3VyYXRpb24pOgorCiAyMDE1LTA3LTAxICBNYXR0aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBw bGUuY29tPgogCiAgICAgICAgIEVuYWJsZWQgTUVESUFfU1RSRUFNIGZsYWcKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4 dC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdl YkNvbnRleHQuY3BwCmluZGV4IGZlYjdmZjEuLjI3ZGM0NDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJDb250 ZXh0LmNwcApAQCAtNzEsMTAgKzcxLDggQEAgc3RhdGljIHZvaWQgdGVzdFdlYkNvbnRleHRDb25m aWd1cmF0aW9uKFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogCiAgICAgR1VuaXF1 ZVB0cjxjaGFyPiB3ZWJTUUxEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShUZXN0OjpkYXRhRGly ZWN0b3J5KCksICJ3ZWJzcWwiLCBudWxscHRyKSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHdlYlNR TERpcmVjdG9yeS5nZXQoKSwgPT0sIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfd2Vi c3FsX2RpcmVjdG9yeShtYW5hZ2VyKSk7Ci0jaWYgMCAvLyBGSVhNRTogV2UgbmVlZCBBUEkgdG8g c2V0IHRoZSBkYXRhYmFzZSBxdW90YSBmb3IgYW4gb3JpZ2luIHRvIGJlIGFibGUgdG8gdGVzdCB0 aGlzLgogICAgIHRlc3QtPnJ1bkphdmFTY3JpcHRBbmRXYWl0VW50aWxGaW5pc2hlZCgiZGIgPSBv cGVuRGF0YWJhc2UoXCJUZXN0RGF0YWJhc2VcIiwgXCIxLjBcIiwgXCJUZXN0RGF0YWJhc2VcIiwg MSk7IiwgJmVycm9yKTsKICAgICBnX2Fzc2VydChnX2ZpbGVfdGVzdCh3ZWJTUUxEaXJlY3Rvcnku Z2V0KCksIEdfRklMRV9URVNUX0lTX0RJUikpOwotI2VuZGlmCiAKICAgICBHVW5pcXVlUHRyPGNo YXI+IGRpc2tDYWNoZURpcmVjdG9yeShnX2J1aWxkX2ZpbGVuYW1lKFRlc3Q6OmRhdGFEaXJlY3Rv cnkoKSwgImRpc2stY2FjaGUiLCBudWxscHRyKSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKGRpc2tD YWNoZURpcmVjdG9yeS5nZXQoKSwgPT0sIHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRf ZGlza19jYWNoZV9kaXJlY3RvcnkobWFuYWdlcikpOwo=