156811 2016-04-20 14:50:18 -0700 Remove reliance on WebAVMediaSelectionOptionMac for the WebPlaybackControlsManager 2016-04-21 12:42:42 -0700 1 1 1 Unclassified WebKit Media WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue eric.carlson jer.noble oldest_to_newest 1185552 0 bdakin 2016-04-20 14:50:18 -0700 Remove reliance on WebAVMediaSelectionOptionMac for the WebPlaybackControlsManager 1185575 1 276859 bdakin 2016-04-20 15:45:55 -0700 Created attachment 276859 Patch 1185577 2 commit-queue 2016-04-20 15:48:29 -0700 Attachment 276859 did not pass style-queue: ERROR: Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm:46: *SoftLink.h header should be included after all other headers. [build/include_order] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1185884 3 bdakin 2016-04-21 12:42:42 -0700 http://trac.webkit.org/changeset/199827 276859 2016-04-20 15:45:55 -0700 2016-04-21 11:12:19 -0700 Patch webcore-video-for-review.txt text/plain 10499 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTc4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE2LTA0LTIwICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcmVsaWFuY2Ugb24gV2Vi QVZNZWRpYVNlbGVjdGlvbk9wdGlvbk1hYyBmb3IgdGhlIAorICAgICAgICBXZWJQbGF5YmFja0Nv bnRyb2xzTWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU2ODExCisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgcmRhcjov L3Byb2JsZW0vMjU3NjA1MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWMu bW06CisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIHNldFNlZWthYmxlVGlt ZVJhbmdlczpdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgc2V0QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM6d2l0aFNlbGVjdGVkSW5kZXg6XSk6CisgICAgICAgICgt W1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIHNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlv bnM6d2l0aFNlbGVjdGVkSW5kZXg6XSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJQbGF5YmFja1Nl c3Npb25JbnRlcmZhY2VNYWM6On5XZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWMpOgorICAg ICAgICAoV2ViQ29yZTo6V2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjOjpzZXRTZWVrYWJs ZVJhbmdlcyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VN YWM6OnNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6Oldl YlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6c2V0TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0 aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM6 OmludmFsaWRhdGUpOgorICAgICAgICAoLVtXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjIGxv Y2FsaXplZERpc3BsYXlOYW1lXSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkFWTWVkaWFTZWxl Y3Rpb25PcHRpb25NYWMgc2V0TG9jYWxpemVkRGlzcGxheU5hbWU6XSk6IERlbGV0ZWQuCisgICAg ICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIGlzU2Vla2luZ10pOiBEZWxldGVkLgor ICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZWVrVG9UaW1lOnRvbGVyYW5j ZUJlZm9yZTp0b2xlcmFuY2VBZnRlcjpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViUGxheWJh Y2tDb250cm9sc01hbmFnZXIgYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnNdKTogRGVsZXRlZC4K KyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgc2V0QXVkaW9NZWRpYVNlbGVj dGlvbk9wdGlvbnM6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNN YW5hZ2VyIGN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uXSk6IERlbGV0ZWQuCisgICAg ICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIHNldEN1cnJlbnRBdWRpb01lZGlhU2Vs ZWN0aW9uT3B0aW9uOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xz TWFuYWdlciBsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zXSk6IERlbGV0ZWQuCisgICAgICAg ICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyIHNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9w dGlvbnM6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2Vy IGN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25dKTogRGVsZXRlZC4KKyAgICAgICAg KC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgc2V0Q3VycmVudExlZ2libGVNZWRpYVNlbGVj dGlvbk9wdGlvbjpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01h bmFnZXIgY2FuY2VsVGh1bWJuYWlsQW5kQXVkaW9BbXBsaXR1ZGVTYW1wbGVHZW5lcmF0aW9uXSk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjptZWRpYVNlbGVjdGlvbk9wdGlvbnMpOiBEZWxl dGVkLgorCiAyMDE2LTA0LTIwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgVXNlIE9wdGlvbmFsPHNpemVfdD4gZm9yIE9yZGVySXRlcmF0b3I6Om1fb3JkZXJJbmRl eCBpbnN0ZWFkIG9mIGludApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlBs YXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjLm1tCShyZXZpc2lv biAxOTk3ODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MiwzOCArNDIsMTUgQEAgU09G VF9MSU5LX0NMQVNTX09QVElPTkFMKEFWS2l0LCBBVlZhbHVlVAogCiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIAotQGludGVyZmFjZSBXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjIDogTlNP YmplY3QgewotICAgIFJldGFpblB0cjxOU1N0cmluZz4gX2xvY2FsaXplZERpc3BsYXlOYW1lOwot fQotQHByb3BlcnR5IChyZXRhaW4pIE5TU3RyaW5nICpsb2NhbGl6ZWREaXNwbGF5TmFtZTsKLUBl bmQKLQotQGltcGxlbWVudGF0aW9uIFdlYkFWTWVkaWFTZWxlY3Rpb25PcHRpb25NYWMKLQotLSAo TlNTdHJpbmcgKilsb2NhbGl6ZWREaXNwbGF5TmFtZQotewotICAgIHJldHVybiBfbG9jYWxpemVk RGlzcGxheU5hbWUuZ2V0KCk7Ci19Ci0KLS0gKHZvaWQpc2V0TG9jYWxpemVkRGlzcGxheU5hbWU6 KE5TU3RyaW5nICopbmFtZQotewotICAgIF9sb2NhbGl6ZWREaXNwbGF5TmFtZSA9IG5hbWU7Ci19 Ci0KLUBlbmQKLQotQGludGVyZmFjZSBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciA6IE5TT2Jq ZWN0IHsKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKSAmJiBFTkFCTEUoV0VCX1BMQVlCQUNL X0NPTlRST0xTX01BTkFHRVIpCisjaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV2ViUGxheWJhY2tD b250cm9sc0NvbnRyb2xsZXJBZGRpdGlvbnMubW0+CisjZWxzZQorQGludGVyZmFjZSBXZWJQbGF5 YmFja0NvbnRyb2xzTWFuYWdlciA6IE5TT2JqZWN0PEFWRnVuY3Rpb25CYXJQbGF5YmFja0NvbnRy b2xzQ29udHJvbGxpbmc+IHsKICAgICBOU1RpbWVJbnRlcnZhbCBfY29udGVudER1cmF0aW9uOwog ICAgIFJldGFpblB0cjxBVlZhbHVlVGltaW5nPiBfdGltaW5nOwotICAgIE5TVGltZUludGVydmFs IF9zZWVrVG9UaW1lOwogICAgIFJldGFpblB0cjxOU0FycmF5PiBfc2Vla2FibGVUaW1lUmFuZ2Vz OwogICAgIEJPT0wgX2hhc0VuYWJsZWRBdWRpbzsKICAgICBCT09MIF9oYXNFbmFibGVkVmlkZW87 Ci0gICAgUmV0YWluUHRyPE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPj4gX2F1ZGlv TWVkaWFTZWxlY3Rpb25PcHRpb25zOwotICAgIFJldGFpblB0cjxBVk1lZGlhU2VsZWN0aW9uT3B0 aW9uPiBfY3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb247Ci0gICAgUmV0YWluUHRyPE5T QXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPj4gX2xlZ2libGVNZWRpYVNlbGVjdGlvbk9w dGlvbnM7Ci0gICAgUmV0YWluUHRyPEFWTWVkaWFTZWxlY3Rpb25PcHRpb24+IF9jdXJyZW50TGVn aWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOwotCiAgICAgZmxvYXQgX3JhdGU7CiAKIEBwcml2YXRl CkBAIC04MiwyOSArNTksMTggQEAgQGludGVyZmFjZSBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdl ciA6IAogCiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgTlNUaW1lSW50ZXJ2YWwgY29udGVudER1cmF0 aW9uOwogQHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbiwgcmVhZHdyaXRlKSBBVlZhbHVlVGlt aW5nICp0aW1pbmc7Ci1AcHJvcGVydHkgTlNUaW1lSW50ZXJ2YWwgc2Vla1RvVGltZTsKIEBwcm9w ZXJ0eSAobm9uYXRvbWljLCByZXRhaW4sIHJlYWR3cml0ZSkgTlNBcnJheSAqc2Vla2FibGVUaW1l UmFuZ2VzOwogQHByb3BlcnR5IChyZWFkd3JpdGUpIEJPT0wgaGFzRW5hYmxlZEF1ZGlvOwogQHBy b3BlcnR5IChyZWFkd3JpdGUpIEJPT0wgaGFzRW5hYmxlZFZpZGVvOwotQHByb3BlcnR5IChub25h dG9taWMsIHJldGFpbiwgcmVhZHdyaXRlKSBOU0FycmF5PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24g Kj4gKmF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zOwotQHByb3BlcnR5IChub25hdG9taWMsIHJl dGFpbiwgcmVhZHdyaXRlKSBBVk1lZGlhU2VsZWN0aW9uT3B0aW9uICpjdXJyZW50QXVkaW9NZWRp YVNlbGVjdGlvbk9wdGlvbjsKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZXRhaW4sIHJlYWR3cml0 ZSkgTlNBcnJheTxBVk1lZGlhU2VsZWN0aW9uT3B0aW9uICo+ICpsZWdpYmxlTWVkaWFTZWxlY3Rp b25PcHRpb25zOwotQHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbiwgcmVhZHdyaXRlKSBBVk1l ZGlhU2VsZWN0aW9uT3B0aW9uICpjdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOwot CiBAcHJvcGVydHkgKG5vbmF0b21pYykgZmxvYXQgcmF0ZTsKIAogLSAoaW5zdGFuY2V0eXBlKWlu aXRXaXRoV2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjOihXZWJDb3JlOjpXZWJQbGF5YmFj a1Nlc3Npb25JbnRlcmZhY2VNYWMqKXdlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzsKIAog QGVuZAogCi0jaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPFdlYktpdEFkZGl0 aW9ucy9XZWJQbGF5YmFja0NvbnRyb2xzQ29udHJvbGxlckFkZGl0aW9ucy5tbT4KLSNlbmRpZgot CiBAaW1wbGVtZW50YXRpb24gV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIKIAogQHN5bnRoZXNp emUgY29udGVudER1cmF0aW9uPV9jb250ZW50RHVyYXRpb247Ci1Ac3ludGhlc2l6ZSBzZWVrVG9U aW1lPV9zZWVrVG9UaW1lOwogQHN5bnRoZXNpemUgaGFzRW5hYmxlZEF1ZGlvPV9oYXNFbmFibGVk QXVkaW87CiBAc3ludGhlc2l6ZSBoYXNFbmFibGVkVmlkZW89X2hhc0VuYWJsZWRWaWRlbzsKIEBz eW50aGVzaXplIHJhdGU9X3JhdGU7CkBAIC0xMzksODggKzEwNSwyMiBAQCAtICh2b2lkKXNldFNl ZWthYmxlVGltZVJhbmdlczooTlNBcnJheSAqCiAgICAgX3NlZWthYmxlVGltZVJhbmdlcyA9IHRp bWVSYW5nZXM7CiB9CiAKLS0gKEJPT0wpaXNTZWVraW5nCi17Ci0gICAgcmV0dXJuIE5POwotfQot Ci0tICh2b2lkKXNlZWtUb1RpbWU6KE5TVGltZUludGVydmFsKXRpbWUgdG9sZXJhbmNlQmVmb3Jl OihOU1RpbWVJbnRlcnZhbCl0b2xlcmFuY2VCZWZvcmUgdG9sZXJhbmNlQWZ0ZXI6KE5TVGltZUlu dGVydmFsKXRvbGVyYW5jZUFmdGVyCi17Ci0gICAgVU5VU0VEX1BBUkFNKHRvbGVyYW5jZUJlZm9y ZSk7Ci0gICAgVU5VU0VEX1BBUkFNKHRvbGVyYW5jZUFmdGVyKTsKLSAgICBfd2ViUGxheWJhY2tT ZXNzaW9uSW50ZXJmYWNlTWFjLT53ZWJQbGF5YmFja1Nlc3Npb25Nb2RlbCgpLT5zZWVrVG9UaW1l KHRpbWUpOwotfQotCi0tIChOU0FycmF5PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilhdWRp b01lZGlhU2VsZWN0aW9uT3B0aW9ucwotewotICAgIHJldHVybiBfYXVkaW9NZWRpYVNlbGVjdGlv bk9wdGlvbnMuZ2V0KCk7Ci19Ci0KLS0gKHZvaWQpc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlv bnM6KE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPiAqKWF1ZGlvT3B0aW9ucwotewot ICAgIF9hdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9ucyA9IGF1ZGlvT3B0aW9uczsKLX0KLQotLSAo QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9u CistICh2b2lkKXNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zOihjb25zdCBWZWN0b3I8V1RG OjpTdHJpbmc+JilvcHRpb25zIHdpdGhTZWxlY3RlZEluZGV4OihOU1VJbnRlZ2VyKXNlbGVjdGVk SW5kZXgKIHsKLSAgICByZXR1cm4gX2N1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uLmdl dCgpOworICAgIFVOVVNFRF9QQVJBTShvcHRpb25zKTsKKyAgICBVTlVTRURfUEFSQU0oc2VsZWN0 ZWRJbmRleCk7CiB9CiAKLS0gKHZvaWQpc2V0Q3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRp b246KEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKilhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uCist ICh2b2lkKXNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6KGNvbnN0IFZlY3RvcjxXVEY6 OlN0cmluZz4mKW9wdGlvbnMgd2l0aFNlbGVjdGVkSW5kZXg6KE5TVUludGVnZXIpc2VsZWN0ZWRJ bmRleAogewotICAgIGlmIChhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uID09IF9jdXJyZW50QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgX2N1cnJlbnRB dWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uID0gYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbjsKLQot ICAgIE5TSW50ZWdlciBpbmRleCA9IE5TTm90Rm91bmQ7Ci0KLSAgICBpZiAoYXVkaW9NZWRpYVNl bGVjdGlvbk9wdGlvbiAmJiBzZWxmLmF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zKQotICAgICAg ICBpbmRleCA9IFtzZWxmLmF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zIGluZGV4T2ZPYmplY3Q6 YXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbl07Ci0KLSAgICBfd2ViUGxheWJhY2tTZXNzaW9uSW50 ZXJmYWNlTWFjLT53ZWJQbGF5YmFja1Nlc3Npb25Nb2RlbCgpLT5zZWxlY3RBdWRpb01lZGlhT3B0 aW9uKGluZGV4ICE9IE5TTm90Rm91bmQgPyBpbmRleCA6IFVJTlQ2NF9NQVgpOwotfQotCi0tIChO U0FycmF5PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilsZWdpYmxlTWVkaWFTZWxlY3Rpb25P cHRpb25zCi17Ci0gICAgcmV0dXJuIF9sZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zLmdldCgp OwotfQotCi0tICh2b2lkKXNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6KE5TQXJyYXk8 QVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPiAqKWxlZ2libGVPcHRpb25zCi17Ci0gICAgX2xlZ2li bGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMgPSBsZWdpYmxlT3B0aW9uczsKLX0KLQotLSAoQVZNZWRp YVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24KLXsK LSAgICByZXR1cm4gX2N1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24uZ2V0KCk7Cisg ICAgVU5VU0VEX1BBUkFNKG9wdGlvbnMpOworICAgIFVOVVNFRF9QQVJBTShzZWxlY3RlZEluZGV4 KTsKIH0KIAotLSAodm9pZClzZXRDdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOihB Vk1lZGlhU2VsZWN0aW9uT3B0aW9uICopbGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uCi17Ci0g ICAgaWYgKGxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbiA9PSBfY3VycmVudExlZ2libGVNZWRp YVNlbGVjdGlvbk9wdGlvbikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgX2N1cnJlbnRMZWdpYmxl TWVkaWFTZWxlY3Rpb25PcHRpb24gPSBsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb247Ci0KLSAg ICBOU0ludGVnZXIgaW5kZXggPSBOU05vdEZvdW5kOwotCi0gICAgaWYgKGxlZ2libGVNZWRpYVNl bGVjdGlvbk9wdGlvbiAmJiBzZWxmLmxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMpCi0gICAg ICAgIGluZGV4ID0gW3NlbGYubGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9ucyBpbmRleE9mT2Jq ZWN0OmxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbl07Ci0KLSAgICBfd2ViUGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlTWFjLT53ZWJQbGF5YmFja1Nlc3Npb25Nb2RlbCgpLT5zZWxlY3RMZWdpYmxl TWVkaWFPcHRpb24oaW5kZXggIT0gTlNOb3RGb3VuZCA/IGluZGV4IDogVUlOVDY0X01BWCk7Ci19 Ci0KLS0gKHZvaWQpY2FuY2VsVGh1bWJuYWlsQW5kQXVkaW9BbXBsaXR1ZGVTYW1wbGVHZW5lcmF0 aW9uCi17Ci19CitAZW5kCiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQotI2ltcG9ydCA8 V2ViS2l0QWRkaXRpb25zL1dlYlBsYXliYWNrQ29udHJvbHNDb250cm9sbGVyVGh1bWJuYWlsQWRk aXRpb25zLm1tPgogI2VuZGlmCiAKLUBlbmQKLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBXZWJQ bGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM6On5XZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VN YWMoKQpAQCAtMjc2LDM1ICsxNzYsMTYgQEAgdm9pZCBXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZh Y2VNYWM6OnNldAogICAgIFtjb250cm9sc01hbmFnZXIgc2V0U2Vla2FibGVUaW1lUmFuZ2VzOnNl ZWthYmxlUmFuZ2VzLmdldCgpXTsKIH0KIAotc3RhdGljIFJldGFpblB0cjxOU011dGFibGVBcnJh eT4gbWVkaWFTZWxlY3Rpb25PcHRpb25zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBvcHRpb25zKQot ewotICAgIFJldGFpblB0cjxOU011dGFibGVBcnJheT4gd2ViT3B0aW9ucyA9IGFkb3B0TlMoW1tO U011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTpvcHRpb25zLnNpemUoKV0pOwot ICAgIGZvciAoYXV0byYgbmFtZSA6IG9wdGlvbnMpIHsKLSAgICAgICAgUmV0YWluUHRyPFdlYkFW TWVkaWFTZWxlY3Rpb25PcHRpb25NYWM+IHdlYk9wdGlvbiA9IGFkb3B0TlMoW1tXZWJBVk1lZGlh U2VsZWN0aW9uT3B0aW9uTWFjIGFsbG9jXSBpbml0XSk7Ci0gICAgICAgIFt3ZWJPcHRpb24gc2V0 TG9jYWxpemVkRGlzcGxheU5hbWU6bmFtZV07Ci0gICAgICAgIFt3ZWJPcHRpb25zIGFkZE9iamVj dDp3ZWJPcHRpb24uZ2V0KCldOwotICAgIH0KLSAgICByZXR1cm4gd2ViT3B0aW9uczsKLX0KLQog dm9pZCBXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM6OnNldEF1ZGlvTWVkaWFTZWxlY3Rp b25PcHRpb25zKGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mIG9wdGlvbnMsIHVpbnQ2NF90IHNl bGVjdGVkSW5kZXgpCiB7CiAgICAgV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIqIGNvbnRyb2xz TWFuYWdlciA9IHBsYXlCYWNrQ29udHJvbHNNYW5hZ2VyKCk7Ci0KLSAgICBSZXRhaW5QdHI8TlNN dXRhYmxlQXJyYXk+IHdlYk9wdGlvbnMgPSBtZWRpYVNlbGVjdGlvbk9wdGlvbnMob3B0aW9ucyk7 Ci0gICAgW2NvbnRyb2xzTWFuYWdlciBzZXRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uczp3ZWJP cHRpb25zLmdldCgpXTsKLSAgICBpZiAoc2VsZWN0ZWRJbmRleCA8IFt3ZWJPcHRpb25zIGNvdW50 XSkKLSAgICAgICAgW2NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50QXVkaW9NZWRpYVNlbGVjdGlv bk9wdGlvbjpbd2ViT3B0aW9ucyBvYmplY3RBdEluZGV4OnN0YXRpY19jYXN0PE5TVUludGVnZXI+ KHNlbGVjdGVkSW5kZXgpXV07CisgICAgW2NvbnRyb2xzTWFuYWdlciBzZXRBdWRpb01lZGlhU2Vs ZWN0aW9uT3B0aW9uczpvcHRpb25zIHdpdGhTZWxlY3RlZEluZGV4OnNlbGVjdGVkSW5kZXhdOwog fQogCiB2b2lkIFdlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6c2V0TGVnaWJsZU1lZGlh U2VsZWN0aW9uT3B0aW9ucyhjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JiBvcHRpb25zLCB1aW50 NjRfdCBzZWxlY3RlZEluZGV4KQogewogICAgIFdlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKiBj b250cm9sc01hbmFnZXIgPSBwbGF5QmFja0NvbnRyb2xzTWFuYWdlcigpOwotCi0gICAgUmV0YWlu UHRyPE5TTXV0YWJsZUFycmF5PiB3ZWJPcHRpb25zID0gbWVkaWFTZWxlY3Rpb25PcHRpb25zKG9w dGlvbnMpOwotICAgIFtjb250cm9sc01hbmFnZXIgc2V0TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0 aW9uczp3ZWJPcHRpb25zLmdldCgpXTsKLSAgICBpZiAoc2VsZWN0ZWRJbmRleCA8IFt3ZWJPcHRp b25zIGNvdW50XSkKLSAgICAgICAgW2NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50TGVnaWJsZU1l ZGlhU2VsZWN0aW9uT3B0aW9uOlt3ZWJPcHRpb25zIG9iamVjdEF0SW5kZXg6c3RhdGljX2Nhc3Q8 TlNVSW50ZWdlcj4oc2VsZWN0ZWRJbmRleCldXTsKKyAgICBbY29udHJvbHNNYW5hZ2VyIHNldExl Z2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6b3B0aW9ucyB3aXRoU2VsZWN0ZWRJbmRleDpzZWxl Y3RlZEluZGV4XTsKIH0KIAogdm9pZCBXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM6Omlu dmFsaWRhdGUoKQo=