49493 2010-11-13 07:04:11 -0800 Web Inspector: [refactoring] support Views in TabbedPane and streamline tab selection in resource view 2010-11-13 08:42:04 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 308974 0 caseq 2010-11-13 07:04:11 -0800 TabbedPane currently expects child "windows" to be tabs. The proposed patch adds support for Views that are selected via View.visible. This allows moving custom logic associated with tab being selected into overridden View.Show(), which, in turn, allows to streamline tab selection logic in ResourceView. 308975 1 73823 caseq 2010-11-13 07:14:08 -0800 Created attachment 73823 patch 308978 2 caseq 2010-11-13 07:19:13 -0800 (In reply to comment #0) > TabbedPane currently expects child "windows" to be tabs. s/tabs/elements/ 308983 3 73823 pfeldman 2010-11-13 07:47:24 -0800 Comment on attachment 73823 patch View in context: https://bugs.webkit.org/attachment.cgi?id=73823&action=review > WebCore/ChangeLog:10 > + No new tests. (OOPS!) Remove this line. > WebCore/inspector/front-end/ResourceView.js:163 > + tab = this.tabbedPane.hasTab(preferredTab) ? preferredTab : "headers"; We used to go to "content" by default, now we should "headers". However, now that we have split resources and network, I think this is right! > WebCore/inspector/front-end/TabbedPane.js:72 > + _setSelection: function(tabObject, isSelected) split this into _showTab and _hideTab? 308984 4 73827 caseq 2010-11-13 08:20:19 -0800 Created attachment 73827 patch to land All review comments addressed. 308985 5 caseq 2010-11-13 08:42:04 -0800 Manually committed r71967: http://trac.webkit.org/changeset/71967 73823 2010-11-13 07:14:08 -0800 2010-11-13 08:20:19 -0800 patch tabbed-pane-views.diff text/plain 10749 caseq ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjIzYzUwYi4uM2Q3OGFlOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0xMS0xMyAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBWaWV3cyBpbiBUYWJiZWRQYW5lLgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtyZWZhY3RvcmluZ10gc3VwcG9ydCBWaWV3cyBpbiBU YWJiZWRQYW5lIGFuZCBzdHJlYW1saW5lIHRhYiBzZWxlY3Rpb24gaW4gcmVzb3VyY2Ugdmlldwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk0OTMKKwor ICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5l bC5wcm90b3R5cGUuX3Nob3dSZXNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLnNlbGVjdENvbnRl bnRUYWIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUuX3Nl bGVjdFRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZS5f cmVmcmVzaENvb2tpZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29va2llc1Rh Yi5wcm90b3R5cGUuc2hvdyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdl UGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZS5z aG93UmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5hcHBlbmRUYWIp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUucHJvdG90eXBlLmhhc1RhYik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuc2VsZWN0VGFiQnlJZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUuX3NldFNlbGVjdGlv bik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzOgorICAgICAg ICAoLnJlc291cmNlLXZpZXctY29va2llcyk6CisgICAgICAgICgucmVzb3VyY2Utdmlldy1jb29r aWVzLnZpc2libGUpOgorCiAyMDEwLTExLTEyICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAcmltLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggNGUwYTY0YS4uYTY5NTE2NyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC04NjQsNyArODY0 LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZp ZXcuc2hvdyh0aGlzLl92aWV3c0NvbnRhaW5lckVsZW1lbnQpOwogCiAgICAgICAgIGlmIChsaW5l KSB7Ci0gICAgICAgICAgICB2aWV3LnNlbGVjdENvbnRlbnRUYWIodHJ1ZSk7CisgICAgICAgICAg ICB2aWV3LnNlbGVjdENvbnRlbnRUYWIoKTsKICAgICAgICAgICAgIGlmICh2aWV3LnJldmVhbExp bmUpCiAgICAgICAgICAgICAgICAgdmlldy5yZXZlYWxMaW5lKGxpbmUpOwogICAgICAgICAgICAg aWYgKHZpZXcuaGlnaGxpZ2h0TGluZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVZpZXcuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VWaWV3LmpzCmluZGV4IDNjYTdmY2MuLjM5NDk5MDEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwpAQCAtMzksMTIgKzM5LDEyIEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKIAogICAgIHRoaXMuaGVhZGVy c0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLmhlYWRl cnNFbGVtZW50LmNsYXNzTmFtZSA9ICJyZXNvdXJjZS12aWV3LWhlYWRlcnMiOwotICAgIHRoaXMu dGFiYmVkUGFuZS5hcHBlbmRUYWIoImhlYWRlcnMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhl YWRlcnMiKSwgdGhpcy5oZWFkZXJzRWxlbWVudCwgdGhpcy5fc2VsZWN0SGVhZGVyc1RhYi5iaW5k KHRoaXMsIHRydWUpKTsKKyAgICB0aGlzLnRhYmJlZFBhbmUuYXBwZW5kVGFiKCJoZWFkZXJzIiwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIZWFkZXJzIiksIHRoaXMuaGVhZGVyc0VsZW1lbnQsIHRo aXMuX3NlbGVjdFRhYi5iaW5kKHRoaXMsICJoZWFkZXJzIikpOwogCiAgICAgaWYgKHRoaXMuaGFz Q29udGVudFRhYigpKSB7CiAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5jbGFzc05h bWUgPSAicmVzb3VyY2Utdmlldy1jb250ZW50IjsKLSAgICAgICAgdGhpcy50YWJiZWRQYW5lLmFw cGVuZFRhYigiY29udGVudCIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29udGVudCIpLCB0aGlz LmNvbnRlbnRFbGVtZW50LCB0aGlzLnNlbGVjdENvbnRlbnRUYWIuYmluZCh0aGlzLCB0cnVlKSk7 CisgICAgICAgIHRoaXMudGFiYmVkUGFuZS5hcHBlbmRUYWIoImNvbnRlbnQiLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkNvbnRlbnQiKSwgdGhpcy5jb250ZW50RWxlbWVudCwgdGhpcy5fc2VsZWN0 VGFiLmJpbmQodGhpcywgImNvbnRlbnQiKSk7CiAgICAgfQogCiAgICAgdGhpcy5oZWFkZXJzTGlz dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvbCIpOwpAQCAtMTQ1LDI5ICsxNDUs MjYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB0aGlzLl9jb29raWVzVmlldy5yZXNpemUoKTsKICAgICB9LAogCi0gICAgX3NlbGVjdFRhYjog ZnVuY3Rpb24oKQorICAgIHNlbGVjdENvbnRlbnRUYWI6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAg ICAgIHZhciBwcmVmZXJyZWRUYWIgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucmVzb3VyY2VWaWV3 VGFiOwotICAgICAgICBpZiAodGhpcy5faGVhZGVyc1Zpc2libGUgJiYgdGhpcy5fY29va2llc1Zp ZXcgJiYgcHJlZmVycmVkVGFiID09PSAiY29va2llcyIpCi0gICAgICAgICAgICB0aGlzLl9zZWxl Y3RDb29raWVzVGFiKCk7Ci0gICAgICAgIGVsc2UgaWYgKHRoaXMuX2hlYWRlcnNWaXNpYmxlICYm ICghdGhpcy5oYXNDb250ZW50VGFiKCkgfHwgcHJlZmVycmVkVGFiID09PSAiaGVhZGVycyIpKQot ICAgICAgICAgICAgdGhpcy5fc2VsZWN0SGVhZGVyc1RhYigpOwotICAgICAgICBlbHNlCi0gICAg ICAgICAgICB0aGlzLl9pbm5lclNlbGVjdENvbnRlbnRUYWIoKTsKKyAgICAgICAgdGhpcy5fc2Vs ZWN0VGFiKCJjb250ZW50Iik7CiAgICAgfSwKIAotICAgIF9zZWxlY3RIZWFkZXJzVGFiOiBmdW5j dGlvbih1cGRhdGVQcmVmcykKKyAgICBfc2VsZWN0VGFiOiBmdW5jdGlvbih0YWIpCiAgICAgewot ICAgICAgICBpZiAodXBkYXRlUHJlZnMpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0dGlu Z3MucmVzb3VyY2VWaWV3VGFiID0gImhlYWRlcnMiOwotICAgICAgICB0aGlzLnRhYmJlZFBhbmUu c2VsZWN0VGFiQnlJZCgiaGVhZGVycyIpOwotICAgIH0sCi0KLSAgICBzZWxlY3RDb250ZW50VGFi OiBmdW5jdGlvbih1cGRhdGVQcmVmcykKLSAgICB7Ci0gICAgICAgIGlmICh1cGRhdGVQcmVmcykK LSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5yZXNvdXJjZVZpZXdUYWIgPSAiY29u dGVudCI7Ci0gICAgICAgIHRoaXMuX2lubmVyU2VsZWN0Q29udGVudFRhYigpOworICAgICAgICBp ZiAodGFiKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNlVmlld1Rh YiA9IHRhYjsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB2YXIgcHJlZmVycmVkVGFiID0g V2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNlVmlld1RhYjsKKyAgICAgICAgICAgIHRhYiA9 ICJjb250ZW50IjsKKworICAgICAgICAgICAgLy8gSG9ub3IgdXNlciB0YWIgcHJlZmVyZW5jZSAo aWYgd2UgY2FuKS4gRmFsbGJhY2sgdG8gY29udGVudCBpZiBoZWFkZXJzIG5vdCB2aXNpYmxlLCBo ZWFkZXJzIG90aGVyd2lzZS4KKyAgICAgICAgICAgIGlmICh0aGlzLl9oZWFkZXJzVmlzaWJsZSkK KyAgICAgICAgICAgICAgICB0YWIgPSB0aGlzLnRhYmJlZFBhbmUuaGFzVGFiKHByZWZlcnJlZFRh YikgPyBwcmVmZXJyZWRUYWIgOiAiaGVhZGVycyI7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy50 YWJiZWRQYW5lLnNlbGVjdFRhYkJ5SWQodGFiKTsKKyAgICAgICAgaWYgKHRhYiA9PT0gImNvbnRl bnQiICYmIHRoaXMuaGFzQ29udGVudFRhYigpKQorICAgICAgICAgICAgdGhpcy5jb250ZW50VGFi U2VsZWN0ZWQoKTsKICAgICB9LAogCiAgICAgaGFzQ29udGVudFRhYjogZnVuY3Rpb24oKQpAQCAt MTc2LDIyICsxNzMsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0sCiAKLSAgICBfc2VsZWN0Q29va2llc1RhYjog ZnVuY3Rpb24odXBkYXRlUHJlZnMpCi0gICAgewotICAgICAgICBpZiAodXBkYXRlUHJlZnMpCi0g ICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucmVzb3VyY2VWaWV3VGFiID0gImNvb2tp ZXMiOwotICAgICAgICB0aGlzLnRhYmJlZFBhbmUuc2VsZWN0VGFiQnlJZCgiY29va2llcyIpOwot ICAgICAgICB0aGlzLl9jb29raWVzVmlldy5yZXNpemUoKTsKLSAgICB9LAotCi0gICAgX2lubmVy U2VsZWN0Q29udGVudFRhYjogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy50YWJiZWRQ YW5lLnNlbGVjdFRhYkJ5SWQoImNvbnRlbnQiKTsKLSAgICAgICAgdGhpcy5yZXNpemUoKTsKLSAg ICAgICAgaWYgKHRoaXMuaGFzQ29udGVudFRhYigpKQotICAgICAgICAgICAgdGhpcy5jb250ZW50 VGFiU2VsZWN0ZWQoKTsKLSAgICB9LAotCiAgICAgX3JlZnJlc2hVUkw6IGZ1bmN0aW9uKCkKICAg ICB7CiAgICAgICAgIHRoaXMudXJsVHJlZUVsZW1lbnQudGl0bGUgPSAiPGRpdiBjbGFzcz1cImhl YWRlci1uYW1lXCI+IiArIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVxdWVzdCBVUkwiKSArICI6 PC9kaXY+IiArCkBAIC0zNzAsNyArMzUxLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5w cm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMucmVzb3VyY2UucmVxdWVzdENvb2tp ZXMgJiYgIXRoaXMucmVzb3VyY2UucmVzcG9uc2VDb29raWVzKQogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIHRoaXMuX2Nvb2tpZXNWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5S ZXNvdXJjZUNvb2tpZXNUYWIoKTsKLSAgICAgICAgICAgIHRoaXMudGFiYmVkUGFuZS5hcHBlbmRU YWIoImNvb2tpZXMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvb2tpZXMiKSwgdGhpcy5fY29v a2llc1ZpZXcuZWxlbWVudCwgdGhpcy5fc2VsZWN0Q29va2llc1RhYi5iaW5kKHRoaXMsIHRydWUp KTsKKyAgICAgICAgICAgIHRoaXMudGFiYmVkUGFuZS5hcHBlbmRUYWIoImNvb2tpZXMiLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkNvb2tpZXMiKSwgdGhpcy5fY29va2llc1ZpZXcsIHRoaXMuX3Nl bGVjdFRhYi5iaW5kKHRoaXMsICJjb29raWVzIikpOwogICAgICAgICB9CiAgICAgICAgIHRoaXMu X2Nvb2tpZXNWaWV3LnJlcXVlc3RDb29raWVzID0gdGhpcy5yZXNvdXJjZS5yZXF1ZXN0Q29va2ll czsKICAgICAgICAgdGhpcy5fY29va2llc1ZpZXcucmVzcG9uc2VDb29raWVzID0gdGhpcy5yZXNv dXJjZS5yZXNwb25zZUNvb2tpZXM7CkBAIC0zOTEsNiArMzcyLDEyIEBAIFdlYkluc3BlY3Rvci5S ZXNvdXJjZUNvb2tpZXNUYWIgPSBmdW5jdGlvbigpCiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJj ZUNvb2tpZXNUYWIucHJvdG90eXBlID0geworICAgIHNob3c6IGZ1bmN0aW9uKHBhcmVudEVsZW1l bnQpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuQ29va2llc1RhYmxlLnByb3RvdHlwZS5z aG93LmNhbGwodGhpcywgcGFyZW50RWxlbWVudCk7CisgICAgICAgIHRoaXMucmVzaXplKCk7Cisg ICAgfSwKKwogICAgIHNldCByZXF1ZXN0Q29va2llcyhjb29raWVzKQogICAgIHsKICAgICAgICAg aWYgKHRoaXMuX3JlcXVlc3RDb29raWVzID09PSBjb29raWVzKQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKaW5kZXggZWI0ZWFiYmYuLjk1ZWIxY2UgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKKysrIGIv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcwpAQCAtMzU5LDcgKzM1 OSw3IEBAIFdlYkluc3BlY3Rvci5TdG9yYWdlUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAg IGlmIChsaW5lKSB7CiAgICAgICAgICAgICB2YXIgdmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJj ZU1hbmFnZXIucmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UocmVzb3VyY2UpOwotICAgICAgICAgICAg dmlldy5zZWxlY3RDb250ZW50VGFiKHRydWUpOworICAgICAgICAgICAgdmlldy5zZWxlY3RDb250 ZW50VGFiKCk7CiAgICAgICAgICAgICBpZiAodmlldy5yZXZlYWxMaW5lKQogICAgICAgICAgICAg ICAgIHZpZXcucmV2ZWFsTGluZShsaW5lKTsKICAgICAgICAgICAgIGlmICh2aWV3LmhpZ2hsaWdo dExpbmUpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFu ZS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzCmluZGV4IDFj N2I5YjAuLjIxYjE0NDggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U YWJiZWRQYW5lLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5l LmpzCkBAIC0zOSw0MiArMzksNDggQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUgPSBmdW5jdGlv bihlbGVtZW50KQogfQogCiBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7Ci0g ICAgYXBwZW5kVGFiOiBmdW5jdGlvbihpZCwgdGFiVGl0bGUsIGNvbnRlbnRFbGVtZW50LCB0YWJD bGlja0xpc3RlbmVyKQorICAgIGFwcGVuZFRhYjogZnVuY3Rpb24oaWQsIHRhYlRpdGxlLCBjb250 ZW50LCB0YWJDbGlja0xpc3RlbmVyKQogICAgIHsKICAgICAgICAgdmFyIHRhYkVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJsaSIpOwogICAgICAgICB0YWJFbGVtZW50LnRleHRDb250 ZW50ID0gdGFiVGl0bGU7CiAgICAgICAgIHRhYkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xp Y2siLCB0YWJDbGlja0xpc3RlbmVyLCBmYWxzZSk7CiAgICAgICAgIHRoaXMudGFic0VsZW1lbnQu YXBwZW5kQ2hpbGQodGFiRWxlbWVudCk7Ci0gICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBw ZW5kQ2hpbGQoY29udGVudEVsZW1lbnQpOwotICAgICAgICB0aGlzLl90YWJPYmplY3RzW2lkXSA9 IHt0YWI6IHRhYkVsZW1lbnQsIGNvbnRlbnQ6IGNvbnRlbnRFbGVtZW50fTsKKyAgICAgICAgdmFy IHRhYk9iamVjdCA9IHsgdGFiOiB0YWJFbGVtZW50IH07CisgICAgICAgIGlmIChjb250ZW50IGlu c3RhbmNlb2YgSFRNTEVsZW1lbnQpIHsKKyAgICAgICAgICAgIHRhYk9iamVjdC5lbGVtZW50ID0g Y29udGVudDsKKyAgICAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY29u dGVudCk7CisgICAgICAgIH0KKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICB0aGlzLmNvbnRl bnRFbGVtZW50LmFwcGVuZENoaWxkKGNvbnRlbnQuZWxlbWVudCk7CisgICAgICAgICAgICB0YWJP YmplY3QudmlldyA9IGNvbnRlbnQ7CisgICAgICAgIH0KKyAgICAgICAgdGhpcy5fdGFiT2JqZWN0 c1tpZF0gPSB0YWJPYmplY3Q7CiAgICAgfSwKLSAgICAKLSAgICB0YWJPYmplY3RGb3JJZDogZnVu Y3Rpb24oaWQpCisKKyAgICBoYXNUYWI6IGZ1bmN0aW9uKHRhYklkKQogICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX3RhYk9iamVjdHNbaWRdOworICAgICAgICByZXR1cm4gdGFiSWQgaW4gdGhp cy5fdGFiT2JqZWN0czsKICAgICB9LAotCi0gICAgaGlkZVRhYjogZnVuY3Rpb24oaWQpCisgICAg IAorICAgIHNlbGVjdFRhYkJ5SWQ6IGZ1bmN0aW9uKHRhYklkKQogICAgIHsKLSAgICAgICAgdmFy IHRhYk9iamVjdCA9IHRoaXMuX3RhYk9iamVjdHNbaWRdOwotICAgICAgICBpZiAodGFiT2JqZWN0 KQotICAgICAgICAgICAgdGFiT2JqZWN0LnRhYi5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAg ICAgICAgZm9yICh2YXIgaWQgaW4gdGhpcy5fdGFiT2JqZWN0cykKKyAgICAgICAgICAgIHRoaXMu X3NldFNlbGVjdGlvbih0aGlzLl90YWJPYmplY3RzW2lkXSwgaWQgPT09IHRhYklkKTsKKyAgICAg ICAgcmV0dXJuIHRoaXMuaGFzVGFiKHRhYklkKTsKICAgICB9LAogCi0gICAgc2VsZWN0VGFiQnlJ ZDogZnVuY3Rpb24oc2VsZWN0SWQpCisgICAgX3NldFNlbGVjdGlvbjogZnVuY3Rpb24odGFiT2Jq ZWN0LCBpc1NlbGVjdGVkKQogICAgIHsKLSAgICAgICAgdmFyIHNlbGVjdGVkID0gZmFsc2U7Ci0g ICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX3RhYk9iamVjdHMpIHsKLSAgICAgICAgICAgIHZh ciB0YWJPYmplY3QgPSB0aGlzLl90YWJPYmplY3RzW2lkXTsKLSAgICAgICAgICAgIGlmIChpZCA9 PT0gc2VsZWN0SWQpIHsKLSAgICAgICAgICAgICAgICBzZWxlY3RlZCA9IHRydWU7Ci0gICAgICAg ICAgICAgICAgdGFiT2JqZWN0LnRhYi5hZGRTdHlsZUNsYXNzKCJzZWxlY3RlZCIpOwotICAgICAg ICAgICAgICAgIHRhYk9iamVjdC5jb250ZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwot ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICB0YWJPYmplY3QudGFiLnJlbW92 ZVN0eWxlQ2xhc3MoInNlbGVjdGVkIik7Ci0gICAgICAgICAgICAgICAgdGFiT2JqZWN0LmNvbnRl bnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAgICAgICAgICB9CisgICAgICAgIGlmIChp c1NlbGVjdGVkKSB7CisgICAgICAgICAgICB0YWJPYmplY3QudGFiLmFkZFN0eWxlQ2xhc3MoInNl bGVjdGVkIik7CisgICAgICAgICAgICBpZiAodGFiT2JqZWN0LmVsZW1lbnQpCisgICAgICAgICAg ICAgICAgdGFiT2JqZWN0LmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0YWJPYmplY3QudGFiLnJlbW92ZVN0eWxlQ2xhc3Mo InNlbGVjdGVkIik7CisgICAgICAgICAgICBpZiAodGFiT2JqZWN0LmVsZW1lbnQpCisgICAgICAg ICAgICAgICAgdGFiT2JqZWN0LmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAg ICAgIH0KLSAgICAgICAgcmV0dXJuIHNlbGVjdGVkOworICAgICAgICBpZiAodGFiT2JqZWN0LnZp ZXcpCisgICAgICAgICAgICB0YWJPYmplY3Qudmlldy52aXNpYmxlID0gaXNTZWxlY3RlZDsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmNzcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IGFl MjYzMzkuLmRkYThhYzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu Y3NzCkBAIC04ODcsNiArODg3LDcgQEAgYm9keS5wbGF0Zm9ybS1saW51eCAubW9ub3NwYWNlLCBi b2R5LnBsYXRmb3JtLWxpbnV4IC5zb3VyY2UtY29kZSB7CiB9CiAKIC5yZXNvdXJjZS12aWV3LWNv b2tpZXMgeworICAgIGRpc3BsYXk6IG5vbmU7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAg IHRvcDogMDsKICAgICByaWdodDogMDsKQEAgLTg5Nyw2ICs4OTgsMTAgQEAgYm9keS5wbGF0Zm9y bS1saW51eCAubW9ub3NwYWNlLCBib2R5LnBsYXRmb3JtLWxpbnV4IC5zb3VyY2UtY29kZSB7CiAg ICAgaGVpZ2h0OiAxMDAlOwogfQogCisucmVzb3VyY2Utdmlldy1jb29raWVzLnZpc2libGUgewor ICAgIGRpc3BsYXk6IGJsb2NrOworfQorCiAucmVzb3VyY2Utdmlldy1jb29raWVzLnRhYmxlIC5k YXRhLWdyaWQgewogICAgIGhlaWdodDogMTAwJTsKIH0K 73827 2010-11-13 08:20:19 -0800 2010-11-13 08:20:19 -0800 patch to land tabbed-pane-views.diff text/plain 10820 caseq ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjIzYzUwYi4uNWM4OTBhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMC0xMS0xMyAgQW5kcmV5IEtvc3lh a292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZl bGRtYW4uCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogW3JlZmFjdG9yaW5nXSBzdXBwb3J0IFZp ZXdzIGluIFRhYmJlZFBhbmUgYW5kIHN0cmVhbWxpbmUgdGFiIHNlbGVjdGlvbiBpbiByZXNvdXJj ZSB2aWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 OTQ5MworCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZS5fc2hvd1Jlc291cmNl KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlVmlldy5wcm90b3R5cGUuc2VsZWN0Q29udGVudFRhYik6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuUmVzb3VyY2VWaWV3LnByb3RvdHlwZS5fc2VsZWN0VGFiKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLl9yZWZyZXNoQ29va2llcyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVGFiLnByb3RvdHlwZS5zaG93KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TdG9yYWdlUGFuZWwucHJvdG90eXBlLnNob3dSZXNvdXJjZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRhYmJlZFBhbmUucHJvdG90eXBlLmFwcGVuZFRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGFiYmVkUGFuZS5wcm90b3R5cGUuaGFzVGFiKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJi ZWRQYW5lLnByb3RvdHlwZS5zZWxlY3RUYWJCeUlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U YWJiZWRQYW5lLnByb3RvdHlwZS5faGlkZVRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFi YmVkUGFuZS5wcm90b3R5cGUuX3Nob3dUYWIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmNzczoKKyAgICAgICAgKC5yZXNvdXJjZS12aWV3LWNvb2tpZXMpOgorICAg ICAgICAoLnJlc291cmNlLXZpZXctY29va2llcy52aXNpYmxlKToKKwogMjAxMC0xMS0xMiAgRGFu aWVsIEJhdGVzICA8ZGJhdGVzQHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBC YXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFu ZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4 IDRlMGE2NGEuLmE2OTUxNjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtQYW5lbC5qcwpAQCAtODY0LDcgKzg2NCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB2aWV3LnNob3codGhpcy5fdmlld3NDb250YWluZXJFbGVt ZW50KTsKIAogICAgICAgICBpZiAobGluZSkgewotICAgICAgICAgICAgdmlldy5zZWxlY3RDb250 ZW50VGFiKHRydWUpOworICAgICAgICAgICAgdmlldy5zZWxlY3RDb250ZW50VGFiKCk7CiAgICAg ICAgICAgICBpZiAodmlldy5yZXZlYWxMaW5lKQogICAgICAgICAgICAgICAgIHZpZXcucmV2ZWFs TGluZShsaW5lKTsKICAgICAgICAgICAgIGlmICh2aWV3LmhpZ2hsaWdodExpbmUpCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwppbmRleCAzY2E3ZmNjLi4zOTQ5 OTAxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3 LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKQEAg LTM5LDEyICszOSwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3ID0gZnVuY3Rpb24ocmVz b3VyY2UpCiAKICAgICB0aGlzLmhlYWRlcnNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CiAgICAgdGhpcy5oZWFkZXJzRWxlbWVudC5jbGFzc05hbWUgPSAicmVzb3VyY2Ut dmlldy1oZWFkZXJzIjsKLSAgICB0aGlzLnRhYmJlZFBhbmUuYXBwZW5kVGFiKCJoZWFkZXJzIiwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIZWFkZXJzIiksIHRoaXMuaGVhZGVyc0VsZW1lbnQsIHRo aXMuX3NlbGVjdEhlYWRlcnNUYWIuYmluZCh0aGlzLCB0cnVlKSk7CisgICAgdGhpcy50YWJiZWRQ YW5lLmFwcGVuZFRhYigiaGVhZGVycyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGVhZGVycyIp LCB0aGlzLmhlYWRlcnNFbGVtZW50LCB0aGlzLl9zZWxlY3RUYWIuYmluZCh0aGlzLCAiaGVhZGVy cyIpKTsKIAogICAgIGlmICh0aGlzLmhhc0NvbnRlbnRUYWIoKSkgewogICAgICAgICB0aGlzLmNv bnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRo aXMuY29udGVudEVsZW1lbnQuY2xhc3NOYW1lID0gInJlc291cmNlLXZpZXctY29udGVudCI7Ci0g ICAgICAgIHRoaXMudGFiYmVkUGFuZS5hcHBlbmRUYWIoImNvbnRlbnQiLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNvbnRlbnQiKSwgdGhpcy5jb250ZW50RWxlbWVudCwgdGhpcy5zZWxlY3RDb250 ZW50VGFiLmJpbmQodGhpcywgdHJ1ZSkpOworICAgICAgICB0aGlzLnRhYmJlZFBhbmUuYXBwZW5k VGFiKCJjb250ZW50IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb250ZW50IiksIHRoaXMuY29u dGVudEVsZW1lbnQsIHRoaXMuX3NlbGVjdFRhYi5iaW5kKHRoaXMsICJjb250ZW50IikpOwogICAg IH0KIAogICAgIHRoaXMuaGVhZGVyc0xpc3RFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgib2wiKTsKQEAgLTE0NSwyOSArMTQ1LDI2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fY29va2llc1ZpZXcucmVzaXplKCk7CiAg ICAgfSwKIAotICAgIF9zZWxlY3RUYWI6IGZ1bmN0aW9uKCkKKyAgICBzZWxlY3RDb250ZW50VGFi OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgcHJlZmVycmVkVGFiID0gV2ViSW5zcGVj dG9yLnNldHRpbmdzLnJlc291cmNlVmlld1RhYjsKLSAgICAgICAgaWYgKHRoaXMuX2hlYWRlcnNW aXNpYmxlICYmIHRoaXMuX2Nvb2tpZXNWaWV3ICYmIHByZWZlcnJlZFRhYiA9PT0gImNvb2tpZXMi KQotICAgICAgICAgICAgdGhpcy5fc2VsZWN0Q29va2llc1RhYigpOwotICAgICAgICBlbHNlIGlm ICh0aGlzLl9oZWFkZXJzVmlzaWJsZSAmJiAoIXRoaXMuaGFzQ29udGVudFRhYigpIHx8IHByZWZl cnJlZFRhYiA9PT0gImhlYWRlcnMiKSkKLSAgICAgICAgICAgIHRoaXMuX3NlbGVjdEhlYWRlcnNU YWIoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5faW5uZXJTZWxlY3RDb250ZW50 VGFiKCk7CisgICAgICAgIHRoaXMuX3NlbGVjdFRhYigiY29udGVudCIpOwogICAgIH0sCiAKLSAg ICBfc2VsZWN0SGVhZGVyc1RhYjogZnVuY3Rpb24odXBkYXRlUHJlZnMpCisgICAgX3NlbGVjdFRh YjogZnVuY3Rpb24odGFiKQogICAgIHsKLSAgICAgICAgaWYgKHVwZGF0ZVByZWZzKQotICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnJlc291cmNlVmlld1RhYiA9ICJoZWFkZXJzIjsK LSAgICAgICAgdGhpcy50YWJiZWRQYW5lLnNlbGVjdFRhYkJ5SWQoImhlYWRlcnMiKTsKLSAgICB9 LAotCi0gICAgc2VsZWN0Q29udGVudFRhYjogZnVuY3Rpb24odXBkYXRlUHJlZnMpCi0gICAgewot ICAgICAgICBpZiAodXBkYXRlUHJlZnMpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0dGlu Z3MucmVzb3VyY2VWaWV3VGFiID0gImNvbnRlbnQiOwotICAgICAgICB0aGlzLl9pbm5lclNlbGVj dENvbnRlbnRUYWIoKTsKKyAgICAgICAgaWYgKHRhYikKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5zZXR0aW5ncy5yZXNvdXJjZVZpZXdUYWIgPSB0YWI7CisgICAgICAgIGVsc2UgeworICAgICAg ICAgICAgdmFyIHByZWZlcnJlZFRhYiA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5yZXNvdXJjZVZp ZXdUYWI7CisgICAgICAgICAgICB0YWIgPSAiY29udGVudCI7CisKKyAgICAgICAgICAgIC8vIEhv bm9yIHVzZXIgdGFiIHByZWZlcmVuY2UgKGlmIHdlIGNhbikuIEZhbGxiYWNrIHRvIGNvbnRlbnQg aWYgaGVhZGVycyBub3QgdmlzaWJsZSwgaGVhZGVycyBvdGhlcndpc2UuCisgICAgICAgICAgICBp ZiAodGhpcy5faGVhZGVyc1Zpc2libGUpCisgICAgICAgICAgICAgICAgdGFiID0gdGhpcy50YWJi ZWRQYW5lLmhhc1RhYihwcmVmZXJyZWRUYWIpID8gcHJlZmVycmVkVGFiIDogImhlYWRlcnMiOwor ICAgICAgICB9CisgICAgICAgIHRoaXMudGFiYmVkUGFuZS5zZWxlY3RUYWJCeUlkKHRhYik7Cisg ICAgICAgIGlmICh0YWIgPT09ICJjb250ZW50IiAmJiB0aGlzLmhhc0NvbnRlbnRUYWIoKSkKKyAg ICAgICAgICAgIHRoaXMuY29udGVudFRhYlNlbGVjdGVkKCk7CiAgICAgfSwKIAogICAgIGhhc0Nv bnRlbnRUYWI6IGZ1bmN0aW9uKCkKQEAgLTE3NiwyMiArMTczLDYgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LAog Ci0gICAgX3NlbGVjdENvb2tpZXNUYWI6IGZ1bmN0aW9uKHVwZGF0ZVByZWZzKQotICAgIHsKLSAg ICAgICAgaWYgKHVwZGF0ZVByZWZzKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdz LnJlc291cmNlVmlld1RhYiA9ICJjb29raWVzIjsKLSAgICAgICAgdGhpcy50YWJiZWRQYW5lLnNl bGVjdFRhYkJ5SWQoImNvb2tpZXMiKTsKLSAgICAgICAgdGhpcy5fY29va2llc1ZpZXcucmVzaXpl KCk7Ci0gICAgfSwKLQotICAgIF9pbm5lclNlbGVjdENvbnRlbnRUYWI6IGZ1bmN0aW9uKCkKLSAg ICB7Ci0gICAgICAgIHRoaXMudGFiYmVkUGFuZS5zZWxlY3RUYWJCeUlkKCJjb250ZW50Iik7Ci0g ICAgICAgIHRoaXMucmVzaXplKCk7Ci0gICAgICAgIGlmICh0aGlzLmhhc0NvbnRlbnRUYWIoKSkK LSAgICAgICAgICAgIHRoaXMuY29udGVudFRhYlNlbGVjdGVkKCk7Ci0gICAgfSwKLQogICAgIF9y ZWZyZXNoVVJMOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLnVybFRyZWVFbGVtZW50 LnRpdGxlID0gIjxkaXYgY2xhc3M9XCJoZWFkZXItbmFtZVwiPiIgKyBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlJlcXVlc3QgVVJMIikgKyAiOjwvZGl2PiIgKwpAQCAtMzcwLDcgKzM1MSw3IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKCF0 aGlzLnJlc291cmNlLnJlcXVlc3RDb29raWVzICYmICF0aGlzLnJlc291cmNlLnJlc3BvbnNlQ29v a2llcykKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB0aGlzLl9jb29raWVz VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVGFiKCk7Ci0gICAgICAgICAg ICB0aGlzLnRhYmJlZFBhbmUuYXBwZW5kVGFiKCJjb29raWVzIiwgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJDb29raWVzIiksIHRoaXMuX2Nvb2tpZXNWaWV3LmVsZW1lbnQsIHRoaXMuX3NlbGVjdENv b2tpZXNUYWIuYmluZCh0aGlzLCB0cnVlKSk7CisgICAgICAgICAgICB0aGlzLnRhYmJlZFBhbmUu YXBwZW5kVGFiKCJjb29raWVzIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb29raWVzIiksIHRo aXMuX2Nvb2tpZXNWaWV3LCB0aGlzLl9zZWxlY3RUYWIuYmluZCh0aGlzLCAiY29va2llcyIpKTsK ICAgICAgICAgfQogICAgICAgICB0aGlzLl9jb29raWVzVmlldy5yZXF1ZXN0Q29va2llcyA9IHRo aXMucmVzb3VyY2UucmVxdWVzdENvb2tpZXM7CiAgICAgICAgIHRoaXMuX2Nvb2tpZXNWaWV3LnJl c3BvbnNlQ29va2llcyA9IHRoaXMucmVzb3VyY2UucmVzcG9uc2VDb29raWVzOwpAQCAtMzkxLDYg KzM3MiwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVGFiID0gZnVuY3Rpb24oKQog fQogCiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVGFiLnByb3RvdHlwZSA9IHsKKyAgICBz aG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9y LkNvb2tpZXNUYWJsZS5wcm90b3R5cGUuc2hvdy5jYWxsKHRoaXMsIHBhcmVudEVsZW1lbnQpOwor ICAgICAgICB0aGlzLnJlc2l6ZSgpOworICAgIH0sCisKICAgICBzZXQgcmVxdWVzdENvb2tpZXMo Y29va2llcykKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9yZXF1ZXN0Q29va2llcyA9PT0gY29v a2llcykKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFu ZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzCmluZGV4 IGViNGVhYmJmLi45NWViMWNlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3RvcmFnZVBhbmVsLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9y YWdlUGFuZWwuanMKQEAgLTM1OSw3ICszNTksNyBAQCBXZWJJbnNwZWN0b3IuU3RvcmFnZVBhbmVs LnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAobGluZSkgewogICAgICAgICAgICAgdmFyIHZp ZXcgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnJlc291cmNlVmlld0ZvclJlc291cmNl KHJlc291cmNlKTsKLSAgICAgICAgICAgIHZpZXcuc2VsZWN0Q29udGVudFRhYih0cnVlKTsKKyAg ICAgICAgICAgIHZpZXcuc2VsZWN0Q29udGVudFRhYigpOwogICAgICAgICAgICAgaWYgKHZpZXcu cmV2ZWFsTGluZSkKICAgICAgICAgICAgICAgICB2aWV3LnJldmVhbExpbmUobGluZSk7CiAgICAg ICAgICAgICBpZiAodmlldy5oaWdobGlnaHRMaW5lKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGFiYmVkUGFuZS5qcwppbmRleCAxYzdiOWIwLi4xZWQ5NzI1IDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcworKysgYi9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwpAQCAtMzksNDIgKzM5LDU1IEBAIFdlYkluc3Bl Y3Rvci5UYWJiZWRQYW5lID0gZnVuY3Rpb24oZWxlbWVudCkKIH0KIAogV2ViSW5zcGVjdG9yLlRh YmJlZFBhbmUucHJvdG90eXBlID0gewotICAgIGFwcGVuZFRhYjogZnVuY3Rpb24oaWQsIHRhYlRp dGxlLCBjb250ZW50RWxlbWVudCwgdGFiQ2xpY2tMaXN0ZW5lcikKKyAgICBhcHBlbmRUYWI6IGZ1 bmN0aW9uKGlkLCB0YWJUaXRsZSwgY29udGVudCwgdGFiQ2xpY2tMaXN0ZW5lcikKICAgICB7CiAg ICAgICAgIHZhciB0YWJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGkiKTsKICAg ICAgICAgdGFiRWxlbWVudC50ZXh0Q29udGVudCA9IHRhYlRpdGxlOwogICAgICAgICB0YWJFbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGFiQ2xpY2tMaXN0ZW5lciwgZmFsc2UpOwog ICAgICAgICB0aGlzLnRhYnNFbGVtZW50LmFwcGVuZENoaWxkKHRhYkVsZW1lbnQpOwotICAgICAg ICB0aGlzLmNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKGNvbnRlbnRFbGVtZW50KTsKLSAgICAg ICAgdGhpcy5fdGFiT2JqZWN0c1tpZF0gPSB7dGFiOiB0YWJFbGVtZW50LCBjb250ZW50OiBjb250 ZW50RWxlbWVudH07CisgICAgICAgIHZhciB0YWJPYmplY3QgPSB7IHRhYjogdGFiRWxlbWVudCB9 OworICAgICAgICBpZiAoY29udGVudCBpbnN0YW5jZW9mIEhUTUxFbGVtZW50KSB7CisgICAgICAg ICAgICB0YWJPYmplY3QuZWxlbWVudCA9IGNvbnRlbnQ7CisgICAgICAgICAgICB0aGlzLmNvbnRl bnRFbGVtZW50LmFwcGVuZENoaWxkKGNvbnRlbnQpOworICAgICAgICB9CisgICAgICAgIGVsc2Ug eworICAgICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZChjb250ZW50LmVs ZW1lbnQpOworICAgICAgICAgICAgdGFiT2JqZWN0LnZpZXcgPSBjb250ZW50OworICAgICAgICB9 CisgICAgICAgIHRoaXMuX3RhYk9iamVjdHNbaWRdID0gdGFiT2JqZWN0OwogICAgIH0sCi0gICAg Ci0gICAgdGFiT2JqZWN0Rm9ySWQ6IGZ1bmN0aW9uKGlkKQorCisgICAgaGFzVGFiOiBmdW5jdGlv bih0YWJJZCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl90YWJPYmplY3RzW2lkXTsKKyAg ICAgICAgcmV0dXJuIHRhYklkIGluIHRoaXMuX3RhYk9iamVjdHM7CisgICAgfSwKKyAgICAgCisg ICAgc2VsZWN0VGFiQnlJZDogZnVuY3Rpb24odGFiSWQpCisgICAgeworICAgICAgICBmb3IgKHZh ciBpZCBpbiB0aGlzLl90YWJPYmplY3RzKSB7CisgICAgICAgICAgICBpZiAoaWQgPT09IHRhYklk KQorICAgICAgICAgICAgICAgIHRoaXMuX3Nob3dUYWIodGhpcy5fdGFiT2JqZWN0c1tpZF0pOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX2hpZGVUYWIodGhpcy5fdGFi T2JqZWN0c1tpZF0pOworICAgICAgICB9CisgICAgICAgIHJldHVybiB0aGlzLmhhc1RhYih0YWJJ ZCk7CiAgICAgfSwKIAotICAgIGhpZGVUYWI6IGZ1bmN0aW9uKGlkKQorICAgIF9zaG93VGFiOiBm dW5jdGlvbih0YWJPYmplY3QpCiAgICAgewotICAgICAgICB2YXIgdGFiT2JqZWN0ID0gdGhpcy5f dGFiT2JqZWN0c1tpZF07Ci0gICAgICAgIGlmICh0YWJPYmplY3QpCi0gICAgICAgICAgICB0YWJP YmplY3QudGFiLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICB0YWJPYmplY3QudGFi LmFkZFN0eWxlQ2xhc3MoInNlbGVjdGVkIik7CisgICAgICAgIGlmICh0YWJPYmplY3QuZWxlbWVu dCkKKyAgICAgICAgICAgIHRhYk9iamVjdC5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRl biIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0YWJPYmplY3Qudmlldy52aXNpYmxlID0g dHJ1ZTsKICAgICB9LAogCi0gICAgc2VsZWN0VGFiQnlJZDogZnVuY3Rpb24oc2VsZWN0SWQpCisg ICAgX2hpZGVUYWI6IGZ1bmN0aW9uKHRhYk9iamVjdCkKICAgICB7Ci0gICAgICAgIHZhciBzZWxl Y3RlZCA9IGZhbHNlOwotICAgICAgICBmb3IgKHZhciBpZCBpbiB0aGlzLl90YWJPYmplY3RzKSB7 Ci0gICAgICAgICAgICB2YXIgdGFiT2JqZWN0ID0gdGhpcy5fdGFiT2JqZWN0c1tpZF07Ci0gICAg ICAgICAgICBpZiAoaWQgPT09IHNlbGVjdElkKSB7Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWQg PSB0cnVlOwotICAgICAgICAgICAgICAgIHRhYk9iamVjdC50YWIuYWRkU3R5bGVDbGFzcygic2Vs ZWN0ZWQiKTsKLSAgICAgICAgICAgICAgICB0YWJPYmplY3QuY29udGVudC5yZW1vdmVTdHlsZUNs YXNzKCJoaWRkZW4iKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGFi T2JqZWN0LnRhYi5yZW1vdmVTdHlsZUNsYXNzKCJzZWxlY3RlZCIpOwotICAgICAgICAgICAgICAg IHRhYk9iamVjdC5jb250ZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgICAgICAgICAg fQotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBzZWxlY3RlZDsKKyAgICAgICAgdGFiT2JqZWN0 LnRhYi5yZW1vdmVTdHlsZUNsYXNzKCJzZWxlY3RlZCIpOworICAgICAgICBpZiAodGFiT2JqZWN0 LmVsZW1lbnQpCisgICAgICAgICAgICB0YWJPYmplY3QuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJo aWRkZW4iKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGFiT2JqZWN0LnZpZXcudmlzaWJs ZSA9IGZhbHNlOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5jc3MKaW5kZXggYWUyNjMzOS4uZGRhOGFjOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5jc3MKQEAgLTg4Nyw2ICs4ODcsNyBAQCBib2R5LnBsYXRmb3JtLWxpbnV4 IC5tb25vc3BhY2UsIGJvZHkucGxhdGZvcm0tbGludXggLnNvdXJjZS1jb2RlIHsKIH0KIAogLnJl c291cmNlLXZpZXctY29va2llcyB7CisgICAgZGlzcGxheTogbm9uZTsKICAgICBwb3NpdGlvbjog YWJzb2x1dGU7CiAgICAgdG9wOiAwOwogICAgIHJpZ2h0OiAwOwpAQCAtODk3LDYgKzg5OCwxMCBA QCBib2R5LnBsYXRmb3JtLWxpbnV4IC5tb25vc3BhY2UsIGJvZHkucGxhdGZvcm0tbGludXggLnNv dXJjZS1jb2RlIHsKICAgICBoZWlnaHQ6IDEwMCU7CiB9CiAKKy5yZXNvdXJjZS12aWV3LWNvb2tp ZXMudmlzaWJsZSB7CisgICAgZGlzcGxheTogYmxvY2s7Cit9CisKIC5yZXNvdXJjZS12aWV3LWNv b2tpZXMudGFibGUgLmRhdGEtZ3JpZCB7CiAgICAgaGVpZ2h0OiAxMDAlOwogfQo=