88634 2012-06-08 01:58:12 -0700 [EFL] Add accelerated compositing related files and flags to EFL build system. 2014-03-24 17:45:10 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Linux RESOLVED INVALID P2 Normal --- 82315 88630 0 hw1008.kim webkit-unassigned gyuyoung.kim laszlo.gombos lucas.de.marchi ostap73 rakuco sw0524.lee webkit.review.bot oldest_to_newest 644487 0 hw1008.kim 2012-06-08 01:58:12 -0700 enable accelerated compositing by adding files and flags to cmake files in EFL port. 644497 1 146513 hw1008.kim 2012-06-08 02:08:56 -0700 Created attachment 146513 Patch 644632 2 146513 ryuan.choi 2012-06-08 06:52:48 -0700 Comment on attachment 146513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146513&action=review > Source/WebCore/PlatformEfl.cmake:301 > + LIST(APPEND WebCore_SOURCES > + platform/graphics/efl/GraphicsContext3DEfl.cpp > + platform/graphics/efl/GraphicsContext3DPrivate.cpp > + platform/graphics/OpenGLShims.cpp > + platform/graphics/surfaces/GraphicsSurface.cpp > + platform/graphics/texmap/LayerTransform.cpp > + platform/graphics/texmap/TextureMapper.cpp > + platform/graphics/texmap/TextureMapperGL.cpp > + platform/graphics/texmap/TextureMapperAnimation.cpp > + platform/graphics/texmap/TextureMapperBackingStore.cpp > + platform/graphics/texmap/TextureMapperImageBuffer.cpp > + platform/graphics/texmap/TextureMapperShaderManager.cpp > + platform/graphics/texmap/GraphicsLayerTextureMapper.cpp > + platform/graphics/texmap/TextureMapperLayer.cpp > + ) Ordering looks wrong. > Tools/EWebLauncher/main.c:637 > - app->ee = ecore_evas_new(engine, 0, 0, geometry.w, geometry.h, NULL); > + app->ee = ecore_evas_new("opengl_x11", 0, 0, geometry.w, geometry.h, NULL); I am not sure. Should it be mandatory? 644667 3 146513 gyuyoung.kim 2012-06-08 07:50:19 -0700 Comment on attachment 146513 Patch Attachment 146513 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/12921527 645288 4 146513 gyuyoung.kim 2012-06-09 04:22:30 -0700 Comment on attachment 146513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146513&action=review > ChangeLog:6 > + Reviewed by NOBODY (OOPS!). Missing description. > Source/WTF/ChangeLog:6 > + Reviewed by NOBODY (OOPS!). ditto. > Source/WebCore/ChangeLog:10 > + * PlatformEfl.cmake: ditto. > Source/cmake/OptionsEfl.cmake:40 > +FIND_PACKAGE(OpenGL REQUIRED) Move this to line 26 as below, FIND_PACKAGE(Cairo 1.10 REQUIRED) FIND_PACKAGE(EFL REQUIRED) FIND_PACKAGE(Fontconfig 2.8.0 REQUIRED) +FIND_PACKAGE(OpenGL REQUIRED) FIND_PACKAGE(Sqlite REQUIRED) 649766 5 146513 rakuco 2012-06-14 19:24:47 -0700 Comment on attachment 146513 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146513&action=review I wonder if forcing 3d acceleration and the Evas OpenGL engine are really required; why not add those WTF defines and require OpenGL only if 3D rendering is on? > ChangeLog:3 > + [EFL] Add AC related files and flags to EFL build system. I'd rather expand the "AC" abbreviation to avoid confusion. 146513 2012-06-08 02:08:56 -0700 2012-06-14 19:24:47 -0700 Patch bugzilla_20120608_build.patch text/plain 8271 hw1008.kim ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBhYzdiZmNmLi41YzVkZmEy IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTItMDYtMDggIEh5b3dvbiBLaW0gIDxodzEwMDgua2ltQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtFRkxdIEFkZCBBQyByZWxhdGVkIGZpbGVzIGFuZCBmbGFncyB0byBFRkwgYnVpbGQgc3lz dGVtLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg2 MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNv dXJjZS9jbWFrZS9PcHRpb25zRWZsLmNtYWtlOgorCiAyMDEyLTA2LTA3ICBQYXRyaWNrIEdhbnN0 ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgV2luQ0Ug YWZ0ZXIgcjExMzU3MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNl L1dURi9DaGFuZ2VMb2cKaW5kZXggYzBhODQ4ZS4uNzI2NWQyMSAxMDA2NDQKLS0tIGEvU291cmNl L1dURi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBA QAorMjAxMi0wNi0wOCAgSHlvd29uIEtpbSAgPGh3MTAwOC5raW1Ac2Ftc3VuZy5jb20+CisKKyAg ICAgICAgW0VGTF0gQWRkIEFDIHJlbGF0ZWQgZmlsZXMgYW5kIGZsYWdzIHRvIEVGTCBidWlsZCBz eXN0ZW0uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 ODYzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog d3RmL1BsYXRmb3JtLmg6CisKIDIwMTItMDYtMDcgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lA d2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdW1dpbl0gRml4IGxpbmtpbmcgV1RGIHdpdGggSUNV CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYv UGxhdGZvcm0uaAppbmRleCBhMzhiMzA5Li44NmYxNzAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RG L3d0Zi9QbGF0Zm9ybS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKQEAgLTk5OSw3 ICs5OTksNyBAQAogI2VuZGlmCiAKIC8qIEFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nICovCi0jaWYg UExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1MpIHx8IFBMQVRGT1JNKFFUKSB8fCAoUExBVEZP Uk0oV0lOKSAmJiAhT1MoV0lOQ0UpICYmICFQTEFURk9STShXSU5fQ0FJUk8pKQorI2lmIFBMQVRG T1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKSB8fCBQTEFURk9STShRVCkgfHwgKFBMQVRGT1JNKFdJ TikgJiYgIU9TKFdJTkNFKSAmJiAhUExBVEZPUk0oV0lOX0NBSVJPKSkgfHwgUExBVEZPUk0oRUZM KQogI2RlZmluZSBXVEZfVVNFX0FDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HIDEKICNlbmRpZgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggZDkwZTY5My4uNzg3ZjBlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDEyLTA2LTA4ICBIeW93b24gS2ltICA8aHcxMDA4LmtpbUBzYW1zdW5nLmNvbT4KKworICAg ICAgICBbRUZMXSBBZGQgQUMgcmVsYXRlZCBmaWxlcyBhbmQgZmxhZ3MgdG8gRUZMIGJ1aWxkIHN5 c3RlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4 NjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292 ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIFBsYXRmb3JtRWZsLmNtYWtlOgor CiAyMDEyLTA2LTA3ICBUYWthc2hpIFNha2Ftb3RvICA8dGFzYWtAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBJbXByb3ZlIHRoZSBwZXJmb3JtYW5jZSBvZiBwdXNoU2NvcGUgaW4gU3R5bGVSZXNvbHZl cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1FZmwuY21ha2UgYi9Tb3VyY2Uv V2ViQ29yZS9QbGF0Zm9ybUVmbC5jbWFrZQppbmRleCBkM2NkMGRmLi4zNmM5NzExIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUVmbC5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9QbGF0Zm9ybUVmbC5jbWFrZQpAQCAtNTksNyArNTksNiBAQCBMSVNUKEFQUEVORCBXZWJDb3Jl X1NPVVJDRVMKICAgcGxhdGZvcm0vZWZsL1RlbXBvcmFyeUxpbmtTdHVicy5jcHAKICAgcGxhdGZv cm0vZWZsL1dpZGdldEVmbC5jcHAKICAgcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3Bw Ci0gIHBsYXRmb3JtL2dyYXBoaWNzL2VmbC9HcmFwaGljc0xheWVyRWZsLmNwcAogICBwbGF0Zm9y bS9ncmFwaGljcy9lZmwvSWNvbkVmbC5jcHAKICAgcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0ltYWdl RWZsLmNwcAogICBwbGF0Zm9ybS9ncmFwaGljcy9lZmwvSW50UG9pbnRFZmwuY3BwCkBAIC0yNzYs NiArMjc1LDMyIEBAIElGIChFTkFCTEVfV0VCR0wpCiAgICkKIEVORElGICgpCiAKK0lGIChXVEZf VVNFX1RFWFRVUkVfTUFQUEVSKQorICBMSVNUKEFQUEVORCBXZWJDb3JlX0lOQ0xVREVfRElSRUNU T1JJRVMKKyAgICAke09QRU5HTF9JTkNMVURFX0RJUn0KKyAgICAiJHtXRUJDT1JFX0RJUn0vcGxh dGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMiCisgICAgIiR7V0VCQ09SRV9ESVJ9L3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcCIKKyAgKQorICBMSVNUKEFQUEVORCBXZWJDb3JlX0xJQlJBUklFUworICAg ICR7T1BFTkdMX2dsX0xJQlJBUll9CisgICkKKyAgTElTVChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VT CisgICAgcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0dyYXBoaWNzQ29udGV4dDNERWZsLmNwcAorICAg IHBsYXRmb3JtL2dyYXBoaWNzL2VmbC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCisgICAg cGxhdGZvcm0vZ3JhcGhpY3MvT3BlbkdMU2hpbXMuY3BwCisgICAgcGxhdGZvcm0vZ3JhcGhpY3Mv c3VyZmFjZXMvR3JhcGhpY3NTdXJmYWNlLmNwcAorICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9MYXllclRyYW5zZm9ybS5jcHAKKyAgICBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlci5jcHAKKyAgICBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcAorICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQW5pbWF0aW9u LmNwcAorICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyQmFja2luZ1N0 b3JlLmNwcAorICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVySW1hZ2VC dWZmZXIuY3BwCisgICAgcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFk ZXJNYW5hZ2VyLmNwcAorICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlci5jcHAKKyAgICBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckxheWVyLmNwcAorICApCitFTkRJRiAoKQorCiBBRERfREVGSU5JVElPTlMoLURXVEZfVVNF X0NST1NTX1BMQVRGT1JNX0NPTlRFWFRfTUVOVVM9MQogICAgICAgICAgICAgICAgIC1EREFUQV9E SVI9IiR7Q01BS0VfSU5TVEFMTF9QUkVGSVh9LyR7REFUQV9JTlNUQUxMX0RJUn0iKQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IDdmMDliZTguLjZjMGMyODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTIt MDYtMDggIEh5b3dvbiBLaW0gIDxodzEwMDgua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdIEFkZCBBQyByZWxhdGVkIGZpbGVzIGFuZCBmbGFncyB0byBFRkwgYnVpbGQgc3lzdGVtLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg2MzQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3Jt RWZsLmNtYWtlOgorCiAyMDEyLTA2LTA0ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVz dGJvQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIERvbid0IHVzZSBXZWJLaXQgSEFWRSgpIG1h Y3JvIGluIHB1YmxpYyBRdCBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtRWZsLmNtYWtlIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybUVmbC5jbWFrZQppbmRleCAyZGVm ODY5Li4zNGUyN2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtRWZsLmNtYWtl CisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1FZmwuY21ha2UKQEAgLTgyLDcgKzgyLDE1IEBA IElGIChFTkFCTEVfTk9USUZJQ0FUSU9OUykKICAgKQogRU5ESUYgKCkKIAorSUYgKFdURl9VU0Vf VEVYVFVSRV9NQVBQRVIpCisgIExJU1QoQVBQRU5EIFdlYktpdF9JTkNMVURFX0RJUkVDVE9SSUVT CisgICAgIiR7V0VCQ09SRV9ESVJ9L3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzIgorICAgICIk e1dFQkNPUkVfRElSfS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAiCisgICkKK0VORElGICgpCisK IExJU1QoQVBQRU5EIFdlYktpdF9TT1VSQ0VTCisgICAgZWZsL1dlYkNvcmVTdXBwb3J0L0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0RWZsLmNwcAogICAgIGVmbC9XZWJDb3JlU3VwcG9ydC9B c3NlcnRNYXRjaGluZ0VudW1zLmNwcAogICAgIGVmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGll bnRFZmwuY3BwCiAgICAgZWZsL1dlYkNvcmVTdXBwb3J0L0RldmljZU9yaWVudGF0aW9uQ2xpZW50 RWZsLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNFZmwuY21ha2UgYi9Tb3Vy Y2UvY21ha2UvT3B0aW9uc0VmbC5jbWFrZQppbmRleCAzMGYyMmIyLi4wNzllNmJhIDEwMDY0NAot LS0gYS9Tb3VyY2UvY21ha2UvT3B0aW9uc0VmbC5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0 aW9uc0VmbC5jbWFrZQpAQCAtMzcsNiArMzcsOCBAQCBGSU5EX1BBQ0tBR0UoR3RocmVhZCBSRVFV SVJFRCkKIEZJTkRfUEFDS0FHRShMaWJTb3VwMiAyLjM3LjkyIFJFUVVJUkVEKQogU0VUKEVOQUJM RV9HTElCX1NVUFBPUlQgT04pCiAKK0ZJTkRfUEFDS0FHRShPcGVuR0wgUkVRVUlSRUQpCisKIFNF VChXVEZfVVNFX1NPVVAgMSkKIEFERF9ERUZJTklUSU9OUygtRFdURl9VU0VfU09VUD0xKQogQURE X0RFRklOSVRJT05TKC1EQlVJTERJTkdfU09VUF9fPTEpCkBAIC01Miw2ICs1NCwxMiBAQCBBRERf REVGSU5JVElPTlMoLURXVEZfVVNFX0lDVV9VTklDT0RFPTEpCiBTRVQoV1RGX1VTRV9DQUlSTyAx KQogQUREX0RFRklOSVRJT05TKC1EV1RGX1VTRV9DQUlSTz0xKQogCitTRVQoV1RGX1VTRV9URVhU VVJFX01BUFBFUiAxKQorQUREX0RFRklOSVRJT05TKC1EV1RGX1VTRV9URVhUVVJFX01BUFBFUj0x KQorCitTRVQoV1RGX1VTRV9URVhUVVJFX01BUFBFUl9HTCAxKQorQUREX0RFRklOSVRJT05TKC1E V1RGX1VTRV9URVhUVVJFX01BUFBFUl9HTD0xKQorCiBTRVQoSlNDX0VYRUNVVEFCTEVfTkFNRSBq c2MpCiAKIFNFVChXVEZfTElCUkFSWV9OQU1FIHd0Zl9lZmwpCkBAIC02Niw2ICs3NCw3IEBAIFNF VChUSEVNRV9CSU5BUllfRElSICR7Q01BS0VfQklOQVJZX0RJUn0vV2ViS2l0L2VmbC9EZWZhdWx0 VGhlbWUpCiBTRVQoVkVSU0lPTl9TQ1JJUFQgIi1XbCwtLXZlcnNpb24tc2NyaXB0LCR7Q01BS0Vf TU9EVUxFX1BBVEh9L2VmbHN5bWJvbHMuZmlsdGVyIikKIAogV0VCS0lUX09QVElPTl9CRUdJTigp CitXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfM0RfUkVOREVSSU5HIE9O KQogV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0JBVFRFUllfU1RBVFVT IE9OKQogV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0JMT0IgT04pCiBX RUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQ1NTX0lNQUdFX1NFVCBPTikK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ODJk NWZmLi4xZjhiMmY5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDYtMDggIEh5b3dvbiBLaW0gIDxodzEwMDgu a2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIEFkZCBBQyByZWxhdGVkIGZpbGVzIGFu ZCBmbGFncyB0byBFRkwgYnVpbGQgc3lzdGVtLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg2MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFY29yZS1ldmFzIGVuZ2luZSBpcyBmb3JjZWQgdG8gYmUgdGhl IE9wZW5HTCBiYWNrZW5kLAorICAgICAgICBzaW5jZSBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyBp cyBlbmFibGVkIGluIEVGTCBwb3J0LgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21haW4uYzoK KyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9G ZWF0dXJlTGlzdC5wbToKKwogMjAxMi0wNi0wNyAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFN0eWxlIGJ1aWxkIGFyY2hpdGVjdHVyZXMgbGlrZSBidWlsZCB2ZXJz aW9ucyBmb3Igbm9uLWxheW91dCB0ZXN0IGZhaWx1cmVzCmRpZmYgLS1naXQgYS9Ub29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwppbmRleCA0MDg5ZDZl Li4xNjdlMTEwIDEwMDY0NAotLS0gYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rv b2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTYzNCw3ICs2MzQsNyBAQCBicm93c2VyQ3JlYXRl KGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2Vu dCwgRWluYV9SZQogICAgIGlmICghYXBwKQogICAgICAgICByZXR1cm4gcXVpdChFSU5BX0ZBTFNF LCAiRVJST1I6IGNvdWxkIG5vdCBjcmVhdGUgRVdlYkxhdW5jaGVyIHdpbmRvd1xuIik7CiAKLSAg ICBhcHAtPmVlID0gZWNvcmVfZXZhc19uZXcoZW5naW5lLCAwLCAwLCBnZW9tZXRyeS53LCBnZW9t ZXRyeS5oLCBOVUxMKTsKKyAgICBhcHAtPmVlID0gZWNvcmVfZXZhc19uZXcoIm9wZW5nbF94MTEi LCAwLCAwLCBnZW9tZXRyeS53LCBnZW9tZXRyeS5oLCBOVUxMKTsKIAogICAgIGlmICghYXBwLT5l ZSkKICAgICAgICAgcmV0dXJuIHF1aXQoRUlOQV9GQUxTRSwgIkVSUk9SOiBjb3VsZCBub3QgY29u c3RydWN0IGV2YXMtZWNvcmVcbiIpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw ZXJsL0ZlYXR1cmVMaXN0LnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL0ZlYXR1cmVMaXN0 LnBtCmluZGV4IDIxYTE5ZTYuLmNmNTQ5YjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cGVybC9GZWF0dXJlTGlzdC5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvRmVh dHVyZUxpc3QucG0KQEAgLTEzMCw3ICsxMzAsNyBAQCBteSAoCiAKIG15IEBmZWF0dXJlcyA9ICgK ICAgICB7IG9wdGlvbiA9PiAiM2QtcmVuZGVyaW5nIiwgZGVzYyA9PiAiVG9nZ2xlIDNEIFJlbmRl cmluZyBzdXBwb3J0IiwKLSAgICAgIGRlZmluZSA9PiAiRU5BQkxFXzNEX1JFTkRFUklORyIsIGRl ZmF1bHQgPT4gKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc1F0KCkpLCB2YWx1ZSA9PiBcJHRocmVl RFJlbmRlcmluZ1N1cHBvcnQgfSwKKyAgICAgIGRlZmluZSA9PiAiRU5BQkxFXzNEX1JFTkRFUklO RyIsIGRlZmF1bHQgPT4gKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc1F0KCkgfHwgaXNFZmwoKSks IHZhbHVlID0+IFwkdGhyZWVEUmVuZGVyaW5nU3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4g ImFjY2VsZXJhdGVkLTJkLWNhbnZhcyIsIGRlc2MgPT4gIlRvZ2dsZSBBY2NlbGVyYXRlZCAyRCBD YW52YXMgc3VwcG9ydCIsCiAgICAgICBkZWZpbmUgPT4gIkVOQUJMRV9BQ0NFTEVSQVRFRF8yRF9D QU5WQVMiLCBkZWZhdWx0ID0+IDAsIHZhbHVlID0+IFwkYWNjZWxlcmF0ZWQyRENhbnZhc1N1cHBv cnQgfSwK