156358 2016-04-07 13:32:01 -0700 WebPlaybackControlsManager should support mediaSelectionOptions 2016-04-07 14:33:09 -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 1181832 0 bdakin 2016-04-07 13:32:01 -0700 WebPlaybackControlsManager should support mediaSelectionOptions rdar://problem/25048743 1181839 1 275925 bdakin 2016-04-07 13:43:03 -0700 Created attachment 275925 Patch 1181841 2 commit-queue 2016-04-07 13:44:24 -0700 Attachment 275925 did not pass style-queue: ERROR: Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:101: Should not have spaces around = in property synthesis. [whitespace/property] [4] ERROR: Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:102: Should not have spaces around = in property synthesis. [whitespace/property] [4] ERROR: Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:103: Should not have spaces around = in property synthesis. [whitespace/property] [4] ERROR: Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:104: Should not have spaces around = in property synthesis. [whitespace/property] [4] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1181843 3 275926 bdakin 2016-04-07 13:48:04 -0700 Created attachment 275926 Patch 1181854 4 275926 jer.noble 2016-04-07 14:02:40 -0700 Comment on attachment 275926 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=275926&action=review r=me, with possible nits. > Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:269 > + [webOption setLocalizedDisplayName:name]; I could be wrong, but I feel like the new preferred style guides for this kind of thing would read: webOption.get().localizedDisplayName = name; > Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:280 > + [controlsManager setAudioMediaSelectionOptions:webOptions.get()]; ...and: controlsManager.get().audioMediaSelectionOptions = webOptions.get(); > Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm:282 > + [controlsManager setCurrentAudioMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]]; ...and: controlsManager.get().currentAudioMediaSelectionOption = [webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]]; etc. But I may not be correct about that use of style. Aside from than that, good patch! 1181887 5 bdakin 2016-04-07 14:33:09 -0700 Thanks Jer! http://trac.webkit.org/changeset/199184 My understanding has been that most people prefer not to use dot syntax with RetainPtrs, but it really is something we should address in the style guide. I chose not to address the comment for now. http://trac.webkit.org/changeset/199184 275925 2016-04-07 13:43:03 -0700 2016-04-07 13:48:04 -0700 Patch for-review.txt text/plain 8880 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTE3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA0LTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQbGF5YmFja0NvbnRyb2xzTWFu YWdlciBzaG91bGQgc3VwcG9ydCBtZWRpYVNlbGVjdGlvbk9wdGlvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjM1OAorICAgICAgICAtYW5kIGNv cnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI1MDQ4NzQzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBqdXN0IGlt cGxlbWVudHMgCisgICAgICAgIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYzo6c2V0QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMgYW5kIAorICAgICAgICBXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VNYWM6OnNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMgYW5kIHBhc3NlcyB0 aGF0IAorICAgICAgICBpbmZvcm1hdGlvbiBvbiB0byBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdl ci4gSWYgc2VsZWN0aW9uIG9wdGlvbnMgYXJlIHNldCB2aWEgCisgICAgICAgIHRoZSBXZWJQbGF5 YmFja0NvbnRyb2xzTWFuYWdlciwgdGhlbiBpdCBnZXRzIHRoZSB3ZWJWaWRlb0Z1bGxzY3JlZW5N b2RlbCgpIHRvIAorICAgICAgICBzZXQgdGhlIG5ldyB2YWx1ZS4KKworICAgICAgICAqIHBsYXRm b3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLm1tOgorICAgICAgICAoLVtX ZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBjdXJyZW50QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlv bl0pOgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbjpdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9s c01hbmFnZXIgY3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbl0pOgorICAgICAgICAo LVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0 aW9uT3B0aW9uOl0pOgorICAgICAgICAoV2ViQ29yZTo6bWVkaWFTZWxlY3Rpb25PcHRpb25zKToK KyAgICAgICAgKFdlYkNvcmU6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYzo6c2V0QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6V2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlTWFjOjpzZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zKToKKyAg ICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgYXVkaW9NZWRpYVNlbGVjdGlvbk9w dGlvbnNdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIg bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uc10pOiBEZWxldGVkLgorCiAyMDE2LTA0LTA1ICBB ZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBUZXh0VHJhY2tS ZXByZXNlbnRhdGlvbmlPUyB0byBUZXh0VHJhY2tSZXByZXNlbnRhdGlvbkNvY29hIGFuZCBlbmFi bGUgb24gTWFjCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlTWFjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5oCShyZXZpc2lvbiAxOTkwNjQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDggKzY5LDggQEAgcHVibGljOgogICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0VmlkZW9EaW1lbnNpb25zKGJvb2wgaGFzVmlkZW8sIGZsb2F0 IHdpZHRoLCBmbG9hdCBoZWlnaHQpIGZpbmFsOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 U2Vla2FibGVSYW5nZXMoY29uc3QgVGltZVJhbmdlcyYpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc2V0Q2FuUGxheUZhc3RSZXZlcnNlKGJvb2wpIG92ZXJyaWRlIHsgfQotICAg IFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMoY29uc3Qg VmVjdG9yPFdURjo6U3RyaW5nPiYgLypvcHRpb25zKi8sIHVpbnQ2NF90IC8qc2VsZWN0ZWRJbmRl eCovKSBvdmVycmlkZSB7IH0KLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldExlZ2libGVNZWRp YVNlbGVjdGlvbk9wdGlvbnMoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgLypvcHRpb25zKi8s IHVpbnQ2NF90IC8qc2VsZWN0ZWRJbmRleCovKSBvdmVycmlkZSB7IH0KKyAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zKGNvbnN0IFZlY3RvcjxXVEY6 OlN0cmluZz4mIC8qb3B0aW9ucyovLCB1aW50NjRfdCAvKnNlbGVjdGVkSW5kZXgqLykgb3ZlcnJp ZGU7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRp b25zKGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mIC8qb3B0aW9ucyovLCB1aW50NjRfdCAvKnNl bGVjdGVkSW5kZXgqLykgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRFeHRl cm5hbFBsYXliYWNrKGJvb2wgZW5hYmxlZCwgRXh0ZXJuYWxQbGF5YmFja1RhcmdldFR5cGUsIFdU Rjo6U3RyaW5nIGxvY2FsaXplZERldmljZU5hbWUpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgc2V0V2lyZWxlc3NWaWRlb1BsYXliYWNrRGlzYWJsZWQoYm9vbCkgb3ZlcnJpZGUg eyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5tbQkocmV2aXNpb24gMTk5MDY0KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsMTMgQEAgU09GVF9MSU5LX0NMQVNT KEFWS2l0LCBBVlZhbHVlVGltaW5nKQogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorQGlu dGVyZmFjZSBXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjIDogTlNPYmplY3QKK0Bwcm9wZXJ0 eSAocmV0YWluKSBOU1N0cmluZyAqbG9jYWxpemVkRGlzcGxheU5hbWU7CitAZW5kCisKK0BpbXBs ZW1lbnRhdGlvbiBXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjCitAZW5kCisKIEBpbnRlcmZh Y2UgV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgOiBOU09iamVjdCB7CiAgICAgTlNUaW1lSW50 ZXJ2YWwgX2NvbnRlbnREdXJhdGlvbjsKICAgICBBVlZhbHVlVGltaW5nICpfdGltaW5nOwpAQCAt NjcsNiArNzQsMTAgQEAgQGludGVyZmFjZSBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciA6IAog QHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbiwgcmVhZHdyaXRlKSBOU0FycmF5ICpzZWVrYWJs ZVRpbWVSYW5nZXM7CiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQk9PTCBoYXNFbmFibGVkQXVkaW87 CiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQk9PTCBoYXNFbmFibGVkVmlkZW87CitAcHJvcGVydHkg KG5vbmF0b21pYywgcmV0YWluLCByZWFkd3JpdGUpIE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9w dGlvbiAqPiAqYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM7CitAcHJvcGVydHkgKG5vbmF0b21p YywgcmV0YWluLCByZWFkd3JpdGUpIEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKmN1cnJlbnRBdWRp b01lZGlhU2VsZWN0aW9uT3B0aW9uOworQHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbiwgcmVh ZHdyaXRlKSBOU0FycmF5PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKmxlZ2libGVNZWRpYVNl bGVjdGlvbk9wdGlvbnM7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmV0YWluLCByZWFkd3JpdGUp IEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKmN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRp b247CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBmbG9hdCByYXRlOwogCkBAIC04Nyw2ICs5OCwx MCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJWaWRlb0Z1bGxzY3JlCiBAc3ludGhlc2l6 ZSBoYXNFbmFibGVkQXVkaW89X2hhc0VuYWJsZWRBdWRpbzsKIEBzeW50aGVzaXplIGhhc0VuYWJs ZWRWaWRlbz1faGFzRW5hYmxlZFZpZGVvOwogQHN5bnRoZXNpemUgcmF0ZT1fcmF0ZTsKK0BzeW50 aGVzaXplIGF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zID0gX2F1ZGlvTWVkaWFTZWxlY3Rpb25P cHRpb25zOworQHN5bnRoZXNpemUgY3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb24gPSBf Y3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb247CitAc3ludGhlc2l6ZSBsZWdpYmxlTWVk aWFTZWxlY3Rpb25PcHRpb25zID0gX2xlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM7CitAc3lu dGhlc2l6ZSBjdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uID0gX2N1cnJlbnRMZWdp YmxlTWVkaWFTZWxlY3Rpb25PcHRpb247CiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aFdlYlZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYzooV2ViQ29yZTo6V2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlTWFjKil3ZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMKIHsKQEAgLTExMCwzNCAr MTI1LDQ0IEBAIC0gKHZvaWQpc2Vla1RvVGltZTooTlNUaW1lSW50ZXJ2YWwpdGltZSAKICAgICBf d2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLT53ZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCgp LT5zZWVrVG9UaW1lKHRpbWUpOwogfQogCi0tIChOU0FycmF5ICopYXVkaW9NZWRpYVNlbGVjdGlv bk9wdGlvbnMKLXsKLSAgICByZXR1cm4gQFtdOwotfQotCiAtIChBVk1lZGlhU2VsZWN0aW9uT3B0 aW9uICopY3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb24KIHsKLSAgICByZXR1cm4gbmls OworICAgIHJldHVybiBfY3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb247CiB9CiAKIC0g KHZvaWQpc2V0Q3VycmVudEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb246KEFWTWVkaWFTZWxlY3Rp b25PcHRpb24gKilhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uCiB7Ci0gICAgVU5VU0VEX1BBUkFN KGF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb24pOwotfQotCi0tIChOU0FycmF5ICopbGVnaWJsZU1l ZGlhU2VsZWN0aW9uT3B0aW9ucwotewotICAgIHJldHVybiBAW107CisgICAgaWYgKGF1ZGlvTWVk aWFTZWxlY3Rpb25PcHRpb24gPT0gX2N1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uKQor ICAgICAgICByZXR1cm47CisgICAgCisgICAgX2N1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0 aW9uID0gYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbjsKKyAgICAKKyAgICBOU0ludGVnZXIgaW5k ZXggPSBOU05vdEZvdW5kOworICAgIAorICAgIGlmIChhdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9u ICYmIHNlbGYuYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMpCisgICAgICAgIGluZGV4ID0gW3Nl bGYuYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMgaW5kZXhPZk9iamVjdDphdWRpb01lZGlhU2Vs ZWN0aW9uT3B0aW9uXTsKKyAgICAKKyAgICBfd2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFj LT53ZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCgpLT5zZWxlY3RBdWRpb01lZGlhT3B0aW9uKGluZGV4 ICE9IE5TTm90Rm91bmQgPyBpbmRleCA6IFVJTlQ2NF9NQVgpOwogfQogCiAtIChBVk1lZGlhU2Vs ZWN0aW9uT3B0aW9uICopY3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbgogewotICAg IHJldHVybiBuaWw7CisgICAgcmV0dXJuIF9jdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0 aW9uOwogfQogCiAtICh2b2lkKXNldEN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb246 KEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKilsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24KIHsK LSAgICBVTlVTRURfUEFSQU0obGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uKTsKKyAgICBpZiAo bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uID09IF9jdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0 aW9uT3B0aW9uKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgX2N1cnJlbnRMZWdpYmxlTWVk aWFTZWxlY3Rpb25PcHRpb24gPSBsZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb247CisgICAgCisg ICAgTlNJbnRlZ2VyIGluZGV4ID0gTlNOb3RGb3VuZDsKKyAgICAKKyAgICBpZiAobGVnaWJsZU1l ZGlhU2VsZWN0aW9uT3B0aW9uICYmIHNlbGYubGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9ucykK KyAgICAgICAgaW5kZXggPSBbc2VsZi5sZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zIGluZGV4 T2ZPYmplY3Q6bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uXTsKKyAgICAKKyAgICBfd2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLT53ZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbCgpLT5zZWxl Y3RMZWdpYmxlTWVkaWFPcHRpb24oaW5kZXggIT0gTlNOb3RGb3VuZCA/IGluZGV4IDogVUlOVDY0 X01BWCk7CiB9CiAKIC0gKHZvaWQpY2FuY2VsVGh1bWJuYWlsQW5kQXVkaW9BbXBsaXR1ZGVTYW1w bGVHZW5lcmF0aW9uCkBAIC0yMzYsNiArMjYxLDM3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVu SW50ZXJmYWNlTWFjOjpzZXQKICAgICBbY29udHJvbHNNYW5hZ2VyIHNldFNlZWthYmxlVGltZVJh bmdlczpzZWVrYWJsZVJhbmdlcy5nZXQoKV07CiB9CiAKK3N0YXRpYyBSZXRhaW5QdHI8TlNNdXRh YmxlQXJyYXk+IG1lZGlhU2VsZWN0aW9uT3B0aW9ucyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgb3B0 aW9ucykKK3sKKyAgICBSZXRhaW5QdHI8TlNNdXRhYmxlQXJyYXk+IHdlYk9wdGlvbnMgPSBhZG9w dE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6b3B0aW9ucy5zaXpl KCldKTsKKyAgICBmb3IgKGF1dG8mIG5hbWUgOiBvcHRpb25zKSB7CisgICAgICAgIFJldGFpblB0 cjxXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjPiB3ZWJPcHRpb24gPSBhZG9wdE5TKFtbV2Vi QVZNZWRpYVNlbGVjdGlvbk9wdGlvbk1hYyBhbGxvY10gaW5pdF0pOworICAgICAgICBbd2ViT3B0 aW9uIHNldExvY2FsaXplZERpc3BsYXlOYW1lOm5hbWVdOworICAgICAgICBbd2ViT3B0aW9ucyBh ZGRPYmplY3Q6d2ViT3B0aW9uLmdldCgpXTsKKyAgICB9CisgICAgcmV0dXJuIHdlYk9wdGlvbnM7 Cit9CisKK3ZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjOjpzZXRBdWRpb01lZGlh U2VsZWN0aW9uT3B0aW9ucyhjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JiBvcHRpb25zLCB1aW50 NjRfdCBzZWxlY3RlZEluZGV4KQoreworICAgIFdlYlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKiBj b250cm9sc01hbmFnZXIgPSBwbGF5QmFja0NvbnRyb2xzTWFuYWdlcigpOworCisgICAgUmV0YWlu UHRyPE5TTXV0YWJsZUFycmF5PiB3ZWJPcHRpb25zID0gbWVkaWFTZWxlY3Rpb25PcHRpb25zKG9w dGlvbnMpOworICAgIFtjb250cm9sc01hbmFnZXIgc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlv bnM6d2ViT3B0aW9ucy5nZXQoKV07CisgICAgaWYgKHNlbGVjdGVkSW5kZXggPCBbd2ViT3B0aW9u cyBjb3VudF0pCisgICAgICAgIFtjb250cm9sc01hbmFnZXIgc2V0Q3VycmVudEF1ZGlvTWVkaWFT ZWxlY3Rpb25PcHRpb246W3dlYk9wdGlvbnMgb2JqZWN0QXRJbmRleDpzdGF0aWNfY2FzdDxOU1VJ bnRlZ2VyPihzZWxlY3RlZEluZGV4KV1dOworfQorCit2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZU1hYzo6c2V0TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9ucyhjb25zdCBWZWN0b3I8 V1RGOjpTdHJpbmc+JiBvcHRpb25zLCB1aW50NjRfdCBzZWxlY3RlZEluZGV4KQoreworICAgIFdl YlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKiBjb250cm9sc01hbmFnZXIgPSBwbGF5QmFja0NvbnRy b2xzTWFuYWdlcigpOworCisgICAgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiB3ZWJPcHRpb25z ID0gbWVkaWFTZWxlY3Rpb25PcHRpb25zKG9wdGlvbnMpOworICAgIFtjb250cm9sc01hbmFnZXIg c2V0TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uczp3ZWJPcHRpb25zLmdldCgpXTsKKyAgICBp ZiAoc2VsZWN0ZWRJbmRleCA8IFt3ZWJPcHRpb25zIGNvdW50XSkKKyAgICAgICAgW2NvbnRyb2xz TWFuYWdlciBzZXRDdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOlt3ZWJPcHRpb25z IG9iamVjdEF0SW5kZXg6c3RhdGljX2Nhc3Q8TlNVSW50ZWdlcj4oc2VsZWN0ZWRJbmRleCldXTsK K30KKwogdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWM6OmVuc3VyZUNvbnRyb2xz TWFuYWdlcigpCiB7CiAgICAgcGxheUJhY2tDb250cm9sc01hbmFnZXIoKTsK 275926 2016-04-07 13:48:04 -0700 2016-04-07 14:02:40 -0700 Patch for-review-2.txt text/plain 8872 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5OTE3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA0LTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJQbGF5YmFja0NvbnRyb2xzTWFu YWdlciBzaG91bGQgc3VwcG9ydCBtZWRpYVNlbGVjdGlvbk9wdGlvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjM1OAorICAgICAgICAtYW5kIGNv cnJlc3BvbmRpbmctCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI1MDQ4NzQzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBqdXN0IGlt cGxlbWVudHMgCisgICAgICAgIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYzo6c2V0QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMgYW5kIAorICAgICAgICBXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VNYWM6OnNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMgYW5kIHBhc3NlcyB0 aGF0IAorICAgICAgICBpbmZvcm1hdGlvbiBvbiB0byBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdl ci4gSWYgc2VsZWN0aW9uIG9wdGlvbnMgYXJlIHNldCB2aWEgCisgICAgICAgIHRoZSBXZWJQbGF5 YmFja0NvbnRyb2xzTWFuYWdlciwgdGhlbiBpdCBnZXRzIHRoZSB3ZWJWaWRlb0Z1bGxzY3JlZW5N b2RlbCgpIHRvIAorICAgICAgICBzZXQgdGhlIG5ldyB2YWx1ZS4KKworICAgICAgICAqIHBsYXRm b3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLm1tOgorICAgICAgICAoLVtX ZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBjdXJyZW50QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlv bl0pOgorICAgICAgICAoLVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbjpdKToKKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9s c01hbmFnZXIgY3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbl0pOgorICAgICAgICAo LVtXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciBzZXRDdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0 aW9uT3B0aW9uOl0pOgorICAgICAgICAoV2ViQ29yZTo6bWVkaWFTZWxlY3Rpb25PcHRpb25zKToK KyAgICAgICAgKFdlYkNvcmU6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYzo6c2V0QXVk aW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6V2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlTWFjOjpzZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zKToKKyAg ICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgYXVkaW9NZWRpYVNlbGVjdGlvbk9w dGlvbnNdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIg bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uc10pOiBEZWxldGVkLgorCiAyMDE2LTA0LTA1ICBB ZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBUZXh0VHJhY2tS ZXByZXNlbnRhdGlvbmlPUyB0byBUZXh0VHJhY2tSZXByZXNlbnRhdGlvbkNvY29hIGFuZCBlbmFi bGUgb24gTWFjCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxs c2NyZWVuSW50ZXJmYWNlTWFjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5oCShyZXZpc2lvbiAxOTkwNjQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJm YWNlTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDggKzY5LDggQEAgcHVibGljOgogICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0VmlkZW9EaW1lbnNpb25zKGJvb2wgaGFzVmlkZW8sIGZsb2F0 IHdpZHRoLCBmbG9hdCBoZWlnaHQpIGZpbmFsOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 U2Vla2FibGVSYW5nZXMoY29uc3QgVGltZVJhbmdlcyYpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc2V0Q2FuUGxheUZhc3RSZXZlcnNlKGJvb2wpIG92ZXJyaWRlIHsgfQotICAg IFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnMoY29uc3Qg VmVjdG9yPFdURjo6U3RyaW5nPiYgLypvcHRpb25zKi8sIHVpbnQ2NF90IC8qc2VsZWN0ZWRJbmRl eCovKSBvdmVycmlkZSB7IH0KLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldExlZ2libGVNZWRp YVNlbGVjdGlvbk9wdGlvbnMoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgLypvcHRpb25zKi8s IHVpbnQ2NF90IC8qc2VsZWN0ZWRJbmRleCovKSBvdmVycmlkZSB7IH0KKyAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zKGNvbnN0IFZlY3RvcjxXVEY6 OlN0cmluZz4mIC8qb3B0aW9ucyovLCB1aW50NjRfdCAvKnNlbGVjdGVkSW5kZXgqLykgb3ZlcnJp ZGU7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRp b25zKGNvbnN0IFZlY3RvcjxXVEY6OlN0cmluZz4mIC8qb3B0aW9ucyovLCB1aW50NjRfdCAvKnNl bGVjdGVkSW5kZXgqLykgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRFeHRl cm5hbFBsYXliYWNrKGJvb2wgZW5hYmxlZCwgRXh0ZXJuYWxQbGF5YmFja1RhcmdldFR5cGUsIFdU Rjo6U3RyaW5nIGxvY2FsaXplZERldmljZU5hbWUpIG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgc2V0V2lyZWxlc3NWaWRlb1BsYXliYWNrRGlzYWJsZWQoYm9vbCkgb3ZlcnJpZGUg eyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5tbQkocmV2aXNpb24gMTk5MDY0KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsMTMgQEAgU09GVF9MSU5LX0NMQVNT KEFWS2l0LCBBVlZhbHVlVGltaW5nKQogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAorQGlu dGVyZmFjZSBXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjIDogTlNPYmplY3QKK0Bwcm9wZXJ0 eSAocmV0YWluKSBOU1N0cmluZyAqbG9jYWxpemVkRGlzcGxheU5hbWU7CitAZW5kCisKK0BpbXBs ZW1lbnRhdGlvbiBXZWJBVk1lZGlhU2VsZWN0aW9uT3B0aW9uTWFjCitAZW5kCisKIEBpbnRlcmZh Y2UgV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIgOiBOU09iamVjdCB7CiAgICAgTlNUaW1lSW50 ZXJ2YWwgX2NvbnRlbnREdXJhdGlvbjsKICAgICBBVlZhbHVlVGltaW5nICpfdGltaW5nOwpAQCAt NjcsNiArNzQsMTAgQEAgQGludGVyZmFjZSBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciA6IAog QHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbiwgcmVhZHdyaXRlKSBOU0FycmF5ICpzZWVrYWJs ZVRpbWVSYW5nZXM7CiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQk9PTCBoYXNFbmFibGVkQXVkaW87 CiBAcHJvcGVydHkgKHJlYWR3cml0ZSkgQk9PTCBoYXNFbmFibGVkVmlkZW87CitAcHJvcGVydHkg KG5vbmF0b21pYywgcmV0YWluLCByZWFkd3JpdGUpIE5TQXJyYXk8QVZNZWRpYVNlbGVjdGlvbk9w dGlvbiAqPiAqYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM7CitAcHJvcGVydHkgKG5vbmF0b21p YywgcmV0YWluLCByZWFkd3JpdGUpIEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKmN1cnJlbnRBdWRp b01lZGlhU2VsZWN0aW9uT3B0aW9uOworQHByb3BlcnR5IChub25hdG9taWMsIHJldGFpbiwgcmVh ZHdyaXRlKSBOU0FycmF5PEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKmxlZ2libGVNZWRpYVNl bGVjdGlvbk9wdGlvbnM7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmV0YWluLCByZWFkd3JpdGUp IEFWTWVkaWFTZWxlY3Rpb25PcHRpb24gKmN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRp b247CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBmbG9hdCByYXRlOwogCkBAIC04Nyw2ICs5OCwx MCBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJWaWRlb0Z1bGxzY3JlCiBAc3ludGhlc2l6 ZSBoYXNFbmFibGVkQXVkaW89X2hhc0VuYWJsZWRBdWRpbzsKIEBzeW50aGVzaXplIGhhc0VuYWJs ZWRWaWRlbz1faGFzRW5hYmxlZFZpZGVvOwogQHN5bnRoZXNpemUgcmF0ZT1fcmF0ZTsKK0BzeW50 aGVzaXplIGF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zPV9hdWRpb01lZGlhU2VsZWN0aW9uT3B0 aW9uczsKK0BzeW50aGVzaXplIGN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uPV9jdXJy ZW50QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbjsKK0BzeW50aGVzaXplIGxlZ2libGVNZWRpYVNl bGVjdGlvbk9wdGlvbnM9X2xlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM7CitAc3ludGhlc2l6 ZSBjdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uPV9jdXJyZW50TGVnaWJsZU1lZGlh U2VsZWN0aW9uT3B0aW9uOwogCiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VNYWM6KFdlYkNvcmU6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1h Yyopd2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjCiB7CkBAIC0xMTAsMzQgKzEyNSw0NCBA QCAtICh2b2lkKXNlZWtUb1RpbWU6KE5TVGltZUludGVydmFsKXRpbWUgCiAgICAgX3dlYlZpZGVv RnVsbHNjcmVlbkludGVyZmFjZU1hYy0+d2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwoKS0+c2Vla1Rv VGltZSh0aW1lKTsKIH0KIAotLSAoTlNBcnJheSAqKWF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25z Ci17Ci0gICAgcmV0dXJuIEBbXTsKLX0KLQogLSAoQVZNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1 cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uCiB7Ci0gICAgcmV0dXJuIG5pbDsKKyAgICBy ZXR1cm4gX2N1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uOwogfQogCiAtICh2b2lkKXNl dEN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9uOihBVk1lZGlhU2VsZWN0aW9uT3B0aW9u ICopYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbgogewotICAgIFVOVVNFRF9QQVJBTShhdWRpb01l ZGlhU2VsZWN0aW9uT3B0aW9uKTsKLX0KLQotLSAoTlNBcnJheSAqKWxlZ2libGVNZWRpYVNlbGVj dGlvbk9wdGlvbnMKLXsKLSAgICByZXR1cm4gQFtdOworICAgIGlmIChhdWRpb01lZGlhU2VsZWN0 aW9uT3B0aW9uID09IF9jdXJyZW50QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbikKKyAgICAgICAg cmV0dXJuOworICAgIAorICAgIF9jdXJyZW50QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbiA9IGF1 ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb247CisgICAgCisgICAgTlNJbnRlZ2VyIGluZGV4ID0gTlNO b3RGb3VuZDsKKyAgICAKKyAgICBpZiAoYXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbiAmJiBzZWxm LmF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zKQorICAgICAgICBpbmRleCA9IFtzZWxmLmF1ZGlv TWVkaWFTZWxlY3Rpb25PcHRpb25zIGluZGV4T2ZPYmplY3Q6YXVkaW9NZWRpYVNlbGVjdGlvbk9w dGlvbl07CisgICAgCisgICAgX3dlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy0+d2ViVmlk ZW9GdWxsc2NyZWVuTW9kZWwoKS0+c2VsZWN0QXVkaW9NZWRpYU9wdGlvbihpbmRleCAhPSBOU05v dEZvdW5kID8gaW5kZXggOiBVSU5UNjRfTUFYKTsKIH0KIAogLSAoQVZNZWRpYVNlbGVjdGlvbk9w dGlvbiAqKWN1cnJlbnRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb24KIHsKLSAgICByZXR1cm4g bmlsOworICAgIHJldHVybiBfY3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbjsKIH0K IAogLSAodm9pZClzZXRDdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOihBVk1lZGlh U2VsZWN0aW9uT3B0aW9uICopbGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uCiB7Ci0gICAgVU5V U0VEX1BBUkFNKGxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbik7CisgICAgaWYgKGxlZ2libGVN ZWRpYVNlbGVjdGlvbk9wdGlvbiA9PSBfY3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlv bikKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIF9jdXJyZW50TGVnaWJsZU1lZGlhU2VsZWN0 aW9uT3B0aW9uID0gbGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uOworICAgIAorICAgIE5TSW50 ZWdlciBpbmRleCA9IE5TTm90Rm91bmQ7CisgICAgCisgICAgaWYgKGxlZ2libGVNZWRpYVNlbGVj dGlvbk9wdGlvbiAmJiBzZWxmLmxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMpCisgICAgICAg IGluZGV4ID0gW3NlbGYubGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9ucyBpbmRleE9mT2JqZWN0 OmxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbl07CisgICAgCisgICAgX3dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZU1hYy0+d2ViVmlkZW9GdWxsc2NyZWVuTW9kZWwoKS0+c2VsZWN0TGVnaWJs ZU1lZGlhT3B0aW9uKGluZGV4ICE9IE5TTm90Rm91bmQgPyBpbmRleCA6IFVJTlQ2NF9NQVgpOwog fQogCiAtICh2b2lkKWNhbmNlbFRodW1ibmFpbEFuZEF1ZGlvQW1wbGl0dWRlU2FtcGxlR2VuZXJh dGlvbgpAQCAtMjM2LDYgKzI2MSwzNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZU1hYzo6c2V0CiAgICAgW2NvbnRyb2xzTWFuYWdlciBzZXRTZWVrYWJsZVRpbWVSYW5nZXM6c2Vl a2FibGVSYW5nZXMuZ2V0KCldOwogfQogCitzdGF0aWMgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5 PiBtZWRpYVNlbGVjdGlvbk9wdGlvbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIG9wdGlvbnMpCit7 CisgICAgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiB3ZWJPcHRpb25zID0gYWRvcHROUyhbW05T TXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0aENhcGFjaXR5Om9wdGlvbnMuc2l6ZSgpXSk7Cisg ICAgZm9yIChhdXRvJiBuYW1lIDogb3B0aW9ucykgeworICAgICAgICBSZXRhaW5QdHI8V2ViQVZN ZWRpYVNlbGVjdGlvbk9wdGlvbk1hYz4gd2ViT3B0aW9uID0gYWRvcHROUyhbW1dlYkFWTWVkaWFT ZWxlY3Rpb25PcHRpb25NYWMgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgW3dlYk9wdGlvbiBzZXRM b2NhbGl6ZWREaXNwbGF5TmFtZTpuYW1lXTsKKyAgICAgICAgW3dlYk9wdGlvbnMgYWRkT2JqZWN0 OndlYk9wdGlvbi5nZXQoKV07CisgICAgfQorICAgIHJldHVybiB3ZWJPcHRpb25zOworfQorCit2 b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYzo6c2V0QXVkaW9NZWRpYVNlbGVjdGlv bk9wdGlvbnMoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgb3B0aW9ucywgdWludDY0X3Qgc2Vs ZWN0ZWRJbmRleCkKK3sKKyAgICBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciogY29udHJvbHNN YW5hZ2VyID0gcGxheUJhY2tDb250cm9sc01hbmFnZXIoKTsKKworICAgIFJldGFpblB0cjxOU011 dGFibGVBcnJheT4gd2ViT3B0aW9ucyA9IG1lZGlhU2VsZWN0aW9uT3B0aW9ucyhvcHRpb25zKTsK KyAgICBbY29udHJvbHNNYW5hZ2VyIHNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zOndlYk9w dGlvbnMuZ2V0KCldOworICAgIGlmIChzZWxlY3RlZEluZGV4IDwgW3dlYk9wdGlvbnMgY291bnRd KQorICAgICAgICBbY29udHJvbHNNYW5hZ2VyIHNldEN1cnJlbnRBdWRpb01lZGlhU2VsZWN0aW9u T3B0aW9uOlt3ZWJPcHRpb25zIG9iamVjdEF0SW5kZXg6c3RhdGljX2Nhc3Q8TlNVSW50ZWdlcj4o c2VsZWN0ZWRJbmRleCldXTsKK30KKwordm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VN YWM6OnNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMoY29uc3QgVmVjdG9yPFdURjo6U3Ry aW5nPiYgb3B0aW9ucywgdWludDY0X3Qgc2VsZWN0ZWRJbmRleCkKK3sKKyAgICBXZWJQbGF5YmFj a0NvbnRyb2xzTWFuYWdlciogY29udHJvbHNNYW5hZ2VyID0gcGxheUJhY2tDb250cm9sc01hbmFn ZXIoKTsKKworICAgIFJldGFpblB0cjxOU011dGFibGVBcnJheT4gd2ViT3B0aW9ucyA9IG1lZGlh U2VsZWN0aW9uT3B0aW9ucyhvcHRpb25zKTsKKyAgICBbY29udHJvbHNNYW5hZ2VyIHNldExlZ2li bGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6d2ViT3B0aW9ucy5nZXQoKV07CisgICAgaWYgKHNlbGVj dGVkSW5kZXggPCBbd2ViT3B0aW9ucyBjb3VudF0pCisgICAgICAgIFtjb250cm9sc01hbmFnZXIg c2V0Q3VycmVudExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbjpbd2ViT3B0aW9ucyBvYmplY3RB dEluZGV4OnN0YXRpY19jYXN0PE5TVUludGVnZXI+KHNlbGVjdGVkSW5kZXgpXV07Cit9CisKIHZv aWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjOjplbnN1cmVDb250cm9sc01hbmFnZXIo KQogewogICAgIHBsYXlCYWNrQ29udHJvbHNNYW5hZ2VyKCk7Cg==