177827 2017-10-03 11:52:54 -0700 Use WeakPtr in RenderFullScreen 2017-10-03 23:56:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham jeremyj-wk jonlee simon.fraser webkit-bug-importer zalan oldest_to_newest 1355929 0 koivisto 2017-10-03 11:52:54 -0700 Get rid of the custom nulling. 1355937 1 322556 koivisto 2017-10-03 11:59:59 -0700 Created attachment 322556 patch 1356259 2 koivisto 2017-10-03 23:54:48 -0700 https://trac.webkit.org/r222831 1356260 3 webkit-bug-importer 2017-10-03 23:56:00 -0700 <rdar://problem/34807298> 322556 2017-10-03 11:59:59 -0700 2017-10-03 12:01:38 -0700 patch fullscreen-weakptr.patch text/plain 8912 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjc5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE3LTEwLTAzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgV2Vha1B0ciBpbiBSZW5k ZXJGdWxsU2NyZWVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzc4MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIERvY3VtZW50OjptX2Z1bGxTY3JlZW5SZW5kZXJlciBSZW5kZXJGdWxsU2NyZWVu OjptX3BsYWNlaG9sZGVyIFdlYWtQdHJzCisgICAgICAgIGFuZCBnZXQgcmlkIG9mIHRoZSBjdXN0 b20gbnVsbGluZyBjb2RlLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50OjpkZXN0cm95UmVuZGVyVHJlZSk6CisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudDo6d2Via2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6OndlYmtpdERpZEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudCk6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0RnVsbFNjcmVlblJlbmRlcmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpmdWxsU2NyZWVuUmVuZGVyZXJEZXN0cm95ZWQpOiBE ZWxldGVkLgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnQ6OmZ1bGxTY3JlZW5SZW5kZXJlciBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckZ1bGxTY3JlZW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnVsbFNjcmVlbjo6 UmVuZGVyRnVsbFNjcmVlbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGdWxsU2NyZWVuOjp3 aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnVsbFNjcmVlbjo6Y3Jl YXRlUGxhY2Vob2xkZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnVsbFNjcmVlblBsYWNl aG9sZGVyOjp3aWxsQmVEZXN0cm95ZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyRnVsbFNjcmVlbjo6c2V0UGxhY2Vob2xkZXIpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJGdWxsU2NyZWVuLmg6CisKIDIwMTctMTAtMDMgIEZ1amlpIEhpcm9ub3JpICA8 SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjIxOTA5KTog RmFpbGluZyBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9pc28tODg1OS04Lmh0bWwKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjIyNzcxKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI0NywxMSArMjI0Nyw2IEBAIHZv aWQgRG9jdW1lbnQ6OmRlc3Ryb3lSZW5kZXJUcmVlKCkKICAgICBpZiAodmlldygpKQogICAgICAg ICB2aWV3KCktPndpbGxEZXN0cm95UmVuZGVyVHJlZSgpOwogCi0jaWYgRU5BQkxFKEZVTExTQ1JF RU5fQVBJKQotICAgIGlmIChtX2Z1bGxTY3JlZW5SZW5kZXJlcikKLSAgICAgICAgc2V0RnVsbFNj cmVlblJlbmRlcmVyKG51bGxwdHIpOwotI2VuZGlmCi0KICAgICBpZiAobV9kb2N1bWVudEVsZW1l bnQpCiAgICAgICAgIFJlbmRlclRyZWVVcGRhdGVyOjp0ZWFyRG93blJlbmRlcmVycygqbV9kb2N1 bWVudEVsZW1lbnQpOwogCkBAIC02MDI4LDcgKzYwMjMsNyBAQCB2b2lkIERvY3VtZW50Ojp3ZWJr aXRXaWxsRW50ZXJGdWxsU2NyZWVuCiAKICAgICBBU1NFUlQocGFnZSgpLT5zZXR0aW5ncygpLmZ1 bGxTY3JlZW5FbmFibGVkKCkpOwogCi0gICAgdW53cmFwRnVsbFNjcmVlblJlbmRlcmVyKG1fZnVs bFNjcmVlblJlbmRlcmVyLCBtX2Z1bGxTY3JlZW5FbGVtZW50LmdldCgpKTsKKyAgICB1bndyYXBG dWxsU2NyZWVuUmVuZGVyZXIobV9mdWxsU2NyZWVuUmVuZGVyZXIuZ2V0KCksIG1fZnVsbFNjcmVl bkVsZW1lbnQuZ2V0KCkpOwogCiAgICAgaWYgKGVsZW1lbnQpCiAgICAgICAgIGVsZW1lbnQtPndp bGxCZWNvbWVGdWxsc2NyZWVuRWxlbWVudCgpOwpAQCAtNjA5NSw3ICs2MDkwLDcgQEAgdm9pZCBE b2N1bWVudDo6d2Via2l0RGlkRXhpdEZ1bGxTY3JlZW5GbwogCiAgICAgbV9hcmVLZXlzRW5hYmxl ZEluRnVsbFNjcmVlbiA9IGZhbHNlOwogCi0gICAgdW53cmFwRnVsbFNjcmVlblJlbmRlcmVyKG1f ZnVsbFNjcmVlblJlbmRlcmVyLCBtX2Z1bGxTY3JlZW5FbGVtZW50LmdldCgpKTsKKyAgICB1bndy YXBGdWxsU2NyZWVuUmVuZGVyZXIobV9mdWxsU2NyZWVuUmVuZGVyZXIuZ2V0KCksIG1fZnVsbFNj cmVlbkVsZW1lbnQuZ2V0KCkpOwogCiAgICAgbV9mdWxsU2NyZWVuRWxlbWVudCA9IG51bGxwdHI7 CiAgICAgc2NoZWR1bGVGb3JjZWRTdHlsZVJlY2FsYygpOwpAQCAtNjExNCwyMyArNjEwOSwyMCBA QCB2b2lkIERvY3VtZW50OjpzZXRGdWxsU2NyZWVuUmVuZGVyZXIoUmVuCiAgICAgaWYgKHJlbmRl cmVyID09IG1fZnVsbFNjcmVlblJlbmRlcmVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAo cmVuZGVyZXIgJiYgbV9zYXZlZFBsYWNlaG9sZGVyUmVuZGVyU3R5bGUpIAotICAgICAgICByZW5k ZXJlci0+Y3JlYXRlUGxhY2Vob2xkZXIoV1RGTW92ZShtX3NhdmVkUGxhY2Vob2xkZXJSZW5kZXJT dHlsZSksIG1fc2F2ZWRQbGFjZWhvbGRlckZyYW1lUmVjdCk7Ci0gICAgZWxzZSBpZiAocmVuZGVy ZXIgJiYgbV9mdWxsU2NyZWVuUmVuZGVyZXIgJiYgbV9mdWxsU2NyZWVuUmVuZGVyZXItPnBsYWNl aG9sZGVyKCkpIHsKLSAgICAgICAgUmVuZGVyQmxvY2sqIHBsYWNlaG9sZGVyID0gbV9mdWxsU2Ny ZWVuUmVuZGVyZXItPnBsYWNlaG9sZGVyKCk7Ci0gICAgICAgIHJlbmRlcmVyLT5jcmVhdGVQbGFj ZWhvbGRlcihSZW5kZXJTdHlsZTo6Y2xvbmVQdHIocGxhY2Vob2xkZXItPnN0eWxlKCkpLCBwbGFj ZWhvbGRlci0+ZnJhbWVSZWN0KCkpOworICAgIGlmIChyZW5kZXJlcikgeworICAgICAgICBpZiAo bV9zYXZlZFBsYWNlaG9sZGVyUmVuZGVyU3R5bGUpCisgICAgICAgICAgICByZW5kZXJlci0+Y3Jl YXRlUGxhY2Vob2xkZXIoV1RGTW92ZShtX3NhdmVkUGxhY2Vob2xkZXJSZW5kZXJTdHlsZSksIG1f c2F2ZWRQbGFjZWhvbGRlckZyYW1lUmVjdCk7CisgICAgICAgIGVsc2UgaWYgKG1fZnVsbFNjcmVl blJlbmRlcmVyICYmIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5wbGFjZWhvbGRlcigpKSB7CisgICAg ICAgICAgICBhdXRvKiBwbGFjZWhvbGRlciA9IG1fZnVsbFNjcmVlblJlbmRlcmVyLT5wbGFjZWhv bGRlcigpOworICAgICAgICAgICAgcmVuZGVyZXItPmNyZWF0ZVBsYWNlaG9sZGVyKFJlbmRlclN0 eWxlOjpjbG9uZVB0cihwbGFjZWhvbGRlci0+c3R5bGUoKSksIHBsYWNlaG9sZGVyLT5mcmFtZVJl Y3QoKSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV9mdWxsU2NyZWVuUmVuZGVyZXIp Ci0gICAgICAgIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5kZXN0cm95KCk7CisgICAgICAgIG1fZnVs bFNjcmVlblJlbmRlcmVyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveSgpOwogICAgIEFTU0VS VCghbV9mdWxsU2NyZWVuUmVuZGVyZXIpOwogCi0gICAgbV9mdWxsU2NyZWVuUmVuZGVyZXIgPSBy ZW5kZXJlcjsKLX0KLQotdm9pZCBEb2N1bWVudDo6ZnVsbFNjcmVlblJlbmRlcmVyRGVzdHJveWVk KCkKLXsKLSAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlciA9IG51bGxwdHI7CisgICAgbV9mdWxsU2Ny ZWVuUmVuZGVyZXIgPSBtYWtlV2Vha1B0cihyZW5kZXJlcik7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6 OmZ1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWVyRmlyZWQoKQpJbmRleDogU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmgJKHJldmlzaW9uIDIyMjc3MSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTAzLDkgKzExMDMsOCBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCB3ZWJraXREaWRFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoRWxlbWVudCopOwog ICAgIAogICAgIHZvaWQgc2V0RnVsbFNjcmVlblJlbmRlcmVyKFJlbmRlckZ1bGxTY3JlZW4qKTsK LSAgICBSZW5kZXJGdWxsU2NyZWVuKiBmdWxsU2NyZWVuUmVuZGVyZXIoKSBjb25zdCB7IHJldHVy biBtX2Z1bGxTY3JlZW5SZW5kZXJlcjsgfQotICAgIHZvaWQgZnVsbFNjcmVlblJlbmRlcmVyRGVz dHJveWVkKCk7Ci0gICAgCisgICAgUmVuZGVyRnVsbFNjcmVlbiogZnVsbFNjcmVlblJlbmRlcmVy KCkgY29uc3QgeyByZXR1cm4gbV9mdWxsU2NyZWVuUmVuZGVyZXIuZ2V0KCk7IH0KKwogICAgIHZv aWQgZnVsbFNjcmVlbkNoYW5nZURlbGF5VGltZXJGaXJlZCgpOwogICAgIGJvb2wgZnVsbFNjcmVl bklzQWxsb3dlZEZvckVsZW1lbnQoRWxlbWVudCopIGNvbnN0OwogICAgIHZvaWQgZnVsbFNjcmVl bkVsZW1lbnRSZW1vdmVkKCk7CkBAIC0xNjE5LDcgKzE2MTgsNyBAQCBwcml2YXRlOgogI2lmIEVO QUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICBSZWZQdHI8RWxlbWVudD4gbV9mdWxsU2NyZWVuRWxl bWVudDsKICAgICBWZWN0b3I8UmVmUHRyPEVsZW1lbnQ+PiBtX2Z1bGxTY3JlZW5FbGVtZW50U3Rh Y2s7Ci0gICAgUmVuZGVyRnVsbFNjcmVlbiogbV9mdWxsU2NyZWVuUmVuZGVyZXIgeyBudWxscHRy IH07CisgICAgV2Vha1B0cjxSZW5kZXJGdWxsU2NyZWVuPiBtX2Z1bGxTY3JlZW5SZW5kZXJlciB7 IG51bGxwdHIgfTsKICAgICBUaW1lciBtX2Z1bGxTY3JlZW5DaGFuZ2VEZWxheVRpbWVyOwogICAg IERlcXVlPFJlZlB0cjxOb2RlPj4gbV9mdWxsU2NyZWVuQ2hhbmdlRXZlbnRUYXJnZXRRdWV1ZTsK ICAgICBEZXF1ZTxSZWZQdHI8Tm9kZT4+IG1fZnVsbFNjcmVlbkVycm9yRXZlbnRUYXJnZXRRdWV1 ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGdWxsU2NyZWVuLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNjcmVlbi5j cHAJKHJldmlzaW9uIDIyMjc3MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG dWxsU2NyZWVuLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsMjcgKzM2LDE3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogY2xhc3MgUmVuZGVyRnVsbFNjcmVlblBsYWNlaG9sZGVyIGZpbmFsIDog cHVibGljIFJlbmRlckJsb2NrRmxvdyB7CiBwdWJsaWM6Ci0gICAgUmVuZGVyRnVsbFNjcmVlblBs YWNlaG9sZGVyKFJlbmRlckZ1bGxTY3JlZW4mIG93bmVyLCBSZW5kZXJTdHlsZSYmIHN0eWxlKQot ICAgICAgICA6IFJlbmRlckJsb2NrRmxvdyhvd25lci5kb2N1bWVudCgpLCBXVEZNb3ZlKHN0eWxl KSkKLSAgICAgICAgLCBtX293bmVyKG93bmVyKSAKKyAgICBSZW5kZXJGdWxsU2NyZWVuUGxhY2Vo b2xkZXIoRG9jdW1lbnQmIGRvY3VtZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQorICAgICAgICA6 IFJlbmRlckJsb2NrRmxvdyhkb2N1bWVudCwgV1RGTW92ZShzdHlsZSkpCiAgICAgewogICAgIH0K IAogcHJpdmF0ZToKICAgICBib29sIGlzUmVuZGVyRnVsbFNjcmVlblBsYWNlaG9sZGVyKCkgY29u c3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZvaWQgd2lsbEJlRGVzdHJveWVkKCkg b3ZlcnJpZGU7Ci0gICAgUmVuZGVyRnVsbFNjcmVlbiYgbV9vd25lcjsKIH07CiAKLXZvaWQgUmVu ZGVyRnVsbFNjcmVlblBsYWNlaG9sZGVyOjp3aWxsQmVEZXN0cm95ZWQoKQotewotICAgIG1fb3du ZXIuc2V0UGxhY2Vob2xkZXIoMCk7Ci0gICAgUmVuZGVyQmxvY2tGbG93Ojp3aWxsQmVEZXN0cm95 ZWQoKTsKLX0KLQogUmVuZGVyRnVsbFNjcmVlbjo6UmVuZGVyRnVsbFNjcmVlbihEb2N1bWVudCYg ZG9jdW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUpCiAgICAgOiBSZW5kZXJGbGV4aWJsZUJveChk b2N1bWVudCwgV1RGTW92ZShzdHlsZSkpCi0gICAgLCBtX3BsYWNlaG9sZGVyKDApCiB7CiAgICAg c2V0UmVwbGFjZWQoZmFsc2UpOyAKIH0KQEAgLTY0LDE2ICs1NCwxMCBAQCBSZW5kZXJGdWxsU2Ny ZWVuOjpSZW5kZXJGdWxsU2NyZWVuKERvY3VtCiB2b2lkIFJlbmRlckZ1bGxTY3JlZW46OndpbGxC ZURlc3Ryb3llZCgpCiB7CiAgICAgaWYgKG1fcGxhY2Vob2xkZXIpIHsKLSAgICAgICAgaWYgKCFt X3BsYWNlaG9sZGVyLT5iZWluZ0Rlc3Ryb3llZCgpKQotICAgICAgICAgICAgbV9wbGFjZWhvbGRl ci0+ZGVzdHJveSgpOworICAgICAgICBtX3BsYWNlaG9sZGVyLT5yZW1vdmVGcm9tUGFyZW50QW5k RGVzdHJveSgpOwogICAgICAgICBBU1NFUlQoIW1fcGxhY2Vob2xkZXIpOwogICAgIH0KIAotICAg IC8vIFJlbmRlck9iamVjdHMgYXJlIHVucmV0YWluZWQsIHNvIG5vdGlmeSB0aGUgZG9jdW1lbnQg KHdoaWNoIGhvbGRzIGEgcG9pbnRlciB0byBhIFJlbmRlckZ1bGxTY3JlZW4pCi0gICAgLy8gaWYg aXQncyBSZW5kZXJGdWxsU2NyZWVuIGlzIGRlc3Ryb3llZC4KLSAgICBpZiAoZG9jdW1lbnQoKS5m dWxsU2NyZWVuUmVuZGVyZXIoKSA9PSB0aGlzKQotICAgICAgICBkb2N1bWVudCgpLmZ1bGxTY3Jl ZW5SZW5kZXJlckRlc3Ryb3llZCgpOwotCiAgICAgUmVuZGVyRmxleGlibGVCb3g6OndpbGxCZURl c3Ryb3llZCgpOwogfQogCkBAIC0xOTQsMTEgKzE3OCw2IEBAIHZvaWQgUmVuZGVyRnVsbFNjcmVl bjo6dW53cmFwUmVuZGVyZXIoYm8KICAgICByZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveSgpOwog fQogCi12b2lkIFJlbmRlckZ1bGxTY3JlZW46OnNldFBsYWNlaG9sZGVyKFJlbmRlckJsb2NrKiBw bGFjZWhvbGRlcikKLXsKLSAgICBtX3BsYWNlaG9sZGVyID0gcGxhY2Vob2xkZXI7Ci19Ci0KIHZv aWQgUmVuZGVyRnVsbFNjcmVlbjo6Y3JlYXRlUGxhY2Vob2xkZXIoc3RkOjp1bmlxdWVfcHRyPFJl bmRlclN0eWxlPiBzdHlsZSwgY29uc3QgTGF5b3V0UmVjdCYgZnJhbWVSZWN0KQogewogICAgIGlm IChzdHlsZS0+d2lkdGgoKS5pc0F1dG8oKSkKQEAgLTIxNCwxMCArMTkzLDEwIEBAIHZvaWQgUmVu ZGVyRnVsbFNjcmVlbjo6Y3JlYXRlUGxhY2Vob2xkZXIKICAgICBpZiAoIXBhcmVudCgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBhdXRvIG5ld1BsYWNlaG9sZGVyID0gY3JlYXRlUmVuZGVyZXI8 UmVuZGVyRnVsbFNjcmVlblBsYWNlaG9sZGVyPigqdGhpcywgV1RGTW92ZSgqc3R5bGUpKTsKKyAg ICBhdXRvIG5ld1BsYWNlaG9sZGVyID0gY3JlYXRlUmVuZGVyZXI8UmVuZGVyRnVsbFNjcmVlblBs YWNlaG9sZGVyPihkb2N1bWVudCgpLCBXVEZNb3ZlKCpzdHlsZSkpOwogICAgIG5ld1BsYWNlaG9s ZGVyLT5pbml0aWFsaXplU3R5bGUoKTsKIAotICAgIG1fcGxhY2Vob2xkZXIgPSBuZXdQbGFjZWhv bGRlci5nZXQoKTsKKyAgICBtX3BsYWNlaG9sZGVyID0gbWFrZVdlYWtQdHIoKm5ld1BsYWNlaG9s ZGVyKTsKIAogICAgIHBhcmVudCgpLT5hZGRDaGlsZChXVEZNb3ZlKG5ld1BsYWNlaG9sZGVyKSwg dGhpcyk7CiAgICAgcGFyZW50KCktPnNldE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygp OwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZ1bGxTY3JlZW4uaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNjcmVlbi5oCShy ZXZpc2lvbiAyMjI3NzEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnVsbFNj cmVlbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw4ICszNiw3IEBAIHB1YmxpYzoKIAogICAgIGNv bnN0IGNoYXIqIHJlbmRlck5hbWUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiAiUmVuZGVyRnVs bFNjcmVlbiI7IH0KIAotICAgIHZvaWQgc2V0UGxhY2Vob2xkZXIoUmVuZGVyQmxvY2sqKTsKLSAg ICBSZW5kZXJCbG9jayogcGxhY2Vob2xkZXIoKSB7IHJldHVybiBtX3BsYWNlaG9sZGVyOyB9Cisg ICAgUmVuZGVyQmxvY2sqIHBsYWNlaG9sZGVyKCkgeyByZXR1cm4gbV9wbGFjZWhvbGRlci5nZXQo KTsgfQogICAgIHZvaWQgY3JlYXRlUGxhY2Vob2xkZXIoc3RkOjp1bmlxdWVfcHRyPFJlbmRlclN0 eWxlPiwgY29uc3QgTGF5b3V0UmVjdCYgZnJhbWVSZWN0KTsKIAogICAgIHN0YXRpYyBSZW5kZXJQ dHI8UmVuZGVyRnVsbFNjcmVlbj4gd3JhcE5ld1JlbmRlcmVyKFJlbmRlclB0cjxSZW5kZXJFbGVt ZW50PiwgUmVuZGVyRWxlbWVudCYgcGFyZW50LCBEb2N1bWVudCYpOwpAQCAtNTIsNyArNTEsNyBA QCBwcml2YXRlOgogICAgIGJvb2wgaXNGbGV4aWJsZUJveEltcGwoKSBjb25zdCBvdmVycmlkZSB7 IHJldHVybiB0cnVlOyB9CiAKIHByb3RlY3RlZDoKLSAgICBSZW5kZXJCbG9jayogbV9wbGFjZWhv bGRlcjsKKyAgICBXZWFrUHRyPFJlbmRlckJsb2NrPiBtX3BsYWNlaG9sZGVyOwogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQo=