173425 2017-06-15 11:46:40 -0700 Uncaught Exception: TypeError: null is not an object (evaluating 'this.contentBrowser.contentViewForRepresentedObject') 2017-06-15 14:29:38 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://msaboff.github.io/RallyTracker/index.html InRadar P2 Normal --- 1 joepeck joepeck commit-queue hi inspector-bugzilla-changes joepeck msaboff webkit-bug-importer oldest_to_newest 1319636 0 joepeck 2017-06-15 11:46:40 -0700 Summary: Uncaught Exception switching between tabs for the first time. Steps to Reproduce: 1. Inspect <https://msaboff.github.io/RallyTracker/index.html> 2. Show Storage Tab 3. Select the Application Cache (index.html) 4. Select the Debugger Tab 5. Close Inspector 6. Open Inspector (Develop > Show Web Inspector) => Should open to the Debugger tab 7. Select the Storage Tab => Uncaught Exception Uncaught Exceptions: - TypeError: null is not an object (evaluating 'this.contentBrowser.contentViewForRepresentedObject') (at NavigationSidebarPanel.js:191:50) showDefaultContentViewForTreeElement @ NavigationSidebarPanel.js:191:50 _checkElementsForPendingViewStateCookie @ NavigationSidebarPanel.js:709:79 restoreStateFromCookie @ NavigationSidebarPanel.js:237:53 restoreStateFromCookie @ TabContentView.js:156:63 shown @ TabContentView.js:135:40 shown @ ContentBrowserTabContentView.js:95:20 prepareToShow @ BackForwardEntry.js:86:35 _showEntry @ ContentViewContainer.js:445:28 showBackForwardEntryForIndex @ ContentViewContainer.js:162:28 showContentView @ ContentViewContainer.js:138:42 _tabBarItemSelected @ TabBrowser.js:239:55 dispatch @ Object.js:170:30 dispatchEventToListeners @ Object.js:177:17 selectedTabBarItem @ TabBar.js:376:38 _handleMouseDown @ TabBar.js:569:13 _handleMouseDown @ [native code] 1319637 1 joepeck 2017-06-15 11:46:57 -0700 <rdar://problem/32744172> 1319639 2 joepeck 2017-06-15 11:49:32 -0700 I can provide a simple solution to avoid the uncaught exception (and therefore the broken tab appearance that results) however it appears tab state restoration is not working as expected (selecting something in the sidebar + loading its content view). I think this is a regression from lazy sidebar initialization. 1319685 3 313001 joepeck 2017-06-15 13:39:42 -0700 Created attachment 313001 [PATCH] Proposed Fix 1319686 4 joepeck 2017-06-15 13:40:41 -0700 > I think this is a regression from lazy sidebar initialization. I don't think this is a regression from lazy sidebar initialization. But it is certainly a mixture of issues. I made restoration work slightly better in both the Debugger and Storage tabs. 1319688 5 313001 hi 2017-06-15 13:45:49 -0700 Comment on attachment 313001 [PATCH] Proposed Fix r=me View in context: https://bugs.webkit.org/attachment.cgi?id=313001&action=review > Source/WebInspectorUI/ChangeLog:16 > + By default select a script/resource content view instead of nothing. This sentence is awkward to me. Always select a script/resource content view instead of nothing. > Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:98 > if (this.navigationSidebarPanel) { > if (!this.navigationSidebarPanel.contentBrowser) > this.navigationSidebarPanel.contentBrowser = this._contentBrowser; > + } You can squash the two if statements: if (this.navigationSidebarPanel && !this.navigationSidebarPanel.contentBrowser) this.navigationSidebarPanel.contentBrowser = this._contentBrowser; > Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:107 > + if (this.navigationSidebarPanel) { > if (!this._contentBrowser.currentContentView) > this.navigationSidebarPanel.showDefaultContentView(); > } Ditto: if (this.navigationSidebarPanel && !this._contentBrowser.currentContentView) this.navigationSidebarPanel.showDefaultContentView(); 1319689 6 313002 joepeck 2017-06-15 13:47:34 -0700 Created attachment 313002 [PATCH] For Landing 1319710 7 313002 commit-queue 2017-06-15 14:26:37 -0700 Comment on attachment 313002 [PATCH] For Landing Clearing flags on attachment: 313002 Committed r218356: <http://trac.webkit.org/changeset/218356> 313001 2017-06-15 13:39:42 -0700 2017-06-15 13:47:41 -0700 [PATCH] Proposed Fix restore-1.patch text/plain 4910 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQyNjFmNGYxNmZlLi5mN2ZkNzIxMjk4NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTctMDYtMTUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBVbmNhdWdodCBFeGNl cHRpb246IFR5cGVFcnJvcjogbnVsbCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICd0aGlz LmNvbnRlbnRCcm93c2VyLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QnKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNDI1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zMjc0NDE3Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJU YWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRh YkNvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93bik6CisgICAgICAgIFJlb3JkZXIgc2xpZ2h0bHkg c28gdGhlIE5hdmlnYXRpb25TaWRlYmFyIGhhcyBpdHMgQ29udGVudEJyb3dzZXIgc2V0CisgICAg ICAgIGJlZm9yZSBhbnlvbmUgdHJpZXMgdG8gcmVzdG9yZSB2aWV3cyBpbiB0aGUgc2lkZWJhci4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNo b3dEZWZhdWx0Q29udGVudFZpZXcpOgorICAgICAgICBCeSBkZWZhdWx0IHNlbGVjdCBhIHNjcmlw dC9yZXNvdXJjZSBjb250ZW50IHZpZXcgaW5zdGVhZCBvZiBub3RoaW5nLgorCisgICAgICAgIChX ZWJJbnNwZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNhdmVTdGF0ZVRvQ29v a2llKToKKyAgICAgICAgV2hlbiBhIHJlc291cmNlIGlzIHNlbGVjdGVkLCBzYXZlIGl0IHVzaW5n IHRoZSBub3JtYWwgcGF0aC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrU2lkZWJhclBh bmVsLnByb3RvdHlwZS5jYW5TaG93RGlmZmVyZW50Q29udGVudFZpZXcpOgorICAgICAgICBSZW1v dmUgYSByZWZlcmVuY2UgdG8gYW4gdW51c2VkIC8gc3RhbGUgbWVtYmVyIHZhcmlhYmxlLgorCiAy MDE3LTA2LTEzICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IENvbnNvbGU6IE1lc3NhZ2UgaWNvbnMgb3ZlcmxheSBzb3VyY2Ug bG9jYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3Lmpz CmluZGV4IGVjOGNkNzc4NmY2Li44MDQwZDNkNzczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCkBAIC05MiwxNCArOTIsMTYgQEAgV2ViSW5zcGVj dG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRh YkNvbnRlbnRWaWV3IGUKIAogICAgIHNob3duKCkKICAgICB7Ci0gICAgICAgIHN1cGVyLnNob3du KCk7Ci0KLSAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuc2hvd24oKTsKLQogICAgICAgICBp ZiAodGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMu bmF2aWdhdGlvblNpZGViYXJQYW5lbC5jb250ZW50QnJvd3NlcikKICAgICAgICAgICAgICAgICB0 aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwuY29udGVudEJyb3dzZXIgPSB0aGlzLl9jb250ZW50 QnJvd3NlcjsKKyAgICAgICAgfQogCisgICAgICAgIHN1cGVyLnNob3duKCk7CisKKyAgICAgICAg dGhpcy5fY29udGVudEJyb3dzZXIuc2hvd24oKTsKKworICAgICAgICBpZiAodGhpcy5uYXZpZ2F0 aW9uU2lkZWJhclBhbmVsKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMuX2NvbnRlbnRCcm93c2Vy LmN1cnJlbnRDb250ZW50VmlldykKICAgICAgICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRl YmFyUGFuZWwuc2hvd0RlZmF1bHRDb250ZW50VmlldygpOwogICAgICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGVi YXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Rl YnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IGYxMTI2NDkyMzVjLi4wNDk0NzJmMWZjMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdn ZXJTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTI4MCw3ICsyODAsMTMgQEAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0gY2xhc3MgRGVidWdnZXJTaWRlYmFyUGFu ZWwgZXh0ZW5kcyBXZWJJbnNwZWMKIAogICAgIHNob3dEZWZhdWx0Q29udGVudFZpZXcoKQogICAg IHsKLSAgICAgICAgdmFyIGN1cnJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2NvbnRlbnRUcmVlT3V0 bGluZS5jaGlsZHJlblswXTsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNl TWFuYWdlci5tYWluRnJhbWUpIHsKKyAgICAgICAgICAgIGxldCBtYWluVHJlZUVsZW1lbnQgPSB0 aGlzLl9zY3JpcHRzQ29udGVudFRyZWVPdXRsaW5lLmZpbmRUcmVlRWxlbWVudChXZWJJbnNwZWN0 b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLm1haW5SZXNvdXJjZSk7CisgICAgICAg ICAgICBpZiAobWFpblRyZWVFbGVtZW50ICYmIHRoaXMuc2hvd0RlZmF1bHRDb250ZW50Vmlld0Zv clRyZWVFbGVtZW50KG1haW5UcmVlRWxlbWVudCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisKKyAgICAgICAgbGV0IGN1cnJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX3Njcmlw dHNDb250ZW50VHJlZU91dGxpbmUuY2hpbGRyZW5bMF07CiAgICAgICAgIHdoaWxlIChjdXJyZW50 VHJlZUVsZW1lbnQgJiYgIWN1cnJlbnRUcmVlRWxlbWVudC5yb290KSB7CiAgICAgICAgICAgICBp ZiAoY3VycmVudFRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJl ZUVsZW1lbnQgfHwgY3VycmVudFRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNj cmlwdFRyZWVFbGVtZW50KSB7CiAgICAgICAgICAgICAgICAgaWYgKHRoaXMuc2hvd0RlZmF1bHRD b250ZW50Vmlld0ZvclRyZWVFbGVtZW50KGN1cnJlbnRUcmVlRWxlbWVudCkpCkBAIC0zMzAsOCAr MzM2LDEwIEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGNsYXNzIERlYnVn Z2VyU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KGNvb2tpZSk7CiAKICAgICAgICAgdmFyIHNlbGVjdGVkVHJlZUVsZW1lbnQgPSB0aGlzLl9icmVh a3BvaW50c0NvbnRlbnRUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50OwotICAgICAgICBp ZiAoIXNlbGVjdGVkVHJlZUVsZW1lbnQpCisgICAgICAgIGlmICghc2VsZWN0ZWRUcmVlRWxlbWVu dCkgeworICAgICAgICAgICAgc3VwZXIuc2F2ZVN0YXRlVG9Db29raWUoY29va2llKTsKICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCiAgICAgICAgIHZhciByZXByZXNlbnRlZE9iamVj dCA9IHNlbGVjdGVkVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtTaWRlYmFy UGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrU2lkZWJhclBhbmVsLmpzCmluZGV4IGE1MTQ1NWE1YmM2Li42NjExMDM1ODYxYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Np ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrU2lkZWJhclBhbmVsLmpzCkBAIC02Miw3ICs2Miw3IEBAIFdlYkluc3BlY3Rv ci5OZXR3b3JrU2lkZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1NpZGViYXJQYW5lbCBleHRlbmRz IFdlYkluc3BlY3RvCiAgICAgICAgIGlmICh0aGlzLmNvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250 ZW50VmlldyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3KQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHJldHVybiAhdGhpcy5yZXN0b3Jp bmdTdGF0ZSB8fCAhdGhpcy5fcmVzdG9yZWRTaG93aW5nTmV0d29ya0dyaWRDb250ZW50VmlldzsK KyAgICAgICAgcmV0dXJuICF0aGlzLnJlc3RvcmluZ1N0YXRlOwogICAgIH0KIAogICAgIC8vIFBy b3RlY3RlZAo= 313002 2017-06-15 13:47:34 -0700 2017-06-15 14:26:37 -0700 [PATCH] For Landing restore-2.patch text/plain 4904 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQyNjFmNGYxNmZlLi4yMjVhNTIxM2E5NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTctMDYtMTUgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBVbmNhdWdodCBFeGNl cHRpb246IFR5cGVFcnJvcjogbnVsbCBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICd0aGlz LmNvbnRlbnRCcm93c2VyLmNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QnKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNDI1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zMjc0NDE3Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBS b3Vzc28uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFi Q29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJD b250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24pOgorICAgICAgICBSZW9yZGVyIHNsaWdodGx5IHNv IHRoZSBOYXZpZ2F0aW9uU2lkZWJhciBoYXMgaXRzIENvbnRlbnRCcm93c2VyIHNldAorICAgICAg ICBiZWZvcmUgYW55b25lIHRyaWVzIHRvIHJlc3RvcmUgdmlld3MgaW4gdGhlIHNpZGViYXIuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZS5zaG93 RGVmYXVsdENvbnRlbnRWaWV3KToKKyAgICAgICAgVHJ5IHRvIHNlbGVjdCBhIHNjcmlwdC9yZXNv dXJjZSBjb250ZW50IHZpZXcgaW5zdGVhZCBvZiBub3RoaW5nLgorCisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGVidWdnZXJTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNhdmVTdGF0ZVRvQ29va2llKToK KyAgICAgICAgV2hlbiBhIHJlc291cmNlIGlzIHNlbGVjdGVkLCBzYXZlIGl0IHVzaW5nIHRoZSBu b3JtYWwgcGF0aC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1NpZGVi YXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrU2lkZWJhclBhbmVsLnBy b3RvdHlwZS5jYW5TaG93RGlmZmVyZW50Q29udGVudFZpZXcpOgorICAgICAgICBSZW1vdmUgYSBy ZWZlcmVuY2UgdG8gYW4gdW51c2VkIC8gc3RhbGUgbWVtYmVyIHZhcmlhYmxlLgorCiAyMDE3LTA2 LTEzICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IENvbnNvbGU6IE1lc3NhZ2UgaWNvbnMgb3ZlcmxheSBzb3VyY2UgbG9jYXRp b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCmluZGV4 IGVjOGNkNzc4NmY2Li44MDQwZDNkNzczMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3NlclRhYkNvbnRlbnRWaWV3LmpzCkBAIC05MiwxNCArOTIsMTYgQEAgV2ViSW5zcGVjdG9yLkNv bnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgPSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3IGUKIAogICAgIHNob3duKCkKICAgICB7Ci0gICAgICAgIHN1cGVyLnNob3duKCk7Ci0K LSAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuc2hvd24oKTsKLQogICAgICAgICBpZiAodGhp cy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMubmF2aWdh dGlvblNpZGViYXJQYW5lbC5jb250ZW50QnJvd3NlcikKICAgICAgICAgICAgICAgICB0aGlzLm5h dmlnYXRpb25TaWRlYmFyUGFuZWwuY29udGVudEJyb3dzZXIgPSB0aGlzLl9jb250ZW50QnJvd3Nl cjsKKyAgICAgICAgfQogCisgICAgICAgIHN1cGVyLnNob3duKCk7CisKKyAgICAgICAgdGhpcy5f Y29udGVudEJyb3dzZXIuc2hvd24oKTsKKworICAgICAgICBpZiAodGhpcy5uYXZpZ2F0aW9uU2lk ZWJhclBhbmVsKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMuX2NvbnRlbnRCcm93c2VyLmN1cnJl bnRDb250ZW50VmlldykKICAgICAgICAgICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFu ZWwuc2hvd0RlZmF1bHRDb250ZW50VmlldygpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclNpZGViYXJQYW5l bC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2Vy U2lkZWJhclBhbmVsLmpzCmluZGV4IGYxMTI2NDkyMzVjLi4wNDk0NzJmMWZjMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJTaWRl YmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRGVidWdnZXJTaWRlYmFyUGFuZWwuanMKQEAgLTI4MCw3ICsyODAsMTMgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsID0gY2xhc3MgRGVidWdnZXJTaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXZWJJbnNwZWMKIAogICAgIHNob3dEZWZhdWx0Q29udGVudFZpZXcoKQogICAgIHsKLSAg ICAgICAgdmFyIGN1cnJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZS5j aGlsZHJlblswXTsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdl ci5tYWluRnJhbWUpIHsKKyAgICAgICAgICAgIGxldCBtYWluVHJlZUVsZW1lbnQgPSB0aGlzLl9z Y3JpcHRzQ29udGVudFRyZWVPdXRsaW5lLmZpbmRUcmVlRWxlbWVudChXZWJJbnNwZWN0b3IuZnJh bWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLm1haW5SZXNvdXJjZSk7CisgICAgICAgICAgICBp ZiAobWFpblRyZWVFbGVtZW50ICYmIHRoaXMuc2hvd0RlZmF1bHRDb250ZW50Vmlld0ZvclRyZWVF bGVtZW50KG1haW5UcmVlRWxlbWVudCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICB9CisKKyAgICAgICAgbGV0IGN1cnJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX3NjcmlwdHNDb250 ZW50VHJlZU91dGxpbmUuY2hpbGRyZW5bMF07CiAgICAgICAgIHdoaWxlIChjdXJyZW50VHJlZUVs ZW1lbnQgJiYgIWN1cnJlbnRUcmVlRWxlbWVudC5yb290KSB7CiAgICAgICAgICAgICBpZiAoY3Vy cmVudFRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUVsZW1l bnQgfHwgY3VycmVudFRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNjcmlwdFRy ZWVFbGVtZW50KSB7CiAgICAgICAgICAgICAgICAgaWYgKHRoaXMuc2hvd0RlZmF1bHRDb250ZW50 Vmlld0ZvclRyZWVFbGVtZW50KGN1cnJlbnRUcmVlRWxlbWVudCkpCkBAIC0zMzAsOCArMzM2LDEw IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbCA9IGNsYXNzIERlYnVnZ2VyU2lk ZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNvb2tp ZSk7CiAKICAgICAgICAgdmFyIHNlbGVjdGVkVHJlZUVsZW1lbnQgPSB0aGlzLl9icmVha3BvaW50 c0NvbnRlbnRUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50OwotICAgICAgICBpZiAoIXNl bGVjdGVkVHJlZUVsZW1lbnQpCisgICAgICAgIGlmICghc2VsZWN0ZWRUcmVlRWxlbWVudCkgewor ICAgICAgICAgICAgc3VwZXIuc2F2ZVN0YXRlVG9Db29raWUoY29va2llKTsKICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQogCiAgICAgICAgIHZhciByZXByZXNlbnRlZE9iamVjdCA9IHNl bGVjdGVkVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtTaWRlYmFyUGFuZWwu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrU2lk ZWJhclBhbmVsLmpzCmluZGV4IGE1MTQ1NWE1YmM2Li42NjExMDM1ODYxYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1NpZGViYXJQ YW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrU2lkZWJhclBhbmVsLmpzCkBAIC02Miw3ICs2Miw3IEBAIFdlYkluc3BlY3Rvci5OZXR3 b3JrU2lkZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1NpZGViYXJQYW5lbCBleHRlbmRzIFdlYklu c3BlY3RvCiAgICAgICAgIGlmICh0aGlzLmNvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250ZW50Vmll dyBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3KQogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIHJldHVybiAhdGhpcy5yZXN0b3JpbmdTdGF0 ZSB8fCAhdGhpcy5fcmVzdG9yZWRTaG93aW5nTmV0d29ya0dyaWRDb250ZW50VmlldzsKKyAgICAg ICAgcmV0dXJuICF0aGlzLnJlc3RvcmluZ1N0YXRlOwogICAgIH0KIAogICAgIC8vIFByb3RlY3Rl ZAo=