171283 2017-04-25 12:21:29 -0700 Web Inspector: "Space" localized string is not loaded in combined and minified builds 2017-04-25 13:39:20 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1301154 0 joepeck 2017-04-25 12:21:29 -0700 Summary: "Space" localized string is not loaded in combined and minified builds Steps to Reproduce: 1. Build and optimized build 2. Open inspector 3. Show Timeline Tab 4. Hover Record button => Localized string not found for "Space" 1301155 1 joepeck 2017-04-25 12:21:38 -0700 <rdar://problem/30871371> 1301156 2 308127 joepeck 2017-04-25 12:24:57 -0700 Created attachment 308127 [PATCH] Proposed Fix 1301157 3 308128 joepeck 2017-04-25 12:25:47 -0700 Created attachment 308128 [PATCH] Proposed Fix 1301169 4 308128 bburg 2017-04-25 13:01:35 -0700 Comment on attachment 308128 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=308128&action=review r=me > Source/WebInspectorUI/UserInterface/Models/Resource.js:694 > + console.assert(!isNaN(size), "Size should be a valid number."); This seems unrelated, but whatever. > Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js:1782 > + console.assert(breakpointTreeElement, "Missing breakpoint descendant.", this); Ditto. 1301196 5 308128 commit-queue 2017-04-25 13:38:03 -0700 Comment on attachment 308128 [PATCH] Proposed Fix Clearing flags on attachment: 308128 Committed r215755: <http://trac.webkit.org/changeset/215755> 1301197 6 commit-queue 2017-04-25 13:38:05 -0700 All reviewed patches have been landed. Closing bug. 1301200 7 joepeck 2017-04-25 13:39:20 -0700 (In reply to Brian Burg from comment #4) > Comment on attachment 308128 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=308128&action=review > > r=me > > > Source/WebInspectorUI/UserInterface/Models/Resource.js:694 > > + console.assert(!isNaN(size), "Size should be a valid number."); > > This seems unrelated, but whatever. These are explained in the changelog. They are warnings produced by the optimizer, which is related to this bug (an issue only seen in optimized builds). 308127 2017-04-25 12:24:57 -0700 2017-04-25 12:25:47 -0700 [PATCH] Proposed Fix space-1.patch text/plain 6609 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAwMzE4MzhkNWQwLi42YWNiNGI4N2FhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTctMDQtMjUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiAiU3BhY2UiIGxvY2FsaXplZCBzdHJpbmcgaXMgbm90IGxvYWRlZCBpbiBjb21iaW5lZCBhbmQg bWluaWZpZWQgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzEyODMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwODcxMzcxPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNvbWJpbmVkIGFu ZCBtaW5pZmllZCBidWlsZHMsIHRoZSBkb2N1bWVudC53cml0ZSgpIHRvIGxvYWQgdGhlCisgICAg ICAgIGxvY2FsaXplZCBzdHJpbmdzIHNjcmlwdCBkb2Vzbid0IGhhcHBlbiBiZWZvcmUgdGhlIEtl eWJvYXJkU2hvcnRjdXQKKyAgICAgICAgZ2xvYmFsIGNvZGUgaW4gTWFpbi5qcyBldmFsdWF0ZXMs IHNvIHRoZXJlIGlzIG5vIFVJU3RyaW5nIGJlY2F1c2UKKyAgICAgICAgd2luZG93LmxvY2FsaXpl ZFN0cmluZ3MgaGFzbid0IHBvcHVsYXRlZCB5ZXQuIFNpbmNlIHRoaXMgaXMgdGhlIG9ubHkKKyAg ICAgICAgaW5zdGFuY2UsIHBvcHVsYXRlIHRoZSBkaXNwbGF5IFVJU3RyaW5nIGxhemlseSBhbmQg cHJvdmlkZSB3YXJuaW5ncworICAgICAgICBpbiBtaW5pZmllZCBidWlsZHMgaWYgdGhpcyBoYXBw ZW5zLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdz LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKToKKyAgICAgICAgUHJvdmlkZSBh IHdhcm5pbmcgaWYgYSBVSVN0cmluZyB3YXMgYXR0ZW1wdGVkIGJlZm9yZSB0aGUgc3RyaW5ncyBo YXZlIGxvYWRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLmxvYWRlZCk6CisgICAgICAgIEZvciB0aGlzIHJhcmUgaW5zdGFu Y2UsIHBvcHVsYXRlIHRoZSBkaXNwbGF5IG5hbWUgb2YgdGhlIHN0cmluZyB3aGVuIHdlIGFyZQor ICAgICAgICBzdXJlIHN0cmluZ3MgaGF2ZSBsb2FkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9LZXlib2FyZFNob3J0Y3V0LmpzOgorICAgICAgICBSZXZlcnQgdGhlIFVJU3Ry aW5nIGhlcmUsIGJ1dCBub3RlIHRoYXQgaXQgd2lsbCBiZSBwb3B1bGF0ZWQgbGF0ZXIuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0Q2FjaGVkUmVzcG9uc2VCb2R5U2l6ZSk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3N0YXR1c0ltYWdlQ29udGV4 dG1lbnUpOgorICAgICAgICBBZGRyZXNzIGNvbnNvbGUuYXNzZXJ0cyBub3QgZW5kaW5nIGluIHNl bWljb2xvbiB3YXJuaW5ncyBwcm9kdWNlZCBkdXJpbmcKKyAgICAgICAgb3B0aW1pemVkIGJ1aWxk cy4gV2l0aG91dCBzZW1pY29sb25zIHRoZXkgYXJlIG5vdCBzdHJpcHBlZC4KKwogMjAxNy0wNC0y MCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogQWRkIHJlZ3VsYXIgZXhwcmVzc2lvbiBzdXBwb3J0IHRvIFhIUiBicmVha3BvaW50cwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2Fk TG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYWZkOWQ4MmI3ODYuLjAxNDEyMDg2 OWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L0xvYWRMb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMKQEAgLTI3LDcgKzI3LDcgQEAK ICAgICBpZiAoV2ViSW5zcGVjdG9yLmRvbnRMb2NhbGl6ZVVzZXJJbnRlcmZhY2UpCiAgICAgICAg IHJldHVybjsKIAotICAgIHZhciBsb2NhbGl6ZWRTdHJpbmdzVVJMID0gSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmxvY2FsaXplZFN0cmluZ3NVUkwoKTsKKyAgICBsZXQgbG9jYWxpemVkU3RyaW5nc1VS TCA9IEluc3BlY3RvckZyb250ZW5kSG9zdC5sb2NhbGl6ZWRTdHJpbmdzVVJMKCk7CiAgICAgY29u c29sZS5hc3NlcnQobG9jYWxpemVkU3RyaW5nc1VSTCk7CiAgICAgaWYgKGxvY2FsaXplZFN0cmlu Z3NVUkwpCiAgICAgICAgIGRvY3VtZW50LndyaXRlKCI8c2NyaXB0IHNyYz1cIiIgKyBsb2NhbGl6 ZWRTdHJpbmdzVVJMICsgIlwiPjwvc2NyaXB0PiIpOwpAQCAtNDksNiArNDksOSBAQCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIHZhcmFyZykKICAgICBpZiAod2luZG93 LmxvY2FsaXplZFN0cmluZ3MgJiYgc3RyaW5nIGluIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQog ICAgICAgICByZXR1cm4gd2luZG93LmxvY2FsaXplZFN0cmluZ3Nbc3RyaW5nXTsKIAorICAgIGlm ICghd2luZG93LmxvY2FsaXplZFN0cmluZ3MpCisgICAgICAgIGNvbnNvbGUuZXJyb3IoYEF0dGVt cHRlZCB0byBsb2FkIGEgbG9jYWxpemVkIHN0cmluZyAiJHtzdHJpbmd9IiBiZWZvcmUgbG9jYWxp emVkU3RyaW5ncyB3YXMgaW5pdGlhbGl6ZWQuYCk7CisKICAgICBpZiAoIXRoaXMuX21pc3NpbmdM b2NhbGl6ZWRTdHJpbmdzKQogICAgICAgICB0aGlzLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncyA9 IHt9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKaW5kZXggNmRhOTZjY2JjMmIuLjE4YTEzMzZiZTVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBAIC0xMTIsNiArMTEyLDkg QEAgV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0aW9uKCkKICAgICAvLyBUaGlzIGxldHMgdXMg c2F2ZSBhIHN0YXRlIGNvb2tpZSBiZWZvcmUgYW55IG1hbmFnZXJzIG9yIHNpZGViYXJzIGRvIGFu eSByZXNldHMgdGhhdCB3b3VsZCBhZmZlY3Qgc3RhdGUgKG5hbWVseSBUaW1lbGluZU1hbmFnZXIp LgogICAgIFdlYkluc3BlY3Rvci5GcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5G cmFtZS5FdmVudC5Qcm92aXNpb25hbExvYWRTdGFydGVkLCB0aGlzLl9wcm92aXNpb25hbExvYWRT dGFydGVkLCB0aGlzKTsKIAorICAgIC8vIFBvcHVsYXRlIGFueSBVSVN0cmluZ3MgdGhhdCBtdXN0 IGJlIGRvbmUgZWFybHkgYWZ0ZXIgbG9jYWxpemVkIHN0cmluZ3MgaGF2ZSBsb2FkZWQuCisgICAg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LlNwYWNlLl9kaXNwbGF5TmFtZSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiU3BhY2UiKTsKKwogICAgIC8vIENyZWF0ZSB0aGUgc2luZ2xl dG9uIG1hbmFnZXJzIG5leHQsIGJlZm9yZSB0aGUgdXNlciBpbnRlcmZhY2UgZWxlbWVudHMsIHNv IHRoZSB1c2VyIGludGVyZmFjZSBjYW4gcmVnaXN0ZXIKICAgICAvLyBhcyBldmVudCBsaXN0ZW5l cnMgb24gdGhlc2UgbWFuYWdlcnMuCiAgICAgdGhpcy50YXJnZXRNYW5hZ2VyID0gbmV3IFdlYklu c3BlY3Rvci5UYXJnZXRNYW5hZ2VyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0tleWJvYXJkU2hvcnRjdXQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCBm MTQyYWZmZThiNC4uMDA5YjFkNmU1MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9LZXlib2FyZFNob3J0Y3V0LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9LZXlib2FyZFNob3J0Y3V0LmpzCkBA IC0yMzIsNyArMjMyLDcgQEAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5ID0gewog ICAgIFRhYjogbmV3IFdlYkluc3BlY3Rvci5LZXkoOSwgIlx1MjFlNSIpLAogICAgIEVudGVyOiBu ZXcgV2ViSW5zcGVjdG9yLktleSgxMywgIlx1MjFhOSIpLAogICAgIEVzY2FwZTogbmV3IFdlYklu c3BlY3Rvci5LZXkoMjcsICJcdTIzOGIiKSwKLSAgICBTcGFjZTogbmV3IFdlYkluc3BlY3Rvci5L ZXkoMzIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3BhY2UiKSksCisgICAgU3BhY2U6IG5ldyBX ZWJJbnNwZWN0b3IuS2V5KDMyLCAiU3BhY2UiKSwgLy8gVUlTdHJpbmcgcG9wdWxhdGVkIGluIFdl Ykluc3BlY3Rvci5sb2FkZWQuCiAgICAgUGFnZVVwOiBuZXcgV2ViSW5zcGVjdG9yLktleSgzMywg Ilx1MjFkZSIpLAogICAgIFBhZ2VEb3duOiBuZXcgV2ViSW5zcGVjdG9yLktleSgzNCwgIlx1MjFk ZiIpLAogICAgIEVuZDogbmV3IFdlYkluc3BlY3Rvci5LZXkoMzUsICJcdTIxOTgiKSwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJj ZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJj ZS5qcwppbmRleCA1MjUwYzNmZTRlOS4uNWVmZjdjYWViNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKQEAgLTY5 MSw3ICs2OTEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UgPSBjbGFzcyBSZXNvdXJjZSBleHRl bmRzIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlCiAKICAgICBzZXRDYWNoZWRSZXNwb25zZUJvZHlT aXplKHNpemUpCiAgICAgewotICAgICAgICBjb25zb2xlLmFzc2VydCghaXNOYU4oc2l6ZSksICJT aXplIHNob3VsZCBiZSBhIHZhbGlkIG51bWJlci4iKQorICAgICAgICBjb25zb2xlLmFzc2VydCgh aXNOYU4oc2l6ZSksICJTaXplIHNob3VsZCBiZSBhIHZhbGlkIG51bWJlci4iKTsKICAgICAgICAg Y29uc29sZS5hc3NlcnQoaXNOYU4odGhpcy5fY2FjaGVkUmVzcG9uc2VCb2R5U2l6ZSksICJUaGlz IHNob3VsZCBvbmx5IGJlIHNldCBvbmNlLiIpOwogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlz Ll9lc3RpbWF0ZWRTaXplID09PSBzaXplLCAiVGhlIGxlZ2FjeSBwYXRoIHdhcyB1cGRhdGVkIGFs cmVhZHkgYW5kIG1hdGNoZXMuIik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKaW5kZXggMmJjMWVk Y2M0NmEuLjZhY2EyYmM1MmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcwpAQCAtMTc3OSw3ICsx Nzc5LDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1l bnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZUVsZW0KIAogICAgICAgICBjb250ZXh0TWVudS5h cHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2ZWFsIEJyZWFrcG9pbnQiKSwgKCkg PT4gewogICAgICAgICAgICAgbGV0IGJyZWFrcG9pbnRUcmVlRWxlbWVudCA9IHRoaXMuc2VsZk9y RGVzY2VuZGFudCgodHJlZUVsZW1lbnQpID0+IHRyZWVFbGVtZW50LmJyZWFrcG9pbnRTdGF0dXMg JiYgdHJlZUVsZW1lbnQuYnJlYWtwb2ludFN0YXR1cyAhPT0gV2ViSW5zcGVjdG9yLkRPTVRyZWVF bGVtZW50LkJyZWFrcG9pbnRTdGF0dXMuTm9uZSk7Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2Vy dChicmVha3BvaW50VHJlZUVsZW1lbnQsICJNaXNzaW5nIGJyZWFrcG9pbnQgZGVzY2VuZGFudC4i LCB0aGlzKQorICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoYnJlYWtwb2ludFRyZWVFbGVtZW50 LCAiTWlzc2luZyBicmVha3BvaW50IGRlc2NlbmRhbnQuIiwgdGhpcyk7CiAgICAgICAgICAgICBp ZiAoIWJyZWFrcG9pbnRUcmVlRWxlbWVudCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAK 308128 2017-04-25 12:25:47 -0700 2017-04-25 13:38:03 -0700 [PATCH] Proposed Fix space-2.patch text/plain 6607 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAwMzE4MzhkNWQwLi42YWNiNGI4N2FhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTctMDQtMjUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiAiU3BhY2UiIGxvY2FsaXplZCBzdHJpbmcgaXMgbm90IGxvYWRlZCBpbiBjb21iaW5lZCBhbmQg bWluaWZpZWQgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzEyODMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwODcxMzcxPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNvbWJpbmVkIGFu ZCBtaW5pZmllZCBidWlsZHMsIHRoZSBkb2N1bWVudC53cml0ZSgpIHRvIGxvYWQgdGhlCisgICAg ICAgIGxvY2FsaXplZCBzdHJpbmdzIHNjcmlwdCBkb2Vzbid0IGhhcHBlbiBiZWZvcmUgdGhlIEtl eWJvYXJkU2hvcnRjdXQKKyAgICAgICAgZ2xvYmFsIGNvZGUgaW4gTWFpbi5qcyBldmFsdWF0ZXMs IHNvIHRoZXJlIGlzIG5vIFVJU3RyaW5nIGJlY2F1c2UKKyAgICAgICAgd2luZG93LmxvY2FsaXpl ZFN0cmluZ3MgaGFzbid0IHBvcHVsYXRlZCB5ZXQuIFNpbmNlIHRoaXMgaXMgdGhlIG9ubHkKKyAg ICAgICAgaW5zdGFuY2UsIHBvcHVsYXRlIHRoZSBkaXNwbGF5IFVJU3RyaW5nIGxhemlseSBhbmQg cHJvdmlkZSB3YXJuaW5ncworICAgICAgICBpbiBtaW5pZmllZCBidWlsZHMgaWYgdGhpcyBoYXBw ZW5zLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL0xvYWRMb2NhbGl6ZWRTdHJpbmdz LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKToKKyAgICAgICAgUHJvdmlkZSBh IHdhcm5pbmcgaWYgYSBVSVN0cmluZyB3YXMgYXR0ZW1wdGVkIGJlZm9yZSB0aGUgc3RyaW5ncyBo YXZlIGxvYWRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLmxvYWRlZCk6CisgICAgICAgIEZvciB0aGlzIHJhcmUgaW5zdGFu Y2UsIHBvcHVsYXRlIHRoZSBkaXNwbGF5IG5hbWUgb2YgdGhlIHN0cmluZyB3aGVuIHdlIGFyZQor ICAgICAgICBzdXJlIHN0cmluZ3MgaGF2ZSBsb2FkZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9LZXlib2FyZFNob3J0Y3V0LmpzOgorICAgICAgICBSZXZlcnQgdGhlIFVJU3Ry aW5nIGhlcmUsIGJ1dCBub3RlIHRoYXQgaXQgd2lsbCBiZSBwb3B1bGF0ZWQgbGF0ZXIuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0Q2FjaGVkUmVzcG9uc2VCb2R5U2l6ZSk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX3N0YXR1c0ltYWdlQ29udGV4 dG1lbnUpOgorICAgICAgICBBZGRyZXNzIGNvbnNvbGUuYXNzZXJ0cyBub3QgZW5kaW5nIGluIHNl bWljb2xvbiB3YXJuaW5ncyBwcm9kdWNlZCBkdXJpbmcKKyAgICAgICAgb3B0aW1pemVkIGJ1aWxk cy4gV2l0aG91dCBzZW1pY29sb25zIHRoZXkgYXJlIG5vdCBzdHJpcHBlZC4KKwogMjAxNy0wNC0y MCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogQWRkIHJlZ3VsYXIgZXhwcmVzc2lvbiBzdXBwb3J0IHRvIFhIUiBicmVha3BvaW50cwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9Mb2Fk TG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYWZkOWQ4MmI3ODYuLmYzZDM1OTli ODhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L0xvYWRMb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvTG9hZExvY2FsaXplZFN0cmluZ3MuanMKQEAgLTI3LDcgKzI3LDcgQEAK ICAgICBpZiAoV2ViSW5zcGVjdG9yLmRvbnRMb2NhbGl6ZVVzZXJJbnRlcmZhY2UpCiAgICAgICAg IHJldHVybjsKIAotICAgIHZhciBsb2NhbGl6ZWRTdHJpbmdzVVJMID0gSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmxvY2FsaXplZFN0cmluZ3NVUkwoKTsKKyAgICBsZXQgbG9jYWxpemVkU3RyaW5nc1VS TCA9IEluc3BlY3RvckZyb250ZW5kSG9zdC5sb2NhbGl6ZWRTdHJpbmdzVVJMKCk7CiAgICAgY29u c29sZS5hc3NlcnQobG9jYWxpemVkU3RyaW5nc1VSTCk7CiAgICAgaWYgKGxvY2FsaXplZFN0cmlu Z3NVUkwpCiAgICAgICAgIGRvY3VtZW50LndyaXRlKCI8c2NyaXB0IHNyYz1cIiIgKyBsb2NhbGl6 ZWRTdHJpbmdzVVJMICsgIlwiPjwvc2NyaXB0PiIpOwpAQCAtNDksNiArNDksOSBAQCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIHZhcmFyZykKICAgICBpZiAod2luZG93 LmxvY2FsaXplZFN0cmluZ3MgJiYgc3RyaW5nIGluIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQog ICAgICAgICByZXR1cm4gd2luZG93LmxvY2FsaXplZFN0cmluZ3Nbc3RyaW5nXTsKIAorICAgIGlm ICghd2luZG93LmxvY2FsaXplZFN0cmluZ3MpCisgICAgICAgIGNvbnNvbGUuZXJyb3IoYEF0dGVt cHRlZCB0byBsb2FkIGxvY2FsaXplZCBzdHJpbmcgIiR7c3RyaW5nfSIgYmVmb3JlIGxvY2FsaXpl ZFN0cmluZ3Mgd2FzIGluaXRpYWxpemVkLmApOworCiAgICAgaWYgKCF0aGlzLl9taXNzaW5nTG9j YWxpemVkU3RyaW5ncykKICAgICAgICAgdGhpcy5fbWlzc2luZ0xvY2FsaXplZFN0cmluZ3MgPSB7 fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzCmluZGV4IDZkYTk2Y2NiYzJiLi4xOGExMzM2YmU1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTEyLDYgKzExMiw5IEBA IFdlYkluc3BlY3Rvci5sb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgLy8gVGhpcyBsZXRzIHVzIHNh dmUgYSBzdGF0ZSBjb29raWUgYmVmb3JlIGFueSBtYW5hZ2VycyBvciBzaWRlYmFycyBkbyBhbnkg cmVzZXRzIHRoYXQgd291bGQgYWZmZWN0IHN0YXRlIChuYW1lbHkgVGltZWxpbmVNYW5hZ2VyKS4K ICAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJh bWUuRXZlbnQuUHJvdmlzaW9uYWxMb2FkU3RhcnRlZCwgdGhpcy5fcHJvdmlzaW9uYWxMb2FkU3Rh cnRlZCwgdGhpcyk7CiAKKyAgICAvLyBQb3B1bGF0ZSBhbnkgVUlTdHJpbmdzIHRoYXQgbXVzdCBi ZSBkb25lIGVhcmx5IGFmdGVyIGxvY2FsaXplZCBzdHJpbmdzIGhhdmUgbG9hZGVkLgorICAgIFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleS5TcGFjZS5fZGlzcGxheU5hbWUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNwYWNlIik7CisKICAgICAvLyBDcmVhdGUgdGhlIHNpbmdsZXRv biBtYW5hZ2VycyBuZXh0LCBiZWZvcmUgdGhlIHVzZXIgaW50ZXJmYWNlIGVsZW1lbnRzLCBzbyB0 aGUgdXNlciBpbnRlcmZhY2UgY2FuIHJlZ2lzdGVyCiAgICAgLy8gYXMgZXZlbnQgbGlzdGVuZXJz IG9uIHRoZXNlIG1hbmFnZXJzLgogICAgIHRoaXMudGFyZ2V0TWFuYWdlciA9IG5ldyBXZWJJbnNw ZWN0b3IuVGFyZ2V0TWFuYWdlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9LZXlib2FyZFNob3J0Y3V0LmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0tleWJvYXJkU2hvcnRjdXQuanMKaW5kZXggZjE0 MmFmZmU4YjQuLjAwOWIxZDZlNTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvS2V5Ym9hcmRTaG9ydGN1dC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvS2V5Ym9hcmRTaG9ydGN1dC5qcwpAQCAt MjMyLDcgKzIzMiw3IEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleSA9IHsKICAg ICBUYWI6IG5ldyBXZWJJbnNwZWN0b3IuS2V5KDksICJcdTIxZTUiKSwKICAgICBFbnRlcjogbmV3 IFdlYkluc3BlY3Rvci5LZXkoMTMsICJcdTIxYTkiKSwKICAgICBFc2NhcGU6IG5ldyBXZWJJbnNw ZWN0b3IuS2V5KDI3LCAiXHUyMzhiIiksCi0gICAgU3BhY2U6IG5ldyBXZWJJbnNwZWN0b3IuS2V5 KDMyLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNwYWNlIikpLAorICAgIFNwYWNlOiBuZXcgV2Vi SW5zcGVjdG9yLktleSgzMiwgIlNwYWNlIiksIC8vIFVJU3RyaW5nIHBvcHVsYXRlZCBpbiBXZWJJ bnNwZWN0b3IubG9hZGVkLgogICAgIFBhZ2VVcDogbmV3IFdlYkluc3BlY3Rvci5LZXkoMzMsICJc dTIxZGUiKSwKICAgICBQYWdlRG93bjogbmV3IFdlYkluc3BlY3Rvci5LZXkoMzQsICJcdTIxZGYi KSwKICAgICBFbmQ6IG5ldyBXZWJJbnNwZWN0b3IuS2V5KDM1LCAiXHUyMTk4IiksCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2Uu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2Uu anMKaW5kZXggNTI1MGMzZmU0ZTkuLjVlZmY3Y2FlYjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCkBAIC02OTEs NyArNjkxLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlID0gY2xhc3MgUmVzb3VyY2UgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZQogCiAgICAgc2V0Q2FjaGVkUmVzcG9uc2VCb2R5U2l6 ZShzaXplKQogICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIWlzTmFOKHNpemUpLCAiU2l6 ZSBzaG91bGQgYmUgYSB2YWxpZCBudW1iZXIuIikKKyAgICAgICAgY29uc29sZS5hc3NlcnQoIWlz TmFOKHNpemUpLCAiU2l6ZSBzaG91bGQgYmUgYSB2YWxpZCBudW1iZXIuIik7CiAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KGlzTmFOKHRoaXMuX2NhY2hlZFJlc3BvbnNlQm9keVNpemUpLCAiVGhpcyBz aG91bGQgb25seSBiZSBzZXQgb25jZS4iKTsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5f ZXN0aW1hdGVkU2l6ZSA9PT0gc2l6ZSwgIlRoZSBsZWdhY3kgcGF0aCB3YXMgdXBkYXRlZCBhbHJl YWR5IGFuZCBtYXRjaGVzLiIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCmluZGV4IDJiYzFlZGNj NDZhLi42YWNhMmJjNTJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKQEAgLTE3NzksNyArMTc3 OSw3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50 IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlRyZWVFbGVtCiAKICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJldmVhbCBCcmVha3BvaW50IiksICgpID0+ IHsKICAgICAgICAgICAgIGxldCBicmVha3BvaW50VHJlZUVsZW1lbnQgPSB0aGlzLnNlbGZPckRl c2NlbmRhbnQoKHRyZWVFbGVtZW50KSA9PiB0cmVlRWxlbWVudC5icmVha3BvaW50U3RhdHVzICYm IHRyZWVFbGVtZW50LmJyZWFrcG9pbnRTdGF0dXMgIT09IFdlYkluc3BlY3Rvci5ET01UcmVlRWxl bWVudC5CcmVha3BvaW50U3RhdHVzLk5vbmUpOwotICAgICAgICAgICAgY29uc29sZS5hc3NlcnQo YnJlYWtwb2ludFRyZWVFbGVtZW50LCAiTWlzc2luZyBicmVha3BvaW50IGRlc2NlbmRhbnQuIiwg dGhpcykKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGJyZWFrcG9pbnRUcmVlRWxlbWVudCwg Ik1pc3NpbmcgYnJlYWtwb2ludCBkZXNjZW5kYW50LiIsIHRoaXMpOwogICAgICAgICAgICAgaWYg KCFicmVha3BvaW50VHJlZUVsZW1lbnQpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCg==