147117 2015-07-20 12:16:59 -0700 Exposed method to query device by UID 2015-07-21 17:07:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 147131 147062 1 mdaiter mdaiter bfulgham commit-queue eric.carlson jeremyj-wk jonlee mdaiter webkit-bug-importer webkit.review.bot oldest_to_newest 1110706 0 mdaiter 2015-07-20 12:16:59 -0700 Needed for getting devices from Safari by UID. 1110708 1 webkit-bug-importer 2015-07-20 12:18:13 -0700 <rdar://problem/21904678> 1110709 2 257116 mdaiter 2015-07-20 12:20:26 -0700 Created attachment 257116 Patch 1110746 3 257116 eric.carlson 2015-07-20 13:51:08 -0700 Comment on attachment 257116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257116&action=review > Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h:53 > + RefPtr<RealtimeMediaSource> sourceWithUID(String&, RealtimeMediaSource::Type, RefPtr<MediaConstraints>&&); Ref&& seems wrong unless you are passing ownership of the RefPtr (https://www.webkit.org/coding/RefPtr.html). Because this argument is optional (I think), it should be a MediaConstraints*. > Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:427 > + AVCaptureDeviceType *device = [AVCaptureDevice deviceWithUniqueID:captureDevice.m_captureDeviceID]; > + ASSERT(device); captureDevice.m_captureDeviceID is set from device.uniqueID, so can you short circuit the lookup: if (captureDevice.m_captureDeviceID != deviceUID) continue; > Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:436 > + if (type == RealtimeMediaSource::Type::Audio && !captureDevice.m_audioSourceId.isEmpty()) { > + captureDevice.m_audioSource = AVAudioCaptureSource::create(device, captureDevice.m_audioSourceId, constraints); > + return captureDevice.m_audioSource; > + } > + if (type == RealtimeMediaSource::Type::Video && !captureDevice.m_videoSourceId.isEmpty()) { > + captureDevice.m_videoSource = AVVideoCaptureSource::create(device, captureDevice.m_videoSourceId, constraints); > + return captureDevice.m_videoSource; > + } Don't you also need to consider constraints: String invalidConstraint; AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(type, constraints, invalidConstraint); if (!invalidConstraint.isEmpty()) continue; 1110820 4 257145 mdaiter 2015-07-20 16:48:11 -0700 Created attachment 257145 Patch 1110823 5 257116 mdaiter 2015-07-20 16:51:03 -0700 Comment on attachment 257116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257116&action=review >> Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h:53 >> + RefPtr<RealtimeMediaSource> sourceWithUID(String&, RealtimeMediaSource::Type, RefPtr<MediaConstraints>&&); > > Ref&& seems wrong unless you are passing ownership of the RefPtr (https://www.webkit.org/coding/RefPtr.html). Because this argument is optional (I think), it should be a MediaConstraints*. The RefPtr.html page said that the methods should be implemented with a RefPtr or Ref reference reference in the place of a PassRefPtr. However, the argument could be a raw pointer instead. Fixed. 1110829 6 eric.carlson 2015-07-20 17:07:54 -0700 (In reply to comment #5) > Comment on attachment 257116 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257116&action=review > > >> Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h:53 > >> + RefPtr<RealtimeMediaSource> sourceWithUID(String&, RealtimeMediaSource::Type, RefPtr<MediaConstraints>&&); > > > > Ref&& seems wrong unless you are passing ownership of the RefPtr (https://www.webkit.org/coding/RefPtr.html). Because this argument is optional (I think), it should be a MediaConstraints*. > > The RefPtr.html page said that the methods should be implemented with a > RefPtr or Ref reference reference in the place of a PassRefPtr. However, the > argument could be a raw pointer instead. > Fixed. Yes, but Ref&& should be used when passing ownership of an object: If a function does take ownership of an object, the argument should be a Ref&& or a RefPtr&&. This includes many setter functions. 1110836 7 257145 eric.carlson 2015-07-20 17:13:08 -0700 Comment on attachment 257145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257145&action=review > Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:429 > + String invalidConstraints; > + AVCaptureDeviceManager::singleton().verifyConstraintsForMediaType(type, constraints, invalidConstraints); > + if (!invalidConstraints.isEmpty()) > + continue; This should be wrapped with a "if (constraints) { ... }" > Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:434 > + if (captureDevice.m_captureDeviceID != deviceUID) > + continue; This is cheap, it should be done before the verifyConstraintsForMediaType() call 1110838 8 257145 mdaiter 2015-07-20 17:15:46 -0700 Comment on attachment 257145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257145&action=review >> Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:429 >> + continue; > > This should be wrapped with a "if (constraints) { ... }" Fixed. >> Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:434 >> + continue; > > This is cheap, it should be done before the verifyConstraintsForMediaType() call Fixed. 1110839 9 257152 mdaiter 2015-07-20 17:16:19 -0700 Created attachment 257152 Patch 1111134 10 257152 commit-queue 2015-07-21 17:07:24 -0700 Comment on attachment 257152 Patch Clearing flags on attachment: 257152 Committed r187140: <http://trac.webkit.org/changeset/187140> 1111135 11 commit-queue 2015-07-21 17:07:27 -0700 All reviewed patches have been landed. Closing bug. 257116 2015-07-20 12:20:26 -0700 2015-07-20 16:48:08 -0700 Patch bug-147117-20150720121923.patch text/plain 3780 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNlOTJhM2M2YWMzMzk3 OGZlNDhiMmI0MGMxNzM0NTg5MmY4MmQzMS4uMzJiMjVlZWIwNmY3ZTI3MDRmNmFhMTUyODE4NjY0 OGRlNjNiM2E5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA3LTIwICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9zZWQgbWV0aG9k IHRvIHF1ZXJ5IGRldmljZSBieSBVSUQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzExNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjE5MDQ2Nzg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5oOiBBZGRlZCBtZXRo b2QgdG8KKyAgICAgICAgcXVlcnkgZGV2aWNlIGJ5IFVJRAorICAgICAgICAqIHBsYXRmb3JtL21l ZGlhc3RyZWFtL21hYy9BVkNhcHR1cmVEZXZpY2VNYW5hZ2VyLm1tOiBEaXR0bworICAgICAgICAo V2ViQ29yZTo6QVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6c291cmNlV2l0aFVJRCk6IERpdHRvCisK IDIwMTUtMDctMTcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog ICAgICAgICBWaWRlbyBwb3N0ZXJzIGRpc2FwcGVhciBvbmNlIG1lZGlhIGhhcyBsb2FkZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVkNhcHR1 cmVEZXZpY2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9t YWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5oCmluZGV4IGRkOGU1NTRhNDIwMjRhZDhkZDY5ODMy YzI1MzQ1YjcyMDBhNmIxM2MuLjE4ZjhhN2I5NDA4ZDE5MThiNGUxZmIxZmVkMzFmZGE4Yjk0ZjNi ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9B VkNhcHR1cmVEZXZpY2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWQ2FwdHVyZURldmljZU1hbmFnZXIuaApAQCAtNTAsNiArNTAsNyBAQCBw dWJsaWM6CiAgICAgVmVjdG9yPFJlZlB0cjxUcmFja1NvdXJjZUluZm8+PiBnZXRTb3VyY2VzSW5m byhjb25zdCBTdHJpbmcmKTsKICAgICBib29sIHZlcmlmeUNvbnN0cmFpbnRzRm9yTWVkaWFUeXBl KFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUsIE1lZGlhQ29uc3RyYWludHMqLCBTdHJpbmcmKTsK ICAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gYmVzdFNvdXJjZUZvclR5cGVBbmRDb25z dHJhaW50cyhSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3Ry YWludHM+KTsKKyAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gc291cmNlV2l0aFVJRChT dHJpbmcmLCBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlLCBSZWZQdHI8TWVkaWFDb25zdHJhaW50 cz4mJik7CiAKICAgICBlbnVtIFZhbGlkQ29uc3RyYWludHMgeyBXaWR0aCA9IDAsIEhlaWdodCwg RnJhbWVSYXRlLCBGYWNpbmdNb2RlLCBHYWluIH07CiAgICAgc3RhdGljIGNvbnN0IFZlY3RvcjxB dG9taWNTdHJpbmc+JiB2YWxpZENvbnN0cmFpbnROYW1lcygpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWQ2FwdHVyZURldmljZU1hbmFnZXIu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2 aWNlTWFuYWdlci5tbQppbmRleCBkZTc5MTUwYzU1MjBjZjc0YWJlZTQ0ODhmNWQzZmI5M2EwMzI2 ZTc4Li5jNGRkZTYzMjJlMmU1ZDVhZWZlMzY4NzQ4MWMzMTVmNWI1OGMzYWExIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNl TWFuYWdlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv QVZDYXB0dXJlRGV2aWNlTWFuYWdlci5tbQpAQCAtNDEzLDYgKzQxMywzNCBAQCBSZWZQdHI8UmVh bHRpbWVNZWRpYVNvdXJjZT4gQVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6YmVzdFNvdXJjZUZvclR5 cGVBbmRDb25zdHJhaQogICAgIHJldHVybiAwOwogfQogCitSZWZQdHI8UmVhbHRpbWVNZWRpYVNv dXJjZT4gQVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6c291cmNlV2l0aFVJRChTdHJpbmcgJmRldmlj ZVVJRCwgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0eXBlLCBSZWZQdHI8TWVkaWFDb25zdHJh aW50cz4mJiBjb25zdHJhaW50cykKK3sKKyAgICBpZiAoIWlzQXZhaWxhYmxlKCkpCisgICAgICAg IHJldHVybiAwOworICAgIAorICAgIFZlY3RvcjxDYXB0dXJlRGV2aWNlPiYgZGV2aWNlcyA9IGNh cHR1cmVEZXZpY2VMaXN0KCk7CisgICAgZm9yIChhdXRvIGNhcHR1cmVEZXZpY2UgOiBkZXZpY2Vz KSB7CisgICAgICAgIGlmICghY2FwdHVyZURldmljZS5tX2VuYWJsZWQpCisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgCisgICAgICAgIEFWQ2FwdHVyZURldmljZVR5cGUgKmRldmljZSA9 IFtBVkNhcHR1cmVEZXZpY2UgZGV2aWNlV2l0aFVuaXF1ZUlEOmNhcHR1cmVEZXZpY2UubV9jYXB0 dXJlRGV2aWNlSURdOworICAgICAgICBBU1NFUlQoZGV2aWNlKTsKKyAgICAgICAgaWYgKFN0cmlu ZyhbZGV2aWNlIHVuaXF1ZUlEXSkgPT0gZGV2aWNlVUlEKSB7CisgICAgICAgICAgICBpZiAodHlw ZSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbyAmJiAhY2FwdHVyZURldmljZS5t X2F1ZGlvU291cmNlSWQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgY2FwdHVyZURldmlj ZS5tX2F1ZGlvU291cmNlID0gQVZBdWRpb0NhcHR1cmVTb3VyY2U6OmNyZWF0ZShkZXZpY2UsIGNh cHR1cmVEZXZpY2UubV9hdWRpb1NvdXJjZUlkLCBjb25zdHJhaW50cyk7CisgICAgICAgICAgICAg ICAgcmV0dXJuIGNhcHR1cmVEZXZpY2UubV9hdWRpb1NvdXJjZTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGlmICh0eXBlID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvICYm ICFjYXB0dXJlRGV2aWNlLm1fdmlkZW9Tb3VyY2VJZC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAg ICAgICBjYXB0dXJlRGV2aWNlLm1fdmlkZW9Tb3VyY2UgPSBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6 Y3JlYXRlKGRldmljZSwgY2FwdHVyZURldmljZS5tX3ZpZGVvU291cmNlSWQsIGNvbnN0cmFpbnRz KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gY2FwdHVyZURldmljZS5tX3ZpZGVvU291cmNlOwor ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAgIAorICAgIHJldHVybiBudWxscHRy OworCit9CisKIHZvaWQgQVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6cmVnaXN0ZXJGb3JEZXZpY2VO b3RpZmljYXRpb25zKCkKIHsKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50 ZXJdIGFkZE9ic2VydmVyOm1fb2JqY09ic2VydmVyLmdldCgpIHNlbGVjdG9yOkBzZWxlY3Rvcihk ZXZpY2VDb25uZWN0ZWQ6KSBuYW1lOkFWQ2FwdHVyZURldmljZVdhc0Nvbm5lY3RlZE5vdGlmaWNh dGlvbiBvYmplY3Q6bmlsXTsK 257145 2015-07-20 16:48:11 -0700 2015-07-20 17:16:17 -0700 Patch bug-147117-20150720164658.patch text/plain 3974 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNlOTJhM2M2YWMzMzk3 OGZlNDhiMmI0MGMxNzM0NTg5MmY4MmQzMS4uMzJiMjVlZWIwNmY3ZTI3MDRmNmFhMTUyODE4NjY0 OGRlNjNiM2E5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA3LTIwICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9zZWQgbWV0aG9k IHRvIHF1ZXJ5IGRldmljZSBieSBVSUQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzExNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjE5MDQ2Nzg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5oOiBBZGRlZCBtZXRo b2QgdG8KKyAgICAgICAgcXVlcnkgZGV2aWNlIGJ5IFVJRAorICAgICAgICAqIHBsYXRmb3JtL21l ZGlhc3RyZWFtL21hYy9BVkNhcHR1cmVEZXZpY2VNYW5hZ2VyLm1tOiBEaXR0bworICAgICAgICAo V2ViQ29yZTo6QVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6c291cmNlV2l0aFVJRCk6IERpdHRvCisK IDIwMTUtMDctMTcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog ICAgICAgICBWaWRlbyBwb3N0ZXJzIGRpc2FwcGVhciBvbmNlIG1lZGlhIGhhcyBsb2FkZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVkNhcHR1 cmVEZXZpY2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9t YWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5oCmluZGV4IGRkOGU1NTRhNDIwMjRhZDhkZDY5ODMy YzI1MzQ1YjcyMDBhNmIxM2MuLmViY2M2MGVjMTNjY2FlZDA5ODMzOTA1OGYxYmZiMWMyZGEwNjgw NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9B VkNhcHR1cmVEZXZpY2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWQ2FwdHVyZURldmljZU1hbmFnZXIuaApAQCAtNTAsNiArNTAsNyBAQCBw dWJsaWM6CiAgICAgVmVjdG9yPFJlZlB0cjxUcmFja1NvdXJjZUluZm8+PiBnZXRTb3VyY2VzSW5m byhjb25zdCBTdHJpbmcmKTsKICAgICBib29sIHZlcmlmeUNvbnN0cmFpbnRzRm9yTWVkaWFUeXBl KFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUsIE1lZGlhQ29uc3RyYWludHMqLCBTdHJpbmcmKTsK ICAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gYmVzdFNvdXJjZUZvclR5cGVBbmRDb25z dHJhaW50cyhSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3Ry YWludHM+KTsKKyAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gc291cmNlV2l0aFVJRChT dHJpbmcmLCBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlLCBNZWRpYUNvbnN0cmFpbnRzKik7CiAK ICAgICBlbnVtIFZhbGlkQ29uc3RyYWludHMgeyBXaWR0aCA9IDAsIEhlaWdodCwgRnJhbWVSYXRl LCBGYWNpbmdNb2RlLCBHYWluIH07CiAgICAgc3RhdGljIGNvbnN0IFZlY3RvcjxBdG9taWNTdHJp bmc+JiB2YWxpZENvbnN0cmFpbnROYW1lcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWQ2FwdHVyZURldmljZU1hbmFnZXIubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdl ci5tbQppbmRleCBkZTc5MTUwYzU1MjBjZjc0YWJlZTQ0ODhmNWQzZmI5M2EwMzI2ZTc4Li4wZGM3 NTFlYTlhODAxNGQyY2ZlMzA5MGZlNDdmNzY3Nzc0ZmQ4NmQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJl RGV2aWNlTWFuYWdlci5tbQpAQCAtNDEzLDYgKzQxMywzOSBAQCBSZWZQdHI8UmVhbHRpbWVNZWRp YVNvdXJjZT4gQVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6YmVzdFNvdXJjZUZvclR5cGVBbmRDb25z dHJhaQogICAgIHJldHVybiAwOwogfQogCitSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gQVZD YXB0dXJlRGV2aWNlTWFuYWdlcjo6c291cmNlV2l0aFVJRChTdHJpbmcgJmRldmljZVVJRCwgUmVh bHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0eXBlLCBNZWRpYUNvbnN0cmFpbnRzKiBjb25zdHJhaW50 cykKK3sKKyAgICBpZiAoIWlzQXZhaWxhYmxlKCkpCisgICAgICAgIHJldHVybiAwOworICAgIAor ICAgIFZlY3RvcjxDYXB0dXJlRGV2aWNlPiYgZGV2aWNlcyA9IGNhcHR1cmVEZXZpY2VMaXN0KCk7 CisgICAgZm9yIChhdXRvIGNhcHR1cmVEZXZpY2UgOiBkZXZpY2VzKSB7CisgICAgICAgIGlmICgh Y2FwdHVyZURldmljZS5tX2VuYWJsZWQpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg CisgICAgICAgIFN0cmluZyBpbnZhbGlkQ29uc3RyYWludHM7CisgICAgICAgIEFWQ2FwdHVyZURl dmljZU1hbmFnZXI6OnNpbmdsZXRvbigpLnZlcmlmeUNvbnN0cmFpbnRzRm9yTWVkaWFUeXBlKHR5 cGUsIGNvbnN0cmFpbnRzLCBpbnZhbGlkQ29uc3RyYWludHMpOworICAgICAgICBpZiAoIWludmFs aWRDb25zdHJhaW50cy5pc0VtcHR5KCkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg CisgICAgICAgIEFWQ2FwdHVyZURldmljZVR5cGUgKmRldmljZSA9IFtBVkNhcHR1cmVEZXZpY2Ug ZGV2aWNlV2l0aFVuaXF1ZUlEOmNhcHR1cmVEZXZpY2UubV9jYXB0dXJlRGV2aWNlSURdOworICAg ICAgICBBU1NFUlQoZGV2aWNlKTsKKyAgICAgICAgaWYgKGNhcHR1cmVEZXZpY2UubV9jYXB0dXJl RGV2aWNlSUQgIT0gZGV2aWNlVUlEKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGlm ICh0eXBlID09IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlvICYmICFjYXB0dXJlRGV2 aWNlLm1fYXVkaW9Tb3VyY2VJZC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGNhcHR1cmVEZXZp Y2UubV9hdWRpb1NvdXJjZSA9IEFWQXVkaW9DYXB0dXJlU291cmNlOjpjcmVhdGUoZGV2aWNlLCBj YXB0dXJlRGV2aWNlLm1fYXVkaW9Tb3VyY2VJZCwgY29uc3RyYWludHMpOworICAgICAgICAgICAg cmV0dXJuIGNhcHR1cmVEZXZpY2UubV9hdWRpb1NvdXJjZTsKKyAgICAgICAgfQorICAgICAgICBp ZiAodHlwZSA9PSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpWaWRlbyAmJiAhY2FwdHVyZURl dmljZS5tX3ZpZGVvU291cmNlSWQuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBjYXB0dXJlRGV2 aWNlLm1fdmlkZW9Tb3VyY2UgPSBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y3JlYXRlKGRldmljZSwg Y2FwdHVyZURldmljZS5tX3ZpZGVvU291cmNlSWQsIGNvbnN0cmFpbnRzKTsKKyAgICAgICAgICAg IHJldHVybiBjYXB0dXJlRGV2aWNlLm1fdmlkZW9Tb3VyY2U7CisgICAgICAgIH0KKyAgICB9Cisg ICAgCisgICAgcmV0dXJuIG51bGxwdHI7CisKK30KKwogdm9pZCBBVkNhcHR1cmVEZXZpY2VNYW5h Z2VyOjpyZWdpc3RlckZvckRldmljZU5vdGlmaWNhdGlvbnMoKQogewogICAgIFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6bV9vYmpjT2JzZXJ2ZXIuZ2V0 KCkgc2VsZWN0b3I6QHNlbGVjdG9yKGRldmljZUNvbm5lY3RlZDopIG5hbWU6QVZDYXB0dXJlRGV2 aWNlV2FzQ29ubmVjdGVkTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwo= 257152 2015-07-20 17:16:19 -0700 2015-07-21 17:07:24 -0700 Patch bug-147117-20150720171506.patch text/plain 4021 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNlOTJhM2M2YWMzMzk3 OGZlNDhiMmI0MGMxNzM0NTg5MmY4MmQzMS4uMzJiMjVlZWIwNmY3ZTI3MDRmNmFhMTUyODE4NjY0 OGRlNjNiM2E5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA3LTIwICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9zZWQgbWV0aG9k IHRvIHF1ZXJ5IGRldmljZSBieSBVSUQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzExNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjE5MDQ2Nzg+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5oOiBBZGRlZCBtZXRo b2QgdG8KKyAgICAgICAgcXVlcnkgZGV2aWNlIGJ5IFVJRAorICAgICAgICAqIHBsYXRmb3JtL21l ZGlhc3RyZWFtL21hYy9BVkNhcHR1cmVEZXZpY2VNYW5hZ2VyLm1tOiBEaXR0bworICAgICAgICAo V2ViQ29yZTo6QVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6c291cmNlV2l0aFVJRCk6IERpdHRvCisK IDIwMTUtMDctMTcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog ICAgICAgICBWaWRlbyBwb3N0ZXJzIGRpc2FwcGVhciBvbmNlIG1lZGlhIGhhcyBsb2FkZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVkNhcHR1 cmVEZXZpY2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9t YWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5oCmluZGV4IGRkOGU1NTRhNDIwMjRhZDhkZDY5ODMy YzI1MzQ1YjcyMDBhNmIxM2MuLmViY2M2MGVjMTNjY2FlZDA5ODMzOTA1OGYxYmZiMWMyZGEwNjgw NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9B VkNhcHR1cmVEZXZpY2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0FWQ2FwdHVyZURldmljZU1hbmFnZXIuaApAQCAtNTAsNiArNTAsNyBAQCBw dWJsaWM6CiAgICAgVmVjdG9yPFJlZlB0cjxUcmFja1NvdXJjZUluZm8+PiBnZXRTb3VyY2VzSW5m byhjb25zdCBTdHJpbmcmKTsKICAgICBib29sIHZlcmlmeUNvbnN0cmFpbnRzRm9yTWVkaWFUeXBl KFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGUsIE1lZGlhQ29uc3RyYWludHMqLCBTdHJpbmcmKTsK ICAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gYmVzdFNvdXJjZUZvclR5cGVBbmRDb25z dHJhaW50cyhSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3Ry YWludHM+KTsKKyAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gc291cmNlV2l0aFVJRChT dHJpbmcmLCBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlLCBNZWRpYUNvbnN0cmFpbnRzKik7CiAK ICAgICBlbnVtIFZhbGlkQ29uc3RyYWludHMgeyBXaWR0aCA9IDAsIEhlaWdodCwgRnJhbWVSYXRl LCBGYWNpbmdNb2RlLCBHYWluIH07CiAgICAgc3RhdGljIGNvbnN0IFZlY3RvcjxBdG9taWNTdHJp bmc+JiB2YWxpZENvbnN0cmFpbnROYW1lcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWQ2FwdHVyZURldmljZU1hbmFnZXIubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdl ci5tbQppbmRleCBkZTc5MTUwYzU1MjBjZjc0YWJlZTQ0ODhmNWQzZmI5M2EwMzI2ZTc4Li41NTVl YTZiNzkxMzY2Yzg1Zjg5MjRjNWJmZGJlNDQ4MTc4NWVjOTNjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJlRGV2aWNlTWFuYWdlci5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZDYXB0dXJl RGV2aWNlTWFuYWdlci5tbQpAQCAtNDEzLDYgKzQxMyw0MSBAQCBSZWZQdHI8UmVhbHRpbWVNZWRp YVNvdXJjZT4gQVZDYXB0dXJlRGV2aWNlTWFuYWdlcjo6YmVzdFNvdXJjZUZvclR5cGVBbmRDb25z dHJhaQogICAgIHJldHVybiAwOwogfQogCitSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gQVZD YXB0dXJlRGV2aWNlTWFuYWdlcjo6c291cmNlV2l0aFVJRChTdHJpbmcgJmRldmljZVVJRCwgUmVh bHRpbWVNZWRpYVNvdXJjZTo6VHlwZSB0eXBlLCBNZWRpYUNvbnN0cmFpbnRzKiBjb25zdHJhaW50 cykKK3sKKyAgICBpZiAoIWlzQXZhaWxhYmxlKCkpCisgICAgICAgIHJldHVybiAwOworICAgIAor ICAgIFZlY3RvcjxDYXB0dXJlRGV2aWNlPiYgZGV2aWNlcyA9IGNhcHR1cmVEZXZpY2VMaXN0KCk7 CisgICAgZm9yIChhdXRvIGNhcHR1cmVEZXZpY2UgOiBkZXZpY2VzKSB7CisgICAgICAgIGlmICgh Y2FwdHVyZURldmljZS5tX2VuYWJsZWQpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAg ICBpZiAoY2FwdHVyZURldmljZS5tX2NhcHR1cmVEZXZpY2VJRCAhPSBkZXZpY2VVSUQpCisgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKGNvbnN0cmFpbnRzKSB7CisgICAgICAgICAg ICBTdHJpbmcgaW52YWxpZENvbnN0cmFpbnRzOworICAgICAgICAgICAgQVZDYXB0dXJlRGV2aWNl TWFuYWdlcjo6c2luZ2xldG9uKCkudmVyaWZ5Q29uc3RyYWludHNGb3JNZWRpYVR5cGUodHlwZSwg Y29uc3RyYWludHMsIGludmFsaWRDb25zdHJhaW50cyk7CisgICAgICAgICAgICBpZiAoIWludmFs aWRDb25zdHJhaW50cy5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgIH0KKyAgICAgICAgCisgICAgICAgIEFWQ2FwdHVyZURldmljZVR5cGUgKmRldmljZSA9IFtB VkNhcHR1cmVEZXZpY2UgZGV2aWNlV2l0aFVuaXF1ZUlEOmNhcHR1cmVEZXZpY2UubV9jYXB0dXJl RGV2aWNlSURdOworICAgICAgICBBU1NFUlQoZGV2aWNlKTsKKyAgICAgICAgaWYgKHR5cGUgPT0g UmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8gJiYgIWNhcHR1cmVEZXZpY2UubV9hdWRp b1NvdXJjZUlkLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgY2FwdHVyZURldmljZS5tX2F1ZGlv U291cmNlID0gQVZBdWRpb0NhcHR1cmVTb3VyY2U6OmNyZWF0ZShkZXZpY2UsIGNhcHR1cmVEZXZp Y2UubV9hdWRpb1NvdXJjZUlkLCBjb25zdHJhaW50cyk7CisgICAgICAgICAgICByZXR1cm4gY2Fw dHVyZURldmljZS5tX2F1ZGlvU291cmNlOworICAgICAgICB9CisgICAgICAgIGlmICh0eXBlID09 IFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvICYmICFjYXB0dXJlRGV2aWNlLm1fdmlk ZW9Tb3VyY2VJZC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGNhcHR1cmVEZXZpY2UubV92aWRl b1NvdXJjZSA9IEFWVmlkZW9DYXB0dXJlU291cmNlOjpjcmVhdGUoZGV2aWNlLCBjYXB0dXJlRGV2 aWNlLm1fdmlkZW9Tb3VyY2VJZCwgY29uc3RyYWludHMpOworICAgICAgICAgICAgcmV0dXJuIGNh cHR1cmVEZXZpY2UubV92aWRlb1NvdXJjZTsKKyAgICAgICAgfQorICAgIH0KKyAgICAKKyAgICBy ZXR1cm4gbnVsbHB0cjsKKworfQorCiB2b2lkIEFWQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZ2lz dGVyRm9yRGV2aWNlTm90aWZpY2F0aW9ucygpCiB7CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjptX29iamNPYnNlcnZlci5nZXQoKSBzZWxlY3Rv cjpAc2VsZWN0b3IoZGV2aWNlQ29ubmVjdGVkOikgbmFtZTpBVkNhcHR1cmVEZXZpY2VXYXNDb25u ZWN0ZWROb3RpZmljYXRpb24gb2JqZWN0Om5pbF07Cg==