197220 2019-04-23 17:28:01 -0700 Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes 2019-04-23 18:28:55 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 191208 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1529840 0 hi 2019-04-23 17:28:01 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. clear the network timeline 3. enable "Preserve Log" 4. reload the page => main frame main resource missing 1529842 1 hi 2019-04-23 17:28:52 -0700 <rdar://problem/49960464> 1529846 2 368090 hi 2019-04-23 17:31:21 -0700 Created attachment 368090 Patch 1529847 3 368090 joepeck 2019-04-23 17:34:03 -0700 Comment on attachment 368090 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368090&action=review I wonder if we should have some kind of test for this. > Source/WebInspectorUI/ChangeLog:3 > + Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes This says main-frame main-resource changes. It also includes sub-frame main-resource changes as well right? 1529848 4 368090 joepeck 2019-04-23 17:34:15 -0700 Comment on attachment 368090 Patch r=me 1529849 5 368091 hi 2019-04-23 17:41:48 -0700 Created attachment 368091 Patch 1529850 6 368092 hi 2019-04-23 17:44:56 -0700 Created attachment 368092 Patch 1529851 7 368090 hi 2019-04-23 17:46:04 -0700 Comment on attachment 368090 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368090&action=review >> Source/WebInspectorUI/ChangeLog:3 >> + Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes > > This says main-frame main-resource changes. It also includes sub-frame main-resource changes as well right? Good point. It should also benefit that as well. 1529866 8 368092 commit-queue 2019-04-23 18:28:54 -0700 Comment on attachment 368092 Patch Clearing flags on attachment: 368092 Committed r244577: <https://trac.webkit.org/changeset/244577> 1529867 9 commit-queue 2019-04-23 18:28:55 -0700 All reviewed patches have been landed. Closing bug. 368090 2019-04-23 17:31:21 -0700 2019-04-23 17:41:46 -0700 Patch bug-197220-20190423173120.patch text/plain 1871 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY2MjJhZDI4YzhlNjdkYWZjMTk4MmU1MDZiNWEx Y2E5NjRiY2IwYzEuLjc0YzVmZDgyMTA0YmZiYzkwNGU4Nzk3MTBlMGE3ODJmYjllZGExOGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA0LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OKHIyMzgxNjgpOiBOZXR3b3JrOiBwcmVzZXJ2ZSBsb2cgZG9lc24ndCBzaG93IG1h aW4gZnJhbWUgbWFpbiByZXNvdXJjZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcyMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5 OTYwNDY0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fbWFpblJlc291cmNlRGlk Q2hhbmdlKToKKyAgICAgICAgV2Ugc3RpbGwgd2FudCB0byBhZGQgdGhlIGZyYW1lJ3MgbWFpbiBy ZXNvdXJjZSBpbiB0aGUgY2FzZSB0aGF0IGl0J3MgdGhlIG1haW4gZnJhbWUuCisKIDIwMTktMDQt MjMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFVuY2F1Z2h0IEV4Y2VwdGlvbjogbnVsbCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0 aW5nICd0aGlzLm93bmVyRG9jdW1lbnQuZnJhbWVJZGVudGlmaWVyJykKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya1RhYmxlQ29udGVudFZpZXcuanMKaW5kZXggYWEwODRhMWJiMzgwYmU3ZDE1ZjFlOGQxNTA3 ODM2YTczZjE5NDAyMS4uNzU0MzJlYjIzNjRhMzFkMDUxZjEwN2Y5OGU4OTg2MTc1YmE4NmU2OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya1RhYmxlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMKQEAgLTE1NzIsMTAgKzE1 NzIsOCBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNv bnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgIF9tYWluUmVzb3VyY2VEaWRDaGFu Z2UoZXZlbnQpCiAgICAgewogICAgICAgICBsZXQgZnJhbWUgPSBldmVudC50YXJnZXQ7Ci0gICAg ICAgIGlmICghZnJhbWUuaXNNYWluRnJhbWUoKSB8fCAhV0kuc2V0dGluZ3MuY2xlYXJOZXR3b3Jr T25OYXZpZ2F0ZS52YWx1ZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0aGlzLnJl c2V0KCk7CisgICAgICAgIGlmIChmcmFtZS5pc01haW5GcmFtZSgpICYmIFdJLnNldHRpbmdzLmNs ZWFyTmV0d29ya09uTmF2aWdhdGUudmFsdWUpCisgICAgICAgICAgICB0aGlzLnJlc2V0KCk7CiAK ICAgICAgICAgdGhpcy5fcnVuRm9yTWFpbkNvbGxlY3Rpb24oKGNvbGxlY3Rpb24pID0+IHsKICAg ICAgICAgICAgIGlmICh0aGlzLl90cmFuc2l0aW9uaW5nUGFnZVRhcmdldCkgewo= 368091 2019-04-23 17:41:48 -0700 2019-04-23 17:44:52 -0700 Patch bug-197220-20190423174147.patch text/plain 4264 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY2MjJhZDI4YzhlNjdkYWZjMTk4MmU1MDZiNWEx Y2E5NjRiY2IwYzEuLmViZjg4ZGYxZTQ4MGRhOWRhYjYxYmM0YjBlZDdmNDkxMWEyYzA2ZDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA0LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OKHIyMzgxNjgpOiBOZXR3b3JrOiBwcmVzZXJ2ZSBsb2cgZG9lc24ndCBzaG93IG1h aW4gZnJhbWUgbWFpbiByZXNvdXJjZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcyMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5 OTYwNDY0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAg IChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2NoYW5nZUNvbGxlY3Rpb24p OgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9tYWluUmVz b3VyY2VEaWRDaGFuZ2UpOgorICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJv dG90eXBlLl9yZXNldE1haW5Db2xsZWN0aW9uKToKKyAgICAgICAgV2Ugd2FudCB0byBhZGQgdGhl IGZyYW1lJ3MgbWFpbiByZXNvdXJjZSBpbiB0aGUgY2FzZSB0aGF0IGl0J3MgdGhlIG1haW4gZnJh bWUsIGJ1dCB3ZSBhbHNvCisgICAgICAgIHdhbnQgdG8gY2xlYXIgdGhlIG1haW4gY29sbGVjdGlv biBvZiBkYXRhIChlLmcuIGlmIHZpZXdpbmcgYW4gaW1wb3J0ZWQgSEFSKS4KKyAgICAgICAgRHJp dmUtYnk6IGBfZ3JvdXBCeURPTU5vZGVOYXZpZ2F0aW9uSXRlbWAgd2FzIHJlbmFtZWQgaW4gYSBw cmV2aW91cyBwYXRjaC4KKwogMjAxOS0wNC0yMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVnaHQgRXhjZXB0aW9uOiBudWxs IGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcgJ3RoaXMub3duZXJEb2N1bWVudC5mcmFtZUlk ZW50aWZpZXInKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCBh YTA4NGExYmIzODBiZTdkMTVmMWU4ZDE1MDc4MzZhNzNmMTk0MDIxLi41YTRjYzRiNzY4YTU4OWZi ZjM4YjI5NGM2Y2Y2ZWY5ZmI1YTczYjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250 ZW50Vmlldy5qcwpAQCAtMzA1LDE0ICszMDUsNyBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50Vmll dyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQog CiAgICAgcmVzZXQoKQogICAgIHsKLSAgICAgICAgdGhpcy5fcnVuRm9yTWFpbkNvbGxlY3Rpb24o KGNvbGxlY3Rpb24pID0+IHsKLSAgICAgICAgICAgIGNvbGxlY3Rpb24uZW50cmllcyA9IFtdOwot ICAgICAgICAgICAgY29sbGVjdGlvbi5maWx0ZXJlZEVudHJpZXMgPSBbXTsKLSAgICAgICAgICAg IGNvbGxlY3Rpb24ucGVuZGluZ0luc2VydGlvbnMgPSBbXTsKLSAgICAgICAgICAgIGNvbGxlY3Rp b24ucGVuZGluZ1VwZGF0ZXMgPSBbXTsKLSAgICAgICAgICAgIGNvbGxlY3Rpb24ud2F0ZXJmYWxs U3RhcnRUaW1lID0gTmFOOwotICAgICAgICAgICAgY29sbGVjdGlvbi53YXRlcmZhbGxFbmRUaW1l ID0gTmFOOwotICAgICAgICB9KTsKKyAgICAgICAgdGhpcy5fcmVzZXRNYWluQ29sbGVjdGlvbigp OwogCiAgICAgICAgIGZvciAobGV0IGRldGFpbFZpZXcgb2YgdGhpcy5fZGV0YWlsVmlld01hcC52 YWx1ZXMoKSkKICAgICAgICAgICAgIGRldGFpbFZpZXcuZGlzcG9zZSgpOwpAQCAtNTg2LDcgKzU3 OSw3IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAKICAgICAgICAgbGV0IGlzTWFpbiA9IGNv bGxlY3Rpb24gPT09IHRoaXMuX21haW5Db2xsZWN0aW9uOwogICAgICAgICB0aGlzLl9jaGVja2Jv eGVzTmF2aWdhdGlvbkl0ZW1Hcm91cC5oaWRkZW4gPSAhaXNNYWluOwotICAgICAgICB0aGlzLl9n cm91cEJ5RE9NTm9kZU5hdmlnYXRpb25JdGVtLmhpZGRlbiA9ICFpc01haW47CisgICAgICAgIHRo aXMuX2dyb3VwTWVkaWFSZXF1ZXN0c0J5RE9NTm9kZU5hdmlnYXRpb25JdGVtLmhpZGRlbiA9ICFp c01haW47CiAgICAgICAgIHRoaXMuX2NsZWFyTmV0d29ya0l0ZW1zTmF2aWdhdGlvbkl0ZW0uZW5h YmxlZCA9IGlzTWFpbjsKICAgICAgICAgdGhpcy5fY29sbGVjdGlvbnNQYXRoTmF2aWdhdGlvbkl0 ZW0uY29tcG9uZW50cyA9IFt0aGlzLl9wYXRoQ29tcG9uZW50c01hcC5nZXQoY29sbGVjdGlvbild OwogCkBAIC0xNTcxLDEzICsxNTY0LDExIEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0g Y2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAKICAg ICBfbWFpblJlc291cmNlRGlkQ2hhbmdlKGV2ZW50KQogICAgIHsKLSAgICAgICAgbGV0IGZyYW1l ID0gZXZlbnQudGFyZ2V0OwotICAgICAgICBpZiAoIWZyYW1lLmlzTWFpbkZyYW1lKCkgfHwgIVdJ LnNldHRpbmdzLmNsZWFyTmV0d29ya09uTmF2aWdhdGUudmFsdWUpCi0gICAgICAgICAgICByZXR1 cm47Ci0KLSAgICAgICAgdGhpcy5yZXNldCgpOwotCiAgICAgICAgIHRoaXMuX3J1bkZvck1haW5D b2xsZWN0aW9uKChjb2xsZWN0aW9uKSA9PiB7CisgICAgICAgICAgICBsZXQgZnJhbWUgPSBldmVu dC50YXJnZXQ7CisgICAgICAgICAgICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSAmJiBXSS5zZXR0 aW5ncy5jbGVhck5ldHdvcmtPbk5hdmlnYXRlLnZhbHVlKQorICAgICAgICAgICAgICAgIHRoaXMu X3Jlc2V0TWFpbkNvbGxlY3Rpb24oKTsKKwogICAgICAgICAgICAgaWYgKHRoaXMuX3RyYW5zaXRp b25pbmdQYWdlVGFyZ2V0KSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fdHJhbnNpdGlvbmluZ1Bh Z2VUYXJnZXQgPSBmYWxzZTsKICAgICAgICAgICAgICAgICB0aGlzLl9uZWVkc0luaXRpYWxQb3B1 bGF0ZSA9IHRydWU7CkBAIC0xNzAzLDYgKzE2OTQsMTggQEAgV0kuTmV0d29ya1RhYmxlQ29udGVu dFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRW aWUKICAgICAgICAgcmV0dXJuIHRoaXMuX2FjdGl2ZUNvbGxlY3Rpb24gPT09IHRoaXMuX21haW5D b2xsZWN0aW9uOwogICAgIH0KIAorICAgIF9yZXNldE1haW5Db2xsZWN0aW9uKCkKKyAgICB7Cisg ICAgICAgIHRoaXMuX3J1bkZvck1haW5Db2xsZWN0aW9uKChjb2xsZWN0aW9uKSA9PiB7CisgICAg ICAgICAgICBjb2xsZWN0aW9uLmVudHJpZXMgPSBbXTsKKyAgICAgICAgICAgIGNvbGxlY3Rpb24u ZmlsdGVyZWRFbnRyaWVzID0gW107CisgICAgICAgICAgICBjb2xsZWN0aW9uLnBlbmRpbmdJbnNl cnRpb25zID0gW107CisgICAgICAgICAgICBjb2xsZWN0aW9uLnBlbmRpbmdVcGRhdGVzID0gW107 CisgICAgICAgICAgICBjb2xsZWN0aW9uLndhdGVyZmFsbFN0YXJ0VGltZSA9IE5hTjsKKyAgICAg ICAgICAgIGNvbGxlY3Rpb24ud2F0ZXJmYWxsRW5kVGltZSA9IE5hTjsKKyAgICAgICAgfSk7Cisg ICAgfQorCiAgICAgX2lzRGVmYXVsdFNvcnQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMu X3RhYmxlLnNvcnRDb2x1bW5JZGVudGlmaWVyID09PSAid2F0ZXJmYWxsIiAmJiB0aGlzLl90YWJs ZS5zb3J0T3JkZXIgPT09IFdJLlRhYmxlLlNvcnRPcmRlci5Bc2NlbmRpbmc7Cg== 368092 2019-04-23 17:44:56 -0700 2019-04-23 18:28:54 -0700 Patch bug-197220-20190423174455.patch text/plain 4541 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY2MjJhZDI4YzhlNjdkYWZjMTk4MmU1MDZiNWEx Y2E5NjRiY2IwYzEuLmY5NDNiYzNhNzQ0OGFiMjM4OTZiY2JjNTQxZWY3OGU1ZTQ2Yzk3YzggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA0LTIzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OKHIyMzgxNjgpOiBOZXR3b3JrOiBwcmVzZXJ2ZSBsb2cgZG9lc24ndCBzaG93IG1h aW4gZnJhbWUgbWFpbiByZXNvdXJjZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcyMjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5 OTYwNDY0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAg ICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5yZXNldCk6CisgICAgICAg IChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuX2FkZENvbGxlY3Rpb24pOgor ICAgICAgICAoV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXcucHJvdG90eXBlLl9yZXNldENvbGxl Y3Rpb24pOiBBZGRlZC4KKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3Rv dHlwZS5fY2hhbmdlQ29sbGVjdGlvbik6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50 Vmlldy5wcm90b3R5cGUuX21haW5SZXNvdXJjZURpZENoYW5nZSk6CisgICAgICAgIFdlIHdhbnQg dG8gYWRkIHRoZSBmcmFtZSdzIG1haW4gcmVzb3VyY2UgaW4gdGhlIGNhc2UgdGhhdCBpdCdzIHRo ZSBtYWluIGZyYW1lLCBidXQgd2UgYWxzbworICAgICAgICB3YW50IHRvIGNsZWFyIHRoZSBtYWlu IGNvbGxlY3Rpb24gb2YgZGF0YSAoZS5nLiBpZiB2aWV3aW5nIGFuIGltcG9ydGVkIEhBUikuCisg ICAgICAgIERyaXZlLWJ5OiBgX2dyb3VwQnlET01Ob2RlTmF2aWdhdGlvbkl0ZW1gIHdhcyByZW5h bWVkIGluIGEgcHJldmlvdXMgcGF0Y2guCisKIDIwMTktMDQtMjMgIERldmluIFJvdXNzbyAgPGRy b3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVuY2F1Z2h0IEV4Y2Vw dGlvbjogbnVsbCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICd0aGlzLm93bmVyRG9jdW1l bnQuZnJhbWVJZGVudGlmaWVyJykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcu anMKaW5kZXggYWEwODRhMWJiMzgwYmU3ZDE1ZjFlOGQxNTA3ODM2YTczZjE5NDAyMS4uMDI3OWMw NTFkZDFlOTkyZjdjODY2YThiM2UwOGNhZjQzYjE3Zjc1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a1RhYmxlQ29udGVudFZpZXcuanMKQEAgLTMwNiwxMiArMzA2LDcgQEAgV0kuTmV0d29ya1RhYmxl Q29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWUKICAgICByZXNldCgpCiAgICAgewogICAgICAgICB0aGlzLl9ydW5Gb3JNYWluQ29s bGVjdGlvbigoY29sbGVjdGlvbikgPT4gewotICAgICAgICAgICAgY29sbGVjdGlvbi5lbnRyaWVz ID0gW107Ci0gICAgICAgICAgICBjb2xsZWN0aW9uLmZpbHRlcmVkRW50cmllcyA9IFtdOwotICAg ICAgICAgICAgY29sbGVjdGlvbi5wZW5kaW5nSW5zZXJ0aW9ucyA9IFtdOwotICAgICAgICAgICAg Y29sbGVjdGlvbi5wZW5kaW5nVXBkYXRlcyA9IFtdOwotICAgICAgICAgICAgY29sbGVjdGlvbi53 YXRlcmZhbGxTdGFydFRpbWUgPSBOYU47Ci0gICAgICAgICAgICBjb2xsZWN0aW9uLndhdGVyZmFs bEVuZFRpbWUgPSBOYU47CisgICAgICAgICAgICB0aGlzLl9yZXNldENvbGxlY3Rpb24oY29sbGVj dGlvbik7CiAgICAgICAgIH0pOwogCiAgICAgICAgIGZvciAobGV0IGRldGFpbFZpZXcgb2YgdGhp cy5fZGV0YWlsVmlld01hcC52YWx1ZXMoKSkKQEAgLTUyNiwyMCArNTIxLDIyIEBAIFdJLk5ldHdv cmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50VmllCiAKICAgICBfYWRkQ29sbGVjdGlvbigpCiAgICAgewotICAgICAgICBs ZXQgY29sbGVjdGlvbiA9IHsKLSAgICAgICAgICAgIGVudHJpZXM6IFtdLAotICAgICAgICAgICAg ZmlsdGVyZWRFbnRyaWVzOiBbXSwKLSAgICAgICAgICAgIHBlbmRpbmdJbnNlcnRpb25zOiBbXSwK LSAgICAgICAgICAgIHBlbmRpbmdVcGRhdGVzOiBbXSwKLSAgICAgICAgICAgIHdhdGVyZmFsbFN0 YXJ0VGltZTogTmFOLAotICAgICAgICAgICAgd2F0ZXJmYWxsRW5kVGltZTogTmFOLAotICAgICAg ICB9OwotCisgICAgICAgIGxldCBjb2xsZWN0aW9uID0ge307CisgICAgICAgIHRoaXMuX3Jlc2V0 Q29sbGVjdGlvbihjb2xsZWN0aW9uKTsKICAgICAgICAgdGhpcy5fY29sbGVjdGlvbnMucHVzaChj b2xsZWN0aW9uKTsKLQogICAgICAgICByZXR1cm4gY29sbGVjdGlvbjsKICAgICB9CiAKKyAgICBf cmVzZXRDb2xsZWN0aW9uKGNvbGxlY3Rpb24pCisgICAgeworICAgICAgICBjb2xsZWN0aW9uLmVu dHJpZXMgPSBbXTsKKyAgICAgICAgY29sbGVjdGlvbi5maWx0ZXJlZEVudHJpZXMgPSBbXTsKKyAg ICAgICAgY29sbGVjdGlvbi5wZW5kaW5nSW5zZXJ0aW9ucyA9IFtdOworICAgICAgICBjb2xsZWN0 aW9uLnBlbmRpbmdVcGRhdGVzID0gW107CisgICAgICAgIGNvbGxlY3Rpb24ud2F0ZXJmYWxsU3Rh cnRUaW1lID0gTmFOOworICAgICAgICBjb2xsZWN0aW9uLndhdGVyZmFsbEVuZFRpbWUgPSBOYU47 CisgICAgfQorCiAgICAgX3NldEFjdGl2ZUNvbGxlY3Rpb24oY29sbGVjdGlvbikKICAgICB7CiAg ICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2NvbGxlY3Rpb25zLmluY2x1ZGVzKGNvbGxlY3Rp b24pKTsKQEAgLTU4Niw3ICs1ODMsNyBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNs YXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogCiAgICAg ICAgIGxldCBpc01haW4gPSBjb2xsZWN0aW9uID09PSB0aGlzLl9tYWluQ29sbGVjdGlvbjsKICAg ICAgICAgdGhpcy5fY2hlY2tib3hlc05hdmlnYXRpb25JdGVtR3JvdXAuaGlkZGVuID0gIWlzTWFp bjsKLSAgICAgICAgdGhpcy5fZ3JvdXBCeURPTU5vZGVOYXZpZ2F0aW9uSXRlbS5oaWRkZW4gPSAh aXNNYWluOworICAgICAgICB0aGlzLl9ncm91cE1lZGlhUmVxdWVzdHNCeURPTU5vZGVOYXZpZ2F0 aW9uSXRlbS5oaWRkZW4gPSAhaXNNYWluOwogICAgICAgICB0aGlzLl9jbGVhck5ldHdvcmtJdGVt c05hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSBpc01haW47CiAgICAgICAgIHRoaXMuX2NvbGxlY3Rp b25zUGF0aE5hdmlnYXRpb25JdGVtLmNvbXBvbmVudHMgPSBbdGhpcy5fcGF0aENvbXBvbmVudHNN YXAuZ2V0KGNvbGxlY3Rpb24pXTsKIApAQCAtMTU3MSwxMyArMTU2OCwxMSBAQCBXSS5OZXR3b3Jr VGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ29udGVudFZpZQogCiAgICAgX21haW5SZXNvdXJjZURpZENoYW5nZShldmVudCkKICAgICB7 Ci0gICAgICAgIGxldCBmcmFtZSA9IGV2ZW50LnRhcmdldDsKLSAgICAgICAgaWYgKCFmcmFtZS5p c01haW5GcmFtZSgpIHx8ICFXSS5zZXR0aW5ncy5jbGVhck5ldHdvcmtPbk5hdmlnYXRlLnZhbHVl KQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMucmVzZXQoKTsKLQogICAgICAg ICB0aGlzLl9ydW5Gb3JNYWluQ29sbGVjdGlvbigoY29sbGVjdGlvbikgPT4geworICAgICAgICAg ICAgbGV0IGZyYW1lID0gZXZlbnQudGFyZ2V0OworICAgICAgICAgICAgaWYgKGZyYW1lLmlzTWFp bkZyYW1lKCkgJiYgV0kuc2V0dGluZ3MuY2xlYXJOZXR3b3JrT25OYXZpZ2F0ZS52YWx1ZSkKKyAg ICAgICAgICAgICAgICB0aGlzLl9yZXNldENvbGxlY3Rpb24oY29sbGVjdGlvbik7CisKICAgICAg ICAgICAgIGlmICh0aGlzLl90cmFuc2l0aW9uaW5nUGFnZVRhcmdldCkgewogICAgICAgICAgICAg ICAgIHRoaXMuX3RyYW5zaXRpb25pbmdQYWdlVGFyZ2V0ID0gZmFsc2U7CiAgICAgICAgICAgICAg ICAgdGhpcy5fbmVlZHNJbml0aWFsUG9wdWxhdGUgPSB0cnVlOwo=