174476 2017-07-13 15:46:27 -0700 Fix style for name of class alloc function in WebVideoFullscreenInterfaceAVKit. 2017-07-14 14:55:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified CLOSED FIXED P2 Normal --- 1 jeremyj-wk jeremyj-wk achristensen commit-queue oldest_to_newest 1328586 0 jeremyj-wk 2017-07-13 15:46:27 -0700 Fix sytle for dynamic class creation function name in WebVideoFullscreenInterfaceAVKit. 1328587 1 315379 jeremyj-wk 2017-07-13 15:49:00 -0700 Created attachment 315379 Patch 1328631 2 315393 jeremyj-wk 2017-07-13 18:40:05 -0700 Created attachment 315393 Patch 1328765 3 315393 achristensen 2017-07-14 08:39:43 -0700 Comment on attachment 315393 Patch r=me WebAVPlayerLayerView_pictureInPicturePlayerLayerView should probably also be renamed to something with "alloc" in it. 1328963 4 315393 commit-queue 2017-07-14 13:17:22 -0700 Comment on attachment 315393 Patch Clearing flags on attachment: 315393 Committed r219520: <http://trac.webkit.org/changeset/219520> 1328964 5 commit-queue 2017-07-14 13:17:23 -0700 All reviewed patches have been landed. Closing bug. 315379 2017-07-13 15:49:00 -0700 2017-07-13 18:40:04 -0700 Patch bug-174476-20170713154859.patch text/plain 4213 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RlYjZkNDEyOGQwZDY5 ZTgzNTRlZTMwM2ZhNGMyMzM4YmQ2MzQ0OC4uYzE4OGFjMThiNTEwOTAzYWQzZjViZTYwNGZkNTQ1 MGViN2Q1NDI1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA3LTEzICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggc3R5bGUgZm9yIG5h bWUgb2YgY2xhc3MgYWxsb2MgZnVuY3Rpb24gaW4gV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzQ0NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMgYmVjYXVzZSBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgVGhpcyBp cyBhIHJlbmFtZSBmb3IgcGVyIHN0eWxlIHJlcXVpcmVtZW50cy4KKworICAgICAgICAqIHBsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKGFs bG9jV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3SW5zdGFuY2UpOgorICAgICAg ICAoV2ViQVZQbGF5ZXJMYXllclZpZXdfcGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyk6 CisgICAgICAgIChhbGxvY1dlYkFWUGxheWVyTGF5ZXJWaWV3SW5zdGFuY2UpOgorICAgICAgICAo V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldHVwRnVsbHNjcmVlbik6CisgICAg ICAgIChnZXRXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXdDbGFzcyk6IERlbGV0 ZWQuCisgICAgICAgIChnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKTogRGVsZXRlZC4KKwog MjAxNy0wNy0xMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1w bGVtZW50b3JzIG9mIG1lbW9yeUNvc3QoKSBuZWVkIHRvIGJlIHRocmVhZC1zYWZlLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IGJlNDhkYzU1OGU4MzRiNzhiYzMyMzJmMDdhNDYz NThmNjQ5MTlhMWQuLjY5ODUwN2ZmNTc1YjRmNTQ4YTFlMmZlYTY0NTVjZWQ4MjVhMDM3ZTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTQyLDcgKzQyLDYgQEAKICNpbXBvcnQg IldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0LmgiCiAjaW1wb3J0ICJXZWJWaWRlb0Z1 bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuTW9k ZWwuaCIKLSNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVlRpbWUuaD4KICNpbXBvcnQgPFVJS2l0L1VJ S2l0Lmg+CiAjaW1wb3J0IDxvYmpjL21lc3NhZ2UuaD4KICNpbXBvcnQgPG9iamMvcnVudGltZS5o PgpAQCAtMzYxLDcgKzM2MCw3IEBAIHN0YXRpYyBDbGFzcyBXZWJBVlBpY3R1cmVJblBpY3R1cmVQ bGF5ZXJMYXllclZpZXdfbGF5ZXJDbGFzcyhpZCwgU0VMKQogICAgIHJldHVybiBbV2ViQVZQbGF5 ZXJMYXllciBjbGFzc107CiB9CiAKLXN0YXRpYyBDbGFzcyBnZXRXZWJBVlBpY3R1cmVJblBpY3R1 cmVQbGF5ZXJMYXllclZpZXdDbGFzcygpCitzdGF0aWMgQ2xhc3MgYWxsb2NXZWJBVlBpY3R1cmVJ blBpY3R1cmVQbGF5ZXJMYXllclZpZXdJbnN0YW5jZSgpCiB7CiAgICAgc3RhdGljIENsYXNzIHRo ZUNsYXNzID0gbmlsOwogICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOwpAQCAt MzcyLDcgKzM3MSw3IEBAIHN0YXRpYyBDbGFzcyBnZXRXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5 ZXJMYXllclZpZXdDbGFzcygpCiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZChtZXRhQ2xhc3MsIEBz ZWxlY3RvcihsYXllckNsYXNzKSwgKElNUClXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXll clZpZXdfbGF5ZXJDbGFzcywgIkBAOiIpOwogICAgIH0pOwogICAgIAotICAgIHJldHVybiB0aGVD bGFzczsKKyAgICByZXR1cm4gW3RoZUNsYXNzIGFsbG9jXTsKIH0KIAogQGludGVyZmFjZSBXZWJB VlBsYXllckxheWVyVmlldyA6IF9fQVZQbGF5ZXJMYXllclZpZXcKQEAgLTQ0OSw3ICs0NDgsNyBA QCBzdGF0aWMgV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICpXZWJBVlBsYXll ckxheWVyVmlld19waWN0dXJlSW5QaWN0dQogICAgIFdlYkFWUGxheWVyTGF5ZXJWaWV3ICpwbGF5 ZXJMYXllclZpZXcgPSBhU2VsZjsKICAgICBXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXll clZpZXcgKnBpcFZpZXcgPSBbcGxheWVyTGF5ZXJWaWV3IHZhbHVlRm9yS2V5OkAiX3BpY3R1cmVJ blBpY3R1cmVQbGF5ZXJMYXllclZpZXciXTsKICAgICBpZiAoIXBpcFZpZXcpIHsKLSAgICAgICAg cGlwVmlldyA9IFtbZ2V0V2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Q2xhc3Mo KSBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvXTsKKyAgICAgICAgcGlwVmlldyA9IFth bGxvY1dlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0luc3RhbmNlKCkgaW5pdFdp dGhGcmFtZTpDR1JlY3RaZXJvXTsKICAgICAgICAgW3BsYXllckxheWVyVmlldyBzZXRWYWx1ZTpw aXBWaWV3IGZvcktleTpAIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3Il07CiAgICAg fQogICAgIHJldHVybiBwaXBWaWV3OwpAQCAtNDY3LDcgKzQ2Niw3IEBAIHN0YXRpYyB2b2lkIFdl YkFWUGxheWVyTGF5ZXJWaWV3X2RlYWxsb2MoaWQgYVNlbGYsIFNFTCkKIAogI3ByYWdtYSBtYXJr IC0gTWV0aG9kcwogCi1zdGF0aWMgQ2xhc3MgZ2V0V2ViQVZQbGF5ZXJMYXllclZpZXdDbGFzcygp CitzdGF0aWMgQ2xhc3MgYWxsb2NXZWJBVlBsYXllckxheWVyVmlld0luc3RhbmNlKCkKIHsKICAg ICBzdGF0aWMgQ2xhc3MgdGhlQ2xhc3MgPSBuaWw7CiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2Vf dCBvbmNlVG9rZW47CkBAIC00ODgsNyArNDg3LDcgQEAgc3RhdGljIENsYXNzIGdldFdlYkFWUGxh eWVyTGF5ZXJWaWV3Q2xhc3MoKQogICAgICAgICBDbGFzcyBtZXRhQ2xhc3MgPSBvYmpjX2dldE1l dGFDbGFzcygiV2ViQVZQbGF5ZXJMYXllclZpZXciKTsKICAgICAgICAgY2xhc3NfYWRkTWV0aG9k KG1ldGFDbGFzcywgQHNlbGVjdG9yKGxheWVyQ2xhc3MpLCAoSU1QKVdlYkFWUGxheWVyTGF5ZXJW aWV3X2xheWVyQ2xhc3MsICJAQDoiKTsKICAgICB9KTsKLSAgICByZXR1cm4gdGhlQ2xhc3M7Cisg ICAgcmV0dXJuIFt0aGVDbGFzcyBhbGxvY107CiB9CiAKIFJlZjxXZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdD4gV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OmNyZWF0ZShX ZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdCYgcGxheWJhY2tTZXNzaW9uSW50ZXJmYWNl KQpAQCAtNjE4LDcgKzYxNyw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQ6OnNldHVwRnVsbHNjcmVlbihVSVZpZXcmIHZpZGVvVmlldywgY29uc3QKICAgICB9CiAKICAg ICBpZiAoIW1fcGxheWVyTGF5ZXJWaWV3KQotICAgICAgICBtX3BsYXllckxheWVyVmlldyA9IGFk b3B0TlMoW1tnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKCkgYWxsb2NdIGluaXRdKTsKKyAg ICAgICAgbV9wbGF5ZXJMYXllclZpZXcgPSBhZG9wdE5TKFthbGxvY1dlYkFWUGxheWVyTGF5ZXJW aWV3SW5zdGFuY2UoKSBpbml0XSk7CiAgICAgW21fcGxheWVyTGF5ZXJWaWV3IHNldEhpZGRlbjpb cGxheWVyQ29udHJvbGxlcigpIGlzRXh0ZXJuYWxQbGF5YmFja0FjdGl2ZV1dOwogICAgIFttX3Bs YXllckxheWVyVmlldyBzZXRCYWNrZ3JvdW5kQ29sb3I6Y2xlYXJVSUNvbG9yKCldOwogCg== 315393 2017-07-13 18:40:05 -0700 2017-07-14 13:17:22 -0700 Patch bug-174476-20170713184004.patch text/plain 4325 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RlYjZkNDEyOGQwZDY5 ZTgzNTRlZTMwM2ZhNGMyMzM4YmQ2MzQ0OC4uYzE4OGFjMThiNTEwOTAzYWQzZjViZTYwNGZkNTQ1 MGViN2Q1NDI1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA3LTEzICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggc3R5bGUgZm9yIG5h bWUgb2YgY2xhc3MgYWxsb2MgZnVuY3Rpb24gaW4gV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl QVZLaXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzQ0NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBuZXcgdGVzdHMgYmVjYXVzZSBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgVGhpcyBp cyBhIHJlbmFtZSBmb3IgcGVyIHN0eWxlIHJlcXVpcmVtZW50cy4KKworICAgICAgICAqIHBsYXRm b3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAgICAgICAgKGFs bG9jV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3SW5zdGFuY2UpOgorICAgICAg ICAoV2ViQVZQbGF5ZXJMYXllclZpZXdfcGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlldyk6 CisgICAgICAgIChhbGxvY1dlYkFWUGxheWVyTGF5ZXJWaWV3SW5zdGFuY2UpOgorICAgICAgICAo V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQ6OnNldHVwRnVsbHNjcmVlbik6CisgICAg ICAgIChnZXRXZWJBVlBpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXdDbGFzcyk6IERlbGV0 ZWQuCisgICAgICAgIChnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKTogRGVsZXRlZC4KKwog MjAxNy0wNy0xMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1w bGVtZW50b3JzIG9mIG1lbW9yeUNvc3QoKSBuZWVkIHRvIGJlIHRocmVhZC1zYWZlLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkludGVy ZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IGJlNDhkYzU1OGU4MzRiNzhiYzMyMzJmMDdhNDYz NThmNjQ5MTlhMWQuLjEzNWNlM2I3M2IwYjJlMjRkOGM3YTFkNTU2YWY0MDBhNGUzYzE5NmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5J bnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTQyLDcgKzQyLDYgQEAKICNpbXBvcnQg IldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0LmgiCiAjaW1wb3J0ICJXZWJWaWRlb0Z1 bGxzY3JlZW5DaGFuZ2VPYnNlcnZlci5oIgogI2ltcG9ydCAiV2ViVmlkZW9GdWxsc2NyZWVuTW9k ZWwuaCIKLSNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVlRpbWUuaD4KICNpbXBvcnQgPFVJS2l0L1VJ S2l0Lmg+CiAjaW1wb3J0IDxvYmpjL21lc3NhZ2UuaD4KICNpbXBvcnQgPG9iamMvcnVudGltZS5o PgpAQCAtMzYxLDcgKzM2MCw3IEBAIHN0YXRpYyBDbGFzcyBXZWJBVlBpY3R1cmVJblBpY3R1cmVQ bGF5ZXJMYXllclZpZXdfbGF5ZXJDbGFzcyhpZCwgU0VMKQogICAgIHJldHVybiBbV2ViQVZQbGF5 ZXJMYXllciBjbGFzc107CiB9CiAKLXN0YXRpYyBDbGFzcyBnZXRXZWJBVlBpY3R1cmVJblBpY3R1 cmVQbGF5ZXJMYXllclZpZXdDbGFzcygpCitzdGF0aWMgV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxh eWVyTGF5ZXJWaWV3ICphbGxvY1dlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0lu c3RhbmNlKCkKIHsKICAgICBzdGF0aWMgQ2xhc3MgdGhlQ2xhc3MgPSBuaWw7CiAgICAgc3RhdGlj IGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CkBAIC0zNzIsNyArMzcxLDcgQEAgc3RhdGljIENs YXNzIGdldFdlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0NsYXNzKCkKICAgICAg ICAgY2xhc3NfYWRkTWV0aG9kKG1ldGFDbGFzcywgQHNlbGVjdG9yKGxheWVyQ2xhc3MpLCAoSU1Q KVdlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld19sYXllckNsYXNzLCAiQEA6Iik7 CiAgICAgfSk7CiAgICAgCi0gICAgcmV0dXJuIHRoZUNsYXNzOworICAgIHJldHVybiAoV2ViQVZQ aWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJWaWV3ICopW3RoZUNsYXNzIGFsbG9jXTsKIH0KIAog QGludGVyZmFjZSBXZWJBVlBsYXllckxheWVyVmlldyA6IF9fQVZQbGF5ZXJMYXllclZpZXcKQEAg LTQ0OSw3ICs0NDgsNyBAQCBzdGF0aWMgV2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5ZXJW aWV3ICpXZWJBVlBsYXllckxheWVyVmlld19waWN0dXJlSW5QaWN0dQogICAgIFdlYkFWUGxheWVy TGF5ZXJWaWV3ICpwbGF5ZXJMYXllclZpZXcgPSBhU2VsZjsKICAgICBXZWJBVlBpY3R1cmVJblBp Y3R1cmVQbGF5ZXJMYXllclZpZXcgKnBpcFZpZXcgPSBbcGxheWVyTGF5ZXJWaWV3IHZhbHVlRm9y S2V5OkAiX3BpY3R1cmVJblBpY3R1cmVQbGF5ZXJMYXllclZpZXciXTsKICAgICBpZiAoIXBpcFZp ZXcpIHsKLSAgICAgICAgcGlwVmlldyA9IFtbZ2V0V2ViQVZQaWN0dXJlSW5QaWN0dXJlUGxheWVy TGF5ZXJWaWV3Q2xhc3MoKSBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvXTsKKyAgICAg ICAgcGlwVmlldyA9IFthbGxvY1dlYkFWUGljdHVyZUluUGljdHVyZVBsYXllckxheWVyVmlld0lu c3RhbmNlKCkgaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvXTsKICAgICAgICAgW3BsYXllckxheWVy VmlldyBzZXRWYWx1ZTpwaXBWaWV3IGZvcktleTpAIl9waWN0dXJlSW5QaWN0dXJlUGxheWVyTGF5 ZXJWaWV3Il07CiAgICAgfQogICAgIHJldHVybiBwaXBWaWV3OwpAQCAtNDY3LDcgKzQ2Niw3IEBA IHN0YXRpYyB2b2lkIFdlYkFWUGxheWVyTGF5ZXJWaWV3X2RlYWxsb2MoaWQgYVNlbGYsIFNFTCkK IAogI3ByYWdtYSBtYXJrIC0gTWV0aG9kcwogCi1zdGF0aWMgQ2xhc3MgZ2V0V2ViQVZQbGF5ZXJM YXllclZpZXdDbGFzcygpCitzdGF0aWMgV2ViQVZQbGF5ZXJMYXllclZpZXcgKmFsbG9jV2ViQVZQ bGF5ZXJMYXllclZpZXdJbnN0YW5jZSgpCiB7CiAgICAgc3RhdGljIENsYXNzIHRoZUNsYXNzID0g bmlsOwogICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOwpAQCAtNDg4LDcgKzQ4 Nyw3IEBAIHN0YXRpYyBDbGFzcyBnZXRXZWJBVlBsYXllckxheWVyVmlld0NsYXNzKCkKICAgICAg ICAgQ2xhc3MgbWV0YUNsYXNzID0gb2JqY19nZXRNZXRhQ2xhc3MoIldlYkFWUGxheWVyTGF5ZXJW aWV3Iik7CiAgICAgICAgIGNsYXNzX2FkZE1ldGhvZChtZXRhQ2xhc3MsIEBzZWxlY3RvcihsYXll ckNsYXNzKSwgKElNUClXZWJBVlBsYXllckxheWVyVmlld19sYXllckNsYXNzLCAiQEA6Iik7CiAg ICAgfSk7Ci0gICAgcmV0dXJuIHRoZUNsYXNzOworICAgIHJldHVybiAoV2ViQVZQbGF5ZXJMYXll clZpZXcgKilbdGhlQ2xhc3MgYWxsb2NdOwogfQogCiBSZWY8V2ViVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQVZLaXQ+IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0OjpjcmVhdGUoV2Vi UGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQmIHBsYXliYWNrU2Vzc2lvbkludGVyZmFjZSkK QEAgLTYxOCw3ICs2MTcsNyBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0 OjpzZXR1cEZ1bGxzY3JlZW4oVUlWaWV3JiB2aWRlb1ZpZXcsIGNvbnN0CiAgICAgfQogCiAgICAg aWYgKCFtX3BsYXllckxheWVyVmlldykKLSAgICAgICAgbV9wbGF5ZXJMYXllclZpZXcgPSBhZG9w dE5TKFtbZ2V0V2ViQVZQbGF5ZXJMYXllclZpZXdDbGFzcygpIGFsbG9jXSBpbml0XSk7CisgICAg ICAgIG1fcGxheWVyTGF5ZXJWaWV3ID0gYWRvcHROUyhbYWxsb2NXZWJBVlBsYXllckxheWVyVmll d0luc3RhbmNlKCkgaW5pdF0pOwogICAgIFttX3BsYXllckxheWVyVmlldyBzZXRIaWRkZW46W3Bs YXllckNvbnRyb2xsZXIoKSBpc0V4dGVybmFsUGxheWJhY2tBY3RpdmVdXTsKICAgICBbbV9wbGF5 ZXJMYXllclZpZXcgc2V0QmFja2dyb3VuZENvbG9yOmNsZWFyVUlDb2xvcigpXTsKIAo=