204446 2019-11-21 00:28:05 -0800 [GTK] Check EGL image extension by using native gl API in AcceleratedBackingStoreWayland 2019-11-27 00:25:13 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 199060 1 changseok changseok bugs-noreply cgarcia commit-queue zan oldest_to_newest 1592312 0 changseok 2019-11-21 00:28:05 -0800 This is part of efforts bringing ANGLE support for WebGL to gtk port. 1592313 1 384034 changseok 2019-11-21 00:50:27 -0800 Created attachment 384034 Patch 1592314 2 384035 changseok 2019-11-21 01:07:59 -0800 Created attachment 384035 Patch 1592744 3 384035 cgarcia 2019-11-22 05:04:04 -0800 Comment on attachment 384035 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384035&action=review > Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:84 > + if (!availableExtensions.contains("GL_ARB_texture_storage"_s)) { > + GLint majorVersion; > + ::glGetIntegerv(GL_MAJOR_VERSION, &majorVersion); > + GLint minorVersion; > + ::glGetIntegerv(GL_MINOR_VERSION, &minorVersion); > + if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 2)) > + availableExtensions.add("GL_ARB_texture_storage"_s); > + } We can simply this, since are only interested in GL_OES_EGL_image and glEGLImageTargetTexture2DOES we don't need to handle this exception here for GL_ARB_texture_storage. > Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:115 > + if (availableExtensions.contains("GL_OES_EGL_image") || availableExtensions.contains("GL_OES_EGL_image_external")) If we are going to build the list of extensions here, we can simplify this even more. Let's just add checkEGLImageAvailable (or something like that) and check any of those are available using the gl api directly, instead of first building a has set to then check if any of those are present. 1593189 4 384234 changseok 2019-11-23 01:54:57 -0800 Created attachment 384234 Patch 1593190 5 384035 changseok 2019-11-23 01:55:53 -0800 Comment on attachment 384035 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384035&action=review >> Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:84 >> + } > > We can simply this, since are only interested in GL_OES_EGL_image and glEGLImageTargetTexture2DOES we don't need to handle this exception here for GL_ARB_texture_storage. You're right. >> Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:115 >> + if (availableExtensions.contains("GL_OES_EGL_image") || availableExtensions.contains("GL_OES_EGL_image_external")) > > If we are going to build the list of extensions here, we can simplify this even more. Let's just add checkEGLImageAvailable (or something like that) and check any of those are available using the gl api directly, instead of first building a has set to then check if any of those are present. That is a good suggestion. Thanks! 1593370 6 384234 commit-queue 2019-11-25 02:08:46 -0800 Comment on attachment 384234 Patch Clearing flags on attachment: 384234 Committed r252851: <https://trac.webkit.org/changeset/252851> 1593371 7 commit-queue 2019-11-25 02:08:48 -0800 All reviewed patches have been landed. Closing bug. 384034 2019-11-21 00:50:27 -0800 2019-11-21 01:07:57 -0800 Patch bug-204446-20191121035026.patch text/plain 4571 changseok U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5ZmNjMDYyNjNlNzhjYTI3 NmFhYzQ2MTA0ZDc2Nzg2ZGMwMGE4NGQuLjA2MDA5OTEyODdlMjkzNjM0NGJlZDNlMzEzMTUxZGVi NzgwMjk5MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMTEtMjEgIENoYW5nU2Vv ayBPaCAgPGNoYW5nc2Vva0B3ZWJraXQub3JnPgorCisgICAgICAgIFtHVEtdIEdldCByaWQgb2Yg RXh0ZW5zaW9uczNET3BlbkdMIGRlcGVuZGVuY3kgZnJvbSBBY2NlbGVyYXRlZEJhY2tpbmdTdG9y ZVdheWxhbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNDQ0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgY2hhbmdlIGlzIHBhcnQgb2YgZWZmb3J0cyBicmluZ2luZyBBTkdMRSBiYWNrZW5kIGZv ciBXZWJHTCB0byB0aGUgZ3RrIHBvcnQuCisgICAgICAgIFdoZW4gQU5HTEUgV2ViR0wgaXMgZW5h YmxlZCwgd2UgZmFjZSBhIGRpbGVtbWEgb2YgY2hvb3NpbmcgZWl0aGVyIEV4dGVuc2lvbnMzREFO R0xFCisgICAgICAgIG9yIEV4dGVuc2lvbnMzRE9wZW5HTCBpbiBBY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQuY3BwLiBTaW5jZSB0aGV5IGNhbm5vdAorICAgICAgICBjb2V4aXN0LCB3ZSBj aG9zZSBFeHRlbnNpb25zM0RBTkdMRSBldmVuIGlmIHdoYXQgd2UgcmVhbGx5IHdhbnQgaXMgRXh0 ZW5zaW9uczNET2VwbkdMLgorICAgICAgICBXZSBhZGRyZXNzIHRoaXMgcHJvYmxlbSBieSBkaXJl Y3RseSBnZXR0aW5nIGdsIGV4dGVuc2lvbnMgdmlhIG5hdGl2ZSBHTCBBUEkKKyAgICAgICAgcmF0 aGVyIHRoYW4gcmVseWluZyBvbiBFeHRlbnNpb25zM0QqIGNsYXNzZXMgaW4gdGhlIGZpbGUuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZC5j cHA6CisgICAgICAgIChXZWJLaXQ6OmdldEV4dGVuc2lvbnMpOgorICAgICAgICAoV2ViS2l0OjpB Y2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmNoZWNrUmVxdWlyZW1lbnRzKToKKwogMjAx OS0xMS0yMCAgQ2hhbmdTZW9rIE9oICA8Y2hhbmdzZW9rQHdlYmtpdC5vcmc+CiAKICAgICAgICAg W0dUS10gQWRkIEFOR0xFIGJhY2tlbmQgdG8gR1RLIHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFu ZC5jcHAKaW5kZXggMWEzMjY0ZDg3YTE2OTdlMjczZmQ4ZDYwMzBmYjllMWFmMGI1MjliNy4uMDM1 ZTg4YmU0MTNlZmU4NmZmODFiNzJiMzk0ZTUzZTgzODc5YTExOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3Jl V2F5bGFuZC5jcHAKQEAgLTM4LDE1ICszOCwxMCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ2Fpcm9V dGlsaXRpZXMuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0dMQ29udGV4dC5oPgogCi0jaWYgVVNFKEFO R0xFKQotI2luY2x1ZGUgPFdlYkNvcmUvRXh0ZW5zaW9uczNEQU5HTEUuaD4KLSNpbmNsdWRlIDxX ZWJDb3JlL09wZW5HTFNoaW1zLmg+Ci0jZWxpZiBVU0UoT1BFTkdMX0VTKQorI2lmIFVTRShPUEVO R0xfRVMpCiAjaW5jbHVkZSA8R0xFUzIvZ2wyLmg+CiAjaW5jbHVkZSA8R0xFUzIvZ2wyZXh0Lmg+ Ci0jaW5jbHVkZSA8V2ViQ29yZS9FeHRlbnNpb25zM0RPcGVuR0xFUy5oPgogI2Vsc2UKLSNpbmNs dWRlIDxXZWJDb3JlL0V4dGVuc2lvbnMzRE9wZW5HTC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvT3Bl bkdMU2hpbXMuaD4KICNlbmRpZgogCkBAIC02Nyw2ICs2MiwzNSBAQCBzdGF0aWMgUEZOR0xFR0xJ TUFHRVRBUkdFVFRFWFRVUkUyRE9FU1BST0MgZ2xJbWFnZVRhcmdldFRleHR1cmUyRDsKIG5hbWVz cGFjZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKK3N0YXRpYyBIYXNoU2V0 PFN0cmluZz4gZ2V0RXh0ZW5zaW9ucyhib29sIHVzZUluZGV4ZWRHZXRTdHJpbmcpCit7CisgICAg SGFzaFNldDxTdHJpbmc+IGF2YWlsYWJsZUV4dGVuc2lvbnM7CisjaWYgIVVTRShPUEVOR0xfRVMp CisgICAgaWYgKHVzZUluZGV4ZWRHZXRTdHJpbmcpIHsKKyAgICAgICAgR0xpbnQgbnVtRXh0ZW5z aW9ucyA9IDA7CisgICAgICAgIDo6Z2xHZXRJbnRlZ2VydihHTF9OVU1fRVhURU5TSU9OUywgJm51 bUV4dGVuc2lvbnMpOworICAgICAgICBmb3IgKEdMaW50IGkgPSAwOyBpIDwgbnVtRXh0ZW5zaW9u czsgKytpKQorICAgICAgICAgICAgYXZhaWxhYmxlRXh0ZW5zaW9ucy5hZGQoZ2xHZXRTdHJpbmdp KEdMX0VYVEVOU0lPTlMsIGkpKTsKKworICAgICAgICBpZiAoIWF2YWlsYWJsZUV4dGVuc2lvbnMu Y29udGFpbnMoIkdMX0FSQl90ZXh0dXJlX3N0b3JhZ2UiX3MpKSB7CisgICAgICAgICAgICBHTGlu dCBtYWpvclZlcnNpb247CisgICAgICAgICAgICA6OmdsR2V0SW50ZWdlcnYoR0xfTUFKT1JfVkVS U0lPTiwgJm1ham9yVmVyc2lvbik7CisgICAgICAgICAgICBHTGludCBtaW5vclZlcnNpb247Cisg ICAgICAgICAgICA6OmdsR2V0SW50ZWdlcnYoR0xfTUlOT1JfVkVSU0lPTiwgJm1pbm9yVmVyc2lv bik7CisgICAgICAgICAgICBpZiAobWFqb3JWZXJzaW9uID4gNCB8fCAobWFqb3JWZXJzaW9uID09 IDQgJiYgbWlub3JWZXJzaW9uID49IDIpKQorICAgICAgICAgICAgICAgIGF2YWlsYWJsZUV4dGVu c2lvbnMuYWRkKCJHTF9BUkJfdGV4dHVyZV9zdG9yYWdlIl9zKTsKKyAgICAgICAgICAgIH0KKyAg ICB9IGVsc2UKKyNlbmRpZgorICAgIHsKKyAgICAgICAgU3RyaW5nIGV4dGVuc2lvbnNTdHJpbmcg PSBTdHJpbmcocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oOjpnbEdldFN0cmluZyhHTF9F WFRFTlNJT05TKSkpOworICAgICAgICBmb3IgKGF1dG8mIGV4dGVuc2lvbiA6IGV4dGVuc2lvbnNT dHJpbmcuc3BsaXQoJyAnKSkKKyAgICAgICAgICAgIGF2YWlsYWJsZUV4dGVuc2lvbnMuYWRkKGV4 dGVuc2lvbik7CisgICAgfQorCisgICAgcmV0dXJuIGF2YWlsYWJsZUV4dGVuc2lvbnM7Cit9CisK IGJvb2wgQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpjaGVja1JlcXVpcmVtZW50cygp CiB7CiAjaWYgVVNFKFdQRV9SRU5ERVJFUikKQEAgLTgxLDE0ICsxMDUsMTIgQEAgYm9vbCBBY2Nl bGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmNoZWNrUmVxdWlyZW1lbnRzKCkKICAgICAgICAg aWYgKCFlZ2xDb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKSkKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKIAotI2lmIFVTRShBTkdMRSkKLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPEV4dGVu c2lvbnMzREFOR0xFPiBnbEV4dGVuc2lvbnMgPSBtYWtlVW5pcXVlPEV4dGVuc2lvbnMzREFOR0xF PihudWxscHRyLCBHTENvbnRleHQ6OmN1cnJlbnQoKS0+dmVyc2lvbigpID49IDMyMCk7Ci0jZWxp ZiBVU0UoT1BFTkdMX0VTKQotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8RXh0ZW5zaW9uczNET3Bl bkdMRVM+IGdsRXh0ZW5zaW9ucyA9IG1ha2VVbmlxdWU8RXh0ZW5zaW9uczNET3BlbkdMRVM+KG51 bGxwdHIsICBmYWxzZSk7CisjaWYgVVNFKE9QRU5HTF9FUykKKyAgICAgICAgSGFzaFNldDxTdHJp bmc+IGF2YWlsYWJsZUV4dGVuc2lvbnMgPSBnZXRFeHRlbnNpb25zKGZhbHNlKTsKICNlbHNlCi0g ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHRlbnNpb25zM0RPcGVuR0w+IGdsRXh0ZW5zaW9ucyA9 IG1ha2VVbmlxdWU8RXh0ZW5zaW9uczNET3BlbkdMPihudWxscHRyLCBHTENvbnRleHQ6OmN1cnJl bnQoKS0+dmVyc2lvbigpID49IDMyMCk7CisgICAgICAgIEhhc2hTZXQ8U3RyaW5nPiBhdmFpbGFi bGVFeHRlbnNpb25zID0gZ2V0RXh0ZW5zaW9ucyhHTENvbnRleHQ6OmN1cnJlbnQoKS0+dmVyc2lv bigpID49IDMyMCk7CiAjZW5kaWYKLSAgICAgICAgaWYgKGdsRXh0ZW5zaW9ucy0+c3VwcG9ydHMo IkdMX09FU19FR0xfaW1hZ2UiKSB8fCBnbEV4dGVuc2lvbnMtPnN1cHBvcnRzKCJHTF9PRVNfRUdM X2ltYWdlX2V4dGVybmFsIikpCisgICAgICAgIGlmIChhdmFpbGFibGVFeHRlbnNpb25zLmNvbnRh aW5zKCJHTF9PRVNfRUdMX2ltYWdlIikgfHwgYXZhaWxhYmxlRXh0ZW5zaW9ucy5jb250YWlucygi R0xfT0VTX0VHTF9pbWFnZV9leHRlcm5hbCIpKQogICAgICAgICAgICAgZ2xJbWFnZVRhcmdldFRl eHR1cmUyRCA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZOR0xFR0xJTUFHRVRBUkdFVFRFWFRVUkUyRE9F U1BST0M+KGVnbEdldFByb2NBZGRyZXNzKCJnbEVHTEltYWdlVGFyZ2V0VGV4dHVyZTJET0VTIikp OwogICAgIH0KIAo= 384035 2019-11-21 01:07:59 -0800 2019-11-23 01:54:54 -0800 Patch bug-204446-20191121040758.patch text/plain 4615 changseok U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5ZmNjMDYyNjNlNzhjYTI3 NmFhYzQ2MTA0ZDc2Nzg2ZGMwMGE4NGQuLjYwODc3ZjFjMzhhZTk2N2ExMjlmMGEwNGIwNDJmNTQ2 ZTNmYjQzNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMTEtMjEgIENoYW5nU2Vv ayBPaCAgPGNoYW5nc2Vva0B3ZWJraXQub3JnPgorCisgICAgICAgIFtHVEtdIEdldCBnbCBleHRl bnNpb25zIGJ5IHVzaW5nIG5hdGl2ZSBnbCBBUEkgaW4gQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVX YXlsYW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDQ0NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGNoYW5nZSBpcyBwYXJ0IG9mIGVmZm9ydHMgYnJpbmdpbmcgQU5HTEUgYmFja2VuZCBmb3Ig V2ViR0wgdG8gdGhlIGd0ayBwb3J0LgorICAgICAgICBXaGVuIEFOR0xFIFdlYkdMIGlzIGVuYWJs ZWQsIHdlIGZhY2UgYSBkaWxlbW1hIG9mIGNob29zaW5nIGVpdGhlciBFeHRlbnNpb25zM0RBTkdM RQorICAgICAgICBvciBFeHRlbnNpb25zM0RPcGVuR0wgaW4gQWNjZWxlcmF0ZWRCYWNraW5nU3Rv cmVXYXlsYW5kLmNwcC4gU2luY2UgdGhleSBjYW5ub3QKKyAgICAgICAgY29leGlzdCwgd2UgY2hv c2UgRXh0ZW5zaW9uczNEQU5HTEUgZXZlbiBpZiB3aGF0IHdlIHJlYWxseSB3YW50IGlzIEV4dGVu c2lvbnMzRE9lcG5HTC4KKyAgICAgICAgV2UgYWRkcmVzcyB0aGlzIHByb2JsZW0gYnkgZGlyZWN0 bHkgZ2V0dGluZyBnbCBleHRlbnNpb25zIHZpYSBuYXRpdmUgR0wgQVBJCisgICAgICAgIHJhdGhl ciB0aGFuIHJlbHlpbmcgb24gRXh0ZW5zaW9uczNEKiBjbGFzc2VzIGluIHRoZSBmaWxlLgorCisg ICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpnZXRFeHRlbnNpb25zKToKKyAgICAgICAgKFdlYktpdDo6QWNj ZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpjaGVja1JlcXVpcmVtZW50cyk6CisKIDIwMTkt MTEtMjAgIENoYW5nU2VvayBPaCAgPGNoYW5nc2Vva0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtH VEtdIEFkZCBBTkdMRSBiYWNrZW5kIHRvIEdUSyBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQu Y3BwCmluZGV4IDFhMzI2NGQ4N2ExNjk3ZTI3M2ZkOGQ2MDMwZmI5ZTFhZjBiNTI5YjcuLmJjYjVm Mzc0MDUxNWFlYzk4NmMzMTBmYzRkY2I5M2ZlMDk1M2IyZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdh eWxhbmQuY3BwCkBAIC0zOCwxNSArMzgsMTAgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0NhaXJvVXRp bGl0aWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HTENvbnRleHQuaD4KIAotI2lmIFVTRShBTkdM RSkKLSNpbmNsdWRlIDxXZWJDb3JlL0V4dGVuc2lvbnMzREFOR0xFLmg+Ci0jaW5jbHVkZSA8V2Vi Q29yZS9PcGVuR0xTaGltcy5oPgotI2VsaWYgVVNFKE9QRU5HTF9FUykKKyNpZiBVU0UoT1BFTkdM X0VTKQogI2luY2x1ZGUgPEdMRVMyL2dsMi5oPgogI2luY2x1ZGUgPEdMRVMyL2dsMmV4dC5oPgot I2luY2x1ZGUgPFdlYkNvcmUvRXh0ZW5zaW9uczNET3BlbkdMRVMuaD4KICNlbHNlCi0jaW5jbHVk ZSA8V2ViQ29yZS9FeHRlbnNpb25zM0RPcGVuR0wuaD4KICNpbmNsdWRlIDxXZWJDb3JlL09wZW5H TFNoaW1zLmg+CiAjZW5kaWYKIApAQCAtNjcsNiArNjIsMzcgQEAgc3RhdGljIFBGTkdMRUdMSU1B R0VUQVJHRVRURVhUVVJFMkRPRVNQUk9DIGdsSW1hZ2VUYXJnZXRUZXh0dXJlMkQ7CiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCitzdGF0aWMgSGFzaFNldDxT dHJpbmc+IGdldEV4dGVuc2lvbnMoYm9vbCB1c2VJbmRleGVkR2V0U3RyaW5nKQoreworICAgIEhh c2hTZXQ8U3RyaW5nPiBhdmFpbGFibGVFeHRlbnNpb25zOworI2lmIFVTRShPUEVOR0xfRVMpCisg ICAgVU5VU0VEX1BBUkFNKHVzZUluZGV4ZWRHZXRTdHJpbmcpOworI2Vsc2UKKyAgICBpZiAodXNl SW5kZXhlZEdldFN0cmluZykgeworICAgICAgICBHTGludCBudW1FeHRlbnNpb25zID0gMDsKKyAg ICAgICAgOjpnbEdldEludGVnZXJ2KEdMX05VTV9FWFRFTlNJT05TLCAmbnVtRXh0ZW5zaW9ucyk7 CisgICAgICAgIGZvciAoR0xpbnQgaSA9IDA7IGkgPCBudW1FeHRlbnNpb25zOyArK2kpCisgICAg ICAgICAgICBhdmFpbGFibGVFeHRlbnNpb25zLmFkZChnbEdldFN0cmluZ2koR0xfRVhURU5TSU9O UywgaSkpOworCisgICAgICAgIGlmICghYXZhaWxhYmxlRXh0ZW5zaW9ucy5jb250YWlucygiR0xf QVJCX3RleHR1cmVfc3RvcmFnZSJfcykpIHsKKyAgICAgICAgICAgIEdMaW50IG1ham9yVmVyc2lv bjsKKyAgICAgICAgICAgIDo6Z2xHZXRJbnRlZ2VydihHTF9NQUpPUl9WRVJTSU9OLCAmbWFqb3JW ZXJzaW9uKTsKKyAgICAgICAgICAgIEdMaW50IG1pbm9yVmVyc2lvbjsKKyAgICAgICAgICAgIDo6 Z2xHZXRJbnRlZ2VydihHTF9NSU5PUl9WRVJTSU9OLCAmbWlub3JWZXJzaW9uKTsKKyAgICAgICAg ICAgIGlmIChtYWpvclZlcnNpb24gPiA0IHx8IChtYWpvclZlcnNpb24gPT0gNCAmJiBtaW5vclZl cnNpb24gPj0gMikpCisgICAgICAgICAgICAgICAgYXZhaWxhYmxlRXh0ZW5zaW9ucy5hZGQoIkdM X0FSQl90ZXh0dXJlX3N0b3JhZ2UiX3MpOworICAgICAgICAgICAgfQorICAgIH0gZWxzZQorI2Vu ZGlmCisgICAgeworICAgICAgICBTdHJpbmcgZXh0ZW5zaW9uc1N0cmluZyA9IFN0cmluZyhyZWlu dGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPig6OmdsR2V0U3RyaW5nKEdMX0VYVEVOU0lPTlMpKSk7 CisgICAgICAgIGZvciAoYXV0byYgZXh0ZW5zaW9uIDogZXh0ZW5zaW9uc1N0cmluZy5zcGxpdCgn ICcpKQorICAgICAgICAgICAgYXZhaWxhYmxlRXh0ZW5zaW9ucy5hZGQoZXh0ZW5zaW9uKTsKKyAg ICB9CisKKyAgICByZXR1cm4gYXZhaWxhYmxlRXh0ZW5zaW9uczsKK30KKwogYm9vbCBBY2NlbGVy YXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmNoZWNrUmVxdWlyZW1lbnRzKCkKIHsKICNpZiBVU0Uo V1BFX1JFTkRFUkVSKQpAQCAtODEsMTQgKzEwNywxMiBAQCBib29sIEFjY2VsZXJhdGVkQmFja2lu Z1N0b3JlV2F5bGFuZDo6Y2hlY2tSZXF1aXJlbWVudHMoKQogICAgICAgICBpZiAoIWVnbENvbnRl eHQtPm1ha2VDb250ZXh0Q3VycmVudCgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0j aWYgVVNFKEFOR0xFKQotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8RXh0ZW5zaW9uczNEQU5HTEU+ IGdsRXh0ZW5zaW9ucyA9IG1ha2VVbmlxdWU8RXh0ZW5zaW9uczNEQU5HTEU+KG51bGxwdHIsIEdM Q29udGV4dDo6Y3VycmVudCgpLT52ZXJzaW9uKCkgPj0gMzIwKTsKLSNlbGlmIFVTRShPUEVOR0xf RVMpCi0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxFeHRlbnNpb25zM0RPcGVuR0xFUz4gZ2xFeHRl bnNpb25zID0gbWFrZVVuaXF1ZTxFeHRlbnNpb25zM0RPcGVuR0xFUz4obnVsbHB0ciwgIGZhbHNl KTsKKyNpZiBVU0UoT1BFTkdMX0VTKQorICAgICAgICBIYXNoU2V0PFN0cmluZz4gYXZhaWxhYmxl RXh0ZW5zaW9ucyA9IGdldEV4dGVuc2lvbnMoZmFsc2UpOwogI2Vsc2UKLSAgICAgICAgc3RkOjp1 bmlxdWVfcHRyPEV4dGVuc2lvbnMzRE9wZW5HTD4gZ2xFeHRlbnNpb25zID0gbWFrZVVuaXF1ZTxF eHRlbnNpb25zM0RPcGVuR0w+KG51bGxwdHIsIEdMQ29udGV4dDo6Y3VycmVudCgpLT52ZXJzaW9u KCkgPj0gMzIwKTsKKyAgICAgICAgSGFzaFNldDxTdHJpbmc+IGF2YWlsYWJsZUV4dGVuc2lvbnMg PSBnZXRFeHRlbnNpb25zKEdMQ29udGV4dDo6Y3VycmVudCgpLT52ZXJzaW9uKCkgPj0gMzIwKTsK ICNlbmRpZgotICAgICAgICBpZiAoZ2xFeHRlbnNpb25zLT5zdXBwb3J0cygiR0xfT0VTX0VHTF9p bWFnZSIpIHx8IGdsRXh0ZW5zaW9ucy0+c3VwcG9ydHMoIkdMX09FU19FR0xfaW1hZ2VfZXh0ZXJu YWwiKSkKKyAgICAgICAgaWYgKGF2YWlsYWJsZUV4dGVuc2lvbnMuY29udGFpbnMoIkdMX09FU19F R0xfaW1hZ2UiKSB8fCBhdmFpbGFibGVFeHRlbnNpb25zLmNvbnRhaW5zKCJHTF9PRVNfRUdMX2lt YWdlX2V4dGVybmFsIikpCiAgICAgICAgICAgICBnbEltYWdlVGFyZ2V0VGV4dHVyZTJEID0gcmVp bnRlcnByZXRfY2FzdDxQRk5HTEVHTElNQUdFVEFSR0VUVEVYVFVSRTJET0VTUFJPQz4oZWdsR2V0 UHJvY0FkZHJlc3MoImdsRUdMSW1hZ2VUYXJnZXRUZXh0dXJlMkRPRVMiKSk7CiAgICAgfQogCg== 384234 2019-11-23 01:54:57 -0800 2019-11-25 02:08:46 -0800 Patch bug-204446-20191123185456.patch text/plain 4227 changseok U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5ZmNjMDYyNjNlNzhjYTI3 NmFhYzQ2MTA0ZDc2Nzg2ZGMwMGE4NGQuLmRmMjk2NWFjYmJmM2U3YzIxMTBhZTZmNmY1YzcxNjdh NTBjZGQyZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMTEtMjMgIENoYW5nU2Vv ayBPaCAgPGNoYW5nc2Vva0B3ZWJraXQub3JnPgorCisgICAgICAgIFtHVEtdIENoZWNrIEVHTCBp bWFnZSBleHRlbnNpb24gYnkgdXNpbmcgbmF0aXZlIGdsIEFQSSBpbiBBY2NlbGVyYXRlZEJhY2tp bmdTdG9yZVdheWxhbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNDQ0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgY2hhbmdlIGlzIHBhcnQgb2YgZWZmb3J0cyBicmluZ2luZyBBTkdMRSBiYWNr ZW5kIGZvciBXZWJHTCB0byB0aGUgZ3RrIHBvcnQuCisgICAgICAgIFdoZW4gQU5HTEUgV2ViR0wg aXMgZW5hYmxlZCwgd2UgZmFjZSBhIGRpbGVtbWEgb2YgY2hvb3NpbmcgZWl0aGVyIEV4dGVuc2lv bnMzREFOR0xFCisgICAgICAgIG9yIEV4dGVuc2lvbnMzRE9wZW5HTCBpbiBBY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZVdheWxhbmQuY3BwLiBTaW5jZSB0aGV5IGNhbm5vdAorICAgICAgICBjb2V4aXN0 LCB3ZSBjaG9zZSBFeHRlbnNpb25zM0RBTkdMRSBldmVuIGlmIHdoYXQgd2UgcmVhbGx5IHdhbnQg aXMgRXh0ZW5zaW9uczNET2VwbkdMLgorICAgICAgICBXZSBhZGRyZXNzIHRoaXMgcHJvYmxlbSBi eSBkaXJlY3RseSBjaGVja2luZyBlZ2wgaW1hZ2UgZXh0ZW5zaW9uIGF2YWlsYWJpbGl0eQorICAg ICAgICB2aWEgbmF0aXZlIEdMIEFQSSByYXRoZXIgdGhhbiByZWx5aW5nIG9uIEV4dGVuc2lvbnMz RCogY2xhc3NlcyBpbiB0aGUgZmlsZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvQWNjZWxl cmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcDoKKyAgICAgICAgKFdlYktpdDo6aXNFR0xJbWFn ZUF2YWlsYWJsZSk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5 bGFuZDo6Y2hlY2tSZXF1aXJlbWVudHMpOgorCiAyMDE5LTExLTIwICBDaGFuZ1Nlb2sgT2ggIDxj aGFuZ3Nlb2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBbR1RLXSBBZGQgQU5HTEUgYmFja2VuZCB0 byBHVEsgcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2Vs ZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9n dGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcAppbmRleCAxYTMyNjRkODdhMTY5 N2UyNzNmZDhkNjAzMGZiOWUxYWYwYjUyOWI3Li40NDNmMDg3NTZmZDEwYTFiYzE0MWVkNjQ5MmU5 OGUxMTA3NGUxYThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNj ZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kLmNwcApAQCAtMzgsMTUgKzM4 LDEwIEBACiAjaW5jbHVkZSA8V2ViQ29yZS9DYWlyb1V0aWxpdGllcy5oPgogI2luY2x1ZGUgPFdl YkNvcmUvR0xDb250ZXh0Lmg+CiAKLSNpZiBVU0UoQU5HTEUpCi0jaW5jbHVkZSA8V2ViQ29yZS9F eHRlbnNpb25zM0RBTkdMRS5oPgotI2luY2x1ZGUgPFdlYkNvcmUvT3BlbkdMU2hpbXMuaD4KLSNl bGlmIFVTRShPUEVOR0xfRVMpCisjaWYgVVNFKE9QRU5HTF9FUykKICNpbmNsdWRlIDxHTEVTMi9n bDIuaD4KICNpbmNsdWRlIDxHTEVTMi9nbDJleHQuaD4KLSNpbmNsdWRlIDxXZWJDb3JlL0V4dGVu c2lvbnMzRE9wZW5HTEVTLmg+CiAjZWxzZQotI2luY2x1ZGUgPFdlYkNvcmUvRXh0ZW5zaW9uczNE T3BlbkdMLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9PcGVuR0xTaGltcy5oPgogI2VuZGlmCiAKQEAg LTY3LDYgKzYyLDMyIEBAIHN0YXRpYyBQRk5HTEVHTElNQUdFVEFSR0VUVEVYVFVSRTJET0VTUFJP QyBnbEltYWdlVGFyZ2V0VGV4dHVyZTJEOwogbmFtZXNwYWNlIFdlYktpdCB7CiB1c2luZyBuYW1l c3BhY2UgV2ViQ29yZTsKIAorYm9vbCBpc0VHTEltYWdlQXZhaWxhYmxlKGJvb2wgdXNlSW5kZXhl ZEdldFN0cmluZykKK3sKKyNpZiBVU0UoT1BFTkdMX0VTKQorICAgIFVOVVNFRF9QQVJBTSh1c2VJ bmRleGVkR2V0U3RyaW5nKTsKKyNlbHNlCisgICAgaWYgKHVzZUluZGV4ZWRHZXRTdHJpbmcpIHsK KyAgICAgICAgR0xpbnQgbnVtRXh0ZW5zaW9ucyA9IDA7CisgICAgICAgIDo6Z2xHZXRJbnRlZ2Vy dihHTF9OVU1fRVhURU5TSU9OUywgJm51bUV4dGVuc2lvbnMpOworICAgICAgICBmb3IgKEdMaW50 IGkgPSAwOyBpIDwgbnVtRXh0ZW5zaW9uczsgKytpKSB7CisgICAgICAgICAgICBTdHJpbmcgZXh0 ZW5zaW9uID0gU3RyaW5nKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGdsR2V0U3RyaW5n aShHTF9FWFRFTlNJT05TLCBpKSkpOworICAgICAgICAgICAgaWYgKGV4dGVuc2lvbiA9PSAiR0xf T0VTX0VHTF9pbWFnZSIgfHwgZXh0ZW5zaW9uID09ICJHTF9PRVNfRUdMX2ltYWdlX2V4dGVybmFs IikKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0gZWxzZQor I2VuZGlmCisgICAgeworICAgICAgICBTdHJpbmcgZXh0ZW5zaW9uc1N0cmluZyA9IFN0cmluZyhy ZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPig6OmdsR2V0U3RyaW5nKEdMX0VYVEVOU0lPTlMp KSk7CisgICAgICAgIGZvciAoYXV0byYgZXh0ZW5zaW9uIDogZXh0ZW5zaW9uc1N0cmluZy5zcGxp dCgnICcpKSB7CisgICAgICAgICAgICBpZiAoZXh0ZW5zaW9uID09ICJHTF9PRVNfRUdMX2ltYWdl IiB8fCBleHRlbnNpb24gPT0gIkdMX09FU19FR0xfaW1hZ2VfZXh0ZXJuYWwiKQorICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNl OworfQorCiBib29sIEFjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZDo6Y2hlY2tSZXF1aXJl bWVudHMoKQogewogI2lmIFVTRShXUEVfUkVOREVSRVIpCkBAIC04MSwxNCArMTAyLDExIEBAIGJv b2wgQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpjaGVja1JlcXVpcmVtZW50cygpCiAg ICAgICAgIGlmICghZWdsQ29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCkpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSNpZiBVU0UoQU5HTEUpCi0gICAgICAgIHN0ZDo6dW5pcXVlX3B0 cjxFeHRlbnNpb25zM0RBTkdMRT4gZ2xFeHRlbnNpb25zID0gbWFrZVVuaXF1ZTxFeHRlbnNpb25z M0RBTkdMRT4obnVsbHB0ciwgR0xDb250ZXh0OjpjdXJyZW50KCktPnZlcnNpb24oKSA+PSAzMjAp OwotI2VsaWYgVVNFKE9QRU5HTF9FUykKLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPEV4dGVuc2lv bnMzRE9wZW5HTEVTPiBnbEV4dGVuc2lvbnMgPSBtYWtlVW5pcXVlPEV4dGVuc2lvbnMzRE9wZW5H TEVTPihudWxscHRyLCAgZmFsc2UpOworI2lmIFVTRShPUEVOR0xfRVMpCisgICAgICAgIGlmIChp c0VHTEltYWdlQXZhaWxhYmxlKGZhbHNlKSkKICNlbHNlCi0gICAgICAgIHN0ZDo6dW5pcXVlX3B0 cjxFeHRlbnNpb25zM0RPcGVuR0w+IGdsRXh0ZW5zaW9ucyA9IG1ha2VVbmlxdWU8RXh0ZW5zaW9u czNET3BlbkdMPihudWxscHRyLCBHTENvbnRleHQ6OmN1cnJlbnQoKS0+dmVyc2lvbigpID49IDMy MCk7CisgICAgICAgIGlmIChpc0VHTEltYWdlQXZhaWxhYmxlKEdMQ29udGV4dDo6Y3VycmVudCgp LT52ZXJzaW9uKCkgPj0gMzIwKSkKICNlbmRpZgotICAgICAgICBpZiAoZ2xFeHRlbnNpb25zLT5z dXBwb3J0cygiR0xfT0VTX0VHTF9pbWFnZSIpIHx8IGdsRXh0ZW5zaW9ucy0+c3VwcG9ydHMoIkdM X09FU19FR0xfaW1hZ2VfZXh0ZXJuYWwiKSkKICAgICAgICAgICAgIGdsSW1hZ2VUYXJnZXRUZXh0 dXJlMkQgPSByZWludGVycHJldF9jYXN0PFBGTkdMRUdMSU1BR0VUQVJHRVRURVhUVVJFMkRPRVNQ Uk9DPihlZ2xHZXRQcm9jQWRkcmVzcygiZ2xFR0xJbWFnZVRhcmdldFRleHR1cmUyRE9FUyIpKTsK ICAgICB9CiAK