74951 2011-12-20 13:09:03 -0800 Add ScrollableArea wrappers for a bunch of ScrollAnimator member functions 2011-12-20 13:21:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 524777 0 andersca 2011-12-20 13:09:03 -0800 Add ScrollableArea wrappers for a bunch of ScrollAnimator member functions 524778 1 120065 andersca 2011-12-20 13:09:34 -0800 Created attachment 120065 Patch 524785 2 andersca 2011-12-20 13:21:46 -0800 Committed r103346: <http://trac.webkit.org/changeset/103346> 120065 2011-12-20 13:09:34 -0800 2011-12-20 13:16:14 -0800 Patch bug-74951-20111220130945.patch text/plain 13892 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQwZDI5MjQ2MWMwNzE1 MjdjYzRhYzFhN2YwM2IxMzM5ODFkODIwMC4uM2ZhM2Q1NjA0YmFlODYxMjRjMjliZGRmMjBhMmQ1 YjdkZmU5ZmQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDExLTEyLTIwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIFNjcm9sbGFi bGVBcmVhIHdyYXBwZXJzIGZvciBhIGJ1bmNoIG9mIFNjcm9sbEFuaW1hdG9yIG1lbWJlciBmdW5j dGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0 OTUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAg KiBwYWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6 Om1vdXNlTW92ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjp1cGRhdGVNb3Vz ZUV2ZW50VGFyZ2V0Tm9kZSk6CisgICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjpzZXRBY3RpdmUpOgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6ZGlkTW92 ZU9uc2NyZWVuKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6d2lsbE1vdmVPZmZzY3Jl ZW4pOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpub3RpZnlQYWdlVGhhdENvbnRlbnRB cmVhV2lsbFBhaW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6Y29udGVudEFyZWFXaWxsUGFpbnQpOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6Om1vdXNlRW50ZXJlZENvbnRlbnRBcmVh KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjptb3VzZUV4aXRlZENvbnRlbnRB cmVhKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjptb3VzZU1vdmVkSW5Db250 ZW50QXJlYSk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6bW91c2VFbnRlcmVk U2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjptb3VzZUV4aXRl ZFNjcm9sbGJhcik6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6Y29udGVudEFy ZWFEaWRTaG93KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjpjb250ZW50QXJl YURpZEhpZGUpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAg ICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWFDbGllbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9T Y3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyOjptb3VzZUVudGVyZWQp OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyOjptb3VzZUV4aXRlZCk6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxiYXI6Om1vdXNlVXApOgorCisyMDExLTEyLTIwICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgU2Nyb2xsYWJsZUFyZWEgc2hvdWxk IGhhdmUgYW4gb3B0aW9uYWwgU2Nyb2xsYWJsZUFyZWFDbGllbnQKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0OTQ5CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjY2Vl OTFlNGM3ODRkNmNkZDBiMGJiOTA1ZjZiM2ZhZTM0OTJlN2U4Li4zNDhmMmU4MWZiYTkwY2UxNzBh YmNjYzc1OWQzOGQyMTQ4NzQ2NTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEt MTItMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgU2Nyb2xsYWJsZUFyZWEgd3JhcHBlcnMgZm9yIGEgYnVuY2ggb2YgU2Nyb2xsQW5pbWF0b3Ig bWVtYmVyIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzQ5NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZpZXcuY3BwOgorICAg ICAgICAoV2ViS2l0OjpCdWlsdEluUERGVmlldzo6cGFpbnQpOgorICAgICAgICAoV2ViS2l0OjpC dWlsdEluUERGVmlldzo6aGFuZGxlTW91c2VFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OkJ1aWx0 SW5QREZWaWV3OjpoYW5kbGVNb3VzZUVudGVyRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpCdWls dEluUERGVmlldzo6aGFuZGxlTW91c2VMZWF2ZUV2ZW50KToKKwogMjAxMS0xMi0yMCAgQnJlbnQg RnVsZ2hhbSAgPGJmdWxnaGFtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1dpbkNhaXJvXSBVbnJl dmlld2VkIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhw LmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggOGI1MGI3YjhlMDY4ZjA1 ZjFmZDVmYzkwZDI3ZmRkMDIwMmIyZTE5NC4uYjAzZGNlNDA0MzYzY2JjOTY3MTM2MGIwYjM1YjNi NzQxZDhiYjM0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysr IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTEyMzMsNiArMTIzMywxMCBAQCBf X1pOSzdXZWJDb3JlMTRSZW5kZXJMaXN0SXRlbTEwbWFya2VyVGV4dEV2CiBfX1pOSzdXZWJDb3Jl MTRSZXNvdXJjZUhhbmRsZTEwY29ubmVjdGlvbkV2CiBfX1pOSzdXZWJDb3JlMTRSZXNvdXJjZUxv YWRlcjExZnJhbWVMb2FkZXJFdgogX19aTks3V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExNHNjcm9s bEFuaW1hdG9yRXYKK19fWk5LN1dlYkNvcmUxNFNjcm9sbGFibGVBcmVhMjBjb250ZW50QXJlYVdp bGxQYWludEV2CitfX1pOSzdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYTIybW91c2VFeGl0ZWRDb250 ZW50QXJlYUV2CitfX1pOSzdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYTIzbW91c2VNb3ZlZEluQ29u dGVudEFyZWFFdgorX19aTks3V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyM21vdXNlRW50ZXJlZENv bnRlbnRBcmVhRXYKIF9fWk5LN1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luMTBjYW5EaXNwbGF5RVJL TlNfNEtVUkxFCiBfX1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjE4ZGF0YWJhc2VJZGVudGlm aWVyRXYKIF9fWk5LN1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luNWVxdWFsRVBLUzBfCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXggYTY3NGRjMTQzYTM5ZDgwNzUxNDYyYTc0YzVl Nzc4M2UyZjU2N2E4Zi4uYzIxZWI3ZTI1YzFkOWRjYTQ4MDY0ZDI5ODM5NWIzMzRhYmVlNTI0NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMTU3MSwxMSArMTU3MSwxMSBA QCBib29sIEV2ZW50SGFuZGxlcjo6bW91c2VNb3ZlZChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQm IGV2ZW50LCBib29sIG9ubHlVcGRhdGVTYwogCiAgICAgaWYgKFJlbmRlckxheWVyKiBsYXllciA9 IGxheWVyRm9yTm9kZShob3ZlcmVkTm9kZS5pbm5lck5vZGUoKSkpIHsKICAgICAgICAgaWYgKHBh Z2UtPmNvbnRhaW5zU2Nyb2xsYWJsZUFyZWEobGF5ZXIpKQotICAgICAgICAgICAgbGF5ZXItPnNj cm9sbEFuaW1hdG9yKCktPm1vdXNlTW92ZWRJbkNvbnRlbnRBcmVhKCk7CisgICAgICAgICAgICBs YXllci0+bW91c2VNb3ZlZEluQ29udGVudEFyZWEoKTsKICAgICB9CiAKICAgICBpZiAoRnJhbWVW aWV3KiBmcmFtZVZpZXcgPSBtX2ZyYW1lLT52aWV3KCkpCi0gICAgICAgIGZyYW1lVmlldy0+c2Ny b2xsQW5pbWF0b3IoKS0+bW91c2VNb3ZlZEluQ29udGVudEFyZWEoKTsgIAorICAgICAgICBmcmFt ZVZpZXctPm1vdXNlTW92ZWRJbkNvbnRlbnRBcmVhKCk7ICAKIAogICAgIGhvdmVyZWROb2RlLnNl dFRvTm9uU2hhZG93QW5jZXN0b3IoKTsKICAgICBwYWdlLT5jaHJvbWUoKS0+bW91c2VEaWRNb3Zl T3ZlckVsZW1lbnQoaG92ZXJlZE5vZGUsIGV2ZW50Lm1vZGlmaWVyRmxhZ3MoKSk7CkBAIC0yMDE5 LDI0ICsyMDE5LDI0IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjp1cGRhdGVNb3VzZUV2ZW50VGFyZ2V0 Tm9kZShOb2RlKiB0YXJnZXROb2RlLCBjb25zdCBQbGF0Zm9ybU1vCiAgICAgICAgICAgICAvLyBU aGUgbW91c2UgaGFzIG1vdmVkIGJldHdlZW4gZnJhbWVzLgogICAgICAgICAgICAgaWYgKEZyYW1l KiBmcmFtZSA9IG1fbGFzdE5vZGVVbmRlck1vdXNlLT5kb2N1bWVudCgpLT5mcmFtZSgpKSB7CiAg ICAgICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKSkK LSAgICAgICAgICAgICAgICAgICAgZnJhbWVWaWV3LT5zY3JvbGxBbmltYXRvcigpLT5tb3VzZUV4 aXRlZENvbnRlbnRBcmVhKCk7CisgICAgICAgICAgICAgICAgICAgIGZyYW1lVmlldy0+bW91c2VF eGl0ZWRDb250ZW50QXJlYSgpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHBh Z2UgJiYgKGxheWVyRm9yTGFzdE5vZGUgJiYgKCFsYXllckZvck5vZGVVbmRlck1vdXNlIHx8IGxh eWVyRm9yTm9kZVVuZGVyTW91c2UgIT0gbGF5ZXJGb3JMYXN0Tm9kZSkpKSB7CiAgICAgICAgICAg ICAvLyBUaGUgbW91c2UgaGFzIG1vdmVkIGJldHdlZW4gbGF5ZXJzLgogICAgICAgICAgICAgaWYg KHBhZ2UtPmNvbnRhaW5zU2Nyb2xsYWJsZUFyZWEobGF5ZXJGb3JMYXN0Tm9kZSkpCi0gICAgICAg ICAgICAgICAgbGF5ZXJGb3JMYXN0Tm9kZS0+c2Nyb2xsQW5pbWF0b3IoKS0+bW91c2VFeGl0ZWRD b250ZW50QXJlYSgpOworICAgICAgICAgICAgICAgIGxheWVyRm9yTGFzdE5vZGUtPm1vdXNlRXhp dGVkQ29udGVudEFyZWEoKTsKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYgKG1fbm9k ZVVuZGVyTW91c2UgJiYgKCFtX2xhc3ROb2RlVW5kZXJNb3VzZSB8fCBtX2xhc3ROb2RlVW5kZXJN b3VzZS0+ZG9jdW1lbnQoKSAhPSBtX2ZyYW1lLT5kb2N1bWVudCgpKSkgewogICAgICAgICAgICAg Ly8gVGhlIG1vdXNlIGhhcyBtb3ZlZCBiZXR3ZWVuIGZyYW1lcy4KICAgICAgICAgICAgIGlmIChG cmFtZSogZnJhbWUgPSBtX25vZGVVbmRlck1vdXNlLT5kb2N1bWVudCgpLT5mcmFtZSgpKSB7CiAg ICAgICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKSkK LSAgICAgICAgICAgICAgICAgICAgZnJhbWVWaWV3LT5zY3JvbGxBbmltYXRvcigpLT5tb3VzZUVu dGVyZWRDb250ZW50QXJlYSgpOworICAgICAgICAgICAgICAgICAgICBmcmFtZVZpZXctPm1vdXNl RW50ZXJlZENvbnRlbnRBcmVhKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAo cGFnZSAmJiAobGF5ZXJGb3JOb2RlVW5kZXJNb3VzZSAmJiAoIWxheWVyRm9yTGFzdE5vZGUgfHwg bGF5ZXJGb3JOb2RlVW5kZXJNb3VzZSAhPSBsYXllckZvckxhc3ROb2RlKSkpIHsKICAgICAgICAg ICAgIC8vIFRoZSBtb3VzZSBoYXMgbW92ZWQgYmV0d2VlbiBsYXllcnMuCiAgICAgICAgICAgICBp ZiAocGFnZS0+Y29udGFpbnNTY3JvbGxhYmxlQXJlYShsYXllckZvck5vZGVVbmRlck1vdXNlKSkK LSAgICAgICAgICAgICAgICBsYXllckZvck5vZGVVbmRlck1vdXNlLT5zY3JvbGxBbmltYXRvcigp LT5tb3VzZUVudGVyZWRDb250ZW50QXJlYSgpOworICAgICAgICAgICAgICAgIGxheWVyRm9yTm9k ZVVuZGVyTW91c2UtPm1vdXNlRW50ZXJlZENvbnRlbnRBcmVhKCk7CiAgICAgICAgIH0KICAgICAg ICAgCiAgICAgICAgIGlmIChtX2xhc3ROb2RlVW5kZXJNb3VzZSAmJiBtX2xhc3ROb2RlVW5kZXJN b3VzZS0+ZG9jdW1lbnQoKSAhPSBtX2ZyYW1lLT5kb2N1bWVudCgpKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKaW5kZXggOGQ4ODFhMDEwNjZjMzM3MjQwZmRhYWFlNjc2 YmEwZjc5M2ZhNWNmMi4uNjBiYjkxZDFkMTJhM2NhMWI0ZTZjMmUyN2RkYTY4ZDE5ZTMwZWY1ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcApAQCAtNTczLDkgKzU3Myw5 IEBAIHZvaWQgRm9jdXNDb250cm9sbGVyOjpzZXRBY3RpdmUoYm9vbCBhY3RpdmUpCiAgICAgICAg ICAgICBIYXNoU2V0PFNjcm9sbGFibGVBcmVhKj46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHNjcm9s bGFibGVBcmVhcy0+ZW5kKCk7IAogICAgICAgICAgICAgZm9yIChIYXNoU2V0PFNjcm9sbGFibGVB cmVhKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gc2Nyb2xsYWJsZUFyZWFzLT5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpIHsKICAgICAgICAgICAgICAgICBpZiAoIWFjdGl2ZSkKLSAgICAgICAgICAg ICAgICAgICAgKCppdCktPnNjcm9sbEFuaW1hdG9yKCktPmNvbnRlbnRBcmVhRGlkSGlkZSgpOwor ICAgICAgICAgICAgICAgICAgICAoKml0KS0+Y29udGVudEFyZWFEaWRIaWRlKCk7CiAgICAgICAg ICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAoKml0KS0+c2Nyb2xsQW5pbWF0b3Io KS0+Y29udGVudEFyZWFEaWRTaG93KCk7CisgICAgICAgICAgICAgICAgICAgICgqaXQpLT5jb250 ZW50QXJlYURpZFNob3coKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA4ZjQ2NDM3OTQ4NjIwNWE2N2EyOTgyM2I1MDI1OTIw ZWUzMTJiY2MwLi42YjQ1NTg1YWQzMDJmYzU2OGI4NjZhOTVjMDdmMGNiZjY1YjkxMjM2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC04ODEsNyArODgxLDcgQEAgdm9pZCBGcmFtZVZp ZXc6OmRpZE1vdmVPbnNjcmVlbigpCiAgICAgUmVuZGVyVmlldyogcm9vdCA9IHJvb3RSZW5kZXJl cih0aGlzKTsKICAgICBpZiAocm9vdCkKICAgICAgICAgcm9vdC0+ZGlkTW92ZU9uc2NyZWVuKCk7 Ci0gICAgc2Nyb2xsQW5pbWF0b3IoKS0+Y29udGVudEFyZWFEaWRTaG93KCk7CisgICAgY29udGVu dEFyZWFEaWRTaG93KCk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3Ojp3aWxsTW92ZU9mZnNjcmVlbigp CkBAIC04ODksNyArODg5LDcgQEAgdm9pZCBGcmFtZVZpZXc6OndpbGxNb3ZlT2Zmc2NyZWVuKCkK ICAgICBSZW5kZXJWaWV3KiByb290ID0gcm9vdFJlbmRlcmVyKHRoaXMpOwogICAgIGlmIChyb290 KQogICAgICAgICByb290LT53aWxsTW92ZU9mZnNjcmVlbigpOwotICAgIHNjcm9sbEFuaW1hdG9y KCktPmNvbnRlbnRBcmVhRGlkSGlkZSgpOworICAgIGNvbnRlbnRBcmVhRGlkSGlkZSgpOwogfQog CiBSZW5kZXJPYmplY3QqIEZyYW1lVmlldzo6bGF5b3V0Um9vdChib29sIG9ubHlEdXJpbmdMYXlv dXQpIGNvbnN0CkBAIC0yNjQ1LDcgKzI2NDUsNyBAQCB2b2lkIEZyYW1lVmlldzo6bm90aWZ5UGFn ZVRoYXRDb250ZW50QXJlYVdpbGxQYWludCgpIGNvbnN0CiAKICAgICBIYXNoU2V0PFNjcm9sbGFi bGVBcmVhKj46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHNjcm9sbGFibGVBcmVhcy0+ZW5kKCk7IAog ICAgIGZvciAoSGFzaFNldDxTY3JvbGxhYmxlQXJlYSo+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHNj cm9sbGFibGVBcmVhcy0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAoKml0KS0+ c2Nyb2xsQW5pbWF0b3IoKS0+Y29udGVudEFyZWFXaWxsUGFpbnQoKTsKKyAgICAgICAgKCppdCkt PmNvbnRlbnRBcmVhV2lsbFBhaW50KCk7CiB9CiAKIGJvb2wgRnJhbWVWaWV3OjpzY3JvbGxBbmlt YXRvckVuYWJsZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFy ZWEuY3BwCmluZGV4IGNkNDkyZWQwYWZhMzJmZTJmNGUwNjdlNDA0OWJlMmM0ODNlODVmYjYuLmQ1 OWM4ODNkMjQ2ZmU4YTQ4MmVjNjZiNjk0MjM4ZDM3Zjg2MWNlMWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKQEAgLTIxOCw2ICsyMTgsNDYgQEAgdm9pZCBT Y3JvbGxhYmxlQXJlYTo6d2lsbEVuZExpdmVSZXNpemUoKQogICAgIHNjcm9sbEFuaW1hdG9yKCkt PndpbGxFbmRMaXZlUmVzaXplKCk7CiB9ICAgIAogCit2b2lkIFNjcm9sbGFibGVBcmVhOjpjb250 ZW50QXJlYVdpbGxQYWludCgpIGNvbnN0Cit7CisgICAgc2Nyb2xsQW5pbWF0b3IoKS0+Y29udGVu dEFyZWFXaWxsUGFpbnQoKTsKK30KKwordm9pZCBTY3JvbGxhYmxlQXJlYTo6bW91c2VFbnRlcmVk Q29udGVudEFyZWEoKSBjb25zdAoreworICAgIHNjcm9sbEFuaW1hdG9yKCktPm1vdXNlRW50ZXJl ZENvbnRlbnRBcmVhKCk7Cit9CisKK3ZvaWQgU2Nyb2xsYWJsZUFyZWE6Om1vdXNlRXhpdGVkQ29u dGVudEFyZWEoKSBjb25zdAoreworICAgIHNjcm9sbEFuaW1hdG9yKCktPm1vdXNlRW50ZXJlZENv bnRlbnRBcmVhKCk7Cit9CisKK3ZvaWQgU2Nyb2xsYWJsZUFyZWE6Om1vdXNlTW92ZWRJbkNvbnRl bnRBcmVhKCkgY29uc3QKK3sKKyAgICBzY3JvbGxBbmltYXRvcigpLT5tb3VzZU1vdmVkSW5Db250 ZW50QXJlYSgpOworfQorCit2b2lkIFNjcm9sbGFibGVBcmVhOjptb3VzZUVudGVyZWRTY3JvbGxi YXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpIGNvbnN0Cit7CisgICAgc2Nyb2xsQW5pbWF0b3IoKS0+ bW91c2VFbnRlcmVkU2Nyb2xsYmFyKHNjcm9sbGJhcik7Cit9CisKK3ZvaWQgU2Nyb2xsYWJsZUFy ZWE6Om1vdXNlRXhpdGVkU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKSBjb25zdAorewor ICAgIHNjcm9sbEFuaW1hdG9yKCktPm1vdXNlRXhpdGVkU2Nyb2xsYmFyKHNjcm9sbGJhcik7Cit9 CisKK3ZvaWQgU2Nyb2xsYWJsZUFyZWE6OmNvbnRlbnRBcmVhRGlkU2hvdygpIGNvbnN0Cit7Cisg ICAgc2Nyb2xsQW5pbWF0b3IoKS0+Y29udGVudEFyZWFEaWRTaG93KCk7Cit9CisKK3ZvaWQgU2Ny b2xsYWJsZUFyZWE6OmNvbnRlbnRBcmVhRGlkSGlkZSgpIGNvbnN0Cit7CisgICAgc2Nyb2xsQW5p bWF0b3IoKS0+Y29udGVudEFyZWFEaWRIaWRlKCk7Cit9CisKIHZvaWQgU2Nyb2xsYWJsZUFyZWE6 OmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQogewogICAgIHNj cm9sbEFuaW1hdG9yKCktPmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAppbmRleCA1ZGFmNjEwMjU4MTA5ODFm Yzc3MmNhYTQyMjBjNmNlZmY1ZTBkM2NlLi5kY2Y5ZWE4YmFjMTI1ZDVmMjFkMjQ3ODJjMzgzNzZm MzliODE2ODRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxl QXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAg LTcyLDYgKzcyLDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIHdpbGxTdGFydExpdmVSZXNpemUoKTsK ICAgICB2b2lkIHdpbGxFbmRMaXZlUmVzaXplKCk7CiAKKyAgICB2b2lkIGNvbnRlbnRBcmVhV2ls bFBhaW50KCkgY29uc3Q7CisgICAgdm9pZCBtb3VzZUVudGVyZWRDb250ZW50QXJlYSgpIGNvbnN0 OworICAgIHZvaWQgbW91c2VFeGl0ZWRDb250ZW50QXJlYSgpIGNvbnN0OworICAgIHZvaWQgbW91 c2VNb3ZlZEluQ29udGVudEFyZWEoKSBjb25zdDsKKyAgICB2b2lkIG1vdXNlRW50ZXJlZFNjcm9s bGJhcihTY3JvbGxiYXIqKSBjb25zdDsKKyAgICB2b2lkIG1vdXNlRXhpdGVkU2Nyb2xsYmFyKFNj cm9sbGJhciopIGNvbnN0OworICAgIHZvaWQgY29udGVudEFyZWFEaWRTaG93KCkgY29uc3Q7Cisg ICAgdm9pZCBjb250ZW50QXJlYURpZEhpZGUoKSBjb25zdDsKKwogICAgIHZvaWQgZGlkQWRkVmVy dGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7CiAgICAgdm9pZCB3aWxsUmVtb3ZlVmVydGljYWxT Y3JvbGxiYXIoU2Nyb2xsYmFyKik7CiAgICAgdmlydHVhbCB2b2lkIGRpZEFkZEhvcml6b250YWxT Y3JvbGxiYXIoU2Nyb2xsYmFyKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxhYmxlQXJlYUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs YWJsZUFyZWFDbGllbnQuaAppbmRleCA4Y2VmOTk5NTliNjc2NmQwM2U5N2RkNDU4YjM2ZjMzNjEw YWY1NDgxLi5mNTM0OWQ5MzBmOTFlZTE0Mzg0MTJjZDc3NGVhNDM0YzkyZjIxNmU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYUNsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhQ2xpZW50LmgKQEAgLTI4LDYg KzI4LDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBTY3JvbGxiYXI7CisKIGNs YXNzIFNjcm9sbGFibGVBcmVhQ2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5TY3JvbGxh YmxlQXJlYUNsaWVudCgpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsYmFyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAKaW5k ZXggYzZjYjBjMTc5NWQ0MWQ4MzJjNGQxZGNhMjA1Mzg4MTZlYWI2NTQ2Ny4uYjk1MmQ0OWRmMDAx MDQ1NGUwMmMwMjExODI2NTc2YmI0ODk1NDcwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsYmFyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxiYXIuY3BwCkBAIC0zNzEsMTMgKzM3MSwxMyBAQCBib29sIFNjcm9sbGJhcjo6bW91c2VNb3Zl ZChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2dCkKIHZvaWQgU2Nyb2xsYmFyOjptb3VzZUVu dGVyZWQoKQogewogICAgIGlmIChtX3Njcm9sbGFibGVBcmVhKQotICAgICAgICBtX3Njcm9sbGFi bGVBcmVhLT5zY3JvbGxBbmltYXRvcigpLT5tb3VzZUVudGVyZWRTY3JvbGxiYXIodGhpcyk7Cisg ICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPm1vdXNlRW50ZXJlZFNjcm9sbGJhcih0aGlzKTsKIH0K IAogYm9vbCBTY3JvbGxiYXI6Om1vdXNlRXhpdGVkKCkKIHsKICAgICBpZiAobV9zY3JvbGxhYmxl QXJlYSkKLSAgICAgICAgbV9zY3JvbGxhYmxlQXJlYS0+c2Nyb2xsQW5pbWF0b3IoKS0+bW91c2VF eGl0ZWRTY3JvbGxiYXIodGhpcyk7CisgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPm1vdXNlRXhp dGVkU2Nyb2xsYmFyKHRoaXMpOwogICAgIHNldEhvdmVyZWRQYXJ0KE5vUGFydCk7CiAgICAgcmV0 dXJuIHRydWU7CiB9CkBAIC0zOTQsNyArMzk0LDcgQEAgYm9vbCBTY3JvbGxiYXI6Om1vdXNlVXAo Y29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBtb3VzZUV2ZW50KQogICAgICAgICAvLyB0byByZWFs bHkga25vdyBpZiB0aGUgbW91c2UgaGFzIGV4aXRlZCB0aGUgc2Nyb2xsYmFyIG9uIGEgbW91c2VV cC4KICAgICAgICAgU2Nyb2xsYmFyUGFydCBwYXJ0ID0gdGhlbWUoKS0+aGl0VGVzdCh0aGlzLCBt b3VzZUV2ZW50KTsKICAgICAgICAgaWYgKHBhcnQgPT0gTm9QYXJ0KQotICAgICAgICAgICAgbV9z Y3JvbGxhYmxlQXJlYS0+c2Nyb2xsQW5pbWF0b3IoKS0+bW91c2VFeGl0ZWRTY3JvbGxiYXIodGhp cyk7CisgICAgICAgICAgICBtX3Njcm9sbGFibGVBcmVhLT5tb3VzZUV4aXRlZFNjcm9sbGJhcih0 aGlzKTsKICAgICB9CiAKICAgICBpZiAocGFyZW50KCkgJiYgcGFyZW50KCktPmlzRnJhbWVWaWV3 KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0J1 aWx0SW5QREZWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYv QnVpbHRJblBERlZpZXcuY3BwCmluZGV4IGE1ODVjYzkzNmEzNmJmYmEwMGUwOTY1NjMxM2QxN2Rl MzU0ODk4MzEuLjdmOTQ5ZjQzYWIzMDEwNTRiZjg3OWMxYWI1MmJjOTk2YjMyZmI0MWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJblBERlZp ZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvQnVpbHRJ blBERlZpZXcuY3BwCkBAIC0yNTMsNyArMjUzLDcgQEAgdm9pZCBCdWlsdEluUERGVmlldzo6ZGVz dHJveSgpCiAKIHZvaWQgQnVpbHRJblBERlZpZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogZ3Jh cGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7Ci0gICAgc2Nyb2xsQW5p bWF0b3IoKS0+Y29udGVudEFyZWFXaWxsUGFpbnQoKTsKKyAgICBjb250ZW50QXJlYVdpbGxQYWlu dCgpOwogCiAgICAgcGFpbnRCYWNrZ3JvdW5kKGdyYXBoaWNzQ29udGV4dCwgZGlydHlSZWN0KTsK IApAQCAtNDU0LDcgKzQ1NCw3IEBAIGJvb2wgQnVpbHRJblBERlZpZXc6OmhhbmRsZU1vdXNlRXZl bnQoY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQpCiB7CiAgICAgc3dpdGNoIChldmVudC50eXBl KCkpIHsKICAgICBjYXNlIFdlYkV2ZW50OjpNb3VzZU1vdmU6Ci0gICAgICAgIHNjcm9sbEFuaW1h dG9yKCktPm1vdXNlTW92ZWRJbkNvbnRlbnRBcmVhKCk7CisgICAgICAgIG1vdXNlTW92ZWRJbkNv bnRlbnRBcmVhKCk7CiAgICAgICAgIC8vIEZJWE1FOiBTaG91bGQgYWxzbyBub3RpZnkgc2Nyb2xs YmFyIHRvIHNob3cgaG92ZXIgZWZmZWN0LiBTaG91bGQgYWxzbyBzZW5kIG1vdXNlRXhpdGVkIHRv IGhpZGUgaXQuCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViRXZlbnQ6Ok1vdXNlRG93bjog ewpAQCAtNDg2LDEzICs0ODYsMTMgQEAgYm9vbCBCdWlsdEluUERGVmlldzo6aGFuZGxlV2hlZWxF dmVudChjb25zdCBXZWJXaGVlbEV2ZW50JiBldmVudCkKIAogYm9vbCBCdWlsdEluUERGVmlldzo6 aGFuZGxlTW91c2VFbnRlckV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKQogewotICAgIHNjcm9s bEFuaW1hdG9yKCktPm1vdXNlRW50ZXJlZENvbnRlbnRBcmVhKCk7CisgICAgbW91c2VFbnRlcmVk Q29udGVudEFyZWEoKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgQnVpbHRJblBERlZp ZXc6OmhhbmRsZU1vdXNlTGVhdmVFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JikKIHsKLSAgICBz Y3JvbGxBbmltYXRvcigpLT5tb3VzZUV4aXRlZENvbnRlbnRBcmVhKCk7CisgICAgbW91c2VFeGl0 ZWRDb250ZW50QXJlYSgpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIAo=