75466 2012-01-03 02:25:23 -0800 Remove style warning in GraphicsContext3DOpenGL.cpp 2012-01-07 21:31:31 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75462 0 kevin.cs.oh webkit-unassigned dbates kbr webkit.review.bot oldest_to_newest 528703 0 kevin.cs.oh 2012-01-03 02:25:23 -0800 This is trivial bug to remove webkit style warnings in GraphicsContext3DOpenGL.cpp 528705 1 120923 kevin.cs.oh 2012-01-03 02:44:29 -0800 Created attachment 120923 Patch 529205 2 120923 eric 2012-01-03 17:42:45 -0800 Comment on attachment 120923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120923&action=review style-only changes are kinda looked down upon. BUt there is some minor cleanup you could do here at the same time which seems worth doing. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1291 > + (*value) = getShaderInfoLog(shader).length(); Why the () around *value? > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1315 > + if (entry.isValid) { > + GLint length; If you're going to re-indent this, you might as well make it use early-return instead. 529221 3 120923 dbates 2012-01-03 18:20:35 -0800 Comment on attachment 120923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120923&action=review > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:887 > // FIXME: This is not implemented on desktop OpenGL. We need to have ifdefs for the different GL variants Nit: This comment is missing a period at the end of the line. Comments should be full sentences as per the WebKit style guide. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:889 > + // ::glReleaseShaderCompiler(); We shouldn't commit commented out code. Instead of fixing the style issue on this line, I suggest we remove this line entirely because it's commented out code and it's clear from the name of this method (whose name coincides with a similarly named OpenGL call) that the implementation of this method will need to inform OpenGL to deallocate its internal resources associated with the shader compiler. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1276 > + // Let OpenGL handle these. This comment is inane as it doesn't explain "why" we should use OpenGL handle these cases. Either we should improve this comment or remove it. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1310 > + return ""; It is sufficient to call the default String() constructor here instead of the C-string variant: return String(); > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1318 > + return ""; Ditto. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1321 > + GLchar* info = (GLchar*) fastMalloc(length); Can we use OwnArrayPtr here? Then we can get rid of the fastFree() call on line 1326. 529387 4 121076 kevin.cs.oh 2012-01-03 23:57:02 -0800 Created attachment 121076 patch 529388 5 120923 kevin.cs.oh 2012-01-04 00:03:32 -0800 Comment on attachment 120923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120923&action=review Thanks for review. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:887 >> // FIXME: This is not implemented on desktop OpenGL. We need to have ifdefs for the different GL variants > > Nit: This comment is missing a period at the end of the line. Comments should be full sentences as per the WebKit style guide. Done. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:889 >> + // ::glReleaseShaderCompiler(); > > We shouldn't commit commented out code. Instead of fixing the style issue on this line, I suggest we remove this line entirely because it's commented out code and it's clear from the name of this method (whose name coincides with a similarly named OpenGL call) that the implementation of this method will need to inform OpenGL to deallocate its internal resources associated with the shader compiler. Removed glReleaseShaderCompiler() and added notImplemented() newly. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1276 >> + // Let OpenGL handle these. > > This comment is inane as it doesn't explain "why" we should use OpenGL handle these cases. Either we should improve this comment or remove it. Removed. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1291 >> + (*value) = getShaderInfoLog(shader).length(); > > Why the () around *value? Removed (). >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1310 >> + return ""; > > It is sufficient to call the default String() constructor here instead of the C-string variant: > > return String(); Done. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1315 >> + GLint length; > > If you're going to re-indent this, you might as well make it use early-return instead. Done. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1318 >> + return ""; > > Ditto. Done. >> Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1321 >> + GLchar* info = (GLchar*) fastMalloc(length); > > Can we use OwnArrayPtr here? Then we can get rid of the fastFree() call on line 1326. It looks no problem. So I did. 530395 6 121076 kbr 2012-01-05 10:27:13 -0800 Comment on attachment 121076 patch Looks correct to me. 530506 7 121076 webkit.review.bot 2012-01-05 12:02:35 -0800 Comment on attachment 121076 patch Clearing flags on attachment: 121076 Committed r104192: <http://trac.webkit.org/changeset/104192> 530507 8 webkit.review.bot 2012-01-05 12:02:39 -0800 All reviewed patches have been landed. Closing bug. 531700 9 121076 dbates 2012-01-07 18:18:49 -0800 Comment on attachment 121076 patch View in context: https://bugs.webkit.org/attachment.cgi?id=121076&action=review I know this was already reviewed and landed, but I noticed a correctness issue. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1251 > + OwnArrayPtr<GLchar> info = adoptArrayPtr(static_cast<GLchar*>(fastMalloc(length))); This is incorrect when GLOBAL_FASTMALLOC_NEW is disabled. We should be using operator new[] instead of fastMalloc() here since OwnArrayPtr ultimately uses operator delete[] on destruction. 531712 10 dbates 2012-01-07 21:31:31 -0800 (In reply to comment #9) > [...] > > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:1251 > > + OwnArrayPtr<GLchar> info = adoptArrayPtr(static_cast<GLchar*>(fastMalloc(length))); > > This is incorrect when GLOBAL_FASTMALLOC_NEW is disabled. We should be using operator new[] instead of fastMalloc() here since OwnArrayPtr ultimately uses operator delete[] on destruction. Fixed in <http://trac.webkit.org/changeset/104395>. 120923 2012-01-03 02:44:29 -0800 2012-01-04 00:03:32 -0800 Patch bug-75466-20120103194428.patch text/plain 5402 kevin.cs.oh SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzkzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAxLTAzICBDaGFuZ1Nl b2sgT2ggIDxzaGl2YW1pZG93QGdtYWlsLmNvbT4KKworICAgICAgICBSZW1vdmUgc3R5bGUgd2Fy bmluZyBpbiBHcmFwaGljc0NvbnRleHQzRE9wZW5HTC5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVsb2NhdGVkIHNvbWUgaGVhZGVycyBhY2NvcmRp bmcgdG8gYWxwaGFiZXRpY2FsIG9yZGVyICYgbW9kaWZpZWQgaW5kZW50YXRpb24uCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIHJlcXVpcmVkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDNEOjpyZWxlYXNlU2hhZGVyQ29tcGlsZXIpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0M0Q6OmdldFNoYWRlcml2KToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDNEOjpnZXRTaGFkZXJJbmZvTG9nKToKKwogMjAxMi0wMS0wMyAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVXNl IGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSB3aGVuIGF2YWlsYWJsZSBmb3Igc2Ny ZWVuQXZhaWxhYmxlUmVjdCgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0wuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5H TC5jcHAJKHJldmlzaW9uIDEwMzkyNikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI1LDE1ICsyNSwxMCBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKLSNpZiBQTEFURk9STShR VCkKLSNpbmNsdWRlIDxRdEdsb2JhbD4KLSNlbmRpZgotCiAjaWYgRU5BQkxFKFdFQkdMKQogCiAj aW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKIAotI2luY2x1ZGUgIldlYkdMT2JqZWN0Lmgi CiAjaW5jbHVkZSAiQ2FudmFzUmVuZGVyaW5nQ29udGV4dC5oIgogI2luY2x1ZGUgIkV4dGVuc2lv bnMzRE9wZW5HTC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgpAQCAtNDEsNiArMzYs NyBAQAogI2luY2x1ZGUgIkltYWdlQnVmZmVyLmgiCiAjaW5jbHVkZSAiSW1hZ2VEYXRhLmgiCiAj aW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKKyNpbmNsdWRlICJXZWJHTE9iamVjdC5oIgogI2lu Y2x1ZGUgPGNzdHJpbmc+CiAjaW5jbHVkZSA8d3RmL0FycmF5QnVmZmVyLmg+CiAjaW5jbHVkZSA8 d3RmL0FycmF5QnVmZmVyVmlldy5oPgpAQCAtNTUsNiArNTEsNyBAQAogI2VsaWYgUExBVEZPUk0o R1RLKQogI2luY2x1ZGUgIk9wZW5HTFNoaW1zLmgiCiAjZWxpZiBQTEFURk9STShRVCkKKyNpbmNs dWRlIDxRdEdsb2JhbD4KICNpbmNsdWRlIDxjYWlyby9PcGVuR0xTaGltcy5oPgogI2VuZGlmCiAK QEAgLTg4OSw3ICs4ODYsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpyZWxlYXNlU2hhZGVy Q29tCiB7CiAgICAgLy8gRklYTUU6IFRoaXMgaXMgbm90IGltcGxlbWVudGVkIG9uIGRlc2t0b3Ag T3BlbkdMLiBXZSBuZWVkIHRvIGhhdmUgaWZkZWZzIGZvciB0aGUgZGlmZmVyZW50IEdMIHZhcmlh bnRzCiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7Ci0gICAgLy86OmdsUmVsZWFzZVNoYWRlckNv bXBpbGVyKCk7CisgICAgLy8gOjpnbFJlbGVhc2VTaGFkZXJDb21waWxlcigpOwogfQogCiB2b2lk IEdyYXBoaWNzQ29udGV4dDNEOjpyZW5kZXJidWZmZXJTdG9yYWdlKEdDM0RlbnVtIHRhcmdldCwg R0MzRGVudW0gaW50ZXJuYWxmb3JtYXQsIEdDM0RzaXplaSB3aWR0aCwgR0MzRHNpemVpIGhlaWdo dCkKQEAgLTEyNzQsMzcgKzEyNzEsMzAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0U2hh ZGVyaXYoUGxhdAogICAgIEhhc2hNYXA8UGxhdGZvcm0zRE9iamVjdCwgU2hhZGVyU291cmNlRW50 cnk+OjppdGVyYXRvciByZXN1bHQgPSBtX3NoYWRlclNvdXJjZU1hcC5maW5kKHNoYWRlcik7CiAg ICAgCiAgICAgc3dpdGNoIChwbmFtZSkgewotICAgICAgICBjYXNlIERFTEVURV9TVEFUVVM6Ci0g ICAgICAgIGNhc2UgU0hBREVSX1RZUEU6Ci0gICAgICAgICAgICAvLyBMZXQgT3BlbkdMIGhhbmRs ZSB0aGVzZS4KLSAgICAgICAgCi0gICAgICAgICAgICA6OmdsR2V0U2hhZGVyaXYoc2hhZGVyLCBw bmFtZSwgdmFsdWUpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIAotICAgICAgICBjYXNl IENPTVBJTEVfU1RBVFVTOgotICAgICAgICAgICAgaWYgKHJlc3VsdCA9PSBtX3NoYWRlclNvdXJj ZU1hcC5lbmQoKSkgewotICAgICAgICAgICAgICAgICgqdmFsdWUpID0gc3RhdGljX2Nhc3Q8aW50 PihmYWxzZSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgfQotICAgICAg ICAKLSAgICAgICAgICAgICgqdmFsdWUpID0gc3RhdGljX2Nhc3Q8aW50PihyZXN1bHQtPnNlY29u ZC5pc1ZhbGlkKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAKLSAgICAgICAgY2FzZSBJ TkZPX0xPR19MRU5HVEg6Ci0gICAgICAgICAgICBpZiAocmVzdWx0ID09IG1fc2hhZGVyU291cmNl TWFwLmVuZCgpKSB7Ci0gICAgICAgICAgICAgICAgKCp2YWx1ZSkgPSAwOwotICAgICAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgICAgICAoKnZhbHVl KSA9IGdldFNoYWRlckluZm9Mb2coc2hhZGVyKS5sZW5ndGgoKTsKLSAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAKLSAgICAgICAgY2FzZSBTSEFERVJfU09VUkNFX0xFTkdUSDoKLSAgICAgICAg ICAgICgqdmFsdWUpID0gZ2V0U2hhZGVyU291cmNlKHNoYWRlcikubGVuZ3RoKCk7Ci0gICAgICAg ICAgICBicmVhazsKLSAgICAgICAgCi0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBzeW50 aGVzaXplR0xFcnJvcihJTlZBTElEX0VOVU0pOworICAgIGNhc2UgREVMRVRFX1NUQVRVUzoKKyAg ICBjYXNlIFNIQURFUl9UWVBFOgorICAgICAgICAvLyBMZXQgT3BlbkdMIGhhbmRsZSB0aGVzZS4K KyAgICAgICAgOjpnbEdldFNoYWRlcml2KHNoYWRlciwgcG5hbWUsIHZhbHVlKTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBDT01QSUxFX1NUQVRVUzoKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBt X3NoYWRlclNvdXJjZU1hcC5lbmQoKSkgeworICAgICAgICAgICAgKCp2YWx1ZSkgPSBzdGF0aWNf Y2FzdDxpbnQ+KGZhbHNlKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAg ICAoKnZhbHVlKSA9IHN0YXRpY19jYXN0PGludD4ocmVzdWx0LT5zZWNvbmQuaXNWYWxpZCk7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgSU5GT19MT0dfTEVOR1RIOgorICAgICAgICBpZiAocmVz dWx0ID09IG1fc2hhZGVyU291cmNlTWFwLmVuZCgpKSB7CisgICAgICAgICAgICAoKnZhbHVlKSA9 IDA7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgKCp2YWx1ZSkgPSBn ZXRTaGFkZXJJbmZvTG9nKHNoYWRlcikubGVuZ3RoKCk7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgU0hBREVSX1NPVVJDRV9MRU5HVEg6CisgICAgICAgICgqdmFsdWUpID0gZ2V0U2hhZGVyU291 cmNlKHNoYWRlcikubGVuZ3RoKCk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAg ICAgIHN5bnRoZXNpemVHTEVycm9yKElOVkFMSURfRU5VTSk7CiAgICAgfQogfQogCkBAIC0xMzE3 LDI2ICsxMzA3LDI3IEBAIFN0cmluZyBHcmFwaGljc0NvbnRleHQzRDo6Z2V0U2hhZGVySW5mb0wK ICAgICBIYXNoTWFwPFBsYXRmb3JtM0RPYmplY3QsIFNoYWRlclNvdXJjZUVudHJ5Pjo6aXRlcmF0 b3IgcmVzdWx0ID0gbV9zaGFkZXJTb3VyY2VNYXAuZmluZChzaGFkZXIpOwogCiAgICAgaWYgKHJl c3VsdCA9PSBtX3NoYWRlclNvdXJjZU1hcC5lbmQoKSkKLSAgICAgICAgIHJldHVybiAiIjsKKyAg ICAgICAgcmV0dXJuICIiOworCisgICAgU2hhZGVyU291cmNlRW50cnkgZW50cnkgPSByZXN1bHQt PnNlY29uZDsKIAotICAgICBTaGFkZXJTb3VyY2VFbnRyeSBlbnRyeSA9IHJlc3VsdC0+c2Vjb25k OworICAgIGlmIChlbnRyeS5pc1ZhbGlkKSB7CisgICAgICAgIEdMaW50IGxlbmd0aDsKKyAgICAg ICAgOjpnbEdldFNoYWRlcml2KHNoYWRlciwgR0xfSU5GT19MT0dfTEVOR1RILCAmbGVuZ3RoKTsK KyAgICAgICAgaWYgKCFsZW5ndGgpCisgICAgICAgICAgICByZXR1cm4gIiI7CisKKyAgICAgICAg R0xzaXplaSBzaXplOworICAgICAgICBHTGNoYXIqIGluZm8gPSAoR0xjaGFyKikgZmFzdE1hbGxv YyhsZW5ndGgpOworCisgICAgICAgIDo6Z2xHZXRTaGFkZXJJbmZvTG9nKHNoYWRlciwgbGVuZ3Ro LCAmc2l6ZSwgaW5mbyk7CisKKyAgICAgICAgU3RyaW5nIHMoaW5mbyk7CisgICAgICAgIGZhc3RG cmVlKGluZm8pOworICAgICAgICByZXR1cm4gczsKKyAgICB9CiAKLSAgICAgaWYgKGVudHJ5Lmlz VmFsaWQpIHsKLSAgICAgICAgIEdMaW50IGxlbmd0aDsKLSAgICAgICAgIDo6Z2xHZXRTaGFkZXJp dihzaGFkZXIsIEdMX0lORk9fTE9HX0xFTkdUSCwgJmxlbmd0aCk7Ci0gICAgICAgICBpZiAoIWxl bmd0aCkKLSAgICAgICAgICAgICByZXR1cm4gIiI7Ci0KLSAgICAgICAgIEdMc2l6ZWkgc2l6ZTsK LSAgICAgICAgIEdMY2hhciogaW5mbyA9IChHTGNoYXIqKSBmYXN0TWFsbG9jKGxlbmd0aCk7Ci0K LSAgICAgICAgIDo6Z2xHZXRTaGFkZXJJbmZvTG9nKHNoYWRlciwgbGVuZ3RoLCAmc2l6ZSwgaW5m byk7Ci0KLSAgICAgICAgIFN0cmluZyBzKGluZm8pOwotICAgICAgICAgZmFzdEZyZWUoaW5mbyk7 Ci0gICAgICAgICByZXR1cm4gczsKLSAgICAgfSBlbHNlCi0gICAgICAgICByZXR1cm4gZW50cnku bG9nOworICAgIHJldHVybiBlbnRyeS5sb2c7CiB9CiAKIFN0cmluZyBHcmFwaGljc0NvbnRleHQz RDo6Z2V0U2hhZGVyU291cmNlKFBsYXRmb3JtM0RPYmplY3Qgc2hhZGVyKQo= 121076 2012-01-03 23:57:02 -0800 2012-01-07 18:18:49 -0800 patch P75466.patch text/plain 7157 kevin.cs.oh SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNDAxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTAxLTAzICBDaGFuZ1Nl b2sgT2ggIDxzaGl2YW1pZG93QGdtYWlsLmNvbT4KKworICAgICAgICBSZW1vdmUgc3R5bGUgd2Fy bmluZyBpbiBHcmFwaGljc0NvbnRleHQzRE9wZW5HTC5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVsb2NhdGVkIHNvbWUgaGVhZGVycyBhY2NvcmRp bmcgdG8gYWxwaGFiZXRpY2FsIG9yZGVyICYgbW9kaWZpZWQgaW5kZW50YXRpb24uCisgICAgICAg IEFuZCB1c2VkIE93bkFycmF5UHRyIHRvIGRlYWwgd2l0aCBjaGFyYWN0ZXIgYXJyYXkuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIHJlcXVpcmVkLiAKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQzRDo6Z2V0U3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDNEOjpyZWxlYXNlU2hhZGVyQ29tcGlsZXIpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0M0Q6OmdldFByb2dyYW1JbmZvTG9nKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzQ29udGV4dDNEOjpnZXRTaGFkZXJpdik6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzRDo6Z2V0U2hhZGVySW5mb0xvZyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQzRDo6Z2V0U2hhZGVyU291cmNlKToKKwogMjAxMi0wMS0wMyAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIEhUTUxDb25zdHJ1Y3Rpb25TaXRlOjph dHRhY2ggc2hvdWxkbid0IHJldHVybiBhIHZhbHVlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0wuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0Nv bnRleHQzRE9wZW5HTC5jcHAJKHJldmlzaW9uIDEwNDAxNSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI1LDE1ICsyNSwxMCBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKLSNp ZiBQTEFURk9STShRVCkKLSNpbmNsdWRlIDxRdEdsb2JhbD4KLSNlbmRpZgotCiAjaWYgRU5BQkxF KFdFQkdMKQogCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0M0QuaCIKIAotI2luY2x1ZGUgIldl YkdMT2JqZWN0LmgiCiAjaW5jbHVkZSAiQ2FudmFzUmVuZGVyaW5nQ29udGV4dC5oIgogI2luY2x1 ZGUgIkV4dGVuc2lvbnMzRE9wZW5HTC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgpA QCAtNDEsNiArMzYsNyBAQAogI2luY2x1ZGUgIkltYWdlQnVmZmVyLmgiCiAjaW5jbHVkZSAiSW1h Z2VEYXRhLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKKyNpbmNsdWRlICJXZWJHTE9i amVjdC5oIgogI2luY2x1ZGUgPGNzdHJpbmc+CiAjaW5jbHVkZSA8d3RmL0FycmF5QnVmZmVyLmg+ CiAjaW5jbHVkZSA8d3RmL0FycmF5QnVmZmVyVmlldy5oPgpAQCAtNTUsNiArNTEsNyBAQAogI2Vs aWYgUExBVEZPUk0oR1RLKQogI2luY2x1ZGUgIk9wZW5HTFNoaW1zLmgiCiAjZWxpZiBQTEFURk9S TShRVCkKKyNpbmNsdWRlIDxRdEdsb2JhbD4KICNpbmNsdWRlIDxjYWlyby9PcGVuR0xTaGltcy5o PgogI2VuZGlmCiAKQEAgLTc3Myw3ICs3NzAsNyBAQCBHQzNEZW51bSBHcmFwaGljc0NvbnRleHQz RDo6Z2V0RXJyb3IoKQogU3RyaW5nIEdyYXBoaWNzQ29udGV4dDNEOjpnZXRTdHJpbmcoR0MzRGVu dW0gbmFtZSkKIHsKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKLSAgICByZXR1cm4gU3RyaW5n KChjb25zdCBjaGFyKikgOjpnbEdldFN0cmluZyhuYW1lKSk7CisgICAgcmV0dXJuIFN0cmluZyhy ZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPig6OmdsR2V0U3RyaW5nKG5hbWUpKSk7CiB9CiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OmhpbnQoR0MzRGVudW0gdGFyZ2V0LCBHQzNEZW51bSBt b2RlKQpAQCAtODg3LDkgKzg4NCw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OnJlYWRQaXhl bHMoR0MzRGkKIAogdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6cmVsZWFzZVNoYWRlckNvbXBpbGVy KCkKIHsKLSAgICAvLyBGSVhNRTogVGhpcyBpcyBub3QgaW1wbGVtZW50ZWQgb24gZGVza3RvcCBP cGVuR0wuIFdlIG5lZWQgdG8gaGF2ZSBpZmRlZnMgZm9yIHRoZSBkaWZmZXJlbnQgR0wgdmFyaWFu dHMKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBub3QgaW1wbGVtZW50ZWQgb24gZGVza3RvcCBPcGVu R0wuIFdlIG5lZWQgdG8gaGF2ZSBpZmRlZnMgZm9yIHRoZSBkaWZmZXJlbnQgR0wgdmFyaWFudHMu CiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7Ci0gICAgLy86OmdsUmVsZWFzZVNoYWRlckNvbXBp bGVyKCk7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQz RDo6cmVuZGVyYnVmZmVyU3RvcmFnZShHQzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIGludGVybmFs Zm9ybWF0LCBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQpCkBAIC0xMjQ1LDE4ICsx MjQyLDE2IEBAIFN0cmluZyBHcmFwaGljc0NvbnRleHQzRDo6Z2V0UHJvZ3JhbUluZm8KICAgICBB U1NFUlQocHJvZ3JhbSk7CiAKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKLSAgICBHTGludCBs ZW5ndGg7CisgICAgR0xpbnQgbGVuZ3RoID0gMDsKICAgICA6OmdsR2V0UHJvZ3JhbWl2KHByb2dy YW0sIEdMX0lORk9fTE9HX0xFTkdUSCwgJmxlbmd0aCk7CiAgICAgaWYgKCFsZW5ndGgpCi0gICAg ICAgIHJldHVybiAiIjsKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOyAKIAotICAgIEdMc2l6ZWkg c2l6ZTsKLSAgICBHTGNoYXIqIGluZm8gPSAoR0xjaGFyKikgZmFzdE1hbGxvYyhsZW5ndGgpOwor ICAgIEdMc2l6ZWkgc2l6ZSA9IDA7CisgICAgT3duQXJyYXlQdHI8R0xjaGFyPiBpbmZvID0gYWRv cHRBcnJheVB0cihzdGF0aWNfY2FzdDxHTGNoYXIqPihmYXN0TWFsbG9jKGxlbmd0aCkpKTsKKyAg ICA6OmdsR2V0UHJvZ3JhbUluZm9Mb2cocHJvZ3JhbSwgbGVuZ3RoLCAmc2l6ZSwgaW5mby5nZXQo KSk7CiAKLSAgICA6OmdsR2V0UHJvZ3JhbUluZm9Mb2cocHJvZ3JhbSwgbGVuZ3RoLCAmc2l6ZSwg aW5mbyk7Ci0gICAgU3RyaW5nIHMoaW5mbyk7Ci0gICAgZmFzdEZyZWUoaW5mbyk7Ci0gICAgcmV0 dXJuIHM7CisgICAgcmV0dXJuIFN0cmluZyhpbmZvLmdldCgpKTsKIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQzRDo6Z2V0UmVuZGVyYnVmZmVyUGFyYW1ldGVyaXYoR0MzRGVudW0gdGFyZ2V0LCBH QzNEZW51bSBwbmFtZSwgR0MzRGludCogdmFsdWUpCkBAIC0xMjc0LDM3ICsxMjY5LDI5IEBAIHZv aWQgR3JhcGhpY3NDb250ZXh0M0Q6OmdldFNoYWRlcml2KFBsYXQKICAgICBIYXNoTWFwPFBsYXRm b3JtM0RPYmplY3QsIFNoYWRlclNvdXJjZUVudHJ5Pjo6aXRlcmF0b3IgcmVzdWx0ID0gbV9zaGFk ZXJTb3VyY2VNYXAuZmluZChzaGFkZXIpOwogICAgIAogICAgIHN3aXRjaCAocG5hbWUpIHsKLSAg ICAgICAgY2FzZSBERUxFVEVfU1RBVFVTOgotICAgICAgICBjYXNlIFNIQURFUl9UWVBFOgotICAg ICAgICAgICAgLy8gTGV0IE9wZW5HTCBoYW5kbGUgdGhlc2UuCi0gICAgICAgIAotICAgICAgICAg ICAgOjpnbEdldFNoYWRlcml2KHNoYWRlciwgcG5hbWUsIHZhbHVlKTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAKLSAgICAgICAgY2FzZSBDT01QSUxFX1NUQVRVUzoKLSAgICAgICAgICAg IGlmIChyZXN1bHQgPT0gbV9zaGFkZXJTb3VyY2VNYXAuZW5kKCkpIHsKLSAgICAgICAgICAgICAg ICAoKnZhbHVlKSA9IHN0YXRpY19jYXN0PGludD4oZmFsc2UpOwotICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgICAgICAoKnZhbHVlKSA9IHN0 YXRpY19jYXN0PGludD4ocmVzdWx0LT5zZWNvbmQuaXNWYWxpZCk7Ci0gICAgICAgICAgICBicmVh azsKLSAgICAgICAgCi0gICAgICAgIGNhc2UgSU5GT19MT0dfTEVOR1RIOgotICAgICAgICAgICAg aWYgKHJlc3VsdCA9PSBtX3NoYWRlclNvdXJjZU1hcC5lbmQoKSkgewotICAgICAgICAgICAgICAg ICgqdmFsdWUpID0gMDsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIAotICAgICAgICAgICAgKCp2YWx1ZSkgPSBnZXRTaGFkZXJJbmZvTG9nKHNoYWRlciku bGVuZ3RoKCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgCi0gICAgICAgIGNhc2UgU0hB REVSX1NPVVJDRV9MRU5HVEg6Ci0gICAgICAgICAgICAoKnZhbHVlKSA9IGdldFNoYWRlclNvdXJj ZShzaGFkZXIpLmxlbmd0aCgpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIAotICAgICAg ICBkZWZhdWx0OgotICAgICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoSU5WQUxJRF9FTlVNKTsK KyAgICBjYXNlIERFTEVURV9TVEFUVVM6CisgICAgY2FzZSBTSEFERVJfVFlQRToKKyAgICAgICAg OjpnbEdldFNoYWRlcml2KHNoYWRlciwgcG5hbWUsIHZhbHVlKTsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBDT01QSUxFX1NUQVRVUzoKKyAgICAgICAgaWYgKHJlc3VsdCA9PSBtX3NoYWRlclNv dXJjZU1hcC5lbmQoKSkgeworICAgICAgICAgICAgKnZhbHVlID0gc3RhdGljX2Nhc3Q8aW50Pihm YWxzZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgKnZhbHVlID0g c3RhdGljX2Nhc3Q8aW50PihyZXN1bHQtPnNlY29uZC5pc1ZhbGlkKTsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBJTkZPX0xPR19MRU5HVEg6CisgICAgICAgIGlmIChyZXN1bHQgPT0gbV9zaGFk ZXJTb3VyY2VNYXAuZW5kKCkpIHsKKyAgICAgICAgICAgICp2YWx1ZSA9IDA7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgKnZhbHVlID0gZ2V0U2hhZGVySW5mb0xvZyhz aGFkZXIpLmxlbmd0aCgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFNIQURFUl9TT1VSQ0Vf TEVOR1RIOgorICAgICAgICAqdmFsdWUgPSBnZXRTaGFkZXJTb3VyY2Uoc2hhZGVyKS5sZW5ndGgo KTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgc3ludGhlc2l6ZUdMRXJy b3IoSU5WQUxJRF9FTlVNKTsKICAgICB9CiB9CiAKQEAgLTEzMTUsMjggKzEzMDIsMjMgQEAgU3Ry aW5nIEdyYXBoaWNzQ29udGV4dDNEOjpnZXRTaGFkZXJJbmZvTAogICAgIG1ha2VDb250ZXh0Q3Vy cmVudCgpOwogCiAgICAgSGFzaE1hcDxQbGF0Zm9ybTNET2JqZWN0LCBTaGFkZXJTb3VyY2VFbnRy eT46Oml0ZXJhdG9yIHJlc3VsdCA9IG1fc2hhZGVyU291cmNlTWFwLmZpbmQoc2hhZGVyKTsKLQog ICAgIGlmIChyZXN1bHQgPT0gbV9zaGFkZXJTb3VyY2VNYXAuZW5kKCkpCi0gICAgICAgICByZXR1 cm4gIiI7CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsgCiAKLSAgICAgU2hhZGVyU291cmNlRW50 cnkgZW50cnkgPSByZXN1bHQtPnNlY29uZDsKKyAgICBTaGFkZXJTb3VyY2VFbnRyeSBlbnRyeSA9 IHJlc3VsdC0+c2Vjb25kOworICAgIGlmICghZW50cnkuaXNWYWxpZCkKKyAgICAgICAgcmV0dXJu IGVudHJ5LmxvZzsKIAotICAgICBpZiAoZW50cnkuaXNWYWxpZCkgewotICAgICAgICAgR0xpbnQg bGVuZ3RoOwotICAgICAgICAgOjpnbEdldFNoYWRlcml2KHNoYWRlciwgR0xfSU5GT19MT0dfTEVO R1RILCAmbGVuZ3RoKTsKLSAgICAgICAgIGlmICghbGVuZ3RoKQotICAgICAgICAgICAgIHJldHVy biAiIjsKLQotICAgICAgICAgR0xzaXplaSBzaXplOwotICAgICAgICAgR0xjaGFyKiBpbmZvID0g KEdMY2hhciopIGZhc3RNYWxsb2MobGVuZ3RoKTsKLQotICAgICAgICAgOjpnbEdldFNoYWRlcklu Zm9Mb2coc2hhZGVyLCBsZW5ndGgsICZzaXplLCBpbmZvKTsKLQotICAgICAgICAgU3RyaW5nIHMo aW5mbyk7Ci0gICAgICAgICBmYXN0RnJlZShpbmZvKTsKLSAgICAgICAgIHJldHVybiBzOwotICAg ICB9IGVsc2UKLSAgICAgICAgIHJldHVybiBlbnRyeS5sb2c7CisgICAgR0xpbnQgbGVuZ3RoID0g MDsKKyAgICA6OmdsR2V0U2hhZGVyaXYoc2hhZGVyLCBHTF9JTkZPX0xPR19MRU5HVEgsICZsZW5n dGgpOworICAgIGlmICghbGVuZ3RoKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7IAorCisgICAg R0xzaXplaSBzaXplID0gMDsKKyAgICBPd25BcnJheVB0cjxHTGNoYXI+IGluZm8gPSBhZG9wdEFy cmF5UHRyKHN0YXRpY19jYXN0PEdMY2hhcio+KGZhc3RNYWxsb2MobGVuZ3RoKSkpOworICAgIDo6 Z2xHZXRTaGFkZXJJbmZvTG9nKHNoYWRlciwgbGVuZ3RoLCAmc2l6ZSwgaW5mby5nZXQoKSk7CisK KyAgICByZXR1cm4gU3RyaW5nKGluZm8uZ2V0KCkpOwogfQogCiBTdHJpbmcgR3JhcGhpY3NDb250 ZXh0M0Q6OmdldFNoYWRlclNvdXJjZShQbGF0Zm9ybTNET2JqZWN0IHNoYWRlcikKQEAgLTEzNDYs OSArMTMyOCw4IEBAIFN0cmluZyBHcmFwaGljc0NvbnRleHQzRDo6Z2V0U2hhZGVyU291cmMKICAg ICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKIAogICAgIEhhc2hNYXA8UGxhdGZvcm0zRE9iamVjdCwg U2hhZGVyU291cmNlRW50cnk+OjppdGVyYXRvciByZXN1bHQgPSBtX3NoYWRlclNvdXJjZU1hcC5m aW5kKHNoYWRlcik7Ci0KICAgICBpZiAocmVzdWx0ID09IG1fc2hhZGVyU291cmNlTWFwLmVuZCgp KQotICAgICAgICByZXR1cm4gIiI7CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsgCiAKICAgICBy ZXR1cm4gcmVzdWx0LT5zZWNvbmQuc291cmNlOwogfQo=