54911 2011-02-21 15:01:28 -0800 DrawingArea[Proxy]Impl's "sequence number" concept should be renamed to "state ID" 2011-02-21 15:21:37 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 51262 1 aroben aroben andersca oldest_to_newest 354828 0 aroben 2011-02-21 15:01:28 -0800 DrawingArea[Proxy]Impl's "sequence number" concept should be renamed to "state ID" 354830 1 aroben 2011-02-21 15:01:57 -0800 See bug 51262 comment 33 for justification. 354833 2 83222 aroben 2011-02-21 15:05:58 -0800 Created attachment 83222 Patch 354842 3 aroben 2011-02-21 15:21:37 -0800 Committed r79254: <http://trac.webkit.org/changeset/79254> 83222 2011-02-21 15:05:58 -0800 2011-02-21 15:14:30 -0800 Patch bug-54911-20110221180802.patch text/plain 22622 aroben U3VidmVyc2lvbiBSZXZpc2lvbjogNzkyNTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhYTRjYjllZDExMDkxYTFj MDVlMWJjM2MyNTM2YjI2M2Q4MTA0MGZmLi42OTc3OGIwOTJjMGEyOGZkYzcwNjEyMzVkOTcyMDNi ZjI2OTA2YTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDUgQEAKIDIwMTEtMDItMjEgIEFkYW0g Um9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCisgICAgICAgIFJlbmFtZSBEcmF3aW5nQXJlYVtQ cm94eV1JbXBsJ3MgInNlcXVlbmNlIG51bWJlciIgY29uY2VwdCB0byAic3RhdGUgSUQiLgorCisg ICAgICAgIEFzIGV4cGxhaW5lZCBpbiByNzkyNTEsIERyYXdpbmdBcmVhUHJveHlJbXBsIGhhcyBz b21lIHN0YXRlIHRoYXQsIHdoZW4gaXQgY2hhbmdlcywgY2F1c2VzCisgICAgICAgIGFsbCBvcGVy YXRpb25zIHBlcmZvcm1lZCBiZWZvcmUgdGhhdCBzdGF0ZSBjaGFuZ2UgdG8gYmVjb21lIGludmFs aWQuIEN1cnJlbnRseSwgdGhpcyBzdGF0ZQorICAgICAgICBjb25zaXN0cyBvZiBhIHNpbmdsZSBw aWVjZSBvZiBkYXRhOiB0aGUgdmlldydzIHNpemUuIEV2ZW50dWFsbHkgaXQgd2lsbCBlbmNvbXBh c3MgbW9yZSBkYXRhCisgICAgICAgIChlLmcuLCB0aGUgYmFja2luZyBzdG9yZSB3ZSdyZSBkcmF3 aW5nIGludG87IHdoZW4gd2Ugc3RhcnQgdGhyb3dpbmcgYXdheSB0aGUgYmFja2luZyBzdG9yZQor ICAgICAgICB0byBzYXZlIG1lbW9yeSwgb3VyIHN0YXRlIHdpbGwgaGF2ZSBjaGFuZ2VkLCBhbmQg YW55IG9wZXJhdGlvbnMgdGhhdCB3ZXJlIGludGVuZGVkIGZvciB0aGUKKyAgICAgICAgb2xkIGJh Y2tpbmcgc3RvcmUgd2lsbCBoYXZlIGJlY29tZSBpbnZhbGlkKS4gcjc5MjUxIGVmZmVjdGl2ZWx5 IHRyYW5zZm9ybWVkCisgICAgICAgIERyYXdpbmdBcmVhW1Byb3h5XUltcGwncyAic2VxdWVuY2Ug bnVtYmVyLCIgd2hpY2ggaW5jcmVtZW50ZWQgZXZlcnkgdGltZSBEcmF3aW5nQXJlYUltcGwKKyAg ICAgICAgc2VudCBEcmF3aW5nQXJlYVByb3h5SW1wbCBhIG1lc3NhZ2UsIHRvIGEgInN0YXRlIElE LCIgd2hpY2ggb25seSBpbmNyZW1lbnRzIHdoZW4gdGhlIHZpZXcncworICAgICAgICBzaXplIGNo YW5nZXMuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBqdXN0IGEgc2V0IG9mIHNpbXBsZSByZW5h bWVzIHRvIHJlZmxlY3QgdGhlIHRyYW5zZm9ybWF0aW9uIHRoYXQgcjc5MjUxCisgICAgICAgIGVm ZmVjdGVkLiBJdCBzaG91bGQgbm90IGludHJvZHVjZSBhbnkgY2hhbmdlcyBpbiBiZWhhdmlvci4g VGhlIHJlbmFtZXMgYXJlOgorICAgICAgICAgIC0gTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpTZXRT aXplIC0+IFVwZGF0ZVN0YXRlCisgICAgICAgICAgLSBNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94 eTo6RGlkU2V0U2l6ZSAtPiBEaWRVcGRhdGVTdGF0ZQorICAgICAgICAgIC0gRHJhd2luZ0FyZWFQ cm94eUltcGw6Om1fbGFzdERpZFNldFNpemVTZXF1ZW5jZU51bWJlciAtPiBtX2N1cnJlbnRTdGF0 ZUlECisgICAgICAgICAgLSBEcmF3aW5nQXJlYVByb3h5SW1wbDo6bV9pc1dhaXRpbmdGb3JEaWRT ZXRTaXplIC0+IG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlU3RhdGUKKyAgICAgICAgICAtIERyYXdp bmdBcmVhUHJveHlJbXBsOjp3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRTZXRTaXplIC0+IHdhaXRGb3JB bmREaXNwYXRjaERpZFVwZGF0ZVN0YXRlCisgICAgICAgICAgLSBEcmF3aW5nQXJlYUltcGw6Om1f aW5TZXRTaXplIC0+IG1faW5VcGRhdGVTdGF0ZQorICAgICAgICAgIC0gZ2VuZXJhdGVTZXF1ZW5j ZU51bWJlciAtPiBnZW5lcmF0ZVN0YXRlSUQKKyAgICAgICAgICAtIHNlcXVlbmNlTnVtYmVyIC0+ IHN0YXRlSUQKKworICAgICAgICBGaXhlcyA8aHR0cDovL3dlYmtpdC5vcmcvYi81NDkxMT4gRHJh d2luZ0FyZWFbUHJveHldSW1wbCdzICJzZXF1ZW5jZSBudW1iZXIiIGNvbmNlcHQgc2hvdWxkCisg ICAgICAgIGJlIHJlbmFtZWQgdG8gInN0YXRlIElEIgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAg ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwOgorICAgICAgICAqIFVJUHJv Y2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9EcmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJl YS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJ bXBsLmNwcDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmg6 CisgICAgICAgIFBlcmZvcm1lZCB0aGUgcmVuYW1lcyBkZXNjcmliZWQgYWJvdmUuCisKKzIwMTEt MDItMjEgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCiAgICAgICAgIE1vdmUgY29u dHJvbCBvZiB0aGUgc2VxdWVuY2UgbnVtYmVyIGZyb20gRHJhd2luZ0FyZWFJbXBsIHRvIERyYXdp bmdBcmVhUHJveHlJbXBsCiAKICAgICAgICAgRHJhd2luZ0FyZWFQcm94eUltcGwgaGFzIHNvbWUg c3RhdGUgdGhhdCwgd2hlbiBpdCBjaGFuZ2VzLCBjYXVzZXMgYWxsIG9wZXJhdGlvbnMgcGVyZm9y bWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94 eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuaAppbmRleCBm ODAyMjQxMDAyN2E2MTk0MzExNmUzOTEyYmI5YmNmNjZlMDBkNTg5Li5mYTM3MmU4YWQ4ZTAxMjJh MGQ4ZDUwOWMxZGE5YjIyNjY2YWE5MjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9E cmF3aW5nQXJlYVByb3h5LmgKQEAgLTk5LDExICs5OSwxMSBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRl OgogICAgIC8vIENvcmVJUEMgbWVzc2FnZSBoYW5kbGVycy4KICAgICAvLyBGSVhNRTogVGhlc2Ug c2hvdWxkIGJlIHB1cmUgdmlydHVhbC4KLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlKHVpbnQ2NF90 IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBVcGRhdGVJbmZvJikgeyB9Ci0gICAgdmlydHVhbCB2b2lk IGRpZFNldFNpemUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIsIGNvbnN0IFVwZGF0ZUluZm8mLCBj b25zdCBMYXllclRyZWVDb250ZXh0JikgeyB9CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZSh1aW50 NjRfdCBzdGF0ZUlELCBjb25zdCBVcGRhdGVJbmZvJikgeyB9CisgICAgdmlydHVhbCB2b2lkIGRp ZFVwZGF0ZVN0YXRlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IFVwZGF0ZUluZm8mLCBjb25zdCBM YXllclRyZWVDb250ZXh0JikgeyB9CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQot ICAgIHZpcnR1YWwgdm9pZCBlbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVpbnQ2NF90 IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBMYXllclRyZWVDb250ZXh0JikgeyB9Ci0gICAgdmlydHVh bCB2b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzZXF1ZW5jZU51 bWJlciwgY29uc3QgVXBkYXRlSW5mbyYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBlbnRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IExheWVyVHJlZUNv bnRleHQmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IFVwZGF0ZUluZm8mKSB7IH0KICNlbmRpZgogfTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHku bWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5t ZXNzYWdlcy5pbgppbmRleCBhMmI1ZTI2YTBjZWZjZTM1MjZlYmE0ZTQ1YTFmM2QyMjkwMDFmM2E5 Li4zYjk1YWY5Yjg4NTViYzcyZTk0N2FjMDJmMjEyOTk1ZjYyZjE2OGNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbgorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5tZXNzYWdlcy5pbgpA QCAtMjEsMTEgKzIxLDExIEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIG1lc3NhZ2VzIC0+IERyYXdpbmdB cmVhUHJveHkgewotICAgIFVwZGF0ZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgV2ViS2l0OjpV cGRhdGVJbmZvIHVwZGF0ZUluZm8pCi0gICAgRGlkU2V0U2l6ZSh1aW50NjRfdCBzZXF1ZW5jZU51 bWJlciwgV2ViS2l0OjpVcGRhdGVJbmZvIHVwZGF0ZUluZm8sIFdlYktpdDo6TGF5ZXJUcmVlQ29u dGV4dCBjb250ZXh0KQorICAgIFVwZGF0ZSh1aW50NjRfdCBzdGF0ZUlELCBXZWJLaXQ6OlVwZGF0 ZUluZm8gdXBkYXRlSW5mbykKKyAgICBEaWRVcGRhdGVTdGF0ZSh1aW50NjRfdCBzdGF0ZUlELCBX ZWJLaXQ6OlVwZGF0ZUluZm8gdXBkYXRlSW5mbywgV2ViS2l0OjpMYXllclRyZWVDb250ZXh0IGNv bnRleHQpCiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgRW50ZXJBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgV2ViS2l0OjpM YXllclRyZWVDb250ZXh0IGNvbnRleHQpCi0gICAgRXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBXZWJLaXQ6OlVwZGF0ZUluZm8gdXBkYXRlSW5m bykKKyAgICBFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVpbnQ2NF90IHN0YXRlSUQs IFdlYktpdDo6TGF5ZXJUcmVlQ29udGV4dCBjb250ZXh0KQorICAgIEV4aXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzdGF0ZUlELCBXZWJLaXQ6OlVwZGF0ZUluZm8gdXBkYXRl SW5mbykKICNlbmRpZgogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Ry YXdpbmdBcmVhUHJveHlJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5n QXJlYVByb3h5SW1wbC5jcHAKaW5kZXggZDkzZWIwOTczNDg0ZjI4OGZjMjYyODllNzg5ODkxMDNi ZWIzMDgyMS4uN2MyNjA1ZTViMjBkNGE4MTI0MmZkZTM2ZmJmZmExZjdjZjYyMjJjNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwCkBA IC00MiwxMCArNDIsMTAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCi1zdGF0aWMgdWludDY0X3QgZ2VuZXJhdGVTZXF1ZW5jZU51bWJlcigpCitzdGF0 aWMgdWludDY0X3QgZ2VuZXJhdGVTdGF0ZUlEKCkKIHsKLSAgICBzdGF0aWMgdWludDY0X3Qgc2Vx dWVuY2VOdW1iZXI7Ci0gICAgcmV0dXJuICsrc2VxdWVuY2VOdW1iZXI7CisgICAgc3RhdGljIHVp bnQ2NF90IHN0YXRlSUQ7CisgICAgcmV0dXJuICsrc3RhdGVJRDsKIH0KIAogUGFzc093blB0cjxE cmF3aW5nQXJlYVByb3h5SW1wbD4gRHJhd2luZ0FyZWFQcm94eUltcGw6OmNyZWF0ZShXZWJQYWdl UHJveHkqIHdlYlBhZ2VQcm94eSkKQEAgLTU1LDggKzU1LDggQEAgUGFzc093blB0cjxEcmF3aW5n QXJlYVByb3h5SW1wbD4gRHJhd2luZ0FyZWFQcm94eUltcGw6OmNyZWF0ZShXZWJQYWdlUHJveHkq IHdlYlAKIAogRHJhd2luZ0FyZWFQcm94eUltcGw6OkRyYXdpbmdBcmVhUHJveHlJbXBsKFdlYlBh Z2VQcm94eSogd2ViUGFnZVByb3h5KQogICAgIDogRHJhd2luZ0FyZWFQcm94eShEcmF3aW5nQXJl YUluZm86OkltcGwsIHdlYlBhZ2VQcm94eSkKLSAgICAsIG1faXNXYWl0aW5nRm9yRGlkU2V0U2l6 ZShmYWxzZSkKLSAgICAsIG1fbGFzdERpZFNldFNpemVTZXF1ZW5jZU51bWJlcigwKQorICAgICwg bV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVTdGF0ZShmYWxzZSkKKyAgICAsIG1fY3VycmVudFN0YXRl SUQoMCkKIHsKIH0KIApAQCAtNzYsMTIgKzc2LDEyIEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUlt cGw6OnBhaW50KEJhY2tpbmdTdG9yZTo6UGxhdGZvcm1HcmFwaGljc0NvbnRleHQgY29udGV4dCwK IAogICAgIEFTU0VSVCghaXNJbkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpOwogCi0gICAg aWYgKG1faXNXYWl0aW5nRm9yRGlkU2V0U2l6ZSkgewotICAgICAgICAvLyBXYWl0IGZvciBhIERp ZFNldFNpemUgbWVzc2FnZSB0aGF0IGNvbnRhaW5zIHRoZSBuZXcgYml0cyBiZWZvcmUgd2UgcGFp bnQKKyAgICBpZiAobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVTdGF0ZSkgeworICAgICAgICAvLyBX YWl0IGZvciBhIERpZFVwZGF0ZVN0YXRlIG1lc3NhZ2UgdGhhdCBjb250YWlucyB0aGUgbmV3IGJp dHMgYmVmb3JlIHdlIHBhaW50CiAgICAgICAgIC8vIHdoYXQncyBjdXJyZW50bHkgaW4gdGhlIGJh Y2tpbmcgc3RvcmUuCi0gICAgICAgIHdhaXRGb3JBbmREaXNwYXRjaERpZFNldFNpemUoKTsKKyAg ICAgICAgd2FpdEZvckFuZERpc3BhdGNoRGlkVXBkYXRlU3RhdGUoKTsKIAotICAgICAgICAvLyBE aXNwYXRjaGluZyBEaWRTZXRTaXplIGNvdWxkIGRlc3Ryb3kgb3VyIGJhY2tpbmcgc3RvcmUgb3Ig Y2hhbmdlIHRoZSBjb21wb3NpdGluZyBtb2RlLgorICAgICAgICAvLyBEaXNwYXRjaGluZyBEaWRV cGRhdGVTdGF0ZSBjb3VsZCBkZXN0cm95IG91ciBiYWNraW5nIHN0b3JlIG9yIGNoYW5nZSB0aGUg Y29tcG9zaXRpbmcgbW9kZS4KICAgICAgICAgaWYgKCFtX2JhY2tpbmdTdG9yZSB8fCBpc0luQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC0xMDgsNyArMTA4LDcgQEAgYm9vbCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6cGFpbnQoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYsIFBsYXRmb3JtRHJhd2luZ0NvbnRleHQKIAogdm9pZCBEcmF3aW5n QXJlYVByb3h5SW1wbDo6c2l6ZURpZENoYW5nZSgpCiB7Ci0gICAgc2VuZFNldFNpemUoKTsKKyAg ICBzZW5kVXBkYXRlU3RhdGUoKTsKIH0KIAogdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6dmlz aWJpbGl0eURpZENoYW5nZSgpCkBAIC0xMzcsOSArMTM3LDkgQEAgdm9pZCBEcmF3aW5nQXJlYVBy b3h5SW1wbDo6ZGV0YWNoQ29tcG9zaXRpbmdDb250ZXh0KCkKICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKIH0KIAotdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6dXBkYXRlKHVpbnQ2NF90IHNl cXVlbmNlTnVtYmVyLCBjb25zdCBVcGRhdGVJbmZvJiB1cGRhdGVJbmZvKQordm9pZCBEcmF3aW5n QXJlYVByb3h5SW1wbDo6dXBkYXRlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IFVwZGF0ZUluZm8m IHVwZGF0ZUluZm8pCiB7Ci0gICAgaWYgKHNlcXVlbmNlTnVtYmVyIDwgbV9sYXN0RGlkU2V0U2l6 ZVNlcXVlbmNlTnVtYmVyKQorICAgIGlmIChzdGF0ZUlEIDwgbV9jdXJyZW50U3RhdGVJRCkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgLy8gRklYTUU6IEhhbmRsZSB0aGUgY2FzZSB3aGVyZSB0aGUg dmlldyBpcyBoaWRkZW4uCkBAIC0xNDgsMTYgKzE0OCwxNiBAQCB2b2lkIERyYXdpbmdBcmVhUHJv eHlJbXBsOjp1cGRhdGUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIsIGNvbnN0IFVwZGF0ZUluZm8m IHVwZAogICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OkRyYXdp bmdBcmVhOjpEaWRVcGRhdGUoKSwgbV93ZWJQYWdlUHJveHktPnBhZ2VJRCgpKTsKIH0KIAotdm9p ZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZGlkU2V0U2l6ZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJl ciwgY29uc3QgVXBkYXRlSW5mbyYgdXBkYXRlSW5mbywgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYg bGF5ZXJUcmVlQ29udGV4dCkKK3ZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmRpZFVwZGF0ZVN0 YXRlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IFVwZGF0ZUluZm8mIHVwZGF0ZUluZm8sIGNvbnN0 IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNvbnRleHQpCiB7Ci0gICAgQVNTRVJUKHNlcXVl bmNlTnVtYmVyID4gbV9sYXN0RGlkU2V0U2l6ZVNlcXVlbmNlTnVtYmVyKTsKLSAgICBtX2xhc3RE aWRTZXRTaXplU2VxdWVuY2VOdW1iZXIgPSBzZXF1ZW5jZU51bWJlcjsKKyAgICBBU1NFUlQoc3Rh dGVJRCA+IG1fY3VycmVudFN0YXRlSUQpOworICAgIG1fY3VycmVudFN0YXRlSUQgPSBzdGF0ZUlE OwogCi0gICAgQVNTRVJUKG1faXNXYWl0aW5nRm9yRGlkU2V0U2l6ZSk7Ci0gICAgbV9pc1dhaXRp bmdGb3JEaWRTZXRTaXplID0gZmFsc2U7CisgICAgQVNTRVJUKG1faXNXYWl0aW5nRm9yRGlkVXBk YXRlU3RhdGUpOworICAgIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlU3RhdGUgPSBmYWxzZTsKIAog ICAgIGlmIChtX3NpemUgIT0gdXBkYXRlSW5mby52aWV3U2l6ZSkKLSAgICAgICAgc2VuZFNldFNp emUoKTsKKyAgICAgICAgc2VuZFVwZGF0ZVN0YXRlKCk7CiAKICAgICBpZiAobGF5ZXJUcmVlQ29u dGV4dCAhPSBtX2xheWVyVHJlZUNvbnRleHQpIHsKICAgICAgICAgaWYgKCFtX2xheWVyVHJlZUNv bnRleHQuaXNFbXB0eSgpKSB7CkBAIC0xODAsMTcgKzE4MCwxNyBAQCB2b2lkIERyYXdpbmdBcmVh UHJveHlJbXBsOjpkaWRTZXRTaXplKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBVcGRh dGVJbmZvJgogICAgIGluY29ycG9yYXRlVXBkYXRlKHVwZGF0ZUluZm8pOwogfQogCi12b2lkIERy YXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVpbnQ2 NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXllclRyZWVDb250 ZXh0KQordm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSh1aW50NjRfdCBzdGF0ZUlELCBjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXllclRy ZWVDb250ZXh0KQogewotICAgIGlmIChzZXF1ZW5jZU51bWJlciA8IG1fbGFzdERpZFNldFNpemVT ZXF1ZW5jZU51bWJlcikKKyAgICBpZiAoc3RhdGVJRCA8IG1fY3VycmVudFN0YXRlSUQpCiAgICAg ICAgIHJldHVybjsKIAogICAgIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobGF5ZXJU cmVlQ29udGV4dCk7CiB9CiAKLXZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzZXF1ZW5jZU51bWJlciwgY29uc3QgVXBkYXRl SW5mbyYgdXBkYXRlSW5mbykKK3ZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OmV4aXRBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSh1aW50NjRfdCBzdGF0ZUlELCBjb25zdCBVcGRhdGVJbmZvJiB1 cGRhdGVJbmZvKQogewotICAgIGlmIChzZXF1ZW5jZU51bWJlciA8IG1fbGFzdERpZFNldFNpemVT ZXF1ZW5jZU51bWJlcikKKyAgICBpZiAoc3RhdGVJRCA8IG1fY3VycmVudFN0YXRlSUQpCiAgICAg ICAgIHJldHVybjsKIAogICAgIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwpAQCAt MjI1LDQyICsyMjUsNDIgQEAgdm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6aW5jb3Jwb3JhdGVV cGRhdGUoY29uc3QgVXBkYXRlSW5mbyYgdXBkYXRlSW5mbykKICAgICAgICAgbV93ZWJQYWdlUHJv eHktPmRpc3BsYXlWaWV3KCk7CiB9CiAKLXZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNlbmRT ZXRTaXplKCkKK3ZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnNlbmRVcGRhdGVTdGF0ZSgpCiB7 CiAgICAgaWYgKCFtX3dlYlBhZ2VQcm94eS0+aXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAobV9pc1dhaXRpbmdGb3JEaWRTZXRTaXplKQorICAgIGlmIChtX2lzV2FpdGluZ0Zv ckRpZFVwZGF0ZVN0YXRlKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2lzV2FpdGluZ0ZvckRp ZFNldFNpemUgPSB0cnVlOwotICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCktPnNlbmQoTWVz c2FnZXM6OkRyYXdpbmdBcmVhOjpTZXRTaXplKGdlbmVyYXRlU2VxdWVuY2VOdW1iZXIoKSwgbV9z aXplLCBtX3Njcm9sbE9mZnNldCksIG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSk7CisgICAgbV9p c1dhaXRpbmdGb3JEaWRVcGRhdGVTdGF0ZSA9IHRydWU7CisgICAgbV93ZWJQYWdlUHJveHktPnBy b2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlVwZGF0ZVN0YXRlKGdlbmVyYXRl U3RhdGVJRCgpLCBtX3NpemUsIG1fc2Nyb2xsT2Zmc2V0KSwgbV93ZWJQYWdlUHJveHktPnBhZ2VJ RCgpKTsKICAgICBtX3Njcm9sbE9mZnNldCA9IEludFNpemUoKTsKIAogICAgIGlmICghbV9sYXll clRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewotICAgICAgICAvLyBXYWl0IGZvciB0aGUgRGlkU2V0 U2l6ZSBtZXNzYWdlLiBOb3JtYWxseSB3ZSBkb24gdGhpcyBpbiBEcmF3aW5nQXJlYVByb3h5SW1w bDo6cGFpbnQsIGJ1dCB0aGF0CisgICAgICAgIC8vIFdhaXQgZm9yIHRoZSBEaWRVcGRhdGVTdGF0 ZSBtZXNzYWdlLiBOb3JtYWxseSB3ZSBkb24gdGhpcyBpbiBEcmF3aW5nQXJlYVByb3h5SW1wbDo6 cGFpbnQsIGJ1dCB0aGF0CiAgICAgICAgIC8vIGZ1bmN0aW9uIGlzIG5ldmVyIGNhbGxlZCB3aGVu IGluIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUuCi0gICAgICAgIHdhaXRGb3JBbmREaXNw YXRjaERpZFNldFNpemUoKTsKKyAgICAgICAgd2FpdEZvckFuZERpc3BhdGNoRGlkVXBkYXRlU3Rh dGUoKTsKICAgICB9CiB9CiAKLXZvaWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OndhaXRGb3JBbmRE aXNwYXRjaERpZFNldFNpemUoKQordm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6d2FpdEZvckFu ZERpc3BhdGNoRGlkVXBkYXRlU3RhdGUoKQogewotICAgIEFTU0VSVChtX2lzV2FpdGluZ0ZvckRp ZFNldFNpemUpOworICAgIEFTU0VSVChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZVN0YXRlKTsKIAog ICAgIGlmICghbV93ZWJQYWdlUHJveHktPmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogICAg IGlmIChtX3dlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5pc0xhdW5jaGluZygpKQogICAgICAgICBy ZXR1cm47CiAgICAgCi0gICAgLy8gRklYTUU6IHdhaXRGb3JBbmREaXNwYXRjaEltbWVkaWF0ZWx5 IHdpbGwgYWx3YXlzIHJldHVybiB0aGUgb2xkZXN0IERpZFNldFNpemUgbWVzc2FnZSB0aGF0Ci0g ICAgLy8gaGFzbid0IHlldCBiZWVuIHByb2Nlc3NlZC4gQnV0IGl0IG1pZ2h0IGJlIGJldHRlciB0 byBza2lwIGFoZWFkIHRvIHNvbWUgb3RoZXIgRGlkU2V0U2l6ZQotICAgIC8vIG1lc3NhZ2UsIGlm IG11bHRpcGxlIERpZFNldFNpemUgbWVzc2FnZXMgYXJlIHdhaXRpbmcgdG8gYmUgcHJvY2Vzc2Vk LiBGb3IgaW5zdGFuY2UsIHdlIGNvdWxkCisgICAgLy8gRklYTUU6IHdhaXRGb3JBbmREaXNwYXRj aEltbWVkaWF0ZWx5IHdpbGwgYWx3YXlzIHJldHVybiB0aGUgb2xkZXN0IERpZFVwZGF0ZVN0YXRl IG1lc3NhZ2UgdGhhdAorICAgIC8vIGhhc24ndCB5ZXQgYmVlbiBwcm9jZXNzZWQuIEJ1dCBpdCBt aWdodCBiZSBiZXR0ZXIgdG8gc2tpcCBhaGVhZCB0byBzb21lIG90aGVyIERpZFVwZGF0ZVN0YXRl CisgICAgLy8gbWVzc2FnZSwgaWYgbXVsdGlwbGUgRGlkVXBkYXRlU3RhdGUgbWVzc2FnZXMgYXJl IHdhaXRpbmcgdG8gYmUgcHJvY2Vzc2VkLiBGb3IgaW5zdGFuY2UsIHdlIGNvdWxkCiAgICAgLy8g Y2hvb3NlIHRoZSBtb3N0IHJlY2VudCBvbmUsIG9yIHRoZSBvbmUgdGhhdCBpcyBjbG9zZXN0IHRv IG91ciBjdXJyZW50IHNpemUuCiAKLSAgICAvLyBUaGUgdGltZW91dCwgaW4gc2Vjb25kcywgd2Ug dXNlIHdoZW4gd2FpdGluZyBmb3IgYSBEaWRTZXRTaXplIG1lc3NhZ2Ugd2hlbiB3ZSdyZSBhc2tl ZCB0byBwYWludC4KLSAgICBzdGF0aWMgY29uc3QgZG91YmxlIGRpZFNldFNpemVUaW1lb3V0ID0g MC41OwotICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCktPmNvbm5lY3Rpb24oKS0+d2FpdEZv ckFuZERpc3BhdGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkRpZFNl dFNpemU+KG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSwgZGlkU2V0U2l6ZVRpbWVvdXQpOworICAg IC8vIFRoZSB0aW1lb3V0LCBpbiBzZWNvbmRzLCB3ZSB1c2Ugd2hlbiB3YWl0aW5nIGZvciBhIERp ZFVwZGF0ZVN0YXRlIG1lc3NhZ2Ugd2hlbiB3ZSdyZSBhc2tlZCB0byBwYWludC4KKyAgICBzdGF0 aWMgY29uc3QgZG91YmxlIGRpZFVwZGF0ZVN0YXRlVGltZW91dCA9IDAuNTsKKyAgICBtX3dlYlBh Z2VQcm94eS0+cHJvY2VzcygpLT5jb25uZWN0aW9uKCktPndhaXRGb3JBbmREaXNwYXRjaEltbWVk aWF0ZWx5PE1lc3NhZ2VzOjpEcmF3aW5nQXJlYVByb3h5OjpEaWRVcGRhdGVTdGF0ZT4obV93ZWJQ YWdlUHJveHktPnBhZ2VJRCgpLCBkaWRVcGRhdGVTdGF0ZVRpbWVvdXQpOwogfQogCiB2b2lkIERy YXdpbmdBcmVhUHJveHlJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0 IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNvbnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCmluZGV4IGY3NzZiMDk5N2I3NWIxZGZh ZjhmYjYwMTJjODFmNmY4NGM4ZGEzZDguLjBmNjRmY2FhMjRjNzVmYTcyZWYyMjAwODdhMDMzNDA3 NTZmOTU3ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5SW1wbC5oCkBAIC01NSwxNCArNTUsMTQgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg ZGV0YWNoQ29tcG9zaXRpbmdDb250ZXh0KCk7CiAKICAgICAvLyBDb3JlSVBDIG1lc3NhZ2UgaGFu ZGxlcnMKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBj b25zdCBVcGRhdGVJbmZvJik7Ci0gICAgdmlydHVhbCB2b2lkIGRpZFNldFNpemUodWludDY0X3Qg c2VxdWVuY2VOdW1iZXIsIGNvbnN0IFVwZGF0ZUluZm8mLCBjb25zdCBMYXllclRyZWVDb250ZXh0 Jik7Ci0gICAgdmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUodWlu dDY0X3Qgc2VxdWVuY2VOdW1iZXIsIGNvbnN0IExheWVyVHJlZUNvbnRleHQmKTsKLSAgICB2aXJ0 dWFsIHZvaWQgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKHVpbnQ2NF90IHNlcXVlbmNl TnVtYmVyLCBjb25zdCBVcGRhdGVJbmZvJik7CisgICAgdmlydHVhbCB2b2lkIHVwZGF0ZSh1aW50 NjRfdCBzdGF0ZUlELCBjb25zdCBVcGRhdGVJbmZvJik7CisgICAgdmlydHVhbCB2b2lkIGRpZFVw ZGF0ZVN0YXRlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IFVwZGF0ZUluZm8mLCBjb25zdCBMYXll clRyZWVDb250ZXh0Jik7CisgICAgdmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21wb3Np dGluZ01vZGUodWludDY0X3Qgc3RhdGVJRCwgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpOworICAg IHZpcnR1YWwgdm9pZCBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUodWludDY0X3Qgc3Rh dGVJRCwgY29uc3QgVXBkYXRlSW5mbyYpOwogCiAgICAgdm9pZCBpbmNvcnBvcmF0ZVVwZGF0ZShj b25zdCBVcGRhdGVJbmZvJik7Ci0gICAgdm9pZCBzZW5kU2V0U2l6ZSgpOwotICAgIHZvaWQgd2Fp dEZvckFuZERpc3BhdGNoRGlkU2V0U2l6ZSgpOworICAgIHZvaWQgc2VuZFVwZGF0ZVN0YXRlKCk7 CisgICAgdm9pZCB3YWl0Rm9yQW5kRGlzcGF0Y2hEaWRVcGRhdGVTdGF0ZSgpOwogCiAgICAgdm9p ZCBlbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQm KTsKICAgICB2b2lkIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpOwpAQCAtNzIsMTIg KzcyLDE0IEBAIHByaXZhdGU6CiAgICAgLy8gVGhlIGN1cnJlbnQgbGF5ZXIgdHJlZSBjb250ZXh0 LgogICAgIExheWVyVHJlZUNvbnRleHQgbV9sYXllclRyZWVDb250ZXh0OwogICAgIAotICAgIC8v IFdoZXRoZXIgd2UndmUgc2VudCBhIFNldFNpemUgbWVzc2FnZSBhbmQgYXJlIG5vdyB3YWl0aW5n IGZvciBhIERpZFNldFNpemUgbWVzc2FnZS4KLSAgICAvLyBVc2VkIHRvIHRocm90dGxlIFNldFNp emUgbWVzc2FnZXMgc28gd2UgZG9uJ3Qgc2VuZCB0aGVtIGZhc3RlciB0aGFuIHRoZSBXZWIgcHJv Y2VzcyBjYW4gaGFuZGxlLgotICAgIGJvb2wgbV9pc1dhaXRpbmdGb3JEaWRTZXRTaXplOwotCi0g ICAgLy8gVGhlIHNlcXVlbmNlIG51bWJlciBvZiB0aGUgbGFzdCBEaWRTZXRTaXplIG1lc3NhZ2UK LSAgICB1aW50NjRfdCBtX2xhc3REaWRTZXRTaXplU2VxdWVuY2VOdW1iZXI7CisgICAgLy8gV2hl dGhlciB3ZSd2ZSBzZW50IGEgVXBkYXRlU3RhdGUgbWVzc2FnZSBhbmQgYXJlIG5vdyB3YWl0aW5n IGZvciBhIERpZFVwZGF0ZVN0YXRlIG1lc3NhZ2UuCisgICAgLy8gVXNlZCB0byB0aHJvdHRsZSBV cGRhdGVTdGF0ZSBtZXNzYWdlcyBzbyB3ZSBkb24ndCBzZW5kIHRoZW0gZmFzdGVyIHRoYW4gdGhl IFdlYiBwcm9jZXNzIGNhbiBoYW5kbGUuCisgICAgYm9vbCBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0 ZVN0YXRlOworCisgICAgLy8gVGhlIHN0YXRlIElEIGNvcnJlc3BvbmRpbmcgdG8gb3VyIGN1cnJl bnQgYmFja2luZyBzdG9yZS4gVXBkYXRlZCB3aGVuZXZlciB3ZSBhbGxvY2F0ZQorICAgIC8vIGEg bmV3IGJhY2tpbmcgc3RvcmUuIEFueSBtZXNzYWdlcyByZWNlaXZlZCB0aGF0IGNvcnJlc3BvbmQg dG8gYW4gZWFybGllciBzdGF0ZSBhcmUgaWdub3JlZCwKKyAgICAvLyBhcyB0aGV5IGRvbid0IGFw cGx5IHRvIG91ciBjdXJyZW50IGJhY2tpbmcgc3RvcmUuCisgICAgdWludDY0X3QgbV9jdXJyZW50 U3RhdGVJRDsKIAogICAgIE93blB0cjxCYWNraW5nU3RvcmU+IG1fYmFja2luZ1N0b3JlOwogfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJl YS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKaW5k ZXggNjg2NzI1ZTEyZmI4YTkzYjNhNDRhOTE5YjM5M2YwNDVlNjllYzkwYS4uNDRmNzVmN2Y4YmVi MTM1MGJmZTAwNzM3NmM4MDZjNDBhM2IyZGJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTg1LDcgKzg1LDcgQEAgcHJvdGVjdGVk OgogcHJpdmF0ZToKICAgICAvLyBDb3JlSVBDIG1lc3NhZ2UgaGFuZGxlcnMuCiAgICAgLy8gRklY TUU6IFRoZXNlIHNob3VsZCBiZSBwdXJlIHZpcnR1YWwuCi0gICAgdmlydHVhbCB2b2lkIHNldFNp emUodWludDY0X3Qgc2VxdWVuY2VOdW1iZXIsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUs IGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCkgeyB9CisgICAgdmlydHVhbCB2 b2lkIHVwZGF0ZVN0YXRlKHVpbnQ2NF90IHN0YXRlSUQsIGNvbnN0IFdlYkNvcmU6OkludFNpemUm IHNpemUsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCkgeyB9CiAgICAgdmly dHVhbCB2b2lkIGRpZFVwZGF0ZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzdXNwZW5kUGFpbnRp bmcoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVzdW1lUGFpbnRpbmcoKSB7IH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5tZXNz YWdlcy5pbgppbmRleCAyMWQxYmZiNjhkMGM5NTY1NzRlYjc3YWY2NWEyNzMzZjNmZjlhNDZhLi42 ODA0NjA2NWFiOWU5Nzk0ZWQxNWI0YTMxMjE5M2Q4ODYyZDRiMzRlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW4KKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLm1lc3NhZ2Vz LmluCkBAIC0yMSw3ICsyMSw3IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIG1lc3NhZ2VzIC0+IERyYXdp bmdBcmVhIHsKLSAgICBTZXRTaXplKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBXZWJDb3JlOjpJ bnRTaXplIHNpemUsIFdlYkNvcmU6OkludFNpemUgc2Nyb2xsT2Zmc2V0KQorICAgIFVwZGF0ZVN0 YXRlKHVpbnQ2NF90IHN0YXRlSUQsIFdlYkNvcmU6OkludFNpemUgc2l6ZSwgV2ViQ29yZTo6SW50 U2l6ZSBzY3JvbGxPZmZzZXQpCiAgICAgRGlkVXBkYXRlKCkKICAgICBTdXNwZW5kUGFpbnRpbmco KQogICAgIFJlc3VtZVBhaW50aW5nKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5jcHAKaW5kZXggMzM5NzE4OTdjMjliYjIwMzA3 N2QxMDBmNTA1ZDBhYzU2ZDZhZjNlYS4uZWM1ZjJlYzhiMmYwZjM1ODllNWQ5MWZhODllNmQwYTIx M2E1ZTAwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0RyYXdpbmdBcmVhSW1wbC5jcHAKQEAgLTU4LDggKzU4LDggQEAgRHJhd2luZ0FyZWFJbXBsOjp+ RHJhd2luZ0FyZWFJbXBsKCkKIAogRHJhd2luZ0FyZWFJbXBsOjpEcmF3aW5nQXJlYUltcGwoV2Vi UGFnZSogd2ViUGFnZSwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVy cykKICAgICA6IERyYXdpbmdBcmVhKERyYXdpbmdBcmVhSW5mbzo6SW1wbCwgcGFyYW1ldGVycy5k cmF3aW5nQXJlYUluZm8uaWRlbnRpZmllciwgd2ViUGFnZSkKLSAgICAsIG1fc2VxdWVuY2VOdW1i ZXIoMCkKLSAgICAsIG1faW5TZXRTaXplKGZhbHNlKQorICAgICwgbV9zdGF0ZUlEKDApCisgICAg LCBtX2luVXBkYXRlU3RhdGUoZmFsc2UpCiAgICAgLCBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZShm YWxzZSkKICAgICAsIG1faXNQYWludGluZ1N1c3BlbmRlZCghcGFyYW1ldGVycy5pc1Zpc2libGUp CiAgICAgLCBtX2Fsd2F5c1VzZUNvbXBvc2l0aW5nKGZhbHNlKQpAQCAtMTg5LDcgKzE4OSw3IEBA IHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpsYXllckhvc3REaWRGbHVzaExheWVycygpCiAgICAgaWYg KCFtX2xheWVyVHJlZUhvc3QpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fd2ViUGFnZS0+c2Vu ZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5n TW9kZShtX3NlcXVlbmNlTnVtYmVyLCBtX2xheWVyVHJlZUhvc3QtPmxheWVyVHJlZUNvbnRleHQo KSkpOworICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6RW50 ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShtX3N0YXRlSUQsIG1fbGF5ZXJUcmVlSG9zdC0+ bGF5ZXJUcmVlQ29udGV4dCgpKSk7CiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjphdHRhY2hD b21wb3NpdGluZ0NvbnRleHQoKQpAQCAtMjE5LDcgKzIxOSw3IEBAIHZvaWQgRHJhd2luZ0FyZWFJ bXBsOjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFwaGljc0xheWVy KQogICAgICAgICAgICAgICAgIC8vIGNvbXBvc2l0aW5nIGNvZGUgdmlhIGRpc3BsYXkoKSBhbmQg bGF5b3V0LgogICAgICAgICAgICAgICAgIC8vIElmIHdlJ3JlIGxlYXZpbmcgY29tcG9zaXRpbmcg bW9kZSBiZWNhdXNlIG9mIGEgc2V0U2l6ZSwgaXQgaXMgc2FmZSB0bwogICAgICAgICAgICAgICAg IC8vIGV4aXQgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZSByaWdodCBhd2F5LgotICAgICAg ICAgICAgICAgIGlmIChtX2luU2V0U2l6ZSkKKyAgICAgICAgICAgICAgICBpZiAobV9pblVwZGF0 ZVN0YXRlKQogICAgICAgICAgICAgICAgICAgICBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUoKTsKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIGV4aXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZVNvb24oKTsKQEAgLTI0MywxMyArMjQzLDEzIEBAIHZvaWQg RHJhd2luZ0FyZWFJbXBsOjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwg Q29yZUlQQzo6TWVzc2FnZUlECiB7CiB9CiAKLXZvaWQgRHJhd2luZ0FyZWFJbXBsOjpzZXRTaXpl KHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplLCBj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQpCit2b2lkIERyYXdpbmdBcmVhSW1w bDo6dXBkYXRlU3RhdGUodWludDY0X3Qgc3RhdGVJRCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYg c2l6ZSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQogewotICAgIEFTU0VS VCghbV9pblNldFNpemUpOwotICAgIG1faW5TZXRTaXplID0gdHJ1ZTsKKyAgICBBU1NFUlQoIW1f aW5VcGRhdGVTdGF0ZSk7CisgICAgbV9pblVwZGF0ZVN0YXRlID0gdHJ1ZTsKIAotICAgIEFTU0VS VF9BUkcoc2VxdWVuY2VOdW1iZXIsIHNlcXVlbmNlTnVtYmVyID4gbV9zZXF1ZW5jZU51bWJlcik7 Ci0gICAgbV9zZXF1ZW5jZU51bWJlciA9IHNlcXVlbmNlTnVtYmVyOworICAgIEFTU0VSVF9BUkco c3RhdGVJRCwgc3RhdGVJRCA+IG1fc3RhdGVJRCk7CisgICAgbV9zdGF0ZUlEID0gc3RhdGVJRDsK IAogICAgIC8vIFNldCB0aGlzIHRvIGZhbHNlIHNpbmNlIHdlJ3JlIGFib3V0IHRvIGNhbGwgZGlz cGxheSgpLgogICAgIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlID0gZmFsc2U7CkBAIC0yNzYsOSAr Mjc2LDkgQEAgdm9pZCBEcmF3aW5nQXJlYUltcGw6OnNldFNpemUodWludDY0X3Qgc2VxdWVuY2VO dW1iZXIsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHMKICAgICAgICAgQVNTRVJUKCFtX2xheWVy VHJlZUhvc3QpOwogICAgIH0KIAotICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2lu Z0FyZWFQcm94eTo6RGlkU2V0U2l6ZShtX3NlcXVlbmNlTnVtYmVyLCB1cGRhdGVJbmZvLCBsYXll clRyZWVDb250ZXh0KSk7CisgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJl YVByb3h5OjpEaWRVcGRhdGVTdGF0ZShtX3N0YXRlSUQsIHVwZGF0ZUluZm8sIGxheWVyVHJlZUNv bnRleHQpKTsKIAotICAgIG1faW5TZXRTaXplID0gZmFsc2U7CisgICAgbV9pblVwZGF0ZVN0YXRl ID0gZmFsc2U7CiB9CiAKIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpkaWRVcGRhdGUoKQpAQCAtMzE5 LDcgKzMxOSw3IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjplbnRlckFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5CiAgICAgQVNTRVJUKCFtX2xheWVy VHJlZUhvc3QpOwogCiAgICAgbV9sYXllclRyZWVIb3N0ID0gTGF5ZXJUcmVlSG9zdDo6Y3JlYXRl KG1fd2ViUGFnZSk7Ci0gICAgaWYgKCFtX2luU2V0U2l6ZSkKKyAgICBpZiAoIW1faW5VcGRhdGVT dGF0ZSkKICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRTaG91bGROb3RpZnlBZnRlck5leHRT Y2hlZHVsZWRMYXllckZsdXNoKCk7CiAKICAgICBtX2xheWVyVHJlZUhvc3QtPnNldFJvb3RDb21w b3NpdGluZ0xheWVyKGdyYXBoaWNzTGF5ZXIpOwpAQCAtMzQ0LDcgKzM0NCw3IEBAIHZvaWQgRHJh d2luZ0FyZWFJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKQogICAgIG1fbGF5 ZXJUcmVlSG9zdC0+aW52YWxpZGF0ZSgpOwogICAgIG1fbGF5ZXJUcmVlSG9zdCA9IG51bGxwdHI7 CiAKLSAgICBpZiAobV9pblNldFNpemUpCisgICAgaWYgKG1faW5VcGRhdGVTdGF0ZSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgVXBkYXRlSW5mbyB1cGRhdGVJbmZvOwpAQCAtMzU3LDggKzM1Nyw4 IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUo KQogCiAgICAgLy8gU2VuZCBhbG9uZyBhIGNvbXBsZXRlIHVwZGF0ZSBvZiB0aGUgcGFnZSBzbyB3 ZSBjYW4gcGFpbnQgdGhlIGNvbnRlbnRzIHJpZ2h0IGFmdGVyIHdlIGV4aXQgdGhlCiAgICAgLy8g YWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZSwgZWxpbWluaWF0aW5nIGZsaWNrZXIuCi0gICAg aWYgKCFtX2luU2V0U2l6ZSkKLSAgICAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpEcmF3 aW5nQXJlYVByb3h5OjpFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobV9zZXF1ZW5jZU51 bWJlciwgdXBkYXRlSW5mbykpOworICAgIGlmICghbV9pblVwZGF0ZVN0YXRlKQorICAgICAgICBt X3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OkV4aXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZShtX3N0YXRlSUQsIHVwZGF0ZUluZm8pKTsKIH0KIAogdm9pZCBEcmF3 aW5nQXJlYUltcGw6OmV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZVNvb24oKQpAQCAtNDA2 LDcgKzQwNiw3IEBAIHZvaWQgRHJhd2luZ0FyZWFJbXBsOjpkaXNwbGF5KCkKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWFQ cm94eTo6VXBkYXRlKG1fc2VxdWVuY2VOdW1iZXIsIHVwZGF0ZUluZm8pKTsKKyAgICBtX3dlYlBh Z2UtPnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6OlVwZGF0ZShtX3N0YXRlSUQsIHVw ZGF0ZUluZm8pKTsKICAgICBtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZSA9IHRydWU7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUlt cGwuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwu aAppbmRleCAyNjI1ZDdlMDExMmEzYWUyZjI0ZmFjNGE5M2Y2MjVlODBjOWIyODUyLi43YTBkNTM2 NTUxNWFhMDBkMDE4MTA5NWI5MGQ5MWQ0ZDljYjhlMjE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhSW1wbC5oCkBAIC02Miw3ICs2Miw3 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6 OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rl ciopOwogCiAgICAgLy8gQ29yZUlQQyBtZXNzYWdlIGhhbmRsZXJzLgotICAgIHZpcnR1YWwgdm9p ZCBzZXRTaXplKHVpbnQ2NF90IHNlcXVlbmNlTnVtYmVyLCBjb25zdCBXZWJDb3JlOjpJbnRTaXpl JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KTsKKyAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlU3RhdGUodWludDY0X3Qgc3RhdGVJRCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYs IGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCk7CiAgICAgdmlydHVhbCB2b2lk IGRpZFVwZGF0ZSgpOwogICAgIHZpcnR1YWwgdm9pZCBzdXNwZW5kUGFpbnRpbmcoKTsKICAgICB2 aXJ0dWFsIHZvaWQgcmVzdW1lUGFpbnRpbmcoKTsKQEAgLTc1LDE0ICs3NSwxNCBAQCBwcml2YXRl OgogICAgIHZvaWQgZGlzcGxheSgpOwogICAgIHZvaWQgZGlzcGxheShVcGRhdGVJbmZvJik7CiAK LSAgICB1aW50NjRfdCBtX3NlcXVlbmNlTnVtYmVyOworICAgIHVpbnQ2NF90IG1fc3RhdGVJRDsK IAogICAgIFJlZ2lvbiBtX2RpcnR5UmVnaW9uOwogICAgIFdlYkNvcmU6OkludFJlY3QgbV9zY3Jv bGxSZWN0OwogICAgIFdlYkNvcmU6OkludFNpemUgbV9zY3JvbGxPZmZzZXQ7CiAKICAgICAvLyBX aGV0aGVyIHdlJ3JlIGN1cnJlbnRseSBwcm9jZXNzaW5nIGEgc2V0U2l6ZSBtZXNzYWdlLgotICAg IGJvb2wgbV9pblNldFNpemU7CisgICAgYm9vbCBtX2luVXBkYXRlU3RhdGU7CiAKICAgICAvLyBX aGV0aGVyIHdlJ3JlIHdhaXRpbmcgZm9yIGEgRGlkVXBkYXRlIG1lc3NhZ2UuIFVzZWQgZm9yIHRo cm90dGxpbmcgcGFpbnRzIHNvIHRoYXQgdGhlIAogICAgIC8vIHdlYiBwcm9jZXNzIHdvbid0IHBh aW50IG1vcmUgZnJlcXVlbnQgdGhhbiB0aGUgVUkgcHJvY2VzcyBjYW4gaGFuZGxlLgo=