203164 2019-10-18 14:16:24 -0700 Web Inspector: Provide a flag for technology preview builds 2019-10-21 15:02:18 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck ews-watchlist hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1581511 0 joepeck 2019-10-18 14:16:24 -0700 Provide a flag for technology preview builds In case there are features we want to enable for Technology Previews provide a single setting switch to enable them in non-TechnologyPreview builds. 1581512 1 joepeck 2019-10-18 14:16:52 -0700 <rdar://problem/56202164> 1581516 2 381327 joepeck 2019-10-18 14:20:12 -0700 Created attachment 381327 [PATCH] Proposed Fix 1581519 3 381327 mattbaker 2019-10-18 14:26:38 -0700 Comment on attachment 381327 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=381327&action=review > Source/WebCore/inspector/InspectorFrontendHost.idl:86 > + boolean isExperimentalBuild(); Why not `readonly attribute boolean isExperimentalBuild`, similar to `isRemote`? 1581529 4 381327 joepeck 2019-10-18 14:33:20 -0700 Comment on attachment 381327 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=381327&action=review >> Source/WebCore/inspector/InspectorFrontendHost.idl:86 >> + boolean isExperimentalBuild(); > > Why not `readonly attribute boolean isExperimentalBuild`, similar to `isRemote`? They could both be booleans, I was just following the existing convention here. I don't think there is an advantage to either, so I'll keep these aligned. 1581551 5 381337 joepeck 2019-10-18 15:12:24 -0700 Created attachment 381337 [PATCH] Proposed Fix 1581567 6 381337 hi 2019-10-18 15:29:54 -0700 Comment on attachment 381337 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=381337&action=review r=me > Source/WebInspectorUI/ChangeLog:16 > + New flags. NIT: I don't think this adds much. I'd either add more description or leave it out. > Source/WebInspectorUI/ChangeLog:20 > + In non-TechnologyPreview builds, if there are Preview Features provide a NIT: in some places you capitalize "Preview Features" and in others you keep them lowercase. It'd be nice to be consistent one way or the other. > Source/WebInspectorUI/UserInterface/Base/Setting.js:215 > +WI.previewFeatures = []; Can we put the `[` and `]` on separate lines, so that if we do ever add anything to this the diff is smaller? Are we expecting the values of this to be `WI.Setting`? Perhaps we should call this `WI.previewFeatureSettings`? > Source/WebInspectorUI/UserInterface/Base/Setting.js:220 > +} Style: missing `;` > Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:352 > + if ((WI.isTechnologyPreviewBuild() || WI.isEngineeringBuild) && hasPreviewFeatures) { NIT: can we do `hasPreviewFeatures` first, so we don't even try to evaluate the others when we don't have any? It would also line up nicely with the variable declaration on the previous line :) ``` let hasPreviewFeatures = WI.previewFeatures.length > 0; if (hasPreviewFeatures && (WI.isTechnologyPreviewBuild() || WI.isEngineeringBuild)) { ``` 1581992 7 381337 joepeck 2019-10-21 13:30:22 -0700 Comment on attachment 381337 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=381337&action=review >> Source/WebInspectorUI/UserInterface/Base/Setting.js:215 >> +WI.previewFeatures = []; > > Can we put the `[` and `]` on separate lines, so that if we do ever add anything to this the diff is smaller? > > Are we expecting the values of this to be `WI.Setting`? Perhaps we should call this `WI.previewFeatureSettings`? I guess we can cross that bridge when we have a preview feature. Heck it could just be a string. I did imagine it being a setting in case we are graduating a setting (that way it would be easy to search for the use of the settings and find it in this list). But for a feature that doesn't even have a setting it could just be a string that we remove soon after. I don't know how frequently, if ever, we are going to need to use this list. >> Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:352 >> + if ((WI.isTechnologyPreviewBuild() || WI.isEngineeringBuild) && hasPreviewFeatures) { > > NIT: can we do `hasPreviewFeatures` first, so we don't even try to evaluate the others when we don't have any? It would also line up nicely with the variable declaration on the previous line :) > ``` > let hasPreviewFeatures = WI.previewFeatures.length > 0; > if (hasPreviewFeatures && (WI.isTechnologyPreviewBuild() || WI.isEngineeringBuild)) { > ``` Nice! 1582064 8 joepeck 2019-10-21 15:02:18 -0700 <https://trac.webkit.org/r251379> 381327 2019-10-18 14:20:12 -0700 2019-10-18 15:12:24 -0700 [PATCH] Proposed Fix preview-builds-1.patch text/plain 8867 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjMWYzZWIxZDA5Mi4uNmQ0NGZmMjU4MjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOS0xMC0xOCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFByb3ZpZGUgYSBmbGFnIGZvciB0ZWNobm9s b2d5IHByZXZpZXcgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDMxNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU2MjAyMTY0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG cm9udGVuZEhvc3Q6OmlzRXhwZXJpbWVudGFsQnVpbGQpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZEhvc3QuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmlkbDoKKwogMjAxOS0xMC0xNCAgUnVzc2VsbCBFcHN0ZWluICA8cnVzc2VsbF9l QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjUxMDgxLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9z dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNw cAppbmRleCA1YTkzZjNiNGFhNi4uZWViNDFkN2I4YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCkBAIC00NDYsNiArNDQ2LDE1 IEBAIGJvb2wgSW5zcGVjdG9yRnJvbnRlbmRIb3N0Ojppc1VuZGVyVGVzdCgpCiAgICAgcmV0dXJu IG1fY2xpZW50ICYmIG1fY2xpZW50LT5pc1VuZGVyVGVzdCgpOwogfQogCitib29sIEluc3BlY3Rv ckZyb250ZW5kSG9zdDo6aXNFeHBlcmltZW50YWxCdWlsZCgpCit7CisjaWYgRU5BQkxFKEVYUEVS SU1FTlRBTF9GRUFUVVJFUykKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbHNlCisgICAgcmV0dXJuIGZh bHNlOworI2VuZGlmCit9CisKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0Ojp1bmJ1ZmZlcmVk TG9nKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICAvLyBUaGlzIGlzIHVzZWQgb25seSBm b3IgZGVidWdnaW5nIGluc3BlY3RvciB0ZXN0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaAppbmRleCA1NmI4OWRmNjIyYi4uMGFhMzE4M2Q0 NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZEhvc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRI b3N0LmgKQEAgLTExMSw2ICsxMTEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNwYXRjaEV2ZW50 QXNDb250ZXh0TWVudUV2ZW50KEV2ZW50Jik7CiAKICAgICBib29sIGlzVW5kZXJUZXN0KCk7Cisg ICAgYm9vbCBpc0V4cGVyaW1lbnRhbEJ1aWxkKCk7CiAgICAgdm9pZCB1bmJ1ZmZlcmVkTG9nKGNv bnN0IFN0cmluZyYgbWVzc2FnZSk7CiAKICAgICB2b2lkIGJlZXAoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwKaW5kZXggOTBiM2Fm Y2RkOTEuLjU1ZTU1ZjA1Y2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbApAQCAtODMsNiArODMsNyBAQAogICAgIHZvaWQgdW5i dWZmZXJlZExvZyhET01TdHJpbmcgbWVzc2FnZSk7CiAKICAgICBib29sZWFuIGlzVW5kZXJUZXN0 KCk7CisgICAgYm9vbGVhbiBpc0V4cGVyaW1lbnRhbEJ1aWxkKCk7CiAKICAgICB2b2lkIGJlZXAo KTsKICAgICB2b2lkIGluc3BlY3RJbnNwZWN0b3IoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmlu ZGV4IDFlNTdmYmFjNWYxLi5kYzA3YTM0ZTc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTktMTAtMTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBQcm92aWRlIGEgZmxhZyBmb3IgdGVj aG5vbG9neSBwcmV2aWV3IGJ1aWxkcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAzMTY0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NjIwMjE2ND4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVGVzdC9UZXN0LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAo V0kuaXNUZWNobm9sb2d5UHJldmlld0J1aWxkKToKKyAgICAgICAgKFdJLmFyZVByZXZpZXdGZWF0 dXJlc0VuYWJsZWQpOgorICAgICAgICBOZXcgZmxhZ3MuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5n c1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3 KToKKyAgICAgICAgSW4gbm9uLVRlY2hub2xvZ3lQcmV2aWV3IGJ1aWxkcywgaWYgdGhlcmUgYXJl IFByZXZpZXcgRmVhdHVyZXMgcHJvdmlkZSBhCisgICAgICAgIHNldHRpbmcgc3dpdGNoIHRoYXQg Y2FuIGJlIHVzZWQgdG8gbWF0Y2ggdGhlIFRlY2hub2xvZ3lQcmV2aWV3IGZlYXR1cmVzLgorCiAy MDE5LTEwLTExICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBEZWJ1Z2dlcjogc3VwcG9ydCBwYXR0ZXJuIGJsYWNrYm94aW5nCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA3OGE4ODliYzNjZS4uMmY5YjVhM2VlNWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXph dGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAtNDQzLDYgKzQ0Myw3IEBAIGxv Y2FsaXplZFN0cmluZ3NbIkVuYWJsZSBFdmVudCBMaXN0ZW5lcnMiXSA9ICJFbmFibGUgRXZlbnQg TGlzdGVuZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBMYXllcnMgVGFiIl0gPSAiRW5h YmxlIExheWVycyBUYWIiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIExvY2FsIE92ZXJyaWRl Il0gPSAiRW5hYmxlIExvY2FsIE92ZXJyaWRlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBO ZXcgVGFiIEJhciJdID0gIkVuYWJsZSBOZXcgVGFiIEJhciI7Citsb2NhbGl6ZWRTdHJpbmdzWyJF bmFibGUgUHJldmlldyBGZWF0dXJlcyJdID0gIkVuYWJsZSBQcmV2aWV3IEZlYXR1cmVzIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkVuYWJsZSBQcm9ncmFtIl0gPSAiRW5hYmxlIFByb2dyYW0iOwogbG9j YWxpemVkU3RyaW5nc1siRW5hYmxlIFJ1bGUiXSA9ICJFbmFibGUgUnVsZSI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJFbmFibGUgYWxsIGJyZWFrcG9pbnRzICglcykiXSA9ICJFbmFibGUgYWxsIGJyZWFr cG9pbnRzICglcykiOwpAQCAtMTA2NSw2ICsxMDY2LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siU3Bl Y2lhbGx5IEV4cG9zZWQgRGF0YSJdID0gIlNwZWNpYWxseSBFeHBvc2VkIERhdGEiOwogbG9jYWxp emVkU3RyaW5nc1siU3BlY2lmaWNpdHk6ICglZCwgJWQsICVkKSJdID0gIlNwZWNpZmljaXR5OiAo JWQsICVkLCAlZCkiOwogbG9jYWxpemVkU3RyaW5nc1siU3BlY2lmaWNpdHk6IE5vIHZhbHVlIGZv ciBzZWxlY3RlZCBlbGVtZW50Il0gPSAiU3BlY2lmaWNpdHk6IE5vIHZhbHVlIGZvciBzZWxlY3Rl ZCBlbGVtZW50IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNwZWxsaW5nIl0gPSAiU3BlbGxpbmciOwor bG9jYWxpemVkU3RyaW5nc1siU3RhZ2luZzoiXSA9ICJTdGFnaW5nOiI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJTdGFsbGVkIl0gPSAiU3RhbGxlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdGFydCJdID0g IlN0YXJ0IjsKIGxvY2FsaXplZFN0cmluZ3NbIlN0YXJ0IFRpbWUiXSA9ICJTdGFydCBUaW1lIjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFp bi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpp bmRleCA2ZmIzNTdmMGY2ZC4uNjc3Y2U3NjAwY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTMyNDYsNiArMzI0Niw3IEBAIFdJ LnJlc2V0ID0gYXN5bmMgZnVuY3Rpb24oKQogfTsKIAogV0kuaXNFbmdpbmVlcmluZ0J1aWxkID0g ZmFsc2U7CitXSS5pc0V4cGVyaW1lbnRhbEJ1aWxkID0gSW5zcGVjdG9yRnJvbnRlbmRIb3N0Lmlz RXhwZXJpbWVudGFsQnVpbGQoKTsKIAogLy8gT3BlblJlc291cmNlRGlhbG9nIGRlbGVnYXRlCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0 dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGlu Zy5qcwppbmRleCBmMTU1Nzc5MjQ0MC4uYWYxY2M2MWUwYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKQEAgLTE4Niw2ICsx ODYsNyBAQCBXSS5zZXR0aW5ncyA9IHsKICAgICB6b29tRmFjdG9yOiBuZXcgV0kuU2V0dGluZygi em9vbS1mYWN0b3IiLCAxKSwKIAogICAgIC8vIEV4cGVyaW1lbnRhbAorICAgIGV4cGVyaW1lbnRh bEVuYWJsZVByZXZpZXdGZWF0dXJlczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFi bGUtcHJldmlldy1mZWF0dXJlcyIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVMYXll cnNUYWI6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLWxheWVycy10YWIiLCBm YWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTmV3VGFiQmFyOiBuZXcgV0kuU2V0dGluZygi ZXhwZXJpbWVudGFsLWVuYWJsZS1uZXctdGFiLWJhciIsIGZhbHNlKSwKICAgICBleHBlcmltZW50 YWxFbmFibGVTdHlsZXNJY29uczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1zdHlsZXMt aWNvbnMiLCBmYWxzZSksCkBAIC0yMTAsMyArMjExLDIxIEBAIFdJLnNldHRpbmdzID0gewogICAg IGRlYnVnRW5hYmxlVW5jYXVnaHRFeGNlcHRpb25SZXBvcnRlcjogbmV3IFdJLlNldHRpbmcoImRl YnVnLWVuYWJsZS11bmNhdWdodC1leGNlcHRpb24tcmVwb3J0ZXIiLCB0cnVlKSwKICAgICBkZWJ1 Z0xheW91dERpcmVjdGlvbjogbmV3IFdJLlNldHRpbmcoImRlYnVnLWxheW91dC1kaXJlY3Rpb24t b3ZlcnJpZGUiLCAic3lzdGVtIiksCiB9OworCitXSS5wcmV2aWV3RmVhdHVyZXMgPSBbXTsKKwor V0kuaXNUZWNobm9sb2d5UHJldmlld0J1aWxkID0gZnVuY3Rpb24oKQoreworICAgIHJldHVybiBX SS5pc0V4cGVyaW1lbnRhbEJ1aWxkICYmICFXSS5pc0VuZ2luZWVyaW5nQnVpbGQ7Cit9CisKK1dJ LmFyZVByZXZpZXdGZWF0dXJlc0VuYWJsZWQgPSBmdW5jdGlvbigpCit7CisgICAgaWYgKFdJLmlz RXhwZXJpbWVudGFsQnVpbGQpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgaWYgKFdJLnNl dHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVByZXZpZXdGZWF0dXJlcy52YWx1ZSkKKyAgICAgICAg cmV0dXJuIHRydWU7CisKKyAgICByZXR1cm4gZmFsc2U7Cit9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0LmpzCmluZGV4IDc1NzA4YTAwYzk1Li5j NmEyZTY0Zjg2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVGVzdC9UZXN0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1Rlc3QvVGVzdC5qcwpAQCAtMTk2LDYgKzE5Niw5IEBAIFdJLmFzc3VtaW5nTWFpblRhcmdldCA9 ICgpID0+IFdJLm1haW5UYXJnZXQ7CiAKIFdJLmlzRGVidWdVSUVuYWJsZWQgPSAoKSA9PiBmYWxz ZTsKIAorV0kuaXNFbmdpbmVlcmluZ0J1aWxkID0gZmFsc2U7CitXSS5pc0V4cGVyaW1lbnRhbEJ1 aWxkID0gdHJ1ZTsKKwogV0kudW5sb2NhbGl6ZWRTdHJpbmcgPSAoc3RyaW5nKSA9PiBzdHJpbmc7 CiBXSS5VSVN0cmluZyA9IChzdHJpbmcsIGtleSwgY29tbWVudCkgPT4gc3RyaW5nOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5n c1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCBkMTM4NTM5NDBiNy4uZjNmZjIy OTg0N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMzQ2LDYg KzM0NiwxNCBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJD b250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogCiAgICAgICAgIGxldCBpbml0aWFs VmFsdWVzID0gbmV3IE1hcDsKIAorICAgICAgICAvLyBXZWJLaXQgbWF5IGJ5IGRlZmF1bHQgZW5h YmxlIGNlcnRhaW4gZmVhdHVyZXMgaW4gYSBUZWNobm9sb2d5IFByZXZpZXcgdGhhdCBhcmUgbm90 IGVuYWJsZWQgaW4gdHJ1bmsuCisgICAgICAgIC8vIFByb3ZpZGUgYSBzd2l0Y2ggdGhhdCB3aWxs IG1ha2Ugbm9uLXByZXZpZXcgYnVpbGRzIGJlaGF2ZSBsaWtlIGFuIGV4cGVyaW1lbnRhbCBidWls ZCwgZm9yIHRob3NlIHByZXZpZXcgZmVhdHVyZXMuCisgICAgICAgIGxldCBoYXNQcmV2aWV3RmVh dHVyZXMgPSBXSS5wcmV2aWV3RmVhdHVyZXMubGVuZ3RoID4gMDsKKyAgICAgICAgaWYgKChXSS5p c1RlY2hub2xvZ3lQcmV2aWV3QnVpbGQoKSB8fCBXSS5pc0VuZ2luZWVyaW5nQnVpbGQpICYmIGhh c1ByZXZpZXdGZWF0dXJlcykgeworICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3 LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIlN0YWdpbmc6IiksIFdJLnNldHRpbmdzLmV4cGVyaW1l bnRhbEVuYWJsZVByZXZpZXdGZWF0dXJlcywgV0kuVUlTdHJpbmcoIkVuYWJsZSBQcmV2aWV3IEZl YXR1cmVzIikpOworICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFy YXRvcigpOworICAgICAgICB9CisKICAgICAgICAgaWYgKHdpbmRvdy5MYXllclRyZWVBZ2VudCkg ewogICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kuVUlT dHJpbmcoIkxheWVyczoiKSwgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFi LCBXSS5VSVN0cmluZygiRW5hYmxlIExheWVycyBUYWIiKSk7CiAgICAgICAgICAgICBleHBlcmlt ZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7CkBAIC0zODEsNiArMzg5LDcgQEAgV0ku U2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAKKyAgICAg ICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVByZXZpZXdG ZWF0dXJlcyk7CiAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50 YWxFbmFibGVMYXllcnNUYWIpOwogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3Mu ZXhwZXJpbWVudGFsRW5hYmxlTmV3VGFiQmFyKTsKIAo= 381337 2019-10-18 15:12:24 -0700 2019-10-21 13:30:22 -0700 [PATCH] Proposed Fix v2.patch text/plain 8907 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwM2U0Yzc5NTc3My4uM2U2OWMxMmI5MGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOS0xMC0xOCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFByb3ZpZGUgYSBmbGFnIGZvciB0ZWNobm9s b2d5IHByZXZpZXcgYnVpbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDMxNjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU2MjAyMTY0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG cm9udGVuZEhvc3Q6OmlzRXhwZXJpbWVudGFsQnVpbGQpOgorICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZEhvc3QuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmlkbDoKKwogMjAxOS0xMC0xOCAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0gSW1wbGVtZW50IEF1dGhlbnRpY2F0b3JDYW5j ZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZEhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9z dC5jcHAKaW5kZXggNWE5M2YzYjRhYTYuLmVlYjQxZDdiOGFjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcApAQCAtNDQ2LDYgKzQ0 NiwxNSBAQCBib29sIEluc3BlY3RvckZyb250ZW5kSG9zdDo6aXNVbmRlclRlc3QoKQogICAgIHJl dHVybiBtX2NsaWVudCAmJiBtX2NsaWVudC0+aXNVbmRlclRlc3QoKTsKIH0KIAorYm9vbCBJbnNw ZWN0b3JGcm9udGVuZEhvc3Q6OmlzRXhwZXJpbWVudGFsQnVpbGQoKQoreworI2lmIEVOQUJMRShF WFBFUklNRU5UQUxfRkVBVFVSRVMpCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQorICAgIHJldHVy biBmYWxzZTsKKyNlbmRpZgorfQorCiB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6dW5idWZm ZXJlZExvZyhjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiB7CiAgICAgLy8gVGhpcyBpcyB1c2VkIG9u bHkgZm9yIGRlYnVnZ2luZyBpbnNwZWN0b3IgdGVzdHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmgKaW5kZXggNTZiODlkZjYyMmIuLjBhYTMx ODNkNDU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kSG9zdC5oCkBAIC0xMTEsNiArMTExLDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hF dmVudEFzQ29udGV4dE1lbnVFdmVudChFdmVudCYpOwogCiAgICAgYm9vbCBpc1VuZGVyVGVzdCgp OworICAgIGJvb2wgaXNFeHBlcmltZW50YWxCdWlsZCgpOwogICAgIHZvaWQgdW5idWZmZXJlZExv Zyhjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOwogCiAgICAgdm9pZCBiZWVwKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbCBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsCmluZGV4IDkw YjNhZmNkZDkxLi41NWU1NWYwNWNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwKQEAgLTgzLDYgKzgzLDcgQEAKICAgICB2b2lk IHVuYnVmZmVyZWRMb2coRE9NU3RyaW5nIG1lc3NhZ2UpOwogCiAgICAgYm9vbGVhbiBpc1VuZGVy VGVzdCgpOworICAgIGJvb2xlYW4gaXNFeHBlcmltZW50YWxCdWlsZCgpOwogCiAgICAgdm9pZCBi ZWVwKCk7CiAgICAgdm9pZCBpbnNwZWN0SW5zcGVjdG9yKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZwppbmRleCBhNjIxYzM1YzIzNC4uMDRhMGY4NTE1NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTEwLTE4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvdmlkZSBhIGZsYWcgZm9y IHRlY2hub2xvZ3kgcHJldmlldyBidWlsZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwMzE2NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYyMDIx NjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBM b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2Uv TWFpbi5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAg ICAgKFdJLmlzVGVjaG5vbG9neVByZXZpZXdCdWlsZCk6CisgICAgICAgIChXSS5hcmVQcmV2aWV3 RmVhdHVyZXNFbmFibGVkKToKKyAgICAgICAgTmV3IGZsYWdzLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUV4cGVyaW1lbnRhbFNldHRpbmdz Vmlldyk6CisgICAgICAgIEluIG5vbi1UZWNobm9sb2d5UHJldmlldyBidWlsZHMsIGlmIHRoZXJl IGFyZSBQcmV2aWV3IEZlYXR1cmVzIHByb3ZpZGUgYQorICAgICAgICBzZXR0aW5nIHN3aXRjaCB0 aGF0IGNhbiBiZSB1c2VkIHRvIG1hdGNoIHRoZSBUZWNobm9sb2d5UHJldmlldyBmZWF0dXJlcy4K KwogMjAxOS0xMC0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHM6IHNlbGVjdGlvbiBzaG91bGRuJ3QgYmUgZGltbWVk IGJ5IHNoYWRvdyB0cmVlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggNWE0 NzMwM2YyNWMuLjU3MjU2YjU0Y2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK QEAgLTQ0MSw2ICs0NDEsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgRXZlbnQgTGlzdGVu ZXJzIl0gPSAiRW5hYmxlIEV2ZW50IExpc3RlbmVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFi bGUgTGF5ZXJzIFRhYiJdID0gIkVuYWJsZSBMYXllcnMgVGFiIjsKIGxvY2FsaXplZFN0cmluZ3Nb IkVuYWJsZSBMb2NhbCBPdmVycmlkZSJdID0gIkVuYWJsZSBMb2NhbCBPdmVycmlkZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJFbmFibGUgTmV3IFRhYiBCYXIiXSA9ICJFbmFibGUgTmV3IFRhYiBCYXIi OworbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIFByZXZpZXcgRmVhdHVyZXMiXSA9ICJFbmFibGUg UHJldmlldyBGZWF0dXJlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgUHJvZ3JhbSJdID0g IkVuYWJsZSBQcm9ncmFtIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBSdWxlIl0gPSAiRW5h YmxlIFJ1bGUiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIGFsbCBicmVha3BvaW50cyAoJXMp Il0gPSAiRW5hYmxlIGFsbCBicmVha3BvaW50cyAoJXMpIjsKQEAgLTEwNjMsNiArMTA2NCw3IEBA IGxvY2FsaXplZFN0cmluZ3NbIlNwZWNpYWxseSBFeHBvc2VkIERhdGEiXSA9ICJTcGVjaWFsbHkg RXhwb3NlZCBEYXRhIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNwZWNpZmljaXR5OiAoJWQsICVkLCAl ZCkiXSA9ICJTcGVjaWZpY2l0eTogKCVkLCAlZCwgJWQpIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNw ZWNpZmljaXR5OiBObyB2YWx1ZSBmb3Igc2VsZWN0ZWQgZWxlbWVudCJdID0gIlNwZWNpZmljaXR5 OiBObyB2YWx1ZSBmb3Igc2VsZWN0ZWQgZWxlbWVudCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTcGVs bGluZyJdID0gIlNwZWxsaW5nIjsKK2xvY2FsaXplZFN0cmluZ3NbIlN0YWdpbmc6Il0gPSAiU3Rh Z2luZzoiOwogbG9jYWxpemVkU3RyaW5nc1siU3RhbGxlZCJdID0gIlN0YWxsZWQiOwogbG9jYWxp emVkU3RyaW5nc1siU3RhcnQiXSA9ICJTdGFydCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdGFydCBU aW1lIl0gPSAiU3RhcnQgVGltZSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggNDA3MGZiZTE2ODIuLmI4YjNhN2EyZDM2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCkBA IC0zMjM1LDYgKzMyMzUsNyBAQCBXSS5yZXNldCA9IGFzeW5jIGZ1bmN0aW9uKCkKIH07CiAKIFdJ LmlzRW5naW5lZXJpbmdCdWlsZCA9IGZhbHNlOworV0kuaXNFeHBlcmltZW50YWxCdWlsZCA9IElu c3BlY3RvckZyb250ZW5kSG9zdC5pc0V4cGVyaW1lbnRhbEJ1aWxkKCk7CiAKIC8vIE9wZW5SZXNv dXJjZURpYWxvZyBkZWxlZ2F0ZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggZjE1NTc3OTI0NDAuLmFmMWNjNjFlMGFk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1Nl dHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9T ZXR0aW5nLmpzCkBAIC0xODYsNiArMTg2LDcgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgem9vbUZh Y3RvcjogbmV3IFdJLlNldHRpbmcoInpvb20tZmFjdG9yIiwgMSksCiAKICAgICAvLyBFeHBlcmlt ZW50YWwKKyAgICBleHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXM6IG5ldyBXSS5TZXR0 aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLXByZXZpZXctZmVhdHVyZXMiLCBmYWxzZSksCiAgICAg ZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFs LWVuYWJsZS1sYXllcnMtdGFiIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZU5ld1Rh YkJhcjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtbmV3LXRhYi1iYXIiLCBm YWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSWNvbnM6IG5ldyBXSS5TZXR0aW5n KCJleHBlcmltZW50YWwtc3R5bGVzLWljb25zIiwgZmFsc2UpLApAQCAtMjEwLDMgKzIxMSwyMSBA QCBXSS5zZXR0aW5ncyA9IHsKICAgICBkZWJ1Z0VuYWJsZVVuY2F1Z2h0RXhjZXB0aW9uUmVwb3J0 ZXI6IG5ldyBXSS5TZXR0aW5nKCJkZWJ1Zy1lbmFibGUtdW5jYXVnaHQtZXhjZXB0aW9uLXJlcG9y dGVyIiwgdHJ1ZSksCiAgICAgZGVidWdMYXlvdXREaXJlY3Rpb246IG5ldyBXSS5TZXR0aW5nKCJk ZWJ1Zy1sYXlvdXQtZGlyZWN0aW9uLW92ZXJyaWRlIiwgInN5c3RlbSIpLAogfTsKKworV0kucHJl dmlld0ZlYXR1cmVzID0gW107CisKK1dJLmlzVGVjaG5vbG9neVByZXZpZXdCdWlsZCA9IGZ1bmN0 aW9uKCkKK3sKKyAgICByZXR1cm4gV0kuaXNFeHBlcmltZW50YWxCdWlsZCAmJiAhV0kuaXNFbmdp bmVlcmluZ0J1aWxkOworfQorCitXSS5hcmVQcmV2aWV3RmVhdHVyZXNFbmFibGVkID0gZnVuY3Rp b24oKQoreworICAgIGlmIChXSS5pc0V4cGVyaW1lbnRhbEJ1aWxkKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKworICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVh dHVyZXMudmFsdWUpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgcmV0dXJuIGZhbHNlOwor fTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3Qv VGVzdC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5q cwppbmRleCBiMzE4ZGRkNTFhMy4uYzIzNDIyMDI0YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdC5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3QuanMKQEAgLTE4NCw2ICsxODQsOSBAQCBX SS5hc3N1bWluZ01haW5UYXJnZXQgPSAoKSA9PiBXSS5tYWluVGFyZ2V0OwogCiBXSS5pc0RlYnVn VUlFbmFibGVkID0gKCkgPT4gZmFsc2U7CiAKK1dJLmlzRW5naW5lZXJpbmdCdWlsZCA9IGZhbHNl OworV0kuaXNFeHBlcmltZW50YWxCdWlsZCA9IHRydWU7CisKIFdJLnVubG9jYWxpemVkU3RyaW5n ID0gKHN0cmluZykgPT4gc3RyaW5nOwogV0kuVUlTdHJpbmcgPSAoc3RyaW5nLCBrZXksIGNvbW1l bnQpID0+IHN0cmluZzsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKaW5k ZXggMTUzYjNkY2U5OTYuLmM1YWEyMWU0ZWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29u dGVudFZpZXcuanMKQEAgLTM0Niw2ICszNDYsMTQgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50Vmll dyA9IGNsYXNzIFNldHRpbmdzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkK IAogICAgICAgICBsZXQgaW5pdGlhbFZhbHVlcyA9IG5ldyBNYXA7CiAKKyAgICAgICAgLy8gV2Vi S2l0IG1heSBieSBkZWZhdWx0IGVuYWJsZSBjZXJ0YWluIGZlYXR1cmVzIGluIGEgVGVjaG5vbG9n eSBQcmV2aWV3IHRoYXQgYXJlIG5vdCBlbmFibGVkIGluIHRydW5rLgorICAgICAgICAvLyBQcm92 aWRlIGEgc3dpdGNoIHRoYXQgd2lsbCBtYWtlIG5vbi1wcmV2aWV3IGJ1aWxkcyBiZWhhdmUgbGlr ZSBhbiBleHBlcmltZW50YWwgYnVpbGQsIGZvciB0aG9zZSBwcmV2aWV3IGZlYXR1cmVzLgorICAg ICAgICBsZXQgaGFzUHJldmlld0ZlYXR1cmVzID0gV0kucHJldmlld0ZlYXR1cmVzLmxlbmd0aCA+ IDA7CisgICAgICAgIGlmICgoV0kuaXNUZWNobm9sb2d5UHJldmlld0J1aWxkKCkgfHwgV0kuaXNF bmdpbmVlcmluZ0J1aWxkKSAmJiBoYXNQcmV2aWV3RmVhdHVyZXMpIHsKKyAgICAgICAgICAgIGV4 cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJU3RyaW5nKCJTdGFnaW5nOiIp LCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXMsIFdJLlVJU3Ry aW5nKCJFbmFibGUgUHJldmlldyBGZWF0dXJlcyIpKTsKKyAgICAgICAgICAgIGV4cGVyaW1lbnRh bFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKKyAgICAgICAgfQorCiAgICAgICAgIGlmIChJ bnNwZWN0b3JCYWNrZW5kLmhhc0RvbWFpbigiTGF5ZXJUcmVlIikpIHsKICAgICAgICAgICAgIGV4 cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJU3RyaW5nKCJMYXllcnM6Iiks IFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUxheWVyc1RhYiwgV0kuVUlTdHJpbmcoIkVu YWJsZSBMYXllcnMgVGFiIikpOwogICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3 LmFkZFNlcGFyYXRvcigpOwpAQCAtMzgxLDYgKzM4OSw3IEBAIFdJLlNldHRpbmdzVGFiQ29udGVu dFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVu dFZpCiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCisgICAgICAgIGxpc3RlbkZvckNoYW5n ZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXMpOwogICAgICAg ICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFi KTsKICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJs ZU5ld1RhYkJhcik7CiAK