129897 2014-03-07 12:16:50 -0800 [iOS] Add an updateID to visibleContentRect updates which is passed back in layer transactions, so we know whether transactions are stale 2014-03-07 12:46:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser benjamin simon.fraser thorton oldest_to_newest 988257 0 simon.fraser 2014-03-07 12:16:50 -0800 [iOS] Add an updateID to visibleContentRect updates which is passed back in layer transactions, so we know whether transactions are stale 988258 1 226147 simon.fraser 2014-03-07 12:18:42 -0800 Created attachment 226147 Patch 988259 2 226147 benjamin 2014-03-07 12:22:18 -0800 Comment on attachment 226147 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226147&action=review > Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h:47 > + VisibleContentRectUpdateInfo(const WebCore::FloatRect& exposedRect, const WebCore::FloatRect& unobscuredRect, const WebCore::FloatRect& customFixedPositionRect, double scale, uint64_t updateID, bool inStableState) I would put the update ID first for some reason... > Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h:78 > + // Note: the comparison doesn't include updateID. I agree this is correct but you should probably say why here. 988278 3 simon.fraser 2014-03-07 12:46:50 -0800 https://trac.webkit.org/r165279 226147 2014-03-07 12:18:42 -0800 2014-03-07 12:22:18 -0800 Patch bug-129897-20140307121843.patch text/plain 14186 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGZmYmFiNTgzZjA4ODBh MjFlYjIyZmNhYzEzZjJlZDEwNjk3OGVmZS4uZWI1NDllMjg3YWE5MmFiMmQ5YjNiMmNhOGYwMWIw OGMwZTMzMWQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE0LTAzLTA3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFkZCBh biB1cGRhdGVJRCB0byB2aXNpYmxlQ29udGVudFJlY3QgdXBkYXRlcyB3aGljaCBpcyBwYXNzZWQg YmFjayBpbiBsYXllciB0cmFuc2FjdGlvbnMsIHNvIHdlIGtub3cgd2hldGhlciB0cmFuc2FjdGlv bnMgYXJlIHN0YWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjk4OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAg ICAgCisgICAgICAgIEluIFdlYktpdDIgb24gaU9TIHdlIG5lZWQgdG8ga25vdyB3aGVuIGxheWVy IHVwZGF0ZXMgZnJvbSB0aGUgd2ViIHByb2Nlc3MKKyAgICAgICAgYXJlIHN0YWxlIHdpdGggcmVz cGVjdCB0byB2aXNpYmxlIHJlY3QgdXBkYXRlcyBmcm9tIHRoZSBVSSBwcm9jZXNzLiBEbyBzbwor ICAgICAgICBieSBhZGRpbmcgYW4gdXBkYXRlSUQgdG8gVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRl SW5mbywgYW5kIHN0b3JpbmcgaXQKKyAgICAgICAgb24gZWFjaCBzaWRlLCByZXR1cm5pbmcgaXQg aW4gUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uCisgICAgICAgIAorICAgICAgICBEaWQgc29t ZSByZS1vcmRlcmluZyBvZiBtZW1iZXJzIGFuZCBlbmNvZGluZyBvcmRlciBpbiBSZW1vdGVMYXll clRyZWVUcmFuc2FjdGlvbgorICAgICAgICB0byBncm91cCBsaWtlIGRhdGEgbWVtYmVycyB0b2dl dGhlci4KKyAgICAgICAgCisgICAgICAgICogU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0 ZUluZm8uY3BwOgorICAgICAgICAoV2ViS2l0OjpWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv OjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv OjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv Lmg6CisgICAgICAgIChXZWJLaXQ6OlZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm86OlZpc2li bGVDb250ZW50UmVjdFVwZGF0ZUluZm8pOgorICAgICAgICAoV2ViS2l0OjpWaXNpYmxlQ29udGVu dFJlY3RVcGRhdGVJbmZvOjp1cGRhdGVJRCk6CisgICAgICAgIChXZWJLaXQ6Om9wZXJhdG9yPT0p OgorICAgICAgICAqIFNoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaDoKKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OnNldExhc3RWaXNpYmxl Q29udGVudFJlY3RVcGRhdGVJRCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uOjpsYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQpOgorICAgICAgICAqIFNo YXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW06CisgICAgICAgIChXZWJLaXQ6 OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6ZGVjb2RlKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bmV4dFZpc2li bGVDb250ZW50UmVjdFVwZGF0ZUlEKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojps YXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkaWRVcGRhdGVWaXNp YmxlUmVjdDp1bm9ic2N1cmVkUmVjdDpzY2FsZTppblN0YWJsZVN0YXRlOl0pOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6V2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OndpbGxDb21taXRMYXllclRy ZWUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKToKKwogMjAxNC0wMy0wNiAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgb25lIG1v cmUgc2V0Q3VzdG9tRml4ZWRQb3NpdGlvblJlY3QoKSB0aGF0IEkgbWlzc2VkLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3Bw IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3Bw CmluZGV4IDU2ZTQ3NzZjOWNmM2YxMWJkMTY4MmM2ZTM4ZGE2YjY3ZWMzYzEzNmMuLjNkNThlMTk1 MGQwNzA0YjliYzE4MWQ2YTZkYjZkYmQ4YjIwMjBiMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5jcHAKQEAgLTM2LDYg KzM2LDcgQEAgdm9pZCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvOjplbmNvZGUoSVBDOjpB cmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBtX3Vub2JzY3Vy ZWRSZWN0OwogICAgIGVuY29kZXIgPDwgbV9jdXN0b21GaXhlZFBvc2l0aW9uUmVjdDsKICAgICBl bmNvZGVyIDw8IG1fc2NhbGU7CisgICAgZW5jb2RlciA8PCBtX3VwZGF0ZUlEOwogICAgIGVuY29k ZXIgPDwgbV9pblN0YWJsZVN0YXRlOwogfQogCkBAIC00OSw2ICs1MCw4IEBAIGJvb2wgVmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNv ZGVyLCBWaXNpYmxlCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5tX3NjYWxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzdWx0Lm1fdXBkYXRlSUQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9pblN0YWJsZVN0YXRlKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uaCBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmgKaW5kZXggODcxODUzOGU0YjA4 NjQ0ZTI4M2NjZDEwYjc4ODY2ZjJkNWE1MzhhZi4uNDhkM2JkMzBjNzI1N2JhMjljNDk0ODM2YmU4 NzI4YWE5MTg3OThkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Zpc2libGVD b250ZW50UmVjdFVwZGF0ZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5oCkBAIC0zOSwxNCArMzksMTcgQEAgY2xhc3MgVmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyB7CiBwdWJsaWM6CiAgICAgVmlzaWJsZUNvbnRlbnRSZWN0 VXBkYXRlSW5mbygpCiAgICAgICAgIDogbV9zY2FsZSgtMSkKKyAgICAgICAgLCBtX3VwZGF0ZUlE KDApCisgICAgICAgICwgbV9pblN0YWJsZVN0YXRlKGZhbHNlKQogICAgIHsKICAgICB9CiAKLSAg ICBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYg ZXhwb3NlZFJlY3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZFJlY3QsIGNv bnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgY3VzdG9tRml4ZWRQb3NpdGlvblJlY3QsIGRvdWJsZSBz Y2FsZSwgYm9vbCBpblN0YWJsZVN0YXRlKQorICAgIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUlu Zm8oY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBleHBvc2VkUmVjdCwgY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiB1bm9ic2N1cmVkUmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBjdXN0 b21GaXhlZFBvc2l0aW9uUmVjdCwgZG91YmxlIHNjYWxlLCB1aW50NjRfdCB1cGRhdGVJRCwgYm9v bCBpblN0YWJsZVN0YXRlKQogICAgICAgICA6IG1fZXhwb3NlZFJlY3QoZXhwb3NlZFJlY3QpCiAg ICAgICAgICwgbV91bm9ic2N1cmVkUmVjdCh1bm9ic2N1cmVkUmVjdCkKICAgICAgICAgLCBtX2N1 c3RvbUZpeGVkUG9zaXRpb25SZWN0KGN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KQogICAgICAgICAs IG1fc2NhbGUoc2NhbGUpCisgICAgICAgICwgbV91cGRhdGVJRCh1cGRhdGVJRCkKICAgICAgICAg LCBtX2luU3RhYmxlU3RhdGUoaW5TdGFibGVTdGF0ZSkKICAgICB7CiAgICAgfQpAQCAtNTUsNiAr NTgsNyBAQCBwdWJsaWM6CiAgICAgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB1bm9ic2N1cmVk UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fdW5vYnNjdXJlZFJlY3Q7IH0KICAgICBjb25zdCBXZWJD b3JlOjpGbG9hdFJlY3QmIGN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KCkgY29uc3QgeyByZXR1cm4g bV9jdXN0b21GaXhlZFBvc2l0aW9uUmVjdDsgfQogICAgIGRvdWJsZSBzY2FsZSgpIGNvbnN0IHsg cmV0dXJuIG1fc2NhbGU7IH0KKyAgICB1aW50NjRfdCB1cGRhdGVJRCgpIGNvbnN0IHsgcmV0dXJu IG1fdXBkYXRlSUQ7IH0KICAgICBib29sIGluU3RhYmxlU3RhdGUoKSBjb25zdCB7IHJldHVybiBt X2luU3RhYmxlU3RhdGU7IH0KIAogICAgIHZvaWQgZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVy JikgY29uc3Q7CkBAIC02NSwxMSArNjksMTMgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpGbG9h dFJlY3QgbV91bm9ic2N1cmVkUmVjdDsKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9jdXN0b21G aXhlZFBvc2l0aW9uUmVjdDsKICAgICBkb3VibGUgbV9zY2FsZTsKKyAgICB1aW50NjRfdCBtX3Vw ZGF0ZUlEOwogICAgIGJvb2wgbV9pblN0YWJsZVN0YXRlOwogfTsKIAogaW5saW5lIGJvb2wgb3Bl cmF0b3I9PShjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvJiBhLCBjb25zdCBWaXNp YmxlQ29udGVudFJlY3RVcGRhdGVJbmZvJiBiKQogeworICAgIC8vIE5vdGU6IHRoZSBjb21wYXJp c29uIGRvZXNuJ3QgaW5jbHVkZSB1cGRhdGVJRC4KICAgICByZXR1cm4gYS5zY2FsZSgpID09IGIu c2NhbGUoKQogICAgICAgICAmJiBhLmV4cG9zZWRSZWN0KCkgPT0gYi5leHBvc2VkUmVjdCgpCiAg ICAgICAgICYmIGEudW5vYnNjdXJlZFJlY3QoKSA9PSBiLnVub2JzY3VyZWRSZWN0KCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b24uaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rp b24uaAppbmRleCAxNmQ1ZjUzZGM2OTEyY2E2NDU0ZTI1ODYzYmY5MDYzZjU3YzliOWZhLi45NTVm MDdlZDZmNzA1YzkyNGU0M2I5NDU1NWIxYmYyNjZhMzVmN2M0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgKKysrIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5oCkBAIC0x NjQsNiArMTY0LDkgQEAgcHVibGljOgogCiAgICAgZG91YmxlIHBhZ2VTY2FsZUZhY3RvcigpIGNv bnN0IHsgcmV0dXJuIG1fcGFnZVNjYWxlRmFjdG9yOyB9CiAgICAgdm9pZCBzZXRQYWdlU2NhbGVG YWN0b3IoZG91YmxlIHBhZ2VTY2FsZUZhY3RvcikgeyBtX3BhZ2VTY2FsZUZhY3RvciA9IHBhZ2VT Y2FsZUZhY3RvcjsgfQorICAgIAorICAgIHZvaWQgc2V0TGFzdFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZUlEKHVpbnQ2NF90IGxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJRCkgeyBtX2xhc3RW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJRCA9IGxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJ RDsgfQorICAgIHVpbnQ2NF90IGxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJRCgpIGNvbnN0 IHsgcmV0dXJuIG1fbGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUlEOyB9CiAKICAgICBib29s IHNjYWxlV2FzU2V0QnlVSVByb2Nlc3MoKSBjb25zdCB7IHJldHVybiBtX3NjYWxlV2FzU2V0QnlV SVByb2Nlc3M7IH0KICAgICB2b2lkIHNldFNjYWxlV2FzU2V0QnlVSVByb2Nlc3MoYm9vbCBzY2Fs ZVdhc1NldEJ5VUlQcm9jZXNzKSB7IG1fc2NhbGVXYXNTZXRCeVVJUHJvY2VzcyA9IHNjYWxlV2Fz U2V0QnlVSVByb2Nlc3M7IH0KQEAgLTE4OCwxNCArMTkxLDE2IEBAIHByaXZhdGU6CiAgICAgTGF5 ZXJQcm9wZXJ0aWVzTWFwIG1fY2hhbmdlZExheWVyUHJvcGVydGllczsKICAgICBWZWN0b3I8TGF5 ZXJDcmVhdGlvblByb3BlcnRpZXM+IG1fY3JlYXRlZExheWVyczsKICAgICBWZWN0b3I8V2ViQ29y ZTo6R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEPiBtX2Rlc3Ryb3llZExheWVySURzOwor ICAgIFZlY3RvcjxXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQ+IG1fdmlk ZW9MYXllcklEc1BlbmRpbmdGdWxsc2NyZWVuOworCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtX2Nv bnRlbnRzU2l6ZTsKICAgICBkb3VibGUgbV9wYWdlU2NhbGVGYWN0b3I7Ci0gICAgYm9vbCBtX3Nj YWxlV2FzU2V0QnlVSVByb2Nlc3M7Ci0gICAgdWludDY0X3QgbV9yZW5kZXJUcmVlU2l6ZTsKICAg ICBkb3VibGUgbV9taW5pbXVtU2NhbGVGYWN0b3I7CiAgICAgZG91YmxlIG1fbWF4aW11bVNjYWxl RmFjdG9yOworICAgIHVpbnQ2NF90IG1fbGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUlEOwor ICAgIHVpbnQ2NF90IG1fcmVuZGVyVHJlZVNpemU7CisgICAgYm9vbCBtX3NjYWxlV2FzU2V0QnlV SVByb2Nlc3M7CiAgICAgYm9vbCBtX2FsbG93c1VzZXJTY2FsaW5nOwotICAgIFZlY3RvcjxXZWJD b3JlOjpHcmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQ+IG1fdmlkZW9MYXllcklEc1BlbmRp bmdGdWxsc2NyZWVuOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQpp bmRleCBkZWViZDIyMzE4ZDg1ZTU0ZWU1ZWU2MTUzYzBhYzdiMmVlMTk3YzAyLi4xNjU2YzhhNzM1 NDI2M2NkNzMzNzZlOGIxODBiYWQ4MDRiZTRiZjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0KQEAgLTQxMSwx NCArNDExLDE4IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmVuY29kZShJUEM6 OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICB9CiAgICAgCiAgICAgZW5jb2Rl ciA8PCBtX2Rlc3Ryb3llZExheWVySURzOworICAgIGVuY29kZXIgPDwgbV92aWRlb0xheWVySURz UGVuZGluZ0Z1bGxzY3JlZW47CisKICAgICBlbmNvZGVyIDw8IG1fY29udGVudHNTaXplOwogICAg IGVuY29kZXIgPDwgbV9wYWdlU2NhbGVGYWN0b3I7Ci0gICAgZW5jb2RlciA8PCBtX3NjYWxlV2Fz U2V0QnlVSVByb2Nlc3M7CiAgICAgZW5jb2RlciA8PCBtX21pbmltdW1TY2FsZUZhY3RvcjsKICAg ICBlbmNvZGVyIDw8IG1fbWF4aW11bVNjYWxlRmFjdG9yOwotICAgIGVuY29kZXIgPDwgbV9hbGxv d3NVc2VyU2NhbGluZzsKKworICAgIGVuY29kZXIgPDwgbV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0 VXBkYXRlSUQ7CiAgICAgZW5jb2RlciA8PCBtX3JlbmRlclRyZWVTaXplOwotICAgIGVuY29kZXIg PDwgbV92aWRlb0xheWVySURzUGVuZGluZ0Z1bGxzY3JlZW47CisKKyAgICBlbmNvZGVyIDw8IG1f c2NhbGVXYXNTZXRCeVVJUHJvY2VzczsKKyAgICBlbmNvZGVyIDw8IG1fYWxsb3dzVXNlclNjYWxp bmc7CiB9CiAKIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmRlY29kZShJUEM6OkFy Z3VtZW50RGVjb2RlciYgZGVjb2RlciwgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mIHJlc3Vs dCkKQEAgLTQ1NSwxMyArNDU5LDEzIEBAIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgUmVtb3RlTGF5CiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1 bHQubV9jb250ZW50c1NpemUpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fdmlk ZW9MYXllcklEc1BlbmRpbmdGdWxsc2NyZWVuKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9wYWdlU2NhbGVGYWN0b3IpKQorICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fY29udGVudHNTaXplKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zY2FsZVdhc1NldEJ5 VUlQcm9jZXNzKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3BhZ2VTY2FsZUZh Y3RvcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cmVzdWx0Lm1fbWluaW11bVNjYWxlRmFjdG9yKSkKQEAgLTQ3MCwxMyArNDc0LDE2IEBAIGJvb2wg UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYg ZGVjb2RlciwgUmVtb3RlTGF5CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9tYXhp bXVtU2NhbGVGYWN0b3IpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHJlc3VsdC5tX2FsbG93c1VzZXJTY2FsaW5nKSkKKyAgICBpZiAoIWRlY29kZXIu ZGVjb2RlKHJlc3VsdC5tX2xhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJRCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAKKwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1f cmVuZGVyVHJlZVNpemUpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCi0gICAgaWYgKCFk ZWNvZGVyLmRlY29kZShyZXN1bHQubV92aWRlb0xheWVySURzUGVuZGluZ0Z1bGxzY3JlZW4pKQor CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zY2FsZVdhc1NldEJ5VUlQcm9jZXNz KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1 bHQubV9hbGxvd3NVc2VyU2NhbGluZykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJl dHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDg4 YzYxOWI2ZGRkY2RiM2M4MzdlODM4ZmM1YzI0ODQzNTJhMWRmNGMuLmEyYWU4NGE2ZGYwMTFhMmU4 YjllN2FlMTgyMzlkMmVlNDUwMTU0ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKQEAgLTQ1OSw2ICs0NTksOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiB1bm9ic2N1cmVkQ29udGVudFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2xhc3RW aXNpYmxlQ29udGVudFJlY3RVcGRhdGUudW5vYnNjdXJlZFJlY3QoKTsgfQogCiAgICAgYm9vbCB1 cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUlu Zm8mKTsKKyAgICB1aW50NjRfdCBuZXh0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQoKSBjb25z dCB7IHJldHVybiBtX2xhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUudXBkYXRlSUQoKSArIDE7 IH0KKyAgICB1aW50NjRfdCBsYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQoKSBjb25zdCB7 IHJldHVybiBtX2xhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUudXBkYXRlSUQoKTsgfQorICAg IAogICAgIHZvaWQgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUoY29u c3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogICAgIHZvaWQgZGlkQ29tbWl0TGF5ZXJUcmVlKGNvbnN0 IFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCmluZGV4IDg4OWQzYjdjMGZkNjhiNDdm NjM5MmU2NGZiZDZhNzBjMjZjZTk5ODEuLmRjN2ExZWE0ZDkwMjYzZjJjODZkNjQ4YTE3MzU0ZGU2 ZWFmMzc1MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0KQEAgLTE3Myw3ICsxNzMsNyBAQCAtICh2b2lkKWRpZFVwZGF0ZVZpc2libGVSZWN0OihD R1JlY3QpdmlzaWJsZVJlY3QgdW5vYnNjdXJlZFJlY3Q6KENHUmVjdCl1bm9ic2N1cgogICAgIH0K IAogICAgIEZsb2F0UmVjdCBmaXhlZFBvc1JlY3QgPSBbc2VsZiBmaXhlZFBvc2l0aW9uUmVjdEZy b21FeHBvc2VkUmVjdDp1bm9ic2N1cmVkUmVjdCBzY2FsZTpzY2FsZV07Ci0gICAgX3BhZ2UtPnVw ZGF0ZVZpc2libGVDb250ZW50UmVjdHMoVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyh2aXNp YmxlUmVjdCwgdW5vYnNjdXJlZFJlY3QsIGZpeGVkUG9zUmVjdCwgc2NhbGUsIGlzU3RhYmxlU3Rh dGUpKTsKKyAgICBfcGFnZS0+dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyhWaXNpYmxlQ29udGVu dFJlY3RVcGRhdGVJbmZvKHZpc2libGVSZWN0LCB1bm9ic2N1cmVkUmVjdCwgZml4ZWRQb3NSZWN0 LCBzY2FsZSwgX3BhZ2UtPm5leHRWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJRCgpLCBpc1N0YWJs ZVN0YXRlKSk7CiAKICAgICBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5KiBzY3JvbGxp bmdDb29yZGluYXRvciA9IF9wYWdlLT5zY3JvbGxpbmdDb29yZGluYXRvclByb3h5KCk7CiAgICAg c2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNjcm9sbFBvc2l0aW9uQ2hhbmdlZFZpYURlbGVnYXRlZFNj cm9sbGluZyhzY3JvbGxpbmdDb29yZGluYXRvci0+cm9vdFNjcm9sbGluZ05vZGVJRCgpLCB1bm9i c2N1cmVkUmVjdC5vcmlnaW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCmluZGV4IDhjMTE2MGIxMjNhOTU2ZGNkMmUxYWY2Mjg2YWQ3MjhlMzFhMzgz ZDYuLjg1MjFmOWVhMGZlNTExYWE5Y2RiODNiNTMyNjQ1NTQ5OWIzNDk5NDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI4Myw2ICsyODMs NyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICNlbmRpZgogI2lmIFBMQVRGT1JNKElPUykKICAg ICAsIG1fc2hvdWxkUmV0dXJuV29yZEF0U2VsZWN0aW9uKGZhbHNlKQorICAgICwgbV9sYXN0Vmlz aWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQoMCkKICAgICAsIG1fc2NhbGVXYXNTZXRCeVVJUHJvY2Vz cyhmYWxzZSkKICAgICAsIG1fdXNlckhhc0NoYW5nZWRQYWdlU2NhbGVGYWN0b3IoZmFsc2UpCiAj ZW5kaWYKQEAgLTI2MzIsNiArMjYzMyw3IEBAIHZvaWQgV2ViUGFnZTo6d2lsbENvbW1pdExheWVy VHJlZShSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYgbGF5ZXJUcmFuc2FjdGlvbikKICAgICBs YXllclRyYW5zYWN0aW9uLnNldFBhZ2VTY2FsZUZhY3Rvcihjb3JlUGFnZSgpLT5wYWdlU2NhbGVG YWN0b3IoKSk7CiAgICAgbGF5ZXJUcmFuc2FjdGlvbi5zZXRSZW5kZXJUcmVlU2l6ZShjb3JlUGFn ZSgpLT5yZW5kZXJUcmVlU2l6ZSgpKTsKICNpZiBQTEFURk9STShJT1MpCisgICAgbGF5ZXJUcmFu c2FjdGlvbi5zZXRMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQobV9sYXN0VmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSUQpOwogICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0U2NhbGVXYXNTZXRC eVVJUHJvY2VzcyhzY2FsZVdhc1NldEJ5VUlQcm9jZXNzKCkpOwogICAgIGxheWVyVHJhbnNhY3Rp b24uc2V0TWluaW11bVNjYWxlRmFjdG9yKG1pbmltdW1QYWdlU2NhbGVGYWN0b3IoKSk7CiAgICAg bGF5ZXJUcmFuc2FjdGlvbi5zZXRNYXhpbXVtU2NhbGVGYWN0b3IobWF4aW11bVBhZ2VTY2FsZUZh Y3RvcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu ZGV4IDMwYmVjYWMyZWU5ZTM4ZDMyMmY1OTVmZTRmZDhhNWU1ZGQwOTc2YzYuLjk3OGJjNGE1YTEx Yzk2NzNlY2I0YjgyOWM2MWJiNjUzNWUxN2M2MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTEwMCw2ICsxMTAwLDcgQEAgcHJpdmF0ZToKICAg ICBib29sIG1fc2hvdWxkUmV0dXJuV29yZEF0U2VsZWN0aW9uOwogCiAgICAgV2ViQ29yZTo6Vmll d3BvcnRDb25maWd1cmF0aW9uIG1fdmlld3BvcnRDb25maWd1cmF0aW9uOworICAgIHVpbnQ2NF90 IG1fbGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUlEOwogICAgIGJvb2wgbV9zY2FsZVdhc1Nl dEJ5VUlQcm9jZXNzOwogICAgIGJvb2wgbV91c2VySGFzQ2hhbmdlZFBhZ2VTY2FsZUZhY3RvcjsK ICAgICBXZWJDb3JlOjpJbnRTaXplIG1fYmxvY2tTZWxlY3Rpb25EZXNpcmVkU2l6ZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpp bmRleCA4OTQwMDM4MzJkZDZiNzYwNWVmMDRmNjdlMWMxNGQ0Mzg5OGUwZWE3Li40YzBiNTkwZjhl YzhmZDdiZTA2OGQ1N2Y0Yzg4NGU4ZDU3MTE1MDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0xNzI5LDYgKzE3Mjks OCBAQCB2b2lkIFdlYlBhZ2U6OmFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlKCkKIAogdm9pZCBX ZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVj dFVwZGF0ZUluZm8mIHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8pCiB7CisgICAgbV9sYXN0 VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSUQgPSB2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv LnVwZGF0ZUlEKCk7CisKICAgICBGbG9hdFJlY3QgZXhwb3NlZFJlY3QgPSB2aXNpYmxlQ29udGVu dFJlY3RVcGRhdGVJbmZvLmV4cG9zZWRSZWN0KCk7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0RXhw b3NlZENvbnRlbnRSZWN0KGVuY2xvc2luZ0ludFJlY3QoZXhwb3NlZFJlY3QpKTsKIAo=