193598 2019-01-18 15:47:00 -0800 Automation.computeElementLayout should return visual viewport-aware coordinates 2019-01-18 20:22:46 -0800 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg ajuma bburg joepeck simon.fraser timothy webkit-bug-importer oldest_to_newest 1496074 0 bburg 2019-01-18 15:47:00 -0800 I propose removing CoordinateSystem::VisualViewport and have LayoutViewport automatically take Visual Viewports into account if it is enabled in settings. 1496075 1 bburg 2019-01-18 15:47:46 -0800 <rdar://problem/35325644> 1496107 2 359557 bburg 2019-01-18 16:59:32 -0800 Created attachment 359557 Patch 1496170 3 bburg 2019-01-18 20:22:46 -0800 Committed r240195: <https://trac.webkit.org/changeset/240195> 359557 2019-01-18 16:59:32 -0800 2019-01-18 17:21:59 -0800 Patch bug-193598-20190118165932.patch text/plain 8707 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA0MWRjMmQxNjQ1ZjQ0 OTc0ZjBiZDQ5YjQ0NTczYzBiNjM3NjNkNi4uZGJmNDMzMGIzNTQ5ZmVmY2JlNDVmMWMzYThkZGQ1 ZTVkMDYxMmZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTAxLTE4ICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIEF1dG9tYXRpb24uY29tcHV0ZUVs ZW1lbnRMYXlvdXQgc2hvdWxkIHJldHVybiB2aXN1YWwgdmlld3BvcnQtYXdhcmUgY29vcmRpbmF0 ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzU5 OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzUzMjU2NDQ+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOiBleHBvcnQg c3ltYm9sIHRvIGJlIHVzYWJsZSBmcm9tIFdlYktpdC4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmll dy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmNsaWVudFRvTGF5b3V0Vmlld3Bv cnRSZWN0IGNvbnN0KTogQWRkZWQuCisgICAgICAgIERvIHRoZSBzYW1lIHRoaW5nIGFzIGNsaWVu dFRvTGF5b3V0Vmlld3BvcnRQb2ludCB3aXRoIGEgcmVjdCBpbnN0ZWFkLgorCisKIDIwMTktMDEt MTggIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 ZXJ0IHIyMzg4MTUsIGl0IGJyb2tlIFdLMSB2aWRlbyBmdWxsc2NyZWVuIG9uIE1hYwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpp bmRleCBkNzcxYmVmOWNmNjg5NTUyM2VjZmRiMGEyZjlmYjc1Y2Y3ZWE4MGUwLi42NzNmMzFhM2Ey NDNkOGNjOTk5ZTQzZTAxMmVhMzQ3M2NmYzRkMmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBA CisyMDE5LTAxLTE4ICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIEF1 dG9tYXRpb24uY29tcHV0ZUVsZW1lbnRMYXlvdXQgc2hvdWxkIHJldHVybiB2aXN1YWwgdmlld3Bv cnQtYXdhcmUgY29vcmRpbmF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MzU5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzUzMjU2NDQ+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJldmlvdXNs eSBJIGFkZGVkIENvb3JkaW5hdGVTeXN0ZW06OlZpc3VhbFZpZXdwb3J0IHRvIHN0dWIgb3V0IHRo aXMgZm9yIGlPUy4KKyAgICAgICAgQnV0IEkgdGhpbmsgdGhhdCBpdCdzIGEgbWlzdGFrZSBmb3Ig c2FmYXJpZHJpdmVyIHRvIGNhcmUgYWJvdXQgVmlzdWFsVmlld3BvcnQKKyAgICAgICAgYmVpbmcg ZW5hYmxlZCBvciBub3QsIGJlY2F1c2UgaXQgaXMgYSBydW50aW1lLXN3aXRjaGFibGUgc2V0dGlu Zy4KKworICAgICAgICBUaGlzIHBhdGNoIHJlbW92ZXMgQ29vcmRpbmF0ZVN5c3RlbTo6VmlzdWFs Vmlld3BvcnQuIE1ha2UgdGhlIGV4aXN0aW5nCisgICAgICAgIENvb3JkaW5hdGVTeXN0ZW06Okxh eW91dFZpZXdwb3J0IHVzZSB2aXN1YWwgdmlld3BvcnQgc2VtYW50aWNzIGlmIG5lZWRlZC4KKwor ICAgICAgICBUaGlzIGlzIHRlc3RlZCBieSBXZWJEcml2ZXIgZWxlbWVudCBjbGlja2luZyB0ZXN0 cy4gVGhlcmUgc2hvdWxkIG5vdCBiZSBhbnkKKyAgICAgICAgZGlmZmVyZW5jZSBpbiBiZWhhdmlv ciB1bnRpbCBpdCBpcyBwb3NzaWJsZSB0byB6b29tIHdpdGggZ2VzdHVyZXMgdmlhIFdlYkRyaXZl ci4KKworICAgICAgICAqIFNoYXJlZC9Db29yZGluYXRlU3lzdGVtLmg6CisgICAgICAgICogVUlQ cm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uOgorICAgICAgICAqIFVJUHJvY2Vzcy9B dXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6cHJv dG9jb2xTdHJpbmdUb0Nvb3JkaW5hdGVTeXN0ZW0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViQXV0b21hdGlvblNlc3Npb25Qcm94eTo6Y29tcHV0ZUVsZW1lbnRMYXlvdXQpOgorCiAyMDE5 LTAxLTE4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXgg c29tZSBidWlsZCBpc3N1ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMDY2OTgx NTZkYjRiNWMyMTBlZTAwODY4ZDFkYzQ3ZmE4YzA3ZGM0MS4uZTQ3MTRhYWRmNmMwZDUyYTg4N2U2 MmUxZTQ2OTI2MzE2YjY5Y2Q5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDg4 Myw2ICs0ODgzLDEzIEBAIEZsb2F0UG9pbnQgRnJhbWVWaWV3OjpsYXlvdXRWaWV3cG9ydFRvQWJz b2x1dGVQb2ludChGbG9hdFBvaW50IHApIGNvbnN0CiAgICAgcmV0dXJuIHAuc2NhbGVkKGZyYW1l KCkuZnJhbWVTY2FsZUZhY3RvcigpKTsKIH0KIAorRmxvYXRSZWN0IEZyYW1lVmlldzo6Y2xpZW50 VG9MYXlvdXRWaWV3cG9ydFJlY3QoRmxvYXRSZWN0IHJlY3QpIGNvbnN0Cit7CisgICAgQVNTRVJU KGZyYW1lKCkuc2V0dGluZ3MoKS52aXN1YWxWaWV3cG9ydEVuYWJsZWQoKSk7CisgICAgcmVjdC5z Y2FsZShmcmFtZSgpLnBhZ2Vab29tRmFjdG9yKCkpOworICAgIHJldHVybiByZWN0OworfQorCiBG bG9hdFBvaW50IEZyYW1lVmlldzo6Y2xpZW50VG9MYXlvdXRWaWV3cG9ydFBvaW50KEZsb2F0UG9p bnQgcCkgY29uc3QKIHsKICAgICBBU1NFUlQoZnJhbWUoKS5zZXR0aW5ncygpLnZpc3VhbFZpZXdw b3J0RW5hYmxlZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IDBjNzgxZWU2MmEzNjM3 ZjM3ZWU2N2JhYzFlODM2MTc4MWZiOTU1YWYuLmZkNjk5NWRlZWJmNTVmMTMzNTRjOWMzMTk0YzE5 YTYxZDQxM2M2YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtNDg2LDcgKzQ4Niw4IEBA IHB1YmxpYzoKICAgICBGbG9hdFBvaW50IGxheW91dFZpZXdwb3J0VG9BYnNvbHV0ZVBvaW50KEZs b2F0UG9pbnQpIGNvbnN0OwogCiAgICAgLy8gVW5saWtlIGNsaWVudCBjb29yZGluYXRlcywgbGF5 b3V0IHZpZXdwb3J0IGNvb3JkaW5hdGVzIGFyZSBhZmZlY3RlZCBieSBwYWdlIHpvb20uCi0gICAg RmxvYXRQb2ludCBjbGllbnRUb0xheW91dFZpZXdwb3J0UG9pbnQoRmxvYXRQb2ludCkgY29uc3Q7 CisgICAgV0VCQ09SRV9FWFBPUlQgRmxvYXRSZWN0IGNsaWVudFRvTGF5b3V0Vmlld3BvcnRSZWN0 KEZsb2F0UmVjdCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgRmxvYXRQb2ludCBjbGllbnRU b0xheW91dFZpZXdwb3J0UG9pbnQoRmxvYXRQb2ludCkgY29uc3Q7CiAKICAgICBib29sIGlzRnJh bWVWaWV3U2Nyb2xsQ29ybmVyKGNvbnN0IFJlbmRlclNjcm9sbGJhclBhcnQmIHNjcm9sbENvcm5l cikgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxDb3JuZXIuZ2V0KCkgPT0gJnNjcm9sbENvcm5lcjsg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlU3lzdGVtLmgg Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlU3lzdGVtLmgKaW5kZXggNTJiODg4MTcy ZTA3YWE1Y2E2MDc4YjA5ODJiODhmYjRiMmVhMzY4Ny4uNGI1NWNmNmIyMzQ0MTA0MzA5MzZmN2Fm Njg2YjU1ODY5YThlODIzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29vcmRp bmF0ZVN5c3RlbS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVTeXN0ZW0u aApAQCAtMzEsOCArMzEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogZW51bSBjbGFzcyBDb29y ZGluYXRlU3lzdGVtIDogdWludDhfdCB7CiAgICAgUGFnZSA9IDAsCi0gICAgTGF5b3V0Vmlld3Bv cnQsCi0gICAgVmlzdWFsVmlld3BvcnQsCisgICAgTGF5b3V0Vmlld3BvcnQKIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApAQCAtNDIsOSArNDEsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIHRlbXBs YXRlPD4gc3RydWN0IEVudW1UcmFpdHM8V2ViS2l0OjpDb29yZGluYXRlU3lzdGVtPiB7CiAgICAg dXNpbmcgdmFsdWVzID0gRW51bVZhbHVlczwKICAgICBXZWJLaXQ6OkNvb3JkaW5hdGVTeXN0ZW0s Ci0gICAgV2ViS2l0OjpDb29yZGluYXRlU3lzdGVtOjpQYWdlLAotICAgIFdlYktpdDo6Q29vcmRp bmF0ZVN5c3RlbTo6TGF5b3V0Vmlld3BvcnQsCi0gICAgV2ViS2l0OjpDb29yZGluYXRlU3lzdGVt OjpWaXN1YWxWaWV3cG9ydAorICAgIFdlYktpdDo6Q29vcmRpbmF0ZVN5c3RlbTo6UGFnZQogICAg ID47CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9u L0F1dG9tYXRpb24uanNvbiBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0 b21hdGlvbi5qc29uCmluZGV4IDY3MWE3NjFhZTM2MzdiNTgxNThmYTEwZjFmNGFmZDFiMmE1YmQz NmUuLjdmNzQxNzJkM2U2YmI5N2ZmMTEwN2Y4ZTdlZTA0MjQ3MWE1YWQ1MTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uCkBAIC0z Miw4ICszMiw3IEBACiAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiVGhlIGNvb3JkaW5hdGUg c3lzdGVtIGluIHdoaWNoIHJlY3RzLCBwb2ludHMsIGFuZCBzaXplcyBhcmUgdG8gYmUgaW50ZXJw cmV0ZWQuIiwKICAgICAgICAgICAgICJlbnVtIjogWwogICAgICAgICAgICAgICAgICJQYWdlIiwK LSAgICAgICAgICAgICAgICAiTGF5b3V0Vmlld3BvcnQiLAotICAgICAgICAgICAgICAgICJWaXN1 YWxWaWV3cG9ydCIKKyAgICAgICAgICAgICAgICAiTGF5b3V0Vmlld3BvcnQiCiAgICAgICAgICAg ICBdCiAgICAgICAgIH0sCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKaW5kZXggNmM0 ZWRlYmIxNzI5ZjdjZWZiNDg5MjJhOTU2NWIwZTdlYTViMDYxMC4uODk5NWRjNjEyNWY0NTkzOTBj MTgwZWViNTQzYzExNTE2YjFjZWU0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTEwMDQs OCArMTAwNCw2IEBAIHN0YXRpYyBPcHRpb25hbDxDb29yZGluYXRlU3lzdGVtPiBwcm90b2NvbFN0 cmluZ1RvQ29vcmRpbmF0ZVN5c3RlbShjb25zdCBTdHJpbmcmCiAgICAgICAgIHJldHVybiBDb29y ZGluYXRlU3lzdGVtOjpQYWdlOwogICAgIGlmIChjb29yZGluYXRlU3lzdGVtU3RyaW5nID09ICJM YXlvdXRWaWV3cG9ydCIpCiAgICAgICAgIHJldHVybiBDb29yZGluYXRlU3lzdGVtOjpMYXlvdXRW aWV3cG9ydDsKLSAgICBpZiAoY29vcmRpbmF0ZVN5c3RlbVN0cmluZyA9PSAiVmlzdWFsVmlld3Bv cnQiKQotICAgICAgICByZXR1cm4gQ29vcmRpbmF0ZVN5c3RlbTo6VmlzdWFsVmlld3BvcnQ7CiAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5 LmNwcAppbmRleCAwMDljY2VjMGMyMzBlMmZkYjZhMThmY2RiZTUzMzdhYjAyZThjZWNlLi4zOTQ2 MWFkYjgzYTBlNGQ1ZTNmN2RmZGZmNzM1NzM5MDU0ZTQzOTg0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9u U2Vzc2lvblByb3h5LmNwcApAQCAtNTY3LDExICs1NjcsNiBAQCB2b2lkIFdlYkF1dG9tYXRpb25T ZXNzaW9uUHJveHk6OmNvbXB1dGVFbGVtZW50TGF5b3V0KHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0 X3QgZgogICAgICAgICAvLyBGSVhNRTogV2FpdCBpbiBhbiBpbXBsZW1lbnRhdGlvbi1zcGVjaWZp YyB3YXkgdXAgdG8gdGhlIHNlc3Npb24gaW1wbGljaXQgd2FpdCB0aW1lb3V0IGZvciB0aGUgZWxl bWVudCB0byBiZWNvbWUgaW4gdmlldy4KICAgICB9CiAKLSAgICBpZiAoY29vcmRpbmF0ZVN5c3Rl bSA9PSBDb29yZGluYXRlU3lzdGVtOjpWaXN1YWxWaWV3cG9ydCkgewotICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6RGlkQ29tcHV0ZUVsZW1lbnRMYXlvdXQoY2FsbGJhY2tJ RCwgeyB9LCBXVEY6Om51bGxvcHQsIGZhbHNlLCBub3RJbXBsZW1lbnRlZEVycm9yVHlwZSksIDAp OwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgV2ViQ29yZTo6RnJhbWVWaWV3KiBmcmFt ZVZpZXcgPSBmcmFtZS0+Y29yZUZyYW1lKCktPnZpZXcoKTsKICAgICBXZWJDb3JlOjpGcmFtZVZp ZXcqIG1haW5WaWV3ID0gZnJhbWUtPmNvcmVGcmFtZSgpLT5tYWluRnJhbWUoKS52aWV3KCk7CiAg ICAgV2ViQ29yZTo6SW50UmVjdCBmcmFtZUVsZW1lbnRCb3VuZHMgPSByb3VuZGVkSW50UmVjdChj b3JlRWxlbWVudC0+Ym91bmRpbmdDbGllbnRSZWN0KCkpOwpAQCAtNTgzLDEwICs1NzgsMTAgQEAg dm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5Ojpjb21wdXRlRWxlbWVudExheW91dCh1aW50 NjRfdCBwYWdlSUQsIHVpbnQ2NF90IGYKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDb29yZGlu YXRlU3lzdGVtOjpMYXlvdXRWaWV3cG9ydDoKICAgICAgICAgLy8gVGhlIGVsZW1lbnQgYm91bmRz IGFyZSBhbHJlYWR5IGluIGNsaWVudCBjb29yZGluYXRlcy4KLSAgICAgICAgcmVzdWx0RWxlbWVu dEJvdW5kcyA9IHJvb3RFbGVtZW50Qm91bmRzOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIENv b3JkaW5hdGVTeXN0ZW06OlZpc3VhbFZpZXdwb3J0OgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgaWYgKGZyYW1lLT5jb3JlRnJhbWUoKS0+c2V0dGluZ3MoKS52aXN1YWxW aWV3cG9ydEVuYWJsZWQoKSkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnRCb3VuZHMgPSBXZWJD b3JlOjpJbnRSZWN0KG1haW5WaWV3LT5jbGllbnRUb0xheW91dFZpZXdwb3J0UmVjdChXZWJDb3Jl OjpGbG9hdFJlY3Qocm9vdEVsZW1lbnRCb3VuZHMpKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIHJlc3VsdEVsZW1lbnRCb3VuZHMgPSByb290RWxlbWVudEJvdW5kczsKICAgICAgICAgYnJl YWs7CiAgICAgfQogCkBAIC02MDIsMTAgKzU5NywxMCBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNz aW9uUHJveHk6OmNvbXB1dGVFbGVtZW50TGF5b3V0KHVpbnQ2NF90IHBhZ2VJRCwgdWludDY0X3Qg ZgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBDb29yZGluYXRlU3lz dGVtOjpMYXlvdXRWaWV3cG9ydDoKICAgICAgICAgICAgICAgICAvLyBUaGUgcG9pbnQgaXMgYWxy ZWFkeSBpbiBjbGllbnQgY29vcmRpbmF0ZXMuCi0gICAgICAgICAgICAgICAgcmVzdWx0SW5WaWV3 Q2VudGVyUG9pbnQgPSByb290SW5WaWV3Q2VudGVyUG9pbnQ7Ci0gICAgICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICBjYXNlIENvb3JkaW5hdGVTeXN0ZW06OlZpc3VhbFZpZXdwb3J0Ogot ICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgICAgIGlm IChmcmFtZS0+Y29yZUZyYW1lKCktPnNldHRpbmdzKCkudmlzdWFsVmlld3BvcnRFbmFibGVkKCkp CisgICAgICAgICAgICAgICAgICAgIHJlc3VsdEluVmlld0NlbnRlclBvaW50ID0gV2ViQ29yZTo6 SW50UG9pbnQobWFpblZpZXctPmNsaWVudFRvTGF5b3V0Vmlld3BvcnRQb2ludChyb290SW5WaWV3 Q2VudGVyUG9pbnQpKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAg IHJlc3VsdEluVmlld0NlbnRlclBvaW50ID0gcm9vdEluVmlld0NlbnRlclBvaW50OwogICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICB9Cg==