Changeset 58487 in webkit

Timestamp:

Apr 29, 2010 1:46:29 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-29 Gustavo Sverzut Barbieri <​barbieri@profusion.mobi>

Reviewed by Eric Seidel.

Add EFL-specific code to Widget.h and move the empty
frameRectsChanged() definition to Widget.cpp, since the EFL port
needs to override that.
​http://webkit.org/b/36317

No new tests required.

• WebCore.base.exp:
• platform/Widget.cpp: (WebCore::Widget::frameRectsChanged):
• platform/Widget.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.base.exp (modified) (1 diff)
• platform/Widget.cpp (modified) (1 diff)
• platform/Widget.h (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-29  Gustavo Sverzut Barbieri  <barbieri@profusion.mobi>
+
+        Reviewed by Eric Seidel.
+
+        Add EFL-specific code to Widget.h and move the empty
+        frameRectsChanged() definition to Widget.cpp, since the EFL port
+        needs to override that.
+        http://webkit.org/b/36317
+
+        No new tests required.
+
+        * WebCore.base.exp:
+        * platform/Widget.cpp:
+        (WebCore::Widget::frameRectsChanged):
+        * platform/Widget.h:
+
 2010-04-29  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
 

trunk/WebCore/WebCore.base.exp

@@ -610 +610 @@
 __ZN7WebCore6WidgetC2EP6NSView
 __ZN7WebCore6WidgetD2Ev
+__ZN7WebCore6Widget17frameRectsChangedEv
 __ZN7WebCore7Console21shouldPrintExceptionsEv
 __ZN7WebCore7Console24setShouldPrintExceptionsEb

trunk/WebCore/platform/Widget.cpp

@@ -175 +175 @@
 }
 
+#if !PLATFORM(EFL)
+void Widget::frameRectsChanged()
+{
+}
+#endif
+
 } // namespace WebCore

trunk/WebCore/platform/Widget.h

@@ -73 +73 @@
 #endif
 
+#if PLATFORM(EFL)
+#include <Ecore_Evas.h>
+#include <Evas.h>
+typedef Evas_Object* PlatformWidget;
+#endif
+
 #if PLATFORM(QT)
 class QWebPageClient;
@@ -95 +101 @@
 class ScrollView;
 class WidgetPrivate;
+#if PLATFORM(EFL)
+class String;
+#endif
 
 // The Widget class serves as a base class for three kinds of objects:
@@ -190 +199 @@
     IntPoint convertFromContainingWindow(const IntPoint&) const;
 
-    virtual void frameRectsChanged() {}
+    virtual void frameRectsChanged();
 
     // Notifies this widget that other widgets on the page have been repositioned.
@@ -202 +211 @@
 
     void removeFromSuperview();
+#endif
+
+#if PLATFORM(EFL)
+    // FIXME: These should really go to PlatformWidget. They're here currently since
+    // the EFL port considers that Evas_Object (a C object) is a PlatformWidget, but
+    // encapsulating that into a C++ class will make this header clean as it should be.
+    Evas* evas() const;
+
+    void setEvasObject(Evas_Object*);
+    Evas_Object* evasObject() const;
+
+    const String edjeTheme() const;
+    void setEdjeTheme(const String &);
+    const String edjeThemeRecursive() const;
 #endif
 
@@ -232 +255 @@
     IntRect m_frame; // Not used when a native widget exists.
 
-#if PLATFORM(MAC)
+#if PLATFORM(EFL)
+    // FIXME: Please see the previous #if PLATFORM(EFL) block.
+    Ecore_Evas* ecoreEvas() const;
+
+    void applyFallbackCursor();
+    void applyCursor();
+#endif
+
+#if PLATFORM(MAC) || PLATFORM(EFL)
     WidgetPrivate* m_data;
 #endif
+
 #if PLATFORM(HAIKU)
     PlatformWidget m_topLevelPlatformWidget;