118801 2013-07-17 10:04:17 -0700 MediaPlayerPrivateAVFoundationCF::processNewAndRemovedTextTracks should be shared by ObjC and CF versions 2013-07-19 10:38:36 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P3 Minor --- 103770 1 bfulgham bfulgham bfulgham commit-queue eric.carlson glenn jer.noble rniwa webkit-bug-importer oldest_to_newest 909357 0 bfulgham 2013-07-17 10:04:17 -0700 The code in MediaPlayerPrivateAVFoundationCF::processNewAndRemovedTextTracks is identical to the code in MediaPlayerPrivateAVFoundationObjC::processNewAndRemovedTextTracks. The implementation should be lifted to the parent class. 909420 1 webkit-bug-importer 2013-07-17 12:36:21 -0700 <rdar://problem/14472043> 909898 2 207029 bfulgham 2013-07-18 16:02:33 -0700 Created attachment 207029 Patch 909899 3 bfulgham 2013-07-18 16:04:12 -0700 It turns out that "clearTracks" was identical as well. 909942 4 207029 commit-queue 2013-07-18 18:07:24 -0700 Comment on attachment 207029 Patch Clearing flags on attachment: 207029 Committed r152876: <http://trac.webkit.org/changeset/152876> 909943 5 commit-queue 2013-07-18 18:07:27 -0700 All reviewed patches have been landed. Closing bug. 909985 6 rniwa 2013-07-18 20:47:03 -0700 This patch caused a build failure on Mountain Lion: /Volumes/Data/slave/mountainlion-debug/build/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:908:115: error: format specifies type 'int' but the argument has type 'size_t' (aka 'unsigned long') [-Werror,-Wformat] LOG(Media, "MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks(%p) - found %i text tracks", this, m_textTracks.size()); ~~ ^~~~~~~~~~~~~~~~~~~ %zi /Volumes/Data/slave/mountainlion-debug/build/WebKitBuild/Debug/usr/local/include/wtf/Assertions.h:344:94: note: expanded from macro 'LOG' #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__) ^ 1 error generated. 910228 7 bfulgham 2013-07-19 10:38:36 -0700 (In reply to comment #6) > This patch caused a build failure on Mountain Lion: > > /Volumes/Data/slave/mountainlion-debug/build/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:908:115: error: format specifies type 'int' but the argument has type 'size_t' (aka 'unsigned long') [-Werror,-Wformat] > LOG(Media, "MediaPlayerPrivateAVFoundation::processNewAndRemovedTextTracks(%p) - found %i text tracks", this, m_textTracks.size()); > ~~ ^~~~~~~~~~~~~~~~~~~ > %zi > /Volumes/Data/slave/mountainlion-debug/build/WebKitBuild/Debug/usr/local/include/wtf/Assertions.h:344:94: note: expanded from macro 'LOG' > #define LOG(channel, ...) WTFLog(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__) > ^ > 1 error generated. Thank you for fixing that! http://trac.webkit.org/changeset/152884 207029 2013-07-18 16:02:33 -0700 2013-07-18 18:07:24 -0700 Patch bug-118801-20130718160224.patch text/plain 9908 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Mjg3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA3LTE4ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYV0gU2hhcmUgbW9y ZSBjb2RlIGJldHdlZW4gTWFjIGFuZCBXaW5kb3dzIGltcGxlbWVudGF0aW9uIGZpbGVzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4ODAxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6Y2xlYXJU ZXh0VHJhY2tzKTogTW92ZQorICAgICAgICBpbXBsZW1lbnRhdGlvbiBmcm9tIE9iakMgZmlsZSB0 byBwYXJlbnQgZmlsZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbjo6cHJvY2Vzc05ld0FuZFJlbW92ZWRUZXh0VHJhY2tzKToKKyAgICAgICAgRGl0dG8u CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbi5oOgorICAgICAgICBSZW1vdmUgZHVwbGljYXRlIGltcGxlbWVudGF0 aW9uLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHA6CisgICAgICAgIERpdHRvLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25DRi5oOgorICAgICAgICBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmg6 CisgICAgICAgIERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIERp dHRvLgorCiAyMDEzLTA3LTE4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxl LmNvbT4KIAogICAgICAgICBGaXhlZCBjb21waWxlIGVycm9ycyBmb3Igbm9uLUNhaXJvIHBsYXRm b3JtcyB1c2luZyBFR0wuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcAkocmV2aXNpb24gMTUyODcwKQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3Myw2ICs4NzMsNDEgQEAgc2l6 ZV90IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6ZQogICAgIHJldHVybiB0b3RhbEJ5 dGVzKCkgKiBidWZmZXJlZCgpLT50b3RhbER1cmF0aW9uKCkgLyBkdXJhdGlvbjsKIH0KIAordm9p ZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmNsZWFyVGV4dFRyYWNrcygpCit7Cisg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fdGV4dFRyYWNrcy5zaXplKCk7ICsraSkgewor ICAgICAgICBSZWZQdHI8SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRj4gdHJhY2sgPSBtX3RleHRU cmFja3NbaV07CisgICAgICAgIHBsYXllcigpLT5yZW1vdmVUZXh0VHJhY2sodHJhY2spOworICAg ICAgICB0cmFjay0+ZGlzY29ubmVjdCgpOworICAgIH0KKyAgICBtX3RleHRUcmFja3MuY2xlYXIo KTsKK30KKwordm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnByb2Nlc3NOZXdB bmRSZW1vdmVkVGV4dFRyYWNrcyhjb25zdCBWZWN0b3I8UmVmUHRyPEluYmFuZFRleHRUcmFja1By aXZhdGVBVkY+ID4mIHJlbW92ZWRUZXh0VHJhY2tzKQoreworICAgIGlmIChyZW1vdmVkVGV4dFRy YWNrcy5zaXplKCkpIHsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fdGV4dFRy YWNrcy5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgaWYgKCFyZW1vdmVkVGV4dFRyYWNrcy5j b250YWlucyhtX3RleHRUcmFja3NbaV0pKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICAgICAgCisgICAgICAgICAgICBwbGF5ZXIoKS0+cmVtb3ZlVGV4dFRyYWNrKHJlbW92ZWRU ZXh0VHJhY2tzW2ldLmdldCgpKTsKKyAgICAgICAgICAgIG1fdGV4dFRyYWNrcy5yZW1vdmUoaSk7 CisgICAgICAgIH0KKyAgICB9CisgICAgCisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1f dGV4dFRyYWNrcy5zaXplKCk7ICsraSkgeworICAgICAgICBSZWZQdHI8SW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUFWRj4gdHJhY2sgPSBtX3RleHRUcmFja3NbaV07CisgICAgICAgIAorICAgICAgICB0 cmFjay0+c2V0VGV4dFRyYWNrSW5kZXgoaSk7CisgICAgICAgIGlmICh0cmFjay0+aGFzQmVlblJl cG9ydGVkKCkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgCisgICAgICAgIHRyYWNr LT5zZXRIYXNCZWVuUmVwb3J0ZWQodHJ1ZSk7CisgICAgICAgIHBsYXllcigpLT5hZGRUZXh0VHJh Y2sodHJhY2suZ2V0KCkpOworICAgIH0KKyAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb246OnByb2Nlc3NOZXdBbmRSZW1vdmVkVGV4dFRyYWNrcyglcCkgLSBmb3Vu ZCAlaSB0ZXh0IHRyYWNrcyIsIHRoaXMsIG1fdGV4dFRyYWNrcy5zaXplKCkpOworfQorCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAkocmV2aXNpb24gMTUyODcwKQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTAsNyArMjUwLDcg QEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBzZXRVcFZpZGVvUmVuZGVyaW5nKCk7CiAg ICAgdmlydHVhbCB2b2lkIHRlYXJEb3duVmlkZW9SZW5kZXJpbmcoKTsKICAgICBib29sIGhhc1Nl dFVwVmlkZW9SZW5kZXJpbmcoKSBjb25zdDsKLSAgICAKKwogICAgIHN0YXRpYyB2b2lkIG1haW5U aHJlYWRDYWxsYmFjayh2b2lkKik7CiAgICAgCiAgICAgdm9pZCBpbnZhbGlkYXRlQ2FjaGVkRHVy YXRpb24oKTsKQEAgLTI2NCw2ICsyNjQsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBzaXpl X3QgZXh0cmFNZW1vcnlDb3N0KCkgY29uc3QgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIHZvaWQg dHJhY2tNb2RlQ2hhbmdlZCgpIE9WRVJSSURFOworICAgIHZvaWQgcHJvY2Vzc05ld0FuZFJlbW92 ZWRUZXh0VHJhY2tzKGNvbnN0IFZlY3RvcjxSZWZQdHI8SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFW Rj4gPiYpOworICAgIHZvaWQgY2xlYXJUZXh0VHJhY2tzKCk7CiAgICAgVmVjdG9yPFJlZlB0cjxJ bmJhbmRUZXh0VHJhY2tQcml2YXRlQVZGPiA+IG1fdGV4dFRyYWNrczsKICAgICAKIHByaXZhdGU6 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2Yv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25DRi5jcHAJKHJldmlzaW9uIDE1Mjg3MCkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25DRi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk0NiwxNiArOTQ2LDYgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6cwogICAgIHNldE5hdHVyYWxTaXpl KEludFNpemUobmF0dXJhbFNpemUpKTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25DRjo6Y2xlYXJUZXh0VHJhY2tzKCkKLXsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgbV90ZXh0VHJhY2tzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIFJlZlB0cjxJbmJhbmRU ZXh0VHJhY2tQcml2YXRlQVZGPiB0cmFjayA9IG1fdGV4dFRyYWNrc1tpXTsKLSAgICAgICAgcGxh eWVyKCktPnJlbW92ZVRleHRUcmFjayh0cmFjayk7Ci0gICAgICAgIHRyYWNrLT5kaXNjb25uZWN0 KCk7Ci0gICAgfQotICAgIG1fdGV4dFRyYWNrcy5jbGVhcigpOwotfQotCiAjaWYgIUhBVkUoQVZG T1VOREFUSU9OX0xFR0lCTEVfT1VUUFVUX1NVUFBPUlQpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbkNGOjpwcm9jZXNzTGVnYWN5Q2xvc2VkQ2FwdGlvbnNUcmFja3MoKQogewpA QCAtOTk4LDMyICs5ODgsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbkNG OjpwCiB9CiAjZW5kaWYKIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6 cHJvY2Vzc05ld0FuZFJlbW92ZWRUZXh0VHJhY2tzKGNvbnN0IFZlY3RvcjxSZWZQdHI8SW5iYW5k VGV4dFRyYWNrUHJpdmF0ZUFWRj4gPiYgcmVtb3ZlZFRleHRUcmFja3MpCi17Ci0gICAgLy8gRklY TUU6IExpZnQgdG8gcGFyZW50IGNsYXNzIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE4ODAxKQotICAgIGlmIChyZW1vdmVkVGV4dFRyYWNrcy5zaXplKCkpIHsKLSAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fdGV4dFRyYWNrcy5zaXplKCk7ICsraSkg ewotICAgICAgICAgICAgaWYgKCFyZW1vdmVkVGV4dFRyYWNrcy5jb250YWlucyhtX3RleHRUcmFj a3NbaV0pKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgCi0gICAgICAg ICAgICBwbGF5ZXIoKS0+cmVtb3ZlVGV4dFRyYWNrKHJlbW92ZWRUZXh0VHJhY2tzW2ldLmdldCgp KTsKLSAgICAgICAgICAgIG1fdGV4dFRyYWNrcy5yZW1vdmUoaSk7Ci0gICAgICAgIH0KLSAgICB9 Ci0gICAgCi0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fdGV4dFRyYWNrcy5zaXplKCk7 ICsraSkgewotICAgICAgICBSZWZQdHI8SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRj4gdHJhY2sg PSBtX3RleHRUcmFja3NbaV07Ci0gICAgICAgIAotICAgICAgICB0cmFjay0+c2V0VGV4dFRyYWNr SW5kZXgoaSk7Ci0gICAgICAgIGlmICh0cmFjay0+aGFzQmVlblJlcG9ydGVkKCkpCi0gICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgCi0gICAgICAgIHRyYWNrLT5zZXRIYXNCZWVuUmVwb3J0 ZWQodHJ1ZSk7Ci0gICAgICAgIHBsYXllcigpLT5hZGRUZXh0VHJhY2sodHJhY2suZ2V0KCkpOwot ICAgIH0KLSAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6 cHJvY2Vzc05ld0FuZFJlbW92ZWRUZXh0VHJhY2tzKCVwKSAtIGZvdW5kICVpIHRleHQgdHJhY2tz IiwgdGhpcywgbV90ZXh0VHJhY2tzLnNpemUoKSk7Ci19Ci0KICNpZiBIQVZFKEFWRk9VTkRBVElP Tl9NRURJQV9TRUxFQ1RJT05fR1JPVVApCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbkNGOjpwcm9jZXNzTWVkaWFTZWxlY3Rpb25PcHRpb25zKCkKIHsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25DRi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25D Ri5oCShyZXZpc2lvbiAxNTI4NzApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0YuaAkod29y a2luZyBjb3B5KQpAQCAtMTA3LDggKzEwNyw2IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZv aWQgc2V0Q3VycmVudFRyYWNrKEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYqKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkYqIGN1cnJlbnRUcmFjaygpIGNv bnN0IE9WRVJSSURFOwotICAgIHZvaWQgcHJvY2Vzc05ld0FuZFJlbW92ZWRUZXh0VHJhY2tzKGNv bnN0IFZlY3RvcjxSZWZQdHI8SW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRj4gPiYpOwotICAgIHZv aWQgY2xlYXJUZXh0VHJhY2tzKCk7CiAKICNpZiAhSEFWRShBVkZPVU5EQVRJT05fTEVHSUJMRV9P VVRQVVRfU1VQUE9SVCkKICAgICB2b2lkIHByb2Nlc3NMZWdhY3lDbG9zZWRDYXB0aW9uc1RyYWNr cygpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAkocmV2aXNpb24gMTUyODcwKQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsOCArMTc1 LDYgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJyZW50VHJhY2soSW5iYW5k VGV4dFRyYWNrUHJpdmF0ZUFWRiopIE9WRVJSSURFOwogICAgIHZpcnR1YWwgSW5iYW5kVGV4dFRy YWNrUHJpdmF0ZUFWRiogY3VycmVudFRyYWNrKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV9j dXJyZW50VHJhY2s7IH0KLSAgICB2b2lkIHByb2Nlc3NOZXdBbmRSZW1vdmVkVGV4dFRyYWNrcyhj b25zdCBWZWN0b3I8UmVmUHRyPEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY+ID4mKTsKLSAgICB2 b2lkIGNsZWFyVGV4dFRyYWNrcygpOwogCiAjaWYgIUhBVkUoQVZGT1VOREFUSU9OX0xFR0lCTEVf T1VUUFVUX1NVUFBPUlQpCiAgICAgdm9pZCBwcm9jZXNzTGVnYWN5Q2xvc2VkQ2FwdGlvbnNUcmFj a3MoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQkocmV2aXNpb24gMTUyODcwKQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTMyNiwx NyArMTMyNiw2IEBAIFJldGFpblB0cjxBVkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVxdWVzdD4KIH0K ICNlbmRpZgogCi0KLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y2xl YXJUZXh0VHJhY2tzKCkKLXsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV90ZXh0VHJh Y2tzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIFJlZlB0cjxJbmJhbmRUZXh0VHJhY2tQcml2YXRl QVZGPiB0cmFjayA9IG1fdGV4dFRyYWNrc1tpXTsKLSAgICAgICAgcGxheWVyKCktPnJlbW92ZVRl eHRUcmFjayh0cmFjayk7Ci0gICAgICAgIHRyYWNrLT5kaXNjb25uZWN0KCk7Ci0gICAgfQotICAg IG1fdGV4dFRyYWNrcy5jbGVhcigpOwotfQotCiAjaWYgIUhBVkUoQVZGT1VOREFUSU9OX0xFR0lC TEVfT1VUUFVUX1NVUFBPUlQpCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OnByb2Nlc3NMZWdhY3lDbG9zZWRDYXB0aW9uc1RyYWNrcygpCiB7CkBAIC0xMzc1LDMyICsx MzY0LDYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOgogfQogI2Vu ZGlmCiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6cHJvY2Vzc05l d0FuZFJlbW92ZWRUZXh0VHJhY2tzKGNvbnN0IFZlY3RvcjxSZWZQdHI8SW5iYW5kVGV4dFRyYWNr UHJpdmF0ZUFWRj4gPiYgcmVtb3ZlZFRleHRUcmFja3MpCi17Ci0gICAgaWYgKHJlbW92ZWRUZXh0 VHJhY2tzLnNpemUoKSkgewotICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV90ZXh0 VHJhY2tzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAgICBpZiAoIXJlbW92ZWRUZXh0VHJhY2tz LmNvbnRhaW5zKG1fdGV4dFRyYWNrc1tpXSkpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0g ICAgICAgICAgICAKLSAgICAgICAgICAgIHBsYXllcigpLT5yZW1vdmVUZXh0VHJhY2socmVtb3Zl ZFRleHRUcmFja3NbaV0uZ2V0KCkpOwotICAgICAgICAgICAgbV90ZXh0VHJhY2tzLnJlbW92ZShp KTsKLSAgICAgICAgfQotICAgIH0KLSAgICAKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg bV90ZXh0VHJhY2tzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIFJlZlB0cjxJbmJhbmRUZXh0VHJh Y2tQcml2YXRlQVZGPiB0cmFjayA9IG1fdGV4dFRyYWNrc1tpXTsKLSAgICAgICAgCi0gICAgICAg IHRyYWNrLT5zZXRUZXh0VHJhY2tJbmRleChpKTsKLSAgICAgICAgaWYgKHRyYWNrLT5oYXNCZWVu UmVwb3J0ZWQoKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAKLSAgICAgICAgdHJh Y2stPnNldEhhc0JlZW5SZXBvcnRlZCh0cnVlKTsKLSAgICAgICAgcGxheWVyKCktPmFkZFRleHRU cmFjayh0cmFjay5nZXQoKSk7Ci0gICAgfQotICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OnByb2Nlc3NOZXdBbmRSZW1vdmVkVGV4dFRyYWNrcyglcCkg LSBmb3VuZCAlaSB0ZXh0IHRyYWNrcyIsIHRoaXMsIG1fdGV4dFRyYWNrcy5zaXplKCkpOwotICAg IAotfQotCiAjaWYgSEFWRShBVkZPVU5EQVRJT05fTUVESUFfU0VMRUNUSU9OX0dST1VQKQogQVZN ZWRpYVNlbGVjdGlvbkdyb3VwVHlwZSogTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6c2FmZU1lZGlhU2VsZWN0aW9uR3JvdXBGb3JMZWdpYmxlTWVkaWEoKQogewo=