118848 2013-07-18 06:20:52 -0700 Use [ImplementedAs] instead of special casing in the bindings generators 2013-07-18 07:23:39 -0700 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 cdumez cdumez commit-queue darin d-r esprehn+autocc fmalita haraken laszlo.gombos pdr rniwa schenney oldest_to_newest 909728 0 cdumez 2013-07-18 06:20:52 -0700 In several instances, special casing is used in the bindings generator to avoid name clashes in the implementation. The [ImplementedBy] IDL extended attribute is meant to solve this issue so we should use it instead. Corresponding Blink revisions: https://src.chromium.org/viewvc/blink?revision=154303&view=revision https://src.chromium.org/viewvc/blink?revision=154309&view=revision https://src.chromium.org/viewvc/blink?revision=154341&view=revision 909732 1 206987 cdumez 2013-07-18 06:24:11 -0700 Created attachment 206987 Patch 909733 2 206987 haraken 2013-07-18 06:29:55 -0700 Comment on attachment 206987 Patch Looks like a good refactoring. 909744 3 206987 commit-queue 2013-07-18 07:23:37 -0700 Comment on attachment 206987 Patch Clearing flags on attachment: 206987 Committed r152844: <http://trac.webkit.org/changeset/152844> 909745 4 commit-queue 2013-07-18 07:23:39 -0700 All reviewed patches have been landed. Closing bug. 206987 2013-07-18 06:24:11 -0700 2013-07-18 07:23:37 -0700 Patch bug-118848-20130718162409.patch text/plain 19342 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDE2NTgxYjZkYmQyYjhj OThhNmQyN2FlNzc0NTBhZDUzMzE5NTQyNC4uMDRlYTEwMmJjNzkxMGVmODQxOTY1YTI5N2QwY2E2 NTY0NDQ2ZGRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDEzLTA3LTE4ICBDaHJp c3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBVc2Ug W0ltcGxlbWVudGVkQXNdIGluc3RlYWQgb2Ygc3BlY2lhbCBjYXNpbmcgaW4gdGhlIGJpbmRpbmdz IGdlbmVyYXRvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExODg0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEluIHNldmVyYWwgaW5zdGFuY2VzLCBzcGVjaWFsIGNhc2luZyB3ZXJlIHVzZWQgaW4gdGhl IGJpbmRpbmdzIGdlbmVyYXRvciB0byBhdm9pZAorICAgICAgICBuYW1lIGNsYXNoZXMgaW4gdGhl IGltcGxlbWVudGF0aW9uLiBUaGUgW0ltcGxlbWVudGVkQnldIElETCBleHRlbmRlZCBhdHRyaWJ1 dGUgaXMKKyAgICAgICAgbWVhbnQgdG8gc29sdmUgdGhpcyBpc3N1ZSBzbyB3ZSBub3cgdXNlIGl0 IGluc3RlYWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisK KyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG06CisgICAgICAgIChX S191Y2ZpcnN0KToKKyAgICAgICAgKEF0dHJpYnV0ZU5hbWVGb3JHZXR0ZXJBbmRTZXR0ZXIpOgor ICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAo R2VuZXJhdGVJbXBsZW1lbnRhdGlvbik6CisgICAgICAgIChOYXRpdmVUb0pTVmFsdWUpOgorICAg ICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG06CisgICAgICAgIChH ZW5lcmF0ZUhlYWRlcik6CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKyAgICAg ICAgKiBzdmcvU1ZHQUVsZW1lbnQuaWRsOgorICAgICAgICAqIHN2Zy9TVkdGRUNvbXBvc2l0ZUVs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRkVDb21wb3NpdGVFbGVtZW50OjpTVkdG RUNvbXBvc2l0ZUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRkVDb21wb3NpdGVFbGVt ZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdGRUNvbXBvc2l0ZUVs ZW1lbnQ6OnNldEZpbHRlckVmZmVjdEF0dHJpYnV0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTVkdG RUNvbXBvc2l0ZUVsZW1lbnQ6OmJ1aWxkKToKKyAgICAgICAgKiBzdmcvU1ZHRkVDb21wb3NpdGVF bGVtZW50Lmg6CisgICAgICAgICogc3ZnL1NWR0ZFQ29tcG9zaXRlRWxlbWVudC5pZGw6CisgICAg ICAgICogc3ZnL1NWR0ZFTW9ycGhvbG9neUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1ZHRkVNb3JwaG9sb2d5RWxlbWVudDo6U1ZHRkVNb3JwaG9sb2d5RWxlbWVudCk6CisgICAgICAg IChXZWJDb3JlOjpTVkdGRU1vcnBob2xvZ3lFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTVkdGRU1vcnBob2xvZ3lFbGVtZW50OjpzZXRGaWx0ZXJFZmZlY3RBdHRy aWJ1dGUpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRkVNb3JwaG9sb2d5RWxlbWVudDo6YnVpbGQp OgorICAgICAgICAqIHN2Zy9TVkdGRU1vcnBob2xvZ3lFbGVtZW50Lmg6CisgICAgICAgICogc3Zn L1NWR0ZFTW9ycGhvbG9neUVsZW1lbnQuaWRsOgorICAgICAgICAqIHN2Zy9TVkdUcmFuc2Zvcm0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHVHJhbnNmb3JtOjp1cGRhdGVTVkdNYXRyaXgpOgor ICAgICAgICAqIHN2Zy9TVkdUcmFuc2Zvcm0uaDoKKyAgICAgICAgKiBzdmcvU1ZHVHJhbnNmb3Jt LmlkbDoKKwogMjAxMy0wNy0xOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIEluY29ycmVjdCBjYWxjdWxhdGVkIHdpZHRoIGZvciBtc3BhY2UuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0gYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KaW5kZXggNjg4MjBl YTIyZGEzODEwZDcyNmEyM2E1YWNkNWYyYzkxNjczZTZmNC4uNjFkMWNlYTExMWViMWQyYjQyZGYw NGIwNzZkN2Q2MjQ1NDZmOGEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvci5wbQpAQCAtNDY2LDYgKzQ2Niw3IEBAIHN1YiBXS191Y2ZpcnN0 CiAgICAgbXkgKCRvYmplY3QsICRwYXJhbSkgPSBAXzsKICAgICBteSAkcmV0ID0gdWNmaXJzdCgk cGFyYW0pOwogICAgICRyZXQgPX4gcy9YbWwvWE1MLyBpZiAkcmV0ID1+IC9eWG1sW15hLXpdLzsK KyAgICAkcmV0ID1+IHMvU3ZnL1NWRy8gaWYgJHJldCA9fiAvXlN2Zy87CiAKICAgICByZXR1cm4g JHJldDsKIH0KQEAgLTUyNSwxMyArNTI2LDYgQEAgc3ViIEF0dHJpYnV0ZU5hbWVGb3JHZXR0ZXJB bmRTZXR0ZXIKICAgICB9CiAgICAgbXkgJGF0dHJpYnV0ZVR5cGUgPSAkYXR0cmlidXRlLT5zaWdu YXR1cmUtPnR5cGU7CiAKLSAgICAjIEF2b2lkIGNsYXNoIHdpdGggQysrIGtleXdvcmQuCi0gICAg JGF0dHJpYnV0ZU5hbWUgPSAiX29wZXJhdG9yIiBpZiAkYXR0cmlidXRlTmFtZSBlcSAib3BlcmF0 b3IiOwotCi0gICAgIyBTVkdBRWxlbWVudCBkZWZpbmVzIGEgbm9uLXZpcnR1YWwgIlN0cmluZyYg dGFyZ2V0KCkgY29uc3QiIG1ldGhvZCB3aGljaCBjbGFzaGVzIHdpdGggInZpcnR1YWwgU3RyaW5n IHRhcmdldCgpIGNvbnN0IiBpbiBFbGVtZW50LgotICAgICMgVG8gc29sdmUgdGhpcyBpc3N1ZSB0 aGUgU1ZHQUVsZW1lbnQgbWV0aG9kIHdhcyByZW5hbWVkIHRvICJzdmdUYXJnZXQiLCB0YWtlIGNh cmUgb2YgdGhhdCB3aGVuIGNhbGxpbmcgdGhpcyBtZXRob2QuCi0gICAgJGF0dHJpYnV0ZU5hbWUg PSAic3ZnVGFyZ2V0IiBpZiAkYXR0cmlidXRlTmFtZSBlcSAidGFyZ2V0IiBhbmQgJGF0dHJpYnV0 ZVR5cGUgZXEgIlNWR0FuaW1hdGVkU3RyaW5nIjsKLQogICAgICMgU1ZHIGFuaW1hdGVkIHR5cGVz IG5lZWQgdG8gdXNlIGEgc3BlY2lhbCBhdHRyaWJ1dGUgbmFtZS4KICAgICAjIFRoZSByZXN0IG9m IHRoZSBzcGVjaWFsIGNhc2luZyBmb3IgU1ZHIGFuaW1hdGVkIHR5cGVzIGlzIGhhbmRsZWQgaW4g dGhlIGxhbmd1YWdlLXNwZWNpZmljIGNvZGUgZ2VuZXJhdG9ycy4KICAgICAkYXR0cmlidXRlTmFt ZSAuPSAiQW5pbWF0ZWQiIGlmICRnZW5lcmF0b3ItPklzU1ZHQW5pbWF0ZWRUeXBlKCRhdHRyaWJ1 dGVUeXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29k ZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9ySlMucG0KaW5kZXggYTg0NTU0NzJkM2Q5ODE0MTJlMDhmNmM0MzhhN2EwODAyNmMzNjli MS4uYzFmZDFhMTgwOTRkOGUyYmJjZDU0NzIwYmY2ZGY5ZjVhZjAwNTIyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTE5 OTQsNyArMTk5NCw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgICAgICAgICAg ICAgbXkgJGlzTnVsbGFibGUgPSAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmlzTnVsbGFibGU7CiAg ICAgICAgICAgICAgICAgJGNvZGVHZW5lcmF0b3ItPkFzc2VydE5vdFNlcXVlbmNlVHlwZSgkdHlw ZSk7CiAgICAgICAgICAgICAgICAgbXkgJGdldEZ1bmN0aW9uTmFtZSA9IEdldEF0dHJpYnV0ZUdl dHRlck5hbWUoJGludGVyZmFjZU5hbWUsICRjbGFzc05hbWUsICRhdHRyaWJ1dGUpOwotICAgICAg ICAgICAgICAgIG15ICRpbXBsR2V0dGVyRnVuY3Rpb25OYW1lID0gJGNvZGVHZW5lcmF0b3ItPldL X2xjZmlyc3QoJG5hbWUpOworICAgICAgICAgICAgICAgIG15ICRpbXBsR2V0dGVyRnVuY3Rpb25O YW1lID0gJGNvZGVHZW5lcmF0b3ItPldLX2xjZmlyc3QoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5l eHRlbmRlZEF0dHJpYnV0ZXMtPnsiSW1wbGVtZW50ZWRBcyJ9IHx8ICRuYW1lKTsKIAogICAgICAg ICAgICAgICAgIG15ICRhdHRyaWJ1dGVDb25kaXRpb25hbFN0cmluZyA9ICRjb2RlR2VuZXJhdG9y LT5HZW5lcmF0ZUNvbmRpdGlvbmFsU3RyaW5nKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZSk7CiAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIjaWYgJHthdHRyaWJ1dGVDb25kaXRpb25h bFN0cmluZ31cbiIpIGlmICRhdHRyaWJ1dGVDb25kaXRpb25hbFN0cmluZzsKQEAgLTM2NDEsMTIg KzM2NDEsNiBAQCBzdWIgTmF0aXZlVG9KU1ZhbHVlCiAgICAgICAgICAgICAgICAgQWRkVG9JbXBs SW5jbHVkZXMoIlNWR1N0YXRpY1Byb3BlcnR5V2l0aFBhcmVudFRlYXJPZmYuaCIsICRjb25kaXRp b25hbCk7CiAgICAgICAgICAgICAgICAgJHRlYXJPZmZUeXBlID1+IHMvU1ZHUHJvcGVydHlUZWFy T2ZmPC9TVkdTdGF0aWNQcm9wZXJ0eVdpdGhQYXJlbnRUZWFyT2ZmPCRpbnRlcmZhY2VOYW1lLCAv OwogCi0gICAgICAgICAgICAgICAgaWYgKCR2YWx1ZSA9fiAvbWF0cml4LyBhbmQgJGludGVyZmFj ZU5hbWUgZXEgIlNWR1RyYW5zZm9ybSIpIHsKLSAgICAgICAgICAgICAgICAgICAgIyBTVkdUcmFu c2Zvcm0gb2ZmZXJzIGEgbWF0cml4KCkgbWV0aG9kIGZvciBpbnRlcm5hbCB1c2FnZSB0aGF0IHJl dHVybnMgYW4gQWZmaW5lVHJhbnNmb3JtCi0gICAgICAgICAgICAgICAgICAgICMgYW5kIGEgc3Zn TWF0cml4KCkgbWV0aG9kIHJldHVybmluZyBhIFNWR01hdHJpeCwgdXNlZCBmb3IgdGhlIGJpbmRp bmdzLgotICAgICAgICAgICAgICAgICAgICAkdmFsdWUgPX4gcy9tYXRyaXgvc3ZnTWF0cml4LzsK LSAgICAgICAgICAgICAgICB9Ci0KICAgICAgICAgICAgICAgICAkdmFsdWUgPSAiJHt0ZWFyT2Zm VHlwZX06OmNyZWF0ZShjYXN0ZWRUaGlzLT5pbXBsKCksICR2YWx1ZSwgJHVwZGF0ZU1ldGhvZCki OwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRl cygiU1ZHU3RhdGljUHJvcGVydHlUZWFyT2ZmLmgiLCAkY29uZGl0aW9uYWwpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbSBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG0KaW5k ZXggYzQ5OTJjMzA1ZmE5YzhiYmUyNGNlNDBlZDA0YjlkY2MxNDU5ODBiMy4uZjc3NzRkYWRmYTcz ZjhhOTI1NWJkMjJiMDQzMDQwZTk1ODMyMDNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JPYmpDLnBtCkBAIC04NDQsOCArODQ0LDYg QEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAKICAgICAgICAgICAgIG15ICRhdHRyaWJ1dGVUeXBlID0g R2V0T2JqQ1R5cGUoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT50eXBlKTsKICAgICAgICAgICAgIG15 ICRwcm9wZXJ0eSA9ICJcQHByb3BlcnR5IiAuIEdldFByb3BlcnR5QXR0cmlidXRlcygkYXR0cmli dXRlLT5zaWduYXR1cmUtPnR5cGUsICRhdHRyaWJ1dGUtPmlzUmVhZE9ubHkpOwotICAgICAgICAg ICAgIyBTb21lIFNWR0ZFKkVsZW1lbnQuaWRsIHVzZSAnb3BlcmF0b3InIGFzIGF0dHJpYnV0ZSBu YW1lLCByZXdyaXRlIGFzICdfb3BlcmF0b3InIHRvIGF2b2lkIGNsYXNoZXMgd2l0aCBDL0MrKwot ICAgICAgICAgICAgJGF0dHJpYnV0ZU5hbWUgPX4gcy9vcGVyYXRvci9fb3BlcmF0b3IvIGlmICgk YXR0cmlidXRlTmFtZSA9fiAvb3BlcmF0b3IvKTsKICAgICAgICAgICAgICRwcm9wZXJ0eSAuPSAi ICIgLiAkYXR0cmlidXRlVHlwZSAuICgkYXR0cmlidXRlVHlwZSA9fiAvXCokLyA/ICIiIDogIiAi KSAuICRhdHRyaWJ1dGVOYW1lOwogCiAgICAgICAgICAgICBteSAkcHVibGljSW50ZXJmYWNlS2V5 ID0gJHByb3BlcnR5IC4gIjsiOwpAQCAtMTIyOCw5ICsxMjI2LDYgQEAgc3ViIEdlbmVyYXRlSW1w bGVtZW50YXRpb24KICAgICAgICAgICAgIH0gZWxzaWYgKCRhdHRyaWJ1dGVOYW1lIGVxICJmcmFt ZSIpIHsKICAgICAgICAgICAgICAgICAjIFNwZWNpYWwgY2FzZSBhdHRyaWJ1dGUgZnJhbWUgdG8g YmUgZnJhbWVCb3JkZXJzLgogICAgICAgICAgICAgICAgICRhdHRyaWJ1dGVJbnRlcmZhY2VOYW1l IC49ICJCb3JkZXJzIjsKLSAgICAgICAgICAgIH0gZWxzaWYgKCRhdHRyaWJ1dGVOYW1lIGVxICJv cGVyYXRvciIpIHsKLSAgICAgICAgICAgICAgICAjIEF2b2lkIGNsYXNoIHdpdGggQysrIGtleXdv cmQuCi0gICAgICAgICAgICAgICAgJGF0dHJpYnV0ZUludGVyZmFjZU5hbWUgPSAiX29wZXJhdG9y IjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgJGF0dHJpYnV0ZU5hbWVzeyRhdHRyaWJ1 dGVJbnRlcmZhY2VOYW1lfSA9IDE7CkBAIC0xMzMwLDEyICsxMzI1LDYgQEAgc3ViIEdlbmVyYXRl SW1wbGVtZW50YXRpb24KICAgICAgICAgICAgICAgICAgICAgICAgICRnZXR0ZXIgPX4gcy9cKC8v OwogICAgICAgICAgICAgICAgICAgICAgICAgbXkgJHVwZGF0ZU1ldGhvZCA9ICImJHtpbXBsQ2xh c3NOYW1lV2l0aE5hbWVzcGFjZX06OnVwZGF0ZSIgLiAkY29kZUdlbmVyYXRvci0+V0tfdWNmaXJz dCgkZ2V0dGVyKTsKIAotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCRnZXR0ZXJDb250ZW50 SGVhZCA9fiAvbWF0cml4LyBhbmQgJGltcGxDbGFzc05hbWUgZXEgIlNWR1RyYW5zZm9ybSIpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIFNWR1RyYW5zZm9ybSBvZmZlcnMgYSBtYXRy aXgoKSBtZXRob2QgZm9yIGludGVybmFsIHVzYWdlIHRoYXQgcmV0dXJucyBhbiBBZmZpbmVUcmFu c2Zvcm0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIGFuZCBhIHN2Z01hdHJpeCgpIG1l dGhvZCByZXR1cm5pbmcgYSBTVkdNYXRyaXgsIHVzZWQgZm9yIHRoZSBiaW5kaW5ncy4KLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAkZ2V0dGVyQ29udGVudEhlYWQgPX4gcy9tYXRyaXgvc3Zn TWF0cml4LzsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgICAgICAg ICAgICAgJGdldHRlckNvbnRlbnRIZWFkID0gIiR7dGVhck9mZlR5cGV9OjpjcmVhdGUoSU1QTCwg JGdldHRlckNvbnRlbnRIZWFkJGdldHRlckNvbnRlbnRUYWlsLCAkdXBkYXRlTWV0aG9kKSI7CiAK ICAgICAgICAgICAgICAgICAgICAgICAgICRnZXR0ZXJDb250ZW50SGVhZCA9ICJraXQoV1RGOjpn ZXRQdHIoJGdldHRlckNvbnRlbnRIZWFkIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdBRWxlbWVudC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQUVsZW1lbnQuaWRsCmlu ZGV4IGUyOWM1M2E3YmMyMTI3ZTcxNTQ0ZGYxNGM5NWE4NjkxODdmMDFlOWEuLmJiYWE2ODkyZGM1 ODllYTQ0YzUzZDJjNzkyN2NlNTFiMDk3NmE2MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdBRWxlbWVudC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0FFbGVtZW50 LmlkbApAQCAtMjYsNyArMjYsNyBAQAogWwogICAgIENvbmRpdGlvbmFsPVNWRwogXSBpbnRlcmZh Y2UgU1ZHQUVsZW1lbnQgOiBTVkdHcmFwaGljc0VsZW1lbnQgewotICAgIHJlYWRvbmx5IGF0dHJp YnV0ZSBTVkdBbmltYXRlZFN0cmluZyB0YXJnZXQ7CisgICAgW0ltcGxlbWVudGVkQXM9c3ZnVGFy Z2V0XSByZWFkb25seSBhdHRyaWJ1dGUgU1ZHQW5pbWF0ZWRTdHJpbmcgdGFyZ2V0OwogfTsKIAog U1ZHQUVsZW1lbnQgaW1wbGVtZW50cyBTVkdFeHRlcm5hbFJlc291cmNlc1JlcXVpcmVkOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZFQ29tcG9zaXRlRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVDb21wb3NpdGVFbGVtZW50LmNwcAppbmRleCAxNGMxZGRh MDk1OTBlOWQwNzA3MGExODRhNDkzZmZlNzE1YjFhZWU2Li5iYWEwOTg0ZjcyZTM1MTJiYmFmMzI1 YjA3NzMxNGE2MjJhZTZiYzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVD b21wb3NpdGVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVDb21wb3Np dGVFbGVtZW50LmNwcApAQCAtMzQsNyArMzQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBB bmltYXRlZCBwcm9wZXJ0eSBkZWZpbml0aW9ucwogREVGSU5FX0FOSU1BVEVEX1NUUklORyhTVkdG RUNvbXBvc2l0ZUVsZW1lbnQsIFNWR05hbWVzOjppbkF0dHIsIEluMSwgaW4xKQogREVGSU5FX0FO SU1BVEVEX1NUUklORyhTVkdGRUNvbXBvc2l0ZUVsZW1lbnQsIFNWR05hbWVzOjppbjJBdHRyLCBJ bjIsIGluMikKLURFRklORV9BTklNQVRFRF9FTlVNRVJBVElPTihTVkdGRUNvbXBvc2l0ZUVsZW1l bnQsIFNWR05hbWVzOjpvcGVyYXRvckF0dHIsIF9vcGVyYXRvciwgX29wZXJhdG9yLCBDb21wb3Np dGVPcGVyYXRpb25UeXBlKQorREVGSU5FX0FOSU1BVEVEX0VOVU1FUkFUSU9OKFNWR0ZFQ29tcG9z aXRlRWxlbWVudCwgU1ZHTmFtZXM6Om9wZXJhdG9yQXR0ciwgU1ZHT3BlcmF0b3IsIHN2Z09wZXJh dG9yLCBDb21wb3NpdGVPcGVyYXRpb25UeXBlKQogREVGSU5FX0FOSU1BVEVEX05VTUJFUihTVkdG RUNvbXBvc2l0ZUVsZW1lbnQsIFNWR05hbWVzOjprMUF0dHIsIEsxLCBrMSkKIERFRklORV9BTklN QVRFRF9OVU1CRVIoU1ZHRkVDb21wb3NpdGVFbGVtZW50LCBTVkdOYW1lczo6azJBdHRyLCBLMiwg azIpCiBERUZJTkVfQU5JTUFURURfTlVNQkVSKFNWR0ZFQ29tcG9zaXRlRWxlbWVudCwgU1ZHTmFt ZXM6OmszQXR0ciwgSzMsIGszKQpAQCAtNDMsNyArNDMsNyBAQCBERUZJTkVfQU5JTUFURURfTlVN QkVSKFNWR0ZFQ29tcG9zaXRlRWxlbWVudCwgU1ZHTmFtZXM6Oms0QXR0ciwgSzQsIGs0KQogQkVH SU5fUkVHSVNURVJfQU5JTUFURURfUFJPUEVSVElFUyhTVkdGRUNvbXBvc2l0ZUVsZW1lbnQpCiAg ICAgUkVHSVNURVJfTE9DQUxfQU5JTUFURURfUFJPUEVSVFkoaW4xKQogICAgIFJFR0lTVEVSX0xP Q0FMX0FOSU1BVEVEX1BST1BFUlRZKGluMikKLSAgICBSRUdJU1RFUl9MT0NBTF9BTklNQVRFRF9Q Uk9QRVJUWShfb3BlcmF0b3IpCisgICAgUkVHSVNURVJfTE9DQUxfQU5JTUFURURfUFJPUEVSVFko c3ZnT3BlcmF0b3IpCiAgICAgUkVHSVNURVJfTE9DQUxfQU5JTUFURURfUFJPUEVSVFkoazEpCiAg ICAgUkVHSVNURVJfTE9DQUxfQU5JTUFURURfUFJPUEVSVFkoazIpCiAgICAgUkVHSVNURVJfTE9D QUxfQU5JTUFURURfUFJPUEVSVFkoazMpCkBAIC01Myw3ICs1Myw3IEBAIEVORF9SRUdJU1RFUl9B TklNQVRFRF9QUk9QRVJUSUVTCiAKIGlubGluZSBTVkdGRUNvbXBvc2l0ZUVsZW1lbnQ6OlNWR0ZF Q29tcG9zaXRlRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWVudCog ZG9jdW1lbnQpCiAgICAgOiBTVkdGaWx0ZXJQcmltaXRpdmVTdGFuZGFyZEF0dHJpYnV0ZXModGFn TmFtZSwgZG9jdW1lbnQpCi0gICAgLCBtX19vcGVyYXRvcihGRUNPTVBPU0lURV9PUEVSQVRPUl9P VkVSKQorICAgICwgbV9zdmdPcGVyYXRvcihGRUNPTVBPU0lURV9PUEVSQVRPUl9PVkVSKQogewog ICAgIEFTU0VSVChoYXNUYWdOYW1lKFNWR05hbWVzOjpmZUNvbXBvc2l0ZVRhZykpOwogICAgIHJl Z2lzdGVyQW5pbWF0ZWRQcm9wZXJ0aWVzRm9yU1ZHRkVDb21wb3NpdGVFbGVtZW50KCk7CkBAIC04 OSw3ICs4OSw3IEBAIHZvaWQgU1ZHRkVDb21wb3NpdGVFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShj b25zdCBRdWFsaWZpZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tCiAgICAgaWYgKG5hbWUgPT0gU1ZH TmFtZXM6Om9wZXJhdG9yQXR0cikgewogICAgICAgICBDb21wb3NpdGVPcGVyYXRpb25UeXBlIHBy b3BlcnR5VmFsdWUgPSBTVkdQcm9wZXJ0eVRyYWl0czxDb21wb3NpdGVPcGVyYXRpb25UeXBlPjo6 ZnJvbVN0cmluZyh2YWx1ZSk7CiAgICAgICAgIGlmIChwcm9wZXJ0eVZhbHVlID4gMCkKLSAgICAg ICAgICAgIHNldF9vcGVyYXRvckJhc2VWYWx1ZShwcm9wZXJ0eVZhbHVlKTsKKyAgICAgICAgICAg IHNldFNWR09wZXJhdG9yQmFzZVZhbHVlKHByb3BlcnR5VmFsdWUpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCkBAIC0xMzAsNyArMTMwLDcgQEAgYm9vbCBTVkdGRUNvbXBvc2l0ZUVsZW1lbnQ6 OnNldEZpbHRlckVmZmVjdEF0dHJpYnV0ZShGaWx0ZXJFZmZlY3QqIGVmZmVjdCwgY29uc3QKIHsK ICAgICBGRUNvbXBvc2l0ZSogY29tcG9zaXRlID0gc3RhdGljX2Nhc3Q8RkVDb21wb3NpdGUqPihl ZmZlY3QpOwogICAgIGlmIChhdHRyTmFtZSA9PSBTVkdOYW1lczo6b3BlcmF0b3JBdHRyKQotICAg ICAgICByZXR1cm4gY29tcG9zaXRlLT5zZXRPcGVyYXRpb24oX29wZXJhdG9yKCkpOworICAgICAg ICByZXR1cm4gY29tcG9zaXRlLT5zZXRPcGVyYXRpb24oc3ZnT3BlcmF0b3IoKSk7CiAgICAgaWYg KGF0dHJOYW1lID09IFNWR05hbWVzOjprMUF0dHIpCiAgICAgICAgIHJldHVybiBjb21wb3NpdGUt PnNldEsxKGsxKCkpOwogICAgIGlmIChhdHRyTmFtZSA9PSBTVkdOYW1lczo6azJBdHRyKQpAQCAt MTc5LDcgKzE3OSw3IEBAIFBhc3NSZWZQdHI8RmlsdGVyRWZmZWN0PiBTVkdGRUNvbXBvc2l0ZUVs ZW1lbnQ6OmJ1aWxkKFNWR0ZpbHRlckJ1aWxkZXIqIGZpbHRlckJ1CiAgICAgaWYgKCFpbnB1dDEg fHwgIWlucHV0MikKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBSZWZQdHI8RmlsdGVyRWZmZWN0 PiBlZmZlY3QgPSBGRUNvbXBvc2l0ZTo6Y3JlYXRlKGZpbHRlciwgX29wZXJhdG9yKCksIGsxKCks IGsyKCksIGszKCksIGs0KCkpOworICAgIFJlZlB0cjxGaWx0ZXJFZmZlY3Q+IGVmZmVjdCA9IEZF Q29tcG9zaXRlOjpjcmVhdGUoZmlsdGVyLCBzdmdPcGVyYXRvcigpLCBrMSgpLCBrMigpLCBrMygp LCBrNCgpKTsKICAgICBGaWx0ZXJFZmZlY3RWZWN0b3ImIGlucHV0RWZmZWN0cyA9IGVmZmVjdC0+ aW5wdXRFZmZlY3RzKCk7CiAgICAgaW5wdXRFZmZlY3RzLnJlc2VydmVDYXBhY2l0eSgyKTsKICAg ICBpbnB1dEVmZmVjdHMuYXBwZW5kKGlucHV0MSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHRkVDb21wb3NpdGVFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVD b21wb3NpdGVFbGVtZW50LmgKaW5kZXggMTBiZmZmOWQ0OTczM2Y1NWNiMjAzNDZhN2I4YmFkYzAw NTZjNmYzYi4uZmI5ZGQwNzFiYjhhYzE4OTI5YjQ2ODg5YzgzY2ZiNGM2ZDE2YmU5MCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZFQ29tcG9zaXRlRWxlbWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdGRUNvbXBvc2l0ZUVsZW1lbnQuaApAQCAtOTAsNyArOTAsNyBA QCBwcml2YXRlOgogICAgIEJFR0lOX0RFQ0xBUkVfQU5JTUFURURfUFJPUEVSVElFUyhTVkdGRUNv bXBvc2l0ZUVsZW1lbnQpCiAgICAgICAgIERFQ0xBUkVfQU5JTUFURURfU1RSSU5HKEluMSwgaW4x KQogICAgICAgICBERUNMQVJFX0FOSU1BVEVEX1NUUklORyhJbjIsIGluMikKLSAgICAgICAgREVD TEFSRV9BTklNQVRFRF9FTlVNRVJBVElPTihfb3BlcmF0b3IsIF9vcGVyYXRvciwgQ29tcG9zaXRl T3BlcmF0aW9uVHlwZSkKKyAgICAgICAgREVDTEFSRV9BTklNQVRFRF9FTlVNRVJBVElPTihTVkdP cGVyYXRvciwgc3ZnT3BlcmF0b3IsIENvbXBvc2l0ZU9wZXJhdGlvblR5cGUpCiAgICAgICAgIERF Q0xBUkVfQU5JTUFURURfTlVNQkVSKEsxLCBrMSkKICAgICAgICAgREVDTEFSRV9BTklNQVRFRF9O VU1CRVIoSzIsIGsyKQogICAgICAgICBERUNMQVJFX0FOSU1BVEVEX05VTUJFUihLMywgazMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVDb21wb3NpdGVFbGVtZW50LmlkbCBi L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGRUNvbXBvc2l0ZUVsZW1lbnQuaWRsCmluZGV4IGZmNDBi NTQ1MDY0MTBjMzljZWQzOGUwMDYxMDBlODQ3OWRjM2I4MTQuLmE2NGNjNDdhYWMwZWUwZjg2MWM5 ZjA4YzJiYmZhYTg2YzAzMDVmMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdG RUNvbXBvc2l0ZUVsZW1lbnQuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGRUNvbXBv c2l0ZUVsZW1lbnQuaWRsCkBAIC0zOCw3ICszOCw3IEBACiAKICAgICByZWFkb25seSBhdHRyaWJ1 dGUgU1ZHQW5pbWF0ZWRTdHJpbmcgICAgICBpbjE7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFNW R0FuaW1hdGVkU3RyaW5nICAgICAgaW4yOwotICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBTVkdBbmlt YXRlZEVudW1lcmF0aW9uIG9wZXJhdG9yOworICAgIFtJbXBsZW1lbnRlZEFzPXN2Z09wZXJhdG9y XSByZWFkb25seSBhdHRyaWJ1dGUgU1ZHQW5pbWF0ZWRFbnVtZXJhdGlvbiBvcGVyYXRvcjsKICAg ICByZWFkb25seSBhdHRyaWJ1dGUgU1ZHQW5pbWF0ZWROdW1iZXIgICAgICBrMTsKICAgICByZWFk b25seSBhdHRyaWJ1dGUgU1ZHQW5pbWF0ZWROdW1iZXIgICAgICBrMjsKICAgICByZWFkb25seSBh dHRyaWJ1dGUgU1ZHQW5pbWF0ZWROdW1iZXIgICAgICBrMzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdGRU1vcnBob2xvZ3lFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdGRU1vcnBob2xvZ3lFbGVtZW50LmNwcAppbmRleCBkNzQ0NDc4MTJhMzFjOWU4Y2EwMGEz MzNhMTdhZmViOWYzM2UwODRiLi4wYWI1MzkxNDZlZTkwM2M5NzJkYWY0ZGU2MDdhZTU1OGFmYjJj N2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVNb3JwaG9sb2d5RWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZFTW9ycGhvbG9neUVsZW1lbnQuY3Bw CkBAIC0zMywxMyArMzMsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAvLyBBbmltYXRlZCBw cm9wZXJ0eSBkZWZpbml0aW9ucwogREVGSU5FX0FOSU1BVEVEX1NUUklORyhTVkdGRU1vcnBob2xv Z3lFbGVtZW50LCBTVkdOYW1lczo6aW5BdHRyLCBJbjEsIGluMSkKLURFRklORV9BTklNQVRFRF9F TlVNRVJBVElPTihTVkdGRU1vcnBob2xvZ3lFbGVtZW50LCBTVkdOYW1lczo6b3BlcmF0b3JBdHRy LCBfb3BlcmF0b3IsIF9vcGVyYXRvciwgTW9ycGhvbG9neU9wZXJhdG9yVHlwZSkKK0RFRklORV9B TklNQVRFRF9FTlVNRVJBVElPTihTVkdGRU1vcnBob2xvZ3lFbGVtZW50LCBTVkdOYW1lczo6b3Bl cmF0b3JBdHRyLCBTVkdPcGVyYXRvciwgc3ZnT3BlcmF0b3IsIE1vcnBob2xvZ3lPcGVyYXRvclR5 cGUpCiBERUZJTkVfQU5JTUFURURfTlVNQkVSX01VTFRJUExFX1dSQVBQRVJTKFNWR0ZFTW9ycGhv bG9neUVsZW1lbnQsIFNWR05hbWVzOjpyYWRpdXNBdHRyLCByYWRpdXNYSWRlbnRpZmllcigpLCBS YWRpdXNYLCByYWRpdXNYKQogREVGSU5FX0FOSU1BVEVEX05VTUJFUl9NVUxUSVBMRV9XUkFQUEVS UyhTVkdGRU1vcnBob2xvZ3lFbGVtZW50LCBTVkdOYW1lczo6cmFkaXVzQXR0ciwgcmFkaXVzWUlk ZW50aWZpZXIoKSwgUmFkaXVzWSwgcmFkaXVzWSkKIAogQkVHSU5fUkVHSVNURVJfQU5JTUFURURf UFJPUEVSVElFUyhTVkdGRU1vcnBob2xvZ3lFbGVtZW50KQogICAgIFJFR0lTVEVSX0xPQ0FMX0FO SU1BVEVEX1BST1BFUlRZKGluMSkKLSAgICBSRUdJU1RFUl9MT0NBTF9BTklNQVRFRF9QUk9QRVJU WShfb3BlcmF0b3IpCisgICAgUkVHSVNURVJfTE9DQUxfQU5JTUFURURfUFJPUEVSVFkoc3ZnT3Bl cmF0b3IpCiAgICAgUkVHSVNURVJfTE9DQUxfQU5JTUFURURfUFJPUEVSVFkocmFkaXVzWCkKICAg ICBSRUdJU1RFUl9MT0NBTF9BTklNQVRFRF9QUk9QRVJUWShyYWRpdXNZKQogICAgIFJFR0lTVEVS X1BBUkVOVF9BTklNQVRFRF9QUk9QRVJUSUVTKFNWR0ZpbHRlclByaW1pdGl2ZVN0YW5kYXJkQXR0 cmlidXRlcykKQEAgLTQ3LDcgKzQ3LDcgQEAgRU5EX1JFR0lTVEVSX0FOSU1BVEVEX1BST1BFUlRJ RVMKIAogaW5saW5lIFNWR0ZFTW9ycGhvbG9neUVsZW1lbnQ6OlNWR0ZFTW9ycGhvbG9neUVsZW1l bnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQqIGRvY3VtZW50KQogICAg IDogU1ZHRmlsdGVyUHJpbWl0aXZlU3RhbmRhcmRBdHRyaWJ1dGVzKHRhZ05hbWUsIGRvY3VtZW50 KQotICAgICwgbV9fb3BlcmF0b3IoRkVNT1JQSE9MT0dZX09QRVJBVE9SX0VST0RFKQorICAgICwg bV9zdmdPcGVyYXRvcihGRU1PUlBIT0xPR1lfT1BFUkFUT1JfRVJPREUpCiB7CiAgICAgQVNTRVJU KGhhc1RhZ05hbWUoU1ZHTmFtZXM6OmZlTW9ycGhvbG9neVRhZykpOwogICAgIHJlZ2lzdGVyQW5p bWF0ZWRQcm9wZXJ0aWVzRm9yU1ZHRkVNb3JwaG9sb2d5RWxlbWVudCgpOwpAQCAtOTgsNyArOTgs NyBAQCB2b2lkIFNWR0ZFTW9ycGhvbG9neUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGNvbnN0IFF1 YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0bwogICAgIGlmIChuYW1lID09IFNWR05hbWVzOjpv cGVyYXRvckF0dHIpIHsKICAgICAgICAgTW9ycGhvbG9neU9wZXJhdG9yVHlwZSBwcm9wZXJ0eVZh bHVlID0gU1ZHUHJvcGVydHlUcmFpdHM8TW9ycGhvbG9neU9wZXJhdG9yVHlwZT46OmZyb21TdHJp bmcodmFsdWUpOwogICAgICAgICBpZiAocHJvcGVydHlWYWx1ZSA+IDApCi0gICAgICAgICAgICBz ZXRfb3BlcmF0b3JCYXNlVmFsdWUocHJvcGVydHlWYWx1ZSk7CisgICAgICAgICAgICBzZXRTVkdP cGVyYXRvckJhc2VWYWx1ZShwcm9wZXJ0eVZhbHVlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K IApAQCAtMTIzLDcgKzEyMyw3IEBAIGJvb2wgU1ZHRkVNb3JwaG9sb2d5RWxlbWVudDo6c2V0Rmls dGVyRWZmZWN0QXR0cmlidXRlKEZpbHRlckVmZmVjdCogZWZmZWN0LCBjb25zCiB7CiAgICAgRkVN b3JwaG9sb2d5KiBtb3JwaG9sb2d5ID0gc3RhdGljX2Nhc3Q8RkVNb3JwaG9sb2d5Kj4oZWZmZWN0 KTsKICAgICBpZiAoYXR0ck5hbWUgPT0gU1ZHTmFtZXM6Om9wZXJhdG9yQXR0cikKLSAgICAgICAg cmV0dXJuIG1vcnBob2xvZ3ktPnNldE1vcnBob2xvZ3lPcGVyYXRvcihfb3BlcmF0b3IoKSk7Cisg ICAgICAgIHJldHVybiBtb3JwaG9sb2d5LT5zZXRNb3JwaG9sb2d5T3BlcmF0b3Ioc3ZnT3BlcmF0 b3IoKSk7CiAgICAgaWYgKGF0dHJOYW1lID09IFNWR05hbWVzOjpyYWRpdXNBdHRyKSB7CiAgICAg ICAgIC8vIEJvdGggc2V0UmFkaXVzIGZ1bmN0aW9ucyBzaG91bGQgYmUgZXZhbHVhdGVkIHNlcGFy YXRlbHkuCiAgICAgICAgIGJvb2wgaXNSYWRpdXNYQ2hhbmdlZCA9IG1vcnBob2xvZ3ktPnNldFJh ZGl1c1gocmFkaXVzWCgpKTsKQEAgLTE2OSw3ICsxNjksNyBAQCBQYXNzUmVmUHRyPEZpbHRlckVm ZmVjdD4gU1ZHRkVNb3JwaG9sb2d5RWxlbWVudDo6YnVpbGQoU1ZHRmlsdGVyQnVpbGRlciogZmls dGVyQgogICAgIGlmICh4UmFkaXVzIDwgMCB8fCB5UmFkaXVzIDwgMCkKICAgICAgICAgcmV0dXJu IDA7CiAKLSAgICBSZWZQdHI8RmlsdGVyRWZmZWN0PiBlZmZlY3QgPSBGRU1vcnBob2xvZ3k6OmNy ZWF0ZShmaWx0ZXIsIF9vcGVyYXRvcigpLCB4UmFkaXVzLCB5UmFkaXVzKTsKKyAgICBSZWZQdHI8 RmlsdGVyRWZmZWN0PiBlZmZlY3QgPSBGRU1vcnBob2xvZ3k6OmNyZWF0ZShmaWx0ZXIsIHN2Z09w ZXJhdG9yKCksIHhSYWRpdXMsIHlSYWRpdXMpOwogICAgIGVmZmVjdC0+aW5wdXRFZmZlY3RzKCku YXBwZW5kKGlucHV0MSk7CiAgICAgcmV0dXJuIGVmZmVjdC5yZWxlYXNlKCk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVNb3JwaG9sb2d5RWxlbWVudC5oIGIvU291cmNl L1dlYkNvcmUvc3ZnL1NWR0ZFTW9ycGhvbG9neUVsZW1lbnQuaAppbmRleCA5MWFmODZlMjI2NjE3 NjBlYTRjY2ZiMTg3ZDhmZTI1ZmM4NWExNzc2Li44ZjdjMmVhN2I4NjBlMTdlZWJkNTllNDRkNWRh NmEzYjU5ZjA5MDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVNb3JwaG9s b2d5RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdGRU1vcnBob2xvZ3lFbGVt ZW50LmgKQEAgLTc3LDcgKzc3LDcgQEAgcHJpdmF0ZToKIAogICAgIEJFR0lOX0RFQ0xBUkVfQU5J TUFURURfUFJPUEVSVElFUyhTVkdGRU1vcnBob2xvZ3lFbGVtZW50KQogICAgICAgICBERUNMQVJF X0FOSU1BVEVEX1NUUklORyhJbjEsIGluMSkKLSAgICAgICAgREVDTEFSRV9BTklNQVRFRF9FTlVN RVJBVElPTihfb3BlcmF0b3IsIF9vcGVyYXRvciwgTW9ycGhvbG9neU9wZXJhdG9yVHlwZSkKKyAg ICAgICAgREVDTEFSRV9BTklNQVRFRF9FTlVNRVJBVElPTihTVkdPcGVyYXRvciwgc3ZnT3BlcmF0 b3IsIE1vcnBob2xvZ3lPcGVyYXRvclR5cGUpCiAgICAgICAgIERFQ0xBUkVfQU5JTUFURURfTlVN QkVSKFJhZGl1c1gsIHJhZGl1c1gpCiAgICAgICAgIERFQ0xBUkVfQU5JTUFURURfTlVNQkVSKFJh ZGl1c1ksIHJhZGl1c1kpCiAgICAgRU5EX0RFQ0xBUkVfQU5JTUFURURfUFJPUEVSVElFUwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZFTW9ycGhvbG9neUVsZW1lbnQuaWRsIGIv U291cmNlL1dlYkNvcmUvc3ZnL1NWR0ZFTW9ycGhvbG9neUVsZW1lbnQuaWRsCmluZGV4IGE2Y2Vi NzVmMzczZWI4YmIyODBhNzliOTc4ODg0MTczZGQyYzliOGMuLmJhNjQ4MWM0N2ZkYjQ3Y2E4MzY4 ZGUzMTUzNjg5YjljYjNmZmYyMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdG RU1vcnBob2xvZ3lFbGVtZW50LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRkVNb3Jw aG9sb2d5RWxlbWVudC5pZGwKQEAgLTMzLDcgKzMzLDcgQEAKICAgICBjb25zdCB1bnNpZ25lZCBz aG9ydCBTVkdfTU9SUEhPTE9HWV9PUEVSQVRPUl9ESUxBVEUgICA9IDI7CiAKICAgICByZWFkb25s eSBhdHRyaWJ1dGUgU1ZHQW5pbWF0ZWRTdHJpbmcgICAgICBpbjE7Ci0gICAgcmVhZG9ubHkgYXR0 cmlidXRlIFNWR0FuaW1hdGVkRW51bWVyYXRpb24gb3BlcmF0b3I7CisgICAgW0ltcGxlbWVudGVk QXM9c3ZnT3BlcmF0b3JdIHJlYWRvbmx5IGF0dHJpYnV0ZSBTVkdBbmltYXRlZEVudW1lcmF0aW9u IG9wZXJhdG9yOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBTVkdBbmltYXRlZE51bWJlciAgICAg IHJhZGl1c1g7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFNWR0FuaW1hdGVkTnVtYmVyICAgICAg cmFkaXVzWTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RyYW5zZm9ybS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVHJhbnNmb3JtLmNwcAppbmRleCBlMTM2MzY2ZTgw MTNmNTFkMWJhMzRkOThjMWFjYjJkYWRhMWVjOTFlLi4yMGQ2ZTg4OTQ0YzVmMmIyOTY5YmNiYWQz OTMxZjM4MzUwMzBiNzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVHJhbnNm b3JtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVHJhbnNmb3JtLmNwcApAQCAtNjIs NyArNjIsNyBAQCB2b2lkIFNWR1RyYW5zZm9ybTo6c2V0TWF0cml4KGNvbnN0IEFmZmluZVRyYW5z Zm9ybSYgbWF0cml4KQogICAgIG1fbWF0cml4ID0gbWF0cml4OwogfQogCi12b2lkIFNWR1RyYW5z Zm9ybTo6dXBkYXRlTWF0cml4KCkKK3ZvaWQgU1ZHVHJhbnNmb3JtOjp1cGRhdGVTVkdNYXRyaXgo KQogewogICAgIC8vIFRoZSB1bmRlcmx5aW5nIG1hdHJpeCBoYXMgYmVlbiBjaGFuZ2VkLCBhbHRl ciB0aGUgdHJhbnNmb3JtYXRpb24gdHlwZS4KICAgICAvLyBTcGVjOiBJbiBjYXNlIHRoZSBtYXRy aXggb2JqZWN0IGlzIGNoYW5nZWQgZGlyZWN0bHkgKGkuZS4sIHdpdGhvdXQgdXNpbmcgdGhlIG1l dGhvZHMgb24gdGhlIFNWR1RyYW5zZm9ybSBpbnRlcmZhY2UgaXRzZWxmKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1RyYW5zZm9ybS5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NW R1RyYW5zZm9ybS5oCmluZGV4IDVmMDlkNjQzM2UxNGYxMzBlZGZlMmUxYjYzNTA4YTZkNmViZGUx OWIuLmEwM2Y5ZWQ3NGE2ZGUzOGUyNWVkYmEzYjQ0ZDc3NWE2MmRkOTQ2YjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUcmFuc2Zvcm0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dmcvU1ZHVHJhbnNmb3JtLmgKQEAgLTU0LDcgKzU0LDcgQEAgcHVibGljOgogCiAgICAgU1ZHTWF0 cml4JiBzdmdNYXRyaXgoKSB7IHJldHVybiBzdGF0aWNfY2FzdDxTVkdNYXRyaXgmPihtX21hdHJp eCk7IH0KICAgICBBZmZpbmVUcmFuc2Zvcm0gbWF0cml4KCkgY29uc3QgeyByZXR1cm4gbV9tYXRy aXg7IH0KLSAgICB2b2lkIHVwZGF0ZU1hdHJpeCgpOworICAgIHZvaWQgdXBkYXRlU1ZHTWF0cml4 KCk7CiAKICAgICBmbG9hdCBhbmdsZSgpIGNvbnN0IHsgcmV0dXJuIG1fYW5nbGU7IH0KICAgICBG bG9hdFBvaW50IHJvdGF0aW9uQ2VudGVyKCkgY29uc3QgeyByZXR1cm4gbV9jZW50ZXI7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUcmFuc2Zvcm0uaWRsIGIvU291cmNlL1dl YkNvcmUvc3ZnL1NWR1RyYW5zZm9ybS5pZGwKaW5kZXggMmVkYWE4MDdjNzdiMTRkMTcwYjJlMmFk MWM4MmQ3MWIzMTBhY2M0My4uYzk2YzJlMmE2ZGRmMDYxNTZmMDUwMmViMjYxYmUzYjEwZDdjNDZm NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RyYW5zZm9ybS5pZGwKKysrIGIv U291cmNlL1dlYkNvcmUvc3ZnL1NWR1RyYW5zZm9ybS5pZGwKQEAgLTMyLDcgKzMyLDcgQEAKICAg ICBjb25zdCB1bnNpZ25lZCBzaG9ydCBTVkdfVFJBTlNGT1JNX1NLRVdZID0gNjsKIAogICAgIHJl YWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBzaG9ydCB0eXBlOwotICAgIHJlYWRvbmx5IGF0dHJp YnV0ZSBTVkdNYXRyaXggbWF0cml4OworICAgIFtJbXBsZW1lbnRlZEFzPXN2Z01hdHJpeF0gcmVh ZG9ubHkgYXR0cmlidXRlIFNWR01hdHJpeCBtYXRyaXg7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRl IGZsb2F0IGFuZ2xlOwogCiAgICAgW1N0cmljdFR5cGVDaGVja2luZ10gdm9pZCBzZXRNYXRyaXgo U1ZHTWF0cml4IG1hdHJpeCk7Cg==