144392 2015-04-29 09:35:50 -0700 [Mac] Use new device picker menu API 2015-05-04 11:12:03 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer oldest_to_newest 1090030 0 eric.carlson 2015-04-29 09:35:50 -0700 Use the new API. 1090031 1 eric.carlson 2015-04-29 09:36:24 -0700 <rdar://problem/20718389> 1090066 2 251967 eric.carlson 2015-04-29 10:55:00 -0700 Created attachment 251967 Proposed patch. 1090068 3 commit-queue 2015-04-29 10:56:41 -0700 Attachment 251967 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:53: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1090074 4 251967 jer.noble 2015-04-29 11:02:44 -0700 Comment on attachment 251967 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=251967&action=review r=me, with nits > Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h:53 > - virtual void showPlaybackTargetPicker(const FloatRect&, bool); > + virtual void showPlaybackTargetPicker(const FloatRect&, bool /*checkActiveRoute*/); nit: We should either not add a comment, or add the parameter name without a comment. > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:47 > - virtual void showPlaybackTargetPicker(const FloatRect&, bool) override; > + virtual void showPlaybackTargetPicker(const FloatRect&, bool /*checkActiveRoute*/) override; Ditto. > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:60 > + OutputeDeviceAvailabilityChanged = 1 << 0, Nit: Outpute > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:150 > + m_pendingActionTimer.stop(); > + m_pendingActionTimer.startOneShot(0); The .stop() isn't necessary. startOneShot() will stop the timer before re-targetting. 1090078 5 251967 eric.carlson 2015-04-29 11:10:00 -0700 Comment on attachment 251967 Proposed patch. Committed r183560: https://trac.webkit.org/r183560 251967 2015-04-29 10:55:00 -0700 2015-04-29 11:10:00 -0700 Proposed patch. update_api_patch_2.txt text/plain 11053 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzU1NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE1LTA0LTI5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFVzZSBuZXcg ZGV2aWNlIHBpY2tlciBtZW51IEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ0MzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNob3dQ bGF5YmFja1RhcmdldFBpY2tlcik6IFBhc3MgdGhlIHJvdXRlIHN0YXRlIHRvIHRoZSBwaWNrZXIu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlci5o OgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5YmFja1RhcmdldFBpY2tlck1hYy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjpNZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyTWFjKTogIG1fZGV2aWNlQ2hhbmdlVGltZXIgLT4gbV9wZW5kaW5nQWN0aW9uVGlt ZXIuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjp+TWVk aWFQbGF5YmFja1RhcmdldFBpY2tlck1hYyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6cGVuZGluZ0FjdGlvblRpbWVyRmlyZWQpOiBSZW5h bWVkIGZyb20gCisgICAgICAgIG91dHB1dGVEZXZpY2VBdmFpbGFiaWxpdHlDaGFuZ2VkVGltZXJG aXJlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OmF2 YWlsYWJsZURldmljZXNEaWRDaGFuZ2UpOiBVc2UgYWRkUGVuZGluZ0FjdGlvbi4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OnNob3dQbGF5YmFja1Rhcmdl dFBpY2tlcik6IENhbGwgbmV3IHBpY2tlciBBUEkgaWYgaXQgaXMKKyAgICAgICAgYXZhaWxhYmxl LiBOZXcgQVBJIHJldHVybnMgdHJ1ZSBpZiBhIHRhcmdldCBpcyBjaG9zZW4sIHNvIGNhbGwgY3Vy cmVudERldmljZURpZENoYW5nZSBpbiB0aGF0IGNhc2UuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjphZGRQZW5kaW5nQWN0aW9uKTogTmV3LgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6Y3VycmVudERldmljZURp ZENoYW5nZSk6IE1ha2UgYXN5bmNocm9ub3VzIGJlY2F1c2UgaXQgCisgICAgICAgIGNhbiBub3cg YmUgY2FsbGVkIGZyb20gc2hvd1BsYXliYWNrVGFyZ2V0UGlja2VyLgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6b3V0cHV0ZURldmljZUF2YWlsYWJpbGl0 eUNoYW5nZWRUaW1lckZpcmVkKTogUmVuYW1lZAorICAgICAgICBwZW5kaW5nQWN0aW9uVGltZXJG aXJlZC4KKworICAgICAgICAqIHBsYXRmb3JtL3NwaS9jb2NvYS9BVktpdFNQSS5oOiBBZGQgbmV3 IFNQSS4KKwogMjAxNS0wNC0yOSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAK ICAgICAgICAgTWFpbiByZXNvdXJjZSBsb2FkZWQgdmlhIDMwNCByZXNwb25zZSBiZWNvbWVzIGVt cHR5IGlmIHJlbG9hZGVkIGJ5IHVzZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuY3Bw CShyZXZpc2lvbiAxODM1NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lv bi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDcgKzEx NCw3IEBAIHZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6cmVtb3ZlQWxsUGwKICAgICB9CiB9 CiAKLXZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hvd1BsYXliYWNrVGFyZ2V0UGlja2Vy KFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJDbGllbnQmIGNsaWVudCwgdWludDY0X3QgY29udGV4dElk LCBjb25zdCBJbnRSZWN0JiByZWN0LCBib29sIGlzVmlkZW8pCit2b2lkIFdlYk1lZGlhU2Vzc2lv bk1hbmFnZXI6OnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihXZWJNZWRpYVNlc3Npb25NYW5hZ2Vy Q2xpZW50JiBjbGllbnQsIHVpbnQ2NF90IGNvbnRleHRJZCwgY29uc3QgSW50UmVjdCYgcmVjdCwg Ym9vbCkKIHsKICAgICBzaXplX3QgaW5kZXggPSBmaW5kKCZjbGllbnQsIGNvbnRleHRJZCk7CiAg ICAgQVNTRVJUKGluZGV4ICE9IG5vdEZvdW5kKTsKQEAgLTEyNCw3ICsxMjQsOCBAQCB2b2lkIFdl Yk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNob3dQbGF5YmFjCiAgICAgZm9yIChhdXRvJiBzdGF0ZSA6 IG1fY2xpZW50U3RhdGUpCiAgICAgICAgIHN0YXRlLT5yZXF1ZXN0ZWRQaWNrZXIgPSAoc3RhdGUt PmNvbnRleHRJZCA9PSBjb250ZXh0SWQgJiYgc3RhdGUtPmNsaWVudCA9PSAmY2xpZW50KTsKIAot ICAgIHRhcmdldFBpY2tlcigpLnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihGbG9hdFJlY3QocmVj dCksIGlzVmlkZW8pOworICAgIGJvb2wgaGFzQWN0aXZlUm91dGUgPSBmbGFnc0FyZVNldChtX2Ns aWVudFN0YXRlW2luZGV4XS0+ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1RvRXh0ZXJu YWxEZXZpY2UpOworICAgIHRhcmdldFBpY2tlcigpLnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihG bG9hdFJlY3QocmVjdCksIGhhc0FjdGl2ZVJvdXRlKTsKIH0KIAogdm9pZCBXZWJNZWRpYVNlc3Np b25NYW5hZ2VyOjpjbGllbnRTdGF0ZURpZENoYW5nZShXZWJNZWRpYVNlc3Npb25NYW5hZ2VyQ2xp ZW50JiBjbGllbnQsIHVpbnQ2NF90IGNvbnRleHRJZCwgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0 ZUZsYWdzIG5ld0ZsYWdzKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIuaAkocmV2aXNpb24g MTgzNTU0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5YmFj a1RhcmdldFBpY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoK IAogICAgIHZpcnR1YWwgfk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIoKTsKIAotICAgIHZpcnR1 YWwgdm9pZCBzaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoY29uc3QgRmxvYXRSZWN0JiwgYm9vbCk7 CisgICAgdmlydHVhbCB2b2lkIHNob3dQbGF5YmFja1RhcmdldFBpY2tlcihjb25zdCBGbG9hdFJl Y3QmLCBib29sIC8qY2hlY2tBY3RpdmVSb3V0ZSovKTsKICAgICB2aXJ0dWFsIHZvaWQgc3RhcnRp bmdNb25pdG9yaW5nUGxheWJhY2tUYXJnZXRzKCk7CiAgICAgdmlydHVhbCB2b2lkIHN0b3BNb25p dG9yaW5nUGxheWJhY2tUYXJnZXRzKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjLmgJKHJldmlzaW9uIDE4MzU1 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyAr NDQsNyBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgc3RkOjp1bmlxdWVf cHRyPE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM+IGNyZWF0ZShNZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyOjpDbGllbnQmKTsKIAotICAgIHZpcnR1YWwgdm9pZCBzaG93UGxheWJhY2tUYXJn ZXRQaWNrZXIoY29uc3QgRmxvYXRSZWN0JiwgYm9vbCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2 b2lkIHNob3dQbGF5YmFja1RhcmdldFBpY2tlcihjb25zdCBGbG9hdFJlY3QmLCBib29sIC8qY2hl Y2tBY3RpdmVSb3V0ZSovKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgc3RhcnRpbmdNb25p dG9yaW5nUGxheWJhY2tUYXJnZXRzKCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHN0b3BN b25pdG9yaW5nUGxheWJhY2tUYXJnZXRzKCkgb3ZlcnJpZGU7CiAgICAgCkBAIC01NSwxMSArNTUs MjAgQEAgcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFj KE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OkNsaWVudCYpOwogCiAgICAgQVZPdXRwdXREZXZp Y2VNZW51Q29udHJvbGxlciAqZGV2aWNlUGlja2VyKCk7Ci0gICAgdm9pZCBvdXRwdXRlRGV2aWNl QXZhaWxhYmlsaXR5Q2hhbmdlZFRpbWVyRmlyZWQoKTsKIAorICAgIGVudW0gQWN0aW9uVHlwZSB7 CisgICAgICAgIE91dHB1dGVEZXZpY2VBdmFpbGFiaWxpdHlDaGFuZ2VkID0gMSA8PCAwLAorICAg ICAgICBDdXJyZW50RGV2aWNlRGlkQ2hhbmdlID0gMSA8PCAxLAorICAgIH07CisgICAgdHlwZWRl ZiB1bnNpZ25lZCBQZW5kaW5nQWN0aW9uRmxhZ3M7CisKKyAgICB2b2lkIGFkZFBlbmRpbmdBY3Rp b24oUGVuZGluZ0FjdGlvbkZsYWdzKTsKKyAgICB2b2lkIHBlbmRpbmdBY3Rpb25UaW1lckZpcmVk KCk7CisKKyAgICBQZW5kaW5nQWN0aW9uRmxhZ3MgbV9wZW5kaW5nQWN0aW9uRmxhZ3MgeyAwIH07 CiAgICAgUmV0YWluUHRyPEFWT3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXI+IG1fb3V0cHV0RGV2 aWNlTWVudUNvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPFdlYkFWT3V0cHV0RGV2aWNlTWVudUNv bnRyb2xsZXJIZWxwZXI+IG1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXJEZWxlZ2F0ZTsKLSAg ICBSdW5Mb29wOjpUaW1lcjxNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjPiBtX2RldmljZUNo YW5nZVRpbWVyOworICAgIFJ1bkxvb3A6OlRpbWVyPE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJN YWM+IG1fcGVuZGluZ0FjdGlvblRpbWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyTWFjLm1tCShyZXZpc2lvbiAxODM1NTQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1MCwxMSBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIHN0YXRpYyBOU1N0cmluZyAqZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFpbGFibGVL ZXlOYW1lID0gQCJleHRlcm5hbE91dHB1dERldmljZUF2YWlsYWJsZSI7CiBzdGF0aWMgTlNTdHJp bmcgKmV4dGVybmFsT3V0cHV0RGV2aWNlUGlja2VkS2V5TmFtZSA9IEAiZXh0ZXJuYWxPdXRwdXRE ZXZpY2VQaWNrZWQiOwogCisvL0ZJWE1FOiByZW1vdmUgdGhpcyBvbmNlIHRoZSBoZWFkZXJzIGFy ZSBhdmFpbGFibGUuCitAaW50ZXJmYWNlIEFWT3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgKEZv cndhcmREZWNsYXJhdGlvbikKKy0gKEJPT0wpc2hvd01lbnVGb3JSZWN0OihOU1JlY3Qpc2NyZWVu UmVjdCBhcHBlYXJhbmNlTmFtZTooTlNTdHJpbmcgKilhcHBlYXJhbmNlTmFtZSBhbGxvd1Jlc2Vs ZWN0aW9uT2ZTZWxlY3RlZE91dHB1dERldmljZTooQk9PTClhbGxvd1Jlc2VsZWN0aW9uT2ZTZWxl Y3RlZE91dHB1dERldmljZTsKK0BlbmQKKwogQGludGVyZmFjZSBXZWJBVk91dHB1dERldmljZU1l bnVDb250cm9sbGVySGVscGVyIDogTlNPYmplY3QgewogICAgIE1lZGlhUGxheWJhY2tUYXJnZXRQ aWNrZXJNYWMqIG1fY2FsbGJhY2s7CiB9CkBAIC02OSwyMyArNzQsMzMgQEAgc3RkOjp1bmlxdWVf cHRyPE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZQogTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1h Yzo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYyhNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy OjpDbGllbnQmIGNsaWVudCkKICAgICA6IE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIoY2xpZW50 KQogICAgICwgbV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlckRlbGVnYXRlKGFkb3B0TlMoW1tX ZWJBVk91dHB1dERldmljZU1lbnVDb250cm9sbGVySGVscGVyIGFsbG9jXSBpbml0V2l0aENhbGxi YWNrOnRoaXNdKSkKLSAgICAsIG1fZGV2aWNlQ2hhbmdlVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0 aGlzLCAmTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6b3V0cHV0ZURldmljZUF2YWlsYWJp bGl0eUNoYW5nZWRUaW1lckZpcmVkKQorICAgICwgbV9wZW5kaW5nQWN0aW9uVGltZXIoUnVuTG9v cDo6bWFpbigpLCB0aGlzLCAmTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6cGVuZGluZ0Fj dGlvblRpbWVyRmlyZWQpCiB7CiB9CiAKIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6On5N ZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjKCkKIHsKLSAgICBtX2RldmljZUNoYW5nZVRpbWVy LnN0b3AoKTsKKyAgICBtX3BlbmRpbmdBY3Rpb25UaW1lci5zdG9wKCk7CiAgICAgW21fb3V0cHV0 RGV2aWNlTWVudUNvbnRyb2xsZXJEZWxlZ2F0ZSBjbGVhckNhbGxiYWNrXTsKICAgICBzdG9wTW9u aXRvcmluZ1BsYXliYWNrVGFyZ2V0cygpOwogfQogCi12b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQ aWNrZXJNYWM6Om91dHB1dGVEZXZpY2VBdmFpbGFiaWxpdHlDaGFuZ2VkVGltZXJGaXJlZCgpCit2 b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OnBlbmRpbmdBY3Rpb25UaW1lckZpcmVk KCkKIHsKICAgICBpZiAoIW1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgfHwgIW1fY2xpZW50 KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NsaWVudC0+ZXh0ZXJuYWxPdXRwdXREZXZpY2VB dmFpbGFibGVEaWRDaGFuZ2UoZGV2aWNlUGlja2VyKCkuZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFp bGFibGUpOworICAgIFBlbmRpbmdBY3Rpb25GbGFncyBwZW5kaW5nQWN0aW9ucyA9IG1fcGVuZGlu Z0FjdGlvbkZsYWdzOworICAgIG1fcGVuZGluZ0FjdGlvbkZsYWdzID0gMDsKKworICAgIGlmIChw ZW5kaW5nQWN0aW9ucyAmIE91dHB1dGVEZXZpY2VBdmFpbGFiaWxpdHlDaGFuZ2VkKQorICAgICAg ICBtX2NsaWVudC0+ZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFpbGFibGVEaWRDaGFuZ2UoZGV2aWNl UGlja2VyKCkuZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFpbGFibGUpOworCisgICAgaWYgKHBlbmRp bmdBY3Rpb25zICYgQ3VycmVudERldmljZURpZENoYW5nZSkgeworICAgICAgICBBVk91dHB1dERl dmljZU1lbnVDb250cm9sbGVyVHlwZSogZGV2aWNlUGlja2VyID0gdGhpcy0+ZGV2aWNlUGlja2Vy KCk7CisgICAgICAgIGlmIChkZXZpY2VQaWNrZXIpCisgICAgICAgICAgICBtX2NsaWVudC0+c2V0 UGxheWJhY2tUYXJnZXQoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldE1hYzo6Y3JlYXRlKFtk ZXZpY2VQaWNrZXIgb3V0cHV0Q29udGV4dF0pKTsKKyAgICB9CiB9CiAKIHZvaWQgTWVkaWFQbGF5 YmFja1RhcmdldFBpY2tlck1hYzo6YXZhaWxhYmxlRGV2aWNlc0RpZENoYW5nZSgpCkBAIC05Myw4 ICsxMDgsNyBAQCB2b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OmF2YWlsCiAgICAg aWYgKCFtX2NsaWVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9kZXZpY2VDaGFuZ2VUaW1l ci5zdG9wKCk7Ci0gICAgbV9kZXZpY2VDaGFuZ2VUaW1lci5zdGFydE9uZVNob3QoMCk7CisgICAg YWRkUGVuZGluZ0FjdGlvbihPdXRwdXRlRGV2aWNlQXZhaWxhYmlsaXR5Q2hhbmdlZCk7CiB9CiAK IEFWT3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXJUeXBlICpNZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyTWFjOjpkZXZpY2VQaWNrZXIoKQpAQCAtMTE2LDEyICsxMzAsMjQgQEAgQVZPdXRwdXREZXZp Y2VNZW51Q29udHJvbGxlclR5cGUgKk1lZGlhUAogICAgIHJldHVybiBtX291dHB1dERldmljZU1l bnVDb250cm9sbGVyLmdldCgpOwogfQogCi12b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJN YWM6OnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihjb25zdCBGbG9hdFJlY3QmIGxvY2F0aW9uLCBi b29sKQordm9pZCBNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjpzaG93UGxheWJhY2tUYXJn ZXRQaWNrZXIoY29uc3QgRmxvYXRSZWN0JiBsb2NhdGlvbiwgYm9vbCBjaGVja0FjdGl2ZVJvdXRl KQogewogICAgIGlmICghbV9jbGllbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIFtkZXZpY2VQ aWNrZXIoKSBzaG93TWVudUZvclJlY3Q6bG9jYXRpb24gYXBwZWFyYW5jZU5hbWU6TlNBcHBlYXJh bmNlTmFtZVZpYnJhbnRMaWdodF07CisgICAgQVZPdXRwdXREZXZpY2VNZW51Q29udHJvbGxlclR5 cGUgKnBpY2tlciA9IGRldmljZVBpY2tlcigpOworICAgIGlmIChbcGlja2VyIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3Ioc2hvd01lbnVGb3JSZWN0OmFwcGVhcmFuY2VOYW1lOmFsbG93UmVz ZWxlY3Rpb25PZlNlbGVjdGVkT3V0cHV0RGV2aWNlOildKSB7CisgICAgICAgIGlmIChbcGlja2Vy IHNob3dNZW51Rm9yUmVjdDpsb2NhdGlvbiBhcHBlYXJhbmNlTmFtZTpOU0FwcGVhcmFuY2VOYW1l VmlicmFudExpZ2h0IGFsbG93UmVzZWxlY3Rpb25PZlNlbGVjdGVkT3V0cHV0RGV2aWNlOiFjaGVj a0FjdGl2ZVJvdXRlXSkKKyAgICAgICAgICAgIGN1cnJlbnREZXZpY2VEaWRDaGFuZ2UoKTsKKyAg ICB9IGVsc2UKKyAgICAgICAgW3BpY2tlciBzaG93TWVudUZvclJlY3Q6bG9jYXRpb24gYXBwZWFy YW5jZU5hbWU6TlNBcHBlYXJhbmNlTmFtZVZpYnJhbnRMaWdodF07Cit9CisKK3ZvaWQgTWVkaWFQ bGF5YmFja1RhcmdldFBpY2tlck1hYzo6YWRkUGVuZGluZ0FjdGlvbihQZW5kaW5nQWN0aW9uRmxh Z3MgYWN0aW9uKQoreworICAgIG1fcGVuZGluZ0FjdGlvbkZsYWdzIHw9IGFjdGlvbjsKKyAgICBt X3BlbmRpbmdBY3Rpb25UaW1lci5zdG9wKCk7CisgICAgbV9wZW5kaW5nQWN0aW9uVGltZXIuc3Rh cnRPbmVTaG90KDApOwogfQogCiB2b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OmN1 cnJlbnREZXZpY2VEaWRDaGFuZ2UoKQpAQCAtMTI5LDExICsxNTUsNyBAQCB2b2lkIE1lZGlhUGxh eWJhY2tUYXJnZXRQaWNrZXJNYWM6OmN1cnJlCiAgICAgaWYgKCFtX2NsaWVudCkKICAgICAgICAg cmV0dXJuOwogCi0gICAgQVZPdXRwdXREZXZpY2VNZW51Q29udHJvbGxlclR5cGUqIGRldmljZVBp Y2tlciA9IHRoaXMtPmRldmljZVBpY2tlcigpOwotICAgIGlmICghZGV2aWNlUGlja2VyKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBtX2NsaWVudC0+c2V0UGxheWJhY2tUYXJnZXQoV2ViQ29yZTo6 TWVkaWFQbGF5YmFja1RhcmdldE1hYzo6Y3JlYXRlKFtkZXZpY2VQaWNrZXIgb3V0cHV0Q29udGV4 dF0pKTsKKyAgICBhZGRQZW5kaW5nQWN0aW9uKEN1cnJlbnREZXZpY2VEaWRDaGFuZ2UpOwogfQog CiB2b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OnN0YXJ0aW5nTW9uaXRvcmluZ1Bs YXliYWNrVGFyZ2V0cygpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2Ev QVZLaXRTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29j b2EvQVZLaXRTUEkuaAkocmV2aXNpb24gMTgzNTU0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vc3BpL2NvY29hL0FWS2l0U1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw2ICsxMzksNyBA QCBOU19DTEFTU19BVkFJTEFCTEVfTUFDKDEwXzExKQogQHByb3BlcnR5IChyZWFkb25seSwgZ2V0 dGVyPWlzRXh0ZXJuYWxPdXRwdXREZXZpY2VQaWNrZWQpIEJPT0wgZXh0ZXJuYWxPdXRwdXREZXZp Y2VQaWNrZWQ7CiAKIC0gKHZvaWQpc2hvd01lbnVGb3JSZWN0OihOU1JlY3Qpc2NyZWVuUmVjdCBh cHBlYXJhbmNlTmFtZTooTlNTdHJpbmcgKilhcHBlYXJhbmNlTmFtZTsKKy0gKEJPT0wpc2hvd01l bnVGb3JSZWN0OihOU1JlY3Qpc2NyZWVuUmVjdCBhcHBlYXJhbmNlTmFtZTooTlNTdHJpbmcgKilh cHBlYXJhbmNlTmFtZSBhbGxvd1Jlc2VsZWN0aW9uT2ZTZWxlY3RlZE91dHB1dERldmljZTooQk9P TClhbGxvd1Jlc2VsZWN0aW9uT2ZTZWxlY3RlZE91dHB1dERldmljZTsKIAogQGVuZAogCg==