69799 2011-10-10 16:36:09 -0700 Extra arguments for JavaScript Constructors should come first 2011-10-12 12:27:38 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 69801 1 annacc annacc abarth darin haraken sam webkit.review.bot oldest_to_newest 481281 0 annacc 2011-10-10 16:36:09 -0700 Especially for JavaScript Constructors that have optional arguments, having the extra parameters (ScriptExecutionContext and ExceptionCode) come at the end of the argument list is inconvenient and forces authors to make these important arguments optional when likely they are not. 481308 1 110442 annacc 2011-10-10 17:07:46 -0700 Created attachment 110442 Patch 481319 2 110442 gyuyoung.kim 2011-10-10 17:12:33 -0700 Comment on attachment 110442 Patch Attachment 110442 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/10025131 481326 3 110442 abarth 2011-10-10 17:13:45 -0700 Comment on attachment 110442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110442&action=review > Source/WebCore/css/WebKitCSSMatrix.h:42 > - static PassRefPtr<WebKitCSSMatrix> create(const String& s, ExceptionCode& ec) > + static PassRefPtr<WebKitCSSMatrix> create(ExceptionCode& ec, const String& s) Usually the ExceptionCode is the last argument. 481327 4 110442 webkit-ews 2011-10-10 17:14:09 -0700 Comment on attachment 110442 Patch Attachment 110442 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10028061 481328 5 annacc 2011-10-10 17:14:26 -0700 haraken, I'm adding you as you seem to be working in this area too. I'm open to suggestions. 481345 6 darin 2011-10-10 17:36:30 -0700 Who are these authors you are talking about, who have to make these arguments optional? This change looks like a V8-only change. What about the original WebKit JavaScript engine? 481347 7 haraken 2011-10-10 17:39:13 -0700 (In reply to comment #5) > haraken, I'm adding you as you seem to be working in this area too. I'm open to suggestions. I agree to this change. I am waiting for this patch landed! - I am afraid that this change will break JSC build. You need to change the corresponding custom constructors in JSC too. - I think it is OK to make changes only for WebKitCSSMatrix, EventSource and Worker in this patch, but please note that there are other custom constructors that are putting ScriptExecutionContext as the last argument. (As far as I see, all the custom constructors that are using ScriptExecutionContext are putting it as the last argument.) Please make a follow-up patch for fixing it. (If you do not want to do it, I can do it instead.) 481350 8 darin 2011-10-10 17:41:38 -0700 I’m sorry, this does not look right to me. Why does it matter whether these arguments are first or last? The arguments are passed from generated code; the arguments should not be optional. 481356 9 annacc 2011-10-10 17:46:44 -0700 Thanks everyone for the feedback! As for why authors might need optional arguments, I suppose I am suggesting this for selfish reasons as I will need to do something like this: cue = new TextTrackCue( id, startTime, endTime, text [, settings [, pauseOnExit ] ] ) http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#texttrackcue As for other JavaScript engines, yes I see now that I need to do that. haraken, I'd love some help with that as I won't know what other classes will be broken by this patch beyond the ones that use V8. 481359 10 abarth 2011-10-10 17:54:08 -0700 > Why does it matter whether these arguments are first or last? The arguments are passed from > generated code; the arguments should not be optional. These context objects can be added by the code generator both for constructors and for normal function members. For normal function members, we pass them in at the beginning. For constructor functions, we pass them in at the end. This patch is mostly about consistency between these two approaches. We've been moving WebKit's IDL to be closer to WebIDL, which treats the constructor more like a normal function (e.g., you can specify the types of the arguments like you would for a normal function). 481361 11 haraken 2011-10-10 17:59:02 -0700 (In reply to comment #10) > > Why does it matter whether these arguments are first or last? The arguments are passed from > > generated code; the arguments should not be optional. > > These context objects can be added by the code generator both for constructors and for normal function members. For normal function members, we pass them in at the beginning. For constructor functions, we pass them in at the end. > > This patch is mostly about consistency between these two approaches. We've been moving WebKit's IDL to be closer to WebIDL, which treats the constructor more like a normal function (e.g., you can specify the types of the arguments like you would for a normal function). I agree to the idea. I think that it is possible to solve the current problem by setting [CallWithDefaultValue] or [CallWithNullValue] for |settings| and |pauseOnExit|, but moving ScriptExecutionContext to the beginning makes more sense for consistency. 481366 12 haraken 2011-10-10 18:08:50 -0700 (In reply to comment #9) > As for other JavaScript engines, yes I see now that I need to do that. haraken, I'd love some help with that as I won't know what other classes will be broken by this patch beyond the ones that use V8. OK, please make changes for WebKitCSSMatrix, EventSource and Worker in this patch. I think that this change won't break anything, since the constructors that are putting ScriptExecutionContext at the end and are using CodeGeneratorV8.pm are only the above three. I will make a follow-up patch for making the similar changes for other custom constructors that are not using CodeGeneratorV8.pm. 481746 13 110543 annacc 2011-10-11 11:15:34 -0700 Created attachment 110543 Patch 481834 14 110558 annacc 2011-10-11 12:42:01 -0700 Created attachment 110558 Patch including changes to test files 481837 15 110558 abarth 2011-10-11 12:46:15 -0700 Comment on attachment 110558 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110558&action=review Assuming this builds, this looks great. > Source/WebCore/ChangeLog:4 > + IDL constructors that use ConstrcutorWith=ScriptExecutionContext. ConstrcutorWith <-- typo 482507 16 110701 annacc 2011-10-12 10:42:00 -0700 Created attachment 110701 Patch for landing 482606 17 110701 abarth 2011-10-12 12:27:29 -0700 Comment on attachment 110701 Patch for landing Clearing flags on attachment: 110701 Committed r97287: <http://trac.webkit.org/changeset/97287> 482607 18 abarth 2011-10-12 12:27:34 -0700 All reviewed patches have been landed. Closing bug. 110442 2011-10-10 17:07:46 -0700 2011-10-11 11:15:29 -0700 Patch bug-69799-20111010170745.patch text/plain 5370 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwNjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1N2ZlMWU5MGM4MjVhNmY1 NjY5M2NjODIxYTBlMjY0ZTZlNDM4NTYwLi41MWI0OTczZDRkNGFhNzIyZGZiMGY1ZTMxODMxOGNl ODZkNjVkMzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMTAtMTAgIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1ha2luZyB0aGUgZXh0 cmEgYXJndW1lbnRzIChpLmUuIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQgYW5kIEV4Y2VwdGlvbkNv ZGUpCisgICAgICAgIGNvbWUgZmlyc3QgaW4gY3VzdG9tIEphdmFTY3JpcHQgQ29uc3RydWN0b3Jz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk3OTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0czoK KyAgICAgICAgLSBmYXN0L2Nzcy9tYXRyaXgtYXMtZnVuY3Rpb24tY3Jhc2guaHRtbCAoZm9yIFdl YktpdENTU01hdHJpeCkKKyAgICAgICAgLSBodHRwL3Rlc3RzL2V2ZW50c291cmNlLyogKGZvciBF dmVudFNvdXJjZSkKKyAgICAgICAgLSBmYXN0L2ZpbGVzeXN0ZW0vKiAoZm9yIFdvcmtlcikKKyAg ICAgICAgCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToK KyAgICAgICAgKEdlbmVyYXRlQ29uc3RydWN0b3JDYWxsYmFjayk6IGNoYW5nZXMgb3JkZXIgb2Yg dGhlIGFyZ3VtZW50IGxpc3QKKyAgICAgICAgKiBjc3MvV2ViS2l0Q1NTTWF0cml4Lmg6CisgICAg ICAgIChXZWJDb3JlOjpXZWJLaXRDU1NNYXRyaXg6OmNyZWF0ZSk6IGNoYW5naW5nIG9yZGVyIG9m IGNvbnN0cnVjdG9yIHBhcmFtcworICAgICAgICAqIHBhZ2UvRXZlbnRTb3VyY2UuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RXZlbnRTb3VyY2U6OmNyZWF0ZSk6IGNoYW5naW5nIG9yZGVyIG9mIGNv bnN0cnVjdG9yIHBhcmFtcworICAgICAgICAqIHBhZ2UvRXZlbnRTb3VyY2UuaDoKKyAgICAgICAg KiB3b3JrZXJzL1dvcmtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXb3JrZXI6OmNyZWF0ZSk6 IGNoYW5naW5nIG9yZGVyIG9mIGNvbnN0cnVjdG9yIHBhcmFtcworICAgICAgICAqIHdvcmtlcnMv V29ya2VyLmg6CisKIDIwMTEtMTAtMTAgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFNocmluayBSZW5kZXJMYXllciBhbmQgU2Nyb2xsYWJsZUFyZWEuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5w bSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmlu ZGV4IDAwNWJiOTM3NmMwNmNjNjVjNWM5ZWJhNmU2OTY2MmMwNGQyMDQ3ZTAuLmVkZjdjMDBlNTQz ODZiZGFiNWNhOTBjYzJjNjZhMDlhZWNlYjBhYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCkBAIC0xNTYwLDcgKzE1NjAsNyBA QCBFTkQKICAgICAgICAgJGluZGV4Kys7CiAgICAgfQogCi0gICAgbXkgJGFyZ3VtZW50U3RyaW5n ID0gam9pbigiLCAiLCBAYXJndW1lbnRMaXN0LCBAZXh0cmFBcmd1bWVudExpc3QpOworICAgIG15 ICRhcmd1bWVudFN0cmluZyA9IGpvaW4oIiwgIiwgQGV4dHJhQXJndW1lbnRMaXN0LCBAYXJndW1l bnRMaXN0KTsKICAgICBwdXNoKEBpbXBsQ29udGVudCwgIlxuIik7CiAgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgUmVmUHRyPCR7aW1wbENsYXNzTmFtZX0+IG9iaiA9ICR7aW1wbENsYXNzTmFt ZX06OmNyZWF0ZSgke2FyZ3VtZW50U3RyaW5nfSk7XG4iKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL1dlYktpdENTU01hdHJpeC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1dlYktp dENTU01hdHJpeC5oCmluZGV4IDEwN2JmOGI2YWIxMWZlMzlmMzYxOThiY2IxYTFlODJjYjgxNDJj NjMuLjRiMGE4ZjJkY2QxZDUyMjU4YjNjYTVkNDdkZDA5NjU5OGNmZjM2ZjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NNYXRyaXguaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvV2ViS2l0Q1NTTWF0cml4LmgKQEAgLTM5LDcgKzM5LDcgQEAgcHVibGljOgogICAgIHsK ICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJLaXRDU1NNYXRyaXgobSkpOwogICAgIH0K LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJLaXRDU1NNYXRyaXg+IGNyZWF0ZShjb25zdCBTdHJp bmcmIHMsIEV4Y2VwdGlvbkNvZGUmIGVjKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYktpdENT U01hdHJpeD4gY3JlYXRlKEV4Y2VwdGlvbkNvZGUmIGVjLCBjb25zdCBTdHJpbmcmIHMpCiAgICAg ewogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYktpdENTU01hdHJpeChzLCBlYykpOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5jcHAKaW5kZXggOTZlYzkyOWM1NGI4MDY4 ZWIyZDMzZmZjZTc1NDAyZjFiNzA4YjhhMC4uODgwYjM1NTdkZjZiMmRiMTYwM2NkMmE4ODc5Y2M2 OWVjN2UxYjQxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5jcHAKQEAgLTY5LDcgKzY5 LDcgQEAgaW5saW5lIEV2ZW50U291cmNlOjpFdmVudFNvdXJjZShjb25zdCBLVVJMJiB1cmwsIFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQKIHsKIH0KIAotUGFzc1JlZlB0cjxFdmVudFNv dXJjZT4gRXZlbnRTb3VyY2U6OmNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCogY29udGV4dCwgRXhjZXB0aW9uQ29kZSYgZWMpCitQYXNzUmVmUHRyPEV2ZW50 U291cmNlPiBFdmVudFNvdXJjZTo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRl eHQsIEV4Y2VwdGlvbkNvZGUmIGVjLCBjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBpZiAodXJs LmlzRW1wdHkoKSkgewogICAgICAgICBlYyA9IFNZTlRBWF9FUlI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0V2ZW50U291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 U291cmNlLmgKaW5kZXggYThiOGI0MWEzOTFlNWU2YjA4MDY4NjBiZTM3MzdhZjYwNzZlYTcxMi4u OGFhMGI3NTIzNDczM2M0NTM5MmFjMWFmODRiYzBhMWJiNGM2YjE0ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRTb3VyY2UuaApAQCAtNTEsNyArNTEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgRXZlbnRTb3VyY2UgOiBwdWJsaWMgUmVmQ291bnRlZDxFdmVudFNvdXJjZT4sIHB1Ymxp YyBFdmVudFRhcmdldCwgcHJpdmF0ZSBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50LCBwdWJsaWMgQWN0 aXZlRE9NT2JqZWN0IHsKICAgICAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgcHVi bGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxFdmVudFNvdXJjZT4gY3JlYXRlKGNvbnN0 IFN0cmluZyYgdXJsLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgRXhjZXB0aW9uQ29kZSYpOwor ICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxFdmVudFNvdXJjZT4gY3JlYXRlKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBFeGNlcHRpb25Db2RlJiwgY29uc3QgU3RyaW5nJiB1cmwpOwogICAgICAg ICB2aXJ0dWFsIH5FdmVudFNvdXJjZSgpOwogCiAgICAgICAgIHN0YXRpYyBjb25zdCB1bnNpZ25l ZCBsb25nIGxvbmcgZGVmYXVsdFJlY29ubmVjdERlbGF5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvd29ya2Vycy9Xb3JrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIu Y3BwCmluZGV4IDZiNzU5ZTAzNTJmNWNiNTZjZGUxZmY2ZDUwNTBlNThjMTYxZjk0YzguLjkyYzc5 ZTgxZTE1ODVmYjFmZTZkMTdlMzVlOTRiMGM0MWMzMjNlNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvV29ya2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dv cmtlci5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgaW5saW5lIFdvcmtlcjo6V29ya2VyKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCiB7CiB9CiAKLVBhc3NSZWZQdHI8V29ya2VyPiBXb3Jr ZXI6OmNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCwgRXhjZXB0aW9uQ29kZSYgZWMpCitQYXNzUmVmUHRyPFdvcmtlcj4gV29ya2VyOjpjcmVh dGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgRXhjZXB0aW9uQ29kZSYgZWMsIGNv bnN0IFN0cmluZyYgdXJsKQogewogICAgIFJlZlB0cjxXb3JrZXI+IHdvcmtlciA9IGFkb3B0UmVm KG5ldyBXb3JrZXIoY29udGV4dCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3Jr ZXJzL1dvcmtlci5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuaAppbmRleCBhMGM3 MDEwOWUyNzExNTYzYjVhM2UzNTViNGZkMmZiZGYyZWM4N2M1Li40MzU0NmY4MWQ1ZjEwMGU4NDJj ZTg3NjViMGE0ZDU2YTVkZTMwODM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz L1dvcmtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmgKQEAgLTUxLDcg KzUxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgV29ya2VyIDogcHVibGlj IEFic3RyYWN0V29ya2VyLCBwcml2YXRlIFdvcmtlclNjcmlwdExvYWRlckNsaWVudCB7CiAgICAg cHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXb3JrZXI+IGNyZWF0ZShjb25zdCBT dHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIEV4Y2VwdGlvbkNvZGUmKTsKKyAg ICAgICAgc3RhdGljIFBhc3NSZWZQdHI8V29ya2VyPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIEV4Y2VwdGlvbkNvZGUmLCBjb25zdCBTdHJpbmcmIHVybCk7CiAgICAgICAgIHZpcnR1 YWwgfldvcmtlcigpOwogCiAgICAgICAgIHZpcnR1YWwgV29ya2VyKiB0b1dvcmtlcigpIHsgcmV0 dXJuIHRoaXM7IH0K 110543 2011-10-11 11:15:34 -0700 2011-10-11 12:41:56 -0700 Patch bug-69799-20111011111532.patch text/plain 6958 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlNWViYTQ3ODMwMDRhMDM2 ZWY4YjFkNmNiYWNmYzNkNjJiNjUyMTE2Li44NmU4OWQxYzIwMWJkNDllNjdhY2RjOTU2MDc1ZTE4 N2IwMmY0ZjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMTAtMTEgIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1vdmluZyBTY3JpcHRF eGVjdXRpb25Db250ZXh0IHRvIHRoZSBmcm9udCBvZiB0aGUgYXJndW1lbnQgbGlzdCBmb3IKKyAg ICAgICAgSURMIGNvbnN0cnVjdG9ycyB0aGF0IHVzZSBDb25zdHJjdXRvcldpdGg9U2NyaXB0RXhl Y3V0aW9uQ29udGV4dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY5Nzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdHM6CisgICAgICAgIC0gaHR0cC90ZXN0cy9ldmVudHNvdXJjZS8qIChmb3IgRXZl bnRTb3VyY2UpCisgICAgICAgIC0gZmFzdC9maWxlc3lzdGVtLyogKGZvciBXb3JrZXIpCisKKyAg ICAgICAgKiBiaW5kaW5ncy9qcy9KU0V2ZW50U291cmNlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkpTRXZlbnRTb3VyY2VDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0SlNFdmVudFNvdXJjZSk6 CisgICAgICAgICogYmluZGluZ3MvanMvSlNXb3JrZXJDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SlNXb3JrZXJDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0SlNXb3JrZXIpOgorICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAoR2VuZXJhdGVD b25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAgICAgKiBwYWdlL0V2ZW50U291cmNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkV2ZW50U291cmNlOjpjcmVhdGUpOgorICAgICAgICAqIHBhZ2UvRXZl bnRTb3VyY2UuaDoKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpXb3JrZXI6OmNyZWF0ZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXIuaDoKKwogMjAx MS0xMC0xMSAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAg ICAgICAgIFtRdF1bV0syXSBTeW5jaHJvbml6ZSB0aWxpbmcgd2l0aCBhY2NlbGVyYXRlZCBjb21w b3NpdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudFNv dXJjZUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50U291cmNl Q3VzdG9tLmNwcAppbmRleCA2NjFjM2RlNTc3YmExZjI1ZmI3MDliNWM4ZGRlZDc3YzE4NmY3ZWMw Li5lZTM1MWIxZjM3MzE1NTUwZjIzNjYxN2YwMTk3YzEyMmQ2MWJmNjFhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50U291cmNlQ3VzdG9tLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50U291cmNlQ3VzdG9tLmNwcApAQCAtNTYs NyArNTYsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIEpTRXZlbnRTb3VyY2VDb25z dHJ1Y3Rvcjo6Y29uc3RydWN0SlNFdmVudFNvdXJjZShFeAogICAgICAgICByZXR1cm4gdGhyb3dW TUVycm9yKGV4ZWMsIGNyZWF0ZVJlZmVyZW5jZUVycm9yKGV4ZWMsICJFdmVudFNvdXJjZSBjb25z dHJ1Y3RvciBhc3NvY2lhdGVkIGRvY3VtZW50IGlzIHVuYXZhaWxhYmxlIikpOwogCiAgICAgRXhj ZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAgUmVmUHRyPEV2ZW50U291cmNlPiBldmVudFNvdXJjZSA9 IEV2ZW50U291cmNlOjpjcmVhdGUodXN0cmluZ1RvU3RyaW5nKHVybCksIGNvbnRleHQsIGVjKTsK KyAgICBSZWZQdHI8RXZlbnRTb3VyY2U+IGV2ZW50U291cmNlID0gRXZlbnRTb3VyY2U6OmNyZWF0 ZShjb250ZXh0LCB1c3RyaW5nVG9TdHJpbmcodXJsKSwgZWMpOwogICAgIGlmIChlYykgewogICAg ICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKEpTVmFsdWUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU1dvcmtlckN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtl ckN1c3RvbS5jcHAKaW5kZXggMGJhMzdlM2UwYzYzZWZiZTZmMzJmZDY1ZTQzYTJiYmVkZjBlOTA0 MC4uYWExZWVlNTkxMzAwMTdmNTgwZDM5MDNmZmVhNjZlNDBkZGE0ZjQxMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJDdXN0b20uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ3VzdG9tLmNwcApAQCAtNjUsNyArNjUsNyBA QCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIEpTV29ya2VyQ29uc3RydWN0b3I6OmNvbnN0 cnVjdEpTV29ya2VyKEV4ZWNTdGF0ZSogZQogICAgIERPTVdpbmRvdyogd2luZG93ID0gYXNKU0RP TVdpbmRvdyhleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCkpLT5pbXBsKCk7CiAKICAgICBFeGNl cHRpb25Db2RlIGVjID0gMDsKLSAgICBSZWZQdHI8V29ya2VyPiB3b3JrZXIgPSBXb3JrZXI6OmNy ZWF0ZSh1c3RyaW5nVG9TdHJpbmcoc2NyaXB0VVJMKSwgd2luZG93LT5kb2N1bWVudCgpLCBlYyk7 CisgICAgUmVmUHRyPFdvcmtlcj4gd29ya2VyID0gV29ya2VyOjpjcmVhdGUod2luZG93LT5kb2N1 bWVudCgpLCB1c3RyaW5nVG9TdHJpbmcoc2NyaXB0VVJMKSwgZWMpOwogICAgIGlmIChlYykgewog ICAgICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwogICAgICAgICByZXR1cm4gSlNWYWx1 ZTo6ZW5jb2RlKEpTVmFsdWUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCmluZGV4IGI2MTQ2MTNiMzAyMjJmZmMyNzQzOTY3MWRj YmEwN2I5YTYyZjY2ZmYuLmFiNjUzZWY4YjQ2YWY2NDQ5ZjUwNDNmYjJhYjcxOGFhZGNmYjk5NGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv clY4LnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv clY4LnBtCkBAIC0xNTQ1LDggKzE1NDUsOSBAQCBFTkQKICAgICBteSAoJHBhcmFtZXRlckNoZWNr U3RyaW5nLCAkcGFyYW1JbmRleCkgPSBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjaygkZnVuY3Rpb24s ICRpbXBsQ2xhc3NOYW1lKTsKICAgICBwdXNoKEBpbXBsQ29udGVudCwgJHBhcmFtZXRlckNoZWNr U3RyaW5nKTsKIAorICAgIG15IEBjb250ZXh0QXJndW1lbnQ7CiAgICAgaWYgKCRkYXRhTm9kZS0+ ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNvbnN0cnVjdG9yV2l0aCJ9ICYmICRkYXRhTm9kZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkNvbnN0cnVjdG9yV2l0aCJ9IGVxICJTY3JpcHRFeGVjdXRpb25D b250ZXh0IikgewotICAgICAgICBwdXNoKEBleHRyYUFyZ3VtZW50TGlzdCwgImNvbnRleHQiKTsK KyAgICAgICAgcHVzaChAY29udGV4dEFyZ3VtZW50LCAiY29udGV4dCIpOwogICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgPDxFTkQpOwogCiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCA9IGdldFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKQEAgLTE1NjcsNyArMTU2OCw3IEBA IEVORAogICAgICAgICAkaW5kZXgrKzsKICAgICB9CiAKLSAgICBteSAkYXJndW1lbnRTdHJpbmcg PSBqb2luKCIsICIsIEBhcmd1bWVudExpc3QsIEBleHRyYUFyZ3VtZW50TGlzdCk7CisgICAgbXkg JGFyZ3VtZW50U3RyaW5nID0gam9pbigiLCAiLCBAY29udGV4dEFyZ3VtZW50LCBAYXJndW1lbnRM aXN0LCBAZXh0cmFBcmd1bWVudExpc3QpOwogICAgIHB1c2goQGltcGxDb250ZW50LCAiXG4iKTsK ICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBSZWZQdHI8JHtpbXBsQ2xhc3NOYW1lfT4gb2Jq ID0gJHtpbXBsQ2xhc3NOYW1lfTo6Y3JlYXRlKCR7YXJndW1lbnRTdHJpbmd9KTtcbiIpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50U291cmNlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCmluZGV4IDk2ZWM5MjljNTRiODA2OGViMmQzM2Zm Y2U3NTQwMmYxYjcwOGI4YTAuLjIxMWU3ZGFiOTgzZWEzOGUzNzVmYTkyN2UxYWJiMzAxMGY1M2E3 MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCkBAIC02OSw3ICs2OSw3IEBAIGlu bGluZSBFdmVudFNvdXJjZTo6RXZlbnRTb3VyY2UoY29uc3QgS1VSTCYgdXJsLCBTY3JpcHRFeGVj dXRpb25Db250ZXh0KiBjb250ZXh0CiB7CiB9CiAKLVBhc3NSZWZQdHI8RXZlbnRTb3VyY2U+IEV2 ZW50U291cmNlOjpjcmVhdGUoY29uc3QgU3RyaW5nJiB1cmwsIFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqIGNvbnRleHQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorUGFzc1JlZlB0cjxFdmVudFNvdXJjZT4g RXZlbnRTb3VyY2U6OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb25z dCBTdHJpbmcmIHVybCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgaWYgKHVybC5pc0VtcHR5 KCkpIHsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudFNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5o CmluZGV4IGE4YjhiNDFhMzkxZTVlNmIwODA2ODYwYmUzNzM3YWY2MDc2ZWE3MTIuLmI3YjlmYzFi Zjc2YTg2MTZkOTc5MTAxMGZiNWYxOGJmZjIyODMwYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRXZlbnRTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50U291 cmNlLmgKQEAgLTUxLDcgKzUxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIEV2 ZW50U291cmNlIDogcHVibGljIFJlZkNvdW50ZWQ8RXZlbnRTb3VyY2U+LCBwdWJsaWMgRXZlbnRU YXJnZXQsIHByaXZhdGUgVGhyZWFkYWJsZUxvYWRlckNsaWVudCwgcHVibGljIEFjdGl2ZURPTU9i amVjdCB7CiAgICAgICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIHB1YmxpYzoKLSAg ICAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXZlbnRTb3VyY2U+IGNyZWF0ZShjb25zdCBTdHJpbmcm IHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICAgICAg c3RhdGljIFBhc3NSZWZQdHI8RXZlbnRTb3VyY2U+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiwgY29uc3QgU3RyaW5nJiB1cmwsIEV4Y2VwdGlvbkNvZGUmKTsKICAgICAgICAgdmlydHVh bCB+RXZlbnRTb3VyY2UoKTsKIAogICAgICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgbG9uZyBs b25nIGRlZmF1bHRSZWNvbm5lY3REZWxheTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvV29ya2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmNwcAppbmRl eCA2Yjc1OWUwMzUyZjVjYjU2Y2RlMWZmNmQ1MDUwZTU4YzE2MWY5NGM4Li45ZDQzMDkwZjhiOWFl N2Q3Mzc0MDNhMWQ3YzM1MmJiNGRkZjI1ZGY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL1dvcmtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuY3Bw CkBAIC01Niw3ICs1Niw3IEBAIGlubGluZSBXb3JrZXI6OldvcmtlcihTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBjb250ZXh0KQogewogfQogCi1QYXNzUmVmUHRyPFdvcmtlcj4gV29ya2VyOjpjcmVh dGUoY29uc3QgU3RyaW5nJiB1cmwsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIEV4 Y2VwdGlvbkNvZGUmIGVjKQorUGFzc1JlZlB0cjxXb3JrZXI+IFdvcmtlcjo6Y3JlYXRlKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgdXJsLCBFeGNlcHRpb25D b2RlJiBlYykKIHsKICAgICBSZWZQdHI8V29ya2VyPiB3b3JrZXIgPSBhZG9wdFJlZihuZXcgV29y a2VyKGNvbnRleHQpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3Jr ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmgKaW5kZXggYTBjNzAxMDllMjcx MTU2M2I1YTNlMzU1YjRmZDJmYmRmMmVjODdjNS4uMjEyYjUyYjE5MjAyMjIzMjhjNDIyYzUyNjlk MjVlYzI5MDY3OTYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5oCkBAIC01MSw3ICs1MSw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIFdvcmtlciA6IHB1YmxpYyBBYnN0cmFj dFdvcmtlciwgcHJpdmF0ZSBXb3JrZXJTY3JpcHRMb2FkZXJDbGllbnQgewogICAgIHB1YmxpYzoK LSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8V29ya2VyPiBjcmVhdGUoY29uc3QgU3RyaW5nJiB1 cmwsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBFeGNlcHRpb25Db2RlJik7CisgICAgICAgIHN0 YXRpYyBQYXNzUmVmUHRyPFdvcmtlcj4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBj b25zdCBTdHJpbmcmIHVybCwgRXhjZXB0aW9uQ29kZSYpOwogICAgICAgICB2aXJ0dWFsIH5Xb3Jr ZXIoKTsKIAogICAgICAgICB2aXJ0dWFsIFdvcmtlciogdG9Xb3JrZXIoKSB7IHJldHVybiB0aGlz OyB9Cg== 110558 2011-10-11 12:42:01 -0700 2011-10-12 10:41:55 -0700 Patch bug-69799-20111011124159.patch text/plain 7848 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MGRjZjViZWQxYjExYzlj NmE2MGY2ZTJhNDE2NDc5YTU5OWZlZjZmLi5lZmRiYWNmYTFhOGFiZDY1ZWFiNDcwZmI5MDIyMDRk YTY5ZjdjYWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMTAtMTEgIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1vdmluZyBTY3JpcHRF eGVjdXRpb25Db250ZXh0IHRvIHRoZSBmcm9udCBvZiB0aGUgYXJndW1lbnQgbGlzdCBmb3IKKyAg ICAgICAgSURMIGNvbnN0cnVjdG9ycyB0aGF0IHVzZSBDb25zdHJjdXRvcldpdGg9U2NyaXB0RXhl Y3V0aW9uQ29udGV4dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY5Nzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdHM6CisgICAgICAgIC0gaHR0cC90ZXN0cy9ldmVudHNvdXJjZS8qIChmb3IgRXZl bnRTb3VyY2UpCisgICAgICAgIC0gZmFzdC9maWxlc3lzdGVtLyogKGZvciBXb3JrZXIpCisKKyAg ICAgICAgKiBiaW5kaW5ncy9qcy9KU0V2ZW50U291cmNlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkpTRXZlbnRTb3VyY2VDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0SlNFdmVudFNvdXJjZSk6 CisgICAgICAgICogYmluZGluZ3MvanMvSlNXb3JrZXJDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SlNXb3JrZXJDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0SlNXb3JrZXIpOgorICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAoR2VuZXJhdGVD b25zdHJ1Y3RvckNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0SW50ZXJmYWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdEludGVyZmFjZTo6 Y29uc3RydWN0b3JDYWxsYmFjayk6CisgICAgICAgICogcGFnZS9FdmVudFNvdXJjZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFdmVudFNvdXJjZTo6Y3JlYXRlKToKKyAgICAgICAgKiBwYWdlL0V2 ZW50U291cmNlLmg6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6V29ya2VyOjpjcmVhdGUpOgorICAgICAgICAqIHdvcmtlcnMvV29ya2VyLmg6CisKIDIw MTEtMTAtMTEgIEpvc2h1YSBCZWxsICA8anNiZWxsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJ bmRleGVkREI6IGltcGxlbWVudCBJREJGYWN0b3J5LmNtcCBtZXRob2QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRTb3VyY2VDdXN0b20uY3BwIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudFNvdXJjZUN1c3RvbS5jcHAKaW5kZXggNjYxYzNk ZTU3N2JhMWYyNWZiNzA5YjVjOGRkZWQ3N2MxODZmN2VjMC4uZWUzNTFiMWYzNzMxNTU1MGYyMzY2 MTdmMDE5N2MxMjJkNjFiZjYxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNFdmVudFNvdXJjZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNFdmVudFNvdXJjZUN1c3RvbS5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBKU0V2ZW50U291cmNlQ29uc3RydWN0b3I6OmNvbnN0cnVjdEpTRXZl bnRTb3VyY2UoRXgKICAgICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVSZWZl cmVuY2VFcnJvcihleGVjLCAiRXZlbnRTb3VyY2UgY29uc3RydWN0b3IgYXNzb2NpYXRlZCBkb2N1 bWVudCBpcyB1bmF2YWlsYWJsZSIpKTsKIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAg IFJlZlB0cjxFdmVudFNvdXJjZT4gZXZlbnRTb3VyY2UgPSBFdmVudFNvdXJjZTo6Y3JlYXRlKHVz dHJpbmdUb1N0cmluZyh1cmwpLCBjb250ZXh0LCBlYyk7CisgICAgUmVmUHRyPEV2ZW50U291cmNl PiBldmVudFNvdXJjZSA9IEV2ZW50U291cmNlOjpjcmVhdGUoY29udGV4dCwgdXN0cmluZ1RvU3Ry aW5nKHVybCksIGVjKTsKICAgICBpZiAoZWMpIHsKICAgICAgICAgc2V0RE9NRXhjZXB0aW9uKGV4 ZWMsIGVjKTsKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShKU1ZhbHVlKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJDdXN0b20uY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJDdXN0b20uY3BwCmluZGV4IDBiYTM3 ZTNlMGM2M2VmYmU2ZjMyZmQ2NWU0M2EyYmJlZGYwZTkwNDAuLmFhMWVlZTU5MTMwMDE3ZjU4MGQz OTAzZmZlYTY2ZTQwZGRhNGY0MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTV29ya2VyQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U1dvcmtlckN1c3RvbS5jcHAKQEAgLTY1LDcgKzY1LDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hP U1RfQ0FMTCBKU1dvcmtlckNvbnN0cnVjdG9yOjpjb25zdHJ1Y3RKU1dvcmtlcihFeGVjU3RhdGUq IGUKICAgICBET01XaW5kb3cqIHdpbmRvdyA9IGFzSlNET01XaW5kb3coZXhlYy0+bGV4aWNhbEds b2JhbE9iamVjdCgpKS0+aW1wbCgpOwogCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAg UmVmUHRyPFdvcmtlcj4gd29ya2VyID0gV29ya2VyOjpjcmVhdGUodXN0cmluZ1RvU3RyaW5nKHNj cmlwdFVSTCksIHdpbmRvdy0+ZG9jdW1lbnQoKSwgZWMpOworICAgIFJlZlB0cjxXb3JrZXI+IHdv cmtlciA9IFdvcmtlcjo6Y3JlYXRlKHdpbmRvdy0+ZG9jdW1lbnQoKSwgdXN0cmluZ1RvU3RyaW5n KHNjcmlwdFVSTCksIGVjKTsKICAgICBpZiAoZWMpIHsKICAgICAgICAgc2V0RE9NRXhjZXB0aW9u KGV4ZWMsIGVjKTsKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShKU1ZhbHVlKCkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y VjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5w bQppbmRleCBiNjE0NjEzYjMwMjIyZmZjMjc0Mzk2NzFkY2JhMDdiOWE2MmY2NmZmLi5hYjY1M2Vm OGI0NmFmNjQ0OWY1MDQzZmIyYWI3MThhYWRjZmI5OTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtMTU0NSw4ICsxNTQ1 LDkgQEAgRU5ECiAgICAgbXkgKCRwYXJhbWV0ZXJDaGVja1N0cmluZywgJHBhcmFtSW5kZXgpID0g R2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2soJGZ1bmN0aW9uLCAkaW1wbENsYXNzTmFtZSk7CiAgICAg cHVzaChAaW1wbENvbnRlbnQsICRwYXJhbWV0ZXJDaGVja1N0cmluZyk7CiAKKyAgICBteSBAY29u dGV4dEFyZ3VtZW50OwogICAgIGlmICgkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJD b25zdHJ1Y3RvcldpdGgifSAmJiAkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDb25z dHJ1Y3RvcldpdGgifSBlcSAiU2NyaXB0RXhlY3V0aW9uQ29udGV4dCIpIHsKLSAgICAgICAgcHVz aChAZXh0cmFBcmd1bWVudExpc3QsICJjb250ZXh0Iik7CisgICAgICAgIHB1c2goQGNvbnRleHRB cmd1bWVudCwgImNvbnRleHQiKTsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8RU5EKTsK IAogICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQgPSBnZXRTY3JpcHRFeGVjdXRp b25Db250ZXh0KCk7CkBAIC0xNTY3LDcgKzE1NjgsNyBAQCBFTkQKICAgICAgICAgJGluZGV4Kys7 CiAgICAgfQogCi0gICAgbXkgJGFyZ3VtZW50U3RyaW5nID0gam9pbigiLCAiLCBAYXJndW1lbnRM aXN0LCBAZXh0cmFBcmd1bWVudExpc3QpOworICAgIG15ICRhcmd1bWVudFN0cmluZyA9IGpvaW4o IiwgIiwgQGNvbnRleHRBcmd1bWVudCwgQGFyZ3VtZW50TGlzdCwgQGV4dHJhQXJndW1lbnRMaXN0 KTsKICAgICBwdXNoKEBpbXBsQ29udGVudCwgIlxuIik7CiAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgUmVmUHRyPCR7aW1wbENsYXNzTmFtZX0+IG9iaiA9ICR7aW1wbENsYXNzTmFtZX06OmNy ZWF0ZSgke2FyZ3VtZW50U3RyaW5nfSk7XG4iKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcAppbmRl eCBiZDA0MTY5NGU3MjA1NWU4ZDNjMWY2OTI3ZWQ0N2M4ZTUwNTgwZTI4Li4yNTU4YjZkZGQ0NDZh NTQzODgwNDcxZjVmNWNjNWQyOTRkNWNmMjhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcApAQCAt NjEsNyArNjEsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhUZXN0SW50ZXJmYWNlOjpjb25z dHJ1Y3RvckNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmCiAgICAgaWYgKCFjb250ZXh0KQog ICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigiVGVzdEludGVyZmFjZSBjb25zdHJ1Y3RvcidzIGFz c29jaWF0ZWQgY29udGV4dCBpcyBub3QgYXZhaWxhYmxlIiwgVjhQcm94eTo6UmVmZXJlbmNlRXJy b3IpOwogCi0gICAgUmVmUHRyPFRlc3RJbnRlcmZhY2U+IG9iaiA9IFRlc3RJbnRlcmZhY2U6OmNy ZWF0ZShzdHIxLCBzdHIyLCBjb250ZXh0LCBlYyk7CisgICAgUmVmUHRyPFRlc3RJbnRlcmZhY2U+ IG9iaiA9IFRlc3RJbnRlcmZhY2U6OmNyZWF0ZShjb250ZXh0LCBzdHIxLCBzdHIyLCBlYyk7CiAg ICAgaWYgKGVjKQogICAgICAgICBnb3RvIGZhaWw7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJj ZS5jcHAKaW5kZXggOTZlYzkyOWM1NGI4MDY4ZWIyZDMzZmZjZTc1NDAyZjFiNzA4YjhhMC4uMjEx ZTdkYWI5ODNlYTM4ZTM3NWZhOTI3ZTFhYmIzMDEwZjUzYTcxOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudFNvdXJjZS5jcHAKQEAgLTY5LDcgKzY5LDcgQEAgaW5saW5lIEV2ZW50U291cmNlOjpFdmVu dFNvdXJjZShjb25zdCBLVVJMJiB1cmwsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQK IHsKIH0KIAotUGFzc1JlZlB0cjxFdmVudFNvdXJjZT4gRXZlbnRTb3VyY2U6OmNyZWF0ZShjb25z dCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgRXhjZXB0aW9u Q29kZSYgZWMpCitQYXNzUmVmUHRyPEV2ZW50U291cmNlPiBFdmVudFNvdXJjZTo6Y3JlYXRlKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgdXJsLCBFeGNlcHRp b25Db2RlJiBlYykKIHsKICAgICBpZiAodXJsLmlzRW1wdHkoKSkgewogICAgICAgICBlYyA9IFNZ TlRBWF9FUlI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50U291cmNlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50U291cmNlLmgKaW5kZXggYThiOGI0MWEzOTFlNWU2 YjA4MDY4NjBiZTM3MzdhZjYwNzZlYTcxMi4uYjdiOWZjMWJmNzZhODYxNmQ5NzkxMDEwZmI1ZjE4 YmZmMjI4MzBhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuaApAQCAtNTEsNyArNTEsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgRXZlbnRTb3VyY2UgOiBwdWJsaWMgUmVm Q291bnRlZDxFdmVudFNvdXJjZT4sIHB1YmxpYyBFdmVudFRhcmdldCwgcHJpdmF0ZSBUaHJlYWRh YmxlTG9hZGVyQ2xpZW50LCBwdWJsaWMgQWN0aXZlRE9NT2JqZWN0IHsKICAgICAgICAgV1RGX01B S0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgcHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxFdmVudFNvdXJjZT4gY3JlYXRlKGNvbnN0IFN0cmluZyYgdXJsLCBTY3JpcHRFeGVjdXRpb25D b250ZXh0KiwgRXhjZXB0aW9uQ29kZSYpOworICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxFdmVu dFNvdXJjZT4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBTdHJpbmcmIHVy bCwgRXhjZXB0aW9uQ29kZSYpOwogICAgICAgICB2aXJ0dWFsIH5FdmVudFNvdXJjZSgpOwogCiAg ICAgICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBsb25nIGxvbmcgZGVmYXVsdFJlY29ubmVjdERl bGF5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuY3BwCmluZGV4IDZiNzU5ZTAzNTJmNWNiNTZjZGUx ZmY2ZDUwNTBlNThjMTYxZjk0YzguLjlkNDMwOTBmOGI5YWU3ZDczNzQwM2ExZDdjMzUyYmI0ZGRm MjVkZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgaW5s aW5lIFdvcmtlcjo6V29ya2VyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCiB7CiB9 CiAKLVBhc3NSZWZQdHI8V29ya2VyPiBXb3JrZXI6OmNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwg U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgRXhjZXB0aW9uQ29kZSYgZWMpCitQYXNz UmVmUHRyPFdvcmtlcj4gV29ya2VyOjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCwgY29uc3QgU3RyaW5nJiB1cmwsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIFJlZlB0 cjxXb3JrZXI+IHdvcmtlciA9IGFkb3B0UmVmKG5ldyBXb3JrZXIoY29udGV4dCkpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5oIGIvU291cmNlL1dlYkNvcmUv d29ya2Vycy9Xb3JrZXIuaAppbmRleCBhMGM3MDEwOWUyNzExNTYzYjVhM2UzNTViNGZkMmZiZGYy ZWM4N2M1Li4yMTJiNTJiMTkyMDIyMjMyOGM0MjJjNTI2OWQyNWVjMjkwNjc5NjIyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvV29ya2VyLmgKQEAgLTUxLDcgKzUxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgY2xhc3MgV29ya2VyIDogcHVibGljIEFic3RyYWN0V29ya2VyLCBwcml2YXRlIFdvcmtl clNjcmlwdExvYWRlckNsaWVudCB7CiAgICAgcHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1Jl ZlB0cjxXb3JrZXI+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29u dGV4dCosIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8V29ya2Vy PiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIGNvbnN0IFN0cmluZyYgdXJsLCBFeGNl cHRpb25Db2RlJik7CiAgICAgICAgIHZpcnR1YWwgfldvcmtlcigpOwogCiAgICAgICAgIHZpcnR1 YWwgV29ya2VyKiB0b1dvcmtlcigpIHsgcmV0dXJuIHRoaXM7IH0K 110701 2011-10-12 10:42:00 -0700 2011-10-12 12:27:29 -0700 Patch for landing bug-69799-20111012104158.patch text/plain 7891 annacc U3VidmVyc2lvbiBSZXZpc2lvbjogOTcyNzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwMTVlNDU1MWIxNWFmMmEx NTVjZjkwZTMwNzZlMmU2NmEzM2U0NDIxLi5kZWFmNDk3Nzg0YTE0ZDhmNmVmNzJiOThkMjIxMzQ2 NjJiNTU5NTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMTAtMTIgIEFubmEg Q2F2ZW5kZXIgIDxhbm5hY2NAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1vdmluZyBTY3JpcHRF eGVjdXRpb25Db250ZXh0IHRvIHRoZSBmcm9udCBvZiB0aGUgYXJndW1lbnQgbGlzdCBmb3IKKyAg ICAgICAgSURMIGNvbnN0cnVjdG9ycyB0aGF0IHVzZSBDb25zdHJ1Y3RvcldpdGg9U2NyaXB0RXhl Y3V0aW9uQ29udGV4dC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY5Nzk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAg ICBUZXN0czoKKyAgICAgICAgLSBodHRwL3Rlc3RzL2V2ZW50c291cmNlLyogKGZvciBFdmVudFNv dXJjZSkKKyAgICAgICAgLSBmYXN0L2ZpbGVzeXN0ZW0vKiAoZm9yIFdvcmtlcikKKworICAgICAg ICAqIGJpbmRpbmdzL2pzL0pTRXZlbnRTb3VyY2VDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SlNFdmVudFNvdXJjZUNvbnN0cnVjdG9yOjpjb25zdHJ1Y3RKU0V2ZW50U291cmNlKToKKyAg ICAgICAgKiBiaW5kaW5ncy9qcy9KU1dvcmtlckN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpKU1dvcmtlckNvbnN0cnVjdG9yOjpjb25zdHJ1Y3RKU1dvcmtlcik6CisgICAgICAgICogYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgIChHZW5lcmF0ZUNvbnN0 cnVjdG9yQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3RJbnRlcmZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0SW50ZXJmYWNlOjpjb25z dHJ1Y3RvckNhbGxiYWNrKToKKyAgICAgICAgKiBwYWdlL0V2ZW50U291cmNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkV2ZW50U291cmNlOjpjcmVhdGUpOgorICAgICAgICAqIHBhZ2UvRXZlbnRT b3VyY2UuaDoKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXb3JrZXI6OmNyZWF0ZSk6CisgICAgICAgICogd29ya2Vycy9Xb3JrZXIuaDoKKwogMjAxMS0x MC0xMiAgU2VyZ2V5IEdsYXp1bm92ICA8c2VyZy5nbGF6dW5vdkBnbWFpbC5jb20+CiAKICAgICAg ICAgU2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTCBnZXRzIGNvbmZ1c2Vk IGJ5IHN5bmNocm9ub3VzIGZyYW1lIGxvYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0V2ZW50U291cmNlQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRXZlbnRTb3VyY2VDdXN0b20uY3BwCmluZGV4IDY2MWMzZGU1NzdiYTFmMjVmYjcw OWI1YzhkZGVkNzdjMTg2ZjdlYzAuLmVlMzUxYjFmMzczMTU1NTBmMjM2NjE3ZjAxOTdjMTIyZDYx YmY2MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRTb3Vy Y2VDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRTb3Vy Y2VDdXN0b20uY3BwCkBAIC01Niw3ICs1Niw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NB TEwgSlNFdmVudFNvdXJjZUNvbnN0cnVjdG9yOjpjb25zdHJ1Y3RKU0V2ZW50U291cmNlKEV4CiAg ICAgICAgIHJldHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlUmVmZXJlbmNlRXJyb3IoZXhl YywgIkV2ZW50U291cmNlIGNvbnN0cnVjdG9yIGFzc29jaWF0ZWQgZG9jdW1lbnQgaXMgdW5hdmFp bGFibGUiKSk7CiAKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBSZWZQdHI8RXZlbnRT b3VyY2U+IGV2ZW50U291cmNlID0gRXZlbnRTb3VyY2U6OmNyZWF0ZSh1c3RyaW5nVG9TdHJpbmco dXJsKSwgY29udGV4dCwgZWMpOworICAgIFJlZlB0cjxFdmVudFNvdXJjZT4gZXZlbnRTb3VyY2Ug PSBFdmVudFNvdXJjZTo6Y3JlYXRlKGNvbnRleHQsIHVzdHJpbmdUb1N0cmluZyh1cmwpLCBlYyk7 CiAgICAgaWYgKGVjKSB7CiAgICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7CiAgICAg ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoSlNWYWx1ZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTV29ya2VyQ3VzdG9tLmNwcAppbmRleCAwYmEzN2UzZTBjNjNlZmJlNmYz MmZkNjVlNDNhMmJiZWRmMGU5MDQwLi5hYTFlZWU1OTEzMDAxN2Y1ODBkMzkwM2ZmZWE2NmU0MGRk YTRmNDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1dvcmtlckN1 c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJDdXN0b20u Y3BwCkBAIC02NSw3ICs2NSw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSlNXb3Jr ZXJDb25zdHJ1Y3Rvcjo6Y29uc3RydWN0SlNXb3JrZXIoRXhlY1N0YXRlKiBlCiAgICAgRE9NV2lu ZG93KiB3aW5kb3cgPSBhc0pTRE9NV2luZG93KGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSkt PmltcGwoKTsKIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgIFJlZlB0cjxXb3JrZXI+ IHdvcmtlciA9IFdvcmtlcjo6Y3JlYXRlKHVzdHJpbmdUb1N0cmluZyhzY3JpcHRVUkwpLCB3aW5k b3ctPmRvY3VtZW50KCksIGVjKTsKKyAgICBSZWZQdHI8V29ya2VyPiB3b3JrZXIgPSBXb3JrZXI6 OmNyZWF0ZSh3aW5kb3ctPmRvY3VtZW50KCksIHVzdHJpbmdUb1N0cmluZyhzY3JpcHRVUkwpLCBl Yyk7CiAgICAgaWYgKGVjKSB7CiAgICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7CiAg ICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoSlNWYWx1ZSgpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KaW5kZXggYjYxNDYx M2IzMDIyMmZmYzI3NDM5NjcxZGNiYTA3YjlhNjJmNjZmZi4uYWI2NTNlZjhiNDZhZjY0NDlmNTA0 M2ZiMmFiNzE4YWFkY2ZiOTk0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KQEAgLTE1NDUsOCArMTU0NSw5IEBAIEVORAogICAg IG15ICgkcGFyYW1ldGVyQ2hlY2tTdHJpbmcsICRwYXJhbUluZGV4KSA9IEdlbmVyYXRlUGFyYW1l dGVyc0NoZWNrKCRmdW5jdGlvbiwgJGltcGxDbGFzc05hbWUpOwogICAgIHB1c2goQGltcGxDb250 ZW50LCAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcpOwogCisgICAgbXkgQGNvbnRleHRBcmd1bWVudDsK ICAgICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ29uc3RydWN0b3JXaXRo In0gJiYgJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ29uc3RydWN0b3JXaXRoIn0g ZXEgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQiKSB7Ci0gICAgICAgIHB1c2goQGV4dHJhQXJndW1l bnRMaXN0LCAiY29udGV4dCIpOworICAgICAgICBwdXNoKEBjb250ZXh0QXJndW1lbnQsICJjb250 ZXh0Iik7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCk7CiAKICAgICBTY3JpcHRF eGVjdXRpb25Db250ZXh0KiBjb250ZXh0ID0gZ2V0U2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOwpA QCAtMTU2Nyw3ICsxNTY4LDcgQEAgRU5ECiAgICAgICAgICRpbmRleCsrOwogICAgIH0KIAotICAg IG15ICRhcmd1bWVudFN0cmluZyA9IGpvaW4oIiwgIiwgQGFyZ3VtZW50TGlzdCwgQGV4dHJhQXJn dW1lbnRMaXN0KTsKKyAgICBteSAkYXJndW1lbnRTdHJpbmcgPSBqb2luKCIsICIsIEBjb250ZXh0 QXJndW1lbnQsIEBhcmd1bWVudExpc3QsIEBleHRyYUFyZ3VtZW50TGlzdCk7CiAgICAgcHVzaChA aW1wbENvbnRlbnQsICJcbiIpOwogICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIFJlZlB0cjwk e2ltcGxDbGFzc05hbWV9PiBvYmogPSAke2ltcGxDbGFzc05hbWV9OjpjcmVhdGUoJHthcmd1bWVu dFN0cmluZ30pO1xuIik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9WOC9WOFRlc3RJbnRlcmZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5jcHAKaW5kZXggYmQwNDE2OTRlNzIw NTVlOGQzYzFmNjkyN2VkNDdjOGU1MDU4MGUyOC4uMjU1OGI2ZGRkNDQ2YTU0Mzg4MDQ3MWY1ZjVj YzVkMjk0ZDVjZjI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5jcHAKQEAgLTYxLDcgKzYxLDcgQEAg djg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4VGVzdEludGVyZmFjZTo6Y29uc3RydWN0b3JDYWxsYmFj ayhjb25zdCB2ODo6QXJndW1lbnRzJgogICAgIGlmICghY29udGV4dCkKICAgICAgICAgcmV0dXJu IHRocm93RXJyb3IoIlRlc3RJbnRlcmZhY2UgY29uc3RydWN0b3IncyBhc3NvY2lhdGVkIGNvbnRl eHQgaXMgbm90IGF2YWlsYWJsZSIsIFY4UHJveHk6OlJlZmVyZW5jZUVycm9yKTsKIAotICAgIFJl ZlB0cjxUZXN0SW50ZXJmYWNlPiBvYmogPSBUZXN0SW50ZXJmYWNlOjpjcmVhdGUoc3RyMSwgc3Ry MiwgY29udGV4dCwgZWMpOworICAgIFJlZlB0cjxUZXN0SW50ZXJmYWNlPiBvYmogPSBUZXN0SW50 ZXJmYWNlOjpjcmVhdGUoY29udGV4dCwgc3RyMSwgc3RyMiwgZWMpOwogICAgIGlmIChlYykKICAg ICAgICAgZ290byBmYWlsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 U291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3BwCmluZGV4IDk2 ZWM5MjljNTRiODA2OGViMmQzM2ZmY2U3NTQwMmYxYjcwOGI4YTAuLjIxMWU3ZGFiOTgzZWEzOGUz NzVmYTkyN2UxYWJiMzAxMGY1M2E3MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuY3Bw CkBAIC02OSw3ICs2OSw3IEBAIGlubGluZSBFdmVudFNvdXJjZTo6RXZlbnRTb3VyY2UoY29uc3Qg S1VSTCYgdXJsLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0CiB7CiB9CiAKLVBhc3NS ZWZQdHI8RXZlbnRTb3VyY2U+IEV2ZW50U291cmNlOjpjcmVhdGUoY29uc3QgU3RyaW5nJiB1cmws IFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorUGFz c1JlZlB0cjxFdmVudFNvdXJjZT4gRXZlbnRTb3VyY2U6OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIHVybCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7 CiAgICAgaWYgKHVybC5pc0VtcHR5KCkpIHsKICAgICAgICAgZWMgPSBTWU5UQVhfRVJSOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudFNvdXJjZS5oIGIvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudFNvdXJjZS5oCmluZGV4IGE4YjhiNDFhMzkxZTVlNmIwODA2ODYwYmUzNzM3 YWY2MDc2ZWE3MTIuLmI3YjlmYzFiZjc2YTg2MTZkOTc5MTAxMGZiNWYxOGJmZjIyODMwYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRTb3VyY2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0V2ZW50U291cmNlLmgKQEAgLTUxLDcgKzUxLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgIGNsYXNzIEV2ZW50U291cmNlIDogcHVibGljIFJlZkNvdW50ZWQ8RXZlbnRT b3VyY2U+LCBwdWJsaWMgRXZlbnRUYXJnZXQsIHByaXZhdGUgVGhyZWFkYWJsZUxvYWRlckNsaWVu dCwgcHVibGljIEFjdGl2ZURPTU9iamVjdCB7CiAgICAgICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NB VEVEOwogICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXZlbnRTb3VyY2U+ IGNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIEV4Y2Vw dGlvbkNvZGUmKTsKKyAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8RXZlbnRTb3VyY2U+IGNyZWF0 ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgY29uc3QgU3RyaW5nJiB1cmwsIEV4Y2VwdGlvbkNv ZGUmKTsKICAgICAgICAgdmlydHVhbCB+RXZlbnRTb3VyY2UoKTsKIAogICAgICAgICBzdGF0aWMg Y29uc3QgdW5zaWduZWQgbG9uZyBsb25nIGRlZmF1bHRSZWNvbm5lY3REZWxheTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvV29ya2VyLmNwcAppbmRleCA2Yjc1OWUwMzUyZjVjYjU2Y2RlMWZmNmQ1MDUwZTU4YzE2 MWY5NGM4Li45ZDQzMDkwZjhiOWFlN2Q3Mzc0MDNhMWQ3YzM1MmJiNGRkZjI1ZGY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9Xb3JrZXIuY3BwCkBAIC01Niw3ICs1Niw3IEBAIGlubGluZSBXb3JrZXI6Oldv cmtlcihTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0KQogewogfQogCi1QYXNzUmVmUHRy PFdvcmtlcj4gV29ya2VyOjpjcmVhdGUoY29uc3QgU3RyaW5nJiB1cmwsIFNjcmlwdEV4ZWN1dGlv bkNvbnRleHQqIGNvbnRleHQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorUGFzc1JlZlB0cjxXb3JrZXI+ IFdvcmtlcjo6Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IFN0 cmluZyYgdXJsLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBSZWZQdHI8V29ya2VyPiB3b3Jr ZXIgPSBhZG9wdFJlZihuZXcgV29ya2VyKGNvbnRleHQpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy LmgKaW5kZXggYTBjNzAxMDllMjcxMTU2M2I1YTNlMzU1YjRmZDJmYmRmMmVjODdjNS4uMjEyYjUy YjE5MjAyMjIzMjhjNDIyYzUyNjlkMjVlYzI5MDY3OTYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvd29ya2Vycy9Xb3JrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtl ci5oCkBAIC01MSw3ICs1MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIFdv cmtlciA6IHB1YmxpYyBBYnN0cmFjdFdvcmtlciwgcHJpdmF0ZSBXb3JrZXJTY3JpcHRMb2FkZXJD bGllbnQgewogICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8V29ya2VyPiBj cmVhdGUoY29uc3QgU3RyaW5nJiB1cmwsIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBFeGNlcHRp b25Db2RlJik7CisgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdvcmtlcj4gY3JlYXRlKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBjb25zdCBTdHJpbmcmIHVybCwgRXhjZXB0aW9uQ29kZSYpOwog ICAgICAgICB2aXJ0dWFsIH5Xb3JrZXIoKTsKIAogICAgICAgICB2aXJ0dWFsIFdvcmtlciogdG9X b3JrZXIoKSB7IHJldHVybiB0aGlzOyB9Cg==