92536 2012-07-27 12:28:37 -0700 [Qt] Remove accurateVisibleContentsPosition and use a FloatRect for visibleContentsRect instead 2012-07-30 04:35:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte hausmann noam yael oldest_to_newest 680958 0 jturcotte 2012-07-27 12:28:37 -0700 [Qt] Remove accurateVisibleContentsPosition and use a FloatRect for visibleContentsRect instead 680967 1 155023 jturcotte 2012-07-27 12:35:24 -0700 Created attachment 155023 Patch 680974 2 155023 noam 2012-07-27 12:39:31 -0700 Comment on attachment 155023 Patch Nice to get rid of that workaround... 681862 3 jturcotte 2012-07-30 04:35:25 -0700 Committed r124013: <http://trac.webkit.org/changeset/124013> 155023 2012-07-27 12:35:24 -0700 2012-07-27 12:39:30 -0700 Patch bug-92536-20120727213024.patch text/plain 17472 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTkwNTZmZTI0OGM4YzQ2 YzRkZmM1ZjRjZmM3ZDMwM2JhOTFlODk3Ni4uOWQ0NjUwMWNlMzVhYzFmZmMwNTExNmI3YWQ4ZDM5 ZmNkYjEwOTU4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDEyLTA3LTI3ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBSZW1vdmUgYWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlvbiBhbmQgdXNlIGEgRmxvYXRS ZWN0IGZvciB2aXNpYmxlQ29udGVudHNSZWN0IGluc3RlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNTM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlv biBjYXJyaWVzIHRoZSBzYW1lIGluZm9ybWF0aW9uIGFzIHZpc2libGVDb250ZW50c1JlY3QubG9j YXRpb24oKSBhbmQKKyAgICAgICAgaXMgbmVlZGVkIGZvciBmaXhlZCBsYXllciBwb3NpdGlvbiB1 cGRhdGVzLgorICAgICAgICBUaGlzIHBhdGNoIGluc3RlYWQgdXNlcyBhIEZsb2F0UmVjdCBmb3Ig dGhlIHZpc2libGUgY29udGVudHMgcmVjdCBmcm9tIHRoZSB3ZWIgdmlldyBkb3duIHRvIHRoZQor ICAgICAgICBMYXllckNvb3JkaW5hdG9yUHJveHksIGFuZCBjb252ZXJ0IGl0IHRvIGFuIEludFJl Y3QgYXQgdGhpcyBtb21lbnQgYmVmb3JlIHNlbmRpbmcgaXQgdG8gdGhlCisgICAgICAgIHdlYiBw cm9jZXNzLgorICAgICAgICBUaGlzIGFsc28gbW92ZXMgdGhlIGNoZWNrIHRvIHByZXZlbnQgc2Vu ZGluZyB0aGUgc2FtZSByZWN0IGF0IHRoZSBtb21lbnQgb2YgdGhlIGNvbnZlcnNpb24KKyAgICAg ICAgaW4gTGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSB0byBmaXggYSBidWcgd2hlcmUgdGhlIGZp eGVkIGxheWVyIGRlbHRhcyB3b3VsZG4ndCBiZSB1cGRhdGVkCisgICAgICAgIHVubGVzcyB0aGUg aW50ZWdlciBwYXJ0IG9mIHBvc2l0aW9uIGNvbXBvbmVudHMgY2hhbmdlZC4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJW aWV3TGVnYWN5UHJpdmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKToKKyAgICAgICAgKiBVSVByb2Nl c3MvRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5 OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6 c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVh UHJveHlJbXBsLmg6CisgICAgICAgIChEcmF3aW5nQXJlYVByb3h5SW1wbCk6CisgICAgICAgICog VUlQcm9jZXNzL0xheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpMYXllclRyZWVDb29yZGluYXRvclByb3h5OjpMYXllclRyZWVDb29yZGluYXRvclByb3h5KToK KyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eTo6c2V0VmlzaWJsZUNv bnRlbnRzUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL0xheWVyVHJlZUNvb3JkaW5hdG9yUHJv eHkuaDoKKyAgICAgICAgKExheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJMYXllclRyZWVSZW5kZXJlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxh eWVyVHJlZVJlbmRlcmVyOjpXZWJMYXllclRyZWVSZW5kZXJlcik6CisgICAgICAgIChXZWJLaXQ6 OldlYkxheWVyVHJlZVJlbmRlcmVyOjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAg KFdlYktpdDo6V2ViTGF5ZXJUcmVlUmVuZGVyZXI6OmFkanVzdFBvc2l0aW9uRm9yRml4ZWRMYXll cnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJMYXllclRyZWVSZW5kZXJlci5oOgorICAgICAg ICAoV2ViTGF5ZXJUcmVlUmVuZGVyZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdw b3J0SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRIYW5kbGVyOjp2aXNp YmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEhhbmRsZXI6Omlu Zm9ybVZpc2libGVDb250ZW50Q2hhbmdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEhhbmRsZXIuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRIYW5kbGVyKToKKworMjAxMi0wNy0y NyAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCiAgICAg ICAgIFtRdF0gRml4IGlzc3VlcyByZW1haW5pbmcgd2l0aCBmaXhlZCBwb3NpdGlvbmVkIGxheWVy cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI1MjgK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5j cHAKaW5kZXggZmEwNDQ2ZmVjNjRhMWIwMDViZGZkOTY5NGZiZTE0YjljZGNjYjZkOC4uYmMwOWNj YzVlMWM3NjhhZTIwNDVmYTlkMjEyMmFjM2IyNmU4Y2VmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC03NzcsMTUgKzc3Nywx NSBAQCB2b2lkIFFRdWlja1dlYlZpZXdMZWdhY3lQcml2YXRlOjppbml0aWFsaXplKFdLQ29udGV4 dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cAogdm9pZCBRUXVpY2tXZWJWaWV3TGVnYWN5UHJp dmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKCkKIHsKICAgICBRX1EoUVF1aWNrV2ViVmlldyk7Ci0g ICAgUVNpemUgdmlld3BvcnRTaXplID0gcS0+Ym91bmRpbmdSZWN0KCkuc2l6ZSgpLnRvU2l6ZSgp OworICAgIFFTaXplRiB2aWV3cG9ydFNpemUgPSBxLT5ib3VuZGluZ1JlY3QoKS5zaXplKCk7CiAg ICAgaWYgKHZpZXdwb3J0U2l6ZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICBwYWdl Vmlldy0+c2V0Q29udGVudHNTaXplKHZpZXdwb3J0U2l6ZSk7CiAgICAgLy8gVGhlIGZpeGVkIGxh eW91dCBpcyBoYW5kbGVkIGJ5IHRoZSBGcmFtZVZpZXcgYW5kIHRoZSBkcmF3aW5nIGFyZWEgZG9l c24ndCBiZWhhdmUgZGlmZmVyZW50bHkKICAgICAvLyB3aGV0aGVyIGl0cyBmaXhlZCBvciBub3Qu IFdlIHN0aWxsIG5lZWQgdG8gdGVsbCB0aGUgZHJhd2luZyBhcmVhIHdoaWNoIHBhcnQgb2YgaXQK ICAgICAvLyBoYXMgdG8gYmUgcmVuZGVyZWQgb24gdGlsZXMsIGFuZCBpbiBkZXNrdG9wIG1vZGUg aXQncyBhbGwgb2YgaXQuCi0gICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5zZXRTaXpl KHZpZXdwb3J0U2l6ZSwgSW50U2l6ZSgpKTsKLSAgICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVh KCktPnNldFZpc2libGVDb250ZW50c1JlY3QoSW50UmVjdChJbnRQb2ludCgpLCB2aWV3cG9ydFNp emUpLCAxLCBGbG9hdFBvaW50KCkpOworICAgIHdlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+ c2V0U2l6ZSh2aWV3cG9ydFNpemUudG9TaXplKCksIEludFNpemUoKSk7CisgICAgd2ViUGFnZVBy b3h5LT5kcmF3aW5nQXJlYSgpLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KEZsb2F0UmVjdChGbG9h dFBvaW50KCksIHZpZXdwb3J0U2l6ZSksIDEsIEZsb2F0UG9pbnQoKSk7CiB9CiAKIHZvaWQgUVF1 aWNrV2ViVmlld0xlZ2FjeVByaXZhdGU6OmVuYWJsZU1vdXNlRXZlbnRzKCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCmluZGV4IDgwNWI4YWMzNDJjNmRhZGEy NjEzOTQ2MDgyMTYyNjM4YmNmNjYwOGEuLjk5NDYwZTQ5OWEwM2M5M2FiYjU4YmMzZjNkZWZiMGU5 M2MzZTFkZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHku aApAQCAtOTYsNyArOTYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0 IGNvbnRlbnRzUmVjdCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpc0JhY2tpbmdTdG9yZVJl YWR5KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIExheWVyVHJlZUNvb3JkaW5hdG9yUHJv eHkqIGxheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkoKSBjb25zdCB7IHJldHVybiBtX2xheWVyVHJl ZUNvb3JkaW5hdG9yUHJveHkuZ2V0KCk7IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNv bnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBm bG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3Rvciwg Y29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgYWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlv biA9IFdlYkNvcmU6OkZsb2F0UG9pbnQoKSkgeyB9CisgICAgdmlydHVhbCB2b2lkIHNldFZpc2li bGVDb250ZW50c1JlY3QoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB2aXNpYmxlQ29udGVudHNS ZWN0LCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZl Y3RvcikgeyB9CiAgICAgdmlydHVhbCB2b2lkIGNyZWF0ZVRpbGVGb3JMYXllcihpbnQgbGF5ZXJJ RCwgaW50IHRpbGVJRCwgY29uc3QgV2ViS2l0OjpVcGRhdGVJbmZvJikgeyB9CiAgICAgdmlydHVh bCB2b2lkIHVwZGF0ZVRpbGVGb3JMYXllcihpbnQgbGF5ZXJJRCwgaW50IHRpbGVJRCwgY29uc3Qg V2ViS2l0OjpVcGRhdGVJbmZvJikgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZVRpbGVGb3JM YXllcihpbnQgbGF5ZXJJRCwgaW50IHRpbGVJRCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRleCAwYmI3NDQ4NGUzMTI0M2Q1 MDBhMTM2ZTJmM2ZlNmQyYmZmYzg3ZGNlLi5jZDhjNWY2MjlmYTczZTE5NWYwM2MzOTY3M2Q0NTEx NjUzZGUwMjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0Fy ZWFQcm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5jcHAKQEAgLTM2NiwxMCArMzY2LDEwIEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94 eUltcGw6OmRpZFJlY2VpdmVMYXllclRyZWVDb29yZGluYXRvclByb3h5TWVzc2FnZShDb3JlSVBD OjpDCiAgICAgICAgIG1fbGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eS0+ZGlkUmVjZWl2ZUxheWVy VHJlZUNvb3JkaW5hdG9yUHJveHlNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgYXJndW1l bnRzKTsKIH0KIAotdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2V0VmlzaWJsZUNvbnRlbnRz UmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBz Y2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvciwgY29uc3Qg V2ViQ29yZTo6RmxvYXRQb2ludCYgYWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlvbikKK3Zv aWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29uc3Qg V2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvcikKIHsKICAgICBpZiAobV9sYXll clRyZWVDb29yZGluYXRvclByb3h5KQotICAgICAgICBtX2xheWVyVHJlZUNvb3JkaW5hdG9yUHJv eHktPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCwgc2NhbGUsIHRy YWplY3RvcnlWZWN0b3IsIGFjY3VyYXRlVmlzaWJsZUNvbnRlbnRzUG9zaXRpb24pOworICAgICAg ICBtX2xheWVyVHJlZUNvb3JkaW5hdG9yUHJveHktPnNldFZpc2libGVDb250ZW50c1JlY3Qodmlz aWJsZUNvbnRlbnRzUmVjdCwgc2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpOwogfQogCiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1w bC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgKaW5k ZXggNGM0YWM1OTM5ZTkwNDlmMWMzZTA1ZmM5NzdmMTYzYmMyNmNhMDUzZS4uMTlhNzcxZjJjYjU3 NjFjN2M0ZmMxMGI3NzEwZGJmN2UyMDU3NzQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmgKQEAgLTgyLDcgKzgyLDcgQEAgcHJpdmF0ZToK ICAgICBib29sIGlzSW5BY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJu ICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpOyB9CiAKICNpZiBVU0UoVUlfU0lERV9DT01Q T1NJVElORykKLSAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29uc3Qg V2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2lu dCYgYWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlvbiA9IFdlYkNvcmU6OkZsb2F0UG9pbnQo KSk7CisgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29uc3QgV2Vi Q29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeSk7CiAgICAgdm9pZCBkaWRSZWNlaXZlTGF5ZXJU cmVlQ29vcmRpbmF0b3JQcm94eU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6 Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CiAjZW5kaWYKICNlbHNlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVlQ29vcmRpbmF0b3JQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVlQ29vcmRpbmF0b3JQ cm94eS5jcHAKaW5kZXggNjI5MjkxYTRiOGI4ZTk0OWQ4ZWY5YzJlNjJhMmYyODI5YTI4YjA4NS4u YWVlMzI0MDQyNDFiNDAxZWVkOWU1ZmUyNTU5OTgzNzZjOTUyYzNmOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXllclRyZWVDb29yZGluYXRvclByb3h5LmNwcApA QCAtMzcsNiArMzcsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIExheWVyVHJlZUNvb3Jk aW5hdG9yUHJveHk6OkxheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkoRHJhd2luZ0FyZWFQcm94eSog ZHJhd2luZ0FyZWFQcm94eSkKICAgICA6IG1fZHJhd2luZ0FyZWFQcm94eShkcmF3aW5nQXJlYVBy b3h5KQogICAgICwgbV9yZW5kZXJlcihhZG9wdFJlZihuZXcgV2ViTGF5ZXJUcmVlUmVuZGVyZXIo dGhpcykpKQorICAgICwgbV9sYXN0U2VudFNjYWxlKDApCiB7CiB9CiAKQEAgLTEzNywxMCArMTM4 LDIwIEBAIHZvaWQgTGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eTo6c2V0Q29udGVudHNTaXplKGNv bnN0IEZsb2F0U2l6ZSYgY29udGVudHNTaXplKQogICAgIGRpc3BhdGNoVXBkYXRlKGJpbmQoJldl YkxheWVyVHJlZVJlbmRlcmVyOjpzZXRDb250ZW50c1NpemUsIG1fcmVuZGVyZXIuZ2V0KCksIGNv bnRlbnRzU2l6ZSkpOwogfQogCi12b2lkIExheWVyVHJlZUNvb3JkaW5hdG9yUHJveHk6OnNldFZp c2libGVDb250ZW50c1JlY3QoY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhbGUsIGNvbnN0 IEZsb2F0UG9pbnQmIHRyYWplY3RvcnlWZWN0b3IsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQm IGFjY3VyYXRlVmlzaWJsZUNvbnRlbnRzUG9zaXRpb24pCit2b2lkIExheWVyVHJlZUNvb3JkaW5h dG9yUHJveHk6OnNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBm bG9hdCBzY2FsZSwgY29uc3QgRmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvcikKIHsKLSAgICBk aXNwYXRjaFVwZGF0ZShiaW5kKCZXZWJMYXllclRyZWVSZW5kZXJlcjo6c2V0VmlzaWJsZUNvbnRl bnRzUmVjdCwgbV9yZW5kZXJlci5nZXQoKSwgcmVjdCwgc2NhbGUsIGFjY3VyYXRlVmlzaWJsZUNv bnRlbnRzUG9zaXRpb24pKTsKLSAgICBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS0+cHJvY2Vz cygpLT5zZW5kKE1lc3NhZ2VzOjpMYXllclRyZWVDb29yZGluYXRvcjo6U2V0VmlzaWJsZUNvbnRl bnRzUmVjdChyZWN0LCBzY2FsZSwgdHJhamVjdG9yeVZlY3RvciksIG1fZHJhd2luZ0FyZWFQcm94 eS0+cGFnZSgpLT5wYWdlSUQoKSk7CisgICAgLy8gSW5mb3JtIHRoZSByZW5kZXJlciB0byBhZGp1 c3Qgdmlld3BvcnQtZml4ZWQgbGF5ZXJzLgorICAgIGRpc3BhdGNoVXBkYXRlKGJpbmQoJldlYkxh eWVyVHJlZVJlbmRlcmVyOjpzZXRWaXNpYmxlQ29udGVudHNSZWN0LCBtX3JlbmRlcmVyLmdldCgp LCByZWN0KSk7CisKKyAgICAvLyBSb3VuZCB0aGUgcmVjdCBpbnN0ZWFkIG9mIGVuY2xvc2luZyBp dCB0byBtYWtlIHN1cmUgdGhhdCBpdHMgc2l6ZSBzdGF5cyB0aGUgc2FtZSB3aGlsZSBwYW5uaW5n LiBUaGlzIGNhbiBoYXZlIG5hc3R5IGVmZmVjdHMgb24gbGF5b3V0LgorICAgIEludFJlY3Qgcm91 bmRlZFJlY3QgPSByb3VuZGVkSW50UmVjdChyZWN0KTsKKyAgICBpZiAocm91bmRlZFJlY3QgPT0g bV9sYXN0U2VudFZpc2libGVSZWN0ICYmIHNjYWxlID09IG1fbGFzdFNlbnRTY2FsZSAmJiB0cmFq ZWN0b3J5VmVjdG9yID09IG1fbGFzdFNlbnRUcmFqZWN0b3J5VmVjdG9yKQorICAgICAgICByZXR1 cm47CisKKyAgICBtX2RyYXdpbmdBcmVhUHJveHktPnBhZ2UoKS0+cHJvY2VzcygpLT5zZW5kKE1l c3NhZ2VzOjpMYXllclRyZWVDb29yZGluYXRvcjo6U2V0VmlzaWJsZUNvbnRlbnRzUmVjdChyb3Vu ZGVkUmVjdCwgc2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpLCBtX2RyYXdpbmdBcmVhUHJveHktPnBh Z2UoKS0+cGFnZUlEKCkpOworICAgIG1fbGFzdFNlbnRWaXNpYmxlUmVjdCA9IHJvdW5kZWRSZWN0 OworICAgIG1fbGFzdFNlbnRTY2FsZSA9IHNjYWxlOworICAgIG1fbGFzdFNlbnRUcmFqZWN0b3J5 VmVjdG9yID0gdHJhamVjdG9yeVZlY3RvcjsKIH0KIAogdm9pZCBMYXllclRyZWVDb29yZGluYXRv clByb3h5OjpyZW5kZXJOZXh0RnJhbWUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0xheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9MYXllclRyZWVDb29yZGluYXRvclByb3h5LmgKaW5kZXggZWNhNjkwMGI2YmIxZDg2N2Iy Zjk3NTk1NDgxY2EzOWE1OTE5N2JjNi4uZmVkMzNhODEwNTY5YzgxYTk5ZjhiMmZhYWUwNDc0NGNj MTJjZjdlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyVHJlZUNv b3JkaW5hdG9yUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVl Q29vcmRpbmF0b3JQcm94eS5oCkBAIC02MCw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRp ZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQs IENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciopOwogICAgIHZvaWQgcHVyZ2VHTFJlc291cmNlcygp OwogICAgIHZvaWQgc2V0Q29udGVudHNTaXplKGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYpOwot ICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jiwg ZmxvYXQgc2NhbGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHRyYWplY3RvcnksIGNvbnN0 IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGFjY3VyYXRlVmlzaWJsZUNvbnRlbnRzUG9zaXRpb24pOwor ICAgIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qm LCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3Rv cik7CiAgICAgdm9pZCBkaWRSZW5kZXJGcmFtZSgpOwogICAgIHZvaWQgY3JlYXRlVGlsZUZvckxh eWVyKGludCBsYXllcklELCBpbnQgdGlsZUlELCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29u c3QgU3VyZmFjZVVwZGF0ZUluZm8mKTsKICAgICB2b2lkIHVwZGF0ZVRpbGVGb3JMYXllcihpbnQg bGF5ZXJJRCwgaW50IHRpbGVJRCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIGNvbnN0IFN1cmZh Y2VVcGRhdGVJbmZvJik7CkBAIC04MCw2ICs4MCw5IEBAIHByb3RlY3RlZDoKIAogICAgIERyYXdp bmdBcmVhUHJveHkqIG1fZHJhd2luZ0FyZWFQcm94eTsKICAgICBSZWZQdHI8V2ViTGF5ZXJUcmVl UmVuZGVyZXI+IG1fcmVuZGVyZXI7CisgICAgV2ViQ29yZTo6SW50UmVjdCBtX2xhc3RTZW50Vmlz aWJsZVJlY3Q7CisgICAgZmxvYXQgbV9sYXN0U2VudFNjYWxlOworICAgIFdlYkNvcmU6OkZsb2F0 UG9pbnQgbV9sYXN0U2VudFRyYWplY3RvcnlWZWN0b3I7CiAjaWYgVVNFKEdSQVBISUNTX1NVUkZB Q0UpCiAgICAgSGFzaE1hcDx1aW50MzJfdCwgUmVmUHRyPFNoYXJlYWJsZVN1cmZhY2U+ID4gbV9z dXJmYWNlczsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkxheWVyVHJlZVJlbmRlcmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJMYXll clRyZWVSZW5kZXJlci5jcHAKaW5kZXggOTQzZWMyMWFhMDYxNjI3OWZhNjg1Yjk1NmQwM2NjOGFh NDk4OWIxZC4uZmJkOWI1YWU0NmU0NGFkZDM5YWIxOWJlZWZlYzFjNTcxNTUxZjJmNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkxheWVyVHJlZVJlbmRlcmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTGF5ZXJUcmVlUmVuZGVyZXIuY3BwCkBA IC04NSw4ICs4NSw3IEBAIHN0YXRpYyBGbG9hdFBvaW50IGJvdW5kZWRTY3JvbGxQb3NpdGlvbihj b25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QKIH0KIAogV2ViTGF5ZXJUcmVl UmVuZGVyZXI6OldlYkxheWVyVHJlZVJlbmRlcmVyKExheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkq IGxheWVyVHJlZUNvb3JkaW5hdG9yUHJveHkpCi0gICAgOiBtX2NvbnRlbnRzU2NhbGUoMSkKLSAg ICAsIG1fbGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eShsYXllclRyZWVDb29yZGluYXRvclByb3h5 KQorICAgIDogbV9sYXllclRyZWVDb29yZGluYXRvclByb3h5KGxheWVyVHJlZUNvb3JkaW5hdG9y UHJveHkpCiAgICAgLCBtX3Jvb3RMYXllcklEKEludmFsaWRXZWJMYXllcklEKQogICAgICwgbV9p c0FjdGl2ZShmYWxzZSkKIHsKQEAgLTE1OSwxMSArMTU4LDkgQEAgdm9pZCBXZWJMYXllclRyZWVS ZW5kZXJlcjo6c2V0Q29udGVudHNTaXplKGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgY29udGVu dHNTaXoKICAgICBtX2NvbnRlbnRzU2l6ZSA9IGNvbnRlbnRzU2l6ZTsKIH0KIAotdm9pZCBXZWJM YXllclRyZWVSZW5kZXJlcjo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBJbnRSZWN0JiBy ZWN0LCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgYWNjdXJhdGVWaXNp YmxlQ29udGVudHNQb3NpdGlvbikKK3ZvaWQgV2ViTGF5ZXJUcmVlUmVuZGVyZXI6OnNldFZpc2li bGVDb250ZW50c1JlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIG1fdmlzaWJsZUNv bnRlbnRzUmVjdCA9IHJlY3Q7Ci0gICAgbV9jb250ZW50c1NjYWxlID0gc2NhbGU7Ci0gICAgbV9h Y2N1cmF0ZVZpc2libGVDb250ZW50c1Bvc2l0aW9uID0gYWNjdXJhdGVWaXNpYmxlQ29udGVudHNQ b3NpdGlvbjsKIH0KIAogdm9pZCBXZWJMYXllclRyZWVSZW5kZXJlcjo6dXBkYXRlVmlld3BvcnQo KQpAQCAtMTgwLDcgKzE3Nyw3IEBAIHZvaWQgV2ViTGF5ZXJUcmVlUmVuZGVyZXI6OmFkanVzdFBv c2l0aW9uRm9yRml4ZWRMYXllcnMoKQogICAgIC8vIEZpeGVkIGxheWVyIHBvc2l0aW9ucyBhcmUg dXBkYXRlZCBieSB0aGUgd2ViIHByb2Nlc3Mgd2hlbiB3ZSB1cGRhdGUgdGhlIHZpc2libGUgY29u dGVudHMgcmVjdCAvIHNjcm9sbCBwb3NpdGlvbi4KICAgICAvLyBJZiB3ZSB3YW50IHRob3NlIGxh eWVycyB0byBmb2xsb3cgYWNjdXJhdGVseSB0aGUgdmlld3BvcnQgd2hlbiB3ZSBtb3ZlIGJldHdl ZW4gdGhlIHdlYiBwcm9jZXNzIHVwZGF0ZXMsIHdlIGhhdmUgdG8gb2Zmc2V0CiAgICAgLy8gdGhl bSBieSB0aGUgZGVsdGEgYmV0d2VlbiB0aGUgY3VycmVudCBwb3NpdGlvbiBhbmQgdGhlIHBvc2l0 aW9uIG9mIHRoZSB2aWV3cG9ydCB1c2VkIGZvciB0aGUgbGFzdCBsYXlvdXQuCi0gICAgRmxvYXRQ b2ludCBzY3JvbGxQb3NpdGlvbiA9IGJvdW5kZWRTY3JvbGxQb3NpdGlvbihGbG9hdFBvaW50KG1f YWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlvbi54KCkgLyBtX2NvbnRlbnRzU2NhbGUsIG1f YWNjdXJhdGVWaXNpYmxlQ29udGVudHNQb3NpdGlvbi55KCkgLyBtX2NvbnRlbnRzU2NhbGUpLCBt X3Zpc2libGVDb250ZW50c1JlY3QsIG1fY29udGVudHNTaXplKTsKKyAgICBGbG9hdFBvaW50IHNj cm9sbFBvc2l0aW9uID0gYm91bmRlZFNjcm9sbFBvc2l0aW9uKG1fdmlzaWJsZUNvbnRlbnRzUmVj dC5sb2NhdGlvbigpLCBtX3Zpc2libGVDb250ZW50c1JlY3QsIG1fY29udGVudHNTaXplKTsKICAg ICBGbG9hdFBvaW50IHJlbmRlcmVkU2Nyb2xsUG9zaXRpb24gPSBib3VuZGVkU2Nyb2xsUG9zaXRp b24obV9yZW5kZXJlZENvbnRlbnRzU2Nyb2xsUG9zaXRpb24sIG1fdmlzaWJsZUNvbnRlbnRzUmVj dCwgbV9jb250ZW50c1NpemUpOwogICAgIEZsb2F0U2l6ZSBkZWx0YSA9IHNjcm9sbFBvc2l0aW9u IC0gcmVuZGVyZWRTY3JvbGxQb3NpdGlvbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkxheWVyVHJlZVJlbmRlcmVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViTGF5ZXJUcmVlUmVuZGVyZXIuaAppbmRleCAyYTRiYWI1MzZjZTRjZTZkOTIxZWJkOGQx NWU4ZjlhMjNlOGU0YjNhLi4xYzgxNTJlNDA4M2I0MjNlOWQzNjg0NzZiNGUzZjBiYWU4ZDRiNGQy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTGF5ZXJUcmVlUmVuZGVy ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTGF5ZXJUcmVlUmVuZGVyZXIu aApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWludFRvR3JhcGhpY3NDb250 ZXh0KEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQpOwogICAgIHZvaWQgc3lu Y1JlbW90ZUNvbnRlbnQoKTsKICAgICB2b2lkIHNldENvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3Jl OjpGbG9hdFNpemUmKTsKLSAgICB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYsIGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBh Y2N1cmF0ZVZpc2libGVDb250ZW50c1Bvc2l0aW9uKTsKKyAgICB2b2lkIHNldFZpc2libGVDb250 ZW50c1JlY3QoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jik7CiAgICAgdm9pZCBkaWRDaGFuZ2VT Y3JvbGxQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9zaXRpb24pOwogICAgIHZv aWQgc3luY0NhbnZhcyh1aW50MzJfdCBpZCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgY2FudmFz U2l6ZSwgdWludDMyX3QgZ3JhcGhpY3NTdXJmYWNlVG9rZW4pOwogCkBAIC0xMDcsOSArMTA3LDcg QEAgcHJpdmF0ZToKIAogICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJMYXllcklELCBXZWJDb3JlOjpH cmFwaGljc0xheWVyKj4gTGF5ZXJNYXA7CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG1fY29udGVu dHNTaXplOwotICAgIFdlYkNvcmU6OkludFJlY3QgbV92aXNpYmxlQ29udGVudHNSZWN0OwotICAg IFdlYkNvcmU6OkZsb2F0UG9pbnQgbV9hY2N1cmF0ZVZpc2libGVDb250ZW50c1Bvc2l0aW9uOwot ICAgIGZsb2F0IG1fY29udGVudHNTY2FsZTsKKyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV92aXNp YmxlQ29udGVudHNSZWN0OwogCiAgICAgLy8gUmVuZGVyIHF1ZXVlIGNhbiBiZSBhY2Nlc3NlZCBv bnkgZnJvbSBtYWluIHRocmVhZCBvciB1cGRhdGVQYWludE5vZGUgY2FsbCBzdGFjayEKICAgICBW ZWN0b3I8RnVuY3Rpb248dm9pZCgpPiA+IG1fcmVuZGVyUXVldWU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRIYW5kbGVyLmNwcAppbmRleCBhMWY1NmQxODk4 NGU4MjU4OWE4ZjNjZDFhZjFmYjNiNDg3ZWU2YzJjLi4zZjE1NmU5NWY3ZTg0MWI4ZDMxMjE2Y2Zj NWM0NzQ3YTUzMDE5MWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SGFuZGxlci5jcHAKQEAgLTY5NCwxMyArNjk0LDEwIEBAIHZvaWQgUXRWaWV3cG9y dEhhbmRsZXI6OnBpbmNoR2VzdHVyZUNhbmNlbGxlZCgpCiAgICAgbV9zY2FsZVVwZGF0ZURlZmVy cmVyLmNsZWFyKCk7CiB9CiAKLVFSZWN0IFF0Vmlld3BvcnRIYW5kbGVyOjp2aXNpYmxlQ29udGVu dHNSZWN0KCkgY29uc3QKK1FSZWN0RiBRdFZpZXdwb3J0SGFuZGxlcjo6dmlzaWJsZUNvbnRlbnRz UmVjdCgpIGNvbnN0CiB7CiAgICAgY29uc3QgUVJlY3RGIHZpc2libGVSZWN0KG1fdmlld3BvcnRJ dGVtLT5ib3VuZGluZ1JlY3QoKS5pbnRlcnNlY3RlZChtX3BhZ2VJdGVtLT5ib3VuZGluZ1JlY3Qo KSkpOwotCi0gICAgLy8gV2UgYXZvaWQgdXNpbmcgdG9BbGlnbmVkUmVjdCgpIGJlY2F1c2UgaXQg cHJvZHVjZXMgaW5jb25zaXN0ZW50IHdpZHRoIGFuZCBoZWlnaHQuCi0gICAgUVJlY3RGIG1hcHBl ZFJlY3QobV92aWV3cG9ydEl0ZW0tPm1hcFJlY3RUb1dlYkNvbnRlbnQodmlzaWJsZVJlY3QpKTsK LSAgICByZXR1cm4gUVJlY3QoZmxvb3IobWFwcGVkUmVjdC54KCkpLCBmbG9vcihtYXBwZWRSZWN0 LnkoKSksIGZsb29yKG1hcHBlZFJlY3Qud2lkdGgoKSksIGZsb29yKG1hcHBlZFJlY3QuaGVpZ2h0 KCkpKTsKKyAgICByZXR1cm4gbV92aWV3cG9ydEl0ZW0tPm1hcFJlY3RUb1dlYkNvbnRlbnQodmlz aWJsZVJlY3QpOwogfQogCiB2b2lkIFF0Vmlld3BvcnRIYW5kbGVyOjppbmZvcm1WaXNpYmxlQ29u dGVudENoYW5nZShjb25zdCBRUG9pbnRGJiB0cmFqZWN0b3J5VmVjdG9yKQpAQCAtNzA5LDE3ICs3 MDYsMTMgQEAgdm9pZCBRdFZpZXdwb3J0SGFuZGxlcjo6aW5mb3JtVmlzaWJsZUNvbnRlbnRDaGFu Z2UoY29uc3QgUVBvaW50RiYgdHJhamVjdG9yeVZlY3QKICAgICBpZiAoIWRyYXdpbmdBcmVhKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9sYXN0VmlzaWJsZUNvbnRlbnRzUmVjdCA9PSB2 aXNpYmxlQ29udGVudHNSZWN0KCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIHFyZWFsIHNjYWxl ID0gbV9wYWdlSXRlbS0+Y29udGVudHNTY2FsZSgpOwogCiAgICAgaWYgKHNjYWxlICE9IG1fbGFz dENvbW1pdHRlZFNjYWxlKQogICAgICAgICBlbWl0IG1fdmlld3BvcnRJdGVtLT5leHBlcmltZW50 YWwoKS0+dGVzdCgpLT5jb250ZW50c1NjYWxlQ29tbWl0dGVkKCk7CiAgICAgbV9sYXN0Q29tbWl0 dGVkU2NhbGUgPSBzY2FsZTsKLSAgICBtX2xhc3RWaXNpYmxlQ29udGVudHNSZWN0ID0gdmlzaWJs ZUNvbnRlbnRzUmVjdCgpOwogCi0gICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250ZW50c1Jl Y3QodmlzaWJsZUNvbnRlbnRzUmVjdCgpLCBzY2FsZSwgdHJhamVjdG9yeVZlY3RvciwgbV92aWV3 cG9ydEl0ZW0tPmNvbnRlbnRQb3MoKSk7CisgICAgZHJhd2luZ0FyZWEtPnNldFZpc2libGVDb250 ZW50c1JlY3QodmlzaWJsZUNvbnRlbnRzUmVjdCgpLCBzY2FsZSwgdHJhamVjdG9yeVZlY3Rvcik7 CiAKICAgICAvLyBFbnN1cmUgdGhhdCB1cGRhdGVQYWludE5vZGUgaXMgYWx3YXlzIGNhbGxlZCBi ZWZvcmUgcGFpbnRpbmcuCiAgICAgbV9wYWdlSXRlbS0+dXBkYXRlKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEhhbmRsZXIuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SGFuZGxlci5oCmluZGV4IGM5M2IwYmQzMjkw OGIzYzI0M2QwY2I4MDI4ZGU3ZDZiZmNlMjY3NjYuLjkyMzdmZTlmMzYzMzE4NzU4YmFiYWJmNGJl YjdjOWVjZGRiYzEzYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZp ZXdwb3J0SGFuZGxlci5oCkBAIC0xMTYsNyArMTE2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNl dFBhZ2VJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJik7CiAgICAgdm9pZCBhbmltYXRlUGFn ZUl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYmKTsKIAotICAgIFFSZWN0IHZpc2libGVDb250 ZW50c1JlY3QoKSBjb25zdDsKKyAgICBRUmVjdEYgdmlzaWJsZUNvbnRlbnRzUmVjdCgpIGNvbnN0 OwogICAgIFFSZWN0RiBpbml0aWFsUmVjdCgpIGNvbnN0OwogICAgIFFSZWN0RiBuZWFyZXN0VmFs aWRCb3VuZHMoKSBjb25zdDsKIApAQCAtMTY5LDcgKzE2OSw2IEBAIHByaXZhdGU6CiAgICAgUVBv aW50RiBtX2xhc3RTY3JvbGxQb3NpdGlvbjsKICAgICBxcmVhbCBtX3BpbmNoU3RhcnRTY2FsZTsK ICAgICBxcmVhbCBtX2xhc3RDb21taXR0ZWRTY2FsZTsKLSAgICBRUmVjdEYgbV9sYXN0VmlzaWJs ZUNvbnRlbnRzUmVjdDsKICAgICBxcmVhbCBtX3pvb21PdXRTY2FsZTsKICAgICBRTGlzdDxTY2Fs ZVN0YWNrSXRlbT4gbV9zY2FsZVN0YWNrOwogfTsK