59147 2011-04-21 15:17:38 -0700 Disable MediaPlayerPrivateAVFoundation when using old full screen mode. 2011-04-22 10:51:23 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 59179 1 jer.noble jer.noble eric.carlson oldest_to_newest 390386 0 jer.noble 2011-04-21 15:17:38 -0700 If the ChromeClient indicates the client supports the old full screen mode, but does not support the new full screen mode, disable AVFoundation playback, so that full screen mode continues to work. 390388 1 jer.noble 2011-04-21 15:18:01 -0700 <rdar://problem/9320415> 390661 2 90676 jer.noble 2011-04-22 00:49:56 -0700 Created attachment 90676 Patch 390670 3 90676 mjs 2011-04-22 01:36:38 -0700 Comment on attachment 90676 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90676&action=review > Source/WebKit/mac/WebView/WebView.mm:1565 > +#if ENABLE(FULLSCREEN_API) > + if (![preferences fullScreenEnabled]) > + settings->setAVFoundationEnabled(false); > + else > +#endif I'm not sure I understand the logic here. If the full screen API is compiled in, and a client doesn't have it enabled, then we force AVFoundation off. But if fullscreen API wasn't compiled in at all, wouldn't we still want AVFoundation turned off? This probably doesn't matter, since we won't actually face that combination of settings. 390673 4 jer.noble 2011-04-22 01:42:45 -0700 (In reply to comment #3) > (From update of attachment 90676 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=90676&action=review > > > Source/WebKit/mac/WebView/WebView.mm:1565 > > +#if ENABLE(FULLSCREEN_API) > > + if (![preferences fullScreenEnabled]) > > + settings->setAVFoundationEnabled(false); > > + else > > +#endif > > I'm not sure I understand the logic here. If the full screen API is compiled in, and a client doesn't have it enabled, then we force AVFoundation off. But if fullscreen API wasn't compiled in at all, wouldn't we still want AVFoundation turned off? This probably doesn't matter, since we won't actually face that combination of settings. That's a good point. I'll refactor this part so that AVFoundation gets disabled if FULLSCREEN_API is turned off. 390887 5 jer.noble 2011-04-22 10:51:23 -0700 Committed r84646: <http://trac.webkit.org/changeset/84646> 90676 2011-04-22 00:49:56 -0700 2011-04-22 01:36:38 -0700 Patch bug-59147-20110422004955.patch text/plain 9702 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODQyNjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxMTk3YThhNjc1NTg1ZWRm YjA3YWE3MjY5NTNlOTFkNDdkNWI1MWYzLi43OGJkZjAwMzNmOWIzZDU3MDU3ZTBhMmVlYzk1NGZh YTc0NDQwZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMjIgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRGlzYWJsZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24gd2hlbiB1c2luZyBvbGQgZnVsbCBzY3JlZW4gbW9kZS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MTQ3CisKKyAgICAgICAgQWRkIGEgbmV3IGlz QVZGb3VuZGF0aW9uRW5hYmxlZCBzZXR0aW5nIGFuZCBjaGVjayBpdCBiZWZvcmUgYWRkaW5nIAor ICAgICAgICBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDIHRvIHRoZSBtZWRpYSBl bmdpbmUgcmVnaXN0cnkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBw YWdlL1NldHRpbmdzLmNwcDoKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChX ZWJDb3JlOjpTZXR0aW5nczo6c2V0QVZGb3VuZGF0aW9uRW5hYmxlZCk6IEFkZGVkLgorICAgICAg ICAoV2ViQ29yZTo6U2V0dGluZ3M6OmlzQVZGb3VuZGF0aW9uRW5hYmxlZCk6IEFkZGVkLgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Omluc3RhbGxlZE1lZGlhRW5naW5lcyk6IENoZWNrIHRoZSBzZXR0aW5ncyBhZGRlZCBhYm92 ZS4KKwogMjAxMS0wNC0xOSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXgg ZDhlZTUyNjE3NWI1Y2Q1YzQ4MTU2N2YzNzYxYTVjZjQzYjlhM2JjYi4uOTFkMDgyYTNmYTIyZDcw MGRkMTQ5MDA0MDgzODdlZWQ3NWE5YjQzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTE4NjAs MyArMTg2MCw3IEBAIF9fWk43V2ViQ29yZTEyRXZlbnRIYW5kbGVyMThoYW5kbGVHZXN0dXJlRXZl bnRFUktOU18yMFBsYXRmb3JtR2VzdHVyZUV2ZW50RQogX19aTjdXZWJDb3JlMTRSZXNvdXJjZUhh bmRsZTQ2c2V0UHJpdmF0ZUJyb3dzaW5nU3RvcmFnZVNlc3Npb25JZGVudGlmaWVyQmFzZUVSS04z V1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5kbGUyOXByaXZhdGVCcm93c2lu Z1N0b3JhZ2VTZXNzaW9uRXYKICNlbmRpZgorCisjaWYgVVNFKEFWRk9VTkRBVElPTikKK19fWk43 V2ViQ29yZThTZXR0aW5nczIwZ0FWRm91bmRhdGlvbkVuYWJsZWRFCisjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9TZXR0aW5ncy5jcHAKaW5kZXggZGQ3ZWQ4OWVjMWI4ZjcwMWE1MWQ2MDlkYjQ2ZGRmODU0ZmFi ODhhNC4uMGNhMzZmOTljNjhhMzMzYzlmNjg3MDRlMDRjYTI1NGE3YzY1OTk4MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZXR0aW5ncy5jcHAKQEAgLTU1LDYgKzU1LDEwIEBAIHN0YXRpYyB2b2lkIHNldExvYWRz SW1hZ2VzQXV0b21hdGljYWxseUluQWxsRnJhbWVzKFBhZ2UqIHBhZ2UpCiBib29sIFNldHRpbmdz OjpnU2hvdWxkUGFpbnROYXRpdmVDb250cm9scyA9IHRydWU7CiAjZW5kaWYKIAorI2lmIFVTRShB VkZPVU5EQVRJT04pCitib29sIFNldHRpbmdzOjpnQVZGb3VuZGF0aW9uRW5hYmxlZChmYWxzZSk7 CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKFdJTikgfHwgKE9TKFdJTkRPV1MpICYmIFBMQVRGT1JN KFdYKSkKIGJvb2wgU2V0dGluZ3M6OmdTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyA9IHRy dWU7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRleCA1ZDY5NDUyNzcyZDY1NjZkMDA0 ZWQ1NjM1ZjNhY2JhYzVkZTk2MTI4Li42MGQwMWI2NGYzMjk1NDM4MWM2MDc2ODllNjM0MWZmOTVh YTA0OWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCkBAIC0zNTUsNiArMzU1LDExIEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBmdWxsU2NyZWVuRW5hYmxlZCgpIGNvbnN0ICB7 IHJldHVybiBtX2Z1bGxTY3JlZW5BUElFbmFibGVkOyB9CiAjZW5kaWYKIAorI2lmIFVTRShBVkZP VU5EQVRJT04pCisgICAgICAgIHN0YXRpYyB2b2lkIHNldEFWRm91bmRhdGlvbkVuYWJsZWQoYm9v bCBmbGFnKSB7IGdBVkZvdW5kYXRpb25FbmFibGVkID0gZmxhZzsgfQorICAgICAgICBzdGF0aWMg Ym9vbCBpc0FWRm91bmRhdGlvbkVuYWJsZWQoKSB7IHJldHVybiBnQVZGb3VuZGF0aW9uRW5hYmxl ZDsgfQorI2VuZGlmCisKICAgICAgICAgdm9pZCBzZXRBc3luY2hyb25vdXNTcGVsbENoZWNraW5n RW5hYmxlZChib29sIGZsYWcpIHsgbV9hc3luY2hyb25vdXNTcGVsbENoZWNraW5nRW5hYmxlZCA9 IGZsYWc7IH0KICAgICAgICAgYm9vbCBhc3luY2hyb25vdXNTcGVsbENoZWNraW5nRW5hYmxlZCgp IGNvbnN0ICB7IHJldHVybiBtX2FzeW5jaHJvbm91c1NwZWxsQ2hlY2tpbmdFbmFibGVkOyB9CiAK QEAgLTQ5OCw2ICs1MDMsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1f Zm9yY2VDb21wb3NpdGluZ01vZGUgOiAxOwogICAgICAgICBib29sIG1fc2hvdWxkSW5qZWN0VXNl clNjcmlwdHNJbkluaXRpYWxFbXB0eURvY3VtZW50IDogMTsKIAorI2lmIFVTRShBVkZPVU5EQVRJ T04pCisgICAgICAgIHN0YXRpYyBib29sIGdBVkZvdW5kYXRpb25FbmFibGVkOworI2VuZGlmCisK ICNpZiBVU0UoU0FGQVJJX1RIRU1FKQogICAgICAgICBzdGF0aWMgYm9vbCBnU2hvdWxkUGFpbnRO YXRpdmVDb250cm9sczsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IGZiZjk3YWMyNDY4NWQyMjQ0NjBiYjYzM2NmMTA3 NmY3Nzc3NGQzZDEuLjYxNDFjZTMwMTM0YzNkMWYyNDYxMTQ0YmQyYzBmMGFjODg5MjdkNDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAK QEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiTUlNRVR5 cGVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIk1lZGlhUGxheWVyUHJpdmF0ZS5oIgorI2luY2x1ZGUg IlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiVGltZVJhbmdlcy5oIgogCiAjaWYgUExBVEZPUk0oUVQp CkBAIC0xOTAsNyArMTkxLDggQEAgc3RhdGljIFZlY3RvcjxNZWRpYVBsYXllckZhY3RvcnkqPiYg aW5zdGFsbGVkTWVkaWFFbmdpbmVzKCkKICNlbmRpZgogCiAjaWYgVVNFKEFWRk9VTkRBVElPTikg JiYgUExBVEZPUk0oTUFDKQotICAgICAgICBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDOjpyZWdpc3Rlck1lZGlhRW5naW5lKGFkZE1lZGlhRW5naW5lKTsKKyAgICAgICAgaWYgKFNl dHRpbmdzOjppc0FWRm91bmRhdGlvbkVuYWJsZWQoKSkKKyAgICAgICAgICAgIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnJlZ2lzdGVyTWVkaWFFbmdpbmUoYWRkTWVkaWFFbmdp bmUpOwogI2VuZGlmCiAKICNpZiAhUExBVEZPUk0oR1RLKSAmJiAhUExBVEZPUk0oRUZMKSAmJiAh KFBMQVRGT1JNKFFUKSAmJiBVU0UoR1NUUkVBTUVSKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAwYmQx Y2Y0M2ExZmFhOGVlYjQ1ZGJhNmFkMjAyMGNiZDUxYzMzZmM0Li5kYmZjMjlkMjIwZTA5ZjY5ZTBi MjhiY2QyYWYxYjJjOTI3MGY4ZjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTEtMDQtMjIgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlzYWJsZSBNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb24gd2hlbiB1c2luZyBvbGQgZnVsbCBzY3JlZW4gbW9kZS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5MTQ3CisKKyAg ICAgICAgQWRkIGEgbmV3IHVzZXIgZGVmYXVsdCBwcmVmZXJlbmNlLCBhbmQgcGx1bWIgdGhhdCBw cmVmZXJlbmNlIGRvd24gdG8gV2ViQ29yZQorICAgICAgICBTZXR0aW5ncy4gQWxsb3cgdGhlIGZ1 bGxTY3JlZW5FbmFibGVkIHByZWZlcmVuY2UgdG8gb3ZlcnJpZGUgdGhlIG5ldyAKKyAgICAgICAg aXNBVkZvdW5kYXRpb25FbmFibGVkIHByZWZlcmVuY2UsIHNvIHRoYXQgY2xpZW50cyBvZiB0aGUg bGVnYWN5IGZ1bGwgc2NyZWVuCisgICAgICAgIG1vZGUgd2lsbCBjb250aW51ZSB0byB1c2UgdGhh dCBtb2RlIG5vcm1hbGx5LgorCisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1By aXZhdGUuaDogQWRkIG5ldyBwcmVmZXJlbmNlIGtleS4KKyAgICAgICAgKiBXZWJWaWV3L1dlYlBy ZWZlcmVuY2VzLm1tOgorICAgICAgICAoK1tXZWJQcmVmZXJlbmNlcyBpbml0aWFsaXplXSk6IFNl dCB0aGUgZGVmYXVsdCB2YWx1ZSBvZiBuZXcKKyAgICAgICAgICAgIHByZWZlcmVuY2UuCisgICAg ICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEFWRm91bmRhdGlvbkVuYWJsZWQ6XSk6IEFkZGVkLgor ICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBpc0FWRm91bmRhdGlvbkVuYWJsZWRdKTogQWRkZWQu CisgICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAgKiBX ZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX3ByZWZlcmVuY2VzQ2hhbmdl ZDpdKTogVXBkYXRlIHRoZSBXZWJDb3JlIHNldHRpbmdzIHdpdGggdGhlCisgICAgICAgICAgICBu ZXcgdmFsdWVzIGZyb20gV2ViUHJlZmVyZW5jZXMuCisKIDIwMTEtMDQtMTkgIEplciBOb2JsZSAg PGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VL ZXlzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5 c1ByaXZhdGUuaAppbmRleCBjNWMxMDFiYjBmZGU3ZmI0Njk1MDRlNzZiODE5OGRkNDU5YjYyZGI1 Li5hNDgyMWJhOWUwM2Q5NDY0ZDU0OGQ5NTg0MDEwOGRlOTlkOGJiMjFmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKQEAg LTEwNyw2ICsxMDcsNyBAQAogI2RlZmluZSBXZWJLaXRNZW1vcnlJbmZvRW5hYmxlZFByZWZlcmVu Y2VLZXkgQCJXZWJLaXRNZW1vcnlJbmZvRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0SHlwZXJsaW5r QXVkaXRpbmdFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdEh5cGVybGlua0F1ZGl0aW5nRW5h YmxlZCIKICNkZWZpbmUgV2ViS2l0VXNlUXVpY2tMb29rUmVzb3VyY2VDYWNoaW5nUXVpcmtzUHJl ZmVyZW5jZUtleSBAIldlYktpdFVzZVF1aWNrTG9va1Jlc291cmNlQ2FjaGluZ1F1aXJrcyIKKyNk ZWZpbmUgV2ViS2l0QVZGb3VuZGF0aW9uRW5hYmxlZEtleSBAIldlYktpdEFWRm91bmRhdGlvbkVu YWJsZWQiCiAKIC8vIFRoZXNlIGFyZSBwcml2YXRlIGJvdGggYmVjYXVzZSBjYWxsZXJzIHNob3Vs ZCBiZSB1c2luZyB0aGUgY292ZXIgbWV0aG9kcyBhbmQgYmVjYXVzZSB0aGUKIC8vIGNvdmVyIG1l dGhvZHMgdGhlbXNlbHZlcyBhcmUgcHJpdmF0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlByZWZlcmVuY2VzLm1tCmluZGV4IGNkN2M3YTdiZGM2OWNlZDE4Yzg2MjE3N2ZmNjQ4MGU5 ZGQ5MDEzOTguLmFjYjJkNzg4Zjc2ZmIwOTFjYWYxZmQ4NTNjZmI3NTQzYjBhZjYzYmUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQpAQCAtMzkxLDYgKzM5 MSw3IEBAIHN0YXRpYyBib29sIHVzZVF1aWNrTG9va1F1aXJrcyh2b2lkKQogICAgICAgICBbTlNO dW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdE1lbW9yeUluZm9FbmFibGVkUHJlZmVy ZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRI eXBlcmxpbmtBdWRpdGluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIg bnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdlYktpdFVzZVByZUhUTUw1UGFyc2VyUXVpcmtzS2V5LAor ICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdEFWRm91bmRhdGlv bkVuYWJsZWRLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDp1c2VRdWlja0xv b2tRdWlya3MoKV0sIFdlYktpdFVzZVF1aWNrTG9va1Jlc291cmNlQ2FjaGluZ1F1aXJrc1ByZWZl cmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoTG9uZ0xvbmc6V2ViQ29yZTo6 QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6Om5vUXVvdGEoKV0sIFdlYktpdEFwcGxpY2F0aW9uQ2Fj aGVUb3RhbFF1b3RhLAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aExvbmdMb25nOldlYkNv cmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpub1F1b3RhKCldLCBXZWJLaXRBcHBsaWNhdGlv bkNhY2hlRGVmYXVsdE9yaWdpblF1b3RhLApAQCAtMTQ4NCw2ICsxNDg1LDE1IEBAIHN0YXRpYyBO U1N0cmluZyAqY2xhc3NJQkNyZWF0b3JJRCA9IG5pbDsKICAgICByZXR1cm4gW3NlbGYgX2Jvb2xW YWx1ZUZvcktleTogV2ViS2l0TG9hZFNpdGVJY29uc0tleV07CiB9CiAKKy0gKHZvaWQpc2V0QVZG b3VuZGF0aW9uRW5hYmxlZDooQk9PTClmbGFnCit7CisgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpm bGFnIGZvcktleTpXZWJLaXRBVkZvdW5kYXRpb25FbmFibGVkS2V5XTsKK30KKworLSAoQk9PTClp c0FWRm91bmRhdGlvbkVuYWJsZWQKK3sKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktl eTpXZWJLaXRBVkZvdW5kYXRpb25FbmFibGVkS2V5XTsKK30KIEBlbmQKIAogQGltcGxlbWVudGF0 aW9uIFdlYlByZWZlcmVuY2VzIChXZWJJbnRlcm5hbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCmluZGV4IGU2NjYwNGExMmU3MGIwZDM4 MjZjOGUwMWJkNzAxMDcxNDNiMzFhMGYuLmM0YjFiMmRhOWZkNTE4M2VhZjRiN2Y2ZGUwNDY2YmQ2 YTdmZWFjNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXNQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJl bmNlc1ByaXZhdGUuaApAQCAtMjQzLDQgKzI0Myw5IEBAIGV4dGVybiBOU1N0cmluZyAqV2ViUHJl ZmVyZW5jZXNDaGFuZ2VkSW50ZXJuYWxOb3RpZmljYXRpb247CiAtICh2b2lkKXNldExvYWRzU2l0 ZUljb25zSWdub3JpbmdJbWFnZUxvYWRpbmdQcmVmZXJlbmNlOiAoQk9PTClmbGFnOwogLSAoQk9P TClsb2Fkc1NpdGVJY29uc0lnbm9yaW5nSW1hZ2VMb2FkaW5nUHJlZmVyZW5jZTsKIAorLy8gQVZG b3VuZGF0aW9uIHN1cHBvcnQgaXMgZGVwZW5kZW50IG9uIFdlYkNvcmUvV2ViS2l0IGJlaW5nCisv LyBjb21waWxlZCB3aXRoIFVTRV9BVkZPVU5EQVRJT04uCistICh2b2lkKXNldEFWRm91bmRhdGlv bkVuYWJsZWQ6KEJPT0wpZmxhZzsKKy0gKEJPT0wpaXNBVkZvdW5kYXRpb25FbmFibGVkOworCiBA ZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggYzM2YWNiOWE2YjRmNmJl NDIwMTZhZWJlM2ExYTk1YjU2NGRhZDdlNi4uMzlmMWUyYmNiOThjYTQxZGQ5ZDFkNjEzN2IyNjVk OGVkMmUwNjg2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMTU1Nyw2 ICsxNTU3LDE0IEBAIHN0YXRpYyBib29sIGZhc3REb2N1bWVudFRlYXJkb3duRW5hYmxlZCgpCiAg ICAgc2V0dGluZ3MtPnNldENyb3NzT3JpZ2luQ2hlY2tJbkdldE1hdGNoZWRDU1NSdWxlc0Rpc2Fi bGVkKFtzZWxmIF9uZWVkc1VucmVzdHJpY3RlZEdldE1hdGNoZWRDU1NSdWxlc10pOwogICAgIHNl dHRpbmdzLT5zZXRJbnRlcmFjdGl2ZUZvcm1WYWxpZGF0aW9uRW5hYmxlZChbc2VsZiBpbnRlcmFj dGl2ZUZvcm1WYWxpZGF0aW9uRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLT5zZXRWYWxpZGF0aW9u TWVzc2FnZVRpbWVyTWFnbmlmaWNhdGlvbihbc2VsZiB2YWxpZGF0aW9uTWVzc2FnZVRpbWVyTWFn bmlmaWNhdGlvbl0pOworI2lmIFVTRShBVkZPVU5EQVRJT04pCisjaWYgRU5BQkxFKEZVTExTQ1JF RU5fQVBJKQorICAgIGlmICghW3ByZWZlcmVuY2VzIGZ1bGxTY3JlZW5FbmFibGVkXSkKKyAgICAg ICAgc2V0dGluZ3MtPnNldEFWRm91bmRhdGlvbkVuYWJsZWQoZmFsc2UpOworICAgIGVsc2UKKyNl bmRpZgorICAgICAgICBzZXR0aW5ncy0+c2V0QVZGb3VuZGF0aW9uRW5hYmxlZChbcHJlZmVyZW5j ZXMgaXNBVkZvdW5kYXRpb25FbmFibGVkXSk7CisjZW5kaWYKIAogICAgIC8vIEFwcGxpY2F0aW9u IENhY2hlIFByZWZlcmVuY2VzIGFyZSBzdG9yZWQgb24gdGhlIGdsb2JhbCBjYWNoZSBzdG9yYWdl IG1hbmFnZXIsIG5vdCBpbiBTZXR0aW5ncy4KICAgICBbV2ViQXBwbGljYXRpb25DYWNoZSBzZXRE ZWZhdWx0T3JpZ2luUXVvdGE6W3ByZWZlcmVuY2VzIGFwcGxpY2F0aW9uQ2FjaGVEZWZhdWx0T3Jp Z2luUXVvdGFdXTsK