220954 2021-01-25 15:20:51 -0800 Web Inspector: Add experimental setting to show Layout panel in Elements tab 2021-01-25 19:29:10 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1722311 0 nvasilyev 2021-01-25 15:20:51 -0800 In this patch the panel is going to be empty. Box Model will move there from Computed, and new layout tools will be added there later. 1722313 1 webkit-bug-importer 2021-01-25 15:21:15 -0800 <rdar://problem/73590856> 1722328 2 418351 nvasilyev 2021-01-25 15:32:56 -0800 Created attachment 418351 Patch 1722331 3 418351 bburg 2021-01-25 15:35:59 -0800 Comment on attachment 418351 Patch r=me 1722380 4 ews-feeder 2021-01-25 19:29:09 -0800 Committed r271874: <https://trac.webkit.org/changeset/271874> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418351. 418351 2021-01-25 15:32:56 -0800 2021-01-25 19:29:10 -0800 Patch patch.txt text/plain 9710 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDM2Y2RkNGRiOWZlOS4uZjg1NGM1MGIzZmEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAyMS0wMS0yNSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBBZGQgZXhwZXJpbWVudGFsIHNldHRpbmcgdG8gc2hvdyBMYXlvdXQgcGFuZWwgaW4gRWxl bWVudHMgdGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjA5NTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzczNTkwODU2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAiU2hvdyBsYXlvdXQgcGFu ZWwiIGNoZWNrYm94IHRvIHRoZSBFeHBlcmltZW50YWwgc2V0dGluZ3MgdGhhdCBzaG93cyBhbiBl bXB0eQorICAgICAgICBwYW5lbCAoZm9yIG5vdykgaW4gRWxlbWVudHMgdGFiLgorCisgICAgICAg ICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv TWFpbi5odG1sOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250 ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5qczogQWRk ZWQuCisgICAgICAgIChXSS5MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAgICAgKFdJ LkxheW91dERldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnN1cHBvcnRzRE9NTm9kZSk6Cisg ICAgICAgIChXSS5MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5hdHRhY2hlZCk6 CisgICAgICAgIChXSS5MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5kZXRhY2hl ZCk6CisgICAgICAgIChXSS5MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5pbml0 aWFsTGF5b3V0KToKKyAgICAgICAgKFdJLkxheW91dERldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90 eXBlLmxheW91dCk6CisgICAgICAgIChXSS5MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLnByb3Rv dHlwZS5fbWFpblJlc291cmNlRGlkQ2hhbmdlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNv bnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KToKKwog MjAyMS0wMS0yMCAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBTdXBwb3J0IFdFQkdMX211bHRpX2RyYXcgZXh0ZW5zaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwppbmRleCAzOWQ2YmQ3MTY5OWEuLmZjZDNiZTQxMjk2OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC04MjIsNiArODIyLDggQEAgbG9jYWxpemVkU3RyaW5n c1siTGF5ZXJzIl0gPSAiTGF5ZXJzIjsKIC8qIE5hbWUgb2YgTGF5ZXJzIFRhYiAqLwogbG9jYWxp emVkU3RyaW5nc1siTGF5ZXJzIFRhYiBOYW1lIl0gPSAiTGF5ZXJzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkxheW91dCAmIFJlbmRlcmluZyJdID0gIkxheW91dCAmIFJlbmRlcmluZyI7CisvKiBUaXRs ZSBvZiB0aGUgQ1NTIHN0eWxlIHBhbmVsLiAqLworbG9jYWxpemVkU3RyaW5nc1siTGF5b3V0IEAg U3R5bGVzIFNpZGViYXIiXSA9ICJMYXlvdXQiOwogLyogTGF5b3V0IHBoYXNlIHRpbWVsaW5lIHJl Y29yZHMgKi8KIGxvY2FsaXplZFN0cmluZ3NbIkxheW91dCBAIFRpbWVsaW5lIHJlY29yZCJdID0g IkxheW91dCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJMYXlvdXQgSW52YWxpZGF0ZWQiXSA9ICJMYXlv dXQgSW52YWxpZGF0ZWQiOwpAQCAtMTI5Myw2ICsxMjk1LDcgQEAgbG9jYWxpemVkU3RyaW5nc1si U2hvdyBBbGwgTm9kZXMgKCVkIE1vcmUpIl0gPSAiU2hvdyBBbGwgTm9kZXMgKCVkIE1vcmUpIjsK IGxvY2FsaXplZFN0cmluZ3NbIlNob3cgQ29uc29sZSJdID0gIlNob3cgQ29uc29sZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IENvbnNvbGUgdGFiIl0gPSAiU2hvdyBDb25zb2xlIHRhYiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJTaG93IEVsZW1lbnRzIl0gPSAiU2hvdyBFbGVtZW50cyI7Citsb2Nh bGl6ZWRTdHJpbmdzWyJTaG93IExheW91dCBwYW5lbCJdID0gIlNob3cgTGF5b3V0IHBhbmVsIjsK IGxvY2FsaXplZFN0cmluZ3NbIlNob3cgUGF0aCJdID0gIlNob3cgUGF0aCI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJTaG93IFJlbWFpbmluZyAoJWQpIl0gPSAiU2hvdyBSZW1haW5pbmcgKCVkKSI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJTaG93IFNjb3BlIENoYWluIG9uIHBhdXNlIl0gPSAiU2hvdyBTY29w ZSBDaGFpbiBvbiBwYXVzZSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXggZTJkNWYwMDAwZWQyLi5hYWIzNDY2YzEyNDIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0 dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1Nl dHRpbmcuanMKQEAgLTIyMyw2ICsyMjMsNyBAQCBXSS5zZXR0aW5ncyA9IHsKICAgICBleHBlcmlt ZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXM6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwt ZW5hYmxlLXByZXZpZXctZmVhdHVyZXMiLCB0cnVlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVT dHlsZXNKdW1wVG9FZmZlY3RpdmU6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtc3R5bGVz LWp1bXAtdG8tZWZmZWN0aXZlIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZVN0eWxl c0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb246IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwt c3R5bGVzLWp1bXAtdG8tdmFyaWFibGUtZGVjbGFyYXRpb24iLCBmYWxzZSksCisgICAgZXhwZXJp bWVudGFsRW5hYmxlTGF5b3V0UGFuZWw6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5h YmxlLWxheW91dC1wYW5lbCIsIGZhbHNlKSwKIAogICAgIC8vIFByb3RvY29sCiAgICAgcHJvdG9j b2xMb2dBc1RleHQ6IG5ldyBXSS5TZXR0aW5nKCJwcm90b2NvbC1sb2ctYXMtdGV4dCIsIGZhbHNl KSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4u aHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAppbmRl eCAzNGQ0ZGEzNDNhM2EuLjVmZGJkYmIwZWRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbApAQCAtNzQwLDYgKzc0MCw3IEBACiAgICAgPHNjcmlw dCBzcmM9IlZpZXdzL0xheWVyVHJlZURhdGFHcmlkTm9kZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNj cmlwdCBzcmM9IlZpZXdzL0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MYXllcnMzRENvbnRlbnRWaWV3LmpzIj48L3Njcmlw dD4KKyAgICA8c2NyaXB0IHNyYz0iVmlld3MvTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbC5qcyI+ PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0xheW91dFRpbWVsaW5lRGF0YUdyaWQu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MYXlvdXRUaW1lbGluZURhdGFH cmlkTm9kZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0xheW91dFRpbWVs aW5lT3ZlcnZpZXdHcmFwaC5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250 ZW50Vmlldy5qcwppbmRleCAwM2U0NWU3YTIzNGMuLjlmMjMyZWM3ZGQ3YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zMCw4ICszMCwxMSBAQCBXSS5FbGVtZW50 c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVudHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRCcm93cwogICAgICAgICBsZXQgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9y cyA9IFsKICAgICAgICAgICAgIFdJLlJ1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLAogICAg ICAgICAgICAgV0kuQ29tcHV0ZWRTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwsCi0KICAgICAgICAg XTsKKworICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5b3V0UGFu ZWwudmFsdWUpCisgICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLnB1 c2goV0kuTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbCk7CisKICAgICAgICAgLy8gQ09NUEFUSUJJ TElUWSAoaU9TIDE0LjApOiBgQ1NTLmdldEZvbnREYXRhRm9yTm9kZWAgZGlkIG5vdCBleGlzdCB5 ZXQuCiAgICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmhhc0NvbW1hbmQoIkNTUy5nZXRGb250 RGF0YUZvck5vZGUiKSkKICAgICAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3Rv cnMucHVzaChXSS5Gb250RGV0YWlsc1NpZGViYXJQYW5lbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXREZXRhaWxzU2lkZWJhclBh bmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0 RGV0YWlsc1NpZGViYXJQYW5lbC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAuLmU4ZTRmODMxNDI1MAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dERldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAg LTAsMCArMSw3NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBt ZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJp bmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBp biB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRl ZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBM T1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5F R0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUg VVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK1dJLkxheW91dERldGFpbHNTaWRlYmFyUGFuZWwg PSBjbGFzcyBMYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuRE9NRGV0YWlsc1Np ZGViYXJQYW5lbAoreworICAgIGNvbnN0cnVjdG9yKCkKKyAgICB7CisgICAgICAgIHN1cGVyKCJs YXlvdXQtZGV0YWlscyIsIFdJLlVJU3RyaW5nKCJMYXlvdXQiLCAiTGF5b3V0IEAgU3R5bGVzIFNp ZGViYXIiLCAiVGl0bGUgb2YgdGhlIENTUyBzdHlsZSBwYW5lbC4iKSk7CisKKyAgICAgICAgdGhp cy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImxheW91dC1wYW5lbCIpOworICAgIH0KKworICAgIC8v IFB1YmxpYworCisgICAgc3VwcG9ydHNET01Ob2RlKG5vZGVUb0luc3BlY3QpCisgICAgeworICAg ICAgICByZXR1cm4gbm9kZVRvSW5zcGVjdC5ub2RlVHlwZSgpID09PSBOb2RlLkVMRU1FTlRfTk9E RTsKKyAgICB9CisKKyAgICBhdHRhY2hlZCgpCisgICAgeworICAgICAgICBzdXBlci5hdHRhY2hl ZCgpOworCisgICAgICAgIFdJLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQu TWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMp OworICAgIH0KKworICAgIGRldGFjaGVkKCkKKyAgICB7CisgICAgICAgIFdJLkZyYW1lLnJlbW92 ZUV2ZW50TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlz Ll9tYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOworCisgICAgICAgIHN1cGVyLmRldGFjaGVk KCk7CisgICAgfQorCisgICAgLy8gUHJvdGVjdGVkCisKKyAgICBpbml0aWFsTGF5b3V0KCkKKyAg ICB7CisgICAgICAgIC8vIEZJWE1FOiBNb3ZlIHRoZSBCb3ggTW9kZWwgc2VjdGlvbiBoZXJlIGZy b20gdGhlIENvbXB1dGVkIHBhbmVsLgorICAgIH0KKworICAgIGxheW91dCgpCisgICAgeworICAg ICAgICBzdXBlci5sYXlvdXQoKTsKKyAgICB9CisKKyAgICAvLyBQcml2YXRlCisKKyAgICBfbWFp blJlc291cmNlRGlkQ2hhbmdlKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKCFldmVudC50YXJn ZXQuaXNNYWluRnJhbWUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLm5l ZWRzTGF5b3V0KCk7CisgICAgfQorfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzCmluZGV4IDRlNzc5OTZhNzhiZC4uZmRhYjQyYzRiNDk1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMKQEAgLTM5OCw2ICszOTgsNyBAQCBXSS5TZXR0aW5nc1RhYkNv bnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNv bnRlbnRWaQogICAgICAgICAgICAgbGV0IHN0eWxlc0dyb3VwID0gZXhwZXJpbWVudGFsU2V0dGlu Z3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJTdHlsZXM6IikpOwogICAgICAgICAgICAgc3R5 bGVzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNK dW1wVG9FZmZlY3RpdmUsIFdJLlVJU3RyaW5nKCJTaG93IGp1bXAgdG8gZWZmZWN0aXZlIHByb3Bl cnR5IGJ1dHRvbiIpKTsKICAgICAgICAgICAgIHN0eWxlc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0 dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlvbiwg V0kuVUlTdHJpbmcoIlNob3cganVtcCB0byB2YXJpYWJsZSBkZWNsYXJhdGlvbiBidXR0b24iKSk7 CisgICAgICAgICAgICBzdHlsZXNHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1l bnRhbEVuYWJsZUxheW91dFBhbmVsLCBXSS5VSVN0cmluZygiU2hvdyBMYXlvdXQgcGFuZWwiKSk7 CiAKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsK ICAgICAgICAgfQpAQCAtNDIxLDYgKzQyMiw3IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcg PSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAg ICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2 aWV3RmVhdHVyZXMpOwogCiAgICAgICAgIGlmIChoYXNDU1NEb21haW4pIHsKKyAgICAgICAgICAg IGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXlvdXRQYW5l bCk7CiAgICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFs RW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlKTsKICAgICAgICAgICAgIGxpc3RlbkZvckNoYW5n ZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9WYXJpYWJsZURlY2xh cmF0aW9uKTsKICAgICAgICAgfQo=