third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/weborigin/SecurityPolicy.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/platform/weborigin/SecurityOrigin.cpp ('k') | third_party/WebKit/Source/web/AssociatedURLLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp

diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp

index e915a51637d2f0c80b3b350902a535e49c4ed936..14cde14e1e0b1558fa9ed493444140d91fd7a92c 100644

--- a/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp

+++ b/third_party/WebKit/Source/platform/weborigin/SecurityPolicy.cpp

@@ -35,15 +35,15 @@

#include "platform/weborigin/SecurityOrigin.h"

#include "wtf/HashMap.h"

#include "wtf/HashSet.h"

-#include "wtf/PtrUtil.h"

+#include "wtf/OwnPtr.h"

+#include "wtf/PassOwnPtr.h"

#include "wtf/Threading.h"

#include "wtf/text/StringHash.h"

-#include <memory>

namespace blink {

using OriginAccessWhiteList = Vector<OriginAccessEntry>;

-using OriginAccessMap = HashMap<String, std::unique_ptr<OriginAccessWhiteList>>;

+using OriginAccessMap = HashMap<String, OwnPtr<OriginAccessWhiteList>>;

using OriginSet = HashSet<String>;

static OriginAccessMap& originAccessMap()

@@ -186,7 +186,7 @@ void SecurityPolicy::addOriginAccessWhitelistEntry(const SecurityOrigin& sourceO

String sourceString = sourceOrigin.toString();

OriginAccessMap::AddResult result = originAccessMap().add(sourceString, nullptr);

if (result.isNewEntry)

- result.storedValue->value = wrapUnique(new OriginAccessWhiteList);

+ result.storedValue->value = adoptPtr(new OriginAccessWhiteList);

OriginAccessWhiteList* list = result.storedValue->value.get();

list->append(OriginAccessEntry(destinationProtocol, destinationDomain, allowDestinationSubdomains ? OriginAccessEntry::AllowSubdomains : OriginAccessEntry::DisallowSubdomains));