Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
index 108b2af8c68d3a1ad5822c19179b59f174637d06..0f4a87b9a987a8aeb5e6826d6852009aff6e98e4 100644
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -103,9 +103,11 @@
#include "web/WebLocalFrameImpl.h"
#include "web/WebPluginContainerImpl.h"
#include "web/WebViewImpl.h"
+#include "wtf/PtrUtil.h"
#include "wtf/StringExtras.h"
#include "wtf/text/CString.h"
#include "wtf/text/WTFString.h"
+#include <memory>
#include <v8.h>
namespace blink {
@@ -803,7 +805,7 @@ Widget* FrameLoaderClientImpl::createPlugin(
return container;
}
-PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
+std::unique_ptr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
HTMLMediaElement& htmlMediaElement,
const WebMediaPlayerSource& source,
WebMediaPlayerClient* client)
@@ -820,17 +822,17 @@ PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMedia::from(htmlMediaElement);
WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement));
- return adoptPtr(webFrame->client()->createMediaPlayer(source,
+ return wrapUnique(webFrame->client()->createMediaPlayer(source,
client, &encryptedMedia,
encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession));
}
-PassOwnPtr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession()
+std::unique_ptr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession()
{
if (!m_webFrame->client())
return nullptr;
- return adoptPtr(m_webFrame->client()->createMediaSession());
+ return wrapUnique(m_webFrame->client()->createMediaSession());
}
ObjectContentType FrameLoaderClientImpl::getObjectContentType(
@@ -963,11 +965,11 @@ void FrameLoaderClientImpl::dispatchWillInsertBody()
m_webFrame->client()->willInsertBody(m_webFrame);
}
-PassOwnPtr<WebServiceWorkerProvider> FrameLoaderClientImpl::createServiceWorkerProvider()
+std::unique_ptr<WebServiceWorkerProvider> FrameLoaderClientImpl::createServiceWorkerProvider()
{
if (!m_webFrame->client())
return nullptr;
- return adoptPtr(m_webFrame->client()->createServiceWorkerProvider());
+ return wrapUnique(m_webFrame->client()->createServiceWorkerProvider());
}
bool FrameLoaderClientImpl::isControlledByServiceWorker(DocumentLoader& loader)
@@ -987,11 +989,11 @@ SharedWorkerRepositoryClient* FrameLoaderClientImpl::sharedWorkerRepositoryClien
return m_webFrame->sharedWorkerRepositoryClient();
}
-PassOwnPtr<WebApplicationCacheHost> FrameLoaderClientImpl::createApplicationCacheHost(WebApplicationCacheHostClient* client)
+std::unique_ptr<WebApplicationCacheHost> FrameLoaderClientImpl::createApplicationCacheHost(WebApplicationCacheHostClient* client)
{
if (!m_webFrame->client())
return nullptr;
- return adoptPtr(m_webFrame->client()->createApplicationCacheHost(client));
+ return wrapUnique(m_webFrame->client()->createApplicationCacheHost(client));
}
void FrameLoaderClientImpl::dispatchDidChangeManifest()
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/FullscreenController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698