138245 2014-10-31 03:44:11 -0700 [EFL] Fix the build with EFL 1.12 2014-11-19 02:43:29 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 138865 138733 1 ossy ryuan.choi buildbot commit-queue gyuyoung.kim hw1008.kim ossy rniwa ryuan.choi oldest_to_newest 1045258 0 ossy 2014-10-31 03:44:11 -0700 EFL 1.12 will be out in 10 days, but the WebKit build is broken with EFL 1.12 beta1 with the folowing error message: In file included from ../../Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h:26:0, from ../../Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:37, from ../../Source/WebCore/platform/graphics/GraphicsContext3D.h:29, from ../../Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h:26, from ../../Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:43, from ../../Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:24, from ../../Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h:32, from DerivedSources/WebKit2/include/WebCore/CompositingCoordinator.h:1, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:28, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:32: ../../Source/ThirdParty/ANGLE/include/KHR/khrplatform.h:144:17: error: conflicting declaration 'typedef int64_t khronos_int64_t' In file included from ../../Source/WTF/wtf/efl/UniquePtrEfl.h:36:0, from ../../Source/WTF/wtf/RunLoop.h:45, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:35, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:30: ../Dependencies/Root/include/evas-1/Evas_GL.h:847:26: error: 'khronos_int64_t' has a previous declaration as 'typedef long long int khronos_int64_t' In file included from ../../Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h:26:0, from ../../Source/WebCore/platform/graphics/ANGLEWebKitBridge.h:37, from ../../Source/WebCore/platform/graphics/GraphicsContext3D.h:29, from ../../Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h:26, from ../../Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:43, from ../../Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:24, from ../../Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h:32, from DerivedSources/WebKit2/include/WebCore/CompositingCoordinator.h:1, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:28, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:32: ../../Source/ThirdParty/ANGLE/include/KHR/khrplatform.h:145:18: error: conflicting declaration 'typedef uint64_t khronos_uint64_t' In file included from ../../Source/WTF/wtf/efl/UniquePtrEfl.h:36:0, from ../../Source/WTF/wtf/RunLoop.h:45, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:35, from ../../Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:30: ../Dependencies/Root/include/evas-1/Evas_GL.h:846:28: error: 'khronos_uint64_t' has a previous declaration as 'typedef long long unsigned int khronos_uint64_t' The root of the problem is this commit inside EFL: https://git.enlightenment.org/core/efl.git/commit/?id=6848cf40b622ee84ca045a138524e868752ce7f5 I'm not sure if it should be fixed in WebKit or in EFL. But it should be fixed somewhere if we would like to use newer EFL in the future. 1047737 1 241328 ryuan.choi 2014-11-10 20:32:13 -0800 Created attachment 241328 Patch 1047739 2 ryuan.choi 2014-11-10 20:36:15 -0800 If I am right, Evas_GL.h should not be included along with another GL headers. So, I removed it from UniquePtrEfl.h This changes make not to use UniquePtrEfl for Evas_GL. In addition, I found another build issue like below. /workspace/project/webkit/efl-webkit/Source/WebKit2/UIProcess/API/efl/EwkView.cpp: In member function ‘bool EwkView::createGLSurface()’: /workspace/project/webkit/efl-webkit/Source/WebKit2/UIProcess/API/efl/EwkView.cpp:836:5: error: missing initializer for member ‘_Evas_GL_Config::gles_version’ [-Werror=missing-field-initializers] }; ^ Evas_GL_Config introduced new member, gles_version. 1048349 3 241328 gyuyoung.kim 2014-11-12 22:26:19 -0800 Comment on attachment 241328 Patch LGTM. 1048359 4 241328 commit-queue 2014-11-12 23:07:16 -0800 Comment on attachment 241328 Patch Clearing flags on attachment: 241328 Committed r176066: <http://trac.webkit.org/changeset/176066> 1048360 5 commit-queue 2014-11-12 23:07:23 -0800 All reviewed patches have been landed. Closing bug. 1049753 6 ossy 2014-11-19 02:43:29 -0800 (In reply to comment #4) > Comment on attachment 241328 [details] > Patch > > Clearing flags on attachment: 241328 > > Committed r176066: <http://trac.webkit.org/changeset/176066> It made all performance tests fail. The new bug report for this regression: bug138865 241328 2014-11-10 20:32:13 -0800 2014-11-12 23:07:16 -0800 Patch bug-138245-20141111223213.patch text/plain 6392 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDkxNGYyMDI5NzUzMzIwYmEyMGM1ZTlj MGQwODNjYWQzOTQyMWFhNmYuLjM1Njk3NDg5MDUwYTRiMzA3YzkwZDM3MDUxMmVjZDNkZjg2NTc4 OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTQtMTEtMTEgIFJ5dWFuIENob2kgIDxyeXVhbi5j aG9pQG5hdmVyY29ycC5jb20+CisKKyAgICAgICAgW0VGTF0gRml4IHRoZSBidWlsZCB3aXRoIEVG TCAxLjEyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzgyNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHd0Zi9lZmwvVW5pcXVlUHRyRWZsLmg6CisgICAgICAgIFJlbW92ZWQgRXZhc19HTC5oIGZyb20g VW5pcXVlUHRyRWZsLmgsIHdoaWNoIGlzIGNvbW1vbmx5IGluY2x1ZGVkLCBiZWNhdXNlCisgICAg ICAgIGl0IHNob3VsZCBub3QgYmUgaW5jbHVkZWQgd2l0aCBvZmZpY2lhbCBHTCBoZWFkZXJzLgor CiAyMDE0LTExLTA5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIGEgbW9yZSBjb3JyZWN0IHdheSB0byBjb21wYXJlIGZsb2F0aW5nIHBvaW50IG51bWJlcnMg YW5kIHVzZSBpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDVhM2ZjZmQ1ZDkwNjM4YTVhZTQ1MzE2ZTI4MzVjMzRj YzJkMjMxM2YuLmRhZDhmZTMyNTI5YmFkNGUzNTI1NWU2OTllZjA3NTIwOGE0ZDU5ZWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxNC0xMS0xMSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNo b2lAbmF2ZXJjb3JwLmNvbT4KKworICAgICAgICBbRUZMXSBGaXggdGhlIGJ1aWxkIHdpdGggRUZM IDEuMTIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz ODI0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgIEZpcnN0LCBtb2RpZmllZCB0 byB1c2UgRXZhc19HTCByYXcgcG9pbnRlciBpbnN0ZWFkIG9mIFVuaXF1ZVB0ckVmbCBiZWNhdXNl CisgICAgICAgIEV2YXNfR0wuaCBjYW4ndCBiZSBpbmNsdWRlZCBpbiBVbmlxdWVQdHJFZmwuaAor ICAgICAgICBJdCBzaG91bGQgYmUgbW92ZWQgaW50byBFdmFzR0xDb250ZXh0IGJlY2F1c2UgV2Vi S2l0L0VGTCB1c2Ugb25seSBvbmUgRXZhc19HTC4KKyAgICAgICAgU2Vjb25kLCBwcm92aWRlZCB0 aGUgdmVyc2lvbiBvZiBHTEVTIGluIEV2YXNfR0xfQ29uZmlnIG5vdCB0byBicmVhayBidWlsZCB3 aXRoCisgICAgICAgIEVGTCAxLjEyCisgICAgICAgIChFd2tWaWV3OjpFd2tWaWV3KToKKyAgICAg ICAgKEV3a1ZpZXc6On5Fd2tWaWV3KToKKyAgICAgICAgKEV3a1ZpZXc6OmRpc3BsYXlUaW1lckZp cmVkKToKKyAgICAgICAgKEV3a1ZpZXc6OmNyZWF0ZUdMU3VyZmFjZSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oOgorCiAyMDE0LTExLTA5ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgbW9yZSBjb3JyZWN0IHdheSB0byBjb21w YXJlIGZsb2F0aW5nIHBvaW50IG51bWJlcnMgYW5kIHVzZSBpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dURi93dGYvZWZsL1VuaXF1ZVB0ckVmbC5oIGIvU291cmNlL1dURi93dGYvZWZsL1VuaXF1ZVB0 ckVmbC5oCmluZGV4IGJhMDExMGE2YjA3MjAyOWM1MDA5MzBiNjg0ZjQ1Y2UxOWFlNDc3MDMuLjAz OGQzZmJiNTNiYjU5NGJkMGM0NTkyMDlhZTE3NWMwOWI5NjJjMDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL2VmbC9VbmlxdWVQdHJFZmwuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9lZmwvVW5p cXVlUHRyRWZsLmgKQEAgLTMzLDcgKzMzLDYgQEAKICNpbmNsdWRlIDxFY29yZV9JTUYuaD4KICNp bmNsdWRlIDxFaW5hLmg+CiAjaW5jbHVkZSA8RXZhcy5oPgotI2luY2x1ZGUgPEV2YXNfR0wuaD4K IAogbmFtZXNwYWNlIFdURiB7CiAKQEAgLTUxLDcgKzUwLDYgQEAgdXNpbmcgRWZsVW5pcXVlUHRy ID0gc3RkOjp1bmlxdWVfcHRyPFQsIEVmbFB0ckRlbGV0ZXI8VD4+OwogICAgIG1hY3JvKEVpbmFf SGFzaCwgZWluYV9oYXNoX2ZyZWUpIFwKICAgICBtYWNybyhFaW5hX01vZHVsZSwgZWluYV9tb2R1 bGVfZnJlZSkgXAogICAgIG1hY3JvKEV2YXNfT2JqZWN0LCBldmFzX29iamVjdF9kZWwpIFwKLSAg ICBtYWNybyhFdmFzX0dMLCBldmFzX2dsX2ZyZWUpCiAKICNkZWZpbmUgV1RGX0RFRklORV9FRkxQ VFJfREVMRVRFUih0eXBlTmFtZSwgZGVsZXRlckZ1bmMpIFwKICAgICB0ZW1wbGF0ZTw+IHN0cnVj dCBFZmxQdHJEZWxldGVyPHR5cGVOYW1lPiBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL0V3a1ZpZXcuY3BwCmluZGV4IDg3OThmZjU4NzYzYTc0NzliODRlMzg2NzVkNWNjZTYy ZDI3OGVhYjcuLjFkYjMxOTA0ZTQzN2ZlMzQ5MTUzYTAwZTlmM2Q1NDA4NjE3MTVjMmMgMTAwNzU1 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBAIC0zMTQsOSAr MzE0LDExIEBAIEV3a1ZpZXc6OkV3a1ZpZXcoV0tWaWV3UmVmIHZpZXcsIEV2YXNfT2JqZWN0KiBl dmFzT2JqZWN0KQogCiAgICAgLy8gRklYTUU6IFJlbW92ZSB3aGVuIHBvc3NpYmxlLgogICAgIHN0 YXRpY19jYXN0PFdlYlZpZXdFZmwqPih3ZWJWaWV3KCkpLT5zZXRFd2tWaWV3KHRoaXMpOwotICAg IG1fZXZhc0dMID0gRWZsVW5pcXVlUHRyPEV2YXNfR0w+KGV2YXNfZ2xfbmV3KGV2YXNfb2JqZWN0 X2V2YXNfZ2V0KG1fZXZhc09iamVjdCkpKTsKKworICAgIC8vIEZJWE1FOiBDb25zaWRlciBpdCB0 byBtb3ZlIGludG8gRXZhc0dMQ29udGV4dC4KKyAgICBtX2V2YXNHTCA9IGV2YXNfZ2xfbmV3KGV2 YXNfb2JqZWN0X2V2YXNfZ2V0KG1fZXZhc09iamVjdCkpOwogICAgIGlmIChtX2V2YXNHTCkKLSAg ICAgICAgbV9ldmFzR0xDb250ZXh0ID0gRXZhc0dMQ29udGV4dDo6Y3JlYXRlKG1fZXZhc0dMLmdl dCgpKTsKKyAgICAgICAgbV9ldmFzR0xDb250ZXh0ID0gRXZhc0dMQ29udGV4dDo6Y3JlYXRlKG1f ZXZhc0dMKTsKIAogICAgIGlmICghbV9ldmFzR0xDb250ZXh0KSB7CiAgICAgICAgIFdBUk4oIkZh aWxlZCB0byBjcmVhdGUgRXZhc19HTCwgZmFsbGluZyBiYWNrIHRvIHNvZnR3YXJlIG1vZGUuIik7 CkBAIC0zNTAsNiArMzUyLDkgQEAgRXdrVmlldzo6fkV3a1ZpZXcoKQogewogICAgIEFTU0VSVCh3 a1BhZ2VUb0V2YXNPYmplY3RNYXAoKS5nZXQod2tQYWdlKCkpID09IG1fZXZhc09iamVjdCk7CiAg ICAgd2tQYWdlVG9FdmFzT2JqZWN0TWFwKCkucmVtb3ZlKHdrUGFnZSgpKTsKKworICAgIGlmICht X2V2YXNHTCkKKyAgICAgICAgZXZhc19nbF9mcmVlKG1fZXZhc0dMKTsKIH0KIAogRXdrVmlldyog RXdrVmlldzo6Y3JlYXRlKFdLVmlld1JlZiB3ZWJWaWV3LCBFdmFzKiBjYW52YXMsIEV2YXNfU21h cnQqIHNtYXJ0KQpAQCAtNTYzLDcgKzU2OCw3IEBAIHZvaWQgRXdrVmlldzo6ZGlzcGxheVRpbWVy RmlyZWQoVGltZXIqKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgZXZhc19nbF9tYWtl X2N1cnJlbnQobV9ldmFzR0wuZ2V0KCksIG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2 YXNHTENvbnRleHQtPmNvbnRleHQoKSk7CisgICAgZXZhc19nbF9tYWtlX2N1cnJlbnQobV9ldmFz R0wsIG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2YXNHTENvbnRleHQtPmNvbnRleHQo KSk7CiAKICAgICBXS1ZpZXdQYWludFRvQ3VycmVudEdMQ29udGV4dCh3a1ZpZXcoKSk7CiAKQEAg LTgyNCwyMSArODI5LDI0IEBAIGJvb2wgRXdrVmlldzo6Y3JlYXRlR0xTdXJmYWNlKCkKICAgICAg ICAgRVZBU19HTF9ERVBUSF9CSVRfOCwKICAgICAgICAgRVZBU19HTF9TVEVOQ0lMX05PTkUsCiAg ICAgICAgIEVWQVNfR0xfT1BUSU9OU19OT05FLAotICAgICAgICBFVkFTX0dMX01VTFRJU0FNUExF X05PTkUKKyAgICAgICAgRVZBU19HTF9NVUxUSVNBTVBMRV9OT05FLAorI2lmIGRlZmluZWQoRVZB U19HTF9BUElfVkVSU0lPTikgJiYgRVZBU19HTF9BUElfVkVSU0lPTiA+PSAyCisgICAgICAgIEVW QVNfR0xfR0xFU18yX1gKKyNlbmRpZgogICAgIH07CiAKICAgICAvLyBSZWNyZWF0ZSB0byBjdXJy ZW50IHNpemU6IFJlcGxhY2VzIGlmIG5vbi1udWxsLCBhbmQgZnJlZXMgZXhpc3Rpbmcgc3VyZmFj ZSBhZnRlciAoT3duUHRyKS4KLSAgICBtX2V2YXNHTFN1cmZhY2UgPSBFdmFzR0xTdXJmYWNlOjpj cmVhdGUobV9ldmFzR0wuZ2V0KCksICZldmFzR0xDb25maWcsIGRldmljZVNpemUoKSk7CisgICAg bV9ldmFzR0xTdXJmYWNlID0gRXZhc0dMU3VyZmFjZTo6Y3JlYXRlKG1fZXZhc0dMLCAmZXZhc0dM Q29uZmlnLCBkZXZpY2VTaXplKCkpOwogICAgIGlmICghbV9ldmFzR0xTdXJmYWNlKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICBFdmFzX05hdGl2ZV9TdXJmYWNlIG5hdGl2ZVN1cmZhY2U7 Ci0gICAgZXZhc19nbF9uYXRpdmVfc3VyZmFjZV9nZXQobV9ldmFzR0wuZ2V0KCksIG1fZXZhc0dM U3VyZmFjZS0+c3VyZmFjZSgpLCAmbmF0aXZlU3VyZmFjZSk7CisgICAgZXZhc19nbF9uYXRpdmVf c3VyZmFjZV9nZXQobV9ldmFzR0wsIG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCAmbmF0aXZl U3VyZmFjZSk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2VfbmF0aXZlX3N1cmZhY2Vfc2V0KHNtYXJ0 RGF0YSgpLT5pbWFnZSwgJm5hdGl2ZVN1cmZhY2UpOwogCi0gICAgZXZhc19nbF9tYWtlX2N1cnJl bnQobV9ldmFzR0wuZ2V0KCksIG1fZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2YXNHTENv bnRleHQtPmNvbnRleHQoKSk7CisgICAgZXZhc19nbF9tYWtlX2N1cnJlbnQobV9ldmFzR0wsIG1f ZXZhc0dMU3VyZmFjZS0+c3VyZmFjZSgpLCBtX2V2YXNHTENvbnRleHQtPmNvbnRleHQoKSk7CiAK LSAgICBFdmFzX0dMX0FQSSogZ2wgPSBldmFzX2dsX2FwaV9nZXQobV9ldmFzR0wuZ2V0KCkpOwor ICAgIEV2YXNfR0xfQVBJKiBnbCA9IGV2YXNfZ2xfYXBpX2dldChtX2V2YXNHTCk7CiAKICAgICBX S1BvaW50IGJvdW5kc0VuZCA9IFdLVmlld1VzZXJWaWV3cG9ydFRvU2NlbmUod2tWaWV3KCksIFdL UG9pbnRNYWtlKGRldmljZVNpemUoKS53aWR0aCgpLCBkZXZpY2VTaXplKCkuaGVpZ2h0KCkpKTsK ICAgICBnbC0+Z2xWaWV3cG9ydCgwLCAwLCBib3VuZHNFbmQueCwgYm91bmRzRW5kLnkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCmluZGV4IDdkMjdmMzYxMjAx ZTZkMzk4ZTlhYTk0ZGExMWU5N2ExOWM3MTA1MDIuLjA4YmU1MDcwY2NlN2U0ZmVmOGQ5OGIzZmY4 YzRlNzcyYzNiZmNmZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tW aWV3LmgKQEAgLTQzLDYgKzQzLDcgQEAKICNlbmRpZgogCiB0eXBlZGVmIHN0cnVjdCBfY2Fpcm9f c3VyZmFjZSBjYWlyb19zdXJmYWNlX3Q7Cit0eXBlZGVmIHN0cnVjdCBfRXZhc19HTCBFdmFzX0dM OwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIENvbnRleHRNZW51Q2xpZW50RWZsOwpAQCAt MjU0LDcgKzI1NSw3IEBAIHByaXZhdGU6CiAgICAgRXZhc19PYmplY3QqIG1fZXZhc09iamVjdDsK ICAgICBSZWZQdHI8RXdrQ29udGV4dD4gbV9jb250ZXh0OwogICAgIFJlZlB0cjxFd2tQYWdlR3Jv dXA+IG1fcGFnZUdyb3VwOwotICAgIEVmbFVuaXF1ZVB0cjxFdmFzX0dMPiBtX2V2YXNHTDsKKyAg ICBFdmFzX0dMKiBtX2V2YXNHTDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6RXZhc0dM Q29udGV4dD4gbV9ldmFzR0xDb250ZXh0OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpF dmFzR0xTdXJmYWNlPiBtX2V2YXNHTFN1cmZhY2U7CiAgICAgYm9vbCBtX3BlbmRpbmdTdXJmYWNl UmVzaXplOwo=