82475 2012-03-28 09:58:23 -0700 Web Inspector: Add context menu for snippets control. 2012-03-28 11:14:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 590064 0 vsevik 2012-03-28 09:58:23 -0700 This is a preliminary implementation of snippets control. We might want to add a more visual one before taking snippets out of experiments. 590070 1 134322 vsevik 2012-03-28 10:05:03 -0700 Created attachment 134322 Patch 590072 2 134322 pfeldman 2012-03-28 10:08:14 -0700 Comment on attachment 134322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134322&action=review > Source/WebCore/ChangeLog:8 > + * English.lproj/localizedStrings.js: Please explain what is happening in the change. > Source/WebCore/inspector/front-end/ScriptsNavigator.js:296 > + Blank line. > Source/WebCore/inspector/front-end/ScriptsNavigator.js:304 > + event.preventDefault(); ContextMenu.show consumes event for you. 590073 3 134323 vsevik 2012-03-28 10:08:52 -0700 Created attachment 134323 Patch 590077 4 134324 vsevik 2012-03-28 10:10:38 -0700 Created attachment 134324 Patch 590085 5 134324 pfeldman 2012-03-28 10:16:50 -0700 Comment on attachment 134324 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134324&action=review > Source/WebCore/ChangeLog:9 > + We might want to add a more visual one before taking snippets out of experiments. a more discoverable one? 590165 6 vsevik 2012-03-28 11:14:05 -0700 Committed r112414: <http://trac.webkit.org/changeset/112414> 134322 2012-03-28 10:05:03 -0700 2012-03-28 10:08:45 -0700 Patch bug-82475-20120328210501.patch text/plain 7745 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk5ZjYwYmQ1ZGRjYzA1 NzU0NjRhMzM2ODY2ZjJmOWY5Y2M1MjU4OS4uMDAyY2RmYWVlYTVmZDJjYjE2Y2JiYjFiYzkzZTVk OWExNzVmMjQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEyLTAzLTI4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBjb250ZXh0IG1lbnUgZm9yIHNuaXBwZXRzIGNvbnRyb2wuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmln YXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlw ZS5fc2hvd1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUuX2NyZWF0ZVNuaXBwZXRzVHJlZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUuX2hhbmRsZVNuaXBw ZXRDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLnByb3RvdHlwZS5fc2hvd1NuaXBwZXRDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUuX2hhbmRsZUV2YWx1YXRlU25pcHBldCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90b3R5cGUuX2hhbmRs ZVJlbmFtZVNuaXBwZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu cHJvdG90eXBlLl9oYW5kbGVSZW1vdmVTbmlwcGV0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5faGFuZGxlQ3JlYXRlU25pcHBldCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlLmdldCBu YXZpZ2F0b3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVt ZW50LnByb3RvdHlwZS5vbmF0dGFjaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9y U2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZW50ZXIpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVtZW50LnByb3RvdHlwZS5faGFuZGxlQ29udGV4dE1l bnVFdmVudCk6CisKKzIwMTItMDMtMjggIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1 bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU2NyaXB0c05hdmlnYXRvciBzaG91bGQg c2F2ZSBzY3JvbGwgcG9zaXRpb24gd2hlbiBzd2l0Y2hpbmcgdGFicy4KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNDcyCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9X ZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA0MmY4ZTE0N2Y2 NDc0MjRiYmQ3ZTk2MGE5MGM5Yjg0MGEzNGE5NGU2Li41NzY3NTU2YjhmMjQyNmNiZTgzZDAyNjg5 MjUxMDEzOGU5ZmYzYmMzIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDQzNQp6Y21hRiVr PiVNQm1XQ35pJm56YXQkeVN9N1l0QVVadEg0bXFrakllOFB5bUZmbGtLN3V4c213XihUM0NHbF5G VEIKemdIYVNJYkhjU3VhP19uJEtaVlVZa3MrNU1sPng7eGg3dHhQaEZHQU9FZjZhKTFPZXNxN19n e0FIdi04bnloYjNZCnowfnMtWUc5UVpEX2Yze1g9RUlhQT42IzJ1ZzJWP1phZGMpVjA9aEYxWGZi fUA7OFhgUiMxbUIjJHAkcTQ7OCRuTwpHenkkelVwa1poTAoKZGVsdGEgMTEKU2NtYUYlZ1hQJnJt V0N+aSZueTVhX1haSUYKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKaW5kZXggZjYxYzFjMjlhNWFhYzhjN2FlNjQzODhk ZTVlZGMwYjc0ZDJkNTM5Mi4uZTliMmY0MzViYTdhZjkzOTJhYTM0NTQzZWM0MjM3M2YyNThkNWU0 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz TmF2aWdhdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c05hdmlnYXRvci5qcwpAQCAtMjI1LDcgKzIyNSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz TmF2aWdhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbGFzdFNlbGVjdGVkVUlTb3Vy Y2VDb2RlID0gdWlTb3VyY2VDb2RlOwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLkZpbGVTZWxlY3Rvci5FdmVudHMuRmlsZVNl bGVjdGVkLCB1aVNvdXJjZUNvZGUpOwogICAgIH0sCi0gICAgCisKICAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqLwpA QCAtMjQ1LDcgKzI0NSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlw ZSA9IHsKICAgICAgICAgfQogICAgICAgICB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291 cmNlQ29kZS5yZW1vdmUodWlTb3VyY2VDb2RlKTsKICAgICB9LAotICAgIAorCiAgICAgX3Nob3dT Y3JpcHRGb2xkZXJzU2V0dGluZ0NoYW5nZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZh ciB1aVNvdXJjZUNvZGVzID0gdGhpcy5fc2NyaXB0c1RyZWUuc2NyaXB0VHJlZUVsZW1lbnRzKCk7 CkBAIC0yNTQsMTcgKzI1NCwxOCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvci5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB1aVNvdXJjZUNvZGVzLmxl bmd0aDsgKytpKQogICAgICAgICAgICAgdGhpcy5hZGRVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2Rl c1tpXSk7Ci0gICAgICAgIAorCiAgICAgICAgIGlmICh0aGlzLl9sYXN0U2VsZWN0ZWRVSVNvdXJj ZUNvZGUpCiAgICAgICAgICAgICB0aGlzLnJldmVhbFVJU291cmNlQ29kZSh0aGlzLl9sYXN0U2Vs ZWN0ZWRVSVNvdXJjZUNvZGUpOwogICAgIH0sCi0gICAgCisKICAgICBfY3JlYXRlU25pcHBldHNU cmVlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgc25pcHBldHNUcmVlRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgICAgIHZhciBzbmlwcGV0c1ZpZXcg PSBuZXcgV2ViSW5zcGVjdG9yLlZpZXcoKTsKICAgICAgICAgc25pcHBldHNWaWV3LmVsZW1lbnQu YWRkU3R5bGVDbGFzcygiZmlsbCIpOwogICAgICAgICBzbmlwcGV0c1ZpZXcuZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJuYXZpZ2F0b3ItY29udGFpbmVyIik7CisgICAgICAgIHNuaXBwZXRzVmlldy5l bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5faGFuZGxlU25pcHBl dENvbnRleHRNZW51RXZlbnQuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgICAgICB2YXIgc25pcHBl dHNPdXRsaW5lRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAg ICBzbmlwcGV0c091dGxpbmVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoIm91dGxpbmUtZGlzY2xvc3Vy ZSIpOwogICAgICAgICBzbmlwcGV0c091dGxpbmVFbGVtZW50LmFkZFN0eWxlQ2xhc3MoIm5hdmln YXRvciIpOwpAQCAtMjc2LDYgKzI3Nyw2OCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRv ci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBzbmlwcGV0c1RyZWU7CiAgICAgfSwKIAor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hhbmRs ZVNuaXBwZXRDb250ZXh0TWVudUV2ZW50OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAg IHRoaXMuX3Nob3dTbmlwcGV0Q29udGV4dE1lbnUoZXZlbnQpOworICAgIH0sCisKKyAgICAvKioK KyAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZT19IHVpU291cmNlQ29kZQorICAgICAqLworICAgIF9zaG93U25pcHBldENv bnRleHRNZW51OiBmdW5jdGlvbihldmVudCwgdWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAg dmFyIGNvbnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOworICAgICAg ICBpZiAodWlTb3VyY2VDb2RlKSB7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGNvbnRleHRN ZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dl ckNhc2VNZW51VGl0bGVzKCkgPyAiRXZhbHVhdGUgc25pcHBldCIgOiAiRXZhbHVhdGUgU25pcHBl dCIpLCB0aGlzLl9oYW5kbGVFdmFsdWF0ZVNuaXBwZXQuYmluZCh0aGlzLCB1aVNvdXJjZUNvZGUp KTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiUmVuYW1lIHNuaXBw ZXQiIDogIlJlbmFtZSBTbmlwcGV0IiksIHRoaXMuX2hhbmRsZVJlbmFtZVNuaXBwZXQuYmluZCh0 aGlzLCB1aVNvdXJjZUNvZGUpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVz KCkgPyAiUmVtb3ZlIHNuaXBwZXQiIDogIlJlbW92ZSBTbmlwcGV0IiksIHRoaXMuX2hhbmRsZVJl bW92ZVNuaXBwZXQuYmluZCh0aGlzLCB1aVNvdXJjZUNvZGUpKTsKKyAgICAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOworICAgICAgICB9CisgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNh c2VNZW51VGl0bGVzKCkgPyAiQ3JlYXRlIHNuaXBwZXQiIDogIkNyZWF0ZSBTbmlwcGV0IiksIHRo aXMuX2hhbmRsZUNyZWF0ZVNuaXBwZXQuYmluZCh0aGlzKSk7CisgICAgICAgIGNvbnRleHRNZW51 LnNob3coZXZlbnQpOworICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICBl dmVudC5zdG9wUHJvcGFnYXRpb24oKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0g e0V2ZW50fSBldmVudAorICAgICAqLworICAgIF9oYW5kbGVFdmFsdWF0ZVNuaXBwZXQ6IGZ1bmN0 aW9uKHVpU291cmNlQ29kZSwgZXZlbnQpCisgICAgeworICAgICAgICAvLyBGSVhNRTogVG8gYmUg aW1wbGVtZW50ZWQuCisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICogQHBhcmFtIHtFdmVudH0gZXZl bnQKKyAgICAgKi8KKyAgICBfaGFuZGxlUmVuYW1lU25pcHBldDogZnVuY3Rpb24odWlTb3VyY2VD b2RlLCBldmVudCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBUbyBiZSBpbXBsZW1lbnRlZC4K KyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICAgICAqLwor ICAgIF9oYW5kbGVSZW1vdmVTbmlwcGV0OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGV2ZW50KQor ICAgIHsKKyAgICAgICAgLy8gRklYTUU6IFRvIGJlIGltcGxlbWVudGVkLgorICAgIH0sCisKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICAgICAqLworICAgIF9oYW5kbGVD cmVhdGVTbmlwcGV0OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBU byBiZSBpbXBsZW1lbnRlZC4KKyAgICB9LAogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7 CkBAIC00MjYsNyArNDg5LDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclRyZWVPdXRsaW5lLnBy b3RvdHlwZSA9IHsKICAgICAgICB9CiAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgIH0sCi0gICAK KwogICAgc2VhcmNoU3RhcnRlZDogZnVuY3Rpb24oKQogICAgewogICAgICAgIHRoaXMuX25hdmln YXRvci5fdHJlZVNlYXJjaEJveC5hcHBlbmRDaGlsZCh0aGlzLnNlYXJjaElucHV0RWxlbWVudCk7 CkBAIC01ODEsNiArNjQ0LDE0IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxl bWVudCA9IGZ1bmN0aW9uKG5hdmlnYXRvciwgdWlTb3VyY2VDb2RlLCB0aXRsCiAKIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgLyoqCisg ICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yfQorICAgICAqLworICAg IGdldCBuYXZpZ2F0b3IoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX25hdmlnYXRvcjsK KyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHR5cGUge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGV9CiAgICAgICovCiAgICAgZ2V0IHVpU291cmNlQ29kZSgpCkBAIC01ODgsNiArNjU5LDEzIEBA IFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiB0aGlzLl91aVNvdXJjZUNvZGU7CiAgICAgfSwKIAorICAgIG9uYXR0YWNo OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZU5hdmlnYXRvclRy ZWVFbGVtZW50LnByb3RvdHlwZS5vbmF0dGFjaC5jYWxsKHRoaXMpOworICAgICAgICBpZiAodGhp cy5fdWlTb3VyY2VDb2RlLmlzU25pcHBldCkKKyAgICAgICAgICAgIHRoaXMubGlzdEl0ZW1FbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5faGFuZGxlQ29udGV4dE1l bnVFdmVudC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgfSwKKwogICAgIC8qKgogICAgICAqIEBw YXJhbSB7RXZlbnR9IGV2ZW50CiAgICAgICovCkBAIC01OTksNiArNjc3LDE0IEBAIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgb25lbnRl cjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yLnNjcmlwdFNlbGVj dGVkKHRoaXMudWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtFdmVudH0gZXZlbnQKKyAgICAgKi8KKyAgICBfaGFuZGxlQ29udGV4dE1lbnVFdmVudDogZnVu Y3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLm5hdmlnYXRvci5fc2hvd1NuaXBwZXRD b250ZXh0TWVudShldmVudCwgdGhpcy51aVNvdXJjZUNvZGUpOwogICAgIH0KIH0KIAo= 134323 2012-03-28 10:08:52 -0700 2012-03-28 10:10:31 -0700 Patch bug-82475-20120328210850.patch text/plain 7924 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk5ZjYwYmQ1ZGRjYzA1 NzU0NjRhMzM2ODY2ZjJmOWY5Y2M1MjU4OS4uMTIxMDU0YzczYjE2MTE4MmQ5ZWFkNzI0MGViNmNi MWI1M2MxMTRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTAzLTI4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBjb250ZXh0IG1lbnUgZm9yIHNuaXBwZXRzIGNvbnRyb2wuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBwcmVsaW1pbmFyeSBp bXBsZW1lbnRhdGlvbiBvZiBzbmlwcGV0cyBjb250cm9sIHVzaW5nIGNvbnRleHQgbWVudS4KKyAg ICAgICAgV2UgbWlnaHQgd2FudCB0byBhZGQgYSBtb3JlIHZpc3VhbCBvbmUgYmVmb3JlIHRha2lu ZyBzbmlwcGV0cyBvdXQgb2YgZXhwZXJpbWVudHMuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzTmF2aWdhdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu cHJvdG90eXBlLl9zaG93U2NyaXB0Rm9sZGVyc1NldHRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5fY3JlYXRlU25pcHBldHNUcmVl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5faGFu ZGxlU25pcHBldENvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlw dHNOYXZpZ2F0b3IucHJvdG90eXBlLl9zaG93U25pcHBldENvbnRleHRNZW51KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5faGFuZGxlRXZhbHVhdGVT bmlwcGV0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlw ZS5faGFuZGxlUmVuYW1lU25pcHBldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05h dmlnYXRvci5wcm90b3R5cGUuX2hhbmRsZVJlbW92ZVNuaXBwZXQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlLl9oYW5kbGVDcmVhdGVTbmlwcGV0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5 cGUuZ2V0IG5hdmlnYXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0 VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O YXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5cGUub25lbnRlcik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlLl9oYW5kbGVD b250ZXh0TWVudUV2ZW50KToKKworMjAxMi0wMy0yOCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlr QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTY3JpcHRzTmF2aWdhdG9y IHNob3VsZCBzYXZlIHNjcm9sbCBwb3NpdGlvbiB3aGVuIHN3aXRjaGluZyB0YWJzLgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzIKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIv U291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDQy ZjhlMTQ3ZjY0NzQyNGJiZDdlOTYwYTkwYzliODQwYTM0YTk0ZTYuLjU3Njc1NTZiOGYyNDI2Y2Jl ODNkMDI2ODkyNTEwMTM4ZTlmZjNiYzMgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNDM1 CnpjbWFGJWs+JU1CbVdDfmkmbnphdCR5U303WXRBVVp0SDRtcWtqSWU4UHltRmZsa0s3dXhzbXde KFQzQ0dsXkZUQgp6Z0hhU0liSGNTdWE/X24kS1pWVVlrcys1TWw+eDt4aDd0eFBoRkdBT0VmNmEp MU9lc3E3X2d7QUh2LThueWhiM1kKejB+cy1ZRzlRWkRfZjN7WD1FSWFBPjYjMnVnMlY/WmFkYylW MD1oRjFYZmJ9QDs4WGBSIzFtQiMkcCRxNDs4JG5PCkd6eSR6VXBrWmhMCgpkZWx0YSAxMQpTY21h RiVnWFAmcm1XQ35pJm55NWFfWFpJRgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcwppbmRleCBmNjFjMWMyOWE1YWFjOGM3 YWU2NDM4OGRlNWVkYzBiNzRkMmQ1MzkyLi5lOWIyZjQzNWJhN2FmOTM5MmFhMzQ1NDNlYzQyMzcz ZjI1OGQ1ZTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNOYXZpZ2F0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCkBAIC0yMjUsNyArMjI1LDcgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9sYXN0U2VsZWN0 ZWRVSVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50 cy5GaWxlU2VsZWN0ZWQsIHVpU291cmNlQ29kZSk7CiAgICAgfSwKLSAgICAKKwogICAgIC8qKgog ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAg ICAgICovCkBAIC0yNDUsNyArMjQ1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50 c0J5VUlTb3VyY2VDb2RlLnJlbW92ZSh1aVNvdXJjZUNvZGUpOwogICAgIH0sCi0gICAgCisKICAg ICBfc2hvd1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZDogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl9zY3JpcHRzVHJlZS5zY3JpcHRUcmVlRWxl bWVudHMoKTsKQEAgLTI1NCwxNyArMjU0LDE4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNl Q29kZXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLmFkZFVJU291cmNlQ29kZSh1aVNv dXJjZUNvZGVzW2ldKTsKLSAgICAgICAgCisKICAgICAgICAgaWYgKHRoaXMuX2xhc3RTZWxlY3Rl ZFVJU291cmNlQ29kZSkKICAgICAgICAgICAgIHRoaXMucmV2ZWFsVUlTb3VyY2VDb2RlKHRoaXMu X2xhc3RTZWxlY3RlZFVJU291cmNlQ29kZSk7CiAgICAgfSwKLSAgICAKKwogICAgIF9jcmVhdGVT bmlwcGV0c1RyZWU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBzbmlwcGV0c1RyZWVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKICAgICAgICAgdmFyIHNuaXBw ZXRzVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuVmlldygpOwogICAgICAgICBzbmlwcGV0c1ZpZXcu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJmaWxsIik7CiAgICAgICAgIHNuaXBwZXRzVmlldy5lbGVt ZW50LmFkZFN0eWxlQ2xhc3MoIm5hdmlnYXRvci1jb250YWluZXIiKTsKKyAgICAgICAgc25pcHBl dHNWaWV3LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5k bGVTbmlwcGV0Q29udGV4dE1lbnVFdmVudC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgICAgIHZh ciBzbmlwcGV0c091dGxpbmVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgIHNuaXBwZXRzT3V0bGluZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygib3V0bGluZS1k aXNjbG9zdXJlIik7CiAgICAgICAgIHNuaXBwZXRzT3V0bGluZUVsZW1lbnQuYWRkU3R5bGVDbGFz cygibmF2aWdhdG9yIik7CkBAIC0yNzYsNiArMjc3LDY4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz TmF2aWdhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHNuaXBwZXRzVHJlZTsKICAg ICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtFdmVudH0gZXZlbnQKKyAgICAgKi8KKyAg ICBfaGFuZGxlU25pcHBldENvbnRleHRNZW51RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsK KyAgICAgICAgdGhpcy5fc2hvd1NuaXBwZXRDb250ZXh0TWVudShldmVudCk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlPX0gdWlTb3VyY2VDb2RlCisgICAgICovCisgICAgX3Nob3dT bmlwcGV0Q29udGV4dE1lbnU6IGZ1bmN0aW9uKGV2ZW50LCB1aVNvdXJjZUNvZGUpCisgICAgewor ICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7 CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUpIHsKKyAgICAgICAgICAgIAorICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9y LnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJFdmFsdWF0ZSBzbmlwcGV0IiA6ICJFdmFsdWF0 ZSBTbmlwcGV0IiksIHRoaXMuX2hhbmRsZUV2YWx1YXRlU25pcHBldC5iaW5kKHRoaXMsIHVpU291 cmNlQ29kZSkpOworICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJSZW5h bWUgc25pcHBldCIgOiAiUmVuYW1lIFNuaXBwZXQiKSwgdGhpcy5faGFuZGxlUmVuYW1lU25pcHBl dC5iaW5kKHRoaXMsIHVpU291cmNlQ29kZSkpOworICAgICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1l bnVUaXRsZXMoKSA/ICJSZW1vdmUgc25pcHBldCIgOiAiUmVtb3ZlIFNuaXBwZXQiKSwgdGhpcy5f aGFuZGxlUmVtb3ZlU25pcHBldC5iaW5kKHRoaXMsIHVpU291cmNlQ29kZSkpOworICAgICAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJhdG9yKCk7CisgICAgICAgIH0KKyAgICAgICAgY29u dGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVz ZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDcmVhdGUgc25pcHBldCIgOiAiQ3JlYXRlIFNuaXBw ZXQiKSwgdGhpcy5faGFuZGxlQ3JlYXRlU25pcHBldC5iaW5kKHRoaXMpKTsKKyAgICAgICAgY29u dGV4dE1lbnUuc2hvdyhldmVudCk7CisgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Cisg ICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOworICAgIH0sCisKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAq IEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hhbmRsZUV2YWx1YXRlU25pcHBl dDogZnVuY3Rpb24odWlTb3VyY2VDb2RlLCBldmVudCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1F OiBUbyBiZSBpbXBsZW1lbnRlZC4KKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge0V2 ZW50fSBldmVudAorICAgICAqLworICAgIF9oYW5kbGVSZW5hbWVTbmlwcGV0OiBmdW5jdGlvbih1 aVNvdXJjZUNvZGUsIGV2ZW50KQorICAgIHsKKyAgICAgICAgLy8gRklYTUU6IFRvIGJlIGltcGxl bWVudGVkLgorICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50Cisg ICAgICovCisgICAgX2hhbmRsZVJlbW92ZVNuaXBwZXQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwg ZXZlbnQpCisgICAgeworICAgICAgICAvLyBGSVhNRTogVG8gYmUgaW1wbGVtZW50ZWQuCisgICAg fSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisgICAg X2hhbmRsZUNyZWF0ZVNuaXBwZXQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgLy8g RklYTUU6IFRvIGJlIGltcGxlbWVudGVkLgorICAgIH0sCiAKICAgICByZXNldDogZnVuY3Rpb24o KQogICAgIHsKQEAgLTQyNiw3ICs0ODksNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVHJlZU91 dGxpbmUucHJvdG90eXBlID0gewogICAgICAgIH0KICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg fSwKLSAgIAorCiAgICBzZWFyY2hTdGFydGVkOiBmdW5jdGlvbigpCiAgICB7CiAgICAgICAgdGhp cy5fbmF2aWdhdG9yLl90cmVlU2VhcmNoQm94LmFwcGVuZENoaWxkKHRoaXMuc2VhcmNoSW5wdXRF bGVtZW50KTsKQEAgLTU4MSw2ICs2NDQsMTQgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlw dFRyZWVFbGVtZW50ID0gZnVuY3Rpb24obmF2aWdhdG9yLCB1aVNvdXJjZUNvZGUsIHRpdGwKIAog V2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAg ICAvKioKKyAgICAgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3J9CisgICAg ICovCisgICAgZ2V0IG5hdmlnYXRvcigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fbmF2 aWdhdG9yOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZX0KICAgICAgKi8KICAgICBnZXQgdWlTb3VyY2VDb2RlKCkKQEAgLTU4OCw2ICs2 NTksMTMgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVtZW50LnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZTsKICAgICB9LAogCisgICAg b25hdHRhY2g6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlTmF2 aWdhdG9yVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoLmNhbGwodGhpcyk7CisgICAgICAg IGlmICh0aGlzLl91aVNvdXJjZUNvZGUuaXNTbmlwcGV0KQorICAgICAgICAgICAgdGhpcy5saXN0 SXRlbUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVD b250ZXh0TWVudUV2ZW50LmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB9LAorCiAgICAgLyoqCiAg ICAgICogQHBhcmFtIHtFdmVudH0gZXZlbnQKICAgICAgKi8KQEAgLTU5OSw2ICs2NzcsMTQgQEAg V2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAg ICBvbmVudGVyOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9uYXZpZ2F0b3Iuc2Ny aXB0U2VsZWN0ZWQodGhpcy51aVNvdXJjZUNvZGUpOworICAgIH0sCisKKyAgICAvKioKKyAgICAg KiBAcGFyYW0ge0V2ZW50fSBldmVudAorICAgICAqLworICAgIF9oYW5kbGVDb250ZXh0TWVudUV2 ZW50OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRoaXMubmF2aWdhdG9yLl9zaG93 U25pcHBldENvbnRleHRNZW51KGV2ZW50LCB0aGlzLnVpU291cmNlQ29kZSk7CiAgICAgfQogfQog Cg== 134324 2012-03-28 10:10:38 -0700 2012-03-28 10:16:50 -0700 Patch bug-82475-20120328211037.patch text/plain 7843 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk5ZjYwYmQ1ZGRjYzA1 NzU0NjRhMzM2ODY2ZjJmOWY5Y2M1MjU4OS4uMTIxMDU0YzczYjE2MTE4MmQ5ZWFkNzI0MGViNmNi MWI1M2MxMTRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTAzLTI4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCBjb250ZXh0IG1lbnUgZm9yIHNuaXBwZXRzIGNvbnRyb2wuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBwcmVsaW1pbmFyeSBp bXBsZW1lbnRhdGlvbiBvZiBzbmlwcGV0cyBjb250cm9sIHVzaW5nIGNvbnRleHQgbWVudS4KKyAg ICAgICAgV2UgbWlnaHQgd2FudCB0byBhZGQgYSBtb3JlIHZpc3VhbCBvbmUgYmVmb3JlIHRha2lu ZyBzbmlwcGV0cyBvdXQgb2YgZXhwZXJpbWVudHMuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzTmF2aWdhdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu cHJvdG90eXBlLl9zaG93U2NyaXB0Rm9sZGVyc1NldHRpbmdDaGFuZ2VkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5fY3JlYXRlU25pcHBldHNUcmVl KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5faGFu ZGxlU25pcHBldENvbnRleHRNZW51RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlw dHNOYXZpZ2F0b3IucHJvdG90eXBlLl9zaG93U25pcHBldENvbnRleHRNZW51KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlwZS5faGFuZGxlRXZhbHVhdGVT bmlwcGV0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLnByb3RvdHlw ZS5faGFuZGxlUmVuYW1lU25pcHBldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05h dmlnYXRvci5wcm90b3R5cGUuX2hhbmRsZVJlbW92ZVNuaXBwZXQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlLl9oYW5kbGVDcmVhdGVTbmlwcGV0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5 cGUuZ2V0IG5hdmlnYXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0 VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O YXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5wcm90b3R5cGUub25lbnRlcik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlLl9oYW5kbGVD b250ZXh0TWVudUV2ZW50KToKKworMjAxMi0wMy0yOCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlr QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTY3JpcHRzTmF2aWdhdG9y IHNob3VsZCBzYXZlIHNjcm9sbCBwb3NpdGlvbiB3aGVuIHN3aXRjaGluZyB0YWJzLgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzIKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIv U291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDQy ZjhlMTQ3ZjY0NzQyNGJiZDdlOTYwYTkwYzliODQwYTM0YTk0ZTYuLjU3Njc1NTZiOGYyNDI2Y2Jl ODNkMDI2ODkyNTEwMTM4ZTlmZjNiYzMgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNDM1 CnpjbWFGJWs+JU1CbVdDfmkmbnphdCR5U303WXRBVVp0SDRtcWtqSWU4UHltRmZsa0s3dXhzbXde KFQzQ0dsXkZUQgp6Z0hhU0liSGNTdWE/X24kS1pWVVlrcys1TWw+eDt4aDd0eFBoRkdBT0VmNmEp MU9lc3E3X2d7QUh2LThueWhiM1kKejB+cy1ZRzlRWkRfZjN7WD1FSWFBPjYjMnVnMlY/WmFkYylW MD1oRjFYZmJ9QDs4WGBSIzFtQiMkcCRxNDs4JG5PCkd6eSR6VXBrWmhMCgpkZWx0YSAxMQpTY21h RiVnWFAmcm1XQ35pJm55NWFfWFpJRgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qcwppbmRleCBmNjFjMWMyOWE1YWFjOGM3 YWU2NDM4OGRlNWVkYzBiNzRkMmQ1MzkyLi4zMmU2NTU4ZGM0NGRmZTRlYTVmNDhlZmU1OGQxZmZk NzFiMmIxYTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNOYXZpZ2F0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCkBAIC0yMjUsNyArMjI1LDcgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9sYXN0U2VsZWN0 ZWRVSVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwuRmlsZVNlbGVjdG9yLkV2ZW50 cy5GaWxlU2VsZWN0ZWQsIHVpU291cmNlQ29kZSk7CiAgICAgfSwKLSAgICAKKwogICAgIC8qKgog ICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAg ICAgICovCkBAIC0yNDUsNyArMjQ1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3NjcmlwdFRyZWVFbGVtZW50 c0J5VUlTb3VyY2VDb2RlLnJlbW92ZSh1aVNvdXJjZUNvZGUpOwogICAgIH0sCi0gICAgCisKICAg ICBfc2hvd1NjcmlwdEZvbGRlcnNTZXR0aW5nQ2hhbmdlZDogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl9zY3JpcHRzVHJlZS5zY3JpcHRUcmVlRWxl bWVudHMoKTsKQEAgLTI1NCwxNyArMjU0LDE4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNl Q29kZXMubGVuZ3RoOyArK2kpCiAgICAgICAgICAgICB0aGlzLmFkZFVJU291cmNlQ29kZSh1aVNv dXJjZUNvZGVzW2ldKTsKLSAgICAgICAgCisKICAgICAgICAgaWYgKHRoaXMuX2xhc3RTZWxlY3Rl ZFVJU291cmNlQ29kZSkKICAgICAgICAgICAgIHRoaXMucmV2ZWFsVUlTb3VyY2VDb2RlKHRoaXMu X2xhc3RTZWxlY3RlZFVJU291cmNlQ29kZSk7CiAgICAgfSwKLSAgICAKKwogICAgIF9jcmVhdGVT bmlwcGV0c1RyZWU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBzbmlwcGV0c1RyZWVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKICAgICAgICAgdmFyIHNuaXBw ZXRzVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuVmlldygpOwogICAgICAgICBzbmlwcGV0c1ZpZXcu ZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJmaWxsIik7CiAgICAgICAgIHNuaXBwZXRzVmlldy5lbGVt ZW50LmFkZFN0eWxlQ2xhc3MoIm5hdmlnYXRvci1jb250YWluZXIiKTsKKyAgICAgICAgc25pcHBl dHNWaWV3LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5k bGVTbmlwcGV0Q29udGV4dE1lbnVFdmVudC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgICAgIHZh ciBzbmlwcGV0c091dGxpbmVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgIHNuaXBwZXRzT3V0bGluZUVsZW1lbnQuYWRkU3R5bGVDbGFzcygib3V0bGluZS1k aXNjbG9zdXJlIik7CiAgICAgICAgIHNuaXBwZXRzT3V0bGluZUVsZW1lbnQuYWRkU3R5bGVDbGFz cygibmF2aWdhdG9yIik7CkBAIC0yNzYsNiArMjc3LDY1IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRz TmF2aWdhdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHNuaXBwZXRzVHJlZTsKICAg ICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtFdmVudH0gZXZlbnQKKyAgICAgKi8KKyAg ICBfaGFuZGxlU25pcHBldENvbnRleHRNZW51RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsK KyAgICAgICAgdGhpcy5fc2hvd1NuaXBwZXRDb250ZXh0TWVudShldmVudCk7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlPX0gdWlTb3VyY2VDb2RlCisgICAgICovCisgICAgX3Nob3dT bmlwcGV0Q29udGV4dE1lbnU6IGZ1bmN0aW9uKGV2ZW50LCB1aVNvdXJjZUNvZGUpCisgICAgewor ICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7 CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUpIHsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFw cGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VN ZW51VGl0bGVzKCkgPyAiRXZhbHVhdGUgc25pcHBldCIgOiAiRXZhbHVhdGUgU25pcHBldCIpLCB0 aGlzLl9oYW5kbGVFdmFsdWF0ZVNuaXBwZXQuYmluZCh0aGlzLCB1aVNvdXJjZUNvZGUpKTsKKyAg ICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdl Ykluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiUmVuYW1lIHNuaXBwZXQiIDog IlJlbmFtZSBTbmlwcGV0IiksIHRoaXMuX2hhbmRsZVJlbmFtZVNuaXBwZXQuYmluZCh0aGlzLCB1 aVNvdXJjZUNvZGUpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAi UmVtb3ZlIHNuaXBwZXQiIDogIlJlbW92ZSBTbmlwcGV0IiksIHRoaXMuX2hhbmRsZVJlbW92ZVNu aXBwZXQuYmluZCh0aGlzLCB1aVNvdXJjZUNvZGUpKTsKKyAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZFNlcGFyYXRvcigpOworICAgICAgICB9CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51 VGl0bGVzKCkgPyAiQ3JlYXRlIHNuaXBwZXQiIDogIkNyZWF0ZSBTbmlwcGV0IiksIHRoaXMuX2hh bmRsZUNyZWF0ZVNuaXBwZXQuYmluZCh0aGlzKSk7CisgICAgICAgIGNvbnRleHRNZW51LnNob3co ZXZlbnQpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50Cisg ICAgICovCisgICAgX2hhbmRsZUV2YWx1YXRlU25pcHBldDogZnVuY3Rpb24odWlTb3VyY2VDb2Rl LCBldmVudCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBUbyBiZSBpbXBsZW1lbnRlZC4KKyAg ICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl fSB1aVNvdXJjZUNvZGUKKyAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICAgICAqLworICAg IF9oYW5kbGVSZW5hbWVTbmlwcGV0OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIGV2ZW50KQorICAg IHsKKyAgICAgICAgLy8gRklYTUU6IFRvIGJlIGltcGxlbWVudGVkLgorICAgIH0sCisKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29k ZQorICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hhbmRsZVJlbW92 ZVNuaXBwZXQ6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgZXZlbnQpCisgICAgeworICAgICAgICAv LyBGSVhNRTogVG8gYmUgaW1wbGVtZW50ZWQuCisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBw YXJhbSB7RXZlbnR9IGV2ZW50CisgICAgICovCisgICAgX2hhbmRsZUNyZWF0ZVNuaXBwZXQ6IGZ1 bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgLy8gRklYTUU6IFRvIGJlIGltcGxlbWVudGVk LgorICAgIH0sCiAKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKQEAgLTQyNiw3ICs0ODYs NyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAg ICAgIH0KICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgfSwKLSAgIAorCiAgICBzZWFyY2hTdGFy dGVkOiBmdW5jdGlvbigpCiAgICB7CiAgICAgICAgdGhpcy5fbmF2aWdhdG9yLl90cmVlU2VhcmNo Qm94LmFwcGVuZENoaWxkKHRoaXMuc2VhcmNoSW5wdXRFbGVtZW50KTsKQEAgLTU4MSw2ICs2NDEs MTQgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNjcmlwdFRyZWVFbGVtZW50ID0gZnVuY3Rpb24o bmF2aWdhdG9yLCB1aVNvdXJjZUNvZGUsIHRpdGwKIAogV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNj cmlwdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAvKioKKyAgICAgKiBAdHlwZSB7V2Vi SW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3J9CisgICAgICovCisgICAgZ2V0IG5hdmlnYXRvcigp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fbmF2aWdhdG9yOworICAgIH0sCisKKyAgICAv KioKICAgICAgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0KICAgICAgKi8KICAg ICBnZXQgdWlTb3VyY2VDb2RlKCkKQEAgLTU4OCw2ICs2NTYsMTMgQEAgV2ViSW5zcGVjdG9yLk5h dmlnYXRvclNjcmlwdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRo aXMuX3VpU291cmNlQ29kZTsKICAgICB9LAogCisgICAgb25hdHRhY2g6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlTmF2aWdhdG9yVHJlZUVsZW1lbnQucHJvdG90 eXBlLm9uYXR0YWNoLmNhbGwodGhpcyk7CisgICAgICAgIGlmICh0aGlzLl91aVNvdXJjZUNvZGUu aXNTbmlwcGV0KQorICAgICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQuYWRkRXZlbnRMaXN0 ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50LmJpbmQodGhp cyksIGZhbHNlKTsKKyAgICB9LAorCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtFdmVudH0gZXZl bnQKICAgICAgKi8KQEAgLTU5OSw2ICs2NzQsMTQgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNj cmlwdFRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICBvbmVudGVyOiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICB0aGlzLl9uYXZpZ2F0b3Iuc2NyaXB0U2VsZWN0ZWQodGhpcy51aVNvdXJj ZUNvZGUpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAor ICAgICAqLworICAgIF9oYW5kbGVDb250ZXh0TWVudUV2ZW50OiBmdW5jdGlvbihldmVudCkKKyAg ICB7CisgICAgICAgIHRoaXMubmF2aWdhdG9yLl9zaG93U25pcHBldENvbnRleHRNZW51KGV2ZW50 LCB0aGlzLnVpU291cmNlQ29kZSk7CiAgICAgfQogfQogCg==