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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « third_party/WebKit/Source/web/WebBlob.cpp ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebDOMActivityLogger.cpp
diff --git a/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp b/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp
index ff332a07e1016ac9c5b9dec7ebd6aa6fa60b77d6..71236d1c777c217737b65ad33e9a63608fee21f9 100644
--- a/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp
+++ b/third_party/WebKit/Source/web/WebDOMActivityLogger.cpp
@@ -35,15 +35,13 @@
#include "core/dom/Document.h"
#include "core/frame/LocalDOMWindow.h"
#include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
#include "wtf/text/WTFString.h"
-#include <memory>
namespace blink {
class DOMActivityLoggerContainer : public V8DOMActivityLogger {
public:
- explicit DOMActivityLoggerContainer(std::unique_ptr<WebDOMActivityLogger> logger)
+ explicit DOMActivityLoggerContainer(PassOwnPtr<WebDOMActivityLogger> logger)
: m_domActivityLogger(std::move(logger))
{
}
@@ -86,7 +84,7 @@ private:
return WebString();
}
- std::unique_ptr<WebDOMActivityLogger> m_domActivityLogger;
+ OwnPtr<WebDOMActivityLogger> m_domActivityLogger;
};
bool hasDOMActivityLogger(int worldId, const WebString& extensionId)
@@ -97,7 +95,7 @@ bool hasDOMActivityLogger(int worldId, const WebString& extensionId)
void setDOMActivityLogger(int worldId, const WebString& extensionId, WebDOMActivityLogger* logger)
{
DCHECK(logger);
- V8DOMActivityLogger::setActivityLogger(worldId, extensionId, wrapUnique(new DOMActivityLoggerContainer(wrapUnique(logger))));
+ V8DOMActivityLogger::setActivityLogger(worldId, extensionId, adoptPtr(new DOMActivityLoggerContainer(adoptPtr(logger))));
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/web/WebBlob.cpp ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698