2011-06-07 Lucas De Marchi <lucas.demarchi@profusion.mobi>

        Reviewed by Antonio Gomes.

        [EFL] Remove Ecore_X bits from PlatformScreenEfl
        https://bugs.webkit.org/show_bug.cgi?id=61649

        Remove the need for Ecore_X and some X calls by always using
        new functions available in EFL to get the screen size.

        * Source/cmake/FindEFL.cmake: Bump ecore and ecore-evas versions.
2011-06-07  Lucas De Marchi  <lucas.demarchi@profusion.mobi>

        Reviewed by Antonio Gomes.

        [EFL] Remove Ecore_X bits from PlatformScreenEfl
        https://bugs.webkit.org/show_bug.cgi?id=61649

        Remove the need for Ecore_X and some X calls by always using
        new functions available in EFL to get the screen size.

        No new tests since the same functionality are done inside EFL now.

        * platform/efl/PlatformScreenEfl.cpp:
        (WebCore::screenRect):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@88245 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9c8a9a96
2011-06-07 Lucas De Marchi <lucas.demarchi@profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Remove Ecore_X bits from PlatformScreenEfl
https://bugs.webkit.org/show_bug.cgi?id=61649
Remove the need for Ecore_X and some X calls by always using
new functions available in EFL to get the screen size.
* Source/cmake/FindEFL.cmake: Bump ecore and ecore-evas versions.
2011-06-07 Andreas Kling <andreas.kling@nokia.com>
Reviewed by Laszlo Gombos.
......
2011-06-07 Lucas De Marchi <lucas.demarchi@profusion.mobi>
Reviewed by Antonio Gomes.
[EFL] Remove Ecore_X bits from PlatformScreenEfl
https://bugs.webkit.org/show_bug.cgi?id=61649
Remove the need for Ecore_X and some X calls by always using
new functions available in EFL to get the screen size.
No new tests since the same functionality are done inside EFL now.
* platform/efl/PlatformScreenEfl.cpp:
(WebCore::screenRect):
2011-06-07 Carlos Garcia Campos <cgarcia@igalia.com>
Reviewed by Martin Robinson.
......
......@@ -34,16 +34,12 @@
#include "config.h"
#include "PlatformScreen.h"
#include <Ecore_Evas.h>
#include "NotImplemented.h"
#include "PlatformString.h"
#include "Widget.h"
#include <wtf/text/CString.h>
#ifdef HAVE_ECORE_X
#include <Ecore_X.h>
#include <X11/Xlib.h>
#endif
namespace WebCore {
int screenDepth(Widget* widget)
......@@ -66,17 +62,10 @@ bool screenIsMonochrome(Widget*)
FloatRect screenRect(Widget* widget)
{
int x = 0, y = 0, w = 0, h = 0;
int x, y, w, h;
Evas* e = widget->evas();
#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
ecore_evas_screen_geometry_get(ecore_evas_ecore_evas_get(e), &x, &y, &w, &h);
return FloatRect(x, y, w, h);
}
......
......@@ -6,9 +6,9 @@ PKG_CHECK_MODULES (ECORE_EVAS REQUIRED ecore-evas>=1.0.0)
PKG_CHECK_MODULES (EFLDEPS REQUIRED
eina>=1.0.0
evas>=1.0.0
ecore>=1.0.0
ecore>=1.0.999.59763
ecore-file>=1.0.0
ecore-evas>=1.0.0
ecore-evas>=1.0.999.59763
edje>=1.0.0)
PKG_CHECK_MODULES (EINA REQUIRED eina>=1.0.0)
PKG_CHECK_MODULES (ECORE_X ecore-x>=1.0.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