168234 2017-02-13 10:30:31 -0800 [WebRTC] Implement description getters for libwebrtc RTCPeerConnection 2017-02-14 11:41:56 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf achristensen commit-queue eric.carlson oldest_to_newest 1276234 0 youennf 2017-02-13 10:30:31 -0800 Currently, we are returning null, which is preventing to pass some W3C tests. 1276274 1 301366 youennf 2017-02-13 11:50:10 -0800 Created attachment 301366 Patch 1276279 2 301368 youennf 2017-02-13 11:59:02 -0800 Created attachment 301368 Patch 1276485 3 301368 achristensen 2017-02-13 17:37:37 -0800 Comment on attachment 301368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301368&action=review > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:66 > -static inline const char* sessionDescriptionType(RTCSessionDescription::SdpType sdpType) > +static inline const char* toSessionDescriptionType(RTCSessionDescription::SdpType sdpType) Let's not do this change. > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:88 > + auto type = description.type(); > + if (type == webrtc::SessionDescriptionInterface::kOffer) > + return RTCSessionDescription::SdpType::Offer; > + if (type == webrtc::SessionDescriptionInterface::kAnswer) > + return RTCSessionDescription::SdpType::Answer; > + ASSERT(type == webrtc::SessionDescriptionInterface::kPrAnswer); > + return RTCSessionDescription::SdpType::Pranswer; switch(description.type()) 1276832 4 301525 youennf 2017-02-14 11:05:17 -0800 Created attachment 301525 Patch for landing 1276833 5 youennf 2017-02-14 11:06:36 -0800 (In reply to comment #3) > Comment on attachment 301368 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301368&action=review > > > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:66 > > -static inline const char* sessionDescriptionType(RTCSessionDescription::SdpType sdpType) > > +static inline const char* toSessionDescriptionType(RTCSessionDescription::SdpType sdpType) > > Let's not do this change. OK > > > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:88 > > + auto type = description.type(); > > + if (type == webrtc::SessionDescriptionInterface::kOffer) > > + return RTCSessionDescription::SdpType::Offer; > > + if (type == webrtc::SessionDescriptionInterface::kAnswer) > > + return RTCSessionDescription::SdpType::Answer; > > + ASSERT(type == webrtc::SessionDescriptionInterface::kPrAnswer); > > + return RTCSessionDescription::SdpType::Pranswer; > > switch(description.type()) description.type() is a static const char[]. 1276847 6 301525 commit-queue 2017-02-14 11:41:51 -0800 Comment on attachment 301525 Patch for landing Clearing flags on attachment: 301525 Committed r212315: <http://trac.webkit.org/changeset/212315> 1276848 7 commit-queue 2017-02-14 11:41:56 -0800 All reviewed patches have been landed. Closing bug. 301366 2017-02-13 11:50:10 -0800 2017-02-13 11:58:58 -0800 Patch bug-168234-20170213114738.patch text/plain 7594 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGMxY2E1OWZkNzhmN2Fk OWJkMTQyMTAyMGU1ZDcxOTIyMDU1NTVmMC4uNzMzNWUwNDk0ZmJhYzI1OTk4MDE1ZDFlMTg4OWE1 MWYyZDJkOGQ1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAyLTEzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW1dlYlJUQ10gSW1wbGVt ZW50IGRlc2NyaXB0aW9uIGdldHRlcnMgZm9yIGxpYndlYnJ0YyBSVENQZWVyQ29ubmVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MjM0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3dzIHBh c3NpbmcgVzNDIHdlYnJ0YyB0ZXN0cy4KKworICAgICAgICBJbXBsZW1lbnRpbmcgbG9jYWxEZXNj cmlwdGlvbi9yZW1vdGVEZXNjcmlwdGlvbiB1c2luZyBsaWJ3ZWJydGMgYmFja2VuZC4KKyAgICAg ICAgY3VycmVudCBhbmQgcGVuZGluZyBkZXNjcmlwdGlvbiBnZXR0ZXJzIGFyZSBtYWRlIHRoZSBz YW1lIGFzIGxvY2FsL3JlbW90ZSBnZXR0ZXJzIGZvciB0aGUgbW9tZW50LgorICAgICAgICBUaGlz IHNob3VsZCBiZSBmaXhlZCB3aGVuIHVwZ3JhZGluZyB0byBsYXRlc3QgbGlid2VicnRjIHJldmlz aW9uLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD TWVkaWFFbmRwb2ludC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1Nlc3Npb25EZXNjcmlwdGlv blR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6ZnJvbVNlc3Npb25EZXNjcmlwdGlvblR5cGUpOgor ICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6bG9jYWxEZXNjcmlwdGlv bik6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50OjpyZW1vdGVEZXNj cmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojpkb1Nl dExvY2FsRGVzY3JpcHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRw b2ludDo6ZG9TZXRSZW1vdGVEZXNjcmlwdGlvbik6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6Om5v dGlmeU5ld1RyYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENQZWVyQ29ubmVjdGlv bkJhY2tlbmQ6OmxvY2FsRGVzY3JpcHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRD UGVlckNvbm5lY3Rpb25CYWNrZW5kOjpyZW1vdGVEZXNjcmlwdGlvbik6CisKIDIwMTctMDItMTAg IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJSVENdIElt cGxlbWVudCBPdXRnb2luZyBsaWJ3ZWJydGMgYXVkaW8gc291cmNlIHN1cHBvcnQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJU Q01lZGlhRW5kcG9pbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9s aWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAKaW5kZXggZTA4MjUwNGIxNzZkMjE3 NzJhN2FiM2QxNWQxNWE1MGU1MTUwNzMzZi4uZTQwNDIzOTlmZjM0YThhMTBlNjc4YWViZGM2YTMy YmZkNDBhYTM4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5j cHAKQEAgLTYxLDcgKzYxLDcgQEAgTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6TGliV2ViUlRDTWVk aWFFbmRwb2ludChMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQmIHAKICAgICBBU1NFUlQo bV9iYWNrZW5kKTsKIH0KIAotc3RhdGljIGlubGluZSBjb25zdCBjaGFyKiBzZXNzaW9uRGVzY3Jp cHRpb25UeXBlKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6U2RwVHlwZSBzZHBUeXBlKQorc3RhdGlj IGlubGluZSBjb25zdCBjaGFyKiB0b1Nlc3Npb25EZXNjcmlwdGlvblR5cGUoUlRDU2Vzc2lvbkRl c2NyaXB0aW9uOjpTZHBUeXBlIHNkcFR5cGUpCiB7CiAgICAgc3dpdGNoIChzZHBUeXBlKSB7CiAg ICAgY2FzZSBSVENTZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGU6Ok9mZmVyOgpAQCAtNzUsMTAg Kzc1LDQ1IEBAIHN0YXRpYyBpbmxpbmUgY29uc3QgY2hhciogc2Vzc2lvbkRlc2NyaXB0aW9uVHlw ZShSVENTZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGUKICAgICB9CiB9CiAKK3N0YXRpYyBpbmxp bmUgUlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpTZHBUeXBlIGZyb21TZXNzaW9uRGVzY3JpcHRpb25U eXBlKGNvbnN0IHdlYnJ0Yzo6U2Vzc2lvbkRlc2NyaXB0aW9uSW50ZXJmYWNlJiBkZXNjcmlwdGlv bikKK3sKKyAgICBhdXRvIHR5cGUgPSBkZXNjcmlwdGlvbi50eXBlKCk7CisgICAgaWYgKHR5cGUg PT0gd2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2U6OmtPZmZlcikKKyAgICAgICAg cmV0dXJuIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6U2RwVHlwZTo6T2ZmZXI7CisgICAgaWYgKHR5 cGUgPT0gd2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2U6OmtBbnN3ZXIpCisgICAg ICAgIHJldHVybiBSVENTZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGU6OkFuc3dlcjsKKyAgICBB U1NFUlQodHlwZSA9PSB3ZWJydGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFjZTo6a1ByQW5z d2VyKTsKKyAgICByZXR1cm4gUlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpTZHBUeXBlOjpQcmFuc3dl cjsKK30KKworc3RhdGljIGlubGluZSBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBmcm9t U2Vzc2lvbkRlc2NyaXB0aW9uKGNvbnN0IHdlYnJ0Yzo6U2Vzc2lvbkRlc2NyaXB0aW9uSW50ZXJm YWNlKiBkZXNjcmlwdGlvbikKK3sKKyAgICBpZiAoIWRlc2NyaXB0aW9uKQorICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKworICAgIHN0ZDo6c3RyaW5nIHNkcDsKKyAgICBkZXNjcmlwdGlvbi0+VG9T dHJpbmcoJnNkcCk7CisgICAgU3RyaW5nIHNkcFN0cmluZyhzZHAuZGF0YSgpLCBzZHAuc2l6ZSgp KTsKKworICAgIHJldHVybiBSVENTZXNzaW9uRGVzY3JpcHRpb246OmNyZWF0ZShmcm9tU2Vzc2lv bkRlc2NyaXB0aW9uVHlwZSgqZGVzY3JpcHRpb24pLCBXVEZNb3ZlKHNkcFN0cmluZykpOworfQor CitSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojps b2NhbERlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogV2UgbWlnaHQgd2FudCB0 byBjcmVhdGUgYSBuZXcgb2JqZWN0IG9ubHkgaWYgdGhlIHNlc3Npb24gYWN0dWFsbHkgY2hhbmdl ZC4KKyAgICByZXR1cm4gZnJvbVNlc3Npb25EZXNjcmlwdGlvbihtX2JhY2tlbmQtPmxvY2FsX2Rl c2NyaXB0aW9uKCkpOworfQorCitSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBMaWJXZWJS VENNZWRpYUVuZHBvaW50OjpyZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAgLy8gRklY TUU6IFdlIG1pZ2h0IHdhbnQgdG8gY3JlYXRlIGEgbmV3IG9iamVjdCBvbmx5IGlmIHRoZSBzZXNz aW9uIGFjdHVhbGx5IGNoYW5nZWQuCisgICAgcmV0dXJuIGZyb21TZXNzaW9uRGVzY3JpcHRpb24o bV9iYWNrZW5kLT5yZW1vdGVfZGVzY3JpcHRpb24oKSk7Cit9CisKIHZvaWQgTGliV2ViUlRDTWVk aWFFbmRwb2ludDo6ZG9TZXRMb2NhbERlc2NyaXB0aW9uKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbiYg ZGVzY3JpcHRpb24pCiB7CiAgICAgd2VicnRjOjpTZHBQYXJzZUVycm9yIGVycm9yOwotICAgIHN0 ZDo6dW5pcXVlX3B0cjx3ZWJydGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFjZT4gc2Vzc2lv bkRlc2NyaXB0aW9uKHdlYnJ0Yzo6Q3JlYXRlU2Vzc2lvbkRlc2NyaXB0aW9uKHNlc3Npb25EZXNj cmlwdGlvblR5cGUoZGVzY3JpcHRpb24udHlwZSgpKSwgZGVzY3JpcHRpb24uc2RwKCkudXRmOCgp LmRhdGEoKSwgJmVycm9yKSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPHdlYnJ0Yzo6U2Vzc2lvbkRl c2NyaXB0aW9uSW50ZXJmYWNlPiBzZXNzaW9uRGVzY3JpcHRpb24od2VicnRjOjpDcmVhdGVTZXNz aW9uRGVzY3JpcHRpb24odG9TZXNzaW9uRGVzY3JpcHRpb25UeXBlKGRlc2NyaXB0aW9uLnR5cGUo KSksIGRlc2NyaXB0aW9uLnNkcCgpLnV0ZjgoKS5kYXRhKCksICZlcnJvcikpOwogCiAgICAgaWYg KCFzZXNzaW9uRGVzY3JpcHRpb24pIHsKICAgICAgICAgU3RyaW5nIGVycm9yTWVzc2FnZShlcnJv ci5kZXNjcmlwdGlvbi5kYXRhKCksIGVycm9yLmRlc2NyaXB0aW9uLnNpemUoKSk7CkBAIC05MSw3 ICsxMjYsNyBAQCB2b2lkIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmRvU2V0TG9jYWxEZXNjcmlw dGlvbihSVENTZXNzaW9uRGVzY3JpcHRpb24mIGRlc2NyaQogdm9pZCBMaWJXZWJSVENNZWRpYUVu ZHBvaW50Ojpkb1NldFJlbW90ZURlc2NyaXB0aW9uKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbiYgZGVz Y3JpcHRpb24pCiB7CiAgICAgd2VicnRjOjpTZHBQYXJzZUVycm9yIGVycm9yOwotICAgIHN0ZDo6 dW5pcXVlX3B0cjx3ZWJydGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFjZT4gc2Vzc2lvbkRl c2NyaXB0aW9uKHdlYnJ0Yzo6Q3JlYXRlU2Vzc2lvbkRlc2NyaXB0aW9uKHNlc3Npb25EZXNjcmlw dGlvblR5cGUoZGVzY3JpcHRpb24udHlwZSgpKSwgZGVzY3JpcHRpb24uc2RwKCkudXRmOCgpLmRh dGEoKSwgJmVycm9yKSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPHdlYnJ0Yzo6U2Vzc2lvbkRlc2Ny aXB0aW9uSW50ZXJmYWNlPiBzZXNzaW9uRGVzY3JpcHRpb24od2VicnRjOjpDcmVhdGVTZXNzaW9u RGVzY3JpcHRpb24odG9TZXNzaW9uRGVzY3JpcHRpb25UeXBlKGRlc2NyaXB0aW9uLnR5cGUoKSks IGRlc2NyaXB0aW9uLnNkcCgpLnV0ZjgoKS5kYXRhKCksICZlcnJvcikpOwogICAgIGlmICghc2Vz c2lvbkRlc2NyaXB0aW9uKSB7CiAgICAgICAgIFN0cmluZyBlcnJvck1lc3NhZ2UoZXJyb3IuZGVz Y3JpcHRpb24uZGF0YSgpLCBlcnJvci5kZXNjcmlwdGlvbi5zaXplKCkpOwogICAgICAgICBtX3Bl ZXJDb25uZWN0aW9uQmFja2VuZC5zZXRSZW1vdGVEZXNjcmlwdGlvbkZhaWxlZChFeGNlcHRpb24g eyBPcGVyYXRpb25FcnJvciwgV1RGTW92ZShlcnJvck1lc3NhZ2UpIH0pOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVk aWFFbmRwb2ludC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJy dGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oCmluZGV4IGEzMDkyODRhZjBlMWQ3ODRlZjllNWZj ZTU5MzM1NDBhZTMzMTlkZWQuLmRjYmYzOTk0NzUzZDhkZGFkMjZiYjA1ZWY2ZjVlZDlkYzk4NjEy NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKQEAgLTcyLDYg KzcyLDkgQEAgcHVibGljOgogICAgIHZvaWQgc3RvcCgpOwogICAgIGJvb2wgaXNTdG9wcGVkKCkg Y29uc3QgeyByZXR1cm4gIW1fYmFja2VuZDsgfQogCisgICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNj cmlwdGlvbj4gbG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0OworICAgIFJlZlB0cjxSVENTZXNzaW9u RGVzY3JpcHRpb24+IHJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3Q7CisKIHByaXZhdGU6CiAgICAg TGliV2ViUlRDTWVkaWFFbmRwb2ludChMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQmLCBM aWJXZWJSVENQcm92aWRlciYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD UGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAppbmRleCBiN2MzOGQ5ZWViYzI5NjhhODM1NWFlNDYx NTg5ZjAyNGQzNmY5NGY1Li45OTFlMWM3MjgxMzA1NGI5ZWMzZmZmYmEwYTNiMzJlM2Q5ZjkxZWM3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFj a2VuZC5jcHAKQEAgLTIyOCw3ICsyMjgsNyBAQCB2b2lkIExpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZDo6bm90aWZ5TmV3VHJhY2tzKFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1Ucgogewog ICAgIGF1dG8gbmV3U3RyZWFtID0gTWVkaWFTdHJlYW06OmNyZWF0ZSgqY29ubmVjdGlvbigpLnNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgV1RGTW92ZSh0cmFja3MpKTsKICAgICBjb25uZWN0aW9u KCkuZmlyZUV2ZW50KE1lZGlhU3RyZWFtRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuYWRkc3Ry ZWFtRXZlbnQsIGZhbHNlLCBmYWxzZSwgbmV3U3RyZWFtLmNvcHlSZWYoKSkpOwotICAgIAorCiAg ICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbT4+IHN0cmVhbXM7CiAgICAgc3RyZWFtcy5hcHBl bmQobmV3U3RyZWFtLmNvcHlSZWYoKSk7CiAgICAgZm9yIChhdXRvJiB0cmFjayA6IG5ld1N0cmVh bS0+Z2V0VHJhY2tzKCkpCkBAIC0yMzcsMTIgKzIzNywxMiBAQCB2b2lkIExpYldlYlJUQ1BlZXJD b25uZWN0aW9uQmFja2VuZDo6bm90aWZ5TmV3VHJhY2tzKFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJl YW1UcgogCiBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBMaWJXZWJSVENQZWVyQ29ubmVj dGlvbkJhY2tlbmQ6OmxvY2FsRGVzY3JpcHRpb24oKSBjb25zdAogewotICAgIHJldHVybiBudWxs cHRyOworICAgIHJldHVybiBtX2VuZHBvaW50LT5sb2NhbERlc2NyaXB0aW9uKCk7CiB9CiAKIFJl ZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2Vu ZDo6cmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdAogewotICAgIHJldHVybiBudWxscHRyOworICAg IHJldHVybiBtX2VuZHBvaW50LT5yZW1vdGVEZXNjcmlwdGlvbigpOwogfQogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCg== 301368 2017-02-13 11:59:02 -0800 2017-02-14 11:05:13 -0800 Patch bug-168234-20170213115630.patch text/plain 9367 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWFjYmJhZDVkODlkZTFh ZTYzYWI0OGQ2YWI2NDA5MjIxMGQ0ZWI3My4uZjNkMzdlMDdlYjVjZmJlMTI3YWJlMjBiOTA3ZDhm Yzk2MGI4ODRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAyLTEzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW1dlYlJUQ10gSW1wbGVt ZW50IGRlc2NyaXB0aW9uIGdldHRlcnMgZm9yIGxpYndlYnJ0YyBSVENQZWVyQ29ubmVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MjM0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3dzIHBh c3NpbmcgVzNDIHdlYnJ0YyB0ZXN0cy4KKworICAgICAgICBJbXBsZW1lbnRpbmcgbG9jYWxEZXNj cmlwdGlvbi9yZW1vdGVEZXNjcmlwdGlvbiB1c2luZyBsaWJ3ZWJydGMgYmFja2VuZC4KKyAgICAg ICAgY3VycmVudCBhbmQgcGVuZGluZyBkZXNjcmlwdGlvbiBnZXR0ZXJzIGFyZSBtYWRlIHRoZSBz YW1lIGFzIGxvY2FsL3JlbW90ZSBnZXR0ZXJzIGZvciB0aGUgbW9tZW50LgorICAgICAgICBUaGlz IHNob3VsZCBiZSBmaXhlZCB3aGVuIHVwZ3JhZGluZyB0byBsYXRlc3QgbGlid2VicnRjIHJldmlz aW9uLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD TWVkaWFFbmRwb2ludC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0b1Nlc3Npb25EZXNjcmlwdGlv blR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6ZnJvbVNlc3Npb25EZXNjcmlwdGlvblR5cGUpOgor ICAgICAgICAoV2ViQ29yZTo6ZnJvbVNlc3Npb25EZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojpsb2NhbERlc2NyaXB0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OnJlbW90ZURlc2NyaXB0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmRvU2V0TG9jYWxEZXNjcmlw dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojpkb1NldFJl bW90ZURlc2NyaXB0aW9uKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50Lmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVh bS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZDo6bG9jYWxEZXNjcmlwdGlv bik6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVl ckNvbm5lY3Rpb25CYWNrZW5kLmg6CisKIDIwMTctMDItMTMgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgY3VzdG9tIGxpbmUgYnJlYWtp bmcgaXRlcmF0b3JzIHRvIHRoZSBsYXRlc3QgdmVyc2lvbiBvZiBVbmljb2RlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENN ZWRpYUVuZHBvaW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCmluZGV4IGI0MTE5MzhiYmM0OWVhNTVi OGRlZTkxY2NlMWMyNWUzYWQ3OTE3YjIuLmFlMjQzNDI1NTU3YmVjZGYxNzljYzI5ZTM0NTcxMTkz M2RhNDAwNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v bGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuY3Bw CkBAIC02Myw3ICs2Myw3IEBAIExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OkxpYldlYlJUQ01lZGlh RW5kcG9pbnQoTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kJiBwCiAgICAgQVNTRVJUKG1f YmFja2VuZCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgY29uc3QgY2hhciogc2Vzc2lvbkRlc2NyaXB0 aW9uVHlwZShSVENTZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGUgc2RwVHlwZSkKK3N0YXRpYyBp bmxpbmUgY29uc3QgY2hhciogdG9TZXNzaW9uRGVzY3JpcHRpb25UeXBlKFJUQ1Nlc3Npb25EZXNj cmlwdGlvbjo6U2RwVHlwZSBzZHBUeXBlKQogewogICAgIHN3aXRjaCAoc2RwVHlwZSkgewogICAg IGNhc2UgUlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpTZHBUeXBlOjpPZmZlcjoKQEAgLTc3LDEwICs3 Nyw0NSBAQCBzdGF0aWMgaW5saW5lIGNvbnN0IGNoYXIqIHNlc3Npb25EZXNjcmlwdGlvblR5cGUo UlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpTZHBUeXBlCiAgICAgfQogfQogCitzdGF0aWMgaW5saW5l IFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6U2RwVHlwZSBmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uVHlw ZShjb25zdCB3ZWJydGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFjZSYgZGVzY3JpcHRpb24p Cit7CisgICAgYXV0byB0eXBlID0gZGVzY3JpcHRpb24udHlwZSgpOworICAgIGlmICh0eXBlID09 IHdlYnJ0Yzo6U2Vzc2lvbkRlc2NyaXB0aW9uSW50ZXJmYWNlOjprT2ZmZXIpCisgICAgICAgIHJl dHVybiBSVENTZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGU6Ok9mZmVyOworICAgIGlmICh0eXBl ID09IHdlYnJ0Yzo6U2Vzc2lvbkRlc2NyaXB0aW9uSW50ZXJmYWNlOjprQW5zd2VyKQorICAgICAg ICByZXR1cm4gUlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpTZHBUeXBlOjpBbnN3ZXI7CisgICAgQVNT RVJUKHR5cGUgPT0gd2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2U6OmtQckFuc3dl cik7CisgICAgcmV0dXJuIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6U2RwVHlwZTo6UHJhbnN3ZXI7 Cit9CisKK3N0YXRpYyBpbmxpbmUgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gZnJvbVNl c3Npb25EZXNjcmlwdGlvbihjb25zdCB3ZWJydGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFj ZSogZGVzY3JpcHRpb24pCit7CisgICAgaWYgKCFkZXNjcmlwdGlvbikKKyAgICAgICAgcmV0dXJu IG51bGxwdHI7CisKKyAgICBzdGQ6OnN0cmluZyBzZHA7CisgICAgZGVzY3JpcHRpb24tPlRvU3Ry aW5nKCZzZHApOworICAgIFN0cmluZyBzZHBTdHJpbmcoc2RwLmRhdGEoKSwgc2RwLnNpemUoKSk7 CisKKyAgICByZXR1cm4gUlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpjcmVhdGUoZnJvbVNlc3Npb25E ZXNjcmlwdGlvblR5cGUoKmRlc2NyaXB0aW9uKSwgV1RGTW92ZShzZHBTdHJpbmcpKTsKK30KKwor UmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gTGliV2ViUlRDTWVkaWFFbmRwb2ludDo6bG9j YWxEZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAgLy8gRklYTUU6IFdlIG1pZ2h0IHdhbnQgdG8g Y3JlYXRlIGEgbmV3IG9iamVjdCBvbmx5IGlmIHRoZSBzZXNzaW9uIGFjdHVhbGx5IGNoYW5nZWQu CisgICAgcmV0dXJuIGZyb21TZXNzaW9uRGVzY3JpcHRpb24obV9iYWNrZW5kLT5sb2NhbF9kZXNj cmlwdGlvbigpKTsKK30KKworUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gTGliV2ViUlRD TWVkaWFFbmRwb2ludDo6cmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdAoreworICAgIC8vIEZJWE1F OiBXZSBtaWdodCB3YW50IHRvIGNyZWF0ZSBhIG5ldyBvYmplY3Qgb25seSBpZiB0aGUgc2Vzc2lv biBhY3R1YWxseSBjaGFuZ2VkLgorICAgIHJldHVybiBmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uKG1f YmFja2VuZC0+cmVtb3RlX2Rlc2NyaXB0aW9uKCkpOworfQorCiB2b2lkIExpYldlYlJUQ01lZGlh RW5kcG9pbnQ6OmRvU2V0TG9jYWxEZXNjcmlwdGlvbihSVENTZXNzaW9uRGVzY3JpcHRpb24mIGRl c2NyaXB0aW9uKQogewogICAgIHdlYnJ0Yzo6U2RwUGFyc2VFcnJvciBlcnJvcjsKLSAgICBzdGQ6 OnVuaXF1ZV9wdHI8d2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2U+IHNlc3Npb25E ZXNjcmlwdGlvbih3ZWJydGM6OkNyZWF0ZVNlc3Npb25EZXNjcmlwdGlvbihzZXNzaW9uRGVzY3Jp cHRpb25UeXBlKGRlc2NyaXB0aW9uLnR5cGUoKSksIGRlc2NyaXB0aW9uLnNkcCgpLnV0ZjgoKS5k YXRhKCksICZlcnJvcikpOworICAgIHN0ZDo6dW5pcXVlX3B0cjx3ZWJydGM6OlNlc3Npb25EZXNj cmlwdGlvbkludGVyZmFjZT4gc2Vzc2lvbkRlc2NyaXB0aW9uKHdlYnJ0Yzo6Q3JlYXRlU2Vzc2lv bkRlc2NyaXB0aW9uKHRvU2Vzc2lvbkRlc2NyaXB0aW9uVHlwZShkZXNjcmlwdGlvbi50eXBlKCkp LCBkZXNjcmlwdGlvbi5zZHAoKS51dGY4KCkuZGF0YSgpLCAmZXJyb3IpKTsKIAogICAgIGlmICgh c2Vzc2lvbkRlc2NyaXB0aW9uKSB7CiAgICAgICAgIFN0cmluZyBlcnJvck1lc3NhZ2UoZXJyb3Iu ZGVzY3JpcHRpb24uZGF0YSgpLCBlcnJvci5kZXNjcmlwdGlvbi5zaXplKCkpOwpAQCAtOTMsNyAr MTI4LDcgQEAgdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBvaW50Ojpkb1NldExvY2FsRGVzY3JpcHRp b24oUlRDU2Vzc2lvbkRlc2NyaXB0aW9uJiBkZXNjcmkKIHZvaWQgTGliV2ViUlRDTWVkaWFFbmRw b2ludDo6ZG9TZXRSZW1vdGVEZXNjcmlwdGlvbihSVENTZXNzaW9uRGVzY3JpcHRpb24mIGRlc2Ny aXB0aW9uKQogewogICAgIHdlYnJ0Yzo6U2RwUGFyc2VFcnJvciBlcnJvcjsKLSAgICBzdGQ6OnVu aXF1ZV9wdHI8d2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2U+IHNlc3Npb25EZXNj cmlwdGlvbih3ZWJydGM6OkNyZWF0ZVNlc3Npb25EZXNjcmlwdGlvbihzZXNzaW9uRGVzY3JpcHRp b25UeXBlKGRlc2NyaXB0aW9uLnR5cGUoKSksIGRlc2NyaXB0aW9uLnNkcCgpLnV0ZjgoKS5kYXRh KCksICZlcnJvcikpOworICAgIHN0ZDo6dW5pcXVlX3B0cjx3ZWJydGM6OlNlc3Npb25EZXNjcmlw dGlvbkludGVyZmFjZT4gc2Vzc2lvbkRlc2NyaXB0aW9uKHdlYnJ0Yzo6Q3JlYXRlU2Vzc2lvbkRl c2NyaXB0aW9uKHRvU2Vzc2lvbkRlc2NyaXB0aW9uVHlwZShkZXNjcmlwdGlvbi50eXBlKCkpLCBk ZXNjcmlwdGlvbi5zZHAoKS51dGY4KCkuZGF0YSgpLCAmZXJyb3IpKTsKICAgICBpZiAoIXNlc3Np b25EZXNjcmlwdGlvbikgewogICAgICAgICBTdHJpbmcgZXJyb3JNZXNzYWdlKGVycm9yLmRlc2Ny aXB0aW9uLmRhdGEoKSwgZXJyb3IuZGVzY3JpcHRpb24uc2l6ZSgpKTsKICAgICAgICAgbV9wZWVy Q29ubmVjdGlvbkJhY2tlbmQuc2V0UmVtb3RlRGVzY3JpcHRpb25GYWlsZWQoRXhjZXB0aW9uIHsg T3BlcmF0aW9uRXJyb3IsIFdURk1vdmUoZXJyb3JNZXNzYWdlKSB9KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlh RW5kcG9pbnQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaAppbmRleCBhMzA5Mjg0YWYwZTFkNzg0ZWY5ZTVmY2U1 OTMzNTQwYWUzMzE5ZGVkLi5kY2JmMzk5NDc1M2Q4ZGRhZDI2YmIwNWVmNmY1ZWQ5ZGM5ODYxMjQx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oCkBAIC03Miw2ICs3 Miw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHN0b3AoKTsKICAgICBib29sIGlzU3RvcHBlZCgpIGNv bnN0IHsgcmV0dXJuICFtX2JhY2tlbmQ7IH0KIAorICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3Jp cHRpb24+IGxvY2FsRGVzY3JpcHRpb24oKSBjb25zdDsKKyAgICBSZWZQdHI8UlRDU2Vzc2lvbkRl c2NyaXB0aW9uPiByZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0OworCiBwcml2YXRlOgogICAgIExp YldlYlJUQ01lZGlhRW5kcG9pbnQoTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kJiwgTGli V2ViUlRDUHJvdmlkZXImKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1Bl ZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKaW5kZXggYjg1Nzc5YjJmY2FlYjE0ZTgxYjQwYzA1ZTgw NmE1YWE4YjllZmM1Ni4uYzA0OTdkY2MwMDQxYmM2MmQ4NTkyMzg5ZTcyN2ZlZGUyZTI5ZTk5YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tl bmQuY3BwCkBAIC0yMjEsNiArMjIxLDE2IEBAIHN0ZDo6dW5pcXVlX3B0cjxSVENEYXRhQ2hhbm5l bEhhbmRsZXI+IExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZDo6Y3JlYXRlRGF0CiAgICAg cmV0dXJuIG1fZW5kcG9pbnQtPmNyZWF0ZURhdGFDaGFubmVsKGxhYmVsLCBvcHRpb25zKTsKIH0K IAorUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gTGliV2ViUlRDUGVlckNvbm5lY3Rpb25C YWNrZW5kOjpsb2NhbERlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9lbmRwb2lu dC0+bG9jYWxEZXNjcmlwdGlvbigpOworfQorCitSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9u PiBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnJlbW90ZURlc2NyaXB0aW9uKCkgY29u c3QgZmluYWw7Cit7CisgICAgcmV0dXJuIG1fZW5kcG9pbnQtPnJlbW90ZURlc2NyaXB0aW9uKCk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFVTRShMSUJXRUJSVEMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5o CmluZGV4IGI1OTQzYTIxNDQwMTc3YmIwYzNmNDc5ZDE0MzdhYjk4MjU0OTExZmUuLjFmNzcxYTll Y2I3MzhkZTcyNGFiNzBmNTNmOThkMmJkOGYyZWUyZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oCkBAIC01OCwxOSArNTgsMTcgQEAg cHJpdmF0ZToKICAgICB2b2lkIGdldFN0YXRzKE1lZGlhU3RyZWFtVHJhY2sqLCBSZWY8RGVmZXJy ZWRQcm9taXNlPiYmKSBmaW5hbDsKICAgICBSZWY8UlRDUnRwUmVjZWl2ZXI+IGNyZWF0ZVJlY2Vp dmVyKGNvbnN0IFN0cmluZyYgdHJhbnNjZWl2ZXJNaWQsIGNvbnN0IFN0cmluZyYgdHJhY2tLaW5k LCBjb25zdCBTdHJpbmcmIHRyYWNrSWQpIGZpbmFsOwogCi0gICAgLy8gRklYTUU6IEFQSSB0byBp bXBsZW1lbnQgZm9yIHJlYWwKLSAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBsb2Nh bERlc2NyaXB0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbnVsbHB0cjsgfQotICAgIFJlZlB0 cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGN1cnJlbnRMb2NhbERlc2NyaXB0aW9uKCkgY29uc3Qg ZmluYWwgeyByZXR1cm4gbnVsbHB0cjsgfQotICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRp b24+IHBlbmRpbmdMb2NhbERlc2NyaXB0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbnVsbHB0 cjsgfQorICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGxvY2FsRGVzY3JpcHRpb24o KSBjb25zdCBmaW5hbDsKKyAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBjdXJyZW50 TG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGxvY2FsRGVzY3JpcHRpb24o KTsgfQorICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IHBlbmRpbmdMb2NhbERlc2Ny aXB0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbG9jYWxEZXNjcmlwdGlvbigpOyB9CiAKLSAg ICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiByZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0 IGZpbmFsIHsgcmV0dXJuIG51bGxwdHI7IH0KLSAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0 aW9uPiBjdXJyZW50UmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdCBmaW5hbCB7IHJldHVybiBudWxs cHRyOyB9Ci0gICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gcGVuZGluZ1JlbW90ZURl c2NyaXB0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbnVsbHB0cjsgfQorICAgIFJlZlB0cjxS VENTZXNzaW9uRGVzY3JpcHRpb24+IHJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3QgZmluYWw7Cisg ICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gY3VycmVudFJlbW90ZURlc2NyaXB0aW9u KCkgY29uc3QgZmluYWwgeyByZXR1cm4gcmVtb3RlRGVzY3JpcHRpb24oKTsgfQorICAgIFJlZlB0 cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IHBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0 IGZpbmFsIHsgcmV0dXJuIHJlbW90ZURlc2NyaXB0aW9uKCk7IH0KIAorICAgIC8vIEZJWE1FOiBB UEkgdG8gaW1wbGVtZW50IGZvciByZWFsCiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbT4+ IGdldFJlbW90ZVN0cmVhbXMoKSBjb25zdCBmaW5hbCB7IHJldHVybiB7IH07IH0KLQogICAgIHZv aWQgcmVwbGFjZVRyYWNrKFJUQ1J0cFNlbmRlciYsIFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiYm LCBET01Qcm9taXNlPHZvaWQ+JiYpIGZpbmFsIHsgfQotCiAgICAgYm9vbCBpc05lZ290aWF0aW9u TmVlZGVkKCkgY29uc3QgZmluYWwgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2b2lkIG1hcmtBc05l ZWRpbmdOZWdvdGlhdGlvbigpIGZpbmFsOwogICAgIHZvaWQgY2xlYXJOZWdvdGlhdGlvbk5lZWRl ZFN0YXRlKCkgZmluYWwgeyB9Cg== 301525 2017-02-14 11:05:17 -0800 2017-02-14 11:41:51 -0800 Patch for landing bug-168234-20170214110244.patch text/plain 7594 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGMxY2E1OWZkNzhmN2Fk OWJkMTQyMTAyMGU1ZDcxOTIyMDU1NTVmMC4uYzg1OWJhYWEzNzgwMWUwNmRjMTM5ZDk2OGUyNGFl YWU3MmYxZTMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTAyLTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW1dlYlJUQ10gSW1wbGVt ZW50IGRlc2NyaXB0aW9uIGdldHRlcnMgZm9yIGxpYndlYnJ0YyBSVENQZWVyQ29ubmVjdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MjM0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBBbGxvd3Mg cGFzc2luZyBXM0Mgd2VicnRjIHRlc3RzLgorCisgICAgICAgIEltcGxlbWVudGluZyBsb2NhbERl c2NyaXB0aW9uL3JlbW90ZURlc2NyaXB0aW9uIHVzaW5nIGxpYndlYnJ0YyBiYWNrZW5kLgorICAg ICAgICBjdXJyZW50IGFuZCBwZW5kaW5nIGRlc2NyaXB0aW9uIGdldHRlcnMgYXJlIG1hZGUgdGhl IHNhbWUgYXMgbG9jYWwvcmVtb3RlIGdldHRlcnMgZm9yIHRoZSBtb21lbnQuCisgICAgICAgIFRo aXMgc2hvdWxkIGJlIGZpeGVkIHdoZW4gdXBncmFkaW5nIHRvIGxhdGVzdCBsaWJ3ZWJydGMgcmV2 aXNpb24uCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENNZWRpYUVuZHBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvU2Vzc2lvbkRlc2NyaXB0 aW9uVHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uVHlwZSk6 CisgICAgICAgIChXZWJDb3JlOjpmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmxvY2FsRGVzY3JpcHRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6cmVtb3RlRGVzY3JpcHRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDTWVkaWFFbmRwb2ludDo6ZG9TZXRMb2NhbERlc2Ny aXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmRvU2V0 UmVtb3RlRGVzY3JpcHRpb24pOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpsb2NhbERlc2NyaXB0 aW9uKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQ ZWVyQ29ubmVjdGlvbkJhY2tlbmQuaDoKKwogMjAxNy0wMi0xMCAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYlJUQ10gSW1wbGVtZW50IE91dGdvaW5nIGxp YndlYnJ0YyBhdWRpbyBzb3VyY2Ugc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENN ZWRpYUVuZHBvaW50LmNwcAppbmRleCBiNDExOTM4YmJjNDllYTU1YjhkZWU5MWNjZTFjMjVlM2Fk NzkxN2IyLi5jNjUwMTgxYWUyMDkzNjA0MTE0NDZiMWQ5MjYzZDY4MTRjNjZlZmM0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENNZWRpYUVuZHBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmNwcApAQCAtNzcsNiArNzcsNDEg QEAgc3RhdGljIGlubGluZSBjb25zdCBjaGFyKiBzZXNzaW9uRGVzY3JpcHRpb25UeXBlKFJUQ1Nl c3Npb25EZXNjcmlwdGlvbjo6U2RwVHlwZQogICAgIH0KIH0KIAorc3RhdGljIGlubGluZSBSVENT ZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGUgZnJvbVNlc3Npb25EZXNjcmlwdGlvblR5cGUoY29u c3Qgd2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2UmIGRlc2NyaXB0aW9uKQorewor ICAgIGF1dG8gdHlwZSA9IGRlc2NyaXB0aW9uLnR5cGUoKTsKKyAgICBpZiAodHlwZSA9PSB3ZWJy dGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFjZTo6a09mZmVyKQorICAgICAgICByZXR1cm4g UlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpTZHBUeXBlOjpPZmZlcjsKKyAgICBpZiAodHlwZSA9PSB3 ZWJydGM6OlNlc3Npb25EZXNjcmlwdGlvbkludGVyZmFjZTo6a0Fuc3dlcikKKyAgICAgICAgcmV0 dXJuIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6U2RwVHlwZTo6QW5zd2VyOworICAgIEFTU0VSVCh0 eXBlID09IHdlYnJ0Yzo6U2Vzc2lvbkRlc2NyaXB0aW9uSW50ZXJmYWNlOjprUHJBbnN3ZXIpOwor ICAgIHJldHVybiBSVENTZXNzaW9uRGVzY3JpcHRpb246OlNkcFR5cGU6OlByYW5zd2VyOworfQor CitzdGF0aWMgaW5saW5lIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGZyb21TZXNzaW9u RGVzY3JpcHRpb24oY29uc3Qgd2VicnRjOjpTZXNzaW9uRGVzY3JpcHRpb25JbnRlcmZhY2UqIGRl c2NyaXB0aW9uKQoreworICAgIGlmICghZGVzY3JpcHRpb24pCisgICAgICAgIHJldHVybiBudWxs cHRyOworCisgICAgc3RkOjpzdHJpbmcgc2RwOworICAgIGRlc2NyaXB0aW9uLT5Ub1N0cmluZygm c2RwKTsKKyAgICBTdHJpbmcgc2RwU3RyaW5nKHNkcC5kYXRhKCksIHNkcC5zaXplKCkpOworCisg ICAgcmV0dXJuIFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6Y3JlYXRlKGZyb21TZXNzaW9uRGVzY3Jp cHRpb25UeXBlKCpkZXNjcmlwdGlvbiksIFdURk1vdmUoc2RwU3RyaW5nKSk7Cit9CisKK1JlZlB0 cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExpYldlYlJUQ01lZGlhRW5kcG9pbnQ6OmxvY2FsRGVz Y3JpcHRpb24oKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBXZSBtaWdodCB3YW50IHRvIGNyZWF0 ZSBhIG5ldyBvYmplY3Qgb25seSBpZiB0aGUgc2Vzc2lvbiBhY3R1YWxseSBjaGFuZ2VkLgorICAg IHJldHVybiBmcm9tU2Vzc2lvbkRlc2NyaXB0aW9uKG1fYmFja2VuZC0+bG9jYWxfZGVzY3JpcHRp b24oKSk7Cit9CisKK1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExpYldlYlJUQ01lZGlh RW5kcG9pbnQ6OnJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogV2Ug bWlnaHQgd2FudCB0byBjcmVhdGUgYSBuZXcgb2JqZWN0IG9ubHkgaWYgdGhlIHNlc3Npb24gYWN0 dWFsbHkgY2hhbmdlZC4KKyAgICByZXR1cm4gZnJvbVNlc3Npb25EZXNjcmlwdGlvbihtX2JhY2tl bmQtPnJlbW90ZV9kZXNjcmlwdGlvbigpKTsKK30KKwogdm9pZCBMaWJXZWJSVENNZWRpYUVuZHBv aW50Ojpkb1NldExvY2FsRGVzY3JpcHRpb24oUlRDU2Vzc2lvbkRlc2NyaXB0aW9uJiBkZXNjcmlw dGlvbikKIHsKICAgICB3ZWJydGM6OlNkcFBhcnNlRXJyb3IgZXJyb3I7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENNZWRp YUVuZHBvaW50LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENNZWRpYUVuZHBvaW50LmgKaW5kZXggYTMwOTI4NGFmMGUxZDc4NGVmOWU1ZmNl NTkzMzU0MGFlMzMxOWRlZC4uZGNiZjM5OTQ3NTNkOGRkYWQyNmJiMDVlZjZmNWVkOWRjOTg2MTI0 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJy dGMvTGliV2ViUlRDTWVkaWFFbmRwb2ludC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ01lZGlhRW5kcG9pbnQuaApAQCAtNzIsNiAr NzIsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdG9wKCk7CiAgICAgYm9vbCBpc1N0b3BwZWQoKSBj b25zdCB7IHJldHVybiAhbV9iYWNrZW5kOyB9CiAKKyAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2Ny aXB0aW9uPiBsb2NhbERlc2NyaXB0aW9uKCkgY29uc3Q7CisgICAgUmVmUHRyPFJUQ1Nlc3Npb25E ZXNjcmlwdGlvbj4gcmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBM aWJXZWJSVENNZWRpYUVuZHBvaW50KExpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZCYsIExp YldlYlJUQ1Byb3ZpZGVyJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQ ZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCmluZGV4IGI4NTc3OWIyZmNhZWIxNGU4MWI0MGMwNWU4 MDZhNWFhOGI5ZWZjNTYuLjE5Y2QzNjg2OGQyNjJhZTA1ZWJmNWFmMTAzNDAzMzI5ZDkwYTZlNTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNr ZW5kLmNwcApAQCAtMjIxLDYgKzIyMSwxNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8UlRDRGF0YUNoYW5u ZWxIYW5kbGVyPiBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmNyZWF0ZURhdAogICAg IHJldHVybiBtX2VuZHBvaW50LT5jcmVhdGVEYXRhQ2hhbm5lbChsYWJlbCwgb3B0aW9ucyk7CiB9 CiAKK1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IExpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZDo6bG9jYWxEZXNjcmlwdGlvbigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZW5kcG9p bnQtPmxvY2FsRGVzY3JpcHRpb24oKTsKK30KKworUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlv bj4gTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpyZW1vdGVEZXNjcmlwdGlvbigpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fZW5kcG9pbnQtPnJlbW90ZURlc2NyaXB0aW9uKCk7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFVTRShMSUJXRUJSVEMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJX ZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oCmluZGV4 IGI1OTQzYTIxNDQwMTc3YmIwYzNmNDc5ZDE0MzdhYjk4MjU0OTExZmUuLjFmNzcxYTllY2I3Mzhk ZTcyNGFiNzBmNTNmOThkMmJkOGYyZWUyZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2Vu ZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xp YldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oCkBAIC01OCwxOSArNTgsMTcgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGdldFN0YXRzKE1lZGlhU3RyZWFtVHJhY2sqLCBSZWY8RGVmZXJyZWRQcm9t aXNlPiYmKSBmaW5hbDsKICAgICBSZWY8UlRDUnRwUmVjZWl2ZXI+IGNyZWF0ZVJlY2VpdmVyKGNv bnN0IFN0cmluZyYgdHJhbnNjZWl2ZXJNaWQsIGNvbnN0IFN0cmluZyYgdHJhY2tLaW5kLCBjb25z dCBTdHJpbmcmIHRyYWNrSWQpIGZpbmFsOwogCi0gICAgLy8gRklYTUU6IEFQSSB0byBpbXBsZW1l bnQgZm9yIHJlYWwKLSAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBsb2NhbERlc2Ny aXB0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbnVsbHB0cjsgfQotICAgIFJlZlB0cjxSVENT ZXNzaW9uRGVzY3JpcHRpb24+IGN1cnJlbnRMb2NhbERlc2NyaXB0aW9uKCkgY29uc3QgZmluYWwg eyByZXR1cm4gbnVsbHB0cjsgfQotICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IHBl bmRpbmdMb2NhbERlc2NyaXB0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbnVsbHB0cjsgfQor ICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IGxvY2FsRGVzY3JpcHRpb24oKSBjb25z dCBmaW5hbDsKKyAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBjdXJyZW50TG9jYWxE ZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIGxvY2FsRGVzY3JpcHRpb24oKTsgfQor ICAgIFJlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb24+IHBlbmRpbmdMb2NhbERlc2NyaXB0aW9u KCkgY29uc3QgZmluYWwgeyByZXR1cm4gbG9jYWxEZXNjcmlwdGlvbigpOyB9CiAKLSAgICBSZWZQ dHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiByZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFs IHsgcmV0dXJuIG51bGxwdHI7IH0KLSAgICBSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBj dXJyZW50UmVtb3RlRGVzY3JpcHRpb24oKSBjb25zdCBmaW5hbCB7IHJldHVybiBudWxscHRyOyB9 Ci0gICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gcGVuZGluZ1JlbW90ZURlc2NyaXB0 aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbnVsbHB0cjsgfQorICAgIFJlZlB0cjxSVENTZXNz aW9uRGVzY3JpcHRpb24+IHJlbW90ZURlc2NyaXB0aW9uKCkgY29uc3QgZmluYWw7CisgICAgUmVm UHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gY3VycmVudFJlbW90ZURlc2NyaXB0aW9uKCkgY29u c3QgZmluYWwgeyByZXR1cm4gcmVtb3RlRGVzY3JpcHRpb24oKTsgfQorICAgIFJlZlB0cjxSVENT ZXNzaW9uRGVzY3JpcHRpb24+IHBlbmRpbmdSZW1vdGVEZXNjcmlwdGlvbigpIGNvbnN0IGZpbmFs IHsgcmV0dXJuIHJlbW90ZURlc2NyaXB0aW9uKCk7IH0KIAorICAgIC8vIEZJWE1FOiBBUEkgdG8g aW1wbGVtZW50IGZvciByZWFsCiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbT4+IGdldFJl bW90ZVN0cmVhbXMoKSBjb25zdCBmaW5hbCB7IHJldHVybiB7IH07IH0KLQogICAgIHZvaWQgcmVw bGFjZVRyYWNrKFJUQ1J0cFNlbmRlciYsIFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiYmLCBET01Q cm9taXNlPHZvaWQ+JiYpIGZpbmFsIHsgfQotCiAgICAgYm9vbCBpc05lZ290aWF0aW9uTmVlZGVk KCkgY29uc3QgZmluYWwgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2b2lkIG1hcmtBc05lZWRpbmdO ZWdvdGlhdGlvbigpIGZpbmFsOwogICAgIHZvaWQgY2xlYXJOZWdvdGlhdGlvbk5lZWRlZFN0YXRl KCkgZmluYWwgeyB9Cg==