157709 2016-05-14 09:23:39 -0700 Web Inspector: Many DataGrid instances do not save/restore their scroll position 2016-05-16 10:41:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1193089 0 timothy 2016-05-14 09:23:39 -0700 There are two bugs here. ContentView's are never restoring their scroll positions from BackFrowardEntry as expected because a new BackFrowardEntry is created each time. Second, many ContentViews don't implement scrollableElements. 1193090 1 webkit-bug-importer 2016-05-14 09:23:57 -0700 <rdar://problem/26286090> 1193124 2 278941 timothy 2016-05-14 12:10:30 -0700 Created attachment 278941 Patch 1193387 3 278941 bburg 2016-05-16 08:43:19 -0700 Comment on attachment 278941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278941&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js:96 > + // is undefined, so we want to show with a state last used. Initially I was worried this could reuse scroll positions where it's not appropriate. For example, two timeline recordings are made, and switching between recordings would reuse the last scroll positions. I'm not sure this will be a problem though, since we create new ContentViews for each representedObject instance. Or, at least, that's what we should be doing. There may be some places that still use singletons (i.e., storage views) where this may have undesirable behavior. 1193390 4 278941 timothy 2016-05-16 08:46:17 -0700 Comment on attachment 278941 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278941&action=review >> Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js:96 >> + // is undefined, so we want to show with a state last used. > > Initially I was worried this could reuse scroll positions where it's not appropriate. For example, two timeline recordings are made, and switching between recordings would reuse the last scroll positions. > > I'm not sure this will be a problem though, since we create new ContentViews for each representedObject instance. Or, at least, that's what we should be doing. There may be some places that still use singletons (i.e., storage views) where this may have undesirable behavior. Yes, we have different views in that case. 1193415 5 timothy 2016-05-16 10:41:34 -0700 https://trac.webkit.org/r200947 278941 2016-05-14 12:10:30 -0700 2016-05-16 08:43:19 -0700 Patch bug-157709-20160514121123.patch text/plain 13140 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk YmIxYmE3OWZjOGZjOGZkYTljYzgxMDRlYWJkMGZkYmRmMDQ5ZTI4Li4wODA2NTc4OTVhOWJiYmE5 YWEyMTEyZGZjNDQ5YWVhMTRhZTM3YjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAxNi0wNS0xNCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFueSBEYXRhR3JpZCBpbnN0YW5jZXMgZG8g bm90IHNhdmUvcmVzdG9yZSB0aGVpciBzY3JvbGwgcG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzcwOQorICAgICAgICByZGFyOi8vcHJv YmxlbS8yNjI4NjA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQmFja0ZvcndhcmRFbnRyeS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5CYWNrRm9yd2FyZEVudHJ5LnByb3RvdHlwZS5tYWtlQ29weSk6IEFk ZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb250YWluZXIucHJvdG90eXBl LnNob3dDb250ZW50Vmlldyk6IENvcHkgdGhlIGxhc3QgZW50cnkgZm9yIHRoZSB2aWV3LgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHNj cm9sbGFibGVFbGVtZW50cyk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv SGVhcFNuYXBzaG90Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90Q29udGVudFZpZXcucHJvdG90eXBlLmdldCBzY3JvbGxhYmxlRWxlbWVudHMpOiBBZGRl ZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0 b3JlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5kZXhlZERhdGFiYXNl T2JqZWN0U3RvcmVDb250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHNjcm9sbGFibGVFbGVtZW50cyk6 IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeVRpbWVsaW5lVmlldy5wcm90b3R5cGUu Z2V0IHNjcm9sbGFibGVFbGVtZW50cyk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvUHJvZmlsZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUHJvZmlsZVZpZXcu cHJvdG90eXBlLmdldCBzY3JvbGxhYmxlRWxlbWVudHMpOiBBZGRlZC4KKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qcm9maWxlVmlldy5wcm90b3R5cGUuX3JlcG9wdWxhdGVEYXRhR3JpZEZyb21UcmVl KTogUmVtb3ZlZCB1bnVzZWQgc2tpcFJlZnJlc2ggYXJndW1lbnQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9TY3JpcHRDbHVzdGVyVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNjcmlwdENsdXN0ZXJUaW1lbGluZVZpZXcucHJvdG90eXBlLmdldCBzY3JvbGxh YmxlRWxlbWVudHMpOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Njcmlw dFByb2ZpbGVUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0UHJv ZmlsZVRpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IHNjcm9sbGFibGVFbGVtZW50cyk6IEFkZGVk LgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZ2V0IHNjcm9sbGFibGVFbGVt ZW50cyk6IEFkZGVkLgorCiAyMDE2LTA1LTEyICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgIkV4dHJhIFNjcmlwdHMiIGZv bGRlciBmcm9tIFJlc291cmNlcyBzaWRlYmFyIGlmIGFsbCBjaGlsZHJlbiByZW1vdmVkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQmFja0Zv cndhcmRFbnRyeS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9CYWNrRm9yd2FyZEVudHJ5LmpzCmluZGV4IDNkYzZiYjM4Y2Y5ODU0MjYxODZjNTFiYzFmZjA3 NDllNGMyZDgzN2YuLjUzMDMyYjE1Njg0OWJiMTc0YzYwYTg2MDgzY2U2ZjM5MGY1YzhlYTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9CYWNr Rm9yd2FyZEVudHJ5LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9CYWNrRm9yd2FyZEVudHJ5LmpzCkBAIC00Niw2ICs0NiwxNCBAQCBXZWJJbnNwZWN0 b3IuQmFja0ZvcndhcmRFbnRyeSA9IGNsYXNzIEJhY2tGb3J3YXJkRW50cnkgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuT2JqZQogCiAgICAgLy8gUHVibGljCiAKKyAgICBtYWtlQ29weShuZXdDb29raWUp CisgICAgeworICAgICAgICBsZXQgY29weSA9IG5ldyBXZWJJbnNwZWN0b3IuQmFja0ZvcndhcmRF bnRyeSh0aGlzLl9jb250ZW50VmlldywgbmV3Q29va2llIHx8IHRoaXMuY29va2llKTsKKyAgICAg ICAgY29weS5fdG9tYnN0b25lID0gdGhpcy5fdG9tYnN0b25lOworICAgICAgICBjb3B5Ll9zY3Jv bGxQb3NpdGlvbnMgPSB0aGlzLl9zY3JvbGxQb3NpdGlvbnMuc2xpY2UoKTsKKyAgICAgICAgcmV0 dXJuIGNvcHk7CisgICAgfQorCiAgICAgZ2V0IGNvbnRlbnRWaWV3KCkKICAgICB7CiAgICAgICAg IHJldHVybiB0aGlzLl9jb250ZW50VmlldzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRWaWV3Q29udGFpbmVyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIu anMKaW5kZXggODIwNDY1NmU3YzdiNzhjNjU2ZTI5OGRiYWYwNjdkNzc4ZjRjNmY5Ni4uYTNjN2E5 ZTQwZDUzY2E4MmRiMWVlOGE0MGViMzk2NTM0MmFlMmM1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZp ZXdDb250YWluZXIuanMKQEAgLTg4LDggKzg4LDIzIEBAIFdlYkluc3BlY3Rvci5Db250ZW50Vmll d0NvbnRhaW5lciA9IGNsYXNzIENvbnRlbnRWaWV3Q29udGFpbmVyIGV4dGVuZHMgV2ViSW5zcGVj CiAgICAgICAgIGlmIChjb250ZW50Vmlldy5wYXJlbnRDb250YWluZXIgIT09IHRoaXMpCiAgICAg ICAgICAgICB0aGlzLl90YWtlT3duZXJzaGlwT2ZDb250ZW50Vmlldyhjb250ZW50Vmlldyk7CiAK LSAgICAgICAgdmFyIGN1cnJlbnRFbnRyeSA9IHRoaXMuY3VycmVudEJhY2tGb3J3YXJkRW50cnk7 Ci0gICAgICAgIHZhciBwcm92aXNpb25hbEVudHJ5ID0gbmV3IFdlYkluc3BlY3Rvci5CYWNrRm9y d2FyZEVudHJ5KGNvbnRlbnRWaWV3LCBjb29raWUpOworICAgICAgICBsZXQgY3VycmVudEVudHJ5 ID0gdGhpcy5jdXJyZW50QmFja0ZvcndhcmRFbnRyeTsKKworICAgICAgICAvLyBUcnkgdG8gZmlu ZCB0aGUgbGFzdCBlbnRyeSB3aXRoIHRoZSBzYW1lIGNvbnRlbnQgdmlldyBzbyB3ZSBjYW4gY29w eSBpdAorICAgICAgICAvLyB0byBwcmVzZXJ2ZSB0aGUgbGFzdCBzY3JvbGwgcG9zaXRpb25zLiBU aGUgc3VwcGxpZWQgY29va2llIChpZiBhbnkpIGNvdWxkCisgICAgICAgIC8vIHN0aWxsIGNoYW5n ZSB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFmdGVyd2FyZHMsIGJ1dCBpbiBtb3N0IGNhc2VzIHRoZSBj b29raWUKKyAgICAgICAgLy8gaXMgdW5kZWZpbmVkLCBzbyB3ZSB3YW50IHRvIHNob3cgd2l0aCBh IHN0YXRlIGxhc3QgdXNlZC4KKyAgICAgICAgbGV0IHByb3Zpc2lvbmFsRW50cnkgPSBudWxsOwor ICAgICAgICBmb3IgKGxldCBpID0gdGhpcy5fYmFja0ZvcndhcmRMaXN0Lmxlbmd0aCAtIDE7IGkg Pj0gMDsgLS1pKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fYmFja0ZvcndhcmRMaXN0W2ldLmNv bnRlbnRWaWV3ID09PSBjb250ZW50VmlldykgeworICAgICAgICAgICAgICAgIHByb3Zpc2lvbmFs RW50cnkgPSB0aGlzLl9iYWNrRm9yd2FyZExpc3RbaV0ubWFrZUNvcHkoY29va2llKTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlm ICghcHJvdmlzaW9uYWxFbnRyeSkKKyAgICAgICAgICAgIHByb3Zpc2lvbmFsRW50cnkgPSBuZXcg V2ViSW5zcGVjdG9yLkJhY2tGb3J3YXJkRW50cnkoY29udGVudFZpZXcsIGNvb2tpZSk7CisKICAg ICAgICAgLy8gRG9uJ3QgZG8gYW55dGhpbmcgaWYgd2Ugd291bGQgaGF2ZSBhZGRlZCBhbiBpZGVu dGljYWwgYmFjay9mb3J3YXJkIGxpc3QgZW50cnkuCiAgICAgICAgIGlmIChjdXJyZW50RW50cnkg JiYgY3VycmVudEVudHJ5LmNvbnRlbnRWaWV3ID09PSBjb250ZW50VmlldyAmJiBPYmplY3Quc2hh bGxvd0VxdWFsKHByb3Zpc2lvbmFsRW50cnkuY29va2llLCBjdXJyZW50RW50cnkuY29va2llKSkg ewogICAgICAgICAgICAgY29uc3Qgc2hvdWxkQ2FsbFNob3duID0gZmFsc2U7CkBAIC0xMDEsMTgg KzExNiwxOCBAQCBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdDb250YWluZXIgPSBjbGFzcyBDb250 ZW50Vmlld0NvbnRhaW5lciBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICAvLyBhdCB0aGUgZW5k IG9mIHRoZSBsaXN0LiBGaW5hbGx5LCB0aGUgY3VycmVudCBpbmRleCB3aWxsIGJlIHVwZGF0ZWQg dG8gcG9pbnQgdG8gdGhlIGVuZCBvZiB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCiAKICAgICAgICAg Ly8gSW5jcmVtZW50IHRoZSBjdXJyZW50IGluZGV4IHRvIHdoZXJlIHdlIHdpbGwgaW5zZXJ0IHRo ZSBjb250ZW50IHZpZXcuCi0gICAgICAgIHZhciBuZXdJbmRleCA9IHRoaXMuX2N1cnJlbnRJbmRl eCArIDE7CisgICAgICAgIGxldCBuZXdJbmRleCA9IHRoaXMuX2N1cnJlbnRJbmRleCArIDE7CiAK ICAgICAgICAgLy8gSW5zZXJ0IHRoZSBjb250ZW50IHZpZXcgYXQgdGhlIG5ldyBpbmRleC4gVGhp cyB3aWxsIHJlbW92ZSBhbnkgY29udGVudCB2aWV3cyBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8g dGhlIGluZGV4LgotICAgICAgICB2YXIgcmVtb3ZlZEVudHJpZXMgPSB0aGlzLl9iYWNrRm9yd2Fy ZExpc3Quc3BsaWNlKG5ld0luZGV4LCB0aGlzLl9iYWNrRm9yd2FyZExpc3QubGVuZ3RoIC0gbmV3 SW5kZXgsIHByb3Zpc2lvbmFsRW50cnkpOworICAgICAgICBsZXQgcmVtb3ZlZEVudHJpZXMgPSB0 aGlzLl9iYWNrRm9yd2FyZExpc3Quc3BsaWNlKG5ld0luZGV4LCB0aGlzLl9iYWNrRm9yd2FyZExp c3QubGVuZ3RoIC0gbmV3SW5kZXgsIHByb3Zpc2lvbmFsRW50cnkpOwogCiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KG5ld0luZGV4ID09PSB0aGlzLl9iYWNrRm9yd2FyZExpc3QubGVuZ3RoIC0gMSk7 CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2JhY2tGb3J3YXJkTGlzdFtuZXdJbmRleF0g PT09IHByb3Zpc2lvbmFsRW50cnkpOwogCiAgICAgICAgIC8vIERpc2Fzc29jaWF0ZSB3aXRoIHRo ZSByZW1vdmVkIGNvbnRlbnQgdmlld3MuCi0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcmVt b3ZlZEVudHJpZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBy ZW1vdmVkRW50cmllcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgLy8gU2tpcCBkaXNhc3Nv Y2lhdGlvbiBpZiB0aGlzIGNvbnRlbnQgdmlldyBpcyBzdGlsbCBpbiB0aGUgYmFjay9mb3J3YXJk IGxpc3QuCi0gICAgICAgICAgICB2YXIgc2hvdWxkRGlzc29jaWF0ZUNvbnRlbnRWaWV3ID0gIXRo aXMuX2JhY2tGb3J3YXJkTGlzdC5zb21lKGZ1bmN0aW9uKGV4aXN0aW5nRW50cnkpIHsKKyAgICAg ICAgICAgIGxldCBzaG91bGREaXNzb2NpYXRlQ29udGVudFZpZXcgPSAhdGhpcy5fYmFja0Zvcndh cmRMaXN0LnNvbWUoZnVuY3Rpb24oZXhpc3RpbmdFbnRyeSkgewogICAgICAgICAgICAgICAgIHJl dHVybiBleGlzdGluZ0VudHJ5LmNvbnRlbnRWaWV3ID09PSByZW1vdmVkRW50cmllc1tpXS5jb250 ZW50VmlldzsKICAgICAgICAgICAgIH0pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZp ZXcuanMKaW5kZXggZjhlMjQ1MWI5ZTA5ZmNmZmM0N2U5ZDdjMzU2ZmEwMDBiMzVkYTJjZi4uOTk5 NTFhNmY3NWJmNzMxMDdiMTllM2E0MDIzODQ1OTYzZTM0OGVkMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0 b3JhZ2VDb250ZW50Vmlldy5qcwpAQCAtNjAsNiArNjAsMTEgQEAgV2ViSW5zcGVjdG9yLkRPTVN0 b3JhZ2VDb250ZW50VmlldyA9IGNsYXNzIERPTVN0b3JhZ2VDb250ZW50VmlldyBleHRlbmRzIFdl Ykluc3AKICAgICAgICAgY29va2llLmhvc3QgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0Lmhvc3Q7 CiAgICAgfQogCisgICAgZ2V0IHNjcm9sbGFibGVFbGVtZW50cygpCisgICAgeworICAgICAgICBy ZXR1cm4gW3RoaXMuX2RhdGFHcmlkLnNjcm9sbENvbnRhaW5lcl07CisgICAgfQorCiAgICAgaXRl bXNDbGVhcmVkKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQucmVtb3ZlQ2hp bGRyZW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0hlYXBTbmFwc2hvdENvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90Q29udGVudFZpZXcuanMKaW5kZXggNzhk NTQ2N2UxNmFiNDk1Mjg3MTFmZjQ1ZWE1Y2M4MWMwMDM0MGUwNi4uNmIyMjIwNTQzYzc5YTA0ZmIw NWUzOTNlMmFlYzU3NDUxZWQzNzVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90Q29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90Q29udGVu dFZpZXcuanMKQEAgLTY1LDYgKzY1LDExIEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb250 ZW50VmlldyA9IGNsYXNzIEhlYXBTbmFwc2hvdENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViCiAgICAg ICAgIHRoaXMuX2hlYXBTbmFwc2hvdERhdGFHcmlkVHJlZS5oaWRkZW4oKTsKICAgICB9CiAKKyAg ICBnZXQgc2Nyb2xsYWJsZUVsZW1lbnRzKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbdGhpcy5f ZGF0YUdyaWQuc2Nyb2xsQ29udGFpbmVyXTsKKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAKICAg ICBfc29ydERhdGFHcmlkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmRleGVkRGF0YWJh c2VPYmplY3RTdG9yZUNvbnRlbnRWaWV3LmpzCmluZGV4IGRmNjZhNDVmZjk0MjMxNGVjZmRjYThi ZDRhMDE5ODRjZDM5ZmU0NzguLjI4NzJhYTRkMDJlMWFhOTc2ODc1MDg5OTQ2ZWU5N2VjNjQxZjg1 ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0luZGV4ZWREYXRhYmFzZU9iamVjdFN0b3JlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW5kZXhlZERhdGFiYXNlT2JqZWN0U3Rv cmVDb250ZW50Vmlldy5qcwpAQCAtMTAxLDYgKzEwMSwxMSBAQCBXZWJJbnNwZWN0b3IuSW5kZXhl ZERhdGFiYXNlT2JqZWN0U3RvcmVDb250ZW50VmlldyA9IGNsYXNzIEluZGV4ZWREYXRhYmFzZU9i amVjdAogICAgICAgICBjb29raWUub2JqZWN0U3RvcmVJbmRleE5hbWUgPSB0aGlzLl9vYmplY3RT dG9yZUluZGV4ICYmIHRoaXMuX29iamVjdFN0b3JlSW5kZXgubmFtZTsKICAgICB9CiAKKyAgICBn ZXQgc2Nyb2xsYWJsZUVsZW1lbnRzKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbdGhpcy5fZGF0 YUdyaWQuc2Nyb2xsQ29udGFpbmVyXTsKKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAKICAgICBf cmVzZXQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvTWVtb3J5VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVWaWV3LmpzCmluZGV4IDAxM2ViZTRhNWUzMmIx YjE1Mjc4OTA2ZTVhNDc5ODU2NTc5OTVmYzkuLjU0OWFkYzE4OGI4Yjk4OTUzMzBlZjJkYmJiNjY2 NTNjNjIzOTE4MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL01lbW9yeVRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuanMKQEAgLTE1MSw2ICsx NTEsMTEgQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVRpbWVsaW5lVmlldyA9IGNsYXNzIE1lbW9yeVRp bWVsaW5lVmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci4KICAgICAgICAgICAgIGNhdGVnb3J5Vmll dy5jbGVhcigpOwogICAgIH0KIAorICAgIGdldCBzY3JvbGxhYmxlRWxlbWVudHMoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIFt0aGlzLmVsZW1lbnRdOworICAgIH0KKwogICAgIC8vIFByb3RlY3Rl ZAogCiAgICAgZ2V0IHNob3dzRmlsdGVyQmFyKCkgeyByZXR1cm4gZmFsc2U7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2ZpbGVWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZVZp ZXcuanMKaW5kZXggZjQwODkzYjkzMmI1MTM2OTAzYTYwOWMyN2ZjZDRiOWVhMTEyZTVjZC4uYmQ5 NjQ2OWUyYjMwZWVmNzc3Y2I0N2VmZmMwNGFlNWYwZTQyOGFmYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZVZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvZmlsZVZpZXcuanMK QEAgLTEwNiw2ICsxMDYsMTEgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVWaWV3ID0gY2xhc3MgUHJv ZmlsZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcKICAgICAgICAgdGhpcy5f cHJvZmlsZURhdGFHcmlkVHJlZS5jbGVhckZvY3VzTm9kZXMoKTsKICAgICB9CiAKKyAgICBnZXQg c2Nyb2xsYWJsZUVsZW1lbnRzKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbdGhpcy5fZGF0YUdy aWQuc2Nyb2xsQ29udGFpbmVyXTsKKyAgICB9CisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIGdl dCBzZWxlY3Rpb25QYXRoQ29tcG9uZW50cygpCkBAIC0xNDEsNyArMTQ2LDcgQEAgV2ViSW5zcGVj dG9yLlByb2ZpbGVWaWV3ID0gY2xhc3MgUHJvZmlsZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu Q29udGVudFZpZXcKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENo YW5nZSk7CiAgICAgfQogCi0gICAgX3JlcG9wdWxhdGVEYXRhR3JpZEZyb21UcmVlKHNraXBSZWZy ZXNoKQorICAgIF9yZXBvcHVsYXRlRGF0YUdyaWRGcm9tVHJlZSgpCiAgICAgewogICAgICAgICB0 aGlzLl9kYXRhR3JpZC5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICBmb3IgKGxldCBjaGlsZCBv ZiB0aGlzLl9wcm9maWxlRGF0YUdyaWRUcmVlLmNoaWxkcmVuKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0Q2x1c3RlclRpbWVsaW5l Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njcmlw dENsdXN0ZXJUaW1lbGluZVZpZXcuanMKaW5kZXggY2NlMWE0OWYxZjE1ODI5ODliODNhMDQ2OGQz NDhmZTkwNTJkZWRlYy4uZGNmMDVkZjIyYzJlZWMxNDA1NzJiMzAyYzIzMTUzYjBkNzFmYzlmZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2Ny aXB0Q2x1c3RlclRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TY3JpcHRDbHVzdGVyVGltZWxpbmVWaWV3LmpzCkBAIC03MSw2ICs3 MSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRDbHVzdGVyVGltZWxpbmVWaWV3ID0gY2xhc3MgU2Ny aXB0Q2x1c3RlclRpbWVsaW5lVmlldyBleHRlbmRzCiAgICAgc2V0IGVuZFRpbWUoeCkgeyB0aGlz Ll9jb250ZW50Vmlld0NvbnRhaW5lci5jdXJyZW50Q29udGVudFZpZXcuZW5kVGltZSA9IHg7IH0K ICAgICBnZXQgY3VycmVudFRpbWUoKSB7IHJldHVybiB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5l ci5jdXJyZW50Q29udGVudFZpZXcuY3VycmVudFRpbWU7IH0KICAgICBzZXQgY3VycmVudFRpbWUo eCkgeyB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5jdXJyZW50Q29udGVudFZpZXcuY3VycmVu dFRpbWUgPSB4OyB9CisgICAgZ2V0IHNjcm9sbGFibGVFbGVtZW50cygpIHsgcmV0dXJuIHRoaXMu X2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50Vmlldy5zY3JvbGxhYmxlRWxlbWVu dHM7IH0KICAgICB1cGRhdGVGaWx0ZXIoZmlsdGVycykgeyByZXR1cm4gdGhpcy5fY29udGVudFZp ZXdDb250YWluZXIuY3VycmVudENvbnRlbnRWaWV3LnVwZGF0ZUZpbHRlcihmaWx0ZXJzKTsgfQog ICAgIGZpbHRlckRpZENoYW5nZSgpIHsgcmV0dXJuIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVy LmN1cnJlbnRDb250ZW50Vmlldy5maWx0ZXJEaWRDaGFuZ2UoKTsgfQogICAgIG1hdGNoRGF0YUdy aWROb2RlQWdhaW5zdEN1c3RvbUZpbHRlcnMobm9kZSkgeyByZXR1cm4gdGhpcy5fY29udGVudFZp ZXdDb250YWluZXIuY3VycmVudENvbnRlbnRWaWV3Lm1hdGNoRGF0YUdyaWROb2RlQWdhaW5zdEN1 c3RvbUZpbHRlcnMobm9kZSk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFByb2ZpbGVUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRQcm9maWxlVGltZWxpbmVW aWV3LmpzCmluZGV4IDE1NDA1MTBmMzhhMWJiNGU0MjJkYTgwYzQxNzA1NGIxOTQ1N2Q1OGIuLjlj N2U4OTJmMmJiODU0Njc5OGUzNzkyNGY2NzU4ZTNhOWYzOTM0MzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFByb2ZpbGVUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0UHJvZmlsZVRpbWVsaW5lVmlldy5qcwpAQCAtNjcsNiArNjcsOCBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0UHJvZmlsZVRpbWVsaW5lVmlldyA9IGNsYXNzIFNjcmlwdFByb2ZpbGVUaW1lbGlu ZVZpZXcgZXh0ZW5kcwogCiAgICAgLy8gUHVibGljCiAKKyAgICBnZXQgc2Nyb2xsYWJsZUVsZW1l bnRzKCkgeyByZXR1cm4gdGhpcy5fcHJvZmlsZVZpZXcuc2Nyb2xsYWJsZUVsZW1lbnRzOyB9CisK ICAgICBnZXQgc2hvd3NMaXZlUmVjb3JkaW5nRGF0YSgpIHsgcmV0dXJuIGZhbHNlOyB9CiAKICAg ICAvLyBGSVhNRTogPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE1NzU4MT4gV2ViIEluc3BlY3Rvcjog U2NyaXB0IFByb2ZpbGVWaWV3cyBzaG91bGQgYmUgc2VhcmNoYWJsZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVWaWV3Lmpz CmluZGV4IDYyOGM3NDNjYTZmOGNmYzA2NWVlMmY3ZDdjYTE3NWE1MWY5ZjMwMjEuLjYwZjNiOTEw NDU5NzZlNTgzNWJhODI1ODM3NDg0Y2QxYTQ0Yzc1NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVZpZXcuanMKQEAg LTQzLDYgKzQzLDEzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcgPSBjbGFzcyBUaW1lbGlu ZVZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcKIAogICAgIC8vIFB1YmxpYwog CisgICAgZ2V0IHNjcm9sbGFibGVFbGVtZW50cygpCisgICAgeworICAgICAgICBpZiAoIXRoaXMu X3RpbWVsaW5lRGF0YUdyaWQpCisgICAgICAgICAgICByZXR1cm4gW107CisgICAgICAgIHJldHVy biBbdGhpcy5fdGltZWxpbmVEYXRhR3JpZC5zY3JvbGxDb250YWluZXJdOworICAgIH0KKwogICAg IGdldCBzaG93c0xpdmVSZWNvcmRpbmdEYXRhKCkKICAgICB7CiAgICAgICAgIC8vIEltcGxlbWVu dGVkIGJ5IHN1Yi1jbGFzc2VzIGlmIG5lZWRlZC4K