87130 2012-05-22 06:59:42 -0700 [Qt] Clean up internal viewport animation API 2012-05-23 12:52:37 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth hausmann menard webkit.review.bot zalan zoltan oldest_to_newest 630337 0 kenneth 2012-05-22 06:59:42 -0700 SSIA 630338 1 143295 kenneth 2012-05-22 07:00:27 -0700 Created attachment 143295 Patch 630341 2 kenneth 2012-05-22 07:03:31 -0700 Landed in 117968 631927 3 143295 hausmann 2012-05-23 12:52:37 -0700 Comment on attachment 143295 Patch Clearing review to take it out of the review queue. 143295 2012-05-22 07:00:27 -0700 2012-05-23 12:52:37 -0700 Patch bug-87130-20120522155946.patch text/plain 12217 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGZiMDVjYjE1Y2U5MmJi OTIyMDNhMTIxNmZhZjdkZmY3NGM1N2RhNi4uY2E0ZDRiZjEzMTU1OTg1MWZmODljNTY2MzQ5MjI5 YzQ4NjFjMjFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA1LTIyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIENsZWFuIHVwIGludGVybmFsIHZpZXdwb3J0IGFuaW1hdGlvbiBBUEkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MTMwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCisKKyAgICAgICAgY29uc3QnaWZ5IGNsYXNzZXMgd2hp Y2ggc2hvdWxkIGJlIGNvbnN0LgorCisgICAgICAgIFRoZXJlIGlzIG5vdyBvbmx5IG9uZSBtZXRo b2Qgd2hpY2ggY2FuIGFuaW1hdGUsIGFuaW1hdGVJdGVtUmVjdFZpc2libGUKKyAgICAgICAgd2hp Y2ggaXMgdXNlZCBmb3IgYWxzbyBhbmltYXRpbmcgdGhlIGNvbnRlbnRzIGJhY2sgaW50byB2YWxp ZCBib3VuZHMuCisgICAgICAgIFRoZSB2YWxpZCBib3VuZHMgYXJlIGNvbXB1dGVkIHVzaW5nIGEg c2VwYXJhdGUgbWV0aG9kLiBJdCBpcyBub3cgbW9yZQorICAgICAgICBjbGVhciB3aGVuIGFuIGFu aW1hdGlvbiBpcyB1c2VkIG9yIG5vdCBhbmQgYXNzZXJ0cyBhcmUgYWRkZWQgZm9yCisgICAgICAg IGVuc3VyaW5nIG5vIGNvbmN1cnJlbnQgYW5pbWF0aW9ucyBhcyB3ZWxsIGFzIHByb3BlciB1cGRh dGUgZGVmZXJyaW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpkaWRDaGFuZ2VW aWV3cG9ydFByb3BlcnRpZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmU6OmNzc1NjYWxlRnJvbUl0ZW0pOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1TY2FsZUZyb21DU1MpOgorICAgICAgICAoV2ViS2l0OjpR dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1Db29yZEZyb21DU1MpOgorICAgICAgICAo V2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1SZWN0RnJvbUNTUyk6Cisg ICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aW5uZXJCb3VuZGVk Q1NTU2NhbGUpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 Om91dGVyQm91bmRlZENTU1NjYWxlKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lOjpzZXRJdGVtUmVjdFZpc2libGUpOgorICAgICAgICAoV2ViS2l0OjpRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVJdGVtUmVjdFZpc2libGUpOgorICAgICAg ICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNjYWxlQW5pbWF0aW9uU3Rh dGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l OjpuZWFyZXN0VmFsaWRCb3VuZHMpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6OmN1cnJlbnRDU1NTY2FsZSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6Y2FuY2VsU2Nyb2xsQW5pbWF0aW9uKToKKyAgICAgICAgKFdl YktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVFbmRlZCk6Cisg ICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aXRlbVNpemVDaGFu Z2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l Lmg6CisgICAgICAgIChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorCiAyMDEyLTA1LTIx ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBbUXRdIE1pbmkgY2xlYW4gdXBzIGluIHRoZSBpbnRlcmFjdGlvbiBlbmdpbmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4 IDY1NjI3ODY1OTA2ZTNlYzBhNGUwYmVmNGYzZmRmYzAyZWVmOTc3YWUuLjc3MGJhYTFjYzQyNDIx ODFiYTZiYmQ2NzNiMzg5MjBkOGQ3NWEzMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtODM0LDcgKzgzNCw3IEBAIHZvaWQg UVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6OmRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGll cyhjb25zdCBXZWJDb3JlOjpWCiAKICAgICAvLyBJZiB0aGUgd2ViIGFwcCBzdWNjZXNzaXZlbHkg Y2hhbmdlcyB0aGUgdmlld3BvcnQgb24gcHVycG9zZQogICAgIC8vIGl0IHdhbnRzIHRvIGJlIGlu IGNvbnRyb2wgYW5kIHdlIHNob3VsZCBkaXNhYmxlIGFuaW1hdGlvbnMuCi0gICAgaW50ZXJhY3Rp b25FbmdpbmUtPmVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KC8qaW1tZWRpYXRl Ki8gdHJ1ZSk7CisgICAgaW50ZXJhY3Rpb25FbmdpbmUtPnNldEl0ZW1SZWN0VmlzaWJsZShpbnRl cmFjdGlvbkVuZ2luZS0+bmVhcmVzdFZhbGlkQm91bmRzKCkpOwogfQogCiB2b2lkIFFRdWlja1dl YlZpZXdGbGlja2FibGVQcml2YXRlOjp1cGRhdGVWaWV3cG9ydFNpemUoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmNwcAppbmRleCAwY2ZiNDM4NDMxZjk2Yjg2MjU3Zjg1ZTFhOGQxZmMwMmMyN2E0NjdmLi5i MmNhZGY3MTA1NDEyMjQyZTcwY2E4YWRlNzc1NWI4M2U1N2ViMDE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmNwcApAQCAtOTgsMjIgKzk4LDIyIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBmdXp6eUNvbXBh cmUocXJlYWwgYSwgcXJlYWwgYiwgcXJlYWwgZXBzaWxvbikKICAgICByZXR1cm4gcUFicyhhIC0g YikgPCBlcHNpbG9uOwogfQogCi1pbmxpbmUgcXJlYWwgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjpjc3NTY2FsZUZyb21JdGVtKHFyZWFsIGl0ZW1TY2FsZSkKK2lubGluZSBxcmVhbCBRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmNzc1NjYWxlRnJvbUl0ZW0ocXJlYWwgaXRlbVNjYWxl KSBjb25zdAogewogICAgIHJldHVybiBpdGVtU2NhbGUgLyBtX2RldmljZVBpeGVsUmF0aW87CiB9 CiAKLWlubGluZSBxcmVhbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1TY2FsZUZy b21DU1MocXJlYWwgY3NzU2NhbGUpCitpbmxpbmUgcXJlYWwgUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjppdGVtU2NhbGVGcm9tQ1NTKHFyZWFsIGNzc1NjYWxlKSBjb25zdAogewogICAgIHJl dHVybiBjc3NTY2FsZSAqIG1fZGV2aWNlUGl4ZWxSYXRpbzsKIH0KIAotaW5saW5lIHFyZWFsIFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aXRlbUNvb3JkRnJvbUNTUyhxcmVhbCB2YWx1ZSkK K2lubGluZSBxcmVhbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1Db29yZEZyb21D U1MocXJlYWwgdmFsdWUpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHZhbHVlICogbV9kZXZpY2VQaXhl bFJhdGlvOwogfQogCi1pbmxpbmUgUVJlY3RGIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6 aXRlbVJlY3RGcm9tQ1NTKGNvbnN0IFFSZWN0RiYgY3NzUmVjdCkKK2lubGluZSBRUmVjdEYgUXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjppdGVtUmVjdEZyb21DU1MoY29uc3QgUVJlY3RGJiBj c3NSZWN0KSBjb25zdAogewogICAgIFFSZWN0RiBpdGVtUmVjdDsKIApAQCAtMTUyLDEyICsxNTIs MTIgQEAgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp+UXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lKCkKIHsKIH0KIAotcXJlYWwgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjppbm5l ckJvdW5kZWRDU1NTY2FsZShxcmVhbCBjc3NTY2FsZSkKK3FyZWFsIFF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZTo6aW5uZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwgY3NzU2NhbGUpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIHFCb3VuZChtX21pbmltdW1TY2FsZSwgY3NzU2NhbGUsIG1fbWF4aW11bVNj YWxlKTsKIH0KIAotcXJlYWwgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpvdXRlckJvdW5k ZWRDU1NTY2FsZShxcmVhbCBjc3NTY2FsZSkKK3FyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZTo6b3V0ZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwgY3NzU2NhbGUpIGNvbnN0CiB7CiAgICAg aWYgKG1fYWxsb3dzVXNlclNjYWxpbmcpIHsKICAgICAgICAgLy8gQm91bmRlZCBieSBbMC4xLCAx MC4wXSBsaWtlIHRoZSB2aWV3cG9ydCBtZXRhIGNvZGUgaW4gV2ViQ29yZS4KQEAgLTE3Myw4ICsx NzMsNiBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2V0SXRlbVJlY3RWaXNp YmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3QpCiAgICAgaWYgKGl0ZW1SZWN0LmlzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgVmlld3BvcnRVcGRhdGVEZWZlcnJlciBndWFyZCh0aGlz KTsKLQogICAgIHFyZWFsIGl0ZW1TY2FsZSA9IG1fdmlld3BvcnQtPndpZHRoKCkgLyBpdGVtUmVj dC53aWR0aCgpOwogCiAgICAgbV9jb250ZW50LT5zZXRDb250ZW50c1NjYWxlKGl0ZW1TY2FsZSk7 CkBAIC0xOTIsMjAgKzE5MCwyNSBAQCBzdGF0aWMgcXJlYWwgcGh5c2ljYWxPdmVyc2hvb3QocXJl YWwgdCkKICAgICByZXR1cm4gKC10ICogKHQgLSAyKSkgKiAxLjI1IC0gKHQgKiB0KSAqIDAuMjU7 CiB9CiAKLWJvb2wgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RW aXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3QpCit2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6YW5pbWF0ZUl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYmIGl0ZW1SZWN0KQog ewotICAgIEFTU0VSVChtX3N1c3BlbmRlZCk7CisgICAgQVNTRVJUKG1fc2NhbGVBbmltYXRpb24t PnN0YXRlKCkgPT0gUUFic3RyYWN0QW5pbWF0aW9uOjpTdG9wcGVkKTsKKworICAgIEFTU0VSVCgh c2Nyb2xsQW5pbWF0aW9uQWN0aXZlKCkpOworICAgIGlmIChzY3JvbGxBbmltYXRpb25BY3RpdmUo KSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgUVJlY3RGIGN1cnJlbnRJdGVtUmVjdFZpc2libGUg PSBtX3ZpZXdwb3J0LT5tYXBSZWN0VG9XZWJDb250ZW50KG1fdmlld3BvcnQtPmJvdW5kaW5nUmVj dCgpKTsKICAgICBpZiAoaXRlbVJlY3QgPT0gY3VycmVudEl0ZW1SZWN0VmlzaWJsZSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm47CiAKICAgICAvLyBGSVhNRTogSW52ZXN0 aWdhdGUgd2h5IHRoYXQgYW5pbWF0aW9uIGRvZXNuJ3QgcnVuIHdoZW4gd2UgYXJlIHVuZm9jdXNl ZC4KICAgICBpZiAoIW1fdmlld3BvcnQtPmlzVmlzaWJsZSgpIHx8ICFtX3ZpZXdwb3J0LT5oYXNG b2N1cygpKSB7CiAgICAgICAgIC8vIEFwcGx5IHRoZSBlbmQgcmVzdWx0IGltbWVkaWF0ZWx5IHdo ZW4gd2UgYXJlIG5vbi12aXNpYmxlLgogICAgICAgICBzZXRJdGVtUmVjdFZpc2libGUoaXRlbVJl Y3QpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KKwogICAg IFFFYXNpbmdDdXJ2ZSBlYXNpbmdDdXJ2ZTsKICAgICBlYXNpbmdDdXJ2ZS5zZXRDdXN0b21UeXBl KHBoeXNpY2FsT3ZlcnNob290KTsKIApAQCAtMjE2LDcgKzIxOSw2IEBAIGJvb2wgUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYg aXRlbVJlY3QpCiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RW5kVmFsdWUoaXRlbVJlY3QpOwog CiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c3RhcnQoKTsKLSAgICByZXR1cm4gdHJ1ZTsKIH0KIAog dm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmZsaWNrYWJsZU1vdmVTdGFydGVkKCkK QEAgLTI1NCwxMSArMjU2LDExIEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpz Y2FsZUFuaW1hdGlvblN0YXRlQ2hhbmdlZChRQWJzdHJhY3RBbmltYXRpb246CiAgICAgc3dpdGNo IChuZXdTdGF0ZSkgewogICAgIGNhc2UgUUFic3RyYWN0QW5pbWF0aW9uOjpSdW5uaW5nOgogICAg ICAgICBtX3ZpZXdwb3J0LT5jYW5jZWxGbGljaygpOwotICAgICAgICBpZiAoIW1fc2NhbGVVcGRh dGVEZWZlcnJlcikKLSAgICAgICAgICAgIG1fc2NhbGVVcGRhdGVEZWZlcnJlciA9IGFkb3B0UHRy KG5ldyBWaWV3cG9ydFVwZGF0ZURlZmVycmVyKHRoaXMsIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6 OkRlZmVyVXBkYXRlQW5kU3VzcGVuZENvbnRlbnQpKTsKKyAgICAgICAgQVNTRVJUKCFtX2FuaW1h dGlvblVwZGF0ZURlZmVycmVyKTsKKyAgICAgICAgbV9hbmltYXRpb25VcGRhdGVEZWZlcnJlciA9 IGFkb3B0UHRyKG5ldyBWaWV3cG9ydFVwZGF0ZURlZmVycmVyKHRoaXMsIFZpZXdwb3J0VXBkYXRl RGVmZXJyZXI6OkRlZmVyVXBkYXRlQW5kU3VzcGVuZENvbnRlbnQpKTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBRQWJzdHJhY3RBbmltYXRpb246OlN0b3BwZWQ6Ci0gICAgICAgIG1fc2NhbGVV cGRhdGVEZWZlcnJlci5jbGVhcigpOworICAgICAgICBtX2FuaW1hdGlvblVwZGF0ZURlZmVycmVy LmNsZWFyKCk7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwpA QCAtNDI3LDExICs0MjksOCBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6em9v bVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3VjaFBvaQogICAgIGFuaW1hdGVJ dGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKIH0KIAotYm9vbCBRdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmU6OmVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5 KGJvb2wgaW1tZWRpYXRlKQorUVJlY3RGIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6bmVh cmVzdFZhbGlkQm91bmRzKCkgY29uc3QKIHsKLSAgICBpZiAoIWltbWVkaWF0ZSAmJiAoc2Nyb2xs QW5pbWF0aW9uQWN0aXZlKCkgfHwgc2NhbGVBbmltYXRpb25BY3RpdmUoKSkpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQogICAgIHFyZWFsIGVuZEl0ZW1TY2FsZSA9IGl0ZW1TY2FsZUZyb21DU1Mo aW5uZXJCb3VuZGVkQ1NTU2NhbGUoY3VycmVudENTU1NjYWxlKCkpKTsKIAogICAgIGNvbnN0IFFS ZWN0RiB2aWV3cG9ydFJlY3QgPSBtX3ZpZXdwb3J0LT5ib3VuZGluZ1JlY3QoKTsKQEAgLTQ0NCwx MSArNDQzLDcgQEAgYm9vbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmVuc3VyZUNvbnRl bnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KGJvb2wgaW1tZWQKIAogICAgIFFSZWN0RiBlbmRWaXNp YmxlQ29udGVudFJlY3QoZW5kUG9zaXRpb24gLyBlbmRJdGVtU2NhbGUsIHZpZXdwb3J0UmVjdC5z aXplKCkgLyBlbmRJdGVtU2NhbGUpOwogCi0gICAgaWYgKGltbWVkaWF0ZSkgewotICAgICAgICBz ZXRJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKLSAgICAgICAgcmV0dXJu IHRydWU7Ci0gICAgfQotICAgIHJldHVybiAhYW5pbWF0ZUl0ZW1SZWN0VmlzaWJsZShlbmRWaXNp YmxlQ29udGVudFJlY3QpOworICAgIHJldHVybiBlbmRWaXNpYmxlQ29udGVudFJlY3Q7CiB9CiAK IHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpyZXNldCgpCkBAIC00ODUsNyArNDgw LDcgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldENTU1NjYWxlKHFyZWFs IHNjYWxlKQogICAgIG1fY29udGVudC0+c2V0Q29udGVudHNTY2FsZShpdGVtU2NhbGVGcm9tQ1NT KG5ld1NjYWxlKSk7CiB9CiAKLXFyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y3Vy cmVudENTU1NjYWxlKCkKK3FyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y3VycmVu dENTU1NjYWxlKCkgY29uc3QKIHsKICAgICByZXR1cm4gY3NzU2NhbGVGcm9tSXRlbShtX2NvbnRl bnQtPmNvbnRlbnRzU2NhbGUoKSk7CiB9CkBAIC01MzgsMTUgKzUzMywxMyBAQCBib29sIFF0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2NhbGVBbmltYXRpb25BY3RpdmUoKSBjb25zdAogCiB2 b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y2FuY2VsU2Nyb2xsQW5pbWF0aW9uKCkK IHsKLSAgICBWaWV3cG9ydFVwZGF0ZURlZmVycmVyIGd1YXJkKHRoaXMpOwotCiAgICAgLy8gSWYg dGhlIHBhbiBnZXN0dXJlIHJlY29nbml6ZXIgcmVjZWl2ZXMgYSB0b3VjaCBiZWdpbiBldmVudAog ICAgIC8vIGR1cmluZyBhbiBvbmdvaW5nIGtpbmV0aWMgc2Nyb2xsIGFuaW1hdGlvbiBvZiBhIHBy ZXZpb3VzCiAgICAgLy8gcGFuIGdlc3R1cmUsIHRoZSBhbmltYXRpb24gaXMgc3RvcHBlZCBhbmQg dGhlIGNvbnRlbnQgaXMKICAgICAvLyBpbW1lZGlhdGVseSBwb3NpdGlvbmVkIGJhY2sgdG8gdmFs aWQgYm91bmRhcmllcy4KIAogICAgIG1fdmlld3BvcnQtPmNhbmNlbEZsaWNrKCk7Ci0gICAgZW5z dXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnkoLyppbW1lZGlhdGUqLyB0cnVlKTsKKyAg ICBzZXRJdGVtUmVjdFZpc2libGUobmVhcmVzdFZhbGlkQm91bmRzKCkpOwogfQogCiB2b2lkIFF0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aW50ZXJydXB0U2NhbGVBbmltYXRpb24oKQpAQCAt NjA4LDkgKzYwMSw5IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdl c3R1cmVFbmRlZCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fcGluY2hTdGFydFNjYWxlID0g LTE7Ci0gICAgLy8gQ2xlYXIgdGhlIHVwZGF0ZSBkZWZlcnJlciBub3cgaWYgd2UncmUgaW4gb3Vy IGZpbmFsIHBvc2l0aW9uIGFuZCB0aGVyZSB3b24ndCBiZSBhbnkgYW5pbWF0aW9uIHRvIGNsZWFy IGl0IGxhdGVyLgotICAgIGlmIChlbnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3VuZGFyeSgp KQotICAgICAgICBtX3NjYWxlVXBkYXRlRGVmZXJyZXIuY2xlYXIoKTsKKworICAgIGFuaW1hdGVJ dGVtUmVjdFZpc2libGUobmVhcmVzdFZhbGlkQm91bmRzKCkpOworICAgIG1fc2NhbGVVcGRhdGVE ZWZlcnJlci5jbGVhcigpOyAvLyBDbGVhciBhZnRlciBzdGFydGluZyBwb3RlbnRpYWwgYW5pbWF0 aW9uLCB3aGljaCB0YWtlcyBvdmVyIGRlZmVycmluZy4KIH0KIAogdm9pZCBRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZUNhbmNlbGxlZCgpCkBAIC02MzAsOCArNjIzLDcg QEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1TaXplQ2hhbmdlZCgpCiAg ICAgaWYgKG1fc3VzcGVuZENvdW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBWaWV3cG9ydFVw ZGF0ZURlZmVycmVyIGd1YXJkKHRoaXMpOwotICAgIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9y dEJvdW5kYXJ5KHRydWUpOworICAgIHNldEl0ZW1SZWN0VmlzaWJsZShuZWFyZXN0VmFsaWRCb3Vu ZHMoKSk7CiB9CiAKIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpzY2FsZUNvbnRl bnQoY29uc3QgUVBvaW50RiYgY2VudGVySW5DU1NDb29yZGluYXRlcywgcXJlYWwgY3NzU2NhbGUp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lLmgKaW5kZXggYWNjZmM2YWQ3Y2VmY2ZmMDRkMDg2MDU4ZTFhYTNhZWI5 NGM1NzRiZC4uMjJlNjk0MTBkYjhjNWQxODFhM2VlYjYxZmZmNTc3ZGQ1ZmNkMjY5NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmUuaApAQCAtNTUsMTUgKzU1LDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENT U1NjYWxlQm91bmRzKHFyZWFsIG1pbmltdW0sIHFyZWFsIG1heGltdW0pOwogICAgIHZvaWQgc2V0 Q1NTU2NhbGUocXJlYWwpOwogCi0gICAgcXJlYWwgY3VycmVudENTU1NjYWxlKCk7Ci0KLSAgICBi b29sIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KGJvb2wgaW1tZWRpYXRlID0g ZmFsc2UpOworICAgIHFyZWFsIGN1cnJlbnRDU1NTY2FsZSgpIGNvbnN0OwogCiAgICAgdm9pZCBz ZXRBbGxvd3NVc2VyU2NhbGluZyhib29sIGFsbG93KSB7IG1fYWxsb3dzVXNlclNjYWxpbmcgPSBh bGxvdzsgfQogICAgIHZvaWQgc2V0Q29udGVudFRvRGV2aWNlUGl4ZWxSYXRpbyhxcmVhbCByYXRp bykge21fZGV2aWNlUGl4ZWxSYXRpbyA9IHJhdGlvOyB9CiAKICAgICB2b2lkIHNldEl0ZW1SZWN0 VmlzaWJsZShjb25zdCBRUmVjdEYmKTsKLSAgICBib29sIGFuaW1hdGVJdGVtUmVjdFZpc2libGUo Y29uc3QgUVJlY3RGJik7CisgICAgdm9pZCBhbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFS ZWN0RiYpOworCisgICAgUVJlY3RGIG5lYXJlc3RWYWxpZEJvdW5kcygpIGNvbnN0OwogCiAgICAg dm9pZCBwYWdlUG9zaXRpb25SZXF1ZXN0KGNvbnN0IFFQb2ludCYgcG9zKTsKICAgICB2b2lkIHRv dWNoQmVnaW4oKTsKQEAgLTEyMCwxMyArMTIwLDEzIEBAIHByaXZhdGU6CiAgICAgUVF1aWNrV2Vi VmlldyogY29uc3QgbV92aWV3cG9ydDsKICAgICBRUXVpY2tXZWJQYWdlKiBjb25zdCBtX2NvbnRl bnQ7CiAKLSAgICBxcmVhbCBjc3NTY2FsZUZyb21JdGVtKHFyZWFsKTsKLSAgICBxcmVhbCBpdGVt U2NhbGVGcm9tQ1NTKHFyZWFsKTsKLSAgICBxcmVhbCBpdGVtQ29vcmRGcm9tQ1NTKHFyZWFsKTsK LSAgICBRUmVjdEYgaXRlbVJlY3RGcm9tQ1NTKGNvbnN0IFFSZWN0RiYpOworICAgIHFyZWFsIGNz c1NjYWxlRnJvbUl0ZW0ocXJlYWwpIGNvbnN0OworICAgIHFyZWFsIGl0ZW1TY2FsZUZyb21DU1Mo cXJlYWwpIGNvbnN0OworICAgIHFyZWFsIGl0ZW1Db29yZEZyb21DU1MocXJlYWwpIGNvbnN0Owor ICAgIFFSZWN0RiBpdGVtUmVjdEZyb21DU1MoY29uc3QgUVJlY3RGJikgY29uc3Q7CiAKLSAgICBx cmVhbCBpbm5lckJvdW5kZWRDU1NTY2FsZShxcmVhbCk7Ci0gICAgcXJlYWwgb3V0ZXJCb3VuZGVk Q1NTU2NhbGUocXJlYWwpOworICAgIHFyZWFsIGlubmVyQm91bmRlZENTU1NjYWxlKHFyZWFsKSBj b25zdDsKKyAgICBxcmVhbCBvdXRlckJvdW5kZWRDU1NTY2FsZShxcmVhbCkgY29uc3Q7CiAKICAg ICBib29sIG1fYWxsb3dzVXNlclNjYWxpbmc7CiAgICAgcXJlYWwgbV9taW5pbXVtU2NhbGU7CkBA IC0xNDQsNiArMTQ0LDcgQEAgcHJpdmF0ZToKICAgICBPd25QdHI8Vmlld3BvcnRVcGRhdGVEZWZl cnJlcj4gbV9zY2FsZVVwZGF0ZURlZmVycmVyOwogICAgIE93blB0cjxWaWV3cG9ydFVwZGF0ZURl ZmVycmVyPiBtX3Njcm9sbFVwZGF0ZURlZmVycmVyOwogICAgIE93blB0cjxWaWV3cG9ydFVwZGF0 ZURlZmVycmVyPiBtX3RvdWNoVXBkYXRlRGVmZXJyZXI7CisgICAgT3duUHRyPFZpZXdwb3J0VXBk YXRlRGVmZXJyZXI+IG1fYW5pbWF0aW9uVXBkYXRlRGVmZXJyZXI7CiAKICAgICBib29sIG1faGFk VXNlckludGVyYWN0aW9uOwogCg==