137684 2014-10-14 02:32:34 -0700 Patch to build a wayland-only webkit/EFL(Without X11/Ecore_X) 2017-04-25 17:27:37 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED WONTFIX P2 Normal --- 1 jianzhong.huang webkit-unassigned commit-queue gyuyoung.kim lucas.de.marchi mcatanzaro ossy ryuan.choi oldest_to_newest 1041512 0 jianzhong.huang 2014-10-14 02:32:34 -0700 Here is a patch to build a wayland-only webkit/EFL(Without X11 and ecore_x). It is applied on ewebkit-1.11.0.(It is almost ready for wayland-only, Thanks for great work.) This patch includes: 1, Add some missing ifdefs to control X/Ecore_X related codes not be built under wayland-only environment. 2, Fix a inline func undefined issue in ViewportStyleResolver.cpp(I build it with clang 3.5, not sure whether it's a compiler problem or not.) 3, Fix a wrong func call in PlatformScreenEfl.cpp When ECore_X disabled. 4, Add a option 'ENABLE_WAYLAND_ONLY' and set some cmake options to control glx/X11 related codes not build when EGL enabled. After patch applied, Webkit/EFL can be compiled without X/Ecore_X with "-DENABLE_WAYLAND_ONLY=ON". And the MiniBrowser works. NOTE: 1, NETSCAPE_PLUGIN_API is disabled when ENABLE_WAYLAND_ONLY since it's related to X11/Xlib. 2, It will use cairosurface and software rendering mode, accelation will be disabled since evas_gl_new failed under wayland(there is no libGL exist.) 3, There is some other stable/unimplemented problems, but at least, it can be built now. All this problems is related to X/ECore_X(Except No.2), and it's a small patch, So I think it's OK to submit a ALL-IN-ONE patch. 1041513 1 239789 jianzhong.huang 2014-10-14 02:34:15 -0700 Created attachment 239789 patch to apply on ewebkit2-1.11.0 1041535 2 commit-queue 2014-10-14 04:24:17 -0700 Attachment 239789 did not pass style-queue: Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 1041737 3 239789 gyuyoung.kim 2014-10-14 17:33:32 -0700 Comment on attachment 239789 patch to apply on ewebkit2-1.11.0 Oh, nice try ! It looks this patch works in progress still. Please ping me when you are ready to get review. 1041739 4 239789 ryuan.choi 2014-10-14 17:35:52 -0700 Comment on attachment 239789 patch to apply on ewebkit2-1.11.0 View in context: https://bugs.webkit.org/attachment.cgi?id=239789&action=review First, thanks for the patch. Patch looks almost fine to me. I didn't try to prepare wayland backend yet. I will check it more when I have it. > ewebkitn/Source/cmake/OptionsEfl.cmake:128 > +option(ENABLE_ECORE_X "Enable Ecore_X specific usage (cursor, bell)") > + > +option(ENABLE_WAYLAND_ONLY "Enable wayland only build.") > +if (ENABLE_WAYLAND_ONLY) > + set(ENABLE_X11_TARGET OFF) > + set(ENABLE_ECORE_X OFF) > + set(ENABLE_NETSCAPE_PLUGIN_API OFF) > +else () > + set(ENABLE_ECORE_X ON) > +endif () In my opinion, We'd better to choose window system between X or WAYLAND. Perhaps, like below. (I am bad with naming) set(WINDOW_SYSTEM "X" CACHE STRING "Choose window system for EWebKit (X or WAYLAND)") ... In addition, I have one question. Doesn't we need to use ECORE_WAYLAND? > ewebkitn/Source/cmake/OptionsEfl.cmake:192 > + if (ENABLE_WAYLAND_ONLY) > + set(ENABLE_X11_TARGET OFF) > + else () > + set(ENABLE_X11_TARGET ON) > + endif () It looks not necessary if we checked similar logic in above statement. > ewebkitn/Source/cmake/OptionsEfl.cmake:248 > + if (ENABLE_WAYLAND_ONLY) > + set(ENABLE_GLES2 ON) > + endif () Should WAYLAND backend depend on this? > ewebkitn/Source/cmake/OptionsEfl.cmake:264 > + if (ENABLE_WAYLAND_ONLY) > + set(ENABLE_EGL ON) > + endif () Ditto. > ewebkit2/Source/WebCore/platform/efl/EflScreenUtilities.cpp:69 > +#ifdef HAVE_ECORE_X > #include <Ecore_X.h> > +#endif Usually, we moved conditional includes to the bottom of includes with empty line. #include ... #include ... #if XXX #include ... #endif #if YYY #include .. #endif > ewebkit2/Source/WebCore/css/ViewportStyleResolver.cpp:43 > +//for undefined renderStyle(), it's a inline function in header. > +#include "NodeRenderStyle.h" I think that this is not related to EFL port. So I think that we should make different bug for this. 1041754 5 jianzhong.huang 2014-10-14 18:25:59 -0700 (In reply to comment #4) Thanks for your helpful reply. comment in content. I will try git codes and refind this patch. > (From update of attachment 239789 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=239789&action=review > > First, thanks for the patch. > Patch looks almost fine to me. > > I didn't try to prepare wayland backend yet. > I will check it more when I have it. > > > ewebkitn/Source/cmake/OptionsEfl.cmake:128 > > +option(ENABLE_ECORE_X "Enable Ecore_X specific usage (cursor, bell)") > > + > > +option(ENABLE_WAYLAND_ONLY "Enable wayland only build.") > > +if (ENABLE_WAYLAND_ONLY) > > + set(ENABLE_X11_TARGET OFF) > > + set(ENABLE_ECORE_X OFF) > > + set(ENABLE_NETSCAPE_PLUGIN_API OFF) > > +else () > > + set(ENABLE_ECORE_X ON) > > +endif () > > In my opinion, > We'd better to choose window system between X or WAYLAND. > > Perhaps, like below. (I am bad with naming) > set(WINDOW_SYSTEM "X" CACHE STRING "Choose window system for EWebKit (X or WAYLAND)") > ... > Good suggestion. > In addition, I have one question. > Doesn't we need to use ECORE_WAYLAND? > It seems there is no direct dependency on ECORE_WAYLAND currently. I think it should be checked to ensure EFL wayland backend enabled. > > ewebkitn/Source/cmake/OptionsEfl.cmake:192 > > + if (ENABLE_WAYLAND_ONLY) > > + set(ENABLE_X11_TARGET OFF) > > + else () > > + set(ENABLE_X11_TARGET ON) > > + endif () > > It looks not necessary if we checked similar logic in above statement. > > > ewebkitn/Source/cmake/OptionsEfl.cmake:248 > > + if (ENABLE_WAYLAND_ONLY) > > + set(ENABLE_GLES2 ON) > > + endif () > > Should WAYLAND backend depend on this? > > > ewebkitn/Source/cmake/OptionsEfl.cmake:264 > > + if (ENABLE_WAYLAND_ONLY) > > + set(ENABLE_EGL ON) > > + endif () > > Ditto. Above two defines will be enabled when WEBGL or WTF_USE_3D_GRAPHICS set to ON, because there is no libGL(glx) under wayland-only environment, these two option should be and MUST be enabled on wayland-only build. for example, "Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp" and other uiprocess related codes depend on COORDINATED_GRAPHICS macro, it is controlbed by WTF_USE_3D_GRAPHICS option. Currently, acceleration will be disabled automatically, since evas_gl_new will fail without libGL. it will fallback to cairo surface instead of GLSurface, I guess WEBGL did not work now(untest), But the cairo rendering works under wayland-only enviroment.(Thank god, at least, it works.) > > > ewebkit2/Source/WebCore/platform/efl/EflScreenUtilities.cpp:69 > > +#ifdef HAVE_ECORE_X > > #include <Ecore_X.h> > > +#endif > > Usually, we moved conditional includes to the bottom of includes with empty line. > > #include ... > #include ... > > #if XXX > #include ... > #endif > > #if YYY > #include .. > #endif > OK, looks more clear. > > ewebkit2/Source/WebCore/css/ViewportStyleResolver.cpp:43 > > +//for undefined renderStyle(), it's a inline function in header. > > +#include "NodeRenderStyle.h" > > I think that this is not related to EFL port. > So I think that we should make different bug for this. Yes, I found this commit in Git codes(No more bug report needed), It should be clang issue. 1041797 6 239849 jianzhong.huang 2014-10-14 22:36:34 -0700 Created attachment 239849 New patch to enable wayland build of ewebkit2 This patch include: 1, Changes to Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp The plugin related funcs is controlled by PLUGIN_ARCHITECTURE(X11) macro in header(Source/WebKit2/UIProcess/WebPageProxy.h). 2, Changes to Source/WebKit2/UIProcess/API/efl/EwkView.cpp ECore_X.h should be imported only when HAVE_ECORE_X defined, It did no fail wayland build when this header exist. But for pure wayland environment, This header did not exist at all. 3, Changes to Source/WebCore/platform/efl/EflScreenUtilities.cpp Enable it only when HAVE_ECORE_X defined like other funcs in source. 4, Changes to Source/WebCore/platform/efl/PlatformScreenEfl.cpp evas() function did not exist anymore, should use platformWidget() instead. It's a bug when ECore_X disabled. 5, Changes to Tools/CMakeLists.txt Do not build TestNetscapePlugIn when ENABLE_X11_TARGET OFF, since it's X11/Xlib related. Above 5 changes should be safe, hope it can be commited soon. And ...., about cmake options, It's not easy to make the logic clear: Maybe ENABLE_ECORE_X should be removed and added two new ENABLE_X/ENABLE_WAYLAND options, Here I still use a "ENABLE_WAYLAND" option, If it set ON: 1, ensure ENABLE_X11_TARGET/ENABLE_ECORE_X/ENABLE_NETSCAPE_PLUGIN_API set to OFF, since they depend on X. 2, check ecore-wayland to ensure EFL had wayland support. 3, set ENABLE_GLES2 and ENABLE_EGL ON to disable GL/GLX requirement. 4, do not build X11 related codes in EGL source list. 5, link WebCore/WebKit2 to GLESv2(when SHARED_CORE ON, libwebcore need link to GLESv2 also.) 6, Only link to X11 libs when ENABLE_X11_TARGET ON. GLESv2/EGL required by WTF_USE_TILED_BACKING_STORE(-DWTF_USE_COORDINATED_GRAPHICS=1) under wayland build. (For X11 build, GL/GLX will be used by default.) Acctually, WTF_USE_TILED_BACKING_STORE should never be disabled(even under X11), otherwise all gui related codes will be disabled(the COORDINATED_GRAPHICS macro mask all gui related codes.). 1301342 7 mcatanzaro 2017-04-25 17:27:37 -0700 EFL has been removed from trunk 239789 2014-10-14 02:34:15 -0700 2014-10-14 22:36:34 -0700 patch to apply on ewebkit2-1.11.0 ewebkit-wayland-only-all-in-one.patch text/plain 7955 jianzhong.huang QWRkIEVOQUJMRV9XQVlMQU5EX09OTFkgb3B0aW9uLgppZiBFTkFCTEVfV0FZTEFORF9PTkxZIHNl dCB0byBPTiwgdGhlbjoKRU5BQkxFX0VDT1JFX1ggc2V0IHRvIE9GRgpFTkFCTEVfTkVUU0NBUEVf UExVR0lOX0FQSSBzZXQgdG8gT0ZGLCBzaW5jZSBpdCBuZWVkIFgxMS9YbGliLgpFTkFCTEVfWDEx X1RBUkdFVCBzZXQgdG8gT0ZGLCBpdCB3aWxsIGJlIHVzZWQgdG8gY29udHJvbCB0aGUgc291cmNl IGxpc3QgaW4gb3RoZXIgY21ha2UgZmlsZXMuCkVOQUJMRV9XRUJHTC9HTEVTMi9FR0wgc2V0IHRv IE9OLgoKZGlmZiAtTnVyIGV3ZWJraXQub3JpZy9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUVmbC5j bWFrZSBld2Via2l0L1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtRWZsLmNtYWtlCi0tLSBld2Via2l0 Lm9yaWcvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1FZmwuY21ha2UJMjAxNC0xMC0xNCAwNjozMzow OS45MTM5MjgzNDQgKzAwMDAKKysrIGV3ZWJraXQvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1FZmwu Y21ha2UJMjAxNC0xMC0xNCAwNjo0MDoyOS42OTM5MzQ5NDMgKzAwMDAKQEAgLTM2OSwxOSArMzY5 LDIzIEBACiAKICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZWZsL0dyYXBoaWNz U3VyZmFjZUNvbW1vbi5jcHAKIAotICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9n bHgvWDExSGVscGVyLmNwcAogCiAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyR0wuY3BwCiAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAKICAgICApCiAKKyAgICBpZiAoRU5BQkxFX1gxMV9UQVJH RVQpCisgICAgICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAgICAgICAgcGxh dGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZ2x4L1gxMUhlbHBlci5jcHAKKyAgICAgICAgKQorICAg IGVuZGlmICgpCisKICAgICBpZiAoV1RGX1VTRV9FR0wpCiAgICAgICAgIGxpc3QoQVBQRU5EIFdl YkNvcmVfU09VUkNFUwogICAgICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZWds L0VHTENvbmZpZ1NlbGVjdG9yLmNwcAogICAgICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvc3Vy ZmFjZXMvZWdsL0VHTENvbnRleHQuY3BwCiAgICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9z dXJmYWNlcy9lZ2wvRUdMSGVscGVyLmNwcAogICAgICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mv c3VyZmFjZXMvZWdsL0VHTFN1cmZhY2UuY3BwCi0gICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGlj cy9zdXJmYWNlcy9lZ2wvRUdMWFN1cmZhY2UuY3BwCiAgICAgICAgICkKICAgICBlbHNlICgpCiAg ICAgICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUwpAQCAtMzkwLDYgKzM5NCwxMiBAQAog ICAgICAgICApCiAgICAgZW5kaWYgKCkKIAorICAgIGlmIChXVEZfVVNFX0VHTCBBTkQgRU5BQkxF X1gxMV9UQVJHRVQpCisgICAgICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAg ICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZWdsL0VHTFhTdXJmYWNlLmNwcAorICAg ICAgICApCisgICAgZW5kaWYoKQorCiAgICAgaWYgKFdURl9VU0VfT1BFTkdMX0VTXzIpCiAgICAg ICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUwogICAgICAgICAgICAgcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTEVTLmNwcApAQCAtNDA0LDkgKzQxNCwxMSBA QAogICAgICAgICApCiAgICAgZW5kaWYgKCkKIAotICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfTElC UkFSSUVTCi0gICAgICAgICR7WDExX1gxMV9MSUJ9Ci0gICAgKQorICAgIGlmIChFTkFCTEVfWDEx X1RBUkdFVCkKKyAgICAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMKKyAgICAgICAg ICAgICR7WDExX1gxMV9MSUJ9CisgICAgICAgICkKKyAgICBlbmRpZigpCiAKICAgICBpZiAoV1RG X1VTRV9FR0wpCiAgICAgICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfTElCUkFSSUVTCmRpZmYgLU51 ciBld2Via2l0Lm9yaWcvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UgZXdlYmtpdC9T b3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZQotLS0gZXdlYmtpdC5vcmlnL1NvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCTIwMTQtMTAtMTQgMDY6MzI6NTguMjIzOTI4MTY5ICsw MDAwCisrKyBld2Via2l0L1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCTIwMTQtMTAt MTQgMDY6NDQ6MjMuNDUwOTM4NDUxICswMDAwCkBAIC0yOTQsNiArMjk0LDEyIEBACiAgICAgJHtT UUxJVEVfTElCUkFSSUVTfQogKQogCitpZiAoV1RGX1VTRV9PUEVOR0xfRVNfMikKKyAgICBsaXN0 KEFQUEVORCBXZWJLaXQyX0xJQlJBUklFUworICAgICAgICAke09QRU5HTEVTMl9MSUJSQVJZfQor ICAgICkKK2VuZGlmKCkKKwogbGlzdChBUFBFTkQgV2ViUHJvY2Vzc19TT1VSQ0VTCiAgICAgV2Vi UHJvY2Vzcy9FbnRyeVBvaW50L3VuaXgvV2ViUHJvY2Vzc01haW4uY3BwCiApCmRpZmYgLU51ciBl d2Via2l0Lm9yaWcvVG9vbHMvQ01ha2VMaXN0cy50eHQgZXdlYmtpdC9Ub29scy9DTWFrZUxpc3Rz LnR4dAotLS0gZXdlYmtpdC5vcmlnL1Rvb2xzL0NNYWtlTGlzdHMudHh0CTIwMTQtMTAtMTQgMDY6 MzM6MDkuOTEyOTI4MzQ0ICswMDAwCisrKyBld2Via2l0L1Rvb2xzL0NNYWtlTGlzdHMudHh0CTIw MTQtMTAtMTQgMDY6MzQ6MDguMDcwOTI5MjE3ICswMDAwCkBAIC02LDcgKzYsOSBAQAogICAgIGFk ZF9zdWJkaXJlY3RvcnkoSW1hZ2VEaWZmKQogCiAgICAgYWRkX3N1YmRpcmVjdG9yeShNaW5pQnJv d3Nlci9lZmwpCi0gICAgYWRkX3N1YmRpcmVjdG9yeShEdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2Nh cGVQbHVnSW4pCisgICAgaWYgKEVOQUJMRV9YMTFfVEFSR0VUKQorICAgICAgICBhZGRfc3ViZGly ZWN0b3J5KER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbikKKyAgICBlbmRpZiAoKQog ZWxzZWlmICgiJHtQT1JUfSIgU1RSRVFVQUwgIkdUSyIpCiAgICAgYWRkX3N1YmRpcmVjdG9yeShJ bWFnZURpZmYpCiAgICAgaWYgKEVOQUJMRV9XRUJLSVQyKQpkaWZmIC1OdXIgZXdlYmtpdC9Tb3Vy Y2UvY21ha2UvT3B0aW9uc0VmbC5jbWFrZSBld2Via2l0bi9Tb3VyY2UvY21ha2UvT3B0aW9uc0Vm bC5jbWFrZQotLS0gZXdlYmtpdC9Tb3VyY2UvY21ha2UvT3B0aW9uc0VmbC5jbWFrZQkyMDE0LTA4 LTE3IDA2OjQyOjQ0LjAwMDAwMDAwMCArMDAwMAorKysgZXdlYmtpdG4vU291cmNlL2NtYWtlL09w dGlvbnNFZmwuY21ha2UJMjAxNC0xMC0xNCAwNzoyMzowNS4wMTc5NzMyODYgKzAwMDAKQEAgLTEx Niw3ICsxMTYsMTcgQEAKIAogV0VCS0lUX09QVElPTl9FTkQoKQogCi1vcHRpb24oRU5BQkxFX0VD T1JFX1ggIkVuYWJsZSBFY29yZV9YIHNwZWNpZmljIHVzYWdlIChjdXJzb3IsIGJlbGwpIiBPTikK K29wdGlvbihFTkFCTEVfRUNPUkVfWCAiRW5hYmxlIEVjb3JlX1ggc3BlY2lmaWMgdXNhZ2UgKGN1 cnNvciwgYmVsbCkiKQorCitvcHRpb24oRU5BQkxFX1dBWUxBTkRfT05MWSAiRW5hYmxlIHdheWxh bmQgb25seSBidWlsZC4iKQoraWYgKEVOQUJMRV9XQVlMQU5EX09OTFkpCisgICAgc2V0KEVOQUJM RV9YMTFfVEFSR0VUIE9GRikKKyAgICBzZXQoRU5BQkxFX0VDT1JFX1ggT0ZGKQorICAgIHNldChF TkFCTEVfTkVUU0NBUEVfUExVR0lOX0FQSSBPRkYpCitlbHNlICgpCisgICAgc2V0KEVOQUJMRV9F Q09SRV9YIE9OKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9FQ09SRV9YKQogICAgICMgV2UgbmVl ZCBYZXh0LmggdG8gZGlzYWJsZSBYbGliIGVycm9yIG1lc3NhZ2VzICB3aGVuIHJ1bm5pbmcgV1RS IG9uIFh2ZmIuCiAgICAgIyBUaGVzZSBlcnJvcnMgYXJlIGR1bXBlZCBvbiBzdGRlcnIgYW5kIG1h a2VzIHRoZSB0ZXN0IGRyaXZlciB0aGlua3MgdGhhdApAQCAtMTc1LDcgKzE4NSwxMSBAQAogZW5k aWYgKCkKIAogaWYgKFdURl9PU19VTklYKQotICAgIHNldChFTkFCTEVfWDExX1RBUkdFVCBPTikK KyAgICBpZiAoRU5BQkxFX1dBWUxBTkRfT05MWSkKKyAgICAgICAgc2V0KEVOQUJMRV9YMTFfVEFS R0VUIE9GRikKKyAgICBlbHNlICgpCisgICAgICAgIHNldChFTkFCTEVfWDExX1RBUkdFVCBPTikK KyAgICBlbmRpZiAoKQogICAgIGFkZF9kZWZpbml0aW9ucygtRFhQX1VOSVgpCiBlbmRpZiAoV1RG X09TX1VOSVgpCiAKQEAgLTIyOSw2ICsyNDMsOSBAQAogICAgIGFkZF9kZWZpbml0aW9ucygtRFdU Rl9VU0VfR1JBUEhJQ1NfU1VSRkFDRT0xKQogCiAgICAgb3B0aW9uKEVOQUJMRV9HTEVTMiAiRW5h YmxlIEdMRVMgU3VwcG9ydCIpCisgICAgaWYgKEVOQUJMRV9XQVlMQU5EX09OTFkpCisgICAgICAg IHNldChFTkFCTEVfR0xFUzIgT04pCisgICAgZW5kaWYgKCkKICAgICBpZiAoRU5BQkxFX0dMRVMy KQogICAgICAgICBmaW5kX3BhY2thZ2UoR0xFUyBSRVFVSVJFRCkKIApAQCAtMjQyLDYgKzI1OSw5 IEBACiAgICAgZW5kaWYgKCkKIAogICAgIG9wdGlvbihFTkFCTEVfRUdMICJFbmFibGUgRUdMIFN1 cHBvcnQiKQorICAgIGlmIChFTkFCTEVfV0FZTEFORF9PTkxZKQorICAgICAgICBzZXQoRU5BQkxF X0VHTCBPTikKKyAgICBlbmRpZiAoKQogICAgIGlmIChFTkFCTEVfRUdMKQogICAgICAgICBmaW5k X3BhY2thZ2UoRUdMIFJFUVVJUkVEKQogICAgICAgICBzZXQoV1RGX1VTRV9FR0wgMSkKZGlmZiAt TnVyIGV3ZWJraXQvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwu Y3BwIGV3ZWJraXQyL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFnZVByb3h5RWZs LmNwcAotLS0gZXdlYmtpdC9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94 eUVmbC5jcHAJMjAxNC0xMC0xNCAwNjoxMzoyOS4yOTY5MTA2MjkgKzAwMDAKKysrIGV3ZWJraXQy L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFnZVByb3h5RWZsLmNwcAkyMDE0LTEw LTE0IDA2OjExOjU3Ljg4NzkwOTI1NyArMDAwMApAQCAtODksNiArODksNyBAQAogICAgIHByb2Nl c3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRUaGVtZVBhdGgodGhlbWVQYXRoKSwgbV9w YWdlSUQsIDApOwogfQogCisjaWYgUExVR0lOX0FSQ0hJVEVDVFVSRShYMTEpCiB2b2lkIFdlYlBh Z2VQcm94eTo6Y3JlYXRlUGx1Z2luQ29udGFpbmVyKHVpbnQ2NF90JikKIHsKICAgICBub3RJbXBs ZW1lbnRlZCgpOwpAQCAtMTAzLDYgKzEwNCw3IEBACiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsK IH0KKyNlbmRpZgogCiB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlSW5wdXRNZXRob2RLZXlkb3du KGJvb2wmIGhhbmRsZWQpCiB7CmRpZmYgLU51ciBld2Via2l0L1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2VmbC9FZmxTY3JlZW5VdGlsaXRpZXMuY3BwIGV3ZWJraXQyL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2VmbC9FZmxTY3JlZW5VdGlsaXRpZXMuY3BwCi0tLSBld2Via2l0L1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2VmbC9FZmxTY3JlZW5VdGlsaXRpZXMuY3BwCTIwMTQtMTAtMTQgMDY6Mjc6 MDUuODYwOTIyODgxICswMDAwCisrKyBld2Via2l0Mi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9l ZmwvRWZsU2NyZWVuVXRpbGl0aWVzLmNwcAkyMDE0LTEwLTE0IDA2OjI4OjE0LjQ1ODkyMzkxMSAr MDAwMApAQCAtMTI0LDYgKzEyNCw3IEBACiAKIEVjb3JlX1hfV2luZG93IGdldEVjb3JlWFdpbmRv dyhFY29yZV9FdmFzKiBlY29yZUV2YXMpCiB7CisjaWZkZWYgSEFWRV9FQ09SRV9YCiAgICAgY29u c3QgY2hhciogZW5naW5lID0gZWNvcmVfZXZhc19lbmdpbmVfbmFtZV9nZXQoZWNvcmVFdmFzKTsK IAogICAgIGlmICghc3RyY21wKGVuZ2luZSwgIm9wZW5nbF94MTEiKSkKQEAgLTEzMiw2ICsxMzMs NyBAQAogICAgIGlmICghc3RyY21wKGVuZ2luZSwgInNvZnR3YXJlX3gxMSIpKQogICAgICAgICBy ZXR1cm4gZWNvcmVfZXZhc19zb2Z0d2FyZV94MTFfd2luZG93X2dldChlY29yZUV2YXMpOwogCisj ZW5kaWYKICAgICByZXR1cm4gMDsKIH0KIApFY29yZV9YIGhlYWRlciBzaG91bGQgbm90IGJlIGlt cG9ydCB3aGVuIEVDT1JFX1ggZGlzYWJsZWQuCi0tLSBld2Via2l0Lm9yaWcvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAJMjAxNC0xMC0xNCAwMToxOTowMi4xMzcx NTQ5NDkgKzAwMDAKKysrIGV3ZWJraXQvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlldy5jcHAJMjAxNC0xMC0xNCAwMjo1OToxOS43MzQ5Mzk4NDcgKzAwMDAKQEAgLTY0LDcg KzY0LDkgQEAKICNpbmNsdWRlICJld2tfc2V0dGluZ3NfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3 a193aW5kb3dfZmVhdHVyZXNfcHJpdmF0ZS5oIgogI2luY2x1ZGUgPEVjb3JlX0V2YXMuaD4KKyNp ZmRlZiBIQVZFX0VDT1JFX1gKICNpbmNsdWRlIDxFY29yZV9YLmg+CisjZW5kaWYKICNpbmNsdWRl IDxFZGplLmg+CiAjaW5jbHVkZSA8RXZhc19HTC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ2Fpcm9V dGlsaXRpZXNFZmwuaD4KZGlmZiAtTnVyIGV3ZWJraXQvU291cmNlL1dlYkNvcmUvY3NzL1ZpZXdw b3J0U3R5bGVSZXNvbHZlci5jcHAgZXdlYmtpdDIvU291cmNlL1dlYkNvcmUvY3NzL1ZpZXdwb3J0 U3R5bGVSZXNvbHZlci5jcHAKLS0tIGV3ZWJraXQvU291cmNlL1dlYkNvcmUvY3NzL1ZpZXdwb3J0 U3R5bGVSZXNvbHZlci5jcHAJMjAxNC0xMC0xNCAwNjoxODoxNi4yNTE5MTQ5MzUgKzAwMDAKKysr IGV3ZWJraXQyL1NvdXJjZS9XZWJDb3JlL2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2ZXIuY3BwCTIw MTQtMTAtMTQgMDY6MTk6MDUuOTY0OTE1NjgxICswMDAwCkBAIC0zOSw2ICszOSw4IEBACiAjaW5j bHVkZSAiU3R5bGVQcm9wZXJ0aWVzLmgiCiAjaW5jbHVkZSAiU3R5bGVSdWxlLmgiCiAjaW5jbHVk ZSAiVmlld3BvcnRBcmd1bWVudHMuaCIKKy8vZm9yIHVuZGVmaW5lZCByZW5kZXJTdHlsZSgpLCBp dCdzIGEgaW5saW5lIGZ1bmN0aW9uIGluIGhlYWRlci4KKyNpbmNsdWRlICJOb2RlUmVuZGVyU3R5 bGUuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCmRpZmYgLU51ciBld2Via2l0L1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybVNjcmVlbkVmbC5jcHAgZXdlYmtpdDIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRmb3JtU2NyZWVuRWZsLmNwcAotLS0gZXdlYmtpdC9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3BwCTIwMTQtMTAt MTQgMDY6Mjc6MDUuODYwOTIyODgxICswMDAwCisrKyBld2Via2l0Mi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9lZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3BwCTIwMTQtMTAtMTQgMDY6MzA6MTIuOTE0 OTI1Njg4ICswMDAwCkBAIC05NCwxMSArOTQsMTEgQEAKICAgICBlY29yZV94X3NjcmVlbl9zaXpl X2dldChlY29yZV94X2RlZmF1bHRfc2NyZWVuX2dldCgpLCAmd2lkdGgsICZoZWlnaHQpOwogICAg IHJldHVybiBGbG9hdFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAjZWxzZQotICAgIGlmICgh d2lkZ2V0IHx8ICF3aWRnZXQtPmV2YXMoKSkKKyAgICBpZiAoIXdpZGdldCB8fCAhd2lkZ2V0LT5w bGF0Zm9ybVdpZGdldCgpKQogICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKICAgICBpbnQg eCwgeSwgdywgaDsKLSAgICBlY29yZV9ldmFzX3NjcmVlbl9nZW9tZXRyeV9nZXQoZWNvcmVfZXZh c19lY29yZV9ldmFzX2dldCh3aWRnZXQtPmV2YXMoKSksICZ4LCAmeSwgJncsICZoKTsKKyAgICBl Y29yZV9ldmFzX3NjcmVlbl9nZW9tZXRyeV9nZXQoZWNvcmVfZXZhc19lY29yZV9ldmFzX2dldCh3 aWRnZXQtPnBsYXRmb3JtV2lkZ2V0KCkpLCAmeCwgJnksICZ3LCAmaCk7CiAgICAgcmV0dXJuIEZs b2F0UmVjdCh4LCB5LCB3LCBoKTsKICNlbmRpZgogfQo= 239849 2014-10-14 22:36:34 -0700 2014-10-14 22:36:34 -0700 New patch to enable wayland build of ewebkit2 ewebkit-enable-wayland-build.patch text/plain 8166 jianzhong.huang ZGlmZiAtTnVyIGV3ZWJraXQub3JpZy9Tb3VyY2UvY21ha2UvT3B0aW9uc0VmbC5jbWFrZSBld2Vi a2l0L1NvdXJjZS9jbWFrZS9PcHRpb25zRWZsLmNtYWtlCi0tLSBld2Via2l0Lm9yaWcvU291cmNl L2NtYWtlL09wdGlvbnNFZmwuY21ha2UJMjAxNC0xMC0xNSAxMTozNzoyNS45NjgyNjE0ODggKzA4 MDAKKysrIGV3ZWJraXQvU291cmNlL2NtYWtlL09wdGlvbnNFZmwuY21ha2UJMjAxNC0xMC0xNSAx MzowMzoxMC42NTMwNzc1ODkgKzA4MDAKQEAgLTExNyw2ICsxMTcsMzAgQEAKIFdFQktJVF9PUFRJ T05fRU5EKCkKIAogb3B0aW9uKEVOQUJMRV9FQ09SRV9YICJFbmFibGUgRWNvcmVfWCBzcGVjaWZp YyB1c2FnZSAoY3Vyc29yLCBiZWxsKSIgT04pCisKK29wdGlvbihFTkFCTEVfV0FZTEFORCAiRW5h YmxlIFdheWxhbmQgYnVpbGQiIE9GRikKKworaWYgKEVOQUJMRV9XQVlMQU5EKQorICAgICMgV2hl biBlbmFibGUgd2F5bGFuZCBidWlsZAorICAgICMgZW5zdXJlIEVOQUJMRV9FQ09SRV9YIGRpc2Fi bGVkLgorICAgICMgZW5zdXJlIEVOQUJMRV9YMTFfVEFSR0VUIGRpc2FibGVkLgorICAgICMgZW5z dXJlIEVOQUJMRV9ORVRTQ0FQRV9QTFVHSU5fQVBJIGRpc2FibGVkIHNpbmNlIGl0IGRlcGVuZCBv biBYbGliLgorICAgIG1lc3NhZ2UoU1RBVFVTICJCdWlsZCBXZWJraXQvRUZMIGZvciBXYXlsYW5k LiIpCisgICAgc2V0KEVOQUJMRV9YMTFfVEFSR0VUIE9GRikKKyAgICBzZXQoRU5BQkxFX0VDT1JF X1ggT0ZGKQorICAgIHNldChFTkFCTEVfTkVUU0NBUEVfUExVR0lOX0FQSSBPRkYpCisgICAgIyBU aGVyZSBpcyBubyBkaXJlY3QgZGVwZW5kZW5jeSB0byBlY29yZS13YXlsYW5kLAorICAgICMgYnV0 IHdpdGhvdXQgaXQsIHdheWxhbmQgYnVpbGQgZGlkIG5vdCB3b3JrIGF0IGFsbC4KKyAgICBmaW5k X3BhY2thZ2UoUGtnQ29uZmlnKQorICAgIHBrZ19jaGVja19tb2R1bGVzKEVDT1JFX1dBWUxBTkQg ZWNvcmUtd2F5bGFuZCkKKyAgICBpZiAoTk9UIEVDT1JFX1dBWUxBTkRfRk9VTkQpIAorICAgICAg ICBtZXNzYWdlKEZBVEFMX0VSUk9SICJUbyBlbmFibGUgd2F5bGFuZCBidWlsZCByZXF1aXJlcyBF Y29yZV9XYXlsYW5kIHN1cHBvcnQuIikKKyAgICBlbmRpZiAoKQorZWxzZSAoKQorICAgIG1lc3Nh Z2UoU1RBVFVTICJCdWlsZCBXZWJraXQvRUZMIGZvciBYIHdpbmRvdy4iKQorICAgIHNldChFTkFC TEVfWDExX1RBUkdFVCBPTikKK2VuZGlmICgpCisKIGlmIChFTkFCTEVfRUNPUkVfWCkKICAgICAj IFdlIG5lZWQgWGV4dC5oIHRvIGRpc2FibGUgWGxpYiBlcnJvciBtZXNzYWdlcyAgd2hlbiBydW5u aW5nIFdUUiBvbiBYdmZiLgogICAgICMgVGhlc2UgZXJyb3JzIGFyZSBkdW1wZWQgb24gc3RkZXJy IGFuZCBtYWtlcyB0aGUgdGVzdCBkcml2ZXIgdGhpbmtzIHRoYXQKQEAgLTE3NSw3ICsxOTksNiBA QAogZW5kaWYgKCkKIAogaWYgKFdURl9PU19VTklYKQotICAgIHNldChFTkFCTEVfWDExX1RBUkdF VCBPTikKICAgICBhZGRfZGVmaW5pdGlvbnMoLURYUF9VTklYKQogZW5kaWYgKFdURl9PU19VTklY KQogCkBAIC0yMjksNiArMjUyLDkgQEAKICAgICBhZGRfZGVmaW5pdGlvbnMoLURXVEZfVVNFX0dS QVBISUNTX1NVUkZBQ0U9MSkKIAogICAgIG9wdGlvbihFTkFCTEVfR0xFUzIgIkVuYWJsZSBHTEVT IFN1cHBvcnQiKQorICAgIGlmIChFTkFCTEVfV0FZTEFORCkKKyAgICAgICAgc2V0KEVOQUJMRV9H TEVTMiBPTikKKyAgICBlbmRpZiAoKQogICAgIGlmIChFTkFCTEVfR0xFUzIpCiAgICAgICAgIGZp bmRfcGFja2FnZShHTEVTIFJFUVVJUkVEKQogCkBAIC0yNDIsNiArMjY4LDkgQEAKICAgICBlbmRp ZiAoKQogCiAgICAgb3B0aW9uKEVOQUJMRV9FR0wgIkVuYWJsZSBFR0wgU3VwcG9ydCIpCisgICAg aWYgKEVOQUJMRV9XQVlMQU5EKQorICAgICAgICBzZXQoRU5BQkxFX0VHTCBPTikKKyAgICBlbmRp ZiAoKQogICAgIGlmIChFTkFCTEVfRUdMKQogICAgICAgICBmaW5kX3BhY2thZ2UoRUdMIFJFUVVJ UkVEKQogICAgICAgICBzZXQoV1RGX1VTRV9FR0wgMSkKQEAgLTMwNiw1ICszMzUsNiBAQAogICAg IHNldChIQVZFX0xMVk0gT04pCiBlbmRpZiAoKQogCisKICMgW0VdV2ViS2l0MiB0ZXN0cyBuZWVk IGEgaGludCB0byBmaW5kIG91dCB3aGVyZSBwcm9jZXNzZXMgc3VjaCBhcyBXZWJQcm9jZXNzIGFy ZSBsb2NhdGVkIGF0LgogYWRkX2RlZmluaXRpb25zKC1EV0VCS0lUX0VYRUNfUEFUSD1cIiR7Q01B S0VfUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZfVwiKQpkaWZmIC1OdXIgZXdlYmtpdC5vcmlnL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9FZmxTY3JlZW5VdGlsaXRpZXMuY3BwIGV3ZWJraXQv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL0VmbFNjcmVlblV0aWxpdGllcy5jcHAKLS0tIGV3 ZWJraXQub3JpZy9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRWZsU2NyZWVuVXRpbGl0aWVz LmNwcAkyMDE0LTEwLTE1IDExOjM3OjI1LjcwNjI2MTQ5OCArMDgwMAorKysgZXdlYmtpdC9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvRWZsU2NyZWVuVXRpbGl0aWVzLmNwcAkyMDE0LTEwLTE1 IDExOjM3OjM5LjM4ODI2MTAwOCArMDgwMApAQCAtMTI0LDYgKzEyNCw3IEBACiAKIEVjb3JlX1hf V2luZG93IGdldEVjb3JlWFdpbmRvdyhFY29yZV9FdmFzKiBlY29yZUV2YXMpCiB7CisjaWZkZWYg SEFWRV9FQ09SRV9YCiAgICAgY29uc3QgY2hhciogZW5naW5lID0gZWNvcmVfZXZhc19lbmdpbmVf bmFtZV9nZXQoZWNvcmVFdmFzKTsKIAogICAgIGlmICghc3RyY21wKGVuZ2luZSwgIm9wZW5nbF94 MTEiKSkKQEAgLTEzMiw2ICsxMzMsNyBAQAogICAgIGlmICghc3RyY21wKGVuZ2luZSwgInNvZnR3 YXJlX3gxMSIpKQogICAgICAgICByZXR1cm4gZWNvcmVfZXZhc19zb2Z0d2FyZV94MTFfd2luZG93 X2dldChlY29yZUV2YXMpOwogCisjZW5kaWYKICAgICByZXR1cm4gMDsKIH0KIApkaWZmIC1OdXIg ZXdlYmtpdC5vcmlnL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9QbGF0Zm9ybVNjcmVlbkVm bC5jcHAgZXdlYmtpdC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUGxhdGZvcm1TY3JlZW5F ZmwuY3BwCi0tLSBld2Via2l0Lm9yaWcvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1BsYXRm b3JtU2NyZWVuRWZsLmNwcAkyMDE0LTEwLTE1IDExOjM3OjI1LjcwNjI2MTQ5OCArMDgwMAorKysg ZXdlYmtpdC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUGxhdGZvcm1TY3JlZW5FZmwuY3Bw CTIwMTQtMTAtMTUgMTE6Mzc6NTYuMDM2MjYwNDEzICswODAwCkBAIC05NCwxMSArOTQsMTEgQEAK ICAgICBlY29yZV94X3NjcmVlbl9zaXplX2dldChlY29yZV94X2RlZmF1bHRfc2NyZWVuX2dldCgp LCAmd2lkdGgsICZoZWlnaHQpOwogICAgIHJldHVybiBGbG9hdFJlY3QoMCwgMCwgd2lkdGgsIGhl aWdodCk7CiAjZWxzZQotICAgIGlmICghd2lkZ2V0IHx8ICF3aWRnZXQtPmV2YXMoKSkKKyAgICBp ZiAoIXdpZGdldCB8fCAhd2lkZ2V0LT5wbGF0Zm9ybVdpZGdldCgpKQogICAgICAgICByZXR1cm4g RmxvYXRSZWN0KCk7CiAKICAgICBpbnQgeCwgeSwgdywgaDsKLSAgICBlY29yZV9ldmFzX3NjcmVl bl9nZW9tZXRyeV9nZXQoZWNvcmVfZXZhc19lY29yZV9ldmFzX2dldCh3aWRnZXQtPmV2YXMoKSks ICZ4LCAmeSwgJncsICZoKTsKKyAgICBlY29yZV9ldmFzX3NjcmVlbl9nZW9tZXRyeV9nZXQoZWNv cmVfZXZhc19lY29yZV9ldmFzX2dldCh3aWRnZXQtPnBsYXRmb3JtV2lkZ2V0KCkpLCAmeCwgJnks ICZ3LCAmaCk7CiAgICAgcmV0dXJuIEZsb2F0UmVjdCh4LCB5LCB3LCBoKTsKICNlbmRpZgogfQpk aWZmIC1OdXIgZXdlYmtpdC5vcmlnL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtRWZsLmNtYWtlIGV3 ZWJraXQvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1FZmwuY21ha2UKLS0tIGV3ZWJraXQub3JpZy9T b3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUVmbC5jbWFrZQkyMDE0LTEwLTE1IDExOjM3OjI1Ljk2NTI2 MTQ4OCArMDgwMAorKysgZXdlYmtpdC9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUVmbC5jbWFrZQky MDE0LTEwLTE1IDExOjM3OjMyLjA3NjI2MTI3MCArMDgwMApAQCAtMzY5LDE5ICszNjksMjMgQEAK IAogICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9lZmwvR3JhcGhpY3NTdXJmYWNl Q29tbW9uLmNwcAogCi0gICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFI ZWxwZXIuY3BwCiAKICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJHTC5jcHAKICAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJT aGFkZXJQcm9ncmFtLmNwcAogICAgICkKIAorICAgIGlmIChFTkFCTEVfWDExX1RBUkdFVCkKKyAg ICAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCisgICAgICAgICAgICBwbGF0Zm9ybS9n cmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNwcAorICAgICAgICApCisgICAgZW5kaWYg KCkKKwogICAgIGlmIChXVEZfVVNFX0VHTCkKICAgICAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9T T1VSQ0VTCiAgICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9lZ2wvRUdMQ29u ZmlnU2VsZWN0b3IuY3BwCiAgICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9l Z2wvRUdMQ29udGV4dC5jcHAKICAgICAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2Vz L2VnbC9FR0xIZWxwZXIuY3BwCiAgICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNl cy9lZ2wvRUdMU3VyZmFjZS5jcHAKLSAgICAgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL3N1cmZh Y2VzL2VnbC9FR0xYU3VyZmFjZS5jcHAKICAgICAgICAgKQogICAgIGVsc2UgKCkKICAgICAgICAg bGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCkBAIC0zOTAsNiArMzk0LDEyIEBACiAgICAgICAg ICkKICAgICBlbmRpZiAoKQogCisgICAgaWYgKFdURl9VU0VfRUdMIEFORCBFTkFCTEVfWDExX1RB UkdFVCkKKyAgICAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCisgICAgICAgICAgICBw bGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9lZ2wvRUdMWFN1cmZhY2UuY3BwCisgICAgICAgICkK KyAgICBlbmRpZigpCisKICAgICBpZiAoV1RGX1VTRV9PUEVOR0xfRVNfMikKICAgICAgICAgbGlz dChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VTCiAgICAgICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9v cGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuY3BwCkBAIC00MDQsOSArNDE0LDE3IEBACiAgICAg ICAgICkKICAgICBlbmRpZiAoKQogCi0gICAgbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMK LSAgICAgICAgJHtYMTFfWDExX0xJQn0KLSAgICApCisgICAgaWYgKEVOQUJMRV9YMTFfVEFSR0VU KQorICAgICAgICBsaXN0KEFQUEVORCBXZWJDb3JlX0xJQlJBUklFUworICAgICAgICAgICAgJHtY MTFfWDExX0xJQn0KKyAgICAgICAgKQorICAgIGVuZGlmKCkKKworICAgIGlmIChXVEZfVVNFX09Q RU5HTF9FU18yKQorICAgICAgICBsaXN0KEFQUEVORCBXZWJDb3JlX0xJQlJBUklFUworICAgICAg ICAgICAgJHtPUEVOR0xFUzJfTElCUkFSWX0KKyAgICAgICAgKQorICAgIGVuZGlmKCkKIAogICAg IGlmIChXVEZfVVNFX0VHTCkKICAgICAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9MSUJSQVJJRVMK ZGlmZiAtTnVyIGV3ZWJraXQub3JpZy9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZSBl d2Via2l0L1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCi0tLSBld2Via2l0Lm9yaWcv U291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UJMjAxNC0xMC0xNSAxMTozNzoyNS4yODYy NjE1MTMgKzA4MDAKKysrIGV3ZWJraXQvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UJ MjAxNC0xMC0xNSAxMTozNzozMi4wNzcyNjEyNzAgKzA4MDAKQEAgLTI5NCw2ICsyOTQsMTIgQEAK ICAgICAke1NRTElURV9MSUJSQVJJRVN9CiApCiAKK2lmIChXVEZfVVNFX09QRU5HTF9FU18yKQor ICAgIGxpc3QoQVBQRU5EIFdlYktpdDJfTElCUkFSSUVTCisgICAgICAgICR7T1BFTkdMRVMyX0xJ QlJBUll9CisgICAgKQorZW5kaWYoKQorCiBsaXN0KEFQUEVORCBXZWJQcm9jZXNzX1NPVVJDRVMK ICAgICBXZWJQcm9jZXNzL0VudHJ5UG9pbnQvdW5peC9XZWJQcm9jZXNzTWFpbi5jcHAKICkKZGlm ZiAtTnVyIGV3ZWJraXQub3JpZy9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tW aWV3LmNwcCBld2Via2l0L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwCi0tLSBld2Via2l0Lm9yaWcvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlldy5jcHAJMjAxNC0xMC0xNSAxMTozNzoyNS4yMTUyNjE1MTUgKzA4MDAKKysrIGV3ZWJraXQv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAJMjAxNC0xMC0xNSAx MTozNzo0Ni4wMzYyNjA3NzEgKzA4MDAKQEAgLTY0LDcgKzY0LDYgQEAKICNpbmNsdWRlICJld2tf c2V0dGluZ3NfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a193aW5kb3dfZmVhdHVyZXNfcHJpdmF0 ZS5oIgogI2luY2x1ZGUgPEVjb3JlX0V2YXMuaD4KLSNpbmNsdWRlIDxFY29yZV9YLmg+CiAjaW5j bHVkZSA8RWRqZS5oPgogI2luY2x1ZGUgPEV2YXNfR0wuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Nh aXJvVXRpbGl0aWVzRWZsLmg+CkBAIC03NSw2ICs3NCwxMCBAQAogI2luY2x1ZGUgPHd0Zi9OZXZl ckRlc3Ryb3llZC5oPgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KIAorI2lmZGVmIEhB VkVfRUNPUkVfWAorI2luY2x1ZGUgPEVjb3JlX1guaD4KKyNlbmRpZgorCiAjaWYgRU5BQkxFKFZJ QlJBVElPTikKICNpbmNsdWRlICJWaWJyYXRpb25DbGllbnRFZmwuaCIKICNlbmRpZgpkaWZmIC1O dXIgZXdlYmtpdC5vcmlnL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFnZVByb3h5 RWZsLmNwcCBld2Via2l0L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFnZVByb3h5 RWZsLmNwcAotLS0gZXdlYmtpdC5vcmlnL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2Vi UGFnZVByb3h5RWZsLmNwcAkyMDE0LTEwLTE1IDExOjM3OjI1LjE5ODI2MTUxNiArMDgwMAorKysg ZXdlYmtpdC9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94eUVmbC5jcHAJ MjAxNC0xMC0xNSAxMTozNzo1MS4xNjQyNjA1ODggKzA4MDAKQEAgLTg5LDYgKzg5LDcgQEAKICAg ICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0VGhlbWVQYXRoKHRoZW1lUGF0 aCksIG1fcGFnZUlELCAwKTsKIH0KIAorI2lmIFBMVUdJTl9BUkNISVRFQ1RVUkUoWDExKQogdm9p ZCBXZWJQYWdlUHJveHk6OmNyZWF0ZVBsdWdpbkNvbnRhaW5lcih1aW50NjRfdCYpCiB7CiAgICAg bm90SW1wbGVtZW50ZWQoKTsKQEAgLTEwMyw2ICsxMDQsNyBAQAogewogICAgIG5vdEltcGxlbWVu dGVkKCk7CiB9CisjZW5kaWYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZUlucHV0TWV0aG9k S2V5ZG93bihib29sJiBoYW5kbGVkKQogewpkaWZmIC1OdXIgZXdlYmtpdC5vcmlnL1Rvb2xzL0NN YWtlTGlzdHMudHh0IGV3ZWJraXQvVG9vbHMvQ01ha2VMaXN0cy50eHQKLS0tIGV3ZWJraXQub3Jp Zy9Ub29scy9DTWFrZUxpc3RzLnR4dAkyMDE0LTEwLTE1IDExOjM3OjI0Ljg1NDI2MTUyOCArMDgw MAorKysgZXdlYmtpdC9Ub29scy9DTWFrZUxpc3RzLnR4dAkyMDE0LTEwLTE1IDExOjM3OjMyLjA3 NzI2MTI3MCArMDgwMApAQCAtNiw3ICs2LDkgQEAKICAgICBhZGRfc3ViZGlyZWN0b3J5KEltYWdl RGlmZikKIAogICAgIGFkZF9zdWJkaXJlY3RvcnkoTWluaUJyb3dzZXIvZWZsKQotICAgIGFkZF9z dWJkaXJlY3RvcnkoRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luKQorICAgIGlmIChF TkFCTEVfWDExX1RBUkdFVCkKKyAgICAgICAgYWRkX3N1YmRpcmVjdG9yeShEdW1wUmVuZGVyVHJl ZS9UZXN0TmV0c2NhcGVQbHVnSW4pCisgICAgZW5kaWYgKCkKIGVsc2VpZiAoIiR7UE9SVH0iIFNU UkVRVUFMICJHVEsiKQogICAgIGFkZF9zdWJkaXJlY3RvcnkoSW1hZ2VEaWZmKQogICAgIGlmIChF TkFCTEVfV0VCS0lUMikK