Diff
Modified: trunk/Tools/ChangeLog (132798 => 132799)
--- trunk/Tools/ChangeLog 2012-10-29 14:26:46 UTC (rev 132798)
+++ trunk/Tools/ChangeLog 2012-10-29 14:29:52 UTC (rev 132799)
@@ -1,3 +1,22 @@
+2012-10-29 Yael Aharon <[email protected]>
+
+ [EFL][AC] Fix bugs preventing us from running layout tests with AC turned on
+ https://bugs.webkit.org/show_bug.cgi?id=100598
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Make sure to use opengl_x11 engine when AC is turned on and X11 is in use.
+ We cannot create a gl context otherwise.
+
+ * MiniBrowser/efl/main.c:
+ (elm_main):
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+ (WTR::initEcoreEvas):
+ * DumpRenderTree/efl/DumpRenderTree.cpp:
+ (initEcoreEvas):
+ * EWebLauncher/efl/main.c:
+ (windowCreate):
+
2012-10-29 Raphael Kubo da Costa <[email protected]>
[EFL][WK2] REGRESSION(r132342): fast/events/frame-tab-focus.html fails
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp (132798 => 132799)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2012-10-29 14:26:46 UTC (rev 132798)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2012-10-29 14:29:52 UTC (rev 132799)
@@ -419,7 +419,11 @@
static Ecore_Evas* initEcoreEvas()
{
- Ecore_Evas* ecoreEvas = ecore_evas_new(0, 0, 0, 800, 600, 0);
+ const char* engine = 0;
+#if defined(WTF_USE_ACCELERATED_COMPOSITING) && defined(HAVE_ECORE_X)
+ engine = "opengl_x11";
+#endif
+ Ecore_Evas* ecoreEvas = ecore_evas_new(engine, 0, 0, 800, 600, 0);
if (!ecoreEvas) {
shutdownEfl();
exit(EXIT_FAILURE);
Modified: trunk/Tools/EWebLauncher/main.c (132798 => 132799)
--- trunk/Tools/EWebLauncher/main.c 2012-10-29 14:26:46 UTC (rev 132798)
+++ trunk/Tools/EWebLauncher/main.c 2012-10-29 14:29:52 UTC (rev 132799)
@@ -807,7 +807,16 @@
return NULL;
}
- app->ee = ecore_evas_new(userArgs->engine, 0, 0, userArgs->geometry.w, userArgs->geometry.h, NULL);
+#if defined(WTF_USE_ACCELERATED_COMPOSITING) && defined(HAVE_ECORE_X)
+ if (userArgs->engine)
+#endif
+ app->ee = ecore_evas_new(userArgs->engine, 0, 0, userArgs->geometry.w, userArgs->geometry.h, NULL);
+#if defined(WTF_USE_ACCELERATED_COMPOSITING) && defined(HAVE_ECORE_X)
+ else {
+ const char* engine = "opengl_x11";
+ app->ee = ecore_evas_new(engine, 0, 0, userArgs->geometry.w, userArgs->geometry.h, NULL);
+ }
+#endif
if (!app->ee) {
quit(EINA_FALSE, "ERROR: could not construct evas-ecore\n");
return NULL;
Modified: trunk/Tools/MiniBrowser/efl/main.c (132798 => 132799)
--- trunk/Tools/MiniBrowser/efl/main.c 2012-10-29 14:26:46 UTC (rev 132798)
+++ trunk/Tools/MiniBrowser/efl/main.c 2012-10-29 14:29:52 UTC (rev 132799)
@@ -779,6 +779,12 @@
if (evas_engine_name)
elm_config_preferred_engine_set(evas_engine_name);
+#if defined(WTF_USE_ACCELERATED_COMPOSITING) && defined(HAVE_ECORE_X)
+ else {
+ evas_engine_name = "opengl_x11";
+ elm_config_preferred_engine_set(evas_engine_name);
+ }
+#endif
if (args < argc) {
char *url = ""
Modified: trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (132798 => 132799)
--- trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2012-10-29 14:26:46 UTC (rev 132798)
+++ trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2012-10-29 14:29:52 UTC (rev 132799)
@@ -30,7 +30,11 @@
static Ecore_Evas* initEcoreEvas()
{
- Ecore_Evas* ecoreEvas = ecore_evas_new(0, 0, 0, 800, 600, 0);
+ const char* engine = 0;
+#if defined(WTF_USE_ACCELERATED_COMPOSITING) && defined(HAVE_ECORE_X)
+ engine = "opengl_x11";
+#endif
+ Ecore_Evas* ecoreEvas = ecore_evas_new(engine, 0, 0, 800, 600, 0);
if (!ecoreEvas)
return 0;
