110313 2013-02-20 00:25:15 -0800 [EFL] Use EINA_LOG instead of fprintf 2013-02-22 20:15:51 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim laszlo.gombos lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 837238 0 gyuyoung.kim 2013-02-20 00:25:15 -0800 EFL port has used EINA_LOG_XXX to display error message. However, some EFL files use fprintf instead of EINA_LOG macro. FYI, we can see EINA_LOG message as below method, 1. export EINA_LOG_LEVEL=level value(e.g. Set 3) EINA_LOG_LEVEL_CRITICAL = 0 EINA_LOG_LEVEL_ERR = 1 EINA_LOG_LEVEL_WARN = 2 EINA_LOG_LEVEL_INFO = 3 EINA_LOG_LEVEL_DBG = 4 2. Run MiniBrowser. 837239 1 189261 gyuyoung.kim 2013-02-20 00:28:05 -0800 Created attachment 189261 Patch 838023 2 189432 gyuyoung.kim 2013-02-20 18:01:11 -0800 Created attachment 189432 Patch 838067 3 laszlo.gombos 2013-02-20 18:52:00 -0800 What do you think about using the WebKit logging macros (e.g. LOG_ERROR) consistently instead - the same way it as it is in some parts of WebContextEfl.cpp ? 838079 4 gyuyoung.kim 2013-02-20 19:06:07 -0800 (In reply to comment #3) > What do you think about using the WebKit logging macros (e.g. LOG_ERROR) consistently instead - the same way it as it is in some parts of WebContextEfl.cpp ? Yes, EFL port can use LOG() macro. So, I don't mind to use LOG_ERROR(). If there is not objection to use LOG(), I'd like to change all EINA_LOG with LOG() macro. What do you think ? 838106 5 laszlo.gombos 2013-02-20 19:46:15 -0800 (In reply to comment #4) > (In reply to comment #3) > > What do you think about using the WebKit logging macros (e.g. LOG_ERROR) consistently instead - the same way it as it is in some parts of WebContextEfl.cpp ? > > Yes, EFL port can use LOG() macro. So, I don't mind to use LOG_ERROR(). If there is not objection to use LOG(), I'd like to change all EINA_LOG with LOG() macro. What do you think ? I think in places where it is proper to include wtf we should prefer the WebKit LOG macros as it generate a consistent/combined log and helps later move the code around. 839179 6 gyuyoung.kim 2013-02-21 20:35:50 -0800 Laszlo, as we talked on Bug 110452, LOG_DEBUG(or, similar things) may make unneeded logs when developer wanna see needed log. So, it looks there is no good alternative solution. So, I'd like to use EINA_LOG as is. Please take a look this patch again. (I don't wanna remove current log in this bug. It needs to investigate further.) 839475 7 189432 laszlo.gombos 2013-02-22 05:14:09 -0800 Comment on attachment 189432 Patch r=me. Thanks for checking the alternatives. 840277 8 189432 webkit.review.bot 2013-02-22 20:15:47 -0800 Comment on attachment 189432 Patch Clearing flags on attachment: 189432 Committed r143832: <http://trac.webkit.org/changeset/143832> 840278 9 webkit.review.bot 2013-02-22 20:15:51 -0800 All reviewed patches have been landed. Closing bug. 189261 2013-02-20 00:28:05 -0800 2013-02-20 18:00:58 -0800 Patch bug-110313-20130220172423.patch text/plain 6413 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk4NDgyNWZmMjcwZGVl NTIwMWI3NGI3ZDM0YTk5NzMzZjA0NmYzNi4uNmZkZDU3MTliNzhlZGUxNGFlOTk2OTlhOWYwYWU2 ZDliNjA1YjRjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAyLTIwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNl IEVJTkFfTE9HIGluc3RlYWQgb2YgZnByaW50ZiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDMxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgZnByaW50ZiB3aXRoIEVJTkFfTE9HLgorCisg ICAgICAgICogcGxhdGZvcm0vZWZsL05ldHdvcmtJbmZvUHJvdmlkZXJFZmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TmV0d29ya0luZm9Qcm92aWRlckVmbDo6c3RhcnRVcGRhdGluZyk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0NhaXJvVXRpbGl0aWVzRWZsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmV2YXNPYmplY3RGcm9tQ2Fpcm9JbWFnZVN1cmZhY2UpOgorCiAyMDEzLTAy LTE5ICBIYXlhdG8gSXRvIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENhbGN1bGF0 ZSBFdmVudFBhdGggaW4gRXZlbnREaXNwYXRjaGVyJ3MgY29uc3RydWN0b3IuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM b2cKaW5kZXggMTlkN2RmOWY3NDI1NjQzNjg1YWU3NzVlNWEwNzZkZTM0MmRjZDkyNS4uM2JmNTJh YzA4Y2U3ZmNjYzFmNjAyYjBiYTViZjhiZDEwOTFlMjRmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9lZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDEzLTAyLTIwICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNlIEVJTkFfTE9HIGluc3RlYWQgb2YgZnByaW50 ZiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDMx MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxh Y2UgZnByaW50ZiB3aXRoIEVJTkFfTE9HLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6 CisgICAgICAgIChfZXdrX2ZyYW1lX2RlYnVnKToKKwogMjAxMy0wMi0xOSAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENvbnZlcnQgMyBzZXR0aW5ncyB0byB1c2Ug U2V0dGluZ3MuaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9OZXR3 b3JrSW5mb1Byb3ZpZGVyRWZsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9OZXR3 b3JrSW5mb1Byb3ZpZGVyRWZsLmNwcAppbmRleCBlNTFlOTY3ZGEyMGQyYTFhNWJkYzQ5MDIyMWYz NTgwNmVmMTBkYmI5Li5lYjgzMGRlYWFjZTA0ODk0MWUwOTg4YzUyZDlhMjgzZjAyOTI4NTdmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTmV0d29ya0luZm9Qcm92aWRl ckVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL05ldHdvcmtJbmZvUHJv dmlkZXJFZmwuY3BwCkBAIC00NCw3ICs0NCw3IEBAIE5ldHdvcmtJbmZvUHJvdmlkZXJFZmw6Ok5l dHdvcmtJbmZvUHJvdmlkZXJFZmwoKQogdm9pZCBOZXR3b3JrSW5mb1Byb3ZpZGVyRWZsOjpzdGFy dFVwZGF0aW5nKCkKIHsKICAgICBpZiAoIWVlemVfaW5pdCgpKQotICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIkZhaWwgdG8gc3RhcnQgbmV0d29yayBpbmZvcm1hdGlvbiBjbGllbnQuXG4iKTsKKyAg ICAgICAgRUlOQV9MT0dfRVJSKCJGYWlsIHRvIHN0YXJ0IG5ldHdvcmsgaW5mb3JtYXRpb24gY2xp ZW50LiIpOwogfQogCiB2b2lkIE5ldHdvcmtJbmZvUHJvdmlkZXJFZmw6OnN0b3BVcGRhdGluZygp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvQ2Fpcm9V dGlsaXRpZXNFZmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0Nh aXJvVXRpbGl0aWVzRWZsLmNwcAppbmRleCBhYTRkNzQ5OTA2NzkzNTdkYmY5Yzc0NjRiMDhlZmEy ODhjODg5OTQzLi42NzlmNTllM2E0MTMyODNjNjVlMTAwOGU2MmFiZDZkNDlkMDEwODNjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvQ2Fpcm9VdGlsaXRp ZXNFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9DYWly b1V0aWxpdGllc0VmbC5jcHAKQEAgLTMyLDIwICszMiwyMCBAQCBQYXNzUmVmUHRyPEV2YXNfT2Jq ZWN0PiBldmFzT2JqZWN0RnJvbUNhaXJvSW1hZ2VTdXJmYWNlKEV2YXMqIGNhbnZhcywgY2Fpcm9f c3VyZgogCiAgICAgY2Fpcm9fc3RhdHVzX3Qgc3RhdHVzID0gY2Fpcm9fc3VyZmFjZV9zdGF0dXMo c3VyZmFjZSk7CiAgICAgaWYgKHN0YXR1cyAhPSBDQUlST19TVEFUVVNfU1VDQ0VTUykgewotICAg ICAgICBmcHJpbnRmKHN0ZGVyciwgImNhaXJvIHN1cmZhY2UgaXMgaW52YWxpZDogJXMiLCBjYWly b19zdGF0dXNfdG9fc3RyaW5nKHN0YXR1cykpOworICAgICAgICBFSU5BX0xPR19FUlIoImNhaXJv IHN1cmZhY2UgaXMgaW52YWxpZDogJXMiLCBjYWlyb19zdGF0dXNfdG9fc3RyaW5nKHN0YXR1cykp OwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKICAgICBjYWlyb19zdXJmYWNlX3R5cGVfdCB0 eXBlID0gY2Fpcm9fc3VyZmFjZV9nZXRfdHlwZShzdXJmYWNlKTsKICAgICBpZiAodHlwZSAhPSBD QUlST19TVVJGQUNFX1RZUEVfSU1BR0UpIHsKLSAgICAgICAgZnByaW50ZihzdGRlcnIsICJ1bmtu b3duIHN1cmZhY2UgdHlwZSAlZCwgcmVxdWlyZWQgJWQgKENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFH RSkuIiwKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJ1bmtub3duIHN1cmZhY2UgdHlwZSAlZCwgcmVx dWlyZWQgJWQgKENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFHRSkuIiwKICAgICAgICAgICAgIHR5cGUs IENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFHRSk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAog ICAgIGNhaXJvX2Zvcm1hdF90IGZvcm1hdCA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2Zvcm1h dChzdXJmYWNlKTsKICAgICBpZiAoZm9ybWF0ICE9IENBSVJPX0ZPUk1BVF9BUkdCMzIgJiYgZm9y bWF0ICE9IENBSVJPX0ZPUk1BVF9SR0IyNCkgewotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInVu a25vd24gc3VyZmFjZSBmb3JtYXQgJWQsIGV4cGVjdGVkICVkIG9yICVkLiIsCisgICAgICAgIEVJ TkFfTE9HX0VSUigidW5rbm93biBzdXJmYWNlIGZvcm1hdCAlZCwgZXhwZWN0ZWQgJWQgb3IgJWQu IiwKICAgICAgICAgICAgIGZvcm1hdCwgQ0FJUk9fRk9STUFUX0FSR0IzMiwgQ0FJUk9fRk9STUFU X1JHQjI0KTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQpAQCAtNTQsMTkgKzU0LDE5IEBAIFBh c3NSZWZQdHI8RXZhc19PYmplY3Q+IGV2YXNPYmplY3RGcm9tQ2Fpcm9JbWFnZVN1cmZhY2UoRXZh cyogY2FudmFzLCBjYWlyb19zdXJmCiAgICAgaW50IGhlaWdodCA9IGNhaXJvX2ltYWdlX3N1cmZh Y2VfZ2V0X2hlaWdodChzdXJmYWNlKTsKICAgICBpbnQgc3RyaWRlID0gY2Fpcm9faW1hZ2Vfc3Vy ZmFjZV9nZXRfc3RyaWRlKHN1cmZhY2UpOwogICAgIGlmICh3aWR0aCA8PSAwIHx8IGhlaWdodCA8 PSAwIHx8IHN0cmlkZSA8PSAwKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiaW52YWxpZCBp bWFnZSBzaXplICVkeCVkLCBzdHJpZGU9JWQiLCB3aWR0aCwgaGVpZ2h0LCBzdHJpZGUpOworICAg ICAgICBFSU5BX0xPR19FUlIoImludmFsaWQgaW1hZ2Ugc2l6ZSAlZHglZCwgc3RyaWRlPSVkIiwg d2lkdGgsIGhlaWdodCwgc3RyaWRlKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCiAgICAg dm9pZCogZGF0YSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEoc3VyZmFjZSk7CiAgICAg aWYgKCFkYXRhKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiY291bGQgbm90IGdldCBzb3Vy Y2UgZGF0YS4iKTsKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJjb3VsZCBub3QgZ2V0IHNvdXJjZSBk YXRhLiIpOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKICAgICBSZWZQdHI8RXZhc19PYmpl Y3Q+IGltYWdlID0gYWRvcHRSZWYoZXZhc19vYmplY3RfaW1hZ2VfZmlsbGVkX2FkZChjYW52YXMp KTsKICAgICBpZiAoIWltYWdlKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiY291bGQgbm90 IGFkZCBpbWFnZSB0byBjYW52YXMuIik7CisgICAgICAgIEVJTkFfTE9HX0VSUigiY291bGQgbm90 IGFkZCBpbWFnZSB0byBjYW52YXMuIik7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIApAQCAt NzUsNyArNzUsNyBAQCBQYXNzUmVmUHRyPEV2YXNfT2JqZWN0PiBldmFzT2JqZWN0RnJvbUNhaXJv SW1hZ2VTdXJmYWNlKEV2YXMqIGNhbnZhcywgY2Fpcm9fc3VyZgogICAgIGV2YXNfb2JqZWN0X2lt YWdlX2FscGhhX3NldChpbWFnZS5nZXQoKSwgZm9ybWF0ID09IENBSVJPX0ZPUk1BVF9BUkdCMzIp OwogCiAgICAgaWYgKGV2YXNfb2JqZWN0X2ltYWdlX3N0cmlkZV9nZXQoaW1hZ2UuZ2V0KCkpICE9 IHN0cmlkZSkgewotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgImV2YXMnIHN0cmlkZSAlZCBkaXZl cmdlcyBmcm9tIGNhaXJvJ3MgJWQuIiwKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJldmFzJyBzdHJp ZGUgJWQgZGl2ZXJnZXMgZnJvbSBjYWlybydzICVkLiIsCiAgICAgICAgICAgICBldmFzX29iamVj dF9pbWFnZV9zdHJpZGVfZ2V0KGltYWdlLmdldCgpKSwgc3RyaWRlKTsKICAgICAgICAgcmV0dXJu IDA7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAppbmRleCAxMjM3MzQ2Y2Ey OWIyYmUxYzZkMmJkZGJiM2Y4YjZlMzNlM2Y1ZTk2Li5lNTdiNTFjNWQ4ZDQyMmEyMzczNWRiODQ3 NDhmMDQwNmEwNjdmNjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2Zy YW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcApAQCAtMTM1 LDEzICsxMzUsMTMgQEAgc3RhdGljIGlubGluZSB2b2lkIF9ld2tfZnJhbWVfZGVidWcoRXZhc19P YmplY3QqIGV3a0ZyYW1lKQogICAgIGV2YXNfb2JqZWN0X2NvbG9yX2dldChjbGlwLCAmY29udGVu dFJlZCwgJmNvbnRlbnRHcmVlbiwgJmNvbnRlbnRCbHVlLCAmY29udGVudEFscGhhKTsKICAgICBl dmFzX29iamVjdF9nZW9tZXRyeV9nZXQoY2xpcCwgJmNvbnRlbnRYLCAmY29udGVudFksICZjb250 ZW50V2lkdGgsICZjb250ZW50SGVpZ2h0KTsKIAotICAgIGZwcmludGYoc3RkZXJyLCAiJXA6IHR5 cGU9JXMgbmFtZT0lcywgdmlzaWJsZT0lZCwgY29sb3I9JTAyeCUwMnglMDJ4JTAyeCwgJWQsJWQr JWR4JWQsIGNsaXBwZXI9JXAgKCVkLCAlMDJ4JTAyeCUwMnglMDJ4LCAlZCwlZCslZHglZClcbiIs CisgICAgRUlOQV9MT0dfRVJSKCIlcDogdHlwZT0lcyBuYW1lPSVzLCB2aXNpYmxlPSVkLCBjb2xv cj0lMDJ4JTAyeCUwMnglMDJ4LCAlZCwlZCslZHglZCwgY2xpcHBlcj0lcCAoJWQsICUwMnglMDJ4 JTAyeCUwMngsICVkLCVkKyVkeCVkKVxuIiwKICAgICAgICAgICAgIGV3a0ZyYW1lLCBldmFzX29i amVjdF90eXBlX2dldChld2tGcmFtZSksIGV2YXNfb2JqZWN0X25hbWVfZ2V0KGV3a0ZyYW1lKSwg ZXZhc19vYmplY3RfdmlzaWJsZV9nZXQoZXdrRnJhbWUpLAogICAgICAgICAgICAgcmVkLCBncmVl biwgYmx1ZSwgYWxwaGEsIHgsIHksIHdpZHRoLCBoZWlnaHQsCiAgICAgICAgICAgICBjbGlwLCBl dmFzX29iamVjdF92aXNpYmxlX2dldChjbGlwKSwgY29udGVudFJlZCwgY29udGVudEdyZWVuLCBj b250ZW50Qmx1ZSwgY29udGVudEFscGhhLCBjb250ZW50WCwgY29udGVudFksIGNvbnRlbnRXaWR0 aCwgY29udGVudEhlaWdodCk7CiAgICAgcGFyZW50ID0gZXZhc19vYmplY3Rfc21hcnRfcGFyZW50 X2dldChld2tGcmFtZSk7CiAgICAgaWYgKCFwYXJlbnQpCi0gICAgICAgIGZwcmludGYoc3RkZXJy LCAiXG4iKTsKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJcbiIpOwogICAgIGVsc2UKICAgICAgICAg X2V3a19mcmFtZV9kZWJ1ZyhwYXJlbnQpOwogfQo= 189432 2013-02-20 18:01:11 -0800 2013-02-22 20:15:47 -0800 Patch bug-110313-20130221105730.patch text/plain 6441 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk4NDgyNWZmMjcwZGVl NTIwMWI3NGI3ZDM0YTk5NzMzZjA0NmYzNi4uNmZkZDU3MTliNzhlZGUxNGFlOTk2OTlhOWYwYWU2 ZDliNjA1YjRjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAyLTIwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNl IEVJTkFfTE9HIGluc3RlYWQgb2YgZnByaW50ZiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDMxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgZnByaW50ZiB3aXRoIEVJTkFfTE9HLgorCisg ICAgICAgICogcGxhdGZvcm0vZWZsL05ldHdvcmtJbmZvUHJvdmlkZXJFZmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TmV0d29ya0luZm9Qcm92aWRlckVmbDo6c3RhcnRVcGRhdGluZyk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0NhaXJvVXRpbGl0aWVzRWZsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmV2YXNPYmplY3RGcm9tQ2Fpcm9JbWFnZVN1cmZhY2UpOgorCiAyMDEzLTAy LTE5ICBIYXlhdG8gSXRvIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENhbGN1bGF0 ZSBFdmVudFBhdGggaW4gRXZlbnREaXNwYXRjaGVyJ3MgY29uc3RydWN0b3IuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VM b2cKaW5kZXggMTlkN2RmOWY3NDI1NjQzNjg1YWU3NzVlNWEwNzZkZTM0MmRjZDkyNS4uM2JmNTJh YzA4Y2U3ZmNjYzFmNjAyYjBiYTViZjhiZDEwOTFlMjRmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9lZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDEzLTAyLTIwICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gVXNlIEVJTkFfTE9HIGluc3RlYWQgb2YgZnByaW50 ZiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDMx MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxh Y2UgZnByaW50ZiB3aXRoIEVJTkFfTE9HLgorCisgICAgICAgICogZXdrL2V3a19mcmFtZS5jcHA6 CisgICAgICAgIChfZXdrX2ZyYW1lX2RlYnVnKToKKwogMjAxMy0wMi0xOSAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENvbnZlcnQgMyBzZXR0aW5ncyB0byB1c2Ug U2V0dGluZ3MuaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9OZXR3 b3JrSW5mb1Byb3ZpZGVyRWZsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9OZXR3 b3JrSW5mb1Byb3ZpZGVyRWZsLmNwcAppbmRleCBlNTFlOTY3ZGEyMGQyYTFhNWJkYzQ5MDIyMWYz NTgwNmVmMTBkYmI5Li5lYjgzMGRlYWFjZTA0ODk0MWUwOTg4YzUyZDlhMjgzZjAyOTI4NTdmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTmV0d29ya0luZm9Qcm92aWRl ckVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL05ldHdvcmtJbmZvUHJv dmlkZXJFZmwuY3BwCkBAIC00NCw3ICs0NCw3IEBAIE5ldHdvcmtJbmZvUHJvdmlkZXJFZmw6Ok5l dHdvcmtJbmZvUHJvdmlkZXJFZmwoKQogdm9pZCBOZXR3b3JrSW5mb1Byb3ZpZGVyRWZsOjpzdGFy dFVwZGF0aW5nKCkKIHsKICAgICBpZiAoIWVlemVfaW5pdCgpKQotICAgICAgICBmcHJpbnRmKHN0 ZGVyciwgIkZhaWwgdG8gc3RhcnQgbmV0d29yayBpbmZvcm1hdGlvbiBjbGllbnQuXG4iKTsKKyAg ICAgICAgRUlOQV9MT0dfRVJSKCJGYWlsIHRvIHN0YXJ0IG5ldHdvcmsgaW5mb3JtYXRpb24gY2xp ZW50LiIpOwogfQogCiB2b2lkIE5ldHdvcmtJbmZvUHJvdmlkZXJFZmw6OnN0b3BVcGRhdGluZygp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvQ2Fpcm9V dGlsaXRpZXNFZmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0Nh aXJvVXRpbGl0aWVzRWZsLmNwcAppbmRleCBhYTRkNzQ5OTA2NzkzNTdkYmY5Yzc0NjRiMDhlZmEy ODhjODg5OTQzLi42NzlmNTllM2E0MTMyODNjNjVlMTAwOGU2MmFiZDZkNDlkMDEwODNjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvQ2Fpcm9VdGlsaXRp ZXNFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9DYWly b1V0aWxpdGllc0VmbC5jcHAKQEAgLTMyLDIwICszMiwyMCBAQCBQYXNzUmVmUHRyPEV2YXNfT2Jq ZWN0PiBldmFzT2JqZWN0RnJvbUNhaXJvSW1hZ2VTdXJmYWNlKEV2YXMqIGNhbnZhcywgY2Fpcm9f c3VyZgogCiAgICAgY2Fpcm9fc3RhdHVzX3Qgc3RhdHVzID0gY2Fpcm9fc3VyZmFjZV9zdGF0dXMo c3VyZmFjZSk7CiAgICAgaWYgKHN0YXR1cyAhPSBDQUlST19TVEFUVVNfU1VDQ0VTUykgewotICAg ICAgICBmcHJpbnRmKHN0ZGVyciwgImNhaXJvIHN1cmZhY2UgaXMgaW52YWxpZDogJXMiLCBjYWly b19zdGF0dXNfdG9fc3RyaW5nKHN0YXR1cykpOworICAgICAgICBFSU5BX0xPR19FUlIoImNhaXJv IHN1cmZhY2UgaXMgaW52YWxpZDogJXMiLCBjYWlyb19zdGF0dXNfdG9fc3RyaW5nKHN0YXR1cykp OwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKICAgICBjYWlyb19zdXJmYWNlX3R5cGVfdCB0 eXBlID0gY2Fpcm9fc3VyZmFjZV9nZXRfdHlwZShzdXJmYWNlKTsKICAgICBpZiAodHlwZSAhPSBD QUlST19TVVJGQUNFX1RZUEVfSU1BR0UpIHsKLSAgICAgICAgZnByaW50ZihzdGRlcnIsICJ1bmtu b3duIHN1cmZhY2UgdHlwZSAlZCwgcmVxdWlyZWQgJWQgKENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFH RSkuIiwKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJ1bmtub3duIHN1cmZhY2UgdHlwZSAlZCwgcmVx dWlyZWQgJWQgKENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFHRSkuIiwKICAgICAgICAgICAgIHR5cGUs IENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFHRSk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAog ICAgIGNhaXJvX2Zvcm1hdF90IGZvcm1hdCA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2Zvcm1h dChzdXJmYWNlKTsKICAgICBpZiAoZm9ybWF0ICE9IENBSVJPX0ZPUk1BVF9BUkdCMzIgJiYgZm9y bWF0ICE9IENBSVJPX0ZPUk1BVF9SR0IyNCkgewotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInVu a25vd24gc3VyZmFjZSBmb3JtYXQgJWQsIGV4cGVjdGVkICVkIG9yICVkLiIsCisgICAgICAgIEVJ TkFfTE9HX0VSUigidW5rbm93biBzdXJmYWNlIGZvcm1hdCAlZCwgZXhwZWN0ZWQgJWQgb3IgJWQu IiwKICAgICAgICAgICAgIGZvcm1hdCwgQ0FJUk9fRk9STUFUX0FSR0IzMiwgQ0FJUk9fRk9STUFU X1JHQjI0KTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQpAQCAtNTQsMTkgKzU0LDE5IEBAIFBh c3NSZWZQdHI8RXZhc19PYmplY3Q+IGV2YXNPYmplY3RGcm9tQ2Fpcm9JbWFnZVN1cmZhY2UoRXZh cyogY2FudmFzLCBjYWlyb19zdXJmCiAgICAgaW50IGhlaWdodCA9IGNhaXJvX2ltYWdlX3N1cmZh Y2VfZ2V0X2hlaWdodChzdXJmYWNlKTsKICAgICBpbnQgc3RyaWRlID0gY2Fpcm9faW1hZ2Vfc3Vy ZmFjZV9nZXRfc3RyaWRlKHN1cmZhY2UpOwogICAgIGlmICh3aWR0aCA8PSAwIHx8IGhlaWdodCA8 PSAwIHx8IHN0cmlkZSA8PSAwKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiaW52YWxpZCBp bWFnZSBzaXplICVkeCVkLCBzdHJpZGU9JWQiLCB3aWR0aCwgaGVpZ2h0LCBzdHJpZGUpOworICAg ICAgICBFSU5BX0xPR19FUlIoImludmFsaWQgaW1hZ2Ugc2l6ZSAlZHglZCwgc3RyaWRlPSVkIiwg d2lkdGgsIGhlaWdodCwgc3RyaWRlKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCiAgICAg dm9pZCogZGF0YSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEoc3VyZmFjZSk7CiAgICAg aWYgKCFkYXRhKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiY291bGQgbm90IGdldCBzb3Vy Y2UgZGF0YS4iKTsKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJjb3VsZCBub3QgZ2V0IHNvdXJjZSBk YXRhLiIpOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKICAgICBSZWZQdHI8RXZhc19PYmpl Y3Q+IGltYWdlID0gYWRvcHRSZWYoZXZhc19vYmplY3RfaW1hZ2VfZmlsbGVkX2FkZChjYW52YXMp KTsKICAgICBpZiAoIWltYWdlKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiY291bGQgbm90 IGFkZCBpbWFnZSB0byBjYW52YXMuIik7CisgICAgICAgIEVJTkFfTE9HX0VSUigiY291bGQgbm90 IGFkZCBpbWFnZSB0byBjYW52YXMuIik7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIApAQCAt NzUsNyArNzUsNyBAQCBQYXNzUmVmUHRyPEV2YXNfT2JqZWN0PiBldmFzT2JqZWN0RnJvbUNhaXJv SW1hZ2VTdXJmYWNlKEV2YXMqIGNhbnZhcywgY2Fpcm9fc3VyZgogICAgIGV2YXNfb2JqZWN0X2lt YWdlX2FscGhhX3NldChpbWFnZS5nZXQoKSwgZm9ybWF0ID09IENBSVJPX0ZPUk1BVF9BUkdCMzIp OwogCiAgICAgaWYgKGV2YXNfb2JqZWN0X2ltYWdlX3N0cmlkZV9nZXQoaW1hZ2UuZ2V0KCkpICE9 IHN0cmlkZSkgewotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgImV2YXMnIHN0cmlkZSAlZCBkaXZl cmdlcyBmcm9tIGNhaXJvJ3MgJWQuIiwKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJldmFzJyBzdHJp ZGUgJWQgZGl2ZXJnZXMgZnJvbSBjYWlybydzICVkLiIsCiAgICAgICAgICAgICBldmFzX29iamVj dF9pbWFnZV9zdHJpZGVfZ2V0KGltYWdlLmdldCgpKSwgc3RyaWRlKTsKICAgICAgICAgcmV0dXJu IDA7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAppbmRleCAxMjM3MzQ2Y2Ey OWIyYmUxYzZkMmJkZGJiM2Y4YjZlMzNlM2Y1ZTk2Li4xZDk0ZGU2MmM5OTBjNDMyNTkyOTM0ZWVh ZjE5YzI3MzNhNGRlMzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2Zy YW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcApAQCAtMTM1 LDEzICsxMzUsMTMgQEAgc3RhdGljIGlubGluZSB2b2lkIF9ld2tfZnJhbWVfZGVidWcoRXZhc19P YmplY3QqIGV3a0ZyYW1lKQogICAgIGV2YXNfb2JqZWN0X2NvbG9yX2dldChjbGlwLCAmY29udGVu dFJlZCwgJmNvbnRlbnRHcmVlbiwgJmNvbnRlbnRCbHVlLCAmY29udGVudEFscGhhKTsKICAgICBl dmFzX29iamVjdF9nZW9tZXRyeV9nZXQoY2xpcCwgJmNvbnRlbnRYLCAmY29udGVudFksICZjb250 ZW50V2lkdGgsICZjb250ZW50SGVpZ2h0KTsKIAotICAgIGZwcmludGYoc3RkZXJyLCAiJXA6IHR5 cGU9JXMgbmFtZT0lcywgdmlzaWJsZT0lZCwgY29sb3I9JTAyeCUwMnglMDJ4JTAyeCwgJWQsJWQr JWR4JWQsIGNsaXBwZXI9JXAgKCVkLCAlMDJ4JTAyeCUwMnglMDJ4LCAlZCwlZCslZHglZClcbiIs CisgICAgRUlOQV9MT0dfREJHKCIlcDogdHlwZT0lcyBuYW1lPSVzLCB2aXNpYmxlPSVkLCBjb2xv cj0lMDJ4JTAyeCUwMnglMDJ4LCAlZCwlZCslZHglZCwgY2xpcHBlcj0lcCAoJWQsICUwMnglMDJ4 JTAyeCUwMngsICVkLCVkKyVkeCVkKVxuIiwKICAgICAgICAgICAgIGV3a0ZyYW1lLCBldmFzX29i amVjdF90eXBlX2dldChld2tGcmFtZSksIGV2YXNfb2JqZWN0X25hbWVfZ2V0KGV3a0ZyYW1lKSwg ZXZhc19vYmplY3RfdmlzaWJsZV9nZXQoZXdrRnJhbWUpLAogICAgICAgICAgICAgcmVkLCBncmVl biwgYmx1ZSwgYWxwaGEsIHgsIHksIHdpZHRoLCBoZWlnaHQsCiAgICAgICAgICAgICBjbGlwLCBl dmFzX29iamVjdF92aXNpYmxlX2dldChjbGlwKSwgY29udGVudFJlZCwgY29udGVudEdyZWVuLCBj b250ZW50Qmx1ZSwgY29udGVudEFscGhhLCBjb250ZW50WCwgY29udGVudFksIGNvbnRlbnRXaWR0 aCwgY29udGVudEhlaWdodCk7CiAgICAgcGFyZW50ID0gZXZhc19vYmplY3Rfc21hcnRfcGFyZW50 X2dldChld2tGcmFtZSk7CiAgICAgaWYgKCFwYXJlbnQpCi0gICAgICAgIGZwcmludGYoc3RkZXJy LCAiXG4iKTsKKyAgICAgICAgRUlOQV9MT0dfRVJSKCJjb3VsZCBub3QgZ2V0IHBhcmVudCBvYmpl Y3QuXG4iKTsKICAgICBlbHNlCiAgICAgICAgIF9ld2tfZnJhbWVfZGVidWcocGFyZW50KTsKIH0K