Unreviewed, rolling out r126169.
[WebKit-https.git] / Source / WebCore / platform / Widget.h
index 3f19b61..65f04d9 100644 (file)
@@ -40,8 +40,8 @@
 #endif
 
 #if PLATFORM(QT)
+#include <QPointer>
 #include <qglobal.h>
-#include <QWeakPointer>
 #endif
 
 #if PLATFORM(MAC)
@@ -63,9 +63,13 @@ typedef GtkWidget* PlatformWidget;
 
 #if PLATFORM(QT)
 QT_BEGIN_NAMESPACE
-class QWidget;
+class QObject;
 QT_END_NAMESPACE
-typedef QWidget* PlatformWidget;
+typedef QObject* PlatformWidget;
+#endif
+
+#if PLATFORM(BLACKBERRY)
+typedef void* PlatformWidget;
 #endif
 
 #if PLATFORM(WX)
@@ -83,6 +87,12 @@ typedef Evas_Object* PlatformWidget;
 #if PLATFORM(QT)
 class QWebPageClient;
 typedef QWebPageClient* PlatformPageClient;
+#elif PLATFORM(BLACKBERRY)
+#include "PageClientBlackBerry.h"
+typedef PageClientBlackBerry* PlatformPageClient;
+#elif PLATFORM(EFL)
+class PageClientEfl;
+typedef PageClientEfl* PlatformPageClient;
 #else
 typedef PlatformWidget PlatformPageClient;
 #endif
@@ -117,7 +127,7 @@ enum WidgetNotification { WillPaintFlattened, DidPaintFlattened };
 //
 class Widget : public RefCounted<Widget> {
 public:
-    Widget(PlatformWidget = 0);
+    explicit Widget(PlatformWidget = 0);
     virtual ~Widget();
 
     PlatformWidget platformWidget() const;
@@ -211,10 +221,6 @@ public:
 
     void setEvasObject(Evas_Object*);
     Evas_Object* evasObject() const;
-
-    const String edjeTheme() const;
-    void setEdjeTheme(const String &);
-    const String edjeThemeRecursive() const;
 #endif
 
 #if PLATFORM(CHROMIUM)
@@ -261,20 +267,12 @@ private:
 
     IntRect m_frame; // Not used when a native widget exists.
 
-#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(QT)
-    QWeakPointer<QObject> m_bindingObject;
+    QPointer<QObject> m_bindingObject;
 #endif
 
 };