54098 2011-02-09 06:54:48 -0800 Web Inspector: [regression] Fix syncing heights of the gutter and main panel lines, and add 2px padding-left 2011-02-10 05:41:20 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 348194 0 aandrey 2011-02-09 06:54:48 -0800 1) Syncing heights of the gutter and main panel lines some times can not be done right away (for example, if the textViewer has not been shown yet in the Web Inspector). Thus we should always sync the height when we repaint the screen. 2) Remove the 2px space between the gutter and mail panels, instead use "padding-left: 2px" for the mail panel. 348199 1 81803 aandrey 2011-02-09 06:58:10 -0800 Created attachment 81803 Patch 348209 2 81803 pfeldman 2011-02-09 07:08:54 -0800 Comment on attachment 81803 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81803&action=review > Source/WebCore/inspector/front-end/TextViewer.js:166 > + gutterChunk.element.style.height = ""; I am not sure what setting integer property to "" is supposed to do. You should use setProperty and removeProperty on style object instead. 348916 3 81803 aandrey 2011-02-10 03:10:10 -0800 Comment on attachment 81803 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81803&action=review >> Source/WebCore/inspector/front-end/TextViewer.js:166 >> + gutterChunk.element.style.height = ""; > > I am not sure what setting integer property to "" is supposed to do. You should use setProperty and removeProperty on style object instead. done 348917 4 81945 aandrey 2011-02-10 03:11:29 -0800 Created attachment 81945 Patch 348921 5 81947 aandrey 2011-02-10 03:40:58 -0800 Created attachment 81947 Patch 348948 6 81951 aandrey 2011-02-10 04:43:58 -0800 Created attachment 81951 Patch 348971 7 81954 aandrey 2011-02-10 05:15:27 -0800 Created attachment 81954 Patch 348984 8 81954 podivilov 2011-02-10 05:41:11 -0800 Comment on attachment 81954 Patch Clearing flags on attachment: 81954 Committed r78210: <http://trac.webkit.org/changeset/78210> 348985 9 podivilov 2011-02-10 05:41:20 -0800 All reviewed patches have been landed. Closing bug. 81803 2011-02-09 06:58:10 -0800 2011-02-10 03:11:23 -0800 Patch bug-54098-20110209175807.patch text/plain 4596 aandrey ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNDdlNjQzYTJhMDBhYzZhMWYzYTdhM2IxYTcyMjMwYWM5NWE0ZDhiLi5i MTRmMzBlYzFjNDYwODQxNjg2ZTMwYzkyM2MxNWM4YTlhM2M3ODg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTEtMDItMDkgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtyZWdyZXNzaW9uXSBGaXggc3luY2luZyBoZWlnaHRzIG9mIHRoZSBndXR0 ZXIgYW5kIG1haW4gcGFuZWwgbGluZXMsIGFuZCBhZGQgMnB4IHBhZGRpbmctbGVmdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwOTgKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZS5fdXBkYXRlUGFuZWxPZmZzZXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyLnByb3RvdHlwZS5fc3luY0RlY29yYXRpb25zRm9yTGluZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVzaXplKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuc2V0IGV4cGFuZGVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzOgorICAgICAgICAoLndlYmtp dC1saW5lLWNvbnRlbnQpOgorCiAyMDExLTAyLTA5ICBQZXRlciBWYXJnYSAgPHB2YXJnYUB3ZWJr aXQub3JnPgogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGV4dFZpZXdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4 dFZpZXdlci5qcwppbmRleCA4NTMyOTRiZGU0MmYzN2ZiZWI5N2U2M2EwYTI2NTdjNWJiMThjNjlh Li5iMzc0YWJjOTViZjIzMzQ1NzFkNTllODdjNjk1YTA0YmFkMzU3YTRmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC0zNyw4ICsz NywxMCBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlciA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxh dGZvcm0sIHVybCkKICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQtZWRpdG9yIG1vbm9zcGFj ZSI7CiAKLSAgICB0aGlzLl9tYWluUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwodGhpcy5fdGV4dE1vZGVsLCB1cmwsIHRoaXMuX3N5bmNTY3JvbGwuYmluZCh0aGlz KSwgdGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZS5iaW5kKHRoaXMpKTsKLSAgICB0aGlzLl9n dXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsKHRoaXMu X3RleHRNb2RlbCk7CisgICAgdmFyIHN5bmNTY3JvbGxMaXN0ZW5lciA9IHRoaXMuX3N5bmNTY3Jv bGwuYmluZCh0aGlzKTsKKyAgICB2YXIgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyID0g dGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZS5iaW5kKHRoaXMpOworICAgIHRoaXMuX21haW5Q YW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbCh0aGlzLl90ZXh0TW9k ZWwsIHVybCwgc3luY1Njcm9sbExpc3RlbmVyLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVu ZXIpOworICAgIHRoaXMuX2d1dHRlclBhbmVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y R3V0dGVyUGFuZWwodGhpcy5fdGV4dE1vZGVsLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVu ZXIpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9tYWluUGFuZWwuZWxlbWVu dCk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2d1dHRlclBhbmVsLmVsZW1l bnQpOwogfQpAQCAtMTI4LDcgKzEzMCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBsaW5lTnVtYmVyc1dpZHRoID0gdGhpcy5fZ3V0 dGVyUGFuZWwuZWxlbWVudC5vZmZzZXRXaWR0aDsKICAgICAgICAgaWYgKGxpbmVOdW1iZXJzV2lk dGgpCi0gICAgICAgICAgICB0aGlzLl9tYWluUGFuZWwuZWxlbWVudC5zdHlsZS5sZWZ0ID0gKGxp bmVOdW1iZXJzV2lkdGggKyAyKSArICJweCI7CisgICAgICAgICAgICB0aGlzLl9tYWluUGFuZWwu ZWxlbWVudC5zdHlsZS5sZWZ0ID0gbGluZU51bWJlcnNXaWR0aCArICJweCI7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIHRoaXMuX21haW5QYW5lbC5lbGVtZW50LnN0eWxlLmxlZnQgPSAiIjsg Ly8gVXNlIGRlZmF1bHQgdmFsdWUgc2V0IGluIENTUy4KICAgICB9LApAQCAtMTU3LDcgKzE1OSwx MSBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFy IG1haW5DaHVuayA9IHRoaXMuX21haW5QYW5lbC5tYWtlTGluZUFDaHVuayhsaW5lTnVtYmVyKTsK ICAgICAgICAgdmFyIGd1dHRlckNodW5rID0gdGhpcy5fZ3V0dGVyUGFuZWwubWFrZUxpbmVBQ2h1 bmsobGluZU51bWJlcik7Ci0gICAgICAgIGd1dHRlckNodW5rLmVsZW1lbnQuc3R5bGUuaGVpZ2h0 ID0gbWFpbkNodW5rLmVsZW1lbnQub2Zmc2V0SGVpZ2h0ICsgInB4IjsKKyAgICAgICAgdmFyIGhl aWdodCA9IG1haW5DaHVuay5lbGVtZW50Lm9mZnNldEhlaWdodDsKKyAgICAgICAgaWYgKGhlaWdo dCkKKyAgICAgICAgICAgIGd1dHRlckNodW5rLmVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gaGVpZ2h0 ICsgInB4IjsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZ3V0dGVyQ2h1bmsuZWxlbWVudC5z dHlsZS5oZWlnaHQgPSAiIjsKICAgICB9CiB9CiAKQEAgLTM0MSwxNCArMzQ3LDE2IEBAIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAKICAgICBy ZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3NjaGVkdWxlUmVwYWludEFs bCgpOworICAgICAgICB0aGlzLl9yZXBhaW50QWxsKCk7CiAgICAgfQogfQogCi1XZWJJbnNwZWN0 b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsID0gZnVuY3Rpb24odGV4dE1vZGVsKQorV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbCA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgc3luY0RlY29y YXRpb25zRm9yTGluZUxpc3RlbmVyKQogewogICAgIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1 bmtlZFBhbmVsLmNhbGwodGhpcywgdGV4dE1vZGVsKTsKIAorICAgIHRoaXMuX3N5bmNEZWNvcmF0 aW9uc0ZvckxpbmVMaXN0ZW5lciA9IHN5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lcjsKKwog ICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHRo aXMuZWxlbWVudC5jbGFzc05hbWUgPSAidGV4dC1lZGl0b3ItbGluZXMiOwogCkBAIC00NDEsNiAr NDQ5LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuX2V4cGFuZGVkID0gZXhwYW5kZWQ7CiAKICAgICAgICAgaWYgKHRoaXMu bGluZXNDb3VudCA9PT0gMSkgeworICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5fc3luY0Rl Y29yYXRpb25zRm9yTGluZUxpc3RlbmVyKHRoaXMuc3RhcnRMaW5lKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC90ZXh0Vmlld2VyLmNzcwppbmRleCA1NDk1N2I5YTBlZmExZWI0ODY5NDk4MDlkZTIzZTgy NTNkYzZiMzUxLi5mNmFhNjVlYWFkMDZmZDdhOThmOGRiMTBiMTQzNjQ5NWIzZWQ5MDM0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3Nz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MK QEAgLTEwNiw2ICsxMDYsMTAgQEAKICAgICBtYXJnaW4tcmlnaHQ6IC0xMHB4OwogfQogCisud2Vi a2l0LWxpbmUtY29udGVudCB7CisgICAgcGFkZGluZy1sZWZ0OiAycHg7Cit9CisKIC53ZWJraXQt YnJlYWtwb2ludCAud2Via2l0LWxpbmUtbnVtYmVyLW91dGVyIHsKICAgICBjb2xvcjogd2hpdGU7 CiAgICAgYm9yZGVyLXdpZHRoOiAwIDE0cHggMHB4IDJweDsK 81945 2011-02-10 03:11:29 -0800 2011-02-10 03:40:51 -0800 Patch bug-54098-20110210141126.patch text/plain 7174 aandrey ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNDdlNjQzYTJhMDBhYzZhMWYzYTdhM2IxYTcyMjMwYWM5NWE0ZDhiLi5i MTRmMzBlYzFjNDYwODQxNjg2ZTMwYzkyM2MxNWM4YTlhM2M3ODg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTEtMDItMDkgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtyZWdyZXNzaW9uXSBGaXggc3luY2luZyBoZWlnaHRzIG9mIHRoZSBndXR0 ZXIgYW5kIG1haW4gcGFuZWwgbGluZXMsIGFuZCBhZGQgMnB4IHBhZGRpbmctbGVmdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwOTgKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZS5fdXBkYXRlUGFuZWxPZmZzZXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyLnByb3RvdHlwZS5fc3luY0RlY29yYXRpb25zRm9yTGluZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVzaXplKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuc2V0IGV4cGFuZGVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzOgorICAgICAgICAoLndlYmtp dC1saW5lLWNvbnRlbnQpOgorCiAyMDExLTAyLTA5ICBQZXRlciBWYXJnYSAgPHB2YXJnYUB3ZWJr aXQub3JnPgogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGV4dFZpZXdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4 dFZpZXdlci5qcwppbmRleCA4NTMyOTRiZGU0MmYzN2ZiZWI5N2U2M2EwYTI2NTdjNWJiMThjNjlh Li44ZDY1ZmQxOTA2MzkwNzM4N2Y5NTRlYTFiNjIwZjhkMmQzNDU0ODczIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC0zNyw4ICsz NywxMCBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlciA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxh dGZvcm0sIHVybCkKICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQtZWRpdG9yIG1vbm9zcGFj ZSI7CiAKLSAgICB0aGlzLl9tYWluUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwodGhpcy5fdGV4dE1vZGVsLCB1cmwsIHRoaXMuX3N5bmNTY3JvbGwuYmluZCh0aGlz KSwgdGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZS5iaW5kKHRoaXMpKTsKLSAgICB0aGlzLl9n dXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsKHRoaXMu X3RleHRNb2RlbCk7CisgICAgdmFyIHN5bmNTY3JvbGxMaXN0ZW5lciA9IHRoaXMuX3N5bmNTY3Jv bGwuYmluZCh0aGlzKTsKKyAgICB2YXIgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyID0g dGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZS5iaW5kKHRoaXMpOworICAgIHRoaXMuX21haW5Q YW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbCh0aGlzLl90ZXh0TW9k ZWwsIHVybCwgc3luY1Njcm9sbExpc3RlbmVyLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVu ZXIpOworICAgIHRoaXMuX2d1dHRlclBhbmVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y R3V0dGVyUGFuZWwodGhpcy5fdGV4dE1vZGVsLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVu ZXIpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9tYWluUGFuZWwuZWxlbWVu dCk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2d1dHRlclBhbmVsLmVsZW1l bnQpOwogfQpAQCAtMTI4LDkgKzEzMCw5IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBsaW5lTnVtYmVyc1dpZHRoID0gdGhpcy5fZ3V0 dGVyUGFuZWwuZWxlbWVudC5vZmZzZXRXaWR0aDsKICAgICAgICAgaWYgKGxpbmVOdW1iZXJzV2lk dGgpCi0gICAgICAgICAgICB0aGlzLl9tYWluUGFuZWwuZWxlbWVudC5zdHlsZS5sZWZ0ID0gKGxp bmVOdW1iZXJzV2lkdGggKyAyKSArICJweCI7CisgICAgICAgICAgICB0aGlzLl9tYWluUGFuZWwu ZWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgibGVmdCIsIGxpbmVOdW1iZXJzV2lkdGggKyAicHgi KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5 bGUubGVmdCA9ICIiOyAvLyBVc2UgZGVmYXVsdCB2YWx1ZSBzZXQgaW4gQ1NTLgorICAgICAgICAg ICAgdGhpcy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImxlZnQiKTsg Ly8gVXNlIGRlZmF1bHQgdmFsdWUgc2V0IGluIENTUy4KICAgICB9LAogCiAgICAgX3N5bmNTY3Jv bGw6IGZ1bmN0aW9uKCkKQEAgLTE0Miw5ICsxNDQsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdl ci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIC8vIEhhbmRsZSBob3Jpem9udGFsIHNjcm9s bCBiYXIgYXQgdGhlIGJvdHRvbSBvZiB0aGUgbWFpbiBwYW5lbC4KICAgICAgICAgICAgIGlmIChn dXR0ZXJFbGVtZW50Lm9mZnNldEhlaWdodCA+IG1haW5FbGVtZW50LmNsaWVudEhlaWdodCkKLSAg ICAgICAgICAgICAgICBndXR0ZXJFbGVtZW50LnN0eWxlLnBhZGRpbmdCb3R0b20gPSAoZ3V0dGVy RWxlbWVudC5vZmZzZXRIZWlnaHQgLSBtYWluRWxlbWVudC5jbGllbnRIZWlnaHQpICsgInB4IjsK KyAgICAgICAgICAgICAgICBndXR0ZXJFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJwYWRkaW5n LWJvdHRvbSIsIChndXR0ZXJFbGVtZW50Lm9mZnNldEhlaWdodCAtIG1haW5FbGVtZW50LmNsaWVu dEhlaWdodCkgKyAicHgiKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBndXR0 ZXJFbGVtZW50LnN0eWxlLnBhZGRpbmdCb3R0b20gPSAiIjsKKyAgICAgICAgICAgICAgICBndXR0 ZXJFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJwYWRkaW5nLWJvdHRvbSIpOwogCiAgICAg ICAgICAgICBndXR0ZXJFbGVtZW50LnNjcm9sbFRvcCA9IG1haW5FbGVtZW50LnNjcm9sbFRvcDsK ICAgICAgICAgfS5iaW5kKHRoaXMpLCAwKTsKQEAgLTE1Nyw3ICsxNTksMTEgQEAgV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBtYWluQ2h1bmsgPSB0 aGlzLl9tYWluUGFuZWwubWFrZUxpbmVBQ2h1bmsobGluZU51bWJlcik7CiAgICAgICAgIHZhciBn dXR0ZXJDaHVuayA9IHRoaXMuX2d1dHRlclBhbmVsLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIp OwotICAgICAgICBndXR0ZXJDaHVuay5lbGVtZW50LnN0eWxlLmhlaWdodCA9IG1haW5DaHVuay5l bGVtZW50Lm9mZnNldEhlaWdodCArICJweCI7CisgICAgICAgIHZhciBoZWlnaHQgPSBtYWluQ2h1 bmsuaGVpZ2h0OworICAgICAgICBpZiAoaGVpZ2h0KQorICAgICAgICAgICAgZ3V0dGVyQ2h1bmsu ZWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgiaGVpZ2h0IiwgaGVpZ2h0ICsgInB4Iik7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIGd1dHRlckNodW5rLmVsZW1lbnQuc3R5bGUucmVtb3ZlUHJv cGVydHkoImhlaWdodCIpOwogICAgIH0KIH0KIApAQCAtMzM4LDE3ICszNDQsMjggQEAgV2ViSW5z cGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAo dG9JbmRleCkKICAgICAgICAgICAgIHRoaXMuX2V4cGFuZENodW5rcyhmcm9tSW5kZXgsIHRvSW5k ZXgpOwogICAgIH0sCisKKyAgICBfdG90YWxIZWlnaHQ6IGZ1bmN0aW9uKGZpcnN0RWxlbWVudCwg bGFzdEVsZW1lbnQpCisgICAgeworICAgICAgICBsYXN0RWxlbWVudCA9IChsYXN0RWxlbWVudCB8 fCBmaXJzdEVsZW1lbnQpLm5leHRFbGVtZW50U2libGluZzsKKyAgICAgICAgaWYgKGxhc3RFbGVt ZW50KQorICAgICAgICAgICAgcmV0dXJuIGxhc3RFbGVtZW50Lm9mZnNldFRvcCAtIGZpcnN0RWxl bWVudC5vZmZzZXRUb3A7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldHVybiBmaXJzdEVs ZW1lbnQub2Zmc2V0UGFyZW50LnNjcm9sbEhlaWdodCAtIGZpcnN0RWxlbWVudC5vZmZzZXRUb3A7 CisgICAgfSwKICAgICAKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRo aXMuX3NjaGVkdWxlUmVwYWludEFsbCgpOworICAgICAgICB0aGlzLl9yZXBhaW50QWxsKCk7CiAg ICAgfQogfQogCi1XZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsID0gZnVuY3Rpb24o dGV4dE1vZGVsKQorV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbCA9IGZ1bmN0aW9u KHRleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyKQogewogICAgIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLmNhbGwodGhpcywgdGV4dE1vZGVsKTsKIAor ICAgIHRoaXMuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lciA9IHN5bmNEZWNvcmF0aW9u c0ZvckxpbmVMaXN0ZW5lcjsKKwogICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwogICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAidGV4dC1lZGl0b3It bGluZXMiOwogCkBAIC00NDEsNiArNDU4LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0 ZXJDaHVuay5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2V4cGFuZGVkID0gZXhwYW5kZWQ7 CiAKICAgICAgICAgaWYgKHRoaXMubGluZXNDb3VudCA9PT0gMSkgeworICAgICAgICAgICAgdGhp cy5fdGV4dFZpZXdlci5fc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyKHRoaXMuc3RhcnRM aW5lKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC00NzQsMTMgKzQ5Miw4 IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlID0gewogICAg IGdldCBoZWlnaHQoKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9leHBhbmRlZExpbmVSb3dz KQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuZWxlbWVudC5vZmZzZXRIZWlnaHQ7Ci0gICAgICAg IHZhciByZXN1bHQgPSAwOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4cGFu ZGVkTGluZVJvd3MubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIHZhciBsaW5lUm93ID0gdGhp cy5fZXhwYW5kZWRMaW5lUm93c1tpXTsKLSAgICAgICAgICAgIHJlc3VsdCArPSBsaW5lUm93Lm9m ZnNldEhlaWdodDsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICAg ICAgcmV0dXJuIHRoaXMuX3RleHRWaWV3ZXIuX3RvdGFsSGVpZ2h0KHRoaXMuZWxlbWVudCk7Cisg ICAgICAgIHJldHVybiB0aGlzLl90ZXh0Vmlld2VyLl90b3RhbEhlaWdodCh0aGlzLl9leHBhbmRl ZExpbmVSb3dzWzBdLCB0aGlzLl9leHBhbmRlZExpbmVSb3dzW3RoaXMuX2V4cGFuZGVkTGluZVJv d3MubGVuZ3RoIC0gMV0pOwogICAgIH0sCiAKICAgICBfY3JlYXRlUm93OiBmdW5jdGlvbihsaW5l TnVtYmVyKQpAQCAtOTkyLDEzICsxMDA1LDggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWlu Q2h1bmsucHJvdG90eXBlID0gewogICAgIGdldCBoZWlnaHQoKQogICAgIHsKICAgICAgICAgaWYg KCF0aGlzLl9leHBhbmRlZExpbmVSb3dzKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuZWxlbWVu dC5vZmZzZXRIZWlnaHQ7Ci0gICAgICAgIHZhciByZXN1bHQgPSAwOwotICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kpIHsKLSAgICAg ICAgICAgIHZhciBsaW5lUm93ID0gdGhpcy5fZXhwYW5kZWRMaW5lUm93c1tpXTsKLSAgICAgICAg ICAgIHJlc3VsdCArPSBsaW5lUm93Lm9mZnNldEhlaWdodDsKLSAgICAgICAgfQotICAgICAgICBy ZXR1cm4gcmVzdWx0OworICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRWaWV3ZXIuX3RvdGFs SGVpZ2h0KHRoaXMuZWxlbWVudCk7CisgICAgICAgIHJldHVybiB0aGlzLl90ZXh0Vmlld2VyLl90 b3RhbEhlaWdodCh0aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdLCB0aGlzLl9leHBhbmRlZExpbmVS b3dzW3RoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoIC0gMV0pOwogICAgIH0sCiAKICAgICBf Y3JlYXRlUm93OiBmdW5jdGlvbihsaW5lTnVtYmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2VyLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKaW5kZXggNTQ5NTdiOWEwZWZhMWViNDg2 OTQ5ODA5ZGUyM2U4MjUzZGM2YjM1MS4uZjZhYTY1ZWFhZDA2ZmQ3YTk4ZjhkYjEwYjE0MzY0OTVi M2VkOTAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90 ZXh0Vmlld2VyLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3Rl eHRWaWV3ZXIuY3NzCkBAIC0xMDYsNiArMTA2LDEwIEBACiAgICAgbWFyZ2luLXJpZ2h0OiAtMTBw eDsKIH0KIAorLndlYmtpdC1saW5lLWNvbnRlbnQgeworICAgIHBhZGRpbmctbGVmdDogMnB4Owor fQorCiAud2Via2l0LWJyZWFrcG9pbnQgLndlYmtpdC1saW5lLW51bWJlci1vdXRlciB7CiAgICAg Y29sb3I6IHdoaXRlOwogICAgIGJvcmRlci13aWR0aDogMCAxNHB4IDBweCAycHg7Cg== 81947 2011-02-10 03:40:58 -0800 2011-02-10 04:43:51 -0800 Patch bug-54098-20110210144055.patch text/plain 7419 aandrey ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNDdlNjQzYTJhMDBhYzZhMWYzYTdhM2IxYTcyMjMwYWM5NWE0ZDhiLi5i MTRmMzBlYzFjNDYwODQxNjg2ZTMwYzkyM2MxNWM4YTlhM2M3ODg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjAgQEAKKzIwMTEtMDItMDkgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtyZWdyZXNzaW9uXSBGaXggc3luY2luZyBoZWlnaHRzIG9mIHRoZSBndXR0 ZXIgYW5kIG1haW4gcGFuZWwgbGluZXMsIGFuZCBhZGQgMnB4IHBhZGRpbmctbGVmdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwOTgKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZS5fdXBkYXRlUGFuZWxPZmZzZXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyLnByb3RvdHlwZS5fc3luY0RlY29yYXRpb25zRm9yTGluZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVzaXplKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuc2V0IGV4cGFuZGVkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzOgorICAgICAgICAoLndlYmtp dC1saW5lLWNvbnRlbnQpOgorCiAyMDExLTAyLTA5ICBQZXRlciBWYXJnYSAgPHB2YXJnYUB3ZWJr aXQub3JnPgogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGV4dFZpZXdlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4 dFZpZXdlci5qcwppbmRleCA4NTMyOTRiZGU0MmYzN2ZiZWI5N2U2M2EwYTI2NTdjNWJiMThjNjlh Li41ZDhkMTJjOGIwZGM2ZGZkMWQyMDU0MjE2NGQxY2NiOGEyZWM2NzIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC0zNyw4ICsz NywxMCBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlciA9IGZ1bmN0aW9uKHRleHRNb2RlbCwgcGxh dGZvcm0sIHVybCkKICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQtZWRpdG9yIG1vbm9zcGFj ZSI7CiAKLSAgICB0aGlzLl9tYWluUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwodGhpcy5fdGV4dE1vZGVsLCB1cmwsIHRoaXMuX3N5bmNTY3JvbGwuYmluZCh0aGlz KSwgdGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZS5iaW5kKHRoaXMpKTsKLSAgICB0aGlzLl9n dXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsKHRoaXMu X3RleHRNb2RlbCk7CisgICAgdmFyIHN5bmNTY3JvbGxMaXN0ZW5lciA9IHRoaXMuX3N5bmNTY3Jv bGwuYmluZCh0aGlzKTsKKyAgICB2YXIgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyID0g dGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZS5iaW5kKHRoaXMpOworICAgIHRoaXMuX21haW5Q YW5lbCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbCh0aGlzLl90ZXh0TW9k ZWwsIHVybCwgc3luY1Njcm9sbExpc3RlbmVyLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVu ZXIpOworICAgIHRoaXMuX2d1dHRlclBhbmVsID0gbmV3IFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y R3V0dGVyUGFuZWwodGhpcy5fdGV4dE1vZGVsLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVu ZXIpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9tYWluUGFuZWwuZWxlbWVu dCk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2d1dHRlclBhbmVsLmVsZW1l bnQpOwogfQpAQCAtMTI4LDkgKzEzMCw5IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBsaW5lTnVtYmVyc1dpZHRoID0gdGhpcy5fZ3V0 dGVyUGFuZWwuZWxlbWVudC5vZmZzZXRXaWR0aDsKICAgICAgICAgaWYgKGxpbmVOdW1iZXJzV2lk dGgpCi0gICAgICAgICAgICB0aGlzLl9tYWluUGFuZWwuZWxlbWVudC5zdHlsZS5sZWZ0ID0gKGxp bmVOdW1iZXJzV2lkdGggKyAyKSArICJweCI7CisgICAgICAgICAgICB0aGlzLl9tYWluUGFuZWwu ZWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgibGVmdCIsIGxpbmVOdW1iZXJzV2lkdGggKyAicHgi KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5 bGUubGVmdCA9ICIiOyAvLyBVc2UgZGVmYXVsdCB2YWx1ZSBzZXQgaW4gQ1NTLgorICAgICAgICAg ICAgdGhpcy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImxlZnQiKTsg Ly8gVXNlIGRlZmF1bHQgdmFsdWUgc2V0IGluIENTUy4KICAgICB9LAogCiAgICAgX3N5bmNTY3Jv bGw6IGZ1bmN0aW9uKCkKQEAgLTE0Miw5ICsxNDQsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdl ci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIC8vIEhhbmRsZSBob3Jpem9udGFsIHNjcm9s bCBiYXIgYXQgdGhlIGJvdHRvbSBvZiB0aGUgbWFpbiBwYW5lbC4KICAgICAgICAgICAgIGlmIChn dXR0ZXJFbGVtZW50Lm9mZnNldEhlaWdodCA+IG1haW5FbGVtZW50LmNsaWVudEhlaWdodCkKLSAg ICAgICAgICAgICAgICBndXR0ZXJFbGVtZW50LnN0eWxlLnBhZGRpbmdCb3R0b20gPSAoZ3V0dGVy RWxlbWVudC5vZmZzZXRIZWlnaHQgLSBtYWluRWxlbWVudC5jbGllbnRIZWlnaHQpICsgInB4IjsK KyAgICAgICAgICAgICAgICBndXR0ZXJFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJwYWRkaW5n LWJvdHRvbSIsIChndXR0ZXJFbGVtZW50Lm9mZnNldEhlaWdodCAtIG1haW5FbGVtZW50LmNsaWVu dEhlaWdodCkgKyAicHgiKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBndXR0 ZXJFbGVtZW50LnN0eWxlLnBhZGRpbmdCb3R0b20gPSAiIjsKKyAgICAgICAgICAgICAgICBndXR0 ZXJFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJwYWRkaW5nLWJvdHRvbSIpOwogCiAgICAg ICAgICAgICBndXR0ZXJFbGVtZW50LnNjcm9sbFRvcCA9IG1haW5FbGVtZW50LnNjcm9sbFRvcDsK ICAgICAgICAgfS5iaW5kKHRoaXMpLCAwKTsKQEAgLTE1Nyw3ICsxNTksMTEgQEAgV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBtYWluQ2h1bmsgPSB0 aGlzLl9tYWluUGFuZWwubWFrZUxpbmVBQ2h1bmsobGluZU51bWJlcik7CiAgICAgICAgIHZhciBn dXR0ZXJDaHVuayA9IHRoaXMuX2d1dHRlclBhbmVsLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIp OwotICAgICAgICBndXR0ZXJDaHVuay5lbGVtZW50LnN0eWxlLmhlaWdodCA9IG1haW5DaHVuay5l bGVtZW50Lm9mZnNldEhlaWdodCArICJweCI7CisgICAgICAgIHZhciBoZWlnaHQgPSBtYWluQ2h1 bmsuaGVpZ2h0OworICAgICAgICBpZiAoaGVpZ2h0KQorICAgICAgICAgICAgZ3V0dGVyQ2h1bmsu ZWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgiaGVpZ2h0IiwgaGVpZ2h0ICsgInB4Iik7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIGd1dHRlckNodW5rLmVsZW1lbnQuc3R5bGUucmVtb3ZlUHJv cGVydHkoImhlaWdodCIpOwogICAgIH0KIH0KIApAQCAtMzM4LDE3ICszNDQsMjggQEAgV2ViSW5z cGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAo dG9JbmRleCkKICAgICAgICAgICAgIHRoaXMuX2V4cGFuZENodW5rcyhmcm9tSW5kZXgsIHRvSW5k ZXgpOwogICAgIH0sCisKKyAgICBfdG90YWxIZWlnaHQ6IGZ1bmN0aW9uKGZpcnN0RWxlbWVudCwg bGFzdEVsZW1lbnQpCisgICAgeworICAgICAgICBsYXN0RWxlbWVudCA9IChsYXN0RWxlbWVudCB8 fCBmaXJzdEVsZW1lbnQpLm5leHRFbGVtZW50U2libGluZzsKKyAgICAgICAgaWYgKGxhc3RFbGVt ZW50KQorICAgICAgICAgICAgcmV0dXJuIGxhc3RFbGVtZW50Lm9mZnNldFRvcCAtIGZpcnN0RWxl bWVudC5vZmZzZXRUb3A7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldHVybiBmaXJzdEVs ZW1lbnQub2Zmc2V0UGFyZW50LnNjcm9sbEhlaWdodCAtIGZpcnN0RWxlbWVudC5vZmZzZXRUb3A7 CisgICAgfSwKICAgICAKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRo aXMuX3NjaGVkdWxlUmVwYWludEFsbCgpOworICAgICAgICB0aGlzLl9yZXBhaW50QWxsKCk7CiAg ICAgfQogfQogCi1XZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsID0gZnVuY3Rpb24o dGV4dE1vZGVsKQorV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbCA9IGZ1bmN0aW9u KHRleHRNb2RlbCwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyKQogewogICAgIFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLmNhbGwodGhpcywgdGV4dE1vZGVsKTsKIAor ICAgIHRoaXMuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lciA9IHN5bmNEZWNvcmF0aW9u c0ZvckxpbmVMaXN0ZW5lcjsKKwogICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpOwogICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAidGV4dC1lZGl0b3It bGluZXMiOwogCkBAIC00MzUsMTQgKzQ1MiwxNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1 dHRlckNodW5rLnByb3RvdHlwZSA9IHsKIAogICAgIHNldCBleHBhbmRlZChleHBhbmRlZCkKICAg ICB7CisgICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEpCisgICAgICAgICAgICB0aGlz Ll90ZXh0Vmlld2VyLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIodGhpcy5zdGFydExp bmUpOworCiAgICAgICAgIGlmICh0aGlzLl9leHBhbmRlZCA9PT0gZXhwYW5kZWQpCiAgICAgICAg ICAgICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSBleHBhbmRlZDsKIAotICAg ICAgICBpZiAodGhpcy5saW5lc0NvdW50ID09PSAxKSB7CisgICAgICAgIGlmICh0aGlzLmxpbmVz Q291bnQgPT09IDEpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KIAogICAgICAgICBp ZiAoZXhwYW5kZWQpIHsKICAgICAgICAgICAgIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MgPSBbXTsK QEAgLTQ3NCwxMyArNDkzLDggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5w cm90b3R5cGUgPSB7CiAgICAgZ2V0IGhlaWdodCgpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMu X2V4cGFuZGVkTGluZVJvd3MpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50Lm9mZnNl dEhlaWdodDsKLSAgICAgICAgdmFyIHJlc3VsdCA9IDA7Ci0gICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAg dmFyIGxpbmVSb3cgPSB0aGlzLl9leHBhbmRlZExpbmVSb3dzW2ldOwotICAgICAgICAgICAgcmVz dWx0ICs9IGxpbmVSb3cub2Zmc2V0SGVpZ2h0OwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5fdGV4dFZpZXdlci5fdG90YWxIZWlnaHQo dGhpcy5lbGVtZW50KTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRWaWV3ZXIuX3RvdGFsSGVp Z2h0KHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbMF0sIHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbdGhp cy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGggLSAxXSk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVS b3c6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCkBAIC05OTIsMTMgKzEwMDYsOCBAQCBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1haW5DaHVuay5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IGhlaWdodCgpCiAg ICAgewogICAgICAgICBpZiAoIXRoaXMuX2V4cGFuZGVkTGluZVJvd3MpCi0gICAgICAgICAgICBy ZXR1cm4gdGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodDsKLSAgICAgICAgdmFyIHJlc3VsdCA9IDA7 Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5n dGg7ICsraSkgewotICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9leHBhbmRlZExpbmVS b3dzW2ldOwotICAgICAgICAgICAgcmVzdWx0ICs9IGxpbmVSb3cub2Zmc2V0SGVpZ2h0OwotICAg ICAgICB9Ci0gICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgICAgICByZXR1cm4gdGhpcy5f dGV4dFZpZXdlci5fdG90YWxIZWlnaHQodGhpcy5lbGVtZW50KTsKKyAgICAgICAgcmV0dXJuIHRo aXMuX3RleHRWaWV3ZXIuX3RvdGFsSGVpZ2h0KHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbMF0sIHRo aXMuX2V4cGFuZGVkTGluZVJvd3NbdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGggLSAxXSk7 CiAgICAgfSwKIAogICAgIF9jcmVhdGVSb3c6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2VyLmNzcwppbmRleCA1 NDk1N2I5YTBlZmExZWI0ODY5NDk4MDlkZTIzZTgyNTNkYzZiMzUxLi5mNmFhNjVlYWFkMDZmZDdh OThmOGRiMTBiMTQzNjQ5NWIzZWQ5MDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKQEAgLTEwNiw2ICsxMDYsMTAgQEAKICAgICBt YXJnaW4tcmlnaHQ6IC0xMHB4OwogfQogCisud2Via2l0LWxpbmUtY29udGVudCB7CisgICAgcGFk ZGluZy1sZWZ0OiAycHg7Cit9CisKIC53ZWJraXQtYnJlYWtwb2ludCAud2Via2l0LWxpbmUtbnVt YmVyLW91dGVyIHsKICAgICBjb2xvcjogd2hpdGU7CiAgICAgYm9yZGVyLXdpZHRoOiAwIDE0cHgg MHB4IDJweDsK 81951 2011-02-10 04:43:58 -0800 2011-02-10 05:15:21 -0800 Patch bug-54098-20110210154355.patch text/plain 7696 aandrey ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNzI4MDZiM2U5NmU2NDQ5MTkzMWU3OTZkNzZhOGVlODUwMTc5OGE3Li44 ZGU2NjZiZTg4ZWQ4NWFiNzcxZjcxMjhhMjk4MWE4NGMzM2I0OTVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjQgQEAKKzIwMTEtMDItMTAgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtyZWdyZXNzaW9uXSBGaXggc3luY2luZyBoZWlnaHRzIG9mIHRoZSBndXR0 ZXIgYW5kIG1haW4gcGFuZWwgbGluZXMsIGFuZCBhZGQgMnB4IHBhZGRpbmctbGVmdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwOTgKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZS5fdXBkYXRlUGFuZWxPZmZzZXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyLnByb3RvdHlwZS5fc3luY1Njcm9sbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZp ZXdlci5wcm90b3R5cGUuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLl90b3RhbEhlaWdodCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVz aXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuc2V0IGV4 cGFuZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJv dG90eXBlLmdldCBoZWlnaHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWlu Q2h1bmsucHJvdG90eXBlLmdldCBoZWlnaHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvdGV4dFZpZXdlci5jc3M6CisgICAgICAgICgud2Via2l0LWxpbmUtY29udGVudCk6CisKIDIw MTEtMDItMTAgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKaW5kZXggNjA4N2ExMTRhOWM2NzQ2NWNhNzNiYjhjNDIz MzViY2EyOGIyNWU5My4uZGQ5YTFmMmVmOTc4NjAxZDA0ZWRlYzYxNDU5ZWVkMGJiYTdjMTNlNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5q cwpAQCAtMzcsOCArMzcsMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIgPSBmdW5jdGlvbih0 ZXh0TW9kZWwsIHBsYXRmb3JtLCB1cmwpCiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJ0ZXh0LWVk aXRvciBtb25vc3BhY2UiOwogCi0gICAgdGhpcy5fbWFpblBhbmVsID0gbmV3IFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsKHRoaXMuX3RleHRNb2RlbCwgdXJsLCB0aGlzLl9zeW5jU2Ny b2xsLmJpbmQodGhpcyksIHRoaXMuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmUuYmluZCh0aGlzKSk7 Ci0gICAgdGhpcy5fZ3V0dGVyUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0 ZXJQYW5lbCh0aGlzLl90ZXh0TW9kZWwpOworICAgIHZhciBzeW5jU2Nyb2xsTGlzdGVuZXIgPSB0 aGlzLl9zeW5jU2Nyb2xsLmJpbmQodGhpcyk7CisgICAgdmFyIHN5bmNEZWNvcmF0aW9uc0Zvckxp bmVMaXN0ZW5lciA9IHRoaXMuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmUuYmluZCh0aGlzKTsKKyAg ICB0aGlzLl9tYWluUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwo dGhpcy5fdGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25z Rm9yTGluZUxpc3RlbmVyKTsKKyAgICB0aGlzLl9ndXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsKHRoaXMuX3RleHRNb2RlbCwgc3luY0RlY29yYXRpb25z Rm9yTGluZUxpc3RlbmVyKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbWFp blBhbmVsLmVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9ndXR0 ZXJQYW5lbC5lbGVtZW50KTsKIH0KQEAgLTE0OCw5ICsxNTAsOSBAQCBXZWJJbnNwZWN0b3IuVGV4 dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgbGluZU51bWJlcnNXaWR0 aCA9IHRoaXMuX2d1dHRlclBhbmVsLmVsZW1lbnQub2Zmc2V0V2lkdGg7CiAgICAgICAgIGlmIChs aW5lTnVtYmVyc1dpZHRoKQotICAgICAgICAgICAgdGhpcy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5 bGUubGVmdCA9IChsaW5lTnVtYmVyc1dpZHRoICsgMikgKyAicHgiOworICAgICAgICAgICAgdGhp cy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImxlZnQiLCBsaW5lTnVtYmVy c1dpZHRoICsgInB4Iik7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMuX21haW5QYW5l bC5lbGVtZW50LnN0eWxlLmxlZnQgPSAiIjsgLy8gVXNlIGRlZmF1bHQgdmFsdWUgc2V0IGluIENT Uy4KKyAgICAgICAgICAgIHRoaXMuX21haW5QYW5lbC5lbGVtZW50LnN0eWxlLnJlbW92ZVByb3Bl cnR5KCJsZWZ0Iik7IC8vIFVzZSBkZWZhdWx0IHZhbHVlIHNldCBpbiBDU1MuCiAgICAgfSwKIAog ICAgIF9zeW5jU2Nyb2xsOiBmdW5jdGlvbigpCkBAIC0xNjIsOSArMTY0LDkgQEAgV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICAvLyBIYW5kbGUgaG9y aXpvbnRhbCBzY3JvbGwgYmFyIGF0IHRoZSBib3R0b20gb2YgdGhlIG1haW4gcGFuZWwuCiAgICAg ICAgICAgICBpZiAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgPiBtYWluRWxlbWVudC5jbGll bnRIZWlnaHQpCi0gICAgICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5wYWRkaW5nQm90 dG9tID0gKGd1dHRlckVsZW1lbnQub2Zmc2V0SGVpZ2h0IC0gbWFpbkVsZW1lbnQuY2xpZW50SGVp Z2h0KSArICJweCI7CisgICAgICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5zZXRQcm9w ZXJ0eSgicGFkZGluZy1ib3R0b20iLCAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgLSBtYWlu RWxlbWVudC5jbGllbnRIZWlnaHQpICsgInB4Iik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5wYWRkaW5nQm90dG9tID0gIiI7CisgICAgICAg ICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgicGFkZGluZy1ib3R0 b20iKTsKIAogICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5zY3JvbGxUb3AgPSBtYWluRWxlbWVu dC5zY3JvbGxUb3A7CiAgICAgICAgIH0uYmluZCh0aGlzKSwgMCk7CkBAIC0xNzcsNyArMTc5LDEx IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIg bWFpbkNodW5rID0gdGhpcy5fbWFpblBhbmVsLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIpOwog ICAgICAgICB2YXIgZ3V0dGVyQ2h1bmsgPSB0aGlzLl9ndXR0ZXJQYW5lbC5tYWtlTGluZUFDaHVu ayhsaW5lTnVtYmVyKTsKLSAgICAgICAgZ3V0dGVyQ2h1bmsuZWxlbWVudC5zdHlsZS5oZWlnaHQg PSBtYWluQ2h1bmsuZWxlbWVudC5vZmZzZXRIZWlnaHQgKyAicHgiOworICAgICAgICB2YXIgaGVp Z2h0ID0gbWFpbkNodW5rLmhlaWdodDsKKyAgICAgICAgaWYgKGhlaWdodCkKKyAgICAgICAgICAg IGd1dHRlckNodW5rLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImhlaWdodCIsIGhlaWdodCAr ICJweCIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBndXR0ZXJDaHVuay5lbGVtZW50LnN0 eWxlLnJlbW92ZVByb3BlcnR5KCJoZWlnaHQiKTsKICAgICB9CiB9CiAKQEAgLTM1OSwxNiArMzY1 LDI3IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMuX2V4cGFuZENodW5rcyhmcm9tSW5kZXgsIHRvSW5kZXgpOwogICAg IH0sCiAKKyAgICBfdG90YWxIZWlnaHQ6IGZ1bmN0aW9uKGZpcnN0RWxlbWVudCwgbGFzdEVsZW1l bnQpCisgICAgeworICAgICAgICBsYXN0RWxlbWVudCA9IChsYXN0RWxlbWVudCB8fCBmaXJzdEVs ZW1lbnQpLm5leHRFbGVtZW50U2libGluZzsKKyAgICAgICAgaWYgKGxhc3RFbGVtZW50KQorICAg ICAgICAgICAgcmV0dXJuIGxhc3RFbGVtZW50Lm9mZnNldFRvcCAtIGZpcnN0RWxlbWVudC5vZmZz ZXRUb3A7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldHVybiBmaXJzdEVsZW1lbnQub2Zm c2V0UGFyZW50LnNjcm9sbEhlaWdodCAtIGZpcnN0RWxlbWVudC5vZmZzZXRUb3A7CisgICAgfSwK KyAgICAKICAgICByZXNpemU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3NjaGVk dWxlUmVwYWludEFsbCgpOworICAgICAgICB0aGlzLl9yZXBhaW50QWxsKCk7CiAgICAgfQogfQog Ci1XZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsID0gZnVuY3Rpb24odGV4dE1vZGVs KQorV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJQYW5lbCA9IGZ1bmN0aW9uKHRleHRNb2Rl bCwgc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyKQogewogICAgIFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLmNhbGwodGhpcywgdGV4dE1vZGVsKTsKIAorICAgIHRoaXMu X3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lciA9IHN5bmNEZWNvcmF0aW9uc0ZvckxpbmVM aXN0ZW5lcjsKKwogICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwogICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAidGV4dC1lZGl0b3ItbGluZXMiOwog CkBAIC00NTUsMTQgKzQ3MiwxNiBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlckNodW5r LnByb3RvdHlwZSA9IHsKIAogICAgIHNldCBleHBhbmRlZChleHBhbmRlZCkKICAgICB7CisgICAg ICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEpCisgICAgICAgICAgICB0aGlzLl90ZXh0Vmll d2VyLl9zeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIodGhpcy5zdGFydExpbmUpOworCiAg ICAgICAgIGlmICh0aGlzLl9leHBhbmRlZCA9PT0gZXhwYW5kZWQpCiAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSBleHBhbmRlZDsKIAotICAgICAgICBpZiAo dGhpcy5saW5lc0NvdW50ID09PSAxKSB7CisgICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09 IDEpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KIAogICAgICAgICBpZiAoZXhwYW5k ZWQpIHsKICAgICAgICAgICAgIHRoaXMuX2V4cGFuZGVkTGluZVJvd3MgPSBbXTsKQEAgLTQ5NCwx MyArNTEzLDggQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUg PSB7CiAgICAgZ2V0IGhlaWdodCgpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2V4cGFuZGVk TGluZVJvd3MpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodDsK LSAgICAgICAgdmFyIHJlc3VsdCA9IDA7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhp cy5fZXhwYW5kZWRMaW5lUm93cy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIGxpbmVS b3cgPSB0aGlzLl9leHBhbmRlZExpbmVSb3dzW2ldOwotICAgICAgICAgICAgcmVzdWx0ICs9IGxp bmVSb3cub2Zmc2V0SGVpZ2h0OwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiByZXN1bHQ7Cisg ICAgICAgICAgICByZXR1cm4gdGhpcy5fdGV4dFZpZXdlci5fdG90YWxIZWlnaHQodGhpcy5lbGVt ZW50KTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRWaWV3ZXIuX3RvdGFsSGVpZ2h0KHRoaXMu X2V4cGFuZGVkTGluZVJvd3NbMF0sIHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbdGhpcy5fZXhwYW5k ZWRMaW5lUm93cy5sZW5ndGggLSAxXSk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVSb3c6IGZ1bmN0 aW9uKGxpbmVOdW1iZXIpCkBAIC0xMDEyLDEzICsxMDI2LDggQEAgV2ViSW5zcGVjdG9yLlRleHRF ZGl0b3JNYWluQ2h1bmsucHJvdG90eXBlID0gewogICAgIGdldCBoZWlnaHQoKQogICAgIHsKICAg ICAgICAgaWYgKCF0aGlzLl9leHBhbmRlZExpbmVSb3dzKQotICAgICAgICAgICAgcmV0dXJuIHRo aXMuZWxlbWVudC5vZmZzZXRIZWlnaHQ7Ci0gICAgICAgIHZhciByZXN1bHQgPSAwOwotICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoOyArK2kp IHsKLSAgICAgICAgICAgIHZhciBsaW5lUm93ID0gdGhpcy5fZXhwYW5kZWRMaW5lUm93c1tpXTsK LSAgICAgICAgICAgIHJlc3VsdCArPSBsaW5lUm93Lm9mZnNldEhlaWdodDsKLSAgICAgICAgfQot ICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3RleHRWaWV3 ZXIuX3RvdGFsSGVpZ2h0KHRoaXMuZWxlbWVudCk7CisgICAgICAgIHJldHVybiB0aGlzLl90ZXh0 Vmlld2VyLl90b3RhbEhlaWdodCh0aGlzLl9leHBhbmRlZExpbmVSb3dzWzBdLCB0aGlzLl9leHBh bmRlZExpbmVSb3dzW3RoaXMuX2V4cGFuZGVkTGluZVJvd3MubGVuZ3RoIC0gMV0pOwogICAgIH0s CiAKICAgICBfY3JlYXRlUm93OiBmdW5jdGlvbihsaW5lTnVtYmVyKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2VyLmNzcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKaW5kZXggNTQ5NTdiOWEw ZWZhMWViNDg2OTQ5ODA5ZGUyM2U4MjUzZGM2YjM1MS4uZjZhYTY1ZWFhZDA2ZmQ3YTk4ZjhkYjEw YjE0MzY0OTViM2VkOTAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC90ZXh0Vmlld2VyLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL3RleHRWaWV3ZXIuY3NzCkBAIC0xMDYsNiArMTA2LDEwIEBACiAgICAgbWFyZ2luLXJp Z2h0OiAtMTBweDsKIH0KIAorLndlYmtpdC1saW5lLWNvbnRlbnQgeworICAgIHBhZGRpbmctbGVm dDogMnB4OworfQorCiAud2Via2l0LWJyZWFrcG9pbnQgLndlYmtpdC1saW5lLW51bWJlci1vdXRl ciB7CiAgICAgY29sb3I6IHdoaXRlOwogICAgIGJvcmRlci13aWR0aDogMCAxNHB4IDBweCAycHg7 Cg== 81954 2011-02-10 05:15:27 -0800 2011-02-10 05:41:11 -0800 Patch bug-54098-20110210161525.patch text/plain 7770 aandrey ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNzI4MDZiM2U5NmU2NDQ5MTkzMWU3OTZkNzZhOGVlODUwMTc5OGE3Li44 ZGU2NjZiZTg4ZWQ4NWFiNzcxZjcxMjhhMjk4MWE4NGMzM2I0OTVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjQgQEAKKzIwMTEtMDItMTAgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtyZWdyZXNzaW9uXSBGaXggc3luY2luZyBoZWlnaHRzIG9mIHRoZSBndXR0 ZXIgYW5kIG1haW4gcGFuZWwgbGluZXMsIGFuZCBhZGQgMnB4IHBhZGRpbmctbGVmdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQwOTgKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UZXh0Vmlld2VyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3Rv dHlwZS5fdXBkYXRlUGFuZWxPZmZzZXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmll d2VyLnByb3RvdHlwZS5fc3luY1Njcm9sbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZp ZXdlci5wcm90b3R5cGUuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwucHJvdG90eXBlLl90b3RhbEhlaWdodCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckNodW5rZWRQYW5lbC5wcm90b3R5cGUucmVz aXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0ZXJDaHVuay5wcm90b3R5cGUuc2V0IGV4 cGFuZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyQ2h1bmsucHJv dG90eXBlLmdldCBoZWlnaHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWlu Q2h1bmsucHJvdG90eXBlLmdldCBoZWlnaHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvdGV4dFZpZXdlci5jc3M6CisgICAgICAgICgud2Via2l0LWxpbmUtY29udGVudCk6CisKIDIw MTEtMDItMTAgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKaW5kZXggNjA4N2ExMTRhOWM2NzQ2NWNhNzNiYjhjNDIz MzViY2EyOGIyNWU5My4uY2U2NTAyZDQ0Y2VlZDFlZWIwMWVlMGNkYmFlMmU5NDY1MThhYTRkMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5q cwpAQCAtMzcsOCArMzcsMTAgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIgPSBmdW5jdGlvbih0 ZXh0TW9kZWwsIHBsYXRmb3JtLCB1cmwpCiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJ0ZXh0LWVk aXRvciBtb25vc3BhY2UiOwogCi0gICAgdGhpcy5fbWFpblBhbmVsID0gbmV3IFdlYkluc3BlY3Rv ci5UZXh0RWRpdG9yTWFpblBhbmVsKHRoaXMuX3RleHRNb2RlbCwgdXJsLCB0aGlzLl9zeW5jU2Ny b2xsLmJpbmQodGhpcyksIHRoaXMuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmUuYmluZCh0aGlzKSk7 Ci0gICAgdGhpcy5fZ3V0dGVyUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JHdXR0 ZXJQYW5lbCh0aGlzLl90ZXh0TW9kZWwpOworICAgIHZhciBzeW5jU2Nyb2xsTGlzdGVuZXIgPSB0 aGlzLl9zeW5jU2Nyb2xsLmJpbmQodGhpcyk7CisgICAgdmFyIHN5bmNEZWNvcmF0aW9uc0Zvckxp bmVMaXN0ZW5lciA9IHRoaXMuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmUuYmluZCh0aGlzKTsKKyAg ICB0aGlzLl9tYWluUGFuZWwgPSBuZXcgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwo dGhpcy5fdGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwgc3luY0RlY29yYXRpb25z Rm9yTGluZUxpc3RlbmVyKTsKKyAgICB0aGlzLl9ndXR0ZXJQYW5lbCA9IG5ldyBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsKHRoaXMuX3RleHRNb2RlbCwgc3luY0RlY29yYXRpb25z Rm9yTGluZUxpc3RlbmVyKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbWFp blBhbmVsLmVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9ndXR0 ZXJQYW5lbC5lbGVtZW50KTsKIH0KQEAgLTE0OCw5ICsxNTAsOSBAQCBXZWJJbnNwZWN0b3IuVGV4 dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB2YXIgbGluZU51bWJlcnNXaWR0 aCA9IHRoaXMuX2d1dHRlclBhbmVsLmVsZW1lbnQub2Zmc2V0V2lkdGg7CiAgICAgICAgIGlmIChs aW5lTnVtYmVyc1dpZHRoKQotICAgICAgICAgICAgdGhpcy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5 bGUubGVmdCA9IChsaW5lTnVtYmVyc1dpZHRoICsgMikgKyAicHgiOworICAgICAgICAgICAgdGhp cy5fbWFpblBhbmVsLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImxlZnQiLCBsaW5lTnVtYmVy c1dpZHRoICsgInB4Iik7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMuX21haW5QYW5l bC5lbGVtZW50LnN0eWxlLmxlZnQgPSAiIjsgLy8gVXNlIGRlZmF1bHQgdmFsdWUgc2V0IGluIENT Uy4KKyAgICAgICAgICAgIHRoaXMuX21haW5QYW5lbC5lbGVtZW50LnN0eWxlLnJlbW92ZVByb3Bl cnR5KCJsZWZ0Iik7IC8vIFVzZSBkZWZhdWx0IHZhbHVlIHNldCBpbiBDU1MuCiAgICAgfSwKIAog ICAgIF9zeW5jU2Nyb2xsOiBmdW5jdGlvbigpCkBAIC0xNjIsOSArMTY0LDkgQEAgV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICAvLyBIYW5kbGUgaG9y aXpvbnRhbCBzY3JvbGwgYmFyIGF0IHRoZSBib3R0b20gb2YgdGhlIG1haW4gcGFuZWwuCiAgICAg ICAgICAgICBpZiAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgPiBtYWluRWxlbWVudC5jbGll bnRIZWlnaHQpCi0gICAgICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5wYWRkaW5nQm90 dG9tID0gKGd1dHRlckVsZW1lbnQub2Zmc2V0SGVpZ2h0IC0gbWFpbkVsZW1lbnQuY2xpZW50SGVp Z2h0KSArICJweCI7CisgICAgICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5zZXRQcm9w ZXJ0eSgicGFkZGluZy1ib3R0b20iLCAoZ3V0dGVyRWxlbWVudC5vZmZzZXRIZWlnaHQgLSBtYWlu RWxlbWVudC5jbGllbnRIZWlnaHQpICsgInB4Iik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5wYWRkaW5nQm90dG9tID0gIiI7CisgICAgICAg ICAgICAgICAgZ3V0dGVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgicGFkZGluZy1ib3R0 b20iKTsKIAogICAgICAgICAgICAgZ3V0dGVyRWxlbWVudC5zY3JvbGxUb3AgPSBtYWluRWxlbWVu dC5zY3JvbGxUb3A7CiAgICAgICAgIH0uYmluZCh0aGlzKSwgMCk7CkBAIC0xNzcsNyArMTc5LDEx IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIg bWFpbkNodW5rID0gdGhpcy5fbWFpblBhbmVsLm1ha2VMaW5lQUNodW5rKGxpbmVOdW1iZXIpOwog ICAgICAgICB2YXIgZ3V0dGVyQ2h1bmsgPSB0aGlzLl9ndXR0ZXJQYW5lbC5tYWtlTGluZUFDaHVu ayhsaW5lTnVtYmVyKTsKLSAgICAgICAgZ3V0dGVyQ2h1bmsuZWxlbWVudC5zdHlsZS5oZWlnaHQg PSBtYWluQ2h1bmsuZWxlbWVudC5vZmZzZXRIZWlnaHQgKyAicHgiOworICAgICAgICB2YXIgaGVp Z2h0ID0gbWFpbkNodW5rLmhlaWdodDsKKyAgICAgICAgaWYgKGhlaWdodCkKKyAgICAgICAgICAg IGd1dHRlckNodW5rLmVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImhlaWdodCIsIGhlaWdodCAr ICJweCIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBndXR0ZXJDaHVuay5lbGVtZW50LnN0 eWxlLnJlbW92ZVByb3BlcnR5KCJoZWlnaHQiKTsKICAgICB9CiB9CiAKQEAgLTM1OSwxNiArMzY1 LDI4IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yQ2h1bmtlZFBhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHRoaXMuX2V4cGFuZENodW5rcyhmcm9tSW5kZXgsIHRvSW5kZXgpOwogICAg IH0sCiAKKyAgICBfdG90YWxIZWlnaHQ6IGZ1bmN0aW9uKGZpcnN0RWxlbWVudCwgbGFzdEVsZW1l bnQpCisgICAgeworICAgICAgICBsYXN0RWxlbWVudCA9IChsYXN0RWxlbWVudCB8fCBmaXJzdEVs ZW1lbnQpLm5leHRFbGVtZW50U2libGluZzsKKyAgICAgICAgaWYgKGxhc3RFbGVtZW50KQorICAg ICAgICAgICAgcmV0dXJuIGxhc3RFbGVtZW50Lm9mZnNldFRvcCAtIGZpcnN0RWxlbWVudC5vZmZz ZXRUb3A7CisgICAgICAgIGVsc2UgaWYgKGZpcnN0RWxlbWVudC5vZmZzZXRQYXJlbnQpCisgICAg ICAgICAgICByZXR1cm4gZmlyc3RFbGVtZW50Lm9mZnNldFBhcmVudC5zY3JvbGxIZWlnaHQgLSBm aXJzdEVsZW1lbnQub2Zmc2V0VG9wOworICAgICAgICByZXR1cm4gZmlyc3RFbGVtZW50Lm9mZnNl dEhlaWdodDsKKyAgICB9LAorICAgIAogICAgIHJlc2l6ZTogZnVuY3Rpb24oKQogICAgIHsKLSAg ICAgICAgdGhpcy5fc2NoZWR1bGVSZXBhaW50QWxsKCk7CisgICAgICAgIHRoaXMuX3JlcGFpbnRB bGwoKTsKICAgICB9CiB9CiAKLVdlYkluc3BlY3Rvci5UZXh0RWRpdG9yR3V0dGVyUGFuZWwgPSBm dW5jdGlvbih0ZXh0TW9kZWwpCitXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRlclBhbmVsID0g ZnVuY3Rpb24odGV4dE1vZGVsLCBzeW5jRGVjb3JhdGlvbnNGb3JMaW5lTGlzdGVuZXIpCiB7CiAg ICAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JDaHVua2VkUGFuZWwuY2FsbCh0aGlzLCB0ZXh0TW9k ZWwpOwogCisgICAgdGhpcy5fc3luY0RlY29yYXRpb25zRm9yTGluZUxpc3RlbmVyID0gc3luY0Rl Y29yYXRpb25zRm9yTGluZUxpc3RlbmVyOworCiAgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJ0ZXh0 LWVkaXRvci1saW5lcyI7CiAKQEAgLTQ1NSwxNCArNDczLDE2IEBAIFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yR3V0dGVyQ2h1bmsucHJvdG90eXBlID0gewogCiAgICAgc2V0IGV4cGFuZGVkKGV4cGFu ZGVkKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMubGluZXNDb3VudCA9PT0gMSkKKyAgICAgICAg ICAgIHRoaXMuX3RleHRWaWV3ZXIuX3N5bmNEZWNvcmF0aW9uc0ZvckxpbmVMaXN0ZW5lcih0aGlz LnN0YXJ0TGluZSk7CisKICAgICAgICAgaWYgKHRoaXMuX2V4cGFuZGVkID09PSBleHBhbmRlZCkK ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlzLl9leHBhbmRlZCA9IGV4cGFuZGVk OwogCi0gICAgICAgIGlmICh0aGlzLmxpbmVzQ291bnQgPT09IDEpIHsKKyAgICAgICAgaWYgKHRo aXMubGluZXNDb3VudCA9PT0gMSkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQogCiAg ICAgICAgIGlmIChleHBhbmRlZCkgewogICAgICAgICAgICAgdGhpcy5fZXhwYW5kZWRMaW5lUm93 cyA9IFtdOwpAQCAtNDk0LDEzICs1MTQsOCBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvckd1dHRl ckNodW5rLnByb3RvdHlwZSA9IHsKICAgICBnZXQgaGVpZ2h0KCkKICAgICB7CiAgICAgICAgIGlm ICghdGhpcy5fZXhwYW5kZWRMaW5lUm93cykKLSAgICAgICAgICAgIHJldHVybiB0aGlzLmVsZW1l bnQub2Zmc2V0SGVpZ2h0OwotICAgICAgICB2YXIgcmVzdWx0ID0gMDsKLSAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCB0aGlzLl9leHBhbmRlZExpbmVSb3dzLmxlbmd0aDsgKytpKSB7Ci0gICAg ICAgICAgICB2YXIgbGluZVJvdyA9IHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbaV07Ci0gICAgICAg ICAgICByZXN1bHQgKz0gbGluZVJvdy5vZmZzZXRIZWlnaHQ7Ci0gICAgICAgIH0KLSAgICAgICAg cmV0dXJuIHJlc3VsdDsKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl90ZXh0Vmlld2VyLl90b3Rh bEhlaWdodCh0aGlzLmVsZW1lbnQpOworICAgICAgICByZXR1cm4gdGhpcy5fdGV4dFZpZXdlci5f dG90YWxIZWlnaHQodGhpcy5fZXhwYW5kZWRMaW5lUm93c1swXSwgdGhpcy5fZXhwYW5kZWRMaW5l Um93c1t0aGlzLl9leHBhbmRlZExpbmVSb3dzLmxlbmd0aCAtIDFdKTsKICAgICB9LAogCiAgICAg X2NyZWF0ZVJvdzogZnVuY3Rpb24obGluZU51bWJlcikKQEAgLTEwMTIsMTMgKzEwMjcsOCBAQCBX ZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5DaHVuay5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IGhl aWdodCgpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2V4cGFuZGVkTGluZVJvd3MpCi0gICAg ICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50Lm9mZnNldEhlaWdodDsKLSAgICAgICAgdmFyIHJl c3VsdCA9IDA7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fZXhwYW5kZWRMaW5l Um93cy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFyIGxpbmVSb3cgPSB0aGlzLl9leHBh bmRlZExpbmVSb3dzW2ldOwotICAgICAgICAgICAgcmVzdWx0ICs9IGxpbmVSb3cub2Zmc2V0SGVp Z2h0OwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgICAgICByZXR1 cm4gdGhpcy5fdGV4dFZpZXdlci5fdG90YWxIZWlnaHQodGhpcy5lbGVtZW50KTsKKyAgICAgICAg cmV0dXJuIHRoaXMuX3RleHRWaWV3ZXIuX3RvdGFsSGVpZ2h0KHRoaXMuX2V4cGFuZGVkTGluZVJv d3NbMF0sIHRoaXMuX2V4cGFuZGVkTGluZVJvd3NbdGhpcy5fZXhwYW5kZWRMaW5lUm93cy5sZW5n dGggLSAxXSk7CiAgICAgfSwKIAogICAgIF9jcmVhdGVSb3c6IGZ1bmN0aW9uKGxpbmVOdW1iZXIp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3 ZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2VyLmNz cwppbmRleCA1NDk1N2I5YTBlZmExZWI0ODY5NDk4MDlkZTIzZTgyNTNkYzZiMzUxLi5mNmFhNjVl YWFkMDZmZDdhOThmOGRiMTBiMTQzNjQ5NWIzZWQ5MDM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKQEAgLTEwNiw2ICsxMDYsMTAg QEAKICAgICBtYXJnaW4tcmlnaHQ6IC0xMHB4OwogfQogCisud2Via2l0LWxpbmUtY29udGVudCB7 CisgICAgcGFkZGluZy1sZWZ0OiAycHg7Cit9CisKIC53ZWJraXQtYnJlYWtwb2ludCAud2Via2l0 LWxpbmUtbnVtYmVyLW91dGVyIHsKICAgICBjb2xvcjogd2hpdGU7CiAgICAgYm9yZGVyLXdpZHRo OiAwIDE0cHggMHB4IDJweDsK