117597 2013-06-13 09:09:26 -0700 Add support for AVFoundation-backed HTMLMediaElements in the WebVideoFullScreenController. 2016-06-14 01:28:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 158729 1 jer.noble jer.noble commit-queue eric.carlson glenn oldest_to_newest 900103 0 jer.noble 2013-06-13 09:09:26 -0700 Add support for AVFoundation-backed HTMLMediaElements in the WebVideoFullScreenController. 900132 1 204623 jer.noble 2013-06-13 09:45:07 -0700 Created attachment 204623 Patch 900194 2 204623 eric.carlson 2013-06-13 10:38:24 -0700 Comment on attachment 204623 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204623&action=review Nice rework! > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:102 > +- (void)setupVideoOverlay:(CALayer*)layer Nit: you should have a space before the "*" > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:146 > + QTMovie* movie = _mediaElement->platformMedia().media.qtMovie; > + QTMovieLayer* layer = [[getQTMovieLayerClass() alloc] init]; Nit: ObjC types get the "*" next to the variable name. > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:159 > + AVPlayer* player = _mediaElement->platformMedia().media.avfMediaPlayer; > + AVPlayerLayer* layer = [[getAVPlayerLayerClass() alloc] init]; Ditto. > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:194 > + CALayer* layer = [[[self window] contentView] layer]; Ditto. > Source/WebCore/platform/mac/WebVideoFullscreenController.mm:433 > // MARK: - > // MARK: QTMovie callbacks > Nit: you might want to move this below rateChanged: since it is no longer QTKit-specific. 900672 3 jer.noble 2013-06-14 15:29:29 -0700 Committed r151608: <http://trac.webkit.org/changeset/151608> 204623 2013-06-13 09:45:07 -0700 2013-06-13 10:38:24 -0700 Patch bug-117597-20130613094325.patch text/plain 9801 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY3NjI2NDcyMmM0Njc0 ZWI5NzA4ZmNmYzUyZTJkY2QzNGU1NmNlMS4uNjJlMzk5YWQwMWJlODg2Nzk3NmU0OTBiYzJiYzM1 MTJhMWM1MzIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTEzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBB VkZvdW5kYXRpb24tYmFja2VkIEhUTUxNZWRpYUVsZW1lbnRzIGluIHRoZSBXZWJWaWRlb0Z1bGxT Y3JlZW5Db250cm9sbGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE3NTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ2hlY2sgZm9yIG1lZGlhIGVsZW1lbnRzIHdpdGggQVZGb3VuZGF0aW9uIG1lZGlh IHR5cGVzIGFuZCBjcmVhdGUgYSBBVlBsYXllckxheWVyCisgICAgICAgIHJhdGhlciB0aGFuIGEg UVRNb3ZpZUxheWVyLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVu Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBz ZXR1cFZpZGVvT3ZlcmxheTpdKTogVGFrZSBhIENBTGF5ZXIgcmF0aGVyIHRoYW4gYQorICAgICAg ICAgICAgUVRNb3ZpZUxheWVyLiBNb3ZlIHRoZSBjb2RlIHdoaWNoIGNvbm5lY3RzIHRoZSBsYXll ciB3aXRoIGl0J3MgbWVkaWEgc291cmNlIGludG8KKyAgICAgICAgICAgIHNldE1lZGlhRWxlbWVu dC4KKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciB3aW5kb3dEaWRMb2Fk XSk6IEdpdmUgdGhlIHdpbmRvdydzIGNvbnRlbnRWaWV3IGEgZ2VuZXJpYworICAgICAgICAgICAg Q0FMYXllciBpbnN0YWVhZCBvZiBhIFFUTW92aWVMYXllci4KKyAgICAgICAgKC1bV2ViVmlkZW9G dWxsc2NyZWVuQ29udHJvbGxlciBzZXRNZWRpYUVsZW1lbnQ6XSk6IFRlc3Qgd2hldGhlciB0aGUg aW5jb21pbmcgbWVkaWEgCisgICAgICAgICAgICBlbGVtZW50IGlzIGJhY2tlZCBieSBhIFFUTW92 aWUgb3IgYW4gQVZQbGF5ZXIsIGFuZCBjcmVhdGUgdGhlIGFwcHJvcHJpYXRlIGxheWVyLgorICAg ICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZEV4aXRGdWxsc2Ny ZWVuXSk6IFJlbW92ZSB0aGUgb2JzZXJ2ZXIgb2YKKyAgICAgICAgICAgIEFWUGxheWVyJ3MgcmF0 ZSBwcm9wZXJ0eS4KKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBvYnNl cnZlVmFsdWVGb3JLZXlQYXRoOm9mT2JqZWN0OmNoYW5nZTpjb250ZXh0Ol0pOgorICAgICAgICAg ICAgSWYgdGhlIGtleVBhdGggaXMgInJhdGUiLCBjYWxsIHJhdGVDaGFuZ2VkLgorCiAyMDEzLTA2 LTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVt b3ZlIHRoZSBub3Rpb24gb2YgaW5hY3RpdmUgcGx1Zy1pbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA2 NDIzMzFjZDljYmYyOWZkMWExNjliMWE5MmVhMjQzNjQzOGFmN2Q3Li4wNTc5ZDZjNzkzNmFkOTU3 N2MxZmM2MGFhM2NiYjhjOGI2NTkzYzEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTMtMDYtMTMgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIHN1cHBvcnQgZm9yIEFWRm91bmRhdGlvbi1iYWNrZWQgSFRNTE1lZGlhRWxlbWVudHMg aW4gdGhlIFdlYlZpZGVvRnVsbFNjcmVlbkNvbnRyb2xsZXIuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc1OTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBBVkZvdW5kYXRpb24gdG8gYmUgZW5h YmxlZCBldmVuIHdoZW4gdGhlIEZ1bGxTY3JlZW4gQVBJIGlzIGRpc2FibGVkLgorCisgICAgICAg ICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0No YW5nZWQ6XSk6IAorCiAyMDEzLTA2LTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHRoZSBub3Rpb24gb2YgaW5hY3RpdmUgcGx1Zy1pbnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3Jl ZW5Db250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5oCmluZGV4IDRhZGNlY2RhNjE0OGE4YzhmOTVmNDJlN2JiOGYwZjll M2YwNGQxMmQuLmRiNGE1YjdiZmUyMzQ5NDcxMWVhMDgzZDk0YzFhMDE2YTk2MDEyNzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250 cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNj cmVlbkNvbnRyb2xsZXIuaApAQCAtMzgsNyArMzgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBA cHJvdG9jb2wgV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckRlbGVnYXRlOwogQGNsYXNzIFdl YlZpZGVvRnVsbHNjcmVlbkhVRFdpbmRvd0NvbnRyb2xsZXI7CiBAY2xhc3MgV2ViV2luZG93RmFk ZUFuaW1hdGlvbjsKLUBjbGFzcyBRVE1vdmllTGF5ZXI7CitAY2xhc3MgQ0FMYXllcjsKIAogQGlu dGVyZmFjZSBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIDogTlNXaW5kb3dDb250cm9sbGVy IHsKIEBwcml2YXRlCkBAIC01OSw3ICs1OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC0gKGlk IDxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyRGVsZWdhdGU+KWRlbGVnYXRlOwogLSAodm9p ZClzZXREZWxlZ2F0ZTooaWQgPFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJEZWxlZ2F0ZT4p ZGVsZWdhdGU7CiAKLS0gKHZvaWQpc2V0dXBWaWRlb092ZXJsYXk6KFFUTW92aWVMYXllciopbGF5 ZXI7CistICh2b2lkKXNldHVwVmlkZW9PdmVybGF5OihDQUxheWVyKilsYXllcjsKIC0gKHZvaWQp c2V0TWVkaWFFbGVtZW50OihXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50KiltZWRpYUVsZW1lbnQ7 CiAtIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50KiltZWRpYUVsZW1lbnQ7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s bGVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIubW0KaW5kZXggZDBmODdlZTVhNzYwZWE0YzFhMzAyMjlhOGEwNTM3OGQxYjkwZTM5 Yy4uNzE5NDA5YWUzNGU3Yjc1MWU3ZTliZDgwYWVjOTU4OTc5NjU4YTcyYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXIubW0KQEAgLTMxLDYgKzMxLDcgQEAKIAogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2Ny ZWVuSFVEV2luZG93Q29udHJvbGxlci5oIgogI2ltcG9ydCAiV2ViV2luZG93QW5pbWF0aW9uLmgi CisjaW1wb3J0IDxBVkZvdW5kYXRpb24vQVZGb3VuZGF0aW9uLmg+CiAjaW1wb3J0IDxDYXJib24v Q2FyYm9uLmg+CiAjaW1wb3J0IDxRVEtpdC9RVEtpdC5oPgogI2ltcG9ydCA8V2ViQ29yZS9EaXNw bGF5U2xlZXBEaXNhYmxlci5oPgpAQCAtNTEsNiArNTIsOSBAQCBTT0ZUX0xJTktfUE9JTlRFUihR VEtpdCwgUVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3RpZmljYXRpb24sIE5TU3RyaW5nICopCiAKICNk ZWZpbmUgUVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3RpZmljYXRpb24gZ2V0UVRNb3ZpZVJhdGVEaWRD aGFuZ2VOb3RpZmljYXRpb24oKQogCitTT0ZUX0xJTktfRlJBTUVXT1JLKEFWRm91bmRhdGlvbikK K1NPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRpb24sIEFWUGxheWVyTGF5ZXIpCisKIEBpbnRlcmZh Y2UgV2ViVmlkZW9GdWxsc2NyZWVuV2luZG93IDogTlNXaW5kb3c8TlNBbmltYXRpb25EZWxlZ2F0 ZT4KIHsKICAgICBTRUwgX2NvbnRyb2xsZXJBY3Rpb25PbkFuaW1hdGlvbkVuZDsKQEAgLTk1LDcg Kzk5LDcgQEAgU09GVF9MSU5LX1BPSU5URVIoUVRLaXQsIFFUTW92aWVSYXRlRGlkQ2hhbmdlTm90 aWZpY2F0aW9uLCBOU1N0cmluZyAqKQogICAgIHJldHVybiAoV2ViVmlkZW9GdWxsc2NyZWVuV2lu ZG93ICopW3N1cGVyIHdpbmRvd107CiB9CiAKLS0gKHZvaWQpc2V0dXBWaWRlb092ZXJsYXk6KFFU TW92aWVMYXllciopbGF5ZXIKKy0gKHZvaWQpc2V0dXBWaWRlb092ZXJsYXk6KENBTGF5ZXIqKWxh eWVyCiB7CiAgICAgV2ViVmlkZW9GdWxsc2NyZWVuV2luZG93ICp3aW5kb3cgPSBbc2VsZiBmdWxs c2NyZWVuV2luZG93XTsKICNpZiBVU0UoR1NUUkVBTUVSKQpAQCAtMTA3LDggKzExMSw2IEBAIFNP RlRfTElOS19QT0lOVEVSKFFUS2l0LCBRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiwg TlNTdHJpbmcgKikKICNlbHNlCiAgICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldExheWVyOmxh eWVyXTsKICAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0V2FudHNMYXllcjpZRVNdOwotICAg IGlmIChfbWVkaWFFbGVtZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50eXBl ID09IFBsYXRmb3JtTWVkaWE6OlFUTW92aWVUeXBlKQotICAgICAgICBbbGF5ZXIgc2V0TW92aWU6 X21lZGlhRWxlbWVudC0+cGxhdGZvcm1NZWRpYSgpLm1lZGlhLnF0TW92aWVdOwogI2VuZGlmCiB9 CiAKQEAgLTExNywxMCArMTE5LDggQEAgU09GVF9MSU5LX1BPSU5URVIoUVRLaXQsIFFUTW92aWVS YXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uLCBOU1N0cmluZyAqKQogICAgIFdlYlZpZGVvRnVsbHNj cmVlbldpbmRvdyAqd2luZG93ID0gW3NlbGYgZnVsbHNjcmVlbldpbmRvd107CiAgICAgW3dpbmRv dyBzZXRIYXNTaGFkb3c6WUVTXTsgLy8gVGhpcyBpcyBuaWNlciB3aXRoIGEgc2hhZG93LgogICAg IFt3aW5kb3cgc2V0TGV2ZWw6TlNQb3BVcE1lbnVXaW5kb3dMZXZlbC0xXTsKLQotICAgIFFUTW92 aWVMYXllciAqbGF5ZXIgPSBbW2dldFFUTW92aWVMYXllckNsYXNzKCkgYWxsb2NdIGluaXRdOwot ICAgIFtzZWxmIHNldHVwVmlkZW9PdmVybGF5OmxheWVyXTsKLSAgICBbbGF5ZXIgcmVsZWFzZV07 CisgICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldExheWVyOltDQUxheWVyIGxheWVyXV07Cisg ICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldFdhbnRzTGF5ZXI6WUVTXTsKIAogI2lmICFVU0Uo R1NUUkVBTUVSKQogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRk T2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoYXBwbGljYXRpb25EaWRSZXNpZ25BY3Rp dmU6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRSZXNpZ25BY3RpdmVOb3RpZmljYXRpb24gb2JqZWN0 Ok5TQXBwXTsKQEAgLTEzNiwxOCArMTM2LDMyIEBAIFNPRlRfTElOS19QT0lOVEVSKFFUS2l0LCBR VE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiwgTlNTdHJpbmcgKikKIC0gKHZvaWQpc2V0 TWVkaWFFbGVtZW50OihIVE1MTWVkaWFFbGVtZW50KiltZWRpYUVsZW1lbnQKIHsKICAgICBfbWVk aWFFbGVtZW50ID0gbWVkaWFFbGVtZW50OworCisgICAgaWYgKCFfbWVkaWFFbGVtZW50KQorICAg ICAgICByZXR1cm47CisKICAgICBpZiAoW3NlbGYgaXNXaW5kb3dMb2FkZWRdKSB7Ci0gICAgICAg IFFUTW92aWVMYXllciAqbW92aWVMYXllciA9IChRVE1vdmllTGF5ZXIgKilbW1tzZWxmIGZ1bGxz Y3JlZW5XaW5kb3ddIGNvbnRlbnRWaWV3XSBsYXllcl07CisgICAgICAgIGlmIChfbWVkaWFFbGVt ZW50LT5wbGF0Zm9ybU1lZGlhKCkudHlwZSA9PSBQbGF0Zm9ybU1lZGlhOjpRVE1vdmllVHlwZSkg eworICAgICAgICAgICAgUVRNb3ZpZSogbW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1l ZGlhKCkubWVkaWEucXRNb3ZpZTsKKyAgICAgICAgICAgIFFUTW92aWVMYXllciogbGF5ZXIgPSBb W2dldFFUTW92aWVMYXllckNsYXNzKCkgYWxsb2NdIGluaXRdOworICAgICAgICAgICAgW2xheWVy IHNldE1vdmllOm1vdmllXTsKKyAgICAgICAgICAgIFtzZWxmIHNldHVwVmlkZW9PdmVybGF5Omxh eWVyXTsKIAotICAgICAgICBBU1NFUlQobW92aWVMYXllciAmJiBbbW92aWVMYXllciBpc0tpbmRP ZkNsYXNzOltnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGNsYXNzXV0pOwotICAgICAgICBbc2VsZiBz ZXR1cFZpZGVvT3ZlcmxheTptb3ZpZUxheWVyXTsKICNpZiAhVVNFKEdTVFJFQU1FUikKLSAgICAg ICAgQVNTRVJUKFttb3ZpZUxheWVyIG1vdmllXSk7Ci0gICAgICAgIFtbTlNOb3RpZmljYXRpb25D ZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdG9yOkBzZWxlY3RvcihyYXRlQ2hh bmdlZDopIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBuYW1lOlFUTW92aWVSYXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0Olttb3ZpZUxheWVy IG1vdmllXV07CisgICAgICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50 ZXJdIGFkZE9ic2VydmVyOnNlbGYKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZWN0b3I6QHNlbGVjdG9yKHJhdGVDaGFuZ2VkOikKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6 UVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3RpZmljYXRpb24KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvYmplY3Q6bW92aWVdOwogI2VuZGlmCisK KyAgICAgICAgfSBlbHNlIGlmIChfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkudHlwZSA9 PSBQbGF0Zm9ybU1lZGlhOjpBVkZvdW5kYXRpb25NZWRpYVBsYXllclR5cGUpIHsKKyAgICAgICAg ICAgIEFWUGxheWVyKiBwbGF5ZXIgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkubWVk aWEuYXZmTWVkaWFQbGF5ZXI7CisgICAgICAgICAgICBBVlBsYXllckxheWVyKiBsYXllciA9IFtb Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCkgYWxsb2NdIGluaXRdOworICAgICAgICAgICAgW3NlbGYg c2V0dXBWaWRlb092ZXJsYXk6bGF5ZXJdOworICAgICAgICAgICAgW2xheWVyIHNldFBsYXllcjpw bGF5ZXJdOworCisgICAgICAgICAgICBbcGxheWVyIGFkZE9ic2VydmVyOnNlbGYgZm9yS2V5UGF0 aDpAInJhdGUiIG9wdGlvbnM6bmlsIGNvbnRleHQ6TlVMTF07CisgICAgICAgIH0KICAgICB9CiB9 CiAKQEAgLTE3Nyw2ICsxOTEsMTAgQEAgU09GVF9MSU5LX1BPSU5URVIoUVRLaXQsIFFUTW92aWVS YXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uLCBOU1N0cmluZyAqKQogICAgIGlmIChfbWVkaWFFbGVt ZW50ICYmIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS50eXBlID09IFBsYXRmb3JtTWVk aWE6OkdTdHJlYW1lckdXb3JsZFR5cGUpCiAgICAgICAgIF9tZWRpYUVsZW1lbnQtPnBsYXRmb3Jt TWVkaWEoKS5tZWRpYS5nc3RyZWFtZXJHV29ybGQtPmV4aXRGdWxsc2NyZWVuKCk7CiAjZW5kaWYK KyAgICBDQUxheWVyKiBsYXllciA9IFtbW3NlbGYgd2luZG93XSBjb250ZW50Vmlld10gbGF5ZXJd OworICAgIGlmIChbbGF5ZXIgaXNLaW5kT2ZDbGFzczpnZXRBVlBsYXllckxheWVyQ2xhc3MoKV0p CisgICAgICAgIFtbKEFWUGxheWVyTGF5ZXIqKWxheWVyIHBsYXllcl0gcmVtb3ZlT2JzZXJ2ZXI6 c2VsZiBmb3JLZXlQYXRoOkAicmF0ZSJdOworCiAgICAgW3NlbGYgY2xlYXJGYWRlQW5pbWF0aW9u XTsKICAgICBbW3NlbGYgd2luZG93XSBjbG9zZV07CiAgICAgW3NlbGYgc2V0V2luZG93Om5pbF07 CkBAIC00MDAsNiArNDE4LDE2IEBAIHN0YXRpYyBOU1dpbmRvdyAqY3JlYXRlQmFja2dyb3VuZEZ1 bGxzY3JlZW5XaW5kb3coTlNSZWN0IGZyYW1lLCBpbnQgbGV2ZWwpCiAgICAgW19odWRDb250cm9s bGVyIGZhZGVXaW5kb3dJbl07CiB9CiAKKy0gKHZvaWQpb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDoo TlNTdHJpbmcgKilrZXlQYXRoIG9mT2JqZWN0OihpZClvYmplY3QgY2hhbmdlOihOU0RpY3Rpb25h cnkgKiljaGFuZ2UgY29udGV4dDoodm9pZCAqKWNvbnRleHQKK3sKKyAgICBVTlVTRURfUEFSQU0o b2JqZWN0KTsKKyAgICBVTlVTRURfUEFSQU0oY2hhbmdlKTsKKyAgICBVTlVTRURfUEFSQU0oY29u dGV4dCk7CisKKyAgICBpZiAoW2tleVBhdGggaXNFcXVhbFRvOkAicmF0ZSJdKQorICAgICAgICBb c2VsZiByYXRlQ2hhbmdlZDpuaWxdOworfQorCiAvLyBNQVJLOiAtCiAvLyBNQVJLOiBRVE1vdmll IGNhbGxiYWNrcwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggZGVhOTRm ZjlhMDYxOGEwODVhOTE1NGNmMTFkZTQ1YmRmMTYxMDZhOC4uY2YyODg3MGRjMTc0ZDgwMjU4MGNm NjNhZjNlNjVjOTFjMDI2YmYyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpA QCAtMTUzMCwxMSArMTUzMCw3IEBAIHN0YXRpYyBib29sIG5lZWRzU2VsZlJldGFpbldoaWxlTG9h ZGluZ1F1aXJrKCkKICAgICBzZXR0aW5ncy0+c2V0SW50ZXJhY3RpdmVGb3JtVmFsaWRhdGlvbkVu YWJsZWQoW3NlbGYgaW50ZXJhY3RpdmVGb3JtVmFsaWRhdGlvbkVuYWJsZWRdKTsKICAgICBzZXR0 aW5ncy0+c2V0VmFsaWRhdGlvbk1lc3NhZ2VUaW1lck1hZ25pZmljYXRpb24oW3NlbGYgdmFsaWRh dGlvbk1lc3NhZ2VUaW1lck1hZ25pZmljYXRpb25dKTsKICNpZiBVU0UoQVZGT1VOREFUSU9OKQot I2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAgICBzZXR0aW5ncy0+c2V0QVZGb3VuZGF0aW9u RW5hYmxlZChbcHJlZmVyZW5jZXMgaXNBVkZvdW5kYXRpb25FbmFibGVkXSAmJiBbcHJlZmVyZW5j ZXMgZnVsbFNjcmVlbkVuYWJsZWRdKTsKLSNlbHNlCi0gICAgc2V0dGluZ3MtPnNldEFWRm91bmRh dGlvbkVuYWJsZWQoZmFsc2UpOwotI2VuZGlmCisgICAgc2V0dGluZ3MtPnNldEFWRm91bmRhdGlv bkVuYWJsZWQoW3ByZWZlcmVuY2VzIGlzQVZGb3VuZGF0aW9uRW5hYmxlZF0pOwogI2VuZGlmCiAj aWYgUExBVEZPUk0oTUFDKSB8fCAoUExBVEZPUk0oUVQpICYmIFVTRShRVEtJVCkpCiAgICAgc2V0 dGluZ3MtPnNldFFUS2l0RW5hYmxlZChbcHJlZmVyZW5jZXMgaXNRVEtpdEVuYWJsZWRdKTsK