36112 2010-03-15 03:01:31 -0700 Make PlatformMedia a typedef 2010-05-10 07:52:29 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC All RESOLVED INVALID P2 Normal --- 1 pnormand webkit-unassigned eric.carlson gustavo jer.noble oldest_to_newest 199600 0 pnormand 2010-03-15 03:01:31 -0700 From Bug 35333, interesting comments especially in https://bugs.webkit.org/show_bug.cgi?id=35333#c8 and https://bugs.webkit.org/show_bug.cgi?id=35333#c10 223217 1 pnormand 2010-05-10 02:48:07 -0700 I will send a patch to make PlatformMedia a typedef. As I think we agreed with Eric (correct me if I'm wrong!) it doesn't make much sense for it to be a structure. 223219 2 55533 pnormand 2010-05-10 03:04:18 -0700 Created attachment 55533 proposed patch 223305 3 jer.noble 2010-05-10 07:35:06 -0700 Phillipe, please take a look at the patch in https://bugs.webkit.org/show_bug.cgi?id=38689. Windows WebCore now has multiple MediaPlayerPrivate engines created at runtime, each which needs to return a different type of PlatformMedia. Defining these types at compile-time by platform doesn't allow this. But adding a GStreamer specific type to the struct in the patch above would be very simple. 223312 4 pnormand 2010-05-10 07:51:40 -0700 Ah well... then I guess I should mark this bug as invalid. For GStreamer the PlatformMedia stuff doesn't help much. I plan to propose a new API in the MediaPlayer to enter/exit fullscreen. The player would provide to the "client" a PlatformFullscreenWindow pointer. Anyway this is for another bug :) 55533 2010-05-10 03:04:18 -0700 2010-05-10 07:52:29 -0700 proposed patch proposed-patch.patch text/plain 11955 pnormand RnJvbSAzNDQ4YjRhNjVlNmE5ODIzNjgxMDA5ZmQ3OTAyYmNjNjliYzA3ZjI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUaHUsIDI5IEFwciAyMDEwIDEwOjEwOjU3ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDI3ICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAgICAgICAgICAgICAgICAgICB8ICAgIDQgKy0KIFdlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmggICAgICAgICAgICAgICAgICAgIHwgICAgMiArLQogV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAgICAgICAgICAgfCAgICA0ICst CiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmggICAgICAgICAgICB8ICAg MTggKysrKysrLS0tLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclBy aXZhdGUuaCAgICAgfCAgICAyICstCiAuLi4vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0 ZVFUS2l0LmggICAgICAgICB8ICAgIDIgKy0KIC4uLi9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQubW0gICAgICAgIHwgICAgNSArLS0KIC4uLi93aW4vTWVkaWFQbGF5ZXJQcml2 YXRlUXVpY2tUaW1lV2luLmNwcCAgICAgICAgIHwgICAgNiArLS0tCiAuLi4vZ3JhcGhpY3Mvd2lu L01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdpbi5oICB8ICAgIDIgKy0KIFdlYktpdC9tYWMv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysK IFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tIHwgICAg NSArLS0KIFdlYktpdC93aW4vQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgICAxMiArKysrKysrKysKIFdlYktpdC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5j cHAgICAgICAgICAgIHwgICAgMiArLQogMTQgZmlsZXMgY2hhbmdlZCwgNzUgaW5zZXJ0aW9ucygr KSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCBhNGI3N2JhLi5lMDU0YTNmIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEw LTA1LTEwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFBsYXRmb3JtTWVk aWEgYSB0eXBlZGVmCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNjExMgorCisgICAgICAgIEFzIFBsYXRmb3JtTWVkaWEgaXMgbWVkaWEtZW5naW5lIHNw ZWNpZmljIGl0IGRvZXNuJ3QgbWFrZSBtdWNoCisgICAgICAgIHNlbnNlIHRvIGhhdmUgcG9zc2li bHkgbXVsdGlwbGUgdHlwZXMgZm9yIGl0LiBNYWtpbmcgaXQgYSB0eXBlZGVmCisgICAgICAgIGFs c28gc2ltcGxpZmllcyB0aGUgY29kZS4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpwbGF0Zm9ybU1lZGlh KToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOdWxsTWVkaWFQ bGF5ZXJQcml2YXRlOjpwbGF0Zm9ybU1lZGlhKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyOjpwbGF0Zm9ybU1lZGlhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5o OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlOjpwbGF0Zm9y bU1lZGlhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2 YXRlUVRLaXQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OnBs YXRmb3JtTWVkaWEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXll clByaXZhdGVRdWlja1RpbWVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlOjpwbGF0Zm9ybU1lZGlhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4v TWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmg6CisKIDIwMTAtMDUtMTAgIElseWEgVGlr aG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZDog cm9sbGJhY2sgdGhlIGNvbW1pdCByNTkwNjIKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRl eCA0ODNhY2FjLi4wM2Q2YjdiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0yMDEy LDkgKzIwMTIsOSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmV4aXRGdWxsc2NyZWVuKCkKICAg ICB9CiB9CiAKLVBsYXRmb3JtTWVkaWEgSFRNTE1lZGlhRWxlbWVudDo6cGxhdGZvcm1NZWRpYSgp IGNvbnN0CitQbGF0Zm9ybU1lZGlhKiBIVE1MTWVkaWFFbGVtZW50OjpwbGF0Zm9ybU1lZGlhKCkg Y29uc3QKIHsKLSAgICByZXR1cm4gbV9wbGF5ZXIgPyBtX3BsYXllci0+cGxhdGZvcm1NZWRpYSgp IDogTm9QbGF0Zm9ybU1lZGlhOworICAgIHJldHVybiBtX3BsYXllciA/IG1fcGxheWVyLT5wbGF0 Zm9ybU1lZGlhKCkgOiAwOwogfQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggOWMzNjQzOC4uMDcxOTY3NCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhRWxlbWVudC5oCkBAIC02OCw3ICs2OCw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9v bCBzdXBwb3J0c1NhdmUoKSBjb25zdDsKICAgICAKLSAgICBQbGF0Zm9ybU1lZGlhIHBsYXRmb3Jt TWVkaWEoKSBjb25zdDsKKyAgICBQbGF0Zm9ybU1lZGlhKiBwbGF0Zm9ybU1lZGlhKCkgY29uc3Q7 CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIFBsYXRmb3JtTGF5ZXIqIHBs YXRmb3JtTGF5ZXIoKSBjb25zdDsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01l ZGlhUGxheWVyLmNwcAppbmRleCA4ZjM5Y2Y3Li5jOTQ4YmJhIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtNzYsNyArNzYsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHBsYXkoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcGF1c2UoKSB7IH0gICAg CiAKLSAgICB2aXJ0dWFsIFBsYXRmb3JtTWVkaWEgcGxhdGZvcm1NZWRpYSgpIGNvbnN0IHsgcmV0 dXJuIE5vUGxhdGZvcm1NZWRpYTsgfQorICAgIHZpcnR1YWwgUGxhdGZvcm1NZWRpYSogcGxhdGZv cm1NZWRpYSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiAgICAgdmlydHVhbCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3Qg eyByZXR1cm4gMDsgfQogI2VuZGlmCkBAIC0zODAsNyArMzgwLDcgQEAgYm9vbCBNZWRpYVBsYXll cjo6aW5NZWRpYURvY3VtZW50KCkKICAgICByZXR1cm4gZG9jdW1lbnQgJiYgZG9jdW1lbnQtPmlz TWVkaWFEb2N1bWVudCgpOwogfQogCi1QbGF0Zm9ybU1lZGlhIE1lZGlhUGxheWVyOjpwbGF0Zm9y bU1lZGlhKCkgY29uc3QKK1BsYXRmb3JtTWVkaWEqIE1lZGlhUGxheWVyOjpwbGF0Zm9ybU1lZGlh KCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9wcml2YXRlLT5wbGF0Zm9ybU1lZGlhKCk7CiB9CmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmggYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKaW5kZXggOTVjYzdmMS4uZDljMjY2 OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaApAQCAtNTIsMTUgKzUy LDEzIEBAIGNsYXNzIFFUTW92aWU7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gU3RydWN0 dXJlIHRoYXQgd2lsbCBob2xkIGV2ZXJ5IG5hdGl2ZQotLy8gdHlwZXMgc3VwcG9ydGVkIGJ5IHRo ZSBjdXJyZW50IG1lZGlhIHBsYXllci4KLS8vIFdlIGhhdmUgdG8gZG8gdGhhdCBoYXMgbXVsdGlw bGUgbWVkaWEgcGxheWVycwotLy8gYmFja2VuZCBjYW4gbGl2ZSBhdCBydW50aW1lLgotdHlwZWRl ZiBzdHJ1Y3QgUGxhdGZvcm1NZWRpYSB7Ci0gICAgUVRNb3ZpZSogcXRNb3ZpZTsKLX0gUGxhdGZv cm1NZWRpYTsKLQotc3RhdGljIGNvbnN0IFBsYXRmb3JtTWVkaWEgTm9QbGF0Zm9ybU1lZGlhID0g eyAwIH07CisvLyBNZWRpYVBsYXllclByaXZhdGUgaW1wbGVtZW50YXRpb25zIHN1cHBvcnRpbmcg dGhlIHBsYXRmb3JtTWVkaWEoKSBBUEkKKy8vIHNob3VsZCBkZWZpbmUgdGhlaXIgUGxhdGZvcm1N ZWRpYSB0eXBlIGhlcmUuCisjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShXSU4pCit0eXBl ZGVmIFFUTW92aWUgUGxhdGZvcm1NZWRpYTsKKyNlbHNlCit0eXBlZGVmIHZvaWQgUGxhdGZvcm1N ZWRpYTsKKyNlbmRpZgogCiBjbGFzcyBDb250ZW50VHlwZTsKIGNsYXNzIEZyYW1lVmlldzsKQEAg LTEzOSw3ICsxMzcsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIHN1cHBvcnRzRnVsbHNjcmVlbigp IGNvbnN0OwogICAgIGJvb2wgc3VwcG9ydHNTYXZlKCkgY29uc3Q7Ci0gICAgUGxhdGZvcm1NZWRp YSBwbGF0Zm9ybU1lZGlhKCkgY29uc3Q7CisgICAgUGxhdGZvcm1NZWRpYSogcGxhdGZvcm1NZWRp YSgpIGNvbnN0OwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBQbGF0Zm9y bUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3Q7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmggYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCmluZGV4IDE2ZmY1NDMuLmE1MDFlZmEg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRl LmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllclByaXZhdGUuaApA QCAtNDQsNyArNDQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbExvYWQoKSA9 IDA7CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIHByZXBhcmVUb1BsYXkoKSB7IH0KLSAgICB2aXJ0 dWFsIFBsYXRmb3JtTWVkaWEgcGxhdGZvcm1NZWRpYSgpIGNvbnN0IHsgcmV0dXJuIE5vUGxhdGZv cm1NZWRpYTsgfQorICAgIHZpcnR1YWwgUGxhdGZvcm1NZWRpYSogcGxhdGZvcm1NZWRpYSgpIGNv bnN0IHsgcmV0dXJuIDA7IH0KICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAg dmlydHVhbCBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkgY29uc3QgeyByZXR1cm4gMDsg fQogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRp YVBsYXllclByaXZhdGVRVEtpdC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVk aWFQbGF5ZXJQcml2YXRlUVRLaXQuaAppbmRleCAyNjM2YWViLi45ODJlYTJjIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5o CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFU S2l0LmgKQEAgLTc3LDcgKzc3LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgTWVkaWFQbGF5ZXI6 OlN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGUoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJp bmcmIGNvZGVjcyk7CiAgICAgc3RhdGljIGJvb2wgaXNBdmFpbGFibGUoKTsKIAotICAgIFBsYXRm b3JtTWVkaWEgcGxhdGZvcm1NZWRpYSgpIGNvbnN0OworICAgIFBsYXRmb3JtTWVkaWEqIHBsYXRm b3JtTWVkaWEoKSBjb25zdDsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAg UGxhdGZvcm1MYXllciogcGxhdGZvcm1MYXllcigpIGNvbnN0OwogI2VuZGlmCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5t bSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0 Lm1tCmluZGV4IGM4MzdiNTEuLjE5MzkxOWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCkBAIC01OTksMTAg KzU5OSw5IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpwcmVwYXJlVG9QbGF5KCkKICAgICAg ICAgcmVzdW1lTG9hZCgpOwogfQogCi1QbGF0Zm9ybU1lZGlhIE1lZGlhUGxheWVyUHJpdmF0ZTo6 cGxhdGZvcm1NZWRpYSgpIGNvbnN0CitQbGF0Zm9ybU1lZGlhKiBNZWRpYVBsYXllclByaXZhdGU6 OnBsYXRmb3JtTWVkaWEoKSBjb25zdAogewotICAgIFBsYXRmb3JtTWVkaWEgcGxhZnRmb3JtTWVk aWEgPSB7IG1fcXRNb3ZpZS5nZXQoKSB9OwotICAgIHJldHVybiBwbGFmdGZvcm1NZWRpYTsKKyAg ICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxQbGF0Zm9ybU1lZGlhKj4obV9xdE1vdmllLmdldCgp KTsKIH0KIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdp bi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVR dWlja1RpbWVXaW4uY3BwCmluZGV4IDE3M2JjYzguLjY0Y2FkZjMgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdpbi5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRl UXVpY2tUaW1lV2luLmNwcApAQCAtMTExLDExICsxMTEsOSBAQCBib29sIE1lZGlhUGxheWVyUHJp dmF0ZTo6c3VwcG9ydHNGdWxsc2NyZWVuKCkgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot UGxhdGZvcm1NZWRpYSBNZWRpYVBsYXllclByaXZhdGU6OnBsYXRmb3JtTWVkaWEoKSBjb25zdAor UGxhdGZvcm1NZWRpYSogTWVkaWFQbGF5ZXJQcml2YXRlOjpwbGF0Zm9ybU1lZGlhKCkgY29uc3QK IHsKLSAgICBQbGF0Zm9ybU1lZGlhIHA7Ci0gICAgcC5xdE1vdmllID0gcmVpbnRlcnByZXRfY2Fz dDxRVE1vdmllKj4obV9xdE1vdmllLmdldCgpKTsKLSAgICByZXR1cm4gcDsKKyAgICByZXR1cm4g cmVpbnRlcnByZXRfY2FzdDxQbGF0Zm9ybU1lZGlhKj4obV9xdE1vdmllLmdldCgpKTsKIH0KIAog I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdpbi5oIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2lu LmgKaW5kZXggZWNkYjlkYS4uNWQzOTlhYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmgKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmgK QEAgLTc2LDcgKzc2LDcgQEAgcHJpdmF0ZToKICAgICBNZWRpYVBsYXllclByaXZhdGUoTWVkaWFQ bGF5ZXIqKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0Z1bGxzY3JlZW4oKSBjb25zdDsK LSAgICB2aXJ0dWFsIFBsYXRmb3JtTWVkaWEgcGxhdGZvcm1NZWRpYSgpIGNvbnN0OworICAgIHZp cnR1YWwgUGxhdGZvcm1NZWRpYSogcGxhdGZvcm1NZWRpYSgpIGNvbnN0OwogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKICAgICBQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKCkg Y29uc3Q7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKaW5kZXggZWE3ZTZmZi4uN2NmOWI1YSAxMDA2NDQKLS0tIGEvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxMC0wNS0xMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBQbGF0 Zm9ybU1lZGlhIGEgdHlwZWRlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzYxMTIKKworICAgICAgICBVc2UgdGhlIG5ldyBQbGF0Zm9ybU1lZGlhIHR5 cGUuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06 CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgd2luZG93RGlkTG9hZF0p OgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHNldE1lZGlhRWxlbWVu dDpXZWJDb3JlOjpdKToKKwogMjAxMC0wNS0wNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcgYW5kIFNpbW9uIEZy YXNlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5D b250cm9sbGVyLm1tIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0KaW5kZXggMjFlNDgxNC4uMDlhZGJiMSAxMDA2NDQKLS0tIGEvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KKysrIGIvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KQEAgLTk0LDcgKzk0LDcgQEAg U09GVF9MSU5LX1BPSU5URVIoUVRLaXQsIFFUTW92aWVSYXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9u LCBOU1N0cmluZyAqKQogICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRMYXllcjpsYXllcl07 CiAgICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldFdhbnRzTGF5ZXI6WUVTXTsKICAgICBpZiAo X21lZGlhRWxlbWVudCkKLSAgICAgICAgW2xheWVyIHNldE1vdmllOl9tZWRpYUVsZW1lbnQtPnBs YXRmb3JtTWVkaWEoKS5xdE1vdmllXTsKKyAgICAgICAgW2xheWVyIHNldE1vdmllOihRVE1vdmll KikgX21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpXTsKICAgICBbd2luZG93IHNldEhhc1No YWRvdzpZRVNdOyAvLyBUaGlzIGlzIG5pY2VyIHdpdGggYSBzaGFkb3cuCiAgICAgW3dpbmRvdyBz ZXRMZXZlbDpOU1BvcFVwTWVudVdpbmRvd0xldmVsLTFdOwogICAgIFtsYXllciByZWxlYXNlXTsK QEAgLTExNCw5ICsxMTQsOCBAQCBTT0ZUX0xJTktfUE9JTlRFUihRVEtpdCwgUVRNb3ZpZVJhdGVE aWRDaGFuZ2VOb3RpZmljYXRpb24sIE5TU3RyaW5nICopCiAjZWxzZQogICAgIF9tZWRpYUVsZW1l bnQgPSBtZWRpYUVsZW1lbnQ7CiAgICAgaWYgKFtzZWxmIGlzV2luZG93TG9hZGVkXSkgewotICAg ICAgICBRVE1vdmllICptb3ZpZSA9IF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5xdE1v dmllOworICAgICAgICBRVE1vdmllICptb3ZpZSA9IChRVE1vdmllKikgX21lZGlhRWxlbWVudC0+ cGxhdGZvcm1NZWRpYSgpOwogICAgICAgICBRVE1vdmllTGF5ZXIgKm1vdmllTGF5ZXIgPSAoUVRN b3ZpZUxheWVyICopW1tbc2VsZiBmdWxsc2NyZWVuV2luZG93XSBjb250ZW50Vmlld10gbGF5ZXJd OwotCiAgICAgICAgIEFTU0VSVChtb3ZpZUxheWVyICYmIFttb3ZpZUxheWVyIGlzS2luZE9mQ2xh c3M6W2dldFFUTW92aWVMYXllckNsYXNzKCkgY2xhc3NdXSk7CiAgICAgICAgIEFTU0VSVChtb3Zp ZSk7CiAgICAgICAgIFttb3ZpZUxheWVyIHNldE1vdmllOm1vdmllXTsKZGlmZiAtLWdpdCBhL1dl YktpdC93aW4vQ2hhbmdlTG9nIGIvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYTY1YmZkYi4u NWMxODMyMyAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3dp bi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNS0xMCAgUGhpbGlwcGUgTm9ybWFu ZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBQbGF0Zm9ybU1lZGlhIGEgdHlwZWRlZgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYxMTIKKworICAgICAgICBV c2UgdGhlIG5ldyBQbGF0Zm9ybU1lZGlhIHR5cGUuCisKKyAgICAgICAgKiBGdWxsc2NyZWVuVmlk ZW9Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKEZ1bGxzY3JlZW5WaWRlb0NvbnRyb2xsZXI6Om1v dmllKToKKwogMjAxMC0wNS0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdC93 aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAgYi9XZWJLaXQvd2luL0Z1bGxzY3JlZW5W aWRlb0NvbnRyb2xsZXIuY3BwCmluZGV4IDFmZjBlZjEuLmEzNWMwYjggMTAwNjQ0Ci0tLSBhL1dl YktpdC93aW4vRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlci5jcHAKKysrIGIvV2ViS2l0L3dpbi9G dWxsc2NyZWVuVmlkZW9Db250cm9sbGVyLmNwcApAQCAtMTk0LDcgKzE5NCw3IEBAIEZ1bGxzY3Jl ZW5WaWRlb0NvbnRyb2xsZXI6On5GdWxsc2NyZWVuVmlkZW9Db250cm9sbGVyKCkKIAogUVRNb3Zp ZUdXb3JsZCogRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlcjo6bW92aWUoKSBjb25zdAogewotICAg IHJldHVybiBtX21lZGlhRWxlbWVudCA/IHJlaW50ZXJwcmV0X2Nhc3Q8UVRNb3ZpZUdXb3JsZCo+ KG1fbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZSkgOiAwOworICAgIHJldHVy biBtX21lZGlhRWxlbWVudCA/IHJlaW50ZXJwcmV0X2Nhc3Q8UVRNb3ZpZUdXb3JsZCo+KHJlaW50 ZXJwcmV0X2Nhc3Q8UVRNb3ZpZSo+KG1fbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkpKSA6 IDA7CiB9CiAKIHZvaWQgRnVsbHNjcmVlblZpZGVvQ29udHJvbGxlcjo6c2V0TWVkaWFFbGVtZW50 KEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCkKLS0gCjEuNy4x