Commit 654202a9 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[EFL][AC] Fix bugs preventing us from running layout tests with AC turned on

https://bugs.webkit.org/show_bug.cgi?id=100598

Patch by Yael Aharon <yael.aharon@intel.com> on 2012-10-29
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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@132799 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2dec0842
2012-10-29 Yael Aharon <yael.aharon@intel.com>
[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 <raphael.kubo.da.costa@intel.com> 2012-10-29 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
[EFL][WK2] REGRESSION(r132342): fast/events/frame-tab-focus.html fails [EFL][WK2] REGRESSION(r132342): fast/events/frame-tab-focus.html fails
......
...@@ -419,7 +419,11 @@ void dump() ...@@ -419,7 +419,11 @@ void dump()
static Ecore_Evas* initEcoreEvas() 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) { if (!ecoreEvas) {
shutdownEfl(); shutdownEfl();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
......
...@@ -807,7 +807,16 @@ windowCreate(User_Arguments *userArgs) ...@@ -807,7 +807,16 @@ windowCreate(User_Arguments *userArgs)
return NULL; 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) { if (!app->ee) {
quit(EINA_FALSE, "ERROR: could not construct evas-ecore\n"); quit(EINA_FALSE, "ERROR: could not construct evas-ecore\n");
return NULL; return NULL;
......
...@@ -779,6 +779,12 @@ elm_main(int argc, char *argv[]) ...@@ -779,6 +779,12 @@ elm_main(int argc, char *argv[])
if (evas_engine_name) if (evas_engine_name)
elm_config_preferred_engine_set(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) { if (args < argc) {
char *url = url_from_user_input(argv[args]); char *url = url_from_user_input(argv[args]);
......
...@@ -30,7 +30,11 @@ namespace WTR { ...@@ -30,7 +30,11 @@ namespace WTR {
static Ecore_Evas* initEcoreEvas() 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) if (!ecoreEvas)
return 0; return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment