138801 2014-11-17 11:54:11 -0800 DataDetectors PageOverlay callbacks can come in to the wrong overlay 2014-11-17 12:28:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin simon.fraser thorton oldest_to_newest 1049268 0 thorton 2014-11-17 11:54:11 -0800 DataDetectors PageOverlay callbacks can come in to the wrong overlay 1049269 1 241729 thorton 2014-11-17 11:55:04 -0800 Created attachment 241729 Patch 1049281 2 thorton 2014-11-17 12:28:13 -0800 http://trac.webkit.org/changeset/176221 241729 2014-11-17 11:55:04 -0800 2014-11-17 12:20:21 -0800 Patch bug-138801-20141117115517.patch text/plain 12128 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDZjMGY1OTA1NjFkODc5 NTBlMjI5NDA4YWIyODZkNjNiNWQ1YzA2NS4uN2FjNDRmNDM5ODY1MTM5OTM1OWJiOGRlZDJkYWQx ZDFkMDhjYjc5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTExLTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIERhdGFEZXRlY3Rv cnMgUGFnZU92ZXJsYXkgY2FsbGJhY2tzIGNhbiBjb21lIGluIHRvIHRoZSB3cm9uZyBvdmVybGF5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg4MDEK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4OTkxMzY5PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9QYWdlT3ZlcmxheS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpnZW5lcmF0ZVBhZ2VPdmVybGF5SUQpOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZU92ZXJsYXk6OlBhZ2VPdmVybGF5KToKKyAgICAgICAgKiBwYWdlL1BhZ2VPdmVybGF5Lmg6 CisgICAgICAgIEdpdmUgZWFjaCBQYWdlT3ZlcmxheSBhIHVuaXF1ZSBJRC4KKwogMjAxNC0xMS0x NiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2Ug VGV4dEluZGljYXRvciBpbnN0ZWFkIG9mIHRoZSBidWlsdCBpbiBMb29rdXAgaGlnaGxpZ2h0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKaW5kZXggNTgxNzk1ZjA3YWZhMjBhYzEyYTQ4M2U4YzJkNDM3YTAyNmE5NTZmNC4uODVk ODM5NWQ0Y2U0Zjk5OTYwZDVjNDk2OThkYWQ5ZGUwM2YxNDU0MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDM3IEBACisyMDE0LTExLTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgorCisgICAgICAgIERhdGFEZXRlY3RvcnMgUGFnZU92ZXJsYXkgY2FsbGJhY2tzIGNhbiBj b21lIGluIHRvIHRoZSB3cm9uZyBvdmVybGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg4MDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE4OTkx MzY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl IGNhbiBjYWxsIGRhdGFEZXRlY3RvcnNEaWRIaWRlVUkgb24gdGhlIHdyb25nIChvciBubykgUGFn ZU92ZXJsYXksCisgICAgICAgIGJlY2F1c2UgaXQncyBwb3NzaWJsZSB0byBoYXZlIGFub3RoZXIg cGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0QXRMb2NhdGlvbgorICAgICAgICBiZXR3ZWVuIHRoZSBm aXJzdCBvbmUgYW5kIHRoZSBkYXRhRGV0ZWN0b3JzRGlkKlVJIHRoYXQgY29ycmVzcG9uZCB0byBp dC4KKworICAgICAgICBUbyBtYWtlIHN1cmUgdGhhdCB0aGUgY2FsbGJhY2tzIGNvbWUgdG8gdGhl IHJpZ2h0IFBhZ2VPdmVybGF5LCBwbHVtYgorICAgICAgICBhbiBpbnRlZ2VyIElEIHRocm91Z2gg YWxsIG9mIHRoZSBjYWxsYmFja3MgYW5kIGZpbmQgdGhlIG92ZXJsYXkgYmFzZWQgb24gdGhhdC4K KworICAgICAgICAqIFNoYXJlZC9tYWMvQWN0aW9uTWVudUhpdFRlc3RSZXN1bHQuaDoKKyAgICAg ICAgU3RvcmUgdGhlIElEIG9mIHRoZSBQYWdlT3ZlcmxheSB0aGF0IG92ZXJyb2RlIGRhdGEgZGV0 ZWN0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVy Lm1tOgorICAgICAgICAoLVtXS0FjdGlvbk1lbnVDb250cm9sbGVyIF9kZWZhdWx0TWVudUl0ZW1z Rm9yRGF0YURldGVjdGVkVGV4dF0pOgorICAgICAgICBTZW5kIHRoZSBJRCBiYWNrIHRvIHRoZSBX ZWIgcHJvY2VzcyB3aGVuIHJlcGx5aW5nIGZyb20gREQgY2FsbGJhY2tzLgorCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1dlYlBhZ2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1BY3Rpb25N ZW51SGl0VGVzdEF0TG9jYXRpb24pOgorICAgICAgICBTdG9yZSB0aGUgSUQgb2YgdGhlIFBhZ2VP dmVybGF5IHRoYXQgb3ZlcnJvZGUgZGF0YSBkZXRlY3Rpb24gaW5zdGVhZCBvZgorICAgICAgICBr ZWVwaW5nIHRoZSBQYWdlT3ZlcmxheSBpdHNlbGYuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6ZGF0YURldGVjdG9yc0RpZFByZXNlbnRVSSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 OmRhdGFEZXRlY3RvcnNEaWRDaGFuZ2VVSSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRh dGFEZXRlY3RvcnNEaWRIaWRlVUkpOgorICAgICAgICBGaW5kIGFuZCByZXBseSB0byB0aGUgY29y cmVjdCBwYWdlIG92ZXJsYXkuCisKIDIwMTQtMTEtMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hv cnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIFRleHRJbmRpY2F0b3IgaW5zdGVhZCBvZiB0 aGUgYnVpbHQgaW4gTG9va3VwIGhpZ2hsaWdodApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9QYWdlT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5LmNw cAppbmRleCBiNTFkNDY0NDg3MDNlYTFjOWI4Mjc5ODUyMzE5ZjEzOGI0MTBlZThkLi4yNTRkODli NjdmMzNkMGU0YzkxNGMyYjI4NmU4MjRjNWNmZDg5MzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VP dmVybGF5LmNwcApAQCAtNDAsNiArNDAsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RhdGlj IGNvbnN0IGRvdWJsZSBmYWRlQW5pbWF0aW9uRHVyYXRpb24gPSAwLjI7CiBzdGF0aWMgY29uc3Qg ZG91YmxlIGZhZGVBbmltYXRpb25GcmFtZVJhdGUgPSAzMDsKIAorc3RhdGljIFBhZ2VPdmVybGF5 OjpQYWdlT3ZlcmxheUlEIGdlbmVyYXRlUGFnZU92ZXJsYXlJRCgpCit7CisgICAgc3RhdGljIFBh Z2VPdmVybGF5OjpQYWdlT3ZlcmxheUlEIHBhZ2VPdmVybGF5SUQ7CisgICAgcmV0dXJuICsrcGFn ZU92ZXJsYXlJRDsKK30KKwogUGFzc1JlZlB0cjxQYWdlT3ZlcmxheT4gUGFnZU92ZXJsYXk6OmNy ZWF0ZShDbGllbnQmIGNsaWVudCwgT3ZlcmxheVR5cGUgb3ZlcmxheVR5cGUpCiB7CiAgICAgcmV0 dXJuIGFkb3B0UmVmKG5ldyBQYWdlT3ZlcmxheShjbGllbnQsIG92ZXJsYXlUeXBlKSk7CkBAIC01 NSw2ICs2MSw3IEBAIFBhZ2VPdmVybGF5OjpQYWdlT3ZlcmxheShDbGllbnQmIGNsaWVudCwgT3Zl cmxheVR5cGUgb3ZlcmxheVR5cGUpCiAgICAgLCBtX2ZyYWN0aW9uRmFkZWRJbigxKQogICAgICwg bV9vdmVybGF5VHlwZShvdmVybGF5VHlwZSkKICAgICAsIG1fYmFja2dyb3VuZENvbG9yKENvbG9y Ojp0cmFuc3BhcmVudCkKKyAgICAsIG1fcGFnZU92ZXJsYXlJRChnZW5lcmF0ZVBhZ2VPdmVybGF5 SUQoKSkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlT3Zlcmxh eS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlT3ZlcmxheS5oCmluZGV4IDcwZmViYzhjYmEy ZTU3YjkxZDBkZjYyNDgwZTA0MzY1OTljMzA3YjIuLmU4ZGE3Nzk3MjM2ZjI1MGI3N2EyNDJiOTg4 M2E2YTJiOGNjODhmZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZU92ZXJs YXkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VPdmVybGF5LmgKQEAgLTc0LDYgKzc0 LDkgQEAgcHVibGljOgogCiAgICAgUGFnZU92ZXJsYXlDb250cm9sbGVyKiBjb250cm9sbGVyKCkg Y29uc3Q7CiAKKyAgICB0eXBlZGVmIHVpbnQ2NF90IFBhZ2VPdmVybGF5SUQ7CisgICAgdmlydHVh bCBQYWdlT3ZlcmxheUlEIHBhZ2VPdmVybGF5SUQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VPdmVy bGF5SUQ7IH0KKwogICAgIHZvaWQgc2V0UGFnZShQYWdlKik7CiAgICAgdm9pZCBzZXROZWVkc0Rp c3BsYXkoY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KTsKICAgICB2b2lkIHNldE5lZWRzRGlzcGxh eSgpOwpAQCAtMTM0LDYgKzEzNyw3IEBAIHByaXZhdGU6CiAgICAgSW50UmVjdCBtX292ZXJyaWRl RnJhbWU7CiAKICAgICBSR0JBMzIgbV9iYWNrZ3JvdW5kQ29sb3I7CisgICAgUGFnZU92ZXJsYXlJ RCBtX3BhZ2VPdmVybGF5SUQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQWN0aW9uTWVudUhpdFRlc3RSZXN1bHQuaCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQWN0aW9uTWVudUhpdFRlc3RSZXN1bHQuaAppbmRl eCBhZTRhMDhhNzhlNzM5YWIzNDk1YzA2YzU1MWVlZGExYWU1MzMyNmVmLi45ZDFjYTkwYzUzZjU1 ZTIxYTU4Y2U5Y2Q3MjJlNzNjYTcwODNiYzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvbWFjL0FjdGlvbk1lbnVIaXRUZXN0UmVzdWx0LmgKKysrIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL21hYy9BY3Rpb25NZW51SGl0VGVzdFJlc3VsdC5oCkBAIC0zMCw2ICszMCw3IEBACiAj aW5jbHVkZSAiVGV4dEluZGljYXRvci5oIgogI2luY2x1ZGUgIldlYkhpdFRlc3RSZXN1bHQuaCIK ICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUGFnZU92 ZXJsYXkuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogT0JKQ19DTEFTUyBE REFjdGlvbkNvbnRleHQ7CkBAIC01NCw2ICs1NSw3IEBAIHN0cnVjdCBBY3Rpb25NZW51SGl0VGVz dFJlc3VsdCB7CiAgICAgUmV0YWluUHRyPEREQWN0aW9uQ29udGV4dD4gYWN0aW9uQ29udGV4dDsK ICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3g7CiAgICAgUmVm UHRyPFRleHRJbmRpY2F0b3I+IGRldGVjdGVkRGF0YVRleHRJbmRpY2F0b3I7CisgICAgV2ViQ29y ZTo6UGFnZU92ZXJsYXk6OlBhZ2VPdmVybGF5SUQgZGV0ZWN0ZWREYXRhT3JpZ2luYXRpbmdQYWdl T3ZlcmxheTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0FjdGlvbk1lbnVDb250cm9sbGVyLm1tCmluZGV4IDI3 ZDgwODlmNWYwYWI3MmI2ODkwNWQyNjQ3MjFmOWVlNTAzZmJjMDkuLjZiNzY2OGRkYjI0NzFhNzUw YWIwZTEwMGEyNzE3MmY2ZGJjMmIwODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV0tBY3Rpb25NZW51Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dLQWN0aW9uTWVudUNvbnRyb2xsZXIubW0KQEAgLTU3MywxNCArNTczLDE1 IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFRvUGhvdG9PbkRpc2soTlNTdHJpbmcgKnN1Z2dlc3Rl ZEZpbGVuYW1lKQogCiAgICAgLy8gUmVmIG91ciBXZWJQYWdlUHJveHkgZm9yIHVzZSBpbiB0aGUg YmxvY2tzIGJlbG93LgogICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IHBhZ2UgPSBfcGFnZTsKKyAg ICBQYWdlT3ZlcmxheTo6UGFnZU92ZXJsYXlJRCBvdmVybGF5SUQgPSBfaGl0VGVzdFJlc3VsdC5k ZXRlY3RlZERhdGFPcmlnaW5hdGluZ1BhZ2VPdmVybGF5OwogICAgIF9jdXJyZW50QWN0aW9uQ29u dGV4dCA9IFthY3Rpb25Db250ZXh0IGNvbnRleHRGb3JWaWV3Ol93a1ZpZXcgYWx0TW9kZTpZRVMg aW50ZXJhY3Rpb25TdGFydGVkSGFuZGxlcjpeKCkgewotICAgICAgICBwYWdlLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlOjpEYXRhRGV0ZWN0b3JzRGlkUHJlc2VudFVJKCkpOworICAgICAgICBwYWdl LT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEYXRhRGV0ZWN0b3JzRGlkUHJlc2VudFVJKG92ZXJs YXlJRCkpOwogICAgIH0gaW50ZXJhY3Rpb25DaGFuZ2VkSGFuZGxlcjpeKCkgewogICAgICAgICBb c2VsZiBfc2hvd1RleHRJbmRpY2F0b3JdOwotICAgICAgICBwYWdlLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpEYXRhRGV0ZWN0b3JzRGlkQ2hhbmdlVUkoKSk7CisgICAgICAgIHBhZ2UtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OkRhdGFEZXRlY3RvcnNEaWRDaGFuZ2VVSShvdmVybGF5SUQpKTsK ICAgICB9IGludGVyYWN0aW9uU3RvcHBlZEhhbmRsZXI6XigpIHsKICAgICAgICAgW3NlbGYgX2hp ZGVUZXh0SW5kaWNhdG9yXTsKLSAgICAgICAgcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 RGF0YURldGVjdG9yc0RpZEhpZGVVSSgpKTsKKyAgICAgICAgcGFnZS0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6RGF0YURldGVjdG9yc0RpZEhpZGVVSShvdmVybGF5SUQpKTsKICAgICB9XTsKIAog ICAgIFtfY3VycmVudEFjdGlvbkNvbnRleHQgc2V0SGlnaGxpZ2h0RnJhbWU6W193a1ZpZXcud2lu ZG93IGNvbnZlcnRSZWN0VG9TY3JlZW46W193a1ZpZXcgY29udmVydFJlY3Q6X2hpdFRlc3RSZXN1 bHQuZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3ggdG9WaWV3Om5pbF1dXTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDEzNTI0ZDZiY2Y0OTQ2OTU3NDg1 NDIxMzA2OGUwZGRjZThhZDE0YjIuLmI2NjJmYmVhMzVmODk4YzNjMDIxYTFlZTVmNWRmZTY0YmI2 ODY0ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApA QCAtNTIsNiArNTIsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgogI2luY2x1ZGUg PFdlYkNvcmUvSW50U2l6ZUhhc2guaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KKyNpbmNs dWRlIDxXZWJDb3JlL1BhZ2VPdmVybGF5Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlVmlzaWJp bGl0eVN0YXRlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TY3JvbGxUeXBlcy5oPgogI2luY2x1ZGUg PFdlYkNvcmUvVGV4dENoZWNraW5nLmg+CkBAIC0xMDU4LDkgKzEwNTksOSBAQCBwcml2YXRlOgog ICAgIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IGxvb2t1cFRleHRBdExvY2F0aW9uKFdlYkNv cmU6OkZsb2F0UG9pbnQpOwogICAgIHZvaWQgc2VsZWN0TGFzdEFjdGlvbk1lbnVSYW5nZSgpOwog Ci0gICAgdm9pZCBkYXRhRGV0ZWN0b3JzRGlkUHJlc2VudFVJKCk7Ci0gICAgdm9pZCBkYXRhRGV0 ZWN0b3JzRGlkQ2hhbmdlVUkoKTsKLSAgICB2b2lkIGRhdGFEZXRlY3RvcnNEaWRIaWRlVUkoKTsK KyAgICB2b2lkIGRhdGFEZXRlY3RvcnNEaWRQcmVzZW50VUkoV2ViQ29yZTo6UGFnZU92ZXJsYXk6 OlBhZ2VPdmVybGF5SUQpOworICAgIHZvaWQgZGF0YURldGVjdG9yc0RpZENoYW5nZVVJKFdlYkNv cmU6OlBhZ2VPdmVybGF5OjpQYWdlT3ZlcmxheUlEKTsKKyAgICB2b2lkIGRhdGFEZXRlY3RvcnNE aWRIaWRlVUkoV2ViQ29yZTo6UGFnZU92ZXJsYXk6OlBhZ2VPdmVybGF5SUQpOwogI2VuZGlmCiAK ICAgICB1aW50NjRfdCBtX3BhZ2VJRDsKQEAgLTEyOTIsNyArMTI5Myw2IEBAIHByaXZhdGU6CiAK ICNpZiBQTEFURk9STShNQUMpCiAgICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiBtX2xhc3RBY3Rp b25NZW51UmFuZ2VGb3JTZWxlY3Rpb247Ci0gICAgUmVmUHRyPFdlYlBhZ2VPdmVybGF5PiBtX2xh c3RBY3Rpb25NZW51SGl0UGFnZU92ZXJsYXk7CiAjZW5kaWYKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXgg NGU5NzJmMWY3ZjJhZmU1OTlkZmEzZGY3ZWU4OTk3YzEwMTAxNDgwNC4uZDliNTRjOWIzMGYwZDQ3 NDJmOGFkNzkyMWJmNjVjMmIzZTVmMDMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTQwMCw4ICs0MDAsOCBA QCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICNpZiBQTEFURk9STShNQUMp CiAgICAgUGVyZm9ybUFjdGlvbk1lbnVIaXRUZXN0QXRMb2NhdGlvbihXZWJDb3JlOjpGbG9hdFBv aW50IGxvY2F0aW9uKQogICAgIFNlbGVjdExhc3RBY3Rpb25NZW51UmFuZ2UoKQotICAgIERhdGFE ZXRlY3RvcnNEaWRQcmVzZW50VUkoKQotICAgIERhdGFEZXRlY3RvcnNEaWRDaGFuZ2VVSSgpCi0g ICAgRGF0YURldGVjdG9yc0RpZEhpZGVVSSgpCisgICAgRGF0YURldGVjdG9yc0RpZFByZXNlbnRV SShXZWJDb3JlOjpQYWdlT3ZlcmxheTo6UGFnZU92ZXJsYXlJRCBwYWdlT3ZlcmxheSkKKyAgICBE YXRhRGV0ZWN0b3JzRGlkQ2hhbmdlVUkoV2ViQ29yZTo6UGFnZU92ZXJsYXk6OlBhZ2VPdmVybGF5 SUQgcGFnZU92ZXJsYXkpCisgICAgRGF0YURldGVjdG9yc0RpZEhpZGVVSShXZWJDb3JlOjpQYWdl T3ZlcmxheTo6UGFnZU92ZXJsYXlJRCBwYWdlT3ZlcmxheSkKICNlbmRpZgogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCmluZGV4 IGQzNjRjMWNlYjlhNTZhYTA5ZDZiOTE3ZWJlMjYwNmFhODYzZWRmMzAuLmMxNTdiZDcxMDg1MmQ3 MmNhMmY2OTJjYTk3ZWJjNWE1MjE4ZjhmN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAgLTk3NCw4ICs5NzQsNiBAQCBT dHJpbmcgV2ViUGFnZTo6cGxhdGZvcm1Vc2VyQWdlbnQoY29uc3QgVVJMJikgY29uc3QKIAogdm9p ZCBXZWJQYWdlOjpwZXJmb3JtQWN0aW9uTWVudUhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6OkZs b2F0UG9pbnQgbG9jYXRpb25JblZpZXdDb29vcmRpbmF0ZXMpCiB7Ci0gICAgbV9sYXN0QWN0aW9u TWVudUhpdFBhZ2VPdmVybGF5ID0gbnVsbHB0cjsKLQogICAgIGxheW91dElmTmVlZGVkKCk7CiAK ICAgICBNYWluRnJhbWUmIG1haW5GcmFtZSA9IGNvcmVQYWdlKCktPm1haW5GcmFtZSgpOwpAQCAt MTAzOCw4ICsxMDM2LDggQEAgdm9pZCBXZWJQYWdlOjpwZXJmb3JtQWN0aW9uTWVudUhpdFRlc3RB dExvY2F0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQgbG9jYXRpb25JblYKIAogICAgICAgICBhY3Rp b25NZW51UmVzdWx0LmRldGVjdGVkRGF0YUJvdW5kaW5nQm94ID0gZGV0ZWN0ZWREYXRhQm91bmRp bmdCb3g7CiAgICAgICAgIGFjdGlvbk1lbnVSZXN1bHQuZGV0ZWN0ZWREYXRhVGV4dEluZGljYXRv ciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5nZSgqbWFpblJlc3VsdFJhbmdlKTsKKyAg ICAgICAgYWN0aW9uTWVudVJlc3VsdC5kZXRlY3RlZERhdGFPcmlnaW5hdGluZ1BhZ2VPdmVybGF5 ID0gb3ZlcmxheS0+cGFnZU92ZXJsYXlJRCgpOwogICAgICAgICBtX2xhc3RBY3Rpb25NZW51UmFu Z2VGb3JTZWxlY3Rpb24gPSBtYWluUmVzdWx0UmFuZ2U7Ci0gICAgICAgIG1fbGFzdEFjdGlvbk1l bnVIaXRQYWdlT3ZlcmxheSA9IHdlYk92ZXJsYXk7CiAKICAgICAgICAgYnJlYWs7CiAgICAgfQpA QCAtMTA4MSwyMyArMTA3OSw0MCBAQCB2b2lkIFdlYlBhZ2U6OnNlbGVjdExhc3RBY3Rpb25NZW51 UmFuZ2UoKQogICAgICAgICBjb3JlUGFnZSgpLT5tYWluRnJhbWUoKS5zZWxlY3Rpb24oKS5zZXRT ZWxlY3RlZFJhbmdlKG1fbGFzdEFjdGlvbk1lbnVSYW5nZUZvclNlbGVjdGlvbi5nZXQoKSwgRE9X TlNUUkVBTSwgdHJ1ZSk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6ZGF0YURldGVjdG9yc0RpZFByZXNl bnRVSSgpCit2b2lkIFdlYlBhZ2U6OmRhdGFEZXRlY3RvcnNEaWRQcmVzZW50VUkoUGFnZU92ZXJs YXk6OlBhZ2VPdmVybGF5SUQgb3ZlcmxheUlEKQogewotICAgIGlmIChtX2xhc3RBY3Rpb25NZW51 SGl0UGFnZU92ZXJsYXkpCi0gICAgICAgIG1fbGFzdEFjdGlvbk1lbnVIaXRQYWdlT3ZlcmxheS0+ ZGF0YURldGVjdG9yc0RpZFByZXNlbnRVSSgpOworICAgIE1haW5GcmFtZSYgbWFpbkZyYW1lID0g Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgZm9yIChjb25zdCBhdXRvJiBvdmVybGF5IDog bWFpbkZyYW1lLnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLnBhZ2VPdmVybGF5cygpKSB7CisgICAg ICAgIGlmIChvdmVybGF5LT5wYWdlT3ZlcmxheUlEKCkgPT0gb3ZlcmxheUlEKSB7CisgICAgICAg ICAgICBpZiAoV2ViUGFnZU92ZXJsYXkqIHdlYk92ZXJsYXkgPSBXZWJQYWdlT3ZlcmxheTo6ZnJv bUNvcmVPdmVybGF5KCpvdmVybGF5KSkKKyAgICAgICAgICAgICAgICB3ZWJPdmVybGF5LT5kYXRh RGV0ZWN0b3JzRGlkUHJlc2VudFVJKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICB9CiB9CiAKLXZvaWQgV2ViUGFnZTo6ZGF0YURldGVjdG9yc0RpZENoYW5nZVVJKCkKK3Zv aWQgV2ViUGFnZTo6ZGF0YURldGVjdG9yc0RpZENoYW5nZVVJKFBhZ2VPdmVybGF5OjpQYWdlT3Zl cmxheUlEIG92ZXJsYXlJRCkKIHsKLSAgICBpZiAobV9sYXN0QWN0aW9uTWVudUhpdFBhZ2VPdmVy bGF5KQotICAgICAgICBtX2xhc3RBY3Rpb25NZW51SGl0UGFnZU92ZXJsYXktPmRhdGFEZXRlY3Rv cnNEaWRDaGFuZ2VVSSgpOworICAgIE1haW5GcmFtZSYgbWFpbkZyYW1lID0gY29yZVBhZ2UoKS0+ bWFpbkZyYW1lKCk7CisgICAgZm9yIChjb25zdCBhdXRvJiBvdmVybGF5IDogbWFpbkZyYW1lLnBh Z2VPdmVybGF5Q29udHJvbGxlcigpLnBhZ2VPdmVybGF5cygpKSB7CisgICAgICAgIGlmIChvdmVy bGF5LT5wYWdlT3ZlcmxheUlEKCkgPT0gb3ZlcmxheUlEKSB7CisgICAgICAgICAgICBpZiAoV2Vi UGFnZU92ZXJsYXkqIHdlYk92ZXJsYXkgPSBXZWJQYWdlT3ZlcmxheTo6ZnJvbUNvcmVPdmVybGF5 KCpvdmVybGF5KSkKKyAgICAgICAgICAgICAgICB3ZWJPdmVybGF5LT5kYXRhRGV0ZWN0b3JzRGlk Q2hhbmdlVUkoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgIH0KIH0KIAot dm9pZCBXZWJQYWdlOjpkYXRhRGV0ZWN0b3JzRGlkSGlkZVVJKCkKK3ZvaWQgV2ViUGFnZTo6ZGF0 YURldGVjdG9yc0RpZEhpZGVVSShQYWdlT3ZlcmxheTo6UGFnZU92ZXJsYXlJRCBvdmVybGF5SUQp CiB7Ci0gICAgaWYgKG1fbGFzdEFjdGlvbk1lbnVIaXRQYWdlT3ZlcmxheSkKLSAgICAgICAgbV9s YXN0QWN0aW9uTWVudUhpdFBhZ2VPdmVybGF5LT5kYXRhRGV0ZWN0b3JzRGlkSGlkZVVJKCk7Ci0g ICAgbV9sYXN0QWN0aW9uTWVudUhpdFBhZ2VPdmVybGF5ID0gbmlsOworICAgIE1haW5GcmFtZSYg bWFpbkZyYW1lID0gY29yZVBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgZm9yIChjb25zdCBhdXRv JiBvdmVybGF5IDogbWFpbkZyYW1lLnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLnBhZ2VPdmVybGF5 cygpKSB7CisgICAgICAgIGlmIChvdmVybGF5LT5wYWdlT3ZlcmxheUlEKCkgPT0gb3ZlcmxheUlE KSB7CisgICAgICAgICAgICBpZiAoV2ViUGFnZU92ZXJsYXkqIHdlYk92ZXJsYXkgPSBXZWJQYWdl T3ZlcmxheTo6ZnJvbUNvcmVPdmVybGF5KCpvdmVybGF5KSkKKyAgICAgICAgICAgICAgICB3ZWJP dmVybGF5LT5kYXRhRGV0ZWN0b3JzRGlkSGlkZVVJKCk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICB9CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=