Title: [88245] trunk
- Revision
- 88245
- Author
- [email protected]
- Date
- 2011-06-07 09:40:17 -0700 (Tue, 07 Jun 2011)
Log Message
2011-06-07 Lucas De Marchi <[email protected]>
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 <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/ChangeLog (88244 => 88245)
--- trunk/ChangeLog 2011-06-07 16:35:06 UTC (rev 88244)
+++ trunk/ChangeLog 2011-06-07 16:40:17 UTC (rev 88245)
@@ -1,3 +1,15 @@
+2011-06-07 Lucas De Marchi <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Laszlo Gombos.
Modified: trunk/Source/WebCore/ChangeLog (88244 => 88245)
--- trunk/Source/WebCore/ChangeLog 2011-06-07 16:35:06 UTC (rev 88244)
+++ trunk/Source/WebCore/ChangeLog 2011-06-07 16:40:17 UTC (rev 88245)
@@ -1,3 +1,18 @@
+2011-06-07 Lucas De Marchi <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Martin Robinson.
Modified: trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp (88244 => 88245)
--- trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp 2011-06-07 16:35:06 UTC (rev 88244)
+++ trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp 2011-06-07 16:40:17 UTC (rev 88245)
@@ -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 @@
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);
}
Modified: trunk/Source/cmake/FindEFL.cmake (88244 => 88245)
--- trunk/Source/cmake/FindEFL.cmake 2011-06-07 16:35:06 UTC (rev 88244)
+++ trunk/Source/cmake/FindEFL.cmake 2011-06-07 16:40:17 UTC (rev 88245)
@@ -6,9 +6,9 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
