130603 2014-03-21 10:19:35 -0700 [iOS] Enable caption support in full screen. 2014-03-25 16:43:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble calvaris commit-queue eric.carlson glenn philipj sergio oldest_to_newest 993181 0 jer.noble 2014-03-21 10:19:35 -0700 [iOS] Enable caption support in full screen. 993182 1 227450 jer.noble 2014-03-21 10:21:47 -0700 Created attachment 227450 Patch 994262 2 227775 jer.noble 2014-03-25 11:37:04 -0700 Created attachment 227775 Patch 994319 3 227775 eric.carlson 2014-03-25 13:53:41 -0700 Comment on attachment 227775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227775&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:33 > +#include <wtf/WeakPtr.h> Is this required? > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:814 > + CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : (CGRect)frame; Can't you use static_cast<CGRect>() ? > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:1493 > + CGRect frame = CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height()); Nit: this local isn't really necessary. 994409 4 jer.noble 2014-03-25 15:39:02 -0700 (In reply to comment #3) > (From update of attachment 227775 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227775&action=review > > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:33 > > +#include <wtf/WeakPtr.h> > > Is this required? Nope. Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:814 > > + CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : (CGRect)frame; > > Can't you use static_cast<CGRect>() ? Yep. Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:1493 > > + CGRect frame = CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height()); > > Nit: this local isn't really necessary. Sure ain't. 994439 5 jer.noble 2014-03-25 16:43:41 -0700 Committed r166268: <http://trac.webkit.org/changeset/166268> 227450 2014-03-21 10:21:47 -0700 2014-03-25 11:37:00 -0700 Patch bug-130603-20140321102127.patch text/plain 6620 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNjZGQ2ODAxNTQwZDEy MWU1NjUwY2ZkNGE5NjFhZTc1NGM3ZDAwYy4uNDljZTdiMTM0MzA1ODdhNDU5MjdkMTllNjIwNDMw ZjZhODJlZmNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAzLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEVuYWJsZSBjYXB0 aW9uIHN1cHBvcnQgaW4gZnVsbCBzY3JlZW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgVGV4dFRyYWNrUmVwcmVzZW50YXRpb24gc3VwcG9ydCB0 byBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKTog QWRkIHRoZSBtX3RleHRUcmFja1JlcHJlc2VuYXRpb25MYXllciBpZiBwcmVzZW50LgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2V0VmlkZW9G dWxsc2NyZWVuTGF5ZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OnJlcXVpcmVzVGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOiBU cnVlLCBpZiBhIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIgaXMgcHJlc2VudC4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNldFRleHRUcmFja1Jl cHJlc2VudGF0aW9uKTogUmVtb3ZlIHRoZSBvbGQsIGFuZCBhZGQgdGhlIG5ldyBtX3RleHRUcmFj a1JlcHJlc2VuYXRpb25MYXllci4KKwogMjAxNC0wMy0yMCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxn aGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXJnZSBXZWJWVFQgVG9rZW5pemVyIFVwZGF0ZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakMuaAppbmRleCBiOGZmMTFmYzgwMDIyMzA4ZGIwNzk0ZGI4MTA0OWMx NTJkMGUxMmY5Li4zZmNlNDYwZGE1MTM1OTU1Y2VkOTUyYjEzZjUyMWI5YjlhZGFjZDFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy5oCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJNZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb24uaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2lu Y2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIE9CSkNfQ0xBU1MgQVZBc3NldEltYWdlR2VuZXJhdG9y OwogT0JKQ19DTEFTUyBBVkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVxdWVzdDsKQEAgLTE5MCw3ICsx OTEsMTIgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVmlkZW9MYXllckdyYXZp dHkoKSBvdmVycmlkZTsKIAogICAgIHZpcnR1YWwgYm9vbCBoYXNTaW5nbGVTZWN1cml0eU9yaWdp bigpIGNvbnN0OwotICAgIAorCisjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQorICAgIHZpcnR1YWwg Ym9vbCByZXF1aXJlc1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7Cisg ICAgdmlydHVhbCB2b2lkIHNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKFRleHRUcmFja1JlcHJl c2VudGF0aW9uKikgb3ZlcnJpZGU7CisjZW5kaWYKKwogICAgIHZvaWQgY3JlYXRlSW1hZ2VHZW5l cmF0b3IoKTsKICAgICB2b2lkIGRlc3Ryb3lJbWFnZUdlbmVyYXRvcigpOwogICAgIFJldGFpblB0 cjxDR0ltYWdlUmVmPiBjcmVhdGVJbWFnZUZvclRpbWVJblJlY3QoZmxvYXQsIGNvbnN0IEludFJl Y3QmKTsKQEAgLTI1NCw2ICsyNjAsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxQbGF0Zm9y bUxheWVyPiBtX3ZpZGVvRnVsbHNjcmVlbkxheWVyOwogICAgIEZsb2F0UmVjdCBtX3ZpZGVvRnVs bHNjcmVlbkZyYW1lOwogICAgIE1lZGlhUGxheWVyOjpWaWRlb0dyYXZpdHkgbV92aWRlb0Z1bGxz Y3JlZW5HcmF2aXR5OworICAgIFJldGFpblB0cjxQbGF0Zm9ybUxheWVyPiBtX3RleHRUcmFja1Jl cHJlc2VudGF0aW9uTGF5ZXI7CiAjZW5kaWYKICAgICBSZXRhaW5QdHI8V2ViQ29yZUFWRk1vdmll T2JzZXJ2ZXI+IG1fb2JqY09ic2VydmVyOwogICAgIFJldGFpblB0cjxpZD4gbV90aW1lT2JzZXJ2 ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCBhMDJiMmY3NThkYjNiYTAyNTY5NWI0OWYw MzVmNmE3MjM0NjYzNGNkLi45MzhiMTZmMDYzZDMwNTZhYTdmZDEyM2ZkMmU3YjFlN2MyNmM5N2M0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTQ4LDYgKzQ4LDcgQEAKICNpbXBvcnQgIlBs YXRmb3JtVGltZVJhbmdlcy5oIgogI2ltcG9ydCAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbXBvcnQg IlNvZnRMaW5raW5nLmgiCisjaW1wb3J0ICJUZXh0VHJhY2tSZXByZXNlbnRhdGlvbi5oIgogI2lt cG9ydCAiVVVJRC5oIgogI2ltcG9ydCAiVmlkZW9UcmFja1ByaXZhdGVBVkZPYmpDLmgiCiAjaW1w b3J0ICJXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIuaCIKQEAgLTUwNCw3ICs1MDUsNyBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIoKQog I2lmIFBMQVRGT1JNKElPUykKICAgICAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIpIHsK ICAgICAgICAgICAgIFttX3ZpZGVvTGF5ZXIgc2V0RnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCBtX3Zp ZGVvRnVsbHNjcmVlbkZyYW1lLndpZHRoKCksIG1fdmlkZW9GdWxsc2NyZWVuRnJhbWUuaGVpZ2h0 KCkpXTsKLSAgICAgICAgICAgIFttX3ZpZGVvRnVsbHNjcmVlbkxheWVyIGFkZFN1YmxheWVyOm1f dmlkZW9MYXllci5nZXQoKV07CisgICAgICAgICAgICBbbV92aWRlb0Z1bGxzY3JlZW5MYXllciBp bnNlcnRTdWJsYXllcjptX3ZpZGVvTGF5ZXIuZ2V0KCkgYXRJbmRleDowXTsKICAgICAgICAgfQog I2VuZGlmCiAgICAgICAgIHBsYXllcigpLT5tZWRpYVBsYXllckNsaWVudCgpLT5tZWRpYVBsYXll clJlbmRlcmluZ01vZGVDaGFuZ2VkKHBsYXllcigpKTsKQEAgLTc4NiwxMSArNzg3LDE3IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2V0VmlkZW9GdWxsc2NyZWVu TGF5ZXIoUGxhdGZvcm1MYXllcioKIAogICAgIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIgPSB2aWRl b0Z1bGxzY3JlZW5MYXllcjsKIAotICAgIGlmICghbV92aWRlb0Z1bGxzY3JlZW5MYXllciB8fCAh bV92aWRlb0xheWVyKQotICAgICAgICByZXR1cm47CisgICAgQ0dSZWN0IGZyYW1lID0gQ0dSZWN0 TWFrZSgwLCAwLCBtX3ZpZGVvRnVsbHNjcmVlbkZyYW1lLndpZHRoKCksIG1fdmlkZW9GdWxsc2Ny ZWVuRnJhbWUuaGVpZ2h0KCkpOworCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIgJiYg bV92aWRlb0xheWVyKSB7CisgICAgICAgIFttX3ZpZGVvTGF5ZXIgc2V0RnJhbWU6ZnJhbWVdOwor ICAgICAgICBbbV92aWRlb0Z1bGxzY3JlZW5MYXllciBpbnNlcnRTdWJsYXllcjptX3ZpZGVvTGF5 ZXIuZ2V0KCkgYXRJbmRleDowXTsKKyAgICB9CiAKLSAgICBbbV92aWRlb0xheWVyIHNldEZyYW1l OkNHUmVjdE1ha2UoMCwgMCwgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZS53aWR0aCgpLCBtX3ZpZGVv RnVsbHNjcmVlbkZyYW1lLmhlaWdodCgpKV07Ci0gICAgW21fdmlkZW9GdWxsc2NyZWVuTGF5ZXIg YWRkU3VibGF5ZXI6bV92aWRlb0xheWVyLmdldCgpXTsKKyAgICBpZiAobV92aWRlb0Z1bGxzY3Jl ZW5MYXllciAmJiBtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIpIHsKKyAgICAgICAgW21f dGV4dFRyYWNrUmVwcmVzZW50YXRpb25MYXllciBzZXRGcmFtZTpmcmFtZV07CisgICAgICAgIFtt X3ZpZGVvRnVsbHNjcmVlbkxheWVyIGFkZFN1YmxheWVyOm1fdGV4dFRyYWNrUmVwcmVzZW50YXRp b25MYXllci5nZXQoKV07CisgICAgfQogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakM6OnNldFZpZGVvRnVsbHNjcmVlbkZyYW1lKEZsb2F0UmVjdCBmcmFtZSkKQEAg LTE0NTMsNiArMTQ2MCw0MiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OnVwZGF0ZVZpZGVvVHJhY2tzKCkKIHsKICAgICBkZXRlcm1pbmVDaGFuZ2VkVHJhY2tzRnJv bU5ld1RyYWNrc0FuZE9sZEl0ZW1zKG1fY2FjaGVkVHJhY2tzLmdldCgpLCBBVk1lZGlhVHlwZVZp ZGVvLCBtX3ZpZGVvVHJhY2tzLCAmVmlkZW9UcmFja1ByaXZhdGVBVkZPYmpDOjpjcmVhdGUsIHBs YXllcigpLCAmTWVkaWFQbGF5ZXI6OnJlbW92ZVZpZGVvVHJhY2ssICZNZWRpYVBsYXllcjo6YWRk VmlkZW9UcmFjayk7CiB9CisKK2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6cmVxdWlyZXNUZXh0VHJhY2tSZXByZXNlbnRhdGlvbigpIGNvbnN0Cit7CisjaWYgUExBVEZP Uk0oSU9TKQorICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbkxheWVyKQorICAgICAgICByZXR1cm4g dHJ1ZTsKKyNlbmRpZgorICAgIHJldHVybiBmYWxzZTsKK30KKwordm9pZCBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzZXRUZXh0VHJhY2tSZXByZXNlbnRhdGlvbihUZXh0VHJh Y2tSZXByZXNlbnRhdGlvbiogcmVwcmVzZW50YXRpb24pCit7CisjaWYgUExBVEZPUk0oSU9TKQor ICAgIFBsYXRmb3JtTGF5ZXIqIHJlcHJlc2VudGF0aW9uTGF5ZXIgPSByZXByZXNlbnRhdGlvbiA/ IHJlcHJlc2VudGF0aW9uLT5wbGF0Zm9ybUxheWVyKCkgOiBuaWw7CisgICAgaWYgKHJlcHJlc2Vu dGF0aW9uTGF5ZXIgPT0gbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVyKQorICAgICAgICBy ZXR1cm47CisKKyAgICBpZiAobV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVyKQorICAgICAg ICBbbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVyIHJlbW92ZUZyb21TdXBlcmxheWVyXTsK KworICAgIG1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb25MYXllciA9IHJlcHJlc2VudGF0aW9uTGF5 ZXI7CisKKyAgICBpZiAobV92aWRlb0Z1bGxzY3JlZW5MYXllciAmJiBtX3RleHRUcmFja1JlcHJl c2VudGF0aW9uTGF5ZXIpIHsKKyAgICAgICAgW21fdGV4dFRyYWNrUmVwcmVzZW50YXRpb25MYXll ciBzZXRGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIG1fdmlkZW9GdWxsc2NyZWVuRnJhbWUud2lkdGgo KSwgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZS5oZWlnaHQoKSldOworICAgICAgICBbbV92aWRlb0Z1 bGxzY3JlZW5MYXllciBhZGRTdWJsYXllcjptX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIu Z2V0KCldOworCisjaWZuZGVmIE5ERUJVRworICAgICAgICBbbV90ZXh0VHJhY2tSZXByZXNlbnRh dGlvbkxheWVyIHNldEJvcmRlckNvbG9yOmNhY2hlZENHQ29sb3IoMHhGRkZGMDAwMCwgQ29sb3JT cGFjZURldmljZVJHQildOworICAgICAgICBbbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVy IHNldEJvcmRlcldpZHRoOjJdOworI2VuZGlmCisgICAgfQorCisjZWxzZQorICAgIFVOVVNFRF9Q QVJBTShyZXByZXNlbnRhdGlvbik7CisjZW5kaWYKK30KICNlbmRpZiAvLyBFTkFCTEUoVklERU9f VFJBQ0spCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2l6ZUNo YW5nZWQoKQo= 227775 2014-03-25 11:37:04 -0700 2014-03-25 13:53:41 -0700 Patch bug-130603-20140325113647.patch text/plain 8024 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTlmMjU1ZmIwNWZlZjEy MDg4NjFjN2U2ZjhkNWU5ZWUyNmRhMjBmMS4uOTk4M2U0MzE2ZTE3ZGE0ZjI0MzIwNTRmNmQ3MWRl NGUxZjVhNTIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTIxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEVuYWJsZSBjYXB0 aW9uIHN1cHBvcnQgaW4gZnVsbCBzY3JlZW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgVGV4dFRyYWNrUmVwcmVzZW50YXRpb24gc3VwcG9ydCB0 byBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKTog QWRkIHRoZSBtX3RleHRUcmFja1JlcHJlc2VuYXRpb25MYXllciBpZiBwcmVzZW50LgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2V0VmlkZW9G dWxsc2NyZWVuTGF5ZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OnJlcXVpcmVzVGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOiBU cnVlLCBpZiBhIG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIgaXMgcHJlc2VudC4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNldFRleHRUcmFja1Jl cHJlc2VudGF0aW9uKTogUmVtb3ZlIHRoZSBvbGQsIGFuZCBhZGQgdGhlIG5ldyBtX3RleHRUcmFj a1JlcHJlc2VuYXRpb25MYXllci4KKworICAgICAgICBNYWtlIHRoZSB0ZXh0IHRyYWNrIGNvbnRh aW5lciBhIHN0YWNraW5nIGNvbnRleHQgZm9yIHBhaW50aW5nIHB1cnBvc2VzLgorICAgICAgICAq IE1vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzczoKKyAgICAgICAgKHZp ZGVvOjotd2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyKToKKwogMjAxNC0wMy0yMSAg QnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXJnZSBWVFRT Y2FubmVyIENvZGUgZnJvbSBCbGluawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3NzIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3NzCmluZGV4IDNjODU4NjQzMTJl ZDJjY2Q4NzIxOTMxNWExMjg4NTVjN2Y1ZjY1NWQuLmRhNzI3MmE2NDUyY2ViZjViYmU3ZjcyMTZi OTEzOTNhNzZiZmQ4ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFj b250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3MKQEAgLTI5NSw2ICsyOTUsNyBAQCB2 aWRlbzo6LXdlYmtpdC1tZWRpYS10ZXh0LXRyYWNrLWNvbnRhaW5lciB7CiAgICAgd2lkdGg6IDEw MCU7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICBwYWRkaW5nLWJvdHRvbTogNXB4OworICAg IHotaW5kZXg6IDA7CiAKICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAgICAgY29sb3I6IHJnYmEo MjU1LCAyNTUsIDI1NSwgMSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKaW5kZXggYjhmZjExZmM4MDAy MjMwOGRiMDc5NGRiODEwNDljMTUyZDBlMTJmOS4uM2ZjZTQ2MGRhNTEzNTk1NWNlZDk1MmIxM2Y1 MjFiOWI5YWRhY2QxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaApAQCAtMzAsNiArMzAsNyBAQAog CiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgiCiAjaW5jbHVkZSA8 d3RmL0hhc2hNYXAuaD4KKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBPQkpDX0NMQVNTIEFW QXNzZXRJbWFnZUdlbmVyYXRvcjsKIE9CSkNfQ0xBU1MgQVZBc3NldFJlc291cmNlTG9hZGluZ1Jl cXVlc3Q7CkBAIC0xOTAsNyArMTkxLDEyIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZVZpZGVvTGF5ZXJHcmF2aXR5KCkgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFz U2luZ2xlU2VjdXJpdHlPcmlnaW4oKSBjb25zdDsKLSAgICAKKworI2lmIEVOQUJMRShWSURFT19U UkFDSykKKyAgICB2aXJ0dWFsIGJvb2wgcmVxdWlyZXNUZXh0VHJhY2tSZXByZXNlbnRhdGlvbigp IGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0VHJhY2tSZXByZXNlbnRh dGlvbihUZXh0VHJhY2tSZXByZXNlbnRhdGlvbiopIG92ZXJyaWRlOworI2VuZGlmCisKICAgICB2 b2lkIGNyZWF0ZUltYWdlR2VuZXJhdG9yKCk7CiAgICAgdm9pZCBkZXN0cm95SW1hZ2VHZW5lcmF0 b3IoKTsKICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY3JlYXRlSW1hZ2VGb3JUaW1lSW5SZWN0 KGZsb2F0LCBjb25zdCBJbnRSZWN0Jik7CkBAIC0yNTQsNiArMjYwLDcgQEAgcHJpdmF0ZToKICAg ICBSZXRhaW5QdHI8UGxhdGZvcm1MYXllcj4gbV92aWRlb0Z1bGxzY3JlZW5MYXllcjsKICAgICBG bG9hdFJlY3QgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZTsKICAgICBNZWRpYVBsYXllcjo6VmlkZW9H cmF2aXR5IG1fdmlkZW9GdWxsc2NyZWVuR3Jhdml0eTsKKyAgICBSZXRhaW5QdHI8UGxhdGZvcm1M YXllcj4gbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVyOwogI2VuZGlmCiAgICAgUmV0YWlu UHRyPFdlYkNvcmVBVkZNb3ZpZU9ic2VydmVyPiBtX29iamNPYnNlcnZlcjsKICAgICBSZXRhaW5Q dHI8aWQ+IG1fdGltZU9ic2VydmVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggYTAyYjJm NzU4ZGIzYmEwMjU2OTViNDlmMDM1ZjZhNzIzNDY2MzRjZC4uNWNjYmYyMGRmNDYyN2ZmY2JlZDAx MTA0NmZhODY4NzE1OThmMjk1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u T2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC00OCw2ICs0 OCw3IEBACiAjaW1wb3J0ICJQbGF0Zm9ybVRpbWVSYW5nZXMuaCIKICNpbXBvcnQgIlNlY3VyaXR5 T3JpZ2luLmgiCiAjaW1wb3J0ICJTb2Z0TGlua2luZy5oIgorI2ltcG9ydCAiVGV4dFRyYWNrUmVw cmVzZW50YXRpb24uaCIKICNpbXBvcnQgIlVVSUQuaCIKICNpbXBvcnQgIlZpZGVvVHJhY2tQcml2 YXRlQVZGT2JqQy5oIgogI2ltcG9ydCAiV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLmgiCkBAIC01 MDQsNyArNTA1LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpj cmVhdGVWaWRlb0xheWVyKCkKICNpZiBQTEFURk9STShJT1MpCiAgICAgICAgIGlmIChtX3ZpZGVv RnVsbHNjcmVlbkxheWVyKSB7CiAgICAgICAgICAgICBbbV92aWRlb0xheWVyIHNldEZyYW1lOkNH UmVjdE1ha2UoMCwgMCwgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZS53aWR0aCgpLCBtX3ZpZGVvRnVs bHNjcmVlbkZyYW1lLmhlaWdodCgpKV07Ci0gICAgICAgICAgICBbbV92aWRlb0Z1bGxzY3JlZW5M YXllciBhZGRTdWJsYXllcjptX3ZpZGVvTGF5ZXIuZ2V0KCldOworICAgICAgICAgICAgW21fdmlk ZW9GdWxsc2NyZWVuTGF5ZXIgaW5zZXJ0U3VibGF5ZXI6bV92aWRlb0xheWVyLmdldCgpIGF0SW5k ZXg6MF07CiAgICAgICAgIH0KICNlbmRpZgogICAgICAgICBwbGF5ZXIoKS0+bWVkaWFQbGF5ZXJD bGllbnQoKS0+bWVkaWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZChwbGF5ZXIoKSk7CkBAIC03 ODYsMjAgKzc4NywzMyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OnNldFZpZGVvRnVsbHNjcmVlbkxheWVyKFBsYXRmb3JtTGF5ZXIqCiAKICAgICBtX3ZpZGVvRnVs bHNjcmVlbkxheWVyID0gdmlkZW9GdWxsc2NyZWVuTGF5ZXI7CiAKLSAgICBpZiAoIW1fdmlkZW9G dWxsc2NyZWVuTGF5ZXIgfHwgIW1fdmlkZW9MYXllcikKLSAgICAgICAgcmV0dXJuOworICAgIENH UmVjdCBmcmFtZSA9IENHUmVjdE1ha2UoMCwgMCwgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZS53aWR0 aCgpLCBtX3ZpZGVvRnVsbHNjcmVlbkZyYW1lLmhlaWdodCgpKTsKKworICAgIGlmIChtX3ZpZGVv RnVsbHNjcmVlbkxheWVyICYmIG1fdmlkZW9MYXllcikgeworICAgICAgICBbbV92aWRlb0xheWVy IHNldEZyYW1lOmZyYW1lXTsKKyAgICAgICAgW21fdmlkZW9GdWxsc2NyZWVuTGF5ZXIgaW5zZXJ0 U3VibGF5ZXI6bV92aWRlb0xheWVyLmdldCgpIGF0SW5kZXg6MF07CisgICAgfQogCi0gICAgW21f dmlkZW9MYXllciBzZXRGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIG1fdmlkZW9GdWxsc2NyZWVuRnJh bWUud2lkdGgoKSwgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZS5oZWlnaHQoKSldOwotICAgIFttX3Zp ZGVvRnVsbHNjcmVlbkxheWVyIGFkZFN1YmxheWVyOm1fdmlkZW9MYXllci5nZXQoKV07CisgICAg aWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIgJiYgbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxh eWVyKSB7CisgICAgICAgIENHUmVjdCB0ZXh0RnJhbWUgPSBtX3ZpZGVvTGF5ZXIgPyBbbV92aWRl b0xheWVyIHZpZGVvUmVjdF0gOiBmcmFtZTsKKyAgICAgICAgW21fdGV4dFRyYWNrUmVwcmVzZW50 YXRpb25MYXllciBzZXRGcmFtZTp0ZXh0RnJhbWVdOworICAgICAgICBbbV92aWRlb0Z1bGxzY3Jl ZW5MYXllciBhZGRTdWJsYXllcjptX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIuZ2V0KCld OworICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpz ZXRWaWRlb0Z1bGxzY3JlZW5GcmFtZShGbG9hdFJlY3QgZnJhbWUpCiB7CiAgICAgbV92aWRlb0Z1 bGxzY3JlZW5GcmFtZSA9IGZyYW1lOwotICAgIGlmICghbV92aWRlb0Z1bGxzY3JlZW5MYXllciB8 fCAhbV92aWRlb0xheWVyKQorICAgIGlmICghbV92aWRlb0Z1bGxzY3JlZW5MYXllcikKICAgICAg ICAgcmV0dXJuOwotICAgIAotICAgIFttX3ZpZGVvTGF5ZXIgc2V0RnJhbWU6Q0dSZWN0TWFrZSgw LCAwLCBmcmFtZS53aWR0aCgpLCBmcmFtZS5oZWlnaHQoKSldOworCisgICAgaWYgKG1fdmlkZW9M YXllcikKKyAgICAgICAgW21fdmlkZW9MYXllciBzZXRGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIGZy YW1lLndpZHRoKCksIGZyYW1lLmhlaWdodCgpKV07CisKKyAgICBpZiAobV90ZXh0VHJhY2tSZXBy ZXNlbnRhdGlvbkxheWVyKSB7CisgICAgICAgIENHUmVjdCB0ZXh0RnJhbWUgPSBtX3ZpZGVvTGF5 ZXIgPyBbbV92aWRlb0xheWVyIHZpZGVvUmVjdF0gOiAoQ0dSZWN0KWZyYW1lOworICAgICAgICBb bV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVyIHNldEZyYW1lOnRleHRGcmFtZV07CisgICAg fQogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNldFZpZGVv RnVsbHNjcmVlbkdyYXZpdHkoTWVkaWFQbGF5ZXI6OlZpZGVvR3Jhdml0eSBncmF2aXR5KQpAQCAt MTQ1Myw2ICsxNDY3LDQwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6dXBkYXRlVmlkZW9UcmFja3MoKQogewogICAgIGRldGVybWluZUNoYW5nZWRUcmFja3NGcm9t TmV3VHJhY2tzQW5kT2xkSXRlbXMobV9jYWNoZWRUcmFja3MuZ2V0KCksIEFWTWVkaWFUeXBlVmlk ZW8sIG1fdmlkZW9UcmFja3MsICZWaWRlb1RyYWNrUHJpdmF0ZUFWRk9iakM6OmNyZWF0ZSwgcGxh eWVyKCksICZNZWRpYVBsYXllcjo6cmVtb3ZlVmlkZW9UcmFjaywgJk1lZGlhUGxheWVyOjphZGRW aWRlb1RyYWNrKTsKIH0KKworYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD OjpyZXF1aXJlc1RleHRUcmFja1JlcHJlc2VudGF0aW9uKCkgY29uc3QKK3sKKyNpZiBQTEFURk9S TShJT1MpCisgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuTGF5ZXIpCisgICAgICAgIHJldHVybiB0 cnVlOworI2VuZGlmCisgICAgcmV0dXJuIGZhbHNlOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OnNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKFRleHRUcmFj a1JlcHJlc2VudGF0aW9uKiByZXByZXNlbnRhdGlvbikKK3sKKyNpZiBQTEFURk9STShJT1MpCisg ICAgUGxhdGZvcm1MYXllciogcmVwcmVzZW50YXRpb25MYXllciA9IHJlcHJlc2VudGF0aW9uID8g cmVwcmVzZW50YXRpb24tPnBsYXRmb3JtTGF5ZXIoKSA6IG5pbDsKKyAgICBpZiAocmVwcmVzZW50 YXRpb25MYXllciA9PSBtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIpCisgICAgICAgIHJl dHVybjsKKworICAgIGlmIChtX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIpCisgICAgICAg IFttX3RleHRUcmFja1JlcHJlc2VudGF0aW9uTGF5ZXIgcmVtb3ZlRnJvbVN1cGVybGF5ZXJdOwor CisgICAgbV90ZXh0VHJhY2tSZXByZXNlbnRhdGlvbkxheWVyID0gcmVwcmVzZW50YXRpb25MYXll cjsKKworICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbkxheWVyICYmIG1fdGV4dFRyYWNrUmVwcmVz ZW50YXRpb25MYXllcikgeworICAgICAgICBDR1JlY3QgZnJhbWUgPSBDR1JlY3RNYWtlKDAsIDAs IG1fdmlkZW9GdWxsc2NyZWVuRnJhbWUud2lkdGgoKSwgbV92aWRlb0Z1bGxzY3JlZW5GcmFtZS5o ZWlnaHQoKSk7CisgICAgICAgIENHUmVjdCB0ZXh0RnJhbWUgPSBtX3ZpZGVvTGF5ZXIgPyBbbV92 aWRlb0xheWVyIHZpZGVvUmVjdF0gOiBmcmFtZTsKKworICAgICAgICBbbV90ZXh0VHJhY2tSZXBy ZXNlbnRhdGlvbkxheWVyIHNldEZyYW1lOnRleHRGcmFtZV07CisgICAgICAgIFttX3ZpZGVvRnVs bHNjcmVlbkxheWVyIGFkZFN1YmxheWVyOm1fdGV4dFRyYWNrUmVwcmVzZW50YXRpb25MYXllci5n ZXQoKV07CisgICAgfQorCisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShyZXByZXNlbnRhdGlvbik7 CisjZW5kaWYKK30KICNlbmRpZiAvLyBFTkFCTEUoVklERU9fVFJBQ0spCiAKIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2l6ZUNoYW5nZWQoKQo=