107896 2013-01-24 19:16:38 -0800 [wk2] Page overlays should do their own animation, instead of relying on implicit animation 2013-01-24 19:49:02 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca sam simon.fraser oldest_to_newest 816099 0 thorton 2013-01-24 19:16:38 -0800 Right now, with TiledCoreAnimationDrawingArea, we accidentally depend on CA implicit animation to do the fade animation when removing a page overlay; we don't use PageOverlay's fade animation (which should be adjusted to use a CA explicit animation, but that's a bug for another day) on the way out (but we do on the way in!). We should make this consistent and update callers. <rdar://problem/12900058> 816103 1 184641 thorton 2013-01-24 19:32:17 -0800 Created attachment 184641 patch 816112 2 thorton 2013-01-24 19:49:02 -0800 http://trac.webkit.org/changeset/140769 184641 2013-01-24 19:32:17 -0800 2013-01-24 19:45:18 -0800 patch overlay.diff text/plain 9855 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNmM3ZjIxLi5mMDdmN2I0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTMtMDEtMjQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gUGFnZSBvdmVybGF5cyBzaG91bGQgZG8gdGhlaXIgb3duIGFuaW1hdGlv biwgaW5zdGVhZCBvZiByZWx5aW5nIG9uIGltcGxpY2l0IGFuaW1hdGlvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3ODk2CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xMjkwMDA1OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVc2UgUGFnZU92ZXJsYXkncyBhbmltYXRpb24gaW5zdGVhZCBvZiBDQSBp bXBsaWNpdCBhbmltYXRpb25zIGZvciB1bmluc3RhbGxQYWdlT3ZlcmxheS4KKworICAgICAgICBN YWtlIFdLQnVuZGxlUGFnZUluc3RhbGxQYWdlT3ZlcmxheS9XS0J1bmRsZVBhZ2VVbmluc3RhbGxQ YWdlT3ZlcmxheSBkZWZhdWx0IHRvIG5vIGFuaW1hdGlvbi4KKworICAgICAgICBBZGQgV0tCdW5k bGVQYWdlSW5zdGFsbFBhZ2VPdmVybGF5V2l0aEFuaW1hdGlvbi9XS0J1bmRsZVBhZ2VVbmluc3Rh bGxQYWdlT3ZlcmxheVdpdGhBbmltYXRpb24uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHA6CisgICAgICAgIChXS0J1bmRsZVBhZ2VV bmluc3RhbGxQYWdlT3ZlcmxheSk6IFRoZSBkZWZhdWx0IGZvciBzaG91bGRGYWRlT3V0IGlzIG5v dyBmYWxzZSwgc28gd2UgZG9uJ3QgbmVlZCB0byBwYXNzIGl0LgorICAgICAgICAoV0tCdW5kbGVQ YWdlSW5zdGFsbFBhZ2VPdmVybGF5V2l0aEFuaW1hdGlvbik6IEFkZCBhIHZlcnNpb24gb2YgV0tC dW5kbGVQYWdlSW5zdGFsbFBhZ2VPdmVybGF5IHRoYXQgZmFkZXMgaW4uCisgICAgICAgIChXS0J1 bmRsZVBhZ2VVbmluc3RhbGxQYWdlT3ZlcmxheVdpdGhBbmltYXRpb24pOiBBZGQgYSB2ZXJzaW9u IG9mIFdLQnVuZGxlUGFnZVVuaW5zdGFsbFBhZ2VPdmVybGF5IHRoYXQgZmFkZXMgb3V0LgorICAg ICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JDbGllbnQ6OmhpZ2hsaWdodCk6IGluc3Rh bGxQYWdlT3ZlcmxheSB1c2VkIHRvIGFuaW1hdGUgYnkgZGVmYXVsdCwgbm93IHdlIG5lZWQgdG8g YXNrIGZvciBpdC4KKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yQ2xpZW50OjpoaWRlSGln aGxpZ2h0KTogdW5pbnN0YWxsUGFnZU92ZXJsYXkgdXNlZCB0byBpbXBsaWNpdGx5IGFuaW1hdGUg YWNjaWRlbnRhbGx5LCBub3cgd2UgbmVlZCB0byBhc2sgZm9yIGl0LgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRD b250cm9sbGVyOjp1cGRhdGVGaW5kVUlBZnRlclBhZ2VTY3JvbGwpOiBEaXR0by4KKyAgICAgICAg KFdlYktpdDo6RmluZENvbnRyb2xsZXI6OmhpZGVGaW5kVUkpOiBEaXR0by4KKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6 Omluc3RhbGxQYWdlT3ZlcmxheSk6IEFkZCBzaG91bGRGYWRlSW4gcGFyYW1ldGVyLgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjp1bmluc3RhbGxQYWdlT3ZlcmxheSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKFdlYlBhZ2UpOiBBZGQgc2hvdWxk RmFkZUluIHRvIGluc3RhbGxQYWdlT3ZlcmxheTsgbWFrZSBib3RoIGl0IGFuZCB1bmluc3RhbGxQ YWdlT3ZlcmxheSdzIHNob3VsZEZhZGUgb3V0IGRlZmF1bHQgdG8gZmFsc2UuCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmRlc3Ryb3lQ YWdlT3ZlcmxheUxheWVyKTogRGlzYWJsZSBpbXBsaWNpdCBhbmltYXRpb25zIHdoZW4gcmVtb3Zp bmcgYSBwYWdlIG92ZXJsYXkuCisKIDIwMTMtMDEtMjQgIEphZSBIeXVuIFBhcmsgIDxqYWUucGFy a0Bjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBDb29yZGluYXRlZCBHcmFwaGljczogcmVtb3Zl IFN1cmZhY2VVcGRhdGVJbmZvOjplbmNvZGUvZGVjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn ZS5jcHAKaW5kZXggMzhiOWRmYi4uNWZlNGM2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdl LmNwcApAQCAtMjk1LDcgKzI5NSwxNyBAQCB2b2lkIFdLQnVuZGxlUGFnZUluc3RhbGxQYWdlT3Zl cmxheShXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tCdW5kbGVQYWdlT3ZlcmxheQogCiB2b2lk IFdLQnVuZGxlUGFnZVVuaW5zdGFsbFBhZ2VPdmVybGF5KFdLQnVuZGxlUGFnZVJlZiBwYWdlUmVm LCBXS0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVybGF5UmVmKQogewotICAgIHRvSW1wbChw YWdlUmVmKS0+dW5pbnN0YWxsUGFnZU92ZXJsYXkodG9JbXBsKHBhZ2VPdmVybGF5UmVmKSwgZmFs c2UpOworICAgIHRvSW1wbChwYWdlUmVmKS0+dW5pbnN0YWxsUGFnZU92ZXJsYXkodG9JbXBsKHBh Z2VPdmVybGF5UmVmKSk7Cit9CisKK3ZvaWQgV0tCdW5kbGVQYWdlSW5zdGFsbFBhZ2VPdmVybGF5 V2l0aEFuaW1hdGlvbihXS0J1bmRsZVBhZ2VSZWYgcGFnZVJlZiwgV0tCdW5kbGVQYWdlT3Zlcmxh eVJlZiBwYWdlT3ZlcmxheVJlZikKK3sKKyAgICB0b0ltcGwocGFnZVJlZiktPmluc3RhbGxQYWdl T3ZlcmxheSh0b0ltcGwocGFnZU92ZXJsYXlSZWYpLCB0cnVlKTsKK30KKwordm9pZCBXS0J1bmRs ZVBhZ2VVbmluc3RhbGxQYWdlT3ZlcmxheVdpdGhBbmltYXRpb24oV0tCdW5kbGVQYWdlUmVmIHBh Z2VSZWYsIFdLQnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXlSZWYpCit7CisgICAgdG9J bXBsKHBhZ2VSZWYpLT51bmluc3RhbGxQYWdlT3ZlcmxheSh0b0ltcGwocGFnZU92ZXJsYXlSZWYp LCB0cnVlKTsKIH0KIAogYm9vbCBXS0J1bmRsZVBhZ2VIYXNMb2NhbERhdGFGb3JVUkwoV0tCdW5k bGVQYWdlUmVmIHBhZ2VSZWYsIFdLVVJMUmVmIHVybFJlZikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn ZS5oCmluZGV4IDI2YzJhOTMuLmU5YWRlNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaApA QCAtNDE5LDYgKzQxOSw5IEBAIFdLX0VYUE9SVCB2b2lkIFdLQnVuZGxlUGFnZVNldFVuZGVybGF5 UGFnZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVQYWdlUmVmCiBXS19FWFBPUlQgdm9p ZCBXS0J1bmRsZVBhZ2VJbnN0YWxsUGFnZU92ZXJsYXkoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdL QnVuZGxlUGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXkpOwogV0tfRVhQT1JUIHZvaWQgV0tCdW5k bGVQYWdlVW5pbnN0YWxsUGFnZU92ZXJsYXkoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxl UGFnZU92ZXJsYXlSZWYgcGFnZU92ZXJsYXkpOwogCitXS19FWFBPUlQgdm9pZCBXS0J1bmRsZVBh Z2VJbnN0YWxsUGFnZU92ZXJsYXlXaXRoQW5pbWF0aW9uKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBX S0J1bmRsZVBhZ2VPdmVybGF5UmVmIHBhZ2VPdmVybGF5KTsKK1dLX0VYUE9SVCB2b2lkIFdLQnVu ZGxlUGFnZVVuaW5zdGFsbFBhZ2VPdmVybGF5V2l0aEFuaW1hdGlvbihXS0J1bmRsZVBhZ2VSZWYg cGFnZSwgV0tCdW5kbGVQYWdlT3ZlcmxheVJlZiBwYWdlT3ZlcmxheSk7CisKIFdLX0VYUE9SVCBi b29sIFdLQnVuZGxlUGFnZUhhc0xvY2FsRGF0YUZvclVSTChXS0J1bmRsZVBhZ2VSZWYgcGFnZSwg V0tVUkxSZWYgdXJsKTsKIFdLX0VYUE9SVCBib29sIFdLQnVuZGxlUGFnZUNhbkhhbmRsZVJlcXVl c3QoV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5j cHAKaW5kZXggMDQ4YzI1Ny4uNjkwNzVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50LmNw cApAQCAtNzMsNyArNzMsNyBAQCB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6aGlnaGxpZ2h0KCkK ICAgICBpZiAoIW1faGlnaGxpZ2h0T3ZlcmxheSkgewogICAgICAgICBSZWZQdHI8UGFnZU92ZXJs YXk+IGhpZ2hsaWdodE92ZXJsYXkgPSBQYWdlT3ZlcmxheTo6Y3JlYXRlKHRoaXMpOwogICAgICAg ICBtX2hpZ2hsaWdodE92ZXJsYXkgPSBoaWdobGlnaHRPdmVybGF5LmdldCgpOwotICAgICAgICBt X3BhZ2UtPmluc3RhbGxQYWdlT3ZlcmxheShoaWdobGlnaHRPdmVybGF5LnJlbGVhc2UoKSk7Cisg ICAgICAgIG1fcGFnZS0+aW5zdGFsbFBhZ2VPdmVybGF5KGhpZ2hsaWdodE92ZXJsYXkucmVsZWFz ZSgpLCB0cnVlKTsKICAgICB9IGVsc2UKICAgICAgICAgbV9oaWdobGlnaHRPdmVybGF5LT5zZXRO ZWVkc0Rpc3BsYXkoKTsKIH0KQEAgLTgxLDcgKzgxLDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JDbGll bnQ6OmhpZ2hsaWdodCgpCiB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6aGlkZUhpZ2hsaWdodCgp CiB7CiAgICAgaWYgKG1faGlnaGxpZ2h0T3ZlcmxheSkKLSAgICAgICAgbV9wYWdlLT51bmluc3Rh bGxQYWdlT3ZlcmxheShtX2hpZ2hsaWdodE92ZXJsYXksIGZhbHNlKTsKKyAgICAgICAgbV9wYWdl LT51bmluc3RhbGxQYWdlT3ZlcmxheShtX2hpZ2hsaWdodE92ZXJsYXksIHRydWUpOwogfQogCiBi b29sIFdlYkluc3BlY3RvckNsaWVudDo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFN0cmlu ZyYgbWVzc2FnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuY3BwCmluZGV4IDQ1ZWYxNGYuLmYzZmVjY2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcApAQCAt MTYzLDcgKzE2Myw3IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRVSUFmdGVyUGFn ZVNjcm9sbChib29sIGZvdW5kLCBjb25zdCBTdHJpbmcmIHN0cmluCiAgICAgaWYgKCFzaG91bGRT aG93T3ZlcmxheSkgewogICAgICAgICBpZiAobV9maW5kUGFnZU92ZXJsYXkpIHsKICAgICAgICAg ICAgIC8vIEdldCByaWQgb2YgdGhlIG92ZXJsYXkuCi0gICAgICAgICAgICBtX3dlYlBhZ2UtPnVu aW5zdGFsbFBhZ2VPdmVybGF5KG1fZmluZFBhZ2VPdmVybGF5LCBmYWxzZSk7CisgICAgICAgICAg ICBtX3dlYlBhZ2UtPnVuaW5zdGFsbFBhZ2VPdmVybGF5KG1fZmluZFBhZ2VPdmVybGF5LCB0cnVl KTsKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgQVNTRVJUKCFtX2ZpbmRQYWdlT3Zlcmxh eSk7CkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBGaW5kQ29udHJvbGxlcjo6dXBkYXRlRmluZFVJ QWZ0ZXJQYWdlU2Nyb2xsKGJvb2wgZm91bmQsIGNvbnN0IFN0cmluZyYgc3RyaW4KICAgICAgICAg aWYgKCFtX2ZpbmRQYWdlT3ZlcmxheSkgewogICAgICAgICAgICAgUmVmUHRyPFBhZ2VPdmVybGF5 PiBmaW5kUGFnZU92ZXJsYXkgPSBQYWdlT3ZlcmxheTo6Y3JlYXRlKHRoaXMpOwogICAgICAgICAg ICAgbV9maW5kUGFnZU92ZXJsYXkgPSBmaW5kUGFnZU92ZXJsYXkuZ2V0KCk7Ci0gICAgICAgICAg ICBtX3dlYlBhZ2UtPmluc3RhbGxQYWdlT3ZlcmxheShmaW5kUGFnZU92ZXJsYXkucmVsZWFzZSgp KTsKKyAgICAgICAgICAgIG1fd2ViUGFnZS0+aW5zdGFsbFBhZ2VPdmVybGF5KGZpbmRQYWdlT3Zl cmxheS5yZWxlYXNlKCksIHRydWUpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8g VGhlIHBhZ2Ugb3ZlcmxheSBuZWVkcyB0byBiZSByZXBhaW50ZWQuCiAgICAgICAgICAgICBtX2Zp bmRQYWdlT3ZlcmxheS0+c2V0TmVlZHNEaXNwbGF5KCk7CkBAIC0yNzksNyArMjc5LDcgQEAgdm9p ZCBGaW5kQ29udHJvbGxlcjo6aGlkZUZpbmRVSSgpCiB7CiAgICAgbV9maW5kTWF0Y2hlcy5jbGVh cigpOwogICAgIGlmIChtX2ZpbmRQYWdlT3ZlcmxheSkKLSAgICAgICAgbV93ZWJQYWdlLT51bmlu c3RhbGxQYWdlT3ZlcmxheShtX2ZpbmRQYWdlT3ZlcmxheSwgZmFsc2UpOworICAgICAgICBtX3dl YlBhZ2UtPnVuaW5zdGFsbFBhZ2VPdmVybGF5KG1fZmluZFBhZ2VPdmVybGF5LCB0cnVlKTsKIAog ICAgIFBsdWdpblZpZXcqIHBsdWdpblZpZXcgPSBwbHVnaW5WaWV3Rm9yRnJhbWUobV93ZWJQYWdl LT5tYWluRnJhbWUoKSk7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKaW5kZXggOThlMzdjNS4uMDA2MDE2NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTM0NywxMCArMTM0Nyw4IEBA IHZvaWQgV2ViUGFnZTo6cG9zdEluamVjdGVkQnVuZGxlTWVzc2FnZShjb25zdCBTdHJpbmcmIG1l c3NhZ2VOYW1lLCBDb3JlSVBDOjpNZXNzCiAgICAgaW5qZWN0ZWRCdW5kbGUtPmRpZFJlY2VpdmVN ZXNzYWdlVG9QYWdlKHRoaXMsIG1lc3NhZ2VOYW1lLCBtZXNzYWdlQm9keS5nZXQoKSk7CiB9CiAK LXZvaWQgV2ViUGFnZTo6aW5zdGFsbFBhZ2VPdmVybGF5KFBhc3NSZWZQdHI8UGFnZU92ZXJsYXk+ IHBhZ2VPdmVybGF5KQordm9pZCBXZWJQYWdlOjppbnN0YWxsUGFnZU92ZXJsYXkoUGFzc1JlZlB0 cjxQYWdlT3ZlcmxheT4gcGFnZU92ZXJsYXksIGJvb2wgc2hvdWxkRmFkZUluKQogewotICAgIGJv b2wgc2hvdWxkRmFkZUluID0gdHJ1ZTsKLSAgICAKICAgICBpZiAobV9wYWdlT3ZlcmxheSkgewog ICAgICAgICBtX3BhZ2VPdmVybGF5LT5zZXRQYWdlKDApOwogCkBAIC0xMzcxLDEyICsxMzY5LDEy IEBAIHZvaWQgV2ViUGFnZTo6aW5zdGFsbFBhZ2VPdmVybGF5KFBhc3NSZWZQdHI8UGFnZU92ZXJs YXk+IHBhZ2VPdmVybGF5KQogICAgIG1fcGFnZU92ZXJsYXktPnNldE5lZWRzRGlzcGxheSgpOwog fQogCi12b2lkIFdlYlBhZ2U6OnVuaW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5KiBwYWdl T3ZlcmxheSwgYm9vbCBmYWRlT3V0KQordm9pZCBXZWJQYWdlOjp1bmluc3RhbGxQYWdlT3Zlcmxh eShQYWdlT3ZlcmxheSogcGFnZU92ZXJsYXksIGJvb2wgc2hvdWxkRmFkZU91dCkKIHsKICAgICBp ZiAocGFnZU92ZXJsYXkgIT0gbV9wYWdlT3ZlcmxheSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg aWYgKGZhZGVPdXQpIHsKKyAgICBpZiAoc2hvdWxkRmFkZU91dCkgewogICAgICAgICBtX3BhZ2VP dmVybGF5LT5zdGFydEZhZGVPdXRBbmltYXRpb24oKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDNiZGI2 NTAuLjZlZjdjM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaApAQCAtMzU3LDggKzM1Nyw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgd2luZG93SXNGb2N1 c2VkKCkgY29uc3Q7CiAgICAgYm9vbCB3aW5kb3dBbmRXZWJQYWdlQXJlRm9jdXNlZCgpIGNvbnN0 OwotICAgIHZvaWQgaW5zdGFsbFBhZ2VPdmVybGF5KFBhc3NSZWZQdHI8UGFnZU92ZXJsYXk+KTsK LSAgICB2b2lkIHVuaW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5KiwgYm9vbCBmYWRlT3V0 KTsKKyAgICB2b2lkIGluc3RhbGxQYWdlT3ZlcmxheShQYXNzUmVmUHRyPFBhZ2VPdmVybGF5Piwg Ym9vbCBzaG91bGRGYWRlSW4gPSBmYWxzZSk7CisgICAgdm9pZCB1bmluc3RhbGxQYWdlT3Zlcmxh eShQYWdlT3ZlcmxheSosIGJvb2wgc2hvdWxkRmFkZU91dCA9IGZhbHNlKTsKICAgICBib29sIGhh c1BhZ2VPdmVybGF5KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlT3ZlcmxheTsgfQogICAgIFdlYkNv cmU6OkludFBvaW50IHNjcmVlblRvV2luZG93KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAg ICAgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0 Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQppbmRleCA2NDll YmY0Li41MDc4ODQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEu bW0KQEAgLTQ5MCw3ICs0OTAsMTMgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YTo6ZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIoKQogewogICAgIEFTU0VSVChtX3BhZ2VPdmVybGF5 TGF5ZXIpOwogCisgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgIFtDQVRyYW5zYWN0aW9u IHNldERpc2FibGVBY3Rpb25zOllFU107CisKICAgICBbbV9wYWdlT3ZlcmxheUxheWVyLT5wbGF0 Zm9ybUxheWVyKCkgcmVtb3ZlRnJvbVN1cGVybGF5ZXJdOworCisgICAgW0NBVHJhbnNhY3Rpb24g Y29tbWl0XTsKKwogICAgIG1fcGFnZU92ZXJsYXlMYXllciA9IG51bGxwdHI7CiB9CiAK