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

Unified Diff: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.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
Index: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
index 4560bab904c95b78eb2952240f7b52f8f51384e3..395869e19890b922b492fccd45a8b071aeafcb1d 100644
--- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
@@ -37,10 +37,10 @@
#include "url/url_canon_ip.h"
#include "wtf/HexNumber.h"
#include "wtf/NotFound.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
#include "wtf/StdLibExtras.h"
#include "wtf/text/StringBuilder.h"
-#include <memory>
namespace blink {
@@ -565,16 +565,16 @@ const KURL& SecurityOrigin::urlWithUniqueSecurityOrigin()
return uniqueSecurityOriginURL;
}
-std::unique_ptr<SecurityOrigin::PrivilegeData> SecurityOrigin::createPrivilegeData() const
+PassOwnPtr<SecurityOrigin::PrivilegeData> SecurityOrigin::createPrivilegeData() const
{
- std::unique_ptr<PrivilegeData> privilegeData = wrapUnique(new PrivilegeData);
+ OwnPtr<PrivilegeData> privilegeData = adoptPtr(new PrivilegeData);
privilegeData->m_universalAccess = m_universalAccess;
privilegeData->m_canLoadLocalResources = m_canLoadLocalResources;
privilegeData->m_blockLocalAccessFromLocalOrigin = m_blockLocalAccessFromLocalOrigin;
return privilegeData;
}
-void SecurityOrigin::transferPrivilegesFrom(std::unique_ptr<PrivilegeData> privilegeData)
+void SecurityOrigin::transferPrivilegesFrom(PassOwnPtr<PrivilegeData> privilegeData)
{
m_universalAccess = privilegeData->m_universalAccess;
m_canLoadLocalResources = privilegeData->m_canLoadLocalResources;

Powered by Google App Engine
This is Rietveld 408576698