110716 2013-02-24 12:53:59 -0800 [Mac] cleanup MediaPlayerPrivateAVFoundation and InbandTextTrackPrivateAVF 2013-02-24 20:00:59 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson buildbot feature-media-reviews jer.noble rniwa webkit-bug-importer webkit.review.bot oldest_to_newest 840643 0 eric.carlson 2013-02-24 12:53:59 -0800 Minor cleanup of the MediaPlayerPrivateAVFoundation and InbandTextTrackPrivateAVF classes 840644 1 webkit-bug-importer 2013-02-24 12:54:31 -0800 <rdar://problem/13281692> 840646 2 189987 eric.carlson 2013-02-24 13:11:28 -0800 Created attachment 189987 Proposed patch 840650 3 189987 buildbot 2013-02-24 13:37:41 -0800 Comment on attachment 189987 Proposed patch Attachment 189987 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16730681 840652 4 189987 buildbot 2013-02-24 14:01:15 -0800 Comment on attachment 189987 Proposed patch Attachment 189987 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/16735666 840657 5 189988 eric.carlson 2013-02-24 14:41:55 -0800 Created attachment 189988 Updated patch. 840664 6 189988 ap 2013-02-24 16:13:58 -0800 Comment on attachment 189988 Updated patch. View in context: https://bugs.webkit.org/attachment.cgi?id=189988&action=review > Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:40 > + virtual ~AVFInbandTrackParent() { } Since there is already a matching .cpp file, it's better to to have the implementation there. Inlining destructors and constructors of polymorphic classes significantly and unnecessarily increases code bloat. 840689 7 eric.carlson 2013-02-24 20:00:23 -0800 Committed http://trac.webkit.org/changeset/143884. 189987 2013-02-24 13:11:28 -0800 2013-02-24 14:41:55 -0800 Proposed patch patch_2.txt text/plain 8133 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Mzg3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTI0ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIGNsZWFudXAg TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uIGFuZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTA3 MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkYpOiBUYWtlIEFWRkluYmFuZFRyYWNrUGFyZW50KgorICAgICAgICAgICAgaW5z dGVhZCBvZiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24qLgorICAgICAgICAoV2ViQ29y ZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZSk6IFBhc3MgbmV3IGN1ZXMg ZGlyZWN0bHkgdG8gdGhlIGNsaWVudC4KKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkY6OmRpc2Nvbm5lY3QpOiBtX3BsYXllciAtPiBtX293bmVyLgorICAgICAgICAo V2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6c2V0TW9kZSk6ICBtX3BsYXllciAt PiBtX293bmVyLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJh bmRUZXh0VHJhY2tQcml2YXRlQVZGLmg6CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6YWRkR2VuZXJpY0N1ZSk6 IERlbGV0ZSwgbm8gbG9uZ2VyIG5lZWRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmg6CisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLmg6IERvbid0IGluY2x1ZGUgCisgICAgICAgICAgICBDYWNoZWRSZXNv dXJjZUNsaWVudC5oLCBpdCBpc24ndCBuZWVkZWQuCisKIDIwMTMtMDItMjQgIFphbiBEb2JlcnNl ayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVwZGF0aW5nIEdPYmplY3QgYmlu ZGluZ3MgYmFzZWxpbmVzIGFmdGVyIHIxNDM4NjMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkYuY3BwCShyZXZpc2lvbiAxNDM4NTEpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRy YWNrUHJpdmF0ZUFWRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDkgKzMxLDkgQEAKIAogI2lu Y2x1ZGUgIkluYmFuZFRleHRUcmFja1ByaXZhdGVDbGllbnQuaCIKICNpbmNsdWRlICJMb2dnaW5n LmgiCi0jaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgiCiAjaW5jbHVk ZSAiU29mdExpbmtpbmcuaCIKICNpbmNsdWRlIDxDb3JlTWVkaWEvQ29yZU1lZGlhLmg+CisjaW5j bHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5n Lmg+CkBAIC04Myw4ICs4Myw4IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6SW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRihNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24qIHBsYXllcikKLSAgICA6IG1f cGxheWVyKHBsYXllcikKK0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkYoQVZGSW5iYW5kVHJhY2tQYXJlbnQqIG93bmVyKQorICAgIDogbV9vd25lcihv d25lcikKICAgICAsIG1faW5kZXgoMCkKICAgICAsIG1faGF2ZVBhcnRpYWxDdWUoZmFsc2UpCiAg ICAgLCBtX2hhc0JlZW5SZXBvcnRlZChmYWxzZSkKQEAgLTMyNiw3ICszMjYsNyBAQCB2b2lkIElu YmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDCiAKIHZvaWQgSW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZShDRkFycmF5UmVmIGF0dHJpYnV0ZWRTdHJpbmdzLCBkb3Vi bGUgdGltZSkKIHsKLSAgICBpZiAoIW1fcGxheWVyKQorICAgIGlmICghY2xpZW50KCkpCiAgICAg ICAgIHJldHVybjsKICAgICAKICAgICBpZiAobV9oYXZlUGFydGlhbEN1ZSkgewpAQCAtMzUyLDcg KzM1Miw4IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0MKICAgICAg ICAgICAgICAgICBpZiAoY3VlRGF0YS0+cG9zaXRpb24oKSA+PSAwICYmIGN1ZURhdGEtPnNpemUo KSA+IDApCiAgICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNldFBvc2l0aW9uKGN1ZURhdGEt PnBvc2l0aW9uKCkgLSBjdWVEYXRhLT5zaXplKCkgLyAyKTsKICAgICAgICAgICAgICAgICAKLSAg ICAgICAgICAgICAgICBtX3BsYXllci0+YWRkR2VuZXJpY0N1ZSh0aGlzLCBjdWVEYXRhKTsKKyAg ICAgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9j ZXNzQ3VlKCVwKSAtIGFkZGluZyBjdWUgZm9yIHRpbWUgJS4yZiIsIHRoaXMsIGN1ZURhdGEtPnN0 YXJ0VGltZSgpKTsKKyAgICAgICAgICAgICAgICBjbGllbnQoKS0+YWRkR2VuZXJpY0N1ZSh0aGlz LCBjdWVEYXRhKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBM T0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlIG5lZ2F0aXZl IGxlbmd0aCBjdWUocykgaWdub3JlZDogc3RhcnQ9JS4yZiwgZW5kPSUuMmZcbiIsIG1fY3VycmVu dEN1ZVN0YXJ0VGltZSwgbV9jdXJyZW50Q3VlRW5kVGltZSk7CkBAIC0zNzksNyArMzgwLDcgQEAg dm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQwogCiB2b2lkIEluYmFuZFRl eHRUcmFja1ByaXZhdGVBVkY6OmRpc2Nvbm5lY3QoKQogewotICAgIG1fcGxheWVyID0gMDsKKyAg ICBtX293bmVyID0gMDsKICAgICBtX2luZGV4ID0gMDsKIH0KIApAQCAtMzk2LDcgKzM5Nyw3IEBA IHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVzZXRDdWUKIAogdm9pZCBJbmJhbmRU ZXh0VHJhY2tQcml2YXRlQVZGOjpzZXRNb2RlKEluYmFuZFRleHRUcmFja1ByaXZhdGU6Ok1vZGUg bmV3TW9kZSkKIHsKLSAgICBpZiAoIW1fcGxheWVyKQorICAgIGlmICghbV9vd25lcikKICAgICAg ICAgcmV0dXJuOwogCiAgICAgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZTo6TW9kZSBvbGRNb2RlID0g bW9kZSgpOwpAQCAtNDA1LDcgKzQwNiw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Rjo6c2V0TW9kZSgKICAgICBpZiAob2xkTW9kZSA9PSBuZXdNb2RlKQogICAgICAgICByZXR1cm47 CiAKLSAgICBtX3BsYXllci0+dHJhY2tNb2RlQ2hhbmdlZCgpOworICAgIG1fb3duZXItPnRyYWNr TW9kZUNoYW5nZWQoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1By aXZhdGVBVkYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCShyZXZpc2lvbiAxNDM4 NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSwxNCArMjksMTkg QEAKICNpZiBFTkFCTEUoVklERU8pICYmIFVTRShBVkZPVU5EQVRJT04pICYmIEhBVkUoQVZGT1VO REFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKIAogI2luY2x1ZGUgIkluYmFuZFRleHRUcmFja1By aXZhdGUuaCIKLSNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nQnVpbGRlci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbjsKIGNsYXNzIEdlbmVyaWNDdWVEYXRhOwogCitjbGFzcyBB VkZJbmJhbmRUcmFja1BhcmVudCB7CitwdWJsaWM6CisgICAgdmlydHVhbCB+QVZGSW5iYW5kVHJh Y2tQYXJlbnQoKSB7IH0KKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgdHJhY2tNb2RlQ2hhbmdlZCgp ID0gMDsKK307CisKIGNsYXNzIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYgOiBwdWJsaWMgSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZSB7CiBwdWJsaWM6CiAKQEAgLTU2LDcgKzYxLDcgQEAgcHVibGlj OgogICAgIHZvaWQgcmVzZXRDdWVWYWx1ZXMoKTsKIAogcHJvdGVjdGVkOgotICAgIEluYmFuZFRl eHRUcmFja1ByaXZhdGVBVkYoTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uKik7CisgICAg SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRihBVkZJbmJhbmRUcmFja1BhcmVudCopOwogCiAgICAg dm9pZCBwcm9jZXNzQ3VlQXR0cmlidXRlcyhDRkF0dHJpYnV0ZWRTdHJpbmdSZWYsIEdlbmVyaWND dWVEYXRhKik7CiAKQEAgLTY1LDcgKzcwLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgVmVjdG9yPE93 blB0cjxHZW5lcmljQ3VlRGF0YT4gPiBtX2N1ZXM7CiAKLSAgICBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb24qIG1fcGxheWVyOworICAgIEFWRkluYmFuZFRyYWNrUGFyZW50KiBtX293bmVy OwogICAgIGludCBtX2luZGV4OwogICAgIGJvb2wgbV9oYXZlUGFydGlhbEN1ZTsKICAgICBib29s IG1faGFzQmVlblJlcG9ydGVkOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAJKHJldmlzaW9uIDE0Mzg1MSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MjksMTUgKzgyOSw2IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpkaXMKIH0KIAogI2lmIEhBVkUo QVZGT1VOREFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uOjphZGRHZW5lcmljQ3VlKEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYqIHRy YWNrLCBHZW5lcmljQ3VlRGF0YSogY3VlRGF0YSkKLXsKLSAgICBpZiAoIXRyYWNrLT5jbGllbnQo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uOjphZGRHZW5lcmljQ3VlKCVwKSAtIGFkZGluZyBjdWUgZm9yIHRpbWUgJS4y ZiIsIHRoaXMsIGN1ZURhdGEtPnN0YXJ0VGltZSgpKTsKLSAgICB0cmFjay0+Y2xpZW50KCktPmFk ZEdlbmVyaWNDdWUodHJhY2ssIGN1ZURhdGEpOwotfQotCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbjo6Y29uZmlndXJlSW5iYW5kVHJhY2tzKCkKIHsKICAgICBSZWZQdHI8SW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRj4gdHJhY2tUb0VuYWJsZTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgJKHJldmlzaW9u IDE0Mzg1MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMjks NiArMjksNyBAQAogI2lmIEVOQUJMRShWSURFTykgJiYgVVNFKEFWRk9VTkRBVElPTikKIAogI2lu Y2x1ZGUgIkZsb2F0U2l6ZS5oIgorI2luY2x1ZGUgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYu aCIKICNpbmNsdWRlICJNZWRpYVBsYXllclByaXZhdGUuaCIKICNpbmNsdWRlICJUaW1lci5oIgog I2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTM4LDcgKzM5LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogY2xhc3MgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjsKIGNsYXNzIEdlbmVyaWND dWVEYXRhOwogCi1jbGFzcyBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24gOiBwdWJsaWMg TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIHsKK2NsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbiA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UsIHB1YmxpYyBB VkZJbmJhbmRUcmFja1BhcmVudCB7CiBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgcmVwYWlu dCgpOwpAQCAtMTI0LDggKzEyNSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyTWFpblRocmVh ZFBlbmRpbmdGbGFnKCk7CiAKICNpZiBIQVZFKEFWRk9VTkRBVElPTl9URVhUX1RSQUNLX1NVUFBP UlQpCi0gICAgdm9pZCBhZGRHZW5lcmljQ3VlKEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYqLCBH ZW5lcmljQ3VlRGF0YSopOwotICAgIHZvaWQgdHJhY2tNb2RlQ2hhbmdlZCgpOworICAgIHZpcnR1 YWwgdm9pZCB0cmFja01vZGVDaGFuZ2VkKCkgT1ZFUlJJREU7CiAjZW5kaWYKIAogcHJvdGVjdGVk OgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAkocmV2aXNpb24gMTQzODUxKQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw2IEBA CiAKICNpZiBFTkFCTEUoVklERU8pICYmIFVTRShBVkZPVU5EQVRJT04pCiAKLSNpbmNsdWRlICJD YWNoZWRSZXNvdXJjZUNsaWVudC5oIgogI2luY2x1ZGUgIk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbi5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAK 189988 2013-02-24 14:41:55 -0800 2013-02-24 20:00:59 -0800 Updated patch. patch_3.txt text/plain 8551 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0Mzg3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTI0ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIGNsZWFudXAg TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uIGFuZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTA3 MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkYpOiBUYWtlIEFWRkluYmFuZFRyYWNrUGFyZW50KgorICAgICAgICAgICAgaW5z dGVhZCBvZiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24qLgorICAgICAgICAoV2ViQ29y ZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZSk6IFBhc3MgbmV3IGN1ZXMg ZGlyZWN0bHkgdG8gdGhlIGNsaWVudC4KKyAgICAgICAgKFdlYkNvcmU6OkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkY6OmRpc2Nvbm5lY3QpOiBtX3BsYXllciAtPiBtX293bmVyLgorICAgICAgICAo V2ViQ29yZTo6SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6c2V0TW9kZSk6ICBtX3BsYXllciAt PiBtX293bmVyLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9JbmJh bmRUZXh0VHJhY2tQcml2YXRlQVZGLmg6CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6YWRkR2VuZXJpY0N1ZSk6 IERlbGV0ZSwgbm8gbG9uZ2VyIG5lZWRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmg6CisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLmg6IERvbid0IGluY2x1ZGUgCisgICAgICAgICAgICBDYWNoZWRSZXNv dXJjZUNsaWVudC5oLCBpdCBpc24ndCBuZWVkZWQuCisKIDIwMTMtMDItMjQgIFphbiBEb2JlcnNl ayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVwZGF0aW5nIEdPYmplY3QgYmlu ZGluZ3MgYmFzZWxpbmVzIGFmdGVyIHIxNDM4NjMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkYuY3BwCShyZXZpc2lvbiAxNDM4NTEpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRy YWNrUHJpdmF0ZUFWRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDkgKzMxLDkgQEAKIAogI2lu Y2x1ZGUgIkluYmFuZFRleHRUcmFja1ByaXZhdGVDbGllbnQuaCIKICNpbmNsdWRlICJMb2dnaW5n LmgiCi0jaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgiCiAjaW5jbHVk ZSAiU29mdExpbmtpbmcuaCIKICNpbmNsdWRlIDxDb3JlTWVkaWEvQ29yZU1lZGlhLmg+CisjaW5j bHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5n Lmg+CkBAIC04Myw4ICs4Myw4IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6SW5iYW5kVGV4dFRyYWNrUHJp dmF0ZUFWRihNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24qIHBsYXllcikKLSAgICA6IG1f cGxheWVyKHBsYXllcikKK0luYmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OkluYmFuZFRleHRUcmFj a1ByaXZhdGVBVkYoQVZGSW5iYW5kVHJhY2tQYXJlbnQqIG93bmVyKQorICAgIDogbV9vd25lcihv d25lcikKICAgICAsIG1faW5kZXgoMCkKICAgICAsIG1faGF2ZVBhcnRpYWxDdWUoZmFsc2UpCiAg ICAgLCBtX2hhc0JlZW5SZXBvcnRlZChmYWxzZSkKQEAgLTMyNiw3ICszMjYsNyBAQCB2b2lkIElu YmFuZFRleHRUcmFja1ByaXZhdGVBVkY6OnByb2Nlc3NDCiAKIHZvaWQgSW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUFWRjo6cHJvY2Vzc0N1ZShDRkFycmF5UmVmIGF0dHJpYnV0ZWRTdHJpbmdzLCBkb3Vi bGUgdGltZSkKIHsKLSAgICBpZiAoIW1fcGxheWVyKQorICAgIGlmICghY2xpZW50KCkpCiAgICAg ICAgIHJldHVybjsKICAgICAKICAgICBpZiAobV9oYXZlUGFydGlhbEN1ZSkgewpAQCAtMzUyLDcg KzM1Miw4IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cHJvY2Vzc0MKICAgICAg ICAgICAgICAgICBpZiAoY3VlRGF0YS0+cG9zaXRpb24oKSA+PSAwICYmIGN1ZURhdGEtPnNpemUo KSA+IDApCiAgICAgICAgICAgICAgICAgICAgIGN1ZURhdGEtPnNldFBvc2l0aW9uKGN1ZURhdGEt PnBvc2l0aW9uKCkgLSBjdWVEYXRhLT5zaXplKCkgLyAyKTsKICAgICAgICAgICAgICAgICAKLSAg ICAgICAgICAgICAgICBtX3BsYXllci0+YWRkR2VuZXJpY0N1ZSh0aGlzLCBjdWVEYXRhKTsKKyAg ICAgICAgICAgICAgICBMT0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9j ZXNzQ3VlKCVwKSAtIGFkZGluZyBjdWUgZm9yIHRpbWUgJS4yZiIsIHRoaXMsIGN1ZURhdGEtPnN0 YXJ0VGltZSgpKTsKKyAgICAgICAgICAgICAgICBjbGllbnQoKS0+YWRkR2VuZXJpY0N1ZSh0aGlz LCBjdWVEYXRhKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBM T0coTWVkaWEsICJJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQ3VlIG5lZ2F0aXZl IGxlbmd0aCBjdWUocykgaWdub3JlZDogc3RhcnQ9JS4yZiwgZW5kPSUuMmZcbiIsIG1fY3VycmVu dEN1ZVN0YXJ0VGltZSwgbV9jdXJyZW50Q3VlRW5kVGltZSk7CkBAIC0zNzksNyArMzgwLDcgQEAg dm9pZCBJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGOjpwcm9jZXNzQwogCiB2b2lkIEluYmFuZFRl eHRUcmFja1ByaXZhdGVBVkY6OmRpc2Nvbm5lY3QoKQogewotICAgIG1fcGxheWVyID0gMDsKKyAg ICBtX293bmVyID0gMDsKICAgICBtX2luZGV4ID0gMDsKIH0KIApAQCAtMzk2LDcgKzM5Nyw3IEBA IHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRjo6cmVzZXRDdWUKIAogdm9pZCBJbmJhbmRU ZXh0VHJhY2tQcml2YXRlQVZGOjpzZXRNb2RlKEluYmFuZFRleHRUcmFja1ByaXZhdGU6Ok1vZGUg bmV3TW9kZSkKIHsKLSAgICBpZiAoIW1fcGxheWVyKQorICAgIGlmICghbV9vd25lcikKICAgICAg ICAgcmV0dXJuOwogCiAgICAgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZTo6TW9kZSBvbGRNb2RlID0g bW9kZSgpOwpAQCAtNDA1LDcgKzQwNiw3IEBAIHZvaWQgSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Rjo6c2V0TW9kZSgKICAgICBpZiAob2xkTW9kZSA9PSBuZXdNb2RlKQogICAgICAgICByZXR1cm47 CiAKLSAgICBtX3BsYXllci0+dHJhY2tNb2RlQ2hhbmdlZCgpOworICAgIG1fb3duZXItPnRyYWNr TW9kZUNoYW5nZWQoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0luYmFuZFRleHRUcmFja1By aXZhdGVBVkYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCShyZXZpc2lvbiAxNDM4 NTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSwxNCArMjksMTkg QEAKICNpZiBFTkFCTEUoVklERU8pICYmIFVTRShBVkZPVU5EQVRJT04pICYmIEhBVkUoQVZGT1VO REFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKIAogI2luY2x1ZGUgIkluYmFuZFRleHRUcmFja1By aXZhdGUuaCIKLSNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv U3RyaW5nQnVpbGRlci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbjsKIGNsYXNzIEdlbmVyaWNDdWVEYXRhOwogCitjbGFzcyBB VkZJbmJhbmRUcmFja1BhcmVudCB7CitwdWJsaWM6CisgICAgdmlydHVhbCB+QVZGSW5iYW5kVHJh Y2tQYXJlbnQoKSB7IH0KKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgdHJhY2tNb2RlQ2hhbmdlZCgp ID0gMDsKK307CisKIGNsYXNzIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYgOiBwdWJsaWMgSW5i YW5kVGV4dFRyYWNrUHJpdmF0ZSB7CiBwdWJsaWM6CiAKQEAgLTU2LDcgKzYxLDcgQEAgcHVibGlj OgogICAgIHZvaWQgcmVzZXRDdWVWYWx1ZXMoKTsKIAogcHJvdGVjdGVkOgotICAgIEluYmFuZFRl eHRUcmFja1ByaXZhdGVBVkYoTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uKik7CisgICAg SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRihBVkZJbmJhbmRUcmFja1BhcmVudCopOwogCiAgICAg dm9pZCBwcm9jZXNzQ3VlQXR0cmlidXRlcyhDRkF0dHJpYnV0ZWRTdHJpbmdSZWYsIEdlbmVyaWND dWVEYXRhKik7CiAKQEAgLTY1LDcgKzcwLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgVmVjdG9yPE93 blB0cjxHZW5lcmljQ3VlRGF0YT4gPiBtX2N1ZXM7CiAKLSAgICBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb24qIG1fcGxheWVyOworICAgIEFWRkluYmFuZFRyYWNrUGFyZW50KiBtX293bmVy OwogICAgIGludCBtX2luZGV4OwogICAgIGJvb2wgbV9oYXZlUGFydGlhbEN1ZTsKICAgICBib29s IG1faGFzQmVlblJlcG9ydGVkOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAJKHJldmlzaW9uIDE0Mzg1MSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MjksMTUgKzgyOSw2IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjpkaXMKIH0KIAogI2lmIEhBVkUo QVZGT1VOREFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uOjphZGRHZW5lcmljQ3VlKEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYqIHRy YWNrLCBHZW5lcmljQ3VlRGF0YSogY3VlRGF0YSkKLXsKLSAgICBpZiAoIXRyYWNrLT5jbGllbnQo KSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uOjphZGRHZW5lcmljQ3VlKCVwKSAtIGFkZGluZyBjdWUgZm9yIHRpbWUgJS4y ZiIsIHRoaXMsIGN1ZURhdGEtPnN0YXJ0VGltZSgpKTsKLSAgICB0cmFjay0+Y2xpZW50KCktPmFk ZEdlbmVyaWNDdWUodHJhY2ssIGN1ZURhdGEpOwotfQotCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbjo6Y29uZmlndXJlSW5iYW5kVHJhY2tzKCkKIHsKICAgICBSZWZQdHI8SW5i YW5kVGV4dFRyYWNrUHJpdmF0ZUFWRj4gdHJhY2tUb0VuYWJsZTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgJKHJldmlzaW9u IDE0Mzg1MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMjks NiArMjksNyBAQAogI2lmIEVOQUJMRShWSURFTykgJiYgVVNFKEFWRk9VTkRBVElPTikKIAogI2lu Y2x1ZGUgIkZsb2F0U2l6ZS5oIgorI2luY2x1ZGUgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYu aCIKICNpbmNsdWRlICJNZWRpYVBsYXllclByaXZhdGUuaCIKICNpbmNsdWRlICJUaW1lci5oIgog I2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTM4LDcgKzM5LDExIEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIGNsYXNzIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY7CiBjbGFzcyBHZW5lcmlj Q3VlRGF0YTsKIAotY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uIDogcHVibGlj IE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSB7CitjbGFzcyBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb24gOiBwdWJsaWMgTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlCisjaWYgSEFW RShBVkZPVU5EQVRJT05fVEVYVF9UUkFDS19TVVBQT1JUKQorICAgICwgcHVibGljIEFWRkluYmFu ZFRyYWNrUGFyZW50CisjZW5kaWYKK3sKIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCByZXBh aW50KCk7CkBAIC0xMjMsMTEgKzEyOCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3BhdGNoTm90 aWZpY2F0aW9uKCk7CiAgICAgdm9pZCBjbGVhck1haW5UaHJlYWRQZW5kaW5nRmxhZygpOwogCi0j aWYgSEFWRShBVkZPVU5EQVRJT05fVEVYVF9UUkFDS19TVVBQT1JUKQotICAgIHZvaWQgYWRkR2Vu ZXJpY0N1ZShJbmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGKiwgR2VuZXJpY0N1ZURhdGEqKTsKLSAg ICB2b2lkIHRyYWNrTW9kZUNoYW5nZWQoKTsKLSNlbmRpZgotCiBwcm90ZWN0ZWQ6CiAgICAgTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uKE1lZGlhUGxheWVyKik7CiAgICAgdmlydHVhbCB+ TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uKCk7CkBAIC0yNjUsNiArMjY1LDcgQEAgcHJv dGVjdGVkOgogICAgIHZpcnR1YWwgU3RyaW5nIGVuZ2luZURlc2NyaXB0aW9uKCkgY29uc3QgeyBy ZXR1cm4gIkFWRm91bmRhdGlvbiI7IH0KIAogI2lmIEhBVkUoQVZGT1VOREFUSU9OX1RFWFRfVFJB Q0tfU1VQUE9SVCkKKyAgICB2aXJ0dWFsIHZvaWQgdHJhY2tNb2RlQ2hhbmdlZCgpIE9WRVJSSURF OwogICAgIFZlY3RvcjxSZWZQdHI8SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRj4gPiBtX3RleHRU cmFja3M7CiAjZW5kaWYKICAgICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgJKHJldmlzaW9u IDE0Mzg1MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAkod29ya2luZyBjb3B5 KQpAQCAtMjgsNyArMjgsNiBAQAogCiAjaWYgRU5BQkxFKFZJREVPKSAmJiBVU0UoQVZGT1VOREFU SU9OKQogCi0jaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VDbGllbnQuaCIKICNpbmNsdWRlICJNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgog Cg==