Remove PlatformWidget references

Source/WebCore/platform/Widget.h

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Collabora Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 10 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Widget_h
 #define Widget_h
 
 #include "IntRect.h"
+#include "PageClientChromium.h"
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 
-#if PLATFORM(CHROMIUM)
-#include "PageClientChromium.h"
-#include "PlatformWidget.h"
-#endif
-
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
 #endif
 
 #if PLATFORM(QT)
 #include <QPointer>
 #include <qglobal.h>
 #endif
 
-#if PLATFORM(MAC)
-OBJC_CLASS NSView;
-OBJC_CLASS NSWindow;
-typedef NSView *PlatformWidget;
-#endif
-
-#if PLATFORM(WIN)
-typedef struct HWND__* HWND;
-typedef HWND PlatformWidget;
-#endif
-
-#if PLATFORM(GTK)
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkContainer GtkContainer;
-typedef GtkWidget* PlatformWidget;
-#endif
-
-#if PLATFORM(QT)
-QT_BEGIN_NAMESPACE
-class QObject;
-QT_END_NAMESPACE
-typedef QObject* PlatformWidget;
-#endif
-
-#if PLATFORM(BLACKBERRY)
-typedef void* PlatformWidget;
-#endif
-
-#if PLATFORM(WX)
-class wxWindow;
-typedef wxWindow* PlatformWidget;
-#endif
-
-#if PLATFORM(EFL)
-#if USE(EO)
-typedef struct _Eo Evas_Object;
-#else
-typedef struct _Evas_Object Evas_Object;
-#endif
-typedef Evas_Object* PlatformWidget;
-#endif
-
-#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;
-#elif PLATFORM(CHROMIUM)
 typedef WebCore::PageClientChromium* PlatformPageClient;
-#else
-typedef PlatformWidget PlatformPageClient;
-#endif
 
 namespace WebCore {
 
 class AXObjectCache;
 class Cursor;
 class Event;
 class Font;
 class GraphicsContext;
 class PlatformMouseEvent;
 class ScrollView;
 class WidgetPrivate;
 
 enum WidgetNotification { WillPaintFlattened, DidPaintFlattened };
 
 // The Widget class serves as a base class for three kinds of objects:
 // (1) Scrollable areas (ScrollView)
 // (2) Scrollbars (Scrollbar)
 // (3) Plugins (PluginView)
 //
-// A widget may or may not be backed by a platform-specific object (e.g., HWND on Windows, NSView on Mac, QWidget on Qt).
-//
 // Widgets are connected in a hierarchy, with the restriction that plugins and scrollbars are always leaves of the
 // tree.  Only ScrollViews can have children (and therefore the Widget class has no concept of children).
-//
-// The rules right now for which widgets get platform-specific objects are as follows:
-// ScrollView - Mac
-// Scrollbar - Mac, Gtk
-// Plugin - Mac, Windows (windowed only), Qt (windowed only, widget is an HWND on windows), Gtk (windowed only)
-//
 class Widget : public RefCounted<Widget> {
 public:
-    explicit Widget(PlatformWidget = 0);
+    Widget();
     virtual ~Widget();
 
-    PlatformWidget platformWidget() const;
-    void setPlatformWidget(PlatformWidget);
-
     int x() const { return frameRect().x(); }
     int y() const { return frameRect().y(); }
     int width() const { return frameRect().width(); }
     int height() const { return frameRect().height(); }
     IntSize size() const { return frameRect().size(); }
     IntPoint location() const { return frameRect().location(); }
 
     virtual void setFrameRect(const IntRect&);
     IntRect frameRect() const;
     IntRect boundsRect() const { return IntRect(0, 0, width(),  height()); }
@@ skipping 88 matching lines @@
     // Virtual methods to convert points to/from the containing ScrollView
     virtual IntRect convertToContainingView(const IntRect&) const;
     virtual IntRect convertFromContainingView(const IntRect&) const;
     virtual IntPoint convertToContainingView(const IntPoint&) const;
     virtual IntPoint convertFromContainingView(const IntPoint&) const;
 
     // A means to access the AX cache when this object can get a pointer to it.
     virtual AXObjectCache* axObjectCache() const { return 0; }
     
 private:
-    void init(PlatformWidget); // Must be called by all Widget constructors to initialize cross-platform data.
-
-    void releasePlatformWidget();
-    void retainPlatformWidget();
+    void init(); // Must be called by all Widget constructors to initialize cross-platform data.
 
     // These methods are used to convert from the root widget to the containing window,
     // which has behavior that may differ between platforms (e.g. Mac uses flipped window coordinates).
     static IntRect convertFromRootToContainingWindow(const Widget* rootWidget, const IntRect&);
     static IntRect convertFromContainingWindowToRoot(const Widget* rootWidget, const IntRect&);
 
     static IntPoint convertFromRootToContainingWindow(const Widget* rootWidget, const IntPoint&);
     static IntPoint convertFromContainingWindowToRoot(const Widget* rootWidget, const IntPoint&);
 
 private:
     ScrollView* m_parent;
-#if !PLATFORM(MAC)
-    PlatformWidget m_widget;
-#else
-    RetainPtr<NSView> m_widget;
-#endif
     bool m_selfVisible;
     bool m_parentVisible;
 
     IntRect m_frame; // Not used when a native widget exists.
 
 #if PLATFORM(MAC)
     WidgetPrivate* m_data;
 #endif
 
 #if PLATFORM(EFL)
     Evas_Object* m_evasObject;
 #endif
 
 #if PLATFORM(QT)
     QPointer<QObject> m_bindingObject;
 #endif
 
 };
 
-#if !PLATFORM(MAC)
-
-inline PlatformWidget Widget::platformWidget() const
-{
-    return m_widget;
-}
-
-inline void Widget::setPlatformWidget(PlatformWidget widget)
-{
-    if (widget != m_widget) {
-        releasePlatformWidget();
-        m_widget = widget;
-        retainPlatformWidget();
-    }
-}
-
-#endif
-
-#if !PLATFORM(GTK)
-
-inline void Widget::releasePlatformWidget()
-{
-}
-
-inline void Widget::retainPlatformWidget()
-{
-}
-
-#endif
-
 } // namespace WebCore
 
 #endif // Widget_h