[EFL] Remove Ecore_X bits from PlatformScreenEfl
Created attachment 95194 [details] Patch
The calls to Ecore_X and to X itself can be replaced with a call to Evas. This makes the code cleaner and actually work when X is not used.
Comment on attachment 95194 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95194&action=review > Source/WebCore/platform/efl/PlatformScreenEfl.cpp:68 > - int x = 0, y = 0, w = 0, h = 0; > - > -#ifdef HAVE_ECORE_X > - Ecore_X_Display* display = ecore_x_display_get(); > - int def = DefaultScreen(display); > - Screen* screen = ScreenOfDisplay(display, def); > - x = 0; > - y = 0; > - w = screen->width; > - h = screen->height; > -#endif > + int width = 0, height = 0; > > - return FloatRect(x, y, w, h); > + evas_output_size_get(widget->evas(), &width, &height); > + return FloatRect(0, 0, width, height); As we talked through IRC, this is the wrong fix, since you should return the size of the screen, not the size of your window. I'll submit a patch for this shortly.
Alright then.
Created attachment 95243 [details] Patch
Comment on attachment 95243 [details] Patch Attachment 95243 [details] did not pass efl-ews (efl): Output: http://queues.webkit.org/results/8740561
(In reply to comment #6) > (From update of attachment 95243 [details]) > Attachment 95243 [details] did not pass efl-ews (efl): > Output: http://queues.webkit.org/results/8740561 Gyuyoung, we need to update EFL on EWS server. Could you do it?
(In reply to comment #7) > (In reply to comment #6) > > (From update of attachment 95243 [details] [details]) > > Attachment 95243 [details] [details] did not pass efl-ews (efl): > > Output: http://queues.webkit.org/results/8740561 > > Gyuyoung, we need to update EFL on EWS server. Could you do it? Thinking again, maybe it's better to make a snapshot of WebKit-EFL for people who didn't move on to newer versions of EFL. 1.1 is coming soon, then this snapshot would be the latest one compatible with 1.0. Leandro, could you make a snapshot?
(In reply to comment #7) > (In reply to comment #6) > > (From update of attachment 95243 [details] [details]) > > Attachment 95243 [details] [details] did not pass efl-ews (efl): > > Output: http://queues.webkit.org/results/8740561 > > Gyuyoung, we need to update EFL on EWS server. Could you do it? Sure, I will upgrade EFL on EWS server. Then, I will land this patch.
Lucas, I update efl libraries(ver. 1.0.999.59989) on both ews and buildbot.
Created attachment 96231 [details] Re-upload previous patch
CC'ing reviewers.
Comment on attachment 96231 [details] Re-upload previous patch Clearing flags on attachment: 96231 Committed r88245: <http://trac.webkit.org/changeset/88245>
All reviewed patches have been landed. Closing bug.
Maybe the BOT needs an update? @Demarchi, could you roll it out until the samsung guys can fix it if it is the case? -- Build files have been written to: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/WebKitBuild/Release [ 2%] Built target wtf_efl [ 9%] Built target javascriptcore_efl [ 9%] Built target jsc_efl Scanning dependencies of target webcore_efl [ 9%] Building CXX object WebCore/CMakeFiles/webcore_efl.dir/platform/efl/PlatformScreenEfl.cpp.o /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/Source/WebCore/platform/efl/PlatformScreenEfl.cpp: In function ‘WebCore::FloatRect WebCore::screenRect(WebCore::Widget*)’: /mnt/buildbot/efl-linux-slave-1/efl-linux-release/build/Source/WebCore/platform/efl/PlatformScreenEfl.cpp:68: error: ‘ecore_evas_screen_geometry_get’ was not declared in this scope make[2]: *** [WebCore/CMakeFiles/webcore_efl.dir/platform/efl/PlatformScreenEfl.cpp.o] Error 1 make[1]: *** [WebCore/CMakeFiles/webcore_efl.dir/all] Error 2 make: *** [all] Error 2 program finished with exit code 2 elapsedTime=48.236335