| Index: third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp
|
| diff --git a/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp b/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp
|
| index b609d71bea0134cef862b172e19064f899ab4845..bb72787b7a4761e25ab96531dd440cad22536d90 100644
|
| --- a/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp
|
| +++ b/third_party/WebKit/Source/web/ExternalDateTimeChooser.cpp
|
| @@ -63,23 +63,29 @@ private:
|
| delete this;
|
| }
|
|
|
| - RefPtr<ExternalDateTimeChooser> m_chooser;
|
| + RefPtrWillBePersistent<ExternalDateTimeChooser> m_chooser;
|
| };
|
|
|
| ExternalDateTimeChooser::~ExternalDateTimeChooser()
|
| {
|
| }
|
|
|
| +DEFINE_TRACE(ExternalDateTimeChooser)
|
| +{
|
| + visitor->trace(m_client);
|
| + DateTimeChooser::trace(visitor);
|
| +}
|
| +
|
| ExternalDateTimeChooser::ExternalDateTimeChooser(DateTimeChooserClient* client)
|
| : m_client(client)
|
| {
|
| ASSERT(client);
|
| }
|
|
|
| -PassRefPtr<ExternalDateTimeChooser> ExternalDateTimeChooser::create(ChromeClientImpl* chromeClient, WebViewClient* webViewClient, DateTimeChooserClient* client, const DateTimeChooserParameters& parameters)
|
| +PassRefPtrWillBeRawPtr<ExternalDateTimeChooser> ExternalDateTimeChooser::create(ChromeClientImpl* chromeClient, WebViewClient* webViewClient, DateTimeChooserClient* client, const DateTimeChooserParameters& parameters)
|
| {
|
| ASSERT(chromeClient);
|
| - RefPtr<ExternalDateTimeChooser> chooser = adoptRef(new ExternalDateTimeChooser(client));
|
| + RefPtrWillBeRawPtr<ExternalDateTimeChooser> chooser = adoptRefWillBeNoop(new ExternalDateTimeChooser(client));
|
| if (!chooser->openDateTimeChooser(chromeClient, webViewClient, parameters))
|
| chooser.clear();
|
| return chooser.release();
|
| @@ -162,13 +168,13 @@ void ExternalDateTimeChooser::didCancelChooser()
|
| void ExternalDateTimeChooser::endChooser()
|
| {
|
| DateTimeChooserClient* client = m_client;
|
| - m_client = 0;
|
| + m_client = nullptr;
|
| client->didEndChooser();
|
| }
|
|
|
| AXObject* ExternalDateTimeChooser::rootAXObject()
|
| {
|
| - return 0;
|
| + return nullptr;
|
| }
|
|
|
| } // namespace blink
|
|
|