108181 2013-01-29 05:08:04 -0800 Web Inspector: Change the Elements panel sidebar layout based on its aspect ratio. 2013-01-30 04:01:21 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kaznacheev kaznacheev apavlov keishi levin+threading loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 818847 0 kaznacheev 2013-01-29 05:08:04 -0800 A followup to https://bugs.webkit.org/show_bug.cgi?id=107129. The sidebar layout should depend on the sidebar aspect ratio, not the docking mode. 818848 1 185220 kaznacheev 2013-01-29 05:16:02 -0800 Created attachment 185220 Patch 818915 2 185220 pfeldman 2013-01-29 07:07:15 -0800 Comment on attachment 185220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185220&action=review > Source/WebCore/inspector/front-end/SidebarView.js:66 > + Start: "Start", Why would we need Left, Right, Top and Bottom then? Start/End + orientation uniquely identify it. 819909 3 185421 kaznacheev 2013-01-30 01:01:22 -0800 Created attachment 185421 Patch 820067 4 185421 webkit.review.bot 2013-01-30 04:01:16 -0800 Comment on attachment 185421 Patch Clearing flags on attachment: 185421 Committed r141249: <http://trac.webkit.org/changeset/141249> 820068 5 webkit.review.bot 2013-01-30 04:01:21 -0800 All reviewed patches have been landed. Closing bug. 185220 2013-01-29 05:16:02 -0800 2013-01-30 01:01:18 -0800 Patch bug-108181-20130129171248.patch text/plain 9734 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwOTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ3ZDY5MTg0NjU3ODI3 Y2NjOTZmNTM1ZmVkYmQ2MmFmMDkwM2NiMi4uMGFmMjgzNTgwMmE5OTBmOGI0MzNhNjljMmJhODM5 OTY5YzBiMWUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTI5ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IENoYW5nZSB0aGUgRWxlbWVudHMgcGFuZWwgc2lkZWJhciBsYXlvdXQgYmFz ZWQgb24gaXRzIGFzcGVjdCByYXRpby4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwODE4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNpZGViYXIgYXNwZWN0IHJhdGlvIHByb3ZlZCB0byBiZSBhIGJldHRl ciB0cmlnZ2VyIGZvciB0aGUgc2lkZWJhciBsYXlvdXQgY2hhbmdlIHRoYXQgdGhlIGRvY2tpbmcg bW9kZS4KKyAgICAgICAgTW92ZWQgdGhlIGxheW91dCBoYW5kbGluZyB0byBXZWJJbnNwZWN0b3Iu U2lkZWJhclZpZXcgYW5kIHJlbmFtZWQgdGhlIGV4cGVyaW1lbnQgdG8gZW5hYmxlIGZ1cnRoZXIg cmV1c2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Eb2NrQ29udHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Eb2NrQ29u dHJvbGxlci5wcm90b3R5cGUuX3VwZGF0ZVVJKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Eb2Nr Q29udHJvbGxlci5wcm90b3R5cGUuX3RvZ2dsZURvY2tTdGF0ZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVs ZW1lbnRzUGFuZWwucHJvdG90eXBlLm9uUmVzaXplKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0 dGluZ3MpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNpZGViYXJWaWV3LnByb3RvdHlwZS5fdXBkYXRlU2lkZWJhclBvc2l0aW9uKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5wcm90b3R5cGUuX3NpZGViYXJQb3NpdGlvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcucHJvdG90eXBlLm9uUmVzaXplKToKKwog MjAxMy0wMS0yOCAgVmxhZGlzbGF2IEthem5hY2hlZXYgIDxrYXpuYWNoZWV2QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbmhlcml0IFNpZGViYXJQYW5lIGZyb20gVmll dy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRG9ja0Nv bnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RvY2tDb250 cm9sbGVyLmpzCmluZGV4IDY4NDFlMWE2M2JjNGE1ODQ0ZmM2MjI5NmI0ZTZjOTcwMmMzYzdlNTku LmU2YzcwMDM0NDdjN2YwNDc4OWQ4ZDNiZTdmYjMxN2UwZDRhMDIwNTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRG9ja0NvbnRyb2xsZXIuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Eb2NrQ29udHJvbGxlci5qcwpAQCAt MzAsNyArMzAsNiBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQGV4dGVuZHMge1dlYklu c3BlY3Rvci5PYmplY3R9CiAgKi8KIFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlciA9IGZ1bmN0 aW9uKCkKIHsKQEAgLTUxLDEwICs1MCw2IEBAIFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5T dGF0ZSA9IHsKICAgICBVbmRvY2tlZDogInVuZG9ja2VkIgogfQogCi1XZWJJbnNwZWN0b3IuRG9j a0NvbnRyb2xsZXIuRXZlbnRUeXBlcyA9IHsKLSAgICBTdGF0ZUNoYW5nZWQ6ICJTdGF0ZUNoYW5n ZWQiCi19Ci0KIFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAg LyoqCiAgICAgICogQHJldHVybiB7RWxlbWVudH0KQEAgLTY1LDE0ICs2MCw2IEBAIFdlYkluc3Bl Y3Rvci5Eb2NrQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAg ICAqIEByZXR1cm4ge3N0cmluZ30KLSAgICAgKi8KLSAgICBkb2NrU2lkZTogZnVuY3Rpb24oKQot ICAgIHsKLSAgICAgIHJldHVybiB0aGlzLl9kb2NrU2lkZTsKLSAgICB9LAotCi0gICAgLyoqCiAg ICAgICogQHBhcmFtIHtzdHJpbmd9IGRvY2tTaWRlCiAgICAgICovCiAgICAgc2V0RG9ja1NpZGU6 IGZ1bmN0aW9uKGRvY2tTaWRlKQpAQCAtMTU0LDggKzE0MSw2IEBAIFdlYkluc3BlY3Rvci5Eb2Nr Q29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fZGVjb3Jh dGVCdXR0b25Gb3JUYXJnZXRTdGF0ZSh0aGlzLl9kb2NrVG9nZ2xlQnV0dG9uLCBsYXN0U3RhdGUp OwogICAgICAgICB0aGlzLl9kZWNvcmF0ZUJ1dHRvbkZvclRhcmdldFN0YXRlKHRoaXMuX2RvY2tU b2dnbGVCdXR0b25PcHRpb24sIHNpZGVzWzBdKTsKLQotICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIuRXZlbnRUeXBlcy5TdGF0 ZUNoYW5nZWQsIHRoaXMuX2RvY2tTaWRlKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xOTcsMTIg KzE4MiwxMCBAQCBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg ICAgICBjYXNlICJ1bmRvY2siOiBhY3Rpb24gPSAidW5kb2NrZWQiOyBicmVhazsKICAgICAgICAg fQogICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QucmVxdWVzdFNldERvY2tTaWRlKGFjdGlv bik7Ci0gICAgfSwKLQotICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5 cGUKKyAgICB9CiB9CiAKIC8qKgogICogQHR5cGUgez9XZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xs ZXJ9CiAgKi8KLVdlYkluc3BlY3Rvci5kb2NrQ29udHJvbGxlciA9IG51bGw7CitXZWJJbnNwZWN0 b3IuZG9ja0NvbnRyb2xsZXIgPSBudWxsOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5l bC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5q cwppbmRleCA3MTk3MzRlYWYxYmIxYmIzNjBlMGRjZGU5NDU2MjViZWVjODVjMzQwLi5kNWYxZTEx OGY4OTJkNTZmMDdhYjY5NzJiZmQ4MWI2MGY3NzcxYzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC00NywxMyArNDcs MTEgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5y ZWdpc3RlclJlcXVpcmVkQ1NTKCJ0ZXh0UHJvbXB0LmNzcyIpOwogICAgIHRoaXMuc2V0SGlkZU9u RGV0YWNoKCk7CiAKLSAgICBXZWJJbnNwZWN0b3IuZG9ja0NvbnRyb2xsZXIuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIuRXZlbnRUeXBlcy5TdGF0ZUNoYW5nZWQs IHRoaXMuX29uRG9ja1N0YXRlQ2hhbmdlZC5iaW5kKHRoaXMpKTsKLQogICAgIGNvbnN0IGluaXRp YWxTaWRlYmFyV2lkdGggPSAzMjU7CiAgICAgY29uc3QgbWluaW11bUNvbnRlbnRXaWR0aFBlcmNl bnQgPSAzNDsKICAgICBjb25zdCBpbml0aWFsU2lkZWJhckhlaWdodCA9IDMyNTsKICAgICBjb25z dCBtaW5pbXVtQ29udGVudEhlaWdodFBlcmNlbnQgPSAzNDsKLSAgICB0aGlzLmNyZWF0ZVNpZGVi YXJWaWV3KHRoaXMuZWxlbWVudCwgdGhpcy5fc2lkZWJhclBvc2l0aW9uKCksIGluaXRpYWxTaWRl YmFyV2lkdGgsIGluaXRpYWxTaWRlYmFySGVpZ2h0KTsKKyAgICB0aGlzLmNyZWF0ZVNpZGViYXJW aWV3KHRoaXMuZWxlbWVudCwgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlv bi5FbmQsIGluaXRpYWxTaWRlYmFyV2lkdGgsIGluaXRpYWxTaWRlYmFySGVpZ2h0KTsKICAgICB0 aGlzLnNwbGl0Vmlldy5zZXRNaW5pbXVtU2lkZWJhcldpZHRoKFByZWZlcmVuY2VzLm1pbkVsZW1l bnRzU2lkZWJhcldpZHRoKTsKICAgICB0aGlzLnNwbGl0Vmlldy5zZXRNaW5pbXVtTWFpbldpZHRo UGVyY2VudChtaW5pbXVtQ29udGVudFdpZHRoUGVyY2VudCk7CiAgICAgdGhpcy5zcGxpdFZpZXcu c2V0TWluaW11bVNpZGViYXJIZWlnaHQoUHJlZmVyZW5jZXMubWluRWxlbWVudHNTaWRlYmFySGVp Z2h0KTsKQEAgLTE2NCwyNiArMTYyLDYgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy50cmVlT3V0bGluZS51cGRhdGVTZWxlY3Rp b24oKTsKICAgICAgICAgdGhpcy51cGRhdGVCcmVhZGNydW1iU2l6ZXMoKTsKLSAgICAgICAgaWYg KFdlYkluc3BlY3Rvci5kb2NrQ29udHJvbGxlci5kb2NrU2lkZSgpICE9PSBXZWJJbnNwZWN0b3Iu RG9ja0NvbnRyb2xsZXIuU3RhdGUuVW5kb2NrZWQpCi0gICAgICAgICAgICB0aGlzLnNwbGl0Vmll dy5zZXRTaWRlYmFyUG9zaXRpb24odGhpcy5fc2lkZWJhclBvc2l0aW9uKCkpOwotICAgIH0sCi0K LSAgICBfb25Eb2NrU3RhdGVDaGFuZ2VkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAo V2ViSW5zcGVjdG9yLmRvY2tDb250cm9sbGVyLmRvY2tTaWRlKCkgPT09IFdlYkluc3BlY3Rvci5E b2NrQ29udHJvbGxlci5TdGF0ZS5VbmRvY2tlZCkKLSAgICAgICAgICAgIHRoaXMuc3BsaXRWaWV3 LnNldFNpZGViYXJQb3NpdGlvbih0aGlzLl9zaWRlYmFyUG9zaXRpb24oKSk7Ci0gICAgfSwKLQot ICAgIC8qKgotICAgICAqIEByZXR1cm4ge3N0cmluZ30KLSAgICAgKi8KLSAgICBfc2lkZWJhclBv c2l0aW9uOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVy aW1lbnRzU2V0dGluZ3MuZWxlbWVudHNQYW5lbFNpbmdsZUNvbHVtbi5pc0VuYWJsZWQoKSAmJgot ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRvY2tDb250cm9sbGVyLmRvY2tTaWRlKCkgPT09IFdl Ykluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5TdGF0ZS5Eb2NrZWRUb1JpZ2h0KQotICAgICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uQm90dG9t OwotCi0gICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0 aW9uLlJpZ2h0OwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCmluZGV4IGE5YTgwY2I2MDhiYWNhZTY3YWUxOGZiZTA3 ZGE4Mzk5ZTAzMjY1M2EuLjUyYjkwYjAzMjNkNzIyNGFmNDFkYjc0ZGU5ODU0Yjk2MDUyOTNkYTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3Mu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwpA QCAtMjE0LDcgKzIxNCw3IEBAIFdlYkluc3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuY3NzUmVnaW9ucyA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoImNz c1JlZ2lvbnMiLCAiQ1NTIFJlZ2lvbnMgU3VwcG9ydCIpOwogICAgIHRoaXMuc2hvd092ZXJyaWRl c0luRHJhd2VyID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic2hvd092ZXJyaWRlc0luRHJhd2Vy IiwgIlNob3cgT3ZlcnJpZGVzIGluIGRyYXdlciIpOwogICAgIHRoaXMuZmlsZVN5c3RlbVByb2pl Y3QgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJmaWxlU3lzdGVtUHJvamVjdCIsICJGaWxlIHN5 c3RlbSBmb2xkZXJzIGluIFNvdXJjZXMgUGFuZWwiKTsKLSAgICB0aGlzLmVsZW1lbnRzUGFuZWxT aW5nbGVDb2x1bW4gPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJlbGVtZW50c1BhbmVsU2luZ2xl Q29sdW1uIiwgIlNpbmdsZS1jb2x1bW4gZWxlbWVudHMgcGFuZWwgbGF5b3V0IHdoZW4gZG9ja2Vk IHRvIHJpZ2h0Iik7CisgICAgdGhpcy52ZXJ0aWNhbFNpZGViYXIgPSB0aGlzLl9jcmVhdGVFeHBl cmltZW50KCJ2ZXJ0aWNhbFNpZGViYXIiLCAiU3BsaXQgdGFsbCBzaWRlYmFycyBob3Jpem9udGFs bHkiKTsKIAogICAgIHRoaXMuX2NsZWFuVXBTZXR0aW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJWaWV3LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVmlldy5qcwppbmRleCA3ZGZhZmE2NmFm ZmQ0Y2RlNjRmMTNmMmJkMzIyMjM0YmFlNDkxZmI3Li5lOGVlMDAxMjhmNDlmZWU2Njc5NTdiODQy MjkwODViNjM4NDcwNzExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NpZGViYXJWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2lkZWJhclZpZXcuanMKQEAgLTQ3LDcgKzQ3LDggQEAgV2ViSW5zcGVjdG9yLlNpZGVi YXJWaWV3ID0gZnVuY3Rpb24oc2lkZWJhclBvc2l0aW9uLCBzaWRlYmFyV2lkdGhTZXR0aW5nTmFt ZSwgZGUKICAgICB0aGlzLl9taW5pbXVtU2lkZWJhckhlaWdodCA9IFByZWZlcmVuY2VzLm1pblNp ZGViYXJIZWlnaHQ7CiAgICAgdGhpcy5fbWluaW11bU1haW5IZWlnaHRQZXJjZW50ID0gNTA7CiAK LSAgICB0aGlzLl9pbm5lclNldFNpZGViYXJQb3NpdGlvbihzaWRlYmFyUG9zaXRpb24gfHwgV2Vi SW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5MZWZ0KTsKKyAgICB0aGlzLl9y ZXF1ZXN0ZWRTaWRlYmFyUG9zaXRpb24gPSBzaWRlYmFyUG9zaXRpb24gfHwgV2ViSW5zcGVjdG9y LlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5MZWZ0OworICAgIHRoaXMuX3VwZGF0ZVNpZGVi YXJQb3NpdGlvbigpOwogfQogCiBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuRXZlbnRUeXBlcyA9 IHsKQEAgLTYxLDcgKzYyLDkgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3Np dGlvbiA9IHsKICAgICBMZWZ0OiAiTGVmdCIsCiAgICAgUmlnaHQ6ICJSaWdodCIsCiAgICAgVG9w OiAiVG9wIiwKLSAgICBCb3R0b206ICJCb3R0b20iCisgICAgQm90dG9tOiAiQm90dG9tIiwKKyAg ICBTdGFydDogIlN0YXJ0IiwKKyAgICBFbmQ6ICJFbmQiCiB9CiAKIFdlYkluc3BlY3Rvci5TaWRl YmFyVmlldy5wcm90b3R5cGUgPSB7CkBAIC05NCwyMyArOTcsMTQgQEAgV2ViSW5zcGVjdG9yLlNp ZGViYXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuYWRkU3R5 bGVDbGFzcyhzdHlsZUNsYXNzKTsKICAgICB9LAogCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtz dHJpbmd9IHNpZGViYXJQb3NpdGlvbgotICAgICAqLwotICAgIHNldFNpZGViYXJQb3NpdGlvbjog ZnVuY3Rpb24oc2lkZWJhclBvc2l0aW9uKQorICAgIF91cGRhdGVTaWRlYmFyUG9zaXRpb246IGZ1 bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLnNpZGViYXJQb3NpdGlvbl8gPT09IHNp ZGViYXJQb3NpdGlvbikKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdmFyIHNpZGViYXJQ b3NpdGlvbiA9IHRoaXMuX3NpZGViYXJQb3NpdGlvbigpOwogCi0gICAgICAgIHRoaXMuX2lubmVy U2V0U2lkZWJhclBvc2l0aW9uKHNpZGViYXJQb3NpdGlvbik7Ci0gICAgfSwKKyAgICAgICAgaWYg KHRoaXMuX2N1cnJlbnRTaWRlYmFyUG9zaXRpb24gPT09IHNpZGViYXJQb3NpdGlvbikKKyAgICAg ICAgICAgIHJldHVybjsKIAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBzaWRlYmFy UG9zaXRpb24KLSAgICAgKi8KLSAgICBfaW5uZXJTZXRTaWRlYmFyUG9zaXRpb246IGZ1bmN0aW9u KHNpZGViYXJQb3NpdGlvbikKLSAgICB7Ci0gICAgICAgIHRoaXMuc2lkZWJhclBvc2l0aW9uXyA9 IHNpZGViYXJQb3NpdGlvbjsKKyAgICAgICAgdGhpcy5fY3VycmVudFNpZGViYXJQb3NpdGlvbiA9 IHNpZGViYXJQb3NpdGlvbjsKIAogICAgICAgICBzd2l0Y2ggKHNpZGViYXJQb3NpdGlvbikgewog ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uTGVm dDoKQEAgLTEzNyw2ICsxMzEsMjMgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LnByb3RvdHlw ZSA9IHsKICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAgICAq LworICAgIF9zaWRlYmFyUG9zaXRpb246IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmIChX ZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy52ZXJ0aWNhbFNpZGViYXIuaXNFbmFibGVk KCkpIHsKKyAgICAgICAgICAgIHZhciB0YWxsID0gdGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodCA+ IHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0aDsKKworICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVl c3RlZFNpZGViYXJQb3NpdGlvbiA9PT0gV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQ b3NpdGlvbi5TdGFydCkKKyAgICAgICAgICAgICAgICByZXR1cm4gdGFsbCA/IFdlYkluc3BlY3Rv ci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uVG9wIDogV2ViSW5zcGVjdG9yLlNpZGViYXJW aWV3LlNpZGViYXJQb3NpdGlvbi5MZWZ0OworCisgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVz dGVkU2lkZWJhclBvc2l0aW9uID09PSBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBv c2l0aW9uLkVuZCkKKyAgICAgICAgICAgICAgICByZXR1cm4gdGFsbCA/IFdlYkluc3BlY3Rvci5T aWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uQm90dG9tIDogV2ViSW5zcGVjdG9yLlNpZGViYXJW aWV3LlNpZGViYXJQb3NpdGlvbi5SaWdodDsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gdGhp cy5fcmVxdWVzdGVkU2lkZWJhclBvc2l0aW9uOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBA cGFyYW0ge251bWJlcn0gd2lkdGgKICAgICAgKi8KICAgICBzZXRNaW5pbXVtU2lkZWJhcldpZHRo OiBmdW5jdGlvbih3aWR0aCkKQEAgLTE4Niw2ICsxOTcsNyBAQCBXZWJJbnNwZWN0b3IuU2lkZWJh clZpZXcucHJvdG90eXBlID0gewogCiAgICAgb25SZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7Cisg ICAgICAgIHRoaXMuX3VwZGF0ZVNpZGViYXJQb3NpdGlvbigpOwogICAgICAgICBXZWJJbnNwZWN0 b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5vblJlc2l6ZS5jYWxsKHRoaXMpOwogICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuRXZlbnRU eXBlcy5SZXNpemVkLCB0aGlzLnNpZGViYXJXaWR0aCgpKTsKICAgICB9LAo= 185421 2013-01-30 01:01:22 -0800 2013-01-30 04:01:16 -0800 Patch bug-108181-20130130125806.patch text/plain 18431 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M2NGRkM2YwYmQ4YWEy ZDc3Y2E2MGFkMWE2YTZiNmFlZTA5Nzk1OS4uMmY1OTA5NTMyOGUzN2MwY2RmZmYwMWNkNzUxOTc2 OGJjZjcwODQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEzLTAxLTMwICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IENoYW5nZSB0aGUgRWxlbWVudHMgcGFuZWwgc2lkZWJhciBsYXlvdXQgYmFz ZWQgb24gaXRzIGFzcGVjdCByYXRpby4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwODE4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNpZGViYXIgYXNwZWN0IHJhdGlvIHByb3ZlZCB0byBiZSBhIGJldHRl ciB0cmlnZ2VyIGZvciB0aGUgc2lkZWJhciBsYXlvdXQgY2hhbmdlIHRoYXQgdGhlIGRvY2tpbmcg bW9kZS4KKyAgICAgICAgTW92ZWQgdGhlIHNpZGViYXIgbGF5b3V0IGhhbmRsaW5nIGNvbXBsZXRl bHkgaW50byBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcgd2hpY2ggbm93IG9ubHkgYWNjZXB0cwor ICAgICAgICB0d28gcG9zaXRpb25zOiBTdGFydCAoY29ycmVzcG9uZGluZyB0byBMZWZ0IG9yIFRv cCkgYW5kIEVuZCAoY29ycmVzcG9uZGluZyB0byBSaWdodCBvciBCb3R0b20pLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ1NTTmFtZWRG bG93Q29sbGVjdGlvbnNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU05hbWVkRmxv d0NvbGxlY3Rpb25zVmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Eb2NrQ29u dHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5wcm90b3R5 cGUuX3VwZGF0ZVVJKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5wcm90 b3R5cGUuX3RvZ2dsZURvY2tTdGF0ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJv dG90eXBlLm9uUmVzaXplKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0 ZW1WaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanM6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5l bC5wcm90b3R5cGUuY3JlYXRlU2lkZWJhclZpZXcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5l bCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NpZGViYXJWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJW aWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5wcm90b3R5cGUuc2V0QXV0 b09yaWVudGF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5wcm90b3R5 cGUuX3VwZGF0ZVNpZGViYXJQb3NpdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJh clZpZXcucHJvdG90eXBlLm9uUmVzaXplKToKKwogMjAxMy0wMS0zMCAgSHVhbmcgRG9uZ3N1bmcg IDxsdXh0ZWxsYUBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBDb29yZGluYXRlZCBHcmFwaGlj czogUmVtb3ZlIG1fcGVuZGluZ1N5bmNCYWNraW5nU3RvcmVzIGluIExheWVyVHJlZVJlbmRlcmVy LgpAQCAtMjIzMiw2ICsyMjY3LDE4IEBACiAgICAgICAgICogeG1sL1hTTFRQcm9jZXNzb3IuaWRs OgogICAgICAgICBBZGQgZXhjZXB0aW9ucyB0byBiaW5kaW5nIGludGVncml0eSBjaGVja3MgdG8g SURMLgogICAgICAgICAKKzIwMTMtMDEtMjggIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9y Zz4KKworICAgICAgICBbY2hyb21pdW1dIEJ1aWxkIGZpeC4KKworICAgICAgICBVbnJldmlld2Vk IGJ1aWxkIGZpeC4gUmVtb3ZlIHRoZSB1c2Ugb2YgU2tNdXRleCBmcm9tIERpc2NhcmRhYmxlUGl4 ZWxSZWYuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EaXNjYXJkYWJs ZVBpeGVsUmVmLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc2NhcmRhYmxlUGl4ZWxSZWZBbGxv Y2F0b3I6OmFsbG9jUGl4ZWxSZWYpOgorICAgICAgICAoV2ViQ29yZTo6RGlzY2FyZGFibGVQaXhl bFJlZjo6RGlzY2FyZGFibGVQaXhlbFJlZik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vRGlzY2FyZGFibGVQaXhlbFJlZi5oOgorICAgICAgICAoRGlzY2FyZGFibGVQaXhl bFJlZik6CisKIDIwMTMtMDEtMjggIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIFN0cmluZyBjb25zdHJ1Y3RlZCBmcm9tIExpdGVyYWxzIHNob3VsZCBi ZSBub24tZW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ1NTTmFtZWRGbG93Q29sbGVjdGlvbnNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9DU1NOYW1lZEZsb3dDb2xsZWN0aW9uc1ZpZXcuanMKaW5kZXggZjBlOTNi MzYyNGM5MDgxZGZhYmVhMjJiZGU2YjUxY2U3ZTc5ZWU0Ni4uZDQyMGQyNzMxY2I2ZDlmN2IyMGUw MjhlOTAyNzZjZWI5NDJjOTYwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9DU1NOYW1lZEZsb3dDb2xsZWN0aW9uc1ZpZXcuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NOYW1lZEZsb3dDb2xsZWN0aW9uc1ZpZXcuanMK QEAgLTMzLDcgKzMzLDcgQEAKICAqLwogV2ViSW5zcGVjdG9yLkNTU05hbWVkRmxvd0NvbGxlY3Rp b25zVmlldyA9IGZ1bmN0aW9uKCkKIHsKLSAgICBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuY2Fs bCh0aGlzLCBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLkxlZnQpOwor ICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5TaWRl YmFyVmlldy5TaWRlYmFyUG9zaXRpb24uU3RhcnQpOwogICAgIHRoaXMucmVnaXN0ZXJSZXF1aXJl ZENTUygiY3NzTmFtZWRGbG93cy5jc3MiKTsKIAogICAgIHRoaXMuX25hbWVkRmxvd3MgPSB7fTsK QEAgLTQ2LDExICs0NiwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTTmFtZWRGbG93Q29sbGVjdGlvbnNW aWV3ID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX3N0YXR1c0VsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzcGFuIik7CiAgICAgdGhpcy5fc3RhdHVzRWxlbWVudC50ZXh0Q29udGVudCA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ1NTIE5hbWVkIEZsb3dzIik7CiAKLSAgICB2YXIgc2lk ZWJhckhlYWRlciA9IHRoaXMuX2xlZnRFbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAidGFiYmVk LXBhbmUtaGVhZGVyIHNlbGVjdGVkIHNpZGViYXItaGVhZGVyIikKKyAgICB2YXIgc2lkZWJhckhl YWRlciA9IHRoaXMuZmlyc3RFbGVtZW50KCkuY3JlYXRlQ2hpbGQoImRpdiIsICJ0YWJiZWQtcGFu ZS1oZWFkZXIgc2VsZWN0ZWQgc2lkZWJhci1oZWFkZXIiKTsKICAgICB2YXIgdGFiID0gc2lkZWJh ckhlYWRlci5jcmVhdGVDaGlsZCgiZGl2IiwgInRhYmJlZC1wYW5lLWhlYWRlci10YWIiKTsKICAg ICB0YWIuY3JlYXRlQ2hpbGQoInNwYW4iLCAidGFiYmVkLXBhbmUtaGVhZGVyLXRhYi10aXRsZSIp LnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDU1MgTmFtZWQgRmxvd3MiKTsK IAotICAgIHRoaXMuX3NpZGViYXJDb250ZW50RWxlbWVudCA9IHRoaXMuX2xlZnRFbGVtZW50LmNy ZWF0ZUNoaWxkKCJkaXYiLCAic2lkZWJhci1jb250ZW50IG91dGxpbmUtZGlzY2xvc3VyZSIpOwor ICAgIHRoaXMuX3NpZGViYXJDb250ZW50RWxlbWVudCA9IHRoaXMuZmlyc3RFbGVtZW50KCkuY3Jl YXRlQ2hpbGQoImRpdiIsICJzaWRlYmFyLWNvbnRlbnQgb3V0bGluZS1kaXNjbG9zdXJlIik7CiAg ICAgdGhpcy5fZmxvd0xpc3RFbGVtZW50ID0gdGhpcy5fc2lkZWJhckNvbnRlbnRFbGVtZW50LmNy ZWF0ZUNoaWxkKCJvbCIpOwogICAgIHRoaXMuX2Zsb3dUcmVlID0gbmV3IFRyZWVPdXRsaW5lKHRo aXMuX2Zsb3dMaXN0RWxlbWVudCk7CiAKQEAgLTYwLDcgKzYwLDcgQEAgV2ViSW5zcGVjdG9yLkNT U05hbWVkRmxvd0NvbGxlY3Rpb25zVmlldyA9IGZ1bmN0aW9uKCkKIAogICAgIHRoaXMuX3RhYmJl ZFBhbmUgPSBuZXcgV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmUoKTsKICAgICB0aGlzLl90YWJiZWRQ YW5lLmNsb3NlYWJsZVRhYnMgPSB0cnVlOwotICAgIHRoaXMuX3RhYmJlZFBhbmUuc2hvdyh0aGlz Ll9yaWdodEVsZW1lbnQpOworICAgIHRoaXMuX3RhYmJlZFBhbmUuc2hvdyh0aGlzLnNlY29uZEVs ZW1lbnQoKSk7CiB9CiAKIFdlYkluc3BlY3Rvci5DU1NOYW1lZEZsb3dDb2xsZWN0aW9uc1ZpZXcu cHJvdG90eXBlID0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Eb2NrQ29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRG9ja0NvbnRyb2xsZXIuanMKaW5kZXggNjg0MWUxYTYzYmM0YTU4NDRmYzYyMjk2YjRlNmM5 NzAyYzNjN2U1OS4uNDYwZTViNTI5MTVjZmZkNDBiYjU5YWE0YmRlNjQwNzg5OTQxZjE2NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Eb2NrQ29udHJvbGxl ci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RvY2tDb250cm9s bGVyLmpzCkBAIC0zMCw3ICszMCw2IEBACiAKIC8qKgogICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0 ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KICAqLwogV2ViSW5zcGVjdG9yLkRvY2tDb250cm9s bGVyID0gZnVuY3Rpb24oKQogewpAQCAtNTEsMTAgKzUwLDYgQEAgV2ViSW5zcGVjdG9yLkRvY2tD b250cm9sbGVyLlN0YXRlID0gewogICAgIFVuZG9ja2VkOiAidW5kb2NrZWQiCiB9CiAKLVdlYklu c3BlY3Rvci5Eb2NrQ29udHJvbGxlci5FdmVudFR5cGVzID0gewotICAgIFN0YXRlQ2hhbmdlZDog IlN0YXRlQ2hhbmdlZCIKLX0KLQogV2ViSW5zcGVjdG9yLkRvY2tDb250cm9sbGVyLnByb3RvdHlw ZSA9IHsKICAgICAvKioKICAgICAgKiBAcmV0dXJuIHtFbGVtZW50fQpAQCAtNjUsMTQgKzYwLDYg QEAgV2ViSW5zcGVjdG9yLkRvY2tDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAg ICAgLyoqCi0gICAgICogQHJldHVybiB7c3RyaW5nfQotICAgICAqLwotICAgIGRvY2tTaWRlOiBm dW5jdGlvbigpCi0gICAgewotICAgICAgcmV0dXJuIHRoaXMuX2RvY2tTaWRlOwotICAgIH0sCi0K LSAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gZG9ja1NpZGUKICAgICAgKi8KICAgICBz ZXREb2NrU2lkZTogZnVuY3Rpb24oZG9ja1NpZGUpCkBAIC0xNTQsOCArMTQxLDYgQEAgV2ViSW5z cGVjdG9yLkRvY2tDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgICAgICB0 aGlzLl9kZWNvcmF0ZUJ1dHRvbkZvclRhcmdldFN0YXRlKHRoaXMuX2RvY2tUb2dnbGVCdXR0b24s IGxhc3RTdGF0ZSk7CiAgICAgICAgIHRoaXMuX2RlY29yYXRlQnV0dG9uRm9yVGFyZ2V0U3RhdGUo dGhpcy5fZG9ja1RvZ2dsZUJ1dHRvbk9wdGlvbiwgc2lkZXNbMF0pOwotCi0gICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5FdmVu dFR5cGVzLlN0YXRlQ2hhbmdlZCwgdGhpcy5fZG9ja1NpZGUpOwogICAgIH0sCiAKICAgICAvKioK QEAgLTE5Nyw5ICsxODIsNyBAQCBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIucHJvdG90eXBl ID0gewogICAgICAgICBjYXNlICJ1bmRvY2siOiBhY3Rpb24gPSAidW5kb2NrZWQiOyBicmVhazsK ICAgICAgICAgfQogICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QucmVxdWVzdFNldERvY2tT aWRlKGFjdGlvbik7Ci0gICAgfSwKLQotICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLk9iamVj dC5wcm90b3R5cGUKKyAgICB9CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCmluZGV4IDcxOTczNGVhZjFiYjFiYjM2 MGUwZGNkZTk0NTYyNWJlZWM4NWMzNDAuLjZkMjcwNjU1NDFhOWNiOWQ3NWMwZDJlMGNjZmZmYWQz ODE4ZTEwZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RWxlbWVudHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0VsZW1lbnRzUGFuZWwuanMKQEAgLTQ3LDEzICs0NywxMiBAQCBXZWJJbnNwZWN0b3IuRWxlbWVu dHNQYW5lbCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnJlZ2lzdGVyUmVxdWlyZWRDU1MoInRleHRQ cm9tcHQuY3NzIik7CiAgICAgdGhpcy5zZXRIaWRlT25EZXRhY2goKTsKIAotICAgIFdlYkluc3Bl Y3Rvci5kb2NrQ29udHJvbGxlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Eb2NrQ29u dHJvbGxlci5FdmVudFR5cGVzLlN0YXRlQ2hhbmdlZCwgdGhpcy5fb25Eb2NrU3RhdGVDaGFuZ2Vk LmJpbmQodGhpcykpOwotCiAgICAgY29uc3QgaW5pdGlhbFNpZGViYXJXaWR0aCA9IDMyNTsKICAg ICBjb25zdCBtaW5pbXVtQ29udGVudFdpZHRoUGVyY2VudCA9IDM0OwogICAgIGNvbnN0IGluaXRp YWxTaWRlYmFySGVpZ2h0ID0gMzI1OwogICAgIGNvbnN0IG1pbmltdW1Db250ZW50SGVpZ2h0UGVy Y2VudCA9IDM0OwotICAgIHRoaXMuY3JlYXRlU2lkZWJhclZpZXcodGhpcy5lbGVtZW50LCB0aGlz Ll9zaWRlYmFyUG9zaXRpb24oKSwgaW5pdGlhbFNpZGViYXJXaWR0aCwgaW5pdGlhbFNpZGViYXJI ZWlnaHQpOworICAgIHRoaXMuY3JlYXRlU2lkZWJhclZpZXcodGhpcy5lbGVtZW50LCBXZWJJbnNw ZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLkVuZCwgaW5pdGlhbFNpZGViYXJXaWR0 aCwgaW5pdGlhbFNpZGViYXJIZWlnaHQpOworICAgIHRoaXMuc3BsaXRWaWV3LnNldEF1dG9Pcmll bnRhdGlvbihXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5lbGVtZW50c1BhbmVsU2lu Z2xlQ29sdW1uLmlzRW5hYmxlZCgpKTsKICAgICB0aGlzLnNwbGl0Vmlldy5zZXRNaW5pbXVtU2lk ZWJhcldpZHRoKFByZWZlcmVuY2VzLm1pbkVsZW1lbnRzU2lkZWJhcldpZHRoKTsKICAgICB0aGlz LnNwbGl0Vmlldy5zZXRNaW5pbXVtTWFpbldpZHRoUGVyY2VudChtaW5pbXVtQ29udGVudFdpZHRo UGVyY2VudCk7CiAgICAgdGhpcy5zcGxpdFZpZXcuc2V0TWluaW11bVNpZGViYXJIZWlnaHQoUHJl ZmVyZW5jZXMubWluRWxlbWVudHNTaWRlYmFySGVpZ2h0KTsKQEAgLTE2NCwyNiArMTYzLDYgQEAg V2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg dGhpcy50cmVlT3V0bGluZS51cGRhdGVTZWxlY3Rpb24oKTsKICAgICAgICAgdGhpcy51cGRhdGVC cmVhZGNydW1iU2l6ZXMoKTsKLSAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kb2NrQ29udHJvbGxl ci5kb2NrU2lkZSgpICE9PSBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIuU3RhdGUuVW5kb2Nr ZWQpCi0gICAgICAgICAgICB0aGlzLnNwbGl0Vmlldy5zZXRTaWRlYmFyUG9zaXRpb24odGhpcy5f c2lkZWJhclBvc2l0aW9uKCkpOwotICAgIH0sCi0KLSAgICBfb25Eb2NrU3RhdGVDaGFuZ2VkOiBm dW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmRvY2tDb250cm9sbGVy LmRvY2tTaWRlKCkgPT09IFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5TdGF0ZS5VbmRvY2tl ZCkKLSAgICAgICAgICAgIHRoaXMuc3BsaXRWaWV3LnNldFNpZGViYXJQb3NpdGlvbih0aGlzLl9z aWRlYmFyUG9zaXRpb24oKSk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEByZXR1cm4ge3N0 cmluZ30KLSAgICAgKi8KLSAgICBfc2lkZWJhclBvc2l0aW9uOiBmdW5jdGlvbigpCi0gICAgewot ICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3MuZWxlbWVudHNQYW5l bFNpbmdsZUNvbHVtbi5pc0VuYWJsZWQoKSAmJgotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRv Y2tDb250cm9sbGVyLmRvY2tTaWRlKCkgPT09IFdlYkluc3BlY3Rvci5Eb2NrQ29udHJvbGxlci5T dGF0ZS5Eb2NrZWRUb1JpZ2h0KQotICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5TaWRl YmFyVmlldy5TaWRlYmFyUG9zaXRpb24uQm90dG9tOwotCi0gICAgICAgIHJldHVybiBXZWJJbnNw ZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLlJpZ2h0OwogICAgIH0sCiAKICAgICAv KioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5 c3RlbVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0 ZW1WaWV3LmpzCmluZGV4IDRkMGVkYjY3MmU4NmY1YjUxMDZjYTFhM2Q3MmQyMWJkMmVjNGVkYzQu LjdmNmExNTA1MDI5YTgwMzU3MzE2NGY2YjE1ZDRkZGJmODU3OTQ4ODIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbVZpZXcuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtVmlldy5qcwpAQCAt MzUsNyArMzUsNyBAQAogICovCiBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcgPSBmdW5jdGlv bihmaWxlU3lzdGVtKQogewotICAgIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5jYWxsKHRoaXMs IFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uTGVmdCwgIkZpbGVTeXN0 ZW1WaWV3U2lkZWJhcldpZHRoIik7CisgICAgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LmNhbGwo dGhpcywgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5TdGFydCwgIkZp bGVTeXN0ZW1WaWV3U2lkZWJhcldpZHRoIik7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xh c3MoImZpbGUtc3lzdGVtLXZpZXciKTsKICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygi c3RvcmFnZS12aWV3Iik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5qcwppbmRleCBhYTgzYjFmMDExMjFhNTU2Y2ZjYzU0 ZGQ5MmU1YTVkZmI3ZjU2NDQ5Li42NWVkMzU3MThmMzY2NTk0NTY0YjFjMmE2YzAzZThlNTA2MmM0 MmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9y eVN0YXRpc3RpY3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9N ZW1vcnlTdGF0aXN0aWNzLmpzCkBAIC00Myw3ICs0Myw3IEBAIFdlYkluc3BlY3Rvci5NZW1vcnlT dGF0aXN0aWNzID0gZnVuY3Rpb24odGltZWxpbmVQYW5lbCwgbW9kZWwsIHNpZGViYXJXaWR0aCkK ICAgICBtb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLkV2 ZW50cy5SZWNvcmRzQ2xlYXJlZCwgdGhpcy5fb25SZWNvcmRzQ2xlYXJlZCwgdGhpcyk7CiAKICAg ICB0aGlzLl9jb250YWluZXJBbmNob3IgPSB0aW1lbGluZVBhbmVsLmVsZW1lbnQubGFzdENoaWxk OwotICAgIHRoaXMuX21lbW9yeVNpZGViYXJWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFy VmlldyhXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLkxlZnQsIHVuZGVm aW5lZCwgc2lkZWJhcldpZHRoKTsKKyAgICB0aGlzLl9tZW1vcnlTaWRlYmFyVmlldyA9IG5ldyBX ZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcoV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQ b3NpdGlvbi5TdGFydCwgdW5kZWZpbmVkLCBzaWRlYmFyV2lkdGgpOwogICAgIHRoaXMuX21lbW9y eVNpZGViYXJWaWV3LnNpZGViYXJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNpZGViYXIiKTsKICAg ICB0aGlzLl9tZW1vcnlTaWRlYmFyVmlldy5lbGVtZW50LmlkID0gIm1lbW9yeS1ncmFwaHMtY29u dGFpbmVyIjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9QYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMK aW5kZXggYWUzYjM4ZGM0MTBkZjBkYzI4NjE1MDMyNDAzOTFmNjhiNGNhODgwYy4uN2IxNjk2ZWUw MTNhZjIyMWY1MzZiZDE0Yjg3YTdmNTA2YmMzYTM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCkBAIC0xNjIsNyArMTYyLDcgQEAgV2ViSW5zcGVjdG9y LlBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFwYXJlbnRFbGVtZW50KQogICAgICAg ICAgICAgcGFyZW50RWxlbWVudCA9IHRoaXMuZWxlbWVudDsKIAotICAgICAgICB0aGlzLnNwbGl0 VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcocG9zaXRpb24gfHwgV2ViSW5zcGVj dG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5MZWZ0LCB0aGlzLl9zaWRlYmFyV2lkdGhT ZXR0aW5nTmFtZSgpLCBkZWZhdWx0V2lkdGgsIGRlZmF1bHRIZWlnaHQpOworICAgICAgICB0aGlz LnNwbGl0VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcocG9zaXRpb24sIHRoaXMu X3NpZGViYXJXaWR0aFNldHRpbmdOYW1lKCksIGRlZmF1bHRXaWR0aCwgZGVmYXVsdEhlaWdodCk7 CiAgICAgICAgIHRoaXMuc3BsaXRWaWV3LnNob3cocGFyZW50RWxlbWVudCk7CiAgICAgICAgIHRo aXMuc3BsaXRWaWV3LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LkV2 ZW50VHlwZXMuUmVzaXplZCwgdGhpcy5zaWRlYmFyUmVzaXplZC5iaW5kKHRoaXMpKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpp bmRleCA1NjE1YjBlYTA3N2NhZGI1ZTE5OWI4OTE2ZjlhMGQ5N2E0YzBiZjk4Li5hNTNlMDA0ZmM0 MTYyZGE0MzA3YTE5NDE0OWU2ZjIzZTdmMjY0YmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtNjksNyArNjksNyBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24od29ya3NwYWNlRm9yVGVzdCkKIAog ICAgIGNvbnN0IGluaXRpYWxEZWJ1Z1NpZGViYXJXaWR0aCA9IDIyNTsKICAgICBjb25zdCBtaW5p bXVtRGVidWdTaWRlYmFyV2lkdGhQZXJjZW50ID0gNTA7Ci0gICAgdGhpcy5jcmVhdGVTaWRlYmFy Vmlldyh0aGlzLmVsZW1lbnQsIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRp b24uUmlnaHQsIGluaXRpYWxEZWJ1Z1NpZGViYXJXaWR0aCk7CisgICAgdGhpcy5jcmVhdGVTaWRl YmFyVmlldyh0aGlzLmVsZW1lbnQsIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9z aXRpb24uRW5kLCBpbml0aWFsRGVidWdTaWRlYmFyV2lkdGgpOwogICAgIHRoaXMuc3BsaXRWaWV3 LmVsZW1lbnQuaWQgPSAic2NyaXB0cy1zcGxpdC12aWV3IjsKICAgICB0aGlzLnNwbGl0Vmlldy5z ZXRNaW5pbXVtU2lkZWJhcldpZHRoKFByZWZlcmVuY2VzLm1pblNjcmlwdHNTaWRlYmFyV2lkdGgp OwogICAgIHRoaXMuc3BsaXRWaWV3LnNldE1pbmltdW1NYWluV2lkdGhQZXJjZW50KG1pbmltdW1E ZWJ1Z1NpZGViYXJXaWR0aFBlcmNlbnQpOwpAQCAtODMsNyArODMsNyBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsID0gZnVuY3Rpb24od29ya3NwYWNlRm9yVGVzdCkKICAgICAvLyBDcmVhdGUg c2NyaXB0cyBuYXZpZ2F0b3IKICAgICBjb25zdCBpbml0aWFsTmF2aWdhdG9yV2lkdGggPSAyMjU7 CiAgICAgY29uc3QgbWluaW11bVZpZXdzQ29udGFpbmVyV2lkdGhQZXJjZW50ID0gNTA7Ci0gICAg dGhpcy5lZGl0b3JWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldyhXZWJJbnNwZWN0 b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLkxlZnQsICJzY3JpcHRzUGFuZWxOYXZpZ2F0 b3JTaWRlYmFyV2lkdGgiLCBpbml0aWFsTmF2aWdhdG9yV2lkdGgpOworICAgIHRoaXMuZWRpdG9y VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcoV2ViSW5zcGVjdG9yLlNpZGViYXJW aWV3LlNpZGViYXJQb3NpdGlvbi5TdGFydCwgInNjcmlwdHNQYW5lbE5hdmlnYXRvclNpZGViYXJX aWR0aCIsIGluaXRpYWxOYXZpZ2F0b3JXaWR0aCk7CiAgICAgdGhpcy5lZGl0b3JWaWV3LmVsZW1l bnQudGFiSW5kZXggPSAwOwogCiAgICAgdGhpcy5lZGl0b3JWaWV3LnNldE1pbmltdW1TaWRlYmFy V2lkdGgoUHJlZmVyZW5jZXMubWluU2NyaXB0c1NpZGViYXJXaWR0aCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCBhOWE4MGNiNjA4YmFj YWU2N2FlMThmYmUwN2RhODM5OWUwMzI2NTNhLi5hN2Q1Njg1MjFjN2M4ZWU4NmQ5OGM1OTY4N2Uw MjMyYjRmYmFhY2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3MuanMKQEAgLTIxNCw3ICsyMTQsNyBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNT ZXR0aW5ncyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLmNzc1JlZ2lvbnMgPSB0aGlzLl9jcmVhdGVF eHBlcmltZW50KCJjc3NSZWdpb25zIiwgIkNTUyBSZWdpb25zIFN1cHBvcnQiKTsKICAgICB0aGlz LnNob3dPdmVycmlkZXNJbkRyYXdlciA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNob3dPdmVy cmlkZXNJbkRyYXdlciIsICJTaG93IE92ZXJyaWRlcyBpbiBkcmF3ZXIiKTsKICAgICB0aGlzLmZp bGVTeXN0ZW1Qcm9qZWN0ID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgiZmlsZVN5c3RlbVByb2pl Y3QiLCAiRmlsZSBzeXN0ZW0gZm9sZGVycyBpbiBTb3VyY2VzIFBhbmVsIik7Ci0gICAgdGhpcy5l bGVtZW50c1BhbmVsU2luZ2xlQ29sdW1uID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgiZWxlbWVu dHNQYW5lbFNpbmdsZUNvbHVtbiIsICJTaW5nbGUtY29sdW1uIGVsZW1lbnRzIHBhbmVsIGxheW91 dCB3aGVuIGRvY2tlZCB0byByaWdodCIpOworICAgIHRoaXMuZWxlbWVudHNQYW5lbFNpbmdsZUNv bHVtbiA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoImVsZW1lbnRzUGFuZWxTaW5nbGVDb2x1bW4i LCAiU3BsaXQgRWxlbWVudHMgc2lkZWJhciBob3Jpem9udGFsbHkgd2hlbiBpdCBpcyB0b28gbmFy cm93Iik7CiAKICAgICB0aGlzLl9jbGVhblVwU2V0dGluZygpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclZpZXcuanMKaW5kZXggN2RmYWZhNjZh ZmZkNGNkZTY0ZjEzZjJiZDMyMjIzNGJhZTQ5MWZiNy4uZmYyOGI5ZjYzZWNkZGI3NTBjY2FjZmVk MWU3NzAyNWY2YzQwYzg5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TaWRlYmFyVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NpZGViYXJWaWV3LmpzCkBAIC0zOCwxNiArMzgsMTUgQEAgV2ViSW5zcGVjdG9yLlNp ZGViYXJWaWV3ID0gZnVuY3Rpb24oc2lkZWJhclBvc2l0aW9uLCBzaWRlYmFyV2lkdGhTZXR0aW5n TmFtZSwgZGUKIHsKICAgICBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LmNhbGwodGhpcywgdHJ1ZSwg c2lkZWJhcldpZHRoU2V0dGluZ05hbWUsIGRlZmF1bHRTaWRlYmFyV2lkdGgsIGRlZmF1bHRTaWRl YmFySGVpZ2h0KTsKIAotICAgIHRoaXMuX2xlZnRFbGVtZW50ID0gdGhpcy5maXJzdEVsZW1lbnQo KTsKLSAgICB0aGlzLl9yaWdodEVsZW1lbnQgPSB0aGlzLnNlY29uZEVsZW1lbnQoKTsKLQogICAg IHRoaXMuX21pbmltdW1TaWRlYmFyV2lkdGggPSBQcmVmZXJlbmNlcy5taW5TaWRlYmFyV2lkdGg7 CiAgICAgdGhpcy5fbWluaW11bU1haW5XaWR0aFBlcmNlbnQgPSA1MDsKIAogICAgIHRoaXMuX21p bmltdW1TaWRlYmFySGVpZ2h0ID0gUHJlZmVyZW5jZXMubWluU2lkZWJhckhlaWdodDsKICAgICB0 aGlzLl9taW5pbXVtTWFpbkhlaWdodFBlcmNlbnQgPSA1MDsKIAotICAgIHRoaXMuX2lubmVyU2V0 U2lkZWJhclBvc2l0aW9uKHNpZGViYXJQb3NpdGlvbiB8fCBXZWJJbnNwZWN0b3IuU2lkZWJhclZp ZXcuU2lkZWJhclBvc2l0aW9uLkxlZnQpOworICAgIHRoaXMuX3NpZGViYXJQb3NpdGlvbiA9IHNp ZGViYXJQb3NpdGlvbiB8fCBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9u LlN0YXJ0OworICAgIHRoaXMuc2V0U2Vjb25kSXNTaWRlYmFyKHRoaXMuX3NpZGViYXJQb3NpdGlv biA9PT0gV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5FbmQpOworICAg IHRoaXMuX3VwZGF0ZVNpZGViYXJQb3NpdGlvbigpOwogfQogCiBXZWJJbnNwZWN0b3IuU2lkZWJh clZpZXcuRXZlbnRUeXBlcyA9IHsKQEAgLTU4LDEwICs1Nyw4IEBAIFdlYkluc3BlY3Rvci5TaWRl YmFyVmlldy5FdmVudFR5cGVzID0gewogICogQGVudW0ge3N0cmluZ30KICAqLwogV2ViSW5zcGVj dG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbiA9IHsKLSAgICBMZWZ0OiAiTGVmdCIsCi0g ICAgUmlnaHQ6ICJSaWdodCIsCi0gICAgVG9wOiAiVG9wIiwKLSAgICBCb3R0b206ICJCb3R0b20i CisgICAgU3RhcnQ6ICJTdGFydCIsCisgICAgRW5kOiAiRW5kIgogfQogCiBXZWJJbnNwZWN0b3Iu U2lkZWJhclZpZXcucHJvdG90eXBlID0gewpAQCAtOTUsNDUgKzkyLDM0IEBAIFdlYkluc3BlY3Rv ci5TaWRlYmFyVmlldy5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBw YXJhbSB7c3RyaW5nfSBzaWRlYmFyUG9zaXRpb24KKyAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IG9u CiAgICAgICovCi0gICAgc2V0U2lkZWJhclBvc2l0aW9uOiBmdW5jdGlvbihzaWRlYmFyUG9zaXRp b24pCisgICAgc2V0QXV0b09yaWVudGF0aW9uOiBmdW5jdGlvbihvbikgeworICAgICAgICB0aGlz Ll9hdXRvT3JpZW50YXRpb24gPSBvbjsKKyAgICB9LAorCisgICAgX3VwZGF0ZVNpZGViYXJQb3Np dGlvbjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuc2lkZWJhclBvc2l0aW9u XyA9PT0gc2lkZWJhclBvc2l0aW9uKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIg dmVydGljYWxTcGxpdCA9IHRydWU7CisgICAgICAgIGlmICh0aGlzLl9hdXRvT3JpZW50YXRpb24p CisgICAgICAgICAgICB2ZXJ0aWNhbFNwbGl0ID0gdGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodCA8 IHRoaXMuZWxlbWVudC5vZmZzZXRXaWR0aDsKIAotICAgICAgICB0aGlzLl9pbm5lclNldFNpZGVi YXJQb3NpdGlvbihzaWRlYmFyUG9zaXRpb24pOwotICAgIH0sCisgICAgICAgIGlmICh2ZXJ0aWNh bFNwbGl0ID09PSB0aGlzLmlzVmVydGljYWwoKSkKKyAgICAgICAgICAgIHJldHVybjsKIAotICAg IC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSBzaWRlYmFyUG9zaXRpb24KLSAgICAgKi8KLSAg ICBfaW5uZXJTZXRTaWRlYmFyUG9zaXRpb246IGZ1bmN0aW9uKHNpZGViYXJQb3NpdGlvbikKLSAg ICB7Ci0gICAgICAgIHRoaXMuc2lkZWJhclBvc2l0aW9uXyA9IHNpZGViYXJQb3NpdGlvbjsKLQot ICAgICAgICBzd2l0Y2ggKHNpZGViYXJQb3NpdGlvbikgewotICAgICAgICBjYXNlIFdlYkluc3Bl Y3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uTGVmdDoKLSAgICAgICAgICAgIHRoaXMu c2V0U2Vjb25kSXNTaWRlYmFyKGZhbHNlKTsKLSAgICAgICAgICAgIHRoaXMuX3NldFNpZGViYXJF bGVtZW50U3R5bGUoInNwbGl0LXZpZXctc2lkZWJhci1sZWZ0Iik7Ci0gICAgICAgICAgICB0aGlz LnNldFZlcnRpY2FsKHRydWUpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5SaWdodDoKLSAgICAgICAgICAg IHRoaXMuc2V0U2Vjb25kSXNTaWRlYmFyKHRydWUpOwotICAgICAgICAgICAgdGhpcy5fc2V0U2lk ZWJhckVsZW1lbnRTdHlsZSgic3BsaXQtdmlldy1zaWRlYmFyLXJpZ2h0Iik7Ci0gICAgICAgICAg ICB0aGlzLnNldFZlcnRpY2FsKHRydWUpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5Ub3A6Ci0gICAgICAg ICAgICB0aGlzLnNldFNlY29uZElzU2lkZWJhcihmYWxzZSk7Ci0gICAgICAgICAgICB0aGlzLl9z ZXRTaWRlYmFyRWxlbWVudFN0eWxlKCJzcGxpdC12aWV3LXNpZGViYXItdG9wIik7Ci0gICAgICAg ICAgICB0aGlzLnNldFZlcnRpY2FsKGZhbHNlKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRpb24uQm90dG9tOgot ICAgICAgICAgICAgdGhpcy5zZXRTZWNvbmRJc1NpZGViYXIodHJ1ZSk7Ci0gICAgICAgICAgICB0 aGlzLl9zZXRTaWRlYmFyRWxlbWVudFN0eWxlKCJzcGxpdC12aWV3LXNpZGViYXItYm90dG9tIik7 Ci0gICAgICAgICAgICB0aGlzLnNldFZlcnRpY2FsKGZhbHNlKTsKLSAgICAgICAgICAgIGJyZWFr OworICAgICAgICBpZiAodGhpcy5fc2lkZWJhclBvc2l0aW9uID09PSBXZWJJbnNwZWN0b3IuU2lk ZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLlN0YXJ0KSB7CisgICAgICAgICAgICBpZiAodmVydGlj YWxTcGxpdCkKKyAgICAgICAgICAgICAgICB0aGlzLl9zZXRTaWRlYmFyRWxlbWVudFN0eWxlKCJz cGxpdC12aWV3LXNpZGViYXItbGVmdCIpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIHRoaXMuX3NldFNpZGViYXJFbGVtZW50U3R5bGUoInNwbGl0LXZpZXctc2lkZWJhci10b3Ai KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGlmICh2ZXJ0aWNhbFNwbGl0KQorICAg ICAgICAgICAgICAgIHRoaXMuX3NldFNpZGViYXJFbGVtZW50U3R5bGUoInNwbGl0LXZpZXctc2lk ZWJhci1yaWdodCIpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRoaXMuX3Nl dFNpZGViYXJFbGVtZW50U3R5bGUoInNwbGl0LXZpZXctc2lkZWJhci1ib3R0b20iKTsKICAgICAg ICAgfQorCisgICAgICAgIHRoaXMuc2V0VmVydGljYWwodmVydGljYWxTcGxpdCk7CiAgICAgfSwK IAogICAgIC8qKgpAQCAtMTg2LDYgKzE3Miw4IEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5w cm90b3R5cGUgPSB7CiAKICAgICBvblJlc2l6ZTogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAg aWYgKHRoaXMuX2F1dG9PcmllbnRhdGlvbikKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNpZGVi YXJQb3NpdGlvbigpOwogICAgICAgICBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5v blJlc2l6ZS5jYWxsKHRoaXMpOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuRXZlbnRUeXBlcy5SZXNpemVkLCB0aGlzLnNpZGVi YXJXaWR0aCgpKTsKICAgICB9LAo=