117570 2013-06-12 17:18:16 -0700 Remove the notion of inactive plug-ins 2013-06-12 17:34:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue esprehn+autocc glenn oldest_to_newest 899875 0 andersca 2013-06-12 17:18:16 -0700 Remove the notion of inactive plug-ins 899878 1 204549 andersca 2013-06-12 17:23:36 -0700 Created attachment 204549 Patch 899880 2 204549 thorton 2013-06-12 17:29:56 -0700 Comment on attachment 204549 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204549&action=review > Source/WebCore/ChangeLog:30 > +2013-06-12 Anders Carlsson <andersca@apple.com> > + > + > + Reviewed by NOBODY (OOPS!). > + > + Remove > + > + * platform/LocalizedStrings.cpp: > + * platform/LocalizedStrings.h: > + * rendering/RenderEmbeddedObject.cpp: > + (WebCore::unavailablePluginReplacementText): > + * rendering/RenderEmbeddedObject.h: > + duplicated change log or something. 899882 3 andersca 2013-06-12 17:34:51 -0700 Committed r151530: <http://trac.webkit.org/changeset/151530> 204549 2013-06-12 17:23:36 -0700 2013-06-12 17:29:56 -0700 Patch bug-117570-20130612172213.patch text/plain 20854 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJhNzA5ZTJkMWY2OGEw ZmU2Y2FhNDM4MGM2ZWIxODFkMTJmM2YzMi4uYWVjNThjYzFiNDhmMmM2YzJmYWM2OTU0YWFjZDQ0 OGM3YzUyMDM4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEzLTA2LTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBu b3Rpb24gb2YgaW5hY3RpdmUgcGx1Zy1pbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNzU3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM0ODQy MTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVt b3ZlIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5JbmFjdGl2ZSBhbmQgdGhlIHJlcGxhY2Vt ZW50IHRleHQuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6 CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5jcHA6CisgICAgICAgICogcGxh dGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJl ZGRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1bmF2YWlsYWJsZVBsdWdpblJlcGxh Y2VtZW50VGV4dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0Lmg6 CisKKzIwMTMtMDYtMTIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSAK KworICAgICAgICAqIHBsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwOgorICAgICAgICAqIHBs YXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRW1i ZWRkZWRPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dW5hdmFpbGFibGVQbHVnaW5SZXBs YWNlbWVudFRleHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5o OgorCiAyMDEzLTA2LTEyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIEFjY2Vzc2liaWxpdHkgY29kZSBhc3N1bWVzIGFuIGFyZWEgZWxlbWVudCdzIHBhcmVudCBp cyBhIG1hcCBlbGVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggOTUxMTJjMGQ4NDc2OWM3OWNkMzNi ZWRiZWU5OGFiY2Q4MWU5OTRlNi4uMTA0ODIwOTI3YjUyMzlhOTVmOWI0ZDM5OTZiOTBkYTRlMDhk M2Y3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA2LTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRoZSBu b3Rpb24gb2YgaW5hY3RpdmUgcGx1Zy1pbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNzU3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM0ODQy MTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVt b3ZlIGNvZGUgdGhhdCBkZWFscyB3aXRoIGluYWN0aXZlIHBsdWctaW5zLgorCisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tOgorICAgICAgICAoV2ViQ2hyb21lQ2xp ZW50OjpzaG91bGRVbmF2YWlsYWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRvbik6CisgICAgICAgIChX ZWJDaHJvbWVDbGllbnQ6OnVuYXZhaWxhYmxlUGx1Z2luQnV0dG9uQ2xpY2tlZCk6CisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJG cmFtZUxvYWRlckNsaWVudDo6Y3JlYXRlUGx1Z2luKToKKwogMjAxMy0wNi0xMiAgWmFuIERvYmVy c2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIG1lbW9yeUluZm9F bmFibGVkLCBxdWFudGl6ZWRNZW1vcnlJbmZvRW5hYmxlZCBzZXR0aW5ncwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IDg4MDQ0YTM4NTY3ODlmMzU4YzE1NmJjZmIzNWMzOWU2NTMzNzk4ZDMuLjY3Nzc4ZjBiOTNmZjEz NjMxNmU3N2FlNjkyNWYwNDhiNmM0ZmQ5MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAor MjAxMy0wNi0xMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFJlbW92ZSB0aGUgbm90aW9uIG9mIGluYWN0aXZlIHBsdWctaW5zCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc1NzAKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzEzNDg0MjEzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlbW92ZSBjb2RlIHRoYXQgZGVhbHMgd2l0aCBpbmFjdGl2ZSBwbHVnLWlu cy4gV2Ugc3RpbGwga2VlcCBhcm91bmQgdGhlIGtXS1BsdWdpbkxvYWRQb2xpY3lJbmFjdGl2ZSBB UEkgZW51bSBmb3Igbm93LgorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvUGx1Z2luTW9kdWxl SW5mby5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaDoKKyAgICAgICAg KFdlYktpdDo6dG9XS1BsdWdpbkxvYWRQb2xpY3kpOgorICAgICAgICAoV2ViS2l0Ojp0b1BsdWdp bk1vZHVsZUxvYWRQb2xpY3kpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbklu Zm9TdG9yZS5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3Jl Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5t bToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpzaG91bGRVc2VQbHVnaW4pOgor ICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OmRlZmF1bHRMb2FkUG9saWN5Rm9yUGx1 Z2luKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpmaW5kUGx1Z2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5Ojp1bmF2YWlsYWJsZVBsdWdpbkJ1dHRvbkNsaWNrZWQpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViQ2hyb21lQ2xpZW50OjpzaG91bGRVbmF2YWlsYWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRv bik6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6dW5hdmFpbGFibGVQbHVnaW5C dXR0b25DbGlja2VkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNyZWF0ZVBsdWdpbik6CisKIDIwMTMtMDYtMTIg IFJ1dGggRm9uZyAgPHJ1dGhfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cgZm9yIHRv Z2dsaW5nIGZ1bGxzY3JlZW4gb24gPHZpZGVvPiBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IDU1M2IwZDdkMWM4YmFk ODNmYzYwYTkyODg0Y2ZlYjY3NmI0YWQyMTIuLjMxNmNhZmE1YTczMGQxM2JmNThmZWVmNmUxZGM2 ZjIzYmIzODgxMzMgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgMTgKYWNtWjIqbFg9VF48 XyN5IUNmbXpzWk42YFFhMD51ZDd6cSNuCgpkZWx0YSAxNDIKemNtZG1Ub3E1NGM8XyN5IUNnJXQx T3dNJGNpT3loMVdHSDQoVjh+PDBYRDkqRU5lcm4jbTxNRiMwN1ZpUlFoPlleCnpBVEpIYkQrMUVS S3NweUZyVHxvKDMxdys5PXJlRkpDXjJ7Zl4oOFZTZ0pzR1hRWVVZNG1nWXduSjBUQE0qPE1DIwpK XkpsWXpUTDhSS0JCS0JSCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9j YWxpemVkU3RyaW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJp bmdzLmNwcAppbmRleCBlZmE4N2E5MTYwZTg3YTdjOWNkZWZmNzg2NWZkYzJhNDYxN2M0YmZlLi5j NjFhYWM3NjI5YmMyNmQwZjM3MTZjM2JkZmU4ODQwMTkzMmU4NTBiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmNwcApAQCAtNzA0LDExICs3MDQsNiBAQCBT dHJpbmcgaW5zZWN1cmVQbHVnaW5WZXJzaW9uVGV4dCgpCiAgICAgcmV0dXJuIFdFQl9VSV9TVFJJ TkdfS0VZKCJCbG9ja2VkIFBsdWctaW4iLCAiQmxvY2tlZCBQbHVnLUluIChJbnNlY3VyZSBwbHVn LWluKSIsICJMYWJlbCB0ZXh0IHRvIGJlIHVzZWQgd2hlbiBhbiBpbnNlY3VyZSBwbHVnLWluIHZl cnNpb24gd2FzIGJsb2NrZWQgZnJvbSBsb2FkaW5nIik7CiB9CiAKLVN0cmluZyBpbmFjdGl2ZVBs dWdpblRleHQoKQotewotICAgIHJldHVybiBXRUJfVUlfU1RSSU5HKCJJbmFjdGl2ZSBQbHVnLWlu IiwgIkxhYmVsIHRleHQgdG8gYmUgdXNlZCB3aGVuIGEgcGx1Z2luIGhhcyBub3QgYmVlbiBsb2Fk ZWQgZm9yIHNvbWUgdGltZSIpOwotfQotCiBTdHJpbmcgbXVsdGlwbGVGaWxlVXBsb2FkVGV4dCh1 bnNpZ25lZCBudW1iZXJPZkZpbGVzKQogewogICAgIHJldHVybiBmb3JtYXRMb2NhbGl6ZWRTdHJp bmcoV0VCX1VJX1NUUklORygiJWQgZmlsZXMiLCAiTGFiZWwgdG8gZGVzY3JpYmUgdGhlIG51bWJl ciBvZiBmaWxlcyBzZWxlY3RlZCBpbiBhIGZpbGUgdXBsb2FkIGNvbnRyb2wgdGhhdCBhbGxvd3Mg bXVsdGlwbGUgZmlsZXMiKSwgbnVtYmVyT2ZGaWxlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9Mb2NhbGl6ZWRTdHJpbmdzLmgKaW5kZXggZTc4ZGI5YmZkNzdhZWJjNTAwMmVhYmQxYjVmNmM3 YTkxNjk0MGIyZC4uOTA0N2ExNWNlNDI5Yjc4NGVkOWI5ZmNhMGY5ZmQ0ODM3ZmFiZGEyZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaApAQCAtMTgyLDcgKzE4 Miw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBTdHJpbmcgY3Jhc2hlZFBsdWdpblRleHQo KTsKICAgICBTdHJpbmcgYmxvY2tlZFBsdWdpbkJ5Q29udGVudFNlY3VyaXR5UG9saWN5VGV4dCgp OwogICAgIFN0cmluZyBpbnNlY3VyZVBsdWdpblZlcnNpb25UZXh0KCk7Ci0gICAgU3RyaW5nIGlu YWN0aXZlUGx1Z2luVGV4dCgpOwogCiAgICAgU3RyaW5nIG11bHRpcGxlRmlsZVVwbG9hZFRleHQo dW5zaWduZWQgbnVtYmVyT2ZGaWxlcyk7CiAgICAgU3RyaW5nIHVua25vd25GaWxlU2l6ZVRleHQo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3Qu Y3BwCmluZGV4IGY5MTk2N2Y0OWUyMjAyYmU2M2EyMzk3NzY3NWNjZmY0ZTU4ZTY4NWEuLmU5ZjBm N2VkZmM3NzYzZjI2NjNkNTVmNDRkNzY5MWRkYWUwZDFkZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcApAQCAtMTIxLDggKzEyMSw2 IEBAIHN0YXRpYyBTdHJpbmcgdW5hdmFpbGFibGVQbHVnaW5SZXBsYWNlbWVudFRleHQoUmVuZGVy RW1iZWRkZWRPYmplY3Q6OlBsdWdpblVuYXZhCiAgICAgICAgIHJldHVybiBibG9ja2VkUGx1Z2lu QnlDb250ZW50U2VjdXJpdHlQb2xpY3lUZXh0KCk7CiAgICAgY2FzZSBSZW5kZXJFbWJlZGRlZE9i amVjdDo6SW5zZWN1cmVQbHVnaW5WZXJzaW9uOgogICAgICAgICByZXR1cm4gaW5zZWN1cmVQbHVn aW5WZXJzaW9uVGV4dCgpOwotICAgIGNhc2UgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbklu YWN0aXZlOgotICAgICAgICByZXR1cm4gaW5hY3RpdmVQbHVnaW5UZXh0KCk7CiAgICAgfQogCiAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJFbWJlZGRlZE9iamVjdC5oCmluZGV4IDMwYjJiZTQ5MTcyOTRlZjc2MTNlNDZhYzU0MjFj NDgyYTczZTY1MTAuLjkxZTQ0ZDViYzQ2MzRjMGIzODY2ZjdjODZhOTNkY2M5ZTk3YzQ0ODUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5oCkBA IC00Miw3ICs0Miw2IEBAIHB1YmxpYzoKICAgICAgICAgUGx1Z2luQ3Jhc2hlZCwKICAgICAgICAg UGx1Z2luQmxvY2tlZEJ5Q29udGVudFNlY3VyaXR5UG9saWN5LAogICAgICAgICBJbnNlY3VyZVBs dWdpblZlcnNpb24sCi0gICAgICAgIFBsdWdpbkluYWN0aXZlLAogICAgIH07CiAgICAgdm9pZCBz ZXRQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbihQbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbik7 CiAgICAgYm9vbCBzaG93c1VuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yKCkgY29uc3Q7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQu bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQubW0K aW5kZXggY2ZiZGJjNjNmOWVlMmIwMGRmMDAyN2IxMWIyODU3MzdiM2Y3NDRiNi4uZjI2YjRjMmJh ZDc1ODNjMzJkZGQ0NWFkYmM4YjJiMDkxYTJlZmJkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbQpAQCAtNTg4LDkgKzU4OCw2 IEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpzY3JvbGxSZWN0SW50b1ZpZXcoY29uc3QgSW50UmVj dCYgcikgY29uc3QKIAogYm9vbCBXZWJDaHJvbWVDbGllbnQ6OnNob3VsZFVuYXZhaWxhYmxlUGx1 Z2luTWVzc2FnZUJlQnV0dG9uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5VbmF2YWlsYWJp bGl0eVJlYXNvbiBwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3QKIHsKLSAgICBpZiAo cGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdp bkluYWN0aXZlKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQogICAgIGlmIChwbHVnaW5VbmF2YWls YWJpbGl0eVJlYXNvbiA9PSBSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1Z2luTWlzc2luZykKICAg ICAgICAgcmV0dXJuIFtbbV93ZWJWaWV3IFVJRGVsZWdhdGVdIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3Iod2ViVmlldzpkaWRQcmVzc01pc3NpbmdQbHVnaW5CdXR0b246KV07CiAKQEAgLTYw MSwyOCArNTk4LDcgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnVuYXZhaWxhYmxlUGx1Z2luQnV0 dG9uQ2xpY2tlZChFbGVtZW50KiBlbGVtZW50LCBSZW5kZXJFbWIKIHsKICAgICBBU1NFUlQoZWxl bWVudC0+aGFzVGFnTmFtZShvYmplY3RUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoZW1iZWRU YWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoYXBwbGV0VGFnKSk7CiAKLSAgICBpZiAocGx1Z2lu VW5hdmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbkluYWN0 aXZlKSB7Ci0gICAgICAgIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIHBsdWdpbkVsZW1lbnQgPSBz dGF0aWNfY2FzdDxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Kj4oZWxlbWVudCk7Ci0KLSAgICAgICAg V2ViQmFzZVBsdWdpblBhY2thZ2UgKnBsdWdpblBhY2thZ2UgPSBuaWw7Ci0gICAgICAgIGlmICgh cGx1Z2luRWxlbWVudC0+c2VydmljZVR5cGUoKS5pc0VtcHR5KCkpCi0gICAgICAgICAgICBwbHVn aW5QYWNrYWdlID0gW21fd2ViVmlldyBfcGx1Z2luRm9yTUlNRVR5cGU6cGx1Z2luRWxlbWVudC0+ c2VydmljZVR5cGUoKV07Ci0KLSAgICAgICAgTlNVUkwgKnVybCA9IHBsdWdpbkVsZW1lbnQtPmRv Y3VtZW50KCktPmNvbXBsZXRlVVJMKHBsdWdpbkVsZW1lbnQtPnVybCgpKTsKLSAgICAgICAgTlNT dHJpbmcgKmV4dGVuc2lvbiA9IFtbdXJsIHBhdGhdIHBhdGhFeHRlbnNpb25dOwotICAgICAgICBp ZiAoIXBsdWdpblBhY2thZ2UgJiYgW2V4dGVuc2lvbiBsZW5ndGhdKQotICAgICAgICAgICAgcGx1 Z2luUGFja2FnZSA9IFttX3dlYlZpZXcgX3BsdWdpbkZvckV4dGVuc2lvbjpleHRlbnNpb25dOwot Ci0gICAgICAgIGlmIChwbHVnaW5QYWNrYWdlICYmIFtwbHVnaW5QYWNrYWdlIGJ1bmRsZUlkZW50 aWZpZXJdID09ICJjb20ub3JhY2xlLmphdmEuSmF2YUFwcGxldFBsdWdpbiIpIHsKLSAgICAgICAg ICAgIC8vIFJlYWN0aXZhdGUgdGhlIHBsdWctaW4gYW5kIHJlbG9hZCB0aGUgcGFnZSBzbyB0aGUg cGx1Zy1pbiB3aWxsIGJlIGluc3RhbnRpYXRlZCBjb3JyZWN0bHkuCi0gICAgICAgICAgICBXS0Fj dGl2YXRlSmF2YVBsdWdJbigpOwotICAgICAgICAgICAgW21fd2ViVmlldyByZWxvYWQ6bmlsXTsK LSAgICAgICAgfQotCi0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBBU1NFUlQocGx1Z2lu VW5hdmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1pc3Np bmcgfHwgcGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6 OlBsdWdpbkluYWN0aXZlKTsKKyAgICBBU1NFUlQocGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24g PT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1pc3NpbmcpOwogICAgIENhbGxVSURlbGVn YXRlKG1fd2ViVmlldywgQHNlbGVjdG9yKHdlYlZpZXc6ZGlkUHJlc3NNaXNzaW5nUGx1Z2luQnV0 dG9uOiksIGtpdChlbGVtZW50KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KaW5kZXggZTM0ZjkyNDJj NWUxZDVhMjk5ODNiOTc3ZDk5MjE3YWYxMWNlYjkxOS4uNWZjZWIzNTVlMGY1NjdlYjJhMWNiYTY0 MDMyNTU2MDQ1YWJmNzcwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAgLTE2NDUsMTkgKzE2NDUsNiBA QCBwcml2YXRlOgogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAKLXN0 YXRpYyBib29sIGlzT3JhY2xlSmF2YVBsdWdJbihOU1N0cmluZyAqYnVuZGxlSWRlbnRpZmllcikK LXsKLSAgICByZXR1cm4gW2J1bmRsZUlkZW50aWZpZXIgaXNFcXVhbFRvU3RyaW5nOkAiY29tLm9y YWNsZS5qYXZhLkphdmFBcHBsZXRQbHVnaW4iXTsKLX0KLQotc3RhdGljIGJvb2wgaXNQbHVnSW5J bmFjdGl2ZShOU1N0cmluZyAqYnVuZGxlSWRlbnRpZmllcikKLXsKLSAgICBpZiAoaXNPcmFjbGVK YXZhUGx1Z0luKGJ1bmRsZUlkZW50aWZpZXIpICYmICFXS0lzSmF2YVBsdWdJbkFjdGl2ZSgpKQot ICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogUGFzc1JlZlB0 cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6 ZSYgc2l6ZSwgSFRNTFBsdWdJbkVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEtVUkwmIHVybCwKICAg ICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFN0cmluZz4m IHBhcmFtVmFsdWVzLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBib29sIGxvYWRNYW51YWxseSkK IHsKQEAgLTE3MzMsMTAgKzE3MjAsNiBAQCBQYXNzUmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmNyZWF0ZVBsdWdpbihjb25zdCBJbnRTaXplJiBzaXplLCBIVE1MUAogICAgICAg ICAgICAgZXJyb3JDb2RlID0gV2ViS2l0RXJyb3JCbG9ja2VkUGx1Z0luVmVyc2lvbjsKICAgICAg ICAgICAgIGlmIChlbGVtZW50LT5yZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkpCiAgICAg ICAgICAgICAgICAgdG9SZW5kZXJFbWJlZGRlZE9iamVjdChlbGVtZW50LT5yZW5kZXJlcigpKS0+ c2V0UGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24oUmVuZGVyRW1iZWRkZWRPYmplY3Q6Okluc2Vj dXJlUGx1Z2luVmVyc2lvbik7Ci0gICAgICAgIH0gZWxzZSBpZiAoaXNQbHVnSW5JbmFjdGl2ZShb cGx1Z2luUGFja2FnZSBidW5kbGVJZGVudGlmaWVyXSkpIHsKLSAgICAgICAgICAgIGlmIChlbGVt ZW50LT5yZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkpCi0gICAgICAgICAgICAgICAgdG9S ZW5kZXJFbWJlZGRlZE9iamVjdChlbGVtZW50LT5yZW5kZXJlcigpKS0+c2V0UGx1Z2luVW5hdmFp bGFiaWxpdHlSZWFzb24oUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbkluYWN0aXZlKTsKLSAg ICAgICAgICAgIHJldHVybiAwOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaWYgKFtw bHVnaW5QYWNrYWdlIGlzS2luZE9mQ2xhc3M6W1dlYlBsdWdpblBhY2thZ2UgY2xhc3NdXSkKICAg ICAgICAgICAgICAgICB2aWV3ID0gcGx1Z2luVmlldyhtX3dlYkZyYW1lLmdldCgpLCAoV2ViUGx1 Z2luUGFja2FnZSAqKXBsdWdpblBhY2thZ2UsIGF0dHJpYnV0ZUtleXMsIGtpdChwYXJhbVZhbHVl cyksIGJhc2VVUkwsIGtpdChlbGVtZW50KSwgbG9hZE1hbnVhbGx5KTsKQEAgLTE4NDAsMTAgKzE4 MjMsNiBAQCBQYXNzUmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUph dmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6ZSYgcwogICAgICAgICAgICAgZXJyb3JDb2RlID0g V2ViS2l0RXJyb3JCbG9ja2VkUGx1Z0luVmVyc2lvbjsKICAgICAgICAgICAgIGlmIChlbGVtZW50 LT5yZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkpCiAgICAgICAgICAgICAgICAgdG9SZW5k ZXJFbWJlZGRlZE9iamVjdChlbGVtZW50LT5yZW5kZXJlcigpKS0+c2V0UGx1Z2luVW5hdmFpbGFi aWxpdHlSZWFzb24oUmVuZGVyRW1iZWRkZWRPYmplY3Q6Okluc2VjdXJlUGx1Z2luVmVyc2lvbik7 Ci0gICAgICAgIH0gZWxzZSBpZiAoaXNQbHVnSW5JbmFjdGl2ZShbcGx1Z2luUGFja2FnZSBidW5k bGVJZGVudGlmaWVyXSkpIHsKLSAgICAgICAgICAgIGlmIChlbGVtZW50LT5yZW5kZXJlcigpLT5p c0VtYmVkZGVkT2JqZWN0KCkpCi0gICAgICAgICAgICAgICAgdG9SZW5kZXJFbWJlZGRlZE9iamVj dChlbGVtZW50LT5yZW5kZXJlcigpKS0+c2V0UGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24oUmVu ZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbkluYWN0aXZlKTsKLSAgICAgICAgICAgIHJldHVybiAw OwogICAgICAgICB9IGVsc2UgewogICAgICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkK ICAgICAgICAgICAgIGlmIChbcGx1Z2luUGFja2FnZSBpc0tpbmRPZkNsYXNzOltXZWJOZXRzY2Fw ZVBsdWdpblBhY2thZ2UgY2xhc3NdXSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvUGx1Z2luTW9kdWxlSW5mby5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Bs dWdpbnMvUGx1Z2luTW9kdWxlSW5mby5oCmluZGV4IGI0MTUyNDUzNzE2ZDc2MWM5OWVkM2M2MmQw NzBiMjc4YTU4ZDE0OGIuLjljMzBlNmRhZDYwZmQ2MTJlZThiMzMwNThjNWU5NjNhMWMyNDAzNGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL1BsdWdpbk1vZHVsZUlu Zm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9QbHVnaW5Nb2R1bGVJbmZv LmgKQEAgLTQ0LDkgKzQ0LDYgQEAgZW51bSBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IHsKICAgICAv LyBUaGUgcGx1Zy1pbiBzaG91bGQgYmUgYmxvY2tlZCBmcm9tIGJlaW5nIGluc3RhbnRpYXRlZC4K ICAgICAvLyBOb3RlIHRoYXQgdGhlIHBsdWctaW4gd2lsbCBzdGlsbCBiZSBzZWVuIGJ5IGUuZy4g bmF2aWdhdG9yLnBsdWdpbnMKICAgICBQbHVnaW5Nb2R1bGVCbG9ja2VkLAotCi0gICAgLy8gVGhl IHBsdWctaW4gbW9kdWxlIGlzIGluYWN0aXZlIGFuZCBzaG91bGQgbm90IGJlIGluc3RhbnRpYXRl ZCB1bmxlc3MgdGhlIHVzZXIgZXhwbGljaXRseSBhbGxvd3MgaXQuCi0gICAgUGx1Z2luTW9kdWxl SW5hY3RpdmUKIH07CiAKIHN0cnVjdCBQbHVnaW5Nb2R1bGVJbmZvIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaAppbmRleCA2NGMzNzk5Njg4NWQyMzJiZWYwYTJk ODhiMTlmOGM4NGQ1YjExNTFmLi40MDg2NTZjNzU3ZGE4ZmVjYmQ3NDE3ODQ0M2Y0NzliNjVjNTRi Mzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tBUElDYXN0 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQVBJQ2FzdC5oCkBAIC00 MTQsOCArNDE0LDYgQEAgaW5saW5lIFdLUGx1Z2luTG9hZFBvbGljeSB0b1dLUGx1Z2luTG9hZFBv bGljeShQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IHBsdWdpbk1vZHUKICAgICAgICAgcmV0dXJuIGtX S1BsdWdpbkxvYWRQb2xpY3lMb2FkVW5zYW5kYm94ZWQ7CiAgICAgY2FzZSBQbHVnaW5Nb2R1bGVC bG9ja2VkOgogICAgICAgICByZXR1cm4ga1dLUGx1Z2luTG9hZFBvbGljeUJsb2NrZWQ7Ci0gICAg Y2FzZSBQbHVnaW5Nb2R1bGVJbmFjdGl2ZToKLSAgICAgICAgcmV0dXJuIGtXS1BsdWdpbkxvYWRQ b2xpY3lJbmFjdGl2ZTsKICAgICB9CiAgICAgCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBA IC00MjksOCArNDI3LDYgQEAgaW5saW5lIFBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgdG9QbHVnaW5N b2R1bGVMb2FkUG9saWN5KFdLUGx1Z2luTG9hZFBvbGljeSBwbHVnaW4KICAgICAgICAgcmV0dXJu IFBsdWdpbk1vZHVsZUxvYWROb3JtYWxseTsKICAgICBjYXNlIGtXS1BsdWdpbkxvYWRQb2xpY3lC bG9ja2VkOgogICAgICAgICByZXR1cm4gUGx1Z2luTW9kdWxlQmxvY2tlZDsKLSAgICBjYXNlIGtX S1BsdWdpbkxvYWRQb2xpY3lJbmFjdGl2ZToKLSAgICAgICAgcmV0dXJuIFBsdWdpbk1vZHVsZUlu YWN0aXZlOwogICAgIGNhc2Uga1dLUGx1Z2luTG9hZFBvbGljeUxvYWRVbnNhbmRib3hlZDoKICAg ICAgICAgcmV0dXJuIFBsdWdpbk1vZHVsZUxvYWRVbnNhbmRib3hlZDsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcApp bmRleCA5MGFmM2E0MDE3NTg2NmY4NTJkOTA4OTAyNDA4YzdiNjYxMDFiMzczLi5hZTk1YTBiNjg3 ZjgxYzg2OWY5ZDY4MjZiMTJmYWU1ZTk3ZGI0NmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5jcHAKQEAgLTE4NiwxMSArMTg2 LDYgQEAgUGx1Z2luTW9kdWxlTG9hZFBvbGljeSBQbHVnaW5JbmZvU3RvcmU6OmRlZmF1bHRMb2Fk UG9saWN5Rm9yUGx1Z2luKGNvbnN0IFBsdWdpbk0KICAgICByZXR1cm4gUGx1Z2luTW9kdWxlTG9h ZE5vcm1hbGx5OwogfQogCi1ib29sIFBsdWdpbkluZm9TdG9yZTo6cmVhY3RpdmF0ZUluYWN0aXZl UGx1Z2luKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mKQotewotICAgIHJldHVybiBmYWxzZTsKLX0K LQogU3RyaW5nIFBsdWdpbkluZm9TdG9yZTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNpb24oY29uc3Qg U3RyaW5nJiBleHRlbnNpb24pCiB7CiAgICAgcmV0dXJuIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1J TUVUeXBlRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oCmluZGV4IDZlMTQ0Y2RlYzM4MjEyODZm ZjdlM2EyM2JiZTQ2NzliZmRiNTJhYjQuLmM0OWNlYTdiOWFiMWQ4N2JhYjcxZTYzM2E1OThmYWIx ZGUxMDQ2YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbkluZm9TdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbkluZm9TdG9yZS5oCkBAIC03Miw3ICs3Miw2IEBAIHB1YmxpYzoKICAgICBQbHVnaW5Nb2R1 bGVJbmZvIGluZm9Gb3JQbHVnaW5XaXRoUGF0aChjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgpIGNv bnN0OwogCiAgICAgc3RhdGljIFBsdWdpbk1vZHVsZUxvYWRQb2xpY3kgZGVmYXVsdExvYWRQb2xp Y3lGb3JQbHVnaW4oY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYpOwotICAgIHN0YXRpYyBib29sIHJl YWN0aXZhdGVJbmFjdGl2ZVBsdWdpbihjb25zdCBQbHVnaW5Nb2R1bGVJbmZvJik7CiAKICAgICB2 b2lkIHNldENsaWVudChQbHVnaW5JbmZvU3RvcmVDbGllbnQqIGNsaWVudCkgeyBtX2NsaWVudCA9 IGNsaWVudDsgfQogICAgIFBsdWdpbkluZm9TdG9yZUNsaWVudCogY2xpZW50KCkgY29uc3QgeyBy ZXR1cm4gbV9jbGllbnQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q bHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUGx1Z2lucy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tCmluZGV4IDVmYmVhYjI3YjE1NzU5 OWI4NjU4OGQ3MzkxNjA0NDVkNWMxY2I3NTkuLjYxMzY3YzUxYmZkYmMyNTIwODA0YjQ0MzFkNjkx ZjExZWViNjE5YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQpAQCAtMTMyLDExICsxMzIsNiBAQCBi b29sIFBsdWdpbkluZm9TdG9yZTo6c2hvdWxkVXNlUGx1Z2luKFZlY3RvcjxQbHVnaW5Nb2R1bGVJ bmZvPiYgYWxyZWFkeUxvYWRlZFBsdQogICAgIGlmICghY2hlY2tGb3JQcmVmZXJyZWRQbHVnaW4o YWxyZWFkeUxvYWRlZFBsdWdpbnMsIHBsdWdpbiwgImNvbS5hcHBsZS5qYXZhLkphdmFBcHBsZXRQ bHVnaW4iLCAgb3JhY2xlSmF2YUFwcGxldFBsdWdpbkJ1bmRsZUlkZW50aWZpZXIpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAocGx1Z2luLmJ1bmRsZUlkZW50aWZpZXIgPT0gImNv bS5hcHBsZS5qYXZhLkphdmFBcHBsZXRQbHVnaW4iICYmIHNob3VsZEJsb2NrUGx1Z2luKHBsdWdp bikgJiYgIVdLSXNKYXZhUGx1Z0luQWN0aXZlKCkpIHsKLSAgICAgICAgLy8gSWYgdGhlIEFwcGxl IEphdmEgcGx1Zy1pbiBpcyBibG9ja2VkIGFuZCB0aGVyZSdzIG5vIEphdmEgcnVudGltZSBpbnN0 YWxsZWQsIGp1c3QgcHJldGVuZCB0aGF0IHRoZSBwbHVnLWluIGRvZXNuJ3QgZXhpc3QuCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTQ1 LDIyICsxNDAsOSBAQCBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IFBsdWdpbkluZm9TdG9yZTo6ZGVm YXVsdExvYWRQb2xpY3lGb3JQbHVnaW4oY29uc3QgUGx1Z2luTQogICAgIGlmIChXS1Nob3VsZEJs b2NrUGx1Z2luKHBsdWdpbi5idW5kbGVJZGVudGlmaWVyLCBwbHVnaW4udmVyc2lvblN0cmluZykp CiAgICAgICAgIHJldHVybiBQbHVnaW5Nb2R1bGVCbG9ja2VkOwogCi0gICAgaWYgKHBsdWdpbi5i dW5kbGVJZGVudGlmaWVyID09IG9yYWNsZUphdmFBcHBsZXRQbHVnaW5CdW5kbGVJZGVudGlmaWVy ICYmICFXS0lzSmF2YVBsdWdJbkFjdGl2ZSgpKQotICAgICAgICByZXR1cm4gUGx1Z2luTW9kdWxl SW5hY3RpdmU7Ci0KICAgICByZXR1cm4gUGx1Z2luTW9kdWxlTG9hZE5vcm1hbGx5OwogfQogCi1i b29sIFBsdWdpbkluZm9TdG9yZTo6cmVhY3RpdmF0ZUluYWN0aXZlUGx1Z2luKGNvbnN0IFBsdWdp bk1vZHVsZUluZm8mIHBsdWdpbikKLXsKLSAgICBpZiAocGx1Z2luLmJ1bmRsZUlkZW50aWZpZXIg PT0gb3JhY2xlSmF2YUFwcGxldFBsdWdpbkJ1bmRsZUlkZW50aWZpZXIpIHsKLSAgICAgICAgV0tB Y3RpdmF0ZUphdmFQbHVnSW4oKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCi0gICAg cmV0dXJuIGZhbHNlOwotfQotCiBTdHJpbmcgUGx1Z2luSW5mb1N0b3JlOjpnZXRNSU1FVHlwZUZv ckV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbikKIHsKICAgICAvLyBGSVhNRTogVGhp cyBzaG91bGQganVzdCBjYWxsIE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5z aW9uIGFuZCBiZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRl eCBjYzEyN2Q3NTI1ZDEwNmQxZjUxZmY1YTczY2Y0MGNlMDZlODUzMjdlLi5lOTJjZDhhOTljMDU4 MzFmOGUzNzc4YjBjM2U1MjhhNDk4MGIxYjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcApAQCAtMTQzOSw3ICsxNDM5LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmZpbmRQbHVnaW4oY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgdWludDMyX3QgcHJvY2Vzc1R5cGUs IGNvbnMKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFBsdWdpbk1vZHVsZUJsb2NrZWQ6Ci0g ICAgY2FzZSBQbHVnaW5Nb2R1bGVJbmFjdGl2ZToKICAgICAgICAgcGx1Z2luUHJvY2Vzc1Rva2Vu ID0gMDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI3NjEsMTcgKzI3NjAsNiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2VkKHVpbnQzMl90IG9w YXF1ZVBsdWdpblVuYXZhaWxhYgogICAgIGNhc2UgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdp bkNyYXNoZWQ6CiAgICAgICAgIHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uID0ga1dLUGx1Z2lu VW5hdmFpbGFiaWxpdHlSZWFzb25QbHVnaW5DcmFzaGVkOwogICAgICAgICBicmVhazsKLQotICAg IGNhc2UgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbkluYWN0aXZlOiB7Ci0jaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgICAgIGlmICghcGx1Z2luLnBhdGguaXNFbXB0eSgp ICYmIFBsdWdpbkluZm9TdG9yZTo6cmVhY3RpdmF0ZUluYWN0aXZlUGx1Z2luKHBsdWdpbikpIHsK LSAgICAgICAgICAgIC8vIFRoZSBwbHVnLWluIGhhcyBiZWVuIHJlYWN0aXZhdGVkIG5vdzsgcmVs b2FkIHRoZSBwYWdlIHNvIGl0J2xsIGJlIGluc3RhbnRpYXRlZC4KLSAgICAgICAgICAgIHJlbG9h ZChmYWxzZSk7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuOwotI2VuZGlmCi0gICAgfQotCiAg ICAgY2FzZSBSZW5kZXJFbWJlZGRlZE9iamVjdDo6UGx1Z2luQmxvY2tlZEJ5Q29udGVudFNlY3Vy aXR5UG9saWN5OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNo cm9tZUNsaWVudC5jcHAKaW5kZXggZWY1NTkzMGVlOWJiMDI2NGMzN2VmMzk3MDdhODdkNTM1MDk2 MGYwYS4uMDk4NThhZWZmOTc5MzUxZTQzMTVjM2Q3NjFhNDY5OTAxNjY3NmM4NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi Q2hyb21lQ2xpZW50LmNwcApAQCAtNTEyLDcgKzUxMiw2IEBAIGJvb2wgV2ViQ2hyb21lQ2xpZW50 OjpzaG91bGRVbmF2YWlsYWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRvbihSZW5kZXJFbWJlZGRlZE9i amVjCiAgICAgICAgIC8vIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vODc5NDM5Nz4gV2Ugc2hvdWxk IG9ubHkgcmV0dXJuIHRydWUgd2hlbiB0aGVyZSBpcyBhCiAgICAgICAgIC8vIG1pc3NpbmdQbHVn aW5CdXR0b25DbGlja2VkIGNhbGxiYWNrIGRlZmluZWQgb24gdGhlIFBhZ2UgVUkgY2xpZW50Lgog ICAgIGNhc2UgUmVuZGVyRW1iZWRkZWRPYmplY3Q6Okluc2VjdXJlUGx1Z2luVmVyc2lvbjoKLSAg ICBjYXNlIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5JbmFjdGl2ZToKICAgICAgICAgcmV0 dXJuIHRydWU7CiAKIApAQCAtNTI4LDcgKzUyNyw3IEBAIGJvb2wgV2ViQ2hyb21lQ2xpZW50Ojpz aG91bGRVbmF2YWlsYWJsZVBsdWdpbk1lc3NhZ2VCZUJ1dHRvbihSZW5kZXJFbWJlZGRlZE9iamVj CiB2b2lkIFdlYkNocm9tZUNsaWVudDo6dW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2VkKEVs ZW1lbnQqIGVsZW1lbnQsIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5VbmF2YWlsYWJpbGl0 eVJlYXNvbiBwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbikgY29uc3QKIHsKICAgICBBU1NFUlQo ZWxlbWVudC0+aGFzVGFnTmFtZShvYmplY3RUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoZW1i ZWRUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoYXBwbGV0VGFnKSk7Ci0gICAgQVNTRVJUKHBs dWdpblVuYXZhaWxhYmlsaXR5UmVhc29uID09IFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5N aXNzaW5nIHx8IHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uID09IFJlbmRlckVtYmVkZGVkT2Jq ZWN0OjpJbnNlY3VyZVBsdWdpblZlcnNpb24gfHwgcGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24g PT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbkluYWN0aXZlKTsKKyAgICBBU1NFUlQocGx1 Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmplY3Q6OlBsdWdpbk1p c3NpbmcgfHwgcGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24gPT0gUmVuZGVyRW1iZWRkZWRPYmpl Y3Q6Okluc2VjdXJlUGx1Z2luVmVyc2lvbiB8fCBwbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbik7 CiAKICAgICBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50KiBwbHVnaW5FbGVtZW50ID0gc3RhdGljX2Nh c3Q8SFRNTFBsdWdJbkltYWdlRWxlbWVudCo+KGVsZW1lbnQpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMTE2OTdlODViNDA4NGQyNGNm MzdlMGMwNzIyOGJhMzYyYTg5ZjRlYS4uZDA3MGI0NzM4ODJjZjAwZmIyMjBlY2M5MTJhYTlhMWI1 YzUwZTJmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcApAQCAtNTU1LDExICs1NTUsNiBAQCBQYXNzUmVmUHRyPFBsdWdpbj4gV2ViUGFnZTo6Y3Jl YXRlUGx1Z2luKFdlYkZyYW1lKiBmcmFtZSwgSFRNTFBsdWdJbkVsZW1lbnQqIHBsdQogCiAgICAg ICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkQmxvY2tJbnNlY3VyZVBsdWdpblZl cnNpb24ocGFyYW1ldGVycy5taW1lVHlwZSwgcGFyYW1ldGVycy51cmwuc3RyaW5nKCksIGZyYW1l VVJMU3RyaW5nLCBwYWdlVVJMU3RyaW5nKSk7CiAgICAgICAgIHJldHVybiAwOwotCi0gICAgY2Fz ZSBQbHVnaW5Nb2R1bGVJbmFjdGl2ZToKLSAgICAgICAgaWYgKHBsdWdpbkVsZW1lbnQtPnJlbmRl cmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSkKLSAgICAgICAgICAgIHRvUmVuZGVyRW1iZWRkZWRP YmplY3QocGx1Z2luRWxlbWVudC0+cmVuZGVyZXIoKSktPnNldFBsdWdpblVuYXZhaWxhYmlsaXR5 UmVhc29uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5JbmFjdGl2ZSk7Ci0gICAgICAgIHJl dHVybiAwOwogICAgIH0KIAogICAgIGlmICghcGx1Z2luUHJvY2Vzc1Rva2VuKSB7Cg==