195907 2019-03-18 13:41:13 -0700 Call transition and animation callbacks on non-composited renderers too. 2019-03-18 15:46:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1517886 0 zalan 2019-03-18 13:41:13 -0700 and move the logic over to RenderLayerModelObject 1517889 1 365056 zalan 2019-03-18 13:45:32 -0700 Created attachment 365056 Patch 1517952 2 365074 zalan 2019-03-18 15:23:44 -0700 Created attachment 365074 Patch 1517971 3 365074 commit-queue 2019-03-18 15:45:53 -0700 Comment on attachment 365074 Patch Clearing flags on attachment: 365074 Committed r243112: <https://trac.webkit.org/changeset/243112> 1517972 4 commit-queue 2019-03-18 15:45:55 -0700 All reviewed patches have been landed. Closing bug. 1517973 5 webkit-bug-importer 2019-03-18 15:46:17 -0700 <rdar://problem/48997304> 365056 2019-03-18 13:45:32 -0700 2019-03-18 15:23:43 -0700 Patch bug-195907-20190318134531.patch text/plain 9065 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGM0ZDE0ZjU3MjdjY2Vm NDMwZThiODkwNDRjYWQyYjk3Y2NmNDcwZi4uYTNjZDM0ZjE1ZGRiYjM4YTZmNTgyN2M3YjRiOTg3 YTFlNDFmNTUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTAzLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2FsbCB0cmFuc2l0aW9uIGFu ZCBhbmltYXRpb24gY2FsbGJhY2tzIG9uIG5vbi1jb21wb3NpdGVkIHJlbmRlcmVycyB0b28uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU5MDcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVzZSBjYWxs YmFja3MgYXJlIG5vdCBjb21wb3NpdGVkIHNwZWNpZmljIGZ1bmN0aW9ucy4KKworICAgICAgICAq IHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5p bWF0aW9uQmFzZTo6ZnJlZXplQXRUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkJh c2U6OmNvbXBvc2l0ZWRSZW5kZXJlciBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9h bmltYXRpb24vQW5pbWF0aW9uQmFzZS5oOgorICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0ltcGxp Y2l0QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltcGxpY2l0QW5pbWF0aW9uOjpz dGFydEFuaW1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpJbXBsaWNpdEFuaW1hdGlvbjo6cGF1 c2VBbmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW1wbGljaXRBbmltYXRpb246OmVuZEFu aW1hdGlvbik6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vS2V5ZnJhbWVBbmltYXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVBbmltYXRpb246OnN0YXJ0QW5pbWF0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5pbWF0aW9uOjpwYXVzZUFuaW1hdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6ZW5kQW5pbWF0aW9uKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllck1vZGVsT2JqZWN0OjpzdGFydFRyYW5zaXRpb24pOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6dHJhbnNpdGlvblBhdXNlZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVsT2JqZWN0Ojp0cmFuc2l0aW9uRmluaXNoZWQp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6c3RhcnRBbmltYXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6YW5pbWF0aW9u UGF1c2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OmFuaW1h dGlvblNlZWtlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVsT2JqZWN0Ojph bmltYXRpb25GaW5pc2hlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVsT2Jq ZWN0OjpzdXNwZW5kQW5pbWF0aW9ucyk6CisKIDIwMTktMDMtMTggIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIGFuaW1hdGlvbiBhbmQgdHJhbnNpdGlvbiBm dW5jdGlvbnMgZnJvbSBSZW5kZXJCb3hNb2RlbE9iamVjdCB0byBSZW5kZXJFbGVtZW50CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCmluZGV4IDVl NzE3M2Q0ODNiMzU0MjY0MzkxMDYzNmE2NTRmZjlhMWZmMGQ4MDEuLmRlY2E2YzFjODU3YTYyNDM0 NWQ4ZDlkZjMzMGZkYWNiODczNDE3ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv YW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5p bWF0aW9uL0FuaW1hdGlvbkJhc2UuY3BwCkBAIC02OSwxNCArNjksNiBAQCBSZW5kZXJFbGVtZW50 KiBBbmltYXRpb25CYXNlOjpyZW5kZXJlcigpIGNvbnN0CiAgICAgcmV0dXJuIG1fZWxlbWVudCA/ IG1fZWxlbWVudC0+cmVuZGVyZXIoKSA6IG51bGxwdHI7CiB9CiAKLVJlbmRlckxheWVyTW9kZWxP YmplY3QqIEFuaW1hdGlvbkJhc2U6OmNvbXBvc2l0ZWRSZW5kZXJlcigpIGNvbnN0Ci17Ci0gICAg YXV0byogcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigpOwotICAgIGlmICghcmVuZGVyZXIgfHwg IXJlbmRlcmVyLT5pc0NvbXBvc2l0ZWQoKSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAg cmV0dXJuIGRvd25jYXN0PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+KHJlbmRlcmVyKTsKLX0KLQog dm9pZCBBbmltYXRpb25CYXNlOjpjbGVhcigpCiB7CiAgICAgZW5kQW5pbWF0aW9uKCk7CkBAIC02 NzksNyArNjcxLDcgQEAgdm9pZCBBbmltYXRpb25CYXNlOjpmcmVlemVBdFRpbWUoZG91YmxlIHQp CiAgICAgZWxzZQogICAgICAgICBtX3BhdXNlVGltZSA9IG1fc3RhcnRUaW1lLnZhbHVlT3IoMCkg KyB0IC0gbV9hbmltYXRpb24tPmRlbGF5KCk7CiAKLSAgICBpZiAoYXV0byogcmVuZGVyZXIgPSBj b21wb3NpdGVkUmVuZGVyZXIoKSkKKyAgICBpZiAoYXV0byogcmVuZGVyZXIgPSB0aGlzLT5yZW5k ZXJlcigpKQogICAgICAgICByZW5kZXJlci0+c3VzcGVuZEFuaW1hdGlvbnMoTW9ub3RvbmljVGlt ZTo6ZnJvbVJhd1NlY29uZHMobV9wYXVzZVRpbWUudmFsdWUoKSkpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKaW5kZXggY2QzMTc0MzI0ZDRi YTYxNDRhOGU1NTlmZDRmMDU4MWM0YTZkODNmOC4uZjdhYmJhZmUwN2U5NTkwZTMwYjc1NWVjYzli NmY0NmE4YmM2ZjgzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24v QW5pbWF0aW9uQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1h dGlvbkJhc2UuaApAQCAtMzksNyArMzksNiBAQCBjbGFzcyBDb21wb3NpdGVBbmltYXRpb247CiBj bGFzcyBFbGVtZW50OwogY2xhc3MgRmxvYXRSZWN0OwogY2xhc3MgTGF5b3V0UmVjdDsKLWNsYXNz IFJlbmRlckxheWVyTW9kZWxPYmplY3Q7CiBjbGFzcyBSZW5kZXJFbGVtZW50OwogY2xhc3MgUmVu ZGVyU3R5bGU7CiBjbGFzcyBUaW1pbmdGdW5jdGlvbjsKQEAgLTYyLDcgKzYxLDYgQEAgcHVibGlj OgogICAgIEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2VsZW1lbnQuZ2V0KCk7 IH0KICAgICBjb25zdCBSZW5kZXJTdHlsZSYgY3VycmVudFN0eWxlKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgUmVuZGVyRWxlbWVudCogcmVuZGVyZXIoKSBjb25zdCBvdmVycmlkZTsKLSAgICBSZW5k ZXJMYXllck1vZGVsT2JqZWN0KiBjb21wb3NpdGVkUmVuZGVyZXIoKSBjb25zdDsKICAgICB2b2lk IGNsZWFyKCk7CiAKICAgICBkb3VibGUgZHVyYXRpb24oKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcAppbmRleCAxZDUx NTdjYmMzZjcxNDJhZGI0NDQ3NGI1ZjI5YWM5MzY3MGEwYjBhLi40MzM0ZTMwNzE2MjllMDU1Zjgz ZTg0MTBkMzdjYTQ3YWQ1YmJkOWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2Fu aW1hdGlvbi9JbXBsaWNpdEFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9h bmltYXRpb24vSW1wbGljaXRBbmltYXRpb24uY3BwCkBAIC0xNDQsMTQgKzE0NCwxNCBAQCBib29s IEltcGxpY2l0QW5pbWF0aW9uOjphZmZlY3RzQWNjZWxlcmF0ZWRQcm9wZXJ0eSgpIGNvbnN0CiAK IGJvb2wgSW1wbGljaXRBbmltYXRpb246OnN0YXJ0QW5pbWF0aW9uKGRvdWJsZSB0aW1lT2Zmc2V0 KQogewotICAgIGlmIChhdXRvKiByZW5kZXJlciA9IGNvbXBvc2l0ZWRSZW5kZXJlcigpKQorICAg IGlmIChhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybiBy ZW5kZXJlci0+c3RhcnRUcmFuc2l0aW9uKHRpbWVPZmZzZXQsIG1fYW5pbWF0aW5nUHJvcGVydHks IG1fZnJvbVN0eWxlLmdldCgpLCBtX3RvU3R5bGUuZ2V0KCkpOwogICAgIHJldHVybiBmYWxzZTsK IH0KIAogdm9pZCBJbXBsaWNpdEFuaW1hdGlvbjo6cGF1c2VBbmltYXRpb24oZG91YmxlIHRpbWVP ZmZzZXQpCiB7Ci0gICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gY29tcG9zaXRlZFJlbmRlcmVyKCkp CisgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKSkKICAgICAgICAgcmVu ZGVyZXItPnRyYW5zaXRpb25QYXVzZWQodGltZU9mZnNldCwgbV9hbmltYXRpbmdQcm9wZXJ0eSk7 CiAgICAgLy8gUmVzdG9yZSB0aGUgb3JpZ2luYWwgKHVuYW5pbWF0ZWQpIHN0eWxlCiAgICAgaWYg KCFwYXVzZWQoKSkKQEAgLTE2MCw3ICsxNjAsNyBAQCB2b2lkIEltcGxpY2l0QW5pbWF0aW9uOjpw YXVzZUFuaW1hdGlvbihkb3VibGUgdGltZU9mZnNldCkKIAogdm9pZCBJbXBsaWNpdEFuaW1hdGlv bjo6ZW5kQW5pbWF0aW9uKGJvb2wpCiB7Ci0gICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gY29tcG9z aXRlZFJlbmRlcmVyKCkpCisgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIo KSkKICAgICAgICAgcmVuZGVyZXItPnRyYW5zaXRpb25GaW5pc2hlZChtX2FuaW1hdGluZ1Byb3Bl cnR5KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5 ZnJhbWVBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vS2V5ZnJh bWVBbmltYXRpb24uY3BwCmluZGV4IGRlZmEzZmRjMjI4ZDk0M2UzOGY2M2YwNTZkZGI2NDllZjAx YWMyYzIuLjUwMjZkZmQwYmVmMjhjN2Q4OGI1MmQyODMzMmQ5NzBhMDMzZWQ1ODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9LZXlmcmFtZUFuaW1hdGlvbi5jcHAK QEAgLTI5MSw3ICsyOTEsNyBAQCBib29sIEtleWZyYW1lQW5pbWF0aW9uOjpoYXNBbmltYXRpb25G b3JQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5KSBjb25zdAogCiBib29sIEtleWZyYW1l QW5pbWF0aW9uOjpzdGFydEFuaW1hdGlvbihkb3VibGUgdGltZU9mZnNldCkKIHsKLSAgICBpZiAo YXV0byogcmVuZGVyZXIgPSBjb21wb3NpdGVkUmVuZGVyZXIoKSkKKyAgICBpZiAoYXV0byogcmVu ZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm4gcmVuZGVyZXItPnN0YXJ0 QW5pbWF0aW9uKHRpbWVPZmZzZXQsIG1fYW5pbWF0aW9uLnB0cigpLCBtX2tleWZyYW1lcyk7CiAg ICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtMzAxLDcgKzMwMSw3IEBAIHZvaWQgS2V5ZnJhbWVBbmlt YXRpb246OnBhdXNlQW5pbWF0aW9uKGRvdWJsZSB0aW1lT2Zmc2V0KQogICAgIGlmICghZWxlbWVu dCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoYXV0byogcmVuZGVyZXIgPSBjb21wb3Np dGVkUmVuZGVyZXIoKSkKKyAgICBpZiAoYXV0byogcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigp KQogICAgICAgICByZW5kZXJlci0+YW5pbWF0aW9uUGF1c2VkKHRpbWVPZmZzZXQsIG1fa2V5ZnJh bWVzLmFuaW1hdGlvbk5hbWUoKSk7CiAKICAgICAvLyBSZXN0b3JlIHRoZSBvcmlnaW5hbCAodW5h bmltYXRlZCkgc3R5bGUKQEAgLTMxNCw3ICszMTQsNyBAQCB2b2lkIEtleWZyYW1lQW5pbWF0aW9u OjplbmRBbmltYXRpb24oYm9vbCBmaWxsaW5nRm9yd2FyZHMpCiAgICAgaWYgKCFlbGVtZW50KCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChhdXRvKiByZW5kZXJlciA9IGNvbXBvc2l0ZWRS ZW5kZXJlcigpKQorICAgIGlmIChhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCkpCiAg ICAgICAgIHJlbmRlcmVyLT5hbmltYXRpb25GaW5pc2hlZChtX2tleWZyYW1lcy5hbmltYXRpb25O YW1lKCkpOwogCiAgICAgLy8gUmVzdG9yZSB0aGUgb3JpZ2luYWwgKHVuYW5pbWF0ZWQpIHN0eWxl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVj dC5jcHAKaW5kZXggZmUyZWQ5YThjMWNkYzdkNDk1YTM5YzZhOWVmYTFjNGFhOGE2NDNjYy4uNGMw MWU4ZTE2Yzc3N2Y5NTYyZGE5NDA3MWVlOWUyNTA0ZjExZDJlYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcApAQCAtMjg1LDU3 ICsyODUsNTcgQEAgdm9pZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0Ojpjb21wdXRlUmVwYWludExh eW91dFJlY3RzKGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmoKIAogYm9vbCBSZW5kZXJMYXllck1v ZGVsT2JqZWN0OjpzdGFydFRyYW5zaXRpb24oZG91YmxlIHRpbWVPZmZzZXQsIENTU1Byb3BlcnR5 SUQgcHJvcGVydHlJZCwgY29uc3QgUmVuZGVyU3R5bGUqIGZyb21TdHlsZSwgY29uc3QgUmVuZGVy U3R5bGUqIHRvU3R5bGUpCiB7Ci0gICAgQVNTRVJUKGhhc0xheWVyKCkpOwotICAgIEFTU0VSVChp c0NvbXBvc2l0ZWQoKSk7CisgICAgaWYgKCFsYXllcigpIHx8ICFsYXllcigpLT5iYWNraW5nKCkp CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4gbGF5ZXIoKS0+YmFja2luZygpLT5z dGFydFRyYW5zaXRpb24odGltZU9mZnNldCwgcHJvcGVydHlJZCwgZnJvbVN0eWxlLCB0b1N0eWxl KTsKIH0KIAogdm9pZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0Ojp0cmFuc2l0aW9uUGF1c2VkKGRv dWJsZSB0aW1lT2Zmc2V0LCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiB7Ci0gICAgQVNTRVJU KGhhc0xheWVyKCkpOwotICAgIEFTU0VSVChpc0NvbXBvc2l0ZWQoKSk7CisgICAgaWYgKCFsYXll cigpIHx8ICFsYXllcigpLT5iYWNraW5nKCkpCisgICAgICAgIHJldHVybjsKICAgICBsYXllcigp LT5iYWNraW5nKCktPnRyYW5zaXRpb25QYXVzZWQodGltZU9mZnNldCwgcHJvcGVydHlJZCk7CiB9 CiAKIHZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6dHJhbnNpdGlvbkZpbmlzaGVkKENTU1By b3BlcnR5SUQgcHJvcGVydHlJZCkKIHsKLSAgICBBU1NFUlQoaGFzTGF5ZXIoKSk7Ci0gICAgQVNT RVJUKGlzQ29tcG9zaXRlZCgpKTsKKyAgICBpZiAoIWxheWVyKCkgfHwgIWxheWVyKCktPmJhY2tp bmcoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIGxheWVyKCktPmJhY2tpbmcoKS0+dHJhbnNpdGlv bkZpbmlzaGVkKHByb3BlcnR5SWQpOwogfQogCiBib29sIFJlbmRlckxheWVyTW9kZWxPYmplY3Q6 OnN0YXJ0QW5pbWF0aW9uKGRvdWJsZSB0aW1lT2Zmc2V0LCBjb25zdCBBbmltYXRpb24qIGFuaW1h dGlvbiwgY29uc3QgS2V5ZnJhbWVMaXN0JiBrZXlmcmFtZXMpCiB7Ci0gICAgQVNTRVJUKGhhc0xh eWVyKCkpOwotICAgIEFTU0VSVChpc0NvbXBvc2l0ZWQoKSk7CisgICAgaWYgKCFsYXllcigpIHx8 ICFsYXllcigpLT5iYWNraW5nKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4g bGF5ZXIoKS0+YmFja2luZygpLT5zdGFydEFuaW1hdGlvbih0aW1lT2Zmc2V0LCBhbmltYXRpb24s IGtleWZyYW1lcyk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6YW5pbWF0aW9u UGF1c2VkKGRvdWJsZSB0aW1lT2Zmc2V0LCBjb25zdCBTdHJpbmcmIG5hbWUpCiB7Ci0gICAgQVNT RVJUKGhhc0xheWVyKCkpOwotICAgIEFTU0VSVChpc0NvbXBvc2l0ZWQoKSk7CisgICAgaWYgKCFs YXllcigpIHx8ICFsYXllcigpLT5iYWNraW5nKCkpCisgICAgICAgIHJldHVybjsKICAgICBsYXll cigpLT5iYWNraW5nKCktPmFuaW1hdGlvblBhdXNlZCh0aW1lT2Zmc2V0LCBuYW1lKTsKIH0KIAog dm9pZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0OjphbmltYXRpb25TZWVrZWQoZG91YmxlIHRpbWVP ZmZzZXQsIGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKLSAgICBBU1NFUlQoaGFzTGF5ZXIoKSk7Ci0g ICAgQVNTRVJUKGlzQ29tcG9zaXRlZCgpKTsKKyAgICBpZiAoIWxheWVyKCkgfHwgIWxheWVyKCkt PmJhY2tpbmcoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIGxheWVyKCktPmJhY2tpbmcoKS0+YW5p bWF0aW9uU2Vla2VkKHRpbWVPZmZzZXQsIG5hbWUpOwogfQogCiB2b2lkIFJlbmRlckxheWVyTW9k ZWxPYmplY3Q6OmFuaW1hdGlvbkZpbmlzaGVkKGNvbnN0IFN0cmluZyYgbmFtZSkKIHsKLSAgICBB U1NFUlQoaGFzTGF5ZXIoKSk7Ci0gICAgQVNTRVJUKGlzQ29tcG9zaXRlZCgpKTsKKyAgICBpZiAo IWxheWVyKCkgfHwgIWxheWVyKCktPmJhY2tpbmcoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIGxh eWVyKCktPmJhY2tpbmcoKS0+YW5pbWF0aW9uRmluaXNoZWQobmFtZSk7CiB9CiAKIHZvaWQgUmVu ZGVyTGF5ZXJNb2RlbE9iamVjdDo6c3VzcGVuZEFuaW1hdGlvbnMoTW9ub3RvbmljVGltZSB0aW1l KQogewotICAgIEFTU0VSVChoYXNMYXllcigpKTsKLSAgICBBU1NFUlQoaXNDb21wb3NpdGVkKCkp OworICAgIGlmICghbGF5ZXIoKSB8fCAhbGF5ZXIoKS0+YmFja2luZygpKQorICAgICAgICByZXR1 cm47CiAgICAgbGF5ZXIoKS0+YmFja2luZygpLT5zdXNwZW5kQW5pbWF0aW9ucyh0aW1lKTsKIH0K IAo= 365074 2019-03-18 15:23:44 -0700 2019-03-18 15:45:53 -0700 Patch bug-195907-20190318152343.patch text/plain 9030 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRiM2M1MjQ5NzM3MjFk OWUyOTQxZTAzMzg1NTA5ZDlmOTcxODU2ZC4uMWY0NzBmMThkMWI1NWNkMDM4Y2I1ZTU1ODRhZDgw ODc4YTIxNDA5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTAzLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2FsbCB0cmFuc2l0aW9uIGFu ZCBhbmltYXRpb24gY2FsbGJhY2tzIG9uIG5vbi1jb21wb3NpdGVkIHJlbmRlcmVycyB0b28uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU5MDcKKwor ICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGhlc2UgY2FsbGJh Y2tzIGFyZSBub3QgY29tcG9zaXRlZCBzcGVjaWZpYyBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBw YWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1h dGlvbkJhc2U6OmZyZWV6ZUF0VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25CYXNl Ojpjb21wb3NpdGVkUmVuZGVyZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvYW5p bWF0aW9uL0FuaW1hdGlvbkJhc2UuaDoKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9JbXBsaWNp dEFuaW1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbXBsaWNpdEFuaW1hdGlvbjo6c3Rh cnRBbmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW1wbGljaXRBbmltYXRpb246OnBhdXNl QW5pbWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkltcGxpY2l0QW5pbWF0aW9uOjplbmRBbmlt YXRpb24pOgorICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lQW5pbWF0aW9uOjpzdGFydEFuaW1hdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpLZXlmcmFtZUFuaW1hdGlvbjo6cGF1c2VBbmltYXRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6S2V5ZnJhbWVBbmltYXRpb246OmVuZEFuaW1hdGlvbik6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6c3RhcnRUcmFuc2l0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnRyYW5zaXRpb25QYXVzZWQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6dHJhbnNpdGlvbkZpbmlzaGVkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnN0YXJ0QW5pbWF0aW9u KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OmFuaW1hdGlvblBh dXNlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVsT2JqZWN0OjphbmltYXRp b25TZWVrZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6YW5p bWF0aW9uRmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9iamVj dDo6c3VzcGVuZEFuaW1hdGlvbnMpOgorCiAyMDE5LTAzLTE4ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgd2Via2l0RWRpdGFibGVDb250 ZW50Q2hhbmdlZCBldmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRp b24vQW5pbWF0aW9uQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Bbmlt YXRpb25CYXNlLmNwcAppbmRleCA1ZTcxNzNkNDgzYjM1NDI2NDM5MTA2MzZhNjU0ZmY5YTFmZjBk ODAxLi5kZWNhNmMxYzg1N2E2MjQzNDVkOGQ5ZGYzMzBmZGFjYjg3MzQxNzg0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcApAQCAtNjksMTQg KzY5LDYgQEAgUmVuZGVyRWxlbWVudCogQW5pbWF0aW9uQmFzZTo6cmVuZGVyZXIoKSBjb25zdAog ICAgIHJldHVybiBtX2VsZW1lbnQgPyBtX2VsZW1lbnQtPnJlbmRlcmVyKCkgOiBudWxscHRyOwog fQogCi1SZW5kZXJMYXllck1vZGVsT2JqZWN0KiBBbmltYXRpb25CYXNlOjpjb21wb3NpdGVkUmVu ZGVyZXIoKSBjb25zdAotewotICAgIGF1dG8qIHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKTsK LSAgICBpZiAoIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+aXNDb21wb3NpdGVkKCkpCi0gICAgICAg IHJldHVybiBudWxscHRyOwotICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2Jq ZWN0PihyZW5kZXJlcik7Ci19Ci0KIHZvaWQgQW5pbWF0aW9uQmFzZTo6Y2xlYXIoKQogewogICAg IGVuZEFuaW1hdGlvbigpOwpAQCAtNjc5LDcgKzY3MSw3IEBAIHZvaWQgQW5pbWF0aW9uQmFzZTo6 ZnJlZXplQXRUaW1lKGRvdWJsZSB0KQogICAgIGVsc2UKICAgICAgICAgbV9wYXVzZVRpbWUgPSBt X3N0YXJ0VGltZS52YWx1ZU9yKDApICsgdCAtIG1fYW5pbWF0aW9uLT5kZWxheSgpOwogCi0gICAg aWYgKGF1dG8qIHJlbmRlcmVyID0gY29tcG9zaXRlZFJlbmRlcmVyKCkpCisgICAgaWYgKGF1dG8q IHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKSkKICAgICAgICAgcmVuZGVyZXItPnN1c3BlbmRB bmltYXRpb25zKE1vbm90b25pY1RpbWU6OmZyb21SYXdTZWNvbmRzKG1fcGF1c2VUaW1lLnZhbHVl KCkpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQmFz ZS5oCmluZGV4IGNkMzE3NDMyNGQ0YmE2MTQ0YThlNTU5ZmQ0ZjA1ODFjNGE2ZDgzZjguLmY3YWJi YWZlMDdlOTU5MGUzMGI3NTVlY2M5YjZmNDZhOGJjNmY4M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmgKQEAgLTM5LDcgKzM5LDYgQEAgY2xhc3Mg Q29tcG9zaXRlQW5pbWF0aW9uOwogY2xhc3MgRWxlbWVudDsKIGNsYXNzIEZsb2F0UmVjdDsKIGNs YXNzIExheW91dFJlY3Q7Ci1jbGFzcyBSZW5kZXJMYXllck1vZGVsT2JqZWN0OwogY2xhc3MgUmVu ZGVyRWxlbWVudDsKIGNsYXNzIFJlbmRlclN0eWxlOwogY2xhc3MgVGltaW5nRnVuY3Rpb247CkBA IC02Miw3ICs2MSw2IEBAIHB1YmxpYzoKICAgICBFbGVtZW50KiBlbGVtZW50KCkgY29uc3QgeyBy ZXR1cm4gbV9lbGVtZW50LmdldCgpOyB9CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIGN1cnJlbnRT dHlsZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIFJlbmRlckVsZW1lbnQqIHJlbmRlcmVyKCkgY29u c3Qgb3ZlcnJpZGU7Ci0gICAgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogY29tcG9zaXRlZFJlbmRl cmVyKCkgY29uc3Q7CiAgICAgdm9pZCBjbGVhcigpOwogCiAgICAgZG91YmxlIGR1cmF0aW9uKCkg Y29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9JbXBsaWNp dEFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9JbXBsaWNpdEFu aW1hdGlvbi5jcHAKaW5kZXggMWQ1MTU3Y2JjM2Y3MTQyYWRiNDQ0NzRiNWYyOWFjOTM2NzBhMGIw YS4uNDMzNGUzMDcxNjI5ZTA1NWY4M2U4NDEwZDM3Y2E0N2FkNWJiZDllZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vSW1wbGljaXRBbmltYXRpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0ltcGxpY2l0QW5pbWF0aW9uLmNwcApAQCAt MTQ0LDE0ICsxNDQsMTQgQEAgYm9vbCBJbXBsaWNpdEFuaW1hdGlvbjo6YWZmZWN0c0FjY2VsZXJh dGVkUHJvcGVydHkoKSBjb25zdAogCiBib29sIEltcGxpY2l0QW5pbWF0aW9uOjpzdGFydEFuaW1h dGlvbihkb3VibGUgdGltZU9mZnNldCkKIHsKLSAgICBpZiAoYXV0byogcmVuZGVyZXIgPSBjb21w b3NpdGVkUmVuZGVyZXIoKSkKKyAgICBpZiAoYXV0byogcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJl cigpKQogICAgICAgICByZXR1cm4gcmVuZGVyZXItPnN0YXJ0VHJhbnNpdGlvbih0aW1lT2Zmc2V0 LCBtX2FuaW1hdGluZ1Byb3BlcnR5LCBtX2Zyb21TdHlsZS5nZXQoKSwgbV90b1N0eWxlLmdldCgp KTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKIHZvaWQgSW1wbGljaXRBbmltYXRpb246OnBhdXNl QW5pbWF0aW9uKGRvdWJsZSB0aW1lT2Zmc2V0KQogewotICAgIGlmIChhdXRvKiByZW5kZXJlciA9 IGNvbXBvc2l0ZWRSZW5kZXJlcigpKQorICAgIGlmIChhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJl bmRlcmVyKCkpCiAgICAgICAgIHJlbmRlcmVyLT50cmFuc2l0aW9uUGF1c2VkKHRpbWVPZmZzZXQs IG1fYW5pbWF0aW5nUHJvcGVydHkpOwogICAgIC8vIFJlc3RvcmUgdGhlIG9yaWdpbmFsICh1bmFu aW1hdGVkKSBzdHlsZQogICAgIGlmICghcGF1c2VkKCkpCkBAIC0xNjAsNyArMTYwLDcgQEAgdm9p ZCBJbXBsaWNpdEFuaW1hdGlvbjo6cGF1c2VBbmltYXRpb24oZG91YmxlIHRpbWVPZmZzZXQpCiAK IHZvaWQgSW1wbGljaXRBbmltYXRpb246OmVuZEFuaW1hdGlvbihib29sKQogewotICAgIGlmIChh dXRvKiByZW5kZXJlciA9IGNvbXBvc2l0ZWRSZW5kZXJlcigpKQorICAgIGlmIChhdXRvKiByZW5k ZXJlciA9IHRoaXMtPnJlbmRlcmVyKCkpCiAgICAgICAgIHJlbmRlcmVyLT50cmFuc2l0aW9uRmlu aXNoZWQobV9hbmltYXRpbmdQcm9wZXJ0eSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvYW5pbWF0aW9uL0tleWZyYW1lQW5pbWF0aW9uLmNwcAppbmRleCBkZWZhM2ZkYzIyOGQ5 NDNlMzhmNjNmMDU2ZGRiNjQ5ZWYwMWFjMmMyLi41MDI2ZGZkMGJlZjI4YzdkODhiNTJkMjgzMzJk OTcwYTAzM2VkNTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9L ZXlmcmFtZUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24v S2V5ZnJhbWVBbmltYXRpb24uY3BwCkBAIC0yOTEsNyArMjkxLDcgQEAgYm9vbCBLZXlmcmFtZUFu aW1hdGlvbjo6aGFzQW5pbWF0aW9uRm9yUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSkg Y29uc3QKIAogYm9vbCBLZXlmcmFtZUFuaW1hdGlvbjo6c3RhcnRBbmltYXRpb24oZG91YmxlIHRp bWVPZmZzZXQpCiB7Ci0gICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gY29tcG9zaXRlZFJlbmRlcmVy KCkpCisgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKSkKICAgICAgICAg cmV0dXJuIHJlbmRlcmVyLT5zdGFydEFuaW1hdGlvbih0aW1lT2Zmc2V0LCBtX2FuaW1hdGlvbi5w dHIoKSwgbV9rZXlmcmFtZXMpOwogICAgIHJldHVybiBmYWxzZTsKIH0KQEAgLTMwMSw3ICszMDEs NyBAQCB2b2lkIEtleWZyYW1lQW5pbWF0aW9uOjpwYXVzZUFuaW1hdGlvbihkb3VibGUgdGltZU9m ZnNldCkKICAgICBpZiAoIWVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGF1 dG8qIHJlbmRlcmVyID0gY29tcG9zaXRlZFJlbmRlcmVyKCkpCisgICAgaWYgKGF1dG8qIHJlbmRl cmVyID0gdGhpcy0+cmVuZGVyZXIoKSkKICAgICAgICAgcmVuZGVyZXItPmFuaW1hdGlvblBhdXNl ZCh0aW1lT2Zmc2V0LCBtX2tleWZyYW1lcy5hbmltYXRpb25OYW1lKCkpOwogCiAgICAgLy8gUmVz dG9yZSB0aGUgb3JpZ2luYWwgKHVuYW5pbWF0ZWQpIHN0eWxlCkBAIC0zMTQsNyArMzE0LDcgQEAg dm9pZCBLZXlmcmFtZUFuaW1hdGlvbjo6ZW5kQW5pbWF0aW9uKGJvb2wgZmlsbGluZ0ZvcndhcmRz KQogICAgIGlmICghZWxlbWVudCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoYXV0byog cmVuZGVyZXIgPSBjb21wb3NpdGVkUmVuZGVyZXIoKSkKKyAgICBpZiAoYXV0byogcmVuZGVyZXIg PSB0aGlzLT5yZW5kZXJlcigpKQogICAgICAgICByZW5kZXJlci0+YW5pbWF0aW9uRmluaXNoZWQo bV9rZXlmcmFtZXMuYW5pbWF0aW9uTmFtZSgpKTsKIAogICAgIC8vIFJlc3RvcmUgdGhlIG9yaWdp bmFsICh1bmFuaW1hdGVkKSBzdHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwCmluZGV4IGZlMmVkOWE4YzFjZGM3ZDQ5NWEzOWM2 YTllZmExYzRhYThhNjQzY2MuLjRjMDFlOGUxNmM3NzdmOTU2MmRhOTQwNzFlZTllMjUwNGYxMWQy ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVs T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2Rl bE9iamVjdC5jcHAKQEAgLTI4NSw1NyArMjg1LDU3IEBAIHZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9i amVjdDo6Y29tcHV0ZVJlcGFpbnRMYXlvdXRSZWN0cyhjb25zdCBSZW5kZXJMYXllck1vZGVsT2Jq CiAKIGJvb2wgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6c3RhcnRUcmFuc2l0aW9uKGRvdWJsZSB0 aW1lT2Zmc2V0LCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQsIGNvbnN0IFJlbmRlclN0eWxlKiBm cm9tU3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiB0b1N0eWxlKQogewotICAgIEFTU0VSVChoYXNM YXllcigpKTsKLSAgICBBU1NFUlQoaXNDb21wb3NpdGVkKCkpOworICAgIGlmICghbGF5ZXIoKSB8 fCAhbGF5ZXIoKS0+YmFja2luZygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0dXJu IGxheWVyKCktPmJhY2tpbmcoKS0+c3RhcnRUcmFuc2l0aW9uKHRpbWVPZmZzZXQsIHByb3BlcnR5 SWQsIGZyb21TdHlsZSwgdG9TdHlsZSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9iamVj dDo6dHJhbnNpdGlvblBhdXNlZChkb3VibGUgdGltZU9mZnNldCwgQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0eUlkKQogewotICAgIEFTU0VSVChoYXNMYXllcigpKTsKLSAgICBBU1NFUlQoaXNDb21wb3Np dGVkKCkpOworICAgIGlmICghbGF5ZXIoKSB8fCAhbGF5ZXIoKS0+YmFja2luZygpKQorICAgICAg ICByZXR1cm47CiAgICAgbGF5ZXIoKS0+YmFja2luZygpLT50cmFuc2l0aW9uUGF1c2VkKHRpbWVP ZmZzZXQsIHByb3BlcnR5SWQpOwogfQogCiB2b2lkIFJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnRy YW5zaXRpb25GaW5pc2hlZChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiB7Ci0gICAgQVNTRVJU KGhhc0xheWVyKCkpOwotICAgIEFTU0VSVChpc0NvbXBvc2l0ZWQoKSk7CisgICAgaWYgKCFsYXll cigpIHx8ICFsYXllcigpLT5iYWNraW5nKCkpCisgICAgICAgIHJldHVybjsKICAgICBsYXllcigp LT5iYWNraW5nKCktPnRyYW5zaXRpb25GaW5pc2hlZChwcm9wZXJ0eUlkKTsKIH0KIAogYm9vbCBS ZW5kZXJMYXllck1vZGVsT2JqZWN0OjpzdGFydEFuaW1hdGlvbihkb3VibGUgdGltZU9mZnNldCwg Y29uc3QgQW5pbWF0aW9uKiBhbmltYXRpb24sIGNvbnN0IEtleWZyYW1lTGlzdCYga2V5ZnJhbWVz KQogewotICAgIEFTU0VSVChoYXNMYXllcigpKTsKLSAgICBBU1NFUlQoaXNDb21wb3NpdGVkKCkp OworICAgIGlmICghbGF5ZXIoKSB8fCAhbGF5ZXIoKS0+YmFja2luZygpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgcmV0dXJuIGxheWVyKCktPmJhY2tpbmcoKS0+c3RhcnRBbmltYXRpb24o dGltZU9mZnNldCwgYW5pbWF0aW9uLCBrZXlmcmFtZXMpOwogfQogCiB2b2lkIFJlbmRlckxheWVy TW9kZWxPYmplY3Q6OmFuaW1hdGlvblBhdXNlZChkb3VibGUgdGltZU9mZnNldCwgY29uc3QgU3Ry aW5nJiBuYW1lKQogewotICAgIEFTU0VSVChoYXNMYXllcigpKTsKLSAgICBBU1NFUlQoaXNDb21w b3NpdGVkKCkpOworICAgIGlmICghbGF5ZXIoKSB8fCAhbGF5ZXIoKS0+YmFja2luZygpKQorICAg ICAgICByZXR1cm47CiAgICAgbGF5ZXIoKS0+YmFja2luZygpLT5hbmltYXRpb25QYXVzZWQodGlt ZU9mZnNldCwgbmFtZSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6YW5pbWF0 aW9uU2Vla2VkKGRvdWJsZSB0aW1lT2Zmc2V0LCBjb25zdCBTdHJpbmcmIG5hbWUpCiB7Ci0gICAg QVNTRVJUKGhhc0xheWVyKCkpOwotICAgIEFTU0VSVChpc0NvbXBvc2l0ZWQoKSk7CisgICAgaWYg KCFsYXllcigpIHx8ICFsYXllcigpLT5iYWNraW5nKCkpCisgICAgICAgIHJldHVybjsKICAgICBs YXllcigpLT5iYWNraW5nKCktPmFuaW1hdGlvblNlZWtlZCh0aW1lT2Zmc2V0LCBuYW1lKTsKIH0K IAogdm9pZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0OjphbmltYXRpb25GaW5pc2hlZChjb25zdCBT dHJpbmcmIG5hbWUpCiB7Ci0gICAgQVNTRVJUKGhhc0xheWVyKCkpOwotICAgIEFTU0VSVChpc0Nv bXBvc2l0ZWQoKSk7CisgICAgaWYgKCFsYXllcigpIHx8ICFsYXllcigpLT5iYWNraW5nKCkpCisg ICAgICAgIHJldHVybjsKICAgICBsYXllcigpLT5iYWNraW5nKCktPmFuaW1hdGlvbkZpbmlzaGVk KG5hbWUpOwogfQogCiB2b2lkIFJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnN1c3BlbmRBbmltYXRp b25zKE1vbm90b25pY1RpbWUgdGltZSkKIHsKLSAgICBBU1NFUlQoaGFzTGF5ZXIoKSk7Ci0gICAg QVNTRVJUKGlzQ29tcG9zaXRlZCgpKTsKKyAgICBpZiAoIWxheWVyKCkgfHwgIWxheWVyKCktPmJh Y2tpbmcoKSkKKyAgICAgICAgcmV0dXJuOwogICAgIGxheWVyKCktPmJhY2tpbmcoKS0+c3VzcGVu ZEFuaW1hdGlvbnModGltZSk7CiB9CiAK