133922 2014-06-14 18:25:14 -0700 Replace StringImpl* callback parameters with const String& 2014-06-14 19:11:15 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz commit-queue sam oldest_to_newest 1015739 0 mitz 2014-06-14 18:25:14 -0700 Some callbacks have StringImpl* parameters. 1015740 1 233132 mitz 2014-06-14 18:28:02 -0700 Created attachment 233132 Use const String& in callbacks 1015741 2 commit-queue 2014-06-14 18:29:17 -0700 Attachment 233132 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/C/WKPage.cpp:1584: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/UIProcess/API/C/WKPage.cpp:1584: Extra space before [ [whitespace/braces] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1015744 3 mitz 2014-06-14 19:11:15 -0700 Committed <http://trac.webkit.org/r169987>. 233132 2014-06-14 18:28:02 -0700 2014-06-14 18:36:41 -0700 Use const String& in callbacks bug-133922-20140614182739.patch text/plain 9396 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTk4NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA2LTE0ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBTdHJpbmdJbXBsKiBj YWxsYmFjayBwYXJhbWV0ZXJzIHdpdGggY29uc3QgU3RyaW5nJgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzOTIyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNw cDoKKyAgICAgICAgKHRvR2VuZXJpY0NhbGxiYWNrRnVuY3Rpb24pOiBBZGRlZCB0aGlzIGhlbHBl ciBmdW5jdGlvbiB0byB3cmFwIGEgV0tTdHJpbmdSZWYtcmV0dXJuaW5nCisgICAgICAgIEFQSSBj YWxsYmFjayBpbiBhIGdlbmVyaWMgY29uc3QgU3RyaW5nJi1yZXR1cm5pbmcgY2FsbGJhY2suCisg ICAgICAgIChXS1BhZ2VSZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbik6CisgICAgICAg IChXS1BhZ2VHZXRTb3VyY2VGb3JGcmFtZSk6CisgICAgICAgIChXS1BhZ2VHZXRDb250ZW50c0Fz U3RyaW5nKToKKyAgICAgICAgKFdLUGFnZUdldEJ5dGVjb2RlUHJvZmlsZSk6CisgICAgICAgIChX S1BhZ2VWYWxpZGF0ZUNvbW1hbmQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbToKKyAgICAgICAgKC1bV0tWaWV3IHZhbGlkYXRlVXNlckludGVyZmFjZUl0ZW06XSk6Cisg ICAgICAgICgtW1dLVmlldyBzdGFydFNwZWFraW5nOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGVmaW5lOl0pOgorICAgICAg ICAoLVtXS0NvbnRlbnRWaWV3IGFwcGx5QXV0b2NvcnJlY3Rpb246dG9TdHJpbmc6d2l0aENvbXBs ZXRpb25IYW5kbGVyOl0pOgorCiAyMDE0LTA2LTE0ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkaXRpb25hbCBpT1MgYnVpbGQgZml4LgpJbmRleDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTY5OTg0KQorKysgU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0x ODYsNyArMTg2LDcgQEAgY2xhc3MgUXVpY2tMb29rRG9jdW1lbnREYXRhOwogCiB0eXBlZGVmIEdl bmVyaWNDYWxsYmFjazx1aW50NjRfdD4gVW5zaWduZWRDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJp Y0NhbGxiYWNrPEVkaXRpbmdSYW5nZT4gRWRpdGluZ1JhbmdlQ2FsbGJhY2s7Ci10eXBlZGVmIEdl bmVyaWNDYWxsYmFjazxTdHJpbmdJbXBsKj4gU3RyaW5nQ2FsbGJhY2s7Cit0eXBlZGVmIEdlbmVy aWNDYWxsYmFjazxjb25zdCBTdHJpbmcmPiBTdHJpbmdDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJp Y0NhbGxiYWNrPFdlYlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSo+IFNjcmlwdFZhbHVlQ2FsbGJhY2s7 CiAKICNpZiBQTEFURk9STShHVEspCkBAIC0yMDQsNyArMjA0LDcgQEAgc3RydWN0IFF1ZXVlZFRv dWNoRXZlbnRzIHsKIH07CiAjZW5kaWYKIAotdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8U3RyaW5n SW1wbCosIGJvb2wsIGludDMyX3Q+IFZhbGlkYXRlQ29tbWFuZENhbGxiYWNrOwordHlwZWRlZiBH ZW5lcmljQ2FsbGJhY2s8Y29uc3QgU3RyaW5nJiwgYm9vbCwgaW50MzJfdD4gVmFsaWRhdGVDb21t YW5kQ2FsbGJhY2s7CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiwgY29uc3QgRWRpdGluZ1JhbmdlJj4gUmVjdEZvckNoYXJhY3RlclJhbmdlQ2FsbGJhY2s7 CiAKICNpZiBQTEFURk9STShNQUMpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMTY5OTg0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NzksMjQgKzE1NzksMzEg QEAgdm9pZCBXS1BhZ2VSdW5KYXZhU2NyaXB0SW5NYWluRnJhbWVfYihXSwogfQogI2VuZGlmCiAK K3N0YXRpYyBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IFN0cmluZyYsIENhbGxiYWNrQmFzZTo6 RXJyb3IpPiB0b0dlbmVyaWNDYWxsYmFja0Z1bmN0aW9uKHZvaWQqIGNvbnRleHQsIHZvaWQgKCpj YWxsYmFjaykoV0tTdHJpbmdSZWYsIFdLRXJyb3JSZWYsIHZvaWQqKSkKK3sKKyAgICByZXR1cm4g W2NvbnRleHQsIGNhbGxiYWNrXShjb25zdCBTdHJpbmcmIHJldHVyblZhbHVlLCBDYWxsYmFja0Jh c2U6OkVycm9yIGVycm9yKSB7CisgICAgICAgIGNhbGxiYWNrKHRvQVBJKEFQSTo6U3RyaW5nOjpj cmVhdGUocmV0dXJuVmFsdWUpLmdldCgpKSwgZXJyb3IgIT0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6 Tm9uZSA/IHRvQVBJKEFQSTo6RXJyb3I6OmNyZWF0ZSgpLmdldCgpKSA6IDAsIGNvbnRleHQpOwor ICAgIH07Cit9CisKIHZvaWQgV0tQYWdlUmVuZGVyVHJlZUV4dGVybmFsUmVwcmVzZW50YXRpb24o V0tQYWdlUmVmIHBhZ2VSZWYsIHZvaWQqIGNvbnRleHQsIFdLUGFnZVJlbmRlclRyZWVFeHRlcm5h bFJlcHJlc2VudGF0aW9uRnVuY3Rpb24gY2FsbGJhY2spCiB7Ci0gICAgdG9JbXBsKHBhZ2VSZWYp LT5nZXRSZW5kZXJUcmVlRXh0ZXJuYWxSZXByZXNlbnRhdGlvbihTdHJpbmdDYWxsYmFjazo6Y3Jl YXRlKHRvR2VuZXJpY0NhbGxiYWNrRnVuY3Rpb248V0tTdHJpbmdSZWYsIFN0cmluZ0ltcGwqPihj b250ZXh0LCBjYWxsYmFjaykpKTsKKyAgICB0b0ltcGwocGFnZVJlZiktPmdldFJlbmRlclRyZWVF eHRlcm5hbFJlcHJlc2VudGF0aW9uKFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUodG9HZW5lcmljQ2Fs bGJhY2tGdW5jdGlvbihjb250ZXh0LCBjYWxsYmFjaykpKTsKIH0KIAogdm9pZCBXS1BhZ2VHZXRT b3VyY2VGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZVJlZiwgV0tGcmFtZVJlZiBmcmFtZVJlZiwgdm9p ZCogY29udGV4dCwgV0tQYWdlR2V0U291cmNlRm9yRnJhbWVGdW5jdGlvbiBjYWxsYmFjaykKIHsK LSAgICB0b0ltcGwocGFnZVJlZiktPmdldFNvdXJjZUZvckZyYW1lKHRvSW1wbChmcmFtZVJlZiks IFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUodG9HZW5lcmljQ2FsbGJhY2tGdW5jdGlvbjxXS1N0cmlu Z1JlZiwgU3RyaW5nSW1wbCo+KGNvbnRleHQsIGNhbGxiYWNrKSkpOworICAgIHRvSW1wbChwYWdl UmVmKS0+Z2V0U291cmNlRm9yRnJhbWUodG9JbXBsKGZyYW1lUmVmKSwgU3RyaW5nQ2FsbGJhY2s6 OmNyZWF0ZSh0b0dlbmVyaWNDYWxsYmFja0Z1bmN0aW9uKGNvbnRleHQsIGNhbGxiYWNrKSkpOwog fQogCiB2b2lkIFdLUGFnZUdldENvbnRlbnRzQXNTdHJpbmcoV0tQYWdlUmVmIHBhZ2VSZWYsIHZv aWQqIGNvbnRleHQsIFdLUGFnZUdldENvbnRlbnRzQXNTdHJpbmdGdW5jdGlvbiBjYWxsYmFjaykK IHsKLSAgICB0b0ltcGwocGFnZVJlZiktPmdldENvbnRlbnRzQXNTdHJpbmcoU3RyaW5nQ2FsbGJh Y2s6OmNyZWF0ZSh0b0dlbmVyaWNDYWxsYmFja0Z1bmN0aW9uPFdLU3RyaW5nUmVmLCBTdHJpbmdJ bXBsKj4oY29udGV4dCwgY2FsbGJhY2spKSk7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5nZXRDb250 ZW50c0FzU3RyaW5nKFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUodG9HZW5lcmljQ2FsbGJhY2tGdW5j dGlvbihjb250ZXh0LCBjYWxsYmFjaykpKTsKIH0KIAogdm9pZCBXS1BhZ2VHZXRCeXRlY29kZVBy b2ZpbGUoV0tQYWdlUmVmIHBhZ2VSZWYsIHZvaWQqIGNvbnRleHQsIFdLUGFnZUdldEJ5dGVjb2Rl UHJvZmlsZUZ1bmN0aW9uIGNhbGxiYWNrKQogewotICAgIHRvSW1wbChwYWdlUmVmKS0+Z2V0Qnl0 ZWNvZGVQcm9maWxlKFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUodG9HZW5lcmljQ2FsbGJhY2tGdW5j dGlvbjxXS1N0cmluZ1JlZiwgU3RyaW5nSW1wbCo+KGNvbnRleHQsIGNhbGxiYWNrKSkpOworICAg IHRvSW1wbChwYWdlUmVmKS0+Z2V0Qnl0ZWNvZGVQcm9maWxlKFN0cmluZ0NhbGxiYWNrOjpjcmVh dGUodG9HZW5lcmljQ2FsbGJhY2tGdW5jdGlvbihjb250ZXh0LCBjYWxsYmFjaykpKTsKIH0KIAog dm9pZCBXS1BhZ2VHZXRTZWxlY3Rpb25Bc1dlYkFyY2hpdmVEYXRhKFdLUGFnZVJlZiBwYWdlUmVm LCB2b2lkKiBjb250ZXh0LCBXS1BhZ2VHZXRTZWxlY3Rpb25Bc1dlYkFyY2hpdmVEYXRhRnVuY3Rp b24gY2FsbGJhY2spCkBAIC0xNjUzLDggKzE2NjAsOCBAQCBXS1N0cmluZ1JlZiBXS1BhZ2VDb3B5 U3RhbmRhcmRVc2VyQWdlbnRXCiAKIHZvaWQgV0tQYWdlVmFsaWRhdGVDb21tYW5kKFdLUGFnZVJl ZiBwYWdlUmVmLCBXS1N0cmluZ1JlZiBjb21tYW5kLCB2b2lkKiBjb250ZXh0LCBXS1BhZ2VWYWxp ZGF0ZUNvbW1hbmRDYWxsYmFjayBjYWxsYmFjaykKIHsKLSAgICB0b0ltcGwocGFnZVJlZiktPnZh bGlkYXRlQ29tbWFuZCh0b0ltcGwoY29tbWFuZCktPnN0cmluZygpLCBWYWxpZGF0ZUNvbW1hbmRD YWxsYmFjazo6Y3JlYXRlKFtjb250ZXh0LCBjYWxsYmFja10oU3RyaW5nSW1wbCogY29tbWFuZE5h bWUsIGJvb2wgaXNFbmFibGVkLCBpbnQzMl90IHN0YXRlLCBDYWxsYmFja0Jhc2U6OkVycm9yIGVy cm9yKSB7Ci0gICAgICAgIGNhbGxiYWNrKHRvQVBJKGNvbW1hbmROYW1lKSwgaXNFbmFibGVkLCBz dGF0ZSwgZXJyb3IgIT0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSA/IHRvQVBJKEFQSTo6RXJy b3I6OmNyZWF0ZSgpLmdldCgpKSA6IDAsIGNvbnRleHQpOworICAgIHRvSW1wbChwYWdlUmVmKS0+ dmFsaWRhdGVDb21tYW5kKHRvSW1wbChjb21tYW5kKS0+c3RyaW5nKCksIFZhbGlkYXRlQ29tbWFu ZENhbGxiYWNrOjpjcmVhdGUoW2NvbnRleHQsIGNhbGxiYWNrXShjb25zdCBTdHJpbmcmIGNvbW1h bmROYW1lLCBib29sIGlzRW5hYmxlZCwgaW50MzJfdCBzdGF0ZSwgQ2FsbGJhY2tCYXNlOjpFcnJv ciBlcnJvcikgeworICAgICAgICBjYWxsYmFjayh0b0FQSShBUEk6OlN0cmluZzo6Y3JlYXRlKGNv bW1hbmROYW1lKS5nZXQoKSksIGlzRW5hYmxlZCwgc3RhdGUsIGVycm9yICE9IENhbGxiYWNrQmFz ZTo6RXJyb3I6Ok5vbmUgPyB0b0FQSShBUEk6OkVycm9yOjpjcmVhdGUoKS5nZXQoKSkgOiAwLCBj b250ZXh0KTsKICAgICB9KSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS1ZpZXcubW0JKHJldmlzaW9uIDE2OTk4NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtODM1LDEyICs4MzUs MTIgQEAgLSAoQk9PTCl2YWxpZGF0ZVVzZXJJbnRlcmZhY2VJdGVtOihpZCA8TgogICAgICAgICAv LyBJZiB3ZSBhcmUgbm90IGFscmVhZHkgYXdhaXRpbmcgdmFsaWRhdGlvbiBmb3IgdGhpcyBjb21t YW5kLCBzdGFydCB0aGUgYXN5bmNocm9ub3VzIHZhbGlkYXRpb24gcHJvY2Vzcy4KICAgICAgICAg Ly8gRklYTUU6IFRoZW9yZXRpY2FsbHksIHRoZXJlIGlzIGEgcmFjZSBoZXJlOyB3aGVuIHdlIGdl dCB0aGUgYW5zd2VyIGl0IG1pZ2h0IGJlIG9sZCwgZnJvbSBhIHByZXZpb3VzIHRpbWUKICAgICAg ICAgLy8gd2UgYXNrZWQgZm9yIHRoZSBzYW1lIGNvbW1hbmQ7IHRoZXJlIGlzIG5vIGd1YXJhbnRl ZSB0aGUgYW5zd2VyIGlzIHN0aWxsIHZhbGlkLgotICAgICAgICBfZGF0YS0+X3BhZ2UtPnZhbGlk YXRlQ29tbWFuZChjb21tYW5kTmFtZSwgVmFsaWRhdGVDb21tYW5kQ2FsbGJhY2s6OmNyZWF0ZShb c2VsZl0oU3RyaW5nSW1wbCogY29tbWFuZE5hbWUsIGJvb2wgaXNFbmFibGVkLCBpbnQzMl90IHN0 YXRlLCBDYWxsYmFja0Jhc2U6OkVycm9yIGVycm9yKSB7CisgICAgICAgIF9kYXRhLT5fcGFnZS0+ dmFsaWRhdGVDb21tYW5kKGNvbW1hbmROYW1lLCBWYWxpZGF0ZUNvbW1hbmRDYWxsYmFjazo6Y3Jl YXRlKFtzZWxmXShjb25zdCBTdHJpbmcmIGNvbW1hbmROYW1lLCBib29sIGlzRW5hYmxlZCwgaW50 MzJfdCBzdGF0ZSwgQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgewogICAgICAgICAgICAgLy8g SWYgdGhlIHByb2Nlc3MgZXhpdHMgYmVmb3JlIHRoZSBjb21tYW5kIGNhbiBiZSB2YWxpZGF0ZWQs IHdlJ2xsIGJlIGNhbGxlZCBiYWNrIHdpdGggYW4gZXJyb3IuCiAgICAgICAgICAgICBpZiAoZXJy b3IgIT0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkKICAgICAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIFtzZWxmIF9zZXRVc2VySW50ZXJmYWNlSXRlbVN0 YXRlOm5zU3RyaW5nRnJvbVdlYkNvcmVTdHJpbmcoY29tbWFuZE5hbWUpIGVuYWJsZWQ6aXNFbmFi bGVkIHN0YXRlOnN0YXRlXTsKKyAgICAgICAgICAgIFtzZWxmIF9zZXRVc2VySW50ZXJmYWNlSXRl bVN0YXRlOmNvbW1hbmROYW1lIGVuYWJsZWQ6aXNFbmFibGVkIHN0YXRlOnN0YXRlXTsKICAgICAg ICAgfSkpOwogICAgIH0KIApAQCAtODUyLDEzICs4NTIsMTMgQEAgLSAoQk9PTCl2YWxpZGF0ZVVz ZXJJbnRlcmZhY2VJdGVtOihpZCA8TgogCiAtIChJQkFjdGlvbilzdGFydFNwZWFraW5nOihpZClz ZW5kZXIKIHsKLSAgICBfZGF0YS0+X3BhZ2UtPmdldFNlbGVjdGlvbk9yQ29udGVudHNBc1N0cmlu ZyhTdHJpbmdDYWxsYmFjazo6Y3JlYXRlKFtzZWxmXShTdHJpbmdJbXBsKiBzdHJpbmcsIENhbGxi YWNrQmFzZTo6RXJyb3IgZXJyb3IpIHsKKyAgICBfZGF0YS0+X3BhZ2UtPmdldFNlbGVjdGlvbk9y Q29udGVudHNBc1N0cmluZyhTdHJpbmdDYWxsYmFjazo6Y3JlYXRlKFtzZWxmXShjb25zdCBTdHJp bmcmIHN0cmluZywgQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgewogICAgICAgICBpZiAoZXJy b3IgIT0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6Tm9uZSkKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgaWYgKCFzdHJpbmcpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgW05TQXBw IHNwZWFrU3RyaW5nOipzdHJpbmddOworICAgICAgICBbTlNBcHAgc3BlYWtTdHJpbmc6c3RyaW5n XTsKICAgICB9KSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAxNjk5ODYp CisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQkod29ya2luZyBjb3B5KQpAQCAtMTIxMCwxNCArMTIxMCwxMyBAQCAtICh2b2lkKV9zaG93 RGljdGlvbmFyeTooTlNTdHJpbmcgKil0ZXh0CiAKIC0gKHZvaWQpX2RlZmluZTooaWQpc2VuZGVy CiB7Ci0gICAgX3BhZ2UtPmdldFNlbGVjdGlvbk9yQ29udGVudHNBc1N0cmluZyhTdHJpbmdDYWxs YmFjazo6Y3JlYXRlKFtzZWxmXShTdHJpbmdJbXBsKiBzdHJpbmcsIENhbGxiYWNrQmFzZTo6RXJy b3IgZXJyb3IpIHsKKyAgICBfcGFnZS0+Z2V0U2VsZWN0aW9uT3JDb250ZW50c0FzU3RyaW5nKFN0 cmluZ0NhbGxiYWNrOjpjcmVhdGUoW3NlbGZdKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBDYWxsYmFj a0Jhc2U6OkVycm9yIGVycm9yKSB7CiAgICAgICAgIGlmIChlcnJvciAhPSBDYWxsYmFja0Jhc2U6 OkVycm9yOjpOb25lKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBpZiAoIXN0cmluZykK ICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBOU1N0cmluZyAqY29udmVydGVkU3RyaW5n ID0gKnN0cmluZzsKLSAgICAgICAgW3NlbGYgX3Nob3dEaWN0aW9uYXJ5OmNvbnZlcnRlZFN0cmlu Z107CisgICAgICAgIFtzZWxmIF9zaG93RGljdGlvbmFyeTpzdHJpbmddOwogICAgIH0pKTsKIH0K IApAQCAtMTU1Nyw4ICsxNTU2LDggQEAgLSAodm9pZClhcHBseUF1dG9jb3JyZWN0aW9uOihOU1N0 cmluZyAqKQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIF9hdXRvY29ycmVjdGlvbkRhdGEu YXV0b2NvcnJlY3Rpb25IYW5kbGVyID0gW2NvbXBsZXRpb25IYW5kbGVyIGNvcHldOwotICAgIF9w YWdlLT5hcHBseUF1dG9jb3JyZWN0aW9uKGNvcnJlY3Rpb24sIGlucHV0LCBTdHJpbmdDYWxsYmFj azo6Y3JlYXRlKFtzZWxmXShTdHJpbmdJbXBsKiBzdHJpbmcsIENhbGxiYWNrQmFzZTo6RXJyb3Ig ZXJyb3IpIHsKLSAgICAgICAgX2F1dG9jb3JyZWN0aW9uRGF0YS5hdXRvY29ycmVjdGlvbkhhbmRs ZXIoc3RyaW5nID8gW1dLQXV0b2NvcnJlY3Rpb25SZWN0cyBhdXRvY29ycmVjdGlvblJlY3RzV2l0 aFJlY3RzOl9hdXRvY29ycmVjdGlvbkRhdGEudGV4dEZpcnN0UmVjdCBsYXN0UmVjdDpfYXV0b2Nv cnJlY3Rpb25EYXRhLnRleHRMYXN0UmVjdF0gOiBuaWwpOworICAgIF9wYWdlLT5hcHBseUF1dG9j b3JyZWN0aW9uKGNvcnJlY3Rpb24sIGlucHV0LCBTdHJpbmdDYWxsYmFjazo6Y3JlYXRlKFtzZWxm XShjb25zdCBTdHJpbmcmIHN0cmluZywgQ2FsbGJhY2tCYXNlOjpFcnJvciBlcnJvcikgeworICAg ICAgICBfYXV0b2NvcnJlY3Rpb25EYXRhLmF1dG9jb3JyZWN0aW9uSGFuZGxlcighc3RyaW5nLmlz TnVsbCgpID8gW1dLQXV0b2NvcnJlY3Rpb25SZWN0cyBhdXRvY29ycmVjdGlvblJlY3RzV2l0aFJl Y3RzOl9hdXRvY29ycmVjdGlvbkRhdGEudGV4dEZpcnN0UmVjdCBsYXN0UmVjdDpfYXV0b2NvcnJl Y3Rpb25EYXRhLnRleHRMYXN0UmVjdF0gOiBuaWwpOwogICAgICAgICBbX2F1dG9jb3JyZWN0aW9u RGF0YS5hdXRvY29ycmVjdGlvbkhhbmRsZXIgcmVsZWFzZV07CiAgICAgICAgIF9hdXRvY29ycmVj dGlvbkRhdGEuYXV0b2NvcnJlY3Rpb25IYW5kbGVyID0gbmlsOwogICAgIH0pKTsK