148593 2015-08-28 15:19:39 -0700 [Mac] Restructure WebMediaSessionManager for testing 2015-09-04 03:56:09 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble ossy webkit-bug-importer oldest_to_newest 1121846 0 eric.carlson 2015-08-28 15:19:39 -0700 Restructure so it is possible to use a Mock target picker. 1121847 1 webkit-bug-importer 2015-08-28 15:20:20 -0700 <rdar://problem/22483489> 1121869 2 260189 eric.carlson 2015-08-28 15:55:20 -0700 Created attachment 260189 Proposed patch. 1121881 3 260189 jer.noble 2015-08-28 16:04:44 -0700 Comment on attachment 260189 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=260189&action=review r=me, with nit. > Source/WebCore/Modules/mediasession/WebMediaSessionManager.h:48 > + WEBCORE_EXPORT static WebMediaSessionManager& singleton(); nit: singleton() is a weird nomenclature. I mean, in other places we use shared(), which implies that it's singleton. But this object is specifically not a singleton! Because it's overridable, it's a ... dual... ton. Or something. 1121883 4 260193 eric.carlson 2015-08-28 16:14:27 -0700 Created attachment 260193 Patch for landing. 1121898 5 260193 commit-queue 2015-08-28 17:15:13 -0700 Comment on attachment 260193 Patch for landing. Clearing flags on attachment: 260193 Committed r189135: <http://trac.webkit.org/changeset/189135> 1123388 6 ossy 2015-09-04 03:56:09 -0700 The patch already landed, let's close the bug. 260189 2015-08-28 15:55:20 -0700 2015-08-28 16:04:44 -0700 Proposed patch. testing_support_patch_1.txt text/plain 10360 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4OTEyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA4LTI4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFJlc3RydWN0 dXJlIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIgZm9yIHRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODU5MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gZnVuY3Rpb25h bCBjaGFuZ2UuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Np b25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1lZGlhUHJvZHVjZXJTdGF0ZVN0cmlu Zyk6IEFkZCBzb21lIG1pc3Npbmcgc3RhdGVzLgorICAgICAgICAoV2ViQ29yZTo6d2ViTWVkaWFT ZXNzaW9uTWFuYWdlck92ZXJyaWRlKTogTmV3LgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVkaWFT ZXNzaW9uTWFuYWdlcjo6c2luZ2xldG9uKTogTmV3LgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVk aWFTZXNzaW9uTWFuYWdlcjo6c2V0V2ViTWVkaWFTZXNzaW9uTWFuYWdlck92ZXJyaWRlKTogTmV3 LCB3aWxsIGFsbG93IHJ1bnRpbWUKKyAgICAgICAgICByZWdpc3RyYXRpb24gb2YgYSBtb2NrIG1h bmFnZXIuCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFu YWdlci5oOgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL1dlYk1l ZGlhU2Vzc2lvbk1hbmFnZXJNYWMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNz aW9uTWFuYWdlcjo6cGxhdGZvcm1NYW5hZ2VyKTogUmVuYW1lZCBmcm9tIHNpbmdsZXRvbi4KKyAg ICAgICAgKFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6OnNpbmdsZXRvbik6IERl bGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL1dlYk1lZGlh U2Vzc2lvbk1hbmFnZXJNYWMuaDoKKwogMjAxNS0wOC0yOCAgWXVzdWtlIFN1enVraSAgPHV0YXRh bmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBNb3ZlIHN0ZDo6ZnVuY3Rpb24gZnJvbSBKU0Z1 bmN0aW9uIGludG8gTmF0aXZlU3RkRnVuY3Rpb25DZWxsIHRvIGNvcnJlY3RseSBkZXN0cm95IHRo ZSBoZWFwIGFsbG9jYXRlZCBzdGQ6OmZ1bmN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5h Z2VyLmNwcAkocmV2aXNpb24gMTg5MDk4KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4 LDYgKzc4LDggQEAgc3RhdGljIFN0cmluZyBtZWRpYVByb2R1Y2VyU3RhdGVTdHJpbmcoTQogICAg ICAgICBzdHJpbmcuYXBwZW5kKCJSZXF1aXJlc1BsYXliYWNrVGFyZ2V0TW9uaXRvcmluZyArICIp OwogICAgIGlmIChmbGFncyAmIE1lZGlhUHJvZHVjZXI6OkV4dGVybmFsRGV2aWNlQXV0b1BsYXlD YW5kaWRhdGUpCiAgICAgICAgIHN0cmluZy5hcHBlbmQoIkV4dGVybmFsRGV2aWNlQXV0b1BsYXlD YW5kaWRhdGUgKyAiKTsKKyAgICBpZiAoZmxhZ3MgJiBNZWRpYVByb2R1Y2VyOjpEaWRQbGF5VG9F bmQpCisgICAgICAgIHN0cmluZy5hcHBlbmQoIkRpZFBsYXlUb0VuZCArICIpOwogICAgIGlmIChz dHJpbmcuaXNFbXB0eSgpKQogICAgICAgICBzdHJpbmcuYXBwZW5kKCJJc05vdFBsYXlpbmciKTsK ICAgICBlbHNlCkBAIC04Nyw2ICs4OSwyNSBAQCBzdGF0aWMgU3RyaW5nIG1lZGlhUHJvZHVjZXJT dGF0ZVN0cmluZyhNCiB9CiAjZW5kaWYKIAorc3RhdGljIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIq JiB3ZWJNZWRpYVNlc3Npb25NYW5hZ2VyT3ZlcnJpZGUoKQoreworICAgIHN0YXRpYyBXZWJNZWRp YVNlc3Npb25NYW5hZ2VyKiBvdmVycmlkZTsKKyAgICByZXR1cm4gb3ZlcnJpZGU7Cit9CisKK1dl Yk1lZGlhU2Vzc2lvbk1hbmFnZXImIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNpbmdsZXRvbigp Cit7CisgICAgaWYgKFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIqIG92ZXJyaWRlID0gd2ViTWVkaWFT ZXNzaW9uTWFuYWdlck92ZXJyaWRlKCkpCisgICAgICAgIHJldHVybiAqb3ZlcnJpZGU7CisKKyAg ICByZXR1cm4gV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6cGxhdGZvcm1NYW5hZ2VyKCk7Cit9CisK K3ZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2V0V2ViTWVkaWFTZXNzaW9uTWFuYWdlck92 ZXJyaWRlKFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIqIG1hbmFnZXIpCit7CisgICAgd2ViTWVkaWFT ZXNzaW9uTWFuYWdlck92ZXJyaWRlKCkgPSBtYW5hZ2VyOworfQorCiBXZWJNZWRpYVNlc3Npb25N YW5hZ2VyOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyKCkKICAgICA6IG1fdGFza1RpbWVyKFJ1bkxv b3A6OmN1cnJlbnQoKSwgdGhpcywgJldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnRhc2tUaW1lckZp cmVkKQogICAgICwgbV93YXRjaGRvZ1RpbWVyKFJ1bkxvb3A6OmN1cnJlbnQoKSwgdGhpcywgJldl Yk1lZGlhU2Vzc2lvbk1hbmFnZXI6OndhdGNoZG9nVGltZXJGaXJlZCkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNl c3Npb25NYW5hZ2VyLmgJKHJldmlzaW9uIDE4OTA5OCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuaAkod29ya2luZyBjb3B5KQpA QCAtNDUsNiArNDUsOSBAQCBjbGFzcyBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyIDogcHVibGljIE1l CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoV2ViTWVkaWFTZXNzaW9uTWFuYWdlcik7CiBwdWJs aWM6CiAKKyAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciYg c2luZ2xldG9uKCk7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQgc2V0V2ViTWVkaWFT ZXNzaW9uTWFuYWdlck92ZXJyaWRlKFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIqKTsKKwogICAgIFdF QkNPUkVfRVhQT1JUIHVpbnQ2NF90IGFkZFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KFdlYk1l ZGlhU2Vzc2lvbk1hbmFnZXJDbGllbnQmLCB1aW50NjRfdCk7CiAgICAgV0VCQ09SRV9FWFBPUlQg dm9pZCByZW1vdmVQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudChXZWJNZWRpYVNlc3Npb25NYW5h Z2VyQ2xpZW50JiwgdWludDY0X3QpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3ZlQWxs UGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRzKFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJDbGllbnQm KTsKQEAgLTU2LDYgKzU5LDcgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgfldlYk1lZGlhU2Vz c2lvbk1hbmFnZXIoKTsKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6TWVkaWFQbGF5YmFja1Rhcmdl dFBpY2tlciYgdGFyZ2V0UGlja2VyKCkgPSAwOworICAgIHN0YXRpYyBXZWJNZWRpYVNlc3Npb25N YW5hZ2VyJiBwbGF0Zm9ybU1hbmFnZXIoKTsKIAogcHJpdmF0ZToKIApJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFn ZXJNYWMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjLmNwcAkocmV2aXNpb24gMTg5 MDk4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL1dl Yk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw3 IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotV2ViTWVkaWFTZXNzaW9uTWFuYWdlciYgV2Vi TWVkaWFTZXNzaW9uTWFuYWdlck1hYzo6c2luZ2xldG9uKCkKK1dlYk1lZGlhU2Vzc2lvbk1hbmFn ZXImIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnBsYXRmb3JtTWFuYWdlcigpCiB7CiAgICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkPFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM+IHNoYXJlZE1hbmFn ZXI7CiAgICAgcmV0dXJuIHNoYXJlZE1hbmFnZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjLmgJKHJldmlzaW9uIDE4OTA5OCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Npb25N YW5hZ2VyTWFjLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDYgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogY2xhc3MgV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYyA6IHB1YmxpYyBXZWJNZWRp YVNlc3Npb25NYW5hZ2VyIHsKICAgICBmcmllbmQgY2xhc3MgTmV2ZXJEZXN0cm95ZWQ8V2ViTWVk aWFTZXNzaW9uTWFuYWdlck1hYz47CiBwdWJsaWM6Ci0gICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXImIHNpbmdsZXRvbigpOwogCiBwcml2YXRlOgogICAgIFdl Yk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4OTEy NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE0IEBACisyMDE1LTA4LTI4ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29t PgorCisgICAgICAgIFtNYWNdIFJlc3RydWN0dXJlIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIgZm9y IHRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0ODU5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6UGFn ZUNsaWVudEltcGw6Om1lZGlhU2Vzc2lvbk1hbmFnZXIpOiBDYWxsIFdlYk1lZGlhU2Vzc2lvbk1h bmFnZXI6OnNpbmdsZXRvbiwgbm90CisgICAgICAgICAgV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1h Yzo6c2luZ2xldG9uLgorCiAyMDE1LTA4LTI4ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUu Y29tPgogCiAgICAgICAgIFtpT1NdIE1ha2UgdGhlIEFsbG93c0lubGluZU1lZGlhUGxheWJhY2sg cHJlZmVyZW5jZSB3b3JrIGluIFdlYktpdCAvIFdlYktpdDIuCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0JKHJldmlzaW9uIDE4OTA5OCkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0JKHdvcmtp bmcgY29weSkKQEAgLTcwLDcgKzcwLDcgQEAKICNlbmRpZgogCiAjaWYgRU5BQkxFKFdJUkVMRVNT X1BMQVlCQUNLX1RBUkdFVCkKLSNpbmNsdWRlIDxXZWJDb3JlL1dlYk1lZGlhU2Vzc2lvbk1hbmFn ZXJNYWMuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuaD4KICNl bmRpZgogCiBAaW50ZXJmYWNlIE5TQXBwbGljYXRpb24gKFdlYk5TQXBwbGljYXRpb25EZXRhaWxz KQpAQCAtODE4LDcgKzgxOCw3IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnNob3dQbGF0Zm9ybUNv bnRleHQKICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUKQogV2ViQ29yZTo6V2Vi TWVkaWFTZXNzaW9uTWFuYWdlciYgUGFnZUNsaWVudEltcGw6Om1lZGlhU2Vzc2lvbk1hbmFnZXIo KQogewotICAgIHJldHVybiBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjOjpzaW5nbGV0b24oKTsK KyAgICByZXR1cm4gV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2luZ2xldG9uKCk7CiB9CiAjZW5k aWYKIApJbmRleDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTg5MTI1KQorKysgU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTUt MDgtMjggIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAg W01hY10gUmVzdHJ1Y3R1cmUgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciBmb3IgdGVzdGluZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTkzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dl Yk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIubW06CisgICAgICAgIChXZWJNZWRpYVBsYXliYWNr VGFyZ2V0UGlja2VyOjphZGRQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudCk6IENhbGwgV2ViTWVk aWFTZXNzaW9uTWFuYWdlcjo6c2luZ2xldG9uLAorICAgICAgICAgIG5vdCBXZWJNZWRpYVNlc3Np b25NYW5hZ2VyTWFjOjpzaW5nbGV0b24uCisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0 UGlja2VyOjpyZW1vdmVQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudCk6IERpdHRvLgorICAgICAg ICAoV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcjo6c2hvd1BsYXliYWNrVGFyZ2V0UGlja2Vy KTogRGl0dG8uCisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpwbGF5YmFj a1RhcmdldFBpY2tlckNsaWVudFN0YXRlRGlkQ2hhbmdlKTogRGl0dG8uCisgICAgICAgIChXZWJN ZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpzZXRQbGF5YmFja1RhcmdldCk6IERpdHRvLgorICAg ICAgICAoV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcjo6aW52YWxpZGF0ZSk6IERpdHRvLgor CiAyMDE1LTA4LTI4ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBD cmFzaCBpbiBXSzEgd2hlbiBjbGlja2luZyBvbiBhIFBERiBpbnNpZGUgYW4gaWZyYW1lCkluZGV4 OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJNZWRpYVBsYXli YWNrVGFyZ2V0UGlja2VyLm1tCShyZXZpc2lvbiAxODkwOTgpCisrKyBTb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIubW0JKHdvcmtpbmcgY29weSkK QEAgLTI5LDcgKzI5LDcgQEAKIAogI2ltcG9ydCA8V2ViQ29yZS9NZWRpYVBsYXliYWNrVGFyZ2V0 Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BhZ2UuaD4KLSNpbXBvcnQgPFdlYkNvcmUvV2ViTWVkaWFT ZXNzaW9uTWFuYWdlck1hYy5oPgorI2ltcG9ydCA8V2ViQ29yZS9XZWJNZWRpYVNlc3Npb25NYW5h Z2VyLmg+CiAKIHN0ZDo6dW5pcXVlX3B0cjxXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyPiBX ZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpjcmVhdGUoV2ViQ29yZTo6UGFnZSYgcGFnZSkK IHsKQEAgLTQzLDIyICs0MywyMiBAQCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpXZWJN ZWRpYVBsCiAKIHZvaWQgV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcjo6YWRkUGxheWJhY2tU YXJnZXRQaWNrZXJDbGllbnQodWludDY0X3QgY29udGV4dElkKQogewotICAgIFdlYkNvcmU6Oldl Yk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6OnNpbmdsZXRvbigpLmFkZFBsYXliYWNrVGFyZ2V0UGlj a2VyQ2xpZW50KCp0aGlzLCBjb250ZXh0SWQpOworICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lv bk1hbmFnZXI6OnNpbmdsZXRvbigpLmFkZFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlz LCBjb250ZXh0SWQpOwogfQogCiB2b2lkIFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnJl bW92ZVBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KHVpbnQ2NF90IGNvbnRleHRJZCkKIHsKLSAg ICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjOjpzaW5nbGV0b24oKS5yZW1vdmVQ bGF5YmFja1RhcmdldFBpY2tlckNsaWVudCgqdGhpcywgY29udGV4dElkKTsKKyAgICBXZWJDb3Jl OjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaW5nbGV0b24oKS5yZW1vdmVQbGF5YmFja1Rhcmdl dFBpY2tlckNsaWVudCgqdGhpcywgY29udGV4dElkKTsKIH0KIAogdm9pZCBXZWJNZWRpYVBsYXli YWNrVGFyZ2V0UGlja2VyOjpzaG93UGxheWJhY2tUYXJnZXRQaWNrZXIodWludDY0X3QgY29udGV4 dElkLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHJlY3QsIGJvb2wgaGFzVmlkZW8pCiB7Ci0g ICAgV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYzo6c2luZ2xldG9uKCkuc2hvd1Bs YXliYWNrVGFyZ2V0UGlja2VyKCp0aGlzLCBjb250ZXh0SWQsIFdlYkNvcmU6OkludFJlY3QocmVj dCksIGhhc1ZpZGVvKTsKKyAgICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaW5n bGV0b24oKS5zaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoKnRoaXMsIGNvbnRleHRJZCwgV2ViQ29y ZTo6SW50UmVjdChyZWN0KSwgaGFzVmlkZW8pOwogfQogCiB2b2lkIFdlYk1lZGlhUGxheWJhY2tU YXJnZXRQaWNrZXI6OnBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50U3RhdGVEaWRDaGFuZ2UodWlu dDY0X3QgY29udGV4dElkLCBXZWJDb3JlOjpNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3Mg c3RhdGUpCiB7Ci0gICAgV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYzo6c2luZ2xl dG9uKCkuY2xpZW50U3RhdGVEaWRDaGFuZ2UoKnRoaXMsIGNvbnRleHRJZCwgc3RhdGUpOworICAg IFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNpbmdsZXRvbigpLmNsaWVudFN0YXRl RGlkQ2hhbmdlKCp0aGlzLCBjb250ZXh0SWQsIHN0YXRlKTsKIH0KIAogdm9pZCBXZWJNZWRpYVBs YXliYWNrVGFyZ2V0UGlja2VyOjpzZXRQbGF5YmFja1RhcmdldCh1aW50NjRfdCBjb250ZXh0SWQs IFJlZjxXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0PiYmIHRhcmdldCkKQEAgLTg4LDcgKzg4 LDcgQEAgdm9pZCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpzZXRTaAogdm9pZCBXZWJN ZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjppbnZhbGlkYXRlKCkKIHsKICAgICBtX3BhZ2UgPSBu dWxscHRyOwotICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6OnNpbmdsZXRv bigpLnJlbW92ZUFsbFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50cygqdGhpcyk7CisgICAgV2Vi Q29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2luZ2xldG9uKCkucmVtb3ZlQWxsUGxheWJh Y2tUYXJnZXRQaWNrZXJDbGllbnRzKCp0aGlzKTsKIH0KIAogI2VuZGlmCg== 260193 2015-08-28 16:14:27 -0700 2015-08-28 17:15:13 -0700 Patch for landing. testing_support_patch_2.txt text/plain 10321 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4OTEyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA4LTI4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFJlc3RydWN0 dXJlIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIgZm9yIHRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODU5MworCisgICAgICAgIFJldmlld2Vk IGJ5IEplciBOb2JsZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGZ1bmN0aW9uYWwgY2hh bmdlLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFu YWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjptZWRpYVByb2R1Y2VyU3RhdGVTdHJpbmcpOiBB ZGQgc29tZSBtaXNzaW5nIHN0YXRlcy4KKyAgICAgICAgKFdlYkNvcmU6OndlYk1lZGlhU2Vzc2lv bk1hbmFnZXJPdmVycmlkZSk6IE5ldy4KKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lv bk1hbmFnZXI6OnNpbmdsZXRvbik6IE5ldy4KKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlhU2Vz c2lvbk1hbmFnZXI6OnNldFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJPdmVycmlkZSk6IE5ldywgd2ls bCBhbGxvdyBydW50aW1lCisgICAgICAgICAgcmVnaXN0cmF0aW9uIG9mIGEgbW9jayBtYW5hZ2Vy LgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIu aDoKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNl c3Npb25NYW5hZ2VyTWFjLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1h bmFnZXI6OnBsYXRmb3JtTWFuYWdlcik6IFJlbmFtZWQgZnJvbSBzaW5nbGV0b24uCisgICAgICAg IChXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjOjpzaW5nbGV0b24pOiBEZWxldGVk LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Np b25NYW5hZ2VyTWFjLmg6CisKIDIwMTUtMDgtMjggIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRl YUBnbWFpbC5jb20+CiAKICAgICAgICAgTW92ZSBzdGQ6OmZ1bmN0aW9uIGZyb20gSlNGdW5jdGlv biBpbnRvIE5hdGl2ZVN0ZEZ1bmN0aW9uQ2VsbCB0byBjb3JyZWN0bHkgZGVzdHJveSB0aGUgaGVh cCBhbGxvY2F0ZWQgc3RkOjpmdW5jdGlvbgpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5j cHAJKHJldmlzaW9uIDE4OTA5OCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNz aW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3 OCw4IEBAIHN0YXRpYyBTdHJpbmcgbWVkaWFQcm9kdWNlclN0YXRlU3RyaW5nKE0KICAgICAgICAg c3RyaW5nLmFwcGVuZCgiUmVxdWlyZXNQbGF5YmFja1RhcmdldE1vbml0b3JpbmcgKyAiKTsKICAg ICBpZiAoZmxhZ3MgJiBNZWRpYVByb2R1Y2VyOjpFeHRlcm5hbERldmljZUF1dG9QbGF5Q2FuZGlk YXRlKQogICAgICAgICBzdHJpbmcuYXBwZW5kKCJFeHRlcm5hbERldmljZUF1dG9QbGF5Q2FuZGlk YXRlICsgIik7CisgICAgaWYgKGZsYWdzICYgTWVkaWFQcm9kdWNlcjo6RGlkUGxheVRvRW5kKQor ICAgICAgICBzdHJpbmcuYXBwZW5kKCJEaWRQbGF5VG9FbmQgKyAiKTsKICAgICBpZiAoc3RyaW5n LmlzRW1wdHkoKSkKICAgICAgICAgc3RyaW5nLmFwcGVuZCgiSXNOb3RQbGF5aW5nIik7CiAgICAg ZWxzZQpAQCAtODcsNiArODksMjUgQEAgc3RhdGljIFN0cmluZyBtZWRpYVByb2R1Y2VyU3RhdGVT dHJpbmcoTQogfQogI2VuZGlmCiAKK3N0YXRpYyBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyKiYgd2Vi TWVkaWFTZXNzaW9uTWFuYWdlck92ZXJyaWRlKCkKK3sKKyAgICBzdGF0aWMgV2ViTWVkaWFTZXNz aW9uTWFuYWdlciogb3ZlcnJpZGU7CisgICAgcmV0dXJuIG92ZXJyaWRlOworfQorCitXZWJNZWRp YVNlc3Npb25NYW5hZ2VyJiBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWQoKQoreworICAg IGlmIChXZWJNZWRpYVNlc3Npb25NYW5hZ2VyKiBvdmVycmlkZSA9IHdlYk1lZGlhU2Vzc2lvbk1h bmFnZXJPdmVycmlkZSgpKQorICAgICAgICByZXR1cm4gKm92ZXJyaWRlOworCisgICAgcmV0dXJu IFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnBsYXRmb3JtTWFuYWdlcigpOworfQorCit2b2lkIFdl Yk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNldFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJPdmVycmlkZShX ZWJNZWRpYVNlc3Npb25NYW5hZ2VyKiBtYW5hZ2VyKQoreworICAgIHdlYk1lZGlhU2Vzc2lvbk1h bmFnZXJPdmVycmlkZSgpID0gbWFuYWdlcjsKK30KKwogV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6 V2ViTWVkaWFTZXNzaW9uTWFuYWdlcigpCiAgICAgOiBtX3Rhc2tUaW1lcihSdW5Mb29wOjpjdXJy ZW50KCksIHRoaXMsICZXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjp0YXNrVGltZXJGaXJlZCkKICAg ICAsIG1fd2F0Y2hkb2dUaW1lcihSdW5Mb29wOjpjdXJyZW50KCksIHRoaXMsICZXZWJNZWRpYVNl c3Npb25NYW5hZ2VyOjp3YXRjaGRvZ1RpbWVyRmlyZWQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFu YWdlci5oCShyZXZpc2lvbiAxODkwOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYg KzQ1LDkgQEAgY2xhc3MgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciA6IHB1YmxpYyBNZQogICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIpOwogcHVibGljOgogCisg ICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXImIHNoYXJlZCgp OworICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldFdlYk1lZGlhU2Vzc2lvbk1hbmFn ZXJPdmVycmlkZShXZWJNZWRpYVNlc3Npb25NYW5hZ2VyKik7CisKICAgICBXRUJDT1JFX0VYUE9S VCB1aW50NjRfdCBhZGRQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudChXZWJNZWRpYVNlc3Npb25N YW5hZ2VyQ2xpZW50JiwgdWludDY0X3QpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVtb3Zl UGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnQoV2ViTWVkaWFTZXNzaW9uTWFuYWdlckNsaWVudCYs IHVpbnQ2NF90KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlbW92ZUFsbFBsYXliYWNrVGFy Z2V0UGlja2VyQ2xpZW50cyhXZWJNZWRpYVNlc3Npb25NYW5hZ2VyQ2xpZW50Jik7CkBAIC01Niw2 ICs1OSw3IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5XZWJNZWRpYVNlc3Npb25NYW5hZ2Vy KCk7CiAKICAgICB2aXJ0dWFsIFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXImIHRh cmdldFBpY2tlcigpID0gMDsKKyAgICBzdGF0aWMgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciYgcGxh dGZvcm1NYW5hZ2VyKCk7CiAKIHByaXZhdGU6CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5jcHAJKHJldmlzaW9uIDE4OTA5OCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Np b25NYW5hZ2VyTWFjLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNyBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLVdlYk1lZGlhU2Vzc2lvbk1hbmFnZXImIFdlYk1lZGlhU2Vzc2lv bk1hbmFnZXJNYWM6OnNpbmdsZXRvbigpCitXZWJNZWRpYVNlc3Npb25NYW5hZ2VyJiBXZWJNZWRp YVNlc3Npb25NYW5hZ2VyOjpwbGF0Zm9ybU1hbmFnZXIoKQogewogICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjPiBzaGFyZWRNYW5hZ2VyOwogICAgIHJl dHVybiBzaGFyZWRNYW5hZ2VyOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vV2ViTWVkaWFT ZXNzaW9uTWFuYWdlck1hYy5oCShyZXZpc2lvbiAxODkwOTgpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5o CSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNs YXNzIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMgOiBwdWJsaWMgV2ViTWVkaWFTZXNzaW9uTWFu YWdlciB7CiAgICAgZnJpZW5kIGNsYXNzIE5ldmVyRGVzdHJveWVkPFdlYk1lZGlhU2Vzc2lvbk1h bmFnZXJNYWM+OwogcHVibGljOgotICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBXZWJNZWRpYVNl c3Npb25NYW5hZ2VyJiBzaW5nbGV0b24oKTsKIAogcHJpdmF0ZToKICAgICBXZWJNZWRpYVNlc3Np b25NYW5hZ2VyTWFjKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODkxMjUpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAx NS0wOC0yOCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAg ICBbTWFjXSBSZXN0cnVjdHVyZSBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyIGZvciB0ZXN0aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1OTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6bWVk aWFTZXNzaW9uTWFuYWdlcik6IENhbGwgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2luZ2xldG9u LCBub3QKKyAgICAgICAgICBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjOjpzaW5nbGV0b24uCisK IDIwMTUtMDgtMjggIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU10gTWFrZSB0aGUgQWxsb3dzSW5saW5lTWVkaWFQbGF5YmFjayBwcmVmZXJlbmNlIHdvcmsg aW4gV2ViS2l0IC8gV2ViS2l0Mi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv UGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNpb24gMTg5MDk4KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbQkod29ya2luZyBjb3B5KQpAQCAtNzAs NyArNzAsNyBAQAogI2VuZGlmCiAKICNpZiBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VU KQotI2luY2x1ZGUgPFdlYkNvcmUvV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5oPgorI2luY2x1 ZGUgPFdlYkNvcmUvV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5oPgogI2VuZGlmCiAKIEBpbnRlcmZh Y2UgTlNBcHBsaWNhdGlvbiAoV2ViTlNBcHBsaWNhdGlvbkRldGFpbHMpCkBAIC04MTgsNyArODE4 LDcgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2hvd1BsYXRmb3JtQ29udGV4dAogI2lmIEVOQUJM RShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCiBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5h Z2VyJiBQYWdlQ2xpZW50SW1wbDo6bWVkaWFTZXNzaW9uTWFuYWdlcigpCiB7Ci0gICAgcmV0dXJu IFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6OnNpbmdsZXRvbigpOworICAgIHJldHVybiBXZWJN ZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWQoKTsKIH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiAxODkxMjUpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxNS0wOC0yOCAgRXJpYyBDYXJsc29u ICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBSZXN0cnVjdHVyZSBX ZWJNZWRpYVNlc3Npb25NYW5hZ2VyIGZvciB0ZXN0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1OTMKKworICAgICAgICBSZXZpZXdlZCBieSBK ZXIgTm9ibGUuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNr ZXIubW06CisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjphZGRQbGF5YmFj a1RhcmdldFBpY2tlckNsaWVudCk6IENhbGwgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2luZ2xl dG9uLAorICAgICAgICAgIG5vdCBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjOjpzaW5nbGV0b24u CisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpyZW1vdmVQbGF5YmFja1Rh cmdldFBpY2tlckNsaWVudCk6IERpdHRvLgorICAgICAgICAoV2ViTWVkaWFQbGF5YmFja1Rhcmdl dFBpY2tlcjo6c2hvd1BsYXliYWNrVGFyZ2V0UGlja2VyKTogRGl0dG8uCisgICAgICAgIChXZWJN ZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpwbGF5YmFja1RhcmdldFBpY2tlckNsaWVudFN0YXRl RGlkQ2hhbmdlKTogRGl0dG8uCisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy OjpzZXRQbGF5YmFja1RhcmdldCk6IERpdHRvLgorICAgICAgICAoV2ViTWVkaWFQbGF5YmFja1Rh cmdldFBpY2tlcjo6aW52YWxpZGF0ZSk6IERpdHRvLgorCiAyMDE1LTA4LTI4ICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCBpbiBXSzEgd2hlbiBjbGlja2lu ZyBvbiBhIFBERiBpbnNpZGUgYW4gaWZyYW1lCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyLm1tCShyZXZp c2lvbiAxODkwOTgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk1lZGlhUGxheWJh Y2tUYXJnZXRQaWNrZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAKIAogI2lt cG9ydCA8V2ViQ29yZS9NZWRpYVBsYXliYWNrVGFyZ2V0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Bh Z2UuaD4KLSNpbXBvcnQgPFdlYkNvcmUvV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5oPgorI2lt cG9ydCA8V2ViQ29yZS9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmg+CiAKIHN0ZDo6dW5pcXVlX3B0 cjxXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyPiBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyOjpjcmVhdGUoV2ViQ29yZTo6UGFnZSYgcGFnZSkKIHsKQEAgLTQzLDIyICs0MywyMiBAQCBX ZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpXZWJNZWRpYVBsCiAKIHZvaWQgV2ViTWVkaWFQ bGF5YmFja1RhcmdldFBpY2tlcjo6YWRkUGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnQodWludDY0 X3QgY29udGV4dElkKQogewotICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM6 OnNpbmdsZXRvbigpLmFkZFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlzLCBjb250ZXh0 SWQpOworICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZCgpLmFkZFBs YXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlzLCBjb250ZXh0SWQpOwogfQogCiB2b2lkIFdl Yk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnJlbW92ZVBsYXliYWNrVGFyZ2V0UGlja2VyQ2xp ZW50KHVpbnQ2NF90IGNvbnRleHRJZCkKIHsKLSAgICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25N YW5hZ2VyTWFjOjpzaW5nbGV0b24oKS5yZW1vdmVQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudCgq dGhpcywgY29udGV4dElkKTsKKyAgICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpz aGFyZWQoKS5yZW1vdmVQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudCgqdGhpcywgY29udGV4dElk KTsKIH0KIAogdm9pZCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpzaG93UGxheWJhY2tU YXJnZXRQaWNrZXIodWludDY0X3QgY29udGV4dElkLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qm IHJlY3QsIGJvb2wgaGFzVmlkZW8pCiB7Ci0gICAgV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFu YWdlck1hYzo6c2luZ2xldG9uKCkuc2hvd1BsYXliYWNrVGFyZ2V0UGlja2VyKCp0aGlzLCBjb250 ZXh0SWQsIFdlYkNvcmU6OkludFJlY3QocmVjdCksIGhhc1ZpZGVvKTsKKyAgICBXZWJDb3JlOjpX ZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWQoKS5zaG93UGxheWJhY2tUYXJnZXRQaWNrZXIo KnRoaXMsIGNvbnRleHRJZCwgV2ViQ29yZTo6SW50UmVjdChyZWN0KSwgaGFzVmlkZW8pOwogfQog CiB2b2lkIFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnBsYXliYWNrVGFyZ2V0UGlja2Vy Q2xpZW50U3RhdGVEaWRDaGFuZ2UodWludDY0X3QgY29udGV4dElkLCBXZWJDb3JlOjpNZWRpYVBy b2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3Mgc3RhdGUpCiB7Ci0gICAgV2ViQ29yZTo6V2ViTWVkaWFT ZXNzaW9uTWFuYWdlck1hYzo6c2luZ2xldG9uKCkuY2xpZW50U3RhdGVEaWRDaGFuZ2UoKnRoaXMs IGNvbnRleHRJZCwgc3RhdGUpOworICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6 OnNoYXJlZCgpLmNsaWVudFN0YXRlRGlkQ2hhbmdlKCp0aGlzLCBjb250ZXh0SWQsIHN0YXRlKTsK IH0KIAogdm9pZCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpzZXRQbGF5YmFja1Rhcmdl dCh1aW50NjRfdCBjb250ZXh0SWQsIFJlZjxXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0PiYm IHRhcmdldCkKQEAgLTg4LDcgKzg4LDcgQEAgdm9pZCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyOjpzZXRTaAogdm9pZCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjppbnZhbGlkYXRl KCkKIHsKICAgICBtX3BhZ2UgPSBudWxscHRyOwotICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lv bk1hbmFnZXJNYWM6OnNpbmdsZXRvbigpLnJlbW92ZUFsbFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xp ZW50cygqdGhpcyk7CisgICAgV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVk KCkucmVtb3ZlQWxsUGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRzKCp0aGlzKTsKIH0KIAogI2Vu ZGlmCg==