110095 2013-02-18 01:54:58 -0800 Web Inspector: Specify return type of WebInspector.UIString 2013-02-26 08:17:28 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 835237 0 eustas 2013-02-18 01:54:58 -0800 1) Extract "fragment builder" from AuditsPanel. This method builds DOM fragment by format and substitutions (and optional formatters). In case of standard string formatters we can use fact that "%s" means literal substitution. 2) Extract "localize" from WebInspector.UIString. Fragment builder should be supplied with localized formats. This was impossible because all localization logic was baked in WebInspector.UIString. 835242 1 188825 eustas 2013-02-18 01:57:52 -0800 Created attachment 188825 Patch 835257 2 188825 pfeldman 2013-02-18 02:24:26 -0800 Comment on attachment 188825 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188825&action=review > Source/WebCore/inspector/front-end/UIString.js:36 > +WebInspector.localize = function(string) { Should be private. > Source/WebCore/inspector/front-end/UIUtils.js:1106 > +WebInspector.formatFragment = function(format, substitutions, formatters) { { on the next line. If that is extracted, where is the updated client? 835331 3 eustas 2013-02-18 04:21:25 -0800 With extracted _localize method typed code ration increases on 0.4% 835333 4 188825 eustas 2013-02-18 04:22:52 -0800 Comment on attachment 188825 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188825&action=review >> Source/WebCore/inspector/front-end/UIString.js:36 >> +WebInspector.localize = function(string) { > > Should be private. Done >> Source/WebCore/inspector/front-end/UIUtils.js:1106 >> +WebInspector.formatFragment = function(format, substitutions, formatters) { > > { on the next line. > > If that is extracted, where is the updated client? Take a look at AuditRuleResult.addFormatted 835336 5 188846 eustas 2013-02-18 04:28:10 -0800 Created attachment 188846 Patch 835359 6 188846 pfeldman 2013-02-18 05:00:48 -0800 Comment on attachment 188846 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188846&action=review > Source/WebCore/inspector/front-end/ObjectPropertiesSection.js:554 > + console.error(WebInspector.UIString("Unknown scope type: \"%s\"", scope.type)); Why is this a part of the change? > Source/WebCore/inspector/front-end/UIString.js:59 > + return String.vsprintf(WebInspector._localize(string), Array.prototype.slice.call(arguments, 1)); Why do you extract it? 835549 7 188846 eustas 2013-02-18 09:18:05 -0800 Comment on attachment 188846 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188846&action=review >> Source/WebCore/inspector/front-end/ObjectPropertiesSection.js:554 >> + console.error(WebInspector.UIString("Unknown scope type: \"%s\"", scope.type)); > > Why is this a part of the change? Otherwise js compiler will report type mismatch warning >> Source/WebCore/inspector/front-end/UIString.js:59 >> + return String.vsprintf(WebInspector._localize(string), Array.prototype.slice.call(arguments, 1)); > > Why do you extract it? Localize could be used in cases when we need to use power of String.format but still be localized. 838301 8 eustas 2013-02-21 03:48:29 -0800 Specify return type of WebInspector.UIString. Fix new js-compiler warnings. This change will increase type coverage by 0.4% (to 81%) 838306 9 189504 eustas 2013-02-21 03:51:55 -0800 Created attachment 189504 Patch 839562 10 189504 pfeldman 2013-02-22 07:30:21 -0800 Comment on attachment 189504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189504&action=review > Source/WebCore/inspector/front-end/ObjectPropertiesSection.js:554 > + console.error(WebInspector.UIString("Unknown scope type: \"%s\"", scope.type)); There is no need to localize it. Otherwise looks good. 842012 11 190286 eustas 2013-02-26 08:09:08 -0800 Created attachment 190286 Patch 842016 12 189504 eustas 2013-02-26 08:11:16 -0800 Comment on attachment 189504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189504&action=review >> Source/WebCore/inspector/front-end/ObjectPropertiesSection.js:554 >> + console.error(WebInspector.UIString("Unknown scope type: \"%s\"", scope.type)); > > There is no need to localize it. Otherwise looks good. Fixed. 842020 13 eustas 2013-02-26 08:16:12 -0800 Committed r144061: <http://trac.webkit.org/changeset/144061> 188825 2013-02-18 01:57:52 -0800 2013-02-18 04:28:06 -0800 Patch bug-110095-20130218135415.patch text/plain 5358 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk5NTEwODJmNWExMzJh NTA3MmJiOTNiNjIwOTk2ZGI2N2VjMWZhYy4uODI1NTMyMWE4NzBlNDY4YTY1NjViZWYwZTQ2NzUy ZWEzZGM2MGFkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTE4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFJlZmFjdG9yaW5nczogZXh0cmFjdCB1dGlscyBmb3IgRE9NIGJ1aWxkaW5nLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMDk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXh0cmFjdGVkICJm cmFnbWVudCBidWlsZGVyIiBmcm9tIEF1ZGl0c1BhbmVsLgorICAgICAgICBFeHRyYWN0ZWQgImxv Y2FsaXplIiBmcm9tIFdlYkluc3BlY3Rvci5VSVN0cmluZy4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanM6IEFkb3BlZCBjaGFuZ2VzLgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvVUlTdHJpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IubG9j YWxpemUpOiBFeHRyYWN0ZWQgZnJvbSAiVUlTdHJpbmciLgorICAgICAgICAoV2ViSW5zcGVjdG9y LlVJU3RyaW5nKTogQWRvcGVkIGNoYW5nZXMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9VSVV0aWxzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmZvcm1hdEZyYWdtZW50KTogRXh0 cmFjdGVkIGZyb20gQXVkaXRzUGFuZWwuCisKIDIwMTMtMDItMTUgIEV1Z2VuZSBLbHl1Y2huaWtv diAgPGV1c3Rhc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW50cm9k dWNlIFByb2ZpbGVzUGFuZWxEZXNjcmlwdG9yLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9BdWRpdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQXVkaXRzUGFuZWwuanMKaW5kZXggYzZlZDE3ZGIyODI3NDg1YmY2NjNh ZTYyZWVlZjQxZjg1ZjI0ZGE5Mi4uZmI2Mzg3MWE3MTI4Yjg4ZjVmYjNmZmExMjI1ZDljNzRkZTBk ZjYwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BdWRp dHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0F1ZGl0 c1BhbmVsLmpzCkBAIC01MTQsMjAgKzUxNCw4IEBAIFdlYkluc3BlY3Rvci5BdWRpdFJ1bGVSZXN1 bHQucHJvdG90eXBlID0gewogICAgIGFkZEZvcm1hdHRlZDogZnVuY3Rpb24oZm9ybWF0LCB2YXJh cmcpCiAgICAgewogICAgICAgICB2YXIgc3Vic3RpdHV0aW9ucyA9IEFycmF5LnByb3RvdHlwZS5z bGljZS5jYWxsKGFyZ3VtZW50cywgMSk7Ci0gICAgICAgIHZhciBmcmFnbWVudCA9IGRvY3VtZW50 LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsKLQotICAgICAgICBmdW5jdGlvbiBhcHBlbmQoYSwg YikKLSAgICAgICAgewotICAgICAgICAgICAgaWYgKCEoYiBpbnN0YW5jZW9mIE5vZGUpKQotICAg ICAgICAgICAgICAgIGIgPSBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShiKTsKLSAgICAgICAgICAg IGEuYXBwZW5kQ2hpbGQoYik7Ci0gICAgICAgICAgICByZXR1cm4gYTsKLSAgICAgICAgfQotCi0g ICAgICAgIHZhciBmb3JtYXR0ZWRSZXN1bHQgPSBTdHJpbmcuZm9ybWF0KGZvcm1hdCwgc3Vic3Rp dHV0aW9ucywgdGhpcy5fZm9ybWF0dGVycywgZnJhZ21lbnQsIGFwcGVuZCkuZm9ybWF0dGVkUmVz dWx0OwotICAgICAgICBpZiAoZm9ybWF0dGVkUmVzdWx0IGluc3RhbmNlb2YgTm9kZSkKLSAgICAg ICAgICAgIGZvcm1hdHRlZFJlc3VsdC5ub3JtYWxpemUoKTsKLSAgICAgICAgcmV0dXJuIHRoaXMu YWRkQ2hpbGQoZm9ybWF0dGVkUmVzdWx0KTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IFdlYkluc3Bl Y3Rvci5mb3JtYXRGcmFnbWVudChmb3JtYXQsIHN1YnN0aXR1dGlvbnMsIHRoaXMuX2Zvcm1hdHRl cnMpOworICAgICAgICByZXR1cm4gdGhpcy5hZGRDaGlsZChyZXN1bHQpOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0cmluZy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTdHJpbmcuanMKaW5kZXgg ZWM2YTE4ODU3NDdjNjMxZGZjMTQzM2I2Mzg3MzU3ZDU2MDA2N2Q2Mi4uN2I4MTM1MzZkYmI0MmZj NzNiOTU0NWUzOTU3NmI1MWRkYTk1MTIyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9VSVN0cmluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1VJU3RyaW5nLmpzCkBAIC0yOCwyNiArMjgsMzUgQEAKICAqIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRgogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KICAqLworCiAgLyoqCi0gKiBAcGFyYW0ge3N0cmluZ30gc3Ry aW5nCi0gKiBAcGFyYW0gey4uLip9IHZhcmFyZwotICovCisgICogQHBhcmFtIHtzdHJpbmd9IHN0 cmluZworICAqIEByZXR1cm4ge3N0cmluZ30KKyAgKi8KK1dlYkluc3BlY3Rvci5sb2NhbGl6ZSA9 IGZ1bmN0aW9uKHN0cmluZykgeworICAgIGlmICghUHJlZmVyZW5jZXMubG9jYWxpemVVSSkKKyAg ICAgICAgcmV0dXJuIHN0cmluZzsKKyAgICBpZiAod2luZG93LmxvY2FsaXplZFN0cmluZ3MgJiYg c3RyaW5nIGluIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQorICAgICAgICByZXR1cm4gd2luZG93 LmxvY2FsaXplZFN0cmluZ3Nbc3RyaW5nXTsKKworICAgIGlmICghKHN0cmluZyBpbiBXZWJJbnNw ZWN0b3IuX21pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzKSkgeworICAgICAgICBjb25zb2xlLndhcm4o IkxvY2FsaXplZCBzdHJpbmcgXCIiICsgc3RyaW5nICsgIlwiIG5vdCBmb3VuZC4iKTsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLl9taXNzaW5nTG9jYWxpemVkU3RyaW5nc1tzdHJpbmddID0gdHJ1ZTsK KyAgICB9CisgICAgaWYgKFByZWZlcmVuY2VzLnNob3dNaXNzaW5nTG9jYWxpemVkU3RyaW5ncykK KyAgICAgICAgc3RyaW5nICs9ICIgKG5vdCBsb2NhbGl6ZWQpIjsKKworICAgIHJldHVybiBzdHJp bmc7Cit9CisKKyAvKioKKyAgKiBAcGFyYW0ge3N0cmluZ30gc3RyaW5nCisgICogQHBhcmFtIHsu Li4qfSB2YXJhcmcKKyAgKiBAcmV0dXJuIHtzdHJpbmd9CisgICovCiBXZWJJbnNwZWN0b3IuVUlT dHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIHZhcmFyZykKIHsKLSAgICBpZiAoUHJlZmVyZW5jZXMu bG9jYWxpemVVSSkgewotICAgICAgICBpZiAod2luZG93LmxvY2FsaXplZFN0cmluZ3MgJiYgc3Ry aW5nIGluIHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQotICAgICAgICAgICAgc3RyaW5nID0gd2lu ZG93LmxvY2FsaXplZFN0cmluZ3Nbc3RyaW5nXTsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAg ICBpZiAoIShzdHJpbmcgaW4gV2ViSW5zcGVjdG9yLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncykp IHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLndhcm4oIkxvY2FsaXplZCBzdHJpbmcgXCIiICsg c3RyaW5nICsgIlwiIG5vdCBmb3VuZC4iKTsKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu X21pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzW3N0cmluZ10gPSB0cnVlOwotICAgICAgICAgICAgfQot ICAgIAotICAgICAgICAgICAgaWYgKFByZWZlcmVuY2VzLnNob3dNaXNzaW5nTG9jYWxpemVkU3Ry aW5ncykKLSAgICAgICAgICAgICAgICBzdHJpbmcgKz0gIiAobm90IGxvY2FsaXplZCkiOwotICAg ICAgICB9Ci0gICAgfQotICAgIHJldHVybiBTdHJpbmcudnNwcmludGYoc3RyaW5nLCBBcnJheS5w cm90b3R5cGUuc2xpY2UuY2FsbChhcmd1bWVudHMsIDEpKTsKKyAgICByZXR1cm4gU3RyaW5nLnZz cHJpbnRmKFdlYkluc3BlY3Rvci5sb2NhbGl6ZShzdHJpbmcpLCBBcnJheS5wcm90b3R5cGUuc2xp Y2UuY2FsbChhcmd1bWVudHMsIDEpKTsKIH0KIAogV2ViSW5zcGVjdG9yLl9taXNzaW5nTG9jYWxp emVkU3RyaW5ncyA9IHt9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9VSVV0aWxzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9V SVV0aWxzLmpzCmluZGV4IDI5YThhMWE4ZTdkZDMyMzIyZGQxZGFhNjlkOTY5MTQxMjdjY2ZmOWMu LjFhYmFiZTYxNDQxZjVmZDViMTk2ZmFiZDEyZTdkMTQxMTkwYmU4ZWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMKQEAgLTEwOTcsNiArMTA5Nywy MyBAQCBXZWJJbnNwZWN0b3IuaW52b2tlT25jZUFmdGVyQmF0Y2hVcGRhdGUgPSBmdW5jdGlvbihv YmplY3QsIG1ldGhvZCkKICAgICBtZXRob2RzLnB1dChtZXRob2QpOwogfQogCisvKioKKyAqIEBw YXJhbSB7c3RyaW5nfSBmb3JtYXQKKyAqIEBwYXJhbSB7IUFycmF5fSBzdWJzdGl0dXRpb25zCisg KiBAcGFyYW0gez9PYmplY3Q9fSBmb3JtYXR0ZXJzCisgKiBAcmV0dXJuIHshTm9kZX0KKyAqLwor V2ViSW5zcGVjdG9yLmZvcm1hdEZyYWdtZW50ID0gZnVuY3Rpb24oZm9ybWF0LCBzdWJzdGl0dXRp b25zLCBmb3JtYXR0ZXJzKSB7CisgICAgZnVuY3Rpb24gYXBwZW5kKGNvbnRhaW5lciwgZnJhZ21l bnQpCisgICAgeworICAgICAgICBjb250YWluZXIuYXBwZW5kQ2hpbGQoZnJhZ21lbnQgaW5zdGFu Y2VvZiBOb2RlID8gZnJhZ21lbnQgOiBkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShmcmFnbWVudCkp OworICAgICAgICByZXR1cm4gY29udGFpbmVyOworICAgIH0KKyAgICB2YXIgcmVzdWx0ID0gU3Ry aW5nLmZvcm1hdChmb3JtYXQsIHN1YnN0aXR1dGlvbnMsIGZvcm1hdHRlcnMgfHwgU3RyaW5nLnN0 YW5kYXJkRm9ybWF0dGVycywgZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpLCBhcHBl bmQpLmZvcm1hdHRlZFJlc3VsdDsKKyAgICByZXN1bHQubm9ybWFsaXplKCk7CisgICAgcmV0dXJu IHJlc3VsdDsKK30KKwogOyhmdW5jdGlvbigpIHsKIAogZnVuY3Rpb24gd2luZG93TG9hZGVkKCkK 188846 2013-02-18 04:28:10 -0800 2013-02-21 03:51:50 -0800 Patch bug-110095-20130218162432.patch text/plain 5196 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk5NTEwODJmNWExMzJh NTA3MmJiOTNiNjIwOTk2ZGI2N2VjMWZhYy4uZjU3NjZhZjI2ZmQ2MWNmNmJlNjdlZWRkZjkzOWUx ZDJkZDk0M2Q4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAyLTE4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFJlZmFjdG9yaW5nczogZXh0cmFjdCBfbG9jYWxpemUgdG8gaW1wcm92ZSB0eXBpbmcu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAwOTUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXRoIGV4 dHJhY3RlZCBfbG9jYWxpemUgbWV0aG9kIHR5cGVkIGNvZGUgcmF0aW9uIGluY3JlYXNlcyBvbiAw LjQlCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0 aW9uLmpzOiBGaXggdHlwZSBlcnJvcnMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9V SVN0cmluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5fbG9jYWxpemUpOiBFeHRyYWN0ZWQu CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTdHJpbmcpOiBBZG9wdCBjaGFuZ2VzLgorCiAyMDEz LTAyLTE1ICBFdWdlbmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEludHJvZHVjZSBQcm9maWxlc1BhbmVsRGVzY3JpcHRvci4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRl eCAwMjI4YWE5MDNjMTQ0NThmNzNkN2ZjZGIyODJiNmUyYmRjNWNkNjNmLi43MzFiMmFkYmY5YjRi OGFhNDNiM2JjMTM1MjI3OWExM2JlNzAyNTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9F bmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC00NDYsNiArNDQ2LDcgQEAgbG9jYWxp emVkU3RyaW5nc1siVXNlIHNtYWxsIHJlc291cmNlIHJvd3MuIl0gPSAiVXNlIHNtYWxsIHJlc291 cmNlIHJvd3MuIjsKIGxvY2FsaXplZFN0cmluZ3NbIlVzZSAlcyBDbGljayB0byBzZWxlY3QgbXVs dGlwbGUgdHlwZXMuIl0gPSAiVXNlICVzIENsaWNrIHRvIHNlbGVjdCBtdWx0aXBsZSB0eXBlcy4i OwogbG9jYWxpemVkU3RyaW5nc1siVXNlZCBIZWFwIFNpemUiXSA9ICJVc2VkIEhlYXAgU2l6ZSI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJVbmhpZGUgYWxsIl0gPSAiVW5oaWRlIGFsbCI7Citsb2NhbGl6 ZWRTdHJpbmdzWyJVbmtub3duIHNjb3BlIHR5cGU6IFwiJXNcIiJdID0gIlVua25vd24gc2NvcGUg dHlwZTogXCIlc1wiIjsKIGxvY2FsaXplZFN0cmluZ3NbIlZhbHVlIl0gPSAiVmFsdWUiOwogbG9j YWxpemVkU3RyaW5nc1siV2FpdGluZyJdID0gIldhaXRpbmciOwogbG9jYWxpemVkU3RyaW5nc1si V2FybmluZ3MiXSA9ICJXYXJuaW5ncyI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRleCBm NGFiZTNhNmM2MWViYmU3ODc2ZjRjYzgyODNlNGQ3ZDE0NzRiMzFhLi4wNTlhZWY0ZTY0NTk2MmJm OTRjYmFkYTc1M2Y1NDdhMDI4NmIwZjAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKQEAg LTI4LDkgKzI4LDkgQEAKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rv ci5Qcm9wZXJ0aWVzU2VjdGlvbn0KICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dH0gb2JqZWN0Ci0gKiBAcGFyYW0ge3N0cmluZ3xFbGVtZW50PX0gdGl0bGUKKyAqIEBwYXJhbSB7 P3N0cmluZ3xFbGVtZW50PX0gdGl0bGUKICAqIEBwYXJhbSB7c3RyaW5nPX0gc3VidGl0bGUKLSAq IEBwYXJhbSB7c3RyaW5nPX0gZW1wdHlQbGFjZWhvbGRlcgorICogQHBhcmFtIHs/c3RyaW5nPX0g ZW1wdHlQbGFjZWhvbGRlcgogICogQHBhcmFtIHtib29sZWFuPX0gaWdub3JlSGFzT3duUHJvcGVy dHkKICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3RQcm9wZXJ0eT49 fSBleHRyYVByb3BlcnRpZXMKICAqIEBwYXJhbSB7ZnVuY3Rpb24obmV3OlRyZWVFbGVtZW50LCBX ZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHkpPX0gdHJlZUVsZW1lbnRDb25zdHJ1Y3Rv cgpAQCAtNTUwLDYgKzU1MCw5IEBAIFdlYkluc3BlY3Rvci5GdW5jdGlvblNjb3BlTWFpblRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgICAgIHRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJHbG9iYWwiKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlz VHJ1ZU9iamVjdCA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUu ZXJyb3IoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVbmtub3duIHNjb3BlIHR5cGU6IFwiJXNcIiIs IHNjb3BlLnR5cGUpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIHZhciByZW1vdGVPYmplY3QgPSBXZWJJbnNw ZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHNjb3BlLm9iamVjdCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU3RyaW5nLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0cmluZy5qcwppbmRleCBlYzZhMTg4NTc0 N2M2MzFkZmMxNDMzYjYzODczNTdkNTYwMDY3ZDYyLi44MjI2OTk0NzY3OGIxZjg1YTgzM2MwMzFh YzU4MDFiYjk3NTE3Yzc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1VJU3RyaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVUlTdHJpbmcuanMKQEAgLTI4LDI2ICsyOCwzNSBAQAogICogKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCiAg KiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNV Q0ggREFNQUdFLgogICovCisKICAvKioKLSAqIEBwYXJhbSB7c3RyaW5nfSBzdHJpbmcKLSAqIEBw YXJhbSB7Li4uKn0gdmFyYXJnCi0gKi8KKyAgKiBAcGFyYW0ge3N0cmluZ30gc3RyaW5nCisgICog QHJldHVybiB7c3RyaW5nfQorICAqLworV2ViSW5zcGVjdG9yLl9sb2NhbGl6ZSA9IGZ1bmN0aW9u KHN0cmluZykgeworICAgIGlmICghUHJlZmVyZW5jZXMubG9jYWxpemVVSSkKKyAgICAgICAgcmV0 dXJuIHN0cmluZzsKKyAgICBpZiAod2luZG93LmxvY2FsaXplZFN0cmluZ3MgJiYgc3RyaW5nIGlu IHdpbmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQorICAgICAgICByZXR1cm4gd2luZG93LmxvY2FsaXpl ZFN0cmluZ3Nbc3RyaW5nXTsKKworICAgIGlmICghKHN0cmluZyBpbiBXZWJJbnNwZWN0b3IuX21p c3NpbmdMb2NhbGl6ZWRTdHJpbmdzKSkgeworICAgICAgICBjb25zb2xlLndhcm4oIkxvY2FsaXpl ZCBzdHJpbmcgXCIiICsgc3RyaW5nICsgIlwiIG5vdCBmb3VuZC4iKTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLl9taXNzaW5nTG9jYWxpemVkU3RyaW5nc1tzdHJpbmddID0gdHJ1ZTsKKyAgICB9Cisg ICAgaWYgKFByZWZlcmVuY2VzLnNob3dNaXNzaW5nTG9jYWxpemVkU3RyaW5ncykKKyAgICAgICAg c3RyaW5nICs9ICIgKG5vdCBsb2NhbGl6ZWQpIjsKKworICAgIHJldHVybiBzdHJpbmc7Cit9CisK KyAvKioKKyAgKiBAcGFyYW0ge3N0cmluZ30gc3RyaW5nCisgICogQHBhcmFtIHsuLi4qfSB2YXJh cmcKKyAgKiBAcmV0dXJuIHtzdHJpbmd9CisgICovCiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcgPSBm dW5jdGlvbihzdHJpbmcsIHZhcmFyZykKIHsKLSAgICBpZiAoUHJlZmVyZW5jZXMubG9jYWxpemVV SSkgewotICAgICAgICBpZiAod2luZG93LmxvY2FsaXplZFN0cmluZ3MgJiYgc3RyaW5nIGluIHdp bmRvdy5sb2NhbGl6ZWRTdHJpbmdzKQotICAgICAgICAgICAgc3RyaW5nID0gd2luZG93LmxvY2Fs aXplZFN0cmluZ3Nbc3RyaW5nXTsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBpZiAoIShz dHJpbmcgaW4gV2ViSW5zcGVjdG9yLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncykpIHsKLSAgICAg ICAgICAgICAgICBjb25zb2xlLndhcm4oIkxvY2FsaXplZCBzdHJpbmcgXCIiICsgc3RyaW5nICsg IlwiIG5vdCBmb3VuZC4iKTsKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuX21pc3NpbmdM b2NhbGl6ZWRTdHJpbmdzW3N0cmluZ10gPSB0cnVlOwotICAgICAgICAgICAgfQotICAgIAotICAg ICAgICAgICAgaWYgKFByZWZlcmVuY2VzLnNob3dNaXNzaW5nTG9jYWxpemVkU3RyaW5ncykKLSAg ICAgICAgICAgICAgICBzdHJpbmcgKz0gIiAobm90IGxvY2FsaXplZCkiOwotICAgICAgICB9Ci0g ICAgfQotICAgIHJldHVybiBTdHJpbmcudnNwcmludGYoc3RyaW5nLCBBcnJheS5wcm90b3R5cGUu c2xpY2UuY2FsbChhcmd1bWVudHMsIDEpKTsKKyAgICByZXR1cm4gU3RyaW5nLnZzcHJpbnRmKFdl Ykluc3BlY3Rvci5fbG9jYWxpemUoc3RyaW5nKSwgQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwo YXJndW1lbnRzLCAxKSk7CiB9CiAKIFdlYkluc3BlY3Rvci5fbWlzc2luZ0xvY2FsaXplZFN0cmlu Z3MgPSB7fTsK 189504 2013-02-21 03:51:55 -0800 2013-02-26 08:11:16 -0800 Patch bug-110095-20130221154815.patch text/plain 4146 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjgxYTU2ODFlYzljNGEy N2FmYzMwYjFiZGY0Njg5NmNiMjJiOGUzNS4uMmQ3OTYyNGVkOWZkMDE2ODY5ZjliNmY2ODMzZjNi ZWQzYjc2OGFkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTE4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFdlYiBJbnNwZWN0b3I6IFNwZWNpZnkgcmV0dXJuIHR5cGUgb2YgV2ViSW5zcGVjdG9y LlVJU3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTAwOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTcGVjaWZ5IHJldHVybiB0eXBlIG9mIFdlYkluc3BlY3Rvci5VSVN0cmluZy4KKyAgICAgICAg Rml4IG5ldyBqcy1jb21waWxlciB3YXJuaW5ncy4KKworICAgICAgICBUaGlzIGNoYW5nZSB3aWxs IGluY3JlYXNlIHR5cGUgY292ZXJhZ2UgYnkgMC40JSAodG8gODElKQorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qczogRml4IHR5cGUgZXJy b3JzLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlTdHJpbmcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVUlTdHJpbmcpOiBSZXR1cm4gdHlwZSBzcGVjaWZpZWQuCisKIDIwMTMt MDItMjEgIFRhbWFzIEN6ZW5lICA8dGN6ZW5lQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBP cGVuQ0wgaW1wbGVtZW50YXRpb24gb2YgRkVNZXJnZSBmaWx0ZXIuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2Vi Q29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggMTE5YWIyOGE5NTk4 YTAyOTAwN2MwMzI0ZDZiZTVmN2EzYzNhN2E3MS4uZmMzZDA2NjIxYjAyMzU2YjZkOTJlYWI2ZjA5 NDBiOGRkMGQ4ZWZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9s b2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qcwpAQCAtNDQ2LDYgKzQ0Niw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIlVz ZSBzbWFsbCByZXNvdXJjZSByb3dzLiJdID0gIlVzZSBzbWFsbCByZXNvdXJjZSByb3dzLiI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJVc2UgJXMgQ2xpY2sgdG8gc2VsZWN0IG11bHRpcGxlIHR5cGVzLiJd ID0gIlVzZSAlcyBDbGljayB0byBzZWxlY3QgbXVsdGlwbGUgdHlwZXMuIjsKIGxvY2FsaXplZFN0 cmluZ3NbIlVzZWQgSGVhcCBTaXplIl0gPSAiVXNlZCBIZWFwIFNpemUiOwogbG9jYWxpemVkU3Ry aW5nc1siVW5oaWRlIGFsbCJdID0gIlVuaGlkZSBhbGwiOworbG9jYWxpemVkU3RyaW5nc1siVW5r bm93biBzY29wZSB0eXBlOiBcIiVzXCIiXSA9ICJVbmtub3duIHNjb3BlIHR5cGU6IFwiJXNcIiI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJWYWx1ZSJdID0gIlZhbHVlIjsKIGxvY2FsaXplZFN0cmluZ3Nb IldhaXRpbmciXSA9ICJXYWl0aW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIldhcm5pbmdzIl0gPSAi V2FybmluZ3MiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMKaW5kZXggZjRhYmUzYTZjNjFlYmJl Nzg3NmY0Y2M4MjgzZTRkN2QxNDc0YjMxYS4uMDU5YWVmNGU2NDU5NjJiZjk0Y2JhZGE3NTNmNTQ3 YTAyODZiMGYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCkBAIC0yOCw5ICsyOCw5IEBA CiAgKiBAY29uc3RydWN0b3IKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuUHJvcGVydGllc1Nl Y3Rpb259CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SZW1vdGVPYmplY3R9IG9iamVjdAotICog QHBhcmFtIHtzdHJpbmd8RWxlbWVudD19IHRpdGxlCisgKiBAcGFyYW0gez9zdHJpbmd8RWxlbWVu dD19IHRpdGxlCiAgKiBAcGFyYW0ge3N0cmluZz19IHN1YnRpdGxlCi0gKiBAcGFyYW0ge3N0cmlu Zz19IGVtcHR5UGxhY2Vob2xkZXIKKyAqIEBwYXJhbSB7P3N0cmluZz19IGVtcHR5UGxhY2Vob2xk ZXIKICAqIEBwYXJhbSB7Ym9vbGVhbj19IGlnbm9yZUhhc093blByb3BlcnR5CiAgKiBAcGFyYW0g e0FycmF5LjxXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0UHJvcGVydHk+PX0gZXh0cmFQcm9wZXJ0 aWVzCiAgKiBAcGFyYW0ge2Z1bmN0aW9uKG5ldzpUcmVlRWxlbWVudCwgV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdFByb3BlcnR5KT19IHRyZWVFbGVtZW50Q29uc3RydWN0b3IKQEAgLTU1MCw2ICs1 NTAsOSBAQCBXZWJJbnNwZWN0b3IuRnVuY3Rpb25TY29wZU1haW5UcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgICAgICB0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiR2xvYmFsIik7CiAgICAgICAgICAgICAgICAgICAgICAgICBpc1RydWVPYmplY3QgPSB0 cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAg IGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiVW5rbm93biBzY29wZSB0eXBlOiBcIiVzXCIiLCBzY29wZS50eXBlKSk7 CisgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgICAgICB2YXIgcmVtb3RlT2JqZWN0ID0gV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdC5mcm9tUGF5bG9hZChzY29wZS5vYmplY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0cmluZy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVUlTdHJpbmcuanMKaW5kZXggZWM2YTE4ODU3NDdjNjMxZGZjMTQzM2I2 Mzg3MzU3ZDU2MDA2N2Q2Mi4uM2E0ODIwOWI5OTEyZTU2YTQ2ZTkxZGRhNjU1MjM2MTJiNzkxMTYx NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0cmlu Zy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU3RyaW5nLmpz CkBAIC0yOCw5ICsyOCwxMSBAQAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCiAgKiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICov CisKICAvKioKICAqIEBwYXJhbSB7c3RyaW5nfSBzdHJpbmcKICAqIEBwYXJhbSB7Li4uKn0gdmFy YXJnCisgKiBAcmV0dXJuIHtzdHJpbmd9CiAgKi8KIFdlYkluc3BlY3Rvci5VSVN0cmluZyA9IGZ1 bmN0aW9uKHN0cmluZywgdmFyYXJnKQogewpAQCAtNDIsNyArNDQsNyBAQCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIHZhcmFyZykKICAgICAgICAgICAgICAgICBjb25z b2xlLndhcm4oIkxvY2FsaXplZCBzdHJpbmcgXCIiICsgc3RyaW5nICsgIlwiIG5vdCBmb3VuZC4i KTsKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuX21pc3NpbmdMb2NhbGl6ZWRTdHJpbmdz W3N0cmluZ10gPSB0cnVlOwogICAgICAgICAgICAgfQotICAgIAorCiAgICAgICAgICAgICBpZiAo UHJlZmVyZW5jZXMuc2hvd01pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzKQogICAgICAgICAgICAgICAg IHN0cmluZyArPSAiIChub3QgbG9jYWxpemVkKSI7CiAgICAgICAgIH0K 190286 2013-02-26 08:09:08 -0800 2013-02-26 08:17:28 -0800 Patch bug-110095-20130226200522.patch text/plain 3294 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAzOWE0ZTZkMGM3MTBi NGIxNjI1YjFlNDZkOGFhYTJlMTdjMmU4My4uMDFmZjFjODNhNjMyYjZkMjU1YWZhNjYwZDhhOTRj ZWE0ZjRiM2JmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTE4ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFdlYiBJbnNwZWN0b3I6IFNwZWNpZnkgcmV0dXJuIHR5cGUgb2YgV2ViSW5zcGVjdG9y LlVJU3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTAwOTUKKworICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgorCisgICAgICAg IFNwZWNpZnkgcmV0dXJuIHR5cGUgb2YgV2ViSW5zcGVjdG9yLlVJU3RyaW5nLgorICAgICAgICBG aXggbmV3IGpzLWNvbXBpbGVyIHdhcm5pbmdzLgorCisgICAgICAgIFRoaXMgY2hhbmdlIHdpbGwg aW5jcmVhc2UgdHlwZSBjb3ZlcmFnZSBieSAwLjQlICh0byA4MSUpCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzOiBGaXggdHlwZSBlcnJv cnMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0cmluZy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5VSVN0cmluZyk6IFJldHVybiB0eXBlIHNwZWNpZmllZC4KKwogMjAxMy0w Mi0yNiAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4 XSBSZW5hbWUgQmF0Y2hlZENhbGxiYWNrIHRvIEJhdGNoZWRNZXRob2QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24u anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFByb3BlcnRpZXNT ZWN0aW9uLmpzCmluZGV4IGY0YWJlM2E2YzYxZWJiZTc4NzZmNGNjODI4M2U0ZDdkMTQ3NGIzMWEu LmMwNmZlNDNjMDA1OGYxMDVjZWE1NjQ0M2EyNWMwMGE4OTUzOTVlZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVydGllc1NlY3Rpb24u anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0 aWVzU2VjdGlvbi5qcwpAQCAtMjgsOSArMjgsOSBAQAogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0 ZW5kcyB7V2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0aW9ufQogICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuUmVtb3RlT2JqZWN0fSBvYmplY3QKLSAqIEBwYXJhbSB7c3RyaW5nfEVsZW1lbnQ9fSB0 aXRsZQorICogQHBhcmFtIHs/c3RyaW5nfEVsZW1lbnQ9fSB0aXRsZQogICogQHBhcmFtIHtzdHJp bmc9fSBzdWJ0aXRsZQotICogQHBhcmFtIHtzdHJpbmc9fSBlbXB0eVBsYWNlaG9sZGVyCisgKiBA cGFyYW0gez9zdHJpbmc9fSBlbXB0eVBsYWNlaG9sZGVyCiAgKiBAcGFyYW0ge2Jvb2xlYW49fSBp Z25vcmVIYXNPd25Qcm9wZXJ0eQogICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlJlbW90 ZU9iamVjdFByb3BlcnR5Pj19IGV4dHJhUHJvcGVydGllcwogICogQHBhcmFtIHtmdW5jdGlvbihu ZXc6VHJlZUVsZW1lbnQsIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3RQcm9wZXJ0eSk9fSB0cmVl RWxlbWVudENvbnN0cnVjdG9yCkBAIC01NTAsNiArNTUwLDkgQEAgV2ViSW5zcGVjdG9yLkZ1bmN0 aW9uU2NvcGVNYWluVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAg ICAgICAgdGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkdsb2JhbCIpOwogICAgICAgICAg ICAgICAgICAgICAgICAgaXNUcnVlT2JqZWN0ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAg ICAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biBzY29wZSB0eXBlOiAiICsgc2NvcGUudHlw ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgICAgICB2YXIgcmVtb3RlT2JqZWN0ID0gV2ViSW5zcGVjdG9yLlJlbW90 ZU9iamVjdC5mcm9tUGF5bG9hZChzY29wZS5vYmplY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0cmluZy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVUlTdHJpbmcuanMKaW5kZXggZWM2YTE4ODU3NDdjNjMxZGZjMTQz M2I2Mzg3MzU3ZDU2MDA2N2Q2Mi4uM2E0ODIwOWI5OTEyZTU2YTQ2ZTkxZGRhNjU1MjM2MTJiNzkx MTYxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVN0 cmluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU3RyaW5n LmpzCkBAIC0yOCw5ICsyOCwxMSBAQAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCiAgKiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog ICovCisKICAvKioKICAqIEBwYXJhbSB7c3RyaW5nfSBzdHJpbmcKICAqIEBwYXJhbSB7Li4uKn0g dmFyYXJnCisgKiBAcmV0dXJuIHtzdHJpbmd9CiAgKi8KIFdlYkluc3BlY3Rvci5VSVN0cmluZyA9 IGZ1bmN0aW9uKHN0cmluZywgdmFyYXJnKQogewpAQCAtNDIsNyArNDQsNyBAQCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcgPSBmdW5jdGlvbihzdHJpbmcsIHZhcmFyZykKICAgICAgICAgICAgICAgICBj b25zb2xlLndhcm4oIkxvY2FsaXplZCBzdHJpbmcgXCIiICsgc3RyaW5nICsgIlwiIG5vdCBmb3Vu ZC4iKTsKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuX21pc3NpbmdMb2NhbGl6ZWRTdHJp bmdzW3N0cmluZ10gPSB0cnVlOwogICAgICAgICAgICAgfQotICAgIAorCiAgICAgICAgICAgICBp ZiAoUHJlZmVyZW5jZXMuc2hvd01pc3NpbmdMb2NhbGl6ZWRTdHJpbmdzKQogICAgICAgICAgICAg ICAgIHN0cmluZyArPSAiIChub3QgbG9jYWxpemVkKSI7CiAgICAgICAgIH0K