134442 2014-06-30 00:46:00 -0700 [EFL] Remove m_evasObject from Widget 2014-06-30 01:46:31 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 134087 1 ryuan.choi ryuan.choi bunhere cdumez commit-queue gyuyoung.kim lucas.de.marchi sergio oldest_to_newest 1019287 0 ryuan.choi 2014-06-30 00:46:00 -0700 Since WebKit1/EFL was dropped, we don't need to keep the m_evasObject in the Widget.cpp because it's not used for WebKit2/Efl. 1019288 1 234069 ryuan.choi 2014-06-30 00:49:47 -0700 Created attachment 234069 Patch 1019290 2 234069 gyuyoung.kim 2014-06-30 00:59:24 -0700 Comment on attachment 234069 Patch Yes, we don't need to keep this code anymore ! 1019302 3 234069 commit-queue 2014-06-30 01:46:26 -0700 Comment on attachment 234069 Patch Clearing flags on attachment: 234069 Committed r170581: <http://trac.webkit.org/changeset/170581> 1019303 4 commit-queue 2014-06-30 01:46:31 -0700 All reviewed patches have been landed. Closing bug. 234069 2014-06-30 00:49:47 -0700 2014-06-30 01:46:26 -0700 Patch bug-134442-20140630164926.patch text/plain 11156 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTZhNWNjMDdmNjVhMzVj M2NlNjEwM2ZhMTI5ZDBhOTI4OGYwMjMyNi4uZmYxZTU3ZmM2ZWE5ZWE0ZWQwNDI4NDFkNDZmZjBm ODQzMzJkYTU2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE0LTA2LTMwICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBSZW1vdmUg bV9ldmFzT2JqZWN0IGZyb20gV2lkZ2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzQ0NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTaW5jZSBXZWJLaXQxL0VGTCB3YXMgZHJvcHBlZCwgd2UgZG9uJ3Qg bmVlZCB0byBrZWVwIHRoZSBtX2V2YXNPYmplY3QKKyAgICAgICAgaW4gdGhlIFdpZGdldC5jcHAg YmVjYXVzZSBpdCdzIG5vdCB1c2VkIGZvciBXZWJLaXQyL0VmbC4KKworICAgICAgICAqIHBsYXRm b3JtL1dpZGdldC5oOgorICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0OjpldmFzT2JqZWN0KTogRGVs ZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvU2Nyb2xsYmFyRWZsLmNwcDoKKyAgICAgICAg UmVtb3ZlZCBXZWJLaXQxL0VmbCBzcGVjaWZpYyBjb2RlIHdoaWNoIHVzZXMgbV9ldmFzT2JqZWN0 LgorICAgICAgICBJdCB3aWxsIGJlIGEgZHVtbXkgdW50aWwgV2ViS2l0Mi9FZmwgc3VwcG9ydCBw cm9wZXIgc2Nyb2xsYmFyIGltcGxlbWVudGF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs YmFyRWZsOjpTY3JvbGxiYXJFZmwpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyRWZsOjp+ U2Nyb2xsYmFyRWZsKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhckVmbDo6c2V0UGFyZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhckVmbDo6ZnJhbWVSZWN0c0NoYW5nZWQpOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyRWZsOjppbnZhbGlkYXRlKToKKyAgICAgICAgKFNj cm9sbGJhckVmbDo6U2Nyb2xsYmFyRWZsKTogRGVsZXRlZC4KKyAgICAgICAgKFNjcm9sbGJhckVm bDo6flNjcm9sbGJhckVmbCk6IERlbGV0ZWQuCisgICAgICAgIChzY3JvbGxiYXJFZmxFZGplTWVz c2FnZSk6IERlbGV0ZWQuCisgICAgICAgIChTY3JvbGxiYXJFZmw6OnNldFBhcmVudCk6IERlbGV0 ZWQuCisgICAgICAgIChTY3JvbGxiYXJFZmw6OnVwZGF0ZVRodW1iUG9zaXRpb24pOiBEZWxldGVk LgorICAgICAgICAoU2Nyb2xsYmFyRWZsOjp1cGRhdGVUaHVtYlByb3BvcnRpb24pOiBEZWxldGVk LgorICAgICAgICAoU2Nyb2xsYmFyRWZsOjp1cGRhdGVUaHVtYlBvc2l0aW9uQW5kUHJvcG9ydGlv bik6IERlbGV0ZWQuCisgICAgICAgIChTY3JvbGxiYXJFZmw6OmZyYW1lUmVjdHNDaGFuZ2VkKTog RGVsZXRlZC4KKyAgICAgICAgKFNjcm9sbGJhckVmbDo6aW52YWxpZGF0ZSk6IERlbGV0ZWQuCisg ICAgICAgICogcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5oOgorICAgICAgICBSZW1vdmVkIHVu bmVjZXNzYXJ5IG1ldGhvZHMuIEluIGFkZGl0aW9uLCBhcHBsaWVkIGZpbmFsLCBvdmVycmlkZSBr ZXl3b3JkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyRWZsOjpoYW5kbGVNb3VzZU1vdmVF dmVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJFZmw6OmhhbmRsZU1v dXNlT3V0RXZlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyRWZsOjpo YW5kbGVNb3VzZVByZXNzRXZlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs YmFyRWZsOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVudCk6IERlbGV0ZWQuCisgICAgICAgICogcGxh dGZvcm0vZWZsL1dpZGdldEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWRnZXQ6OldpZGdl dCk6CisgICAgICAgIChXZWJDb3JlOjpXaWRnZXQ6OnNldEV2YXNPYmplY3QpOiBEZWxldGVkLgor CiAyMDE0LTA2LTI5ICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAg ICAgICBbRUZMXSBSZW1vdmUgbmV0c2NhcGUgcGx1Z2luIGltcGxlbWVudGF0aW9uIGZyb20gV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAppbmRleCBlZDM5YTJhYmUwYjI3YWMyMjBiMmUw MWEyMGVlMjQ2MmNkOTU3MmVhLi42OTlkNzcxNWUxMzVjYzI1MmRlMzk0ZGI3MjM3Y2NkODNiZGVj YTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaApAQCAtMTgzLDExICsxODMsNiBAQCBwdWJs aWM6CiAgICAgdm9pZCBhZGRUb1N1cGVydmlldyhOU1ZpZXcqKTsKICNlbmRpZgogCi0jaWYgUExB VEZPUk0oRUZMKQotICAgIHZvaWQgc2V0RXZhc09iamVjdChFdmFzX09iamVjdCopOwotICAgIEV2 YXNfT2JqZWN0KiBldmFzT2JqZWN0KCkgeyByZXR1cm4gbV9ldmFzT2JqZWN0OyB9Ci0jZW5kaWYK LQogICAgIC8vIFZpcnR1YWwgbWV0aG9kcyB0byBjb252ZXJ0IHBvaW50cyB0by9mcm9tIHRoZSBj b250YWluaW5nIFNjcm9sbFZpZXcKICAgICB2aXJ0dWFsIEludFJlY3QgY29udmVydFRvQ29udGFp bmluZ1ZpZXcoY29uc3QgSW50UmVjdCYpIGNvbnN0OwogICAgIHZpcnR1YWwgSW50UmVjdCBjb252 ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3KGNvbnN0IEludFJlY3QmKSBjb25zdDsKQEAgLTIxOSwxMCAr MjE0LDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1fcGFyZW50VmlzaWJsZTsKIAogICAgIEludFJl Y3QgbV9mcmFtZTsgLy8gTm90IHVzZWQgd2hlbiBhIG5hdGl2ZSB3aWRnZXQgZXhpc3RzLgotCi0j aWYgUExBVEZPUk0oRUZMKQotICAgIEV2YXNfT2JqZWN0KiBtX2V2YXNPYmplY3Q7Ci0jZW5kaWYK IH07CiAKICNkZWZpbmUgV0lER0VUX1RZUEVfQ0FTVFMoVG9WYWx1ZVR5cGVOYW1lLCBwcmVkaWNh dGUpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9TY3JvbGxiYXJF ZmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5jcHAKaW5k ZXggMmMyOGY1ZThhYWY2NDc5OGQ4MWIyNzVlOTgzNjExNzZkNTY2NDhjMC4uNDhhMGI4YzZlMzA4 NGY3MzE3NDc4NzZiMDk5ZmNkMDY3NGM3NmU0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZWZsL1Njcm9sbGJhckVmbC5jcHAKQEAgLTIzLDI2ICsyMywxMCBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIlNjcm9sbGJhckVmbC5oIgogCi0jaW5jbHVkZSAiRnJhbWUuaCIK LSNpbmNsdWRlICJGcmFtZVZpZXcuaCIKLSNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKLSNp bmNsdWRlICJIb3N0V2luZG93LmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgotI2luY2x1ZGUgIlBh Z2UuaCIKLSNpbmNsdWRlICJSZW5kZXJUaGVtZUVmbC5oIgotI2luY2x1ZGUgIlNjcm9sbGJhclRo ZW1lLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKIAotI2luY2x1ZGUgPEVjb3JlLmg+Ci0jaW5j bHVkZSA8RWRqZS5oPgotI2luY2x1ZGUgPEV2YXMuaD4KLSNpbmNsdWRlIDxuZXc+Ci0jaW5jbHVk ZSA8c3RyaW5nPgotI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KLSNpbmNsdWRlIDx3dGYv dGV4dC9DU3RyaW5nLmg+Ci0KLXVzaW5nIG5hbWVzcGFjZSBzdGQ7Ci11c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKK25hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGFzc1JlZlB0cjxTY3JvbGxiYXI+IFNj cm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxl QXJlYSwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbGJhckNvbnRyb2xT aXplIHNpemUpCiB7CkBAIC01NCwxMjYgKzM4LDE2IEBAIFBhc3NSZWZQdHI8U2Nyb2xsYmFyPiBT Y3JvbGxiYXI6OmNyZWF0ZU5hdGl2ZVNjcm9sbGJhcihTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJs CiAKIFNjcm9sbGJhckVmbDo6U2Nyb2xsYmFyRWZsKFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxl QXJlYSwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24sIFNjcm9sbGJhckNvbnRyb2xT aXplIGNvbnRyb2xTaXplKQogICAgIDogU2Nyb2xsYmFyKHNjcm9sbGFibGVBcmVhLCBvcmllbnRh dGlvbiwgY29udHJvbFNpemUpCi0gICAgLCBtX2xhc3RQb3MoMCkKLSAgICAsIG1fbGFzdFRvdGFs U2l6ZSgwKQotICAgICwgbV9sYXN0VmlzaWJsZVNpemUoMCkKIHsKIH0KIAogU2Nyb2xsYmFyRWZs Ojp+U2Nyb2xsYmFyRWZsKCkKIHsKLSAgICBpZiAoIWV2YXNPYmplY3QoKSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgZXZhc19vYmplY3RfZGVsKGV2YXNPYmplY3QoKSk7Ci0gICAgc2V0RXZhc09i amVjdCgwKTsKLX0KLQotc3RhdGljIHZvaWQgc2Nyb2xsYmFyRWZsRWRqZU1lc3NhZ2Uodm9pZCog ZGF0YSwgRXZhc19PYmplY3QqLCBFZGplX01lc3NhZ2VfVHlwZSBtZXNzYWdlVHlwZSwgaW50IGlk LCB2b2lkKiBtZXNzYWdlKQotewotICAgIGlmICghaWQpIHsKLSAgICAgICAgRUlOQV9MT0dfRVJS KCJVbmtub3duIG1lc3NhZ2UgaWQgJyVkJyBmcm9tIHNjcm9sbCBiYXIgdGhlbWUuIiwgaWQpOwot ICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKG1lc3NhZ2VUeXBlICE9IEVESkVfTUVT U0FHRV9GTE9BVCkgewotICAgICAgICBFSU5BX0xPR19FUlIoIk1lc3NhZ2UgaWQgJyVkJyBvZiBp bmNvcnJlY3QgdHlwZSBmcm9tIHNjcm9sbCBiYXIgdGhlbWUuICIKLSAgICAgICAgICAgICAgICAg ICAgICJFeHBlY3RlZCAnJWQnLCBnb3QgJyVkJy4iLAotICAgICAgICAgICAgICAgICAgICAgaWQs IEVESkVfTUVTU0FHRV9GTE9BVCwgbWVzc2FnZVR5cGUpOwotICAgICAgICByZXR1cm47Ci0gICAg fQotCi0gICAgU2Nyb2xsYmFyRWZsKiB0aGF0ID0gc3RhdGljX2Nhc3Q8U2Nyb2xsYmFyRWZsKj4o ZGF0YSk7Ci0KLSAgICBFZGplX01lc3NhZ2VfRmxvYXQqIG1lc3NhZ2VGbG9hdCA9IHN0YXRpY19j YXN0PEVkamVfTWVzc2FnZV9GbG9hdCo+KG1lc3NhZ2UpOwotICAgIGludCB2YWx1ZSA9IG1lc3Nh Z2VGbG9hdC0+dmFsICogKHRoYXQtPnRvdGFsU2l6ZSgpIC0gdGhhdC0+dmlzaWJsZVNpemUoKSk7 Ci0gICAgdGhhdC0+c2Nyb2xsYWJsZUFyZWEoKS0+c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0 aW9uKHRoYXQtPm9yaWVudGF0aW9uKCksIHZhbHVlKTsKIH0KIAogdm9pZCBTY3JvbGxiYXJFZmw6 OnNldFBhcmVudChTY3JvbGxWaWV3KiB2aWV3KQogewogICAgIFdpZGdldDo6c2V0UGFyZW50KHZp ZXcpOwotCi0gICAgaWYgKCF2aWV3IHx8ICF2aWV3LT5ldmFzT2JqZWN0KCkpCi0gICAgICAgIHJl dHVybjsKLQotICAgIEZyYW1lJiBmcmFtZSA9IHRvRnJhbWVWaWV3KHZpZXcpLT5mcmFtZSgpOwot ICAgIGlmICghZnJhbWUucGFnZSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBTdHJpbmcgdGhl bWUgPSBzdGF0aWNfY2FzdDxSZW5kZXJUaGVtZUVmbCY+KGZyYW1lLnBhZ2UoKS0+dGhlbWUoKSku dGhlbWVQYXRoKCk7Ci0KLSAgICBjb25zdCBjaGFyKiBncm91cCA9IChvcmllbnRhdGlvbigpID09 IEhvcml6b250YWxTY3JvbGxiYXIpID8gInNjcm9sbGJhci5ob3Jpem9udGFsIiA6ICJzY3JvbGxi YXIudmVydGljYWwiOwotICAgIGlmICh0aGVtZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgRUlOQV9M T0dfRVJSKCJDb3VsZCBub3QgbG9hZCB0aGVtZSAnJXMnOiBubyB0aGVtZSBwYXRoIHNldC4iLCBn cm91cCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBpZiAoIWV2YXNPYmplY3QoKSkg ewotICAgICAgICBzZXRFdmFzT2JqZWN0KGVkamVfb2JqZWN0X2FkZChldmFzX29iamVjdF9ldmFz X2dldCh2aWV3LT5ldmFzT2JqZWN0KCkpKSk7Ci0gICAgICAgIGlmICghZXZhc09iamVjdCgpKSB7 Ci0gICAgICAgICAgICBFSU5BX0xPR19FUlIoIkNvdWxkIG5vdCBjcmVhdGUgZWRqZSBvYmplY3Qg Zm9yIHZpZXc9JXAiLCB2aWV3KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAg ICAgICBmcmFtZVJlY3RzQ2hhbmdlZCgpOwotICAgICAgICBlZGplX29iamVjdF9tZXNzYWdlX2hh bmRsZXJfc2V0KGV2YXNPYmplY3QoKSwgc2Nyb2xsYmFyRWZsRWRqZU1lc3NhZ2UsIHRoaXMpOwot ICAgIH0KLQotICAgIGlmICghZWRqZV9vYmplY3RfZmlsZV9zZXQoZXZhc09iamVjdCgpLCB0aGVt ZS51dGY4KCkuZGF0YSgpLCBncm91cCkpIHsKLSAgICAgICAgRWRqZV9Mb2FkX0Vycm9yIGVyciA9 IGVkamVfb2JqZWN0X2xvYWRfZXJyb3JfZ2V0KGV2YXNPYmplY3QoKSk7Ci0gICAgICAgIGNvbnN0 IGNoYXIqIGVycm1lc3NhZ2UgPSBlZGplX2xvYWRfZXJyb3Jfc3RyKGVycik7Ci0gICAgICAgIEVJ TkFfTE9HX0VSUigiQ291bGQgbm90IGxvYWQgdGhlbWUgJyVzJyBmcm9tIGZpbGUgJyVzJzogIyVk ICclcyciLAotICAgICAgICAgICAgICAgICAgICAgZ3JvdXAsIHRoZW1lLnV0ZjgoKS5kYXRhKCks IGVyciwgZXJybWVzc2FnZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBldmFzX29i amVjdF9zbWFydF9tZW1iZXJfYWRkKGV2YXNPYmplY3QoKSwgdmlldy0+ZXZhc09iamVjdCgpKTsK LSAgICBldmFzX29iamVjdF9zaG93KGV2YXNPYmplY3QoKSk7Ci19Ci0KLXZvaWQgU2Nyb2xsYmFy RWZsOjp1cGRhdGVUaHVtYlBvc2l0aW9uKCkKLXsKLSAgICB1cGRhdGVUaHVtYlBvc2l0aW9uQW5k UHJvcG9ydGlvbigpOwotfQotCi12b2lkIFNjcm9sbGJhckVmbDo6dXBkYXRlVGh1bWJQcm9wb3J0 aW9uKCkKLXsKLSAgICB1cGRhdGVUaHVtYlBvc2l0aW9uQW5kUHJvcG9ydGlvbigpOwotfQotCi12 b2lkIFNjcm9sbGJhckVmbDo6dXBkYXRlVGh1bWJQb3NpdGlvbkFuZFByb3BvcnRpb24oKQotewot ICAgIGlmICghZXZhc09iamVjdCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpbnQgcG9zID0g Y3VycmVudFBvcygpOwotICAgIGludCB0U2l6ZSA9IHRvdGFsU2l6ZSgpOwotICAgIGludCB2U2l6 ZSA9IHZpc2libGVTaXplKCk7Ci0KLSAgICBpZiAobV9sYXN0UG9zID09IHBvcwotICAgICAgICAm JiBtX2xhc3RUb3RhbFNpemUgPT0gdFNpemUKLSAgICAgICAgJiYgbV9sYXN0VmlzaWJsZVNpemUg PT0gdlNpemUpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fbGFzdFBvcyA9IHBvczsKLSAgICBt X2xhc3RUb3RhbFNpemUgPSB0U2l6ZTsKLSAgICBtX2xhc3RWaXNpYmxlU2l6ZSA9IHZTaXplOwot Ci0gICAgYXV0byBidWZmZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPGNoYXJbXT4oc2l6ZW9mKEVkamVf TWVzc2FnZV9GbG9hdF9TZXQpICsgc2l6ZW9mKGRvdWJsZSkpOwotICAgIEVkamVfTWVzc2FnZV9G bG9hdF9TZXQqIG1lc3NhZ2UgPSBuZXcoYnVmZmVyLmdldCgpKSBFZGplX01lc3NhZ2VfRmxvYXRf U2V0OwotICAgIG1lc3NhZ2UtPmNvdW50ID0gMjsKLQotICAgIGlmICh0U2l6ZSAtIHZTaXplID4g MCkKLSAgICAgICAgbWVzc2FnZS0+dmFsWzBdID0gcG9zIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHRT aXplIC0gdlNpemUpOwotICAgIGVsc2UKLSAgICAgICAgbWVzc2FnZS0+dmFsWzBdID0gMC4wOwot Ci0gICAgaWYgKHRTaXplID4gMCkKLSAgICAgICAgbWVzc2FnZS0+dmFsWzFdID0gdlNpemUgLyBz dGF0aWNfY2FzdDxmbG9hdD4odFNpemUpOwotICAgIGVsc2UKLSAgICAgICAgbWVzc2FnZS0+dmFs WzFdID0gMC4wOwotCi0gICAgZWRqZV9vYmplY3RfbWVzc2FnZV9zZW5kKGV2YXNPYmplY3QoKSwg RURKRV9NRVNTQUdFX0ZMT0FUX1NFVCwgMCwgbWVzc2FnZSk7CiB9CiAKIHZvaWQgU2Nyb2xsYmFy RWZsOjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTE4NCwzMSArNTgsMTEg QEAgdm9pZCBTY3JvbGxiYXJFZmw6OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQog CiB2b2lkIFNjcm9sbGJhckVmbDo6ZnJhbWVSZWN0c0NoYW5nZWQoKQogewotICAgIEV2YXNfT2Jq ZWN0KiBvYmplY3QgPSBldmFzT2JqZWN0KCk7Ci0gICAgRXZhc19Db29yZCB4LCB5OwotCi0gICAg aWYgKCFwYXJlbnQoKSB8fCAhb2JqZWN0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBJbnRSZWN0 IHJlY3QgPSBmcmFtZVJlY3QoKTsKLSAgICBpZiAocGFyZW50KCktPmlzU2Nyb2xsVmlld1Njcm9s bGJhcih0aGlzKSkKLSAgICAgICAgcmVjdC5zZXRMb2NhdGlvbihwYXJlbnQoKS0+Y29udmVydFRv Q29udGFpbmluZ1dpbmRvdyhyZWN0LmxvY2F0aW9uKCkpKTsKLSAgICBlbHNlCi0gICAgICAgIHJl Y3Quc2V0TG9jYXRpb24ocGFyZW50KCktPmNvbnRlbnRzVG9XaW5kb3cocmVjdC5sb2NhdGlvbigp KSk7Ci0KLSAgICBldmFzX29iamVjdF9nZW9tZXRyeV9nZXQocm9vdCgpLT5ldmFzT2JqZWN0KCks ICZ4LCAmeSwgMCwgMCk7Ci0gICAgZXZhc19vYmplY3RfbW92ZShvYmplY3QsIHggKyByZWN0Lngo KSwgeSArIHJlY3QueSgpKTsKLSAgICBldmFzX29iamVjdF9yZXNpemUob2JqZWN0LCByZWN0Lndp ZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogfQogCiB2b2lkIFNjcm9sbGJhckVmbDo6aW52YWxpZGF0 ZSgpCiB7Ci0gICAgaWYgKEV2YXNfT2JqZWN0KiBvYmplY3QgPSBldmFzT2JqZWN0KCkpIHsKLSAg ICAgICAgaWYgKHN1cHByZXNzSW52YWxpZGF0aW9uKCkpCi0gICAgICAgICAgICBldmFzX29iamVj dF9oaWRlKG9iamVjdCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGV2YXNfb2JqZWN0X3No b3cob2JqZWN0KTsKLSAgICB9Ci0KICAgICBXaWRnZXQ6OmludmFsaWRhdGUoKTsKIH0KKworfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1Njcm9sbGJhckVmbC5oCmluZGV4IGU4ODNlZDg5 YzJhYmIxNzA2ZTM2OTZmMTU4Y2U4ODJiOWZhMTg1MmQuLjIxNTJmODU4MjVmNTk2YmM3YTVjNTZj OWMxMTE3ODAyNGE2Y2E4NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Vm bC9TY3JvbGxiYXJFZmwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvU2Nyb2xs YmFyRWZsLmgKQEAgLTM0LDM1ICszNCwyMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNs YXNzIFNjcm9sbGJhckVmbCA6IHB1YmxpYyBTY3JvbGxiYXIgeworY2xhc3MgU2Nyb2xsYmFyRWZs IGZpbmFsIDogcHVibGljIFNjcm9sbGJhciB7CiBwdWJsaWM6CiAgICAgZnJpZW5kIGNsYXNzIFNj cm9sbGJhcjsKIAogICAgIHZpcnR1YWwgflNjcm9sbGJhckVmbCgpOwogCi0gICAgdmlydHVhbCB2 b2lkIHNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0Jik7Ci0KLSAgICB2aXJ0dWFsIGJvb2wgaGFu ZGxlTW91c2VNb3ZlRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JikgeyByZXR1cm4gZmFs c2U7IH0KLSAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VPdXRFdmVudChjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmKSB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVN b3VzZVByZXNzRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JikgeyByZXR1cm4gZmFsc2U7 IH0KLSAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VSZWxlYXNlRXZlbnQoY29uc3QgUGxhdGZv cm1Nb3VzZUV2ZW50JikgeyByZXR1cm4gZmFsc2U7IH0KLQotICAgIHZpcnR1YWwgdm9pZCBmcmFt ZVJlY3RzQ2hhbmdlZCgpOwotCisgICAgdmlydHVhbCB2b2lkIHNldEZyYW1lUmVjdChjb25zdCBJ bnRSZWN0Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIGZyYW1lUmVjdHNDaGFuZ2VkKCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGUoKSBvdmVycmlkZTsKKwogcHJv dGVjdGVkOgogICAgIFNjcm9sbGJhckVmbChTY3JvbGxhYmxlQXJlYSosIFNjcm9sbGJhck9yaWVu dGF0aW9uLCBTY3JvbGxiYXJDb250cm9sU2l6ZSk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl VGh1bWJQb3NpdGlvbkFuZFByb3BvcnRpb24oKTsKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGh1 bWJQb3NpdGlvbigpOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVUaHVtYlByb3BvcnRpb24oKTsK LQotICAgIHZpcnR1YWwgdm9pZCBzZXRQYXJlbnQoU2Nyb2xsVmlldyopOwotCi1wcml2YXRlOgot ICAgIGludCBtX2xhc3RQb3M7Ci0gICAgaW50IG1fbGFzdFRvdGFsU2l6ZTsKLSAgICBpbnQgbV9s YXN0VmlzaWJsZVNpemU7CisgICAgdmlydHVhbCB2b2lkIHNldFBhcmVudChTY3JvbGxWaWV3Kikg b3ZlcnJpZGU7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9l ZmwvV2lkZ2V0RWZsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9XaWRnZXRFZmwu Y3BwCmluZGV4IDI3OWM2M2M3ZTVmNmU2MGVmMWY2YTU1M2Q1YTQyOTcwNGI5MGY5MGQuLjQyYWM4 MjkxNzM2NDZhZmRhZDBmZjVjZmJkNmI1MzI5MmJlY2Q3NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9XaWRnZXRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9XaWRnZXRFZmwuY3BwCkBAIC01Myw3ICs1Myw2IEBAIFdpZGdldDo6V2lkZ2V0 KFBsYXRmb3JtV2lkZ2V0IHdpZGdldCkKICAgICAsIG1fc2VsZlZpc2libGUoZmFsc2UpCiAgICAg LCBtX3BhcmVudFZpc2libGUoZmFsc2UpCiAgICAgLCBtX2ZyYW1lKDAsIDAsIDAsIDApCi0gICAg LCBtX2V2YXNPYmplY3QoMCkKIHsKICAgICBpbml0KHdpZGdldCk7CiB9CkBAIC0xMDYsOSArMTA1 LDQgQEAgdm9pZCBXaWRnZXQ6OnNldElzU2VsZWN0ZWQoYm9vbCkKICAgICBub3RJbXBsZW1lbnRl ZCgpOwogfQogCi12b2lkIFdpZGdldDo6c2V0RXZhc09iamVjdChFdmFzX09iamVjdCogb2JqZWN0 KQotewotICAgIG1fZXZhc09iamVjdCA9IG9iamVjdDsKLX0KLQogfQo=