49046 2010-11-04 18:47:45 -0700 Implement NP_RemoveProperty and NP_Enumerate 2010-11-05 10:40:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 305090 0 andersca 2010-11-04 18:47:45 -0700 Implement NP_RemoveProperty and NP_Enumerate 305092 1 73028 andersca 2010-11-04 18:51:29 -0700 Created attachment 73028 Patch 305095 2 webkit.review.bot 2010-11-04 18:53:39 -0700 Attachment 73028 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/platform/mac-wk2/Skipped', u'WebKit2/ChangeLog', u'WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp', u'WebKit2/Shared/Plugins/NPObjectMessageReceiver.h', u'WebKit2/Shared/Plugins/NPObjectMessageReceiver.messages.in', u'WebKit2/Shared/Plugins/NPObjectProxy.cpp', u'WebKit2/Shared/Plugins/NPObjectProxy.h']" exit_code: 1 WebKit2/Shared/Plugins/NPObjectProxy.cpp:281: NPObjectProxy::NP_RemoveProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/Shared/Plugins/NPObjectProxy.cpp:286: NPObjectProxy::NP_Enumerate is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 305116 3 73028 oliver 2010-11-04 20:35:58 -0700 Comment on attachment 73028 Patch r=me 305355 4 andersca 2010-11-05 10:40:44 -0700 Committed r71430: <http://trac.webkit.org/changeset/71430> 73028 2010-11-04 18:51:29 -0700 2010-11-04 20:35:58 -0700 Patch bug-49046-20101104185127.patch text/plain 9524 andersca ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxZmJkYjk5Zjk2MGM4YzRmNGQyMjNmZThmOWUyMDc4YWQ2ODdiZWQwLi4zYWQ5N2E3 ODA2Y2E1MWJjMWUyN2VjMzFmOWYwMGM3ZmIwZTQwODQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTEtMDQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgTlBf UmVtb3ZlUHJvcGVydHkgYW5kIE5QX0VudW1lcmF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkwNDYKKworICAgICAgICBSZW1vdmUgbm93IHBhc3Np bmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQ6CisKIDIwMTAt MTEtMDQgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMt d2syL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQKaW5kZXgg MmM2YjJiZTVhOWRlMWFmYTc1OWFlZTlmNWEwYWViZjRmNTI4OTk5Yy4uMTIxNzdkNWQ4YjYwN2Jh YmU4NGE3NTUwMGQ2Y2ExYzYxNGM2MDgxYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjLXdrMi9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tp cHBlZApAQCAtMTczNSwxNSArMTczNSwxMSBAQCBwbHVnaW5zL3JldHVybi1uZWdhdGl2ZS1vbmUt ZnJvbS13cml0ZS5odG1sCiBwbHVnaW5zL3NldC1zdGF0dXMuaHRtbAogcGx1Z2lucy91cGRhdGUt d2lkZ2V0cy1jcmFzaC5odG1sCiBwbHVnaW5zL3dpbmRvdy1vcGVuLmh0bWwKLXBsdWdpbnMvbnBy dW50aW1lL2VudW1lcmF0ZS5odG1sCiBwbHVnaW5zL25wcnVudGltZS9ldmFsdWF0ZS5odG1sCi1w bHVnaW5zL25wcnVudGltZS9nZXQtaW50LWlkZW50aWZpZXItc3BlY2lhbC12YWx1ZXMuaHRtbAot cGx1Z2lucy9ucHJ1bnRpbWUvZ2V0LXByb3BlcnR5LXJldHVybi12YWx1ZS5odG1sCiBwbHVnaW5z L25wcnVudGltZS9pZGVudGlmaWVyLWNvbnZlcnNpb24uaHRtbAogcGx1Z2lucy9ucHJ1bnRpbWUv aW52b2tlLWJyb3dzZXJmdW5jcy5odG1sCiBwbHVnaW5zL25wcnVudGltZS9pbnZva2UtZGVmYXVs dC5odG1sCiBwbHVnaW5zL25wcnVudGltZS9ucHJ1bnRpbWUuaHRtbAotcGx1Z2lucy9ucHJ1bnRp bWUvb2JqZWN0LWZyb20tZGVzdHJveWVkLXBsdWdpbi5odG1sCiBwbHVnaW5zL25wcnVudGltZS9w bHVnaW4tc2NyaXB0YWJsZS1vYmplY3QtaW52b2tlLWRlZmF1bHQuaHRtbAogcGx1Z2lucy9ucHJ1 bnRpbWUvcm91bmQtdHJpcC1ucG9iamVjdC5odG1sCiAgCmRpZmYgLS1naXQgYS9XZWJLaXQyL0No YW5nZUxvZyBiL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGQ4NTc4ZTJmZmE4NTc5OTQxOGVhYmUz NTRmZDdjZTA4M2E5ODJlNmIuLmEyYWRjNmQzYjM1OWI0NDdjNjdmMjU2Y2JkMzZkMjVjYWE4Zjk5 ZWMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMzMgQEAKKzIwMTAtMTEtMDQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbXBsZW1lbnQgTlBfUmVtb3ZlUHJvcGVydHkgYW5kIE5QX0VudW1lcmF0ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkwNDYKKworICAgICAg ICAqIFNoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVzc2FnZVJlY2VpdmVyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6OnJlbW92ZVByb3BlcnR5KToKKyAgICAg ICAgQ2FsbCB0aGUgcmVtb3ZlUHJvcGVydHkgTlBDbGFzcyBmdW5jdGlvbi4KKworICAgICAgICAo V2ViS2l0OjpOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcjo6ZW51bWVyYXRlKToKKyAgICAgICAgQ2Fs bCB0aGUgZW51bWVyYXRlIE5QQ2xhc3MgZnVuY3Rpb24uCisKKyAgICAgICAgKiBTaGFyZWQvUGx1 Z2lucy9OUE9iamVjdE1lc3NhZ2VSZWNlaXZlci5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIFJl bW92ZVByb3BlcnR5IGFuZCBFbnVtZXJhdGUgbWVzc2FnZXMuCisKKyAgICAgICAgKiBTaGFyZWQv UGx1Z2lucy9OUE9iamVjdFByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBPYmplY3RQcm94 eTo6cmVtb3ZlUHJvcGVydHkpOgorICAgICAgICBTZW5kIHRoZSBSZW1vdmVQcm9wZXJ0eSBtZXNz YWdlLgorCisgICAgICAgIChXZWJLaXQ6Ok5QT2JqZWN0UHJveHk6OmVudW1lcmF0ZSk6CisgICAg ICAgIFNlbmQgdGhlIEVudW1lcmF0ZSBtZXNzYWdlLgorCisgICAgICAgIChXZWJLaXQ6Ok5QT2Jq ZWN0UHJveHk6Ok5QX1JlbW92ZVByb3BlcnR5KToKKyAgICAgICAgQ2FsbCByZW1vdmVQcm9wZXJ0 eS4KKworICAgICAgICAoV2ViS2l0OjpOUE9iamVjdFByb3h5OjpOUF9FbnVtZXJhdGUpOgorICAg ICAgICBDYWxsIGVudW1lcmF0ZS4KKwogMjAxMC0xMS0wNCAgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg SHlhdHQuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVzc2Fn ZVJlY2VpdmVyLmNwcCBiL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVj ZWl2ZXIuY3BwCmluZGV4IDlhOWU5YWNiMDc5ZGRhMDNmYTI3YTljYTYzMzZkODg4NzI0NWU3ZjEu LmM3MWQ0MDk4YTllNjQ2ZWI2NzNlY2FkMDg4YThjMmU3OWE1YTJmMzcgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIuY3BwCisrKyBiL1dl YktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIuY3BwCkBAIC0xNDIs NiArMTQyLDM2IEBAIHZvaWQgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6OnNldFByb3BlcnR5KGNv bnN0IE5QSWRlbnRpZmllckRhdGEmIHByb3BlcnR5TmFtZURhCiAgICAgcmVsZWFzZU5QVmFyaWFu dFZhbHVlKCZwcm9wZXJ0eVZhbHVlKTsKIH0KIAordm9pZCBOUE9iamVjdE1lc3NhZ2VSZWNlaXZl cjo6cmVtb3ZlUHJvcGVydHkoY29uc3QgTlBJZGVudGlmaWVyRGF0YSYgcHJvcGVydHlOYW1lRGF0 YSwgYm9vbCYgcmV0dXJuVmFsdWUpCit7CisgICAgaWYgKCFtX25wT2JqZWN0LT5fY2xhc3MtPnJl bW92ZVByb3BlcnR5KSB7CisgICAgICAgIHJldHVyblZhbHVlID0gZmFsc2U7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKKyAgICByZXR1cm5WYWx1ZSA9IG1fbnBPYmplY3QtPl9jbGFzcy0+cmVt b3ZlUHJvcGVydHkobV9ucE9iamVjdCwgcHJvcGVydHlOYW1lRGF0YS5jcmVhdGVOUElkZW50aWZp ZXIoKSk7Cit9CisKK3ZvaWQgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6OmVudW1lcmF0ZShib29s JiByZXR1cm5WYWx1ZSwgVmVjdG9yPE5QSWRlbnRpZmllckRhdGE+JiBpZGVudGlmaWVyc0RhdGEp Cit7CisgICAgaWYgKCFOUF9DTEFTU19TVFJVQ1RfVkVSU0lPTl9IQVNfRU5VTShtX25wT2JqZWN0 LT5fY2xhc3MpIHx8ICFtX25wT2JqZWN0LT5fY2xhc3MtPmVudW1lcmF0ZSkgeworICAgICAgICBy ZXR1cm5WYWx1ZSA9IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgTlBJZGVu dGlmaWVyKiBpZGVudGlmaWVycyA9IDA7CisgICAgdWludDMyX3QgaWRlbnRpZmllckNvdW50ID0g MDsKKworICAgIHJldHVyblZhbHVlID0gbV9ucE9iamVjdC0+X2NsYXNzLT5lbnVtZXJhdGUobV9u cE9iamVjdCwgJmlkZW50aWZpZXJzLCAmaWRlbnRpZmllckNvdW50KTsKKyAgICBpZiAoIXJldHVy blZhbHVlKQorICAgICAgICByZXR1cm47CisKKyAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwg aWRlbnRpZmllckNvdW50OyArK2kpCisgICAgICAgIGlkZW50aWZpZXJzRGF0YS5hcHBlbmQoTlBJ ZGVudGlmaWVyRGF0YTo6ZnJvbU5QSWRlbnRpZmllcihpZGVudGlmaWVyc1tpXSkpOworCisgICAg bnBuTWVtRnJlZShpZGVudGlmaWVycyk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAj ZW5kaWYgLy8gRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFy ZWQvUGx1Z2lucy9OUE9iamVjdE1lc3NhZ2VSZWNlaXZlci5oIGIvV2ViS2l0Mi9TaGFyZWQvUGx1 Z2lucy9OUE9iamVjdE1lc3NhZ2VSZWNlaXZlci5oCmluZGV4IDIyZGI0MmUxMTI2MWM4MzJhZjc5 MTAyMTNkZDIzMTYyMDU4MmUwZDguLjFmNWNkMDZhNDMxZmVmMGE0YTljYTU4N2NkZDAzOWU2MDk0 ZWYxZDQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdl UmVjZWl2ZXIuaAorKysgYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVzc2FnZVJl Y2VpdmVyLmgKQEAgLTU4LDYgKzU4LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGhhc1Byb3BlcnR5 KGNvbnN0IE5QSWRlbnRpZmllckRhdGEmLCBib29sJiByZXR1cm5WYWx1ZSk7CiAgICAgdm9pZCBn ZXRQcm9wZXJ0eShjb25zdCBOUElkZW50aWZpZXJEYXRhJiwgYm9vbCYgcmV0dXJuVmFsdWUsIE5Q VmFyaWFudERhdGEmIHJlc3VsdERhdGEpOwogICAgIHZvaWQgc2V0UHJvcGVydHkoY29uc3QgTlBJ ZGVudGlmaWVyRGF0YSYsIGNvbnN0IE5QVmFyaWFudERhdGEmIHByb3BlcnR5VmFsdWVEYXRhLCBi b29sJiByZXR1cm5WYWx1ZSk7CisgICAgdm9pZCByZW1vdmVQcm9wZXJ0eShjb25zdCBOUElkZW50 aWZpZXJEYXRhJiwgYm9vbCYgcmV0dXJuVmFsdWUpOworICAgIHZvaWQgZW51bWVyYXRlKGJvb2wm IHJldHVyblZhbHVlLCBWZWN0b3I8TlBJZGVudGlmaWVyRGF0YT4mIGlkZW50aWZpZXJzRGF0YSk7 CiAKICAgICBOUFJlbW90ZU9iamVjdE1hcCogbV9ucFJlbW90ZU9iamVjdE1hcDsKICAgICB1aW50 NjRfdCBtX25wT2JqZWN0SUQ7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05Q T2JqZWN0TWVzc2FnZVJlY2VpdmVyLm1lc3NhZ2VzLmluIGIvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lu cy9OUE9iamVjdE1lc3NhZ2VSZWNlaXZlci5tZXNzYWdlcy5pbgppbmRleCAwYjFhZDg5MjBmYWNk NzcwMTk0ZWEzMmJlNjJhNmIwMTFkNzhkNjAzLi43YjUxYjFkNDgyNjg1NmI2MmRkNjBjMWVhNGFm MjA2OGM5Y2Q1MDkxIDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0 TWVzc2FnZVJlY2VpdmVyLm1lc3NhZ2VzLmluCisrKyBiL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMv TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIubWVzc2FnZXMuaW4KQEAgLTI5LDYgKzI5LDggQEAgbWVz c2FnZXMgLT4gTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIgewogICAgIEhhc1Byb3BlcnR5KFdlYktp dDo6TlBJZGVudGlmaWVyRGF0YSBwcm9wZXJ0eU5hbWUpIC0+IChib29sIHJldHVyblZhbHVlKQog ICAgIEdldFByb3BlcnR5KFdlYktpdDo6TlBJZGVudGlmaWVyRGF0YSBwcm9wZXJ0eU5hbWUpIC0+ IChib29sIHJldHVyblZhbHVlLCBXZWJLaXQ6Ok5QVmFyaWFudERhdGEgcmVzdWx0RGF0YSkKICAg ICBTZXRQcm9wZXJ0eShXZWJLaXQ6Ok5QSWRlbnRpZmllckRhdGEgcHJvcGVydHlOYW1lLCBXZWJL aXQ6Ok5QVmFyaWFudERhdGEgcHJvcGVydHlWYWx1ZURhdGEpIC0+IChib29sIHJldHVyblZhbHVl KQorICAgIFJlbW92ZVByb3BlcnR5KFdlYktpdDo6TlBJZGVudGlmaWVyRGF0YSBwcm9wZXJ0eU5h bWUpIC0+IChib29sIHJldHVyblZhbHVlKQorICAgIEVudW1lcmF0ZSgpIC0+IChib29sIHJldHVy blZhbHVlLCBWZWN0b3I8V2ViS2l0OjpOUElkZW50aWZpZXJEYXRhPiBpZGVudGlmaWVyc0RhdGEp CiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUE9iamVj dFByb3h5LmNwcCBiL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RQcm94eS5jcHAKaW5k ZXggMjZhYmU4Mjc5YWM5YjVlM2ZjMDk5ZjZjZmM5N2EyMjAyZWJiZTQxZi4uMzZjYTAxYTVkNjI1 NzAxZWJhMzlmMDRhNDFjNDJiZmIxYzBiNGNmMyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQv UGx1Z2lucy9OUE9iamVjdFByb3h5LmNwcAorKysgYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05Q T2JqZWN0UHJveHkuY3BwCkBAIC0xNzQsNiArMTc0LDQ1IEBAIGJvb2wgTlBPYmplY3RQcm94eTo6 c2V0UHJvcGVydHkoTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSwgY29uc3QgTlBWYXJpYW50KiB2 YWx1CiAgICAgcmV0dXJuIHJldHVyblZhbHVlOwogfQogCitib29sIE5QT2JqZWN0UHJveHk6OnJl bW92ZVByb3BlcnR5KE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUpCit7CisgICAgaWYgKCFtX25w UmVtb3RlT2JqZWN0TWFwKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgCisgICAgTlBJZGVu dGlmaWVyRGF0YSBwcm9wZXJ0eU5hbWVEYXRhID0gTlBJZGVudGlmaWVyRGF0YTo6ZnJvbU5QSWRl bnRpZmllcihwcm9wZXJ0eU5hbWUpOworCisgICAgYm9vbCByZXR1cm5WYWx1ZSA9IGZhbHNlOwor ICAgIAorICAgIGlmICghbV9ucFJlbW90ZU9iamVjdE1hcC0+Y29ubmVjdGlvbigpLT5zZW5kU3lu YyhNZXNzYWdlczo6TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6OlJlbW92ZVByb3BlcnR5KHByb3Bl cnR5TmFtZURhdGEpLCBNZXNzYWdlczo6TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6OlJlbW92ZVBy b3BlcnR5OjpSZXBseShyZXR1cm5WYWx1ZSksIG1fbnBPYmplY3RJRCkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgIHJldHVybiByZXR1cm5WYWx1ZTsKK30KKworYm9vbCBOUE9iamVjdFBy b3h5OjplbnVtZXJhdGUoTlBJZGVudGlmaWVyKiogaWRlbnRpZmllcnMsIHVpbnQzMl90KiBpZGVu dGlmaWVyQ291bnQpCit7CisgICAgaWYgKCFtX25wUmVtb3RlT2JqZWN0TWFwKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBib29sIHJldHVyblZhbHVlOworICAgIFZlY3RvcjxOUElkZW50 aWZpZXJEYXRhPiBpZGVudGlmaWVyc0RhdGE7CisKKyAgICBpZiAoIW1fbnBSZW1vdGVPYmplY3RN YXAtPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6Ok5QT2JqZWN0TWVzc2FnZVJlY2Vp dmVyOjpFbnVtZXJhdGUoKSwgTWVzc2FnZXM6Ok5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyOjpFbnVt ZXJhdGU6OlJlcGx5KHJldHVyblZhbHVlLCBpZGVudGlmaWVyc0RhdGEpLCBtX25wT2JqZWN0SUQp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIXJldHVyblZhbHVlKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBOUElkZW50aWZpZXIqIG5hbWVJZGVudGlmaWVycyA9IG5w bk1lbU5ld0FycmF5PE5QSWRlbnRpZmllcj4oaWRlbnRpZmllcnNEYXRhLnNpemUoKSk7CisgICAg CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBpZGVudGlmaWVyc0RhdGEuc2l6ZSgpOyArK2kp CisgICAgICAgIG5hbWVJZGVudGlmaWVyc1tpXSA9IGlkZW50aWZpZXJzRGF0YVtpXS5jcmVhdGVO UElkZW50aWZpZXIoKTsKKyAgICAKKyAgICAqaWRlbnRpZmllcnMgPSBuYW1lSWRlbnRpZmllcnM7 CisgICAgKmlkZW50aWZpZXJDb3VudCA9IGlkZW50aWZpZXJzRGF0YS5zaXplKCk7CisgICAgcmV0 dXJuIHRydWU7Cit9CisKIE5QQ2xhc3MqIE5QT2JqZWN0UHJveHk6Om5wQ2xhc3MoKQogewogICAg IHN0YXRpYyBOUENsYXNzIG5wQ2xhc3MgPSB7CkBAIC0yMzksMTYgKzI3OCwxNCBAQCBib29sIE5Q T2JqZWN0UHJveHk6Ok5QX1NldFByb3BlcnR5KE5QT2JqZWN0KiBucE9iamVjdCwgTlBJZGVudGlm aWVyIHByb3BlcnR5TmFtZQogICAgIHJldHVybiB0b05QT2JqZWN0UHJveHkobnBPYmplY3QpLT5z ZXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUsIHZhbHVlKTsKIH0KIAotYm9vbCBOUE9iamVjdFByb3h5 OjpOUF9SZW1vdmVQcm9wZXJ0eShOUE9iamVjdCosIE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUp Citib29sIE5QT2JqZWN0UHJveHk6Ok5QX1JlbW92ZVByb3BlcnR5KE5QT2JqZWN0KiBucE9iamVj dCwgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwot ICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gdG9OUE9iamVjdFByb3h5KG5wT2JqZWN0KS0+ cmVtb3ZlUHJvcGVydHkocHJvcGVydHlOYW1lKTsKIH0KIAotYm9vbCBOUE9iamVjdFByb3h5OjpO UF9FbnVtZXJhdGUoTlBPYmplY3QqLCBOUElkZW50aWZpZXIqKiBpZGVudGlmaWVycywgdWludDMy X3QqIGlkZW50aWZpZXJDb3VudCkKK2Jvb2wgTlBPYmplY3RQcm94eTo6TlBfRW51bWVyYXRlKE5Q T2JqZWN0KiBucE9iamVjdCwgTlBJZGVudGlmaWVyKiogaWRlbnRpZmllcnMsIHVpbnQzMl90KiBp ZGVudGlmaWVyQ291bnQpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFs c2U7CisgICAgcmV0dXJuIHRvTlBPYmplY3RQcm94eShucE9iamVjdCktPmVudW1lcmF0ZShpZGVu dGlmaWVycywgaWRlbnRpZmllckNvdW50KTsKIH0KIAogYm9vbCBOUE9iamVjdFByb3h5OjpOUF9D b25zdHJ1Y3QoTlBPYmplY3QqLCBjb25zdCBOUFZhcmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3Qg YXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1No YXJlZC9QbHVnaW5zL05QT2JqZWN0UHJveHkuaCBiL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBP YmplY3RQcm94eS5oCmluZGV4IDQ4NWQzZWUzODM5NTNiYzY5ZDE3NWE2M2YzMzU4YmJiMzU0ZGNl YjYuLmJjNmNmYjE5OTc1NjQzNTcwZWRkYmNhZjQ2NjAxOWEzMjIxYzBjYWEgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RQcm94eS5oCisrKyBiL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvTlBPYmplY3RQcm94eS5oCkBAIC02Miw2ICs2Miw4IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBoYXNQcm9wZXJ0eShOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lKTsKICAgICBib29s IGdldFByb3BlcnR5KE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUsIE5QVmFyaWFudCogcmVzdWx0 KTsKICAgICBib29sIHNldFByb3BlcnR5KE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUsIGNvbnN0 IE5QVmFyaWFudCogdmFsdWUpOworICAgIGJvb2wgcmVtb3ZlUHJvcGVydHkoTlBJZGVudGlmaWVy IHByb3BlcnR5TmFtZSk7CisgICAgYm9vbCBlbnVtZXJhdGUoTlBJZGVudGlmaWVyKiogaWRlbnRp ZmllcnMsIHVpbnQzMl90KiBpZGVudGlmaWVyQ291bnQpOwogCiAgICAgc3RhdGljIE5QQ2xhc3Mq IG5wQ2xhc3MoKTsKICAgICBzdGF0aWMgTlBPYmplY3QqIE5QX0FsbG9jYXRlKE5QUCwgTlBDbGFz cyopOwo=