146237 2015-06-23 07:13:27 -0700 Refactor UserMediaRequest to share more code between MediaDevices.getUserMedia and legacy webkitGetUserMedia 2015-06-24 00:43:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf adam.bergkvist commit-queue darin eric.carlson oldest_to_newest 1104097 0 youennf 2015-06-23 07:13:27 -0700 This is a follow-up of bug 146200 1104100 1 255411 youennf 2015-06-23 07:30:52 -0700 Created attachment 255411 Patch 1104326 2 255411 commit-queue 2015-06-24 00:43:44 -0700 Comment on attachment 255411 Patch Clearing flags on attachment: 255411 Committed r185903: <http://trac.webkit.org/changeset/185903> 1104327 3 commit-queue 2015-06-24 00:43:47 -0700 All reviewed patches have been landed. Closing bug. 255411 2015-06-23 07:30:52 -0700 2015-06-24 00:43:44 -0700 Patch bug-146237-20150623163009.patch text/plain 10165 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjUwZWE1NWQ2YzdlNTEz NjU1NmYxYWYwYWE5ZWQ2ZGNkNmUwNTZhMC4uYjI4YzU3NmY0YjU4NGYyOTViMmI1YzU3YTc5Zjg5 ZTBkNGU3NGY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTA2LTIzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgUmVmYWN0 b3IgVXNlck1lZGlhUmVxdWVzdCB0byBzaGFyZSBtb3JlIGNvZGVzIGJldHdlZW4gTWVkaWFEZXZp Y2VzLmdldFVzZXJNZWRpYSBhbmQgbGVnYWN5IHdlYmtpdEdldFVzZXJNZWRpYQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MjM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGlu ZyB0ZXN0cywgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYUNvbnN0cmFpbnRzSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YUNvbnN0cmFpbnRzSW1wbDo6Y3JlYXRlKTogU2ltcGxpZmllZCBlcnJvciBoYW5kbGluZyBieSBy ZW1vdmluZyBleGNlcHRpb24gY29kZSBwYXJhbWV0ZXIuCisgICAgICAgICogTW9kdWxlcy9tZWRp YXN0cmVhbS9NZWRpYUNvbnN0cmFpbnRzSW1wbC5oOiBEaXR0by4KKyAgICAgICAgKiBNb2R1bGVz L21lZGlhc3RyZWFtL01lZGlhRGV2aWNlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYURl dmljZXM6OmdldFVzZXJNZWRpYSk6IFJlbW92ZWQgY29kZSBub3cgaW4gVXNlck1lZGlhUmVxdWVz dDo6c3RhcnQuCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9OYXZpZ2F0b3JVc2VyTWVk aWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmF2aWdhdG9yVXNlck1lZGlhOjp3ZWJraXRHZXRV c2VyTWVkaWEpOiBEaXR0by4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRp YVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VPcHRpb25zKTogU2ltcGxpZmll ZCBlcnJvciBoYW5kbGluZyBieSByZW1vdmluZyBleGNlcHRpb24gY29kZSBwYXJhbWV0ZXIuCisg ICAgICAgIChXZWJDb3JlOjpVc2VyTWVkaWFSZXF1ZXN0OjpzdGFydCk6IFJlbmFtZWQgY3JlYXRl IGluIHN0YXJ0IGFuZCBhZGRlZCBjb21tb24gY29kZS4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuaDoKKwogMjAxNS0wNi0yMiAgWW91ZW5uIEZhYmxldCAg PHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIE1lZGlhRGV2aWNlcy5nZXRV c2VyTWVkaWEgc2hvdWxkIG1pZ3JhdGUgZnJvbSBjYWxsYmFja3MgdG8gRE9NUHJvbWlzZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYUNvbnN0cmFp bnRzSW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhQ29u c3RyYWludHNJbXBsLmNwcAppbmRleCAzZjc3ZDE4NzdiODIxZWY3NWMwMGM5ODQ2NjgxMzZmMjky ZmRlMWY3Li4yODAyOGJjM2MyZjFhNDFhN2M1OTQwOTlkZWEwYTdiOWMxNmYwY2I5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhQ29uc3RyYWludHNJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhQ29u c3RyYWludHNJbXBsLmNwcApAQCAtNDEsMTMgKzQxLDExIEBACiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotUmVmUHRyPE1lZGlhQ29uc3RyYWludHNJbXBsPiBNZWRpYUNvbnN0cmFpbnRzSW1wbDo6 Y3JlYXRlKGNvbnN0IERpY3Rpb25hcnkmIGNvbnN0cmFpbnRzLCBFeGNlcHRpb25Db2RlJiBlYykK K1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzSW1wbD4gTWVkaWFDb25zdHJhaW50c0ltcGw6OmNyZWF0 ZShjb25zdCBEaWN0aW9uYXJ5JiBjb25zdHJhaW50cykKIHsKICAgICBSZWZQdHI8TWVkaWFDb25z dHJhaW50c0ltcGw+IG9iamVjdCA9IGFkb3B0UmVmKCpuZXcgTWVkaWFDb25zdHJhaW50c0ltcGwo KSk7Ci0gICAgaWYgKCFvYmplY3QtPmluaXRpYWxpemUoY29uc3RyYWludHMpKSB7Ci0gICAgICAg IGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CisgICAgaWYgKCFvYmplY3QtPmluaXRpYWxpemUoY29u c3RyYWludHMpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9CiAgICAgcmV0dXJuIG9i amVjdDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9NZWRpYUNvbnN0cmFpbnRzSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYUNvbnN0cmFpbnRzSW1wbC5oCmluZGV4IGE0YzFmN2NlNjc4OTMyZmRkNzg5NmEz NzVkYzgxYzRjZGNhNDI3NzIuLjIzMTg4N2NmYTRjZDczYjA2M2JhZWUwYzMxNDY3YWU5MzlhNDU4 N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFD b25zdHJhaW50c0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L01lZGlhQ29uc3RyYWludHNJbXBsLmgKQEAgLTQ0LDcgKzQ0LDcgQEAgY2xhc3MgRGljdGlvbmFy eTsKIGNsYXNzIE1lZGlhQ29uc3RyYWludHNJbXBsIDogcHVibGljIE1lZGlhQ29uc3RyYWludHMg ewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8TWVkaWFDb25zdHJhaW50c0ltcGw+IGNyZWF0ZSgp OwotICAgIHN0YXRpYyBSZWZQdHI8TWVkaWFDb25zdHJhaW50c0ltcGw+IGNyZWF0ZShjb25zdCBE aWN0aW9uYXJ5JiwgRXhjZXB0aW9uQ29kZSYpOworICAgIHN0YXRpYyBSZWZQdHI8TWVkaWFDb25z dHJhaW50c0ltcGw+IGNyZWF0ZShjb25zdCBEaWN0aW9uYXJ5Jik7CiAKICAgICB2aXJ0dWFsIH5N ZWRpYUNvbnN0cmFpbnRzSW1wbCgpOwogICAgIGJvb2wgaW5pdGlhbGl6ZShjb25zdCBEaWN0aW9u YXJ5Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01l ZGlhRGV2aWNlcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlh RGV2aWNlcy5jcHAKaW5kZXggNmE5NGJiMjQ2NTdhMjZlNzk2MDUyNDNiZDFkOGM4MmY5NGMwY2Vk My4uNTNhMTc2ZTdjZGYxY2Y5MWNlNmJkYmZhOWNkNGY4NWFhOWIzZDRlOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYURldmljZXMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFEZXZpY2VzLmNwcApAQCAt NjIsMjUgKzYyLDcgQEAgRG9jdW1lbnQqIE1lZGlhRGV2aWNlczo6ZG9jdW1lbnQoKSBjb25zdAog CiB2b2lkIE1lZGlhRGV2aWNlczo6Z2V0VXNlck1lZGlhKGNvbnN0IERpY3Rpb25hcnkmIG9wdGlv bnMsIFByb21pc2UmJiBwcm9taXNlLCBFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKIHsKLSAgICBp ZiAoIW9wdGlvbnMuaXNPYmplY3QoKSkgewotICAgICAgICBlYyA9IFR5cGVFcnJvcjsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQotICAgIFVzZXJNZWRpYUNvbnRyb2xsZXIqIHVzZXJNZWRpYSA9 IFVzZXJNZWRpYUNvbnRyb2xsZXI6OmZyb20oZG9jdW1lbnQoKSA/IGRvY3VtZW50KCktPnBhZ2Uo KSA6IG51bGxwdHIpOwotICAgIGlmICghdXNlck1lZGlhKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBX ZSBwcm9iYWJseSB3YW50IHRvIHJldHVybiBhIE1lZGlhU3RyZWFtRXJyb3IgaGVyZSB1c2luZyB0 aGUgcmVqZWN0Q2FsbGJhY2ssIGFuZCBnZXQgcmlkIG9mZiB0aGUgRXhjZXB0aW9uQ29kZSBwYXJh bWV0ZXIuCi0gICAgICAgIGVjID0gTk9UX1NVUFBPUlRFRF9FUlI7Ci0gICAgICAgIHJldHVybjsK LSAgICB9Ci0KLSAgICBSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4gcmVxdWVzdCA9IFVzZXJNZWRp YVJlcXVlc3Q6OmNyZWF0ZShkb2N1bWVudCgpLCB1c2VyTWVkaWEsIG9wdGlvbnMsIFdURjo6bW92 ZShwcm9taXNlKSwgZWMpOwotICAgIGlmICghcmVxdWVzdCkgewotICAgICAgICBlYyA9IE5PVF9T VVBQT1JURURfRVJSOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgcmVxdWVzdC0+c3Rh cnQoKTsKKyAgICBVc2VyTWVkaWFSZXF1ZXN0OjpzdGFydChkb2N1bWVudCgpLCBvcHRpb25zLCBX VEY6Om1vdmUocHJvbWlzZSksIGVjKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9OYXZpZ2F0b3JVc2Vy TWVkaWEuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9OYXZpZ2F0b3JV c2VyTWVkaWEuY3BwCmluZGV4IGUwM2M2YWNjZmRkZDEzM2U4NDE2ZjU1YTc5YzA5NGY0ZGZmYTMz Y2UuLjQxN2I5Y2MxZjE1NWI1ODA5YTc3YmNjNjE2MGJlNDMyNDUwMWZlYWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTmF2aWdhdG9yVXNlck1lZGlhLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL05hdmlnYXRvclVzZXJN ZWRpYS5jcHAKQEAgLTU2LDEyICs1Niw2IEBAIHZvaWQgTmF2aWdhdG9yVXNlck1lZGlhOjp3ZWJr aXRHZXRVc2VyTWVkaWEoTmF2aWdhdG9yKiBuYXZpZ2F0b3IsIGNvbnN0IERpY3Rpb25hCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBVc2VyTWVkaWFDb250cm9sbGVyKiB1c2VyTWVkaWEg PSBVc2VyTWVkaWFDb250cm9sbGVyOjpmcm9tKG5hdmlnYXRvci0+ZnJhbWUoKSA/IG5hdmlnYXRv ci0+ZnJhbWUoKS0+cGFnZSgpIDogMCk7Ci0gICAgaWYgKCF1c2VyTWVkaWEpIHsKLSAgICAgICAg ZWMgPSBOT1RfU1VQUE9SVEVEX0VSUjsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAgIC8v IFdlIGRvIG5vdCBuZWVkIHRvIHByb3RlY3QgdGhlIGNvbnRleHQgKGkuZS4gZG9jdW1lbnQpIGhl cmUgYXMgVXNlck1lZGlhUmVxdWVzdCBpcyBvYnNlcnZpbmcgY29udGV4dCBkZXN0cnVjdGlvbiBh bmQgd2lsbCBjaGVjayB2YWxpZGl0eSBiZWZvcmUgcmVzb2x2aW5nL3JlamVjdGluZyBwcm9taXNl LgogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG5hdmlnYXRvci0+ZnJhbWUoKS0+ZG9jdW1lbnQo KTsKIApAQCAtODAsMTMgKzc0LDcgQEAgdm9pZCBOYXZpZ2F0b3JVc2VyTWVkaWE6OndlYmtpdEdl dFVzZXJNZWRpYShOYXZpZ2F0b3IqIG5hdmlnYXRvciwgY29uc3QgRGljdGlvbmEKICAgICAgICAg fSk7CiAgICAgfTsKIAotICAgIGF1dG8gcmVxdWVzdCA9IFVzZXJNZWRpYVJlcXVlc3Q6OmNyZWF0 ZShuYXZpZ2F0b3ItPmZyYW1lKCktPmRvY3VtZW50KCksIHVzZXJNZWRpYSwgb3B0aW9ucywgTWVk aWFEZXZpY2VzOjpQcm9taXNlKFdURjo6bW92ZShyZXNvbHZlQ2FsbGJhY2spLCBXVEY6Om1vdmUo cmVqZWN0Q2FsbGJhY2spKSwgZWMpOwotICAgIGlmICghcmVxdWVzdCkgewotICAgICAgICBlYyA9 IE5PVF9TVVBQT1JURURfRVJSOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgcmVxdWVz dC0+c3RhcnQoKTsKKyAgICBVc2VyTWVkaWFSZXF1ZXN0OjpzdGFydChuYXZpZ2F0b3ItPmZyYW1l KCktPmRvY3VtZW50KCksIG9wdGlvbnMsIE1lZGlhRGV2aWNlczo6UHJvbWlzZShXVEY6Om1vdmUo cmVzb2x2ZUNhbGxiYWNrKSwgV1RGOjptb3ZlKHJlamVjdENhbGxiYWNrKSksIGVjKTsKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHAKaW5kZXggZDA5ZTA4MDE2OTU4ZDA1 MDBhYmE5NmUxNWEzNzA2OGU4ODgyNGJhOC4uMjczMTI3ZWY0MmJiNmRlODU1M2QwMTA0MjEyZTFk MDIwYjVkMTI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuY3BwCkBAIC01NSwzOCArNTUsNDIgQEAKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1zdGF0aWMgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiBwYXJz ZU9wdGlvbnMoY29uc3QgRGljdGlvbmFyeSYgb3B0aW9ucywgY29uc3QgU3RyaW5nJiBtZWRpYVR5 cGUsIEV4Y2VwdGlvbkNvZGUmIGVjKQorc3RhdGljIFJlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiBw YXJzZU9wdGlvbnMoY29uc3QgRGljdGlvbmFyeSYgb3B0aW9ucywgY29uc3QgU3RyaW5nJiBtZWRp YVR5cGUpCiB7Ci0gICAgUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0cmFpbnRzOwotCiAg ICAgRGljdGlvbmFyeSBjb25zdHJhaW50c0RpY3Rpb25hcnk7Ci0gICAgYm9vbCBvayA9IG9wdGlv bnMuZ2V0KG1lZGlhVHlwZSwgY29uc3RyYWludHNEaWN0aW9uYXJ5KTsKLSAgICBpZiAob2sgJiYg IWNvbnN0cmFpbnRzRGljdGlvbmFyeS5pc1VuZGVmaW5lZE9yTnVsbCgpKQotICAgICAgICBjb25z dHJhaW50cyA9IE1lZGlhQ29uc3RyYWludHNJbXBsOjpjcmVhdGUoY29uc3RyYWludHNEaWN0aW9u YXJ5LCBlYyk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIGJvb2wgbWVkaWFSZXF1ZXN0ZWQgPSBmYWxz ZTsKLSAgICAgICAgb3B0aW9ucy5nZXQobWVkaWFUeXBlLCBtZWRpYVJlcXVlc3RlZCk7Ci0gICAg ICAgIGlmIChtZWRpYVJlcXVlc3RlZCkKLSAgICAgICAgICAgIGNvbnN0cmFpbnRzID0gTWVkaWFD b25zdHJhaW50c0ltcGw6OmNyZWF0ZSgpOwotICAgIH0KKyAgICBpZiAob3B0aW9ucy5nZXQobWVk aWFUeXBlLCBjb25zdHJhaW50c0RpY3Rpb25hcnkpICYmICFjb25zdHJhaW50c0RpY3Rpb25hcnku aXNVbmRlZmluZWRPck51bGwoKSkKKyAgICAgICAgcmV0dXJuIE1lZGlhQ29uc3RyYWludHNJbXBs OjpjcmVhdGUoY29uc3RyYWludHNEaWN0aW9uYXJ5KTsKKworICAgIGJvb2wgbWVkaWFSZXF1ZXN0 ZWQgPSBmYWxzZTsKKyAgICBpZiAoIW9wdGlvbnMuZ2V0KG1lZGlhVHlwZSwgbWVkaWFSZXF1ZXN0 ZWQpIHx8ICFtZWRpYVJlcXVlc3RlZCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBy ZXR1cm4gY29uc3RyYWludHMucmVsZWFzZSgpOworICAgIHJldHVybiBNZWRpYUNvbnN0cmFpbnRz SW1wbDo6Y3JlYXRlKCk7CiB9CiAKLVJlZlB0cjxVc2VyTWVkaWFSZXF1ZXN0PiBVc2VyTWVkaWFS ZXF1ZXN0OjpjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgVXNlck1lZGlh Q29udHJvbGxlciogY29udHJvbGxlciwgY29uc3QgRGljdGlvbmFyeSYgb3B0aW9ucywgTWVkaWFE ZXZpY2VzOjpQcm9taXNlJiYgcHJvbWlzZSwgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lkIFVzZXJN ZWRpYVJlcXVlc3Q6OnN0YXJ0KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgRGljdGlvbmFyeSYg b3B0aW9ucywgTWVkaWFEZXZpY2VzOjpQcm9taXNlJiYgcHJvbWlzZSwgRXhjZXB0aW9uQ29kZSYg ZWMpCiB7Ci0gICAgUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGF1ZGlvQ29uc3RyYWludHMgPSBw YXJzZU9wdGlvbnMob3B0aW9ucywgQXRvbWljU3RyaW5nKCJhdWRpbyIsIEF0b21pY1N0cmluZzo6 Q29uc3RydWN0RnJvbUxpdGVyYWwpLCBlYyk7Ci0gICAgaWYgKGVjKQotICAgICAgICByZXR1cm4g bnVsbHB0cjsKKyAgICBpZiAoIW9wdGlvbnMuaXNPYmplY3QoKSkgeworICAgICAgICBlYyA9IFR5 cGVFcnJvcjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgIFJlZlB0cjxNZWRpYUNvbnN0 cmFpbnRzPiB2aWRlb0NvbnN0cmFpbnRzID0gcGFyc2VPcHRpb25zKG9wdGlvbnMsIEF0b21pY1N0 cmluZygidmlkZW8iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSwgZWMpOwot ICAgIGlmIChlYykKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgVXNlck1lZGlhQ29udHJv bGxlciogdXNlck1lZGlhID0gVXNlck1lZGlhQ29udHJvbGxlcjo6ZnJvbShkb2N1bWVudCA/IGRv Y3VtZW50LT5wYWdlKCkgOiBudWxscHRyKTsKKyAgICBpZiAoIXVzZXJNZWRpYSkgeworICAgICAg ICBlYyA9IE5PVF9TVVBQT1JURURfRVJSOworICAgICAgICByZXR1cm47CisgICAgfQogCi0gICAg aWYgKCFhdWRpb0NvbnN0cmFpbnRzICYmICF2aWRlb0NvbnN0cmFpbnRzKQotICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKyAgICBSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gYXVkaW9Db25zdHJhaW50 cyA9IHBhcnNlT3B0aW9ucyhvcHRpb25zLCBBdG9taWNTdHJpbmcoImF1ZGlvIiwgQXRvbWljU3Ry aW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOworICAgIFJlZlB0cjxNZWRpYUNvbnN0cmFpbnRz PiB2aWRlb0NvbnN0cmFpbnRzID0gcGFyc2VPcHRpb25zKG9wdGlvbnMsIEF0b21pY1N0cmluZygi dmlkZW8iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CisKKyAgICBpZiAo IWF1ZGlvQ29uc3RyYWludHMgJiYgIXZpZGVvQ29uc3RyYWludHMpIHsKKyAgICAgICAgZWMgPSBO T1RfU1VQUE9SVEVEX0VSUjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IFVzZXJNZWRpYVJlcXVlc3QoY29udGV4dCwgY29udHJvbGxlciwgYXVkaW9D b25zdHJhaW50cy5yZWxlYXNlKCksIHZpZGVvQ29uc3RyYWludHMucmVsZWFzZSgpLCBXVEY6Om1v dmUocHJvbWlzZSkpKTsKKyAgICBSZWY8VXNlck1lZGlhUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0 UmVmKCpuZXcgVXNlck1lZGlhUmVxdWVzdChkb2N1bWVudCwgdXNlck1lZGlhLCBhdWRpb0NvbnN0 cmFpbnRzLnJlbGVhc2UoKSwgdmlkZW9Db25zdHJhaW50cy5yZWxlYXNlKCksIFdURjo6bW92ZShw cm9taXNlKSkpOworICAgIHJlcXVlc3QtPnN0YXJ0KCk7CiB9CiAKIFVzZXJNZWRpYVJlcXVlc3Q6 OlVzZXJNZWRpYVJlcXVlc3QoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgVXNlck1l ZGlhQ29udHJvbGxlciogY29udHJvbGxlciwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiBh dWRpb0NvbnN0cmFpbnRzLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IHZpZGVvQ29uc3Ry YWludHMsIE1lZGlhRGV2aWNlczo6UHJvbWlzZSYmIHByb21pc2UpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuaCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5oCmluZGV4IGE5 M2YyYmRkODJhOTY4N2Y1YTA4OTg2NThiM2EwZGZiYmRlZmFlZTEuLjBkMGQ0NGE4ZmM1MzdiY2Yz YTM4NzJiZDAxZmQ3M2RmMDk2MGI3NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5oCkBAIC01OCw3ICs1OCw3IEBAIHR5 cGVkZWYgaW50IEV4Y2VwdGlvbkNvZGU7CiAKIGNsYXNzIFVzZXJNZWRpYVJlcXVlc3QgOiBwdWJs aWMgTWVkaWFTdHJlYW1DcmVhdGlvbkNsaWVudCwgcHVibGljIENvbnRleHREZXN0cnVjdGlvbk9i c2VydmVyIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUmVmUHRyPFVzZXJNZWRpYVJlcXVlc3Q+IGNy ZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgVXNlck1lZGlhQ29udHJvbGxlciosIGNvbnN0 IERpY3Rpb25hcnkmIG9wdGlvbnMsIE1lZGlhRGV2aWNlczo6UHJvbWlzZSYmLCBFeGNlcHRpb25D b2RlJik7CisgICAgc3RhdGljIHZvaWQgc3RhcnQoRG9jdW1lbnQqLCBjb25zdCBEaWN0aW9uYXJ5 JiwgTWVkaWFEZXZpY2VzOjpQcm9taXNlJiYsIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB+VXNlck1l ZGlhUmVxdWVzdCgpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgU2VjdXJpdHlPcmlnaW4qIHNlY3Vy aXR5T3JpZ2luKCkgY29uc3Q7Cg==