147126 2015-07-20 15:21:57 -0700 Remove revealing getVideoTracks() and getAudioTracks() 2015-07-22 10:18:42 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 mdaiter mdaiter bfulgham commit-queue eric.carlson jonlee mdaiter webkit-bug-importer webkit.review.bot oldest_to_newest 1110777 0 mdaiter 2015-07-20 15:21:57 -0700 We need to remove these methods in order to not have to reveal anything we shouldn't be revealing. 1110778 1 webkit-bug-importer 2015-07-20 15:22:52 -0700 <rdar://problem/21908723> 1110782 2 257132 mdaiter 2015-07-20 15:25:49 -0700 Created attachment 257132 Patch 1110844 3 257132 eric.carlson 2015-07-20 17:30:13 -0700 Comment on attachment 257132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257132&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:140 > + m_MediaStreamPrivate->addTrack(&*track, MediaStreamPrivate::NotifyClientOption::DontNotify); &*track is strange. If the compiler requires "&*", can you get rid of it by explicitly declaring "type"'s track instead of using auto? > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:174 > return MediaPlayerPrivateInterface::platformLayer(); MediaPlayerPrivateInterface::platformLayer returns 0, why don't you just return nullptr here instead of calling it. > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:175 > + return (PlatformLayer*)m_previewLayer; You should use a C++ style cast here. 1111037 4 257132 mdaiter 2015-07-21 13:29:11 -0700 Comment on attachment 257132 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257132&action=review >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:140 >> + m_MediaStreamPrivate->addTrack(&*track, MediaStreamPrivate::NotifyClientOption::DontNotify); > > &*track is strange. If the compiler requires "&*", can you get rid of it by explicitly declaring "type"'s track instead of using auto? Better way of doing this: std::move() >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:174 >> return MediaPlayerPrivateInterface::platformLayer(); > > MediaPlayerPrivateInterface::platformLayer returns 0, why don't you just return nullptr here instead of calling it. Just wanted to call this for clarity. I can return a nullptr here. >> Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:175 >> + return (PlatformLayer*)m_previewLayer; > > You should use a C++ style cast here. Sure. static_cast<> it is. 1111042 5 257200 mdaiter 2015-07-21 13:31:46 -0700 Created attachment 257200 Patch 1111333 6 257200 commit-queue 2015-07-22 10:18:32 -0700 Comment on attachment 257200 Patch Clearing flags on attachment: 257200 Committed r187164: <http://trac.webkit.org/changeset/187164> 1111334 7 commit-queue 2015-07-22 10:18:42 -0700 All reviewed patches have been landed. Closing bug. 257132 2015-07-20 15:25:49 -0700 2015-07-21 13:31:44 -0700 Patch bug-147126-20150720152436.patch text/plain 11748 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDRiOGY0YzZmZGE4NzE4 YWIyYTZjNmY5ZjIyZTBlNjdhNjcyYWE1Ny4uZDc1NGZkODdjZTM2OGNlMDY3ODFlMTExNmI2Njk0 OWI2NmU5NDlkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA3LTIwICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSByZXZlYWxp bmcgZ2V0VmlkZW9UcmFja3MoKSBhbmQgZ2V0QXVkaW9UcmFja3MoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTI2CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8yMTkwODcyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW06CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Ok1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmxvYWQpOiBNb2RkZWQgdG8gdXNlCisg ICAgICAgIHRyYWNrcygpIGluc3RlYWQgb2YgZ2V0VmlkZW8vQXVkaW9UcmFja3MoKQorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9y bUxheWVyKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6cGxheUludGVybmFsKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cGF1c2VJbnRlcm5hbCk6IERpdHRv CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 OnNldE11dGVkKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQzo6bmF0dXJhbFNpemUpOiBEaXR0bworICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpoYXNWaWRlbyk6IERpdHRvCisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Omhh c0F1ZGlvKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6Y3VycmVudE1lZGlhVGltZSk6CisgICAgICAgIENoYW5nZWQgdG8gYSBG SVhNRQorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJpdmF0ZS5o OgorCiAyMDE1LTA3LTIwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBSb2xsb3V0IHIxODcwMjAgYW5kIHIxODcwMjE6IGJyZWFrcyBKU0MgQVBJIHRlc3RzIG9uIGRl YnVnIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW0uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW0uaAppbmRleCAwNjM4YzlkMjg3NWM5NDdiN2FkYjNjNTI1OTdiYWE3ZTRkMGExYzU2 Li5mZDU4ZGU1NWU2MGNjMjM4NWY5MGViYzc4ZWU3YWU2Yzg4MmNjOGZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCkBAIC02NCw4ICs2 NCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVRyYWNrKE1lZGlhU3RyZWFtVHJhY2sqKTsK ICAgICBNZWRpYVN0cmVhbVRyYWNrKiBnZXRUcmFja0J5SWQoU3RyaW5nKTsKIAotICAgIFZlY3Rv cjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4+IGdldEF1ZGlvVHJhY2tzKCkgb3ZlcnJpZGUgZmlu YWw7Ci0gICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPj4gZ2V0VmlkZW9UcmFja3Mo KSBvdmVycmlkZSBmaW5hbDsKKyAgICBWZWN0b3I8UmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+PiBn ZXRBdWRpb1RyYWNrcygpOworICAgIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4+IGdl dFZpZGVvVHJhY2tzKCk7CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPj4gZ2V0 VHJhY2tzKCkgY29uc3Q7CiAKICAgICBSZWZQdHI8TWVkaWFTdHJlYW0+IGNsb25lKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQy5oCmluZGV4IGYwYjg4MzVmMGE0MDE5ODRmNmY2OTExZTlhNDliYjk4 MmE5NDNlNWYuLmUzMWQ1NDMxMGNhNmFkZmYzMjkwNGEyN2Q2NTViMjdiYjA4OTY4MGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCkBAIC04MSw3ICs4MSw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBsb2FkKGNvbnN0IFN0cmluZyYsIE1lZGlhU291cmNlUHJpdmF0ZUNsaWVudCopIG92ZXJyaWRl IHsgfTsKICNlbmRpZgogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCi0gICAgdm9pZCBsb2FkKE1l ZGlhU3RyZWFtUHJpdmF0ZSopIG92ZXJyaWRlOworICAgIHZvaWQgbG9hZChNZWRpYVN0cmVhbVBy aXZhdGUmKSBvdmVycmlkZTsKICNlbmRpZgogICAgIHZvaWQgY2FuY2VsTG9hZCgpIG92ZXJyaWRl OwogCkBAIC0xNTEsNiArMTUxLDcgQEAgcHJpdmF0ZToKICAgICBXZWFrUHRyRmFjdG9yeTxNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM+IG1fd2Vha1B0ckZhY3Rvcnk7CiAgICAg UmVmUHRyPE1lZGlhU3RyZWFtUHJpdmF0ZUFWRk9iakM+IG1fTWVkaWFTdHJlYW1Qcml2YXRlOwog ICAgIFJldGFpblB0cjxBVkFzc2V0PiBtX2Fzc2V0OworICAgIFJldGFpblB0cjxBVkNhcHR1cmVW aWRlb1ByZXZpZXdMYXllcj4gbV9wcmV2aWV3TGF5ZXI7CiAgICAgUmV0YWluUHRyPEFWU2FtcGxl QnVmZmVyRGlzcGxheUxheWVyPiBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllcjsKICAgICBWZWN0 b3I8UmV0YWluUHRyPEFWU2FtcGxlQnVmZmVyQXVkaW9SZW5kZXJlcj4+IG1fc2FtcGxlQnVmZmVy QXVkaW9SZW5kZXJlcnM7CiAgICAgUmV0YWluUHRyPEFWU2FtcGxlQnVmZmVyUmVuZGVyU3luY2hy b25pemVyPiBtX3N5bmNocm9uaXplcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQppbmRleCBi ZTc4ZmExMDU3YTc3M2E1ZDk5OTkzN2ZmNTIzNjRmMDBiMzNjODk3Li4yYTc2YjQ5YTk4MWIyZjk2 YTVmZjMzNjJlZjVkYWIyN2JjNWMxZTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCkBA IC03OCw2ICs3OCw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6TWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDKE1lZGlhCiAgICAgLCBtX3NlZWtDb21w bGV0ZWQodHJ1ZSkKICAgICAsIG1fbG9hZGluZ1Byb2dyZXNzZWQoZmFsc2UpCiB7CisKIH0KIAog TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjp+TWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDKCkKQEAgLTEzMiwyNCArMTMzLDIxIEBAIE1lZGlhUGxheWVyOjpT dXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzdXBwb3J0 c1R5cGUoY29uCiAjcHJhZ21hIG1hcmsgLQogI3ByYWdtYSBtYXJrIE1lZGlhUGxheWVyUHJpdmF0 ZUludGVyZmFjZSBPdmVycmlkZXMKIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakM6OmxvYWQoTWVkaWFTdHJlYW1Qcml2YXRlKiBjbGllbnQpCit2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6bG9hZChNZWRpYVN0cmVhbVByaXZhdGUmIGNs aWVudCkKIHsKLSAgICBtX01lZGlhU3RyZWFtUHJpdmF0ZSA9IE1lZGlhU3RyZWFtUHJpdmF0ZUFW Rk9iakM6OmNyZWF0ZSh0aGlzLCBjbGllbnQtPmNsaWVudCgpKTsKLSAgICBmb3IgKGF1dG8gdHJh Y2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0ZS0+Y2xpZW50KCktPmdldFZpZGVvVHJhY2tzKCkpIHsK LSAgICAgICAgY2xpZW50LT5hZGRUcmFjaygmdHJhY2stPnByaXZhdGVUcmFjaygpLCBNZWRpYVN0 cmVhbVByaXZhdGU6Ok5vdGlmeUNsaWVudE9wdGlvbjo6RG9udE5vdGlmeSk7Ci0gICAgICAgIGNs aWVudC0+Y2xpZW50KCktPmRpZEFkZFRyYWNrVG9Qcml2YXRlKHRyYWNrLT5wcml2YXRlVHJhY2so KSk7Ci0gICAgICAgIGlmICh0cmFjay0+cmVhZHlTdGF0ZSgpID09ICJsaXZlIikgeworICAgIG1f TWVkaWFTdHJlYW1Qcml2YXRlID0gTWVkaWFTdHJlYW1Qcml2YXRlQVZGT2JqQzo6Y3JlYXRlKCp0 aGlzLCAqY2xpZW50LmNsaWVudCgpKTsKKyAgICBmb3IgKGF1dG8gdHJhY2sgOiBjbGllbnQudHJh Y2tzKCkpIHsKKyAgICAgICAgbV9NZWRpYVN0cmVhbVByaXZhdGUtPmFkZFRyYWNrKCYqdHJhY2ss IE1lZGlhU3RyZWFtUHJpdmF0ZTo6Tm90aWZ5Q2xpZW50T3B0aW9uOjpEb250Tm90aWZ5KTsKKyAg ICAgICAgbV9NZWRpYVN0cmVhbVByaXZhdGUtPmNsaWVudCgpLT5kaWRBZGRUcmFja1RvUHJpdmF0 ZSgqdHJhY2spOworICAgICAgICBpZiAoIXRyYWNrLT5lbmRlZCgpKSB7CiAgICAgICAgICAgICB0 cmFjay0+c291cmNlKCktPnN0YXJ0UHJvZHVjaW5nRGF0YSgpOwogICAgICAgICAgICAgdHJhY2st PnNldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgZm9yIChhdXRvIHRyYWNr IDogbV9NZWRpYVN0cmVhbVByaXZhdGUtPmNsaWVudCgpLT5nZXRBdWRpb1RyYWNrcygpKSB7Ci0g ICAgICAgIGNsaWVudC0+YWRkVHJhY2soJnRyYWNrLT5wcml2YXRlVHJhY2soKSwgTWVkaWFTdHJl YW1Qcml2YXRlOjpOb3RpZnlDbGllbnRPcHRpb246OkRvbnROb3RpZnkpOwotICAgICAgICBjbGll bnQtPmNsaWVudCgpLT5kaWRBZGRUcmFja1RvUHJpdmF0ZSh0cmFjay0+cHJpdmF0ZVRyYWNrKCkp OwotICAgICAgICBpZiAodHJhY2stPnJlYWR5U3RhdGUoKSA9PSAibGl2ZSIpIHsKLSAgICAgICAg ICAgIHRyYWNrLT5zb3VyY2UoKS0+c3RhcnRQcm9kdWNpbmdEYXRhKCk7Ci0gICAgICAgICAgICB0 cmFjay0+c2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgfQorICAgIG1fcHJldmlld0xheWVyID0g bnVsbHB0cjsKKyAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0ZS0+dHJh Y2tzKCkpIHsKKyAgICAgICAgaWYgKHRyYWNrLT50eXBlKCkgPT0gUmVhbHRpbWVNZWRpYVNvdXJj ZTo6VHlwZTo6VmlkZW8pCisgICAgICAgICAgICBtX3ByZXZpZXdMYXllciA9IHN0YXRpY19jYXN0 PEFWVmlkZW9DYXB0dXJlU291cmNlKj4odHJhY2stPnNvdXJjZSgpKS0+cHJldmlld0xheWVyKCk7 CiAgICAgfQogICAgIG1fcGxheWVyLT5jbGllbnQoKS5tZWRpYVBsYXllclJlbmRlcmluZ01vZGVD aGFuZ2VkKG1fcGxheWVyKTsKIH0KQEAgLTE3MiwxNCArMTcwLDkgQEAgUGxhdGZvcm1NZWRpYSBN ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnBsYXRmb3JtTWVkaWEoKSBjb25z dAogCiBQbGF0Zm9ybUxheWVyKiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAogewotICAgIGlmICghbV9NZWRpYVN0cmVhbVByaXZhdGUp CisgICAgaWYgKCFtX3ByZXZpZXdMYXllcikKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyUHJp dmF0ZUludGVyZmFjZTo6cGxhdGZvcm1MYXllcigpOwotICAgIGZvciAoYXV0byB0cmFjayA6IG1f TWVkaWFTdHJlYW1Qcml2YXRlLT5jbGllbnQoKS0+Z2V0VmlkZW9UcmFja3MoKSkgewotICAgICAg ICAvLyBGSVhNRSgxNDY4NTgpOiBKdXN0IGdyYWIgdGhlIGZpcnN0IHdlYmNhbSBmb3Igbm93LCB3 ZSBjYW4gbWFuYWdlIG1vcmUgbGF0ZXIKLSAgICAgICAgQVZWaWRlb0NhcHR1cmVTb3VyY2UqIGNh cHR1cmUgPSAoQVZWaWRlb0NhcHR1cmVTb3VyY2UqKXRyYWNrLT5zb3VyY2UoKTsKLSAgICAgICAg cmV0dXJuIChQbGF0Zm9ybUxheWVyKilbZ2V0QVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXJDbGFz cygpIGxheWVyV2l0aFNlc3Npb246Y2FwdHVyZS0+c2Vzc2lvbigpXTsKLSAgICB9Ci0gICAgcmV0 dXJuIE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZTo6cGxhdGZvcm1MYXllcigpOworICAgIHJl dHVybiAoUGxhdGZvcm1MYXllciopbV9wcmV2aWV3TGF5ZXI7CiB9CiAKIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF5KCkKQEAgLTE5OCw5ICsxOTEsNyBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cGxheUludGVybmFsKCkK ICAgICBpZiAoc2hvdWxkQmVQbGF5aW5nKCkpCiAgICAgICAgIFttX3N5bmNocm9uaXplciBzZXRS YXRlOm1fcmF0ZV07CiAKLSAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0 ZS0+Y2xpZW50KCktPmdldFZpZGVvVHJhY2tzKCkpCi0gICAgICAgIHRyYWNrLT5zb3VyY2UoKS0+ c3RhcnRQcm9kdWNpbmdEYXRhKCk7Ci0gICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRpYVN0cmVh bVByaXZhdGUtPmNsaWVudCgpLT5nZXRBdWRpb1RyYWNrcygpKQorICAgIGZvciAoYXV0byB0cmFj ayA6IG1fTWVkaWFTdHJlYW1Qcml2YXRlLT50cmFja3MoKSkKICAgICAgICAgdHJhY2stPnNvdXJj ZSgpLT5zdGFydFByb2R1Y2luZ0RhdGEoKTsKIH0KIApAQCAtMjE4LDkgKzIwOSw3IEBAIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwYXVzZUludGVybmFsKCkKIHsK ICAgICBtX3BsYXlpbmcgPSBmYWxzZTsKIAotICAgIGZvciAoYXV0byB0cmFjayA6IG1fTWVkaWFT dHJlYW1Qcml2YXRlLT5jbGllbnQoKS0+Z2V0VmlkZW9UcmFja3MoKSkKLSAgICAgICAgdHJhY2st PnNvdXJjZSgpLT5zdG9wUHJvZHVjaW5nRGF0YSgpOwotICAgIGZvciAoYXV0byB0cmFjayA6IG1f TWVkaWFTdHJlYW1Qcml2YXRlLT5jbGllbnQoKS0+Z2V0QXVkaW9UcmFja3MoKSkKKyAgICBmb3Ig KGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0ZS0+dHJhY2tzKCkpCiAgICAgICAgIHRy YWNrLT5zb3VyY2UoKS0+c3RvcFByb2R1Y2luZ0RhdGEoKTsKIH0KIApAQCAtMjQxLDIwICsyMzAs MjQgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnN1cHBvcnRz U2Nhbm5pbmcoKSBjb25zdAogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZG T2JqQzo6c2V0TXV0ZWQoYm9vbCBtdXRlZCkKIHsKLSAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01l ZGlhU3RyZWFtUHJpdmF0ZS0+Y2xpZW50KCktPmdldEF1ZGlvVHJhY2tzKCkpCi0gICAgICAgIHRy YWNrLT5zb3VyY2UoKS0+c2V0TXV0ZWQobXV0ZWQpOworICAgIGZvciAoYXV0byB0cmFjayA6IG1f TWVkaWFTdHJlYW1Qcml2YXRlLT50cmFja3MoKSkgeworICAgICAgICBpZiAodHJhY2stPnR5cGUo KSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbykKKyAgICAgICAgICAgIHRyYWNr LT5zb3VyY2UoKS0+c2V0TXV0ZWQobXV0ZWQpOworICAgIH0KIH0KIAogRmxvYXRTaXplIE1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6bmF0dXJhbFNpemUoKSBjb25zdAogewot ICAgIEZsb2F0U2l6ZSBmbG9hdFNpemU7Ci0gICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRpYVN0 cmVhbVByaXZhdGUtPmNsaWVudCgpLT5nZXRWaWRlb1RyYWNrcygpKSB7Ci0gICAgICAgIEFWVmlk ZW9DYXB0dXJlU291cmNlKiBzb3VyY2UgPSAoQVZWaWRlb0NhcHR1cmVTb3VyY2UqKXRyYWNrLT5z b3VyY2UoKTsKLSAgICAgICAgaWYgKCFzb3VyY2UtPnN0b3BwZWQoKSAmJiB0cmFjay0+ZW5hYmxl ZCgpKSB7Ci0gICAgICAgICAgICBpZiAoc291cmNlLT53aWR0aCgpID4gZmxvYXRTaXplLndpZHRo KCkpCi0gICAgICAgICAgICAgICAgZmxvYXRTaXplLnNldFdpZHRoKHNvdXJjZS0+d2lkdGgoKSk7 Ci0gICAgICAgICAgICBpZiAoc291cmNlLT5oZWlnaHQoKSA+IGZsb2F0U2l6ZS5oZWlnaHQoKSkK LSAgICAgICAgICAgICAgICBmbG9hdFNpemUuc2V0SGVpZ2h0KHNvdXJjZS0+aGVpZ2h0KCkpOwor ICAgIEZsb2F0U2l6ZSBmbG9hdFNpemUoMCwgMCk7CisgICAgZm9yIChhdXRvIHRyYWNrIDogbV9N ZWRpYVN0cmVhbVByaXZhdGUtPnRyYWNrcygpKSB7CisgICAgICAgIGlmICh0cmFjay0+dHlwZSgp ID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvKSB7CisgICAgICAgICAgICBBVlZp ZGVvQ2FwdHVyZVNvdXJjZSogc291cmNlID0gKEFWVmlkZW9DYXB0dXJlU291cmNlKil0cmFjay0+ c291cmNlKCk7CisgICAgICAgICAgICBpZiAoIXNvdXJjZS0+c3RvcHBlZCgpICYmIHRyYWNrLT5l bmFibGVkKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoc291cmNlLT53aWR0aCgpID4gZmxvYXRT aXplLndpZHRoKCkpCisgICAgICAgICAgICAgICAgICAgIGZsb2F0U2l6ZS5zZXRXaWR0aChzb3Vy Y2UtPndpZHRoKCkpOworICAgICAgICAgICAgICAgIGlmIChzb3VyY2UtPmhlaWdodCgpID4gZmxv YXRTaXplLmhlaWdodCgpKQorICAgICAgICAgICAgICAgICAgICBmbG9hdFNpemUuc2V0SGVpZ2h0 KHNvdXJjZS0+aGVpZ2h0KCkpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogICAg IHJldHVybiBmbG9hdFNpemU7CkBAIC0yNjIsMTIgKzI1NSwyMCBAQCBGbG9hdFNpemUgTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpuYXR1cmFsU2l6ZSgpIGNvbnN0CiAKIGJv b2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpoYXNWaWRlbygpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuICFtX01lZGlhU3RyZWFtUHJpdmF0ZS0+Y2xpZW50KCktPmdldFZpZGVv VHJhY2tzKCkuaXNFbXB0eSgpOworICAgIGZvciAoYXV0byB0cmFjayA6IG1fTWVkaWFTdHJlYW1Q cml2YXRlLT50cmFja3MoKSkgeworICAgICAgICBpZiAodHJhY2stPnR5cGUoKSA9PSBSZWFsdGlt ZU1lZGlhU291cmNlOjpUeXBlOjpWaWRlbykKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg IH0KKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT dHJlYW1BVkZPYmpDOjpoYXNBdWRpbygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuICFtX01lZGlhU3Ry ZWFtUHJpdmF0ZS0+Y2xpZW50KCktPmdldEF1ZGlvVHJhY2tzKCkuaXNFbXB0eSgpOworICAgIGZv ciAoYXV0byB0cmFjayA6IG1fTWVkaWFTdHJlYW1Qcml2YXRlLT50cmFja3MoKSkgeworICAgICAg ICBpZiAodHJhY2stPnR5cGUoKSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbykK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7CiB9CiAK IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRWaXNpYmxlKGJv b2wpCkBAIC0yODIsMTAgKzI4Myw4IEBAIE1lZGlhVGltZSBNZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakM6OmR1cmF0aW9uTWVkaWFUaW1lKCkgY29uc3QKIAogTWVkaWFUaW1lIE1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6Y3VycmVudE1lZGlhVGltZSgpIGNv bnN0CiB7Ci0gICAgTWVkaWFUaW1lIHN5bmNocm9uaXplclRpbWUgPSB0b01lZGlhVGltZShDTVRp bWViYXNlR2V0VGltZShbbV9zeW5jaHJvbml6ZXIgdGltZWJhc2VdKSk7Ci0gICAgaWYgKHN5bmNo cm9uaXplclRpbWUgPCBNZWRpYVRpbWU6Onplcm9UaW1lKCkpCi0gICAgICAgIHJldHVybiBNZWRp YVRpbWU6Onplcm9UaW1lKCk7Ci0gICAgcmV0dXJuIHN5bmNocm9uaXplclRpbWU7CisgICAgLy8g RklYTUUoMTQ3MTI1KTogTXVzdCBpbXBsZW1lbnQgdGhpcyBsYXRlcgorICAgIHJldHVybiBNZWRp YVRpbWU6Onplcm9UaW1lKCk7CiB9CiAKIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDOjpzZWVraW5nKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmgKaW5kZXggNmIxZGUyNzBm Mzk0OWQwMWE4OWQ3YzUyMTBkNTdjOWUzN2Y1OGI2NC4uMGQ4NjVkNmQ0YzI5YjdhYjAxYTY3NTM2 MTNjODZlOTBkNDIzYmJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmgKQEAgLTUzLDggKzUzLDYgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBhY3RpdmVTdGF0dXNDaGFuZ2VkKCkgPSAwOwogICAgIHZp cnR1YWwgdm9pZCBkaWRBZGRUcmFja1RvUHJpdmF0ZShNZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZSYp ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVtb3ZlVHJhY2tGcm9tUHJpdmF0ZShNZWRpYVN0 cmVhbVRyYWNrUHJpdmF0ZSYpID0gMDsKLSAgICB2aXJ0dWFsIFZlY3RvcjxSZWZQdHI8TWVkaWFT dHJlYW1UcmFjaz4+IGdldFZpZGVvVHJhY2tzKCkgPSAwOwotICAgIHZpcnR1YWwgVmVjdG9yPFJl ZlB0cjxNZWRpYVN0cmVhbVRyYWNrPj4gZ2V0QXVkaW9UcmFja3MoKSA9IDA7CiB9OwogCiBjbGFz cyBNZWRpYVN0cmVhbVByaXZhdGUgOiBwdWJsaWMgUmVmQ291bnRlZDxNZWRpYVN0cmVhbVByaXZh dGU+IHsK 257200 2015-07-21 13:31:46 -0700 2015-07-22 10:18:32 -0700 Patch bug-147126-20150721133033.patch text/plain 11795 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDRiOGY0YzZmZGE4NzE4 YWIyYTZjNmY5ZjIyZTBlNjdhNjcyYWE1Ny4uZDc1NGZkODdjZTM2OGNlMDY3ODFlMTExNmI2Njk0 OWI2NmU5NDlkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA3LTIwICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSByZXZlYWxp bmcgZ2V0VmlkZW9UcmFja3MoKSBhbmQgZ2V0QXVkaW9UcmFja3MoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTI2CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8yMTkwODcyMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW06CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Ok1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OmxvYWQpOiBNb2RkZWQgdG8gdXNlCisg ICAgICAgIHRyYWNrcygpIGluc3RlYWQgb2YgZ2V0VmlkZW8vQXVkaW9UcmFja3MoKQorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF0Zm9y bUxheWVyKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6cGxheUludGVybmFsKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6cGF1c2VJbnRlcm5hbCk6IERpdHRv CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 OnNldE11dGVkKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQzo6bmF0dXJhbFNpemUpOiBEaXR0bworICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpoYXNWaWRlbyk6IERpdHRvCisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Omhh c0F1ZGlvKTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlh U3RyZWFtQVZGT2JqQzo6Y3VycmVudE1lZGlhVGltZSk6CisgICAgICAgIENoYW5nZWQgdG8gYSBG SVhNRQorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUHJpdmF0ZS5o OgorCiAyMDE1LTA3LTIwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAg ICBSb2xsb3V0IHIxODcwMjAgYW5kIHIxODcwMjE6IGJyZWFrcyBKU0MgQVBJIHRlc3RzIG9uIGRl YnVnIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vTWVkaWFTdHJlYW0uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW0uaAppbmRleCAwNjM4YzlkMjg3NWM5NDdiN2FkYjNjNTI1OTdiYWE3ZTRkMGExYzU2 Li5mZDU4ZGU1NWU2MGNjMjM4NWY5MGViYzc4ZWU3YWU2Yzg4MmNjOGZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5oCkBAIC02NCw4ICs2 NCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZVRyYWNrKE1lZGlhU3RyZWFtVHJhY2sqKTsK ICAgICBNZWRpYVN0cmVhbVRyYWNrKiBnZXRUcmFja0J5SWQoU3RyaW5nKTsKIAotICAgIFZlY3Rv cjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4+IGdldEF1ZGlvVHJhY2tzKCkgb3ZlcnJpZGUgZmlu YWw7Ci0gICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPj4gZ2V0VmlkZW9UcmFja3Mo KSBvdmVycmlkZSBmaW5hbDsKKyAgICBWZWN0b3I8UmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+PiBn ZXRBdWRpb1RyYWNrcygpOworICAgIFZlY3RvcjxSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4+IGdl dFZpZGVvVHJhY2tzKCk7CiAgICAgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPj4gZ2V0 VHJhY2tzKCkgY29uc3Q7CiAKICAgICBSZWZQdHI8TWVkaWFTdHJlYW0+IGNsb25lKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU3RyZWFtQVZGT2JqQy5oCmluZGV4IGYwYjg4MzVmMGE0MDE5ODRmNmY2OTExZTlhNDliYjk4 MmE5NDNlNWYuLmUzMWQ1NDMxMGNhNmFkZmYzMjkwNGEyN2Q2NTViMjdiYjA4OTY4MGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQy5oCkBAIC04MSw3ICs4MSw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBsb2FkKGNvbnN0IFN0cmluZyYsIE1lZGlhU291cmNlUHJpdmF0ZUNsaWVudCopIG92ZXJyaWRl IHsgfTsKICNlbmRpZgogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCi0gICAgdm9pZCBsb2FkKE1l ZGlhU3RyZWFtUHJpdmF0ZSopIG92ZXJyaWRlOworICAgIHZvaWQgbG9hZChNZWRpYVN0cmVhbVBy aXZhdGUmKSBvdmVycmlkZTsKICNlbmRpZgogICAgIHZvaWQgY2FuY2VsTG9hZCgpIG92ZXJyaWRl OwogCkBAIC0xNTEsNiArMTUxLDcgQEAgcHJpdmF0ZToKICAgICBXZWFrUHRyRmFjdG9yeTxNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM+IG1fd2Vha1B0ckZhY3Rvcnk7CiAgICAg UmVmUHRyPE1lZGlhU3RyZWFtUHJpdmF0ZUFWRk9iakM+IG1fTWVkaWFTdHJlYW1Qcml2YXRlOwog ICAgIFJldGFpblB0cjxBVkFzc2V0PiBtX2Fzc2V0OworICAgIFJldGFpblB0cjxBVkNhcHR1cmVW aWRlb1ByZXZpZXdMYXllcj4gbV9wcmV2aWV3TGF5ZXI7CiAgICAgUmV0YWluUHRyPEFWU2FtcGxl QnVmZmVyRGlzcGxheUxheWVyPiBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllcjsKICAgICBWZWN0 b3I8UmV0YWluUHRyPEFWU2FtcGxlQnVmZmVyQXVkaW9SZW5kZXJlcj4+IG1fc2FtcGxlQnVmZmVy QXVkaW9SZW5kZXJlcnM7CiAgICAgUmV0YWluUHRyPEFWU2FtcGxlQnVmZmVyUmVuZGVyU3luY2hy b25pemVyPiBtX3N5bmNocm9uaXplcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQppbmRleCBi ZTc4ZmExMDU3YTc3M2E1ZDk5OTkzN2ZmNTIzNjRmMDBiMzNjODk3Li4zN2YxMGM2MmRlMDc3Yjc2 NzBkMDg2MGUxOWY1NDk1YzhkY2JiYjM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0 cmVhbUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCkBA IC03OCw2ICs3OCw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6TWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDKE1lZGlhCiAgICAgLCBtX3NlZWtDb21w bGV0ZWQodHJ1ZSkKICAgICAsIG1fbG9hZGluZ1Byb2dyZXNzZWQoZmFsc2UpCiB7CisKIH0KIAog TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjp+TWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDKCkKQEAgLTEzMiwyNCArMTMzLDIxIEBAIE1lZGlhUGxheWVyOjpT dXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzdXBwb3J0 c1R5cGUoY29uCiAjcHJhZ21hIG1hcmsgLQogI3ByYWdtYSBtYXJrIE1lZGlhUGxheWVyUHJpdmF0 ZUludGVyZmFjZSBPdmVycmlkZXMKIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakM6OmxvYWQoTWVkaWFTdHJlYW1Qcml2YXRlKiBjbGllbnQpCit2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6bG9hZChNZWRpYVN0cmVhbVByaXZhdGUmIGNs aWVudCkKIHsKLSAgICBtX01lZGlhU3RyZWFtUHJpdmF0ZSA9IE1lZGlhU3RyZWFtUHJpdmF0ZUFW Rk9iakM6OmNyZWF0ZSh0aGlzLCBjbGllbnQtPmNsaWVudCgpKTsKLSAgICBmb3IgKGF1dG8gdHJh Y2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0ZS0+Y2xpZW50KCktPmdldFZpZGVvVHJhY2tzKCkpIHsK LSAgICAgICAgY2xpZW50LT5hZGRUcmFjaygmdHJhY2stPnByaXZhdGVUcmFjaygpLCBNZWRpYVN0 cmVhbVByaXZhdGU6Ok5vdGlmeUNsaWVudE9wdGlvbjo6RG9udE5vdGlmeSk7Ci0gICAgICAgIGNs aWVudC0+Y2xpZW50KCktPmRpZEFkZFRyYWNrVG9Qcml2YXRlKHRyYWNrLT5wcml2YXRlVHJhY2so KSk7Ci0gICAgICAgIGlmICh0cmFjay0+cmVhZHlTdGF0ZSgpID09ICJsaXZlIikgeworICAgIG1f TWVkaWFTdHJlYW1Qcml2YXRlID0gTWVkaWFTdHJlYW1Qcml2YXRlQVZGT2JqQzo6Y3JlYXRlKCp0 aGlzLCAqY2xpZW50LmNsaWVudCgpKTsKKyAgICBmb3IgKGF1dG8gdHJhY2sgOiBjbGllbnQudHJh Y2tzKCkpIHsKKyAgICAgICAgbV9NZWRpYVN0cmVhbVByaXZhdGUtPmFkZFRyYWNrKFdURjo6bW92 ZSh0cmFjayksIE1lZGlhU3RyZWFtUHJpdmF0ZTo6Tm90aWZ5Q2xpZW50T3B0aW9uOjpEb250Tm90 aWZ5KTsKKyAgICAgICAgbV9NZWRpYVN0cmVhbVByaXZhdGUtPmNsaWVudCgpLT5kaWRBZGRUcmFj a1RvUHJpdmF0ZSgqdHJhY2spOworICAgICAgICBpZiAoIXRyYWNrLT5lbmRlZCgpKSB7CiAgICAg ICAgICAgICB0cmFjay0+c291cmNlKCktPnN0YXJ0UHJvZHVjaW5nRGF0YSgpOwogICAgICAgICAg ICAgdHJhY2stPnNldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgZm9yIChh dXRvIHRyYWNrIDogbV9NZWRpYVN0cmVhbVByaXZhdGUtPmNsaWVudCgpLT5nZXRBdWRpb1RyYWNr cygpKSB7Ci0gICAgICAgIGNsaWVudC0+YWRkVHJhY2soJnRyYWNrLT5wcml2YXRlVHJhY2soKSwg TWVkaWFTdHJlYW1Qcml2YXRlOjpOb3RpZnlDbGllbnRPcHRpb246OkRvbnROb3RpZnkpOwotICAg ICAgICBjbGllbnQtPmNsaWVudCgpLT5kaWRBZGRUcmFja1RvUHJpdmF0ZSh0cmFjay0+cHJpdmF0 ZVRyYWNrKCkpOwotICAgICAgICBpZiAodHJhY2stPnJlYWR5U3RhdGUoKSA9PSAibGl2ZSIpIHsK LSAgICAgICAgICAgIHRyYWNrLT5zb3VyY2UoKS0+c3RhcnRQcm9kdWNpbmdEYXRhKCk7Ci0gICAg ICAgICAgICB0cmFjay0+c2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgfQorICAgIG1fcHJldmll d0xheWVyID0gbnVsbHB0cjsKKyAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJp dmF0ZS0+dHJhY2tzKCkpIHsKKyAgICAgICAgaWYgKHRyYWNrLT50eXBlKCkgPT0gUmVhbHRpbWVN ZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW8pCisgICAgICAgICAgICBtX3ByZXZpZXdMYXllciA9IHN0 YXRpY19jYXN0PEFWVmlkZW9DYXB0dXJlU291cmNlKj4odHJhY2stPnNvdXJjZSgpKS0+cHJldmll d0xheWVyKCk7CiAgICAgfQogICAgIG1fcGxheWVyLT5jbGllbnQoKS5tZWRpYVBsYXllclJlbmRl cmluZ01vZGVDaGFuZ2VkKG1fcGxheWVyKTsKIH0KQEAgLTE3MiwxNCArMTcwLDkgQEAgUGxhdGZv cm1NZWRpYSBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnBsYXRmb3JtTWVk aWEoKSBjb25zdAogCiBQbGF0Zm9ybUxheWVyKiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVh bUFWRk9iakM6OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAogewotICAgIGlmICghbV9NZWRpYVN0cmVh bVByaXZhdGUpCi0gICAgICAgIHJldHVybiBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OnBs YXRmb3JtTGF5ZXIoKTsKLSAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0 ZS0+Y2xpZW50KCktPmdldFZpZGVvVHJhY2tzKCkpIHsKLSAgICAgICAgLy8gRklYTUUoMTQ2ODU4 KTogSnVzdCBncmFiIHRoZSBmaXJzdCB3ZWJjYW0gZm9yIG5vdywgd2UgY2FuIG1hbmFnZSBtb3Jl IGxhdGVyCi0gICAgICAgIEFWVmlkZW9DYXB0dXJlU291cmNlKiBjYXB0dXJlID0gKEFWVmlkZW9D YXB0dXJlU291cmNlKil0cmFjay0+c291cmNlKCk7Ci0gICAgICAgIHJldHVybiAoUGxhdGZvcm1M YXllciopW2dldEFWQ2FwdHVyZVZpZGVvUHJldmlld0xheWVyQ2xhc3MoKSBsYXllcldpdGhTZXNz aW9uOmNhcHR1cmUtPnNlc3Npb24oKV07Ci0gICAgfQotICAgIHJldHVybiBNZWRpYVBsYXllclBy aXZhdGVJbnRlcmZhY2U6OnBsYXRmb3JtTGF5ZXIoKTsKKyAgICBpZiAoIW1fcHJldmlld0xheWVy KQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UGxhdGZv cm1MYXllcio+KG1fcHJldmlld0xheWVyKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakM6OnBsYXkoKQpAQCAtMTk4LDkgKzE5MSw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpwbGF5SW50ZXJuYWwoKQogICAgIGlmIChz aG91bGRCZVBsYXlpbmcoKSkKICAgICAgICAgW21fc3luY2hyb25pemVyIHNldFJhdGU6bV9yYXRl XTsKIAotICAgIGZvciAoYXV0byB0cmFjayA6IG1fTWVkaWFTdHJlYW1Qcml2YXRlLT5jbGllbnQo KS0+Z2V0VmlkZW9UcmFja3MoKSkKLSAgICAgICAgdHJhY2stPnNvdXJjZSgpLT5zdGFydFByb2R1 Y2luZ0RhdGEoKTsKLSAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0ZS0+ Y2xpZW50KCktPmdldEF1ZGlvVHJhY2tzKCkpCisgICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRp YVN0cmVhbVByaXZhdGUtPnRyYWNrcygpKQogICAgICAgICB0cmFjay0+c291cmNlKCktPnN0YXJ0 UHJvZHVjaW5nRGF0YSgpOwogfQogCkBAIC0yMTgsOSArMjA5LDcgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnBhdXNlSW50ZXJuYWwoKQogewogICAgIG1fcGxh eWluZyA9IGZhbHNlOwogCi0gICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRpYVN0cmVhbVByaXZh dGUtPmNsaWVudCgpLT5nZXRWaWRlb1RyYWNrcygpKQotICAgICAgICB0cmFjay0+c291cmNlKCkt PnN0b3BQcm9kdWNpbmdEYXRhKCk7Ci0gICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRpYVN0cmVh bVByaXZhdGUtPmNsaWVudCgpLT5nZXRBdWRpb1RyYWNrcygpKQorICAgIGZvciAoYXV0byB0cmFj ayA6IG1fTWVkaWFTdHJlYW1Qcml2YXRlLT50cmFja3MoKSkKICAgICAgICAgdHJhY2stPnNvdXJj ZSgpLT5zdG9wUHJvZHVjaW5nRGF0YSgpOwogfQogCkBAIC0yNDEsMjAgKzIzMCwyNCBAQCBib29s IE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6c3VwcG9ydHNTY2FubmluZygp IGNvbnN0CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRN dXRlZChib29sIG11dGVkKQogewotICAgIGZvciAoYXV0byB0cmFjayA6IG1fTWVkaWFTdHJlYW1Q cml2YXRlLT5jbGllbnQoKS0+Z2V0QXVkaW9UcmFja3MoKSkKLSAgICAgICAgdHJhY2stPnNvdXJj ZSgpLT5zZXRNdXRlZChtdXRlZCk7CisgICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRpYVN0cmVh bVByaXZhdGUtPnRyYWNrcygpKSB7CisgICAgICAgIGlmICh0cmFjay0+dHlwZSgpID09IFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKQorICAgICAgICAgICAgdHJhY2stPnNvdXJjZSgp LT5zZXRNdXRlZChtdXRlZCk7CisgICAgfQogfQogCiBGbG9hdFNpemUgTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpuYXR1cmFsU2l6ZSgpIGNvbnN0CiB7Ci0gICAgRmxvYXRT aXplIGZsb2F0U2l6ZTsKLSAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFtUHJpdmF0 ZS0+Y2xpZW50KCktPmdldFZpZGVvVHJhY2tzKCkpIHsKLSAgICAgICAgQVZWaWRlb0NhcHR1cmVT b3VyY2UqIHNvdXJjZSA9IChBVlZpZGVvQ2FwdHVyZVNvdXJjZSopdHJhY2stPnNvdXJjZSgpOwot ICAgICAgICBpZiAoIXNvdXJjZS0+c3RvcHBlZCgpICYmIHRyYWNrLT5lbmFibGVkKCkpIHsKLSAg ICAgICAgICAgIGlmIChzb3VyY2UtPndpZHRoKCkgPiBmbG9hdFNpemUud2lkdGgoKSkKLSAgICAg ICAgICAgICAgICBmbG9hdFNpemUuc2V0V2lkdGgoc291cmNlLT53aWR0aCgpKTsKLSAgICAgICAg ICAgIGlmIChzb3VyY2UtPmhlaWdodCgpID4gZmxvYXRTaXplLmhlaWdodCgpKQotICAgICAgICAg ICAgICAgIGZsb2F0U2l6ZS5zZXRIZWlnaHQoc291cmNlLT5oZWlnaHQoKSk7CisgICAgRmxvYXRT aXplIGZsb2F0U2l6ZSgwLCAwKTsKKyAgICBmb3IgKGF1dG8gdHJhY2sgOiBtX01lZGlhU3RyZWFt UHJpdmF0ZS0+dHJhY2tzKCkpIHsKKyAgICAgICAgaWYgKHRyYWNrLT50eXBlKCkgPT0gUmVhbHRp bWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW8pIHsKKyAgICAgICAgICAgIEFWVmlkZW9DYXB0dXJl U291cmNlKiBzb3VyY2UgPSAoQVZWaWRlb0NhcHR1cmVTb3VyY2UqKXRyYWNrLT5zb3VyY2UoKTsK KyAgICAgICAgICAgIGlmICghc291cmNlLT5zdG9wcGVkKCkgJiYgdHJhY2stPmVuYWJsZWQoKSkg eworICAgICAgICAgICAgICAgIGlmIChzb3VyY2UtPndpZHRoKCkgPiBmbG9hdFNpemUud2lkdGgo KSkKKyAgICAgICAgICAgICAgICAgICAgZmxvYXRTaXplLnNldFdpZHRoKHNvdXJjZS0+d2lkdGgo KSk7CisgICAgICAgICAgICAgICAgaWYgKHNvdXJjZS0+aGVpZ2h0KCkgPiBmbG9hdFNpemUuaGVp Z2h0KCkpCisgICAgICAgICAgICAgICAgICAgIGZsb2F0U2l6ZS5zZXRIZWlnaHQoc291cmNlLT5o ZWlnaHQoKSk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIGZs b2F0U2l6ZTsKQEAgLTI2MiwxMiArMjU1LDIwIEBAIEZsb2F0U2l6ZSBNZWRpYVBsYXllclByaXZh dGVNZWRpYVN0cmVhbUFWRk9iakM6Om5hdHVyYWxTaXplKCkgY29uc3QKIAogYm9vbCBNZWRpYVBs YXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6Omhhc1ZpZGVvKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gIW1fTWVkaWFTdHJlYW1Qcml2YXRlLT5jbGllbnQoKS0+Z2V0VmlkZW9UcmFja3MoKS5p c0VtcHR5KCk7CisgICAgZm9yIChhdXRvIHRyYWNrIDogbV9NZWRpYVN0cmVhbVByaXZhdGUtPnRy YWNrcygpKSB7CisgICAgICAgIGlmICh0cmFjay0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3Vy Y2U6OlR5cGU6OlZpZGVvKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJl dHVybiBmYWxzZTsKIH0KIAogYm9vbCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9i akM6Omhhc0F1ZGlvKCkgY29uc3QKIHsKLSAgICByZXR1cm4gIW1fTWVkaWFTdHJlYW1Qcml2YXRl LT5jbGllbnQoKS0+Z2V0QXVkaW9UcmFja3MoKS5pc0VtcHR5KCk7CisgICAgZm9yIChhdXRvIHRy YWNrIDogbV9NZWRpYVN0cmVhbVByaXZhdGUtPnRyYWNrcygpKSB7CisgICAgICAgIGlmICh0cmFj ay0+dHlwZSgpID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvKQorICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6OnNldFZpc2libGUoYm9vbCkKQEAgLTI4 MiwxMCArMjgzLDggQEAgTWVkaWFUaW1lIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZG T2JqQzo6ZHVyYXRpb25NZWRpYVRpbWUoKSBjb25zdAogCiBNZWRpYVRpbWUgTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpjdXJyZW50TWVkaWFUaW1lKCkgY29uc3QKIHsKLSAg ICBNZWRpYVRpbWUgc3luY2hyb25pemVyVGltZSA9IHRvTWVkaWFUaW1lKENNVGltZWJhc2VHZXRU aW1lKFttX3N5bmNocm9uaXplciB0aW1lYmFzZV0pKTsKLSAgICBpZiAoc3luY2hyb25pemVyVGlt ZSA8IE1lZGlhVGltZTo6emVyb1RpbWUoKSkKLSAgICAgICAgcmV0dXJuIE1lZGlhVGltZTo6emVy b1RpbWUoKTsKLSAgICByZXR1cm4gc3luY2hyb25pemVyVGltZTsKKyAgICAvLyBGSVhNRSgxNDcx MjUpOiBNdXN0IGltcGxlbWVudCB0aGlzIGxhdGVyCisgICAgcmV0dXJuIE1lZGlhVGltZTo6emVy b1RpbWUoKTsKIH0KIAogYm9vbCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakM6 OnNlZWtpbmcoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vTWVkaWFTdHJlYW1Qcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVByaXZhdGUuaAppbmRleCA2YjFkZTI3MGYzOTQ5ZDAxYTg5 ZDdjNTIxMGQ1N2M5ZTM3ZjU4YjY0Li4wZDg2NWQ2ZDRjMjliN2FiMDFhNjc1MzYxM2M4NmU5MGQ0 MjNiYmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVByaXZhdGUuaApAQCAtNTMsOCArNTMsNiBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGFjdGl2ZVN0YXR1c0NoYW5nZWQoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IGRpZEFkZFRyYWNrVG9Qcml2YXRlKE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJikgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBkaWRSZW1vdmVUcmFja0Zyb21Qcml2YXRlKE1lZGlhU3RyZWFtVHJhY2tQ cml2YXRlJikgPSAwOwotICAgIHZpcnR1YWwgVmVjdG9yPFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNr Pj4gZ2V0VmlkZW9UcmFja3MoKSA9IDA7Ci0gICAgdmlydHVhbCBWZWN0b3I8UmVmUHRyPE1lZGlh U3RyZWFtVHJhY2s+PiBnZXRBdWRpb1RyYWNrcygpID0gMDsKIH07CiAKIGNsYXNzIE1lZGlhU3Ry ZWFtUHJpdmF0ZSA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU3RyZWFtUHJpdmF0ZT4gewo=