141996 2015-02-24 18:16:47 -0800 Clarify some resizing terminology in ScrollView/FrameView 2015-02-24 21:36:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin simon.fraser thorton zalan oldest_to_newest 1071876 0 simon.fraser 2015-02-24 18:16:47 -0800 Clarify some resizing terminology in ScrollView/FrameView 1071886 1 247290 simon.fraser 2015-02-24 19:13:17 -0800 Created attachment 247290 Patch 1071957 2 simon.fraser 2015-02-24 21:36:16 -0800 https://trac.webkit.org/r180615 247290 2015-02-24 19:13:17 -0800 2015-02-24 19:37:24 -0800 Patch bug-141996-20150224191305.patch text/plain 18038 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJiYWUzM2NkZjY3MDA1 YmQ2MWJkZDZhODQ4Mjg4M2U0ZDNjMTdjNS4uMTgyNjFiM2VhYjg0ZjVhNmYzN2I3MTM3ZmQ1ZDIy M2Y4Y2FkNGIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDY4IEBACiAyMDE1LTAyLTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIENsYXJpZnkgc29t ZSByZXNpemluZyB0ZXJtaW5vbG9neSBpbiBTY3JvbGxWaWV3L0ZyYW1lVmlldworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxOTk2CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2Nyb2xsYWJsZUFyZWEvU2Ny b2xsVmlldy9GcmFtZVZpZXcgaGFkIHNvbWUgY29uZnVzaW5nIHRlcm1pbm9sb2d5IGFyb3VuZAor ICAgICAgICBjb250ZW50c1Jlc2l6ZWQvdmlzaWJsZUNvbnRlbnRzUmVzaXplZC9maXhlZExheW91 dFNpemVDaGFuZ2VkLgorICAgICAgICAKKyAgICAgICAgQ2xhcmlmeSB0aGlzIGJ5IGRpc3Rpbmd1 aXNoaW5nIGJldHdlZW46CisgICAgICAgIDEuIEF2YWlsYWJsZSBzaXplIGNoYW5nZXMgYmVjYXVz ZSBvZgorICAgICAgICAgICAgaSkgbm9uLW92ZXJsYXkgc2Nyb2xsYmFyIHByZXNlbmNlCisgICAg ICAgICAgIGlpKSBTY3JvbGxhYmxlQXJlYSBmcmFtZSBjaGFuZ2UKKyAgICAgICAgMi4gUmVtb3Zp bmcgZml4ZWRMYXlvdXRTaXplQ2hhbmdlZCgpIGFuZCBqdXN0IHRyZWF0aW5nIGl0IGxpa2UgYW4K KyAgICAgICAgICAgYXZhaWxhYmxlIHNpemUgY2hhbmdlLgorICAgICAgICAgICAKKyAgICAgICAg Y29udGVudHNSZXNpemVkKCkgaXMgcmVsZWdhdGVkIHRvIHNpbXBseSBiZWluZyBhIGhvb2sgdGhh dCBhbGxvd3MgTWFjIHRvCisgICAgICAgIGZsYXNoIG92ZXJsYXkgc2Nyb2xsYmFycy4KKyAgICAg ICAgCisgICAgICAgIFRoZSBjb25mdXNpbmdseSBuYW1lZCB2aXNpYmxlQ29udGVudHNSZXNpemVk KCkgaXMgbm93IHVwZGF0ZUNvbnRlbnRzU2l6ZSgpLAorICAgICAgICBhbmQgaXMgdGhlIHdheSB0 aGF0IGEgU2Nyb2xsYWJsZUFyZWEgdGVsbHMgaXRzIHN1YmNsYXNzcyB0aGF0IGl0IHNob3VsZCBy ZWNvbXB1dGUKKyAgICAgICAgdGhlIHNpemUgb2YgdGhlIGNvbnRlbnRzIChpLmUuIGRvIGEgbGF5 b3V0KS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6c2V0Q29udGVudHNTaXplKTogTm8gbG9uZ2VyIG15c3RlcmlvdXNseSBza2lw IHRoZQorICAgICAgICBGcmFtZVZpZXcgaW1wbGVtZW50YXRpb24gb2YgY29udGVudHNSZXNpemVk KCksIHdoaWNoIHVzZWQgdG8gZG8gYSBzZXROZWVkc0xheW91dCgpCisgICAgICAgIHdoaWNoIHdl IGRpZG4ndCB3YW50IHRvIGRvIGZyb20gc2V0Q29udGVudHNTaXplKCksIHdoaWNoIGl0c2VsZiBo YXBwZW5zIGFzIGEgcmVzdWx0IG9mIGxheW91dC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmll dzo6YWRqdXN0Vmlld1NpemUpOiBXaGl0ZXNwYWNlLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpsYXlvdXQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6YXZhaWxh YmxlQ29udGVudFNpemVDaGFuZ2VkKTogQ2FsbGVkIG9uIGZyYW1lIHNpemUgY2hhbmdlLCBvciBz Y3JvbGxiYXIKKyAgICAgICAgY2hhbmdlLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1 cGRhdGVDb250ZW50c1NpemUpOiBUaGlzIGFjdHVhbGx5IGRvZXMgdGhlIGxheW91dC4KKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKTogQWx3YXlzIGNh bGwgdGhlIGJhc2UgY2xhc3M7ICBTY3JvbGxWaWV3OjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQKKyAg ICAgICAgd2lsbCBiYWlsIGlmIG5vdCBhIGZvcmNlZCB1cGRhdGUuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OnNldEN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KTogRm9yY2VzIGEg bGF5b3V0IHZpYSB1cGRhdGVDb250ZW50c1NpemUoKSBub3cuCisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmNvbnRlbnRzUmVzaXplZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmZpeGVkTGF5b3V0U2l6ZUNoYW5nZWQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVWaWV3Ojp2aXNpYmxlQ29udGVudHNSZXNpemVkKTogRGVsZXRlZC4KKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0Rml4ZWRMYXlvdXRTaXplKTogQ2Fs bHMgYXZhaWxhYmxlQ29udGVudFNpemVDaGFuZ2VkKCkgbm93LgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsVmlldzo6c2V0VXNlRml4ZWRMYXlvdXQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbFZpZXc6OmF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdlZCk6IFVwZGF0ZSBzY3JvbGxi YXJzIGlmIHRoYXQncyBub3QKKyAgICAgICAgdGhlIHJlYXNvbiB3ZSBhcmUgYmVpbmcgY2FsbGVk LgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6dXBkYXRlU2Nyb2xsYmFycyk6IGNvbnRl bnRzUmVzaXplZCgpIHdhcyB0aGUgdGhpbmcgdGhhdCBjYXVzZWQgc2V0TmVlZHNMYXlvdXQoKTsK KyAgICAgICAgcmVwbGFjZSBpdCB3aXRoIGF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdlZCgpLiB2 aXNpYmxlQ29udGVudHNSZXNpemVkKCkgZGlkIHRoZSBsYXlvdXQsIGFuZAorICAgICAgICByZXBs YWNlIHdpdGggdXBkYXRlQ29udGVudHNTaXplKCkuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3OjpzZXRGcmFtZVJlY3QpOiBDYWxsIGF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdlZCgpIG5v dy4gVGhpcyB0YWtlcyBjYXJlIG9mCisgICAgICAgIHVwZGF0aW5nIHNjcm9sbGJhcnMsIHNvIG5v IG5lZWQgdG8gZXhwbGljaXRseSBkbyB0aGF0LgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmll dzo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKTogQ2FsbCB0aGUgYmFzZSBjbGFzcy4KKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OmZpeGVkTGF5b3V0U2l6ZUNoYW5nZWQpOiBEZWxldGVkLgor ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3Jv bGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6YXZhaWxh YmxlQ29udGVudFNpemVDaGFuZ2VkKTogQ2FsbCBzY3JvbGxBbmltYXRvci0+Y29udGVudHNSZXNp emVkKCkKKyAgICAgICAgdG8gZmxhc2ggdGhlIHNjcm9sbGJhcnMuCisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsZWRUb1JpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGFibGVBcmVhOjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQpOiBDYWxsIGF2YWlsYWJsZUNvbnRl bnRTaXplQ2hhbmdlZCgpIHNpbmNlCisgICAgICAgIHNjcm9sbGJhciBzdHlsZSBhZmZlY3RzIGF2 YWlsYWJsZSBzcGFjZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZUNvbnRlbnRzU2l6ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKTogRGVs ZXRlZC4KKworMjAxNS0wMi0yNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KKwogICAgICAgICBVc2UgbnVsbHB0ciBpbiBtb3JlIHBsYWNlcyBpbiBGcmFtZVZpZXcsIFJl bmRlclZpZXcsIFJlbmRlck9iamVjdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQxOTc0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3MzQ3NjhiZDU0YjE3ZGZhYWRk MTMyODMzZDc0YzFlZmE0N2QzMzQyLi40MGJjNGVlMjJlNDkwZjZmZjg3YmM3MTg0YzAxZGFjNjdk M2M0ODgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTUtMDItMjQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xhcmlmeSBzb21lIHJl c2l6aW5nIHRlcm1pbm9sb2d5IGluIFNjcm9sbFZpZXcvRnJhbWVWaWV3CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE5OTYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3JvbGxhYmxlQXJlYS9TY3JvbGxW aWV3L0ZyYW1lVmlldyBoYWQgc29tZSBjb25mdXNpbmcgdGVybWlub2xvZ3kgYXJvdW5kCisgICAg ICAgIGNvbnRlbnRzUmVzaXplZC92aXNpYmxlQ29udGVudHNSZXNpemVkL2ZpeGVkTGF5b3V0U2l6 ZUNoYW5nZWQuCisgICAgICAgIAorICAgICAgICBDbGFyaWZ5IHRoaXMgYnkgZGlzdGluZ3Vpc2hp bmcgYmV0d2VlbjoKKyAgICAgICAgMS4gQXZhaWxhYmxlIHNpemUgY2hhbmdlcyBiZWNhdXNlIG9m CisgICAgICAgICAgICBpKSBub24tb3ZlcmxheSBzY3JvbGxiYXIgcHJlc2VuY2UKKyAgICAgICAg ICAgaWkpIFNjcm9sbGFibGVBcmVhIGZyYW1lIGNoYW5nZQorICAgICAgICAyLiBSZW1vdmluZyBm aXhlZExheW91dFNpemVDaGFuZ2VkKCkgYW5kIGp1c3QgdHJlYXRpbmcgaXQgbGlrZSBhbgorICAg ICAgICAgICBhdmFpbGFibGUgc2l6ZSBjaGFuZ2UuCisgICAgICAgICAgIAorICAgICAgICBjb250 ZW50c1Jlc2l6ZWQoKSBpcyByZWxlZ2F0ZWQgdG8gc2ltcGx5IGJlaW5nIGEgaG9vayB0aGF0IGFs bG93cyBNYWMgdG8KKyAgICAgICAgZmxhc2ggb3ZlcmxheSBzY3JvbGxiYXJzLgorICAgICAgICAK KyAgICAgICAgVGhlIGNvbmZ1c2luZ2x5IG5hbWVkIHZpc2libGVDb250ZW50c1Jlc2l6ZWQoKSBp cyBub3cgdXBkYXRlQ29udGVudHNTaXplKCksCisgICAgICAgIGFuZCBpcyB0aGUgd2F5IHRoYXQg YSBTY3JvbGxhYmxlQXJlYSB0ZWxscyBpdHMgc3ViY2xhc3NzIHRoYXQgaXQgc2hvdWxkIHJlY29t cHV0ZQorICAgICAgICB0aGUgc2l6ZSBvZiB0aGUgY29udGVudHMgKGkuZS4gZG8gYSBsYXlvdXQp LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW06CisgICAg ICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKTogQ2FsbCB0aGUg YmFzZSBjbGFzcyBtZXRob2QsCisgICAgICAgIHdoaWNoIHRha2VzIGNhcmUgb2YgCisKIDIwMTUt MDItMjQgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAg UkVHUkVTU0lPTihyMTc5NDI5KTogQ2FuJ3QgdHlwZSBjb21tZW50cyBpbiBGYWNlYm9vawpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDgxYWFhOTQ0YmI2OTY2N2VlMjFiNWE3NGQyMmMw OGVmZGVlOTQ2M2UuLjFmY2VjZTBkZWJmYTJmMTUwZTk2NGRmNjliYTM0Y2JkY2IyYzViYzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTU2Niw3ICs1NjYsNyBAQCB2b2lkIEZyYW1l Vmlldzo6c2V0Q29udGVudHNTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgbV9kZWZlclNl dE5lZWRzTGF5b3V0Q291bnQrKzsKIAogICAgIFNjcm9sbFZpZXc6OnNldENvbnRlbnRzU2l6ZShz aXplKTsKLSAgICBTY3JvbGxWaWV3Ojpjb250ZW50c1Jlc2l6ZWQoKTsKKyAgICBjb250ZW50c1Jl c2l6ZWQoKTsKICAgICAKICAgICBQYWdlKiBwYWdlID0gZnJhbWUoKS5wYWdlKCk7CiAgICAgaWYg KCFwYWdlKQpAQCAtNTk3LDcgKzU5Nyw3IEBAIHZvaWQgRnJhbWVWaWV3OjphZGp1c3RWaWV3U2l6 ZSgpCiAgICAgY29uc3QgSW50UmVjdCByZWN0ID0gcmVuZGVyVmlldy0+ZG9jdW1lbnRSZWN0KCk7 CiAgICAgY29uc3QgSW50U2l6ZSYgc2l6ZSA9IHJlY3Quc2l6ZSgpOwogICAgIFNjcm9sbFZpZXc6 OnNldFNjcm9sbE9yaWdpbihJbnRQb2ludCgtcmVjdC54KCksIC1yZWN0LnkoKSksICFmcmFtZSgp LmRvY3VtZW50KCktPnByaW50aW5nKCksIHNpemUgPT0gY29udGVudHNTaXplKCkpOwotICAgIAor CiAgICAgc2V0Q29udGVudHNTaXplKHNpemUpOwogfQogCkBAIC0xMjc2LDcgKzEyNzYsNiBAQCB2 b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogICAgICAgICAgICAgfQog CiAgICAgICAgICAgICBMYXlvdXRTaXplIG9sZFNpemUgPSBtX3NpemU7Ci0KICAgICAgICAgICAg IG1fc2l6ZSA9IGxheW91dFNpemUoKTsKIAogICAgICAgICAgICAgaWYgKG9sZFNpemUgIT0gbV9z aXplKSB7CkBAIC0yMjkwLDE5ICsyMjg5LDEwIEBAIGJvb2wgRnJhbWVWaWV3OjpyZW5kZXJlZENo YXJhY3RlcnNFeGNlZWQodW5zaWduZWQgdGhyZXNob2xkKQogICAgIHJldHVybiBjb3VudFJlbmRl cmVkQ2hhcmFjdGVyc0luUmVuZGVyT2JqZWN0V2l0aFRocmVzaG9sZCgqbV9mcmFtZS0+Y29udGVu dFJlbmRlcmVyKCksIHRocmVzaG9sZCkgPj0gdGhyZXNob2xkOwogfQogCi12b2lkIEZyYW1lVmll dzo6Y29udGVudHNSZXNpemVkKCkKK3ZvaWQgRnJhbWVWaWV3OjphdmFpbGFibGVDb250ZW50U2l6 ZUNoYW5nZWQoQXZhaWxhYmxlU2l6ZUNoYW5nZVJlYXNvbiByZWFzb24pCiB7Ci0gICAgU2Nyb2xs Vmlldzo6Y29udGVudHNSZXNpemVkKCk7CiAgICAgc2V0TmVlZHNMYXlvdXQoKTsKLX0KLQotdm9p ZCBGcmFtZVZpZXc6OmZpeGVkTGF5b3V0U2l6ZUNoYW5nZWQoKQotewotICAgIC8vIENhbiBiZSB0 cmlnZ2VyZWQgYmVmb3JlIHRoZSB2aWV3IGlzIHNldCwgc2VlIGNvbW1lbnQgaW4gRnJhbWVWaWV3 Ojp2aXNpYmxlQ29udGVudHNSZXNpemVkKCkuCi0gICAgLy8gQW4gQVNTRVJUIGlzIHRyaWdnZXJl ZCB3aGVuIGEgdmlldyBzY2hlZHVsZXMgYSBsYXlvdXQgYmVmb3JlIGJlaW5nIGF0dGFjaGVkIHRv IGEgZnJhbWUuCi0gICAgaWYgKCFmcmFtZSgpLnZpZXcoKSkKLSAgICAgICAgcmV0dXJuOwotICAg IFNjcm9sbFZpZXc6OmZpeGVkTGF5b3V0U2l6ZUNoYW5nZWQoKTsKKyAgICBTY3JvbGxWaWV3Ojph dmFpbGFibGVDb250ZW50U2l6ZUNoYW5nZWQocmVhc29uKTsKIH0KIAogYm9vbCBGcmFtZVZpZXc6 OnNob3VsZExheW91dEFmdGVyQ29udGVudHNSZXNpemVkKCkgY29uc3QKQEAgLTIzMTAsNyArMjMw MCw3IEBAIGJvb2wgRnJhbWVWaWV3OjpzaG91bGRMYXlvdXRBZnRlckNvbnRlbnRzUmVzaXplZCgp IGNvbnN0CiAgICAgcmV0dXJuICF1c2VGaXhlZExheW91dCgpIHx8IHVzZUN1c3RvbUZpeGVkUG9z aXRpb25MYXlvdXRSZWN0KCk7CiB9CiAKLXZvaWQgRnJhbWVWaWV3Ojp2aXNpYmxlQ29udGVudHNS ZXNpemVkKCkKK3ZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVDb250ZW50c1NpemUoKQogewogICAgIC8v IFdlIGNoZWNrIHRvIG1ha2Ugc3VyZSB0aGUgdmlldyBpcyBhdHRhY2hlZCB0byBhIGZyYW1lKCkg YXMgdGhpcyBtZXRob2QgY2FuCiAgICAgLy8gYmUgdHJpZ2dlcmVkIGJlZm9yZSB0aGUgdmlldyBp cyBhdHRhY2hlZCBieSBGcmFtZTo6Y3JlYXRlVmlldyguLi4pIHNldHRpbmcKQEAgLTM0OTMsOCAr MzQ4Myw3IEBAIHZvaWQgRnJhbWVWaWV3OjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQoaW50IG5ld1N0 eWxlLCBib29sIGZvcmNlVXBkYXRlKQogCiAgICAgZnJhbWUoKS5wYWdlKCktPmNocm9tZSgpLmNs aWVudCgpLnJlY29tbWVuZGVkU2Nyb2xsYmFyU3R5bGVEaWRDaGFuZ2UobmV3U3R5bGUpOwogCi0g ICAgaWYgKGZvcmNlVXBkYXRlKQotICAgICAgICBTY3JvbGxWaWV3OjpzY3JvbGxiYXJTdHlsZUNo YW5nZWQobmV3U3R5bGUsIGZvcmNlVXBkYXRlKTsKKyAgICBTY3JvbGxWaWV3OjpzY3JvbGxiYXJT dHlsZUNoYW5nZWQobmV3U3R5bGUsIGZvcmNlVXBkYXRlKTsKIH0KIAogdm9pZCBGcmFtZVZpZXc6 Om5vdGlmeVBhZ2VUaGF0Q29udGVudEFyZWFXaWxsUGFpbnQoKSBjb25zdApAQCAtNDQ2Niw3ICs0 NDU1LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnNldEN1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0 KGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAgICAgIHJldHVybjsKICAgICBtX3VzZUN1c3RvbUZp eGVkUG9zaXRpb25MYXlvdXRSZWN0ID0gdHJ1ZTsKICAgICBtX2N1c3RvbUZpeGVkUG9zaXRpb25M YXlvdXRSZWN0ID0gcmVjdDsKLSAgICB2aXNpYmxlQ29udGVudHNSZXNpemVkKCk7CisgICAgdXBk YXRlQ29udGVudHNTaXplKCk7CiB9CiAKIGJvb2wgRnJhbWVWaWV3Ojp1cGRhdGVGaXhlZFBvc2l0 aW9uTGF5b3V0UmVjdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA2NWM3YmJkYTI1OWM2 NjZkOGNjYmM0YzI3MDMyN2RjZjRhOTU3YTU3Li4yMzA5NDQyYmVkNTZjNjQwM2EwYzgxMzA2NzU1 ZDRhMGE3ZWY0MDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTU4MCwxMCArNTgwLDkg QEAgcHJpdmF0ZToKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFkanVzdFRpbGVkQmFja2luZ0Nv dmVyYWdlKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgcmVwYWludENvbnRlbnRSZWN0YW5nbGUoY29u c3QgSW50UmVjdCYpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBjb250ZW50c1Jlc2l6ZWQo KSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgdmlzaWJsZUNvbnRlbnRzUmVzaXplZCgpIG92 ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDb250ZW50c1NpemUoKSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgYXZhaWxhYmxlQ29udGVudFNpemVDaGFuZ2VkKEF2YWlsYWJsZVNp emVDaGFuZ2VSZWFzb24pIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBhZGRlZE9yUmVtb3Zl ZFNjcm9sbGJhcigpIG92ZXJyaWRlOwotICAgIHZpcnR1YWwgdm9pZCBmaXhlZExheW91dFNpemVD aGFuZ2VkKCkgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGVsZWdhdGVzU2Nyb2xsaW5n RGlkQ2hhbmdlKCkgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5j cHAKaW5kZXggZTM3ZWQyMjA2ZjhjN2I4MjUwOTk2OGNlYzJhZjk2MTFlNjg4NTY0Yi4uNTViMDY3 ZDM3ZGFhZWRkNjAwN2QwZjBiNmMxNjAzMDg4YjAzOWRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5jcHAKQEAgLTM0Niw3ICszNDYsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNl dEZpeGVkTGF5b3V0U2l6ZShjb25zdCBJbnRTaXplJiBuZXdTaXplKQogICAgICAgICByZXR1cm47 CiAgICAgbV9maXhlZExheW91dFNpemUgPSBuZXdTaXplOwogICAgIGlmIChtX3VzZUZpeGVkTGF5 b3V0KQotICAgICAgICBmaXhlZExheW91dFNpemVDaGFuZ2VkKCk7CisgICAgICAgIGF2YWlsYWJs ZUNvbnRlbnRTaXplQ2hhbmdlZChBdmFpbGFibGVTaXplQ2hhbmdlUmVhc29uOjpBcmVhU2l6ZUNo YW5nZWQpOwogfQogCiBib29sIFNjcm9sbFZpZXc6OnVzZUZpeGVkTGF5b3V0KCkgY29uc3QKQEAg LTM2MCwxMyArMzYwLDE0IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0VXNlRml4ZWRMYXlvdXQoYm9v bCBlbmFibGUpCiAgICAgICAgIHJldHVybjsKICAgICBtX3VzZUZpeGVkTGF5b3V0ID0gZW5hYmxl OwogICAgIGlmICghbV9maXhlZExheW91dFNpemUuaXNFbXB0eSgpKQotICAgICAgICBmaXhlZExh eW91dFNpemVDaGFuZ2VkKCk7CisgICAgICAgIGF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdlZChB dmFpbGFibGVTaXplQ2hhbmdlUmVhc29uOjpBcmVhU2l6ZUNoYW5nZWQpOwogfQogCi12b2lkIFNj cm9sbFZpZXc6OmZpeGVkTGF5b3V0U2l6ZUNoYW5nZWQoKQordm9pZCBTY3JvbGxWaWV3OjphdmFp bGFibGVDb250ZW50U2l6ZUNoYW5nZWQoQXZhaWxhYmxlU2l6ZUNoYW5nZVJlYXNvbiByZWFzb24p CiB7Ci0gICAgdXBkYXRlU2Nyb2xsYmFycyhzY3JvbGxPZmZzZXQoKSk7Ci0gICAgY29udGVudHNS ZXNpemVkKCk7CisgICAgU2Nyb2xsYWJsZUFyZWE6OmF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdl ZChyZWFzb24pOworICAgIGlmIChyZWFzb24gIT0gQXZhaWxhYmxlU2l6ZUNoYW5nZVJlYXNvbjo6 U2Nyb2xsYmFyc0NoYW5nZWQpCisgICAgICAgIHVwZGF0ZVNjcm9sbGJhcnMoc2Nyb2xsT2Zmc2V0 KCkpOwogfQogCiBJbnRTaXplIFNjcm9sbFZpZXc6OmNvbnRlbnRzU2l6ZSgpIGNvbnN0CkBAIC02 MDAsMTEgKzYwMSwxMSBAQCB2b2lkIFNjcm9sbFZpZXc6OnVwZGF0ZVNjcm9sbGJhcnMoY29uc3Qg SW50U2l6ZSYgZGVzaXJlZE9mZnNldCkKICAgICBib29sIGhhc092ZXJsYXlTY3JvbGxiYXJzID0g KCFtX2hvcml6b250YWxTY3JvbGxiYXIgfHwgbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5pc092ZXJs YXlTY3JvbGxiYXIoKSkgJiYgKCFtX3ZlcnRpY2FsU2Nyb2xsYmFyIHx8IG1fdmVydGljYWxTY3Jv bGxiYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpKTsKIAogICAgIC8vIElmIHdlIGNhbWUgaW4gaGVy ZSB3aXRoIHRoZSB2aWV3IGFscmVhZHkgbmVlZGluZyBhIGxheW91dCwgdGhlbiBnbyBhaGVhZCBh bmQgZG8gdGhhdAotICAgIC8vIGZpcnN0LiAgKFRoaXMgd2lsbCBiZSB0aGUgY29tbW9uIGNhc2Us IGUuZy4sIHdoZW4gdGhlIHBhZ2UgY2hhbmdlcyBkdWUgdG8gd2luZG93IHJlc2l6aW5nIGZvciBl eGFtcGxlKS4KKyAgICAvLyBmaXJzdC4gKFRoaXMgd2lsbCBiZSB0aGUgY29tbW9uIGNhc2UsIGUu Zy4sIHdoZW4gdGhlIHBhZ2UgY2hhbmdlcyBkdWUgdG8gd2luZG93IHJlc2l6aW5nIGZvciBleGFt cGxlKS4KICAgICAvLyBUaGlzIGxheW91dCB3aWxsIG5vdCByZS1lbnRlciB1cGRhdGVTY3JvbGxi YXJzIGFuZCBkb2VzIG5vdCBjb3VudCB0b3dhcmRzIG91ciBtYXggbGF5b3V0IHBhc3MgdG90YWwu CiAgICAgaWYgKCFtX3Njcm9sbGJhcnNTdXBwcmVzc2VkICYmICFoYXNPdmVybGF5U2Nyb2xsYmFy cykgewogICAgICAgICBtX2luVXBkYXRlU2Nyb2xsYmFycyA9IHRydWU7Ci0gICAgICAgIHZpc2li bGVDb250ZW50c1Jlc2l6ZWQoKTsKKyAgICAgICAgdXBkYXRlQ29udGVudHNTaXplKCk7CiAgICAg ICAgIG1faW5VcGRhdGVTY3JvbGxiYXJzID0gZmFsc2U7CiAgICAgfQogCkBAIC02OTYsOCArNjk3 LDggQEAgdm9pZCBTY3JvbGxWaWV3Ojp1cGRhdGVTY3JvbGxiYXJzKGNvbnN0IEludFNpemUmIGRl c2lyZWRPZmZzZXQpCiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIGNNYXhVcGRhdGVTY3JvbGxiYXJz UGFzcyA9IDI7CiAgICAgICAgIGlmICgoc2VuZENvbnRlbnRSZXNpemVkTm90aWZpY2F0aW9uIHx8 IG5lZWRBbm90aGVyUGFzcykgJiYgbV91cGRhdGVTY3JvbGxiYXJzUGFzcyA8IGNNYXhVcGRhdGVT Y3JvbGxiYXJzUGFzcykgewogICAgICAgICAgICAgbV91cGRhdGVTY3JvbGxiYXJzUGFzcysrOwot ICAgICAgICAgICAgY29udGVudHNSZXNpemVkKCk7Ci0gICAgICAgICAgICB2aXNpYmxlQ29udGVu dHNSZXNpemVkKCk7CisgICAgICAgICAgICBhdmFpbGFibGVDb250ZW50U2l6ZUNoYW5nZWQoQXZh aWxhYmxlU2l6ZUNoYW5nZVJlYXNvbjo6U2Nyb2xsYmFyc0NoYW5nZWQpOworICAgICAgICAgICAg dXBkYXRlQ29udGVudHNTaXplKCk7CiAgICAgICAgICAgICBJbnRTaXplIG5ld0RvY1NpemUgPSB0 b3RhbENvbnRlbnRzU2l6ZSgpOwogICAgICAgICAgICAgaWYgKG5ld0RvY1NpemUgPT0gZG9jU2l6 ZSkgewogICAgICAgICAgICAgICAgIC8vIFRoZSBsYXlvdXQgd2l0aCB0aGUgbmV3IHNjcm9sbCBz dGF0ZSBoYWQgbm8gaW1wYWN0IG9uCkBAIC0xMDQ3LDEzICsxMDQ4LDEwIEBAIHZvaWQgU2Nyb2xs Vmlldzo6c2V0RnJhbWVSZWN0KGNvbnN0IEludFJlY3QmIG5ld1JlY3QpCiAgICAgICAgIHJldHVy bjsKIAogICAgIFdpZGdldDo6c2V0RnJhbWVSZWN0KG5ld1JlY3QpOwotCiAgICAgZnJhbWVSZWN0 c0NoYW5nZWQoKTsKLQotICAgIHVwZGF0ZVNjcm9sbGJhcnMoc2Nyb2xsT2Zmc2V0KCkpOwotCisg ICAgCiAgICAgaWYgKCFtX3VzZUZpeGVkTGF5b3V0ICYmIG9sZFJlY3Quc2l6ZSgpICE9IG5ld1Jl Y3Quc2l6ZSgpKQotICAgICAgICBjb250ZW50c1Jlc2l6ZWQoKTsKKyAgICAgICAgYXZhaWxhYmxl Q29udGVudFNpemVDaGFuZ2VkKEF2YWlsYWJsZVNpemVDaGFuZ2VSZWFzb246OkFyZWFTaXplQ2hh bmdlZCk7CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6ZnJhbWVSZWN0c0NoYW5nZWQoKQpAQCAtMTE2 MiwxMiArMTE2MCwxMiBAQCBib29sIFNjcm9sbFZpZXc6OmlzU2Nyb2xsQ29ybmVyVmlzaWJsZSgp IGNvbnN0CiAgICAgcmV0dXJuICFzY3JvbGxDb3JuZXJSZWN0KCkuaXNFbXB0eSgpOwogfQogCi12 b2lkIFNjcm9sbFZpZXc6OnNjcm9sbGJhclN0eWxlQ2hhbmdlZChpbnQsIGJvb2wgZm9yY2VVcGRh dGUpCit2b2lkIFNjcm9sbFZpZXc6OnNjcm9sbGJhclN0eWxlQ2hhbmdlZChpbnQgbmV3U3R5bGUs IGJvb2wgZm9yY2VVcGRhdGUpCiB7CisgICAgU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbGJhclN0eWxl Q2hhbmdlZChuZXdTdHlsZSwgZm9yY2VVcGRhdGUpOwogICAgIGlmICghZm9yY2VVcGRhdGUpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGNvbnRlbnRzUmVzaXplZCgpOwogICAgIHVwZGF0ZVNjcm9s bGJhcnMoc2Nyb2xsT2Zmc2V0KCkpOwogICAgIHBvc2l0aW9uU2Nyb2xsYmFyTGF5ZXJzKCk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggYjZhNmViOGFlYWNjYmE2MDUz M2FkMjlmZDc4NDMzNjA5NzBmZWViNi4uNmNkYWNjMWQ2NTFhYzliNDFhMGE3NDU0MDViODMzYThm YmZjZDY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApAQCAtMzg5LDEwICsz ODksOSBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRPdmVyaGFuZ0FyZWFz KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmIGhvcml6b250YWxPdmVyaGFuZ0FyZWEs IGNvbnN0IEludFJlY3QmIHZlcnRpY2FsT3ZlcmhhbmdBcmVhLCBjb25zdCBJbnRSZWN0JiBkaXJ0 eVJlY3QpOwogCi0gICAgdmlydHVhbCB2b2lkIHZpc2libGVDb250ZW50c1Jlc2l6ZWQoKSA9IDA7 CisgICAgdmlydHVhbCB2b2lkIGF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdlZChBdmFpbGFibGVT aXplQ2hhbmdlUmVhc29uKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkZWRPclJlbW92 ZWRTY3JvbGxiYXIoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRlbGVnYXRlc1Njcm9sbGluZ0Rp ZENoYW5nZSgpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBmaXhlZExheW91dFNpemVDaGFuZ2VkKCk7 CiAKICAgICAvLyBUaGVzZSBmdW5jdGlvbnMgYXJlIHVzZWQgdG8gY3JlYXRlL2Rlc3Ryb3kgc2Ny b2xsYmFycy4KICAgICAvLyBUaGV5IHJldHVybiB0cnVlIGlmIHRoZSBzY3JvbGxiYXIgd2FzIGFk ZGVkIG9yIHJlbW92ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5j cHAKaW5kZXggMGQ2ZGRmYjc5OWVmNjY1ODQ3ZTVhOWNjN2NmMTA4YmY1NWYzYzdhNC4uMTZjOTMx MDhiZWE3ZTQwMjkzMWFlZDlmZjk4NDdmMzI1ZTQyNWRmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcApAQCAtMzE0LDYgKzMxNCwxMiBAQCB2b2lkIFNjcm9s bGFibGVBcmVhOjpjb250ZW50c1Jlc2l6ZWQoKQogICAgICAgICBzY3JvbGxBbmltYXRvci0+Y29u dGVudHNSZXNpemVkKCk7CiB9CiAKK3ZvaWQgU2Nyb2xsYWJsZUFyZWE6OmF2YWlsYWJsZUNvbnRl bnRTaXplQ2hhbmdlZChBdmFpbGFibGVTaXplQ2hhbmdlUmVhc29uKQoreworICAgIGlmIChTY3Jv bGxBbmltYXRvciogc2Nyb2xsQW5pbWF0b3IgPSBleGlzdGluZ1Njcm9sbEFuaW1hdG9yKCkpCisg ICAgICAgIHNjcm9sbEFuaW1hdG9yLT5jb250ZW50c1Jlc2l6ZWQoKTsgLy8gVGhpcyBmbGFzaGVz IG92ZXJsYXkgc2Nyb2xsYmFycy4KK30KKwogYm9vbCBTY3JvbGxhYmxlQXJlYTo6aGFzT3Zlcmxh eVNjcm9sbGJhcnMoKSBjb25zdAogewogICAgIHJldHVybiAodmVydGljYWxTY3JvbGxiYXIoKSAm JiB2ZXJ0aWNhbFNjcm9sbGJhcigpLT5pc092ZXJsYXlTY3JvbGxiYXIoKSkKQEAgLTQ3OSw2ICs0 ODUsMTEgQEAgYm9vbCBTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsZWRUb1JpZ2h0KCkgY29uc3QKICAg ICByZXR1cm4gc2Nyb2xsUG9zaXRpb24oKS54KCkgPj0gbWF4aW11bVNjcm9sbFBvc2l0aW9uKCku eCgpOwogfQogCit2b2lkIFNjcm9sbGFibGVBcmVhOjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQoaW50 LCBib29sKQoreworICAgIGF2YWlsYWJsZUNvbnRlbnRTaXplQ2hhbmdlZChBdmFpbGFibGVTaXpl Q2hhbmdlUmVhc29uOjpTY3JvbGxiYXJzQ2hhbmdlZCk7Cit9CisKIEludFNpemUgU2Nyb2xsYWJs ZUFyZWE6OnRvdGFsQ29udGVudHNTaXplKCkgY29uc3QKIHsKICAgICBJbnRTaXplIHRvdGFsQ29u dGVudHNTaXplID0gY29udGVudHNTaXplKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs YWJsZUFyZWEuaAppbmRleCBjYTZlNDJkNTU1NzJkMDFmY2YyMzRmMGVkMjViYThjOGYyN2YzZTc1 Li5hZmE4NjFkMmVkZDJiODA5YjI0YTkxNDI0MzU3YTZiYzAxMDliMDZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTExMiw2ICsxMTIsMTUgQEAgcHVibGlj OgogCiAgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIGNvbnRlbnRzUmVzaXplZCgpOwog CisgICAgLy8gRm9yY2UgdGhlIGNvbnRlbnRzIHRvIHJlY29tcHV0ZSB0aGVpciBzaXplIChpLmUu IGRvIGxheW91dCkuCisgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIHVwZGF0ZUNvbnRl bnRzU2l6ZSgpIHsgfQorCisgICAgZW51bSBjbGFzcyBBdmFpbGFibGVTaXplQ2hhbmdlUmVhc29u IHsKKyAgICAgICAgU2Nyb2xsYmFyc0NoYW5nZWQsCisgICAgICAgIEFyZWFTaXplQ2hhbmdlZAor ICAgIH07CisgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIGF2YWlsYWJsZUNvbnRlbnRT aXplQ2hhbmdlZChBdmFpbGFibGVTaXplQ2hhbmdlUmVhc29uKTsKKwogICAgIGJvb2wgaGFzT3Zl cmxheVNjcm9sbGJhcnMoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZvaWQg c2V0U2Nyb2xsYmFyT3ZlcmxheVN0eWxlKFNjcm9sbGJhck92ZXJsYXlTdHlsZSk7CiAgICAgU2Ny b2xsYmFyT3ZlcmxheVN0eWxlIHNjcm9sbGJhck92ZXJsYXlTdHlsZSgpIGNvbnN0IHsgcmV0dXJu IHN0YXRpY19jYXN0PFNjcm9sbGJhck92ZXJsYXlTdHlsZT4obV9zY3JvbGxiYXJPdmVybGF5U3R5 bGUpOyB9CkBAIC0yMDEsNyArMjEwLDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIElu dFNpemUgdG90YWxDb250ZW50c1NpemUoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91 bGRTdXNwZW5kU2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KLSAgICB2 aXJ0dWFsIHZvaWQgc2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKGludCAvKm5ld1N0eWxlKi8sIGJvb2wg Lypmb3JjZVVwZGF0ZSovKSB7IH0KKyAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZvaWQgc2Ny b2xsYmFyU3R5bGVDaGFuZ2VkKGludCAvKm5ld1N0eWxlKi8sIGJvb2wgLypmb3JjZVVwZGF0ZSov KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZVNjcm9sbGVyVGh1bWJSZWN0KGNvbnN0IElu dFJlY3QmKSB7IH0KICAgICAKICAgICAvLyBOb3RlIHRoYXQgdGhpcyBvbmx5IHJldHVybnMgc2Ny b2xsYWJsZSBhcmVhcyB0aGF0IGNhbiBhY3R1YWxseSBiZSBzY3JvbGxlZC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggMGJj ZDE5ZWIwNzkzOTFhYTgyOTllNDFlY2Q0ZDhkYWZiOGE0OWUxNy4uYjk5NjAwZDcwNmIxYjllMWRl MjMxYzE4ZWJiMWNkZTBlNTJjNDkwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KQEAgLTcyNCw3ICs3MjQsNyBAQCBJbnRSZWN0 IFBERlBsdWdpbjo6c2Nyb2xsQ29ybmVyUmVjdCgpIGNvbnN0CiBTY3JvbGxhYmxlQXJlYSogUERG UGx1Z2luOjplbmNsb3NpbmdTY3JvbGxhYmxlQXJlYSgpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6 IFdhbGsgdXAgdGhlIGZyYW1lIHRyZWUgYW5kIGxvb2sgZm9yIGEgc2Nyb2xsYWJsZSBwYXJlbnQg ZnJhbWUgb3IgUmVuZGVyTGF5ZXIuCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7 CiB9CiAKIEludFJlY3QgUERGUGx1Z2luOjpzY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KCkgY29u c3QKQEAgLTc4OCw3ICs3ODgsNyBAQCBJbnRQb2ludCBQREZQbHVnaW46Om1heGltdW1TY3JvbGxQ b3NpdGlvbigpIGNvbnN0CiAgICAgcmV0dXJuIG1heGltdW1PZmZzZXQ7CiB9CiAKLXZvaWQgUERG UGx1Z2luOjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQoaW50LCBib29sIGZvcmNlVXBkYXRlKQordm9p ZCBQREZQbHVnaW46OnNjcm9sbGJhclN0eWxlQ2hhbmdlZChpbnQgc3R5bGUsIGJvb2wgZm9yY2VV cGRhdGUpCiB7CiAgICAgaWYgKCFmb3JjZVVwZGF0ZSkKICAgICAgICAgcmV0dXJuOwpAQCAtNzk3 LDEwICs3OTcsOSBAQCB2b2lkIFBERlBsdWdpbjo6c2Nyb2xsYmFyU3R5bGVDaGFuZ2VkKGludCwg Ym9vbCBmb3JjZVVwZGF0ZSkKICAgICBJbnRQb2ludCBuZXdTY3JvbGxPZmZzZXQgPSBJbnRQb2lu dChtX3Njcm9sbE9mZnNldCkuc2hydW5rVG8obWF4aW11bVNjcm9sbFBvc2l0aW9uKCkpOwogICAg IHNldFNjcm9sbE9mZnNldChuZXdTY3JvbGxPZmZzZXQpOwogICAgIAorICAgIFNjcm9sbGFibGVB cmVhOjpzY3JvbGxiYXJTdHlsZUNoYW5nZWQoc3R5bGUsIGZvcmNlVXBkYXRlKTsKICAgICAvLyBB cyBzaXplIG9mIHRoZSBjb250ZW50IGFyZWEgY2hhbmdlcywgc2Nyb2xsYmFycyBtYXkgbmVlZCB0 byBhcHBlYXIgb3IgdG8gZGlzYXBwZWFyLgogICAgIHVwZGF0ZVNjcm9sbGJhcnMoKTsKLSAgICAK LSAgICBTY3JvbGxhYmxlQXJlYTo6Y29udGVudHNSZXNpemVkKCk7CiB9CiAKIHZvaWQgUERGUGx1 Z2luOjphZGRBcmNoaXZlUmVzb3VyY2UoKQo=