69376 2011-10-04 14:15:27 -0700 Web Inspector: add CSS model classes to the compilation. 2011-10-05 03:12:06 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 477934 0 pfeldman 2011-10-04 14:15:27 -0700 Patch to follow. 477940 1 109686 pfeldman 2011-10-04 14:17:49 -0700 Created attachment 109686 Patch 477945 2 109686 joepeck 2011-10-04 14:21:31 -0700 Comment on attachment 109686 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109686&action=review > Source/WebCore/inspector/front-end/CSSStyleModel.js:742 > + * @tyle {WebInspector.CSSStyleModel} @tyle I think is a typo for @type This compiler has caught some really crafty JS issues. Its looking like a pretty cool static analyzer. 477957 3 109691 pfeldman 2011-10-04 14:26:09 -0700 Created attachment 109691 [Patch] Review comment addressed. 478254 4 pfeldman 2011-10-05 03:12:06 -0700 Committed r96689: <http://trac.webkit.org/changeset/96689> 109686 2011-10-04 14:17:49 -0700 2011-10-04 14:26:01 -0700 Patch bug-69376-20111005011747.patch text/plain 13383 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY2MzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYjNmZTYwNDcxNjViZjQ2 MjU1ODU0N2ZjYjAyYTA2ZWNjNjAxMzJiLi4yYmYxM2M3NmU0NTA3MmE1YjAxZDk5ZmEwNjYxZjhj Nzc5MDU3ZDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMTAtMDQgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogYWRkIENTUyBtb2RlbCBjbGFzc2VzIHRvIHRoZSBjb21waWxhdGlvbi4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5Mzc2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1m cm9udC1lbmQuc2g6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NDb21wbGV0aW9u cy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9u cy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuZm9yUHJv cGVydHkpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZS5zZXRDb250 ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5n LnByb3RvdHlwZS5jYW5TZXRDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVHJlZU1vZGVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5 bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBh bmUucHJvdG90eXBlLl9jb250YWluc0luaGVyaXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuaXNQcm9wZXJ0eUluaGVyaXRlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuaXNQ cm9wZXJ0eU92ZXJsb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVQ cm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUucmVidWlsZENvbXB1dGVkVHJhY2UpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qczoKKyAgICAgICAgKEFycmF5LnByb3Rv dHlwZS5rZXlTZXQpOgorCiAyMDExLTEwLTA0ICBDYXJ5IENsYXJrICA8Y2FyeWNsYXJrQGdvb2ds ZS5jb20+CiAKICAgICAgICAgRW5hYmxlIHN1YiBwaXhlbCB0ZXh0IChTa2lhIG9uIE1hYykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCBjNjJi YmFmMzI0ZDM5YjY2MTlkYjVkNzhhNTVjNWIzNTA2OGFmNzcxLi4wNDRkOTBlNDg1Nzg3MTc1NTIz ZWFiMGFhMzk2NDJmZWVjNjA3MDA5IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Nv bXBpbGUtZnJvbnQtZW5kLnNoCkBAIC00NCwxMiArNDQsMTUgQEAgamF2YSAtamFyIH4vY2xvc3Vy ZS9jb21waWxlci5qYXIgLS1jb21waWxhdGlvbl9sZXZlbCBTSU1QTEVfT1BUSU1JWkFUSU9OUyAt LXdhcm4KICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09i amVjdC5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZXR0aW5ncy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjIwOmpz bW9kdWxlX2NvbW1vbiBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjIzOmpzbW9kdWxlX2Nv bW1vbiBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b21waWxlclNvdXJjZU1hcHBpbmcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5nUHJvdmlkZXIuanMgXAogICAg ICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1vZGVs LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnRlbnRQcm92aWRlcnMuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29va2llUGFyc2VyLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0NvbXBsZXRpb25zLmpzIFwKKyAgICAgICAgLS1qcyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q cyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NT dHlsZU1vZGVsLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTQ29tcGxldGlvbnMuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0NvbXBsZXRpb25zLmpzCmluZGV4IGJh M2FjYTIwYzM4YzZkYmI4ZGRmYTcyYjhhZGNjZDljZDMyNTRlN2UuLjAyNTBjNjY5NGZmZDljYmUw OWM1NDFmZTAwZjNiN2EwNzQyNzAyMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ1NTQ29tcGxldGlvbnMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NDb21wbGV0aW9ucy5qcwpAQCAtMzAsNiArMzAsOSBAQAogICog T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KICAqLwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCiBXZWJJbnNwZWN0 b3IuQ1NTQ29tcGxldGlvbnMgPSBmdW5jdGlvbih2YWx1ZXMsIGFjY2VwdEVtcHR5UHJlZml4KQog ewogICAgIHRoaXMuX3ZhbHVlcyA9IHZhbHVlcy5zbGljZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NLZXl3b3JkQ29tcGxldGlvbnMuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q cwppbmRleCBiYzU4OTVlOGNjNTg5NjVmMzNlZGYwOTdjMGIyMDRiNDA4N2ZjN2IxLi45YmQxY2Zh NGEwZTM5YzU1Y2MxY2QzM2MwNTY5ZjQxMjhkOGQ0ZDY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q cwpAQCAtMjgsMTUgKzI4LDE4IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgorICogQGNv bnN0cnVjdG9yCisgKi8KIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMgPSB7CiAg ICAgZm9yUHJvcGVydHk6IGZ1bmN0aW9uKHByb3BlcnR5TmFtZSkKICAgICB7CiAgICAgICAgIHZh ciBhY2NlcHRlZEtleXdvcmRzID0gWyJpbml0aWFsIl07Ci0gICAgICAgIGlmIChwcm9wZXJ0eU5h bWUgaW4gdGhpcy5fcHJvcGVydHlLZXl3b3JkTWFwKQotICAgICAgICAgICAgYWNjZXB0ZWRLZXl3 b3JkcyA9IGFjY2VwdGVkS2V5d29yZHMuY29uY2F0KHRoaXMuX3Byb3BlcnR5S2V5d29yZE1hcFtw cm9wZXJ0eU5hbWVdKTsKLSAgICAgICAgaWYgKHByb3BlcnR5TmFtZSBpbiB0aGlzLl9jb2xvckF3 YXJlUHJvcGVydGllcykKKyAgICAgICAgaWYgKHByb3BlcnR5TmFtZSBpbiBXZWJJbnNwZWN0b3Iu Q1NTS2V5d29yZENvbXBsZXRpb25zLl9wcm9wZXJ0eUtleXdvcmRNYXApCisgICAgICAgICAgICBh Y2NlcHRlZEtleXdvcmRzID0gYWNjZXB0ZWRLZXl3b3Jkcy5jb25jYXQoV2ViSW5zcGVjdG9yLkNT U0tleXdvcmRDb21wbGV0aW9ucy5fcHJvcGVydHlLZXl3b3JkTWFwW3Byb3BlcnR5TmFtZV0pOwor ICAgICAgICBpZiAocHJvcGVydHlOYW1lIGluIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxl dGlvbnMuX2NvbG9yQXdhcmVQcm9wZXJ0aWVzKQogICAgICAgICAgICAgYWNjZXB0ZWRLZXl3b3Jk cyA9IGFjY2VwdGVkS2V5d29yZHMuY29uY2F0KFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxl dGlvbnMuX2NvbG9ycyk7Ci0gICAgICAgIGlmIChwcm9wZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9y LlN0eWxlc1NpZGViYXJQYW5lLkluaGVyaXRlZFByb3BlcnRpZXMpCisgICAgICAgIGlmIChwcm9w ZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5Jbmhlcml0ZWRQ cm9wZXJ0aWVzKQogICAgICAgICAgICAgYWNjZXB0ZWRLZXl3b3Jkcy5wdXNoKCJpbmhlcml0Iik7 CiAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zKGFjY2VwdGVk S2V5d29yZHMsIHRydWUpOwogICAgIH0sCkBAIC00Nyw2ICs1MCwxNSBAQCBXZWJJbnNwZWN0b3Iu Q1NTS2V5d29yZENvbXBsZXRpb25zID0gewogICAgIH0KIH07CiAKKy8vIFRha2VuIGZyb20gaHR0 cDovL3d3dy53My5vcmcvVFIvQ1NTMjEvcHJvcGlkeC5odG1sLgorV2ViSW5zcGVjdG9yLkNTU0tl eXdvcmRDb21wbGV0aW9ucy5Jbmhlcml0ZWRQcm9wZXJ0aWVzID0gWworICAgICJhemltdXRoIiwg ImJvcmRlci1jb2xsYXBzZSIsICJib3JkZXItc3BhY2luZyIsICJjYXB0aW9uLXNpZGUiLCAiY29s b3IiLCAiY3Vyc29yIiwgImRpcmVjdGlvbiIsICJlbGV2YXRpb24iLAorICAgICJlbXB0eS1jZWxs cyIsICJmb250LWZhbWlseSIsICJmb250LXNpemUiLCAiZm9udC1zdHlsZSIsICJmb250LXZhcmlh bnQiLCAiZm9udC13ZWlnaHQiLCAiZm9udCIsICJsZXR0ZXItc3BhY2luZyIsCisgICAgImxpbmUt aGVpZ2h0IiwgImxpc3Qtc3R5bGUtaW1hZ2UiLCAibGlzdC1zdHlsZS1wb3NpdGlvbiIsICJsaXN0 LXN0eWxlLXR5cGUiLCAibGlzdC1zdHlsZSIsICJvcnBoYW5zIiwgInBpdGNoLXJhbmdlIiwKKyAg ICAicGl0Y2giLCAicXVvdGVzIiwgInJpY2huZXNzIiwgInNwZWFrLWhlYWRlciIsICJzcGVhay1u dW1lcmFsIiwgInNwZWFrLXB1bmN0dWF0aW9uIiwgInNwZWFrIiwgInNwZWVjaC1yYXRlIiwgInN0 cmVzcyIsCisgICAgInRleHQtYWxpZ24iLCAidGV4dC1pbmRlbnQiLCAidGV4dC10cmFuc2Zvcm0i LCAidGV4dC1zaGFkb3ciLCAidmlzaWJpbGl0eSIsICJ2b2ljZS1mYW1pbHkiLCAidm9sdW1lIiwg IndoaXRlLXNwYWNlIiwgIndpZG93cyIsICJ3b3JkLXNwYWNpbmciCitdLmtleVNldCgpOworCiBX ZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLl9jb2xvcnMgPSBbCiAgICAgImFxdWEi LCAiYmxhY2siLCAiYmx1ZSIsICJmdWNoc2lhIiwgImdyYXkiLCAiZ3JlZW4iLCAibGltZSIsICJt YXJvb24iLCAibmF2eSIsICJvbGl2ZSIsICJvcmFuZ2UiLCAicHVycGxlIiwgInJlZCIsCiAgICAg InNpbHZlciIsICJ0ZWFsIiwgIndoaXRlIiwgInllbGxvdyIsICJ0cmFuc3BhcmVudCIsICJjdXJy ZW50Y29sb3IiLCAiZ3JleSIsICJhbGljZWJsdWUiLCAiYW50aXF1ZXdoaXRlIiwKQEAgLTY2LDcg Kzc4LDcgQEAgV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fY29sb3JzID0gWwog ICAgICJyb3lhbGJsdWUiLCAic2FkZGxlYnJvd24iLCAic2FsbW9uIiwgInNhbmR5YnJvd24iLCAi c2VhZ3JlZW4iLCAic2Vhc2hlbGwiLCAic2llbm5hIiwgInNreWJsdWUiLCAic2xhdGVibHVlIiwK ICAgICAic2xhdGVncmF5IiwgInNsYXRlZ3JleSIsICJzbm93IiwgInNwcmluZ2dyZWVuIiwgInN0 ZWVsYmx1ZSIsICJ0YW4iLCAidGhpc3RsZSIsICJ0b21hdG8iLCAidHVycXVvaXNlIiwgInZpb2xl dCIsCiAgICAgIndoZWF0IiwgIndoaXRlc21va2UiLCAieWVsbG93Z3JlZW4iCi1dLAorXTsKIAog V2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fY29sb3JBd2FyZVByb3BlcnRpZXMg PSBbCiAgICAgImJhY2tncm91bmQiLCAiYmFja2dyb3VuZC1jb2xvciIsICJib3JkZXIiLCAiYm9y ZGVyLWNvbG9yIiwgImJvcmRlci10b3AiLCAiYm9yZGVyLXJpZ2h0IiwgImJvcmRlci1ib3R0b20i LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHls ZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1v ZGVsLmpzCmluZGV4IGFmOWVjMTA0YmUxOGU3ZDUxMjU5NDc1MWU4YWNmMTMxNzk1NDMyNGIuLmU4 MmM0NGMwNWRlZjQ4MmZlYTQyN2JkMmQzYTUzZDAzY2MyM2RhODggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTI0Miw3 ICsyNDIsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbiA9IGZ1bmN0aW9uKHBh eWxvYWQpCiAKICAgICB2YXIgcHJvcGVydHlJbmRleCA9IDA7CiAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCBwYXlsb2FkUHJvcGVydHlDb3VudDsgKytpKSB7Ci0gICAgICAgIHZhciBwcm9wZXJ0eSA9 IG5ldyBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucGFyc2VQYXlsb2FkKHRoaXMsIGksIHBheWxv YWQuY3NzUHJvcGVydGllc1tpXSk7CisgICAgICAgIHZhciBwcm9wZXJ0eSA9IFdlYkluc3BlY3Rv ci5DU1NQcm9wZXJ0eS5wYXJzZVBheWxvYWQodGhpcywgaSwgcGF5bG9hZC5jc3NQcm9wZXJ0aWVz W2ldKTsKICAgICAgICAgdGhpcy5fYWxsUHJvcGVydGllcy5wdXNoKHByb3BlcnR5KTsKICAgICAg ICAgaWYgKHByb3BlcnR5LmRpc2FibGVkKQogICAgICAgICAgICAgdGhpcy5fX2Rpc2FibGVkUHJv cGVydGllc1tpXSA9IHByb3BlcnR5OwpAQCAtNjU3LDEyICs2NTcsMTcgQEAgV2ViSW5zcGVjdG9y LkNTU1N0eWxlTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0gewogICAgIHNldENvbnRl bnQ6IGZ1bmN0aW9uKHJlc291cmNlLCBjb250ZW50LCBtYWpvckNoYW5nZSwgdXNlckNhbGxiYWNr KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3VybFRvU3R5bGVTaGVldElkW3Jlc291cmNlLnVy bF0pIHsKLSAgICAgICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudChyZXNvdXJjZS51cmwsIGNv bnRlbnQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spOworICAgICAgICAgICAgdGhpcy5faW5u ZXJTZXRDb250ZW50KHJlc291cmNlLnVybCwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxs YmFjaywgbnVsbCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgdGhp cy5fbG9hZFN0eWxlU2hlZXRIZWFkZXJzKHRoaXMuX2lubmVyU2V0Q29udGVudC5iaW5kKHRoaXMs IHJlc291cmNlLnVybCwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaykpOwogICAg IH0sCiAKKyAgICBjYW5TZXRDb250ZW50OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9LAorCiAgICAgX2luc3BlY3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKICAgICAgICAgLy8gTWFpbiBmcmFtZSBuYXZpZ2F0aW9uIC0gY2xlYXIgaGlz dG9yeS4KQEAgLTczMiwzICs3MzcsOCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291 cmNlQmluZGluZy5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVs UmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VEb21haW5Nb2RlbEJpbmRpbmcucHJvdG90eXBlOworCisvKioKKyAqIEB0eWxlIHtXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVNb2RlbH0KKyAqLworV2ViSW5zcGVjdG9yLmNzc01vZGVsID0gbnVsbDsK XCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwppbmRleCAxZjlhOTQ0ZWYw MTI1NjFkZDZkYmI2ZTQzYmNkMTk2YmYxMDNhM2FkLi5lZjhmYzhhOTZjZTQzZmMzNWU5NGNmZThj MTQwYjI4ZWZkNzQ4MjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKQEAgLTQzOCwzICs0MzgsOCBAQCBXZWJJ bnNwZWN0b3IuUGFnZURpc3BhdGNoZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9yZXNv dXJjZVRyZWVNb2RlbC5fZnJhbWVEZXRhY2hlZChmcmFtZUlkKTsKICAgICB9CiB9CisKKy8qKgor ICogQHR5cGUge1dlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbH0KKyAqLworV2ViSW5zcGVj dG9yLnJlc291cmNlVHJlZU1vZGVsID0gbnVsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IDIzMTZiYjRm ODQ4NWE0OTU2NzU5ZDdiNDcwNzE2Nzc4ODNjMDljYTAuLjcyZDY3ZTJkZWY1N2QyNzQ3NGZkMjI0 YTEzYjFmNmQ0MWFjYmJlYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtMTA1LDE0ICsxMDUsNiBAQCBX ZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUuQ29sb3JGb3JtYXQgPSB7CiAKIFdlYkluc3Bl Y3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5TdHlsZVZhbHVlRGVsaW1pdGVycyA9ICIgXHRcblwiJzo7 LC8oKSI7CiAKLS8vIFRha2VuIGZyb20gaHR0cDovL3d3dy53My5vcmcvVFIvQ1NTMjEvcHJvcGlk eC5odG1sLgotV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLkluaGVyaXRlZFByb3BlcnRp ZXMgPSBbCi0gICAgImF6aW11dGgiLCAiYm9yZGVyLWNvbGxhcHNlIiwgImJvcmRlci1zcGFjaW5n IiwgImNhcHRpb24tc2lkZSIsICJjb2xvciIsICJjdXJzb3IiLCAiZGlyZWN0aW9uIiwgImVsZXZh dGlvbiIsCi0gICAgImVtcHR5LWNlbGxzIiwgImZvbnQtZmFtaWx5IiwgImZvbnQtc2l6ZSIsICJm b250LXN0eWxlIiwgImZvbnQtdmFyaWFudCIsICJmb250LXdlaWdodCIsICJmb250IiwgImxldHRl ci1zcGFjaW5nIiwKLSAgICAibGluZS1oZWlnaHQiLCAibGlzdC1zdHlsZS1pbWFnZSIsICJsaXN0 LXN0eWxlLXBvc2l0aW9uIiwgImxpc3Qtc3R5bGUtdHlwZSIsICJsaXN0LXN0eWxlIiwgIm9ycGhh bnMiLCAicGl0Y2gtcmFuZ2UiLAotICAgICJwaXRjaCIsICJxdW90ZXMiLCAicmljaG5lc3MiLCAi c3BlYWstaGVhZGVyIiwgInNwZWFrLW51bWVyYWwiLCAic3BlYWstcHVuY3R1YXRpb24iLCAic3Bl YWsiLCAic3BlZWNoLXJhdGUiLCAic3RyZXNzIiwKLSAgICAidGV4dC1hbGlnbiIsICJ0ZXh0LWlu ZGVudCIsICJ0ZXh0LXRyYW5zZm9ybSIsICJ0ZXh0LXNoYWRvdyIsICJ2aXNpYmlsaXR5IiwgInZv aWNlLWZhbWlseSIsICJ2b2x1bWUiLCAid2hpdGUtc3BhY2UiLCAid2lkb3dzIiwgIndvcmQtc3Bh Y2luZyIKLV0ua2V5U2V0KCk7CiAKIC8vIEtlZXAgaW4gc3luYyB3aXRoIFJlbmRlclN0eWxlQ29u c3RhbnRzLmggUHNldWRvSWQgZW51bS4gQXJyYXkgYmVsb3cgY29udGFpbnMgcHNldWRvIGlkIG5h bWVzIGZvciBjb3JyZXNwb25kaW5nIGVudW0gaW5kZXhlcy4KIC8vIEZpcnN0IGl0ZW0gaXMgZW1w dHkgZHVlIHRvIGl0cyBhcnRpZmljaWFsIE5PUFNFVURPIG5hdHVyZSBpbiB0aGUgZW51bS4KQEAg LTYzMCw3ICs2MjIsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBl ID0gewogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb3BlcnRpZXMubGVuZ3RoOyArK2kp IHsKICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHByb3BlcnRpZXNbaV07CiAgICAgICAgICAg ICAvLyBEb2VzIHRoaXMgc3R5bGUgY29udGFpbiBub24tb3ZlcnJpZGRlbiBpbmhlcml0ZWQgcHJv cGVydHk/Ci0gICAgICAgICAgICBpZiAocHJvcGVydHkuaXNMaXZlICYmIHByb3BlcnR5Lm5hbWUg aW4gV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLkluaGVyaXRlZFByb3BlcnRpZXMpCisg ICAgICAgICAgICBpZiAocHJvcGVydHkuaXNMaXZlICYmIHByb3BlcnR5Lm5hbWUgaW4gV2ViSW5z cGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5Jbmhlcml0ZWRQcm9wZXJ0aWVzKQogICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBmYWxzZTsK QEAgLTkyNCw3ICs5MTYsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLmlzSW5oZXJpdGVkKSB7CiAgICAgICAgICAg ICAvLyBXaGlsZSByZW5kZXJpbmcgaW5oZXJpdGVkIHN0eWxlc2hlZXQsIHJldmVyc2UgbWVhbmlu ZyBvZiB0aGlzIHByb3BlcnR5LgogICAgICAgICAgICAgLy8gUmVuZGVyIHRydWx5IGluaGVyaXRl ZCBwcm9wZXJ0aWVzIHdpdGggYmxhY2ssIGkuZS4gcmV0dXJuIHRoZW0gYXMgbm9uLWluaGVyaXRl ZC4KLSAgICAgICAgICAgIHJldHVybiAhKHByb3BlcnR5TmFtZSBpbiBXZWJJbnNwZWN0b3IuU3R5 bGVzU2lkZWJhclBhbmUuSW5oZXJpdGVkUHJvcGVydGllcyk7CisgICAgICAgICAgICByZXR1cm4g IShwcm9wZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5Jbmhl cml0ZWRQcm9wZXJ0aWVzKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fSwKQEAgLTkzNCw3ICs5MjYsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlv bi5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghdGhpcy5fdXNlZFByb3BlcnRpZXMgfHwgdGhp cy5ub0FmZmVjdCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICBpZiAodGhp cy5pc0luaGVyaXRlZCAmJiAhKHByb3BlcnR5TmFtZSBpbiBXZWJJbnNwZWN0b3IuU3R5bGVzU2lk ZWJhclBhbmUuSW5oZXJpdGVkUHJvcGVydGllcykpIHsKKyAgICAgICAgaWYgKHRoaXMuaXNJbmhl cml0ZWQgJiYgIShwcm9wZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0 aW9ucy5Jbmhlcml0ZWRQcm9wZXJ0aWVzKSkgewogICAgICAgICAgICAgLy8gSW4gdGhlIGluaGVy aXRlZCBzZWN0aW9ucywgb25seSBzaG93IG92ZXJyaWRlcyBmb3IgdGhlIHBvdGVudGlhbGx5IGlu aGVyaXRlZCBwcm9wZXJ0aWVzLgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9 CkBAIC0xMzA0LDcgKzEyOTYsNyBAQCBXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHlsZVByb3BlcnRp ZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB2YXIgcHJvcGVydHkgPSBz ZWN0aW9uLnVuaXF1ZVByb3BlcnRpZXNbal07CiAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnR5 LmRpc2FibGVkKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAg ICBpZiAoc2VjdGlvbi5pc0luaGVyaXRlZCAmJiAhKHByb3BlcnR5Lm5hbWUgaW4gV2ViSW5zcGVj dG9yLlN0eWxlc1NpZGViYXJQYW5lLkluaGVyaXRlZFByb3BlcnRpZXMpKQorICAgICAgICAgICAg ICAgIGlmIChzZWN0aW9uLmlzSW5oZXJpdGVkICYmICEocHJvcGVydHkubmFtZSBpbiBXZWJJbnNw ZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLkluaGVyaXRlZFByb3BlcnRpZXMpKQogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgICAgIHZhciB0cmVlRWxlbWVu dCA9IHRoaXMuX3Byb3BlcnR5VHJlZUVsZW1lbnRzW3Byb3BlcnR5Lm5hbWVdOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCmluZGV4IDc4MzQ2ZDA1NjVk ZTQ5NmY3NzQzMGRkYmJiMTAzYThhYjQxMWRjYzUuLjRlMmI4NzAyOWFiYjliNjRmNGI2MjY4OTI3 MzkxNmEwM2M0ZGIzMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvZXh0ZXJucy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2V4dGVybnMuanMKQEAgLTg4LDYgKzg4LDggQEAgRWxlbWVudC5wcm90b3R5cGUuc2Nyb2xsSW50 b1ZpZXdJZk5lZWRlZCA9IGZ1bmN0aW9uKCkge30KICAqLwogQXJyYXkucHJvdG90eXBlLnJlbW92 ZSA9IGZ1bmN0aW9uKG9iaiwgb25seUZpcnN0KSB7fQogCitBcnJheS5wcm90b3R5cGUua2V5U2V0 ID0gZnVuY3Rpb24oKSB7fQorCiBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9uU2VydmVyID0ge30KIFdl Ykluc3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIubm90aWZ5UmVzb3VyY2VDb250ZW50Q29tbWl0dGVk ID0gZnVuY3Rpb24ocmVzb3VyY2UsIGNvbnRlbnQpIHt9CiBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9u U2VydmVyLm5vdGlmeVBhbmVsU2hvd24gPSBmdW5jdGlvbihwYW5lbCkge30K 109691 2011-10-04 14:26:09 -0700 2011-10-05 01:50:34 -0700 [Patch] Review comment addressed. bug-69376-20111005012607.patch text/plain 13355 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY2MzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYjNmZTYwNDcxNjViZjQ2 MjU1ODU0N2ZjYjAyYTA2ZWNjNjAxMzJiLi4yYmYxM2M3NmU0NTA3MmE1YjAxZDk5ZmEwNjYxZjhj Nzc5MDU3ZDg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMTAtMDQgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogYWRkIENTUyBtb2RlbCBjbGFzc2VzIHRvIHRoZSBjb21waWxhdGlvbi4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5Mzc2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1m cm9udC1lbmQuc2g6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NDb21wbGV0aW9u cy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9u cy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuZm9yUHJv cGVydHkpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZS5zZXRDb250 ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsUmVzb3VyY2VCaW5kaW5n LnByb3RvdHlwZS5jYW5TZXRDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVHJlZU1vZGVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5 bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBh bmUucHJvdG90eXBlLl9jb250YWluc0luaGVyaXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuaXNQcm9wZXJ0eUluaGVyaXRlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuaXNQ cm9wZXJ0eU92ZXJsb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVQ cm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUucmVidWlsZENvbXB1dGVkVHJhY2UpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qczoKKyAgICAgICAgKEFycmF5LnByb3Rv dHlwZS5rZXlTZXQpOgorCiAyMDExLTEwLTA0ICBDYXJ5IENsYXJrICA8Y2FyeWNsYXJrQGdvb2ds ZS5jb20+CiAKICAgICAgICAgRW5hYmxlIHN1YiBwaXhlbCB0ZXh0IChTa2lhIG9uIE1hYykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAppbmRleCBjNjJi YmFmMzI0ZDM5YjY2MTlkYjVkNzhhNTVjNWIzNTA2OGFmNzcxLi4wNDRkOTBlNDg1Nzg3MTc1NTIz ZWFiMGFhMzk2NDJmZWVjNjA3MDA5IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Nv bXBpbGUtZnJvbnQtZW5kLnNoCkBAIC00NCwxMiArNDQsMTUgQEAgamF2YSAtamFyIH4vY2xvc3Vy ZS9jb21waWxlci5qYXIgLS1jb21waWxhdGlvbl9sZXZlbCBTSU1QTEVfT1BUSU1JWkFUSU9OUyAt LXdhcm4KICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09i amVjdC5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZXR0aW5ncy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Vc2VyTWV0cmljcy5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjIwOmpz bW9kdWxlX2NvbW1vbiBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjIzOmpzbW9kdWxlX2Nv bW1vbiBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b21waWxlclNvdXJjZU1hcHBpbmcuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5nUHJvdmlkZXIuanMgXAogICAg ICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1vZGVs LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nv bnRlbnRQcm92aWRlcnMuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29va2llUGFyc2VyLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0NvbXBsZXRpb25zLmpzIFwKKyAgICAgICAgLS1qcyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q cyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NT dHlsZU1vZGVsLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0JyZWFrcG9pbnRNYW5hZ2VyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTQ29tcGxldGlvbnMuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0NvbXBsZXRpb25zLmpzCmluZGV4IGJh M2FjYTIwYzM4YzZkYmI4ZGRmYTcyYjhhZGNjZDljZDMyNTRlN2UuLjAyNTBjNjY5NGZmZDljYmUw OWM1NDFmZTAwZjNiN2EwNzQyNzAyMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ1NTQ29tcGxldGlvbnMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NDb21wbGV0aW9ucy5qcwpAQCAtMzAsNiArMzAsOSBAQAogICog T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KICAqLwogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCiBXZWJJbnNwZWN0 b3IuQ1NTQ29tcGxldGlvbnMgPSBmdW5jdGlvbih2YWx1ZXMsIGFjY2VwdEVtcHR5UHJlZml4KQog ewogICAgIHRoaXMuX3ZhbHVlcyA9IHZhbHVlcy5zbGljZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NLZXl3b3JkQ29tcGxldGlvbnMuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q cwppbmRleCBiYzU4OTVlOGNjNTg5NjVmMzNlZGYwOTdjMGIyMDRiNDA4N2ZjN2IxLi45YmQxY2Zh NGEwZTM5YzU1Y2MxY2QzM2MwNTY5ZjQxMjhkOGQ0ZDY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q cwpAQCAtMjgsMTUgKzI4LDE4IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgorICogQGNv bnN0cnVjdG9yCisgKi8KIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMgPSB7CiAg ICAgZm9yUHJvcGVydHk6IGZ1bmN0aW9uKHByb3BlcnR5TmFtZSkKICAgICB7CiAgICAgICAgIHZh ciBhY2NlcHRlZEtleXdvcmRzID0gWyJpbml0aWFsIl07Ci0gICAgICAgIGlmIChwcm9wZXJ0eU5h bWUgaW4gdGhpcy5fcHJvcGVydHlLZXl3b3JkTWFwKQotICAgICAgICAgICAgYWNjZXB0ZWRLZXl3 b3JkcyA9IGFjY2VwdGVkS2V5d29yZHMuY29uY2F0KHRoaXMuX3Byb3BlcnR5S2V5d29yZE1hcFtw cm9wZXJ0eU5hbWVdKTsKLSAgICAgICAgaWYgKHByb3BlcnR5TmFtZSBpbiB0aGlzLl9jb2xvckF3 YXJlUHJvcGVydGllcykKKyAgICAgICAgaWYgKHByb3BlcnR5TmFtZSBpbiBXZWJJbnNwZWN0b3Iu Q1NTS2V5d29yZENvbXBsZXRpb25zLl9wcm9wZXJ0eUtleXdvcmRNYXApCisgICAgICAgICAgICBh Y2NlcHRlZEtleXdvcmRzID0gYWNjZXB0ZWRLZXl3b3Jkcy5jb25jYXQoV2ViSW5zcGVjdG9yLkNT U0tleXdvcmRDb21wbGV0aW9ucy5fcHJvcGVydHlLZXl3b3JkTWFwW3Byb3BlcnR5TmFtZV0pOwor ICAgICAgICBpZiAocHJvcGVydHlOYW1lIGluIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxl dGlvbnMuX2NvbG9yQXdhcmVQcm9wZXJ0aWVzKQogICAgICAgICAgICAgYWNjZXB0ZWRLZXl3b3Jk cyA9IGFjY2VwdGVkS2V5d29yZHMuY29uY2F0KFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxl dGlvbnMuX2NvbG9ycyk7Ci0gICAgICAgIGlmIChwcm9wZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9y LlN0eWxlc1NpZGViYXJQYW5lLkluaGVyaXRlZFByb3BlcnRpZXMpCisgICAgICAgIGlmIChwcm9w ZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5Jbmhlcml0ZWRQ cm9wZXJ0aWVzKQogICAgICAgICAgICAgYWNjZXB0ZWRLZXl3b3Jkcy5wdXNoKCJpbmhlcml0Iik7 CiAgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zKGFjY2VwdGVk S2V5d29yZHMsIHRydWUpOwogICAgIH0sCkBAIC00Nyw2ICs1MCwxNSBAQCBXZWJJbnNwZWN0b3Iu Q1NTS2V5d29yZENvbXBsZXRpb25zID0gewogICAgIH0KIH07CiAKKy8vIFRha2VuIGZyb20gaHR0 cDovL3d3dy53My5vcmcvVFIvQ1NTMjEvcHJvcGlkeC5odG1sLgorV2ViSW5zcGVjdG9yLkNTU0tl eXdvcmRDb21wbGV0aW9ucy5Jbmhlcml0ZWRQcm9wZXJ0aWVzID0gWworICAgICJhemltdXRoIiwg ImJvcmRlci1jb2xsYXBzZSIsICJib3JkZXItc3BhY2luZyIsICJjYXB0aW9uLXNpZGUiLCAiY29s b3IiLCAiY3Vyc29yIiwgImRpcmVjdGlvbiIsICJlbGV2YXRpb24iLAorICAgICJlbXB0eS1jZWxs cyIsICJmb250LWZhbWlseSIsICJmb250LXNpemUiLCAiZm9udC1zdHlsZSIsICJmb250LXZhcmlh bnQiLCAiZm9udC13ZWlnaHQiLCAiZm9udCIsICJsZXR0ZXItc3BhY2luZyIsCisgICAgImxpbmUt aGVpZ2h0IiwgImxpc3Qtc3R5bGUtaW1hZ2UiLCAibGlzdC1zdHlsZS1wb3NpdGlvbiIsICJsaXN0 LXN0eWxlLXR5cGUiLCAibGlzdC1zdHlsZSIsICJvcnBoYW5zIiwgInBpdGNoLXJhbmdlIiwKKyAg ICAicGl0Y2giLCAicXVvdGVzIiwgInJpY2huZXNzIiwgInNwZWFrLWhlYWRlciIsICJzcGVhay1u dW1lcmFsIiwgInNwZWFrLXB1bmN0dWF0aW9uIiwgInNwZWFrIiwgInNwZWVjaC1yYXRlIiwgInN0 cmVzcyIsCisgICAgInRleHQtYWxpZ24iLCAidGV4dC1pbmRlbnQiLCAidGV4dC10cmFuc2Zvcm0i LCAidGV4dC1zaGFkb3ciLCAidmlzaWJpbGl0eSIsICJ2b2ljZS1mYW1pbHkiLCAidm9sdW1lIiwg IndoaXRlLXNwYWNlIiwgIndpZG93cyIsICJ3b3JkLXNwYWNpbmciCitdLmtleVNldCgpOworCiBX ZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLl9jb2xvcnMgPSBbCiAgICAgImFxdWEi LCAiYmxhY2siLCAiYmx1ZSIsICJmdWNoc2lhIiwgImdyYXkiLCAiZ3JlZW4iLCAibGltZSIsICJt YXJvb24iLCAibmF2eSIsICJvbGl2ZSIsICJvcmFuZ2UiLCAicHVycGxlIiwgInJlZCIsCiAgICAg InNpbHZlciIsICJ0ZWFsIiwgIndoaXRlIiwgInllbGxvdyIsICJ0cmFuc3BhcmVudCIsICJjdXJy ZW50Y29sb3IiLCAiZ3JleSIsICJhbGljZWJsdWUiLCAiYW50aXF1ZXdoaXRlIiwKQEAgLTY2LDcg Kzc4LDcgQEAgV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fY29sb3JzID0gWwog ICAgICJyb3lhbGJsdWUiLCAic2FkZGxlYnJvd24iLCAic2FsbW9uIiwgInNhbmR5YnJvd24iLCAi c2VhZ3JlZW4iLCAic2Vhc2hlbGwiLCAic2llbm5hIiwgInNreWJsdWUiLCAic2xhdGVibHVlIiwK ICAgICAic2xhdGVncmF5IiwgInNsYXRlZ3JleSIsICJzbm93IiwgInNwcmluZ2dyZWVuIiwgInN0 ZWVsYmx1ZSIsICJ0YW4iLCAidGhpc3RsZSIsICJ0b21hdG8iLCAidHVycXVvaXNlIiwgInZpb2xl dCIsCiAgICAgIndoZWF0IiwgIndoaXRlc21va2UiLCAieWVsbG93Z3JlZW4iCi1dLAorXTsKIAog V2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fY29sb3JBd2FyZVByb3BlcnRpZXMg PSBbCiAgICAgImJhY2tncm91bmQiLCAiYmFja2dyb3VuZC1jb2xvciIsICJib3JkZXIiLCAiYm9y ZGVyLWNvbG9yIiwgImJvcmRlci10b3AiLCAiYm9yZGVyLXJpZ2h0IiwgImJvcmRlci1ib3R0b20i LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHls ZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1v ZGVsLmpzCmluZGV4IGFmOWVjMTA0YmUxOGU3ZDUxMjU5NDc1MWU4YWNmMTMxNzk1NDMyNGIuLjBi MTAzMTJlZGM1ZmYwOTNjMGU2YWNjZjQyYzk0YWZhM2Q0MjgzMmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanMKQEAgLTI0Miw3 ICsyNDIsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvbiA9IGZ1bmN0aW9uKHBh eWxvYWQpCiAKICAgICB2YXIgcHJvcGVydHlJbmRleCA9IDA7CiAgICAgZm9yICh2YXIgaSA9IDA7 IGkgPCBwYXlsb2FkUHJvcGVydHlDb3VudDsgKytpKSB7Ci0gICAgICAgIHZhciBwcm9wZXJ0eSA9 IG5ldyBXZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucGFyc2VQYXlsb2FkKHRoaXMsIGksIHBheWxv YWQuY3NzUHJvcGVydGllc1tpXSk7CisgICAgICAgIHZhciBwcm9wZXJ0eSA9IFdlYkluc3BlY3Rv ci5DU1NQcm9wZXJ0eS5wYXJzZVBheWxvYWQodGhpcywgaSwgcGF5bG9hZC5jc3NQcm9wZXJ0aWVz W2ldKTsKICAgICAgICAgdGhpcy5fYWxsUHJvcGVydGllcy5wdXNoKHByb3BlcnR5KTsKICAgICAg ICAgaWYgKHByb3BlcnR5LmRpc2FibGVkKQogICAgICAgICAgICAgdGhpcy5fX2Rpc2FibGVkUHJv cGVydGllc1tpXSA9IHByb3BlcnR5OwpAQCAtNjU3LDEyICs2NTcsMTcgQEAgV2ViSW5zcGVjdG9y LkNTU1N0eWxlTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlID0gewogICAgIHNldENvbnRl bnQ6IGZ1bmN0aW9uKHJlc291cmNlLCBjb250ZW50LCBtYWpvckNoYW5nZSwgdXNlckNhbGxiYWNr KQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3VybFRvU3R5bGVTaGVldElkW3Jlc291cmNlLnVy bF0pIHsKLSAgICAgICAgICAgIHRoaXMuX2lubmVyU2V0Q29udGVudChyZXNvdXJjZS51cmwsIGNv bnRlbnQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spOworICAgICAgICAgICAgdGhpcy5faW5u ZXJTZXRDb250ZW50KHJlc291cmNlLnVybCwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxs YmFjaywgbnVsbCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgdGhp cy5fbG9hZFN0eWxlU2hlZXRIZWFkZXJzKHRoaXMuX2lubmVyU2V0Q29udGVudC5iaW5kKHRoaXMs IHJlc291cmNlLnVybCwgY29udGVudCwgbWFqb3JDaGFuZ2UsIHVzZXJDYWxsYmFjaykpOwogICAg IH0sCiAKKyAgICBjYW5TZXRDb250ZW50OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9LAorCiAgICAgX2luc3BlY3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKICAgICAgICAgLy8gTWFpbiBmcmFtZSBuYXZpZ2F0aW9uIC0gY2xlYXIgaGlz dG9yeS4KQEAgLTczMiwzICs3MzcsOCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbFJlc291 cmNlQmluZGluZy5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVs UmVzb3VyY2VCaW5kaW5nLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VEb21haW5Nb2RlbEJpbmRpbmcucHJvdG90eXBlOworCisvKioKKyAqIEB0eXBlIHtXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVNb2RlbH0KKyAqLworV2ViSW5zcGVjdG9yLmNzc01vZGVsID0gbnVsbDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VU cmVlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl VHJlZU1vZGVsLmpzCmluZGV4IDFmOWE5NDRlZjAxMjU2MWRkNmRiYjZlNDNiY2QxOTZiZjEwM2Ez YWQuLmVmOGZjOGE5NmNlNDNmYzM1ZTk0Y2ZlOGMxNDBiMjhlZmQ3NDgyOGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2Rl bC5qcwpAQCAtNDM4LDMgKzQzOCw4IEBAIFdlYkluc3BlY3Rvci5QYWdlRGlzcGF0Y2hlci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLl9mcmFtZURldGFjaGVk KGZyYW1lSWQpOwogICAgIH0KIH0KKworLyoqCisgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZU1vZGVsfQorICovCitXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwgPSBudWxs OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz U2lkZWJhclBhbmUuanMKaW5kZXggMjMxNmJiNGY4NDg1YTQ5NTY3NTlkN2I0NzA3MTY3Nzg4M2Mw OWNhMC4uNzJkNjdlMmRlZjU3ZDI3NDc0ZmQyMjRhMTNiMWY2ZDQxYWNiYmVhMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzCkBAIC0xMDUsMTQgKzEwNSw2IEBAIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFu ZS5Db2xvckZvcm1hdCA9IHsKIAogV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLlN0eWxl VmFsdWVEZWxpbWl0ZXJzID0gIiBcdFxuXCInOjssLygpIjsKIAotLy8gVGFrZW4gZnJvbSBodHRw Oi8vd3d3LnczLm9yZy9UUi9DU1MyMS9wcm9waWR4Lmh0bWwuCi1XZWJJbnNwZWN0b3IuU3R5bGVz U2lkZWJhclBhbmUuSW5oZXJpdGVkUHJvcGVydGllcyA9IFsKLSAgICAiYXppbXV0aCIsICJib3Jk ZXItY29sbGFwc2UiLCAiYm9yZGVyLXNwYWNpbmciLCAiY2FwdGlvbi1zaWRlIiwgImNvbG9yIiwg ImN1cnNvciIsICJkaXJlY3Rpb24iLCAiZWxldmF0aW9uIiwKLSAgICAiZW1wdHktY2VsbHMiLCAi Zm9udC1mYW1pbHkiLCAiZm9udC1zaXplIiwgImZvbnQtc3R5bGUiLCAiZm9udC12YXJpYW50Iiwg ImZvbnQtd2VpZ2h0IiwgImZvbnQiLCAibGV0dGVyLXNwYWNpbmciLAotICAgICJsaW5lLWhlaWdo dCIsICJsaXN0LXN0eWxlLWltYWdlIiwgImxpc3Qtc3R5bGUtcG9zaXRpb24iLCAibGlzdC1zdHls ZS10eXBlIiwgImxpc3Qtc3R5bGUiLCAib3JwaGFucyIsICJwaXRjaC1yYW5nZSIsCi0gICAgInBp dGNoIiwgInF1b3RlcyIsICJyaWNobmVzcyIsICJzcGVhay1oZWFkZXIiLCAic3BlYWstbnVtZXJh bCIsICJzcGVhay1wdW5jdHVhdGlvbiIsICJzcGVhayIsICJzcGVlY2gtcmF0ZSIsICJzdHJlc3Mi LAotICAgICJ0ZXh0LWFsaWduIiwgInRleHQtaW5kZW50IiwgInRleHQtdHJhbnNmb3JtIiwgInRl eHQtc2hhZG93IiwgInZpc2liaWxpdHkiLCAidm9pY2UtZmFtaWx5IiwgInZvbHVtZSIsICJ3aGl0 ZS1zcGFjZSIsICJ3aWRvd3MiLCAid29yZC1zcGFjaW5nIgotXS5rZXlTZXQoKTsKIAogLy8gS2Vl cCBpbiBzeW5jIHdpdGggUmVuZGVyU3R5bGVDb25zdGFudHMuaCBQc2V1ZG9JZCBlbnVtLiBBcnJh eSBiZWxvdyBjb250YWlucyBwc2V1ZG8gaWQgbmFtZXMgZm9yIGNvcnJlc3BvbmRpbmcgZW51bSBp bmRleGVzLgogLy8gRmlyc3QgaXRlbSBpcyBlbXB0eSBkdWUgdG8gaXRzIGFydGlmaWNpYWwgTk9Q U0VVRE8gbmF0dXJlIGluIHRoZSBlbnVtLgpAQCAtNjMwLDcgKzYyMiw3IEBAIFdlYkluc3BlY3Rv ci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgcHJvcGVydGllcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHByb3BlcnR5 ID0gcHJvcGVydGllc1tpXTsKICAgICAgICAgICAgIC8vIERvZXMgdGhpcyBzdHlsZSBjb250YWlu IG5vbi1vdmVycmlkZGVuIGluaGVyaXRlZCBwcm9wZXJ0eT8KLSAgICAgICAgICAgIGlmIChwcm9w ZXJ0eS5pc0xpdmUgJiYgcHJvcGVydHkubmFtZSBpbiBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJh clBhbmUuSW5oZXJpdGVkUHJvcGVydGllcykKKyAgICAgICAgICAgIGlmIChwcm9wZXJ0eS5pc0xp dmUgJiYgcHJvcGVydHkubmFtZSBpbiBXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25z LkluaGVyaXRlZFByb3BlcnRpZXMpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtOTI0LDcgKzkxNiw3IEBAIFdlYkluc3Bl Y3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRo aXMuaXNJbmhlcml0ZWQpIHsKICAgICAgICAgICAgIC8vIFdoaWxlIHJlbmRlcmluZyBpbmhlcml0 ZWQgc3R5bGVzaGVldCwgcmV2ZXJzZSBtZWFuaW5nIG9mIHRoaXMgcHJvcGVydHkuCiAgICAgICAg ICAgICAvLyBSZW5kZXIgdHJ1bHkgaW5oZXJpdGVkIHByb3BlcnRpZXMgd2l0aCBibGFjaywgaS5l LiByZXR1cm4gdGhlbSBhcyBub24taW5oZXJpdGVkLgotICAgICAgICAgICAgcmV0dXJuICEocHJv cGVydHlOYW1lIGluIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5Jbmhlcml0ZWRQcm9w ZXJ0aWVzKTsKKyAgICAgICAgICAgIHJldHVybiAhKHByb3BlcnR5TmFtZSBpbiBXZWJJbnNwZWN0 b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLkluaGVyaXRlZFByb3BlcnRpZXMpOwogICAgICAgICB9 CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LApAQCAtOTM0LDcgKzkyNiw3IEBAIFdlYklu c3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYg KCF0aGlzLl91c2VkUHJvcGVydGllcyB8fCB0aGlzLm5vQWZmZWN0KQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgICAgIGlmICh0aGlzLmlzSW5oZXJpdGVkICYmICEocHJvcGVydHlO YW1lIGluIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5Jbmhlcml0ZWRQcm9wZXJ0aWVz KSkgeworICAgICAgICBpZiAodGhpcy5pc0luaGVyaXRlZCAmJiAhKHByb3BlcnR5TmFtZSBpbiBX ZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLkluaGVyaXRlZFByb3BlcnRpZXMpKSB7 CiAgICAgICAgICAgICAvLyBJbiB0aGUgaW5oZXJpdGVkIHNlY3Rpb25zLCBvbmx5IHNob3cgb3Zl cnJpZGVzIGZvciB0aGUgcG90ZW50aWFsbHkgaW5oZXJpdGVkIHByb3BlcnRpZXMuCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAgLTEzMDQsNyArMTI5Niw3IEBAIFdlYklu c3BlY3Rvci5Db21wdXRlZFN0eWxlUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlID0gewogICAg ICAgICAgICAgICAgIHZhciBwcm9wZXJ0eSA9IHNlY3Rpb24udW5pcXVlUHJvcGVydGllc1tqXTsK ICAgICAgICAgICAgICAgICBpZiAocHJvcGVydHkuZGlzYWJsZWQpCiAgICAgICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGlmIChzZWN0aW9uLmlzSW5oZXJpdGVkICYm ICEocHJvcGVydHkubmFtZSBpbiBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUuSW5oZXJp dGVkUHJvcGVydGllcykpCisgICAgICAgICAgICAgICAgaWYgKHNlY3Rpb24uaXNJbmhlcml0ZWQg JiYgIShwcm9wZXJ0eS5uYW1lIGluIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMu SW5oZXJpdGVkUHJvcGVydGllcykpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAg ICAgICAgICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5fcHJvcGVydHlUcmVlRWxlbWVu dHNbcHJvcGVydHkubmFtZV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2V4dGVybnMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2V4dGVybnMuanMKaW5kZXggNzgzNDZkMDU2NWRlNDk2Zjc3NDMwZGRiYmIxMDNhOGFiNDExZGNj NS4uNGUyYjg3MDI5YWJiOWI2NGY0YjYyNjg5MjczOTE2YTAzYzRkYjMxZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcwpAQCAtODgsNiArODgsOCBA QCBFbGVtZW50LnByb3RvdHlwZS5zY3JvbGxJbnRvVmlld0lmTmVlZGVkID0gZnVuY3Rpb24oKSB7 fQogICovCiBBcnJheS5wcm90b3R5cGUucmVtb3ZlID0gZnVuY3Rpb24ob2JqLCBvbmx5Rmlyc3Qp IHt9CiAKK0FycmF5LnByb3RvdHlwZS5rZXlTZXQgPSBmdW5jdGlvbigpIHt9CisKIFdlYkluc3Bl Y3Rvci5leHRlbnNpb25TZXJ2ZXIgPSB7fQogV2ViSW5zcGVjdG9yLmV4dGVuc2lvblNlcnZlci5u b3RpZnlSZXNvdXJjZUNvbnRlbnRDb21taXR0ZWQgPSBmdW5jdGlvbihyZXNvdXJjZSwgY29udGVu dCkge30KIFdlYkluc3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIubm90aWZ5UGFuZWxTaG93biA9IGZ1 bmN0aW9uKHBhbmVsKSB7fQo=