138929 2014-11-20 10:20:40 -0800 Add -[WKWebView loadData:MIMEType:textEncodingName:baseURL:] 2014-11-20 12:01:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz oldest_to_newest 1050169 0 andersca 2014-11-20 10:20:40 -0800 Add -[WKWebView loadData:MIMEType:textEncodingName:baseURL:] 1050171 1 241957 andersca 2014-11-20 10:22:39 -0800 Created attachment 241957 Patch 1050172 2 241957 mitz 2014-11-20 10:31:02 -0800 Comment on attachment 241957 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241957&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:111 > + @param encodingName The encoding of the data. I think this should say “text encoding of the data”, but also, since this is an NSString, perhaps it should say that it should be an IANA name, or whatever is applicable here. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:112 > + @param baseURL A URL that is used to resolve relative URLs within the document. Will anything work if this is a file URL (i.e. will a there be read access to the URL)? If not, this is worth mentioning in the @discussion. Besides being used to resolve relative URLs, does this URL also control access to cookies and other things? 1050174 3 andersca 2014-11-20 10:33:27 -0800 (In reply to comment #2) > Comment on attachment 241957 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=241957&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:111 > > + @param encodingName The encoding of the data. > > I think this should say “text encoding of the data”, but also, since this is > an NSString, perhaps it should say that it should be an IANA name, or > whatever is applicable here. How about "The IANA registered text encoding of the data"? > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:112 > > + @param baseURL A URL that is used to resolve relative URLs within the document. > > Will anything work if this is a file URL (i.e. will a there be read access > to the URL)? If not, this is worth mentioning in the @discussion. Besides > being used to resolve relative URLs, does this URL also control access to > cookies and other things? Not yet, that's tracked by another bug (including modifying the header documentation to clarify this). 1050185 4 mitz 2014-11-20 10:46:39 -0800 (In reply to comment #3) > (In reply to comment #2) > > Comment on attachment 241957 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=241957&action=review > > > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h:111 > > > + @param encodingName The encoding of the data. > > > > I think this should say “text encoding of the data”, but also, since this is > > an NSString, perhaps it should say that it should be an IANA name, or > > whatever is applicable here. > > How about "The IANA registered text encoding of the data"? Looking at the HTML spec, this is usually called “character encoding” and the names come from <https://encoding.spec.whatwg.org>, where they are referred to as “names” and “labels”, so an IANA reference may be outdated. Perhaps the selector should be -loadData:MIMEType:characterEncoding:baseURL:. The comment could say “The data's character encoding name”. 1050208 5 241968 andersca 2014-11-20 11:58:36 -0800 Created attachment 241968 Patch 1050210 6 andersca 2014-11-20 12:01:28 -0800 Committed r176408: <http://trac.webkit.org/changeset/176408> 241957 2014-11-20 10:22:39 -0800 2014-11-20 11:58:33 -0800 Patch bug-138929-20141120102257.patch text/plain 6087 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Mzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjc1NmFiZjRhZWYxNjE0 Yjk2ZDQ2YTI3NzVhMjJjYjgxMTA3NWViZS4uNDRjYWM3MDBkNDMxNTlhYzBiMTFkYzRkMDk4NzMy MjgyMmM5YmNlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTExLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIC1bV0tXZWJW aWV3IGxvYWREYXRhOk1JTUVUeXBlOnRleHRFbmNvZGluZ05hbWU6YmFzZVVSTDpdCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5MjkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzE4NjgzODAyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFsc28sIHJlLWltcGxlbWVudCAtW1dLV2ViVmlldyBsb2FkSFRN TFN0cmluZzpiYXNlVVJMOl0gaW4gdGVybXMgb2YgdGhpcyBuZXdseSBhZGRlZCBmdW5jdGlvbgor ICAgICAgICBhbmQgYXNzdW1lIGEgVVRGLTggZW5jb2RpbmcuIFRoaXMgbWF0Y2hlcyB3aGF0IExl Z2FjeSBXZWJLaXQgZG9lcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAg ICAgICgtW1dLV2ViVmlldyBsb2FkSFRNTFN0cmluZzpiYXNlVVJMOl0pOgorICAgICAgICAoLVtX S1dlYlZpZXcgbG9hZERhdGE6TUlNRVR5cGU6dGV4dEVuY29kaW5nTmFtZTpiYXNlVVJMOl0pOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmxvYWREYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CisKIDIwMTQtMTEtMjAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4K IAogICAgICAgICBbR1RLXSBVUlRCRiBhZnRlciByMTc2MzYzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgKaW5kZXggMTlhMWNhZDU1MzZkZjE5ZTI5 ODhkMDJkZTdmYjFkYjc4YjhhMmRhNy4uNzlhMGY1MWQ2M2NiMTM0NTZiMjhhNzRmNDFlNjA5MDI4 Yjc5Y2Y2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5oCkBAIC0xMDUsNiArMTA1LDE1IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSgxMF8xMCwgOF8w KQogICovCiAtIChXS05hdmlnYXRpb24gKilsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilzdHJp bmcgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMOwogCisvKiEgQGFic3RyYWN0IFNldHMgdGhlIHdl YnBhZ2UgY29udGVudHMgYW5kIGJhc2UgVVJMLgorIEBwYXJhbSBkYXRhIFRoZSBkYXRhIHRvIHVz ZSBhcyB0aGUgY29udGVudHMgb2YgdGhlIHdlYnBhZ2UuCisgQHBhcmFtIE1JTUVUeXBlIFRoZSBN SU1FIHR5cGUgb2YgdGhlIGRhdGEuCisgQHBhcmFtIGVuY29kaW5nTmFtZSBUaGUgZW5jb2Rpbmcg b2YgdGhlIGRhdGEuCisgQHBhcmFtIGJhc2VVUkwgQSBVUkwgdGhhdCBpcyB1c2VkIHRvIHJlc29s dmUgcmVsYXRpdmUgVVJMcyB3aXRoaW4gdGhlIGRvY3VtZW50LgorIEByZXN1bHQgQSBuZXcgbmF2 aWdhdGlvbi4KKyAqLworLSAoV0tOYXZpZ2F0aW9uICopbG9hZERhdGE6KE5TRGF0YSAqKWRhdGEg TUlNRVR5cGU6KE5TU3RyaW5nICopTUlNRVR5cGUgdGV4dEVuY29kaW5nTmFtZTooTlNTdHJpbmcg KillbmNvZGluZ05hbWUgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIFdLX0FWQUlMQUJMRShXS19N QUNfVEJBLCBXS19JT1NfVEJBKTsKKwogLyohIEBhYnN0cmFjdCBOYXZpZ2F0ZXMgdG8gYW4gaXRl bSBmcm9tIHRoZSBiYWNrLWZvcndhcmQgbGlzdCBhbmQgc2V0cyBpdAogIGFzIHRoZSBjdXJyZW50 IGl0ZW0uCiAgQHBhcmFtIGl0ZW0gVGhlIGl0ZW0gdG8gd2hpY2ggdG8gbmF2aWdhdGUuIE11c3Qg YmUgb25lIG9mIHRoZSBpdGVtcyBpbiB0aGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMzA1NDgyMTdkZWM4NjAyYTFmOTM1MGIwNjlm ODdlMmQ3YzMwYmNjNy4uNDRjZTQzZDgwMmVlODk2ZTc2YzdiYWZjZTQ2MzNlZTg4MDE3OGVjOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K QEAgLTQzNCw3ICs0MzQsMTQgQEAgc3RhdGljIGludDMyX3QgZGV2aWNlT3JpZW50YXRpb24oKQog CiAtIChXS05hdmlnYXRpb24gKilsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilzdHJpbmcgYmFz ZVVSTDooTlNVUkwgKiliYXNlVVJMCiB7Ci0gICAgdWludDY0X3QgbmF2aWdhdGlvbklEID0gX3Bh Z2UtPmxvYWRIVE1MU3RyaW5nKHN0cmluZywgYmFzZVVSTC5hYnNvbHV0ZVN0cmluZyk7CisgICAg TlNEYXRhICpkYXRhID0gW3N0cmluZyBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNv ZGluZ107CisKKyAgICByZXR1cm4gW3NlbGYgbG9hZERhdGE6ZGF0YSBNSU1FVHlwZTpAInRleHQv aHRtbCIgdGV4dEVuY29kaW5nTmFtZTpAIlVURi04IiBiYXNlVVJMOmJhc2VVUkxdOworfQorCist IChXS05hdmlnYXRpb24gKilsb2FkRGF0YTooTlNEYXRhICopZGF0YSBNSU1FVHlwZTooTlNTdHJp bmcgKilNSU1FVHlwZSB0ZXh0RW5jb2RpbmdOYW1lOihOU1N0cmluZyAqKWVuY29kaW5nTmFtZSBi YXNlVVJMOihOU1VSTCAqKWJhc2VVUkwKK3sKKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQgPSBf cGFnZS0+bG9hZERhdGEoQVBJOjpEYXRhOjpjcmVhdGVXaXRob3V0Q29weWluZyhkYXRhKS5nZXQo KSwgTUlNRVR5cGUsIGVuY29kaW5nTmFtZSwgYmFzZVVSTC5hYnNvbHV0ZVN0cmluZyk7CiAgICAg aWYgKCFuYXZpZ2F0aW9uSUQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZDQ3YzEwYTQ3ZjIyNmUyMjEwMDI0NDE5 MDNjY2M3NzkwYzBmZmU1MS4uYjc4MGE0MTI4ZDQyMGFiZmU2MDdhYjBmMGMyZjZmNDA5ZTUxYzNk NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc4NCwx MCArNzg0LDE2IEBAIHVpbnQ2NF90IFdlYlBhZ2VQcm94eTo6bG9hZEZpbGUoY29uc3QgU3RyaW5n JiBmaWxlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHJlc291CiAgICAgcmV0dXJuIG5hdmlnYXRp b25JRDsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmxvYWREYXRhKEFQSTo6RGF0YSogZGF0YSwg Y29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3Ry aW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCit1aW50NjRfdCBXZWJQYWdlUHJv eHk6OmxvYWREYXRhKEFQSTo6RGF0YSogZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29u c3QgU3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCog dXNlckRhdGEpCiB7CiAgICAgaWYgKG1faXNDbG9zZWQpCi0gICAgICAgIHJldHVybjsKKyAgICAg ICAgcmV0dXJuIDA7CisKKyAgICB1aW50NjRfdCBuYXZpZ2F0aW9uSUQgPSBnZW5lcmF0ZU5hdmln YXRpb25JRCgpOworCisgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFu c2FjdGlvbigpOworCisgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJM KHRyYW5zYWN0aW9uLCAhYmFzZVVSTC5pc0VtcHR5KCkgPyBiYXNlVVJMIDogQVNDSUlMaXRlcmFs KCJhYm91dDpibGFuayIpKTsKIAogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZWF0dGFj aFRvV2ViUHJvY2VzcygpOwpAQCAtNzk1LDggKzgwMSwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 bG9hZERhdGEoQVBJOjpEYXRhKiBkYXRhLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBT dHJpbgogICAgIG1fcHJvY2Vzcy0+YXNzdW1lUmVhZEFjY2Vzc1RvQmFzZVVSTChiYXNlVVJMKTsK ICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWREYXRhKGRhdGEtPmRh dGFSZWZlcmVuY2UoKSwgTUlNRVR5cGUsIGVuY29kaW5nLCBiYXNlVVJMLCBXZWJDb250ZXh0VXNl ck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9wYWdlSUQpOwogICAgIG1f cHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOworCisgICAgcmV0dXJuIG5h dmlnYXRpb25JRDsKIH0KIAorLy8gRklYTUU6IEdldCByaWQgb2YgbG9hZEhUTUxTdHJpbmcgYW5k IGp1c3QgdXNlIGxvYWREYXRhIGluc3RlYWQuCiB1aW50NjRfdCBXZWJQYWdlUHJveHk6OmxvYWRI VE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJM LCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCiB7CiAgICAgaWYgKG1faXNDbG9zZWQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMjZmZTAyM2Y4ZmM5Y2IyYWFkNmFm ZTk2M2E1NWQwZmJlYzFlZmFhNi4uNWY4Y2ZkOGVkMGRiOTA1NGI5NGRlNDhhZjY0MTE0ODM4MWIw MDkxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzA4LDcg KzMwOCw3IEBAIHB1YmxpYzoKIAogICAgIHVpbnQ2NF90IGxvYWRSZXF1ZXN0KGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwog ICAgIHVpbnQ2NF90IGxvYWRGaWxlKGNvbnN0IFN0cmluZyYgZmlsZVVSTCwgY29uc3QgU3RyaW5n JiByZXNvdXJjZURpcmVjdG9yeVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7 Ci0gICAgdm9pZCBsb2FkRGF0YShBUEk6OkRhdGEqLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBj b25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSA9IG51bGxwdHIpOworICAgIHVpbnQ2NF90IGxvYWREYXRhKEFQSTo6RGF0YSos IGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0 cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7CiAgICAgdWlu dDY0X3QgbG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJp bmcmIGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAgIHZvaWQg bG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBT dHJpbmcmIGJhc2VVUkwsIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwsIEFQSTo6T2JqZWN0 KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAgIHZvaWQgbG9hZFBsYWluVGV4dFN0cmluZyhjb25z dCBTdHJpbmcmLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsK 241968 2014-11-20 11:58:36 -0800 2014-11-20 11:59:51 -0800 Patch bug-138929-20141120115854.patch text/plain 6139 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2Mzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjc1NmFiZjRhZWYxNjE0 Yjk2ZDQ2YTI3NzVhMjJjYjgxMTA3NWViZS4uNDRjYWM3MDBkNDMxNTlhYzBiMTFkYzRkMDk4NzMy MjgyMmM5YmNlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTExLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIC1bV0tXZWJW aWV3IGxvYWREYXRhOk1JTUVUeXBlOnRleHRFbmNvZGluZ05hbWU6YmFzZVVSTDpdCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg5MjkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzE4NjgzODAyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFsc28sIHJlLWltcGxlbWVudCAtW1dLV2ViVmlldyBsb2FkSFRN TFN0cmluZzpiYXNlVVJMOl0gaW4gdGVybXMgb2YgdGhpcyBuZXdseSBhZGRlZCBmdW5jdGlvbgor ICAgICAgICBhbmQgYXNzdW1lIGEgVVRGLTggZW5jb2RpbmcuIFRoaXMgbWF0Y2hlcyB3aGF0IExl Z2FjeSBXZWJLaXQgZG9lcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAg ICAgICgtW1dLV2ViVmlldyBsb2FkSFRNTFN0cmluZzpiYXNlVVJMOl0pOgorICAgICAgICAoLVtX S1dlYlZpZXcgbG9hZERhdGE6TUlNRVR5cGU6dGV4dEVuY29kaW5nTmFtZTpiYXNlVVJMOl0pOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OmxvYWREYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CisKIDIwMTQtMTEtMjAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4K IAogICAgICAgICBbR1RLXSBVUlRCRiBhZnRlciByMTc2MzYzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgKaW5kZXggMTlhMWNhZDU1MzZkZjE5ZTI5 ODhkMDJkZTdmYjFkYjc4YjhhMmRhNy4uMDE1ZjU5YzMyNTk0NmIzMmY1ZDQ2YTNiZjkzMWQ2MjUw YzU0ZDVlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5oCkBAIC0xMDUsNiArMTA1LDE1IEBAIFdLX0NMQVNTX0FWQUlMQUJMRSgxMF8xMCwgOF8w KQogICovCiAtIChXS05hdmlnYXRpb24gKilsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilzdHJp bmcgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMOwogCisvKiEgQGFic3RyYWN0IFNldHMgdGhlIHdl YnBhZ2UgY29udGVudHMgYW5kIGJhc2UgVVJMLgorIEBwYXJhbSBkYXRhIFRoZSBkYXRhIHRvIHVz ZSBhcyB0aGUgY29udGVudHMgb2YgdGhlIHdlYnBhZ2UuCisgQHBhcmFtIE1JTUVUeXBlIFRoZSBN SU1FIHR5cGUgb2YgdGhlIGRhdGEuCisgQHBhcmFtIGVuY29kaW5nTmFtZSBUaGUgZGF0YSdzIGNo YXJhY3RlciBlbmNvZGluZyBuYW1lLgorIEBwYXJhbSBiYXNlVVJMIEEgVVJMIHRoYXQgaXMgdXNl ZCB0byByZXNvbHZlIHJlbGF0aXZlIFVSTHMgd2l0aGluIHRoZSBkb2N1bWVudC4KKyBAcmVzdWx0 IEEgbmV3IG5hdmlnYXRpb24uCisgKi8KKy0gKFdLTmF2aWdhdGlvbiAqKWxvYWREYXRhOihOU0Rh dGEgKilkYXRhIE1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlIGNoYXJhY3RlckVuY29kaW5n TmFtZTooTlNTdHJpbmcgKiljaGFyYWN0ZXJFbmNvZGluZ05hbWUgYmFzZVVSTDooTlNVUkwgKili YXNlVVJMIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJBKTsKKwogLyohIEBhYnN0 cmFjdCBOYXZpZ2F0ZXMgdG8gYW4gaXRlbSBmcm9tIHRoZSBiYWNrLWZvcndhcmQgbGlzdCBhbmQg c2V0cyBpdAogIGFzIHRoZSBjdXJyZW50IGl0ZW0uCiAgQHBhcmFtIGl0ZW0gVGhlIGl0ZW0gdG8g d2hpY2ggdG8gbmF2aWdhdGUuIE11c3QgYmUgb25lIG9mIHRoZSBpdGVtcyBpbiB0aGUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMzA1 NDgyMTdkZWM4NjAyYTFmOTM1MGIwNjlmODdlMmQ3YzMwYmNjNy4uY2E4YzNmYzRhMmQyMmVhNTgw ZTJkYWMwMTkzNWVmZTJlZDVhMjIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTQzNCw3ICs0MzQsMTQgQEAgc3RhdGljIGludDMy X3QgZGV2aWNlT3JpZW50YXRpb24oKQogCiAtIChXS05hdmlnYXRpb24gKilsb2FkSFRNTFN0cmlu ZzooTlNTdHJpbmcgKilzdHJpbmcgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMCiB7Ci0gICAgdWlu dDY0X3QgbmF2aWdhdGlvbklEID0gX3BhZ2UtPmxvYWRIVE1MU3RyaW5nKHN0cmluZywgYmFzZVVS TC5hYnNvbHV0ZVN0cmluZyk7CisgICAgTlNEYXRhICpkYXRhID0gW3N0cmluZyBkYXRhVXNpbmdF bmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ107CisKKyAgICByZXR1cm4gW3NlbGYgbG9hZERh dGE6ZGF0YSBNSU1FVHlwZTpAInRleHQvaHRtbCIgY2hhcmFjdGVyRW5jb2RpbmdOYW1lOkAiVVRG LTgiIGJhc2VVUkw6YmFzZVVSTF07Cit9CisKKy0gKFdLTmF2aWdhdGlvbiAqKWxvYWREYXRhOihO U0RhdGEgKilkYXRhIE1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlIGNoYXJhY3RlckVuY29k aW5nTmFtZTooTlNTdHJpbmcgKiljaGFyYWN0ZXJFbmNvZGluZ05hbWUgYmFzZVVSTDooTlNVUkwg KiliYXNlVVJMCit7CisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEID0gX3BhZ2UtPmxvYWREYXRh KEFQSTo6RGF0YTo6Y3JlYXRlV2l0aG91dENvcHlpbmcoZGF0YSkuZ2V0KCksIE1JTUVUeXBlLCBj aGFyYWN0ZXJFbmNvZGluZ05hbWUsIGJhc2VVUkwuYWJzb2x1dGVTdHJpbmcpOwogICAgIGlmICgh bmF2aWdhdGlvbklEKQogICAgICAgICByZXR1cm4gbmlsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGQ0N2MxMGE0N2YyMjZlMjIxMDAyNDQxOTAzY2Nj Nzc5MGMwZmZlNTEuLmI3ODBhNDEyOGQ0MjBhYmZlNjA3YWIwZjBjMmY2ZjQwOWU1MWMzZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03ODQsMTAgKzc4 NCwxNiBAQCB1aW50NjRfdCBXZWJQYWdlUHJveHk6OmxvYWRGaWxlKGNvbnN0IFN0cmluZyYgZmls ZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiByZXNvdQogICAgIHJldHVybiBuYXZpZ2F0aW9uSUQ7 CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkRGF0YShBUEk6OkRhdGEqIGRhdGEsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYg YmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJEYXRhKQordWludDY0X3QgV2ViUGFnZVByb3h5Ojps b2FkRGF0YShBUEk6OkRhdGEqIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0 cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJE YXRhKQogewogICAgIGlmIChtX2lzQ2xvc2VkKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJl dHVybiAwOworCisgICAgdWludDY0X3QgbmF2aWdhdGlvbklEID0gZ2VuZXJhdGVOYXZpZ2F0aW9u SUQoKTsKKworICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNhY3Rp b24oKTsKKworICAgIG1fcGFnZUxvYWRTdGF0ZS5zZXRQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFu c2FjdGlvbiwgIWJhc2VVUkwuaXNFbXB0eSgpID8gYmFzZVVSTCA6IEFTQ0lJTGl0ZXJhbCgiYWJv dXQ6YmxhbmsiKSk7CiAKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmVhdHRhY2hUb1dl YlByb2Nlc3MoKTsKQEAgLTc5NSw4ICs4MDEsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRE YXRhKEFQSTo6RGF0YSogZGF0YSwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW4K ICAgICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoYmFzZVVSTCk7CiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkRGF0YShkYXRhLT5kYXRhUmVm ZXJlbmNlKCksIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgV2ViQ29udGV4dFVzZXJNZXNz YWdlRW5jb2Rlcih1c2VyRGF0YSwgcHJvY2VzcygpKSksIG1fcGFnZUlEKTsKICAgICBtX3Byb2Nl c3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKworICAgIHJldHVybiBuYXZpZ2F0 aW9uSUQ7CiB9CiAKKy8vIEZJWE1FOiBHZXQgcmlkIG9mIGxvYWRIVE1MU3RyaW5nIGFuZCBqdXN0 IHVzZSBsb2FkRGF0YSBpbnN0ZWFkLgogdWludDY0X3QgV2ViUGFnZVByb3h5Ojpsb2FkSFRNTFN0 cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJ OjpPYmplY3QqIHVzZXJEYXRhKQogewogICAgIGlmIChtX2lzQ2xvc2VkKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDI2ZmUwMjNmOGZjOWNiMmFhZDZhZmU5NjNh NTVkMGZiZWMxZWZhYTYuLjVmOGNmZDhlZDBkYjkwNTRiOTRkZTQ4YWY2NDExNDgzODFiMDA5MTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTMwOCw3ICszMDgs NyBAQCBwdWJsaWM6CiAKICAgICB1aW50NjRfdCBsb2FkUmVxdWVzdChjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKICAgICB1 aW50NjRfdCBsb2FkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVVUkwsIGNvbnN0IFN0cmluZyYgcmVz b3VyY2VEaXJlY3RvcnlVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwotICAg IHZvaWQgbG9hZERhdGEoQVBJOjpEYXRhKiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3Qg U3RyaW5nJiBlbmNvZGluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBBUEk6Ok9iamVjdCogdXNl ckRhdGEgPSBudWxscHRyKTsKKyAgICB1aW50NjRfdCBsb2FkRGF0YShBUEk6OkRhdGEqLCBjb25z dCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nLCBjb25zdCBTdHJpbmcm IGJhc2VVUkwsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSA9IG51bGxwdHIpOwogICAgIHVpbnQ2NF90 IGxvYWRIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBi YXNlVVJMLCBBUEk6Ok9iamVjdCogdXNlckRhdGEgPSBudWxscHRyKTsKICAgICB2b2lkIGxvYWRB bHRlcm5hdGVIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5n JiBiYXNlVVJMLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMLCBBUEk6Ok9iamVjdCogdXNl ckRhdGEgPSBudWxscHRyKTsKICAgICB2b2lkIGxvYWRQbGFpblRleHRTdHJpbmcoY29uc3QgU3Ry aW5nJiwgQVBJOjpPYmplY3QqIHVzZXJEYXRhID0gbnVsbHB0cik7Cg==