Changeset 36647 in webkit

Timestamp:

Sep 18, 2008 8:16:26 PM (16 years ago)

Author:

hyatt@apple.com

Message:

2008-09-18 David Hyatt <​hyatt@apple.com>

Move to only one constructor for Widgets. Rename data to m_data and make
it have an #ifdef only for platforms that have platform-specific data (Mac
and Gtk).

Reviewed by Sam Weinig

• WebCore.base.exp:
• platform/Widget.cpp: (WebCore::Widget::init):
• platform/Widget.h:
• platform/gtk/WidgetGtk.cpp: (WebCore::Widget::Widget): (WebCore::Widget::~Widget): (WebCore::Widget::cursor): (WebCore::Widget::setCursor):
• platform/mac/WidgetMac.mm: (WebCore::Widget::Widget): (WebCore::Widget::~Widget): (WebCore::Widget::addToSuperview): (WebCore::Widget::removeFromSuperview): (WebCore::Widget::beforeMouseDown): (WebCore::Widget::afterMouseDown):
• platform/qt/WidgetQt.cpp: (WebCore::Widget::Widget):
• platform/win/WidgetWin.cpp: (WebCore::Widget::Widget):
• platform/wx/WidgetWx.cpp: (WebCore::Widget::Widget):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.base.exp (modified) (1 diff)
• platform/Widget.cpp (modified) (1 diff)
• platform/Widget.h (modified) (3 diffs)
• platform/gtk/WidgetGtk.cpp (modified) (4 diffs)
• platform/mac/WidgetMac.mm (modified) (6 diffs)
• platform/qt/WidgetQt.cpp (modified) (1 diff)
• platform/win/WidgetWin.cpp (modified) (1 diff)
• platform/wx/WidgetWx.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-18  David Hyatt  <hyatt@apple.com>
+
+        Move to only one constructor for Widgets.  Rename data to m_data and make
+        it have an #ifdef only for platforms that have platform-specific data (Mac
+        and Gtk).
+
+        Reviewed by Sam Weinig
+
+        * WebCore.base.exp:
+        * platform/Widget.cpp:
+        (WebCore::Widget::init):
+        * platform/Widget.h:
+        * platform/gtk/WidgetGtk.cpp:
+        (WebCore::Widget::Widget):
+        (WebCore::Widget::~Widget):
+        (WebCore::Widget::cursor):
+        (WebCore::Widget::setCursor):
+        * platform/mac/WidgetMac.mm:
+        (WebCore::Widget::Widget):
+        (WebCore::Widget::~Widget):
+        (WebCore::Widget::addToSuperview):
+        (WebCore::Widget::removeFromSuperview):
+        (WebCore::Widget::beforeMouseDown):
+        (WebCore::Widget::afterMouseDown):
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::Widget::Widget):
+        * platform/win/WidgetWin.cpp:
+        (WebCore::Widget::Widget):
+        * platform/wx/WidgetWx.cpp:
+        (WebCore::Widget::Widget):
+
 2008-09-18  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/WebCore.base.exp

@@ -543 +543 @@
 __ZN7WebCore6Widget8setFocusEv
 __ZN7WebCore6WidgetC1EP6NSView
-__ZN7WebCore6WidgetC1Ev
 __ZN7WebCore6WidgetC2EP6NSView
 __ZN7WebCore6WidgetD2Ev

trunk/WebCore/platform/Widget.cpp

@@ -34 +34 @@
 namespace WebCore {
 
-void Widget::init()
+void Widget::init(PlatformWidget widget)
 {
     m_parent = 0;
-    m_widget = 0;
     m_selfVisible = false;
     m_parentVisible = false;
     m_containingWindow = 0;
+    m_widget = widget;
+    if (m_widget)
+        retainPlatformWidget();
 }
 

trunk/WebCore/platform/Widget.h

@@ -103 +103 @@
 class Widget {
 public:
-    Widget();
-    Widget(PlatformWidget);
+    Widget(PlatformWidget = 0);
     virtual ~Widget();
     
@@ -188 +187 @@
 
 private:
-    void init(); // Must be called by all Widget constructors to initialize cross-platform data.
+    void init(PlatformWidget); // Must be called by all Widget constructors to initialize cross-platform data.
 
     void releasePlatformWidget();
@@ -203 +202 @@
 
 #if PLATFORM(MAC) || PLATFORM(GTK)
-    WidgetPrivate* data;
+    WidgetPrivate* m_data;
 #endif
 };

trunk/WebCore/platform/gtk/WidgetGtk.cpp

@@ -46 +46 @@
 };
 
-Widget::Widget()
-    : data(new WidgetPrivate)
+Widget::Widget(PlatformWidget widget)
+    : m_data(new WidgetPrivate)
 {
-    init();
-    data->cursor = 0;
-}
-
-Widget::Widget(PlatformWidget widget)
-    : data(new WidgetPrivate)
-{
-    init();
-    m_widget = widget;
-    data->cursor = 0;
+    init(widget);
+    m_data->cursor = 0;
 }
 
@@ -64 +56 @@
 {
     ASSERT(!parent());
-    delete data;
+    delete m_data;
 }
 
@@ -79 +71 @@
 Cursor Widget::cursor()
 {
-    return Cursor(data->cursor);
+    return Cursor(m_data->cursor);
 }
 
@@ -97 +89 @@
     // expensive operation, so avoid it if possible.
 
-    if (pcur == data->cursor)
+    if (pcur == m_data->cursor)
         return;
 
     gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : GTK_WIDGET(containingWindow())->window, pcur);
-    data->cursor = pcur;
+    m_data->cursor = pcur;
 }
 

trunk/WebCore/platform/mac/WidgetMac.mm

@@ -76 +76 @@
 }
 
-Widget::Widget() : data(new WidgetPrivate)
-{
-    init();
-    data->mustStayInWindow = false;
-    data->removeFromSuperviewSoon = false;
-}
-
-Widget::Widget(NSView* view) : data(new WidgetPrivate)
-{
-    init();
-    setPlatformWidget(view);
-    data->mustStayInWindow = false;
-    data->removeFromSuperviewSoon = false;
+Widget::Widget(NSView* view)
+    : m_data(new WidgetPrivate)
+{
+    init(view);
+    m_data->mustStayInWindow = false;
+    m_data->removeFromSuperviewSoon = false;
 }
 
@@ -94 +87 @@
 {
     releasePlatformWidget();
-    delete data;
+    delete m_data;
 }
 
@@ -269 +262 @@
     if ([subview superview] != view)
         [view addSubview:subview];
-    data->removeFromSuperviewSoon = false;
+    m_data->removeFromSuperviewSoon = false;
     [window _setNeedsToResetDragMargins:resetDragMargins];
 
@@ -277 +270 @@
 void Widget::removeFromSuperview()
 {
-    if (data->mustStayInWindow)
-        data->removeFromSuperviewSoon = true;
+    if (m_data->mustStayInWindow)
+        m_data->removeFromSuperviewSoon = true;
     else {
-        data->removeFromSuperviewSoon = false;
+        m_data->removeFromSuperviewSoon = false;
         BEGIN_BLOCK_OBJC_EXCEPTIONS;
         safeRemoveFromSuperview(getOuterView());
@@ -291 +284 @@
     if (widget) {
         ASSERT(view == widget->getOuterView());
-        ASSERT(!widget->data->mustStayInWindow);
-        widget->data->mustStayInWindow = true;
+        ASSERT(!widget->m_data->mustStayInWindow);
+        widget->m_data->mustStayInWindow = true;
     }
 }
@@ -303 +296 @@
         END_BLOCK_OBJC_EXCEPTIONS;
     } else {
-        ASSERT(widget->data->mustStayInWindow);
-        widget->data->mustStayInWindow = false;
-        if (widget->data->removeFromSuperviewSoon)
+        ASSERT(widget->m_data->mustStayInWindow);
+        widget->m_data->mustStayInWindow = false;
+        if (widget->m_data->removeFromSuperviewSoon)
             widget->removeFromSuperview();
     }

trunk/WebCore/platform/qt/WidgetQt.cpp

@@ -54 +54 @@
 namespace WebCore {
 
-Widget::Widget()
-{
-    init();
-}
-
 Widget::Widget(QWidget* widget)
 {
-    init();
-    m_widget = widget;
+    init(widget);
 }
 

trunk/WebCore/platform/win/WidgetWin.cpp

@@ -39 +39 @@
 namespace WebCore {
 
-Widget::Widget()
-{
-    init();
-}
-
 Widget::Widget(PlatformWidget widget)
 {
-    init();
-    m_widget = widget;
+    init(widget);
 }
 

trunk/WebCore/platform/wx/WidgetWx.cpp

@@ -35 +35 @@
 namespace WebCore {
 
-Widget::Widget()
-{
-    init();
-}
-
 Widget::Widget(PlatformWidget widget)
 {
-    init();
-    m_widget = widget;
+    init(widget);
 }