172410 2017-05-19 22:05:06 -0700 Value for iterator property is wrong for maplike interfaces 2017-05-20 12:14:20 -0700 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://heycam.github.io/webidl/#es-map-entries WebExposed P2 Normal --- 1 cdumez cdumez buildbot cdumez sam youennf oldest_to_newest 1310964 0 cdumez 2017-05-19 22:05:06 -0700 Value for iterator property is wrong for maplike interfaces. Value for iterator property is wrong for maplike interfaces. The iterator property is supposed to have the same value as the 'entries' property but we currently use the value of the 'values' property. Specification: - https://heycam.github.io/webidl/#es-map-entries - https://heycam.github.io/webidl/#es-iterator 1310967 1 310760 cdumez 2017-05-19 22:10:27 -0700 Created attachment 310760 WIP Patch This should be testable via the RTCStatsReport interface. I'll look into it tomorrow. 1310969 2 buildbot 2017-05-19 22:12:18 -0700 Attachment 310760 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1311008 3 cdumez 2017-05-20 08:37:32 -0700 Confirmed that: Object.getOwnPropertyDescriptor(RTCStatsReport.prototype, Symbol.iterator).value === Object.getOwnPropertyDescriptor(RTCStatsReport.prototype, 'entries').value in Firefox. This does not work in WebKit because RTCStatsReport is wrongly marked as NoInterfaceObject :/ 1311009 4 310772 cdumez 2017-05-20 08:42:08 -0700 Created attachment 310772 Patch 1311032 5 310772 sam 2017-05-20 11:57:59 -0700 Comment on attachment 310772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310772&action=review > Source/WebCore/Modules/mediastream/RTCStatsReport.idl:27 > +// FIXME: This should not be marked as [NoInterfaceObject]. > [ Why not just do it now? > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:3469 > if (InterfaceNeedsIterator($interface)) { > AddToImplIncludes("<builtins/BuiltinNames.h>"); > - if (IsKeyValueIterableInterface($interface)) { > + if (IsKeyValueIterableInterface($interface) or $interface->mapLike) { While you are in the neighborhood (not really, but whatever), consider removing the comment: # FIXME: This should return 1 for maplike once we support them. return 1 if $interface->mapLike; in InterfaceNeedsIterator() 1311036 6 cdumez 2017-05-20 12:11:59 -0700 (In reply to Sam Weinig from comment #5) > Comment on attachment 310772 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=310772&action=review > > > Source/WebCore/Modules/mediastream/RTCStatsReport.idl:27 > > +// FIXME: This should not be marked as [NoInterfaceObject]. > > [ > > Why not just do it now? Seems unrelated but I will follow up on this ASAP. > > > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:3469 > > if (InterfaceNeedsIterator($interface)) { > > AddToImplIncludes("<builtins/BuiltinNames.h>"); > > - if (IsKeyValueIterableInterface($interface)) { > > + if (IsKeyValueIterableInterface($interface) or $interface->mapLike) { > > While you are in the neighborhood (not really, but whatever), consider > removing the comment: > > # FIXME: This should return 1 for maplike once we support them. > return 1 if $interface->mapLike; > > in InterfaceNeedsIterator() Oh right, this should actually say setlike, not maplike. 1311037 7 cdumez 2017-05-20 12:14:20 -0700 Committed r217188: <http://trac.webkit.org/changeset/217188> 310760 2017-05-19 22:10:27 -0700 2017-05-20 08:42:06 -0700 WIP Patch 172410_maplike_iterator_WIP.patch text/plain 3850 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNTY0M2EzZGNhYi4uZDc1YjQzZTUzNWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxNy0wNS0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgor CisgICAgICAgIFZhbHVlIGZvciBpdGVyYXRvciBwcm9wZXJ0eSBpcyB3cm9uZyBmb3IgbWFwbGlr ZSBpbnRlcmZhY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzI0MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVJbXBsZW1lbnRhdGlvbik6Cisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTTWFwTGlrZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU01hcExpa2VQcm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAg KiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNSZWFkT25seU1hcExpa2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SlNSZWFkT25seU1hcExpa2VQcm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKToK KwogMjAxNy0wNS0xOSAgSmVyZW15IEpvbmVzICA8amVyZW15akBhcHBsZS5jb20+CiAKICAgICAg ICAgd2Via2l0U3VwcG9ydHNGdWxsc2NyZWVuIGFuZCB3ZWJraXRTdXBwb3J0c1ByZXNlbnRhdGlv bk1vZGUoJ2Z1bGxzY3JlZW4nKSBkaXNhZ3JlZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggY2UzYTc0OGNlZmUuLjc1NWZl OGExZWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JKUy5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JKUy5wbQpAQCAtMzQ2NiwxMCArMzQ2Niw4IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVu dGF0aW9uCiAKICAgICAgICAgaWYgKEludGVyZmFjZU5lZWRzSXRlcmF0b3IoJGludGVyZmFjZSkp IHsKICAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCI8YnVpbHRpbnMvQnVpbHRpbk5hbWVz Lmg+Iik7Ci0gICAgICAgICAgICBpZiAoSXNLZXlWYWx1ZUl0ZXJhYmxlSW50ZXJmYWNlKCRpbnRl cmZhY2UpKSB7CisgICAgICAgICAgICBpZiAoSXNLZXlWYWx1ZUl0ZXJhYmxlSW50ZXJmYWNlKCRp bnRlcmZhY2UpIG9yICRpbnRlcmZhY2UtPm1hcExpa2UpIHsKICAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICBwdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPml0ZXJh dG9yU3ltYm9sLCBnZXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygp LmVudHJpZXNQdWJsaWNOYW1lKCkpLCBEb250RW51bSk7XG4iKTsKLSAgICAgICAgICAgIH0gZWxz aWYgKCRpbnRlcmZhY2UtPm1hcExpa2UpIHsKLSAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICBwdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPml0ZXJhdG9yU3ltYm9s LCBnZXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLnZhbHVlc1B1 YmxpY05hbWUoKSksIERvbnRFbnVtKTtcbiIpOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBwdXREaXJlY3Qodm0sIHZtLnByb3Bl cnR5TmFtZXMtPml0ZXJhdG9yU3ltYm9sLCBnbG9iYWxPYmplY3QoKS0+YXJyYXlQcm90b3R5cGUo KS0+Z2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS52YWx1ZXNQ cml2YXRlTmFtZSgpKSwgRG9udEVudW0pO1xuIik7CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNNYXBMaWtlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU01hcExpa2UuY3BwCmlu ZGV4IDE3MjRjMzE3NjdjLi41MzE1MDMyMmRlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTTWFwTGlrZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTTWFwTGlrZS5jcHAKQEAgLTEyMCw3ICsxMjAs NyBAQCB2b2lkIEpTTWFwTGlrZVByb3RvdHlwZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtKQogewog ICAgIEJhc2U6OmZpbmlzaENyZWF0aW9uKHZtKTsKICAgICByZWlmeVN0YXRpY1Byb3BlcnRpZXMo dm0sIEpTTWFwTGlrZVByb3RvdHlwZVRhYmxlVmFsdWVzLCAqdGhpcyk7Ci0gICAgcHV0RGlyZWN0 KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5pdGVyYXRvclN5bWJvbCwgZ2V0RGlyZWN0KHZtLCB2bS5w cm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS52YWx1ZXNQdWJsaWNOYW1lKCkpLCBEb250RW51 bSk7CisgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5pdGVyYXRvclN5bWJvbCwg Z2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5lbnRyaWVzUHVi bGljTmFtZSgpKSwgRG9udEVudW0pOwogfQogCiBjb25zdCBDbGFzc0luZm8gSlNNYXBMaWtlOjpz X2luZm8gPSB7ICJNYXBMaWtlIiwgJkJhc2U6OnNfaW5mbywgbnVsbHB0ciwgbnVsbHB0ciwgQ1JF QVRFX01FVEhPRF9UQUJMRShKU01hcExpa2UpIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNSZWFkT25seU1hcExpa2UuY3BwIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTUmVhZE9ubHlNYXBMaWtlLmNwcApp bmRleCAwZmQ1MzBmYTYyOS4uMWE1MTliZTRkMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1JlYWRPbmx5TWFwTGlrZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTUmVhZE9ubHlNYXBMaWtlLmNw cApAQCAtMTE0LDcgKzExNCw3IEBAIHZvaWQgSlNSZWFkT25seU1hcExpa2VQcm90b3R5cGU6OmZp bmlzaENyZWF0aW9uKFZNJiB2bSkKIHsKICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2bSk7CiAg ICAgcmVpZnlTdGF0aWNQcm9wZXJ0aWVzKHZtLCBKU1JlYWRPbmx5TWFwTGlrZVByb3RvdHlwZVRh YmxlVmFsdWVzLCAqdGhpcyk7Ci0gICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5p dGVyYXRvclN5bWJvbCwgZ2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFt ZXMoKS52YWx1ZXNQdWJsaWNOYW1lKCkpLCBEb250RW51bSk7CisgICAgcHV0RGlyZWN0KHZtLCB2 bS5wcm9wZXJ0eU5hbWVzLT5pdGVyYXRvclN5bWJvbCwgZ2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0 eU5hbWVzLT5idWlsdGluTmFtZXMoKS5lbnRyaWVzUHVibGljTmFtZSgpKSwgRG9udEVudW0pOwog fQogCiBjb25zdCBDbGFzc0luZm8gSlNSZWFkT25seU1hcExpa2U6OnNfaW5mbyA9IHsgIlJlYWRP bmx5TWFwTGlrZSIsICZCYXNlOjpzX2luZm8sIG51bGxwdHIsIG51bGxwdHIsIENSRUFURV9NRVRI T0RfVEFCTEUoSlNSZWFkT25seU1hcExpa2UpIH07Cg== 310772 2017-05-20 08:42:08 -0700 2017-05-20 11:57:59 -0700 Patch bug-172410-20170520084207.patch text/plain 7106 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU2NDNhM2RjYWIyMGEz NjBhYWZiZjNhNDFhMmY2ZWU5NzE3ZjhlMy4uOTdiMThlN2UzZGJlZjQyY2JlYzAxYTQ3MWUwMmIw YWFlODkyNGNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTA1LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVmFsdWUgZm9yIGl0ZXJhdG9y IHByb3BlcnR5IGlzIHdyb25nIGZvciBtYXBsaWtlIGludGVyZmFjZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjQxMAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZhbHVlIGZvciBpdGVyYXRvciBwcm9w ZXJ0eSB3YXMgd3JvbmcgZm9yIG1hcGxpa2UgaW50ZXJmYWNlcy4gVGhlIGl0ZXJhdG9yIHByb3Bl cnR5IGlzCisgICAgICAgIHN1cHBvc2VkIHRvIGhhdmUgdGhlIHNhbWUgdmFsdWUgYXMgdGhlICdl bnRyaWVzJyBwcm9wZXJ0eSBidXQgd2Ugd2VyZSB1c2luZyB0aGUgdmFsdWUKKyAgICAgICAgb2Yg dGhlICd2YWx1ZXMnIHByb3BlcnR5LgorCisgICAgICAgIFNwZWNpZmljYXRpb246CisgICAgICAg IC0gaHR0cHM6Ly9oZXljYW0uZ2l0aHViLmlvL3dlYmlkbC8jZXMtbWFwLWVudHJpZXMKKyAgICAg ICAgLSBodHRwczovL2hleWNhbS5naXRodWIuaW8vd2ViaWRsLyNlcy1pdGVyYXRvcgorCisgICAg ICAgIFRoaXMgaW1wYWN0cyB0aGUgaXRlcmF0b3Igb2YgdGhlIFJUQ1N0YXRzUmVwb3J0IGludGVy ZmFjZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHVwZGF0ZWQgZXhpc3RpbmcgdGVzdC4KKwor ICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAo R2VuZXJhdGVJbXBsZW1lbnRhdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0pTL0pTTWFwTGlrZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU01hcExpa2VQcm90b3R5cGU6 OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNS ZWFkT25seU1hcExpa2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNSZWFkT25seU1hcExpa2VQ cm90b3R5cGU6OmZpbmlzaENyZWF0aW9uKToKKwogMjAxNy0wNS0xOSAgSmVyZW15IEpvbmVzICA8 amVyZW15akBhcHBsZS5jb20+CiAKICAgICAgICAgd2Via2l0U3VwcG9ydHNGdWxsc2NyZWVuIGFu ZCB3ZWJraXRTdXBwb3J0c1ByZXNlbnRhdGlvbk1vZGUoJ2Z1bGxzY3JlZW4nKSBkaXNhZ3JlZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNS ZXBvcnQuaWRsIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1Jl cG9ydC5pZGwKaW5kZXggMzdlNjRkMmU0NTdlMGE0MDAyNDcwNjUyNDcxZTAwMjE5YmM5YTU1OC4u YTMwYTViMzIxZmU0M2RkYmJhZjM1MjhjOGEwMGZhZWUzZmY5MGM0YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1JlcG9ydC5pZGwKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENTdGF0c1JlcG9ydC5pZGwKQEAg LTIzLDYgKzIzLDcgQEAKICAqIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8vIEZJWE1FOiBUaGlzIHNob3VsZCBub3Qg YmUgbWFya2VkIGFzIFtOb0ludGVyZmFjZU9iamVjdF0uCiBbCiAgICAgTm9JbnRlcmZhY2VPYmpl Y3QsCiAgICAgQ29uZGl0aW9uYWw9V0VCX1JUQywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggY2UzYTc0OGNlZmUxZThkYWE1 N2NlYWUxODk2N2IwNWExMWYwZGJmMi4uNzU1ZmU4YTFlYmMwZTExMjhlNGRkYmJiZWFiZGQxODQz ZjNmZmU4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9ySlMucG0KQEAgLTM0NjYsMTAgKzM0NjYsOCBAQCBzdWIgR2VuZXJhdGVJbXBsZW1l bnRhdGlvbgogCiAgICAgICAgIGlmIChJbnRlcmZhY2VOZWVkc0l0ZXJhdG9yKCRpbnRlcmZhY2Up KSB7CiAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiPGJ1aWx0aW5zL0J1aWx0aW5OYW1l cy5oPiIpOwotICAgICAgICAgICAgaWYgKElzS2V5VmFsdWVJdGVyYWJsZUludGVyZmFjZSgkaW50 ZXJmYWNlKSkgeworICAgICAgICAgICAgaWYgKElzS2V5VmFsdWVJdGVyYWJsZUludGVyZmFjZSgk aW50ZXJmYWNlKSBvciAkaW50ZXJmYWNlLT5tYXBMaWtlKSB7CiAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5pdGVy YXRvclN5bWJvbCwgZ2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMo KS5lbnRyaWVzUHVibGljTmFtZSgpKSwgRG9udEVudW0pO1xuIik7Ci0gICAgICAgICAgICB9IGVs c2lmICgkaW50ZXJmYWNlLT5tYXBMaWtlKSB7Ci0gICAgICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5pdGVyYXRvclN5bWJv bCwgZ2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS52YWx1ZXNQ dWJsaWNOYW1lKCkpLCBEb250RW51bSk7XG4iKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9w ZXJ0eU5hbWVzLT5pdGVyYXRvclN5bWJvbCwgZ2xvYmFsT2JqZWN0KCktPmFycmF5UHJvdG90eXBl KCktPmdldERpcmVjdCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkudmFsdWVz UHJpdmF0ZU5hbWUoKSksIERvbnRFbnVtKTtcbiIpOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTTWFwTGlrZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNNYXBMaWtlLmNwcApp bmRleCAxNzI0YzMxNzY3Yzg1ZmExYmFiNWFjZGYwODkxM2Q0ZDMxNDMxNjg4Li41MzE1MDMyMmRl YjBkYTAwMjFmY2ExMTIxZjZmYjhmYjBiNzY3ZDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNNYXBMaWtlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNNYXBMaWtlLmNwcApAQCAtMTIwLDcgKzEy MCw3IEBAIHZvaWQgSlNNYXBMaWtlUHJvdG90eXBlOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0pCiB7 CiAgICAgQmFzZTo6ZmluaXNoQ3JlYXRpb24odm0pOwogICAgIHJlaWZ5U3RhdGljUHJvcGVydGll cyh2bSwgSlNNYXBMaWtlUHJvdG90eXBlVGFibGVWYWx1ZXMsICp0aGlzKTsKLSAgICBwdXREaXJl Y3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPml0ZXJhdG9yU3ltYm9sLCBnZXREaXJlY3Qodm0sIHZt LnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLnZhbHVlc1B1YmxpY05hbWUoKSksIERvbnRF bnVtKTsKKyAgICBwdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPml0ZXJhdG9yU3ltYm9s LCBnZXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmVudHJpZXNQ dWJsaWNOYW1lKCkpLCBEb250RW51bSk7CiB9CiAKIGNvbnN0IENsYXNzSW5mbyBKU01hcExpa2U6 OnNfaW5mbyA9IHsgIk1hcExpa2UiLCAmQmFzZTo6c19pbmZvLCBudWxscHRyLCBudWxscHRyLCBD UkVBVEVfTUVUSE9EX1RBQkxFKEpTTWFwTGlrZSkgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1JlYWRPbmx5TWFwTGlrZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNSZWFkT25seU1hcExpa2UuY3Bw CmluZGV4IDBmZDUzMGZhNjI5MDYyYzhkMDRiYzZjODdjYzNlYzliMmQ3NTgyNWEuLjFhNTE5YmU0 ZDJlMjUzNjhiYTFiYzJjZDI2ZWJlOGRhMGI3ZjkwZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1JlYWRPbmx5TWFwTGlrZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTUmVhZE9ubHlNYXBMaWtl LmNwcApAQCAtMTE0LDcgKzExNCw3IEBAIHZvaWQgSlNSZWFkT25seU1hcExpa2VQcm90b3R5cGU6 OmZpbmlzaENyZWF0aW9uKFZNJiB2bSkKIHsKICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbih2bSk7 CiAgICAgcmVpZnlTdGF0aWNQcm9wZXJ0aWVzKHZtLCBKU1JlYWRPbmx5TWFwTGlrZVByb3RvdHlw ZVRhYmxlVmFsdWVzLCAqdGhpcyk7Ci0gICAgcHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVz LT5pdGVyYXRvclN5bWJvbCwgZ2V0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGlu TmFtZXMoKS52YWx1ZXNQdWJsaWNOYW1lKCkpLCBEb250RW51bSk7CisgICAgcHV0RGlyZWN0KHZt LCB2bS5wcm9wZXJ0eU5hbWVzLT5pdGVyYXRvclN5bWJvbCwgZ2V0RGlyZWN0KHZtLCB2bS5wcm9w ZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5lbnRyaWVzUHVibGljTmFtZSgpKSwgRG9udEVudW0p OwogfQogCiBjb25zdCBDbGFzc0luZm8gSlNSZWFkT25seU1hcExpa2U6OnNfaW5mbyA9IHsgIlJl YWRPbmx5TWFwTGlrZSIsICZCYXNlOjpzX2luZm8sIG51bGxwdHIsIG51bGxwdHIsIENSRUFURV9N RVRIT0RfVEFCTEUoSlNSZWFkT25seU1hcExpa2UpIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2RiNjc2MGRiMjRkMTEw OGYzOGM5YjAxODI5ODk2OWM1M2VlZDJlNS4uNWQyMDIzNGQwNDY1ZDJhMjEwYjljN2VkMGNhMWFi OWFlNGZiMjg2YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA1LTIwICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVmFsdWUgZm9yIGl0ZXJhdG9yIHByb3Bl cnR5IGlzIHdyb25nIGZvciBtYXBsaWtlIGludGVyZmFjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjQxMAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4dGVuZCB0ZXN0IGNvdmVyYWdlIHRvIHRlc3Qg dGhlIFJUQ1N0YXRzUmVwb3J0IGl0ZXJhdG9yLgorCisgICAgICAgICogd2VicnRjL3ZpZGVvLXN0 YXRzLmh0bWw6CisKIDIwMTctMDUtMTkgIEplcmVteSBKb25lcyAgPGplcmVteWpAYXBwbGUuY29t PgogCiAgICAgICAgIHdlYmtpdFN1cHBvcnRzRnVsbHNjcmVlbiBhbmQgd2Via2l0U3VwcG9ydHNQ cmVzZW50YXRpb25Nb2RlKCdmdWxsc2NyZWVuJykgZGlzYWdyZWUuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tc3RhdHMuaHRtbCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRl by1zdGF0cy5odG1sCmluZGV4IDRkMTljZjRiNWM1MWVlZTBhZjA1YjI5MDc1OWQwNWExZWY2ODUw MmIuLjViZDRlMjBkOTk0YjJjMWY2ODgyZDZlMzBlMDkxNzUzYzhmZjNiZmMgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1zdGF0cy5odG1sCisrKyBiL0xheW91dFRlc3RzL3dl YnJ0Yy92aWRlby1zdGF0cy5odG1sCkBAIC0xMCw5ICsxMCwxOCBAQAogICAgICAgICA8c2NyaXB0 IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KIAorZnVuY3Rp b24gY2hlY2tTdGF0c1JlcG9ydEl0ZXJhdG9yKHJlcG9ydCkKK3sKKyAgICBhc3NlcnRfZXF1YWxz KE9iamVjdC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IocmVwb3J0Ll9fcHJvdG9fXywgU3ltYm9s Lml0ZXJhdG9yKS52YWx1ZSwgT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcihyZXBvcnQu X19wcm90b19fLCAnZW50cmllcycpLnZhbHVlKTsKKyAgICBhc3NlcnRfZXF1YWxzKE9iamVjdC5n ZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IocmVwb3J0Ll9fcHJvdG9fXywgU3ltYm9sLml0ZXJhdG9y KS52YWx1ZS5uYW1lLCAiZW50cmllcyIpOworICAgIGZvciAobGV0IHBhaXIgb2YgcmVwb3J0KQor ICAgICAgICBhc3NlcnRfZXF1YWxzKHBhaXIubGVuZ3RoLCAyKTsKK30KKwogZnVuY3Rpb24gZ2V0 SW5ib3VuZFJUUFN0YXRzKGNvbm5lY3Rpb24pCiB7CiAgICAgcmV0dXJuIGNvbm5lY3Rpb24uZ2V0 U3RhdHMoKS50aGVuKChyZXBvcnQpID0+IHsKKyAgICAgICAgY2hlY2tTdGF0c1JlcG9ydEl0ZXJh dG9yKHJlcG9ydCk7CiAgICAgICAgIHZhciBzdGF0czsKICAgICAgICAgcmVwb3J0LmZvckVhY2go KHN0YXRJdGVtKSA9PiB7CiAgICAgICAgICAgICBpZiAoc3RhdEl0ZW0udHlwZSA9PT0gImluYm91 bmQtcnRwIikgewpAQCAtMjYsNiArMzUsNyBAQCBmdW5jdGlvbiBnZXRJbmJvdW5kUlRQU3RhdHMo Y29ubmVjdGlvbikKIGZ1bmN0aW9uIGdldE91dGJvdW5kUlRQU3RhdHMoY29ubmVjdGlvbikKIHsK ICAgICByZXR1cm4gY29ubmVjdGlvbi5nZXRTdGF0cygpLnRoZW4oKHJlcG9ydCkgPT4geworICAg ICAgICBjaGVja1N0YXRzUmVwb3J0SXRlcmF0b3IocmVwb3J0KTsKICAgICAgICAgdmFyIHN0YXRz OwogICAgICAgICByZXBvcnQuZm9yRWFjaCgoc3RhdEl0ZW0pID0+IHsKICAgICAgICAgICAgIGlm IChzdGF0SXRlbS50eXBlID09PSAib3V0Ym91bmQtcnRwIikgewo=