Commit bcf10d8c authored by sigbjornf@opera.com's avatar sigbjornf@opera.com

Oilpan: update WebNotification and WebDOMMediaStreamTrack type conversions

These two public/web/ types hadn't been updated to use transition types
over their underlying Oilpan-converted objects.

R=tkent@chromium.org,haraken@chromium.org
BUG=357163

Review URL: https://codereview.chromium.org/310393004

git-svn-id: svn://svn.chromium.org/blink/trunk@175540 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a458b890
...@@ -79,20 +79,20 @@ bool NotificationPresenterImpl::isInitialized() ...@@ -79,20 +79,20 @@ bool NotificationPresenterImpl::isInitialized()
bool NotificationPresenterImpl::show(Notification* notification) bool NotificationPresenterImpl::show(Notification* notification)
{ {
return m_presenter->show(PassRefPtr<Notification>(notification)); return m_presenter->show(RawPtr<Notification>(notification));
} }
void NotificationPresenterImpl::close(Notification* notification) void NotificationPresenterImpl::close(Notification* notification)
{ {
m_presenter->close(PassRefPtr<Notification>(notification)); m_presenter->close(RawPtr<Notification>(notification));
// FIXME: Remove the duplicated call to cancel() when Chromium updated to override close() instead. // FIXME: Remove the duplicated call to cancel() when Chromium updated to override close() instead.
m_presenter->cancel(PassRefPtr<Notification>(notification)); m_presenter->cancel(RawPtr<Notification>(notification));
} }
void NotificationPresenterImpl::notificationObjectDestroyed(Notification* notification) void NotificationPresenterImpl::notificationObjectDestroyed(Notification* notification)
{ {
m_presenter->objectDestroyed(PassRefPtr<Notification>(notification)); m_presenter->objectDestroyed(RawPtr<Notification>(notification));
} }
NotificationClient::Permission NotificationPresenterImpl::checkPermission(ExecutionContext* context) NotificationClient::Permission NotificationPresenterImpl::checkPermission(ExecutionContext* context)
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
namespace blink { namespace blink {
WebDOMMediaStreamTrack::WebDOMMediaStreamTrack(PassRefPtr<WebCore::MediaStreamTrack> track) WebDOMMediaStreamTrack::WebDOMMediaStreamTrack(PassRefPtrWillBeRawPtr<WebCore::MediaStreamTrack> track)
: m_private(track) : m_private(track)
{ {
} }
......
...@@ -114,20 +114,15 @@ void WebNotification::dispatchClickEvent() ...@@ -114,20 +114,15 @@ void WebNotification::dispatchClickEvent()
m_private->dispatchClickEvent(); m_private->dispatchClickEvent();
} }
WebNotification::WebNotification(const WTF::PassRefPtr<WebCore::Notification>& notification) WebNotification::WebNotification(const WTF::RawPtr<Notification>& notification)
: m_private(notification) : m_private(notification)
{ {
} }
WebNotification& WebNotification::operator=(const WTF::PassRefPtr<Notification>& notification) WebNotification& WebNotification::operator=(const WTF::RawPtr<Notification>& notification)
{ {
m_private = notification; m_private = notification;
return *this; return *this;
} }
WebNotification::operator WTF::PassRefPtr<Notification>() const
{
return m_private.get();
}
} // namespace blink } // namespace blink
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
private: private:
#if BLINK_IMPLEMENTATION #if BLINK_IMPLEMENTATION
WebDOMMediaStreamTrack(WTF::PassRefPtr<WebCore::MediaStreamTrack>); WebDOMMediaStreamTrack(PassRefPtrWillBeRawPtr<WebCore::MediaStreamTrack>);
#endif #endif
WebPrivatePtr<WebCore::MediaStreamTrack> m_private; WebPrivatePtr<WebCore::MediaStreamTrack> m_private;
......
...@@ -93,9 +93,8 @@ public: ...@@ -93,9 +93,8 @@ public:
void dispatchDisplayEvent() { dispatchShowEvent(); } void dispatchDisplayEvent() { dispatchShowEvent(); }
#if BLINK_IMPLEMENTATION #if BLINK_IMPLEMENTATION
WebNotification(const WTF::PassRefPtr<WebCore::Notification>&); WebNotification(const WTF::RawPtr<WebCore::Notification>&);
WebNotification& operator=(const WTF::PassRefPtr<WebCore::Notification>&); WebNotification& operator=(const WTF::RawPtr<WebCore::Notification>&);
operator WTF::PassRefPtr<WebCore::Notification>() const;
#endif #endif
private: private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment