71072 2011-10-27 16:10:46 -0700 Add a Plugin::geometryDidChange that will work with transforms 2011-10-27 17:19:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 492059 0 andersca 2011-10-27 16:10:46 -0700 Add a Plugin::geometryDidChange that will work with transforms 492066 1 112775 andersca 2011-10-27 16:18:25 -0700 Created attachment 112775 Patch 492111 2 112775 simon.fraser 2011-10-27 17:13:29 -0700 Comment on attachment 112775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112775&action=review > Source/WebKit2/WebProcess/Plugins/PluginView.cpp:727 > + IntPoint locationInWindowCoordinates = parent()->contentsToWindow(frameRect().location()); This should use contentsToRootView(), not contentsToWindow(). 492115 3 andersca 2011-10-27 17:19:03 -0700 Committed r98664: <http://trac.webkit.org/changeset/98664> 112775 2011-10-27 16:18:25 -0700 2011-10-27 17:13:29 -0700 Patch bug-71072-20111027161823.patch text/plain 17840 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTg2NDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmZmFhNDA4NmYwMzc0ZDA3 MmJjYzYzOTk1NGNmZDhmOThkNzg2MmM5Li5jOWEzOWU1MzllN2IzZWM4MDExM2Y2M2Y4ODUzODc0 Zjg3OWY2ZjhiIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTAtMjcgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBQbHVnaW46 Omdlb21ldHJ5RGlkQ2hhbmdlIHRoYXQgd2lsbCB3b3JrIHdpdGggdHJhbnNmb3JtcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzEwNzIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBvcnQgc3ltYm9scyBu ZWVkZWQgYnkgV2ViS2l0Mi4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCiAyMDExLTEw LTI3ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTg2MjYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODcyNGQ5N2Jj MzhhMDIwZWU1YjlhOWNhOGQ1YWQwZjU5NTQ3OWIxNy4uZjkzMGVhNjhmMTYyMjRmYjE0NzhiOWE0 YmU1YjhmOTg5ODJhMjRkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ5IEBACiAyMDExLTEwLTI3 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEg UGx1Z2luOjpnZW9tZXRyeURpZENoYW5nZSB0aGF0IHdpbGwgd29yayB3aXRoIHRyYW5zZm9ybXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMDcyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3 IFBsdWdpbjo6Z2VvbWV0cnlEaWRDaGFuZ2UgcHVyZSB2aXJ0dWFsIG1lbWJlciBmdW5jdGlvbiwg dGhhdCB0YWtlcworICAgICAgICB0aGUgc2l6ZSBvZiB0aGUgcGx1Zy1pbiwgdGhlIGNsaXAgcmVj dCAoaW4gcGx1Zy1pbiBjb29yZGluYXRlcyksIGFuZCBhIG1hdHJpeCB0aGF0IG1ha2VzCisgICAg ICAgIGl0IHBvc3NpYmxlIHRvIGNvbnZlcnQgYmV0d2VlbiByb290IHZpZXcgY29vcmRpbmF0ZXMg YW5kIHBsdWctaW4gY29vcmRpbmF0ZXMuCisKKyAgICAgICAgUGx1Z2luVmlldyBvbmx5IGNhbGxz IHRoaXMgbmV3IGdlb21ldHJ5RGlkQ2hhbmdlIG1lbWJlciBmdW5jdGlvbiBpZiAKKyAgICAgICAg UGx1Z2luOjp3YW50c1dpbmRvd1JlbGF0aXZlQ29vcmRpbmF0ZXMgcmV0dXJucyBmYWxzZSwgd2hp Y2ggaXMgb25seSB0cnVlIGZvciBCdWlsdEluUERGVmlldyByaWdodCBub3cuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwOgorICAgICAg ICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6Z2VvbWV0cnlEaWRDaGFuZ2UpOgorICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oOgorICAgICAgICBB ZGQgc3R1Yi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZp ZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpCdWlsdEluUERGVmlldzo6dXBkYXRlU2Nyb2xsYmFy cyk6CisgICAgICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3OjpwZGZEb2N1bWVudERpZExvYWQp OgorICAgICAgICAoV2ViS2l0OjpCdWlsdEluUERGVmlldzo6cGFpbnRDb250ZW50KToKKyAgICAg ICAgKFdlYktpdDo6QnVpbHRJblBERlZpZXc6OmRlcHJlY2F0ZWRHZW9tZXRyeURpZENoYW5nZSk6 CisgICAgICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3OjpnZW9tZXRyeURpZENoYW5nZSk6Cisg ICAgICAgIChXZWJLaXQ6OkJ1aWx0SW5QREZWaWV3OjpzZXRTY3JvbGxPZmZzZXQpOgorICAgICAg ICAoV2ViS2l0OjpCdWlsdEluUERGVmlldzo6bWF4aW11bVNjcm9sbFBvc2l0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6QnVpbHRJblBERlZpZXc6OnZpc2libGVIZWlnaHQpOgorICAgICAgICAoV2Vi S2l0OjpCdWlsdEluUERGVmlldzo6dmlzaWJsZVdpZHRoKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1BsdWdpbnMvUERGL0J1aWx0SW5QREZWaWV3Lmg6CisgICAgICAgIFRoZXJlJ3Mgbm8gbmVlZCB0 byBrZWVwIHRyYWNrIG9mIHRoZSBwbHVnLWluIHJlY3QgYW55bW9yZS4KKworICAgICAgICAqIFdl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaDoKKyAgICAgICAgQWRkIGFuZCBkb2N1bWVudCBnZW9t ZXRyeURpZENoYW5nZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb3h5OjpnZW9tZXRyeURpZENoYW5nZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5Lmg6CisgICAgICAgIEFk ZCBzdHViLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgor ICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3Ojp2aWV3R2VvbWV0cnlEaWRDaGFuZ2UpOgorICAg ICAgICBDYWxsIGdlb21ldHJ5RGlkQ2hhbmdlLgorCisyMDExLTEwLTI3ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmVuYW1lIFBsdWdpbjo6Z2VvbWV0 cnlEaWRDaGFuZ2UgdG8gUGx1Z2luOjpkZXByZWNhdGVkR2VvbWV0cnlEaWRDaGFuZ2UKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMDY1CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5leHAuaW4KaW5kZXggYjEyMTY3MGZlZjVkNmFhOWE3ZGY5Nzg5OTk5ODkzYjNiYWNjMTdi ZC4uYzhiMGFhNTU4N2E5YmQ5NmMxZTBjMGYzMjgwYWNjYTNiMDlkNjI4NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4KQEAgLTQwMSw2ICs0MDEsNyBAQCBfX1pON1dlYkNvcmUxNFN0b3JhZ2VUcmFja2Vy MTdpbml0aWFsaXplVHJhY2tlckVSS04zV1RGNlN0cmluZ0VQTlNfMjBTdG9yYWdlVHJhYwogX19a TjdXZWJDb3JlMTRTdG9yYWdlVHJhY2tlcjE4ZGlza1VzYWdlRm9yT3JpZ2luRVBOU18xNFNlY3Vy aXR5T3JpZ2luRQogX19aTjdXZWJDb3JlMTRTdG9yYWdlVHJhY2tlcjMyc3luY0ZpbGVTeXN0ZW1B bmRUcmFja2VyRGF0YWJhc2VFdgogX19aTjdXZWJDb3JlMTRlbmRPZlBhcmFncmFwaEVSS05TXzE1 VmlzaWJsZVBvc2l0aW9uRU5TXzI3RWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlRQorX19aTjdX ZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm1DMUVkZGRkZGQKIF9fWk43V2ViQ29yZTE1QXJjaGl2ZVJl c291cmNlNmNyZWF0ZUVOM1dURjEwUGFzc1JlZlB0cklOU18xMlNoYXJlZEJ1ZmZlckVFRVJLTlNf NEtVUkxFUktOUzFfNlN0cmluZ0VTQV9TQV9SS05TXzE2UmVzb3VyY2VSZXNwb25zZUUKIF9fWk43 V2ViQ29yZTE1RE9NV3JhcHBlcldvcmxkMTNjbGVhcldyYXBwZXJzRXYKIF9fWk43V2ViQ29yZTE1 RE9NV3JhcHBlcldvcmxkRDFFdgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggNmNmNjVi NzI5YjUxYjYyYzczYjAwMTA0YmVjMjRjN2VhNDI0MDk1NC4uYjNkOWViYmY3ODcxNTk4ZjAwZTAx ZTAxODAyZmQwNTYyMjBhMmYwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCkBAIC02NzYs NiArNjc2LDEyIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OmRlcHJlY2F0ZWRHZW9tZXRyeURpZENo YW5nZShjb25zdCBJbnRSZWN0JiBmcmFtZVJlY3QsIGNvbnN0CiAgICAgY2FsbFNldFdpbmRvdygp OwogfQogCit2b2lkIE5ldHNjYXBlUGx1Z2luOjpnZW9tZXRyeURpZENoYW5nZShjb25zdCBJbnRT aXplJiBwbHVnaW5TaXplLCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3QgQWZmaW5lVHJh bnNmb3JtJiBwbHVnaW5Ub1Jvb3RWaWV3VHJhbnNmb3JtKQoreworICAgIC8vIEZJWE1FOiBUaGlz IGlzbid0IGNhbGxlZCB5ZXQuCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKIHZvaWQg TmV0c2NhcGVQbHVnaW46OnZpc2liaWxpdHlEaWRDaGFuZ2UoKQogewogICAgIEFTU0VSVChtX2lz U3RhcnRlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCmluZGV4IGJjNzAzOGQyZGM1Yjc1MmI3MWEx YjNhM2FiYTY3YTM2YzA5ZDk4MzkuLjY1MjcxZTcxYjMwYzc3MjdlZTNmYjZmY2Y3MWI1ZjBlZjFl NDY0YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZVBsdWdpbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCkBAIC0xNjksNiArMTY5LDcgQEAgcHJpdmF0 ZToKICNlbmRpZgogICAgIHZpcnR1YWwgYm9vbCBpc1RyYW5zcGFyZW50KCk7CiAgICAgdmlydHVh bCB2b2lkIGRlcHJlY2F0ZWRHZW9tZXRyeURpZENoYW5nZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiBmcmFtZVJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBSZWN0KTsKKyAgICB2aXJ0 dWFsIHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgcGx1Z2lu U2l6ZSwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFdlYkNvcmU6OkFm ZmluZVRyYW5zZm9ybSYgcGx1Z2luVG9Sb290Vmlld1RyYW5zZm9ybSk7CiAgICAgdmlydHVhbCB2 b2lkIHZpc2liaWxpdHlEaWRDaGFuZ2UoKTsKICAgICB2aXJ0dWFsIHZvaWQgZnJhbWVEaWRGaW5p c2hMb2FkaW5nKHVpbnQ2NF90IHJlcXVlc3RJRCk7CiAgICAgdmlydHVhbCB2b2lkIGZyYW1lRGlk RmFpbCh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgd2FzQ2FuY2VsbGVkKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcuY3Bw IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5j cHAKaW5kZXggOWUwYTI4MjQ4ZTdhYmE2ZmNiNjFjYTNjYWFhYTcyNjljODFlMGUwMi4uODRhYTBj MTVjNjFkZWYzYTY3MTI3OTczM2U5ZGI5MzY5NzJmMTJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5jcHAKQEAg LTk3LDE1ICs5NywxNSBAQCBjb25zdCBQbHVnaW5WaWV3KiBCdWlsdEluUERGVmlldzo6cGx1Z2lu VmlldygpIGNvbnN0CiB2b2lkIEJ1aWx0SW5QREZWaWV3Ojp1cGRhdGVTY3JvbGxiYXJzKCkKIHsK ICAgICBpZiAobV9ob3Jpem9udGFsU2Nyb2xsYmFyKSB7Ci0gICAgICAgIGlmIChtX2ZyYW1lUmVj dC53aWR0aCgpID49IG1fcGRmRG9jdW1lbnRTaXplLndpZHRoKCkpCisgICAgICAgIGlmIChtX3Bs dWdpblNpemUud2lkdGgoKSA+PSBtX3BkZkRvY3VtZW50U2l6ZS53aWR0aCgpKQogICAgICAgICAg ICAgZGVzdHJveVNjcm9sbGJhcihIb3Jpem9udGFsU2Nyb2xsYmFyKTsKLSAgICB9IGVsc2UgaWYg KG1fZnJhbWVSZWN0LndpZHRoKCkgPCBtX3BkZkRvY3VtZW50U2l6ZS53aWR0aCgpKQorICAgIH0g ZWxzZSBpZiAobV9wbHVnaW5TaXplLndpZHRoKCkgPCBtX3BkZkRvY3VtZW50U2l6ZS53aWR0aCgp KQogICAgICAgICBtX2hvcml6b250YWxTY3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIoSG9yaXpv bnRhbFNjcm9sbGJhcik7CiAKICAgICBpZiAobV92ZXJ0aWNhbFNjcm9sbGJhcikgewotICAgICAg ICBpZiAobV9mcmFtZVJlY3QuaGVpZ2h0KCkgPj0gbV9wZGZEb2N1bWVudFNpemUuaGVpZ2h0KCkp CisgICAgICAgIGlmIChtX3BsdWdpblNpemUuaGVpZ2h0KCkgPj0gbV9wZGZEb2N1bWVudFNpemUu aGVpZ2h0KCkpCiAgICAgICAgICAgICBkZXN0cm95U2Nyb2xsYmFyKFZlcnRpY2FsU2Nyb2xsYmFy KTsKLSAgICB9IGVsc2UgaWYgKG1fZnJhbWVSZWN0LmhlaWdodCgpIDwgbV9wZGZEb2N1bWVudFNp emUuaGVpZ2h0KCkpCisgICAgfSBlbHNlIGlmIChtX3BsdWdpblNpemUuaGVpZ2h0KCkgPCBtX3Bk ZkRvY3VtZW50U2l6ZS5oZWlnaHQoKSkKICAgICAgICAgbV92ZXJ0aWNhbFNjcm9sbGJhciA9IGNy ZWF0ZVNjcm9sbGJhcihWZXJ0aWNhbFNjcm9sbGJhcik7CiAKICAgICBpbnQgaG9yaXpvbnRhbFNj cm9sbGJhckhlaWdodCA9IChtX2hvcml6b250YWxTY3JvbGxiYXIgJiYgIW1faG9yaXpvbnRhbFNj cm9sbGJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCkpID8gbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5o ZWlnaHQoKSA6IDA7CkBAIC0xMTUsMTYgKzExNSwxNiBAQCB2b2lkIEJ1aWx0SW5QREZWaWV3Ojp1 cGRhdGVTY3JvbGxiYXJzKCkKIAogICAgIGlmIChtX2hvcml6b250YWxTY3JvbGxiYXIpIHsKICAg ICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5zZXRTdGVwcyhTY3JvbGxiYXI6OnBpeGVsc1Bl ckxpbmVTdGVwKCksIHBhZ2VTdGVwKTsKLSAgICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5z ZXRQcm9wb3J0aW9uKG1fZnJhbWVSZWN0LndpZHRoKCkgLSB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRo LCBtX3BkZkRvY3VtZW50U2l6ZS53aWR0aCgpKTsKLSAgICAgICAgSW50UmVjdCBzY3JvbGxiYXJS ZWN0KHBsdWdpblZpZXcoKS0+eCgpLCBwbHVnaW5WaWV3KCktPnkoKSArIG1fZnJhbWVSZWN0Lmhl aWdodCgpIC0gbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5oZWlnaHQoKSwgbV9mcmFtZVJlY3Qud2lk dGgoKSwgbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5oZWlnaHQoKSk7CisgICAgICAgIG1faG9yaXpv bnRhbFNjcm9sbGJhci0+c2V0UHJvcG9ydGlvbihtX3BsdWdpblNpemUud2lkdGgoKSAtIHZlcnRp Y2FsU2Nyb2xsYmFyV2lkdGgsIG1fcGRmRG9jdW1lbnRTaXplLndpZHRoKCkpOworICAgICAgICBJ bnRSZWN0IHNjcm9sbGJhclJlY3QocGx1Z2luVmlldygpLT54KCksIHBsdWdpblZpZXcoKS0+eSgp ICsgbV9wbHVnaW5TaXplLmhlaWdodCgpIC0gbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5oZWlnaHQo KSwgbV9wbHVnaW5TaXplLndpZHRoKCksIG1faG9yaXpvbnRhbFNjcm9sbGJhci0+aGVpZ2h0KCkp OwogICAgICAgICBpZiAobV92ZXJ0aWNhbFNjcm9sbGJhcikKICAgICAgICAgICAgIHNjcm9sbGJh clJlY3QuY29udHJhY3QobV92ZXJ0aWNhbFNjcm9sbGJhci0+d2lkdGgoKSwgMCk7CiAgICAgICAg IG1faG9yaXpvbnRhbFNjcm9sbGJhci0+c2V0RnJhbWVSZWN0KHNjcm9sbGJhclJlY3QpOwogICAg IH0KICAgICBpZiAobV92ZXJ0aWNhbFNjcm9sbGJhcikgewogICAgICAgICBtX3ZlcnRpY2FsU2Ny b2xsYmFyLT5zZXRTdGVwcyhTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCksIHBhZ2VTdGVw KTsKLSAgICAgICAgbV92ZXJ0aWNhbFNjcm9sbGJhci0+c2V0UHJvcG9ydGlvbihtX2ZyYW1lUmVj dC5oZWlnaHQoKSAtIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQsIG1fcGRmRG9jdW1lbnRTaXpl LmhlaWdodCgpKTsKLSAgICAgICAgSW50UmVjdCBzY3JvbGxiYXJSZWN0KEludFJlY3QocGx1Z2lu VmlldygpLT54KCkgKyBtX2ZyYW1lUmVjdC53aWR0aCgpIC0gbV92ZXJ0aWNhbFNjcm9sbGJhci0+ d2lkdGgoKSwgcGx1Z2luVmlldygpLT55KCksIG1fdmVydGljYWxTY3JvbGxiYXItPndpZHRoKCks IG1fZnJhbWVSZWN0LmhlaWdodCgpKSk7CisgICAgICAgIG1fdmVydGljYWxTY3JvbGxiYXItPnNl dFByb3BvcnRpb24obV9wbHVnaW5TaXplLmhlaWdodCgpIC0gaG9yaXpvbnRhbFNjcm9sbGJhckhl aWdodCwgbV9wZGZEb2N1bWVudFNpemUuaGVpZ2h0KCkpOworICAgICAgICBJbnRSZWN0IHNjcm9s bGJhclJlY3QoSW50UmVjdChwbHVnaW5WaWV3KCktPngoKSArIG1fcGx1Z2luU2l6ZS53aWR0aCgp IC0gbV92ZXJ0aWNhbFNjcm9sbGJhci0+d2lkdGgoKSwgcGx1Z2luVmlldygpLT55KCksIG1fdmVy dGljYWxTY3JvbGxiYXItPndpZHRoKCksIG1fcGx1Z2luU2l6ZS5oZWlnaHQoKSkpOwogICAgICAg ICBpZiAobV9ob3Jpem9udGFsU2Nyb2xsYmFyKQogICAgICAgICAgICAgc2Nyb2xsYmFyUmVjdC5j b250cmFjdCgwLCBtX2hvcml6b250YWxTY3JvbGxiYXItPmhlaWdodCgpKTsKICAgICAgICAgbV92 ZXJ0aWNhbFNjcm9sbGJhci0+c2V0RnJhbWVSZWN0KHNjcm9sbGJhclJlY3QpOwpAQCAtMjExLDcg KzIxMSw3IEBAIHZvaWQgQnVpbHRJblBERlZpZXc6OnBkZkRvY3VtZW50RGlkTG9hZCgpCiAgICAg Y2FsY3VsYXRlU2l6ZXMoKTsKICAgICB1cGRhdGVTY3JvbGxiYXJzKCk7CiAKLSAgICBjb250cm9s bGVyKCktPmludmFsaWRhdGUoSW50UmVjdCgwLCAwLCBtX2ZyYW1lUmVjdC53aWR0aCgpLCBtX2Zy YW1lUmVjdC5oZWlnaHQoKSkpOworICAgIGNvbnRyb2xsZXIoKS0+aW52YWxpZGF0ZShJbnRSZWN0 KDAsIDAsIG1fcGx1Z2luU2l6ZS53aWR0aCgpLCBtX3BsdWdpblNpemUuaGVpZ2h0KCkpKTsKIH0K IAogdm9pZCBCdWlsdEluUERGVmlldzo6Y2FsY3VsYXRlU2l6ZXMoKQpAQCAtMjkyLDggKzI5Miw4 IEBAIHZvaWQgQnVpbHRJblBERlZpZXc6OnBhaW50Q29udGVudChHcmFwaGljc0NvbnRleHQqIGdy YXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjCiAgICAgaW50IHBhZ2VUb3AgPSAwOwogICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wYWdlQm94ZXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAg SW50UmVjdCBwYWdlQm94ID0gbV9wYWdlQm94ZXNbaV07Ci0gICAgICAgIGZsb2F0IGV4dHJhT2Zm c2V0Rm9yQ2VudGVyaW5nWCA9IG1heChyb3VuZGYoKG1fZnJhbWVSZWN0LndpZHRoKCkgLSBwYWdl Qm94LndpZHRoKCkpIC8gMi4wZiksIDAuMGYpOwotICAgICAgICBmbG9hdCBleHRyYU9mZnNldEZv ckNlbnRlcmluZ1kgPSAobV9wYWdlQm94ZXMuc2l6ZSgpID09IDEpID8gbWF4KHJvdW5kZigobV9m cmFtZVJlY3QuaGVpZ2h0KCkgLSBwYWdlQm94LmhlaWdodCgpICsgc2hhZG93T2Zmc2V0WSkgLyAy LjBmKSwgMC4wZikgOiAwOworICAgICAgICBmbG9hdCBleHRyYU9mZnNldEZvckNlbnRlcmluZ1gg PSBtYXgocm91bmRmKChtX3BsdWdpblNpemUud2lkdGgoKSAtIHBhZ2VCb3gud2lkdGgoKSkgLyAy LjBmKSwgMC4wZik7CisgICAgICAgIGZsb2F0IGV4dHJhT2Zmc2V0Rm9yQ2VudGVyaW5nWSA9ICht X3BhZ2VCb3hlcy5zaXplKCkgPT0gMSkgPyBtYXgocm91bmRmKChtX3BsdWdpblNpemUuaGVpZ2h0 KCkgLSBwYWdlQm94LmhlaWdodCgpICsgc2hhZG93T2Zmc2V0WSkgLyAyLjBmKSwgMC4wZikgOiAw OwogCiAgICAgICAgIGlmIChwYWdlVG9wID4gY29udGVudFJlY3QubWF4WSgpKQogICAgICAgICAg ICAgYnJlYWs7CkBAIC0zNjksMTIgKzM2OSwxNyBAQCBib29sIEJ1aWx0SW5QREZWaWV3Ojppc1Ry YW5zcGFyZW50KCkKIAogdm9pZCBCdWlsdEluUERGVmlldzo6ZGVwcmVjYXRlZEdlb21ldHJ5RGlk Q2hhbmdlKGNvbnN0IEludFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3Qp CiB7Ci0gICAgaWYgKG1fZnJhbWVSZWN0ID09IGZyYW1lUmVjdCkgeworICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworfQorCit2b2lkIEJ1aWx0SW5QREZWaWV3OjpnZW9tZXRyeURpZENoYW5nZShj b25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCwgY29uc3Qg QWZmaW5lVHJhbnNmb3JtJiBwbHVnaW5Ub1Jvb3RWaWV3VHJhbnNmb3JtKQoreworICAgIGlmICht X3BsdWdpblNpemUgPT0gcGx1Z2luU2l6ZSkgewogICAgICAgICAvLyBOb3RoaW5nIHRvIGRvLgog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9mcmFtZVJlY3QgPSBmcmFtZVJlY3Q7Cisg ICAgbV9wbHVnaW5TaXplID0gcGx1Z2luU2l6ZTsKICAgICB1cGRhdGVTY3JvbGxiYXJzKCk7CiB9 CiAKQEAgLTU5NCw3ICs1OTksNyBAQCB2b2lkIEJ1aWx0SW5QREZWaWV3OjpzZXRTY3JvbGxPZmZz ZXQoY29uc3QgSW50UG9pbnQmIG9mZnNldCkKIHsKICAgICBtX3Njcm9sbE9mZnNldCA9IEludFNp emUob2Zmc2V0LngoKSwgb2Zmc2V0LnkoKSk7CiAgICAgLy8gRklYTUU6IEl0IHdvdWxkIGJlIGJl dHRlciBmb3IgcGVyZm9ybWFuY2UgdG8gYmxpdCBwYXJ0cyB0aGF0IHJlbWFpbiB2aXNpYmxlLgot ICAgIGNvbnRyb2xsZXIoKS0+aW52YWxpZGF0ZShJbnRSZWN0KDAsIDAsIG1fZnJhbWVSZWN0Lndp ZHRoKCksIG1fZnJhbWVSZWN0LmhlaWdodCgpKSk7CisgICAgY29udHJvbGxlcigpLT5pbnZhbGlk YXRlKEludFJlY3QoMCwgMCwgbV9wbHVnaW5TaXplLndpZHRoKCksIG1fcGx1Z2luU2l6ZS5oZWln aHQoKSkpOwogfQogCiBpbnQgQnVpbHRJblBERlZpZXc6OnNjcm9sbFNpemUoU2Nyb2xsYmFyT3Jp ZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnN0CkBAIC02NTEsMTkgKzY1NiwxOSBAQCBJbnRQb2lu dCBCdWlsdEluUERGVmlldzo6bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3QKICAgICBpbnQg aG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCA9IChtX2hvcml6b250YWxTY3JvbGxiYXIgJiYgIW1f aG9yaXpvbnRhbFNjcm9sbGJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCkpID8gbV9ob3Jpem9udGFs U2Nyb2xsYmFyLT5oZWlnaHQoKSA6IDA7CiAgICAgaW50IHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgg PSAobV92ZXJ0aWNhbFNjcm9sbGJhciAmJiAhbV92ZXJ0aWNhbFNjcm9sbGJhci0+aXNPdmVybGF5 U2Nyb2xsYmFyKCkpID8gbV92ZXJ0aWNhbFNjcm9sbGJhci0+d2lkdGgoKSA6IDA7CiAKLSAgICBJ bnRQb2ludCBtYXhpbXVtT2Zmc2V0KG1fcGRmRG9jdW1lbnRTaXplLndpZHRoKCkgLSBtX2ZyYW1l UmVjdC53aWR0aCgpICsgdmVydGljYWxTY3JvbGxiYXJXaWR0aCwgbV9wZGZEb2N1bWVudFNpemUu aGVpZ2h0KCkgLSBtX2ZyYW1lUmVjdC5oZWlnaHQoKSArIGhvcml6b250YWxTY3JvbGxiYXJIZWln aHQpOworICAgIEludFBvaW50IG1heGltdW1PZmZzZXQobV9wZGZEb2N1bWVudFNpemUud2lkdGgo KSAtIG1fcGx1Z2luU2l6ZS53aWR0aCgpICsgdmVydGljYWxTY3JvbGxiYXJXaWR0aCwgbV9wZGZE b2N1bWVudFNpemUuaGVpZ2h0KCkgLSBtX3BsdWdpblNpemUuaGVpZ2h0KCkgKyBob3Jpem9udGFs U2Nyb2xsYmFySGVpZ2h0KTsKICAgICBtYXhpbXVtT2Zmc2V0LmNsYW1wTmVnYXRpdmVUb1plcm8o KTsKICAgICByZXR1cm4gbWF4aW11bU9mZnNldDsKIH0KIAogTGF5b3V0VW5pdCBCdWlsdEluUERG Vmlldzo6dmlzaWJsZUhlaWdodCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZnJhbWVSZWN0Lmhl aWdodCgpOworICAgIHJldHVybiBtX3BsdWdpblNpemUuaGVpZ2h0KCk7CiB9CiAKIExheW91dFVu aXQgQnVpbHRJblBERlZpZXc6OnZpc2libGVXaWR0aCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1f ZnJhbWVSZWN0LndpZHRoKCk7CisgICAgcmV0dXJuIG1fcGx1Z2luU2l6ZS53aWR0aCgpOwogfQog CiBJbnRTaXplIEJ1aWx0SW5QREZWaWV3Ojpjb250ZW50c1NpemUoKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5o IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9CdWlsdEluUERGVmlldy5o CmluZGV4IDY5YTg5Mzk4NWJjN2EyMmQwYThmZTc3ZDQxMDc0NTdlZDU5MzkyMzUuLjMzNjQ4NDE3 OGMzNDE2ZDI3ZDdjOGU5MjhlZjg5NWU1YjM4YzNmYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0J1aWx0SW5QREZWaWV3LmgKQEAgLTc4LDYg Kzc4LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogICAgIHZpcnR1YWwgYm9vbCBpc1RyYW5zcGFyZW50 KCk7CiAgICAgdmlydHVhbCB2b2lkIGRlcHJlY2F0ZWRHZW9tZXRyeURpZENoYW5nZShjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiBmcmFtZVJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBS ZWN0KTsKKyAgICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6 SW50U2l6ZSYgcGx1Z2luU2l6ZSwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QsIGNv bnN0IFdlYkNvcmU6OkFmZmluZVRyYW5zZm9ybSYgcGx1Z2luVG9Sb290Vmlld1RyYW5zZm9ybSk7 CiAgICAgdmlydHVhbCB2b2lkIHZpc2liaWxpdHlEaWRDaGFuZ2UoKTsKICAgICB2aXJ0dWFsIHZv aWQgZnJhbWVEaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IHJlcXVlc3RJRCk7CiAgICAgdmlydHVh bCB2b2lkIGZyYW1lRGlkRmFpbCh1aW50NjRfdCByZXF1ZXN0SUQsIGJvb2wgd2FzQ2FuY2VsbGVk KTsKQEAgLTE0Myw4ICsxNDQsNyBAQCBwcml2YXRlOgogICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQg dGhlIG90aGVyIGNvbnZlcnNpb24gZnVuY3Rpb25zOyB0aGlzIG9uZSBpcyBlbm91Z2ggdG8gZ2V0 IHNjcm9sbGJhciBoaXQgdGVzdGluZyB3b3JraW5nLgogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50 UG9pbnQgY29udmVydEZyb21Db250YWluaW5nVmlld1RvU2Nyb2xsYmFyKGNvbnN0IFdlYkNvcmU6 OlNjcm9sbGJhciosIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwYXJlbnRQb2ludCkgY29uc3Q7 CiAKLSAgICAvLyBJbiB3aW5kb3cgY29vcmRpbmF0ZXMuCi0gICAgV2ViQ29yZTo6SW50UmVjdCBt X2ZyYW1lUmVjdDsKKyAgICBXZWJDb3JlOjpJbnRTaXplIG1fcGx1Z2luU2l6ZTsKIAogICAgIFdl YkNvcmU6OktVUkwgbV9zb3VyY2VVUkw7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW4uaAppbmRleCAzODBhMDNkODJhMTM2NDNiYmQzOTVhMjNmZjcyNzI2ODI1Mzdm MDZmLi43YTdiNWU2NWQwZTViNTRkMjQ1Zjc1Zjc4NTUzZWIzMWU4Y2ExODU0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCkBAIC00MCw2ICs0MCw3IEBAIG5h bWVzcGFjZSBDb3JlSVBDIHsKIH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIGNsYXNzIEFm ZmluZVRyYW5zZm9ybTsKICAgICBjbGFzcyBHcmFwaGljc0NvbnRleHQ7CiAgICAgY2xhc3MgSW50 UmVjdDsKICAgICBjbGFzcyBTY3JvbGxiYXI7CkBAIC0xMTgsNiArMTE5LDEwIEBAIHB1YmxpYzoK ICAgICAvLyBUZWxscyB0aGUgcGx1Zy1pbiB0aGF0IGVpdGhlciB0aGUgcGx1Zy1pbnMgZnJhbWUg cmVjdCBvciBpdHMgY2xpcCByZWN0IGhhcyBjaGFuZ2VkLiBCb3RoIHJlY3RzIGFyZSBpbiB3aW5k b3cgY29vcmRpbmF0ZXMuCiAgICAgdmlydHVhbCB2b2lkIGRlcHJlY2F0ZWRHZW9tZXRyeURpZENo YW5nZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBmcmFtZVJlY3QsIGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmIGNsaXBSZWN0KSA9IDA7CiAKKyAgICAvLyBUZWxscyB0aGUgcGx1Zy1pbiB0aGF0IGl0 cyBnZW9tZXRyeSBoYXMgY2hhbmdlZC4gVGhlIGNsaXAgcmVjdCBpcyBpbiBwbHVnLWluIGNvb3Jk aW5hdGVzLCBhbmQgdGhlIGFmZmluZSB0cmFuc2Zvcm0gY2FuIGJlIHVzZWQKKyAgICAvLyB0byBj b252ZXJ0IGZyb20gcm9vdCB2aWV3IGNvb3JkaW5hdGVzIHRvIHBsdWctaW4gY29vcmRpbmF0ZXMu CisgICAgdmlydHVhbCB2b2lkIGdlb21ldHJ5RGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFNp emUmIHBsdWdpblNpemUsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBSZWN0LCBjb25zdCBX ZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0mIHBsdWdpblRvUm9vdFZpZXdUcmFuc2Zvcm0pID0gMDsK KwogICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRoYXQgaXQgaGFzIGJlZW4gZXhwbGljaXRseSBo aWRkZW4gb3Igc2hvd24uIChOb3RlIHRoYXQgdGhpcyBpcyBub3QgY2FsbGVkIHdoZW4gdGhlIHBs dWctaW4gYmVjb21lcyBvYnNjdXJlZCBmcm9tIHZpZXcgb24gc2NyZWVuLikKICAgICB2aXJ0dWFs IHZvaWQgdmlzaWJpbGl0eURpZENoYW5nZSgpID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKaW5kZXggNTNkODAwYmQ4ZWE3ODg0 MzA1YzdhMTQ1YmNjYzNiOGQyYjhkZmQ2Mi4uOTc0YmFkNGI4MWYxYTBmNDlmNzRlN2NiYjYyNmRh MmRiZDBiYjJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJveHkuY3BwCkBAIC0yNDEsNiArMjQxLDEyIEBAIHZvaWQgUGx1Z2luUHJveHk6OmRl cHJlY2F0ZWRHZW9tZXRyeURpZENoYW5nZShjb25zdCBJbnRSZWN0JiBmcmFtZVJlY3QsIGNvbnN0 IEluCiAgICAgZ2VvbWV0cnlEaWRDaGFuZ2UoKTsKIH0KIAordm9pZCBQbHVnaW5Qcm94eTo6Z2Vv bWV0cnlEaWRDaGFuZ2UoY29uc3QgSW50U2l6ZSYgcGx1Z2luU2l6ZSwgY29uc3QgSW50UmVjdCYg Y2xpcFJlY3QsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYgcGx1Z2luVG9Sb290Vmlld1RyYW5zZm9y bSkKK3sKKyAgICAvLyBGSVhNRTogVGhpcyBpc24ndCBjYWxsZWQgeWV0LgorICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworfQorCiB2b2lkIFBsdWdpblByb3h5Ojp2aXNpYmlsaXR5RGlkQ2hhbmdl KCkKIHsKICAgICBBU1NFUlQobV9pc1N0YXJ0ZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaAppbmRleCA1MmU3MWYyZTZhN2MzNGI2YmNiOWY1 Y2NhMTM2M2U3NGU0OTE4NmJmLi42NzcxNTVlYTM3NjAzMGYzMzAzY2ZhMTE5ZjAxMzk0ZTM4YjYx MjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJv eHkuaApAQCAtNzIsNiArNzIsNyBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgdmlydHVhbCBib29s IGlzVHJhbnNwYXJlbnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGVwcmVjYXRlZEdlb21ldHJ5RGlk Q2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgY2xpcFJlY3QpOworICAgIHZpcnR1YWwgdm9pZCBnZW9tZXRyeURpZENoYW5nZShj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBwbHVnaW5TaXplLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JiBjbGlwUmVjdCwgY29uc3QgV2ViQ29yZTo6QWZmaW5lVHJhbnNmb3JtJiBwbHVnaW5Ub1Jvb3RW aWV3VHJhbnNmb3JtKTsKICAgICB2aXJ0dWFsIHZvaWQgdmlzaWJpbGl0eURpZENoYW5nZSgpOwog ICAgIHZpcnR1YWwgdm9pZCBmcmFtZURpZEZpbmlzaExvYWRpbmcodWludDY0X3QgcmVxdWVzdElE KTsKICAgICB2aXJ0dWFsIHZvaWQgZnJhbWVEaWRGYWlsKHVpbnQ2NF90IHJlcXVlc3RJRCwgYm9v bCB3YXNDYW5jZWxsZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblZpZXcuY3BwCmluZGV4IGU1MjkxYjM0MDY5ZDY2ZmNjMGU0MDQzZjY3ZjBhMDRkYTFi YTdmNzEuLjVlMjA5ZTgxNjI0OTQ1NjE5MDQxMjhiY2UwYjVkOTJlOGNhMDM5NjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTcx NiwxNyArNzE2LDIxIEBAIHZvaWQgUGx1Z2luVmlldzo6dmlld0dlb21ldHJ5RGlkQ2hhbmdlKCkK ICAgICBpZiAoIW1faXNJbml0aWFsaXplZCB8fCAhbV9wbHVnaW4gfHwgIXBhcmVudCgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBJbnRSZWN0IHJlY3Q7Ci0KICAgICBpZiAobV9wbHVnaW4tPndh bnRzV2luZG93UmVsYXRpdmVDb29yZGluYXRlcygpKSB7CiAgICAgICAgIC8vIEdldCB0aGUgZnJh bWUgcmVjdCBpbiB3aW5kb3cgY29vcmRpbmF0ZXMuCi0gICAgICAgIHJlY3QgPSBwYXJlbnQoKS0+ Y29udGVudHNUb1dpbmRvdyhmcmFtZVJlY3QoKSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgLy8g RklYTUU6IFRoZSBwbHVnLWluIHNob3VsZG4ndCBrbm93IGl0cyBsb2NhdGlvbiByZWxhdGl2ZSB0 byBpdHMgcGFyZW50IGZyYW1lLgotICAgICAgICByZWN0ID0gZnJhbWVSZWN0KCk7CisgICAgICAg IEludFJlY3QgcmVjdCA9IHBhcmVudCgpLT5jb250ZW50c1RvV2luZG93KGZyYW1lUmVjdCgpKTsK KyAgICAgICAgbV9wbHVnaW4tPmRlcHJlY2F0ZWRHZW9tZXRyeURpZENoYW5nZShyZWN0LCBjbGlw UmVjdEluV2luZG93Q29vcmRpbmF0ZXMoKSk7CisgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAg ICBtX3BsdWdpbi0+ZGVwcmVjYXRlZEdlb21ldHJ5RGlkQ2hhbmdlKHJlY3QsIGNsaXBSZWN0SW5X aW5kb3dDb29yZGluYXRlcygpKTsKKyAgICAvLyBGSVhNRTogSnVzdCBwYXNzaW5nIGEgdHJhbnNs YXRpb24gbWF0cml4IGlzbid0IGdvb2QgZW5vdWdoLgorICAgIEludFBvaW50IGxvY2F0aW9uSW5X aW5kb3dDb29yZGluYXRlcyA9IHBhcmVudCgpLT5jb250ZW50c1RvV2luZG93KGZyYW1lUmVjdCgp LmxvY2F0aW9uKCkpOworICAgIEFmZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSBBZmZpbmVUcmFu c2Zvcm06OnRyYW5zbGF0aW9uKGxvY2F0aW9uSW5XaW5kb3dDb29yZGluYXRlcy54KCksIGxvY2F0 aW9uSW5XaW5kb3dDb29yZGluYXRlcy55KCkpOworCisgICAgLy8gRklYTUU6IFRoZSBjbGlwIHJl Y3QgaXNuJ3QgY29ycmVjdC4KKyAgICBJbnRSZWN0IGNsaXBSZWN0ID0gYm91bmRzUmVjdCgpOwor ICAgIG1fcGx1Z2luLT5nZW9tZXRyeURpZENoYW5nZShzaXplKCksIGNsaXBSZWN0LCB0cmFuc2Zv cm0pOworCiB9CiAKIHZvaWQgUGx1Z2luVmlldzo6dmlld1Zpc2liaWxpdHlEaWRDaGFuZ2UoKQo=