81044 2012-03-13 15:32:28 -0700 Support loading a WKPage from web archive data 2012-03-13 21:04:26 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jeffm jeffm andersca beidson jberlin jeffm mitz sam oldest_to_newest 577885 0 jeffm 2012-03-13 15:32:28 -0700 Support loading a WKPage from web archive data 577898 1 131730 jeffm 2012-03-13 15:37:50 -0700 Created attachment 131730 Patch 577908 2 131730 beidson 2012-03-13 15:42:39 -0700 Comment on attachment 131730 Patch I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" 577914 3 jeffm 2012-03-13 15:44:55 -0700 (In reply to comment #2) > (From update of attachment 131730 [details]) > I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" Sounds reasonable. New patch soon. 577918 4 jberlin 2012-03-13 15:45:34 -0700 > (From update of attachment 131730 [details]) > I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" I think that naming came from Sam and Anders (loadWebArchiveFromData). It might have been "ForData". 577922 5 jeffm 2012-03-13 15:47:35 -0700 (In reply to comment #4) > > (From update of attachment 131730 [details] [details]) > > I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" > > I think that naming came from Sam and Anders (loadWebArchiveFromData). It might have been "ForData". OK. I eagerly await their opinions. 577927 6 beidson 2012-03-13 15:49:18 -0700 (In reply to comment #4) > > (From update of attachment 131730 [details] [details]) > > I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" > > I think that naming came from Sam and Anders (loadWebArchiveFromData). It might have been "ForData". I'm suggesting "WKLoadWebArchiveData" I don't think the current "WKLoadWebArchiveFromData" flows very well or follows naming precedent. I think "WKLoadWebArchiveForData" doesn't make any sense at all! 577965 7 mitz 2012-03-13 16:24:12 -0700 (In reply to comment #6) > (In reply to comment #4) > > > (From update of attachment 131730 [details] [details] [details]) > > > I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" > > > > I think that naming came from Sam and Anders (loadWebArchiveFromData). It might have been "ForData". > > I'm suggesting "WKLoadWebArchiveData" I think you mean WK*Page*LoadWebArchiveData. 577981 8 131749 jeffm 2012-03-13 16:35:33 -0700 Created attachment 131749 Patch 577982 9 jeffm 2012-03-13 16:36:07 -0700 I agree with Brady, I've attached a new patch. 577983 10 beidson 2012-03-13 16:37:26 -0700 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #4) > > > > (From update of attachment 131730 [details] [details] [details] [details]) > > > > I'd rather see every instance of "WebArchiveFromData" be "WebArchiveData" > > > > > > I think that naming came from Sam and Anders (loadWebArchiveFromData). It might have been "ForData". > > > > I'm suggesting "WKLoadWebArchiveData" > > I think you mean WK*Page*LoadWebArchiveData. Yes, sure did. 577985 11 jeffm 2012-03-13 16:39:22 -0700 Committed r110638: <http://trac.webkit.org/changeset/110638> 578077 12 sam 2012-03-13 18:28:22 -0700 This patch is missing API tests. Please add them. 578133 13 jeffm 2012-03-13 21:04:26 -0700 (In reply to comment #12) > This patch is missing API tests. Please add them. I wrote up bug 81073 to track this. 131730 2012-03-13 15:37:50 -0700 2012-03-13 15:45:49 -0700 Patch bug-81044-20120313153745.patch text/plain 6458 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDYyMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEyLTAzLTEzICBKZWZmIE1p bGxlciAgPGplZmZtQGFwcGxlLmNvbT4KKworICAgICAgICBTdXBwb3J0IGxvYWRpbmcgYSBXS1Bh Z2UgZnJvbSB3ZWIgYXJjaGl2ZSBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MTA0NAorICAgICAgICAKKyAgICAgICAgVGhpcyBjb2RlIHdhcyB3 cml0dGVuIGJ5IEplc3NpZSBCZXJsaW4uCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAgICAg KFdLUGFnZUxvYWRXZWJBcmNoaXZlRnJvbURhdGEpOiBBZGRlZC4KKyAgICAgICAgCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOiBBZGRlZCBXS1BhZ2VMb2FkV2ViQXJjaGl2ZUZy b21EYXRhKCkuCisgICAgICAgIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRXZWJBcmNoaXZlRnJvbURhdGEp OiBBZGRlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDogQWRkZWQgbG9h ZFdlYkFyY2hpdmVGcm9tRGF0YSgpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkV2ViQXJjaGl2ZUZyb21E YXRhKTogQWRkZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOiBB ZGRlZCBsb2FkV2ViQXJjaGl2ZUZyb21EYXRhKCkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjogQWRkZWQgTG9hZFdlYkFyY2hpdmVGcm9tRGF0YSBt ZXNzYWdlLgorCiAyMDEyLTAzLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+ICYm IEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWx3YXlz IGVuYWJsZSBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDExMDYyMikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC01MDQsNiArNTA0LDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUGxhaW5UZXh0U3RyaW5n KGMKICAgICBwcm9jZXNzKCktPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIAor dm9pZCBXZWJQYWdlUHJveHk6OmxvYWRXZWJBcmNoaXZlRnJvbURhdGEoY29uc3QgV2ViRGF0YSog d2ViQXJjaGl2ZURhdGEpCit7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJlYXR0YWNo VG9XZWJQcm9jZXNzKCk7CisKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkxvYWRXZWJBcmNoaXZlRnJvbURhdGEod2ViQXJjaGl2ZURhdGEtPmRhdGFSZWZlcmVuY2UoKSks IG1fcGFnZUlEKTsKKyAgICBwcm9jZXNzKCktPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQo KTsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BMb2FkaW5nKCkKIHsKICAgICBpZiAoIWlz VmFsaWQoKSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJl dmlzaW9uIDExMDYyMikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAkod29ya2luZyBjb3B5KQpAQCAtMjU0LDYgKzI1NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGxv YWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNl VVJMKTsKICAgICB2b2lkIGxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRt bFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxl VVJMKTsKICAgICB2b2lkIGxvYWRQbGFpblRleHRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcp OworICAgIHZvaWQgbG9hZFdlYkFyY2hpdmVGcm9tRGF0YShjb25zdCBXZWJEYXRhKik7CiAKICAg ICB2b2lkIHN0b3BMb2FkaW5nKCk7CiAgICAgdm9pZCByZWxvYWQoYm9vbCByZWxvYWRGcm9tT3Jp Z2luKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCShy ZXZpc2lvbiAxMTA2MjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODIsNiArODIsMTEgQEAgdm9pZCBXS1BhZ2VMb2FkUGxh aW5UZXh0U3RyaW5nKFdLUGFnZVJlZgogICAgIHRvSW1wbChwYWdlUmVmKS0+bG9hZFBsYWluVGV4 dFN0cmluZyh0b1dURlN0cmluZyhwbGFpblRleHRTdHJpbmdSZWYpKTsgICAgCiB9CiAKK3ZvaWQg V0tQYWdlTG9hZFdlYkFyY2hpdmVGcm9tRGF0YShXS1BhZ2VSZWYgcGFnZVJlZiwgV0tEYXRhUmVm IHdlYkFyY2hpdmVEYXRhUmVmKQoreworICAgIHRvSW1wbChwYWdlUmVmKS0+bG9hZFdlYkFyY2hp dmVGcm9tRGF0YSh0b0ltcGwod2ViQXJjaGl2ZURhdGFSZWYpKTsKK30KKwogdm9pZCBXS1BhZ2VT dG9wTG9hZGluZyhXS1BhZ2VSZWYgcGFnZVJlZikKIHsKICAgICB0b0ltcGwocGFnZVJlZiktPnN0 b3BMb2FkaW5nKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5o CShyZXZpc2lvbiAxMTA2MjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMxOSw2ICszMTksNyBAQCBXS19FWFBPUlQgdm9pZCBX S1BhZ2VMb2FkVVJMUmVxdWVzdChXS1BhCiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VMb2FkSFRNTFN0 cmluZyhXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgaHRtbFN0cmluZywgV0tVUkxSZWYgYmFz ZVVSTCk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhXS1Bh Z2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgaHRtbFN0cmluZywgV0tVUkxSZWYgYmFzZVVSTCwgV0tV UkxSZWYgdW5yZWFjaGFibGVVUkwpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlTG9hZFBsYWluVGV4 dFN0cmluZyhXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgcGxhaW5UZXh0U3RyaW5nKTsKK1dL X0VYUE9SVCB2b2lkIFdLUGFnZUxvYWRXZWJBcmNoaXZlRnJvbURhdGEoV0tQYWdlUmVmIHBhZ2Us IFdLRGF0YVJlZiB3ZWJBcmNoaXZlRGF0YSk7CiAKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVN0b3BM b2FkaW5nKFdLUGFnZVJlZiBwYWdlKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVJlbG9hZChXS1Bh Z2VSZWYgcGFnZSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxMTA2MjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4Miw2ICs2ODIsMTIg QEAgdm9pZCBXZWJQYWdlOjpsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IAogICAgIGxvYWREYXRh KHNoYXJlZEJ1ZmZlciwgInRleHQvcGxhaW4iLCAidXRmLTE2IiwgYmxhbmtVUkwoKSwgS1VSTCgp KTsKIH0KIAordm9pZCBXZWJQYWdlOjpsb2FkV2ViQXJjaGl2ZUZyb21EYXRhKGNvbnN0IENvcmVJ UEM6OkRhdGFSZWZlcmVuY2UmIHdlYkFyY2hpdmVEYXRhKQoreworICAgIFJlZlB0cjxTaGFyZWRC dWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgY2hhcio+KHdlYkFyY2hpdmVEYXRhLmRhdGEoKSksIHdlYkFyY2hpdmVEYXRhLnNp emUoKSAqIHNpemVvZih1aW50OF90KSk7CisgICAgbG9hZERhdGEoc2hhcmVkQnVmZmVyLCAiYXBw bGljYXRpb24veC13ZWJhcmNoaXZlIiwgInV0Zi0xNiIsIGJsYW5rVVJMKCksIEtVUkwoKSk7Cit9 CisKIHZvaWQgV2ViUGFnZTo6bGlua0NsaWNrZWQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFdl Yk1vdXNlRXZlbnQmIGV2ZW50KQogewogICAgIEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZy YW1lKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgJKHJldmlzaW9uIDExMDYyMikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0MCw2ICs1NDAsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgbG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBT dHJpbmcmIGJhc2VVUkwpOwogICAgIHZvaWQgbG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoY29uc3Qg U3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IFN0cmluZyYg dW5yZWFjaGFibGVVUkwpOwogICAgIHZvaWQgbG9hZFBsYWluVGV4dFN0cmluZyhjb25zdCBTdHJp bmcmKTsKKyAgICB2b2lkIGxvYWRXZWJBcmNoaXZlRnJvbURhdGEoY29uc3QgQ29yZUlQQzo6RGF0 YVJlZmVyZW5jZSYpOwogICAgIHZvaWQgbGlua0NsaWNrZWQoY29uc3QgU3RyaW5nJiB1cmwsIGNv bnN0IFdlYk1vdXNlRXZlbnQmKTsKICAgICB2b2lkIHJlbG9hZChib29sIHJlbG9hZEZyb21Pcmln aW4sIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYpOwogICAgIHZvaWQgZ29Gb3J3YXJk KHVpbnQ2NF90KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxMTA2MjIpCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkod29ya2luZyBj b3B5KQpAQCAtNTcsNiArNTcsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIHsKICAgICBMb2FkSFRN TFN0cmluZyhXVEY6OlN0cmluZyBodG1sU3RyaW5nLCBXVEY6OlN0cmluZyBiYXNlVVJMKQogICAg IExvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKFdURjo6U3RyaW5nIGh0bWxTdHJpbmcsIFdURjo6U3Ry aW5nIGJhc2VVUkwsIFdURjo6U3RyaW5nIHVucmVhY2hhYmxlVVJMKTsgCiAgICAgTG9hZFBsYWlu VGV4dFN0cmluZyhXVEY6OlN0cmluZyBzdHJpbmcpCisgICAgTG9hZFdlYkFyY2hpdmVGcm9tRGF0 YShDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIHdlYkFyY2hpdmVEYXRhKQogICAgIExvYWRVUkwoV1RG OjpTdHJpbmcgdXJsLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKQogICAgIExvYWRVUkxSZXF1ZXN0KFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCByZXF1ZXN0LCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0ZW5z aW9uSGFuZGxlKQogICAgIExpbmtDbGlja2VkKFdURjo6U3RyaW5nIHVybCwgV2ViS2l0OjpXZWJN b3VzZUV2ZW50IGV2ZW50KQo= 131749 2012-03-13 16:35:33 -0700 2012-03-13 16:38:11 -0700 Patch bug-81044-20120313163528.patch text/plain 6402 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDYzNykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEyLTAzLTEzICBKZWZmIE1p bGxlciAgPGplZmZtQGFwcGxlLmNvbT4KKworICAgICAgICBTdXBwb3J0IGxvYWRpbmcgYSBXS1Bh Z2UgZnJvbSB3ZWIgYXJjaGl2ZSBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MTA0NAorCisgICAgICAgIFRoaXMgY29kZSB3YXMgd3JpdHRlbiBi eSBKZXNzaWUgQmVybGluLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VM b2FkV2ViQXJjaGl2ZURhdGEpOiBBZGRlZC4KKyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLUGFnZS5oOiBBZGRlZCBXS1BhZ2VMb2FkV2ViQXJjaGl2ZURhdGEoKS4KKyAgICAg ICAgCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6bG9hZFdlYkFyY2hpdmVEYXRhKTogQWRkZWQuCisgICAgICAgIAor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDogQWRkZWQgbG9hZFdlYkFyY2hpdmVE YXRhKCkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRXZWJBcmNoaXZlRGF0YSk6IEFkZGVkLgorICAgICAg ICAKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOiBBZGRlZCBsb2FkV2Vi QXJjaGl2ZURhdGEoKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluOiBBZGRlZCBMb2FkV2ViQXJjaGl2ZURhdGEgbWVzc2FnZS4KKwogMjAxMi0wMy0x MyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPiAmJiBCZW5qYW1pbiBQb3VsYWluICA8 YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFsd2F5cyBlbmFibGUgRU5BQkxFKENMSUVO VF9CQVNFRF9HRU9MT0NBVElPTikKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCShyZXZpc2lvbiAxMTA2MjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTA0LDYgKzUwNCwxNSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFBsYWluVGV4dFN0cmluZyhjCiAgICAgcHJvY2VzcygpLT5y ZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojps b2FkV2ViQXJjaGl2ZURhdGEoY29uc3QgV2ViRGF0YSogd2ViQXJjaGl2ZURhdGEpCit7CisgICAg aWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CisKKyAgICBw cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRXZWJBcmNoaXZlRGF0YSh3ZWJB cmNoaXZlRGF0YS0+ZGF0YVJlZmVyZW5jZSgpKSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MoKS0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6 c3RvcExvYWRpbmcoKQogewogICAgIGlmICghaXNWYWxpZCgpKQpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTEwNjIyKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTQsNiAr MjU0LDcgQEAgcHVibGljOgogICAgIHZvaWQgbG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBo dG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwpOwogICAgIHZvaWQgbG9hZEFsdGVybmF0 ZUhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VV UkwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwpOwogICAgIHZvaWQgbG9hZFBsYWluVGV4 dFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZyk7CisgICAgdm9pZCBsb2FkV2ViQXJjaGl2ZURh dGEoY29uc3QgV2ViRGF0YSopOwogCiAgICAgdm9pZCBzdG9wTG9hZGluZygpOwogICAgIHZvaWQg cmVsb2FkKGJvb2wgcmVsb2FkRnJvbU9yaWdpbik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMTEwNjIyKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgy LDExIEBAIHZvaWQgV0tQYWdlTG9hZFBsYWluVGV4dFN0cmluZyhXS1BhZ2VSZWYKICAgICB0b0lt cGwocGFnZVJlZiktPmxvYWRQbGFpblRleHRTdHJpbmcodG9XVEZTdHJpbmcocGxhaW5UZXh0U3Ry aW5nUmVmKSk7ICAgIAogfQogCit2b2lkIFdLUGFnZUxvYWRXZWJBcmNoaXZlRGF0YShXS1BhZ2VS ZWYgcGFnZVJlZiwgV0tEYXRhUmVmIHdlYkFyY2hpdmVEYXRhUmVmKQoreworICAgIHRvSW1wbChw YWdlUmVmKS0+bG9hZFdlYkFyY2hpdmVEYXRhKHRvSW1wbCh3ZWJBcmNoaXZlRGF0YVJlZikpOwor fQorCiB2b2lkIFdLUGFnZVN0b3BMb2FkaW5nKFdLUGFnZVJlZiBwYWdlUmVmKQogewogICAgIHRv SW1wbChwYWdlUmVmKS0+c3RvcExvYWRpbmcoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQYWdlLmgJKHJldmlzaW9uIDExMDYyMikKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzE5LDYgKzMxOSw3IEBA IFdLX0VYUE9SVCB2b2lkIFdLUGFnZUxvYWRVUkxSZXF1ZXN0KFdLUGEKIFdLX0VYUE9SVCB2b2lk IFdLUGFnZUxvYWRIVE1MU3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBodG1sU3Ry aW5nLCBXS1VSTFJlZiBiYXNlVVJMKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUxvYWRBbHRlcm5h dGVIVE1MU3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBodG1sU3RyaW5nLCBXS1VS TFJlZiBiYXNlVVJMLCBXS1VSTFJlZiB1bnJlYWNoYWJsZVVSTCk7CiBXS19FWFBPUlQgdm9pZCBX S1BhZ2VMb2FkUGxhaW5UZXh0U3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBwbGFp blRleHRTdHJpbmcpOworV0tfRVhQT1JUIHZvaWQgV0tQYWdlTG9hZFdlYkFyY2hpdmVEYXRhKFdL UGFnZVJlZiBwYWdlLCBXS0RhdGFSZWYgd2ViQXJjaGl2ZURhdGEpOwogCiBXS19FWFBPUlQgdm9p ZCBXS1BhZ2VTdG9wTG9hZGluZyhXS1BhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQgdm9pZCBXS1Bh Z2VSZWxvYWQoV0tQYWdlUmVmIHBhZ2UpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTEwNjIyKQorKysgU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 ODIsNiArNjgyLDEyIEBAIHZvaWQgV2ViUGFnZTo6bG9hZFBsYWluVGV4dFN0cmluZyhjb25zdCAK ICAgICBsb2FkRGF0YShzaGFyZWRCdWZmZXIsICJ0ZXh0L3BsYWluIiwgInV0Zi0xNiIsIGJsYW5r VVJMKCksIEtVUkwoKSk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6bG9hZFdlYkFyY2hpdmVEYXRhKGNv bnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmIHdlYkFyY2hpdmVEYXRhKQoreworICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KHdlYkFyY2hpdmVEYXRhLmRhdGEoKSksIHdlYkFyY2hp dmVEYXRhLnNpemUoKSAqIHNpemVvZih1aW50OF90KSk7CisgICAgbG9hZERhdGEoc2hhcmVkQnVm ZmVyLCAiYXBwbGljYXRpb24veC13ZWJhcmNoaXZlIiwgInV0Zi0xNiIsIGJsYW5rVVJMKCksIEtV UkwoKSk7Cit9CisKIHZvaWQgV2ViUGFnZTo6bGlua0NsaWNrZWQoY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2ZW50KQogewogICAgIEZyYW1lKiBmcmFtZSA9IG1fcGFn ZS0+bWFpbkZyYW1lKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgJKHJldmlzaW9uIDExMDYyMikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0MCw2ICs1NDAsNyBAQCBw cml2YXRlOgogICAgIHZvaWQgbG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5n LCBjb25zdCBTdHJpbmcmIGJhc2VVUkwpOwogICAgIHZvaWQgbG9hZEFsdGVybmF0ZUhUTUxTdHJp bmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIGNvbnN0 IFN0cmluZyYgdW5yZWFjaGFibGVVUkwpOwogICAgIHZvaWQgbG9hZFBsYWluVGV4dFN0cmluZyhj b25zdCBTdHJpbmcmKTsKKyAgICB2b2lkIGxvYWRXZWJBcmNoaXZlRGF0YShjb25zdCBDb3JlSVBD OjpEYXRhUmVmZXJlbmNlJik7CiAgICAgdm9pZCBsaW5rQ2xpY2tlZChjb25zdCBTdHJpbmcmIHVy bCwgY29uc3QgV2ViTW91c2VFdmVudCYpOwogICAgIHZvaWQgcmVsb2FkKGJvb2wgcmVsb2FkRnJv bU9yaWdpbiwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CiAgICAgdm9pZCBnb0Zv cndhcmQodWludDY0X3QpOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDExMDYyMikKKysrIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3Jr aW5nIGNvcHkpCkBAIC01Nyw2ICs1Nyw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAgIExv YWRIVE1MU3RyaW5nKFdURjo6U3RyaW5nIGh0bWxTdHJpbmcsIFdURjo6U3RyaW5nIGJhc2VVUkwp CiAgICAgTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoV1RGOjpTdHJpbmcgaHRtbFN0cmluZywgV1RG OjpTdHJpbmcgYmFzZVVSTCwgV1RGOjpTdHJpbmcgdW5yZWFjaGFibGVVUkwpOyAKICAgICBMb2Fk UGxhaW5UZXh0U3RyaW5nKFdURjo6U3RyaW5nIHN0cmluZykKKyAgICBMb2FkV2ViQXJjaGl2ZURh dGEoQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSB3ZWJBcmNoaXZlRGF0YSkKICAgICBMb2FkVVJMKFdU Rjo6U3RyaW5nIHVybCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4 dGVuc2lvbkhhbmRsZSkKICAgICBMb2FkVVJMUmVxdWVzdChXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QgcmVxdWVzdCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSkKICAgICBMaW5rQ2xpY2tlZChXVEY6OlN0cmluZyB1cmwsIFdlYktpdDo6V2Vi TW91c2VFdmVudCBldmVudCkK