2010-04-05 Leandro Pereira <leandro@profusion.mobi>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Apr 2010 03:50:46 +0000 (03:50 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Apr 2010 03:50:46 +0000 (03:50 +0000)
        Reviewed by Kenneth Rohde Christiansen.

        Add EFL-specific code to platform/graphics/*.h.
        http://webkit.org/b/36308

        * platform/graphics/Icon.h:
        * platform/graphics/IntRect.h:
        * platform/graphics/FloatRect.h:
        * platform/graphics/IntPoint.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@57118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/FloatRect.h
WebCore/platform/graphics/Icon.h
WebCore/platform/graphics/IntPoint.h
WebCore/platform/graphics/IntRect.h

index fc27d1e..1df45fc 100644 (file)
@@ -1,3 +1,15 @@
+2010-04-05  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add EFL-specific code to platform/graphics/*.h.
+        http://webkit.org/b/36308
+
+        * platform/graphics/Icon.h:
+        * platform/graphics/IntRect.h:
+        * platform/graphics/FloatRect.h:
+        * platform/graphics/IntPoint.h:
+
 2010-04-05  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
index b265121..4c3a382 100644 (file)
 
 #include "FloatPoint.h"
 
+#if PLATFORM(EFL)
+#include <Evas.h>
+#endif
+
 #if PLATFORM(CG)
 typedef struct CGRect CGRect;
 #endif
@@ -145,6 +149,11 @@ public:
     operator QRectF() const;
 #endif
 
+#if PLATFORM(EFL)
+    explicit FloatRect(const Eina_Rectangle&);
+    operator Eina_Rectangle() const;
+#endif
+
 #if PLATFORM(WX) && USE(WXGC)
     FloatRect(const wxRect2DDouble&);
     operator wxRect2DDouble() const;
index d7d694a..59c732f 100644 (file)
@@ -39,6 +39,8 @@ typedef struct HICON__* HICON;
 #include <QIcon>
 #elif PLATFORM(GTK)
 typedef struct _GdkPixbuf GdkPixbuf;
+#elif PLATFORM(EFL)
+#include <Evas.h>
 #elif PLATFORM(CHROMIUM)
 #include "PlatformIcon.h"
 #endif
@@ -74,6 +76,9 @@ private:
 #elif PLATFORM(GTK)
     Icon();
     GdkPixbuf* m_icon;
+#elif PLATFORM(EFL)
+    Icon();
+    Evas_Object* m_icon;
 #elif PLATFORM(CHROMIUM)
     Icon(const PlatformIcon&);
     PlatformIcon m_icon;
index 02110f2..6d5d40b 100644 (file)
@@ -56,6 +56,8 @@ QT_END_NAMESPACE
 typedef struct _GdkPoint GdkPoint;
 #elif PLATFORM(HAIKU)
 class BPoint;
+#elif PLATFORM(EFL)
+typedef struct _Evas_Point Evas_Point;
 #endif
 
 #if PLATFORM(WX)
@@ -129,6 +131,9 @@ public:
 #elif PLATFORM(HAIKU)
     explicit IntPoint(const BPoint&);
     operator BPoint() const;
+#elif PLATFORM(EFL)
+    explicit IntPoint(const Evas_Point&);
+    operator Evas_Point() const;
 #endif
 
 #if PLATFORM(WX)
index ad90dd9..5c5eae1 100644 (file)
@@ -51,6 +51,8 @@ QT_END_NAMESPACE
 typedef struct _GdkRectangle GdkRectangle;
 #elif PLATFORM(HAIKU)
 class BRect;
+#elif PLATFORM(EFL)
+#include <Evas.h>
 #endif
 
 #if PLATFORM(WX)
@@ -153,6 +155,9 @@ public:
 #elif PLATFORM(HAIKU)
     explicit IntRect(const BRect&);
     operator BRect() const;
+#elif PLATFORM(EFL)
+    explicit IntRect(const Eina_Rectangle&);
+    operator Eina_Rectangle() const;
 #endif
 
 #if PLATFORM(CG)