57279 2011-03-28 15:30:07 -0700 WebKit2 bundle page needs to offer generated file hooks 2011-03-29 13:52:50 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin ossy webkit-ews oldest_to_newest 374834 0 darin 2011-03-28 15:30:07 -0700 WebKit2 page bundle needs to offer generated file hooks 374839 1 87221 darin 2011-03-28 15:35:40 -0700 Created attachment 87221 Patch 374847 2 webkit-ews 2011-03-28 15:48:33 -0700 Attachment 87221 did not build on qt: Build output: http://queues.webkit.org/results/8273522 374923 3 87221 darin 2011-03-28 18:04:49 -0700 Comment on attachment 87221 Patch Forgot to include the WebKitTestRunner part of the patch. Uploading a copy with that in it soon. 374924 4 87245 darin 2011-03-28 18:05:16 -0700 Created attachment 87245 Patch 375226 5 87245 aroben 2011-03-29 05:59:34 -0700 Comment on attachment 87245 Patch Presumably the two MiniBrowser implementations need to be updated as well. 375418 6 darin 2011-03-29 09:25:15 -0700 (In reply to comment #5) > Presumably the two MiniBrowser implementations need to be updated as well. I’ll check. But maybe not if they don’t have a UI client at all. I searched for the name of the struct I changed in the entire tree and did not get any hits on MiniBrowser. 375566 7 darin 2011-03-29 11:20:41 -0700 Committed r82289: <http://trac.webkit.org/changeset/82289> 375644 8 ossy 2011-03-29 12:08:19 -0700 (In reply to comment #7) > Committed r82289: <http://trac.webkit.org/changeset/82289> It broke WTR build because of missing initializers for members: /home/oszi/WebKit/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: In constructor ‘WTR::InjectedBundlePage::InjectedBundlePage(const OpaqueWKBundlePage*)’: /home/oszi/WebKit/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:216: error: missing initializer for member ‘WKBundlePageUIClient::shouldGenerateFileForUpload’ /home/oszi/WebKit/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:216: error: missing initializer for member ‘WKBundlePageUIClient::generateFileForUpload’ 375677 9 ossy 2011-03-29 12:44:08 -0700 I landed the missing part of the patch: http://trac.webkit.org/changeset/82302 375722 10 darin 2011-03-29 13:52:50 -0700 Sorry about not landing that part! I am not sure why webkit-patch didn’t land it. Last time I had this problem, someone told me it was due to Maciej’s changes to work only within a certain directory, and I can’t prove that didn’t happen this time, but I don’t think it did. 87221 2011-03-28 15:35:40 -0700 2011-03-28 18:05:13 -0700 Patch bug-57279-20110328153539.patch text/plain 6103 darin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTY2KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDMtMjggIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlYktpdDIgYnVuZGxlIHBhZ2UgbmVlZHMgdG8gb2ZmZXIgZ2VuZXJh dGVkIGZpbGUgaG9va3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU3Mjc5CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j L1dLQnVuZGxlUGFnZS5oOiBBZGRlZCBzaG91bGRHZW5lcmF0ZUZpbGVGb3JVcGxvYWQgYW5kCisg ICAgICAgIGdlbmVyYXRlRmlsZUZvclVwbG9hZCBjYWxsYmFjayBwb2ludGVycy4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6c2hvdWxk R2VuZXJhdGVGaWxlRm9yVXBsb2FkKTogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OkluamVjdGVk QnVuZGxlUGFnZVVJQ2xpZW50OjpnZW5lcmF0ZUZpbGVGb3JVcGxvYWQpOiBBZGRlZC4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50 Lmg6IEFkZGVkIGZ1bmN0aW9ucyBhYm92ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21l Q2xpZW50OjpzaG91bGRSZXBsYWNlV2l0aEdlbmVyYXRlZEZpbGVGb3JVcGxvYWQpOiBJbXBsZW1l bnRlZCBieQorICAgICAgICBjYWxsaW5nIHRoZSBmdW5jdGlvbnMgYWJvdmUuCisgICAgICAgIChX ZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6Z2VuZXJhdGVSZXBsYWNlbWVudEZpbGUpOiBEaXR0by4K KwogMjAxMS0wMy0yOCAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSm9uIEhvbmV5Y3V0dC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3BwCShyZXZpc2lvbiA4MTkyMykKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlD bGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OSw0ICs5OSwyMCBAQCB2b2lkIEluamVjdGVk QnVuZGxlUGFnZVVJQ2xpZW50OjpwYWludEN1CiAgICAgbV9jbGllbnQucGFpbnRDdXN0b21PdmVy aGFuZ0FyZWEodG9BUEkocGFnZSksIHRvQVBJKGNvbnRleHQuZ2V0KCkpLCB0b0FQSShob3Jpem9u dGFsT3ZlcmhhbmdBcmVhKSwgdG9BUEkodmVydGljYWxPdmVyaGFuZ0FyZWEpLCB0b0FQSShkaXJ0 eVJlY3QpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKIH0KIAorU3RyaW5nIEluamVjdGVkQnVuZGxl UGFnZVVJQ2xpZW50OjpzaG91bGRHZW5lcmF0ZUZpbGVGb3JVcGxvYWQoV2ViUGFnZSogcGFnZSwg Y29uc3QgU3RyaW5nJiBvcmlnaW5hbEZpbGVQYXRoKQoreworICAgIGlmICghbV9jbGllbnQuc2hv dWxkR2VuZXJhdGVGaWxlRm9yVXBsb2FkKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAg UmVmUHRyPFdlYlN0cmluZz4gZ2VuZXJhdGVkRmlsZVBhdGggPSBhZG9wdFJlZih0b0ltcGwobV9j bGllbnQuc2hvdWxkR2VuZXJhdGVGaWxlRm9yVXBsb2FkKHRvQVBJKHBhZ2UpLCB0b0FQSShvcmln aW5hbEZpbGVQYXRoLmltcGwoKSksIG1fY2xpZW50LmNsaWVudEluZm8pKSk7CisgICAgcmV0dXJu IGdlbmVyYXRlZEZpbGVQYXRoID8gZ2VuZXJhdGVkRmlsZVBhdGgtPnN0cmluZygpIDogU3RyaW5n KCk7Cit9CisKK1N0cmluZyBJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6Z2VuZXJhdGVGaWxl Rm9yVXBsb2FkKFdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxGaWxlUGF0aCkK K3sKKyAgICBpZiAoIW1fY2xpZW50LnNob3VsZEdlbmVyYXRlRmlsZUZvclVwbG9hZCkKKyAgICAg ICAgcmV0dXJuIFN0cmluZygpOworICAgIFJlZlB0cjxXZWJTdHJpbmc+IGdlbmVyYXRlZEZpbGVQ YXRoID0gYWRvcHRSZWYodG9JbXBsKG1fY2xpZW50LmdlbmVyYXRlRmlsZUZvclVwbG9hZCh0b0FQ SShwYWdlKSwgdG9BUEkob3JpZ2luYWxGaWxlUGF0aC5pbXBsKCkpLCBtX2NsaWVudC5jbGllbnRJ bmZvKSkpOworICAgIHJldHVybiBnZW5lcmF0ZWRGaWxlUGF0aCA/IGdlbmVyYXRlZEZpbGVQYXRo LT5zdHJpbmcoKSA6IFN0cmluZygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQ YWdlVUlDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50LmgJKHJldmlzaW9uIDgxOTIz KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2VVSUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw5IEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgc2hvdWxkUGFpbnRDdXN0b21PdmVyaGFuZ0FyZWEoKTsKICAgICB2b2lk IHBhaW50Q3VzdG9tT3ZlcmhhbmdBcmVhKFdlYlBhZ2UqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGNv bnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKworICAgIFN0cmluZyBzaG91bGRHZW5lcmF0ZUZpbGVG b3JVcGxvYWQoV2ViUGFnZSosIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxGaWxlUGF0aCk7CisgICAg U3RyaW5nIGdlbmVyYXRlRmlsZUZvclVwbG9hZChXZWJQYWdlKiwgY29uc3QgU3RyaW5nJiBvcmln aW5hbEZpbGVQYXRoKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUGFnZS5oCShyZXZpc2lvbiA4MTkyMykKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE2OCw2ICsxNjgsNyBAQCB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VXaWxsUnVu SmF2YVNjCiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VNb3VzZURpZE1vdmVPdmVyRWxlbWVu dENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVIaXRUZXN0UmVzdWx0UmVm IGhpdFRlc3RSZXN1bHQsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYqIHVz ZXJEYXRhLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxl UGFnZURpZFNjcm9sbENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAq Y2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VQYWludEN1c3RvbU92ZXJo YW5nQXJlYUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tHcmFwaGljc0NvbnRleHRS ZWYgZ3JhcGhpY3NDb250ZXh0LCBXS1JlY3QgaG9yaXpvbnRhbE92ZXJoYW5nLCBXS1JlY3QgdmVy dGljYWxPdmVyaGFuZywgV0tSZWN0IGRpcnR5UmVjdCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7 Cit0eXBlZGVmIFdLU3RyaW5nUmVmICgqV0tCdW5kbGVQYWdlR2VuZXJhdGVGaWxlRm9yVXBsb2Fk Q2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBvcmlnaW5hbEZpbGVQ YXRoLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIAogc3RydWN0IFdLQnVuZGxlUGFnZVVJQ2xp ZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CkBAIC0xODAsNiArMTgxLDggQEAgc3RydWN0 IFdLQnVuZGxlUGFnZVVJQ2xpZW50IHsKICAgICBXS0J1bmRsZVBhZ2VNb3VzZURpZE1vdmVPdmVy RWxlbWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIG1vdXNlRGlkTW92ZU92ZXJF bGVtZW50OwogICAgIFdLQnVuZGxlUGFnZURpZFNjcm9sbENhbGxiYWNrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcGFnZURpZFNjcm9sbDsKICAgICBXS0J1bmRsZVBhZ2VQ YWludEN1c3RvbU92ZXJoYW5nQXJlYUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIHBh aW50Q3VzdG9tT3ZlcmhhbmdBcmVhOworICAgIFdLQnVuZGxlUGFnZUdlbmVyYXRlRmlsZUZvclVw bG9hZENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgc2hvdWxkR2VuZXJhdGVGaWxl Rm9yVXBsb2FkOworICAgIFdLQnVuZGxlUGFnZUdlbmVyYXRlRmlsZUZvclVwbG9hZENhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVGaWxlRm9yVXBsb2FkOwogfTsKIHR5 cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZVVJQ2xpZW50IFdLQnVuZGxlUGFnZVVJQ2xpZW50Owog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCShyZXZpc2lvbiA4MTkyMykKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTQ2LDE0ICs1NDYsMTMgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6 OnBhaW50Q3VzdG9tSGlnaGxpZwogCiBib29sIFdlYkNocm9tZUNsaWVudDo6c2hvdWxkUmVwbGFj ZVdpdGhHZW5lcmF0ZWRGaWxlRm9yVXBsb2FkKGNvbnN0IFN0cmluZyYgcGF0aCwgU3RyaW5nJiBn ZW5lcmF0ZWRGaWxlbmFtZSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBm YWxzZTsKKyAgICBnZW5lcmF0ZWRGaWxlbmFtZSA9IG1fcGFnZS0+aW5qZWN0ZWRCdW5kbGVVSUNs aWVudCgpLnNob3VsZEdlbmVyYXRlRmlsZUZvclVwbG9hZChtX3BhZ2UsIHBhdGgpOworICAgIHJl dHVybiAhZ2VuZXJhdGVkRmlsZW5hbWUuaXNOdWxsKCk7CiB9CiAKIFN0cmluZyBXZWJDaHJvbWVD bGllbnQ6OmdlbmVyYXRlUmVwbGFjZW1lbnRGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gbV9w YWdlLT5pbmplY3RlZEJ1bmRsZVVJQ2xpZW50KCkuZ2VuZXJhdGVGaWxlRm9yVXBsb2FkKG1fcGFn ZSwgcGF0aCk7CiB9CiAKIGJvb2wgV2ViQ2hyb21lQ2xpZW50OjpwYWludEN1c3RvbVNjcm9sbGJh cihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBGbG9hdFJlY3QmLCBTY3JvbGxiYXJDb250cm9sU2l6 ZSwgCg== 87245 2011-03-28 18:05:16 -0700 2011-03-29 05:59:34 -0700 Patch bug-57279-20110328180515.patch text/plain 7315 darin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTY3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDMtMjggIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdlYktpdDIgYnVuZGxlIHBhZ2UgbmVlZHMgdG8gb2ZmZXIgZ2VuZXJh dGVkIGZpbGUgaG9va3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU3Mjc5CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j L1dLQnVuZGxlUGFnZS5oOiBBZGRlZCBzaG91bGRHZW5lcmF0ZUZpbGVGb3JVcGxvYWQgYW5kCisg ICAgICAgIGdlbmVyYXRlRmlsZUZvclVwbG9hZCBjYWxsYmFjayBwb2ludGVycy4KKworICAgICAg ICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6c2hvdWxk R2VuZXJhdGVGaWxlRm9yVXBsb2FkKTogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OkluamVjdGVk QnVuZGxlUGFnZVVJQ2xpZW50OjpnZW5lcmF0ZUZpbGVGb3JVcGxvYWQpOiBBZGRlZC4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50 Lmg6IEFkZGVkIGZ1bmN0aW9ucyBhYm92ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ2hyb21l Q2xpZW50OjpzaG91bGRSZXBsYWNlV2l0aEdlbmVyYXRlZEZpbGVGb3JVcGxvYWQpOiBJbXBsZW1l bnRlZCBieQorICAgICAgICBjYWxsaW5nIHRoZSBmdW5jdGlvbnMgYWJvdmUuCisgICAgICAgIChX ZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6Z2VuZXJhdGVSZXBsYWNlbWVudEZpbGUpOiBEaXR0by4K KwogMjAxMS0wMy0yOCAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSm9uIEhvbmV5Y3V0dC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3BwCShyZXZpc2lvbiA4MjE2NykKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlD bGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OSw0ICs5OSwyMCBAQCB2b2lkIEluamVjdGVk QnVuZGxlUGFnZVVJQ2xpZW50OjpwYWludEN1CiAgICAgbV9jbGllbnQucGFpbnRDdXN0b21PdmVy aGFuZ0FyZWEodG9BUEkocGFnZSksIHRvQVBJKGNvbnRleHQuZ2V0KCkpLCB0b0FQSShob3Jpem9u dGFsT3ZlcmhhbmdBcmVhKSwgdG9BUEkodmVydGljYWxPdmVyaGFuZ0FyZWEpLCB0b0FQSShkaXJ0 eVJlY3QpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKIH0KIAorU3RyaW5nIEluamVjdGVkQnVuZGxl UGFnZVVJQ2xpZW50OjpzaG91bGRHZW5lcmF0ZUZpbGVGb3JVcGxvYWQoV2ViUGFnZSogcGFnZSwg Y29uc3QgU3RyaW5nJiBvcmlnaW5hbEZpbGVQYXRoKQoreworICAgIGlmICghbV9jbGllbnQuc2hv dWxkR2VuZXJhdGVGaWxlRm9yVXBsb2FkKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAg UmVmUHRyPFdlYlN0cmluZz4gZ2VuZXJhdGVkRmlsZVBhdGggPSBhZG9wdFJlZih0b0ltcGwobV9j bGllbnQuc2hvdWxkR2VuZXJhdGVGaWxlRm9yVXBsb2FkKHRvQVBJKHBhZ2UpLCB0b0FQSShvcmln aW5hbEZpbGVQYXRoLmltcGwoKSksIG1fY2xpZW50LmNsaWVudEluZm8pKSk7CisgICAgcmV0dXJu IGdlbmVyYXRlZEZpbGVQYXRoID8gZ2VuZXJhdGVkRmlsZVBhdGgtPnN0cmluZygpIDogU3RyaW5n KCk7Cit9CisKK1N0cmluZyBJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6Z2VuZXJhdGVGaWxl Rm9yVXBsb2FkKFdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxGaWxlUGF0aCkK K3sKKyAgICBpZiAoIW1fY2xpZW50LnNob3VsZEdlbmVyYXRlRmlsZUZvclVwbG9hZCkKKyAgICAg ICAgcmV0dXJuIFN0cmluZygpOworICAgIFJlZlB0cjxXZWJTdHJpbmc+IGdlbmVyYXRlZEZpbGVQ YXRoID0gYWRvcHRSZWYodG9JbXBsKG1fY2xpZW50LmdlbmVyYXRlRmlsZUZvclVwbG9hZCh0b0FQ SShwYWdlKSwgdG9BUEkob3JpZ2luYWxGaWxlUGF0aC5pbXBsKCkpLCBtX2NsaWVudC5jbGllbnRJ bmZvKSkpOworICAgIHJldHVybiBnZW5lcmF0ZWRGaWxlUGF0aCA/IGdlbmVyYXRlZEZpbGVQYXRo LT5zdHJpbmcoKSA6IFN0cmluZygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQ YWdlVUlDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50LmgJKHJldmlzaW9uIDgyMTY3 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2VVSUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw5IEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgc2hvdWxkUGFpbnRDdXN0b21PdmVyaGFuZ0FyZWEoKTsKICAgICB2b2lk IHBhaW50Q3VzdG9tT3ZlcmhhbmdBcmVhKFdlYlBhZ2UqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGNv bnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKworICAgIFN0cmluZyBzaG91bGRHZW5lcmF0ZUZpbGVG b3JVcGxvYWQoV2ViUGFnZSosIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxGaWxlUGF0aCk7CisgICAg U3RyaW5nIGdlbmVyYXRlRmlsZUZvclVwbG9hZChXZWJQYWdlKiwgY29uc3QgU3RyaW5nJiBvcmln aW5hbEZpbGVQYXRoKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQ SS9jL1dLQnVuZGxlUGFnZS5oCShyZXZpc2lvbiA4MjE2NykKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE2OCw2ICsxNjgsNyBAQCB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VXaWxsUnVu SmF2YVNjCiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VNb3VzZURpZE1vdmVPdmVyRWxlbWVu dENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVIaXRUZXN0UmVzdWx0UmVm IGhpdFRlc3RSZXN1bHQsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYqIHVz ZXJEYXRhLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxl UGFnZURpZFNjcm9sbENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAq Y2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS0J1bmRsZVBhZ2VQYWludEN1c3RvbU92ZXJo YW5nQXJlYUNhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tHcmFwaGljc0NvbnRleHRS ZWYgZ3JhcGhpY3NDb250ZXh0LCBXS1JlY3QgaG9yaXpvbnRhbE92ZXJoYW5nLCBXS1JlY3QgdmVy dGljYWxPdmVyaGFuZywgV0tSZWN0IGRpcnR5UmVjdCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7 Cit0eXBlZGVmIFdLU3RyaW5nUmVmICgqV0tCdW5kbGVQYWdlR2VuZXJhdGVGaWxlRm9yVXBsb2Fk Q2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBvcmlnaW5hbEZpbGVQ YXRoLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIAogc3RydWN0IFdLQnVuZGxlUGFnZVVJQ2xp ZW50IHsKICAgICBpbnQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb247CkBAIC0xODAsNiArMTgxLDggQEAgc3RydWN0 IFdLQnVuZGxlUGFnZVVJQ2xpZW50IHsKICAgICBXS0J1bmRsZVBhZ2VNb3VzZURpZE1vdmVPdmVy RWxlbWVudENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIG1vdXNlRGlkTW92ZU92ZXJF bGVtZW50OwogICAgIFdLQnVuZGxlUGFnZURpZFNjcm9sbENhbGxiYWNrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcGFnZURpZFNjcm9sbDsKICAgICBXS0J1bmRsZVBhZ2VQ YWludEN1c3RvbU92ZXJoYW5nQXJlYUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIHBh aW50Q3VzdG9tT3ZlcmhhbmdBcmVhOworICAgIFdLQnVuZGxlUGFnZUdlbmVyYXRlRmlsZUZvclVw bG9hZENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgc2hvdWxkR2VuZXJhdGVGaWxl Rm9yVXBsb2FkOworICAgIFdLQnVuZGxlUGFnZUdlbmVyYXRlRmlsZUZvclVwbG9hZENhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVGaWxlRm9yVXBsb2FkOwogfTsKIHR5 cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZVVJQ2xpZW50IFdLQnVuZGxlUGFnZVVJQ2xpZW50Owog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCShyZXZpc2lvbiA4MjE2NykKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTQ2LDE0ICs1NDYsMTMgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6 OnBhaW50Q3VzdG9tSGlnaGxpZwogCiBib29sIFdlYkNocm9tZUNsaWVudDo6c2hvdWxkUmVwbGFj ZVdpdGhHZW5lcmF0ZWRGaWxlRm9yVXBsb2FkKGNvbnN0IFN0cmluZyYgcGF0aCwgU3RyaW5nJiBn ZW5lcmF0ZWRGaWxlbmFtZSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBm YWxzZTsKKyAgICBnZW5lcmF0ZWRGaWxlbmFtZSA9IG1fcGFnZS0+aW5qZWN0ZWRCdW5kbGVVSUNs aWVudCgpLnNob3VsZEdlbmVyYXRlRmlsZUZvclVwbG9hZChtX3BhZ2UsIHBhdGgpOworICAgIHJl dHVybiAhZ2VuZXJhdGVkRmlsZW5hbWUuaXNOdWxsKCk7CiB9CiAKIFN0cmluZyBXZWJDaHJvbWVD bGllbnQ6OmdlbmVyYXRlUmVwbGFjZW1lbnRGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICByZXR1cm4gbV9w YWdlLT5pbmplY3RlZEJ1bmRsZVVJQ2xpZW50KCkuZ2VuZXJhdGVGaWxlRm9yVXBsb2FkKG1fcGFn ZSwgcGF0aCk7CiB9CiAKIGJvb2wgV2ViQ2hyb21lQ2xpZW50OjpwYWludEN1c3RvbVNjcm9sbGJh cihHcmFwaGljc0NvbnRleHQqLCBjb25zdCBGbG9hdFJlY3QmLCBTY3JvbGxiYXJDb250cm9sU2l6 ZSwgCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9n CShyZXZpc2lvbiA4MjE2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDEzIEBACisyMDExLTAzLTI4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQy IGJ1bmRsZSBwYWdlIG5lZWRzIHRvIG9mZmVyIGdlbmVyYXRlZCBmaWxlIGhvb2tzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzI3OQorCisgICAgICAg ICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3Bw OgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVkQnVuZGxlUGFnZSk6 IEFkZGVkIG5ldyBjYWxsYmFja3MuCisKIDIwMTEtMDMtMjggIEFkZWxlIFBldGVyc29uICA8YWRl bGVAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeC4KSW5kZXg6IFRvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl UGFnZS5jcHAJKHJldmlzaW9uIDgyMTY3KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTMs NiArMjEzLDggQEAgSW5qZWN0ZWRCdW5kbGVQYWdlOjpJbmplY3RlZEJ1bmRsZVBhZ2UoVwogICAg ICAgICAwLCAvKm1vdXNlRGlkTW92ZU92ZXJFbGVtZW50Ki8KICAgICAgICAgMCwgLypwYWdlRGlk U2Nyb2xsKi8KICAgICAgICAgMCwgLypwYWludEN1c3RvbU92ZXJoYW5nQXJlYSovCisgICAgICAg IDAsIC8qc2hvdWxkR2VuZXJhdGVGaWxlRm9yVXBsb2FkKi8KKyAgICAgICAgMCwgLypnZW5lcmF0 ZUZpbGVGb3JVcGxvYWQqLwogICAgIH07CiAgICAgV0tCdW5kbGVQYWdlU2V0VUlDbGllbnQobV9w YWdlLCAmdWlDbGllbnQpOwogCg==