Changeset 86537 in webkit

Timestamp:

May 16, 2011 12:24:01 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-16 Adam Barth <​abarth@webkit.org>

[Qt] QtPlatformPlugin create methods should use PassOwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=60873

This change is slightly more than a build fix because the patch kind of
spidered a bit while I was trying to fix the build the "right way."
Hopefully nothing here is controversial.

• Api/qwebpage.cpp: (QWebPagePrivate::adjustPointForClicking):
• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::createSelectPopup):
• WebCoreSupport/FullScreenVideoQt.cpp: (WebCore::FullScreenVideoQt::FullScreenVideoQt): (WebCore::FullScreenVideoQt::~FullScreenVideoQt):
• WebCoreSupport/FullScreenVideoQt.h:
• WebCoreSupport/NotificationPresenterClientQt.cpp: (WebCore::NotificationWrapper::NotificationWrapper): (WebCore::NotificationPresenterClientQt::displayNotification):
• WebCoreSupport/PopupMenuQt.cpp: (WebCore::PopupMenuQt::PopupMenuQt): (WebCore::PopupMenuQt::~PopupMenuQt): (WebCore::PopupMenuQt::show):
• WebCoreSupport/PopupMenuQt.h:
• WebCoreSupport/QtPlatformPlugin.cpp: (WebCore::QtPlatformPlugin::createSelectInputMethod): (WebCore::QtPlatformPlugin::createNotificationPresenter): (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer): (WebCore::QtPlatformPlugin::createTouchModifier): (WebCore::QtPlatformPlugin::createFullScreenVideoHandler):
• WebCoreSupport/QtPlatformPlugin.h: (WebCore::QtPlatformPlugin::QtPlatformPlugin):

2011-05-16 Adam Barth <​abarth@webkit.org>

[Qt] QtPlatformPlugin create methods should use PassOwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=60873

• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::platformStart):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/qt/PluginViewQt.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.h (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/FullScreenVideoQt.h (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/PopupMenuQt.cpp (modified) (4 diffs)
• WebKit/qt/WebCoreSupport/PopupMenuQt.h (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/QtPlatformPlugin.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Adam Barth  <abarth@webkit.org>
+
+        [Qt] QtPlatformPlugin create methods should use PassOwnPtr
+        https://bugs.webkit.org/show_bug.cgi?id=60873
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::platformStart):
+
 2011-05-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp

@@ -946 +946 @@
             && m_parentFrame->page()->settings() 
             && m_parentFrame->page()->settings()->acceleratedCompositingEnabled()) {
-            m_platformLayer = new PluginGraphicsLayerQt(this);
+            m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this));
             // Trigger layer computation in RenderLayerCompositor
             m_element->setNeedsStyleRecalc(SyntheticStyleChange);

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -1320 +1320 @@
 {
     QtPlatformPlugin platformPlugin;
-    QWebTouchModifier* touchModifier = platformPlugin.createTouchModifier();
+    OwnPtr<QWebTouchModifier> touchModifier = platformPlugin.createTouchModifier();
     if (!touchModifier)
         return;
@@ -1329 +1329 @@
     unsigned leftPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Left);
 
-    delete touchModifier;
-    touchModifier = 0;
+    touchModifier = nullptr;
 
     if (!topPadding && !rightPadding && !bottomPadding && !leftPadding)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-16  Adam Barth  <abarth@webkit.org>
+
+        [Qt] QtPlatformPlugin create methods should use PassOwnPtr
+        https://bugs.webkit.org/show_bug.cgi?id=60873
+
+        This change is slightly more than a build fix because the patch kind of
+        spidered a bit while I was trying to fix the build the "right way."
+        Hopefully nothing here is controversial.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::adjustPointForClicking):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+        * WebCoreSupport/FullScreenVideoQt.cpp:
+        (WebCore::FullScreenVideoQt::FullScreenVideoQt):
+        (WebCore::FullScreenVideoQt::~FullScreenVideoQt):
+        * WebCoreSupport/FullScreenVideoQt.h:
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationWrapper::NotificationWrapper):
+        (WebCore::NotificationPresenterClientQt::displayNotification):
+        * WebCoreSupport/PopupMenuQt.cpp:
+        (WebCore::PopupMenuQt::PopupMenuQt):
+        (WebCore::PopupMenuQt::~PopupMenuQt):
+        (WebCore::PopupMenuQt::show):
+        * WebCoreSupport/PopupMenuQt.h:
+        * WebCoreSupport/QtPlatformPlugin.cpp:
+        (WebCore::QtPlatformPlugin::createSelectInputMethod):
+        (WebCore::QtPlatformPlugin::createNotificationPresenter):
+        (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer):
+        (WebCore::QtPlatformPlugin::createTouchModifier):
+        (WebCore::QtPlatformPlugin::createFullScreenVideoHandler):
+        * WebCoreSupport/QtPlatformPlugin.h:
+        (WebCore::QtPlatformPlugin::QtPlatformPlugin):
+
 2011-05-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -697 +697 @@
 #endif
 
-QWebSelectMethod* ChromeClientQt::createSelectPopup() const
-{
-    QWebSelectMethod* result = m_platformPlugin.createSelectInputMethod();
+PassOwnPtr<QWebSelectMethod> ChromeClientQt::createSelectPopup() const
+{
+    OwnPtr<QWebSelectMethod> result = m_platformPlugin.createSelectInputMethod();
     if (result)
-        return result;
+        return result.release();
 
 #if defined(Q_WS_MAEMO_5)
-    return new QtMaemoWebPopup;
+    return adoptPtr(new QtMaemoWebPopup);
 #elif !defined(QT_NO_COMBOBOX)
-    return new QtFallbackWebPopup(this);
+    return adoptPtr(new QtFallbackWebPopup(this));
 #else
-    return 0;
+    return nullptr;
 #endif
 }

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h

@@ -35 +35 @@
 #include "PlatformString.h"
 #include "QtPlatformPlugin.h"
+#include <wtf/PassOwnPtr.h>
 #include <wtf/RefCounted.h>
 
@@ -190 +191 @@
     virtual void populateVisitedLinks();
 
-    QWebSelectMethod* createSelectPopup() const;
+    PassOwnPtr<QWebSelectMethod> createSelectPopup() const;
 
     virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;

trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp

@@ -139 +139 @@
     m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler();
     if (!m_FullScreenVideoHandler)
-        m_FullScreenVideoHandler = new DefaultFullScreenVideoHandler;
+        m_FullScreenVideoHandler = adoptPtr(new DefaultFullScreenVideoHandler);
 
     if (m_FullScreenVideoHandler)
-        connect(m_FullScreenVideoHandler, SIGNAL(fullScreenClosed()), this, SLOT(aboutToClose()));
-#endif
-
-#if USE(GSTREAMER)
-    m_FullScreenVideoHandlerGStreamer = new GStreamerFullScreenVideoHandler;
+        connect(m_FullScreenVideoHandler.get(), SIGNAL(fullScreenClosed()), this, SLOT(aboutToClose()));
+#endif
+
+#if USE(GSTREAMER)
+    m_FullScreenVideoHandlerGStreamer = adoptPtr(new GStreamerFullScreenVideoHandler);
 #endif
 }
@@ -152 +152 @@
 FullScreenVideoQt::~FullScreenVideoQt()
 {
-#if USE(QT_MULTIMEDIA)
-    delete m_FullScreenVideoHandler;
-#endif
-#if USE(GSTREAMER)
-    delete m_FullScreenVideoHandlerGStreamer;
-#endif
 }
 

trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h

@@ -24 +24 @@
 #include <QObject>
 #include <wtf/Platform.h>
+#include <wtf/OwnPtr.h>
 
 QT_BEGIN_NAMESPACE
@@ -105 +106 @@
     HTMLVideoElement* m_videoElement;
 #if USE(QT_MULTIMEDIA)
-    QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
+    OwnPtr<QWebFullScreenVideoHandler> m_FullScreenVideoHandler;
 #endif
 #if USE(GSTREAMER)
-    GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
+    OwnPtr<GStreamerFullScreenVideoHandler> m_FullScreenVideoHandlerGStreamer;
 #endif
 };

trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

@@ -74 +74 @@
 
 #ifndef QT_NO_SYSTEMTRAYICON
-    m_notificationIcon = 0;
-#endif
-    m_presenter = 0;
+    m_notificationIcon = nullptr;
+#endif
+    m_presenter = nullptr;
 #endif
 }
@@ -212 +212 @@
         if (bytes.length() && pixmap.loadFromData(bytes)) {
             QIcon icon(pixmap);
-            wrapper->m_notificationIcon = new QSystemTrayIcon(icon);
+            wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon));
         } else
-            wrapper->m_notificationIcon = new QSystemTrayIcon();
+            wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon());
 #endif
     }

trunk/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp

@@ -83 +83 @@
 PopupMenuQt::PopupMenuQt(PopupMenuClient* client, const ChromeClientQt* chromeClient)
     : m_popupClient(client)
-    , m_popup(0)
-    , m_selectData(0)
     , m_chromeClient(chromeClient)
 {
@@ -91 +89 @@
 PopupMenuQt::~PopupMenuQt()
 {
-    delete m_selectData;
-    delete m_popup;
 }
 
@@ -108 +104 @@
     if (!m_popup) {
         m_popup = m_chromeClient->createSelectPopup();
-        connect(m_popup, SIGNAL(didHide()), this, SLOT(didHide()));
-        connect(m_popup, SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool)));
+        connect(m_popup.get(), SIGNAL(didHide()), this, SLOT(didHide()));
+        connect(m_popup.get(), SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool)));
     }
 
-    if (QtFallbackWebPopup* fallback = qobject_cast<QtFallbackWebPopup*>(m_popup)) {
+    if (QtFallbackWebPopup* fallback = qobject_cast<QtFallbackWebPopup*>(m_popup.get())) {
         QRect geometry(rect);
         geometry.moveTopLeft(view->contentsToWindow(rect.location()));
@@ -119 +115 @@
     }
 
-    if (m_selectData)
-        delete m_selectData;
-    m_selectData = new SelectData(m_popupClient);
-    m_popup->show(*m_selectData);
+    m_selectData = adoptPtr(new SelectData(m_popupClient));
+    m_popup->show(*m_selectData.get());
 #endif
 }

trunk/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h

@@ -23 +23 @@
 #include "PopupMenu.h"
 #include <QObject>
+#include <wtf/PassOwnPtr.h>
 
 class QWebSelectData;
@@ -50 +51 @@
 private:
     PopupMenuClient* m_popupClient;
-    QWebSelectMethod* m_popup;
-    QWebSelectData* m_selectData;
+    OwnPtr<QWebSelectMethod> m_popup;
+    OwnPtr<QWebSelectData> m_selectData;
     const ChromeClientQt* m_chromeClient;
 };

trunk/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp

@@ -103 +103 @@
 }
 
-QWebSelectMethod* QtPlatformPlugin::createSelectInputMethod()
+PassOwnPtr<QWebSelectMethod> QtPlatformPlugin::createSelectInputMethod()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? static_cast<QWebSelectMethod*>(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0;
+    return adoptPtr(p ? static_cast<QWebSelectMethod*>(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0);
 }
 
-
-QWebNotificationPresenter* QtPlatformPlugin::createNotificationPresenter()
+PassOwnPtr<QWebNotificationPresenter> QtPlatformPlugin::createNotificationPresenter()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? static_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0;
+    return adoptPtr(p ? static_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0);
 }
 
-QWebHapticFeedbackPlayer* QtPlatformPlugin::createHapticFeedbackPlayer()
+PassOwnPtr<QWebHapticFeedbackPlayer> QtPlatformPlugin::createHapticFeedbackPlayer()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? static_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0;
+    return adoptPtr(p ? static_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0);
 }
 
-QWebTouchModifier* QtPlatformPlugin::createTouchModifier()
+PassOwnPtr<QWebTouchModifier> QtPlatformPlugin::createTouchModifier()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? static_cast<QWebTouchModifier*>(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0;
+    return adoptPtr(p ? static_cast<QWebTouchModifier*>(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0);
 }
 
 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
-QWebFullScreenVideoHandler* QtPlatformPlugin::createFullScreenVideoHandler()
+PassOwnPtr<QWebFullScreenVideoHandler> QtPlatformPlugin::createFullScreenVideoHandler()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? static_cast<QWebFullScreenVideoHandler*>(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0;
+    return adoptPtr(p ? static_cast<QWebFullScreenVideoHandler*>(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0);
 }
 #endif

trunk/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h

@@ -23 +23 @@
 
 #include <QPluginLoader>
+#include <wtf/PassOwnPtr.h>
 
 class QWebSelectMethod;
@@ -38 +39 @@
 class QtPlatformPlugin {
 public:
-    QtPlatformPlugin() : m_loaded(false), m_plugin(0) {}
+    QtPlatformPlugin()
+        : m_loaded(false)
+        , m_plugin(0)
+    {
+    }
+
     ~QtPlatformPlugin();
 
-    QWebSelectMethod* createSelectInputMethod();
-    QWebNotificationPresenter* createNotificationPresenter();
-    QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
-    QWebTouchModifier* createTouchModifier();
+    PassOwnPtr<QWebSelectMethod> createSelectInputMethod();
+    PassOwnPtr<QWebNotificationPresenter> createNotificationPresenter();
+    PassOwnPtr<QWebHapticFeedbackPlayer> createHapticFeedbackPlayer();
+    PassOwnPtr<QWebTouchModifier> createTouchModifier();
 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
-    QWebFullScreenVideoHandler* createFullScreenVideoHandler();
+    PassOwnPtr<QWebFullScreenVideoHandler> createFullScreenVideoHandler();
 #endif