65353 2011-07-28 18:51:58 -0700 Remove LegacyDefaultOptionalArguments flag from DOMWindow.idl 2011-08-03 14:51:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 pilgrim webkit-unassigned abarth webkit.review.bot oldest_to_newest 443762 0 pilgrim 2011-07-28 18:51:58 -0700 As discussed in IRC, we are migrating our IDL files away from the interface-level "LegacyDefaultOptionalArguments" flag and onto argument-level [Optional] or [Optional=CallWithDefaultValue] flags. This patch migrates DOMWindow.idl. It does not change any behavior, i.e. it does not make any arguments required that were previously optional, nor vice-versa. All existing tests pass. (Note: this required a small change to the code generator to allow [RequireAllArguments] without the "=Raise" parameter, as required by scrollBy, scrollTo, scroll, moveBy, moveTo, resizeBy, and resizeTo methods.) 443763 1 102322 pilgrim 2011-07-28 18:53:12 -0700 Created attachment 102322 Patch 443764 2 102322 darin 2011-07-28 18:59:46 -0700 Comment on attachment 102322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102322&action=review > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:1983 > if ($dataNode->extendedAttributes->{"LegacyDefaultOptionalArguments"}) { > $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"}; > } else { > - $requiresAllArguments = "Raise"; > + $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"} || "Raise"; > } There is probably a cleaner way to write this that doesn’t repeat the expression function->signature->extendedAttributes->{"RequiresAllArguments"}. > Source/WebCore/page/DOMWindow.idl:74 > + [Custom] DOMWindow open(in [Optional=CallWithDefaultValue] DOMString url, I’m curious, what does “call with default value” mean? What is the default value? 443766 3 pilgrim 2011-07-28 19:17:42 -0700 (In reply to comment #2) > (From update of attachment 102322 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=102322&action=review > > There is probably a cleaner way to write this that doesn’t repeat the expression function->signature->extendedAttributes->{"RequiresAllArguments"}. After a few more patches in the coming few days, we will be removing the LegacyDefaultOptionalArguments altogether, so I'd argue it's not that big a deal. > > > Source/WebCore/page/DOMWindow.idl:74 > > + [Custom] DOMWindow open(in [Optional=CallWithDefaultValue] DOMString url, > > I’m curious, what does “call with default value” mean? What is the default value? It varies by type. 443824 4 abarth 2011-07-28 22:38:24 -0700 > (From update of attachment 102322 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=102322&action=review > > > Source/WebCore/page/DOMWindow.idl:74 > > + [Custom] DOMWindow open(in [Optional=CallWithDefaultValue] DOMString url, > > I’m curious, what does “call with default value” mean? What is the default value? Basically, it's whatever undefined maps to for the given type. In the case of DOMString, I think that's the null string. For pointer types, it ends up as zero. "Optional" (without the value) uses C++ overloading to dispatch the different calls. We struggled a bit to come up with an appropriate name. If you've got a better suggestion, we're all ears. :) 444001 5 102322 abarth 2011-07-29 10:50:05 -0700 Comment on attachment 102322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102322&action=review >> Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:1983 >> if ($dataNode->extendedAttributes->{"LegacyDefaultOptionalArguments"}) { >> $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"}; >> } else { >> - $requiresAllArguments = "Raise"; >> + $requiresAllArguments = $function->signature->extendedAttributes->{"RequiresAllArguments"} || "Raise"; >> } > > There is probably a cleaner way to write this that doesn’t repeat the expression function->signature->extendedAttributes->{"RequiresAllArguments"}. I would just address this comment. It's easy to fix. :) > Source/WebCore/page/DOMWindow.idl:205 > - [EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback); > - [EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url, in [Callback, Optional] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback); > + [EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in [Optional=CallWithDefaultValue] unsigned short type, > + in [Optional=CallWithDefaultValue] long long size, > + in [Callback, Optional] FileSystemCallback successCallback, > + in [Callback, Optional] ErrorCallback errorCallback); > + [EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in [Optional=CallWithDefaultValue] DOMString url, > + in [Callback, Optional] EntryCallback successCallback, > + in [Callback, Optional] ErrorCallback errorCallback); I'd skip these. FileSystem is pretty new. > Source/WebCore/page/DOMWindow.idl:250 > #if defined(ENABLE_REQUEST_ANIMATION_FRAME) > // WebKit animation extensions > long webkitRequestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback, in Element element); > - void webkitCancelRequestAnimationFrame(in long id); > + void webkitCancelRequestAnimationFrame(in [Optional=CallWithDefaultValue] long id); > #endif This API is already pretty new. I'd skip it. 446001 6 102808 pilgrim 2011-08-03 12:19:51 -0700 Created attachment 102808 Patch 446002 7 pilgrim 2011-08-03 12:20:46 -0700 Skipped FileSystem and animationFrame APIs. Refactored code generators as per Darin's comment. 446104 8 102808 webkit.review.bot 2011-08-03 14:51:02 -0700 Comment on attachment 102808 Patch Clearing flags on attachment: 102808 Committed r92313: <http://trac.webkit.org/changeset/92313> 446105 9 webkit.review.bot 2011-08-03 14:51:06 -0700 All reviewed patches have been landed. Closing bug. 102322 2011-07-28 18:53:12 -0700 2011-08-03 12:19:44 -0700 Patch bug-65353-20110728215330.patch text/plain 11576 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxOTY5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMjggIE1hcmsgUGls Z3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBMZWdhY3lEZWZh dWx0T3B0aW9uYWxBcmd1bWVudHMgZmxhZyBmcm9tIERPTVdpbmRvdy5pZGwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MzUzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbGwgZXhp c3RpbmcgdGVzdHMgcGFzcy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVJbXBsZW1lbnRhdGlvbik6CisgICAgICAgICog YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgIChHZW5lcmF0ZUZ1 bmN0aW9uQ2FsbGJhY2spOgorICAgICAgICAqIHBhZ2UvRE9NV2luZG93LmlkbDoKKwogMjAxMS0w Ny0yOCAgTHVrZSBNYWNwaGVyc29uICAgPG1hY3BoZXJzb25AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJlbW92ZSByZW1haW5pbmcgdXNlcyBvZiBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxl bmd0aEludEZvckxlbmd0aCgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JKUy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkocmV2aXNpb24gOTE5NTApCisrKyBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTk3OSw3ICsxOTc5LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAg ICAgICAgICAgICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiTGVnYWN5RGVm YXVsdE9wdGlvbmFsQXJndW1lbnRzIn0pIHsKICAgICAgICAgICAgICAgICAgICAgJHJlcXVpcmVz QWxsQXJndW1lbnRzID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJSZXF1aXJlc0FsbEFyZ3VtZW50cyJ9OwogICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICAgICAgICAgICRyZXF1aXJlc0FsbEFyZ3VtZW50cyA9ICJSYWlzZSI7CisgICAgICAg ICAgICAgICAgICAgICRyZXF1aXJlc0FsbEFyZ3VtZW50cyA9ICRmdW5jdGlvbi0+c2lnbmF0dXJl LT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiUmVxdWlyZXNBbGxBcmd1bWVudHMifSB8fCAiUmFpc2Ui OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoJHJlcXVpcmVzQWxsQXJn dW1lbnRzKSB7CiAgICAgICAgICAgICAgICAgICAgIG15ICRudW1NYW5kYXRvcnlQYXJhbXMgPSBA eyRmdW5jdGlvbi0+cGFyYW1ldGVyc307CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkocmV2aXNpb24gOTE5NTApCisrKyBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkod29ya2lu ZyBjb3B5KQpAQCAtMTI1MSw3ICsxMjUxLDcgQEAgRU5ECiAgICAgaWYgKCRkYXRhTm9kZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkxlZ2FjeURlZmF1bHRPcHRpb25hbEFyZ3VtZW50cyJ9KSB7CiAg ICAgICAgICRyZXF1aXJlc0FsbEFyZ3VtZW50cyA9ICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRl bmRlZEF0dHJpYnV0ZXMtPnsiUmVxdWlyZXNBbGxBcmd1bWVudHMifTsKICAgICB9IGVsc2Ugewot ICAgICAgICAkcmVxdWlyZXNBbGxBcmd1bWVudHMgPSAiUmFpc2UiOworICAgICAgICAkcmVxdWly ZXNBbGxBcmd1bWVudHMgPSAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IlJlcXVpcmVzQWxsQXJndW1lbnRzIn0gfHwgIlJhaXNlIjsKICAgICB9CiAgICAgaWYgKCRy ZXF1aXJlc0FsbEFyZ3VtZW50cykgewogICAgICAgICBteSAkbnVtTWFuZGF0b3J5UGFyYW1zID0g QHskZnVuY3Rpb24tPnBhcmFtZXRlcnN9OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9ET01X aW5kb3cuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93Lmlk bAkocmV2aXNpb24gOTE5NTApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJ KHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDYgQEAKIG1vZHVsZSB3aW5kb3cgewogCiAgICAg aW50ZXJmYWNlIFsKLSAgICAgICAgTGVnYWN5RGVmYXVsdE9wdGlvbmFsQXJndW1lbnRzLAogICAg ICAgICBDaGVja0RvbWFpblNlY3VyaXR5LAogICAgICAgICBDdXN0b21EZWZpbmVHZXR0ZXIsCiAg ICAgICAgIEN1c3RvbURlZmluZVNldHRlciwKQEAgLTcyLDI2ICs3MSwyNiBAQCBtb2R1bGUgd2lu ZG93IHsKICAgICAgICAgdm9pZCBwcmludCgpOwogICAgICAgICB2b2lkIHN0b3AoKTsKIAotICAg ICAgICBbQ3VzdG9tXSBET01XaW5kb3cgb3BlbihpbiBET01TdHJpbmcgdXJsLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpbiBET01TdHJpbmcgbmFtZSwKKyAgICAgICAgW0N1c3Rv bV0gRE9NV2luZG93IG9wZW4oaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBET01T dHJpbmcgdXJsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9 Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0cmluZyBuYW1lLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbiBbT3B0aW9uYWxdIERPTVN0cmluZyBvcHRpb25zKTsKIAotICAgICAg ICBbQ3VzdG9tXSBET01PYmplY3Qgc2hvd01vZGFsRGlhbG9nKGluIERPTVN0cmluZyB1cmwsCisg ICAgICAgIFtDdXN0b21dIERPTU9iamVjdCBzaG93TW9kYWxEaWFsb2coaW4gW09wdGlvbmFsPUNh bGxXaXRoRGVmYXVsdFZhbHVlXSBET01TdHJpbmcgdXJsLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbF0gRE9NT2JqZWN0IGRpYWxvZ0FyZ3Ms CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlvbmFs XSBET01TdHJpbmcgZmVhdHVyZUFyZ3MpOwogCi0gICAgICAgIHZvaWQgYWxlcnQoaW4gRE9NU3Ry aW5nIG1lc3NhZ2UpOwotICAgICAgICBib29sZWFuIGNvbmZpcm0oaW4gRE9NU3RyaW5nIG1lc3Nh Z2UpOwotICAgICAgICBbQ29udmVydE51bGxTdHJpbmdUbz1OdWxsXSBET01TdHJpbmcgcHJvbXB0 KGluIERPTVN0cmluZyBtZXNzYWdlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGluIFtDb252ZXJ0VW5kZWZpbmVkT3JOdWxsVG9OdWxsU3RyaW5n XSBET01TdHJpbmcgZGVmYXVsdFZhbHVlKTsKLQotICAgICAgICBib29sZWFuIGZpbmQoaW4gRE9N U3RyaW5nIHN0cmluZywKLSAgICAgICAgICAgICAgICAgICAgIGluIGJvb2xlYW4gY2FzZVNlbnNp dGl2ZSwKLSAgICAgICAgICAgICAgICAgICAgIGluIGJvb2xlYW4gYmFja3dhcmRzLAotICAgICAg ICAgICAgICAgICAgICAgaW4gYm9vbGVhbiB3cmFwLAotICAgICAgICAgICAgICAgICAgICAgaW4g Ym9vbGVhbiB3aG9sZVdvcmQsCi0gICAgICAgICAgICAgICAgICAgICBpbiBib29sZWFuIHNlYXJj aEluRnJhbWVzLAotICAgICAgICAgICAgICAgICAgICAgaW4gYm9vbGVhbiBzaG93RGlhbG9nKTsK KyAgICAgICAgdm9pZCBhbGVydChpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERP TVN0cmluZyBtZXNzYWdlKTsKKyAgICAgICAgYm9vbGVhbiBjb25maXJtKGluIFtPcHRpb25hbD1D YWxsV2l0aERlZmF1bHRWYWx1ZV0gRE9NU3RyaW5nIG1lc3NhZ2UpOworICAgICAgICBbQ29udmVy dE51bGxTdHJpbmdUbz1OdWxsXSBET01TdHJpbmcgcHJvbXB0KGluIFtPcHRpb25hbD1DYWxsV2l0 aERlZmF1bHRWYWx1ZV0gRE9NU3RyaW5nIG1lc3NhZ2UsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW0NvbnZlcnRVbmRlZmluZWRPck51bGxU b051bGxTdHJpbmcsT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0cmluZyBkZWZh dWx0VmFsdWUpOworCisgICAgICAgIGJvb2xlYW4gZmluZChpbiBbT3B0aW9uYWw9Q2FsbFdpdGhE ZWZhdWx0VmFsdWVdIERPTVN0cmluZyBzdHJpbmcsCisgICAgICAgICAgICAgICAgICAgICBpbiBb T3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4gY2FzZVNlbnNpdGl2ZSwKKyAg ICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gYm9v bGVhbiBiYWNrd2FyZHMsCisgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdp dGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4gd3JhcCwKKyAgICAgICAgICAgICAgICAgICAgIGluIFtP cHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gYm9vbGVhbiB3aG9sZVdvcmQsCisgICAgICAg ICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4g c2VhcmNoSW5GcmFtZXMsCisgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdp dGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4gc2hvd0RpYWxvZyk7CiAKICAgICAgICAgYXR0cmlidXRl IFtSZXBsYWNlYWJsZV0gYm9vbGVhbiBvZmZzY3JlZW5CdWZmZXJpbmc7CiAKQEAgLTE0MiwyNSAr MTQxLDI3IEBAIG1vZHVsZSB3aW5kb3cgewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgRG9j dW1lbnQgZG9jdW1lbnQ7CiAKICAgICAgICAgLy8gQ1NTT00gVmlldyBNb2R1bGUKLSAgICAgICAg TWVkaWFRdWVyeUxpc3QgbWF0Y2hNZWRpYShpbiBET01TdHJpbmcgcXVlcnkpOworICAgICAgICBN ZWRpYVF1ZXJ5TGlzdCBtYXRjaE1lZGlhKGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1 ZV0gRE9NU3RyaW5nIHF1ZXJ5KTsKIAogICAgICAgICAvLyBzdHlsZU1lZGlhIGhhcyBiZWVuIHJl bW92ZWQgZnJvbSB0aGUgQ1NTT00gVmlldyBzcGVjaWZpY2F0aW9uLgogICAgICAgICByZWFkb25s eSBhdHRyaWJ1dGUgU3R5bGVNZWRpYSBzdHlsZU1lZGlhOwogCiAgICAgICAgIC8vIERPTSBMZXZl bCAyIFN0eWxlIEludGVyZmFjZQotICAgICAgICBDU1NTdHlsZURlY2xhcmF0aW9uIGdldENvbXB1 dGVkU3R5bGUoaW4gRWxlbWVudCBlbGVtZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaW4gW0NvbnZlcnRVbmRlZmluZWRPck51bGxUb051bGxTdHJpbmdd IERPTVN0cmluZyBwc2V1ZG9FbGVtZW50KTsKKyAgICAgICAgQ1NTU3R5bGVEZWNsYXJhdGlvbiBn ZXRDb21wdXRlZFN0eWxlKGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gRWxlbWVu dCBlbGVtZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aW4gW0NvbnZlcnRVbmRlZmluZWRPck51bGxUb051bGxTdHJpbmcsT3B0aW9uYWw9Q2FsbFdpdGhE ZWZhdWx0VmFsdWVdIERPTVN0cmluZyBwc2V1ZG9FbGVtZW50KTsKIAogICAgICAgICAvLyBXZWJL aXQgZXh0ZW5zaW9ucwogI2lmIGRlZmluZWQoTEFOR1VBR0VfSkFWQVNDUklQVCkgJiYgTEFOR1VB R0VfSkFWQVNDUklQVAotICAgICAgICBDU1NSdWxlTGlzdCBnZXRNYXRjaGVkQ1NTUnVsZXMoaW4g RWxlbWVudCBlbGVtZW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aW4gRE9NU3RyaW5nIHBzZXVkb0VsZW1lbnQpOworICAgICAgICBDU1NSdWxlTGlzdCBnZXRNYXRj aGVkQ1NTUnVsZXMoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBFbGVtZW50IGVs ZW1lbnQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9u YWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0cmluZyBwc2V1ZG9FbGVtZW50KTsKICNlbmRp ZgogCiAgICAgICAgIGF0dHJpYnV0ZSBbUmVwbGFjZWFibGVdIGRvdWJsZSBkZXZpY2VQaXhlbFJh dGlvOwogICAgICAgICAKLSAgICAgICAgV2ViS2l0UG9pbnQgd2Via2l0Q29udmVydFBvaW50RnJv bVBhZ2VUb05vZGUoaW4gTm9kZSBub2RlLCBpbiBXZWJLaXRQb2ludCBwKTsKLSAgICAgICAgV2Vi S2l0UG9pbnQgd2Via2l0Q29udmVydFBvaW50RnJvbU5vZGVUb1BhZ2UoaW4gTm9kZSBub2RlLCBp biBXZWJLaXRQb2ludCBwKTsKKyAgICAgICAgV2ViS2l0UG9pbnQgd2Via2l0Q29udmVydFBvaW50 RnJvbVBhZ2VUb05vZGUoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBOb2RlIG5v ZGUsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIFdlYktpdFBvaW50IHApOworICAg ICAgICBXZWJLaXRQb2ludCB3ZWJraXRDb252ZXJ0UG9pbnRGcm9tTm9kZVRvUGFnZShpbiBbT3B0 aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIE5vZGUgbm9kZSwgCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0 aERlZmF1bHRWYWx1ZV0gV2ViS2l0UG9pbnQgcCk7CiAKICNpZiBkZWZpbmVkKEVOQUJMRV9PRkZM SU5FX1dFQl9BUFBMSUNBVElPTlMpICYmIEVOQUJMRV9PRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMK ICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFtFbmFibGVkQXRSdW50aW1lXSBET01BcHBsaWNh dGlvbkNhY2hlIGFwcGxpY2F0aW9uQ2FjaGU7CkBAIC0xOTUsOCArMTk2LDEzIEBAIG1vZHVsZSB3 aW5kb3cgewogI2lmIGRlZmluZWQoRU5BQkxFX0ZJTEVfU1lTVEVNKSAmJiBFTkFCTEVfRklMRV9T WVNURU0KICAgICAgICAgY29uc3QgdW5zaWduZWQgc2hvcnQgVEVNUE9SQVJZID0gMDsKICAgICAg ICAgY29uc3QgdW5zaWduZWQgc2hvcnQgUEVSU0lTVEVOVCA9IDE7Ci0gICAgICAgIFtFbmFibGVk QXRSdW50aW1lPUZpbGVTeXN0ZW1dIHZvaWQgd2Via2l0UmVxdWVzdEZpbGVTeXN0ZW0oaW4gdW5z aWduZWQgc2hvcnQgdHlwZSwgaW4gbG9uZyBsb25nIHNpemUsIGluIFtDYWxsYmFjaywgT3B0aW9u YWxdIEZpbGVTeXN0ZW1DYWxsYmFjayBzdWNjZXNzQ2FsbGJhY2ssIGluIFtDYWxsYmFjaywgT3B0 aW9uYWxdIEVycm9yQ2FsbGJhY2sgZXJyb3JDYWxsYmFjayk7Ci0gICAgICAgIFtFbmFibGVkQXRS dW50aW1lPUZpbGVTeXN0ZW1dIHZvaWQgd2Via2l0UmVzb2x2ZUxvY2FsRmlsZVN5c3RlbVVSTChp biBET01TdHJpbmcgdXJsLCBpbiBbQ2FsbGJhY2ssIE9wdGlvbmFsXSBFbnRyeUNhbGxiYWNrIHN1 Y2Nlc3NDYWxsYmFjaywgaW4gW0NhbGxiYWNrLCBPcHRpb25hbF0gRXJyb3JDYWxsYmFjayBlcnJv ckNhbGxiYWNrKTsKKyAgICAgICAgW0VuYWJsZWRBdFJ1bnRpbWU9RmlsZVN5c3RlbV0gdm9pZCB3 ZWJraXRSZXF1ZXN0RmlsZVN5c3RlbShpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVd IHVuc2lnbmVkIHNob3J0IHR5cGUsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0aERl ZmF1bHRWYWx1ZV0gbG9uZyBsb25nIHNpemUsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtDYWxsYmFjaywgT3B0 aW9uYWxdIEZpbGVTeXN0ZW1DYWxsYmFjayBzdWNjZXNzQ2FsbGJhY2ssIAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu IFtDYWxsYmFjaywgT3B0aW9uYWxdIEVycm9yQ2FsbGJhY2sgZXJyb3JDYWxsYmFjayk7CisgICAg ICAgIFtFbmFibGVkQXRSdW50aW1lPUZpbGVTeXN0ZW1dIHZvaWQgd2Via2l0UmVzb2x2ZUxvY2Fs RmlsZVN5c3RlbVVSTChpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0cmlu ZyB1cmwsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW0NhbGxiYWNrLCBPcHRpb25hbF0gRW50cnlD YWxsYmFjayBzdWNjZXNzQ2FsbGJhY2ssIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW0NhbGxiYWNr LCBPcHRpb25hbF0gRXJyb3JDYWxsYmFjayBlcnJvckNhbGxiYWNrKTsKIAogICAgICAgICBhdHRy aWJ1dGUgW0VuYWJsZWRBdFJ1bnRpbWU9RmlsZVN5c3RlbV0gV2ViS2l0RmxhZ3NDb25zdHJ1Y3Rv ciBXZWJLaXRGbGFnczsKICNlbmRpZgpAQCAtMjEyLDcgKzIxOCw5IEBAIG1vZHVsZSB3aW5kb3cg ewogCiAgICAgICAgIC8vIGNyb3NzLWRvY3VtZW50IG1lc3NhZ2luZwogI2lmIGRlZmluZWQoTEFO R1VBR0VfSkFWQVNDUklQVCkgJiYgTEFOR1VBR0VfSkFWQVNDUklQVAotICAgICAgICBbRG9Ob3RD aGVja0RvbWFpblNlY3VyaXR5LCBDdXN0b21dIHZvaWQgcG9zdE1lc3NhZ2UoaW4gU2VyaWFsaXpl ZFNjcmlwdFZhbHVlIG1lc3NhZ2UsIGluIFtPcHRpb25hbF0gQXJyYXkgbWVzc2FnZVBvcnRzLCBp biBET01TdHJpbmcgdGFyZ2V0T3JpZ2luKQorICAgICAgICBbRG9Ob3RDaGVja0RvbWFpblNlY3Vy aXR5LCBDdXN0b21dIHZvaWQgcG9zdE1lc3NhZ2UoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVs dFZhbHVlXSBTZXJpYWxpemVkU2NyaXB0VmFsdWUgbWVzc2FnZSwgCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWxd IEFycmF5IG1lc3NhZ2VQb3J0cywgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFs dWVdIERPTVN0cmluZyB0YXJnZXRPcmlnaW4pCiAgICAgICAgICAgICByYWlzZXMoRE9NRXhjZXB0 aW9uKTsKICNlbHNlCiAgICAgICAgIC8vIFRoZXJlJ3Mgbm8gZ29vZCB3YXkgdG8gZXhwb3NlIGFu IGFycmF5IHZpYSB0aGUgT2JqQyBiaW5kaW5ncywgc28gZm9yIG5vdyBqdXN0IGFsbG93IHBhc3Np bmcgaW4gYSBzaW5nbGUgcG9ydC4KQEAgLTIyNSwyNSArMjMzLDI2IEBAIG1vZHVsZSB3aW5kb3cg ewogI2VuZGlmCiAKICAgICAgICAgLy8gVGltZXJzCi0gICAgICAgIFtDdXN0b21dIGxvbmcgc2V0 VGltZW91dChpbiBUaW1lb3V0SGFuZGxlciBoYW5kbGVyLCBpbiBsb25nIHRpbWVvdXQpOworICAg ICAgICBbQ3VzdG9tXSBsb25nIHNldFRpbWVvdXQoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVs dFZhbHVlXSBUaW1lb3V0SGFuZGxlciBoYW5kbGVyLCAKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gbG9uZyB0aW1lb3V0 KTsKICAgICAgICAgLy8gW0N1c3RvbV0gbG9uZyBzZXRUaW1lb3V0KGluIFRpbWVvdXRIYW5kbGVy IGhhbmRsZXIsIGluIGxvbmcgdGltZW91dCwgYXJndW1lbnRzLi4uKTsKICAgICAgICAgLy8gW0N1 c3RvbV0gbG9uZyBzZXRUaW1lb3V0KGluIERPTVN0cmluZyBjb2RlLCBpbiBsb25nIHRpbWVvdXQp OwotICAgICAgICB2b2lkIGNsZWFyVGltZW91dChpbiBsb25nIGhhbmRsZSk7Ci0gICAgICAgIFtD dXN0b21dIGxvbmcgc2V0SW50ZXJ2YWwoaW4gVGltZW91dEhhbmRsZXIgaGFuZGxlciwgaW4gbG9u ZyB0aW1lb3V0KTsKKyAgICAgICAgdm9pZCBjbGVhclRpbWVvdXQoaW4gW09wdGlvbmFsPUNhbGxX aXRoRGVmYXVsdFZhbHVlXSBsb25nIGhhbmRsZSk7CisgICAgICAgIFtDdXN0b21dIGxvbmcgc2V0 SW50ZXJ2YWwoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBUaW1lb3V0SGFuZGxl ciBoYW5kbGVyLCBpbiBsb25nIHRpbWVvdXQpOwogICAgICAgICAvLyBbQ3VzdG9tXSBsb25nIHNl dEludGVydmFsKGluIFRpbWVvdXRIYW5kbGVyIGhhbmRsZXIsIGluIGxvbmcgdGltZW91dCwgYXJn dW1lbnRzLi4uKTsKICAgICAgICAgLy8gW0N1c3RvbV0gbG9uZyBzZXRJbnRlcnZhbChpbiBET01T dHJpbmcgY29kZSwgaW4gbG9uZyB0aW1lb3V0KTsKLSAgICAgICAgdm9pZCBjbGVhckludGVydmFs KGluIGxvbmcgaGFuZGxlKTsKKyAgICAgICAgdm9pZCBjbGVhckludGVydmFsKGluIFtPcHRpb25h bD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gbG9uZyBoYW5kbGUpOwogCiAjaWYgZGVmaW5lZChFTkFC TEVfUkVRVUVTVF9BTklNQVRJT05fRlJBTUUpCiAgICAgICAgIC8vIFdlYktpdCBhbmltYXRpb24g ZXh0ZW5zaW9ucwogICAgICAgICBsb25nIHdlYmtpdFJlcXVlc3RBbmltYXRpb25GcmFtZShpbiBb Q2FsbGJhY2tdIFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrIGNhbGxiYWNrLCBpbiBFbGVt ZW50IGVsZW1lbnQpOwotICAgICAgICB2b2lkIHdlYmtpdENhbmNlbFJlcXVlc3RBbmltYXRpb25G cmFtZShpbiBsb25nIGlkKTsKKyAgICAgICAgdm9pZCB3ZWJraXRDYW5jZWxSZXF1ZXN0QW5pbWF0 aW9uRnJhbWUoaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIGlkKTsKICNl bmRpZgogCiAgICAgICAgIC8vIEJhc2U2NAotICAgICAgICBET01TdHJpbmcgYXRvYihpbiBbQ29u dmVydE51bGxUb051bGxTdHJpbmddIERPTVN0cmluZyBzdHJpbmcpCisgICAgICAgIERPTVN0cmlu ZyBhdG9iKGluIFtDb252ZXJ0TnVsbFRvTnVsbFN0cmluZyxPcHRpb25hbD1DYWxsV2l0aERlZmF1 bHRWYWx1ZV0gRE9NU3RyaW5nIHN0cmluZykKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRp b24pOwotICAgICAgICBET01TdHJpbmcgYnRvYShpbiBbQ29udmVydE51bGxUb051bGxTdHJpbmdd IERPTVN0cmluZyBzdHJpbmcpCisgICAgICAgIERPTVN0cmluZyBidG9hKGluIFtDb252ZXJ0TnVs bFRvTnVsbFN0cmluZyxPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gRE9NU3RyaW5nIHN0 cmluZykKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwogCiAgICAgICAgIC8vIEV2 ZW50cwo= 102808 2011-08-03 12:19:51 -0700 2011-08-03 14:51:01 -0700 Patch bug-65353-20110803152000.patch text/plain 9332 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMjM3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDgtMDIgIE1hcmsgUGls Z3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbW92ZSBMZWdhY3lEZWZh dWx0T3B0aW9uYWxBcmd1bWVudHMgZmxhZyBmcm9tIERPTVdpbmRvdy5pZGwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MzUzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFsbCBleGlzdGlu ZyB0ZXN0cyBwYXNzLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG06CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKyAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAgICAgKEdlbmVyYXRlRnVuY3Rp b25DYWxsYmFjayk6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuaWRsOgorCiAyMDExLTA4LTAy ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUg TGVnYWN5RGVmYXVsdE9wdGlvbmFsQXJndW1lbnRzIGZsYWcgZnJvbSBTVkcgSURMIGZpbGVzCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbQkocmV2aXNpb24gOTIyMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTk3NiwxMSArMTk3Niwx MSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIG15ICRudW1Q YXJhbWV0ZXJzID0gQHskZnVuY3Rpb24tPnBhcmFtZXRlcnN9OwogCiAgICAgICAgICAgICAgICAg bXkgJHJlcXVpcmVzQWxsQXJndW1lbnRzOwotICAgICAgICAgICAgICAgIGlmICgkZGF0YU5vZGUt PmV4dGVuZGVkQXR0cmlidXRlcy0+eyJMZWdhY3lEZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMifSkg ewotICAgICAgICAgICAgICAgICAgICAkcmVxdWlyZXNBbGxBcmd1bWVudHMgPSAkZnVuY3Rpb24t PnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlJlcXVpcmVzQWxsQXJndW1lbnRzIn07 Ci0gICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgJHJlcXVpcmVz QWxsQXJndW1lbnRzID0gIlJhaXNlIjsKKyAgICAgICAgICAgICAgICBteSAkcmVxdWlyZXNBbGxB cmd1bWVudHNEZWZhdWx0ID0gIiI7CisgICAgICAgICAgICAgICAgaWYgKCEkZGF0YU5vZGUtPmV4 dGVuZGVkQXR0cmlidXRlcy0+eyJMZWdhY3lEZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMifSkgewor ICAgICAgICAgICAgICAgICAgICAkcmVxdWlyZXNBbGxBcmd1bWVudHNEZWZhdWx0ID0gIlJhaXNl IjsKICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgJHJlcXVpcmVzQWxsQXJndW1l bnRzID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJSZXF1aXJl c0FsbEFyZ3VtZW50cyJ9IHx8ICRyZXF1aXJlc0FsbEFyZ3VtZW50c0RlZmF1bHQ7CiAgICAgICAg ICAgICAgICAgaWYgKCRyZXF1aXJlc0FsbEFyZ3VtZW50cykgewogICAgICAgICAgICAgICAgICAg ICBteSAkbnVtTWFuZGF0b3J5UGFyYW1zID0gQHskZnVuY3Rpb24tPnBhcmFtZXRlcnN9OwogICAg ICAgICAgICAgICAgICAgICBmb3JlYWNoIG15ICRwYXJhbSAocmV2ZXJzZShAeyRmdW5jdGlvbi0+ cGFyYW1ldGVyc30pKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3JWOC5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkocmV2aXNpb24gOTIyMzcpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkod29ya2luZyBjb3B5KQpA QCAtMTI0OCwxMSArMTI0OCwxMSBAQCBFTkQKICAgICBteSAkbnVtUGFyYW1ldGVycyA9IEB7JGZ1 bmN0aW9uLT5wYXJhbWV0ZXJzfTsKIAogICAgIG15ICRyZXF1aXJlc0FsbEFyZ3VtZW50czsKLSAg ICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiTGVnYWN5RGVmYXVsdE9wdGlv bmFsQXJndW1lbnRzIn0pIHsKLSAgICAgICAgJHJlcXVpcmVzQWxsQXJndW1lbnRzID0gJGZ1bmN0 aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJSZXF1aXJlc0FsbEFyZ3VtZW50 cyJ9OwotICAgIH0gZWxzZSB7Ci0gICAgICAgICRyZXF1aXJlc0FsbEFyZ3VtZW50cyA9ICJSYWlz ZSI7CisgICAgbXkgJHJlcXVpcmVzQWxsQXJndW1lbnRzRGVmYXVsdCA9ICIiOworICAgIGlmICgh JGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiTGVnYWN5RGVmYXVsdE9wdGlvbmFsQXJn dW1lbnRzIn0pIHsKKyAgICAgICAgJHJlcXVpcmVzQWxsQXJndW1lbnRzRGVmYXVsdCA9ICJSYWlz ZSI7CiAgICAgfQorICAgICRyZXF1aXJlc0FsbEFyZ3VtZW50cyA9ICRmdW5jdGlvbi0+c2lnbmF0 dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiUmVxdWlyZXNBbGxBcmd1bWVudHMifSB8fCAkcmVx dWlyZXNBbGxBcmd1bWVudHNEZWZhdWx0OwogICAgIGlmICgkcmVxdWlyZXNBbGxBcmd1bWVudHMp IHsKICAgICAgICAgbXkgJG51bU1hbmRhdG9yeVBhcmFtcyA9IEB7JGZ1bmN0aW9uLT5wYXJhbWV0 ZXJzfTsKICAgICAgICAgZm9yZWFjaCBteSAkcGFyYW0gKHJldmVyc2UoQHskZnVuY3Rpb24tPnBh cmFtZXRlcnN9KSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaWRsCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbAkocmV2aXNpb24g OTIyMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHdvcmtpbmcgY29w eSkKQEAgLTI2LDcgKzI2LDYgQEAKIG1vZHVsZSB3aW5kb3cgewogCiAgICAgaW50ZXJmYWNlIFsK LSAgICAgICAgTGVnYWN5RGVmYXVsdE9wdGlvbmFsQXJndW1lbnRzLAogICAgICAgICBDaGVja0Rv bWFpblNlY3VyaXR5LAogICAgICAgICBDdXN0b21EZWZpbmVHZXR0ZXIsCiAgICAgICAgIEN1c3Rv bURlZmluZVNldHRlciwKQEAgLTgwLDE4ICs3OSwxOCBAQCBtb2R1bGUgd2luZG93IHsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWxdIERPTU9i amVjdCBkaWFsb2dBcmdzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGluIFtPcHRpb25hbF0gRE9NU3RyaW5nIGZlYXR1cmVBcmdzKTsKIAotICAgICAgICB2b2lk IGFsZXJ0KGluIERPTVN0cmluZyBtZXNzYWdlKTsKLSAgICAgICAgYm9vbGVhbiBjb25maXJtKGlu IERPTVN0cmluZyBtZXNzYWdlKTsKLSAgICAgICAgW0NvbnZlcnROdWxsU3RyaW5nVG89TnVsbF0g RE9NU3RyaW5nIHByb21wdChpbiBET01TdHJpbmcgbWVzc2FnZSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbQ29udmVydFVuZGVmaW5lZE9y TnVsbFRvTnVsbFN0cmluZ10gRE9NU3RyaW5nIGRlZmF1bHRWYWx1ZSk7Ci0KLSAgICAgICAgYm9v bGVhbiBmaW5kKGluIERPTVN0cmluZyBzdHJpbmcsCi0gICAgICAgICAgICAgICAgICAgICBpbiBi b29sZWFuIGNhc2VTZW5zaXRpdmUsCi0gICAgICAgICAgICAgICAgICAgICBpbiBib29sZWFuIGJh Y2t3YXJkcywKLSAgICAgICAgICAgICAgICAgICAgIGluIGJvb2xlYW4gd3JhcCwKLSAgICAgICAg ICAgICAgICAgICAgIGluIGJvb2xlYW4gd2hvbGVXb3JkLAotICAgICAgICAgICAgICAgICAgICAg aW4gYm9vbGVhbiBzZWFyY2hJbkZyYW1lcywKLSAgICAgICAgICAgICAgICAgICAgIGluIGJvb2xl YW4gc2hvd0RpYWxvZyk7CisgICAgICAgIHZvaWQgYWxlcnQoaW4gW09wdGlvbmFsPUNhbGxXaXRo RGVmYXVsdFZhbHVlXSBET01TdHJpbmcgbWVzc2FnZSk7CisgICAgICAgIGJvb2xlYW4gY29uZmly bShpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0cmluZyBtZXNzYWdlKTsK KyAgICAgICAgW0NvbnZlcnROdWxsU3RyaW5nVG89TnVsbF0gRE9NU3RyaW5nIHByb21wdChpbiBb T3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIERPTVN0cmluZyBtZXNzYWdlLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFtDb252ZXJ0 VW5kZWZpbmVkT3JOdWxsVG9OdWxsU3RyaW5nLE9wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVl XSBET01TdHJpbmcgZGVmYXVsdFZhbHVlKTsKKworICAgICAgICBib29sZWFuIGZpbmQoaW4gW09w dGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBET01TdHJpbmcgc3RyaW5nLAorICAgICAgICAg ICAgICAgICAgICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBib29sZWFuIGNh c2VTZW5zaXRpdmUsCisgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhE ZWZhdWx0VmFsdWVdIGJvb2xlYW4gYmFja3dhcmRzLAorICAgICAgICAgICAgICAgICAgICAgaW4g W09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBib29sZWFuIHdyYXAsCisgICAgICAgICAg ICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIGJvb2xlYW4gd2hv bGVXb3JkLAorICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVs dFZhbHVlXSBib29sZWFuIHNlYXJjaEluRnJhbWVzLAorICAgICAgICAgICAgICAgICAgICAgaW4g W09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBib29sZWFuIHNob3dEaWFsb2cpOwogCiAg ICAgICAgIGF0dHJpYnV0ZSBbUmVwbGFjZWFibGVdIGJvb2xlYW4gb2Zmc2NyZWVuQnVmZmVyaW5n OwogCkBAIC0xNDgsMjUgKzE0NywyNyBAQCBtb2R1bGUgd2luZG93IHsKICAgICAgICAgcmVhZG9u bHkgYXR0cmlidXRlIFN0eWxlTWVkaWEgc3R5bGVNZWRpYTsKIAogICAgICAgICAvLyBET00gTGV2 ZWwgMiBTdHlsZSBJbnRlcmZhY2UKLSAgICAgICAgQ1NTU3R5bGVEZWNsYXJhdGlvbiBnZXRDb21w dXRlZFN0eWxlKGluIEVsZW1lbnQgZWxlbWVudCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGluIFtDb252ZXJ0VW5kZWZpbmVkT3JOdWxsVG9OdWxsU3RyaW5n XSBET01TdHJpbmcgcHNldWRvRWxlbWVudCk7CisgICAgICAgIENTU1N0eWxlRGVjbGFyYXRpb24g Z2V0Q29tcHV0ZWRTdHlsZShpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIEVsZW1l bnQgZWxlbWVudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGluIFtDb252ZXJ0VW5kZWZpbmVkT3JOdWxsVG9OdWxsU3RyaW5nLE9wdGlvbmFsPUNhbGxXaXRo RGVmYXVsdFZhbHVlXSBET01TdHJpbmcgcHNldWRvRWxlbWVudCk7CiAKICAgICAgICAgLy8gV2Vi S2l0IGV4dGVuc2lvbnMKICNpZiBkZWZpbmVkKExBTkdVQUdFX0pBVkFTQ1JJUFQpICYmIExBTkdV QUdFX0pBVkFTQ1JJUFQKLSAgICAgICAgQ1NTUnVsZUxpc3QgZ2V0TWF0Y2hlZENTU1J1bGVzKGlu IEVsZW1lbnQgZWxlbWVudCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGluIERPTVN0cmluZyBwc2V1ZG9FbGVtZW50KTsKKyAgICAgICAgQ1NTUnVsZUxpc3QgZ2V0TWF0 Y2hlZENTU1J1bGVzKGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gRWxlbWVudCBl bGVtZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlv bmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBET01TdHJpbmcgcHNldWRvRWxlbWVudCk7CiAjZW5k aWYKIAogICAgICAgICBhdHRyaWJ1dGUgW1JlcGxhY2VhYmxlXSBkb3VibGUgZGV2aWNlUGl4ZWxS YXRpbzsKICAgICAgICAgCi0gICAgICAgIFdlYktpdFBvaW50IHdlYmtpdENvbnZlcnRQb2ludEZy b21QYWdlVG9Ob2RlKGluIE5vZGUgbm9kZSwgaW4gV2ViS2l0UG9pbnQgcCk7Ci0gICAgICAgIFdl YktpdFBvaW50IHdlYmtpdENvbnZlcnRQb2ludEZyb21Ob2RlVG9QYWdlKGluIE5vZGUgbm9kZSwg aW4gV2ViS2l0UG9pbnQgcCk7CisgICAgICAgIFdlYktpdFBvaW50IHdlYmtpdENvbnZlcnRQb2lu dEZyb21QYWdlVG9Ob2RlKGluIFtPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gTm9kZSBu b2RlLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBXZWJLaXRQb2ludCBwKTsKKyAg ICAgICAgV2ViS2l0UG9pbnQgd2Via2l0Q29udmVydFBvaW50RnJvbU5vZGVUb1BhZ2UoaW4gW09w dGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBOb2RlIG5vZGUsIAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbT3B0aW9uYWw9Q2FsbFdp dGhEZWZhdWx0VmFsdWVdIFdlYktpdFBvaW50IHApOwogCiAjaWYgZGVmaW5lZChFTkFCTEVfT0ZG TElORV9XRUJfQVBQTElDQVRJT05TKSAmJiBFTkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJT05T CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBbRW5hYmxlZEF0UnVudGltZV0gRE9NQXBwbGlj YXRpb25DYWNoZSBhcHBsaWNhdGlvbkNhY2hlOwogI2VuZGlmICAgIAogI2lmIGRlZmluZWQoRU5B QkxFX0RBVEFCQVNFKSAmJiBFTkFCTEVfREFUQUJBU0UKLSAgICAgICAgW0VuYWJsZWRBdFJ1bnRp bWUsIFJlcXVpcmVzQWxsQXJndW1lbnRzPVJhaXNlXSBEYXRhYmFzZSBvcGVuRGF0YWJhc2UoaW4g RE9NU3RyaW5nIG5hbWUsIGluIERPTVN0cmluZyB2ZXJzaW9uLCBpbiBET01TdHJpbmcgZGlzcGxh eU5hbWUsIGluIHVuc2lnbmVkIGxvbmcgZXN0aW1hdGVkU2l6ZSwgaW4gW0NhbGxiYWNrLCBPcHRp b25hbF0gRGF0YWJhc2VDYWxsYmFjayBjcmVhdGlvbkNhbGxiYWNrKQorICAgICAgICBbRW5hYmxl ZEF0UnVudGltZV0gRGF0YWJhc2Ugb3BlbkRhdGFiYXNlKGluIERPTVN0cmluZyBuYW1lLCBpbiBE T01TdHJpbmcgdmVyc2lvbiwgaW4gRE9NU3RyaW5nIGRpc3BsYXlOYW1lLCBpbiB1bnNpZ25lZCBs b25nIGVzdGltYXRlZFNpemUsIGluIFtDYWxsYmFjaywgT3B0aW9uYWxdIERhdGFiYXNlQ2FsbGJh Y2sgY3JlYXRpb25DYWxsYmFjaykKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwog I2VuZGlmCiAjaWYgZGVmaW5lZChFTkFCTEVfRE9NX1NUT1JBR0UpICYmIEVOQUJMRV9ET01fU1RP UkFHRQpAQCAtMjI1LDE0ICsyMjYsMTUgQEAgbW9kdWxlIHdpbmRvdyB7CiAjZW5kaWYKIAogICAg ICAgICAvLyBUaW1lcnMKLSAgICAgICAgW0N1c3RvbV0gbG9uZyBzZXRUaW1lb3V0KGluIFRpbWVv dXRIYW5kbGVyIGhhbmRsZXIsIGluIGxvbmcgdGltZW91dCk7CisgICAgICAgIFtDdXN0b21dIGxv bmcgc2V0VGltZW91dChpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZhdWx0VmFsdWVdIFRpbWVvdXRI YW5kbGVyIGhhbmRsZXIsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09w dGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIHRpbWVvdXQpOwogICAgICAgICAvLyBb Q3VzdG9tXSBsb25nIHNldFRpbWVvdXQoaW4gVGltZW91dEhhbmRsZXIgaGFuZGxlciwgaW4gbG9u ZyB0aW1lb3V0LCBhcmd1bWVudHMuLi4pOwogICAgICAgICAvLyBbQ3VzdG9tXSBsb25nIHNldFRp bWVvdXQoaW4gRE9NU3RyaW5nIGNvZGUsIGluIGxvbmcgdGltZW91dCk7Ci0gICAgICAgIHZvaWQg Y2xlYXJUaW1lb3V0KGluIGxvbmcgaGFuZGxlKTsKKyAgICAgICAgdm9pZCBjbGVhclRpbWVvdXQo aW4gW09wdGlvbmFsPUNhbGxXaXRoRGVmYXVsdFZhbHVlXSBsb25nIGhhbmRsZSk7CiAgICAgICAg IFtDdXN0b21dIGxvbmcgc2V0SW50ZXJ2YWwoaW4gVGltZW91dEhhbmRsZXIgaGFuZGxlciwgaW4g bG9uZyB0aW1lb3V0KTsKICAgICAgICAgLy8gW0N1c3RvbV0gbG9uZyBzZXRJbnRlcnZhbChpbiBU aW1lb3V0SGFuZGxlciBoYW5kbGVyLCBpbiBsb25nIHRpbWVvdXQsIGFyZ3VtZW50cy4uLik7CiAg ICAgICAgIC8vIFtDdXN0b21dIGxvbmcgc2V0SW50ZXJ2YWwoaW4gRE9NU3RyaW5nIGNvZGUsIGlu IGxvbmcgdGltZW91dCk7Ci0gICAgICAgIHZvaWQgY2xlYXJJbnRlcnZhbChpbiBsb25nIGhhbmRs ZSk7CisgICAgICAgIHZvaWQgY2xlYXJJbnRlcnZhbChpbiBbT3B0aW9uYWw9Q2FsbFdpdGhEZWZh dWx0VmFsdWVdIGxvbmcgaGFuZGxlKTsKIAogI2lmIGRlZmluZWQoRU5BQkxFX1JFUVVFU1RfQU5J TUFUSU9OX0ZSQU1FKQogICAgICAgICAvLyBXZWJLaXQgYW5pbWF0aW9uIGV4dGVuc2lvbnMKQEAg LTI0MSw5ICsyNDMsOSBAQCBtb2R1bGUgd2luZG93IHsKICNlbmRpZgogCiAgICAgICAgIC8vIEJh c2U2NAotICAgICAgICBET01TdHJpbmcgYXRvYihpbiBbQ29udmVydE51bGxUb051bGxTdHJpbmdd IERPTVN0cmluZyBzdHJpbmcpCisgICAgICAgIERPTVN0cmluZyBhdG9iKGluIFtDb252ZXJ0TnVs bFRvTnVsbFN0cmluZyxPcHRpb25hbD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gRE9NU3RyaW5nIHN0 cmluZykKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwotICAgICAgICBET01TdHJp bmcgYnRvYShpbiBbQ29udmVydE51bGxUb051bGxTdHJpbmddIERPTVN0cmluZyBzdHJpbmcpCisg ICAgICAgIERPTVN0cmluZyBidG9hKGluIFtDb252ZXJ0TnVsbFRvTnVsbFN0cmluZyxPcHRpb25h bD1DYWxsV2l0aERlZmF1bHRWYWx1ZV0gRE9NU3RyaW5nIHN0cmluZykKICAgICAgICAgICAgIHJh aXNlcyhET01FeGNlcHRpb24pOwogCiAgICAgICAgIC8vIEV2ZW50cwo=