204026 2019-11-08 15:19:30 -0800 Web Inspector: Unchecking Enable Preview Features on Engineering and Preview builds does not affect WI.arePreviewFeaturesEnabled() 2020-01-17 16:16:15 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1588864 0 nvasilyev 2019-11-08 15:19:30 -0800 WI.arePreviewFeaturesEnabled() correctly returns true by default on Engineering and Preview builds. However, this setting Staging: [ ] Enable Preview Features doesn't affect WI.arePreviewFeaturesEnabled(), which is used to determine whether or not we show the new P3 color picker. If the setting is unchecked, WI.arePreviewFeaturesEnabled() still returns true. 1588866 1 webkit-bug-importer 2019-11-08 15:29:01 -0800 <rdar://problem/57037089> 1588868 2 383172 nvasilyev 2019-11-08 15:36:57 -0800 Created attachment 383172 Patch 1588907 3 383172 bburg 2019-11-08 17:13:55 -0800 Comment on attachment 383172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383172&action=review I don't understand the need for a separate WI.canShowPreviewFeatures(). > Source/WebInspectorUI/UserInterface/Base/Setting.js:189 > + experimentalEnablePreviewFeatures: new WI.Setting("experimental-enable-preview-features", true), I'm not sure what to think here. Why has the default changed? I would assume Safari Technology Preview should always show experimental features, whereas production builds should hide them behind a checkbox? In that case the default should depend on if (WI.isExperimentalBuild && !WI.isEngineeringBuild) > Source/WebInspectorUI/UserInterface/Base/Setting.js:223 > + return hasPreviewFeatures && (WI.isExperimentalBuild || WI.isEngineeringBuild); This is redundant. Engineering builds always define ENABLE(EXPERIMENTAL_FEATURES). > Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:349 > + if (WI.canShowPreviewFeatures()) { Please just make this if (WI.arePreviewFeaturesEnabled() && WI.previewFeatures.length) 1588929 4 383172 nvasilyev 2019-11-08 17:57:12 -0800 Comment on attachment 383172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383172&action=review All I care is to be able disable & enable preview preview features in the engineering build. Now I can't do that because the checkbox does nothing. >> Source/WebInspectorUI/UserInterface/Base/Setting.js:189 >> + experimentalEnablePreviewFeatures: new WI.Setting("experimental-enable-preview-features", true), > > I'm not sure what to think here. Why has the default changed? > > I would assume Safari Technology Preview should always show experimental features, whereas production builds should hide them behind a checkbox? In that case the default should depend on > > if (WI.isExperimentalBuild && !WI.isEngineeringBuild) Production builds hide preview features and don't even show the checkbox. This patch didn't change that. This patch allows to disable preview features in engineering and STP builds. Before this patch the setting existed but the checkbox wouldn't actually do anything. Re: "Why has the default changed?". Preview features should be enabled by default in engineering and STP builds. Changing the default was the most straightforward fix. Let me know if you have other suggestions. >> Source/WebInspectorUI/UserInterface/Base/Setting.js:223 >> + return hasPreviewFeatures && (WI.isExperimentalBuild || WI.isEngineeringBuild); > > This is redundant. Engineering builds always define ENABLE(EXPERIMENTAL_FEATURES). Thanks. >> Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:349 >> + if (WI.canShowPreviewFeatures()) { > > Please just make this > > if (WI.arePreviewFeaturesEnabled() && WI.previewFeatures.length) This is used in two different places and it has a comment. I thought I would make sense not to repeat it. 1603083 5 383172 bburg 2020-01-06 09:24:33 -0800 Comment on attachment 383172 Patch Please rebase the patch and address the redundant check I pointed out, thanks. 1608187 6 388086 nvasilyev 2020-01-17 13:46:50 -0800 Created attachment 388086 Patch Rebaselined. 1608216 7 388086 bburg 2020-01-17 14:58:29 -0800 Comment on attachment 388086 Patch r=me 1608271 8 commit-queue 2020-01-17 16:15:42 -0800 The commit-queue encountered the following flaky tests while processing attachment 388086: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1608273 9 388086 commit-queue 2020-01-17 16:16:13 -0800 Comment on attachment 388086 Patch Clearing flags on attachment: 388086 Committed r254773: <https://trac.webkit.org/changeset/254773> 1608274 10 commit-queue 2020-01-17 16:16:15 -0800 All reviewed patches have been landed. Closing bug. 383172 2019-11-08 15:36:57 -0800 2020-01-17 13:46:50 -0800 Patch patch.txt text/plain 3966 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBmMzdkOWFhYTcxLi4zZGRlMTZhMzQ3MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTktMTEtMDggIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogVW5jaGVja2luZyBFbmFibGUgUHJldmlldyBGZWF0dXJlcyBvbiBFbmdpbmVlcmluZyBhbmQg UHJldmlldyBidWlsZHMgZG9lcyBub3QgYWZmZWN0IFdJLmFyZVByZXZpZXdGZWF0dXJlc0VuYWJs ZWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0 MDI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFr ZSBgV0kuYXJlUHJldmlld0ZlYXR1cmVzRW5hYmxlZCgpYCByZXR1cm4gZmFsc2Ugd2hlbiBFbmFi bGUgUHJldmlldyBGZWF0dXJlcyBpcyB1bmNoZWNrZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAgICAgKFdJLmNhblNob3dQcmV2aWV3RmVhdHVyZXMp OgorICAgICAgICAoV0kuYXJlUHJldmlld0ZlYXR1cmVzRW5hYmxlZCk6CisgICAgICAgIChXSS5p c1RlY2hub2xvZ3lQcmV2aWV3QnVpbGQpOiBEZWxldGVkLgorICAgICAgICAoV0kuY2FuU2hvd1By ZXZpZXdGZWF0dXJlcyk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKwogMjAxOS0xMS0wNyAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTihyMjUw MDg3KTogaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QuaHRtbCBpcyB0aW1pbmcgb3V0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRp bmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcu anMKaW5kZXggOTdjOWRiODRkMDUuLmM1ZjlhM2QxZjliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0xODYsNyArMTg2 LDcgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgem9vbUZhY3RvcjogbmV3IFdJLlNldHRpbmcoInpv b20tZmFjdG9yIiwgMSksCiAKICAgICAvLyBFeHBlcmltZW50YWwKLSAgICBleHBlcmltZW50YWxF bmFibGVQcmV2aWV3RmVhdHVyZXM6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxl LXByZXZpZXctZmVhdHVyZXMiLCBmYWxzZSksCisgICAgZXhwZXJpbWVudGFsRW5hYmxlUHJldmll d0ZlYXR1cmVzOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1wcmV2aWV3LWZl YXR1cmVzIiwgdHJ1ZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTmV3VGFiQmFyOiBuZXcgV0ku U2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1uZXctdGFiLWJhciIsIGZhbHNlKSwKICAgICBl eHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9FZmZlY3RpdmU6IG5ldyBXSS5TZXR0aW5nKCJl eHBlcmltZW50YWwtc3R5bGVzLWp1bXAtdG8tZWZmZWN0aXZlIiwgZmFsc2UpLAogCkBAIC0yMTUs MTggKzIxNSwxNSBAQCBXSS5wcmV2aWV3RmVhdHVyZXMgPSBbCiAgICAgInAzLWdhbXV0LWNvbG9y LXBpY2tlciIgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMDM5MzE+IFdlYiBJbnNw ZWN0b3I6IEVuYWJsZSBwMyBjb2xvciBwaWNrZXIgYnkgZGVmYXVsdAogXTsKIAotV0kuaXNUZWNo bm9sb2d5UHJldmlld0J1aWxkID0gZnVuY3Rpb24oKQorLy8gV2ViS2l0IG1heSBieSBkZWZhdWx0 IGVuYWJsZSBjZXJ0YWluIGZlYXR1cmVzIGluIGEgVGVjaG5vbG9neSBQcmV2aWV3IHRoYXQgYXJl IG5vdCBlbmFibGVkIGluIHRydW5rLgorLy8gUHJvdmlkZSBhIHN3aXRjaCB0aGF0IHdpbGwgbWFr ZSBub24tcHJldmlldyBidWlsZHMgYmVoYXZlIGxpa2UgYW4gZXhwZXJpbWVudGFsIGJ1aWxkLCBm b3IgdGhvc2UgcHJldmlldyBmZWF0dXJlcy4KK1dJLmNhblNob3dQcmV2aWV3RmVhdHVyZXMgPSBm dW5jdGlvbigpCiB7Ci0gICAgcmV0dXJuIFdJLmlzRXhwZXJpbWVudGFsQnVpbGQgJiYgIVdJLmlz RW5naW5lZXJpbmdCdWlsZDsKKyAgICBsZXQgaGFzUHJldmlld0ZlYXR1cmVzID0gV0kucHJldmll d0ZlYXR1cmVzLmxlbmd0aCA+IDA7CisgICAgcmV0dXJuIGhhc1ByZXZpZXdGZWF0dXJlcyAmJiAo V0kuaXNFeHBlcmltZW50YWxCdWlsZCB8fCBXSS5pc0VuZ2luZWVyaW5nQnVpbGQpOwogfTsKIAog V0kuYXJlUHJldmlld0ZlYXR1cmVzRW5hYmxlZCA9IGZ1bmN0aW9uKCkKIHsKLSAgICBpZiAoV0ku aXNFeHBlcmltZW50YWxCdWlsZCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBpZiAoV0ku c2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzLnZhbHVlKQotICAgICAg ICByZXR1cm4gdHJ1ZTsKLQotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gV0kuY2FuU2hv d1ByZXZpZXdGZWF0dXJlcygpICYmIFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVByZXZp ZXdGZWF0dXJlcy52YWx1ZTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5q cwppbmRleCA5ZjAwZDBkNmU2Yy4uMDgzZTU3ZDY1YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NU YWJDb250ZW50Vmlldy5qcwpAQCAtMzQ2LDEwICszNDYsNyBAQCBXSS5TZXR0aW5nc1RhYkNvbnRl bnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRl bnRWaQogCiAgICAgICAgIGxldCBpbml0aWFsVmFsdWVzID0gbmV3IE1hcDsKIAotICAgICAgICAv LyBXZWJLaXQgbWF5IGJ5IGRlZmF1bHQgZW5hYmxlIGNlcnRhaW4gZmVhdHVyZXMgaW4gYSBUZWNo bm9sb2d5IFByZXZpZXcgdGhhdCBhcmUgbm90IGVuYWJsZWQgaW4gdHJ1bmsuCi0gICAgICAgIC8v IFByb3ZpZGUgYSBzd2l0Y2ggdGhhdCB3aWxsIG1ha2Ugbm9uLXByZXZpZXcgYnVpbGRzIGJlaGF2 ZSBsaWtlIGFuIGV4cGVyaW1lbnRhbCBidWlsZCwgZm9yIHRob3NlIHByZXZpZXcgZmVhdHVyZXMu Ci0gICAgICAgIGxldCBoYXNQcmV2aWV3RmVhdHVyZXMgPSBXSS5wcmV2aWV3RmVhdHVyZXMubGVu Z3RoID4gMDsKLSAgICAgICAgaWYgKGhhc1ByZXZpZXdGZWF0dXJlcyAmJiAoV0kuaXNUZWNobm9s b2d5UHJldmlld0J1aWxkKCkgfHwgV0kuaXNFbmdpbmVlcmluZ0J1aWxkKSkgeworICAgICAgICBp ZiAoV0kuY2FuU2hvd1ByZXZpZXdGZWF0dXJlcygpKSB7CiAgICAgICAgICAgICBleHBlcmltZW50 YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0cmluZygiU3RhZ2luZzoiKSwgV0kuc2V0 dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzLCBXSS5VSVN0cmluZygiRW5h YmxlIFByZXZpZXcgRmVhdHVyZXMiKSk7CiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5n c1ZpZXcuYWRkU2VwYXJhdG9yKCk7CiAgICAgICAgIH0K 388086 2020-01-17 13:46:50 -0800 2020-01-17 16:16:13 -0800 Patch patch.txt text/plain 3797 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0NTRlYzJiZTFiLi5mZTYxNzI2ZDU4NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDEtMTcgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogVW5jaGVja2luZyBFbmFibGUgUHJldmlldyBGZWF0dXJlcyBvbiBFbmdpbmVlcmluZyBhbmQg UHJldmlldyBidWlsZHMgZG9lcyBub3QgYWZmZWN0IFdJLmFyZVByZXZpZXdGZWF0dXJlc0VuYWJs ZWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0 MDI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFr ZSBgV0kuYXJlUHJldmlld0ZlYXR1cmVzRW5hYmxlZCgpYCByZXR1cm4gZmFsc2Ugd2hlbiBFbmFi bGUgUHJldmlldyBGZWF0dXJlcyBpcyB1bmNoZWNrZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0Jhc2UvU2V0dGluZy5qczoKKyAgICAgICAgKFdJLmNhblNob3dQcmV2aWV3RmVhdHVyZXMp OgorICAgICAgICAoV0kuYXJlUHJldmlld0ZlYXR1cmVzRW5hYmxlZCk6CisgICAgICAgIChXSS5p c1RlY2hub2xvZ3lQcmV2aWV3QnVpbGQpOiBEZWxldGVkLgorICAgICAgICAoV0kuY2FuU2hvd1By ZXZpZXdGZWF0dXJlcyk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0 dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKwogMjAyMC0wMS0xNiAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIGxpbmtzIHRvIHJl ZmVyZW5jZSBwYWdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IGFhMjBmN2M4M2I1Li4xYTUzY2I5ZDRiMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5q cwpAQCAtMjE2LDcgKzIxNiw3IEBAIFdJLnNldHRpbmdzID0gewogICAgIHpvb21GYWN0b3I6IG5l dyBXSS5TZXR0aW5nKCJ6b29tLWZhY3RvciIsIDEpLAogCiAgICAgLy8gRXhwZXJpbWVudGFsCi0g ICAgZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzOiBuZXcgV0kuU2V0dGluZygiZXhw ZXJpbWVudGFsLWVuYWJsZS1wcmV2aWV3LWZlYXR1cmVzIiwgZmFsc2UpLAorICAgIGV4cGVyaW1l bnRhbEVuYWJsZVByZXZpZXdGZWF0dXJlczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1l bmFibGUtcHJldmlldy1mZWF0dXJlcyIsIHRydWUpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZU5l d1RhYkJhcjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtbmV3LXRhYi1iYXIi LCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlOiBu ZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLXN0eWxlcy1qdW1wLXRvLWVmZmVjdGl2ZSIsIGZh bHNlKSwKIApAQCAtMjQ1LDE4ICsyNDUsMTUgQEAgV0kuc2V0dGluZ3MgPSB7CiAKIFdJLnByZXZp ZXdGZWF0dXJlcyA9IFtdOwogCi1XSS5pc1RlY2hub2xvZ3lQcmV2aWV3QnVpbGQgPSBmdW5jdGlv bigpCisvLyBXZWJLaXQgbWF5IGJ5IGRlZmF1bHQgZW5hYmxlIGNlcnRhaW4gZmVhdHVyZXMgaW4g YSBUZWNobm9sb2d5IFByZXZpZXcgdGhhdCBhcmUgbm90IGVuYWJsZWQgaW4gdHJ1bmsuCisvLyBQ cm92aWRlIGEgc3dpdGNoIHRoYXQgd2lsbCBtYWtlIG5vbi1wcmV2aWV3IGJ1aWxkcyBiZWhhdmUg bGlrZSBhbiBleHBlcmltZW50YWwgYnVpbGQsIGZvciB0aG9zZSBwcmV2aWV3IGZlYXR1cmVzLgor V0kuY2FuU2hvd1ByZXZpZXdGZWF0dXJlcyA9IGZ1bmN0aW9uKCkKIHsKLSAgICByZXR1cm4gV0ku aXNFeHBlcmltZW50YWxCdWlsZCAmJiAhV0kuaXNFbmdpbmVlcmluZ0J1aWxkOworICAgIGxldCBo YXNQcmV2aWV3RmVhdHVyZXMgPSBXSS5wcmV2aWV3RmVhdHVyZXMubGVuZ3RoID4gMDsKKyAgICBy ZXR1cm4gaGFzUHJldmlld0ZlYXR1cmVzICYmIFdJLmlzRXhwZXJpbWVudGFsQnVpbGQ7CiB9Owog CiBXSS5hcmVQcmV2aWV3RmVhdHVyZXNFbmFibGVkID0gZnVuY3Rpb24oKQogewotICAgIGlmIChX SS5pc0V4cGVyaW1lbnRhbEJ1aWxkKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIGlmIChX SS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXMudmFsdWUpCi0gICAg ICAgIHJldHVybiB0cnVlOwotCi0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBXSS5jYW5T aG93UHJldmlld0ZlYXR1cmVzKCkgJiYgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlUHJl dmlld0ZlYXR1cmVzLnZhbHVlOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzCmluZGV4IDAzZTU0NTJjNzdjLi5jY2Q5MDI0NzQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5n c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zNTUsMTAgKzM1NSw3IEBAIFdJLlNldHRpbmdzVGFiQ29u dGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29u dGVudFZpCiAKICAgICAgICAgbGV0IGluaXRpYWxWYWx1ZXMgPSBuZXcgTWFwOwogCi0gICAgICAg IC8vIFdlYktpdCBtYXkgYnkgZGVmYXVsdCBlbmFibGUgY2VydGFpbiBmZWF0dXJlcyBpbiBhIFRl Y2hub2xvZ3kgUHJldmlldyB0aGF0IGFyZSBub3QgZW5hYmxlZCBpbiB0cnVuay4KLSAgICAgICAg Ly8gUHJvdmlkZSBhIHN3aXRjaCB0aGF0IHdpbGwgbWFrZSBub24tcHJldmlldyBidWlsZHMgYmVo YXZlIGxpa2UgYW4gZXhwZXJpbWVudGFsIGJ1aWxkLCBmb3IgdGhvc2UgcHJldmlldyBmZWF0dXJl cy4KLSAgICAgICAgbGV0IGhhc1ByZXZpZXdGZWF0dXJlcyA9IFdJLnByZXZpZXdGZWF0dXJlcy5s ZW5ndGggPiAwOwotICAgICAgICBpZiAoaGFzUHJldmlld0ZlYXR1cmVzICYmIChXSS5pc1RlY2hu b2xvZ3lQcmV2aWV3QnVpbGQoKSB8fCBXSS5pc0VuZ2luZWVyaW5nQnVpbGQpKSB7CisgICAgICAg IGlmIChXSS5jYW5TaG93UHJldmlld0ZlYXR1cmVzKCkpIHsKICAgICAgICAgICAgIGV4cGVyaW1l bnRhbFNldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJU3RyaW5nKCJTdGFnaW5nOiIpLCBXSS5z ZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXMsIFdJLlVJU3RyaW5nKCJF bmFibGUgUHJldmlldyBGZWF0dXJlcyIpKTsKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRp bmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKICAgICAgICAgfQo=