107956 2013-01-25 09:34:19 -0800 Adding a text track should not make controls visible 2013-01-27 12:12:36 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 43668 1 eric.carlson eric.carlson dglazkov feature-media-reviews ojan.autocc webkit-bug-importer webkit.review.bot oldest_to_newest 816655 0 eric.carlson 2013-01-25 09:34:19 -0800 Adding a text track makes controls visible 816670 1 184767 eric.carlson 2013-01-25 09:49:17 -0800 Created attachment 184767 Proposed patch 816829 2 184791 eric.carlson 2013-01-25 12:13:30 -0800 Created attachment 184791 Updated patch. Updated patch as the first version sometimes creates hidden controls when we did not previously. This isn't really a change in functionality, but it causes some tests that dump the render tree to fail so attempt to restore the previous behavior. Not marking r? so the bots can chew on it first. 816853 3 184791 webkit.review.bot 2013-01-25 12:58:46 -0800 Comment on attachment 184791 Updated patch. Attachment 184791 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16122473 New failing tests: media/media-captions-no-controls.html 816869 4 184801 eric.carlson 2013-01-25 13:19:03 -0800 Created attachment 184801 Updated patch. Oops, the results for my new test depended on the side effect I removed in the second patch :-O 816886 5 184801 eric.carlson 2013-01-25 13:43:15 -0800 Comment on attachment 184801 Updated patch. Committed r140862. 817392 6 webkit-bug-importer 2013-01-27 12:12:36 -0800 <rdar://problem/13093844> 184767 2013-01-25 09:49:17 -0800 2013-01-25 12:13:30 -0800 Proposed patch patch_2.txt text/plain 9467 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDgzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTI1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZGluZyBhIHRleHQg dHJhY2sgc2hvdWxkIG5vdCBtYWtlIGNvbnRyb2xzIHZpc2libGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzk1NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLWNhcHRpb25z LW5vLWNvbnRyb2xzLmh0bWwKKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVBY3RpdmVUZXh0VHJh Y2tDdWVzKTogQ2FsbCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5LgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlVGV4dFRyYWNrRGlzcGxheSk6IE5ldywgY2FsbCBtZWRp YUNvbnRyb2xzLT51cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCkKKyAgICAgICAgICAgIGlmIHdlIGhh dmUgY29udHJvbHMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpzZXRDbG9z ZWRDYXB0aW9uc1Zpc2libGUpOiAgQ2FsbCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5LgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y3JlYXRlTWVkaWFDb250cm9scyk6IEhpZGUg Y29udHJvbHMgaWYgdGhleSBzaG91bGQgbm90IGJlIAorICAgICAgICAgICAgdmlzaWJsZS4gTWlu b3IgZHJpdmUgYnkgY2xlYW51cC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 OmNvbmZpZ3VyZVRleHRUcmFja0Rpc3BsYXkpOiBEcml2ZSBieSBjbGVhbnVwLCBwdWxsIHRoZSB0 aHJlZSBsaW5lcworICAgICAgICAgICAgZnJvbSB1cGRhdGVDbG9zZWRDYXB0aW9uc0NvbnRyb2xz IGlubGluZSBhbmQgZGVsZXRlIGl0IGJlY2F1c2UgdGhpcyB3YXMgdGhlIG9ubHkgY2FsbGVyLgor ICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorCiAyMDEzLTAxLTI1ICBHdXN0YXZv IE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgogCiAgICAgICAgIFtTb3VwXSBTdHJlYW1s aW5lIGNhbmNlbGxhdGlvbiBhbmQgY2xpZW50IGNoZWNrcwpJbmRleDogU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxNDA4MzgpCisrKyBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTc4LDkg KzExNzgsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUFjdGl2ZVRleHRUCiAgICAg ICAgIC8vIEV2ZW4gdGhvdWdoIHRoZSBhY3RpdmUgc2V0IGhhcyBub3QgY2hhbmdlZCwgaXQgaXMg cG9zc2libGUgdGhhdCB0aGUKICAgICAgICAgLy8gdGhlIG1vZGUgb2YgYSB0cmFjayBoYXMgY2hh bmdlZCBmcm9tICdoaWRkZW4nIHRvICdzaG93aW5nJyBhbmQgdGhlCiAgICAgICAgIC8vIGN1ZXMg aGF2ZSBub3QgeWV0IGJlZW4gcmVuZGVyZWQuCi0gICAgICAgIGlmIChoYXNNZWRpYUNvbnRyb2xz KCkpCi0gICAgICAgICAgICBtZWRpYUNvbnRyb2xzKCktPnVwZGF0ZVRleHRUcmFja0Rpc3BsYXko KTsKLQorICAgICAgICB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKQEAgLTEzMTgsOCArMTMxNiw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBk YXRlQWN0aXZlVGV4dFQKICAgICAvLyBVcGRhdGUgdGhlIGN1cnJlbnQgYWN0aXZlIGN1ZXMuCiAg ICAgbV9jdXJyZW50bHlBY3RpdmVDdWVzID0gY3VycmVudEN1ZXM7CiAKLSAgICBpZiAoYWN0aXZl U2V0Q2hhbmdlZCAmJiBoYXNNZWRpYUNvbnRyb2xzKCkpCi0gICAgICAgIG1lZGlhQ29udHJvbHMo KS0+dXBkYXRlVGV4dFRyYWNrRGlzcGxheSgpOworICAgIGlmIChhY3RpdmVTZXRDaGFuZ2VkKQor ICAgICAgICB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CiB9CiAKIGJvb2wgSFRNTE1lZGlhRWxl bWVudDo6dGV4dFRyYWNrc0FyZVJlYWR5KCkgY29uc3QKQEAgLTQxNDksNiArNDE0NywxNiBAQCBi b29sIEhUTUxNZWRpYUVsZW1lbnQ6OmNsb3NlZENhcHRpb25zVmlzCiAgICAgcmV0dXJuIG1fY2xv c2VkQ2FwdGlvbnNWaXNpYmxlOwogfQogCisjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQordm9pZCBI VE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCkKK3sKKyAgICBpZiAoIWhh c01lZGlhQ29udHJvbHMoKSAmJiAhY3JlYXRlTWVkaWFDb250cm9scygpKQorICAgICAgICByZXR1 cm47CisgICAgCisgICAgbWVkaWFDb250cm9scygpLT51cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7 Cit9CisjZW5kaWYKKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRDbG9zZWRDYXB0aW9uc1Zp c2libGUoYm9vbCBjbG9zZWRDYXB0aW9uVmlzaWJsZSkKIHsKICAgICBMT0coTWVkaWEsICJIVE1M TWVkaWFFbGVtZW50OjpzZXRDbG9zZWRDYXB0aW9uc1Zpc2libGUoJXMpIiwgYm9vbFN0cmluZyhj bG9zZWRDYXB0aW9uVmlzaWJsZSkpOwpAQCAtNDE2NCw3ICs0MTcyLDggQEAgdm9pZCBIVE1MTWVk aWFFbGVtZW50OjpzZXRDbG9zZWRDYXB0aW9ucwogICAgICAgICBtX2Rpc2FibGVDYXB0aW9ucyA9 ICFtX2Nsb3NlZENhcHRpb25zVmlzaWJsZTsKIAogICAgICAgICBtYXJrQ2FwdGlvbkFuZFN1YnRp dGxlVHJhY2tzQXNVbmNvbmZpZ3VyZWQoKTsKLSAgICAgICAgbWVkaWFDb250cm9scygpLT51cGRh dGVUZXh0VHJhY2tEaXNwbGF5KCk7CisKKyAgICAgICAgdXBkYXRlVGV4dFRyYWNrRGlzcGxheSgp OwogICAgIH0KICNlbHNlCiAgICAgaWYgKGhhc01lZGlhQ29udHJvbHMoKSkKQEAgLTQyODUsMjEg KzQyOTQsMjQgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjpjcmVhdGVNZWRpYUNvbnRybwogICAg IGlmIChoYXNNZWRpYUNvbnRyb2xzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgRXhj ZXB0aW9uQ29kZSBlYzsKLSAgICBSZWZQdHI8TWVkaWFDb250cm9scz4gY29udHJvbHMgPSBNZWRp YUNvbnRyb2xzOjpjcmVhdGUoZG9jdW1lbnQoKSk7Ci0gICAgaWYgKCFjb250cm9scykKKyAgICBS ZWZQdHI8TWVkaWFDb250cm9scz4gbWVkaWFDb250cm9scyA9IE1lZGlhQ29udHJvbHM6OmNyZWF0 ZShkb2N1bWVudCgpKTsKKyAgICBpZiAoIW1lZGlhQ29udHJvbHMpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAotICAgIGNvbnRyb2xzLT5zZXRNZWRpYUNvbnRyb2xsZXIobV9tZWRpYUNvbnRyb2xs ZXIgPyBtX21lZGlhQ29udHJvbGxlci5nZXQoKSA6IHN0YXRpY19jYXN0PE1lZGlhQ29udHJvbGxl ckludGVyZmFjZSo+KHRoaXMpKTsKLSAgICBjb250cm9scy0+cmVzZXQoKTsKKyAgICBtZWRpYUNv bnRyb2xzLT5zZXRNZWRpYUNvbnRyb2xsZXIobV9tZWRpYUNvbnRyb2xsZXIgPyBtX21lZGlhQ29u dHJvbGxlci5nZXQoKSA6IHN0YXRpY19jYXN0PE1lZGlhQ29udHJvbGxlckludGVyZmFjZSo+KHRo aXMpKTsKKyAgICBtZWRpYUNvbnRyb2xzLT5yZXNldCgpOwogICAgIGlmIChpc0Z1bGxzY3JlZW4o KSkKLSAgICAgICAgY29udHJvbHMtPmVudGVyZWRGdWxsc2NyZWVuKCk7CisgICAgICAgIG1lZGlh Q29udHJvbHMtPmVudGVyZWRGdWxsc2NyZWVuKCk7CiAKICAgICBpZiAoIXNoYWRvdygpKQogICAg ICAgICBjcmVhdGVTaGFkb3dTdWJ0cmVlKCk7CiAKICAgICBBU1NFUlQodXNlckFnZW50U2hhZG93 Um9vdCgpKTsKLSAgICB1c2VyQWdlbnRTaGFkb3dSb290KCktPmFwcGVuZENoaWxkKGNvbnRyb2xz LCBlYyk7CisgICAgdXNlckFnZW50U2hhZG93Um9vdCgpLT5hcHBlbmRDaGlsZChtZWRpYUNvbnRy b2xzLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKworICAgIGlmICghY29udHJvbHMoKSB8fCAhaW5E b2N1bWVudCgpKQorICAgICAgICBtZWRpYUNvbnRyb2xzLT5oaWRlKCk7CisKICAgICByZXR1cm4g dHJ1ZTsKIH0KIApAQCAtNDM0OCwxNyArNDM2MCwxMCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmNvbmZpZ3VyZVRleHRUcmFjCiAgICAgaWYgKCFoYXNNZWRpYUNvbnRyb2xzKCkgJiYgIWNyZWF0 ZU1lZGlhQ29udHJvbHMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgdXBkYXRlQ2xvc2VkQ2Fw dGlvbnNDb250cm9scygpOwotfQotCi12b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZUNsb3Nl ZENhcHRpb25zQ29udHJvbHMoKQotewotICAgIGlmIChoYXNNZWRpYUNvbnRyb2xzKCkpIHsKLSAg ICAgICAgbWVkaWFDb250cm9scygpLT5jaGFuZ2VkQ2xvc2VkQ2FwdGlvbnNWaXNpYmlsaXR5KCk7 Ci0KLSAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OndlYmtpdFZpZGVvVHJhY2tF bmFibGVkKCkpCi0gICAgICAgICAgICBtZWRpYUNvbnRyb2xzKCktPnVwZGF0ZVRleHRUcmFja0Rp c3BsYXkoKTsKLSAgICB9CisgICAgbWVkaWFDb250cm9scygpLT5jaGFuZ2VkQ2xvc2VkQ2FwdGlv bnNWaXNpYmlsaXR5KCk7CisgICAgCisgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6Ondl YmtpdFZpZGVvVHJhY2tFbmFibGVkKCkpCisgICAgICAgIHVwZGF0ZVRleHRUcmFja0Rpc3BsYXko KTsKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2Vk KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCShyZXZpc2lvbiAx NDA3ODApCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjU3LDcgKzI1Nyw3IEBAIHB1YmxpYzoKICAgICBib29sIHVzZXJJc0ludGVy ZXN0ZWRJblRoaXNUcmFja0tpbmQoU3RyaW5nKSBjb25zdDsKICAgICBib29sIHRleHRUcmFja3NB cmVSZWFkeSgpIGNvbnN0OwogICAgIHZvaWQgY29uZmlndXJlVGV4dFRyYWNrRGlzcGxheSgpOwot ICAgIHZvaWQgdXBkYXRlQ2xvc2VkQ2FwdGlvbnNDb250cm9scygpOworICAgIHZvaWQgdXBkYXRl VGV4dFRyYWNrRGlzcGxheSgpOwogCiAgICAgLy8gVGV4dFRyYWNrQ2xpZW50CiAgICAgdmlydHVh bCB2b2lkIHRleHRUcmFja1JlYWR5U3RhdGVDaGFuZ2VkKFRleHRUcmFjayopOwpJbmRleDogTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwko cmV2aXNpb24gMTQwODM3KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDEtMjUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkaW5nIGEgdGV4dCB0cmFjayBzaG91bGQgbm90IG1h a2UgY29udHJvbHMgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA3OTU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL21lZGlhLWNhcHRpb25zLW5vLWNvbnRyb2xzLmh0 bWw6IEFkZGVkLgorCiAyMDEzLTAxLTI1ICBTdWRhcnNhbmEgTmFnaW5lbmkgIDxzdWRhcnNhbmEu bmFnaW5lbmlAaW50ZWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgRUZMIHJlYmFzZWxpbmUu CkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtY2FwdGlvbnMt bm8tY29udHJvbHMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVk aWEvbWVkaWEtY2FwdGlvbnMtbm8tY29udHJvbHMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpA QCAtMCwwICsxLDIzIEBACitUZXN0cyB0aGF0IGFkZGluZyBhIHRleHQgdHJhY2sgZG9lcyBub3Qg bWFrZSBjb250cm9scyB2aXNpYmxlLgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKKworKiogSW5p dGlhbCBzdGF0ZTogbm8gdGV4dCB0cmFja3MsIGNvbnRyb2xzIHNob3VsZCBub3QgYmUgdmlzaWJs ZSAqKgorRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3MubGVuZ3RoID09ICcwJykgT0sKK0VYUEVD VEVEICh2aWRlby5jb250cm9scyA9PSAnZmFsc2UnKSBPSworRVhQRUNURUQgKGNvbnRyb2xzRWxl bWVudC5zdHlsZVsnZGlzcGxheSddID09ICdub25lJykgT0sKKworKiogQWRkIGEgdGV4dCB0cmFj aywgY29udHJvbHMgc2hvdWxkIG5vdCBiZWNvbWUgdmlzaWJsZSAqKgorUlVOKHZpZGVvLmFkZFRl eHRUcmFjaygnY2FwdGlvbnMnKSkKK0VYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzLmxlbmd0aCA9 PSAnMScpIE9LCitFWFBFQ1RFRCAodmlkZW8uY29udHJvbHMgPT0gJ2ZhbHNlJykgT0sKK0VYUEVD VEVEIChjb250cm9sc0VsZW1lbnQuc3R5bGVbJ2Rpc3BsYXknXSA9PSAnbm9uZScpIE9LCisKKyoq IEVuYWJsZSBjb250cm9scyAqKgorUlVOKHZpZGVvLnNldEF0dHJpYnV0ZSgnY29udHJvbHMnLCdj b250cm9scycpKQorRVhQRUNURUQgKHZpZGVvLnRleHRUcmFja3MubGVuZ3RoID09ICcxJykgT0sK K0VYUEVDVEVEICh2aWRlby5jb250cm9scyA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAoY29udHJv bHNFbGVtZW50LnN0eWxlWydkaXNwbGF5J10gIT0gJ25vbmUnKSBPSworCitFTkQgT0YgVEVTVAor CkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL21lZGlhLWNhcHRpb25zLW5vLWNvbnRy b2xzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYXB0aW9u cy1uby1jb250cm9scy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUwIEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBodHRwLWVxdWl2PSJD b250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCIgLz4KKworICAg ICAgICA8c2NyaXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 IHNyYz12aWRlby10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz1tZWRpYS1j b250cm9scy5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICAgICAgZnVu Y3Rpb24gY2FucGxheXRocm91Z2goKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNv bnRyb2xzRWxlbWVudCA9IG1lZGlhQ29udHJvbHNFbGVtZW50KGludGVybmFscy5zaGFkb3dSb290 KHZpZGVvKS5maXJzdENoaWxkLCAiLXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCIpOworICAg ICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioqIEluaXRpYWwgc3RhdGU6IG5vIHRleHQg dHJhY2tzLCBjb250cm9scyBzaG91bGQgbm90IGJlIHZpc2libGUgKioiKTsKKyAgICAgICAgICAg ICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3MubGVuZ3RoIiwgMCk7CisgICAgICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jb250cm9scyIsIGZhbHNlLCAnPT0nKTsKKyAg ICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImNvbnRyb2xzRWxlbWVudC5zdHlsZVsnZGlzcGxh eSddIiwgJ25vbmUnKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioqIEFk ZCBhIHRleHQgdHJhY2ssIGNvbnRyb2xzIHNob3VsZCBub3QgYmVjb21lIHZpc2libGUgKioiKTsK KyAgICAgICAgICAgICAgICBydW4oInZpZGVvLmFkZFRleHRUcmFjaygnY2FwdGlvbnMnKSIpOwor ICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNrcy5sZW5ndGgiLCAx KTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNvbnRyb2xzIiwgZmFsc2Up OworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiY29udHJvbHNFbGVtZW50LnN0eWxlWydk aXNwbGF5J10iLCAnbm9uZScpOworCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+ KiogRW5hYmxlIGNvbnRyb2xzICoqIik7CisgICAgICAgICAgICAgICAgcnVuKCJ2aWRlby5zZXRB dHRyaWJ1dGUoJ2NvbnRyb2xzJywnY29udHJvbHMnKSIpOworICAgICAgICAgICAgICAgIHRlc3RF eHBlY3RlZCgidmlkZW8udGV4dFRyYWNrcy5sZW5ndGgiLCAxKTsKKyAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoInZpZGVvLmNvbnRyb2xzIiwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgdGVz dEV4cGVjdGVkKCJjb250cm9sc0VsZW1lbnQuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywgIiE9 Iik7CisKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgICAg IGVuZFRlc3QoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gc3RhcnQo KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKwor ICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgnY2FucGxheXRocm91Z2gnLCBjYW5wbGF5dGhy b3VnaCk7CisgICAgICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8i LCAiY29udGVudC90ZXN0Iik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgPC9zY3JpcHQ+Cisg ICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAgICAgIDx2aWRlbz4K KyAgICAgICAgPC92aWRlbz4KKyAgICAgICAgPHA+VGVzdHMgdGhhdCBhZGRpbmcgYSB0ZXh0IHRy YWNrIGRvZXMgbm90IG1ha2UgY29udHJvbHMgdmlzaWJsZS48L3A+CisgICAgPC9ib2R5PgorPC9o dG1sPgo= 184791 2013-01-25 12:13:30 -0800 2013-01-25 13:19:03 -0800 Updated patch. patch_3.txt text/plain 9604 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDg0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTI1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZGluZyBhIHRleHQg dHJhY2sgc2hvdWxkIG5vdCBtYWtlIGNvbnRyb2xzIHZpc2libGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzk1NgorCisgICAgICAgIFJldmlld2Vk IGJ5IERlYW4gSmFja3Nvbi4KKworICAgICAgICBUZXN0OiBtZWRpYS9tZWRpYS1jYXB0aW9ucy1u by1jb250cm9scy5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlQWN0aXZlVGV4dFRyYWNr Q3Vlcyk6IENhbGwgdXBkYXRlVGV4dFRyYWNrRGlzcGxheS4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVRleHRUcmFja0Rpc3BsYXkpOiBOZXcsIGNhbGwgbWVkaWFD b250cm9scy0+dXBkYXRlVGV4dFRyYWNrRGlzcGxheSgpCisgICAgICAgICAgICBpZiB3ZSBoYXZl IGNvbnRyb2xzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0Q2xvc2Vk Q2FwdGlvbnNWaXNpYmxlKTogIENhbGwgdXBkYXRlVGV4dFRyYWNrRGlzcGxheS4KKyAgICAgICAg KFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhQ29udHJvbHMpOiBIaWRlIGNv bnRyb2xzIGlmIHRoZXkgc2hvdWxkIG5vdCBiZSAKKyAgICAgICAgICAgIHZpc2libGUuIE1pbm9y IGRyaXZlIGJ5IGNsZWFudXAuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpj b25maWd1cmVUZXh0VHJhY2tEaXNwbGF5KTogRHJpdmUgYnkgY2xlYW51cCwgcHVsbCB0aGUgdGhy ZWUgbGluZXMKKyAgICAgICAgICAgIGZyb20gdXBkYXRlQ2xvc2VkQ2FwdGlvbnNDb250cm9scyBp bmxpbmUgYW5kIGRlbGV0ZSBpdCBiZWNhdXNlIHRoaXMgd2FzIHRoZSBvbmx5IGNhbGxlci4KKyAg ICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKwogMjAxMy0wMS0yNSAgQWJoaXNoZWsg QXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjEzOTgz Nik6IENyYXNoIGluIFdURjo6ZXF1YWxJZ25vcmluZ0Nhc2UKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTQwODM4KQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3OCw5 ICsxMTc4LDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlQWN0aXZlVGV4dFQKICAg ICAgICAgLy8gRXZlbiB0aG91Z2ggdGhlIGFjdGl2ZSBzZXQgaGFzIG5vdCBjaGFuZ2VkLCBpdCBp cyBwb3NzaWJsZSB0aGF0IHRoZQogICAgICAgICAvLyB0aGUgbW9kZSBvZiBhIHRyYWNrIGhhcyBj aGFuZ2VkIGZyb20gJ2hpZGRlbicgdG8gJ3Nob3dpbmcnIGFuZCB0aGUKICAgICAgICAgLy8gY3Vl cyBoYXZlIG5vdCB5ZXQgYmVlbiByZW5kZXJlZC4KKyAgICAgICAgLy8gTm90ZTogZG9uJ3QgY2Fs bCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCkgdW5sZXNzIHdlIGhhdmUgY29udHJvbHMgYmVjYXVz ZSBpdCB3aWxsCisgICAgICAgIC8vIGNyZWF0ZSB0aGVtLgogICAgICAgICBpZiAoaGFzTWVkaWFD b250cm9scygpKQotICAgICAgICAgICAgbWVkaWFDb250cm9scygpLT51cGRhdGVUZXh0VHJhY2tE aXNwbGF5KCk7Ci0KKyAgICAgICAgICAgIHVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTMxOCw4ICsxMzE5LDggQEAgdm9pZCBIVE1MTWVkaWFF bGVtZW50Ojp1cGRhdGVBY3RpdmVUZXh0VAogICAgIC8vIFVwZGF0ZSB0aGUgY3VycmVudCBhY3Rp dmUgY3Vlcy4KICAgICBtX2N1cnJlbnRseUFjdGl2ZUN1ZXMgPSBjdXJyZW50Q3VlczsKIAotICAg IGlmIChhY3RpdmVTZXRDaGFuZ2VkICYmIGhhc01lZGlhQ29udHJvbHMoKSkKLSAgICAgICAgbWVk aWFDb250cm9scygpLT51cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CisgICAgaWYgKGFjdGl2ZVNl dENoYW5nZWQpCisgICAgICAgIHVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKTsKIH0KIAogYm9vbCBI VE1MTWVkaWFFbGVtZW50Ojp0ZXh0VHJhY2tzQXJlUmVhZHkoKSBjb25zdApAQCAtNDE0OSw2ICs0 MTUwLDE2IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6Y2xvc2VkQ2FwdGlvbnNWaXMKICAgICBy ZXR1cm4gbV9jbG9zZWRDYXB0aW9uc1Zpc2libGU7CiB9CiAKKyNpZiBFTkFCTEUoVklERU9fVFJB Q0spCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKQorewor ICAgIGlmICghaGFzTWVkaWFDb250cm9scygpICYmICFjcmVhdGVNZWRpYUNvbnRyb2xzKCkpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICBtZWRpYUNvbnRyb2xzKCktPnVwZGF0ZVRleHRUcmFj a0Rpc3BsYXkoKTsKK30KKyNlbmRpZgorCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldENsb3Nl ZENhcHRpb25zVmlzaWJsZShib29sIGNsb3NlZENhcHRpb25WaXNpYmxlKQogewogICAgIExPRyhN ZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNldENsb3NlZENhcHRpb25zVmlzaWJsZSglcykiLCBi b29sU3RyaW5nKGNsb3NlZENhcHRpb25WaXNpYmxlKSk7CkBAIC00MTY0LDcgKzQxNzUsOCBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldENsb3NlZENhcHRpb25zCiAgICAgICAgIG1fZGlzYWJs ZUNhcHRpb25zID0gIW1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxlOwogCiAgICAgICAgIG1hcmtDYXB0 aW9uQW5kU3VidGl0bGVUcmFja3NBc1VuY29uZmlndXJlZCgpOwotICAgICAgICBtZWRpYUNvbnRy b2xzKCktPnVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKTsKKworICAgICAgICB1cGRhdGVUZXh0VHJh Y2tEaXNwbGF5KCk7CiAgICAgfQogI2Vsc2UKICAgICBpZiAoaGFzTWVkaWFDb250cm9scygpKQpA QCAtNDI4NSwyMSArNDI5NywyNCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlh Q29udHJvCiAgICAgaWYgKGhhc01lZGlhQ29udHJvbHMoKSkKICAgICAgICAgcmV0dXJuIHRydWU7 CiAKLSAgICBFeGNlcHRpb25Db2RlIGVjOwotICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xzPiBjb250 cm9scyA9IE1lZGlhQ29udHJvbHM6OmNyZWF0ZShkb2N1bWVudCgpKTsKLSAgICBpZiAoIWNvbnRy b2xzKQorICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xzPiBtZWRpYUNvbnRyb2xzID0gTWVkaWFDb250 cm9sczo6Y3JlYXRlKGRvY3VtZW50KCkpOworICAgIGlmICghbWVkaWFDb250cm9scykKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgY29udHJvbHMtPnNldE1lZGlhQ29udHJvbGxlcihtX21l ZGlhQ29udHJvbGxlciA/IG1fbWVkaWFDb250cm9sbGVyLmdldCgpIDogc3RhdGljX2Nhc3Q8TWVk aWFDb250cm9sbGVySW50ZXJmYWNlKj4odGhpcykpOwotICAgIGNvbnRyb2xzLT5yZXNldCgpOwor ICAgIG1lZGlhQ29udHJvbHMtPnNldE1lZGlhQ29udHJvbGxlcihtX21lZGlhQ29udHJvbGxlciA/ IG1fbWVkaWFDb250cm9sbGVyLmdldCgpIDogc3RhdGljX2Nhc3Q8TWVkaWFDb250cm9sbGVySW50 ZXJmYWNlKj4odGhpcykpOworICAgIG1lZGlhQ29udHJvbHMtPnJlc2V0KCk7CiAgICAgaWYgKGlz RnVsbHNjcmVlbigpKQotICAgICAgICBjb250cm9scy0+ZW50ZXJlZEZ1bGxzY3JlZW4oKTsKKyAg ICAgICAgbWVkaWFDb250cm9scy0+ZW50ZXJlZEZ1bGxzY3JlZW4oKTsKIAogICAgIGlmICghc2hh ZG93KCkpCiAgICAgICAgIGNyZWF0ZVNoYWRvd1N1YnRyZWUoKTsKIAogICAgIEFTU0VSVCh1c2Vy QWdlbnRTaGFkb3dSb290KCkpOwotICAgIHVzZXJBZ2VudFNoYWRvd1Jvb3QoKS0+YXBwZW5kQ2hp bGQoY29udHJvbHMsIGVjKTsKKyAgICB1c2VyQWdlbnRTaGFkb3dSb290KCktPmFwcGVuZENoaWxk KG1lZGlhQ29udHJvbHMsIEFTU0VSVF9OT19FWENFUFRJT04pOworCisgICAgaWYgKCFjb250cm9s cygpIHx8ICFpbkRvY3VtZW50KCkpCisgICAgICAgIG1lZGlhQ29udHJvbHMtPmhpZGUoKTsKKwog ICAgIHJldHVybiB0cnVlOwogfQogCkBAIC00MzQ4LDE3ICs0MzYzLDEwIEBAIHZvaWQgSFRNTE1l ZGlhRWxlbWVudDo6Y29uZmlndXJlVGV4dFRyYWMKICAgICBpZiAoIWhhc01lZGlhQ29udHJvbHMo KSAmJiAhY3JlYXRlTWVkaWFDb250cm9scygpKQogICAgICAgICByZXR1cm47CiAKLSAgICB1cGRh dGVDbG9zZWRDYXB0aW9uc0NvbnRyb2xzKCk7Ci19Ci0KLXZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 dXBkYXRlQ2xvc2VkQ2FwdGlvbnNDb250cm9scygpCi17Ci0gICAgaWYgKGhhc01lZGlhQ29udHJv bHMoKSkgewotICAgICAgICBtZWRpYUNvbnRyb2xzKCktPmNoYW5nZWRDbG9zZWRDYXB0aW9uc1Zp c2liaWxpdHkoKTsKLQotICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6d2Via2l0 VmlkZW9UcmFja0VuYWJsZWQoKSkKLSAgICAgICAgICAgIG1lZGlhQ29udHJvbHMoKS0+dXBkYXRl VGV4dFRyYWNrRGlzcGxheSgpOwotICAgIH0KKyAgICBtZWRpYUNvbnRyb2xzKCktPmNoYW5nZWRD bG9zZWRDYXB0aW9uc1Zpc2liaWxpdHkoKTsKKyAgICAKKyAgICBpZiAoUnVudGltZUVuYWJsZWRG ZWF0dXJlczo6d2Via2l0VmlkZW9UcmFja0VuYWJsZWQoKSkKKyAgICAgICAgdXBkYXRlVGV4dFRy YWNrRGlzcGxheSgpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNhcHRpb25QcmVmZXJl bmNlc0NoYW5nZWQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJ KHJldmlzaW9uIDE0MDg1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTgsNyArMjU4LDcgQEAgcHVibGljOgogICAgIGJvb2wg dXNlcklzSW50ZXJlc3RlZEluVGhpc1RyYWNrS2luZChTdHJpbmcpIGNvbnN0OwogICAgIGJvb2wg dGV4dFRyYWNrc0FyZVJlYWR5KCkgY29uc3Q7CiAgICAgdm9pZCBjb25maWd1cmVUZXh0VHJhY2tE aXNwbGF5KCk7Ci0gICAgdm9pZCB1cGRhdGVDbG9zZWRDYXB0aW9uc0NvbnRyb2xzKCk7CisgICAg dm9pZCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CiAKICAgICAvLyBUZXh0VHJhY2tDbGllbnQK ICAgICB2aXJ0dWFsIHZvaWQgdGV4dFRyYWNrUmVhZHlTdGF0ZUNoYW5nZWQoVGV4dFRyYWNrKik7 CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCShyZXZpc2lvbiAxNDA4NDgpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMS0yNSAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRpbmcgYSB0ZXh0IHRyYWNrIHNo b3VsZCBub3QgbWFrZSBjb250cm9scyB2aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc5NTYKKworICAgICAgICBSZXZpZXdlZCBieSAgRGVh biBKYWNrc29uLgorCisgICAgICAgICogbWVkaWEvbWVkaWEtY2FwdGlvbnMtbm8tY29udHJvbHMt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1j b250cm9scy5odG1sOiBBZGRlZC4KKwogMjAxMy0wMS0yNSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVy bm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjEzOTgzNik6IENyYXNoIGlu IFdURjo6ZXF1YWxJZ25vcmluZ0Nhc2UKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL21lZGlhLWNh cHRpb25zLW5vLWNvbnRyb2xzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjMgQEAKK1Rlc3RzIHRoYXQgYWRkaW5n IGEgdGV4dCB0cmFjayBkb2VzIG5vdCBtYWtlIGNvbnRyb2xzIHZpc2libGUuCisKK0VWRU5UKGNh bnBsYXl0aHJvdWdoKQorCisqKiBJbml0aWFsIHN0YXRlOiBubyB0ZXh0IHRyYWNrcywgY29udHJv bHMgc2hvdWxkIG5vdCBiZSB2aXNpYmxlICoqCitFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrcy5s ZW5ndGggPT0gJzAnKSBPSworRVhQRUNURUQgKHZpZGVvLmNvbnRyb2xzID09ICdmYWxzZScpIE9L CitFWFBFQ1RFRCAoY29udHJvbHNFbGVtZW50LnN0eWxlWydkaXNwbGF5J10gPT0gJ25vbmUnKSBP SworCisqKiBBZGQgYSB0ZXh0IHRyYWNrLCBjb250cm9scyBzaG91bGQgbm90IGJlY29tZSB2aXNp YmxlICoqCitSVU4odmlkZW8uYWRkVGV4dFRyYWNrKCdjYXB0aW9ucycpKQorRVhQRUNURUQgKHZp ZGVvLnRleHRUcmFja3MubGVuZ3RoID09ICcxJykgT0sKK0VYUEVDVEVEICh2aWRlby5jb250cm9s cyA9PSAnZmFsc2UnKSBPSworRVhQRUNURUQgKGNvbnRyb2xzRWxlbWVudC5zdHlsZVsnZGlzcGxh eSddID09ICdub25lJykgT0sKKworKiogRW5hYmxlIGNvbnRyb2xzICoqCitSVU4odmlkZW8uc2V0 QXR0cmlidXRlKCdjb250cm9scycsJ2NvbnRyb2xzJykpCitFWFBFQ1RFRCAodmlkZW8udGV4dFRy YWNrcy5sZW5ndGggPT0gJzEnKSBPSworRVhQRUNURUQgKHZpZGVvLmNvbnRyb2xzID09ICd0cnVl JykgT0sKK0VYUEVDVEVEIChjb250cm9sc0VsZW1lbnQuc3R5bGVbJ2Rpc3BsYXknXSAhPSAnbm9u ZScpIE9LCisKK0VORCBPRiBURVNUCisKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL21lZGlhLWNh cHRpb25zLW5vLWNvbnRyb2xzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEv bWVkaWEtY2FwdGlvbnMtbm8tY29udHJvbHMuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL21lZGlhL21lZGlhLWNhcHRpb25zLW5vLWNvbnRyb2xzLmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAg ICAgIDxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyBj aGFyc2V0PXV0Zi04IiAvPgorCisgICAgICAgIDxzY3JpcHQgc3JjPW1lZGlhLWZpbGUuanM+PC9z Y3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPXZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CisgICAg ICAgIDxzY3JpcHQgc3JjPW1lZGlhLWNvbnRyb2xzLmpzPjwvc2NyaXB0PgorICAgICAgICA8c2Ny aXB0PgorCisgICAgICAgICAgICBmdW5jdGlvbiBjYW5wbGF5dGhyb3VnaCgpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgY29udHJvbHNFbGVtZW50ID0gbWVkaWFDb250cm9sc0VsZW1l bnQoaW50ZXJuYWxzLnNoYWRvd1Jvb3QodmlkZW8pLmZpcnN0Q2hpbGQsICItd2Via2l0LW1lZGlh LWNvbnRyb2xzLXBhbmVsIik7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+Kiog SW5pdGlhbCBzdGF0ZTogbm8gdGV4dCB0cmFja3MsIGNvbnRyb2xzIHNob3VsZCBub3QgYmUgdmlz aWJsZSAqKiIpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8udGV4dFRyYWNr cy5sZW5ndGgiLCAwKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNvbnRy b2xzIiwgZmFsc2UsICc9PScpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiY29udHJv bHNFbGVtZW50LnN0eWxlWydkaXNwbGF5J10iLCAnbm9uZScpOworCisgICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCI8YnI+KiogQWRkIGEgdGV4dCB0cmFjaywgY29udHJvbHMgc2hvdWxkIG5v dCBiZWNvbWUgdmlzaWJsZSAqKiIpOworICAgICAgICAgICAgICAgIHJ1bigidmlkZW8uYWRkVGV4 dFRyYWNrKCdjYXB0aW9ucycpIik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRl by50ZXh0VHJhY2tzLmxlbmd0aCIsIDEpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi dmlkZW8uY29udHJvbHMiLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJj b250cm9sc0VsZW1lbnQuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJyk7CisKKyAgICAgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIjxicj4qKiBFbmFibGUgY29udHJvbHMgKioiKTsKKyAgICAgICAg ICAgICAgICBydW4oInZpZGVvLnNldEF0dHJpYnV0ZSgnY29udHJvbHMnLCdjb250cm9scycpIik7 CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzLmxlbmd0aCIs IDEpOworICAgICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY29udHJvbHMiLCB0cnVl KTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoImNvbnRyb2xzRWxlbWVudC5zdHlsZVsn ZGlzcGxheSddIiwgJ25vbmUnLCAiIT0iKTsKKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0 ZSgiIik7CisgICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBmdW5jdGlvbiBzdGFydCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ZmluZE1lZGlhRWxlbWVudCgpOworCisgICAgICAgICAgICAgICAgd2FpdEZvckV2ZW50KCdjYW5w bGF5dGhyb3VnaCcsIGNhbnBsYXl0aHJvdWdoKTsKKyAgICAgICAgICAgICAgICB2aWRlby5zcmMg PSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKTsKKyAgICAgICAgICAgIH0K KworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJzdGFy dCgpIj4KKyAgICAgICAgPHZpZGVvPgorICAgICAgICA8L3ZpZGVvPgorICAgICAgICA8cD5UZXN0 cyB0aGF0IGFkZGluZyBhIHRleHQgdHJhY2sgZG9lcyBub3QgbWFrZSBjb250cm9scyB2aXNpYmxl LjwvcD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 184801 2013-01-25 13:19:03 -0800 2013-01-25 13:43:15 -0800 Updated patch. patch_4.txt text/plain 9707 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDg0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTI1ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZGluZyBhIHRleHQg dHJhY2sgc2hvdWxkIG5vdCBtYWtlIGNvbnRyb2xzIHZpc2libGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzk1NgorCisgICAgICAgIFJldmlld2Vk IGJ5IERlYW4gSmFja3Nvbi4KKworICAgICAgICBUZXN0OiBtZWRpYS9tZWRpYS1jYXB0aW9ucy1u by1jb250cm9scy5odG1sCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlQWN0aXZlVGV4dFRyYWNr Q3Vlcyk6IENhbGwgdXBkYXRlVGV4dFRyYWNrRGlzcGxheS4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVRleHRUcmFja0Rpc3BsYXkpOiBOZXcsIGNhbGwgbWVkaWFD b250cm9scy0+dXBkYXRlVGV4dFRyYWNrRGlzcGxheSgpCisgICAgICAgICAgICBpZiB3ZSBoYXZl IGNvbnRyb2xzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0Q2xvc2Vk Q2FwdGlvbnNWaXNpYmxlKTogIENhbGwgdXBkYXRlVGV4dFRyYWNrRGlzcGxheS4KKyAgICAgICAg KFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhQ29udHJvbHMpOiBIaWRlIGNv bnRyb2xzIGlmIHRoZXkgc2hvdWxkIG5vdCBiZSAKKyAgICAgICAgICAgIHZpc2libGUuIE1pbm9y IGRyaXZlIGJ5IGNsZWFudXAuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpj b25maWd1cmVUZXh0VHJhY2tEaXNwbGF5KTogRHJpdmUgYnkgY2xlYW51cCwgcHVsbCB0aGUgdGhy ZWUgbGluZXMKKyAgICAgICAgICAgIGZyb20gdXBkYXRlQ2xvc2VkQ2FwdGlvbnNDb250cm9scyBp bmxpbmUgYW5kIGRlbGV0ZSBpdCBiZWNhdXNlIHRoaXMgd2FzIHRoZSBvbmx5IGNhbGxlci4KKyAg ICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKwogMjAxMy0wMS0yNSAgQWJoaXNoZWsg QXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjEzOTgz Nik6IENyYXNoIGluIFdURjo6ZXF1YWxJZ25vcmluZ0Nhc2UKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTQwODM4KQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3OCw5 ICsxMTc4LDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlQWN0aXZlVGV4dFQKICAg ICAgICAgLy8gRXZlbiB0aG91Z2ggdGhlIGFjdGl2ZSBzZXQgaGFzIG5vdCBjaGFuZ2VkLCBpdCBp cyBwb3NzaWJsZSB0aGF0IHRoZQogICAgICAgICAvLyB0aGUgbW9kZSBvZiBhIHRyYWNrIGhhcyBj aGFuZ2VkIGZyb20gJ2hpZGRlbicgdG8gJ3Nob3dpbmcnIGFuZCB0aGUKICAgICAgICAgLy8gY3Vl cyBoYXZlIG5vdCB5ZXQgYmVlbiByZW5kZXJlZC4KKyAgICAgICAgLy8gTm90ZTogZG9uJ3QgY2Fs bCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCkgdW5sZXNzIHdlIGhhdmUgY29udHJvbHMgYmVjYXVz ZSBpdCB3aWxsCisgICAgICAgIC8vIGNyZWF0ZSB0aGVtLgogICAgICAgICBpZiAoaGFzTWVkaWFD b250cm9scygpKQotICAgICAgICAgICAgbWVkaWFDb250cm9scygpLT51cGRhdGVUZXh0VHJhY2tE aXNwbGF5KCk7Ci0KKyAgICAgICAgICAgIHVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTMxOCw4ICsxMzE5LDggQEAgdm9pZCBIVE1MTWVkaWFF bGVtZW50Ojp1cGRhdGVBY3RpdmVUZXh0VAogICAgIC8vIFVwZGF0ZSB0aGUgY3VycmVudCBhY3Rp dmUgY3Vlcy4KICAgICBtX2N1cnJlbnRseUFjdGl2ZUN1ZXMgPSBjdXJyZW50Q3VlczsKIAotICAg IGlmIChhY3RpdmVTZXRDaGFuZ2VkICYmIGhhc01lZGlhQ29udHJvbHMoKSkKLSAgICAgICAgbWVk aWFDb250cm9scygpLT51cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CisgICAgaWYgKGFjdGl2ZVNl dENoYW5nZWQpCisgICAgICAgIHVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKTsKIH0KIAogYm9vbCBI VE1MTWVkaWFFbGVtZW50Ojp0ZXh0VHJhY2tzQXJlUmVhZHkoKSBjb25zdApAQCAtNDE0OSw2ICs0 MTUwLDE2IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6Y2xvc2VkQ2FwdGlvbnNWaXMKICAgICBy ZXR1cm4gbV9jbG9zZWRDYXB0aW9uc1Zpc2libGU7CiB9CiAKKyNpZiBFTkFCTEUoVklERU9fVFJB Q0spCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKQorewor ICAgIGlmICghaGFzTWVkaWFDb250cm9scygpICYmICFjcmVhdGVNZWRpYUNvbnRyb2xzKCkpCisg ICAgICAgIHJldHVybjsKKyAgICAKKyAgICBtZWRpYUNvbnRyb2xzKCktPnVwZGF0ZVRleHRUcmFj a0Rpc3BsYXkoKTsKK30KKyNlbmRpZgorCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldENsb3Nl ZENhcHRpb25zVmlzaWJsZShib29sIGNsb3NlZENhcHRpb25WaXNpYmxlKQogewogICAgIExPRyhN ZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnNldENsb3NlZENhcHRpb25zVmlzaWJsZSglcykiLCBi b29sU3RyaW5nKGNsb3NlZENhcHRpb25WaXNpYmxlKSk7CkBAIC00MTY0LDcgKzQxNzUsOCBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldENsb3NlZENhcHRpb25zCiAgICAgICAgIG1fZGlzYWJs ZUNhcHRpb25zID0gIW1fY2xvc2VkQ2FwdGlvbnNWaXNpYmxlOwogCiAgICAgICAgIG1hcmtDYXB0 aW9uQW5kU3VidGl0bGVUcmFja3NBc1VuY29uZmlndXJlZCgpOwotICAgICAgICBtZWRpYUNvbnRy b2xzKCktPnVwZGF0ZVRleHRUcmFja0Rpc3BsYXkoKTsKKworICAgICAgICB1cGRhdGVUZXh0VHJh Y2tEaXNwbGF5KCk7CiAgICAgfQogI2Vsc2UKICAgICBpZiAoaGFzTWVkaWFDb250cm9scygpKQpA QCAtNDI4NSwyMSArNDI5NywyNCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlh Q29udHJvCiAgICAgaWYgKGhhc01lZGlhQ29udHJvbHMoKSkKICAgICAgICAgcmV0dXJuIHRydWU7 CiAKLSAgICBFeGNlcHRpb25Db2RlIGVjOwotICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xzPiBjb250 cm9scyA9IE1lZGlhQ29udHJvbHM6OmNyZWF0ZShkb2N1bWVudCgpKTsKLSAgICBpZiAoIWNvbnRy b2xzKQorICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xzPiBtZWRpYUNvbnRyb2xzID0gTWVkaWFDb250 cm9sczo6Y3JlYXRlKGRvY3VtZW50KCkpOworICAgIGlmICghbWVkaWFDb250cm9scykKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0gICAgY29udHJvbHMtPnNldE1lZGlhQ29udHJvbGxlcihtX21l ZGlhQ29udHJvbGxlciA/IG1fbWVkaWFDb250cm9sbGVyLmdldCgpIDogc3RhdGljX2Nhc3Q8TWVk aWFDb250cm9sbGVySW50ZXJmYWNlKj4odGhpcykpOwotICAgIGNvbnRyb2xzLT5yZXNldCgpOwor ICAgIG1lZGlhQ29udHJvbHMtPnNldE1lZGlhQ29udHJvbGxlcihtX21lZGlhQ29udHJvbGxlciA/ IG1fbWVkaWFDb250cm9sbGVyLmdldCgpIDogc3RhdGljX2Nhc3Q8TWVkaWFDb250cm9sbGVySW50 ZXJmYWNlKj4odGhpcykpOworICAgIG1lZGlhQ29udHJvbHMtPnJlc2V0KCk7CiAgICAgaWYgKGlz RnVsbHNjcmVlbigpKQotICAgICAgICBjb250cm9scy0+ZW50ZXJlZEZ1bGxzY3JlZW4oKTsKKyAg ICAgICAgbWVkaWFDb250cm9scy0+ZW50ZXJlZEZ1bGxzY3JlZW4oKTsKIAogICAgIGlmICghc2hh ZG93KCkpCiAgICAgICAgIGNyZWF0ZVNoYWRvd1N1YnRyZWUoKTsKIAogICAgIEFTU0VSVCh1c2Vy QWdlbnRTaGFkb3dSb290KCkpOwotICAgIHVzZXJBZ2VudFNoYWRvd1Jvb3QoKS0+YXBwZW5kQ2hp bGQoY29udHJvbHMsIGVjKTsKKyAgICB1c2VyQWdlbnRTaGFkb3dSb290KCktPmFwcGVuZENoaWxk KG1lZGlhQ29udHJvbHMsIEFTU0VSVF9OT19FWENFUFRJT04pOworCisgICAgaWYgKCFjb250cm9s cygpIHx8ICFpbkRvY3VtZW50KCkpCisgICAgICAgIG1lZGlhQ29udHJvbHMtPmhpZGUoKTsKKwog ICAgIHJldHVybiB0cnVlOwogfQogCkBAIC00MzQ4LDE3ICs0MzYzLDEwIEBAIHZvaWQgSFRNTE1l ZGlhRWxlbWVudDo6Y29uZmlndXJlVGV4dFRyYWMKICAgICBpZiAoIWhhc01lZGlhQ29udHJvbHMo KSAmJiAhY3JlYXRlTWVkaWFDb250cm9scygpKQogICAgICAgICByZXR1cm47CiAKLSAgICB1cGRh dGVDbG9zZWRDYXB0aW9uc0NvbnRyb2xzKCk7Ci19Ci0KLXZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 dXBkYXRlQ2xvc2VkQ2FwdGlvbnNDb250cm9scygpCi17Ci0gICAgaWYgKGhhc01lZGlhQ29udHJv bHMoKSkgewotICAgICAgICBtZWRpYUNvbnRyb2xzKCktPmNoYW5nZWRDbG9zZWRDYXB0aW9uc1Zp c2liaWxpdHkoKTsKLQotICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6d2Via2l0 VmlkZW9UcmFja0VuYWJsZWQoKSkKLSAgICAgICAgICAgIG1lZGlhQ29udHJvbHMoKS0+dXBkYXRl VGV4dFRyYWNrRGlzcGxheSgpOwotICAgIH0KKyAgICBtZWRpYUNvbnRyb2xzKCktPmNoYW5nZWRD bG9zZWRDYXB0aW9uc1Zpc2liaWxpdHkoKTsKKyAgICAKKyAgICBpZiAoUnVudGltZUVuYWJsZWRG ZWF0dXJlczo6d2Via2l0VmlkZW9UcmFja0VuYWJsZWQoKSkKKyAgICAgICAgdXBkYXRlVGV4dFRy YWNrRGlzcGxheSgpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNhcHRpb25QcmVmZXJl bmNlc0NoYW5nZWQoKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJ KHJldmlzaW9uIDE0MDg1MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTgsNyArMjU4LDcgQEAgcHVibGljOgogICAgIGJvb2wg dXNlcklzSW50ZXJlc3RlZEluVGhpc1RyYWNrS2luZChTdHJpbmcpIGNvbnN0OwogICAgIGJvb2wg dGV4dFRyYWNrc0FyZVJlYWR5KCkgY29uc3Q7CiAgICAgdm9pZCBjb25maWd1cmVUZXh0VHJhY2tE aXNwbGF5KCk7Ci0gICAgdm9pZCB1cGRhdGVDbG9zZWRDYXB0aW9uc0NvbnRyb2xzKCk7CisgICAg dm9pZCB1cGRhdGVUZXh0VHJhY2tEaXNwbGF5KCk7CiAKICAgICAvLyBUZXh0VHJhY2tDbGllbnQK ICAgICB2aXJ0dWFsIHZvaWQgdGV4dFRyYWNrUmVhZHlTdGF0ZUNoYW5nZWQoVGV4dFRyYWNrKik7 CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCShyZXZpc2lvbiAxNDA4NDgpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMS0yNSAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGRpbmcgYSB0ZXh0IHRyYWNrIHNo b3VsZCBub3QgbWFrZSBjb250cm9scyB2aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc5NTYKKworICAgICAgICBSZXZpZXdlZCBieSAgRGVh biBKYWNrc29uLgorCisgICAgICAgICogbWVkaWEvbWVkaWEtY2FwdGlvbnMtbm8tY29udHJvbHMt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1j b250cm9scy5odG1sOiBBZGRlZC4KKwogMjAxMy0wMS0yNSAgQWJoaXNoZWsgQXJ5YSAgPGluZmVy bm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjEzOTgzNik6IENyYXNoIGlu IFdURjo6ZXF1YWxJZ25vcmluZ0Nhc2UKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL21lZGlhLWNh cHRpb25zLW5vLWNvbnRyb2xzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250cm9scy1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjQgQEAKK1Rlc3RzIHRoYXQgYWRkaW5n IGEgdGV4dCB0cmFjayBkb2VzIG5vdCBtYWtlIGNvbnRyb2xzIHZpc2libGUuCisKK0VWRU5UKGNh bnBsYXl0aHJvdWdoKQorCisqKiBJbml0aWFsIHN0YXRlOiBubyB0ZXh0IHRyYWNrcywgY29udHJv bHMgc2hvdWxkIG5vdCBiZSB2aXNpYmxlICoqCitFWFBFQ1RFRCAodmlkZW8udGV4dFRyYWNrcy5s ZW5ndGggPT0gJzAnKSBPSworRVhQRUNURUQgKHZpZGVvLmNvbnRyb2xzID09ICdmYWxzZScpIE9L CitFWFBFQ1RFRCAoaW50ZXJuYWxzLnNoYWRvd1Jvb3QodmlkZW8pID09ICdudWxsJykgT0sKKwor KiogQWRkIGEgdGV4dCB0cmFjaywgY29udHJvbHMgc2hvdWxkIG5vdCBiZWNvbWUgdmlzaWJsZSAq KgorUlVOKHZpZGVvLmFkZFRleHRUcmFjaygnY2FwdGlvbnMnKSkKK0VYUEVDVEVEICh2aWRlby50 ZXh0VHJhY2tzLmxlbmd0aCA9PSAnMScpIE9LCitFWFBFQ1RFRCAodmlkZW8uY29udHJvbHMgPT0g J2ZhbHNlJykgT0sKK0VYUEVDVEVEIChpbnRlcm5hbHMuc2hhZG93Um9vdCh2aWRlbykgPT0gJ251 bGwnKSBPSworCisqKiBFbmFibGUgY29udHJvbHMgKioKK1JVTih2aWRlby5zZXRBdHRyaWJ1dGUo J2NvbnRyb2xzJywnY29udHJvbHMnKSkKK0VYUEVDVEVEICh2aWRlby50ZXh0VHJhY2tzLmxlbmd0 aCA9PSAnMScpIE9LCitFWFBFQ1RFRCAodmlkZW8uY29udHJvbHMgPT0gJ3RydWUnKSBPSworRVhQ RUNURUQgKGludGVybmFscy5zaGFkb3dSb290KHZpZGVvKSAhPSAnbnVsbCcpIE9LCitFWFBFQ1RF RCAoY29udHJvbHNFbGVtZW50LnN0eWxlWydkaXNwbGF5J10gIT0gJ25vbmUnKSBPSworCitFTkQg T0YgVEVTVAorCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1jYXB0aW9ucy1uby1jb250 cm9scy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL21lZGlhLWNhcHRpb25z LW5vLWNvbnRyb2xzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9tZWRpYS9tZWRp YS1jYXB0aW9ucy1uby1jb250cm9scy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUxIEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBodHRw LWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCIg Lz4KKworICAgICAgICA8c2NyaXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgICAg ICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNy Yz1tZWRpYS1jb250cm9scy5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKworICAgICAg ICAgICAgZnVuY3Rpb24gY2FucGxheXRocm91Z2goKQorICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioqIEluaXRpYWwgc3RhdGU6IG5vIHRleHQgdHJhY2tz LCBjb250cm9scyBzaG91bGQgbm90IGJlIHZpc2libGUgKioiKTsKKyAgICAgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRUcmFja3MubGVuZ3RoIiwgMCk7CisgICAgICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jb250cm9scyIsIGZhbHNlLCAnPT0nKTsKKyAgICAgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoImludGVybmFscy5zaGFkb3dSb290KHZpZGVvKSIsIG51bGwp OworCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+KiogQWRkIGEgdGV4dCB0cmFj aywgY29udHJvbHMgc2hvdWxkIG5vdCBiZWNvbWUgdmlzaWJsZSAqKiIpOworICAgICAgICAgICAg ICAgIHJ1bigidmlkZW8uYWRkVGV4dFRyYWNrKCdjYXB0aW9ucycpIik7CisgICAgICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ2aWRlby50ZXh0VHJhY2tzLmxlbmd0aCIsIDEpOworICAgICAgICAg ICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY29udHJvbHMiLCBmYWxzZSk7CisgICAgICAgICAg ICAgICAgdGVzdEV4cGVjdGVkKCJpbnRlcm5hbHMuc2hhZG93Um9vdCh2aWRlbykiLCBudWxsKTsK KworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiPGJyPioqIEVuYWJsZSBjb250cm9scyAq KiIpOworICAgICAgICAgICAgICAgIHJ1bigidmlkZW8uc2V0QXR0cmlidXRlKCdjb250cm9scycs J2NvbnRyb2xzJykiKTsKKyAgICAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLnRleHRU cmFja3MubGVuZ3RoIiwgMSk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5j b250cm9scyIsIHRydWUpOworICAgICAgICAgICAgICAgIGNvbnRyb2xzRWxlbWVudCA9IG1lZGlh Q29udHJvbHNFbGVtZW50KGludGVybmFscy5zaGFkb3dSb290KHZpZGVvKS5maXJzdENoaWxkLCAi LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCIpOworICAgICAgICAgICAgICAgIHRlc3RFeHBl Y3RlZCgiaW50ZXJuYWxzLnNoYWRvd1Jvb3QodmlkZW8pIiwgbnVsbCwgIiE9Iik7CisgICAgICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJjb250cm9sc0VsZW1lbnQuc3R5bGVbJ2Rpc3BsYXknXSIs ICdub25lJywgIiE9Iik7CisKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAg ICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVu Y3Rpb24gc3RhcnQoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGZpbmRNZWRpYUVs ZW1lbnQoKTsKKworICAgICAgICAgICAgICAgIHdhaXRGb3JFdmVudCgnY2FucGxheXRocm91Z2gn LCBjYW5wbGF5dGhyb3VnaCk7CisgICAgICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlh RmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0Iik7CisgICAgICAgICAgICB9CisKKyAgICAgICAg PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAg ICAgIDx2aWRlbz4KKyAgICAgICAgPC92aWRlbz4KKyAgICAgICAgPHA+VGVzdHMgdGhhdCBhZGRp bmcgYSB0ZXh0IHRyYWNrIGRvZXMgbm90IG1ha2UgY29udHJvbHMgdmlzaWJsZS48L3A+CisgICAg PC9ib2R5PgorPC9odG1sPgo=