84926 2012-04-25 19:07:59 -0700 [chromium] Remove guarded virtual methods from WebFilterOperation API 2012-04-26 00:02:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj abarth backer dglazkov fishd jamesr piman tkent+wkapi webkit.review.bot zork oldest_to_newest 610302 0 danakj 2012-04-25 19:07:59 -0700 [chromium] Cannot use guarded virtual methods in public API classes 610305 1 138925 danakj 2012-04-25 19:12:50 -0700 Created attachment 138925 Patch 610306 2 webkit.review.bot 2012-04-25 19:14:42 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 610321 3 138925 jamesr 2012-04-25 20:46:53 -0700 Comment on attachment 138925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138925&action=review > Source/Platform/ChangeLog:3 > + [chromium] Cannot use guarded virtual methods in public API classes this is not a description of a bug (public API classes shouldn't allow guarded virtual methods, most likely) and it's not a good description of what this patch is changing. can you update it (and the WebCore/ChangeLog entry too)? 610332 4 138931 danakj 2012-04-25 21:31:39 -0700 Created attachment 138931 Patch for landing 610365 5 138931 webkit.review.bot 2012-04-25 22:43:40 -0700 Comment on attachment 138931 Patch for landing Clearing flags on attachment: 138931 Committed r115291: <http://trac.webkit.org/changeset/115291> 610366 6 webkit.review.bot 2012-04-25 22:43:45 -0700 All reviewed patches have been landed. Closing bug. 610385 7 138931 fishd 2012-04-25 23:58:21 -0700 Comment on attachment 138931 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=138931&action=review > Source/Platform/chromium/public/WebFilterOperation.h:74 > + enum BasicComponentTransferFilterType { "BasicComponentTransfer" appears both as part of the struct name as as a prefix for the enum. why duplicate the prefix? 610388 8 138931 danakj 2012-04-26 00:02:51 -0700 Comment on attachment 138931 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=138931&action=review >> Source/Platform/chromium/public/WebFilterOperation.h:74 >> + enum BasicComponentTransferFilterType { > > "BasicComponentTransfer" appears both as part of the struct name as as > a prefix for the enum. why duplicate the prefix? Because it is a sub-FilterType specific to this class. There is a FilterType in the base class that specifies which subclass the operation is. This specifies which FilterType for a BasicComponentTransfer. 138925 2012-04-25 19:12:50 -0700 2012-04-25 21:31:35 -0700 Patch bug-84926-20120425191249.patch text/plain 15192 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBlY2RiOTRhNzRiOWQ3 MWJhMDEwODM1OTlhMjFjYTQ2YTZlNzgwZjc2Li4wNjU5ZWRkZjNmMzBiZGE0NjcyM2IwNDViNjZl OWQ3YjAzOGFhN2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMi0wNC0yNSAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IENhbm5vdCB1c2UgZ3VhcmRlZCB2aXJ0dWFsIG1ldGhvZHMgaW4gcHVibGljIEFQSSBjbGFzc2Vz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDkyNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHJlbW92 ZSB0aGUgdmlydHVhbCBtZXRob2RzIGZyb20gdGhlIFdlYkZpbHRlck9wZXJhdGlvbiBjbGFzcywK KyAgICAgICAgYW5kIHVzZSBhbiBlbnVtIGluIHRoZSBiYXNlIGNsYXNzIHRvIGRpc3Rpbmd1aXNo IHdoaWNoIHN1YmNsYXNzCisgICAgICAgIHRoZSBvYmplY3QgaXMuIFRoZW4gV2ViRmlsdGVyT3Bl cmF0aW9ucyBjYW4gYWNjZXNzIHRoZSBjb3JyZWN0CisgICAgICAgIHN1YmNsYXNzIHRvIGdldCB0 aGUgZmlsdGVyIG9wZXJhdGlvbidzIGRhdGEgYW5kIGNvbnN0cnVjdCBhCisgICAgICAgIFdlYkNv cmU6OkZpbHRlck9wZXJhdGlvbiB0byBzdG9yZSBpbnRlcm5hbGx5LgorCisgICAgICAgICogY2hy b21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpXZWJG aWx0ZXJPcGVyYXRpb246OldlYkZpbHRlck9wZXJhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Oldl YkJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb246OldlYkJhc2ljQ29sb3JNYXRyaXhGaWx0 ZXJPcGVyYXRpb24pOgorICAgICAgICAoV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlv bik6CisgICAgICAgIChXZWJLaXQ6OldlYkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJPcGVy YXRpb246OldlYkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJPcGVyYXRpb24pOgorICAgICAg ICAoV2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbik6CisgICAgICAgIChX ZWJLaXQ6OldlYkJsdXJGaWx0ZXJPcGVyYXRpb246OldlYkJsdXJGaWx0ZXJPcGVyYXRpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJEcm9wU2hhZG93RmlsdGVyT3BlcmF0aW9uOjpXZWJEcm9wU2hh ZG93RmlsdGVyT3BlcmF0aW9uKToKKwogMjAxMi0wNC0yNSAgR2F2aW4gUGV0ZXJzICA8Z2F2aW5w QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIEZpeCBzb21lIGNvbmRpdGlvbmFs IGNvbXBpbGF0aW9uIGxvZ2ljIGluIFBsYXRmb3JtCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmIyOTIzZmY1YmNi NzQwNmIwZDY4Mzk4NTk3OWIzYzhiNjRhMjQyZi4uNTk4ZGZhYTVjNzY0M2I5NmExMWM0YjNhZTFm ZTgzYTJlMWQ4NTc3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTI1ICBE YW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g Q2Fubm90IHVzZSBndWFyZGVkIHZpcnR1YWwgbWV0aG9kcyBpbiBwdWJsaWMgQVBJIGNsYXNzZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0OTI2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3Jl Lmd5cGk6CisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJGaWx0ZXJPcGVy YXRpb24uY3BwOiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQv V2ViRmlsdGVyT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZpbHRlck9wZXJh dGlvbnM6OmFwcGVuZCk6CisKIDIwMTItMDQtMjUgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVu YXJkQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgTm90IHJldmlld2VkLCBmaXggV2luZG93cyBi dWlsZCBhZnRlciByMTE1MjE1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBmODE5ZmVj NTI2M2E1YzZmY2U1NmEzZTZlZjdhZDM3NTMxZTQwMjg0Li42ZDE2YmYwOGJiYzViMzUwNzdhOWMz OWE3Y2I4OGUxMzhkOWEzMmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDEyLTA0LTI1ICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtjaHJvbWl1bV0gQ2Fubm90IHVzZSBndWFyZGVkIHZpcnR1YWwgbWV0aG9kcyBp biBwdWJsaWMgQVBJIGNsYXNzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg0OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBzcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHA6CisKIDIwMTItMDQtMjUg IE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1 bV0gQ2FsbCBhY3R1YWxNZW1vcnlVc2FnZU1CIGRpcmVjdGx5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv UGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oIGIvU291cmNlL1Bs YXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJGaWx0ZXJPcGVyYXRpb24uaAppbmRleCA1NjFjYWQz YzJjN2U0YzZkNzU4MzViODg5NGMyMGI3OTZmMTIxMWU1Li4yYjU5NDBjOTQyMDY1ZjE4ZDA3MmYy OWQ5YThmYzc5N2VjMjQ1NmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0v cHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1 bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmgKQEAgLTM0LDg3ICszNCw3OCBAQAogI2luY2x1 ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjZW5kaWYKIAotI2lmIFdFQktJVF9JTVBMRU1FTlRBVElP TgotbmFtZXNwYWNlIFdlYkNvcmUgewotY2xhc3MgRmlsdGVyT3BlcmF0aW9uOwotfQotI2VuZGlm Ci0KIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdHJ1Y3QgV2ViRmlsdGVyT3BlcmF0aW9uIHsKLSNp ZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6 RmlsdGVyT3BlcmF0aW9uPiB0b0ZpbHRlck9wZXJhdGlvbigpIGNvbnN0ID0gMDsKLSNlbmRpZgor ICAgIGVudW0gRmlsdGVyVHlwZSB7CisgICAgICAgIEZpbHRlclR5cGVCYXNpY0NvbG9yTWF0cml4 LAorICAgICAgICBGaWx0ZXJUeXBlQmFzaWNDb21wb25lbnRUcmFuc2ZlciwKKyAgICAgICAgRmls dGVyVHlwZUJsdXIsCisgICAgICAgIEZpbHRlclR5cGVEcm9wU2hhZG93CisgICAgfTsKKworICAg IEZpbHRlclR5cGUgdHlwZTsKIAogcHJvdGVjdGVkOgotICAgIFdlYkZpbHRlck9wZXJhdGlvbigp IHsgfQorICAgIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlIHR5cGUpCisgICAgICAgIDog dHlwZSh0eXBlKQorICAgIHsgfQogfTsKIAogc3RydWN0IFdlYkJhc2ljQ29sb3JNYXRyaXhGaWx0 ZXJPcGVyYXRpb24gOiBwdWJsaWMgV2ViRmlsdGVyT3BlcmF0aW9uIHsKLSAgICBlbnVtIEZpbHRl clR5cGUgewotICAgICAgICBGaWx0ZXJUeXBlR3JheXNjYWxlID0gMSwKLSAgICAgICAgRmlsdGVy VHlwZVNlcGlhID0gMiwKLSAgICAgICAgRmlsdGVyVHlwZVNhdHVyYXRlID0gMywKLSAgICAgICAg RmlsdGVyVHlwZUh1ZVJvdGF0ZSA9IDQKKyAgICBlbnVtIEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJU eXBlIHsKKyAgICAgICAgQmFzaWNDb2xvck1hdHJpeEZpbHRlclR5cGVHcmF5c2NhbGUgPSAxLAor ICAgICAgICBCYXNpY0NvbG9yTWF0cml4RmlsdGVyVHlwZVNlcGlhID0gMiwKKyAgICAgICAgQmFz aWNDb2xvck1hdHJpeEZpbHRlclR5cGVTYXR1cmF0ZSA9IDMsCisgICAgICAgIEJhc2ljQ29sb3JN YXRyaXhGaWx0ZXJUeXBlSHVlUm90YXRlID0gNAogICAgIH07CiAKLSAgICBXZWJCYXNpY0NvbG9y TWF0cml4RmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGUgdHlwZSwgZmxvYXQgYW1vdW50KQotICAg ICAgICA6IHR5cGUodHlwZSkKKyAgICBXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9u KEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJUeXBlIHR5cGUsIGZsb2F0IGFtb3VudCkKKyAgICAgICAg OiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZUJhc2ljQ29sb3JNYXRyaXgpCisgICAgICAg ICwgc3VidHlwZSh0eXBlKQogICAgICAgICAsIGFtb3VudChhbW91bnQpCiAgICAgeyB9CiAKLSNp ZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6 RmlsdGVyT3BlcmF0aW9uPiB0b0ZpbHRlck9wZXJhdGlvbigpIGNvbnN0IE9WRVJSSURFOwotI2Vu ZGlmCi0KLSAgICBGaWx0ZXJUeXBlIHR5cGU7CisgICAgQmFzaWNDb2xvck1hdHJpeEZpbHRlclR5 cGUgc3VidHlwZTsKICAgICBmbG9hdCBhbW91bnQ7CiB9OwogCiBzdHJ1Y3QgV2ViQmFzaWNDb21w b25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbiA6IHB1YmxpYyBXZWJGaWx0ZXJPcGVyYXRpb24g ewotICAgIGVudW0gRmlsdGVyVHlwZSB7Ci0gICAgICAgIEZpbHRlclR5cGVJbnZlcnQgPSA1LAot ICAgICAgICBGaWx0ZXJUeXBlQnJpZ2h0bmVzcyA9IDcsCi0gICAgICAgIEZpbHRlclR5cGVDb250 cmFzdCA9IDgKKyAgICBlbnVtIEJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJUeXBlIHsKKyAg ICAgICAgQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlclR5cGVJbnZlcnQgPSA1LAorICAgICAg ICBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyVHlwZUJyaWdodG5lc3MgPSA3LAorICAgICAg ICBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyVHlwZUNvbnRyYXN0ID0gOAogICAgICAgICAv LyBPcGFjaXR5IGlzIG1pc3NpbmcgYmVjYXVzZSB0aGlzIGlzIG1vcmUgZXhwZW5zaXZlIHRoYW4g anVzdCBzZXR0aW5nIG9wYWNpdHkgb24gdGhlIGxheWVyLgogICAgIH07CiAKLSAgICBXZWJCYXNp Y0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGUgdHlwZSwgZmxvYXQg YW1vdW50KQotICAgICAgICA6IHR5cGUodHlwZSkKKyAgICBXZWJCYXNpY0NvbXBvbmVudFRyYW5z ZmVyRmlsdGVyT3BlcmF0aW9uKEJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJUeXBlIHR5cGUs IGZsb2F0IGFtb3VudCkKKyAgICAgICAgOiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZUJh c2ljQ29tcG9uZW50VHJhbnNmZXIpCisgICAgICAgICwgc3VidHlwZSh0eXBlKQogICAgICAgICAs IGFtb3VudChhbW91bnQpCiAgICAgeyB9CiAKLSNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KLSAg ICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6RmlsdGVyT3BlcmF0aW9uPiB0b0ZpbHRlck9w ZXJhdGlvbigpIGNvbnN0IE9WRVJSSURFOwotI2VuZGlmCi0KLSAgICBGaWx0ZXJUeXBlIHR5cGU7 CisgICAgQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlclR5cGUgc3VidHlwZTsKICAgICBmbG9h dCBhbW91bnQ7CiB9OwogCiBzdHJ1Y3QgV2ViQmx1ckZpbHRlck9wZXJhdGlvbiA6IHB1YmxpYyBX ZWJGaWx0ZXJPcGVyYXRpb24gewotICAgIGV4cGxpY2l0IFdlYkJsdXJGaWx0ZXJPcGVyYXRpb24o aW50IHBpeGVsUmFkaXVzKSA6IHBpeGVsUmFkaXVzKHBpeGVsUmFkaXVzKSB7IH0KLQotI2lmIFdF QktJVF9JTVBMRU1FTlRBVElPTgotICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJDb3JlOjpGaWx0 ZXJPcGVyYXRpb24+IHRvRmlsdGVyT3BlcmF0aW9uKCkgY29uc3QgT1ZFUlJJREU7Ci0jZW5kaWYK KyAgICBleHBsaWNpdCBXZWJCbHVyRmlsdGVyT3BlcmF0aW9uKGludCBwaXhlbFJhZGl1cykKKyAg ICAgICAgOiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZUJsdXIpCisgICAgICAgICwgcGl4 ZWxSYWRpdXMocGl4ZWxSYWRpdXMpCisgICAgeyB9CiAKICAgICBpbnQgcGl4ZWxSYWRpdXM7CiB9 OwogCi1jbGFzcyBXZWJEcm9wU2hhZG93RmlsdGVyT3BlcmF0aW9uIDogcHVibGljIFdlYkZpbHRl ck9wZXJhdGlvbiB7Ci0gICAgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbihpbnQgeCwgaW50 IHksIGludCBzdGREZXZpYXRpb24sIFdlYkNvbG9yIGNvbG9yKQotICAgICAgICA6IHgoeCkKK3N0 cnVjdCBXZWJEcm9wU2hhZG93RmlsdGVyT3BlcmF0aW9uIDogcHVibGljIFdlYkZpbHRlck9wZXJh dGlvbiB7CisgICAgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbihpbnQgeCwgaW50IHksIGlu dCBzdGREZXZpYXRpb24sIFdlYkNvbG9yIGNvbG9yKSAKKyAgICAgICAgOiBXZWJGaWx0ZXJPcGVy YXRpb24oRmlsdGVyVHlwZURyb3BTaGFkb3cpCisgICAgICAgICwgeCh4KQogICAgICAgICAsIHko eSkKICAgICAgICAgLCBzdGREZXZpYXRpb24oc3RkRGV2aWF0aW9uKQogICAgICAgICAsIGNvbG9y KGNvbG9yKQogICAgIHsgfQogCi0jaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCi0gICAgdmlydHVh bCBQYXNzUmVmUHRyPFdlYkNvcmU6OkZpbHRlck9wZXJhdGlvbj4gdG9GaWx0ZXJPcGVyYXRpb24o KSBjb25zdCBPVkVSUklERTsKLSNlbmRpZgotCiAgICAgaW50IHg7CiAgICAgaW50IHk7CiAgICAg aW50IHN0ZERldmlhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lw aSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBkOWI3OTEwZGEyZWFjOWZlY2Ux ZTIwODQyYzRkODAxZmU3ZTdlNTA2Li5mODA2YzlhYjBhZjdlZmNlMDY2YThhNGYyZjE0NWJkMThm NWVhNGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC04MjM2LDcgKzgyMzYsNiBAQAogICAgICAgICAg ICAgJ3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViRGF0YS5jcHAnLAogICAgICAgICAgICAg J3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViSFRUUEJvZHkuY3BwJywKICAgICAgICAgICAg ICdwbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkhUVFBMb2FkSW5mby5jcHAnLAotICAgICAg ICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViRmlsdGVyT3BlcmF0aW9uLmNwcCcs CiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJGaWx0ZXJPcGVyYXRp b25zLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJJQ0VD YW5kaWRhdGVEZXNjcmlwdG9yLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0v c3VwcG9ydC9XZWJJQ0VPcHRpb25zLmNwcCcsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkZpbHRlck9wZXJhdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkZpbHRlck9wZXJhdGlvbi5jcHAK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDUzNjk2OGQ4MmRjZDA2OTliNzQyODBlYTk5 MTgwYzFkMmI1N2VmNDQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJGaWx0ZXJP cGVyYXRpb24uY3BwCisrKyAvZGV2L251bGwKQEAgLTEsNTYgKzAsMCBAQAotLyoKLSAqIENvcHly aWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICoKLSAqIDEuICBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICog ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KLSAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgICBkb2N1 bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJp YnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElU UyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FS UkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0gKiBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS IFBVUlBPU0UgQVJFCi0gKiBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJ VFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0gKiBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUwot ICogKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOwotICogTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7 IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECi0gKiBPTiBBTlkg VEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCi0gKiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbmNs dWRlICJjb25maWcuaCIKLQotI2luY2x1ZGUgIkZpbHRlck9wZXJhdGlvbi5oIgotCi0jaW5jbHVk ZSA8cHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oPgotCi11c2luZyBuYW1lc3BhY2UgV2ViQ29y ZTsKLQotbmFtZXNwYWNlIFdlYktpdCB7Ci0KLVBhc3NSZWZQdHI8V2ViQ29yZTo6RmlsdGVyT3Bl cmF0aW9uPiBXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjp0b0ZpbHRlck9wZXJh dGlvbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRp b246OmNyZWF0ZShhbW91bnQsIHN0YXRpY19jYXN0PEZpbHRlck9wZXJhdGlvbjo6T3BlcmF0aW9u VHlwZT4odHlwZSkpOwotfQotCi1QYXNzUmVmUHRyPFdlYkNvcmU6OkZpbHRlck9wZXJhdGlvbj4g V2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbjo6dG9GaWx0ZXJPcGVyYXRp b24oKSBjb25zdAotewotICAgIHJldHVybiBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyT3Bl cmF0aW9uOjpjcmVhdGUoYW1vdW50LCBzdGF0aWNfY2FzdDxGaWx0ZXJPcGVyYXRpb246Ok9wZXJh dGlvblR5cGU+KHR5cGUpKTsKLX0KLQotUGFzc1JlZlB0cjxXZWJDb3JlOjpGaWx0ZXJPcGVyYXRp b24+IFdlYkJsdXJGaWx0ZXJPcGVyYXRpb246OnRvRmlsdGVyT3BlcmF0aW9uKCkgY29uc3QKLXsK LSAgICByZXR1cm4gQmx1ckZpbHRlck9wZXJhdGlvbjo6Y3JlYXRlKExlbmd0aChwaXhlbFJhZGl1 cywgRml4ZWQpLCBGaWx0ZXJPcGVyYXRpb246OkJMVVIpOwotfQotCi1QYXNzUmVmUHRyPFdlYkNv cmU6OkZpbHRlck9wZXJhdGlvbj4gV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbjo6dG9GaWx0 ZXJPcGVyYXRpb24oKSBjb25zdAotewotICAgIHJldHVybiBEcm9wU2hhZG93RmlsdGVyT3BlcmF0 aW9uOjpjcmVhdGUoSW50UG9pbnQoeCwgeSksIHN0ZERldmlhdGlvbiwgY29sb3IsIEZpbHRlck9w ZXJhdGlvbjo6RFJPUF9TSEFET1cpOwotfQotCi19IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViRmlsdGVy T3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0 L1dlYkZpbHRlck9wZXJhdGlvbnMuY3BwCmluZGV4IGU4MDA3ZDg3ZmRmNzRlNDdlZGVjMzFhMjkw NGRjMzk1NjYxZDAzZGEuLmQ2MGQ5Mjg3YTZiNTk5MTQxMzJlMDBiNDQyMjIxNTdhNjk0MDU1ZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2Vi RmlsdGVyT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vc3VwcG9ydC9XZWJGaWx0ZXJPcGVyYXRpb25zLmNwcApAQCAtNDIsNyArNDIsMjggQEAgdm9p ZCBXZWJGaWx0ZXJPcGVyYXRpb25zOjppbml0aWFsaXplKCkKIAogdm9pZCBXZWJGaWx0ZXJPcGVy YXRpb25zOjphcHBlbmQoY29uc3QgV2ViRmlsdGVyT3BlcmF0aW9uJiBmaWx0ZXIpCiB7Ci0gICAg bV9wcml2YXRlLT5vcGVyYXRpb25zKCkuYXBwZW5kKGZpbHRlci50b0ZpbHRlck9wZXJhdGlvbigp KTsKKyAgICBzd2l0Y2ggKGZpbHRlci50eXBlKSB7CisgICAgY2FzZSBXZWJGaWx0ZXJPcGVyYXRp b246OkZpbHRlclR5cGVCYXNpY0NvbG9yTWF0cml4OiB7CisgICAgICAgIGNvbnN0IFdlYkJhc2lj Q29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24mIGNvbG9yRmlsdGVyID0gc3RhdGljX2Nhc3Q8Y29u c3QgV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbiY+KGZpbHRlcik7CisgICAgICAg IG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3Bl cmF0aW9uOjpjcmVhdGUoY29sb3JGaWx0ZXIuYW1vdW50LCBzdGF0aWNfY2FzdDxGaWx0ZXJPcGVy YXRpb246Ok9wZXJhdGlvblR5cGU+KGNvbG9yRmlsdGVyLnN1YnR5cGUpKSk7CisgICAgICAgIGJy ZWFrOworICAgIH0KKyAgICBjYXNlIFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZUJhc2lj Q29tcG9uZW50VHJhbnNmZXI6IHsKKyAgICAgICAgY29uc3QgV2ViQmFzaWNDb21wb25lbnRUcmFu c2ZlckZpbHRlck9wZXJhdGlvbiYgY29tcG9uZW50RmlsdGVyID0gc3RhdGljX2Nhc3Q8Y29uc3Qg V2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbiY+KGZpbHRlcik7CisgICAg ICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChCYXNpY0NvbXBvbmVudFRyYW5zZmVy RmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoY29tcG9uZW50RmlsdGVyLmFtb3VudCwgc3RhdGljX2Nh c3Q8RmlsdGVyT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlPihjb21wb25lbnRGaWx0ZXIuc3VidHlw ZSkpKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIGNhc2UgV2ViRmlsdGVyT3BlcmF0aW9u OjpGaWx0ZXJUeXBlQmx1cjogeworICAgICAgICBjb25zdCBXZWJCbHVyRmlsdGVyT3BlcmF0aW9u JiBibHVyRmlsdGVyID0gc3RhdGljX2Nhc3Q8Y29uc3QgV2ViQmx1ckZpbHRlck9wZXJhdGlvbiY+ KGZpbHRlcik7CisgICAgICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChCbHVyRmls dGVyT3BlcmF0aW9uOjpjcmVhdGUoTGVuZ3RoKGJsdXJGaWx0ZXIucGl4ZWxSYWRpdXMsIEZpeGVk KSwgRmlsdGVyT3BlcmF0aW9uOjpCTFVSKSk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBj YXNlIFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZURyb3BTaGFkb3c6IHsKKyAgICAgICAg Y29uc3QgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbiYgc2hhZG93RmlsdGVyID0gc3RhdGlj X2Nhc3Q8Y29uc3QgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbiY+KGZpbHRlcik7CisgICAg ICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChEcm9wU2hhZG93RmlsdGVyT3BlcmF0 aW9uOjpjcmVhdGUoSW50UG9pbnQoc2hhZG93RmlsdGVyLngsIHNoYWRvd0ZpbHRlci55KSwgc2hh ZG93RmlsdGVyLnN0ZERldmlhdGlvbiwgc2hhZG93RmlsdGVyLmNvbG9yLCBGaWx0ZXJPcGVyYXRp b246OkRST1BfU0hBRE9XKSk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICB9CiB9CiAKIHZv aWQgV2ViRmlsdGVyT3BlcmF0aW9uczo6Y2xlYXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAppbmRleCBmMWZiMjI5ZWU1M2VjZDA3 OGRhYTFlNmE3M2EyYWJjODIzMTJjZmNjLi42OWU1OTYyMjlmNDNkMmZkZTQ1Y2RiNGEwNzBjNWQ3 ZDNkNjA4YmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRN YXRjaGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRN YXRjaGluZ0VudW1zLmNwcApAQCAtMzE5LDE0ICszMTksMTQgQEAgQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShXZWJFZGl0aW5nQWN0aW9uVHlwZWQsIEVkaXRvckluc2VydEFjdGlvblR5cGVk KTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRWRpdGluZ0FjdGlvblBhc3RlZCwg RWRpdG9ySW5zZXJ0QWN0aW9uUGFzdGVkKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o V2ViRWRpdGluZ0FjdGlvbkRyb3BwZWQsIEVkaXRvckluc2VydEFjdGlvbkRyb3BwZWQpOwogCi1D T01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVy YXRpb246OkZpbHRlclR5cGVHcmF5c2NhbGUsIEZpbHRlck9wZXJhdGlvbjo6R1JBWVNDQUxFKTsK LUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9w ZXJhdGlvbjo6RmlsdGVyVHlwZVNlcGlhLCBGaWx0ZXJPcGVyYXRpb246OlNFUElBKTsKLUNPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlv bjo6RmlsdGVyVHlwZVNhdHVyYXRlLCBGaWx0ZXJPcGVyYXRpb246OlNBVFVSQVRFKTsKLUNPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlv bjo6RmlsdGVyVHlwZUh1ZVJvdGF0ZSwgRmlsdGVyT3BlcmF0aW9uOjpIVUVfUk9UQVRFKTsKLQot Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmls dGVyT3BlcmF0aW9uOjpGaWx0ZXJUeXBlSW52ZXJ0LCBGaWx0ZXJPcGVyYXRpb246OklOVkVSVCk7 Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29tcG9uZW50VHJhbnNmZXJG aWx0ZXJPcGVyYXRpb246OkZpbHRlclR5cGVCcmlnaHRuZXNzLCBGaWx0ZXJPcGVyYXRpb246OkJS SUdIVE5FU1MpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJCYXNpY0NvbXBvbmVu dFRyYW5zZmVyRmlsdGVyT3BlcmF0aW9uOjpGaWx0ZXJUeXBlQ29udHJhc3QsIEZpbHRlck9wZXJh dGlvbjo6Q09OVFJBU1QpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJCYXNpY0Nv bG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpCYXNpY0NvbG9yTWF0cml4RmlsdGVyVHlwZUdyYXlz Y2FsZSwgRmlsdGVyT3BlcmF0aW9uOjpHUkFZU0NBTEUpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJ TkdfRU5VTShXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpCYXNpY0NvbG9yTWF0 cml4RmlsdGVyVHlwZVNlcGlhLCBGaWx0ZXJPcGVyYXRpb246OlNFUElBKTsKK0NPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbjo6QmFz aWNDb2xvck1hdHJpeEZpbHRlclR5cGVTYXR1cmF0ZSwgRmlsdGVyT3BlcmF0aW9uOjpTQVRVUkFU RSk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29sb3JNYXRyaXhGaWx0 ZXJPcGVyYXRpb246OkJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJUeXBlSHVlUm90YXRlLCBGaWx0ZXJP cGVyYXRpb246OkhVRV9ST1RBVEUpOworCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdl YkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJPcGVyYXRpb246OkJhc2ljQ29tcG9uZW50VHJh bnNmZXJGaWx0ZXJUeXBlSW52ZXJ0LCBGaWx0ZXJPcGVyYXRpb246OklOVkVSVCk7CitDT01QSUxF X0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJPcGVy YXRpb246OkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJUeXBlQnJpZ2h0bmVzcywgRmlsdGVy T3BlcmF0aW9uOjpCUklHSFRORVNTKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2Vi QmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbjo6QmFzaWNDb21wb25lbnRUcmFu c2ZlckZpbHRlclR5cGVDb250cmFzdCwgRmlsdGVyT3BlcmF0aW9uOjpDT05UUkFTVCk7CiAKIENP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRm9udERlc2NyaXB0aW9uOjpHZW5lcmljRmFt aWx5Tm9uZSwgRm9udERlc2NyaXB0aW9uOjpOb0ZhbWlseSk7CiBDT01QSUxFX0FTU0VSVF9NQVRD SElOR19FTlVNKFdlYkZvbnREZXNjcmlwdGlvbjo6R2VuZXJpY0ZhbWlseVN0YW5kYXJkLCBGb250 RGVzY3JpcHRpb246OlN0YW5kYXJkRmFtaWx5KTsK 138931 2012-04-25 21:31:39 -0700 2012-04-26 00:02:51 -0700 Patch for landing bug-84926-20120425213138.patch text/plain 15198 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBlY2RiOTRhNzRiOWQ3 MWJhMDEwODM1OTlhMjFjYTQ2YTZlNzgwZjc2Li5mOGIzZmJhNDI2YTUyZWJjNGIwNzRlOTM3MzRl YzM4ZjdkZjdkZWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMi0wNC0yNSAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IFJlbW92ZSBndWFyZGVkIHZpcnR1YWwgbWV0aG9kcyBmcm9tIFdlYkZpbHRlck9wZXJhdGlvbiBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0OTI2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCisKKyAgICAgICAgV2UgcmVt b3ZlIHRoZSB2aXJ0dWFsIG1ldGhvZHMgZnJvbSB0aGUgV2ViRmlsdGVyT3BlcmF0aW9uIGNsYXNz LAorICAgICAgICBhbmQgdXNlIGFuIGVudW0gaW4gdGhlIGJhc2UgY2xhc3MgdG8gZGlzdGluZ3Vp c2ggd2hpY2ggc3ViY2xhc3MKKyAgICAgICAgdGhlIG9iamVjdCBpcy4gVGhlbiBXZWJGaWx0ZXJP cGVyYXRpb25zIGNhbiBhY2Nlc3MgdGhlIGNvcnJlY3QKKyAgICAgICAgc3ViY2xhc3MgdG8gZ2V0 IHRoZSBmaWx0ZXIgb3BlcmF0aW9uJ3MgZGF0YSBhbmQgY29uc3RydWN0IGEKKyAgICAgICAgV2Vi Q29yZTo6RmlsdGVyT3BlcmF0aW9uIHRvIHN0b3JlIGludGVybmFsbHkuCisKKyAgICAgICAgKiBj aHJvbWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6Oldl YkZpbHRlck9wZXJhdGlvbjo6V2ViRmlsdGVyT3BlcmF0aW9uKToKKyAgICAgICAgKFdlYktpdDo6 V2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbjo6V2ViQmFzaWNDb2xvck1hdHJpeEZp bHRlck9wZXJhdGlvbik6CisgICAgICAgIChXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9w ZXJhdGlvbjo6V2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbik6CisgICAg ICAgIChXZWJCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyT3BlcmF0aW9uKToKKyAgICAgICAg KFdlYktpdDo6V2ViQmx1ckZpbHRlck9wZXJhdGlvbjo6V2ViQmx1ckZpbHRlck9wZXJhdGlvbik6 CisgICAgICAgIChXZWJLaXQ6OldlYkRyb3BTaGFkb3dGaWx0ZXJPcGVyYXRpb246OldlYkRyb3BT aGFkb3dGaWx0ZXJPcGVyYXRpb24pOgorCiAyMDEyLTA0LTI1ICBHYXZpbiBQZXRlcnMgIDxnYXZp bnBAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gRml4IHNvbWUgY29uZGl0aW9u YWwgY29tcGlsYXRpb24gbG9naWMgaW4gUGxhdGZvcm0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyYjI5MjNmZjVi Y2I3NDA2YjBkNjgzOTg1OTc5YjNjOGI2NGEyNDJmLi5hZWJhY2M2NjQ2ZWRlNDFiZDIyNDczYThi MzY1YzRkZjk5MTM0YTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQtMjUg IERhbmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVt XSBSZW1vdmUgZ3VhcmRlZCB2aXJ0dWFsIG1ldGhvZHMgZnJvbSBXZWJGaWx0ZXJPcGVyYXRpb24g QVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDky NgorCisgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgorCisgICAgICAgICogV2Vi Q29yZS5neXBpOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViRmlsdGVy T3BlcmF0aW9uLmNwcDogUmVtb3ZlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9zdXBw b3J0L1dlYkZpbHRlck9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGaWx0ZXJP cGVyYXRpb25zOjphcHBlbmQpOgorCiAyMDEyLTA0LTI1ICBBbGV4aXMgTWVuYXJkICA8YWxleGlz Lm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZCwgZml4IFdpbmRv d3MgYnVpbGQgYWZ0ZXIgcjExNTIxNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZjgx OWZlYzUyNjNhNWM2ZmNlNTZhM2U2ZWY3YWQzNzUzMWU0MDI4NC4uNTk5NDdmOGQzOTczM2M0Y2Fj YjBiNjJhOWI4MDVmZTc0MWI4NjY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxMi0wNC0yNSAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9y Zz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBndWFyZGVkIHZpcnR1YWwgbWV0aG9kcyBm cm9tIFdlYkZpbHRlck9wZXJhdGlvbiBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg0OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9i aW5zb24uCisKKyAgICAgICAgKiBzcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHA6CisKIDIwMTIt MDQtMjUgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtD aHJvbWl1bV0gQ2FsbCBhY3R1YWxNZW1vcnlVc2FnZU1CIGRpcmVjdGx5CmRpZmYgLS1naXQgYS9T b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oIGIvU291 cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJGaWx0ZXJPcGVyYXRpb24uaAppbmRleCA1 NjFjYWQzYzJjN2U0YzZkNzU4MzViODg5NGMyMGI3OTZmMTIxMWU1Li4yYjU5NDBjOTQyMDY1ZjE4 ZDA3MmYyOWQ5YThmYzc5N2VjMjQ1NmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hy b21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9j aHJvbWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmgKQEAgLTM0LDg3ICszNCw3OCBAQAog I2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjZW5kaWYKIAotI2lmIFdFQktJVF9JTVBMRU1F TlRBVElPTgotbmFtZXNwYWNlIFdlYkNvcmUgewotY2xhc3MgRmlsdGVyT3BlcmF0aW9uOwotfQot I2VuZGlmCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdHJ1Y3QgV2ViRmlsdGVyT3BlcmF0aW9u IHsKLSNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2Vi Q29yZTo6RmlsdGVyT3BlcmF0aW9uPiB0b0ZpbHRlck9wZXJhdGlvbigpIGNvbnN0ID0gMDsKLSNl bmRpZgorICAgIGVudW0gRmlsdGVyVHlwZSB7CisgICAgICAgIEZpbHRlclR5cGVCYXNpY0NvbG9y TWF0cml4LAorICAgICAgICBGaWx0ZXJUeXBlQmFzaWNDb21wb25lbnRUcmFuc2ZlciwKKyAgICAg ICAgRmlsdGVyVHlwZUJsdXIsCisgICAgICAgIEZpbHRlclR5cGVEcm9wU2hhZG93CisgICAgfTsK KworICAgIEZpbHRlclR5cGUgdHlwZTsKIAogcHJvdGVjdGVkOgotICAgIFdlYkZpbHRlck9wZXJh dGlvbigpIHsgfQorICAgIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlIHR5cGUpCisgICAg ICAgIDogdHlwZSh0eXBlKQorICAgIHsgfQogfTsKIAogc3RydWN0IFdlYkJhc2ljQ29sb3JNYXRy aXhGaWx0ZXJPcGVyYXRpb24gOiBwdWJsaWMgV2ViRmlsdGVyT3BlcmF0aW9uIHsKLSAgICBlbnVt IEZpbHRlclR5cGUgewotICAgICAgICBGaWx0ZXJUeXBlR3JheXNjYWxlID0gMSwKLSAgICAgICAg RmlsdGVyVHlwZVNlcGlhID0gMiwKLSAgICAgICAgRmlsdGVyVHlwZVNhdHVyYXRlID0gMywKLSAg ICAgICAgRmlsdGVyVHlwZUh1ZVJvdGF0ZSA9IDQKKyAgICBlbnVtIEJhc2ljQ29sb3JNYXRyaXhG aWx0ZXJUeXBlIHsKKyAgICAgICAgQmFzaWNDb2xvck1hdHJpeEZpbHRlclR5cGVHcmF5c2NhbGUg PSAxLAorICAgICAgICBCYXNpY0NvbG9yTWF0cml4RmlsdGVyVHlwZVNlcGlhID0gMiwKKyAgICAg ICAgQmFzaWNDb2xvck1hdHJpeEZpbHRlclR5cGVTYXR1cmF0ZSA9IDMsCisgICAgICAgIEJhc2lj Q29sb3JNYXRyaXhGaWx0ZXJUeXBlSHVlUm90YXRlID0gNAogICAgIH07CiAKLSAgICBXZWJCYXNp Y0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGUgdHlwZSwgZmxvYXQgYW1vdW50 KQotICAgICAgICA6IHR5cGUodHlwZSkKKyAgICBXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3Bl cmF0aW9uKEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJUeXBlIHR5cGUsIGZsb2F0IGFtb3VudCkKKyAg ICAgICAgOiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZUJhc2ljQ29sb3JNYXRyaXgpCisg ICAgICAgICwgc3VidHlwZSh0eXBlKQogICAgICAgICAsIGFtb3VudChhbW91bnQpCiAgICAgeyB9 CiAKLSNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2Vi Q29yZTo6RmlsdGVyT3BlcmF0aW9uPiB0b0ZpbHRlck9wZXJhdGlvbigpIGNvbnN0IE9WRVJSSURF OwotI2VuZGlmCi0KLSAgICBGaWx0ZXJUeXBlIHR5cGU7CisgICAgQmFzaWNDb2xvck1hdHJpeEZp bHRlclR5cGUgc3VidHlwZTsKICAgICBmbG9hdCBhbW91bnQ7CiB9OwogCiBzdHJ1Y3QgV2ViQmFz aWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbiA6IHB1YmxpYyBXZWJGaWx0ZXJPcGVy YXRpb24gewotICAgIGVudW0gRmlsdGVyVHlwZSB7Ci0gICAgICAgIEZpbHRlclR5cGVJbnZlcnQg PSA1LAotICAgICAgICBGaWx0ZXJUeXBlQnJpZ2h0bmVzcyA9IDcsCi0gICAgICAgIEZpbHRlclR5 cGVDb250cmFzdCA9IDgKKyAgICBlbnVtIEJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJUeXBl IHsKKyAgICAgICAgQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlclR5cGVJbnZlcnQgPSA1LAor ICAgICAgICBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyVHlwZUJyaWdodG5lc3MgPSA3LAor ICAgICAgICBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyVHlwZUNvbnRyYXN0ID0gOAogICAg ICAgICAvLyBPcGFjaXR5IGlzIG1pc3NpbmcgYmVjYXVzZSB0aGlzIGlzIG1vcmUgZXhwZW5zaXZl IHRoYW4ganVzdCBzZXR0aW5nIG9wYWNpdHkgb24gdGhlIGxheWVyLgogICAgIH07CiAKLSAgICBX ZWJCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGUgdHlwZSwg ZmxvYXQgYW1vdW50KQotICAgICAgICA6IHR5cGUodHlwZSkKKyAgICBXZWJCYXNpY0NvbXBvbmVu dFRyYW5zZmVyRmlsdGVyT3BlcmF0aW9uKEJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJUeXBl IHR5cGUsIGZsb2F0IGFtb3VudCkKKyAgICAgICAgOiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVy VHlwZUJhc2ljQ29tcG9uZW50VHJhbnNmZXIpCisgICAgICAgICwgc3VidHlwZSh0eXBlKQogICAg ICAgICAsIGFtb3VudChhbW91bnQpCiAgICAgeyB9CiAKLSNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJ T04KLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8V2ViQ29yZTo6RmlsdGVyT3BlcmF0aW9uPiB0b0Zp bHRlck9wZXJhdGlvbigpIGNvbnN0IE9WRVJSSURFOwotI2VuZGlmCi0KLSAgICBGaWx0ZXJUeXBl IHR5cGU7CisgICAgQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlclR5cGUgc3VidHlwZTsKICAg ICBmbG9hdCBhbW91bnQ7CiB9OwogCiBzdHJ1Y3QgV2ViQmx1ckZpbHRlck9wZXJhdGlvbiA6IHB1 YmxpYyBXZWJGaWx0ZXJPcGVyYXRpb24gewotICAgIGV4cGxpY2l0IFdlYkJsdXJGaWx0ZXJPcGVy YXRpb24oaW50IHBpeGVsUmFkaXVzKSA6IHBpeGVsUmFkaXVzKHBpeGVsUmFkaXVzKSB7IH0KLQot I2lmIFdFQktJVF9JTVBMRU1FTlRBVElPTgotICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJDb3Jl OjpGaWx0ZXJPcGVyYXRpb24+IHRvRmlsdGVyT3BlcmF0aW9uKCkgY29uc3QgT1ZFUlJJREU7Ci0j ZW5kaWYKKyAgICBleHBsaWNpdCBXZWJCbHVyRmlsdGVyT3BlcmF0aW9uKGludCBwaXhlbFJhZGl1 cykKKyAgICAgICAgOiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZUJsdXIpCisgICAgICAg ICwgcGl4ZWxSYWRpdXMocGl4ZWxSYWRpdXMpCisgICAgeyB9CiAKICAgICBpbnQgcGl4ZWxSYWRp dXM7CiB9OwogCi1jbGFzcyBXZWJEcm9wU2hhZG93RmlsdGVyT3BlcmF0aW9uIDogcHVibGljIFdl YkZpbHRlck9wZXJhdGlvbiB7Ci0gICAgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbihpbnQg eCwgaW50IHksIGludCBzdGREZXZpYXRpb24sIFdlYkNvbG9yIGNvbG9yKQotICAgICAgICA6IHgo eCkKK3N0cnVjdCBXZWJEcm9wU2hhZG93RmlsdGVyT3BlcmF0aW9uIDogcHVibGljIFdlYkZpbHRl ck9wZXJhdGlvbiB7CisgICAgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbihpbnQgeCwgaW50 IHksIGludCBzdGREZXZpYXRpb24sIFdlYkNvbG9yIGNvbG9yKSAKKyAgICAgICAgOiBXZWJGaWx0 ZXJPcGVyYXRpb24oRmlsdGVyVHlwZURyb3BTaGFkb3cpCisgICAgICAgICwgeCh4KQogICAgICAg ICAsIHkoeSkKICAgICAgICAgLCBzdGREZXZpYXRpb24oc3RkRGV2aWF0aW9uKQogICAgICAgICAs IGNvbG9yKGNvbG9yKQogICAgIHsgfQogCi0jaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCi0gICAg dmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OkZpbHRlck9wZXJhdGlvbj4gdG9GaWx0ZXJPcGVy YXRpb24oKSBjb25zdCBPVkVSUklERTsKLSNlbmRpZgotCiAgICAgaW50IHg7CiAgICAgaW50IHk7 CiAgICAgaW50IHN0ZERldmlhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBkOWI3OTEwZGEyZWFj OWZlY2UxZTIwODQyYzRkODAxZmU3ZTdlNTA2Li5mODA2YzlhYjBhZjdlZmNlMDY2YThhNGYyZjE0 NWJkMThmNWVhNGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysr IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC04MjM2LDcgKzgyMzYsNiBAQAogICAg ICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViRGF0YS5jcHAnLAogICAgICAg ICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViSFRUUEJvZHkuY3BwJywKICAgICAg ICAgICAgICdwbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkhUVFBMb2FkSW5mby5jcHAnLAot ICAgICAgICAgICAgJ3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2ViRmlsdGVyT3BlcmF0aW9u LmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJGaWx0ZXJP cGVyYXRpb25zLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9X ZWJJQ0VDYW5kaWRhdGVEZXNjcmlwdG9yLmNwcCcsCiAgICAgICAgICAgICAncGxhdGZvcm0vY2hy b21pdW0vc3VwcG9ydC9XZWJJQ0VPcHRpb25zLmNwcCcsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkZpbHRlck9wZXJhdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9zdXBwb3J0L1dlYkZpbHRlck9wZXJhdGlv bi5jcHAKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDUzNjk2OGQ4MmRjZDA2OTliNzQy ODBlYTk5MTgwYzFkMmI1N2VmNDQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vc3VwcG9ydC9XZWJG aWx0ZXJPcGVyYXRpb24uY3BwCisrKyAvZGV2L251bGwKQEAgLTEsNTYgKzAsMCBAQAotLyoKLSAq IENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoK LSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICoKLSAqIDEuICBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAotICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KLSAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg QU5EIElUUyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVE Ci0gKiBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFCi0gKiBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0gKiBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUwotICogKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOwotICogTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECi0gKiBP TiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCi0gKiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0K LSNpbmNsdWRlICJjb25maWcuaCIKLQotI2luY2x1ZGUgIkZpbHRlck9wZXJhdGlvbi5oIgotCi0j aW5jbHVkZSA8cHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oPgotCi11c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKLQotbmFtZXNwYWNlIFdlYktpdCB7Ci0KLVBhc3NSZWZQdHI8V2ViQ29yZTo6Rmls dGVyT3BlcmF0aW9uPiBXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjp0b0ZpbHRl ck9wZXJhdGlvbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJP cGVyYXRpb246OmNyZWF0ZShhbW91bnQsIHN0YXRpY19jYXN0PEZpbHRlck9wZXJhdGlvbjo6T3Bl cmF0aW9uVHlwZT4odHlwZSkpOwotfQotCi1QYXNzUmVmUHRyPFdlYkNvcmU6OkZpbHRlck9wZXJh dGlvbj4gV2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbjo6dG9GaWx0ZXJP cGVyYXRpb24oKSBjb25zdAotewotICAgIHJldHVybiBCYXNpY0NvbXBvbmVudFRyYW5zZmVyRmls dGVyT3BlcmF0aW9uOjpjcmVhdGUoYW1vdW50LCBzdGF0aWNfY2FzdDxGaWx0ZXJPcGVyYXRpb246 Ok9wZXJhdGlvblR5cGU+KHR5cGUpKTsKLX0KLQotUGFzc1JlZlB0cjxXZWJDb3JlOjpGaWx0ZXJP cGVyYXRpb24+IFdlYkJsdXJGaWx0ZXJPcGVyYXRpb246OnRvRmlsdGVyT3BlcmF0aW9uKCkgY29u c3QKLXsKLSAgICByZXR1cm4gQmx1ckZpbHRlck9wZXJhdGlvbjo6Y3JlYXRlKExlbmd0aChwaXhl bFJhZGl1cywgRml4ZWQpLCBGaWx0ZXJPcGVyYXRpb246OkJMVVIpOwotfQotCi1QYXNzUmVmUHRy PFdlYkNvcmU6OkZpbHRlck9wZXJhdGlvbj4gV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbjo6 dG9GaWx0ZXJPcGVyYXRpb24oKSBjb25zdAotewotICAgIHJldHVybiBEcm9wU2hhZG93RmlsdGVy T3BlcmF0aW9uOjpjcmVhdGUoSW50UG9pbnQoeCwgeSksIHN0ZERldmlhdGlvbiwgY29sb3IsIEZp bHRlck9wZXJhdGlvbjo6RFJPUF9TSEFET1cpOwotfQotCi19IC8vIG5hbWVzcGFjZSBXZWJLaXQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBvcnQvV2Vi RmlsdGVyT3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9z dXBwb3J0L1dlYkZpbHRlck9wZXJhdGlvbnMuY3BwCmluZGV4IGU4MDA3ZDg3ZmRmNzRlNDdlZGVj MzFhMjkwNGRjMzk1NjYxZDAzZGEuLmQ2MGQ5Mjg3YTZiNTk5MTQxMzJlMDBiNDQyMjIxNTdhNjk0 MDU1ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL3N1cHBv cnQvV2ViRmlsdGVyT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vc3VwcG9ydC9XZWJGaWx0ZXJPcGVyYXRpb25zLmNwcApAQCAtNDIsNyArNDIsMjgg QEAgdm9pZCBXZWJGaWx0ZXJPcGVyYXRpb25zOjppbml0aWFsaXplKCkKIAogdm9pZCBXZWJGaWx0 ZXJPcGVyYXRpb25zOjphcHBlbmQoY29uc3QgV2ViRmlsdGVyT3BlcmF0aW9uJiBmaWx0ZXIpCiB7 Ci0gICAgbV9wcml2YXRlLT5vcGVyYXRpb25zKCkuYXBwZW5kKGZpbHRlci50b0ZpbHRlck9wZXJh dGlvbigpKTsKKyAgICBzd2l0Y2ggKGZpbHRlci50eXBlKSB7CisgICAgY2FzZSBXZWJGaWx0ZXJP cGVyYXRpb246OkZpbHRlclR5cGVCYXNpY0NvbG9yTWF0cml4OiB7CisgICAgICAgIGNvbnN0IFdl YkJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24mIGNvbG9yRmlsdGVyID0gc3RhdGljX2Nh c3Q8Y29uc3QgV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbiY+KGZpbHRlcik7Cisg ICAgICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChCYXNpY0NvbG9yTWF0cml4Rmls dGVyT3BlcmF0aW9uOjpjcmVhdGUoY29sb3JGaWx0ZXIuYW1vdW50LCBzdGF0aWNfY2FzdDxGaWx0 ZXJPcGVyYXRpb246Ok9wZXJhdGlvblR5cGU+KGNvbG9yRmlsdGVyLnN1YnR5cGUpKSk7CisgICAg ICAgIGJyZWFrOworICAgIH0KKyAgICBjYXNlIFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlw ZUJhc2ljQ29tcG9uZW50VHJhbnNmZXI6IHsKKyAgICAgICAgY29uc3QgV2ViQmFzaWNDb21wb25l bnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbiYgY29tcG9uZW50RmlsdGVyID0gc3RhdGljX2Nhc3Q8 Y29uc3QgV2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbiY+KGZpbHRlcik7 CisgICAgICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChCYXNpY0NvbXBvbmVudFRy YW5zZmVyRmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoY29tcG9uZW50RmlsdGVyLmFtb3VudCwgc3Rh dGljX2Nhc3Q8RmlsdGVyT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlPihjb21wb25lbnRGaWx0ZXIu c3VidHlwZSkpKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIGNhc2UgV2ViRmlsdGVyT3Bl cmF0aW9uOjpGaWx0ZXJUeXBlQmx1cjogeworICAgICAgICBjb25zdCBXZWJCbHVyRmlsdGVyT3Bl cmF0aW9uJiBibHVyRmlsdGVyID0gc3RhdGljX2Nhc3Q8Y29uc3QgV2ViQmx1ckZpbHRlck9wZXJh dGlvbiY+KGZpbHRlcik7CisgICAgICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChC bHVyRmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoTGVuZ3RoKGJsdXJGaWx0ZXIucGl4ZWxSYWRpdXMs IEZpeGVkKSwgRmlsdGVyT3BlcmF0aW9uOjpCTFVSKSk7CisgICAgICAgIGJyZWFrOworICAgIH0K KyAgICBjYXNlIFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZURyb3BTaGFkb3c6IHsKKyAg ICAgICAgY29uc3QgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbiYgc2hhZG93RmlsdGVyID0g c3RhdGljX2Nhc3Q8Y29uc3QgV2ViRHJvcFNoYWRvd0ZpbHRlck9wZXJhdGlvbiY+KGZpbHRlcik7 CisgICAgICAgIG1fcHJpdmF0ZS0+b3BlcmF0aW9ucygpLmFwcGVuZChEcm9wU2hhZG93RmlsdGVy T3BlcmF0aW9uOjpjcmVhdGUoSW50UG9pbnQoc2hhZG93RmlsdGVyLngsIHNoYWRvd0ZpbHRlci55 KSwgc2hhZG93RmlsdGVyLnN0ZERldmlhdGlvbiwgc2hhZG93RmlsdGVyLmNvbG9yLCBGaWx0ZXJP cGVyYXRpb246OkRST1BfU0hBRE9XKSk7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICB9CiB9 CiAKIHZvaWQgV2ViRmlsdGVyT3BlcmF0aW9uczo6Y2xlYXIoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAppbmRleCBmMWZiMjI5ZWU1 M2VjZDA3OGRhYTFlNmE3M2EyYWJjODIzMTJjZmNjLi42OWU1OTYyMjlmNDNkMmZkZTQ1Y2RiNGEw NzBjNWQ3ZDNkNjA4YmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9B c3NlcnRNYXRjaGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9B c3NlcnRNYXRjaGluZ0VudW1zLmNwcApAQCAtMzE5LDE0ICszMTksMTQgQEAgQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXZWJFZGl0aW5nQWN0aW9uVHlwZWQsIEVkaXRvckluc2VydEFjdGlv blR5cGVkKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRWRpdGluZ0FjdGlvblBh c3RlZCwgRWRpdG9ySW5zZXJ0QWN0aW9uUGFzdGVkKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViRWRpdGluZ0FjdGlvbkRyb3BwZWQsIEVkaXRvckluc2VydEFjdGlvbkRyb3BwZWQp OwogCi1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29sb3JNYXRyaXhGaWx0 ZXJPcGVyYXRpb246OkZpbHRlclR5cGVHcmF5c2NhbGUsIEZpbHRlck9wZXJhdGlvbjo6R1JBWVND QUxFKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZp bHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZVNlcGlhLCBGaWx0ZXJPcGVyYXRpb246OlNFUElBKTsK LUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9w ZXJhdGlvbjo6RmlsdGVyVHlwZVNhdHVyYXRlLCBGaWx0ZXJPcGVyYXRpb246OlNBVFVSQVRFKTsK LUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9w ZXJhdGlvbjo6RmlsdGVyVHlwZUh1ZVJvdGF0ZSwgRmlsdGVyT3BlcmF0aW9uOjpIVUVfUk9UQVRF KTsKLQotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJCYXNpY0NvbXBvbmVudFRyYW5z ZmVyRmlsdGVyT3BlcmF0aW9uOjpGaWx0ZXJUeXBlSW52ZXJ0LCBGaWx0ZXJPcGVyYXRpb246OklO VkVSVCk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29tcG9uZW50VHJh bnNmZXJGaWx0ZXJPcGVyYXRpb246OkZpbHRlclR5cGVCcmlnaHRuZXNzLCBGaWx0ZXJPcGVyYXRp b246OkJSSUdIVE5FU1MpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJCYXNpY0Nv bXBvbmVudFRyYW5zZmVyRmlsdGVyT3BlcmF0aW9uOjpGaWx0ZXJUeXBlQ29udHJhc3QsIEZpbHRl ck9wZXJhdGlvbjo6Q09OVFJBU1QpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJC YXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpCYXNpY0NvbG9yTWF0cml4RmlsdGVyVHlw ZUdyYXlzY2FsZSwgRmlsdGVyT3BlcmF0aW9uOjpHUkFZU0NBTEUpOworQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXZWJCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpCYXNpY0Nv bG9yTWF0cml4RmlsdGVyVHlwZVNlcGlhLCBGaWx0ZXJPcGVyYXRpb246OlNFUElBKTsKK0NPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlv bjo6QmFzaWNDb2xvck1hdHJpeEZpbHRlclR5cGVTYXR1cmF0ZSwgRmlsdGVyT3BlcmF0aW9uOjpT QVRVUkFURSk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29sb3JNYXRy aXhGaWx0ZXJPcGVyYXRpb246OkJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJUeXBlSHVlUm90YXRlLCBG aWx0ZXJPcGVyYXRpb246OkhVRV9ST1RBVEUpOworCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdlYkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJPcGVyYXRpb246OkJhc2ljQ29tcG9u ZW50VHJhbnNmZXJGaWx0ZXJUeXBlSW52ZXJ0LCBGaWx0ZXJPcGVyYXRpb246OklOVkVSVCk7CitD T01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0 ZXJPcGVyYXRpb246OkJhc2ljQ29tcG9uZW50VHJhbnNmZXJGaWx0ZXJUeXBlQnJpZ2h0bmVzcywg RmlsdGVyT3BlcmF0aW9uOjpCUklHSFRORVNTKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VO VU0oV2ViQmFzaWNDb21wb25lbnRUcmFuc2ZlckZpbHRlck9wZXJhdGlvbjo6QmFzaWNDb21wb25l bnRUcmFuc2ZlckZpbHRlclR5cGVDb250cmFzdCwgRmlsdGVyT3BlcmF0aW9uOjpDT05UUkFTVCk7 CiAKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRm9udERlc2NyaXB0aW9uOjpHZW5l cmljRmFtaWx5Tm9uZSwgRm9udERlc2NyaXB0aW9uOjpOb0ZhbWlseSk7CiBDT01QSUxFX0FTU0VS VF9NQVRDSElOR19FTlVNKFdlYkZvbnREZXNjcmlwdGlvbjo6R2VuZXJpY0ZhbWlseVN0YW5kYXJk LCBGb250RGVzY3JpcHRpb246OlN0YW5kYXJkRmFtaWx5KTsK