51437 2010-12-21 17:48:39 -0800 Add a way to get a web archive in WebKit2 2010-12-22 12:23:11 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 325302 0 darin 2010-12-21 17:48:39 -0800 Add a way to get a web archive in WebKit2 325304 1 77173 darin 2010-12-21 17:51:53 -0800 Created attachment 77173 Patch 325318 2 77173 beidson 2010-12-21 18:11:27 -0800 Comment on attachment 77173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77173&action=review > WebKit2/ChangeLog:15 > + (WebKit::WebPageProxy::getWebArchiveForFrame): Added. Not going to r- based on this, but consider it - I slightly prefer "getWebArchiveOfFrame" instead of "getWebArchiveForFrame" Same comment applies throughout > WebKit2/WebProcess/WebPage/WebPage.cpp:951 > + It seems weird that every platform has this family of functionality even if they don't support our concept of a "WebArchive," and that makes this silent "never really do anything here" behavior puzzling to me for non-Mac/Win builds. I don't know a good solution for this without a whole-lot-more #ifdef'ing 325586 3 darin 2010-12-22 11:08:35 -0800 (In reply to comment #2) > I slightly prefer "getWebArchiveOfFrame" instead of "getWebArchiveForFrame" I talked to Sam and we decided to do it your way. > It seems weird that every platform has this family of functionality even if they don't support our concept of a "WebArchive," and that makes this silent "never really do anything here" behavior puzzling to me for non-Mac/Win builds. I thought it through, and I think this is probably the best tradeoff. I don’t think more ifdefs would be helpful. Returning an empty archive on platforms that don’t support archives seems OK to me, but you could argue that we need to return an error instead or omit the function entirely. 325628 4 darin 2010-12-22 12:23:11 -0800 Committed r74494: <http://trac.webkit.org/changeset/74494> 77173 2010-12-21 17:51:53 -0800 2010-12-21 18:11:27 -0800 Patch bug-51437-20101221175152.patch text/plain 11409 darin SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDQ0MykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTAtMTItMjEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh IHdheSB0byBnZXQgYSB3ZWIgYXJjaGl2ZSBpbiBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTQzNworCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VHZXRXZWJBcmNoaXZlRm9yRnJhbWUp OiBBZGRlZC4KKyAgICAgICAgKGNhbGxHZXRXZWJBcmNoaXZlRm9yRnJhbWVCbG9ja0FuZERpc3Bv c2UpOiBBZGRlZC4KKyAgICAgICAgKFdLUGFnZUdldFdlYkFyY2hpdmVGb3JGcmFtZV9iKTogQWRk ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOiBBZGRlZCBmdW5jdGlvbnMg YWJvdmUuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2xvc2UpOiBDbGVhciBvdXQgbV93ZWJBcmNoaXZlQ2FsbGJh Y2tzLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmdldFdlYkFyY2hpdmVGb3JGcmFt ZSk6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEdldFdlYkFyY2hp dmVGb3JGcmFtZSk6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnByb2Nl c3NEaWRDcmFzaCk6IENsZWFyIG91dCBtX3dlYkFyY2hpdmVDYWxsYmFja3MuCisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOiBBZGRlZCBmdW5jdGlvbnMgYWJvdmUuCisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjogQWRkZWQgRGlkR2V0V2ViQXJj aGl2ZUZvckZyYW1lLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0V2ViQXJjaGl2ZUZvckZyYW1lKTogQWRkZWQu CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDogQWRkZWQgZnVuY3Rpb24g YWJvdmUuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46 IEFkZGVkIEdldFdlYkFyY2hpdmVGb3JGcmFtZS4KKwogMjAxMC0xMi0yMSAgU2FtIFdlaW5pZyAg PHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29u LgpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA3NDQxOCkKKysr IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0 OSw2ICsyNDksNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2xvc2UoKQogICAgIGludmFsaWRhdGVD YWxsYmFja01hcChtX2ZyYW1lU291cmNlQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRlQ2FsbGJh Y2tNYXAobV9yZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbkNhbGxiYWNrcyk7CiAgICAg aW52YWxpZGF0ZUNhbGxiYWNrTWFwKG1fc2NyaXB0UmV0dXJuVmFsdWVDYWxsYmFja3MpOworICAg IGludmFsaWRhdGVDYWxsYmFja01hcChtX3dlYkFyY2hpdmVDYWxsYmFja3MpOwogCiAgICAgVmVj dG9yPFdlYkVkaXRDb21tYW5kUHJveHkqPiBlZGl0Q29tbWFuZFZlY3RvcjsKICAgICBjb3B5VG9W ZWN0b3IobV9lZGl0Q29tbWFuZFNldCwgZWRpdENvbW1hbmRWZWN0b3IpOwpAQCAtODE1LDYgKzgx NiwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0Q29udGVudHNBc1N0cmluZyhQCiAgICAgcHJv Y2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRDb250ZW50c0FzU3RyaW5nKGNhbGxi YWNrSUQpLCBtX3BhZ2VJRCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpnZXRXZWJBcmNoaXZl Rm9yRnJhbWUoV2ViRnJhbWVQcm94eSogZnJhbWUsIFBhc3NSZWZQdHI8V2ViQXJjaGl2ZUNhbGxi YWNrPiBwcnBDYWxsYmFjaykKK3sKKyAgICBSZWZQdHI8V2ViQXJjaGl2ZUNhbGxiYWNrPiBjYWxs YmFjayA9IHBycENhbGxiYWNrOworICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+ Y2FsbGJhY2tJRCgpOworICAgIG1fd2ViQXJjaGl2ZUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwg Y2FsbGJhY2suZ2V0KCkpOworICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 R2V0V2ViQXJjaGl2ZUZvckZyYW1lKGZyYW1lLT5mcmFtZUlEKCksIGNhbGxiYWNrSUQpLCBtX3Bh Z2VJRCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5OjpwcmVmZXJlbmNlc0RpZENoYW5nZSgpCiB7 CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkBAIC0xNzQ2LDYgKzE3NTUsMjEgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmRpZEdldFNvdXJjZUZvckZyYW1lKAogICAgIGNhbGxiYWNrLT5wZXJmb3JtQ2FsbGJh Y2tXaXRoUmV0dXJuVmFsdWUocmVzdWx0U3RyaW5nLmltcGwoKSk7CiB9CiAKK3ZvaWQgV2ViUGFn ZVByb3h5OjpkaWRHZXRXZWJBcmNoaXZlRm9yRnJhbWUoY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVy ZW5jZSYgZGF0YVJlZmVyZW5jZSwgdWludDY0X3QgY2FsbGJhY2tJRCkKK3sKKyAgICBSZWZQdHI8 V2ViQXJjaGl2ZUNhbGxiYWNrPiBjYWxsYmFjayA9IG1fd2ViQXJjaGl2ZUNhbGxiYWNrcy50YWtl KGNhbGxiYWNrSUQpOworICAgIGlmICghY2FsbGJhY2spIHsKKyAgICAgICAgLy8gRklYTUU6IExv ZyBlcnJvciBvciBhc3NlcnQuCisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBSZWZQdHI8 V2ViRGF0YT4gZGF0YTsKKyAgICBpZiAoc2l6ZV90IHNpemUgPSBkYXRhUmVmZXJlbmNlLnNpemUo KSkKKyAgICAgICAgZGF0YSA9IFdlYkRhdGE6OmNyZWF0ZShkYXRhUmVmZXJlbmNlLmRhdGEoKSwg c2l6ZSk7CisKKyAgICBjYWxsYmFjay0+cGVyZm9ybUNhbGxiYWNrV2l0aFJldHVyblZhbHVlKGRh dGEuZ2V0KCkpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6Zm9jdXNlZEZyYW1lQ2hhbmdlZCh1 aW50NjRfdCBmcmFtZUlEKQogewogICAgIG1fZm9jdXNlZEZyYW1lID0gZnJhbWVJRCA/IHByb2Nl c3MoKS0+d2ViRnJhbWUoZnJhbWVJRCkgOiAwOwpAQCAtMTgwMiw2ICsxODI2LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OnByb2Nlc3NEaWRDcmFzaCgpCiAgICAgaW52YWxpZGF0ZUNhbGxiYWNrTWFw KG1fZnJhbWVTb3VyY2VDYWxsYmFja3MpOwogICAgIGludmFsaWRhdGVDYWxsYmFja01hcChtX3Jl bmRlclRyZWVFeHRlcm5hbFJlcHJlc2VudGF0aW9uQ2FsbGJhY2tzKTsKICAgICBpbnZhbGlkYXRl Q2FsbGJhY2tNYXAobV9zY3JpcHRSZXR1cm5WYWx1ZUNhbGxiYWNrcyk7CisgICAgaW52YWxpZGF0 ZUNhbGxiYWNrTWFwKG1fd2ViQXJjaGl2ZUNhbGxiYWNrcyk7CiAKICAgICBWZWN0b3I8V2ViRWRp dENvbW1hbmRQcm94eSo+IGVkaXRDb21tYW5kVmVjdG9yOwogICAgIGNvcHlUb1ZlY3RvcihtX2Vk aXRDb21tYW5kU2V0LCBlZGl0Q29tbWFuZFZlY3Rvcik7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaAkocmV2aXNpb24gNzQ0MTgpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDYgKzEwMSw3IEBAIHR5cGVkZWYgR2VuZXJpY0Nh bGxiYWNrPFdLU3RyaW5nUmVmLCBTdHIKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPFdLU3RyaW5n UmVmLCBTdHJpbmdJbXBsKj4gUmVuZGVyVHJlZUV4dGVybmFsUmVwcmVzZW50YXRpb25DYWxsYmFj azsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPFdLU3RyaW5nUmVmLCBTdHJpbmdJbXBsKj4gU2Ny aXB0UmV0dXJuVmFsdWVDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPFdLU3RyaW5n UmVmLCBTdHJpbmdJbXBsKj4gQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrOwordHlwZWRlZiBHZW5l cmljQ2FsbGJhY2s8V0tEYXRhUmVmPiBXZWJBcmNoaXZlQ2FsbGJhY2s7CiAKIGNsYXNzIFdlYlBh Z2VQcm94eSA6IHB1YmxpYyBBUElPYmplY3QsIHB1YmxpYyBXZWJQb3B1cE1lbnVQcm94eTo6Q2xp ZW50IHsKIHB1YmxpYzoKQEAgLTI0NSw2ICsyNDYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBnZXRS ZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbihQYXNzUmVmUHRyPFJlbmRlclRyZWVFeHRl cm5hbFJlcHJlc2VudGF0aW9uQ2FsbGJhY2s+KTsKICAgICB2b2lkIGdldFNvdXJjZUZvckZyYW1l KFdlYkZyYW1lUHJveHkqLCBQYXNzUmVmUHRyPEZyYW1lU291cmNlQ2FsbGJhY2s+KTsKICAgICB2 b2lkIGdldENvbnRlbnRzQXNTdHJpbmcoUGFzc1JlZlB0cjxDb250ZW50c0FzU3RyaW5nQ2FsbGJh Y2s+KTsKKyAgICB2b2lkIGdldFdlYkFyY2hpdmVGb3JGcmFtZShXZWJGcmFtZVByb3h5KiwgUGFz c1JlZlB0cjxXZWJBcmNoaXZlQ2FsbGJhY2s+KTsKIAogICAgIHZvaWQgcmVjZWl2ZWRQb2xpY3lE ZWNpc2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rpb24sIFdlYkZyYW1lUHJveHkqLCB1aW50NjRfdCBs aXN0ZW5lcklEKTsKIApAQCAtNDI0LDYgKzQyNiw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRS dW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoY29uc3QgU3RyaW5nJiwgdWludDY0X3QpOwogICAgIHZv aWQgZGlkR2V0UmVuZGVyVHJlZUV4dGVybmFsUmVwcmVzZW50YXRpb24oY29uc3QgU3RyaW5nJiwg dWludDY0X3QpOwogICAgIHZvaWQgZGlkR2V0U291cmNlRm9yRnJhbWUoY29uc3QgU3RyaW5nJiwg dWludDY0X3QpOworICAgIHZvaWQgZGlkR2V0V2ViQXJjaGl2ZUZvckZyYW1lKGNvbnN0IENvcmVJ UEM6OkRhdGFSZWZlcmVuY2UmLCB1aW50NjRfdCk7CiAKICAgICB2b2lkIGZvY3VzZWRGcmFtZUNo YW5nZWQodWludDY0X3QgZnJhbWVJRCk7CiAKQEAgLTQ3MCw2ICs0NzMsNyBAQCBwcml2YXRlOgog ICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxGcmFtZVNvdXJjZUNhbGxiYWNrPiA+IG1fZnJh bWVTb3VyY2VDYWxsYmFja3M7CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFJlbmRlclRy ZWVFeHRlcm5hbFJlcHJlc2VudGF0aW9uQ2FsbGJhY2s+ID4gbV9yZW5kZXJUcmVlRXh0ZXJuYWxS ZXByZXNlbnRhdGlvbkNhbGxiYWNrczsKICAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8U2Ny aXB0UmV0dXJuVmFsdWVDYWxsYmFjaz4gPiBtX3NjcmlwdFJldHVyblZhbHVlQ2FsbGJhY2tzOwor ICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxXZWJBcmNoaXZlQ2FsbGJhY2s+ID4gbV93ZWJB cmNoaXZlQ2FsbGJhY2tzOwogCiAgICAgSGFzaFNldDxXZWJFZGl0Q29tbWFuZFByb3h5Kj4gbV9l ZGl0Q29tbWFuZFNldDsKIApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5t ZXNzYWdlcy5pbgkocmV2aXNpb24gNzQ0MTgpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTExMSw2ICsxMTEsNyBAQCBtZXNz YWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIERpZEdldENvbnRlbnRzQXNTdHJpbmcoV1RGOjpT dHJpbmcgcmVzdWx0U3RyaW5nLCB1aW50NjRfdCBjYWxsYmFja0lEKQogICAgIERpZEdldFJlbmRl clRyZWVFeHRlcm5hbFJlcHJlc2VudGF0aW9uKFdURjo6U3RyaW5nIHJlc3VsdFN0cmluZywgdWlu dDY0X3QgY2FsbGJhY2tJRCkKICAgICBEaWRHZXRTb3VyY2VGb3JGcmFtZShXVEY6OlN0cmluZyBy ZXN1bHRTdHJpbmcsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCisgICAgRGlkR2V0V2ViQXJjaGl2ZUZv ckZyYW1lKENvcmVJUEM6OkRhdGFSZWZlcmVuY2UgYXJjaGl2ZURhdGEsIHVpbnQ2NF90IGNhbGxi YWNrSUQpCiAgICAgRGlkUnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lKFdURjo6U3RyaW5nIHJlc3Vs dFN0cmluZywgdWludDY0X3QgY2FsbGJhY2tJRCkKIAogI2lmIFBMQVRGT1JNKE1BQykKSW5kZXg6 IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gNzQ0MTgpCisrKyBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTksMyArMzk5 LDIyIEBAIHZvaWQgV0tQYWdlR2V0Q29udGVudHNBc1N0cmluZ19iKFdLUGFnZVIKICAgICBXS1Bh Z2VHZXRDb250ZW50c0FzU3RyaW5nKHBhZ2VSZWYsIEJsb2NrX2NvcHkoYmxvY2spLCBjYWxsQ29u dGVudHNBc1N0cmluZ0Jsb2NrQmxvY2tBbmREaXNwb3NlKTsKIH0KICNlbmRpZgorCit2b2lkIFdL UGFnZUdldFdlYkFyY2hpdmVGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZVJlZiwgV0tGcmFtZVJlZiBm cmFtZVJlZiwgdm9pZCogY29udGV4dCwgV0tQYWdlR2V0V2ViQXJjaGl2ZUZvckZyYW1lRnVuY3Rp b24gY2FsbGJhY2spCit7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5nZXRXZWJBcmNoaXZlRm9yRnJh bWUodG9JbXBsKGZyYW1lUmVmKSwgV2ViQXJjaGl2ZUNhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwg Y2FsbGJhY2spKTsKK30KKworI2lmZGVmIF9fQkxPQ0tTX18KK3N0YXRpYyB2b2lkIGNhbGxHZXRX ZWJBcmNoaXZlRm9yRnJhbWVCbG9ja0FuZERpc3Bvc2UoV0tEYXRhUmVmIHJlc3VsdFZhbHVlLCBX S0Vycm9yUmVmIGVycm9yLCB2b2lkKiBjb250ZXh0KQoreworICAgIFdLUGFnZUdldFdlYkFyY2hp dmVGb3JGcmFtZUJsb2NrIGJsb2NrID0gKFdLUGFnZUdldFdlYkFyY2hpdmVGb3JGcmFtZUJsb2Nr KWNvbnRleHQ7CisgICAgYmxvY2socmVzdWx0VmFsdWUsIGVycm9yKTsKKyAgICBCbG9ja19yZWxl YXNlKGJsb2NrKTsKK30KKwordm9pZCBXS1BhZ2VHZXRXZWJBcmNoaXZlRm9yRnJhbWVfYihXS1Bh Z2VSZWYgcGFnZVJlZiwgV0tGcmFtZVJlZiBmcmFtZVJlZiwgV0tQYWdlR2V0V2ViQXJjaGl2ZUZv ckZyYW1lQmxvY2sgYmxvY2spCit7CisgICAgV0tQYWdlR2V0V2ViQXJjaGl2ZUZvckZyYW1lKHBh Z2VSZWYsIGZyYW1lUmVmLCBCbG9ja19jb3B5KGJsb2NrKSwgY2FsbEdldFdlYkFyY2hpdmVGb3JG cmFtZUJsb2NrQW5kRGlzcG9zZSk7Cit9CisjZW5kaWYKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UGFnZS5oCShyZXZpc2lvbiA3NDQxOCkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMzYsNiArMzM2LDEzIEBAIHR5cGVkZWYgdm9pZCAoXldL UGFnZUdldENvbnRlbnRzQXNTdHJpbmcKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUdldENvbnRlbnRz QXNTdHJpbmdfYihXS1BhZ2VSZWYgcGFnZSwgV0tQYWdlR2V0Q29udGVudHNBc1N0cmluZ0Jsb2Nr IGJsb2NrKTsKICNlbmRpZgogCit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VHZXRXZWJBcmNoaXZlRm9y RnJhbWVGdW5jdGlvbikoV0tEYXRhUmVmLCBXS0Vycm9yUmVmLCB2b2lkKik7CitXS19FWFBPUlQg dm9pZCBXS1BhZ2VHZXRXZWJBcmNoaXZlRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVS ZWYgZnJhbWUsIHZvaWQqIGNvbnRleHQsIFdLUGFnZUdldFdlYkFyY2hpdmVGb3JGcmFtZUZ1bmN0 aW9uIGZ1bmN0aW9uKTsKKyNpZmRlZiBfX0JMT0NLU19fCit0eXBlZGVmIHZvaWQgKF5XS1BhZ2VH ZXRXZWJBcmNoaXZlRm9yRnJhbWVCbG9jaykoV0tEYXRhUmVmLCBXS0Vycm9yUmVmKTsKK1dLX0VY UE9SVCB2b2lkIFdLUGFnZUdldFdlYkFyY2hpdmVGb3JGcmFtZV9iKFdLUGFnZVJlZiBwYWdlLCBX S0ZyYW1lUmVmIGZyYW1lLCBXS1BhZ2VHZXRXZWJBcmNoaXZlRm9yRnJhbWVCbG9jayBibG9jayk7 CisjZW5kaWYKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKSW5kZXg6IFdlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA3NDQxOCkKKysrIFdlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsy Niw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZS5oIgogCiAjaW5jbHVkZSAiQXJndW1lbnRzLmgiCisj aW5jbHVkZSAiRGF0YVJlZmVyZW5jZS5oIgogI2luY2x1ZGUgIkRyYXdpbmdBcmVhLmgiCiAjaW5j bHVkZSAiSW5qZWN0ZWRCdW5kbGUuaCIKICNpbmNsdWRlICJJbmplY3RlZEJ1bmRsZUJhY2tGb3J3 YXJkTGlzdC5oIgpAQCAtNzgsNiArNzksMTAgQEAKICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5o PgogI2luY2x1ZGUgPHJ1bnRpbWUvSlNWYWx1ZS5oPgogCisjaWYgUExBVEZPUk0oTUFDKSB8fCBQ TEFURk9STShXSU4pCisjaW5jbHVkZSA8V2ViQ29yZS9MZWdhY3lXZWJBcmNoaXZlLmg+CisjZW5k aWYKKwogI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKIC8vIEZJWE1FOiBUaGlzIGlzIGN1cnJl bnRseSBNYWMtc3BlY2lmaWMhCiAjaW5jbHVkZSAiTWFjaFBvcnQuaCIKQEAgLTkzMCw2ICs5MzUs MjMgQEAgdm9pZCBXZWJQYWdlOjpnZXRTb3VyY2VGb3JGcmFtZSh1aW50NjRfdAogICAgIHNlbmQo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkR2V0U291cmNlRm9yRnJhbWUocmVzdWx0U3RyaW5n LCBjYWxsYmFja0lEKSk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6Z2V0V2ViQXJjaGl2ZUZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCit7CisgICAgQ29yZUlQQzo6 RGF0YVJlZmVyZW5jZSBkYXRhUmVmZXJlbmNlOworCisjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFU Rk9STShXSU4pCisgICAgUmV0YWluUHRyPENGRGF0YVJlZj4gZGF0YTsKKyAgICBpZiAoV2ViRnJh bWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkud2ViRnJhbWUoZnJhbWVJRCkpIHsKKyAg ICAgICAgaWYgKFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBhcmNoaXZlID0gTGVnYWN5V2ViQXJj aGl2ZTo6Y3JlYXRlKGZyYW1lLT5jb3JlRnJhbWUoKSkpIHsKKyAgICAgICAgICAgIGlmICgoZGF0 YSA9IGFyY2hpdmUtPnJhd0RhdGFSZXByZXNlbnRhdGlvbigpKSkKKyAgICAgICAgICAgICAgICBk YXRhUmVmZXJlbmNlID0gQ29yZUlQQzo6RGF0YVJlZmVyZW5jZShDRkRhdGFHZXRCeXRlUHRyKGRh dGEuZ2V0KCkpLCBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSkpOworICAgICAgICB9CisgICAg fQorI2VuZGlmCisKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEdldFdlYkFy Y2hpdmVGb3JGcmFtZShkYXRhUmVmZXJlbmNlLCBjYWxsYmFja0lEKSk7Cit9CisKIHZvaWQgV2Vi UGFnZTo6cHJlZmVyZW5jZXNEaWRDaGFuZ2UoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3Rv cmUpCiB7CiAgICAgV2ViUHJlZmVyZW5jZXNTdG9yZTo6cmVtb3ZlVGVzdFJ1bm5lck92ZXJyaWRl cygpOwpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gNzQ0 MTgpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTMxMCw2ICszMTAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZ2V0Q29udGVudHNBc1N0 cmluZyh1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIGdldFJlbmRlclRyZWVFeHRlcm5h bFJlcHJlc2VudGF0aW9uKHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogICAgIHZvaWQgZ2V0U291cmNl Rm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgY2FsbGJhY2tJRCk7CisgICAgdm9p ZCBnZXRXZWJBcmNoaXZlRm9yRnJhbWUodWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgY2FsbGJh Y2tJRCk7CiAgICAgdm9pZCBydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoY29uc3QgU3RyaW5nJiwg dWludDY0X3QgY2FsbGJhY2tJRCk7CiAKICAgICB2b2lkIHByZWZlcmVuY2VzRGlkQ2hhbmdlKGNv bnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmKTsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gNzQ0MTgpCisrKyBXZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBA IC01Myw2ICs1Myw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAgIEdldFJlbmRlclRyZWVF eHRlcm5hbFJlcHJlc2VudGF0aW9uKHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgR2V0Q29udGVu dHNBc1N0cmluZyh1aW50NjRfdCBjYWxsYmFja0lEKQogICAgIEdldFNvdXJjZUZvckZyYW1lKHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCisgICAgR2V0V2ViQXJjaGl2ZUZv ckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgUnVuSmF2 YVNjcmlwdEluTWFpbkZyYW1lKFdURjo6U3RyaW5nIHNjcmlwdCwgdWludDY0X3QgY2FsbGJhY2tJ RCkKIAogICAgIFByZWZlcmVuY2VzRGlkQ2hhbmdlKFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9y ZSBzdG9yZSkK