121899 2013-09-25 04:11:56 -0700 Optimize strings copies in srcset parser 2013-10-04 11:39:54 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 romain.perier webkit-unassigned ap benjamin commit-queue esprehn+autocc gyuyoung.kim oldest_to_newest 932924 0 romain.perier 2013-09-25 04:11:56 -0700 Images URLs are copied for each loop iteration during the parsing algorithm. This is important to avoid sharing the same buffer with "srcsetattribute" which might be removed after the attribute has been processed (outside of "bestFitSourceForImageAttributes") A good optimization would be to use shadow copies during parsing and deep copies when the selection algorithm returns the good candidate (as "srcsetAttribute" is not out of scope, this string is valid as long as the function "bestFitSourceForImageAttributes" runs) 932925 1 212551 romain.perier 2013-09-25 04:14:13 -0700 Created attachment 212551 Patch 933062 2 212551 ap 2013-09-25 10:12:14 -0700 Comment on attachment 212551 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212551&action=review I think that this is a useful thing to look into. r- for regressing src preformance though. > Source/WebCore/html/parser/HTMLParserIdioms.cpp:393 > + image.imageURL = StringImpl::createWithoutCopying(srcsetAttribute.characters() + imageURLStart, imageURLEnd - imageURLStart); I'm not really a fan of passing unsafe string across functions. Can we just record the start and length of the URL as indexes, and only create a string when needed? > Source/WebCore/html/parser/HTMLParserIdioms.cpp:425 > + return String(imageCandidates.last().imageURL.characters(), imageCandidates.last().imageURL.length()); This adds an extra copy in the common case where we have an src and no srcset. 933625 3 212732 romain.perier 2013-09-26 12:01:23 -0700 Created attachment 212732 Patch 933627 4 romain.perier 2013-09-26 12:04:15 -0700 Something like the latest patch ? This is even better, it greatly improves performances 933640 5 212732 ap 2013-09-26 12:33:13 -0700 Comment on attachment 212732 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212732&action=review Yes, this looks much better to me. A few questions/comment below: > Source/WebCore/html/parser/HTMLParserIdioms.cpp:311 > bool operator==(const ImageWithScale& image) const Is the operator== actually needed? I don't immediately see where it's used, although I could have easily overlooked that. > Source/WebCore/html/parser/HTMLParserIdioms.cpp:418 > + image.imageURLStart = 0; > + image.imageURLLength = 0; Can we add a constructor to ImageWithScale instead? > Source/WebCore/html/parser/HTMLParserIdioms.cpp:433 > + return imageCandidates.last().hasNoImage() ? srcAttribute : String(srcsetAttribute.characters() + imageCandidates.last().imageURLStart, imageCandidates.last().imageURLLength); Please use srcsetAttribute.substring() instead. That's more readable, and could help future optimizations. Also, I'd use a local variable for imageCandidates.last(). 933770 6 212732 benjamin 2013-09-26 16:08:31 -0700 Comment on attachment 212732 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=212732&action=review > Source/WebCore/html/parser/HTMLParserIdioms.cpp:303 > + size_t imageURLStart; String length are unsigned. You should have imageURLStart unsigned . > Source/WebCore/html/parser/HTMLParserIdioms.cpp:309 > + return !imageURLStart && !imageURLLength; Isn't !imageURLLength enough? The method should probably be hasImageURL() and the caller use "!hasImage()". >> Source/WebCore/html/parser/HTMLParserIdioms.cpp:433 >> - return String(imageCandidates[i].imageURL); >> + return imageCandidates[i].hasNoImage() ? srcAttribute : String(srcsetAttribute.characters() + imageCandidates[i].imageURLStart, imageCandidates[i].imageURLLength); >> } >> - return String(imageCandidates.last().imageURL); >> + return imageCandidates.last().hasNoImage() ? srcAttribute : String(srcsetAttribute.characters() + imageCandidates.last().imageURLStart, imageCandidates.last().imageURLLength); > > Please use srcsetAttribute.substring() instead. That's more readable, and could help future optimizations. > > Also, I'd use a local variable for imageCandidates.last(). substring() would be better indeed. StringImpl::substring takes into account the 8/16 bits strings. You could even use String::substringSharingImpl() here since srcsetAttribute will stay alive anyway. 933784 7 ap 2013-09-26 17:01:47 -0700 > srcsetAttribute will stay alive anyway What guaranteed this? E.g., can we have a dangling pointer for a while between changing the attribute via DOM and a style recalc? 933854 8 romain.perier 2013-09-27 00:08:36 -0700 (In reply to comment #5) > (From update of attachment 212732 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=212732&action=review > > Yes, this looks much better to me. A few questions/comment below: > > > Source/WebCore/html/parser/HTMLParserIdioms.cpp:311 > > bool operator==(const ImageWithScale& image) const > > Is the operator== actually needed? I don't immediately see where it's used, although I could have easily overlooked that. Not sure, it was probably used for sorting ... but we use a "comp" function for this... not really clear. Removing it does not introduce regressions. Good catch. > > > Source/WebCore/html/parser/HTMLParserIdioms.cpp:418 > > + image.imageURLStart = 0; > > + image.imageURLLength = 0; > > Can we add a constructor to ImageWithScale instead? sure, it's more readable and probably faster > > > Source/WebCore/html/parser/HTMLParserIdioms.cpp:433 > > + return imageCandidates.last().hasNoImage() ? srcAttribute : String(srcsetAttribute.characters() + imageCandidates.last().imageURLStart, imageCandidates.last().imageURLLength); > > Please use srcsetAttribute.substring() instead. That's more readable, and could help future optimizations. OK, makes sense > > Also, I'd use a local variable for imageCandidates.last(). OK 934092 9 benjamin 2013-09-27 14:35:31 -0700 (In reply to comment #7) > > srcsetAttribute will stay alive anyway > > What guaranteed this? E.g., can we have a dangling pointer for a while between changing the attribute via DOM and a style recalc? Even if you were to unref srcsetAttribute, substringSharingImpl ref() the original string, you will not get a dangling pointer. 936185 10 213362 romain.perier 2013-10-04 07:08:31 -0700 Created attachment 213362 Patch 936220 11 213362 ap 2013-10-04 09:51:36 -0700 Comment on attachment 213362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213362&action=review > Source/WebCore/html/parser/HTMLParserIdioms.cpp:306 > + ImageWithScale() : imageURLStart(0), imageURLLength(0), scaleFactor(1.0) { } I think that the preferred style would be the same as in non-inline case, with each initializer and each brace on its own line. And we don't add .0 to literal values. Especially in this case, because 1.0 is a double, but scaleFactor is a float. ImageWithScale() : imageURLStart(0) , imageURLLength(0) , scaleFactor(1) { } > Source/WebCore/html/parser/HTMLParserIdioms.cpp:414 > ImageWithScale image; > - image.imageURL = srcAttribute; > - image.scaleFactor = 1.0; > - > imageCandidates.append(image); This is getting somewhat convoluted. Please rename "image" to "srcPlaceholderImage" for a little more clarity. > Source/WebCore/html/parser/HTMLParserIdioms.cpp:426 > + const ImageWithScale &lastCandidate = imageCandidates.last(); The "&" should be attached to type name, const ImageWithScale& lastCandidate = imageCandidates.last(); 936266 12 213380 romain.perier 2013-10-04 11:25:13 -0700 Created attachment 213380 Patch 936268 13 romain.perier 2013-10-04 11:26:12 -0700 Everything has been fixed 936273 14 213380 ap 2013-10-04 11:31:21 -0700 Comment on attachment 213380 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213380&action=review I'll just land with a style fix manually, the iterations for minor style fixes are getting annoying. > Source/WebCore/html/parser/HTMLParserIdioms.cpp:312 > + { > + } These should not be indented (were not in the snippet I posted). 936285 15 ap 2013-10-04 11:39:54 -0700 Committed <http://trac.webkit.org/r156902>. 212551 2013-09-25 04:14:13 -0700 2013-09-26 12:01:13 -0700 Patch bug-121899-20130925131412.patch text/plain 2480 romain.perier U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE3NDQwYjg2YjY1Yjdk NDdhYTc1YjcyMGZhNWFkZTllYTEwZjk5OS4uYTZlYTU1ZjMxYWE3ZjJjYmU3MjVhMzgyZDFlMGIx MTYwYmU0Nzg2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA5LTI1ICBSb21h aW4gUGVyaWVyICA8cm9tYWluLnBlcmllckBnbWFpbC5jb20+CisKKyAgICAgICAgT3B0aW1pemUg c3RyaW5ncyBjb3BpZXMgaW4gc3Jjc2V0IHBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxODk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5n IG9uZXMuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZSk6 IERvbid0IGNvcHkKKyAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgYXQgZWFjaCBsb29wIGl0ZXJhdGlv biwgdXNlIHNoYWRvdyBjb3BpZXMgaW5zdGVhZC4KKyAgICAgICAgKFdlYkNvcmU6OmJlc3RGaXRT b3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMpOiBNYWtlIGEgZGVlcCBjb3B5CisgICAgICAgIG9mIHRo ZSBVUkxzIG9ubHkgd2hlbiB0aGUgY29ycmVzcG9uZGluZyBjYW5kaWRhdGUgaXMgY2hvb3Nlbgor ICAgICAgICBieSB0aGUgc2VsZWN0aW9uIGFsZ29yaXRobS4gSXQgcmVkdWNlcyB0aGUgbnVtYmVy IG9mIGNvcGllcworICAgICAgICBzaWduaWZpY2FudGx5IGFuZCBpbXByb3ZlcyBwZXJmb3JtYW5j ZXMgKH40JSkuCisKIDIwMTMtMDktMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFVzZSB1bmlxdWVfcHRyIGluc3RlYWQgb2YgZGVsZXRlQWxsVmFsdWVzIGluIEZs b2F0aW5nT2JqZWN0IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L0hUTUxQYXJzZXJJZGlvbXMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBh cnNlcklkaW9tcy5jcHAKaW5kZXggYTdjYjcyZTJmYjk3ZDZiNTYyMTYwYjQxYzFkZDJlODk4NDc2 ZGQ1ZC4uYmM2ODU0Mzc0NDk5MjAyZWU0N2IyZDY1OTdhYzkxMzM4Zjk5MmEwMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlcklkaW9tcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlcklkaW9tcy5jcHAKQEAgLTM5MCw3 ICszOTAsNyBAQCBzdGF0aWMgdm9pZCBwYXJzZUltYWdlc1dpdGhTY2FsZUZyb21TcmNzZXRBdHRy aWJ1dGUoY29uc3QgU3RyaW5nJiBzcmNzZXRBdHRyaWJ1dAogICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgICAgIEltYWdlV2l0aFNjYWxlIGltYWdlOwotICAgICAgICBpbWFnZS5pbWFnZVVS TCA9IFN0cmluZyhzcmNzZXRBdHRyaWJ1dGUuY2hhcmFjdGVycygpICsgaW1hZ2VVUkxTdGFydCwg aW1hZ2VVUkxFbmQgLSBpbWFnZVVSTFN0YXJ0KTsKKyAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgPSBT dHJpbmdJbXBsOjpjcmVhdGVXaXRob3V0Q29weWluZyhzcmNzZXRBdHRyaWJ1dGUuY2hhcmFjdGVy cygpICsgaW1hZ2VVUkxTdGFydCwgaW1hZ2VVUkxFbmQgLSBpbWFnZVVSTFN0YXJ0KTsKICAgICAg ICAgaW1hZ2Uuc2NhbGVGYWN0b3IgPSBpbWFnZVNjYWxlRmFjdG9yOwogCiAgICAgICAgIGltYWdl Q2FuZGlkYXRlcy5hcHBlbmQoaW1hZ2UpOwpAQCAtNDIwLDkgKzQyMCw5IEBAIFN0cmluZyBiZXN0 Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25z dCBTdHJpbmcmIHNyCiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGltYWdlQ2FuZGlkYXRl cy5zaXplKCkgLSAxOyArK2kpIHsKICAgICAgICAgaWYgKGltYWdlQ2FuZGlkYXRlc1tpXS5zY2Fs ZUZhY3RvciA+PSBkZXZpY2VTY2FsZUZhY3RvcikKLSAgICAgICAgICAgIHJldHVybiBTdHJpbmco aW1hZ2VDYW5kaWRhdGVzW2ldLmltYWdlVVJMKTsKKyAgICAgICAgICAgIHJldHVybiBTdHJpbmco aW1hZ2VDYW5kaWRhdGVzW2ldLmltYWdlVVJMLmNoYXJhY3RlcnMoKSwgaW1hZ2VDYW5kaWRhdGVz W2ldLmltYWdlVVJMLmxlbmd0aCgpKTsKICAgICB9Ci0gICAgcmV0dXJuIFN0cmluZyhpbWFnZUNh bmRpZGF0ZXMubGFzdCgpLmltYWdlVVJMKTsKKyAgICByZXR1cm4gU3RyaW5nKGltYWdlQ2FuZGlk YXRlcy5sYXN0KCkuaW1hZ2VVUkwuY2hhcmFjdGVycygpLCBpbWFnZUNhbmRpZGF0ZXMubGFzdCgp LmltYWdlVVJMLmxlbmd0aCgpKTsKIH0KIAogfQo= 212732 2013-09-26 12:01:23 -0700 2013-10-04 07:08:22 -0700 Patch bug-121899-20130926210121.patch text/plain 3648 romain.perier U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE3NDQwYjg2YjY1Yjdk NDdhYTc1YjcyMGZhNWFkZTllYTEwZjk5OS4uZmNmNjdkM2JlYTBhMDUzOTY5MGRlOGU1N2JiZmU2 ODM0NzU3ZmVjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA5LTI1ICBSb21h aW4gUGVyaWVyICA8cm9tYWluLnBlcmllckBnbWFpbC5jb20+CisKKyAgICAgICAgT3B0aW1pemUg c3RyaW5ncyBjb3BpZXMgaW4gc3Jjc2V0IHBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxODk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5n IG9uZXMuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZSk6 IERvbid0IGNvcHkKKyAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgYXQgZWFjaCBsb29wIGl0ZXJhdGlv biwgcmVjb3JkIGluZGV4ZXMgInN0YXJ0IiBhbmQgImxlbmd0aCIgaW5zdGVhZC4KKyAgICAgICAg KFdlYkNvcmU6OmJlc3RGaXRTb3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMpOiBNYWtlIGEgZGVlcCBj b3B5CisgICAgICAgIG9mIHRoZSBVUkxzIG9ubHkgd2hlbiB0aGUgY29ycmVzcG9uZGluZyBjYW5k aWRhdGUgaXMgY2hvb3NlbgorICAgICAgICBieSB0aGUgc2VsZWN0aW9uIGFsZ29yaXRobS4gSXQg cmVkdWNlcyB0aGUgbnVtYmVyIG9mIGNvcGllcworICAgICAgICBzaWduaWZpY2FudGx5IGFuZCBn cmVhdGx5IGltcHJvdmVzIHBlcmZvcm1hbmNlcyAofjY5JSkuCisKIDIwMTMtMDktMjMgIERhcmlu IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSB1bmlxdWVfcHRyIGluc3Rl YWQgb2YgZGVsZXRlQWxsVmFsdWVzIGluIEZsb2F0aW5nT2JqZWN0IGNvZGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJJZGlvbXMuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlcklkaW9tcy5jcHAKaW5kZXggYTdjYjcyZTJm Yjk3ZDZiNTYyMTYwYjQxYzFkZDJlODk4NDc2ZGQ1ZC4uYmVlZTI4NTU4NzA1YjA0YjM0N2MwNjM0 ZmRiNGRlZmMwNTgwNGMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIv SFRNTFBhcnNlcklkaW9tcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TFBhcnNlcklkaW9tcy5jcHAKQEAgLTMwMCwxMSArMzAwLDE3IEBAIGJvb2wgdGhyZWFkU2FmZU1h dGNoKGNvbnN0IEhUTUxJZGVudGlmaWVyJiBsb2NhbE5hbWUsIGNvbnN0IFF1YWxpZmllZE5hbWUm IHFOYW1lCiAjZW5kaWYKIAogc3RydWN0IEltYWdlV2l0aFNjYWxlIHsKLSAgICBTdHJpbmcgaW1h Z2VVUkw7CisgICAgc2l6ZV90IGltYWdlVVJMU3RhcnQ7CisgICAgdW5zaWduZWQgaW1hZ2VVUkxM ZW5ndGg7CiAgICAgZmxvYXQgc2NhbGVGYWN0b3I7CisKKyAgICBib29sIGhhc05vSW1hZ2UoKSBj b25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuICFpbWFnZVVSTFN0YXJ0ICYmICFpbWFnZVVSTExl bmd0aDsKKyAgICB9CiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEltYWdlV2l0aFNjYWxlJiBp bWFnZSkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBzY2FsZUZhY3RvciA9PSBpbWFnZS5z Y2FsZUZhY3RvciAmJiBpbWFnZVVSTCA9PSBpbWFnZS5pbWFnZVVSTDsKKyAgICAgICAgcmV0dXJu IHNjYWxlRmFjdG9yID09IGltYWdlLnNjYWxlRmFjdG9yICYmIGltYWdlVVJMU3RhcnQgPT0gaW1h Z2UuaW1hZ2VVUkxTdGFydCAmJiBpbWFnZVVSTExlbmd0aCA9PSBpbWFnZS5pbWFnZVVSTExlbmd0 aDsKICAgICB9CiB9OwogdHlwZWRlZiBWZWN0b3I8SW1hZ2VXaXRoU2NhbGU+IEltYWdlQ2FuZGlk YXRlczsKQEAgLTM5MCw3ICszOTYsOCBAQCBzdGF0aWMgdm9pZCBwYXJzZUltYWdlc1dpdGhTY2Fs ZUZyb21TcmNzZXRBdHRyaWJ1dGUoY29uc3QgU3RyaW5nJiBzcmNzZXRBdHRyaWJ1dAogICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgICAgIEltYWdlV2l0aFNjYWxlIGltYWdlOwotICAgICAg ICBpbWFnZS5pbWFnZVVSTCA9IFN0cmluZyhzcmNzZXRBdHRyaWJ1dGUuY2hhcmFjdGVycygpICsg aW1hZ2VVUkxTdGFydCwgaW1hZ2VVUkxFbmQgLSBpbWFnZVVSTFN0YXJ0KTsKKyAgICAgICAgaW1h Z2UuaW1hZ2VVUkxTdGFydCA9IGltYWdlVVJMU3RhcnQ7CisgICAgICAgIGltYWdlLmltYWdlVVJM TGVuZ3RoID0gaW1hZ2VVUkxFbmQgLSBpbWFnZVVSTFN0YXJ0OwogICAgICAgICBpbWFnZS5zY2Fs ZUZhY3RvciA9IGltYWdlU2NhbGVGYWN0b3I7CiAKICAgICAgICAgaW1hZ2VDYW5kaWRhdGVzLmFw cGVuZChpbWFnZSk7CkBAIC00MDcsNyArNDE0LDggQEAgU3RyaW5nIGJlc3RGaXRTb3VyY2VGb3JJ bWFnZUF0dHJpYnV0ZXMoZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IsIGNvbnN0IFN0cmluZyYgc3IK IAogICAgIGlmICghc3JjQXR0cmlidXRlLmlzRW1wdHkoKSkgewogICAgICAgICBJbWFnZVdpdGhT Y2FsZSBpbWFnZTsKLSAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgPSBzcmNBdHRyaWJ1dGU7CisgICAg ICAgIGltYWdlLmltYWdlVVJMU3RhcnQgPSAwOworICAgICAgICBpbWFnZS5pbWFnZVVSTExlbmd0 aCA9IDA7CiAgICAgICAgIGltYWdlLnNjYWxlRmFjdG9yID0gMS4wOwogCiAgICAgICAgIGltYWdl Q2FuZGlkYXRlcy5hcHBlbmQoaW1hZ2UpOwpAQCAtNDIwLDkgKzQyOCw5IEBAIFN0cmluZyBiZXN0 Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25z dCBTdHJpbmcmIHNyCiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGltYWdlQ2FuZGlkYXRl cy5zaXplKCkgLSAxOyArK2kpIHsKICAgICAgICAgaWYgKGltYWdlQ2FuZGlkYXRlc1tpXS5zY2Fs ZUZhY3RvciA+PSBkZXZpY2VTY2FsZUZhY3RvcikKLSAgICAgICAgICAgIHJldHVybiBTdHJpbmco aW1hZ2VDYW5kaWRhdGVzW2ldLmltYWdlVVJMKTsKKyAgICAgICAgICAgIHJldHVybiBpbWFnZUNh bmRpZGF0ZXNbaV0uaGFzTm9JbWFnZSgpID8gc3JjQXR0cmlidXRlIDogU3RyaW5nKHNyY3NldEF0 dHJpYnV0ZS5jaGFyYWN0ZXJzKCkgKyBpbWFnZUNhbmRpZGF0ZXNbaV0uaW1hZ2VVUkxTdGFydCwg aW1hZ2VDYW5kaWRhdGVzW2ldLmltYWdlVVJMTGVuZ3RoKTsKICAgICB9Ci0gICAgcmV0dXJuIFN0 cmluZyhpbWFnZUNhbmRpZGF0ZXMubGFzdCgpLmltYWdlVVJMKTsKKyAgICByZXR1cm4gaW1hZ2VD YW5kaWRhdGVzLmxhc3QoKS5oYXNOb0ltYWdlKCkgPyBzcmNBdHRyaWJ1dGUgOiBTdHJpbmcoc3Jj c2V0QXR0cmlidXRlLmNoYXJhY3RlcnMoKSArIGltYWdlQ2FuZGlkYXRlcy5sYXN0KCkuaW1hZ2VV UkxTdGFydCwgaW1hZ2VDYW5kaWRhdGVzLmxhc3QoKS5pbWFnZVVSTExlbmd0aCk7CiB9CiAKIH0K 213362 2013-10-04 07:08:31 -0700 2013-10-04 11:25:05 -0700 Patch bug-121899-20131004160829.patch text/plain 3589 romain.perier U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE3NDQwYjg2YjY1Yjdk NDdhYTc1YjcyMGZhNWFkZTllYTEwZjk5OS4uYjg0MTE4Mjc4MzA5MTRkMmU2YmE2MmUwOWJlNmFm ZTY0NTdlNDQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA5LTI1ICBSb21h aW4gUGVyaWVyICA8cm9tYWluLnBlcmllckBnbWFpbC5jb20+CisKKyAgICAgICAgT3B0aW1pemUg c3RyaW5ncyBjb3BpZXMgaW4gc3Jjc2V0IHBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxODk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5n IG9uZXMuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZSk6 IERvbid0IGNvcHkKKyAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgYXQgZWFjaCBsb29wIGl0ZXJhdGlv biwgc2F2ZSBpbmRleGVzIGluc3RlYWQuCisgICAgICAgIChXZWJDb3JlOjpiZXN0Rml0U291cmNl Rm9ySW1hZ2VBdHRyaWJ1dGVzKTogTWFrZSBhIGRlZXAgY29weQorICAgICAgICBvZiB0aGUgVVJM cyBvbmx5IHdoZW4gdGhlIGNvcnJlc3BvbmRpbmcgY2FuZGlkYXRlIGlzIGNob29zZW4KKyAgICAg ICAgYnkgdGhlIHNlbGVjdGlvbiBhbGdvcml0aG0uIEl0IHJlZHVjZXMgdGhlIG51bWJlciBvZiBj b3BpZXMKKyAgICAgICAgc2lnbmlmaWNhbnRseSBhbmQgaW1wcm92ZXMgcGVyZm9ybWFuY2VzCisg ICAgICAgIChhcm91bmQgMzAlIHdpdGggdGhlICJSZWxlYXNlIiBwcm9maWxlIGFuZCA2MCUgd2l0 aCB0aGUgIkRlYnVnIiBvbmUpLgorCiAyMDEzLTA5LTIzICBEYXJpbiBBZGxlciAgPGRhcmluQGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgdW5pcXVlX3B0ciBpbnN0ZWFkIG9mIGRlbGV0ZUFsbFZh bHVlcyBpbiBGbG9hdGluZ09iamVjdCBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxQYXJzZXJJZGlvbXMuY3BwCmluZGV4IGE3Y2I3MmUyZmI5N2Q2YjU2MjE2MGI0MWMx ZGQyZTg5ODQ3NmRkNWQuLjQyMzg0MWUzODE0YTkwYjZkMWQxZjZkNGFkZjQ2MjFmNTFmNTcwMjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJJZGlvbXMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJJZGlvbXMuY3Bw CkBAIC0zMDAsMTEgKzMwMCwxNCBAQCBib29sIHRocmVhZFNhZmVNYXRjaChjb25zdCBIVE1MSWRl bnRpZmllciYgbG9jYWxOYW1lLCBjb25zdCBRdWFsaWZpZWROYW1lJiBxTmFtZQogI2VuZGlmCiAK IHN0cnVjdCBJbWFnZVdpdGhTY2FsZSB7Ci0gICAgU3RyaW5nIGltYWdlVVJMOworICAgIHVuc2ln bmVkIGltYWdlVVJMU3RhcnQ7CisgICAgdW5zaWduZWQgaW1hZ2VVUkxMZW5ndGg7CiAgICAgZmxv YXQgc2NhbGVGYWN0b3I7Ci0gICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEltYWdlV2l0aFNjYWxl JiBpbWFnZSkgY29uc3QKKyAgICBJbWFnZVdpdGhTY2FsZSgpIDogaW1hZ2VVUkxTdGFydCgwKSwg aW1hZ2VVUkxMZW5ndGgoMCksIHNjYWxlRmFjdG9yKDEuMCkgeyB9CisKKyAgICBib29sIGhhc0lt YWdlVVJMKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBzY2FsZUZhY3RvciA9PSBpbWFn ZS5zY2FsZUZhY3RvciAmJiBpbWFnZVVSTCA9PSBpbWFnZS5pbWFnZVVSTDsKKyAgICAgICAgcmV0 dXJuIGltYWdlVVJMTGVuZ3RoOwogICAgIH0KIH07CiB0eXBlZGVmIFZlY3RvcjxJbWFnZVdpdGhT Y2FsZT4gSW1hZ2VDYW5kaWRhdGVzOwpAQCAtMzkwLDcgKzM5Myw4IEBAIHN0YXRpYyB2b2lkIHBh cnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZShjb25zdCBTdHJpbmcmIHNyY3Nl dEF0dHJpYnV0CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgSW1hZ2VXaXRoU2Nh bGUgaW1hZ2U7Ci0gICAgICAgIGltYWdlLmltYWdlVVJMID0gU3RyaW5nKHNyY3NldEF0dHJpYnV0 ZS5jaGFyYWN0ZXJzKCkgKyBpbWFnZVVSTFN0YXJ0LCBpbWFnZVVSTEVuZCAtIGltYWdlVVJMU3Rh cnQpOworICAgICAgICBpbWFnZS5pbWFnZVVSTFN0YXJ0ID0gaW1hZ2VVUkxTdGFydDsKKyAgICAg ICAgaW1hZ2UuaW1hZ2VVUkxMZW5ndGggPSBpbWFnZVVSTEVuZCAtIGltYWdlVVJMU3RhcnQ7CiAg ICAgICAgIGltYWdlLnNjYWxlRmFjdG9yID0gaW1hZ2VTY2FsZUZhY3RvcjsKIAogICAgICAgICBp bWFnZUNhbmRpZGF0ZXMuYXBwZW5kKGltYWdlKTsKQEAgLTQwNyw5ICs0MTEsNiBAQCBTdHJpbmcg YmVzdEZpdFNvdXJjZUZvckltYWdlQXR0cmlidXRlcyhmbG9hdCBkZXZpY2VTY2FsZUZhY3Rvciwg Y29uc3QgU3RyaW5nJiBzcgogCiAgICAgaWYgKCFzcmNBdHRyaWJ1dGUuaXNFbXB0eSgpKSB7CiAg ICAgICAgIEltYWdlV2l0aFNjYWxlIGltYWdlOwotICAgICAgICBpbWFnZS5pbWFnZVVSTCA9IHNy Y0F0dHJpYnV0ZTsKLSAgICAgICAgaW1hZ2Uuc2NhbGVGYWN0b3IgPSAxLjA7Ci0KICAgICAgICAg aW1hZ2VDYW5kaWRhdGVzLmFwcGVuZChpbWFnZSk7CiAgICAgfQogCkBAIC00MjAsOSArNDIxLDEw IEBAIFN0cmluZyBiZXN0Rml0U291cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmljZVNj YWxlRmFjdG9yLCBjb25zdCBTdHJpbmcmIHNyCiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IGltYWdlQ2FuZGlkYXRlcy5zaXplKCkgLSAxOyArK2kpIHsKICAgICAgICAgaWYgKGltYWdlQ2Fu ZGlkYXRlc1tpXS5zY2FsZUZhY3RvciA+PSBkZXZpY2VTY2FsZUZhY3RvcikKLSAgICAgICAgICAg IHJldHVybiBTdHJpbmcoaW1hZ2VDYW5kaWRhdGVzW2ldLmltYWdlVVJMKTsKKyAgICAgICAgICAg IHJldHVybiBpbWFnZUNhbmRpZGF0ZXNbaV0uaGFzSW1hZ2VVUkwoKSA/IHNyY3NldEF0dHJpYnV0 ZS5zdWJzdHJpbmdTaGFyaW5nSW1wbChpbWFnZUNhbmRpZGF0ZXNbaV0uaW1hZ2VVUkxTdGFydCwg aW1hZ2VDYW5kaWRhdGVzW2ldLmltYWdlVVJMTGVuZ3RoKSA6IHNyY0F0dHJpYnV0ZTsKICAgICB9 Ci0gICAgcmV0dXJuIFN0cmluZyhpbWFnZUNhbmRpZGF0ZXMubGFzdCgpLmltYWdlVVJMKTsKKyAg ICBjb25zdCBJbWFnZVdpdGhTY2FsZSAmbGFzdENhbmRpZGF0ZSA9IGltYWdlQ2FuZGlkYXRlcy5s YXN0KCk7CisgICAgcmV0dXJuIGxhc3RDYW5kaWRhdGUuaGFzSW1hZ2VVUkwoKSA/IHNyY3NldEF0 dHJpYnV0ZS5zdWJzdHJpbmdTaGFyaW5nSW1wbChsYXN0Q2FuZGlkYXRlLmltYWdlVVJMU3RhcnQs IGxhc3RDYW5kaWRhdGUuaW1hZ2VVUkxMZW5ndGgpIDogc3JjQXR0cmlidXRlOwogfQogCiB9Cg== 213380 2013-10-04 11:25:13 -0700 2013-10-04 11:31:21 -0700 Patch bug-121899-20131004202511.patch text/plain 3853 romain.perier U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE3NDQwYjg2YjY1Yjdk NDdhYTc1YjcyMGZhNWFkZTllYTEwZjk5OS4uYjg0MTE4Mjc4MzA5MTRkMmU2YmE2MmUwOWJlNmFm ZTY0NTdlNDQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA5LTI1ICBSb21h aW4gUGVyaWVyICA8cm9tYWluLnBlcmllckBnbWFpbC5jb20+CisKKyAgICAgICAgT3B0aW1pemUg c3RyaW5ncyBjb3BpZXMgaW4gc3Jjc2V0IHBhcnNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxODk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBjb3ZlcmVkIGJ5IGV4aXN0aW5n IG9uZXMuCisKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnBhcnNlSW1hZ2VzV2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZSk6 IERvbid0IGNvcHkKKyAgICAgICAgaW1hZ2UuaW1hZ2VVUkwgYXQgZWFjaCBsb29wIGl0ZXJhdGlv biwgc2F2ZSBpbmRleGVzIGluc3RlYWQuCisgICAgICAgIChXZWJDb3JlOjpiZXN0Rml0U291cmNl Rm9ySW1hZ2VBdHRyaWJ1dGVzKTogTWFrZSBhIGRlZXAgY29weQorICAgICAgICBvZiB0aGUgVVJM cyBvbmx5IHdoZW4gdGhlIGNvcnJlc3BvbmRpbmcgY2FuZGlkYXRlIGlzIGNob29zZW4KKyAgICAg ICAgYnkgdGhlIHNlbGVjdGlvbiBhbGdvcml0aG0uIEl0IHJlZHVjZXMgdGhlIG51bWJlciBvZiBj b3BpZXMKKyAgICAgICAgc2lnbmlmaWNhbnRseSBhbmQgaW1wcm92ZXMgcGVyZm9ybWFuY2VzCisg ICAgICAgIChhcm91bmQgMzAlIHdpdGggdGhlICJSZWxlYXNlIiBwcm9maWxlIGFuZCA2MCUgd2l0 aCB0aGUgIkRlYnVnIiBvbmUpLgorCiAyMDEzLTA5LTIzICBEYXJpbiBBZGxlciAgPGRhcmluQGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgdW5pcXVlX3B0ciBpbnN0ZWFkIG9mIGRlbGV0ZUFsbFZh bHVlcyBpbiBGbG9hdGluZ09iamVjdCBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxQYXJzZXJJZGlvbXMuY3BwCmluZGV4IGE3Y2I3MmUyZmI5N2Q2YjU2MjE2MGI0MWMx ZGQyZTg5ODQ3NmRkNWQuLjFjM2FjZGQxMjUyZDY5MTY3ZThlMzJlZmUzNzc1OTIxYmQ3MmQ5OTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJJZGlvbXMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJJZGlvbXMuY3Bw CkBAIC0zMDAsMTEgKzMwMCwyMCBAQCBib29sIHRocmVhZFNhZmVNYXRjaChjb25zdCBIVE1MSWRl bnRpZmllciYgbG9jYWxOYW1lLCBjb25zdCBRdWFsaWZpZWROYW1lJiBxTmFtZQogI2VuZGlmCiAK IHN0cnVjdCBJbWFnZVdpdGhTY2FsZSB7Ci0gICAgU3RyaW5nIGltYWdlVVJMOworICAgIHVuc2ln bmVkIGltYWdlVVJMU3RhcnQ7CisgICAgdW5zaWduZWQgaW1hZ2VVUkxMZW5ndGg7CiAgICAgZmxv YXQgc2NhbGVGYWN0b3I7Ci0gICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEltYWdlV2l0aFNjYWxl JiBpbWFnZSkgY29uc3QKKworICAgIEltYWdlV2l0aFNjYWxlKCkKKyAgICAgICAgOiBpbWFnZVVS TFN0YXJ0KDApCisgICAgICAgICwgaW1hZ2VVUkxMZW5ndGgoMCkKKyAgICAgICAgLCBzY2FsZUZh Y3RvcigxKQorICAgICAgICB7IAorICAgICAgICB9CisKKyAgICBib29sIGhhc0ltYWdlVVJMKCkg Y29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBzY2FsZUZhY3RvciA9PSBpbWFnZS5zY2FsZUZh Y3RvciAmJiBpbWFnZVVSTCA9PSBpbWFnZS5pbWFnZVVSTDsKKyAgICAgICAgcmV0dXJuIGltYWdl VVJMTGVuZ3RoOwogICAgIH0KIH07CiB0eXBlZGVmIFZlY3RvcjxJbWFnZVdpdGhTY2FsZT4gSW1h Z2VDYW5kaWRhdGVzOwpAQCAtMzkwLDcgKzM5OSw4IEBAIHN0YXRpYyB2b2lkIHBhcnNlSW1hZ2Vz V2l0aFNjYWxlRnJvbVNyY3NldEF0dHJpYnV0ZShjb25zdCBTdHJpbmcmIHNyY3NldEF0dHJpYnV0 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgSW1hZ2VXaXRoU2NhbGUgaW1hZ2U7 Ci0gICAgICAgIGltYWdlLmltYWdlVVJMID0gU3RyaW5nKHNyY3NldEF0dHJpYnV0ZS5jaGFyYWN0 ZXJzKCkgKyBpbWFnZVVSTFN0YXJ0LCBpbWFnZVVSTEVuZCAtIGltYWdlVVJMU3RhcnQpOworICAg ICAgICBpbWFnZS5pbWFnZVVSTFN0YXJ0ID0gaW1hZ2VVUkxTdGFydDsKKyAgICAgICAgaW1hZ2Uu aW1hZ2VVUkxMZW5ndGggPSBpbWFnZVVSTEVuZCAtIGltYWdlVVJMU3RhcnQ7CiAgICAgICAgIGlt YWdlLnNjYWxlRmFjdG9yID0gaW1hZ2VTY2FsZUZhY3RvcjsKIAogICAgICAgICBpbWFnZUNhbmRp ZGF0ZXMuYXBwZW5kKGltYWdlKTsKQEAgLTQwNiwxMSArNDE2LDggQEAgU3RyaW5nIGJlc3RGaXRT b3VyY2VGb3JJbWFnZUF0dHJpYnV0ZXMoZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IsIGNvbnN0IFN0 cmluZyYgc3IKICAgICBwYXJzZUltYWdlc1dpdGhTY2FsZUZyb21TcmNzZXRBdHRyaWJ1dGUoc3Jj c2V0QXR0cmlidXRlLCBpbWFnZUNhbmRpZGF0ZXMpOwogCiAgICAgaWYgKCFzcmNBdHRyaWJ1dGUu aXNFbXB0eSgpKSB7Ci0gICAgICAgIEltYWdlV2l0aFNjYWxlIGltYWdlOwotICAgICAgICBpbWFn ZS5pbWFnZVVSTCA9IHNyY0F0dHJpYnV0ZTsKLSAgICAgICAgaW1hZ2Uuc2NhbGVGYWN0b3IgPSAx LjA7Ci0KLSAgICAgICAgaW1hZ2VDYW5kaWRhdGVzLmFwcGVuZChpbWFnZSk7CisgICAgICAgIElt YWdlV2l0aFNjYWxlIHNyY1BsYWNlaG9sZGVySW1hZ2U7CisgICAgICAgIGltYWdlQ2FuZGlkYXRl cy5hcHBlbmQoc3JjUGxhY2Vob2xkZXJJbWFnZSk7CiAgICAgfQogCiAgICAgaWYgKGltYWdlQ2Fu ZGlkYXRlcy5pc0VtcHR5KCkpCkBAIC00MjAsOSArNDI3LDEwIEBAIFN0cmluZyBiZXN0Rml0U291 cmNlRm9ySW1hZ2VBdHRyaWJ1dGVzKGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25zdCBTdHJp bmcmIHNyCiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGltYWdlQ2FuZGlkYXRlcy5zaXpl KCkgLSAxOyArK2kpIHsKICAgICAgICAgaWYgKGltYWdlQ2FuZGlkYXRlc1tpXS5zY2FsZUZhY3Rv ciA+PSBkZXZpY2VTY2FsZUZhY3RvcikKLSAgICAgICAgICAgIHJldHVybiBTdHJpbmcoaW1hZ2VD YW5kaWRhdGVzW2ldLmltYWdlVVJMKTsKKyAgICAgICAgICAgIHJldHVybiBpbWFnZUNhbmRpZGF0 ZXNbaV0uaGFzSW1hZ2VVUkwoKSA/IHNyY3NldEF0dHJpYnV0ZS5zdWJzdHJpbmdTaGFyaW5nSW1w bChpbWFnZUNhbmRpZGF0ZXNbaV0uaW1hZ2VVUkxTdGFydCwgaW1hZ2VDYW5kaWRhdGVzW2ldLmlt YWdlVVJMTGVuZ3RoKSA6IHNyY0F0dHJpYnV0ZTsKICAgICB9Ci0gICAgcmV0dXJuIFN0cmluZyhp bWFnZUNhbmRpZGF0ZXMubGFzdCgpLmltYWdlVVJMKTsKKyAgICBjb25zdCBJbWFnZVdpdGhTY2Fs ZSYgbGFzdENhbmRpZGF0ZSA9IGltYWdlQ2FuZGlkYXRlcy5sYXN0KCk7CisgICAgcmV0dXJuIGxh c3RDYW5kaWRhdGUuaGFzSW1hZ2VVUkwoKSA/IHNyY3NldEF0dHJpYnV0ZS5zdWJzdHJpbmdTaGFy aW5nSW1wbChsYXN0Q2FuZGlkYXRlLmltYWdlVVJMU3RhcnQsIGxhc3RDYW5kaWRhdGUuaW1hZ2VV UkxMZW5ndGgpIDogc3JjQXR0cmlidXRlOwogfQogCiB9Cg==