117608 2013-06-13 14:08:32 -0700 Report the memory cost of HTMLMediaElements to GC. 2013-06-14 15:40:40 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue darin eric.carlson esprehn+autocc glenn oldest_to_newest 900279 0 jer.noble 2013-06-13 14:08:32 -0700 Report the memory cost of HTMLMediaElements to GC. 900283 1 204642 jer.noble 2013-06-13 14:14:18 -0700 Created attachment 204642 Patch 900338 2 204642 darin 2013-06-13 17:42:54 -0700 Comment on attachment 204642 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204642&action=review > Source/WebCore/html/HTMLMediaElement.cpp:622 > + double extraMemoryCost = m_player->extraMemoryCost(); > + double extraMemoryCostDelta = extraMemoryCost - m_reportedExtraMemoryCost; > + m_reportedExtraMemoryCost = extraMemoryCost; Why the mix of double and size_t here? It seems like extraMemoryCost is returning size_t, so this should just be size_t. > Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:883 > + return totalBytes() * buffered()->totalDuration() / duration; Is there something that prevents this from overflowing a size_t? > Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:269 > + virtual size_t extraMemoryCost() const OVERRIDE; Either this class or this function should be marked FINAL too. 900551 3 204642 eric.carlson 2013-06-14 07:23:33 -0700 Comment on attachment 204642 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204642&action=review > Source/WebCore/platform/graphics/MediaPlayerPrivate.h:209 > + virtual size_t extraMemoryCost() const { return 0; } Most (all?) ports will want the simple implementation you added to MediaPlayerPrivateAVFoundation.cpp - why not put it here? 900674 4 jer.noble 2013-06-14 15:33:51 -0700 (In reply to comment #2) > (From update of attachment 204642 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204642&action=review > > > Source/WebCore/html/HTMLMediaElement.cpp:622 > > + double extraMemoryCost = m_player->extraMemoryCost(); > > + double extraMemoryCostDelta = extraMemoryCost - m_reportedExtraMemoryCost; > > + m_reportedExtraMemoryCost = extraMemoryCost; > > Why the mix of double and size_t here? It seems like extraMemoryCost is returning size_t, so this should just be size_t. No good reason; these should indeed be size_t. > > Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:883 > > + return totalBytes() * buffered()->totalDuration() / duration; > > Is there something that prevents this from overflowing a size_t? Since totalBytes() is an unsigned, and (totalDuration() / duration) will be in the range [0..1], this can never overflow a size_t. > > Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:269 > > + virtual size_t extraMemoryCost() const OVERRIDE; > > Either this class or this function should be marked FINAL too. Sure thing. Thanks! 900675 5 jer.noble 2013-06-14 15:34:27 -0700 (In reply to comment #3) > (From update of attachment 204642 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204642&action=review > > > Source/WebCore/platform/graphics/MediaPlayerPrivate.h:209 > > + virtual size_t extraMemoryCost() const { return 0; } > > Most (all?) ports will want the simple implementation you added to MediaPlayerPrivateAVFoundation.cpp - why not put it here? I guess that makes sense. If any port wants their own implementation, they can just override it. 900679 6 jer.noble 2013-06-14 15:36:10 -0700 (In reply to comment #5) > (In reply to comment #3) > > (From update of attachment 204642 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=204642&action=review > > > > > Source/WebCore/platform/graphics/MediaPlayerPrivate.h:209 > > > + virtual size_t extraMemoryCost() const { return 0; } > > > > Most (all?) ports will want the simple implementation you added to MediaPlayerPrivateAVFoundation.cpp - why not put it here? > > I guess that makes sense. If any port wants their own implementation, they can just override it. Ah, it can't go into MediaPlayerPrivate because MediaPlayerPrivate does not have a "totalBytes()" method. 900680 7 jer.noble 2013-06-14 15:40:40 -0700 Committed r151609: <http://trac.webkit.org/changeset/151609> 204642 2013-06-13 14:14:18 -0700 2013-06-14 07:23:33 -0700 Patch bug-117608-20130613141237.patch text/plain 8024 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY3NjI2NDcyMmM0Njc0 ZWI5NzA4ZmNmYzUyZTJkY2QzNGU1NmNlMS4uYTU0ODM5Mzg0NDJiMTZhZTM5OTBmZWI0ZjllYjEz MDUzMjViYjg1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA2LTEzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJlcG9ydCB0aGUgbWVtb3J5 IGNvc3Qgb2YgSFRNTE1lZGlhRWxlbWVudHMgdG8gR0MuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc2MDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXBvcnQgdGhlIGV4dHJhIG1lbW9yeSBjb3N0IG9m IGEgSFRNTE1lZGlhRWxlbWVudCB0byB0aGUgVk0sIGluIG9yZGVyIHRvCisgICAgICAgIGVuY291 cmFnZSBHQyB0byBvY2N1ciBhZnRlciBhIG1lZGlhIGVsZW1lbnQgaXMgcmVtb3ZlZCBmcm9tIHRo ZSBET00uCisKKyAgICAgICAgQmVjYXVzZSB3ZSBjYW5ub3Qga25vdyBmb3Igc3VyZSB0aGUgbWVt b3J5IGNvc3Qgb2Ygb3VyIHVuZGVybHlpbmcgbWVkaWEKKyAgICAgICAgZnJhbWV3b3JrIG9iamVj dHMsIHVzZSB0aGUgd29yc3QgY2FzZSBzY2VuYXJpbyBmb3IgdGhlIG1lZGlhIG1lbW9yeSBjb3N0 OgorICAgICAgICB0aGUgYnVmZmVyZWQgcGVyY2VudGFnZSBvZiBtb3ZpZSAqIHRoZSB0b3RhbCBk YXRhIGxlbmd0aCBvZiB0aGUgbW92aWUuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6SFRNTE1lZGlhRWxl bWVudCk6IEluaXRpYWxpemUgbV9yZXBvcnRlZEV4dHJhTWVtb3J5Q29zdC4KKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnJlbW92ZWRGcm9tKTogUmVwb3J0IHRoZSBleHRyYSBt ZW1vcnkgY29zdC4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAg KiBodG1sL1RpbWVSYW5nZXMuY3BwOgorICAgICAgICAoVGltZVJhbmdlczo6dG90YWxEdXJhdGlv bik6IEFkZGVkIGNvbnZlbmllbmNlIGZ1bmN0aW9uLgorICAgICAgICAqIGh0bWwvVGltZVJhbmdl cy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpleHRyYU1lbW9yeUNvc3QpOiBQYXNzIHRvIE1lZGlh UGxheWVyUHJpdmF0ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlOjpleHRyYU1lbW9yeUNv c3QpOiBEZWZhdWx0IHRvIDAuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmV4dHJhTWVtb3J5Q29zdCk6IFJldHVy biB0aGUgcGVyY2VudGFnZQorICAgICAgICAgICAgbG9hZGVkICogdG90YWwgZGF0YSBsZW5ndGgu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbi5oOgorCiAyMDEzLTA2LTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBub3Rpb24gb2YgaW5hY3RpdmUg cGx1Zy1pbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGY3 MDViYTEzN2FmM2U0NjcwMGE4Y2I3NjIzOTY1ZmJkZjA0ZjY5NDUuLjE3YzVjOWIwZDgzZTUxNjgz NjJkYzQ3ZmFjNGYzZTJkZjE4MDIwODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcApAQCAtMzI0LDYgKzMyNCw3IEBAIEhUTUxNZWRpYUVsZW1lbnQ6OkhUTUxNZWRp YUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQqIGRvY3VtCiAj aWYgVVNFKEFVRElPX1NFU1NJT04pCiAgICAgLCBtX2F1ZGlvU2Vzc2lvbk1hbmFnZXJUb2tlbihB dWRpb1Nlc3Npb25NYW5hZ2VyVG9rZW46OmNyZWF0ZSh0YWdOYW1lID09IHZpZGVvVGFnID8gQXVk aW9TZXNzaW9uTWFuYWdlcjo6VmlkZW8gOiBBdWRpb1Nlc3Npb25NYW5hZ2VyOjpBdWRpbykpCiAj ZW5kaWYKKyAgICAsIG1fcmVwb3J0ZWRFeHRyYU1lbW9yeUNvc3QoMCkKIHsKICAgICBMT0coTWVk aWEsICJIVE1MTWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50Iik7CiAgICAgZG9jdW1lbnQt PnJlZ2lzdGVyRm9yTWVkaWFWb2x1bWVDYWxsYmFja3ModGhpcyk7CkBAIC02MTEsNiArNjEyLDE4 IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cmVtb3ZlZEZyb20oQ29udGFpbmVyTm9kZSogaW5z ZXJ0aW9uUG9pbnQpCiAgICAgICAgICAgICBwYXVzZSgpOwogICAgICAgICBpZiAobV9pc0Z1bGxz Y3JlZW4pCiAgICAgICAgICAgICBleGl0RnVsbHNjcmVlbigpOworCisgICAgICAgIGlmIChtX3Bs YXllcikgeworICAgICAgICAgICAgSlNDOjpWTSogdm0gPSBKU0RPTVdpbmRvd0Jhc2U6OmNvbW1v blZNKCk7CisgICAgICAgICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKHZtKTsKKworICAgICAg ICAgICAgZG91YmxlIGV4dHJhTWVtb3J5Q29zdCA9IG1fcGxheWVyLT5leHRyYU1lbW9yeUNvc3Qo KTsKKyAgICAgICAgICAgIGRvdWJsZSBleHRyYU1lbW9yeUNvc3REZWx0YSA9IGV4dHJhTWVtb3J5 Q29zdCAtIG1fcmVwb3J0ZWRFeHRyYU1lbW9yeUNvc3Q7CisgICAgICAgICAgICBtX3JlcG9ydGVk RXh0cmFNZW1vcnlDb3N0ID0gZXh0cmFNZW1vcnlDb3N0OworCisgICAgICAgICAgICBpZiAoZXh0 cmFNZW1vcnlDb3N0RGVsdGEgPiAwKQorICAgICAgICAgICAgICAgIHZtLT5oZWFwLnJlcG9ydEV4 dHJhTWVtb3J5Q29zdChleHRyYU1lbW9yeUNvc3REZWx0YSk7CisgICAgICAgIH0KICAgICB9CiAK ICAgICBIVE1MRWxlbWVudDo6cmVtb3ZlZEZyb20oaW5zZXJ0aW9uUG9pbnQpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAppbmRleCA1N2I2NjhmMTU0YjdlYWUwYmY3NGFiNmNm Zjk3MzEzYjM1ZTBmNWE3Li5iY2M5NTI4ZWI4ZTIwNmU3MDc4MzhkY2M2N2E5Mzk0YjQ5NGNlODY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaApAQCAtNzc2LDYgKzc3Niw3 IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIE93blB0cjxQYWdlQWN0aXZpdHlBc3NlcnRpb25U b2tlbj4gbV9hY3Rpdml0eVRva2VuOworICAgIHNpemVfdCBtX3JlcG9ydGVkRXh0cmFNZW1vcnlD b3N0OwogfTsKIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1RpbWVSYW5n ZXMuY3BwCmluZGV4IDkwZDdkMTJjNzM5ZDc1OGZmZTk4OGQ4OTc0ZTBlNTY4NGYzM2M2YjcuLmNm OGUyMGZjMjNiMzA2MDJhMTY5YTU1ZjY5ZmNlNWU5ZDUxZTJlN2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9U aW1lUmFuZ2VzLmNwcApAQCAtMTg2LDMgKzE4NiwxMSBAQCBkb3VibGUgVGltZVJhbmdlczo6bmVh cmVzdChkb3VibGUgdGltZSkgY29uc3QKICAgICB9CiAgICAgcmV0dXJuIGNsb3Nlc3RUaW1lOwog fQorCitkb3VibGUgVGltZVJhbmdlczo6dG90YWxEdXJhdGlvbigpIGNvbnN0Cit7CisgICAgZG91 YmxlIHRvdGFsID0gMDsKKyAgICBmb3IgKHVuc2lnbmVkIG4gPSAwOyBuIDwgbGVuZ3RoKCk7IG4r KykKKyAgICAgICAgdG90YWwgKz0gZmFicyhlbmQobiwgSUdOT1JFX0VYQ0VQVElPTikgLSBzdGFy dChuLCBJR05PUkVfRVhDRVBUSU9OKSk7CisgICAgcmV0dXJuIHRvdGFsOworfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9UaW1lUmFuZ2VzLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1s L1RpbWVSYW5nZXMuaAppbmRleCBlZmRjYWJmYzIzZTMzOTUzN2Q0ZjMwMzIyZDNmMjY5NzdjMDNi ZGNjLi45N2Y0ZWI3ZmE1NWY4YzIzNjRmMWUyNDc1MGQwZTgwOWIzNTVhYTkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL1RpbWVSYW5nZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL1RpbWVSYW5nZXMuaApAQCAtNjEsNiArNjEsOCBAQCBwdWJsaWM6CiAgICAgCiAgICAgZG91 YmxlIG5lYXJlc3QoZG91YmxlIHRpbWUpIGNvbnN0OwogCisgICAgZG91YmxlIHRvdGFsRHVyYXRp b24oKSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBUaW1lUmFuZ2VzKCkgeyB9CiAgICAgVGltZVJh bmdlcyhkb3VibGUgc3RhcnQsIGRvdWJsZSBlbmQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IDUzZTY3ODE3ZjE0NzZkNTVkMTc1 YjJlZjZmNjJiNzU1OWY1ZjBjOWQuLjAxNzQ2NWZhYmM5ZDcwYTA4MmM4M2IxYjBlZjQ1MmQ5Nzcw ZTI0NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlh UGxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAKQEAgLTExOTYsNiArMTE5NiwxNSBAQCBTdHJpbmcgTWVkaWFQbGF5ZXI6Omxhbmd1 YWdlT2ZQcmltYXJ5QXVkaW9UcmFjaygpIGNvbnN0CiAgICAgCiAgICAgcmV0dXJuIG1fcHJpdmF0 ZS0+bGFuZ3VhZ2VPZlByaW1hcnlBdWRpb1RyYWNrKCk7CiB9CisKK3NpemVfdCBNZWRpYVBsYXll cjo6ZXh0cmFNZW1vcnlDb3N0KCkgY29uc3QKK3sKKyAgICBpZiAoIW1fcHJpdmF0ZSkKKyAgICAg ICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gbV9wcml2YXRlLT5leHRyYU1lbW9yeUNvc3QoKTsK K30KKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL01lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5oCmluZGV4IDcxNWFhMTFlNjY4NTA4YTA1NGIwZjk0ZTlhYmYxMTZjZjIxZGQ2 ZGQuLmUwYTJiYzYzMWI0OTc3NDIxOTJiYWZmYTExNWIyZjY5N2M1MGE1ODYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaApAQCAtNDgwLDYgKzQ4 MCw4IEBAIHB1YmxpYzoKIAogICAgIFN0cmluZyBsYW5ndWFnZU9mUHJpbWFyeUF1ZGlvVHJhY2so KSBjb25zdDsKIAorICAgIHNpemVfdCBleHRyYU1lbW9yeUNvc3QoKSBjb25zdDsKKwogcHJpdmF0 ZToKICAgICBNZWRpYVBsYXllcihNZWRpYVBsYXllckNsaWVudCopOwogICAgIHZvaWQgbG9hZFdp dGhOZXh0TWVkaWFFbmdpbmUoTWVkaWFQbGF5ZXJGYWN0b3J5Kik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCmluZGV4IDY0 MDFmMTk0NTQ4NTdhZGQyZDQ0ODFiZWZkYjE2MjJlN2Q5ZmQ1MGQuLmNiZTgwZTZjMjdmYTdlY2Rm NzE3ZjhiMzJkOTE0OTFjZGYzNmViMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCkBAIC0yMDUsNiArMjA1LDggQEAg cHVibGljOgogI2VuZGlmCiAgICAgCiAgICAgdmlydHVhbCBTdHJpbmcgbGFuZ3VhZ2VPZlByaW1h cnlBdWRpb1RyYWNrKCkgY29uc3QgeyByZXR1cm4gZW1wdHlTdHJpbmcoKTsgfQorCisgICAgdmly dHVhbCBzaXplX3QgZXh0cmFNZW1vcnlDb3N0KCkgY29uc3QgeyByZXR1cm4gMDsgfQogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uLmNwcAppbmRleCA5NDg1ZjU0NWM4NzkyNTJmMTliYjU4MDMwOTQ3ZTc1M2UzODYzMDU2Li5h YTlhZWE4MDMwODFlMTc1YjBmNTc4MTMwNGM1Nzc3ZTk3MjU4ZDhkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcApAQCAtODc0 LDYgKzg3NCwxNSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6dHJhY2tN b2RlQ2hhbmdlZCgpCiB9CiAjZW5kaWYKIAorc2l6ZV90IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbjo6ZXh0cmFNZW1vcnlDb3N0KCkgY29uc3QKK3sKKyAgICBkb3VibGUgZHVyYXRpb24g PSB0aGlzLT5kdXJhdGlvbigpOworICAgIGlmICghZHVyYXRpb24pCisgICAgICAgIHJldHVybiAw OworCisgICAgcmV0dXJuIHRvdGFsQnl0ZXMoKSAqIGJ1ZmZlcmVkKCktPnRvdGFsRHVyYXRpb24o KSAvIGR1cmF0aW9uOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5oCmlu ZGV4IGIyNTk1MjM5M2VmYmY2OTFiMjg3MzNhM2FlMmNhNDRjY2Q3ZDczOWIuLjY1MjE1YTczYWQy Yjg1MmU5MDkxY2VjYjlkMjcwYTcxNGE5Y2Y2ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgKQEAgLTI2Niw2ICsyNjYsOCBAQCBw cm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIFN0cmluZyBlbmdpbmVEZXNjcmlwdGlvbigpIGNvbnN0 IHsgcmV0dXJuICJBVkZvdW5kYXRpb24iOyB9CiAKKyAgICB2aXJ0dWFsIHNpemVfdCBleHRyYU1l bW9yeUNvc3QoKSBjb25zdCBPVkVSUklERTsKKwogI2lmICFQTEFURk9STShXSU4pCiAgICAgdmly dHVhbCB2b2lkIHRyYWNrTW9kZUNoYW5nZWQoKSBPVkVSUklERTsKICAgICBWZWN0b3I8UmVmUHRy PEluYmFuZFRleHRUcmFja1ByaXZhdGVBVkY+ID4gbV90ZXh0VHJhY2tzOwo=