171574 2017-05-02 14:47:54 -0700 Improve scrolling tree logging 2017-05-02 16:08:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton oldest_to_newest 1303823 0 simon.fraser 2017-05-02 14:47:54 -0700 Improve scrolling tree logging 1303828 1 308853 simon.fraser 2017-05-02 14:52:17 -0700 Created attachment 308853 Patch 1303871 2 simon.fraser 2017-05-02 16:08:15 -0700 https://trac.webkit.org/r216103 308853 2017-05-02 14:52:17 -0700 2017-05-02 14:53:56 -0700 Patch bug-171574-20170502145216.patch text/plain 16483 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IDhj YjAxZmY1NDE3MDFlZmJiYjVmYzYwMmU3YjYyNDM0MTFiMTFhNDkuLjk2ODgxNjc4MDVlYmFjZGQ0 MGI2MmRjNTRhMTlmZDYxNzFiNjhhNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCkBAIC02MjYs MTIgKzYyNiwxMiBAQCBib29sIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnZpc3VhbFZpZXdw b3J0RW5hYmxlZCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fcGFnZS0+bWFpbkZyYW1lKCkuc2V0dGlu Z3MoKS52aXN1YWxWaWV3cG9ydEVuYWJsZWQoKTsKIH0KIAotU3RyaW5nIEFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OnNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dCgpIGNvbnN0CitTdHJpbmcgQXN5 bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0KFNjcm9sbGlu Z1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yKSBjb25zdAogewogICAgIGlmIChtX3Nj cm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpKSB7CiAgICAgICAgIGlmIChtX2V2ZW50 VHJhY2tpbmdSZWdpb25zRGlydHkpCiAgICAgICAgICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+ cm9vdFN0YXRlTm9kZSgpLT5zZXRFdmVudFRyYWNraW5nUmVnaW9ucyhhYnNvbHV0ZUV2ZW50VHJh Y2tpbmdSZWdpb25zKCkpOwotICAgICAgICByZXR1cm4gbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnJv b3RTdGF0ZU5vZGUoKS0+c2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0KCk7CisgICAgICAgIHJldHVy biBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpLT5zY3JvbGxpbmdTdGF0ZVRy ZWVBc1RleHQoYmVoYXZpb3IpOwogICAgIH0KIAogICAgIHJldHVybiBTdHJpbmcoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRp bmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3IuaAppbmRleCAwMTFhZTBmMjMzYzA5MjZmZWZlMGYwZDkwN2M1ZjFhODBmMjcyNzQx Li5iMDA0ZDVhZTA0MjRiOWZhNDhhODUzNzdmYjRjMGVkOGZlYTQyYWY0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvci5oCkBAIC03Niw3ICs3Niw3IEBAIHByb3RlY3RlZDoKIAogICAgIHZvaWQgdXBkYXRlU2Ny b2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQ b2ludCYsIHN0ZDo6b3B0aW9uYWw8RmxvYXRQb2ludD4gbGF5b3V0Vmlld3BvcnRPcmlnaW4sIGJv b2wgcHJvZ3JhbW1hdGljU2Nyb2xsLCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKIAot ICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBzY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHQoKSBjb25z dCBvdmVycmlkZTsKKyAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgc2Nyb2xsaW5nU3RhdGVUcmVl QXNUZXh0KFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yID0gU2Nyb2xsaW5nU3RhdGVU cmVlQXNUZXh0QmVoYXZpb3JOb3JtYWwpIGNvbnN0IG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgd2lsbENvbW1pdFRyZWUoKSBvdmVycmlkZTsKIAogICAgIGJvb2wgZXZlbnRUcmFj a2luZ1JlZ2lvbnNEaXJ0eSgpIGNvbnN0IHsgcmV0dXJuIG1fZXZlbnRUcmFja2luZ1JlZ2lvbnNE aXJ0eTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IGZmMzQyNjZhN2MyMThkMGU0NTU1NWQwMjNiY2ZmZDFl MTBmODU5MDkuLjkxOTk3MzJlYzMyZmQ1NmQ5N2EyYjgwMDZiYjNjYjkyMTBkNGYxZDMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGlu YXRvci5jcHAKQEAgLTM4OCw3ICszODgsNyBAQCBTY3JvbGxpbmdOb2RlSUQgU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnVuaXF1ZVNjcm9sbExheWVySUQoKQogICAgIHJldHVybiB1bmlxdWVTY3JvbGxM YXllcklEKys7CiB9CiAKLVN0cmluZyBTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xsaW5nU3Rh dGVUcmVlQXNUZXh0KCkgY29uc3QKK1N0cmluZyBTY3JvbGxpbmdDb29yZGluYXRvcjo6c2Nyb2xs aW5nU3RhdGVUcmVlQXNUZXh0KFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBjb25z dAogewogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IGViNmRhYmY5NzhkY2M0 ZWQyZTMwMmEyNTJiNDUwYjE2OGJmNGJiOTIuLjJhOWE4ODdjY2FmNzk3ZWNkYmZmMzkxZmEyZjkz ZDlkNGY1ZDE1YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtNTMsNiArNTMsMTUgQEAgdHlwZWRlZiB1aW50NjRf dCBTY3JvbGxpbmdOb2RlSUQ7CiAKIGVudW0gU2Nyb2xsaW5nTm9kZVR5cGUgeyBGcmFtZVNjcm9s bGluZ05vZGUsIE92ZXJmbG93U2Nyb2xsaW5nTm9kZSwgRml4ZWROb2RlLCBTdGlja3lOb2RlIH07 CiAKK2VudW0gU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3JGbGFncyB7CisgICAgU2Ny b2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3JOb3JtYWwgICAgICAgICAgICAgICAgICA9IDAs CisgICAgU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3JJbmNsdWRlTGF5ZXJJRHMgICAg ICAgICA9IDEgPDwgMCwKKyAgICBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvckluY2x1 ZGVOb2RlSURzICAgICAgICAgID0gMSA8PCAxLAorICAgIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4 dEJlaGF2aW9ySW5jbHVkZUxheWVyUG9zaXRpb25zICAgPSAxIDw8IDIsCisgICAgU2Nyb2xsaW5n U3RhdGVUcmVlQXNUZXh0QmVoYXZpb3JEZWJ1ZyAgICAgICAgICAgICAgICAgICA9IFNjcm9sbGlu Z1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9ySW5jbHVkZUxheWVySURzIHwgU2Nyb2xsaW5nU3RhdGVU cmVlQXNUZXh0QmVoYXZpb3JJbmNsdWRlTm9kZUlEcyB8IFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4 dEJlaGF2aW9ySW5jbHVkZUxheWVyUG9zaXRpb25zCit9OwordHlwZWRlZiB1bnNpZ25lZCBTY3Jv bGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvcjsKKwogY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBG cmFtZTsKIGNsYXNzIEZyYW1lVmlldzsKQEAgLTE4MSw3ICsxOTAsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHVwZGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdOb2RlSUQsIEdy YXBoaWNzTGF5ZXIqIC8qc2Nyb2xsTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypzY3JvbGxlZENv bnRlbnRzTGF5ZXIqLywgR3JhcGhpY3NMYXllciogLypjb3VudGVyU2Nyb2xsaW5nTGF5ZXIqLywg R3JhcGhpY3NMYXllciogLyppbnNldENsaXBMYXllciovLCBjb25zdCBTY3JvbGxpbmdHZW9tZXRy eSogPSBudWxscHRyKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlT3ZlcmZsb3dTY3JvbGxp bmdOb2RlKFNjcm9sbGluZ05vZGVJRCwgR3JhcGhpY3NMYXllciogLypzY3JvbGxMYXllciovLCBH cmFwaGljc0xheWVyKiAvKnNjcm9sbGVkQ29udGVudHNMYXllciovLCBjb25zdCBTY3JvbGxpbmdH ZW9tZXRyeSogPSBudWxscHRyKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVjb25jaWxlVmlld3Bv cnRDb25zdHJhaW5lZExheWVyUG9zaXRpb25zKGNvbnN0IExheW91dFJlY3QmLCBTY3JvbGxpbmdM YXllclBvc2l0aW9uQWN0aW9uKSB7IH0KLSAgICB2aXJ0dWFsIFN0cmluZyBzY3JvbGxpbmdTdGF0 ZVRyZWVBc1RleHQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmluZyBzY3JvbGxpbmdTdGF0ZVRy ZWVBc1RleHQoU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IgPSBTY3JvbGxpbmdTdGF0 ZVRyZWVBc1RleHRCZWhhdmlvck5vcm1hbCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGlzUnVi YmVyQmFuZEluUHJvZ3Jlc3MoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwg Ym9vbCBpc1Njcm9sbFNuYXBJblByb2dyZXNzKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlU2Nyb2xsU25hcFByb3BlcnRpZXNXaXRoRnJhbWVWaWV3KGNv bnN0IEZyYW1lVmlldyYpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGUuY3BwCmluZGV4IDE3ZDAxNjU5NzRlMmIw NDAyYTUzNDg1MjIyZGMxM2Q4ZjQ2MzljZmIuLmU0NDIzZWU4NTIwMzlmM2FhZTc5NjA3ZTY0N2Vh MDM4OTQyMWUwYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1N0YXRlRml4ZWROb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZS5jcHAKQEAgLTkzLDkgKzkzLDEwIEBAIHZvaWQg U2Nyb2xsaW5nU3RhdGVGaXhlZE5vZGU6OnJlY29uY2lsZUxheWVyUG9zaXRpb25Gb3JWaWV3cG9y dFJlY3QoY29uc3QgTGF5b3V0CiAgICAgfQogfQogCi12b2lkIFNjcm9sbGluZ1N0YXRlRml4ZWRO b2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgU2Nyb2xsaW5n U3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IpIGNvbnN0Cit2b2lkIFNjcm9sbGluZ1N0YXRlRml4ZWRO b2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgU2Nyb2xsaW5n U3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IgYmVoYXZpb3IpIGNvbnN0CiB7CiAgICAgdHMgPDwgIigi IDw8ICJGaXhlZCBub2RlIiA8PCAiXG4iOworICAgIFNjcm9sbGluZ1N0YXRlTm9kZTo6ZHVtcFBy b3BlcnRpZXModHMsIGluZGVudCwgYmVoYXZpb3IpOwogCiAgICAgaWYgKG1fY29uc3RyYWludHMu YW5jaG9yRWRnZXMoKSkgewogICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50ICsgMSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5v ZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2Rl LmNwcAppbmRleCA2MWRhNThhOWRlZWMwZjY4ZDVkYTYyMGUyZDZmZDgwMzE1YTc0YzIwLi5mNjZm NDlkZjgwMDQ0YThjMWVhNzEwMjVlNzEwN2Q2MDZhOGI4Njg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAKQEAgLTExMiw2 ICsxMTIsMTkgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZU5vZGU6OnNldExheWVyKGNvbnN0IExheWVy UmVwcmVzZW50YXRpb24mIGxheWVyUmVwcmVzZW50YXRpb24KICAgICBzZXRQcm9wZXJ0eUNoYW5n ZWQoU2Nyb2xsTGF5ZXIpOwogfQogCit2b2lkIFNjcm9sbGluZ1N0YXRlTm9kZTo6ZHVtcFByb3Bl cnRpZXMoVGV4dFN0cmVhbSYgdHMsIGludCBpbmRlbnQsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4 dEJlaGF2aW9yIGJlaGF2aW9yKSBjb25zdAoreworICAgIGlmIChiZWhhdmlvciAmIFNjcm9sbGlu Z1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9ySW5jbHVkZU5vZGVJRHMpIHsKKyAgICAgICAgd3JpdGVJ bmRlbnQodHMsIGluZGVudCArIDEpOworICAgICAgICB0cyA8PCAiKG5vZGVJRCAiIDw8IHNjcm9s bGluZ05vZGVJRCgpIDw8ICIpXG4iOworICAgIH0KKyAgICAKKyAgICBpZiAoYmVoYXZpb3IgJiBT Y3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvckluY2x1ZGVMYXllcklEcykgeworICAgICAg ICB3cml0ZUluZGVudCh0cywgaW5kZW50ICsgMSk7CisgICAgICAgIHRzIDw8ICIobGF5ZXJJRCAi IDw8IGxheWVyKCkubGF5ZXJJRCgpIDw8ICIpXG4iOworICAgIH0KK30KKwogdm9pZCBTY3JvbGxp bmdTdGF0ZU5vZGU6OmR1bXAoVGV4dFN0cmVhbSYgdHMsIGludCBpbmRlbnQsIFNjcm9sbGluZ1N0 YXRlVHJlZUFzVGV4dEJlaGF2aW9yIGJlaGF2aW9yKSBjb25zdAogewogICAgIHdyaXRlSW5kZW50 KHRzLCBpbmRlbnQpOwpAQCAtMTMxLDExICsxNDQsMTEgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZU5v ZGU6OmR1bXAoVGV4dFN0cmVhbSYgdHMsIGludCBpbmRlbnQsIFNjcm9sbGluZ1N0YXRlVHJlZUFz VGUKICAgICB0cyA8PCAiKVxuIjsKIH0KIAotU3RyaW5nIFNjcm9sbGluZ1N0YXRlTm9kZTo6c2Ny b2xsaW5nU3RhdGVUcmVlQXNUZXh0KCkgY29uc3QKK1N0cmluZyBTY3JvbGxpbmdTdGF0ZU5vZGU6 OnNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlv ciBiZWhhdmlvcikgY29uc3QKIHsKICAgICBUZXh0U3RyZWFtIHRzKFRleHRTdHJlYW06OkxpbmVN b2RlOjpNdWx0aXBsZUxpbmUsIFRleHRTdHJlYW06OkZvcm1hdHRpbmc6OlNWR1N0eWxlUmVjdCk7 CiAKLSAgICBkdW1wKHRzLCAwLCBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvck5vcm1h bCk7CisgICAgZHVtcCh0cywgMCwgYmVoYXZpb3IpOwogICAgIHJldHVybiB0cy5yZWxlYXNlKCk7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1N0YXRlTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3Rh dGVOb2RlLmgKaW5kZXggMDg3ZDYxODI5YWRlNTQ2MTA2MTIwNTc1YmQ0MWExNjgwZWJjMWQxZi4u OTU0MjkzZDNjNGVlYTVmYmUxNWI4YmMzY2MwMjZlMGRlNmM2OGU5MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKQEAgLTM5LDE1 ICszOSw2IEBAIGNsYXNzIEdyYXBoaWNzTGF5ZXI7CiBjbGFzcyBTY3JvbGxpbmdTdGF0ZVRyZWU7 CiBjbGFzcyBUZXh0U3RyZWFtOwogCi1lbnVtIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2 aW9yRmxhZ3MgewotICAgIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yTm9ybWFsICAg ICAgICAgICAgICAgICAgPSAwLAotICAgIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9y SW5jbHVkZUxheWVySURzICAgICAgICAgPSAxIDw8IDAsCi0gICAgU2Nyb2xsaW5nU3RhdGVUcmVl QXNUZXh0QmVoYXZpb3JJbmNsdWRlTm9kZUlEcyAgICAgICAgICA9IDEgPDwgMSwKLSAgICBTY3Jv bGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvckluY2x1ZGVMYXllclBvc2l0aW9ucyAgID0gMSA8 PCAyLAotICAgIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yRGVidWcgICAgICAgICAg ICAgICAgICAgPSBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvckluY2x1ZGVMYXllcklE cyB8IFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9ySW5jbHVkZU5vZGVJRHMgfCBTY3Jv bGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvckluY2x1ZGVMYXllclBvc2l0aW9ucwotfTsKLXR5 cGVkZWYgdW5zaWduZWQgU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3I7Ci0KIC8vIFVz ZWQgdG8gYWxsb3cgU2Nyb2xsaW5nU3RhdGVOb2RlcyB0byByZWZlciB0byBsYXllcnMgaW4gdmFy aW91cyBjb250ZXh0czoKIC8vIGEpIEFzeW5jIHNjcm9sbGluZywgbWFpbiB0aHJlYWQ6IFNjcm9s bGluZ1N0YXRlTm9kZSBob2xkcyBvbnRvIGEgR3JhcGhpY3NMYXllciwgYW5kIHVzZXMgbV9sYXll cklECiAvLyAgICB0byBkZXRlY3Qgd2hldGhlciB0aGF0IEdyYXBoaWNzTGF5ZXIncyB1bmRlcmx5 aW5nIFBsYXRmb3JtTGF5ZXIgY2hhbmdlZC4KQEAgLTI0MCwxNiArMjMxLDE2IEBAIHB1YmxpYzoK IAogICAgIHZvaWQgYXBwZW5kQ2hpbGQoUmVmPFNjcm9sbGluZ1N0YXRlTm9kZT4mJik7CiAKLSAg ICBTdHJpbmcgc2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0KCkgY29uc3Q7CisgICAgU3RyaW5nIHNj cm9sbGluZ1N0YXRlVHJlZUFzVGV4dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvciA9 IFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yTm9ybWFsKSBjb25zdDsKIAogcHJvdGVj dGVkOgogICAgIFNjcm9sbGluZ1N0YXRlTm9kZShjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmLCBT Y3JvbGxpbmdTdGF0ZVRyZWUmKTsKIAorICAgIHZpcnR1YWwgdm9pZCBkdW1wUHJvcGVydGllcyhU ZXh0U3RyZWFtJiwgaW50IGluZGVudCwgU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3Ip IGNvbnN0OworICAgIAogcHJpdmF0ZToKICAgICB2b2lkIGR1bXAoVGV4dFN0cmVhbSYsIGludCBp bmRlbnQsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yKSBjb25zdDsKIAotICAgIHZp cnR1YWwgdm9pZCBkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFtJiwgaW50IGluZGVudCwgU2Nyb2xs aW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IpIGNvbnN0ID0gMDsKLQogICAgIGNvbnN0IFNjcm9s bGluZ05vZGVUeXBlIG1fbm9kZVR5cGU7CiAgICAgU2Nyb2xsaW5nTm9kZUlEIG1fbm9kZUlEOwog ICAgIENoYW5nZWRQcm9wZXJ0aWVzIG1fY2hhbmdlZFByb3BlcnRpZXM7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxp bmdOb2RlLmNwcAppbmRleCBiM2RlMjYzMjQ0Y2E4YzIxODIwMDJiZDYyZDQxZjVjMzhkOGE4ODM4 Li5kYWQwNWQzMTFhMDZhMjE1M2Y2MDA2YjJkYmUzM2YzOTFmODFkZGI3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZS5jcHAKQEAgLTE4NSw4ICsxODUsMTAgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGU6OnNldEV4cGVjdHNXaGVlbEV2ZW50VGVzdFRyaWdnZXIoYm9vbCBleHBlY3Rz VGUKICAgICBzZXRQcm9wZXJ0eUNoYW5nZWQoRXhwZWN0c1doZWVsRXZlbnRUZXN0VHJpZ2dlcik7 CiB9CiAKLXZvaWQgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpkdW1wUHJvcGVydGllcyhU ZXh0U3RyZWFtJiB0cywgaW50IGluZGVudCwgU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZp b3IpIGNvbnN0Cit2b2lkIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6ZHVtcFByb3BlcnRp ZXMoVGV4dFN0cmVhbSYgdHMsIGludCBpbmRlbnQsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJl aGF2aW9yIGJlaGF2aW9yKSBjb25zdAogeworICAgIFNjcm9sbGluZ1N0YXRlTm9kZTo6ZHVtcFBy b3BlcnRpZXModHMsIGluZGVudCwgYmVoYXZpb3IpOworICAgIAogICAgIGlmIChtX3Njcm9sbFBv c2l0aW9uICE9IEZsb2F0UG9pbnQoKSkgewogICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50 ICsgMSk7CiAgICAgICAgIHRzIDw8ICIoc2Nyb2xsIHBvc2l0aW9uICIKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGUu Y3BwCmluZGV4IDkxMmY1YjlkNzg3YTUzOTlmZjU5ZmJhNGVmNmFkYjJmYTQyOGYwYTcuLjc2N2U2 ZmI0MDZlYmNhOTFmNDg4MjFjNjQzZDIyMTNkZmI4MGRjNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlLmNw cApAQCAtOTMsOSArOTMsMTAgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OnJlY29u Y2lsZUxheWVyUG9zaXRpb25Gb3JWaWV3cG9ydFJlY3QoY29uc3QgTGF5b3UKICAgICB9CiB9CiAK LXZvaWQgU2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlOjpkdW1wUHJvcGVydGllcyhUZXh0U3RyZWFt JiB0cywgaW50IGluZGVudCwgU2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IpIGNvbnN0 Cit2b2lkIFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZTo6ZHVtcFByb3BlcnRpZXMoVGV4dFN0cmVh bSYgdHMsIGludCBpbmRlbnQsIFNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJlaGF2aW9yIGJlaGF2 aW9yKSBjb25zdAogewogICAgIHRzIDw8ICIoIiA8PCAiU3RpY2t5IG5vZGUiIDw8ICJcbiI7Cisg ICAgU2Nyb2xsaW5nU3RhdGVOb2RlOjpkdW1wUHJvcGVydGllcyh0cywgaW5kZW50LCBiZWhhdmlv cik7CiAKICAgICBpZiAobV9jb25zdHJhaW50cy5hbmNob3JFZGdlcygpKSB7CiAgICAgICAgIHdy aXRlSW5kZW50KHRzLCBpbmRlbnQgKyAxKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuY3BwCmluZGV4IDBiYmMxYjczMzgyNzE5YjYy NThkMTFkMDQ5NDMzZTMyOTg3YTNlMDguLmMwNWM1MWQxNGYwNGY0YTdmMWI5MmI2ZGRmMzM1ZTVj Y2NlMmNjMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVUcmVlLmNwcApAQCAtMjc2LDcgKzI3Niw3IEBAIHZvaWQgc2hvd1Njcm9sbGlu Z1N0YXRlVHJlZShjb25zdCBXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVRyZWUqIHRyZWUpCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBTdHJpbmcgb3V0cHV0ID0gcm9vdE5vZGUtPnNjcm9s bGluZ1N0YXRlVHJlZUFzVGV4dCgpOworICAgIFN0cmluZyBvdXRwdXQgPSByb290Tm9kZS0+c2Ny b2xsaW5nU3RhdGVUcmVlQXNUZXh0KFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJlZUFzVGV4dEJl aGF2aW9yRGVidWcpOwogICAgIGZwcmludGYoc3RkZXJyLCAiJXNcbiIsIG91dHB1dC51dGY4KCku ZGF0YSgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLm1tCmluZGV4IGEzMDIyNzY1MjUxZTc0 NTIzOTk3NTUyYjc1YjFjMmNiODhlODZhYjguLmE5OWJmN2Q3M2U5ZmJkMDUwOGQ3MWY3MWE2MWIy MDA0ZjZkMmUzNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21h Yy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0KQEAgLTExNyw3ICsxMTcsNyBA QCB2b2lkIFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpjb21taXRUcmVlU3RhdGUoKQogICAgIGlm ICghc2Nyb2xsaW5nU3RhdGVUcmVlKCktPmhhc0NoYW5nZWRQcm9wZXJ0aWVzKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIExPRyhTY3JvbGxpbmcsICIlcyIsIHNjcm9sbGluZ1N0YXRlVHJlZUFz VGV4dCgpLnV0ZjgoKS5kYXRhKCkpOworICAgIExPRyhTY3JvbGxpbmcsICIlcyIsIHNjcm9sbGlu Z1N0YXRlVHJlZUFzVGV4dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvckRlYnVnKS51 dGY4KCkuZGF0YSgpKTsKIAogICAgIFJlZlB0cjxUaHJlYWRlZFNjcm9sbGluZ1RyZWU+IHRocmVh ZGVkU2Nyb2xsaW5nVHJlZSA9IGRvd25jYXN0PFRocmVhZGVkU2Nyb2xsaW5nVHJlZT4oc2Nyb2xs aW5nVHJlZSgpKTsKICAgICBTY3JvbGxpbmdTdGF0ZVRyZWUqIHVucHJvdGVjdGVkVHJlZVN0YXRl ID0gc2Nyb2xsaW5nU3RhdGVUcmVlKCktPmNvbW1pdChMYXllclJlcHJlc2VudGF0aW9uOjpQbGF0 Zm9ybUxheWVyUmVwcmVzZW50YXRpb24pLnJlbGVhc2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggNDM2MmQzMWM2MTZlODI3NzMx Y2Q3ZTQ5ZTE5MjcyM2FiNWVkYzExNS4uYjM1NjZlOTIyM2M0NWFiOWIxZjhiODcyY2U3ZTFkMmU3 ZTgyZmU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy QmFja2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAKICNpbmNsdWRlICJIVE1MUGx1Z0luRWxlbWVudC5o IgogI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oIgogI2luY2x1ZGUgIktleWZy YW1lTGlzdC5oIgorI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJNYWluRnJhbWUuaCIK ICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGx1Z2luVmlld0Jhc2UuaCIKQEAgLTE3ODAs MTEgKzE3ODEsMTMgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmRldGFjaEZyb21TY3JvbGxp bmdDb29yZGluYXRvcihMYXllclNjcm9sbENvb3JkaW5hdGlvblIKICAgICAgICAgcmV0dXJuOwog CiAgICAgaWYgKChyb2xlcyAmIFNjcm9sbGluZykgJiYgbV9zY3JvbGxpbmdOb2RlSUQpIHsKKyAg ICAgICAgTE9HKENvbXBvc2l0aW5nLCAiRGV0YWNoaW5nIFNjcm9sbGluZyBub2RlICVsbHUiLCBt X3Njcm9sbGluZ05vZGVJRCk7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5kZXRhY2hG cm9tU3RhdGVUcmVlKG1fc2Nyb2xsaW5nTm9kZUlEKTsKICAgICAgICAgbV9zY3JvbGxpbmdOb2Rl SUQgPSAwOwogICAgIH0KICAgICAKICAgICBpZiAoKHJvbGVzICYgVmlld3BvcnRDb25zdHJhaW5l ZCkgJiYgbV92aWV3cG9ydENvbnN0cmFpbmVkTm9kZUlEKSB7CisgICAgICAgIExPRyhDb21wb3Np dGluZywgIkRldGFjaGluZyBWaWV3cG9ydENvbnN0cmFpbmVkIG5vZGUgJWxsdSIsIG1fdmlld3Bv cnRDb25zdHJhaW5lZE5vZGVJRCk7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5kZXRh Y2hGcm9tU3RhdGVUcmVlKG1fdmlld3BvcnRDb25zdHJhaW5lZE5vZGVJRCk7CiAgICAgICAgIG1f dmlld3BvcnRDb25zdHJhaW5lZE5vZGVJRCA9IDA7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCA2ODM0OGM2ZWJh OTQ1ODdhMGQ4YWMwZjZhNzFlOTgwNjZiMTg0MTY3Li5mODU5ZWY1MmQ1NGJjYzE3NzBlYmRiYWQz ZDM0MTkwYjU2ZDhmMGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtODEwLDcgKzgxMCw3IEBAIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpsb2dMYXllckluZm8oY29uc3QgUmVuZGVyTGF5ZXImIGxheWVyLCBpbnQg ZGVwdGgpCiAgICAgYWJzb2x1dGVCb3VuZHMubW92ZShsYXllci5vZmZzZXRGcm9tQW5jZXN0b3Io bV9yZW5kZXJWaWV3LmxheWVyKCkpKTsKICAgICAKICAgICBTdHJpbmdCdWlsZGVyIGxvZ1N0cmlu ZzsKLSAgICBsb2dTdHJpbmcuYXBwZW5kKFN0cmluZzo6Zm9ybWF0KCIlKnAgKCUuM2YsJS4zZi0l LjNmLCUuM2YpICUuMmZLQiIsIDEyICsgZGVwdGggKiAyLCAmbGF5ZXIsCisgICAgbG9nU3RyaW5n LmFwcGVuZChTdHJpbmc6OmZvcm1hdCgiJSpwIGlkICVsbHUgKCUuM2YsJS4zZi0lLjNmLCUuM2Yp ICUuMmZLQiIsIDEyICsgZGVwdGggKiAyLCAmbGF5ZXIsIGJhY2tpbmctPmdyYXBoaWNzTGF5ZXIo KS0+cHJpbWFyeUxheWVySUQoKSwKICAgICAgICAgYWJzb2x1dGVCb3VuZHMueCgpLnRvRmxvYXQo KSwgYWJzb2x1dGVCb3VuZHMueSgpLnRvRmxvYXQoKSwgYWJzb2x1dGVCb3VuZHMubWF4WCgpLnRv RmxvYXQoKSwgYWJzb2x1dGVCb3VuZHMubWF4WSgpLnRvRmxvYXQoKSwKICAgICAgICAgYmFja2lu Zy0+YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKSAvIDEwMjQpKTsKICAgICAKQEAgLTM5MDQs NiArMzkwNCw4IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29y ZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgTGF5CiAgICAgICAgIFNjcm9sbGluZ05v ZGVJRCBub2RlSUQgPSBhdHRhY2hTY3JvbGxpbmdOb2RlKGxheWVyLCBub2RlVHlwZSwgcGFyZW50 Tm9kZUlEKTsKICAgICAgICAgaWYgKCFub2RlSUQpCiAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICAKKyAgICAgICAgTE9HKENvbXBvc2l0aW5nLCAiUmVnaXN0ZXJpbmcgVmlld3BvcnRD b25zdHJhaW5lZCBzY3JvbGxpbmcgbm9kZSAlbGx1IChsYXllciAlbGx1KSBhcyBjaGlsZCBvZiAl bGx1Iiwgbm9kZUlELCBiYWNraW5nLT5ncmFwaGljc0xheWVyKCktPnByaW1hcnlMYXllcklEKCks IHBhcmVudE5vZGVJRCk7CiAKICAgICAgICAgc3dpdGNoIChub2RlVHlwZSkgewogICAgICAgICBj YXNlIEZpeGVkTm9kZToKQEAgLTM5MjAsNyArMzkyMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwg TGF5CiAgICAgICAgIHBhcmVudE5vZGVJRCA9IG5vZGVJRDsKICAgICB9IGVsc2UKICAgICAgICAg ZGV0YWNoU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihsYXllciwgVmlld3BvcnRDb25zdHJhaW5lZCk7 Ci0KKyAgICAgICAgCiAgICAgaWYgKHJlYXNvbnMgJiBTY3JvbGxpbmcpIHsKICAgICAgICAgaWYg KGlzUm9vdExheWVyKQogICAgICAgICAgICAgdXBkYXRlU2Nyb2xsQ29vcmRpbmF0aW9uRm9yVGhp c0ZyYW1lKHBhcmVudE5vZGVJRCk7CkBAIC0zOTQ4LDYgKzM5NTAsOSBAQCB2b2lkIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6dXBkYXRlU2Nyb2xsQ29vcmRpbmF0ZWRMYXllcihSZW5kZXJMYXllciYg bGF5ZXIsIExheQogICAgICAgICAgICAgc2Nyb2xsaW5nR2VvbWV0cnkuY3VycmVudEhvcml6b250 YWxTbmFwUG9pbnRJbmRleCA9IGxheWVyLmN1cnJlbnRIb3Jpem9udGFsU25hcFBvaW50SW5kZXgo KTsKICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2lu dEluZGV4ID0gbGF5ZXIuY3VycmVudFZlcnRpY2FsU25hcFBvaW50SW5kZXgoKTsKICNlbmRpZgor CisgICAgICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJSZWdpc3RlcmluZyBTY3JvbGxpbmcgc2Ny b2xsaW5nIG5vZGUgJWxsdSAobGF5ZXIgJWxsdSkgYXMgY2hpbGQgb2YgJWxsdSIsIG5vZGVJRCwg YmFja2luZy0+Z3JhcGhpY3NMYXllcigpLT5wcmltYXJ5TGF5ZXJJRCgpLCBwYXJlbnROb2RlSUQp OworCiAgICAgICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+dXBkYXRlT3ZlcmZsb3dTY3Jv bGxpbmdOb2RlKG5vZGVJRCwgYmFja2luZy0+c2Nyb2xsaW5nTGF5ZXIoKSwgYmFja2luZy0+c2Ny b2xsaW5nQ29udGVudHNMYXllcigpLCAmc2Nyb2xsaW5nR2VvbWV0cnkpOwogICAgICAgICB9CiAg ICAgfSBlbHNlCg==