147011 2015-07-16 13:54:59 -0700 Adding previewCaptureLayer to AVVideoCaptureSource 2015-07-22 21:16:39 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 147014 1 mdaiter mdaiter bfulgham commit-queue eric.carlson jonlee mdaiter webkit-bug-importer webkit.review.bot oldest_to_newest 1109950 0 mdaiter 2015-07-16 13:54:59 -0700 Needed to add this, so that on instantiation a captureSource has a layer that it can send to whatever platform needs it. 1109951 1 webkit-bug-importer 2015-07-16 13:56:04 -0700 <rdar://problem/21861999> 1109953 2 256921 mdaiter 2015-07-16 13:56:58 -0700 Created attachment 256921 Patch 1109959 3 256921 eric.carlson 2015-07-16 14:08:09 -0700 Comment on attachment 256921 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256921&action=review > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:49 > + virtual AVCaptureVideoPreviewLayer* previewLayer() { return m_videoPreviewLayer.get(); } Does this need to be virtual? > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:65 > + WTF::RetainPtr<AVCaptureVideoPreviewLayer> m_videoPreviewLayer; "WTF::" isn't needed. > Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:224 > + m_videoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:session()]; You need to use adoptNS. 1109960 4 256923 mdaiter 2015-07-16 14:11:32 -0700 Created attachment 256923 Patch 1109962 5 256921 mdaiter 2015-07-16 14:11:57 -0700 Comment on attachment 256921 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256921&action=review >> Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:49 >> + virtual AVCaptureVideoPreviewLayer* previewLayer() { return m_videoPreviewLayer.get(); } > > Does this need to be virtual? Fixed. >> Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h:65 >> + WTF::RetainPtr<AVCaptureVideoPreviewLayer> m_videoPreviewLayer; > > "WTF::" isn't needed. Fixed. >> Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:224 >> + m_videoPreviewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:session()]; > > You need to use adoptNS. Fixed. 1111572 6 256923 commit-queue 2015-07-22 21:16:36 -0700 Comment on attachment 256923 Patch Clearing flags on attachment: 256923 Committed r187208: <http://trac.webkit.org/changeset/187208> 1111573 7 commit-queue 2015-07-22 21:16:39 -0700 All reviewed patches have been landed. Closing bug. 256921 2015-07-16 13:56:58 -0700 2015-07-16 14:11:30 -0700 Patch bug-147011-20150716135552.patch text/plain 4153 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2RhMDM5ZTI2NzRmYTlh OGI0ODNlNWQ2NmQxMWMwY2EzNDc0YmQ0Yi4uMzk3MjE5OWJlYWQxODE0NjFlOGM1ZDQ5YmMzOTZh MTVkNTQyNjllYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA3LTE2ICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIE5lZWRlZCB0byBhZGQg bWV0aG9kcyB0byBnZXQgUHJldmlld0NhcHR1cmVMYXllcnMgZnJvbSBWaWRlbworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDExCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8yMTg2MTk5OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVy ZVNvdXJjZS5oOiBBZGRlZCBpbiBwcmV2aWV3CisgICAgICAgIGxheWVyIHRvIGNsYXNzCisgICAg ICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJldmlld0xheWVyKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW06IElu c3RhbnRpYXRlCisgICAgICAgIHByZXZpZXdMYXllciBvbiBsb2FkCisgICAgICAgIChXZWJDb3Jl OjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6c2V0dXBDYXB0dXJlU2Vzc2lvbik6CisKIDIwMTUtMDct MTYgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsIG91dCBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xODY5MDMuIEl0IGJy b2tlIHRoZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgKaW5kZXggMTFiOGZiNzAy YTU2ZWZiZWZlYjQ3NmQ4NmE2OWRkMDJlYzEyZjUyMS4uNWJkYWIxNjExZTBlOTQ4ZmU0OWExY2Ey OGFlZWQ1ZWM2NTE5NDg5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgKQEAgLTMwLDYg KzMwLDggQEAKIAogI2luY2x1ZGUgIkFWTWVkaWFDYXB0dXJlU291cmNlLmgiCiAKK09CSkNfQ0xB U1MgQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXI7CisKIHR5cGVkZWYgY29uc3Qgc3RydWN0IG9w YXF1ZUNNRm9ybWF0RGVzY3JpcHRpb24gKkNNRm9ybWF0RGVzY3JpcHRpb25SZWY7CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKQEAgLTQ0LDYgKzQ2LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50 MzJfdCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fd2lkdGg7IH0KICAgICB2aXJ0dWFsIGludDMy X3QgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9oZWlnaHQ7IH0KIAorICAgIHZpcnR1YWwgQVZD YXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXIqIHByZXZpZXdMYXllcigpIHsgcmV0dXJuIG1fdmlkZW9Q cmV2aWV3TGF5ZXIuZ2V0KCk7IH0KKyAgICAKIHByaXZhdGU6CiAgICAgQVZWaWRlb0NhcHR1cmVT b3VyY2UoQVZDYXB0dXJlRGV2aWNlKiwgY29uc3QgQXRvbWljU3RyaW5nJiwgUGFzc1JlZlB0cjxN ZWRpYUNvbnN0cmFpbnRzPik7CiAgICAgdmlydHVhbCB+QVZWaWRlb0NhcHR1cmVTb3VyY2UoKTsK QEAgLTU4LDYgKzYyLDcgQEAgcHJpdmF0ZToKIAogICAgIFJldGFpblB0cjxBVkNhcHR1cmVDb25u ZWN0aW9uPiBtX3ZpZGVvQ29ubmVjdGlvbjsKICAgICBSZXRhaW5QdHI8Q01Gb3JtYXREZXNjcmlw dGlvblJlZj4gbV92aWRlb0Zvcm1hdERlc2NyaXB0aW9uOworICAgIFdURjo6UmV0YWluUHRyPEFW Q2FwdHVyZVZpZGVvUHJldmlld0xheWVyPiBtX3ZpZGVvUHJldmlld0xheWVyOwogICAgIFZlY3Rv cjxGbG9hdDY0PiBtX3ZpZGVvRnJhbWVUaW1lU3RhbXBzOwogICAgIEZsb2F0NjQgbV9mcmFtZVJh dGU7CiAgICAgaW50MzJfdCBtX3dpZHRoOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCmlu ZGV4IDZhZWFhODZhMzkxNGVlZmMyYTNkNjU1ODZiYTljMDFkZTExMTJjYWEuLmQzMzQ1Mjc2ZWFk YjMxMDEwM2RkYWQyMWU1M2M1MTRlZDhlNzc2YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3Vy Y2UubW0KQEAgLTQ1LDYgKzQ1LDcgQEAgdHlwZWRlZiBBVkNhcHR1cmVEZXZpY2UgQVZDYXB0dXJl RGV2aWNlVHlwZTsKIHR5cGVkZWYgQVZDYXB0dXJlRGV2aWNlSW5wdXQgQVZDYXB0dXJlRGV2aWNl SW5wdXRUeXBlOwogdHlwZWRlZiBBVkNhcHR1cmVPdXRwdXQgQVZDYXB0dXJlT3V0cHV0VHlwZTsK IHR5cGVkZWYgQVZDYXB0dXJlVmlkZW9EYXRhT3V0cHV0IEFWQ2FwdHVyZVZpZGVvRGF0YU91dHB1 dFR5cGU7Cit0eXBlZGVmIEFWQ2FwdHVyZVZpZGVvUHJldmlld0xheWVyIEFWQ2FwdHVyZVZpZGVv UHJldmlld0xheWVyVHlwZTsKIAogU09GVF9MSU5LX0ZSQU1FV09SS19PUFRJT05BTChBVkZvdW5k YXRpb24pCiAKQEAgLTUzLDEyICs1NCwxNCBAQCBTT0ZUX0xJTktfQ0xBU1MoQVZGb3VuZGF0aW9u LCBBVkNhcHR1cmVEZXZpY2UpCiBTT0ZUX0xJTktfQ0xBU1MoQVZGb3VuZGF0aW9uLCBBVkNhcHR1 cmVEZXZpY2VJbnB1dCkKIFNPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRpb24sIEFWQ2FwdHVyZU91 dHB1dCkKIFNPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRpb24sIEFWQ2FwdHVyZVZpZGVvRGF0YU91 dHB1dCkKK1NPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRpb24sIEFWQ2FwdHVyZVZpZGVvUHJldmll d0xheWVyKQogCiAjZGVmaW5lIEFWQ2FwdHVyZUNvbm5lY3Rpb24gZ2V0QVZDYXB0dXJlQ29ubmVj dGlvbkNsYXNzKCkKICNkZWZpbmUgQVZDYXB0dXJlRGV2aWNlIGdldEFWQ2FwdHVyZURldmljZUNs YXNzKCkKICNkZWZpbmUgQVZDYXB0dXJlRGV2aWNlSW5wdXQgZ2V0QVZDYXB0dXJlRGV2aWNlSW5w dXRDbGFzcygpCiAjZGVmaW5lIEFWQ2FwdHVyZU91dHB1dCBnZXRBVkNhcHR1cmVPdXRwdXRDbGFz cygpCiAjZGVmaW5lIEFWQ2FwdHVyZVZpZGVvRGF0YU91dHB1dCBnZXRBVkNhcHR1cmVWaWRlb0Rh dGFPdXRwdXRDbGFzcygpCisjZGVmaW5lIEFWQ2FwdHVyZVZpZGVvUHJldmlld0xheWVyIGdldEFW Q2FwdHVyZVZpZGVvUHJldmlld0xheWVyQ2xhc3MoKQogCiBTT0ZUX0xJTktfUE9JTlRFUihBVkZv dW5kYXRpb24sIEFWTWVkaWFUeXBlQXVkaW8sIE5TU3RyaW5nICopCiBTT0ZUX0xJTktfUE9JTlRF UihBVkZvdW5kYXRpb24sIEFWTWVkaWFUeXBlVmlkZW8sIE5TU3RyaW5nICopCkBAIC0yMTcsNiAr MjIwLDggQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6c2V0dXBDYXB0dXJlU2Vzc2lvbigp CiAgICAgICAgIFtzZXNzaW9uKCkgYWRkT3V0cHV0OnZpZGVvT3V0cHV0LmdldCgpXTsKICAgICAK ICAgICBtX3ZpZGVvQ29ubmVjdGlvbiA9IGFkb3B0TlMoW3ZpZGVvT3V0cHV0LmdldCgpIGNvbm5l Y3Rpb25XaXRoTWVkaWFUeXBlOkFWTWVkaWFUeXBlVmlkZW9dKTsKKyAgICAKKyAgICBtX3ZpZGVv UHJldmlld0xheWVyID0gW1tBVkNhcHR1cmVWaWRlb1ByZXZpZXdMYXllciBhbGxvY10gaW5pdFdp dGhTZXNzaW9uOnNlc3Npb24oKV07CiB9CiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNh bGN1bGF0ZUZyYW1lcmF0ZShDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIpCg== 256923 2015-07-16 14:11:32 -0700 2015-07-22 21:16:36 -0700 Patch bug-147011-20150716141026.patch text/plain 4149 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2RhMDM5ZTI2NzRmYTlh OGI0ODNlNWQ2NmQxMWMwY2EzNDc0YmQ0Yi4uMzk3MjE5OWJlYWQxODE0NjFlOGM1ZDQ5YmMzOTZh MTVkNTQyNjllYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA3LTE2ICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIE5lZWRlZCB0byBhZGQg bWV0aG9kcyB0byBnZXQgUHJldmlld0NhcHR1cmVMYXllcnMgZnJvbSBWaWRlbworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDExCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8yMTg2MTk5OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVy ZVNvdXJjZS5oOiBBZGRlZCBpbiBwcmV2aWV3CisgICAgICAgIGxheWVyIHRvIGNsYXNzCisgICAg ICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJldmlld0xheWVyKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW06IElu c3RhbnRpYXRlCisgICAgICAgIHByZXZpZXdMYXllciBvbiBsb2FkCisgICAgICAgIChXZWJDb3Jl OjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6c2V0dXBDYXB0dXJlU2Vzc2lvbik6CisKIDIwMTUtMDct MTYgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsIG91dCBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xODY5MDMuIEl0IGJy b2tlIHRoZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgKaW5kZXggMTFiOGZiNzAy YTU2ZWZiZWZlYjQ3NmQ4NmE2OWRkMDJlYzEyZjUyMS4uNTAyZGFkZDYyY2Y3OTM5Mjg3ZTc1ZDU4 ZTI5ZmY4NGYxZjdkZjQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgKQEAgLTMwLDYg KzMwLDggQEAKIAogI2luY2x1ZGUgIkFWTWVkaWFDYXB0dXJlU291cmNlLmgiCiAKK09CSkNfQ0xB U1MgQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXI7CisKIHR5cGVkZWYgY29uc3Qgc3RydWN0IG9w YXF1ZUNNRm9ybWF0RGVzY3JpcHRpb24gKkNNRm9ybWF0RGVzY3JpcHRpb25SZWY7CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKQEAgLTQ0LDYgKzQ2LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50 MzJfdCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fd2lkdGg7IH0KICAgICB2aXJ0dWFsIGludDMy X3QgaGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9oZWlnaHQ7IH0KIAorICAgIEFWQ2FwdHVyZVZp ZGVvUHJldmlld0xheWVyKiBwcmV2aWV3TGF5ZXIoKSB7IHJldHVybiBtX3ZpZGVvUHJldmlld0xh eWVyLmdldCgpOyB9CisgICAgCiBwcml2YXRlOgogICAgIEFWVmlkZW9DYXB0dXJlU291cmNlKEFW Q2FwdHVyZURldmljZSosIGNvbnN0IEF0b21pY1N0cmluZyYsIFBhc3NSZWZQdHI8TWVkaWFDb25z dHJhaW50cz4pOwogICAgIHZpcnR1YWwgfkFWVmlkZW9DYXB0dXJlU291cmNlKCk7CkBAIC01OCw2 ICs2Miw3IEBAIHByaXZhdGU6CiAKICAgICBSZXRhaW5QdHI8QVZDYXB0dXJlQ29ubmVjdGlvbj4g bV92aWRlb0Nvbm5lY3Rpb247CiAgICAgUmV0YWluUHRyPENNRm9ybWF0RGVzY3JpcHRpb25SZWY+ IG1fdmlkZW9Gb3JtYXREZXNjcmlwdGlvbjsKKyAgICBSZXRhaW5QdHI8QVZDYXB0dXJlVmlkZW9Q cmV2aWV3TGF5ZXI+IG1fdmlkZW9QcmV2aWV3TGF5ZXI7CiAgICAgVmVjdG9yPEZsb2F0NjQ+IG1f dmlkZW9GcmFtZVRpbWVTdGFtcHM7CiAgICAgRmxvYXQ2NCBtX2ZyYW1lUmF0ZTsKICAgICBpbnQz Ml90IG1fd2lkdGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0KaW5kZXggNmFlYWE4NmEz OTE0ZWVmYzJhM2Q2NTU4NmJhOWMwMWRlMTExMmNhYS4uYTgzZDZkYWY1ZmNjZDlkYzNiN2RmNWZk YmFhNWJhYmVkYWUyM2FjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQpAQCAtNDUs NiArNDUsNyBAQCB0eXBlZGVmIEFWQ2FwdHVyZURldmljZSBBVkNhcHR1cmVEZXZpY2VUeXBlOwog dHlwZWRlZiBBVkNhcHR1cmVEZXZpY2VJbnB1dCBBVkNhcHR1cmVEZXZpY2VJbnB1dFR5cGU7CiB0 eXBlZGVmIEFWQ2FwdHVyZU91dHB1dCBBVkNhcHR1cmVPdXRwdXRUeXBlOwogdHlwZWRlZiBBVkNh cHR1cmVWaWRlb0RhdGFPdXRwdXQgQVZDYXB0dXJlVmlkZW9EYXRhT3V0cHV0VHlwZTsKK3R5cGVk ZWYgQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXIgQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXJU eXBlOwogCiBTT0ZUX0xJTktfRlJBTUVXT1JLX09QVElPTkFMKEFWRm91bmRhdGlvbikKIApAQCAt NTMsMTIgKzU0LDE0IEBAIFNPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRpb24sIEFWQ2FwdHVyZURl dmljZSkKIFNPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRpb24sIEFWQ2FwdHVyZURldmljZUlucHV0 KQogU09GVF9MSU5LX0NMQVNTKEFWRm91bmRhdGlvbiwgQVZDYXB0dXJlT3V0cHV0KQogU09GVF9M SU5LX0NMQVNTKEFWRm91bmRhdGlvbiwgQVZDYXB0dXJlVmlkZW9EYXRhT3V0cHV0KQorU09GVF9M SU5LX0NMQVNTKEFWRm91bmRhdGlvbiwgQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXIpCiAKICNk ZWZpbmUgQVZDYXB0dXJlQ29ubmVjdGlvbiBnZXRBVkNhcHR1cmVDb25uZWN0aW9uQ2xhc3MoKQog I2RlZmluZSBBVkNhcHR1cmVEZXZpY2UgZ2V0QVZDYXB0dXJlRGV2aWNlQ2xhc3MoKQogI2RlZmlu ZSBBVkNhcHR1cmVEZXZpY2VJbnB1dCBnZXRBVkNhcHR1cmVEZXZpY2VJbnB1dENsYXNzKCkKICNk ZWZpbmUgQVZDYXB0dXJlT3V0cHV0IGdldEFWQ2FwdHVyZU91dHB1dENsYXNzKCkKICNkZWZpbmUg QVZDYXB0dXJlVmlkZW9EYXRhT3V0cHV0IGdldEFWQ2FwdHVyZVZpZGVvRGF0YU91dHB1dENsYXNz KCkKKyNkZWZpbmUgQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXIgZ2V0QVZDYXB0dXJlVmlkZW9Q cmV2aWV3TGF5ZXJDbGFzcygpCiAKIFNPRlRfTElOS19QT0lOVEVSKEFWRm91bmRhdGlvbiwgQVZN ZWRpYVR5cGVBdWRpbywgTlNTdHJpbmcgKikKIFNPRlRfTElOS19QT0lOVEVSKEFWRm91bmRhdGlv biwgQVZNZWRpYVR5cGVWaWRlbywgTlNTdHJpbmcgKikKQEAgLTIxNyw2ICsyMjAsOCBAQCB2b2lk IEFWVmlkZW9DYXB0dXJlU291cmNlOjpzZXR1cENhcHR1cmVTZXNzaW9uKCkKICAgICAgICAgW3Nl c3Npb24oKSBhZGRPdXRwdXQ6dmlkZW9PdXRwdXQuZ2V0KCldOwogICAgIAogICAgIG1fdmlkZW9D b25uZWN0aW9uID0gYWRvcHROUyhbdmlkZW9PdXRwdXQuZ2V0KCkgY29ubmVjdGlvbldpdGhNZWRp YVR5cGU6QVZNZWRpYVR5cGVWaWRlb10pOworICAgIAorICAgIG1fdmlkZW9QcmV2aWV3TGF5ZXIg PSBhZG9wdE5TKFtbQVZDYXB0dXJlVmlkZW9QcmV2aWV3TGF5ZXIgYWxsb2NdIGluaXRXaXRoU2Vz c2lvbjpzZXNzaW9uKCldKTsKIH0KIAogdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FsY3Vs YXRlRnJhbWVyYXRlKENNU2FtcGxlQnVmZmVyUmVmIHNhbXBsZUJ1ZmZlcikK